diff --git a/code/core/src/docs-tools/shared.ts b/code/core/src/docs-tools/shared.ts
index ca34c29c6e5e..178bf46ca387 100644
--- a/code/core/src/docs-tools/shared.ts
+++ b/code/core/src/docs-tools/shared.ts
@@ -1,4 +1,4 @@
-export const ADDON_ID = '@storybook/core/docs';
+export const ADDON_ID = 'storybook/docs';
 export const PANEL_ID = `${ADDON_ID}/panel`;
 export const PARAM_KEY = `docs`;
 
diff --git a/code/core/src/manager-api/tests/layout.test.ts b/code/core/src/manager-api/tests/layout.test.ts
index ab31a75502ab..a9ced49e1ac3 100644
--- a/code/core/src/manager-api/tests/layout.test.ts
+++ b/code/core/src/manager-api/tests/layout.test.ts
@@ -471,14 +471,14 @@ describe('layout API', () => {
     });
 
     it('should set selectedPanel initially', () => {
-      const panelName = '@storybook/core/a11y/panel';
+      const panelName = 'storybook/a11y/panel';
       layoutApi.setOptions({ selectedPanel: panelName });
 
       expect(getLastSetStateArgs()[0].selectedPanel).toEqual(panelName);
     });
 
     it('should change selectedPanel if it is defined in the options and is different', () => {
-      const panelName = '@storybook/core/a11y/panel';
+      const panelName = 'storybook/a11y/panel';
       layoutApi.setOptions({});
       layoutApi.setOptions({ selectedPanel: panelName });