diff --git a/toolkit-showcase/assets/dbp-toolkit-showcase.topic.metadata.json.ejs b/toolkit-showcase/assets/dbp-toolkit-showcase.topic.metadata.json.ejs
index 7d0dbd7eca28558d1aa45cd51c83b465b58b7507..4e81bee5601fd50250f2a87993238c39f9ba93b8 100644
--- a/toolkit-showcase/assets/dbp-toolkit-showcase.topic.metadata.json.ejs
+++ b/toolkit-showcase/assets/dbp-toolkit-showcase.topic.metadata.json.ejs
@@ -15,7 +15,7 @@
   "activities": [
     {"path": "auth.metadata.json"},
     {"path": "person-select.metadata.json"},
-    {"path": "organization-select.metadata.json"},
+    {"path": "resource-select.metadata.json"},
     {"path": "knowledge-base-web-page-element-view.metadata.json"},
     {"path": "common.metadata.json"},
     {"path": "qr-code-scanner.metadata.json"},
diff --git a/toolkit-showcase/assets/organization-select.metadata.json b/toolkit-showcase/assets/organization-select.metadata.json
deleted file mode 100644
index d3684a7d4064e4ba32e3a77d1b4bc06ab865776d..0000000000000000000000000000000000000000
--- a/toolkit-showcase/assets/organization-select.metadata.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "element": "dbp-organization-select-demo-activity",
-    "module_src": "dbp-organization-select-demo-activity.js",
-    "routing_name": "organization-select",
-    "name": {
-        "de": "Institutsauswahl",
-        "en": "Organization select"
-    },
-    "short_name": {
-        "de": "Institutsauswahl",
-        "en": "Organization select"
-    },
-    "description": {
-        "de": "Erlaubt die Auswahl von Instituten",
-        "en": "Allows selection of organizations"
-    },
-    "subscribe": "lang,entry-point-url"
-}
diff --git a/toolkit-showcase/assets/resource-select.metadata.json b/toolkit-showcase/assets/resource-select.metadata.json
new file mode 100644
index 0000000000000000000000000000000000000000..fcd4c455e2e2878f9aa35e46419459b3bfc700dd
--- /dev/null
+++ b/toolkit-showcase/assets/resource-select.metadata.json
@@ -0,0 +1,18 @@
+{
+    "element": "dbp-resource-select-demo-activity",
+    "module_src": "dbp-resource-select-demo-activity.js",
+    "routing_name": "resource-select",
+    "name": {
+        "de": "Ressourcenauswahl",
+        "en": "Resource select"
+    },
+    "short_name": {
+        "de": "Ressourcenauswahl",
+        "en": "Resource select"
+    },
+    "description": {
+        "de": "Erlaubt die Auswahl von Resourcen",
+        "en": "Allows selection of resources"
+    },
+    "subscribe": "lang,entry-point-url"
+}
diff --git a/toolkit-showcase/package.json b/toolkit-showcase/package.json
index 53f45c3aaafe9fd73c6848cda07c98891e636791..34c9029b0eba43b85da62f5afce3b36e5b788443 100644
--- a/toolkit-showcase/package.json
+++ b/toolkit-showcase/package.json
@@ -47,9 +47,9 @@
         "@dbp-toolkit/font-source-sans-pro": "^0.2.0",
         "@dbp-toolkit/language-select": "^0.3.0",
         "@dbp-toolkit/notification": "^0.3.0",
-        "@dbp-toolkit/organization-select": "^0.2.0",
         "@dbp-toolkit/person-profile": "^0.2.0",
         "@dbp-toolkit/person-select": "^0.3.0",
+        "@dbp-toolkit/resource-select": "^0.1.0",
         "@open-wc/scoped-elements": "^2.1.0",
         "@rollup/plugin-replace": "^4.0.0",
         "highlight.js": "^11.0.0",
diff --git a/toolkit-showcase/src/dbp-organization-select-demo-activity.js b/toolkit-showcase/src/dbp-resource-select-demo-activity.js
similarity index 82%
rename from toolkit-showcase/src/dbp-organization-select-demo-activity.js
rename to toolkit-showcase/src/dbp-resource-select-demo-activity.js
index 466429fb059c462df2590bb3a58caac469b52844..825e07db66d7c30541e2e1e0b11b2fc41a3f30fc 100644
--- a/toolkit-showcase/src/dbp-organization-select-demo-activity.js
+++ b/toolkit-showcase/src/dbp-resource-select-demo-activity.js
@@ -1,10 +1,10 @@
 import {css, html} from 'lit';
 import {ScopedElementsMixin} from '@open-wc/scoped-elements';
-import {OrganizationSelectDemo} from '@dbp-toolkit/organization-select/src/dbp-organization-select-demo';
+import {ResourceSelectDemo} from '@dbp-toolkit/resource-select/src/dbp-resource-select-demo';
 import * as commonUtils from '@dbp-toolkit/common/utils';
 import * as commonStyles from '@dbp-toolkit/common/styles';
 import {unsafeHTML} from 'lit/directives/unsafe-html.js';
-import readme from '@dbp-toolkit/organization-select/README.md';
+import readme from '@dbp-toolkit/resource-select/README.md';
 import * as demoStyles from './styles';
 import {AdapterLitElement} from '@dbp-toolkit/provider/src/adapter-lit-element';
 
@@ -17,7 +17,7 @@ class DbpOrganizationSelectDemoActivity extends ScopedElementsMixin(AdapterLitEl
 
     static get scopedElements() {
         return {
-            'dbp-organization-select-demo': OrganizationSelectDemo,
+            'dbp-resource-select-demo': ResourceSelectDemo,
         };
     }
 
@@ -60,16 +60,16 @@ class DbpOrganizationSelectDemoActivity extends ScopedElementsMixin(AdapterLitEl
     render() {
         return html`
             ${unsafeHTML(readme)}
-            <dbp-organization-select-demo
+            <dbp-resource-select-demo
                 id="demo"
                 lang="${this.lang}"
                 entry-point-url="${this.entryPointUrl}"
-                no-auth></dbp-organization-select-demo>
+                no-auth></dbp-resource-select-demo>
         `;
     }
 }
 
 commonUtils.defineCustomElement(
-    'dbp-organization-select-demo-activity',
+    'dbp-resource-select-demo-activity',
     DbpOrganizationSelectDemoActivity
 );
diff --git a/yarn.lock b/yarn.lock
index ba5f8fc8357ae0ef73cdbc084573e6b1f6c55bb4..0b5d81726552240a37559b3e57b569cc89743095 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1878,7 +1878,7 @@
   resolved "https://registry.yarnpkg.com/@open-wc/dedupe-mixin/-/dedupe-mixin-1.3.0.tgz#0df5d438285fc3482838786ee81895318f0ff778"
   integrity sha512-UfdK1MPnR6T7f3svzzYBfu3qBkkZ/KsPhcpc3JYhsUY4hbpwNF9wEQtD4Z+/mRqMTJrKg++YSxIxE0FBhY3RIw==
 
-"@open-wc/scoped-elements@^2.1.0":
+"@open-wc/scoped-elements@^2.0.0", "@open-wc/scoped-elements@^2.1.0":
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/@open-wc/scoped-elements/-/scoped-elements-2.1.1.tgz#a43a2167d259af1f113301fcc93b1b9a6c371991"
   integrity sha512-qQAtVIK2H1oUIM2oSrCBnf1+ZGHd2nIowt1tete+Dn9rNXIogAMJlUBY/R1NR9MuuJvQ1MeFjgQoDmb05TUdkw==