diff --git a/packages/internet-header/cypress/e2e/breadcrumbs.cy.ts b/packages/internet-header/cypress/e2e/breadcrumbs.cy.ts
index c5c46cfbde..f689d7cea1 100644
--- a/packages/internet-header/cypress/e2e/breadcrumbs.cy.ts
+++ b/packages/internet-header/cypress/e2e/breadcrumbs.cy.ts
@@ -33,13 +33,13 @@ describe('breadcrumb', () => {
       modifiedConfig.fr.breadcrumb = undefined;
       modifiedConfig.it.breadcrumb = undefined;
 
-      prepare('Internet Header/Breadcrumbs', 'Default', { config: modifiedConfig });
+      prepare('Components/Internet Header/Breadcrumbs', 'Default', { config: modifiedConfig });
       cy.get('swisspost-internet-breadcrumbs').should('exist');
       cy.get('div.breadcrumbs').should('not.exist');
     });
 
     it(`should add custom elements`, () => {
-      prepare('Internet Header/Breadcrumbs/Custom Items', 'Default');
+      prepare('Components/Internet Header/Breadcrumbs/Custom Items', 'Default');
 
       cy.changeArg('custom-items', [
         { text: 'Test1', url: '/x/y/z' },
@@ -63,7 +63,7 @@ describe('breadcrumb', () => {
 
   describe('Toggle overlay buttons', () => {
     beforeEach(() => {
-      prepare('Internet Header/Breadcrumbs', 'Default');
+      prepare('Components/Internet Header/Breadcrumbs', 'Default');
       cy.get('div.breadcrumbs').as('breadcrumbs');
       cy.intercept(
         'https://post.ch/de/kundencenter/onlinedienste/standorte-und-oeffnungszeiten/**',
@@ -111,7 +111,7 @@ describe('breadcrumb', () => {
   describe('mobile', () => {
     beforeEach(() => {
       cy.viewport('iphone-6+');
-      prepare('Internet Header/Breadcrumbs', 'Default');
+      prepare('Components/Internet Header/Breadcrumbs', 'Default');
       cy.get('div.breadcrumbs').as('breadcrumbs');
     });
 
diff --git a/packages/internet-header/cypress/e2e/footer.cy.ts b/packages/internet-header/cypress/e2e/footer.cy.ts
index fdd972c771..32227b890c 100644
--- a/packages/internet-header/cypress/e2e/footer.cy.ts
+++ b/packages/internet-header/cypress/e2e/footer.cy.ts
@@ -4,7 +4,7 @@ describe('footer', () => {
   describe('config', () => {
     describe('custom footer config set', () => {
       it(`shows custom footer links`, async () => {
-        prepare('Internet Header/Footer', 'Default');
+        prepare('Components/Internet Header/Footer', 'Default');
 
         const customFooterConfig = {
           de: {
@@ -41,12 +41,12 @@ describe('footer', () => {
 
     describe('external functions test', () => {
       it('should not show cookie settings link when UC_UI is not defined', () => {
-        prepare('Internet Header/Footer', 'Default');
+        prepare('Components/Internet Header/Footer', 'Default');
         cy.get('.footer-meta-links').should('exist').get('.cookie-settings').should('not.exist');
       });
 
       it('should show cookie settings when UC_UI is defined', () => {
-        prepare('Internet Header/Footer', 'Default');
+        prepare('Components/Internet Header/Footer', 'Default');
         cy.window().then(win => {
           win['UC_UI'] = { showSecondLayer: () => 'second layer mock' };
           cy.get('.footer-meta-links').should('exist').get('.cookie-settings').should('exist');
diff --git a/packages/internet-header/cypress/e2e/header.cy.ts b/packages/internet-header/cypress/e2e/header.cy.ts
index 23b53103ff..670050b2dc 100644
--- a/packages/internet-header/cypress/e2e/header.cy.ts
+++ b/packages/internet-header/cypress/e2e/header.cy.ts
@@ -2,7 +2,7 @@ import { prepare } from '../support/prepare-story';
 
 describe('header', () => {
   beforeEach(() => {
-    prepare('Internet Header/Header', 'Default');
+    prepare('Components/Internet Header/Header', 'Default');
     cy.changeArg('language', 'de');
   });
 
diff --git a/packages/internet-header/cypress/e2e/language-detection.cy.ts b/packages/internet-header/cypress/e2e/language-detection.cy.ts
index 5b5865ed2d..6eea364a86 100644
--- a/packages/internet-header/cypress/e2e/language-detection.cy.ts
+++ b/packages/internet-header/cypress/e2e/language-detection.cy.ts
@@ -3,7 +3,7 @@ import { prepare } from '../support/prepare-story';
 
 describe('language detection from storybook', () => {
   it('should not render the header without languages in the config', () => {
-    prepare('Internet Header/Header', 'Default');
+    prepare('Components/Internet Header/Header', 'Default');
     cy.get('swisspost-internet-header').should('exist');
     cy.get('.post-internet-header').should('not.exist');
   });
@@ -15,7 +15,7 @@ describe('language detection from storybook', () => {
     delete customConfig.fr;
     delete customConfig.en;
 
-    prepare('Internet Header/Header', 'Default', { config: customConfig });
+    prepare('Components/Internet Header/Header', 'Default', { config: customConfig });
 
     cy.get('swisspost-internet-header')
       .shadow()
diff --git a/packages/internet-header/cypress/e2e/language-switch.cy.ts b/packages/internet-header/cypress/e2e/language-switch.cy.ts
index b4b9481fca..554d5435c1 100644
--- a/packages/internet-header/cypress/e2e/language-switch.cy.ts
+++ b/packages/internet-header/cypress/e2e/language-switch.cy.ts
@@ -9,7 +9,7 @@ describe('language-switch', () => {
 
   beforeEach(() => {
     cy.viewport(1024, 800);
-    prepare('Internet Header/Header', 'Default');
+    prepare('Components/Internet Header/Header', 'Default');
     cy.changeArg('language', 'de');
   });
 
@@ -140,7 +140,7 @@ describe('language-switch', () => {
         url: '',
       };
       config.en!.header.navLang = [navLangEntry];
-      prepare('Internet Header/Header', 'Default', { config });
+      prepare('Components/Internet Header/Header', 'Default', { config });
       cy.get('#post-language-switch-desktop').should('not.exist');
     });
 
diff --git a/packages/internet-header/cypress/e2e/login.cy.ts b/packages/internet-header/cypress/e2e/login.cy.ts
index 1187c78354..2d73ae040e 100644
--- a/packages/internet-header/cypress/e2e/login.cy.ts
+++ b/packages/internet-header/cypress/e2e/login.cy.ts
@@ -6,7 +6,7 @@ describe('login', () => {
   describe('args', () => {
     describe('login: true', () => {
       it(`adds login control`, () => {
-        prepare('Internet Header/Header', 'Default');
+        prepare('Components/Internet Header/Header', 'Default');
         cy.changeArg('login', true);
         cy.get('post-klp-login-widget').should('exist').and('be.visible');
       });
@@ -14,7 +14,7 @@ describe('login', () => {
 
     describe('login: false', () => {
       it(`removes login control`, () => {
-        prepare('Internet Header/Header', 'Default');
+        prepare('Components/Internet Header/Header', 'Default');
         cy.changeArg('login', false);
         cy.get('post-klp-login-widget').should('not.exist');
       });
@@ -31,7 +31,7 @@ describe('login', () => {
         config.de!.header.loginWidgetOptions = undefined;
 
         // Intercept the request to the config API and return a static response
-        prepare('Internet Header/Header', 'Default', { config });
+        prepare('Components/Internet Header/Header', 'Default', { config });
         cy.changeArg('language', 'de');
 
         // Assert the header is hydrated
@@ -49,7 +49,7 @@ describe('login', () => {
         let config: IPortalConfig = JSON.parse(JSON.stringify(testConfiguration));
         config.de!.header.showJobsLoginWidget = true;
         config.de!.header.isLoginWidgetHidden = false;
-        prepare('Internet Header/Header', 'Default', { config });
+        prepare('Components/Internet Header/Header', 'Default', { config });
         cy.changeArg('language', 'de');
         console.warn(config.de?.header.loginWidgetOptions);
         cy.get('swisspost-internet-header').should('have.class', 'hydrated');
@@ -63,7 +63,7 @@ describe('login', () => {
         let config: IPortalConfig = JSON.parse(JSON.stringify(testConfiguration));
         config.de!.header.showJobsLoginWidget = false;
         config.de!.header.isLoginWidgetHidden = false;
-        prepare('Internet Header/Header', 'Default', { config });
+        prepare('Components/Internet Header/Header', 'Default', { config });
         cy.changeArg('language', 'de');
         cy.get('swisspost-internet-header').should('have.class', 'hydrated');
         cy.get('.klp-widget-anonymous').should('exist');
diff --git a/packages/internet-header/cypress/e2e/logout.cy.ts b/packages/internet-header/cypress/e2e/logout.cy.ts
index 2e6d324903..15c36524a2 100644
--- a/packages/internet-header/cypress/e2e/logout.cy.ts
+++ b/packages/internet-header/cypress/e2e/logout.cy.ts
@@ -4,7 +4,7 @@ describe('logout', () => {
   describe('args', () => {
     describe('logoutUrl', () => {
       it('logout with url from config', () => {
-        prepare('Internet Header/Header', 'Default', { loggedIn: true });
+        prepare('Components/Internet Header/Header', 'Default', { loggedIn: true });
         logoutFromMenu();
 
         const origin = 'https://www.post.ch';
@@ -15,7 +15,7 @@ describe('logout', () => {
       });
 
       it(`overrides logout url from config`, () => {
-        prepare('Internet Header/Header', 'Default', { loggedIn: true });
+        prepare('Components/Internet Header/Header', 'Default', { loggedIn: true });
         cy.changeArg('logoutUrl', 'about:blank');
         logoutFromMenu();
         cy.location('pathname').should('eq', 'blank');
diff --git a/packages/internet-header/cypress/e2e/main-navigation.cy.ts b/packages/internet-header/cypress/e2e/main-navigation.cy.ts
index 15f31e0ff3..38e35d076b 100644
--- a/packages/internet-header/cypress/e2e/main-navigation.cy.ts
+++ b/packages/internet-header/cypress/e2e/main-navigation.cy.ts
@@ -3,7 +3,7 @@ import { prepare } from '../support/prepare-story';
 
 describe('main-navigation', () => {
   beforeEach(() => {
-    prepare('Internet Header/Header', 'Default');
+    prepare('Components/Internet Header/Header', 'Default');
     cy.changeArg('language', 'de');
   });
 
@@ -28,7 +28,7 @@ describe('main-navigation', () => {
   it('should have an active route when config defines an active route', () => {
     const activeConfig = JSON.parse(JSON.stringify(testConfiguration));
     activeConfig.de.header.navMain[0].isActive = true;
-    prepare('Internet Header/Header', 'Default', { config: activeConfig });
+    prepare('Components/Internet Header/Header', 'Default', { config: activeConfig });
     cy.changeArg('language', 'de');
     cy.get('swisspost-internet-header')
       .shadow()
@@ -48,7 +48,7 @@ describe('main-navigation', () => {
   });
 
   it('Changes active link also in custom config nav links', () => {
-    prepare('Internet Header/Header/Custom Config', 'Default');
+    prepare('Components/Internet Header/Header/Custom Config', 'Default');
     cy.changeArg('language', 'en');
     cy.changeArg('active-route', 'https://maps.google.com');
     cy.get('swisspost-internet-header')
diff --git a/packages/internet-header/cypress/e2e/meta-navigation.cy.ts b/packages/internet-header/cypress/e2e/meta-navigation.cy.ts
index 8eef0aa451..d02dbc408e 100644
--- a/packages/internet-header/cypress/e2e/meta-navigation.cy.ts
+++ b/packages/internet-header/cypress/e2e/meta-navigation.cy.ts
@@ -4,7 +4,7 @@ import { prepare } from '../support/prepare-story';
 
 describe('meta-navigation', () => {
   beforeEach(() => {
-    prepare('Internet Header/Header', 'Default');
+    prepare('Components/Internet Header/Header', 'Default');
     cy.changeArg('language', 'de');
     cy.viewport(1024, Cypress.config('viewportHeight'));
   });
@@ -96,7 +96,7 @@ describe('meta-navigation', () => {
         // Clear meta navigation config
         config.de!.header.navMeta = undefined;
 
-        prepare('Internet Header/Header', 'Default', { config });
+        prepare('Components/Internet Header/Header', 'Default', { config });
         cy.changeArg('language', 'de');
 
         // Assert the header is hydrated
@@ -122,7 +122,7 @@ describe('meta-navigation', () => {
           },
         ];
 
-        prepare('Internet Header/Header', 'Default', { config });
+        prepare('Components/Internet Header/Header', 'Default', { config });
         cy.changeArg('language', 'de');
 
         // Assert the header is hydrated
diff --git a/packages/internet-header/cypress/e2e/os-flyout.cy.ts b/packages/internet-header/cypress/e2e/os-flyout.cy.ts
index 097d30ada6..e9c0a3c326 100644
--- a/packages/internet-header/cypress/e2e/os-flyout.cy.ts
+++ b/packages/internet-header/cypress/e2e/os-flyout.cy.ts
@@ -2,7 +2,7 @@ import { prepare } from '../support/prepare-story';
 
 describe('os-flyout', () => {
   beforeEach(() => {
-    prepare('Internet Header/Header', 'Default');
+    prepare('Components/Internet Header/Header', 'Default');
   });
   it('should customize the os flyout title', () => {
     const title = 'Test OS Flyout';
diff --git a/packages/internet-header/cypress/e2e/search.cy.ts b/packages/internet-header/cypress/e2e/search.cy.ts
index d345f0575a..3dc0e8355e 100644
--- a/packages/internet-header/cypress/e2e/search.cy.ts
+++ b/packages/internet-header/cypress/e2e/search.cy.ts
@@ -18,7 +18,7 @@ describe('search', () => {
       'StaoCacheTypes',
     );
 
-    prepare('Internet Header/Header', 'Default');
+    prepare('Components/Internet Header/Header', 'Default');
     cy.changeArg('language', 'de');
   });
 
@@ -75,7 +75,7 @@ describe('search', () => {
       it('Coveo suggestions should be turned off with isCustomSuggestionHidden', () => {
         const config = copyConfig();
         config.de!.header.search.isCustomSuggestionHidden = true;
-        prepare('Internet Header/Header', 'Default', { config });
+        prepare('Components/Internet Header/Header', 'Default', { config });
         cy.changeArg('language', 'de');
         cy.get(searchButton).click();
         cy.get('#searchBox').type('s', { force: true });
diff --git a/packages/internet-header/cypress/e2e/skiplinks.cy.ts b/packages/internet-header/cypress/e2e/skiplinks.cy.ts
index b9292e67d9..891d2aa76f 100644
--- a/packages/internet-header/cypress/e2e/skiplinks.cy.ts
+++ b/packages/internet-header/cypress/e2e/skiplinks.cy.ts
@@ -2,7 +2,7 @@ import { prepare } from '../support/prepare-story';
 
 describe('skiplinks', () => {
   beforeEach(() => {
-    prepare('Internet Header/Header', 'Default');
+    prepare('Components/Internet Header/Header', 'Default');
     cy.changeArg('language', 'de');
   });
 
diff --git a/packages/internet-header/cypress/e2e/stickyness.cy.ts b/packages/internet-header/cypress/e2e/stickyness.cy.ts
index 37187ce37b..3801015178 100644
--- a/packages/internet-header/cypress/e2e/stickyness.cy.ts
+++ b/packages/internet-header/cypress/e2e/stickyness.cy.ts
@@ -2,7 +2,7 @@ import { prepare } from '../support/prepare-story';
 
 describe('stickyness', () => {
   beforeEach(() => {
-    prepare('Internet Header/Header', 'Default');
+    prepare('Components/Internet Header/Header', 'Default');
   });
 
   it('should not show header when scrolling when stickyness is none', () => {