diff --git a/package-lock.json b/package-lock.json
index 713050317..e9fd48166 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,7 +11,7 @@
             "dependencies": {
                 "@11ty/eleventy-fetch": "^4.0.0",
                 "@kevingimbel/eleventy-plugin-mermaid": "^2.1.0",
-                "@sbb-esta/lyne-components": "0.42.0",
+                "@sbb-esta/lyne-components": "0.42.6",
                 "copyfiles": "^2.4.1",
                 "eleventy-plugin-i18n": "^0.1.3",
                 "eleventy-sass": "^2.2.1",
@@ -205,9 +205,9 @@
             }
         },
         "node_modules/@babel/parser": {
-            "version": "7.23.0",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz",
-            "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==",
+            "version": "7.23.3",
+            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.3.tgz",
+            "integrity": "sha512-uVsWNvlVsIninV2prNz/3lHCb+5CJ+e+IUBfbjToAHODtfGYLfCFuY4AU7TskI+dAKk+njsPiBjq1gKTvZOBaw==",
             "bin": {
                 "parser": "bin/babel-parser.js"
             },
@@ -216,9 +216,9 @@
             }
         },
         "node_modules/@babel/types": {
-            "version": "7.23.0",
-            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz",
-            "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==",
+            "version": "7.23.3",
+            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.3.tgz",
+            "integrity": "sha512-OZnvoH2l8PK5eUvEcUyCt/sXgr/h+UWpVuBbOljwcrAgUl6lpchoQ++PHGyQy1AtYnVA6CEq3y5xeEI10brpXw==",
             "dependencies": {
                 "@babel/helper-string-parser": "^7.22.5",
                 "@babel/helper-validator-identifier": "^7.22.20",
@@ -274,9 +274,9 @@
             }
         },
         "node_modules/@sbb-esta/lyne-components": {
-            "version": "0.42.0",
-            "resolved": "https://registry.npmjs.org/@sbb-esta/lyne-components/-/lyne-components-0.42.0.tgz",
-            "integrity": "sha512-g2y5LnHh45bWODsG8yaH1AkpO4i7vgyogwy13dAaWZ5lMxBODYHLW6JvQb87TMswJ1KPOTZel9mCj5qZtVDImg=="
+            "version": "0.42.6",
+            "resolved": "https://registry.npmjs.org/@sbb-esta/lyne-components/-/lyne-components-0.42.6.tgz",
+            "integrity": "sha512-Fxqv+y6pbQftvc8hKxgz7pOaJMtAsK7cC0BBahR/bIfwgH0rP2xj7mWffhGeCMm0GFH/CLwM5S1E9NebEX+C2g=="
         },
         "node_modules/@sbb-esta/lyne-design-tokens": {
             "version": "0.3.7",
@@ -456,9 +456,9 @@
             "integrity": "sha512-TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw=="
         },
         "node_modules/async": {
-            "version": "3.2.4",
-            "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz",
-            "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ=="
+            "version": "3.2.5",
+            "resolved": "https://registry.npmjs.org/async/-/async-3.2.5.tgz",
+            "integrity": "sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg=="
         },
         "node_modules/babel-walk": {
             "version": "3.0.0-canary-5",
@@ -1003,9 +1003,9 @@
             }
         },
         "node_modules/fast-glob": {
-            "version": "3.3.1",
-            "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz",
-            "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==",
+            "version": "3.3.2",
+            "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
+            "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
             "dependencies": {
                 "@nodelib/fs.stat": "^2.0.2",
                 "@nodelib/fs.walk": "^1.2.3",
@@ -1094,16 +1094,16 @@
             "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
         },
         "node_modules/flat-cache": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.1.1.tgz",
-            "integrity": "sha512-/qM2b3LUIaIgviBQovTLvijfyOQXPtSRnRK26ksj2J7rzPIecePUIpJsZ4T02Qg+xiAEKIs5K8dsHEd+VaKa/Q==",
+            "version": "3.2.0",
+            "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",
+            "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==",
             "dependencies": {
                 "flatted": "^3.2.9",
                 "keyv": "^4.5.3",
                 "rimraf": "^3.0.2"
             },
             "engines": {
-                "node": ">=12.0.0"
+                "node": "^10.12.0 || >=12.0.0"
             }
         },
         "node_modules/flatted": {
@@ -1647,9 +1647,9 @@
             }
         },
         "node_modules/liquidjs": {
-            "version": "10.9.3",
-            "resolved": "https://registry.npmjs.org/liquidjs/-/liquidjs-10.9.3.tgz",
-            "integrity": "sha512-vG8fLPSBtf0C6FJg0DwzxwWF0sPE+wIRrrGsNoe0DP3Pg4HOPqycGDT14V4UfyskUXsum7DkhUuZQ9tBRjbX+g==",
+            "version": "10.9.4",
+            "resolved": "https://registry.npmjs.org/liquidjs/-/liquidjs-10.9.4.tgz",
+            "integrity": "sha512-E7SmGMwhv0Pa1Yau6odd2EgNPAmrx1OOjzvpm9AFxBGVtCX2Bx4fOCDtDCML13L7g6zjLPN7Kb/kakyAl2HTPQ==",
             "dependencies": {
                 "commander": "^10.0.0"
             },
@@ -1717,9 +1717,9 @@
             }
         },
         "node_modules/luxon": {
-            "version": "3.4.3",
-            "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.3.tgz",
-            "integrity": "sha512-tFWBiv3h7z+T/tDaoxA8rqTxy1CHV6gHS//QdaH4pulbq/JuBSGgQspQQqcgnwdAx6pNI7cmvz5Sv/addzHmUg==",
+            "version": "3.4.4",
+            "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.4.tgz",
+            "integrity": "sha512-zobTr7akeGHnv7eBOXcRgMeCP6+uyYsczwmeRCauvpvaAltgNyTbLH/+VaEAPUeWBT+1GuNmz4wC/6jtQzbbVA==",
             "engines": {
                 "node": ">=12"
             }
diff --git a/package.json b/package.json
index cbb759e35..2615912fb 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "dependencies": {
         "@11ty/eleventy-fetch": "^4.0.0",
         "@kevingimbel/eleventy-plugin-mermaid": "^2.1.0",
-        "@sbb-esta/lyne-components": "0.42.0",
+        "@sbb-esta/lyne-components": "0.42.6",
         "copyfiles": "^2.4.1",
         "eleventy-plugin-i18n": "^0.1.3",
         "eleventy-sass": "^2.2.1",
diff --git a/src/de/design-system/lyne/components/sbb-accordion/implementation/implementation.11tydata.js b/src/de/design-system/lyne/components/sbb-accordion/implementation/implementation.11tydata.js
index 961b8465b..38d1cfaca 100644
--- a/src/de/design-system/lyne/components/sbb-accordion/implementation/implementation.11tydata.js
+++ b/src/de/design-system/lyne/components/sbb-accordion/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-accordion/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/accordion/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/de/design-system/lyne/components/sbb-action-group/implementation/implementation.11tydata.js b/src/de/design-system/lyne/components/sbb-action-group/implementation/implementation.11tydata.js
index 0658becff..36b01122c 100644
--- a/src/de/design-system/lyne/components/sbb-action-group/implementation/implementation.11tydata.js
+++ b/src/de/design-system/lyne/components/sbb-action-group/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-action-group/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/action-group/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/de/design-system/lyne/components/sbb-alert-group/implementation/implementation.11tydata.js b/src/de/design-system/lyne/components/sbb-alert-group/implementation/implementation.11tydata.js
index ceef88745..9b2cba7c4 100644
--- a/src/de/design-system/lyne/components/sbb-alert-group/implementation/implementation.11tydata.js
+++ b/src/de/design-system/lyne/components/sbb-alert-group/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-alert-group/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/alert/alert-group/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/de/design-system/lyne/components/sbb-alert/implementation/implementation.11tydata.js b/src/de/design-system/lyne/components/sbb-alert/implementation/implementation.11tydata.js
index a7ae12bdd..b719b4d97 100644
--- a/src/de/design-system/lyne/components/sbb-alert/implementation/implementation.11tydata.js
+++ b/src/de/design-system/lyne/components/sbb-alert/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-alert/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/alert/alert/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/de/design-system/lyne/components/sbb-autocomplete/implementation/implementation.11tydata.js b/src/de/design-system/lyne/components/sbb-autocomplete/implementation/implementation.11tydata.js
index 7302b4004..d35ad45a3 100644
--- a/src/de/design-system/lyne/components/sbb-autocomplete/implementation/implementation.11tydata.js
+++ b/src/de/design-system/lyne/components/sbb-autocomplete/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-autocomplete/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/autocomplete/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/de/design-system/lyne/components/sbb-button/implementation/implementation.11tydata.js b/src/de/design-system/lyne/components/sbb-button/implementation/implementation.11tydata.js
index fc9fdf7d2..3b4da72d3 100644
--- a/src/de/design-system/lyne/components/sbb-button/implementation/implementation.11tydata.js
+++ b/src/de/design-system/lyne/components/sbb-button/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-button/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/button/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/de/design-system/lyne/components/sbb-calendar/implementation/implementation.11tydata.js b/src/de/design-system/lyne/components/sbb-calendar/implementation/implementation.11tydata.js
index 38fb676f7..f5fa8b539 100644
--- a/src/de/design-system/lyne/components/sbb-calendar/implementation/implementation.11tydata.js
+++ b/src/de/design-system/lyne/components/sbb-calendar/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-calendar/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/calendar/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/de/design-system/lyne/components/sbb-card-badge/implementation/implementation.11tydata.js b/src/de/design-system/lyne/components/sbb-card-badge/implementation/implementation.11tydata.js
index 3ccc9648b..d499e6dd7 100644
--- a/src/de/design-system/lyne/components/sbb-card-badge/implementation/implementation.11tydata.js
+++ b/src/de/design-system/lyne/components/sbb-card-badge/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-card-badge/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/card/card-badge/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/de/design-system/lyne/components/sbb-card/implementation/implementation.11tydata.js b/src/de/design-system/lyne/components/sbb-card/implementation/implementation.11tydata.js
index 328203f80..6301eefdd 100644
--- a/src/de/design-system/lyne/components/sbb-card/implementation/implementation.11tydata.js
+++ b/src/de/design-system/lyne/components/sbb-card/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-card/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/card/card/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/de/design-system/lyne/components/sbb-checkbox-group/implementation/implementation.11tydata.js b/src/de/design-system/lyne/components/sbb-checkbox-group/implementation/implementation.11tydata.js
index b9b778550..aad0ebca9 100644
--- a/src/de/design-system/lyne/components/sbb-checkbox-group/implementation/implementation.11tydata.js
+++ b/src/de/design-system/lyne/components/sbb-checkbox-group/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-checkbox-group/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/checkbox/checkbox-group/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/de/design-system/lyne/components/sbb-checkbox/implementation/implementation.11tydata.js b/src/de/design-system/lyne/components/sbb-checkbox/implementation/implementation.11tydata.js
index 58b904311..153b8057c 100644
--- a/src/de/design-system/lyne/components/sbb-checkbox/implementation/implementation.11tydata.js
+++ b/src/de/design-system/lyne/components/sbb-checkbox/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-checkbox/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/checkbox/checkbox/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/de/design-system/lyne/components/sbb-chip/implementation/implementation.11tydata.js b/src/de/design-system/lyne/components/sbb-chip/implementation/implementation.11tydata.js
index 3ea6587c7..fa4f6ae88 100644
--- a/src/de/design-system/lyne/components/sbb-chip/implementation/implementation.11tydata.js
+++ b/src/de/design-system/lyne/components/sbb-chip/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-chip/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/chip/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/de/design-system/lyne/components/sbb-clock/implementation/implementation.11tydata.js b/src/de/design-system/lyne/components/sbb-clock/implementation/implementation.11tydata.js
index 24d0716a6..1e270e97f 100644
--- a/src/de/design-system/lyne/components/sbb-clock/implementation/implementation.11tydata.js
+++ b/src/de/design-system/lyne/components/sbb-clock/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-clock/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/clock/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/de/design-system/lyne/components/sbb-datepicker-next-day/implementation/implementation.11tydata.js b/src/de/design-system/lyne/components/sbb-datepicker-next-day/implementation/implementation.11tydata.js
index 3a872c436..d171afefa 100644
--- a/src/de/design-system/lyne/components/sbb-datepicker-next-day/implementation/implementation.11tydata.js
+++ b/src/de/design-system/lyne/components/sbb-datepicker-next-day/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-datepicker-next-day/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/datepicker/datepicker-next-day/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/de/design-system/lyne/components/sbb-datepicker-previous-day/implementation/implementation.11tydata.js b/src/de/design-system/lyne/components/sbb-datepicker-previous-day/implementation/implementation.11tydata.js
index d3f50d2a1..9c742feab 100644
--- a/src/de/design-system/lyne/components/sbb-datepicker-previous-day/implementation/implementation.11tydata.js
+++ b/src/de/design-system/lyne/components/sbb-datepicker-previous-day/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-datepicker-previous-day/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/datepicker/datepicker-previous-day/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/de/design-system/lyne/components/sbb-datepicker-toggle/implementation/implementation.11tydata.js b/src/de/design-system/lyne/components/sbb-datepicker-toggle/implementation/implementation.11tydata.js
index 4cd409836..90ee34109 100644
--- a/src/de/design-system/lyne/components/sbb-datepicker-toggle/implementation/implementation.11tydata.js
+++ b/src/de/design-system/lyne/components/sbb-datepicker-toggle/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-datepicker-toggle/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/datepicker/datepicker-toggle/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/de/design-system/lyne/components/sbb-datepicker/implementation/implementation.11tydata.js b/src/de/design-system/lyne/components/sbb-datepicker/implementation/implementation.11tydata.js
index 7b31c1a87..aa40fe846 100644
--- a/src/de/design-system/lyne/components/sbb-datepicker/implementation/implementation.11tydata.js
+++ b/src/de/design-system/lyne/components/sbb-datepicker/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-datepicker/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/datepicker/datepicker/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/de/design-system/lyne/components/sbb-dialog/implementation/implementation.11tydata.js b/src/de/design-system/lyne/components/sbb-dialog/implementation/implementation.11tydata.js
index 5a0b6ea75..3a60553be 100644
--- a/src/de/design-system/lyne/components/sbb-dialog/implementation/implementation.11tydata.js
+++ b/src/de/design-system/lyne/components/sbb-dialog/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-dialog/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/dialog/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/de/design-system/lyne/components/sbb-divider/implementation/implementation.11tydata.js b/src/de/design-system/lyne/components/sbb-divider/implementation/implementation.11tydata.js
index a37e67061..488071f36 100644
--- a/src/de/design-system/lyne/components/sbb-divider/implementation/implementation.11tydata.js
+++ b/src/de/design-system/lyne/components/sbb-divider/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-divider/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/divider/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/de/design-system/lyne/components/sbb-expansion-panel/implementation/implementation.11tydata.js b/src/de/design-system/lyne/components/sbb-expansion-panel/implementation/implementation.11tydata.js
index 241d833b1..f444f641b 100644
--- a/src/de/design-system/lyne/components/sbb-expansion-panel/implementation/implementation.11tydata.js
+++ b/src/de/design-system/lyne/components/sbb-expansion-panel/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-expansion-panel/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/expansion-panel/expansion-panel/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/de/design-system/lyne/components/sbb-footer/implementation/implementation.11tydata.js b/src/de/design-system/lyne/components/sbb-footer/implementation/implementation.11tydata.js
index 72bb7fff2..9a0382b38 100644
--- a/src/de/design-system/lyne/components/sbb-footer/implementation/implementation.11tydata.js
+++ b/src/de/design-system/lyne/components/sbb-footer/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-footer/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/footer/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/de/design-system/lyne/components/sbb-form-error/implementation/implementation.11tydata.js b/src/de/design-system/lyne/components/sbb-form-error/implementation/implementation.11tydata.js
index 622a41a5f..8c03de96f 100644
--- a/src/de/design-system/lyne/components/sbb-form-error/implementation/implementation.11tydata.js
+++ b/src/de/design-system/lyne/components/sbb-form-error/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-form-error/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/form-error/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/de/design-system/lyne/components/sbb-form-field/implementation/implementation.11tydata.js b/src/de/design-system/lyne/components/sbb-form-field/implementation/implementation.11tydata.js
index de1b63cba..3281dea95 100644
--- a/src/de/design-system/lyne/components/sbb-form-field/implementation/implementation.11tydata.js
+++ b/src/de/design-system/lyne/components/sbb-form-field/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-form-field/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/form-field/form-field/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/de/design-system/lyne/components/sbb-header-action/implementation/implementation.11tydata.js b/src/de/design-system/lyne/components/sbb-header-action/implementation/implementation.11tydata.js
index 36418cbdd..d3e50f3bd 100644
--- a/src/de/design-system/lyne/components/sbb-header-action/implementation/implementation.11tydata.js
+++ b/src/de/design-system/lyne/components/sbb-header-action/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-header-action/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/header/header-action/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/de/design-system/lyne/components/sbb-header/implementation/implementation.11tydata.js b/src/de/design-system/lyne/components/sbb-header/implementation/implementation.11tydata.js
index 92895a664..913a30901 100644
--- a/src/de/design-system/lyne/components/sbb-header/implementation/implementation.11tydata.js
+++ b/src/de/design-system/lyne/components/sbb-header/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-header/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/header/header/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/de/design-system/lyne/components/sbb-icon/implementation/implementation.11tydata.js b/src/de/design-system/lyne/components/sbb-icon/implementation/implementation.11tydata.js
index 84e025d22..ac7edf39b 100644
--- a/src/de/design-system/lyne/components/sbb-icon/implementation/implementation.11tydata.js
+++ b/src/de/design-system/lyne/components/sbb-icon/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-icon/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/icon/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/de/design-system/lyne/components/sbb-image/implementation/implementation.11tydata.js b/src/de/design-system/lyne/components/sbb-image/implementation/implementation.11tydata.js
index eb3a967b7..b8911fd95 100644
--- a/src/de/design-system/lyne/components/sbb-image/implementation/implementation.11tydata.js
+++ b/src/de/design-system/lyne/components/sbb-image/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-image/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/image/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/de/design-system/lyne/components/sbb-journey-header/implementation/implementation.11tydata.js b/src/de/design-system/lyne/components/sbb-journey-header/implementation/implementation.11tydata.js
index db8d53f78..5b229040f 100644
--- a/src/de/design-system/lyne/components/sbb-journey-header/implementation/implementation.11tydata.js
+++ b/src/de/design-system/lyne/components/sbb-journey-header/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-journey-header/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/journey-header/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/de/design-system/lyne/components/sbb-link-list/implementation/implementation.11tydata.js b/src/de/design-system/lyne/components/sbb-link-list/implementation/implementation.11tydata.js
index 64bf67bd6..4aef0f148 100644
--- a/src/de/design-system/lyne/components/sbb-link-list/implementation/implementation.11tydata.js
+++ b/src/de/design-system/lyne/components/sbb-link-list/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-link-list/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/link-list/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/de/design-system/lyne/components/sbb-link/implementation/implementation.11tydata.js b/src/de/design-system/lyne/components/sbb-link/implementation/implementation.11tydata.js
index c510cfcf2..0b3deabd6 100644
--- a/src/de/design-system/lyne/components/sbb-link/implementation/implementation.11tydata.js
+++ b/src/de/design-system/lyne/components/sbb-link/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-link/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/link/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/de/design-system/lyne/components/sbb-logo/implementation/implementation.11tydata.js b/src/de/design-system/lyne/components/sbb-logo/implementation/implementation.11tydata.js
index c43a16f57..895349efc 100644
--- a/src/de/design-system/lyne/components/sbb-logo/implementation/implementation.11tydata.js
+++ b/src/de/design-system/lyne/components/sbb-logo/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-logo/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/logo/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/de/design-system/lyne/components/sbb-menu-action/implementation/implementation.11tydata.js b/src/de/design-system/lyne/components/sbb-menu-action/implementation/implementation.11tydata.js
index b2339d318..90379d8b7 100644
--- a/src/de/design-system/lyne/components/sbb-menu-action/implementation/implementation.11tydata.js
+++ b/src/de/design-system/lyne/components/sbb-menu-action/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-menu-action/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/menu/menu-action/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/de/design-system/lyne/components/sbb-menu/implementation/implementation.11tydata.js b/src/de/design-system/lyne/components/sbb-menu/implementation/implementation.11tydata.js
index 8f3f4df95..0a9897e51 100644
--- a/src/de/design-system/lyne/components/sbb-menu/implementation/implementation.11tydata.js
+++ b/src/de/design-system/lyne/components/sbb-menu/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-menu/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/menu/menu/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/de/design-system/lyne/components/sbb-optgroup/implementation/implementation.11tydata.js b/src/de/design-system/lyne/components/sbb-optgroup/implementation/implementation.11tydata.js
index 8c07bc77e..efc1d4be1 100644
--- a/src/de/design-system/lyne/components/sbb-optgroup/implementation/implementation.11tydata.js
+++ b/src/de/design-system/lyne/components/sbb-optgroup/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-optgroup/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/option/optgroup/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/de/design-system/lyne/components/sbb-option/implementation/implementation.11tydata.js b/src/de/design-system/lyne/components/sbb-option/implementation/implementation.11tydata.js
index c3f63a30f..fac660b9a 100644
--- a/src/de/design-system/lyne/components/sbb-option/implementation/implementation.11tydata.js
+++ b/src/de/design-system/lyne/components/sbb-option/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-option/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/option/option/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/de/design-system/lyne/components/sbb-radiobutton-group/implementation/implementation.11tydata.js b/src/de/design-system/lyne/components/sbb-radiobutton-group/implementation/implementation.11tydata.js
index 34f52a1e4..7b035fb9a 100644
--- a/src/de/design-system/lyne/components/sbb-radiobutton-group/implementation/implementation.11tydata.js
+++ b/src/de/design-system/lyne/components/sbb-radiobutton-group/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-radio-button-group/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/radio-button/radio-button-group/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/de/design-system/lyne/components/sbb-radiobutton/implementation/implementation.11tydata.js b/src/de/design-system/lyne/components/sbb-radiobutton/implementation/implementation.11tydata.js
index 563b06c39..9bfb0afe5 100644
--- a/src/de/design-system/lyne/components/sbb-radiobutton/implementation/implementation.11tydata.js
+++ b/src/de/design-system/lyne/components/sbb-radiobutton/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-radio-button/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/radio-button/radio-button/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/de/design-system/lyne/components/sbb-selection-panel/implementation/implementation.11tydata.js b/src/de/design-system/lyne/components/sbb-selection-panel/implementation/implementation.11tydata.js
index 88b9d5753..4286d41b8 100644
--- a/src/de/design-system/lyne/components/sbb-selection-panel/implementation/implementation.11tydata.js
+++ b/src/de/design-system/lyne/components/sbb-selection-panel/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-selection-panel/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/selection-panel/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/de/design-system/lyne/components/sbb-signet/implementation/implementation.11tydata.js b/src/de/design-system/lyne/components/sbb-signet/implementation/implementation.11tydata.js
index c403df77a..b99ff4d6e 100644
--- a/src/de/design-system/lyne/components/sbb-signet/implementation/implementation.11tydata.js
+++ b/src/de/design-system/lyne/components/sbb-signet/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-signet/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/signet/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/de/design-system/lyne/components/sbb-slider/implementation/implementation.11tydata.js b/src/de/design-system/lyne/components/sbb-slider/implementation/implementation.11tydata.js
index 71348064e..7edd34501 100644
--- a/src/de/design-system/lyne/components/sbb-slider/implementation/implementation.11tydata.js
+++ b/src/de/design-system/lyne/components/sbb-slider/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-slider/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/slider/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/de/design-system/lyne/components/sbb-tab-group/implementation/implementation.11tydata.js b/src/de/design-system/lyne/components/sbb-tab-group/implementation/implementation.11tydata.js
index 155415eb0..24a9f56d7 100644
--- a/src/de/design-system/lyne/components/sbb-tab-group/implementation/implementation.11tydata.js
+++ b/src/de/design-system/lyne/components/sbb-tab-group/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-tab-group/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/tabs/tab-group/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/de/design-system/lyne/components/sbb-tab-title/implementation/implementation.11tydata.js b/src/de/design-system/lyne/components/sbb-tab-title/implementation/implementation.11tydata.js
index a1abd9718..29e45953d 100644
--- a/src/de/design-system/lyne/components/sbb-tab-title/implementation/implementation.11tydata.js
+++ b/src/de/design-system/lyne/components/sbb-tab-title/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-tab-title/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/tabs/tab-title/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/de/design-system/lyne/components/sbb-tag-group/implementation/implementation.11tydata.js b/src/de/design-system/lyne/components/sbb-tag-group/implementation/implementation.11tydata.js
index c2d8fdff7..a03e5b551 100644
--- a/src/de/design-system/lyne/components/sbb-tag-group/implementation/implementation.11tydata.js
+++ b/src/de/design-system/lyne/components/sbb-tag-group/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-tag-group/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/tag/tag-group/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/de/design-system/lyne/components/sbb-tag/implementation/implementation.11tydata.js b/src/de/design-system/lyne/components/sbb-tag/implementation/implementation.11tydata.js
index 9ef155ece..6b7e6390b 100644
--- a/src/de/design-system/lyne/components/sbb-tag/implementation/implementation.11tydata.js
+++ b/src/de/design-system/lyne/components/sbb-tag/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-tag/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/tag/tag/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/de/design-system/lyne/components/sbb-teaser-hero/implementation/implementation.11tydata.js b/src/de/design-system/lyne/components/sbb-teaser-hero/implementation/implementation.11tydata.js
index 6006d7bb2..29f8ba870 100644
--- a/src/de/design-system/lyne/components/sbb-teaser-hero/implementation/implementation.11tydata.js
+++ b/src/de/design-system/lyne/components/sbb-teaser-hero/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-teaser-hero/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/teaser-hero/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/de/design-system/lyne/components/sbb-teaser/implementation/implementation.11tydata.js b/src/de/design-system/lyne/components/sbb-teaser/implementation/implementation.11tydata.js
index 027082249..3d82518c4 100644
--- a/src/de/design-system/lyne/components/sbb-teaser/implementation/implementation.11tydata.js
+++ b/src/de/design-system/lyne/components/sbb-teaser/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-teaser/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/teaser/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/de/design-system/lyne/components/sbb-time-input/implementation/implementation.11tydata.js b/src/de/design-system/lyne/components/sbb-time-input/implementation/implementation.11tydata.js
index 534d7a8f1..f49183d62 100644
--- a/src/de/design-system/lyne/components/sbb-time-input/implementation/implementation.11tydata.js
+++ b/src/de/design-system/lyne/components/sbb-time-input/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-time-input/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/time-input/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/de/design-system/lyne/components/sbb-title/implementation/implementation.11tydata.js b/src/de/design-system/lyne/components/sbb-title/implementation/implementation.11tydata.js
index 40e2e36ce..162ce2490 100644
--- a/src/de/design-system/lyne/components/sbb-title/implementation/implementation.11tydata.js
+++ b/src/de/design-system/lyne/components/sbb-title/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-title/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/title/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/de/design-system/lyne/components/sbb-toggle-check/implementation/implementation.11tydata.js b/src/de/design-system/lyne/components/sbb-toggle-check/implementation/implementation.11tydata.js
index 56a942e64..49e9460ae 100644
--- a/src/de/design-system/lyne/components/sbb-toggle-check/implementation/implementation.11tydata.js
+++ b/src/de/design-system/lyne/components/sbb-toggle-check/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-toggle-check/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/toggle-check/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/de/design-system/lyne/components/sbb-toggle-option/implementation/implementation.11tydata.js b/src/de/design-system/lyne/components/sbb-toggle-option/implementation/implementation.11tydata.js
index 5201d7741..c0bab820a 100644
--- a/src/de/design-system/lyne/components/sbb-toggle-option/implementation/implementation.11tydata.js
+++ b/src/de/design-system/lyne/components/sbb-toggle-option/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-toggle-option/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/toggle/toggle-option/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/de/design-system/lyne/components/sbb-toggle/implementation/implementation.11tydata.js b/src/de/design-system/lyne/components/sbb-toggle/implementation/implementation.11tydata.js
index db7614f84..045c03b7a 100644
--- a/src/de/design-system/lyne/components/sbb-toggle/implementation/implementation.11tydata.js
+++ b/src/de/design-system/lyne/components/sbb-toggle/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-toggle/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/toggle/toggle/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/de/design-system/lyne/components/sbb-tooltip-trigger/implementation/implementation.11tydata.js b/src/de/design-system/lyne/components/sbb-tooltip-trigger/implementation/implementation.11tydata.js
index 45377874f..eea53b116 100644
--- a/src/de/design-system/lyne/components/sbb-tooltip-trigger/implementation/implementation.11tydata.js
+++ b/src/de/design-system/lyne/components/sbb-tooltip-trigger/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-tooltip-trigger/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/tooltip/tooltip-trigger/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/de/design-system/lyne/components/sbb-tooltip/implementation/implementation.11tydata.js b/src/de/design-system/lyne/components/sbb-tooltip/implementation/implementation.11tydata.js
index 9f3bc7f28..d3f9374d8 100644
--- a/src/de/design-system/lyne/components/sbb-tooltip/implementation/implementation.11tydata.js
+++ b/src/de/design-system/lyne/components/sbb-tooltip/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-tooltip/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/tooltip/tooltip/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/en/design-system/lyne/components/sbb-action-group/implementation/implementation.11tydata.js b/src/en/design-system/lyne/components/sbb-action-group/implementation/implementation.11tydata.js
index 0658becff..36b01122c 100644
--- a/src/en/design-system/lyne/components/sbb-action-group/implementation/implementation.11tydata.js
+++ b/src/en/design-system/lyne/components/sbb-action-group/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-action-group/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/action-group/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/en/design-system/lyne/components/sbb-alert-group/implementation/implementation.11tydata.js b/src/en/design-system/lyne/components/sbb-alert-group/implementation/implementation.11tydata.js
index ceef88745..9b2cba7c4 100644
--- a/src/en/design-system/lyne/components/sbb-alert-group/implementation/implementation.11tydata.js
+++ b/src/en/design-system/lyne/components/sbb-alert-group/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-alert-group/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/alert/alert-group/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/en/design-system/lyne/components/sbb-alert/implementation/implementation.11tydata.js b/src/en/design-system/lyne/components/sbb-alert/implementation/implementation.11tydata.js
index a7ae12bdd..b719b4d97 100644
--- a/src/en/design-system/lyne/components/sbb-alert/implementation/implementation.11tydata.js
+++ b/src/en/design-system/lyne/components/sbb-alert/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-alert/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/alert/alert/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/en/design-system/lyne/components/sbb-autocomplete/implementation/implementation.11tydata.js b/src/en/design-system/lyne/components/sbb-autocomplete/implementation/implementation.11tydata.js
index 7302b4004..d35ad45a3 100644
--- a/src/en/design-system/lyne/components/sbb-autocomplete/implementation/implementation.11tydata.js
+++ b/src/en/design-system/lyne/components/sbb-autocomplete/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-autocomplete/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/autocomplete/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/en/design-system/lyne/components/sbb-button/implementation/implementation.11tydata.js b/src/en/design-system/lyne/components/sbb-button/implementation/implementation.11tydata.js
index fc9fdf7d2..3b4da72d3 100644
--- a/src/en/design-system/lyne/components/sbb-button/implementation/implementation.11tydata.js
+++ b/src/en/design-system/lyne/components/sbb-button/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-button/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/button/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/en/design-system/lyne/components/sbb-calendar/implementation/implementation.11tydata.js b/src/en/design-system/lyne/components/sbb-calendar/implementation/implementation.11tydata.js
index 38fb676f7..f5fa8b539 100644
--- a/src/en/design-system/lyne/components/sbb-calendar/implementation/implementation.11tydata.js
+++ b/src/en/design-system/lyne/components/sbb-calendar/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-calendar/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/calendar/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/en/design-system/lyne/components/sbb-card-badge/implementation/implementation.11tydata.js b/src/en/design-system/lyne/components/sbb-card-badge/implementation/implementation.11tydata.js
index 3ccc9648b..d499e6dd7 100644
--- a/src/en/design-system/lyne/components/sbb-card-badge/implementation/implementation.11tydata.js
+++ b/src/en/design-system/lyne/components/sbb-card-badge/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-card-badge/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/card/card-badge/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/en/design-system/lyne/components/sbb-card/implementation/implementation.11tydata.js b/src/en/design-system/lyne/components/sbb-card/implementation/implementation.11tydata.js
index 328203f80..6301eefdd 100644
--- a/src/en/design-system/lyne/components/sbb-card/implementation/implementation.11tydata.js
+++ b/src/en/design-system/lyne/components/sbb-card/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-card/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/card/card/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/en/design-system/lyne/components/sbb-checkbox-group/implementation/implementation.11tydata.js b/src/en/design-system/lyne/components/sbb-checkbox-group/implementation/implementation.11tydata.js
index b9b778550..aad0ebca9 100644
--- a/src/en/design-system/lyne/components/sbb-checkbox-group/implementation/implementation.11tydata.js
+++ b/src/en/design-system/lyne/components/sbb-checkbox-group/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-checkbox-group/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/checkbox/checkbox-group/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/en/design-system/lyne/components/sbb-checkbox/implementation/implementation.11tydata.js b/src/en/design-system/lyne/components/sbb-checkbox/implementation/implementation.11tydata.js
index 58b904311..153b8057c 100644
--- a/src/en/design-system/lyne/components/sbb-checkbox/implementation/implementation.11tydata.js
+++ b/src/en/design-system/lyne/components/sbb-checkbox/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-checkbox/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/checkbox/checkbox/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/en/design-system/lyne/components/sbb-chip/implementation/implementation.11tydata.js b/src/en/design-system/lyne/components/sbb-chip/implementation/implementation.11tydata.js
index 3ea6587c7..fa4f6ae88 100644
--- a/src/en/design-system/lyne/components/sbb-chip/implementation/implementation.11tydata.js
+++ b/src/en/design-system/lyne/components/sbb-chip/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-chip/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/chip/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/en/design-system/lyne/components/sbb-clock/implementation/implementation.11tydata.js b/src/en/design-system/lyne/components/sbb-clock/implementation/implementation.11tydata.js
index 24d0716a6..1e270e97f 100644
--- a/src/en/design-system/lyne/components/sbb-clock/implementation/implementation.11tydata.js
+++ b/src/en/design-system/lyne/components/sbb-clock/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-clock/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/clock/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/en/design-system/lyne/components/sbb-datepicker-next-day/implementation/implementation.11tydata.js b/src/en/design-system/lyne/components/sbb-datepicker-next-day/implementation/implementation.11tydata.js
index 3a872c436..d171afefa 100644
--- a/src/en/design-system/lyne/components/sbb-datepicker-next-day/implementation/implementation.11tydata.js
+++ b/src/en/design-system/lyne/components/sbb-datepicker-next-day/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-datepicker-next-day/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/datepicker/datepicker-next-day/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/en/design-system/lyne/components/sbb-datepicker-previous-day/implementation/implementation.11tydata.js b/src/en/design-system/lyne/components/sbb-datepicker-previous-day/implementation/implementation.11tydata.js
index d3f50d2a1..9c742feab 100644
--- a/src/en/design-system/lyne/components/sbb-datepicker-previous-day/implementation/implementation.11tydata.js
+++ b/src/en/design-system/lyne/components/sbb-datepicker-previous-day/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-datepicker-previous-day/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/datepicker/datepicker-previous-day/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/en/design-system/lyne/components/sbb-datepicker-toggle/implementation/implementation.11tydata.js b/src/en/design-system/lyne/components/sbb-datepicker-toggle/implementation/implementation.11tydata.js
index 4cd409836..90ee34109 100644
--- a/src/en/design-system/lyne/components/sbb-datepicker-toggle/implementation/implementation.11tydata.js
+++ b/src/en/design-system/lyne/components/sbb-datepicker-toggle/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-datepicker-toggle/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/datepicker/datepicker-toggle/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/en/design-system/lyne/components/sbb-datepicker/implementation/implementation.11tydata.js b/src/en/design-system/lyne/components/sbb-datepicker/implementation/implementation.11tydata.js
index 7b31c1a87..aa40fe846 100644
--- a/src/en/design-system/lyne/components/sbb-datepicker/implementation/implementation.11tydata.js
+++ b/src/en/design-system/lyne/components/sbb-datepicker/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-datepicker/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/datepicker/datepicker/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/en/design-system/lyne/components/sbb-dialog/implementation/implementation.11tydata.js b/src/en/design-system/lyne/components/sbb-dialog/implementation/implementation.11tydata.js
index 5a0b6ea75..3a60553be 100644
--- a/src/en/design-system/lyne/components/sbb-dialog/implementation/implementation.11tydata.js
+++ b/src/en/design-system/lyne/components/sbb-dialog/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-dialog/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/dialog/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/en/design-system/lyne/components/sbb-divider/implementation/implementation.11tydata.js b/src/en/design-system/lyne/components/sbb-divider/implementation/implementation.11tydata.js
index a37e67061..488071f36 100644
--- a/src/en/design-system/lyne/components/sbb-divider/implementation/implementation.11tydata.js
+++ b/src/en/design-system/lyne/components/sbb-divider/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-divider/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/divider/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/en/design-system/lyne/components/sbb-footer/implementation/implementation.11tydata.js b/src/en/design-system/lyne/components/sbb-footer/implementation/implementation.11tydata.js
index 72bb7fff2..9a0382b38 100644
--- a/src/en/design-system/lyne/components/sbb-footer/implementation/implementation.11tydata.js
+++ b/src/en/design-system/lyne/components/sbb-footer/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-footer/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/footer/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/en/design-system/lyne/components/sbb-form-error/implementation/implementation.11tydata.js b/src/en/design-system/lyne/components/sbb-form-error/implementation/implementation.11tydata.js
index 622a41a5f..8c03de96f 100644
--- a/src/en/design-system/lyne/components/sbb-form-error/implementation/implementation.11tydata.js
+++ b/src/en/design-system/lyne/components/sbb-form-error/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-form-error/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/form-error/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/en/design-system/lyne/components/sbb-form-field/implementation/implementation.11tydata.js b/src/en/design-system/lyne/components/sbb-form-field/implementation/implementation.11tydata.js
index de1b63cba..3281dea95 100644
--- a/src/en/design-system/lyne/components/sbb-form-field/implementation/implementation.11tydata.js
+++ b/src/en/design-system/lyne/components/sbb-form-field/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-form-field/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/form-field/form-field/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/en/design-system/lyne/components/sbb-header-action/implementation/implementation.11tydata.js b/src/en/design-system/lyne/components/sbb-header-action/implementation/implementation.11tydata.js
index 36418cbdd..d3e50f3bd 100644
--- a/src/en/design-system/lyne/components/sbb-header-action/implementation/implementation.11tydata.js
+++ b/src/en/design-system/lyne/components/sbb-header-action/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-header-action/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/header/header-action/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/en/design-system/lyne/components/sbb-header/implementation/implementation.11tydata.js b/src/en/design-system/lyne/components/sbb-header/implementation/implementation.11tydata.js
index 92895a664..913a30901 100644
--- a/src/en/design-system/lyne/components/sbb-header/implementation/implementation.11tydata.js
+++ b/src/en/design-system/lyne/components/sbb-header/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-header/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/header/header/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/en/design-system/lyne/components/sbb-icon/implementation/implementation.11tydata.js b/src/en/design-system/lyne/components/sbb-icon/implementation/implementation.11tydata.js
index 84e025d22..ac7edf39b 100644
--- a/src/en/design-system/lyne/components/sbb-icon/implementation/implementation.11tydata.js
+++ b/src/en/design-system/lyne/components/sbb-icon/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-icon/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/icon/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/en/design-system/lyne/components/sbb-image/implementation/implementation.11tydata.js b/src/en/design-system/lyne/components/sbb-image/implementation/implementation.11tydata.js
index eb3a967b7..b8911fd95 100644
--- a/src/en/design-system/lyne/components/sbb-image/implementation/implementation.11tydata.js
+++ b/src/en/design-system/lyne/components/sbb-image/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-image/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/image/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/en/design-system/lyne/components/sbb-journey-header/implementation/implementation.11tydata.js b/src/en/design-system/lyne/components/sbb-journey-header/implementation/implementation.11tydata.js
index db8d53f78..5b229040f 100644
--- a/src/en/design-system/lyne/components/sbb-journey-header/implementation/implementation.11tydata.js
+++ b/src/en/design-system/lyne/components/sbb-journey-header/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-journey-header/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/journey-header/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/en/design-system/lyne/components/sbb-link-list/implementation/implementation.11tydata.js b/src/en/design-system/lyne/components/sbb-link-list/implementation/implementation.11tydata.js
index 64bf67bd6..4aef0f148 100644
--- a/src/en/design-system/lyne/components/sbb-link-list/implementation/implementation.11tydata.js
+++ b/src/en/design-system/lyne/components/sbb-link-list/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-link-list/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/link-list/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/en/design-system/lyne/components/sbb-link/implementation/implementation.11tydata.js b/src/en/design-system/lyne/components/sbb-link/implementation/implementation.11tydata.js
index c510cfcf2..0b3deabd6 100644
--- a/src/en/design-system/lyne/components/sbb-link/implementation/implementation.11tydata.js
+++ b/src/en/design-system/lyne/components/sbb-link/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-link/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/link/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/en/design-system/lyne/components/sbb-logo/implementation/implementation.11tydata.js b/src/en/design-system/lyne/components/sbb-logo/implementation/implementation.11tydata.js
index c43a16f57..895349efc 100644
--- a/src/en/design-system/lyne/components/sbb-logo/implementation/implementation.11tydata.js
+++ b/src/en/design-system/lyne/components/sbb-logo/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-logo/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/logo/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/en/design-system/lyne/components/sbb-menu-action/implementation/implementation.11tydata.js b/src/en/design-system/lyne/components/sbb-menu-action/implementation/implementation.11tydata.js
index b2339d318..90379d8b7 100644
--- a/src/en/design-system/lyne/components/sbb-menu-action/implementation/implementation.11tydata.js
+++ b/src/en/design-system/lyne/components/sbb-menu-action/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-menu-action/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/menu/menu-action/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/en/design-system/lyne/components/sbb-menu/implementation/implementation.11tydata.js b/src/en/design-system/lyne/components/sbb-menu/implementation/implementation.11tydata.js
index 8f3f4df95..0a9897e51 100644
--- a/src/en/design-system/lyne/components/sbb-menu/implementation/implementation.11tydata.js
+++ b/src/en/design-system/lyne/components/sbb-menu/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-menu/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/menu/menu/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/en/design-system/lyne/components/sbb-optgroup/implementation/implementation.11tydata.js b/src/en/design-system/lyne/components/sbb-optgroup/implementation/implementation.11tydata.js
index 8c07bc77e..efc1d4be1 100644
--- a/src/en/design-system/lyne/components/sbb-optgroup/implementation/implementation.11tydata.js
+++ b/src/en/design-system/lyne/components/sbb-optgroup/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-optgroup/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/option/optgroup/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/en/design-system/lyne/components/sbb-option/implementation/implementation.11tydata.js b/src/en/design-system/lyne/components/sbb-option/implementation/implementation.11tydata.js
index c3f63a30f..fac660b9a 100644
--- a/src/en/design-system/lyne/components/sbb-option/implementation/implementation.11tydata.js
+++ b/src/en/design-system/lyne/components/sbb-option/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-option/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/option/option/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/en/design-system/lyne/components/sbb-radiobutton-group/implementation/implementation.11tydata.js b/src/en/design-system/lyne/components/sbb-radiobutton-group/implementation/implementation.11tydata.js
index 34f52a1e4..7b035fb9a 100644
--- a/src/en/design-system/lyne/components/sbb-radiobutton-group/implementation/implementation.11tydata.js
+++ b/src/en/design-system/lyne/components/sbb-radiobutton-group/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-radio-button-group/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/radio-button/radio-button-group/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/en/design-system/lyne/components/sbb-radiobutton/implementation/implementation.11tydata.js b/src/en/design-system/lyne/components/sbb-radiobutton/implementation/implementation.11tydata.js
index 563b06c39..9bfb0afe5 100644
--- a/src/en/design-system/lyne/components/sbb-radiobutton/implementation/implementation.11tydata.js
+++ b/src/en/design-system/lyne/components/sbb-radiobutton/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-radio-button/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/radio-button/radio-button/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/en/design-system/lyne/components/sbb-selection-panel/implementation/implementation.11tydata.js b/src/en/design-system/lyne/components/sbb-selection-panel/implementation/implementation.11tydata.js
index 88b9d5753..4286d41b8 100644
--- a/src/en/design-system/lyne/components/sbb-selection-panel/implementation/implementation.11tydata.js
+++ b/src/en/design-system/lyne/components/sbb-selection-panel/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-selection-panel/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/selection-panel/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/en/design-system/lyne/components/sbb-signet/implementation/implementation.11tydata.js b/src/en/design-system/lyne/components/sbb-signet/implementation/implementation.11tydata.js
index c403df77a..b99ff4d6e 100644
--- a/src/en/design-system/lyne/components/sbb-signet/implementation/implementation.11tydata.js
+++ b/src/en/design-system/lyne/components/sbb-signet/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-signet/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/signet/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/en/design-system/lyne/components/sbb-slider/implementation/implementation.11tydata.js b/src/en/design-system/lyne/components/sbb-slider/implementation/implementation.11tydata.js
index 71348064e..7edd34501 100644
--- a/src/en/design-system/lyne/components/sbb-slider/implementation/implementation.11tydata.js
+++ b/src/en/design-system/lyne/components/sbb-slider/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-slider/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/slider/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/en/design-system/lyne/components/sbb-tab-group/implementation/implementation.11tydata.js b/src/en/design-system/lyne/components/sbb-tab-group/implementation/implementation.11tydata.js
index 155415eb0..24a9f56d7 100644
--- a/src/en/design-system/lyne/components/sbb-tab-group/implementation/implementation.11tydata.js
+++ b/src/en/design-system/lyne/components/sbb-tab-group/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-tab-group/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/tabs/tab-group/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/en/design-system/lyne/components/sbb-tab-title/implementation/implementation.11tydata.js b/src/en/design-system/lyne/components/sbb-tab-title/implementation/implementation.11tydata.js
index a1abd9718..29e45953d 100644
--- a/src/en/design-system/lyne/components/sbb-tab-title/implementation/implementation.11tydata.js
+++ b/src/en/design-system/lyne/components/sbb-tab-title/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-tab-title/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/tabs/tab-title/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/en/design-system/lyne/components/sbb-tag-group/implementation/implementation.11tydata.js b/src/en/design-system/lyne/components/sbb-tag-group/implementation/implementation.11tydata.js
index c2d8fdff7..a03e5b551 100644
--- a/src/en/design-system/lyne/components/sbb-tag-group/implementation/implementation.11tydata.js
+++ b/src/en/design-system/lyne/components/sbb-tag-group/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-tag-group/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/tag/tag-group/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/en/design-system/lyne/components/sbb-tag/implementation/implementation.11tydata.js b/src/en/design-system/lyne/components/sbb-tag/implementation/implementation.11tydata.js
index 9ef155ece..6b7e6390b 100644
--- a/src/en/design-system/lyne/components/sbb-tag/implementation/implementation.11tydata.js
+++ b/src/en/design-system/lyne/components/sbb-tag/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-tag/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/tag/tag/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/en/design-system/lyne/components/sbb-teaser-hero/implementation/implementation.11tydata.js b/src/en/design-system/lyne/components/sbb-teaser-hero/implementation/implementation.11tydata.js
index 6006d7bb2..29f8ba870 100644
--- a/src/en/design-system/lyne/components/sbb-teaser-hero/implementation/implementation.11tydata.js
+++ b/src/en/design-system/lyne/components/sbb-teaser-hero/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-teaser-hero/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/teaser-hero/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/en/design-system/lyne/components/sbb-teaser/implementation/implementation.11tydata.js b/src/en/design-system/lyne/components/sbb-teaser/implementation/implementation.11tydata.js
index 027082249..3d82518c4 100644
--- a/src/en/design-system/lyne/components/sbb-teaser/implementation/implementation.11tydata.js
+++ b/src/en/design-system/lyne/components/sbb-teaser/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-teaser/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/teaser/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/en/design-system/lyne/components/sbb-time-input/implementation/implementation.11tydata.js b/src/en/design-system/lyne/components/sbb-time-input/implementation/implementation.11tydata.js
index 534d7a8f1..f49183d62 100644
--- a/src/en/design-system/lyne/components/sbb-time-input/implementation/implementation.11tydata.js
+++ b/src/en/design-system/lyne/components/sbb-time-input/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-time-input/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/time-input/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/en/design-system/lyne/components/sbb-title/implementation/implementation.11tydata.js b/src/en/design-system/lyne/components/sbb-title/implementation/implementation.11tydata.js
index 40e2e36ce..162ce2490 100644
--- a/src/en/design-system/lyne/components/sbb-title/implementation/implementation.11tydata.js
+++ b/src/en/design-system/lyne/components/sbb-title/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-title/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/title/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/en/design-system/lyne/components/sbb-toggle-check/implementation/implementation.11tydata.js b/src/en/design-system/lyne/components/sbb-toggle-check/implementation/implementation.11tydata.js
index 56a942e64..49e9460ae 100644
--- a/src/en/design-system/lyne/components/sbb-toggle-check/implementation/implementation.11tydata.js
+++ b/src/en/design-system/lyne/components/sbb-toggle-check/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-toggle-check/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/toggle-check/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/en/design-system/lyne/components/sbb-toggle-option/implementation/implementation.11tydata.js b/src/en/design-system/lyne/components/sbb-toggle-option/implementation/implementation.11tydata.js
index 5201d7741..c0bab820a 100644
--- a/src/en/design-system/lyne/components/sbb-toggle-option/implementation/implementation.11tydata.js
+++ b/src/en/design-system/lyne/components/sbb-toggle-option/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-toggle-option/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/toggle/toggle-option/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/en/design-system/lyne/components/sbb-toggle/implementation/implementation.11tydata.js b/src/en/design-system/lyne/components/sbb-toggle/implementation/implementation.11tydata.js
index db7614f84..045c03b7a 100644
--- a/src/en/design-system/lyne/components/sbb-toggle/implementation/implementation.11tydata.js
+++ b/src/en/design-system/lyne/components/sbb-toggle/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-toggle/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/toggle/toggle/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/en/design-system/lyne/components/sbb-tooltip-trigger/implementation/implementation.11tydata.js b/src/en/design-system/lyne/components/sbb-tooltip-trigger/implementation/implementation.11tydata.js
index 45377874f..eea53b116 100644
--- a/src/en/design-system/lyne/components/sbb-tooltip-trigger/implementation/implementation.11tydata.js
+++ b/src/en/design-system/lyne/components/sbb-tooltip-trigger/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-tooltip-trigger/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/tooltip/tooltip-trigger/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"
diff --git a/src/en/design-system/lyne/components/sbb-tooltip/implementation/implementation.11tydata.js b/src/en/design-system/lyne/components/sbb-tooltip/implementation/implementation.11tydata.js
index 9f3bc7f28..d3f9374d8 100644
--- a/src/en/design-system/lyne/components/sbb-tooltip/implementation/implementation.11tydata.js
+++ b/src/en/design-system/lyne/components/sbb-tooltip/implementation/implementation.11tydata.js
@@ -3,7 +3,7 @@ const EleventyFetch = require("@11ty/eleventy-fetch");
 module.exports = {
     eleventyComputed: {
       implementation: data => {
-        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/sbb-tooltip/readme.md";
+        let url = "https://raw.githubusercontent.com/lyne-design-system/lyne-components/master/src/components/tooltip/tooltip/readme.md";
         return EleventyFetch(url, {
           duration: "1d",
           type: "text"