diff --git a/packages/auth/assets/index.html b/packages/auth/assets/index.html
index a96e02202a402c6204e3342618457c2aaac304ea..7a85c8948898769fd663117646a8127b48b352c1 100644
--- a/packages/auth/assets/index.html
+++ b/packages/auth/assets/index.html
@@ -19,7 +19,7 @@
                        try-login></dbp-auth-keycloak>
     <dbp-login-button subscribe="auth" lang="de" show-image></dbp-login-button>
 
-    <dbp-auth-demo lang="de" entry-point-url="http://127.0.0.1:8000" subscribe="auth:auth"></dbp-auth-demo>
+    <dbp-auth-demo lang="de" entry-point-url="http://127.0.0.1:8000" subscribe="auth"></dbp-auth-demo>
 </dbp-provider>
 
 </body>
diff --git a/packages/check-in-place-select/src/dbp-check-in-place-select-demo.js b/packages/check-in-place-select/src/dbp-check-in-place-select-demo.js
index 1d302c0aba432d24b5b4fef1bf31f26818287ee1..20c0b84e18a6cfa1e0877bb89be223589bea2ddd 100644
--- a/packages/check-in-place-select/src/dbp-check-in-place-select-demo.js
+++ b/packages/check-in-place-select/src/dbp-check-in-place-select-demo.js
@@ -75,13 +75,13 @@ export class CheckInPlaceSelectDemo extends ScopedElementsMixin(DBPLitElement) {
                         <div class="field">
                             <label class="label">Check-In-Place 1</label>
                             <div class="control">
-                                <dbp-check-in-place-select lang="${this.lang}" entry-point-url="${this.entryPointUrl}" subscribe="auth:auth"></dbp-check-in-place-select>
+                                <dbp-check-in-place-select lang="${this.lang}" entry-point-url="${this.entryPointUrl}" subscribe="auth"></dbp-check-in-place-select>
                             </div>
                         </div>
                         <div class="field">
                             <label class="label">Check-In-Place 2</label>
                             <div class="control">
-                                <dbp-check-in-place-select lang="${this.lang}" entry-point-url="${this.entryPointUrl}" subscribe="auth:auth" show-reload-button reload-button-title="Click me"></dbp-check-in-place-select>
+                                <dbp-check-in-place-select lang="${this.lang}" entry-point-url="${this.entryPointUrl}" subscribe="auth" show-reload-button reload-button-title="Click me"></dbp-check-in-place-select>
                             </div>
                         </div>
                     </form>
diff --git a/packages/knowledge-base-web-page-element-view/src/dbp-knowledge-base-web-page-element-view-demo.js b/packages/knowledge-base-web-page-element-view/src/dbp-knowledge-base-web-page-element-view-demo.js
index 14a2f4fdd5380e071fff06446fa9ada6485bba51..717b3c1c4a495f4bb2ed6143bb1294aa0b81087a 100644
--- a/packages/knowledge-base-web-page-element-view/src/dbp-knowledge-base-web-page-element-view-demo.js
+++ b/packages/knowledge-base-web-page-element-view/src/dbp-knowledge-base-web-page-element-view-demo.js
@@ -86,23 +86,23 @@ export class KnowledgeBaseWebPageElementViewDemo extends ScopedElementsMixin(DBP
                 <div class="container">
                     <h2 class="subtitle">Deutsch</h2>
                     <p>Ein erster Schritt</p>
-                    <dbp-knowledge-base-web-page-element-view subscribe="auth:auth" lang="de" entry-point-url="${this.entryPointUrl}" value="bedienstete/bibliothek/buch-ausleihen" text="Ein Buch ausleihen"></dbp-knowledge-base-web-page-element-view>
+                    <dbp-knowledge-base-web-page-element-view subscribe="auth" lang="de" entry-point-url="${this.entryPointUrl}" value="bedienstete/bibliothek/buch-ausleihen" text="Ein Buch ausleihen"></dbp-knowledge-base-web-page-element-view>
                 </div>
                 <div class="container">
                     <h2 class="subtitle">Englisch</h2>
                     <p>A first step</p>
-                    <dbp-knowledge-base-web-page-element-view subscribe="auth:auth" lang="en" entry-point-url="${this.entryPointUrl}" value="bedienstete/bibliothek/buch-ausleihen" text="Borrow a book"></dbp-knowledge-base-web-page-element-view>
+                    <dbp-knowledge-base-web-page-element-view subscribe="auth" lang="en" entry-point-url="${this.entryPointUrl}" value="bedienstete/bibliothek/buch-ausleihen" text="Borrow a book"></dbp-knowledge-base-web-page-element-view>
                 </div>
                 <hr>
                 <div class="container">
                     <p>mit Text in der WebComponent:</p>
-                    <dbp-knowledge-base-web-page-element-view subscribe="auth:auth" lang="${this.lang}" value="abc/def/xyz" text="FAQ"></dbp-knowledge-base-web-page-element-view>
+                    <dbp-knowledge-base-web-page-element-view subscribe="auth" lang="${this.lang}" value="abc/def/xyz" text="FAQ"></dbp-knowledge-base-web-page-element-view>
                 </div>
                 <hr>
                 <div class="container">
                     <p>ohne Text in der WebComponent:</p>
                     Kontaktieren Sie uns unter...
-                    <dbp-knowledge-base-web-page-element-view subscribe="auth:auth" class="opt" lang="${this.lang}" value="abc/def/klm"></dbp-knowledge-base-web-page-element-view>
+                    <dbp-knowledge-base-web-page-element-view subscribe="auth" class="opt" lang="${this.lang}" value="abc/def/klm"></dbp-knowledge-base-web-page-element-view>
                 </div>
             </section>
         `;
diff --git a/packages/provider/assets/index.html.ejs b/packages/provider/assets/index.html.ejs
index a69096d594ba4f3723e174a971d87fc3f83ca555..a201f2d2b861c8db7845b826036836f295d38f0e 100644
--- a/packages/provider/assets/index.html.ejs
+++ b/packages/provider/assets/index.html.ejs
@@ -20,7 +20,7 @@
 
 <body>
     <dbp-provider id="root" root="1" availability="global" lang="de" entry-point-url="http://127.0.0.1:8000" auth requested-login-status>
-        <dbp-provider-demo id="provider-demo" subscribe="lang:lang:entry-point-url:entry-point-url"></dbp-provider-demo>
+        <dbp-provider-demo id="provider-demo" subscribe="lang:entry-point-url"></dbp-provider-demo>
     </dbp-provider>
     <p>version: <span style="color: white; background-color: black;"><%= buildInfo.info %></span></p>
 </body>
diff --git a/packages/provider/src/dbp-provider-demo.js b/packages/provider/src/dbp-provider-demo.js
index df6154888f47c4e632a41605034c147d8991c02f..0fd78e06155286a9d54209a354c86eb56ad46cd5 100644
--- a/packages/provider/src/dbp-provider-demo.js
+++ b/packages/provider/src/dbp-provider-demo.js
@@ -97,14 +97,14 @@ class ProviderDemo extends ScopedElementsMixin(DBPLitElement) {
                             <h2>${i18n.t('demo.consumer')}</h2>
                             <p>${i18n.t('demo.consumer_description', {id: "c1", subscriptions: "border-color"})}</p>
                             <pre>&lt;dbp-consumer  id="c1"  subscribe="border-color:bc" &gt;&lt;/dbp-consumer&gt;</pre>
-                            <dbp-consumer id="c1" subscribe="border-color:bc,lang:lang"></dbp-consumer>
+                            <dbp-consumer id="c1" subscribe="border-color:bc,lang"></dbp-consumer>
                             <p>${i18n.t('demo.consumer_description', {id: "c2", subscriptions: "foo"})}</p>
                             <pre>&lt;dbp-consumer  id="c2"  subscribe="foo:foo" &gt;&lt;/dbp-consumer&gt;</pre>
-                            <dbp-consumer id="c2" subscribe="foo:foo,lang:lang"></dbp-consumer>
+                            <dbp-consumer id="c2" subscribe="foo:foo,lang"></dbp-consumer>
                             <p>${i18n.t('demo.consumer_description', {id: "c3", subscriptions: "availability:status"})}</p>
                             <p>Local <em>status</em> is provided as <em>availability</em></p>
                             <pre>&lt;dbp-consumer  id="c3"  subscribe="status:availability"  border-color="orange" &gt;&lt;/dbp-consumer&gt;</pre>
-                            <dbp-consumer id="c3" subscribe="status:availability,lang:lang" border-color="orange"></dbp-consumer>
+                            <dbp-consumer id="c3" subscribe="status:availability,lang" border-color="orange"></dbp-consumer>
                             <p>${i18n.t('demo.consumer_description', {id: "c4", subscriptions: "unknown-name:status"})}</p>
                             <p>Remote <em>unknown-name</em> does not exist, the default value is overwritten by <em>undefined</em></i></p>
                             <pre>&lt;dbp-consumer  id="c4"  subscribe="status:unknown-name"  border-color="darkgray" &gt;&lt;/dbp-consumer&gt;</pre>
diff --git a/toolkit-showcase/assets/auth.metadata.json b/toolkit-showcase/assets/auth.metadata.json
index 826c212bd89de28c7032f922b0b632ca1da33886..43eecda43c606666abbcde010da655c8f983982b 100644
--- a/toolkit-showcase/assets/auth.metadata.json
+++ b/toolkit-showcase/assets/auth.metadata.json
@@ -14,5 +14,5 @@
     "de": "Web Komponente zur Authentifikation",
     "en": "Auth web component"
   },
-  "subscribe": "lang:lang,entry-point-url:entry-point-url"
+  "subscribe": "lang,entry-point-url"
 }
diff --git a/toolkit-showcase/assets/check-in-place-select.metadata.json b/toolkit-showcase/assets/check-in-place-select.metadata.json
index cc76f8534372f6f13e4807a9fd6f55f2331987a0..8647f4818e6213542877f69b394afdd6a3b6d3a7 100644
--- a/toolkit-showcase/assets/check-in-place-select.metadata.json
+++ b/toolkit-showcase/assets/check-in-place-select.metadata.json
@@ -14,5 +14,5 @@
     "de": "Ort Web Component",
     "en": "Check-in place select web component"
   },
-  "subscribe": "lang:lang,entry-point-url:entry-point-url"
+  "subscribe": "lang,entry-point-url"
 }
diff --git a/toolkit-showcase/assets/common.metadata.json b/toolkit-showcase/assets/common.metadata.json
index 654f1c98a16826770075b7e0540d8df6fee6d63b..f536e1ecf4fd8b0e662d77ae1a79a48a5f9a2e6c 100644
--- a/toolkit-showcase/assets/common.metadata.json
+++ b/toolkit-showcase/assets/common.metadata.json
@@ -14,5 +14,5 @@
     "de": "Gemeinsame Web Components",
     "en": "Common web components"
   },
-  "subscribe": "lang:lang,entry-point-url:entry-point-url"
+  "subscribe": "lang,entry-point-url"
 }
diff --git a/toolkit-showcase/assets/data-table-view.metadata.json b/toolkit-showcase/assets/data-table-view.metadata.json
index ad646391847cdcbbf977a84f2ae14e1198a22af8..afc1f01faad98169cd9325b62417cdcd5e5ef899 100644
--- a/toolkit-showcase/assets/data-table-view.metadata.json
+++ b/toolkit-showcase/assets/data-table-view.metadata.json
@@ -14,5 +14,5 @@
     "de": "DataTable: mit Daten, Paginierung, Such- und Exportfunktion",
     "en": "DataTable: with data, paging and searching AND exportable"
   },
-  "subscribe": "lang:lang,entry-point-url:entry-point-url"
+  "subscribe": "lang,entry-point-url"
 }
diff --git a/toolkit-showcase/assets/file-handling.metadata.json b/toolkit-showcase/assets/file-handling.metadata.json
index edd171f0fa22a6877a07b6c6c9eb73b17c068e5e..044c547810a5c8d8bd932d6dffe5bbfec4e949fc 100644
--- a/toolkit-showcase/assets/file-handling.metadata.json
+++ b/toolkit-showcase/assets/file-handling.metadata.json
@@ -14,5 +14,5 @@
     "de": "Web Komponenten für file sink und file source. Für mehrere verschiedenen Quellen.",
     "en": "Web components for file sink and file source. For several different sources."
   },
-  "subscribe": "lang:lang,entry-point-url:entry-point-url,nextcloud-auth-url:nextcloud-auth-url,nextcloud-web-dav-url:nextcloud-web-dav-url,nextcloud-name:nextcloud-name,nextcloud-file-url:nextcloud-file-url,show-nextcloud-file-picker:show-nextcloud-file-picker"
+  "subscribe": "lang,entry-point-url,nextcloud-auth-url:nextcloud-auth-url,nextcloud-web-dav-url:nextcloud-web-dav-url,nextcloud-name:nextcloud-name,nextcloud-file-url:nextcloud-file-url,show-nextcloud-file-picker:show-nextcloud-file-picker"
 }
diff --git a/toolkit-showcase/assets/knowledge-base-web-page-element-view.metadata.json b/toolkit-showcase/assets/knowledge-base-web-page-element-view.metadata.json
index d5f59a3035b93a24ed79185f4c1a76e0f9ec5eb0..904c8db941dda1b2dfcb6b9000f2fc178aaee1f1 100644
--- a/toolkit-showcase/assets/knowledge-base-web-page-element-view.metadata.json
+++ b/toolkit-showcase/assets/knowledge-base-web-page-element-view.metadata.json
@@ -14,5 +14,5 @@
     "de": "Erlaubt das Einfügen von Webinhalten",
     "en": "Allows the inserting of web content"
   },
-  "subscribe": "lang:lang,entry-point-url:entry-point-url"
+  "subscribe": "lang,entry-point-url"
 }
diff --git a/toolkit-showcase/assets/language-select.metadata.json b/toolkit-showcase/assets/language-select.metadata.json
index 21a66e2d24296281249f02479515796d59db908d..1334dacefc0958883f8ec81dc2cee4436b939140 100644
--- a/toolkit-showcase/assets/language-select.metadata.json
+++ b/toolkit-showcase/assets/language-select.metadata.json
@@ -14,5 +14,5 @@
     "de": "Sprachauswahl Web Component",
     "en": "Language select web component"
   },
-  "subscribe": "lang:lang,entry-point-url:entry-point-url"
+  "subscribe": "lang,entry-point-url"
 }
diff --git a/toolkit-showcase/assets/matomo.metadata.json b/toolkit-showcase/assets/matomo.metadata.json
index 6e472d64e71e7c4336c5fdd79caa99b6d1f87c70..ac6196b2499d153c3257662c47c99371ffcd0894 100644
--- a/toolkit-showcase/assets/matomo.metadata.json
+++ b/toolkit-showcase/assets/matomo.metadata.json
@@ -14,5 +14,5 @@
     "de": "Matomo Web Component",
     "en": "Matomo web component"
   },
-  "subscribe": "lang:lang,entry-point-url:entry-point-url"
+  "subscribe": "lang,entry-point-url"
 }
diff --git a/toolkit-showcase/assets/notification.metadata.json b/toolkit-showcase/assets/notification.metadata.json
index 06d42c717f798117944e5e0a90be036274d894ab..c5e9627409643e0c2773e1aaee4f22d73fc8879e 100644
--- a/toolkit-showcase/assets/notification.metadata.json
+++ b/toolkit-showcase/assets/notification.metadata.json
@@ -14,5 +14,5 @@
     "de": "Zeigt eine Benachrichtigung an",
     "en": "Shows a message"
   },
-  "subscribe": "lang:lang,entry-point-url:entry-point-url"
+  "subscribe": "lang,entry-point-url"
 }
diff --git a/toolkit-showcase/assets/person-profile.metadata.json b/toolkit-showcase/assets/person-profile.metadata.json
index 93e534167268e333dea21a4645e382c3d7c38943..1a12b5cb70e3b12c8b7a5475dc809972c6e6944f 100644
--- a/toolkit-showcase/assets/person-profile.metadata.json
+++ b/toolkit-showcase/assets/person-profile.metadata.json
@@ -14,5 +14,5 @@
     "de": "Gemeinsame Web Components",
     "en": "Person profile web components"
   },
-  "subscribe": "lang:lang,entry-point-url:entry-point-url"
+  "subscribe": "lang,entry-point-url"
 }
diff --git a/toolkit-showcase/assets/person-select.metadata.json b/toolkit-showcase/assets/person-select.metadata.json
index 3c67077d64be87597189cea28172fa6bb1c948b5..35c1d58d2683b4ad9bc97e8f3e05086afba252e4 100644
--- a/toolkit-showcase/assets/person-select.metadata.json
+++ b/toolkit-showcase/assets/person-select.metadata.json
@@ -14,5 +14,5 @@
     "de": "Erlaubt das Suchen von Personen",
     "en": "Allows searching for persons"
   },
-  "subscribe": "lang:lang,entry-point-url:entry-point-url"
+  "subscribe": "lang,entry-point-url"
 }
diff --git a/toolkit-showcase/assets/qr-code-scanner.metadata.json b/toolkit-showcase/assets/qr-code-scanner.metadata.json
index c58d7eda4684e958ce73de0507d6007dfa796ee4..ad5a59ff3e4c54e55870a55b12f3c50a9a17721a 100644
--- a/toolkit-showcase/assets/qr-code-scanner.metadata.json
+++ b/toolkit-showcase/assets/qr-code-scanner.metadata.json
@@ -14,5 +14,5 @@
     "de": "Scannt Qr Codes",
     "en": "Scans Qr Codes"
   },
-  "subscribe": "lang:lang,entry-point-url:entry-point-url"
+  "subscribe": "lang,entry-point-url"
 }
diff --git a/toolkit-showcase/src/dbp-auth-demo-activity.js b/toolkit-showcase/src/dbp-auth-demo-activity.js
index 0adeb6f56f62274fd387ea3d7046b52f555cb9d4..240300a4586016329a7836d9141cc4f4da9acee6 100644
--- a/toolkit-showcase/src/dbp-auth-demo-activity.js
+++ b/toolkit-showcase/src/dbp-auth-demo-activity.js
@@ -59,7 +59,7 @@ class DbpAuthDemoActivity extends ScopedElementsMixin(AdapterLitElement) {
     render() {
         return html`
                 ${unsafeHTML(readme)}
-                <dbp-auth-demo id="demo" lang="${this.lang}" entry-point-url="${this.entryPointUrl}" subscribe="auth:auth"></dbp-auth-demo>
+                <dbp-auth-demo id="demo" lang="${this.lang}" entry-point-url="${this.entryPointUrl}" subscribe="auth"></dbp-auth-demo>
         `;
     }
 }