diff --git a/docs/README.md b/docs/README.md
index 630f52b..4126806 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -57,5 +57,5 @@ const api = await expose({
 ## Installation
 
 ```bash
-npm install @collage/collage
+npm install @collage/core
 ```
diff --git a/docs/guide/getting-started.md b/docs/guide/getting-started.md
index bf21315..035308c 100644
--- a/docs/guide/getting-started.md
+++ b/docs/guide/getting-started.md
@@ -30,10 +30,10 @@ Vite just created you two separate projects containing everything you need to de
 
 ```bash
 cd dashboard
-npm i @collage/collage
+npm i @collage/core
 
 cd ../todos
-npm i @collage/collage
+npm i @collage/core
 ```
 
 ::: tip
@@ -167,7 +167,7 @@ For now we just promote the Todos App and the Dashboard App to fragments by call
 
 ```javascript{2-3}
 // Import and call the expose() function
-import { expose } from '@collage/collage'
+import { expose } from '@collage/core'
 expose()
 
 function addTodoItem(text) {
@@ -184,7 +184,7 @@ document.addEventListener('submit', event => {
 
 ```javascript{2-3}
 // Import and call the expose() function
-import { expose } from '@collage/collage'
+import { expose } from '@collage/core'
 expose()
 
 // nothing else to do for now
@@ -253,7 +253,7 @@ Here we will need the [**Topics API**](../docs/core-api.html#topics-api) specifi
 ::: code-group-item todos/main.js
 
 ```javascript{1-11,18-23,34,45}
-import { expose } from '@collage/collage'
+import { expose } from '@collage/core'
 const context = await expose({
   services: {
     todos: {
@@ -344,7 +344,7 @@ In this case we would like to have access to the todos 'active' topic and to the
 ::: code-group-item dashboard/main.js
 
 ```javascript{1-11,15,23}
-import { expose } from '@collage/collage'
+import { expose } from '@collage/core'
 const context = await expose({
   services: {
     todos: {
diff --git a/docs/package.json b/docs/package.json
index b1df7e1..d098132 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@collage/collage-docs",
+  "name": "@collage/core-docs",
   "version": "1.0.0",
   "description": "Documentation App for the collage lib",
   "main": "vuepress-config.js",
diff --git a/package-lock.json b/package-lock.json
index 6c428cb..8fbe8cc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,11 +1,11 @@
 {
-  "name": "@collage/collage",
+  "name": "@collage/core",
   "version": "0.0.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
-      "name": "@collage/collage",
+      "name": "@collage/core",
       "version": "0.0.0",
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index c3e4b1b..02cbbb8 100644
--- a/package.json
+++ b/package.json
@@ -1,15 +1,15 @@
 {
-  "name": "@collage/collage",
-  "version": "0.2.4",
+  "name": "@collage/core",
+  "version": "0.2.5",
   "description": "A library to handle communication between micro frontends and enable an easy to use orchestration",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/SICKAG/collage.git"
   },
-  "author": "Wanja Tschuor <wanja.tschuor@sick>",
+  "author": "Wanja Tschuor <wanja.tschuor@sick.de>",
   "contributors": [
     "Susanne Kirchner <susanne.kirchner@sick.de>",
-    "Joshua Hagedorn <ravens.aerie@googlemail.com"
+    "Joshua Hagedorn <ravens.aerie@googlemail.com>"
   ],
   "license": "MIT",
   "publishConfig": {
diff --git a/src/core/config-plugin/samples/config-fragment.html b/src/core/config-plugin/samples/config-fragment.html
index edf67aa..17156ee 100644
--- a/src/core/config-plugin/samples/config-fragment.html
+++ b/src/core/config-plugin/samples/config-fragment.html
@@ -24,7 +24,7 @@
     }
   </style>
   <script type="module">
-    import { expose, onConfigUpdated, onLoaded } from "@collage/collage";
+    import { expose, onConfigUpdated, onLoaded } from "@collage/core";
 
     const frontendDescription = {};
 
diff --git a/src/core/config-plugin/samples/config-fragment2.html b/src/core/config-plugin/samples/config-fragment2.html
index 982eb01..01938cb 100644
--- a/src/core/config-plugin/samples/config-fragment2.html
+++ b/src/core/config-plugin/samples/config-fragment2.html
@@ -20,7 +20,7 @@
     }
   </style>
   <script type="module">
-    import { expose, onConfigUpdated } from "@collage/collage";
+    import { expose, onConfigUpdated } from "@collage/core";
 
     const frontendDescription = {};
 
diff --git a/src/core/config-plugin/samples/index.html b/src/core/config-plugin/samples/index.html
index 8baffad..76af4a5 100644
--- a/src/core/config-plugin/samples/index.html
+++ b/src/core/config-plugin/samples/index.html
@@ -20,7 +20,7 @@
     }
   </style>
   <script type="module">
-    import { expose } from "@collage/collage";
+    import { expose } from "@collage/core";
     const description = {
       fragmentsConfig: {
         "./config-fragment.html": {
diff --git a/src/core/direct-functions-plugin/samples/function-child.html b/src/core/direct-functions-plugin/samples/function-child.html
index 90f765d..f951173 100644
--- a/src/core/direct-functions-plugin/samples/function-child.html
+++ b/src/core/direct-functions-plugin/samples/function-child.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Document</title>
     <script type="module">
-      import { expose, onLoaded } from "@collage/collage";
+      import { expose, onLoaded } from "@collage/core";
       expose({
         functions: {
           castSpell(spell) {
diff --git a/src/core/direct-functions-plugin/samples/function-child2.html b/src/core/direct-functions-plugin/samples/function-child2.html
index e178353..766619f 100644
--- a/src/core/direct-functions-plugin/samples/function-child2.html
+++ b/src/core/direct-functions-plugin/samples/function-child2.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Document</title>
     <script type="module">
-      import { expose } from "@collage/collage";
+      import { expose } from "@collage/core";
       expose({
         functions: {
           bla(bla) {
diff --git a/src/core/direct-functions-plugin/samples/function-grandchild.html b/src/core/direct-functions-plugin/samples/function-grandchild.html
index 8d2c850..d239a3b 100644
--- a/src/core/direct-functions-plugin/samples/function-grandchild.html
+++ b/src/core/direct-functions-plugin/samples/function-grandchild.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Document</title>
     <script type="module">
-      import { expose } from "@collage/collage";
+      import { expose } from "@collage/core";
       expose({
         functions: {
           bla(bla) {
diff --git a/src/core/direct-functions-plugin/samples/index.html b/src/core/direct-functions-plugin/samples/index.html
index b250214..28acd1a 100644
--- a/src/core/direct-functions-plugin/samples/index.html
+++ b/src/core/direct-functions-plugin/samples/index.html
@@ -7,7 +7,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <title>Document</title>
   <script type="module">
-    import { expose, onLoaded } from "@collage/collage";
+    import { expose, onLoaded } from "@collage/core";
 
     function onClickAt(selector, fn) {
       document.addEventListener("click", (e) => {
diff --git a/src/core/handshake-plugin/samples/locationReloadArrangement.html b/src/core/handshake-plugin/samples/locationReloadArrangement.html
index 1386ddb..12197ba 100644
--- a/src/core/handshake-plugin/samples/locationReloadArrangement.html
+++ b/src/core/handshake-plugin/samples/locationReloadArrangement.html
@@ -7,7 +7,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>Document</title>
   <script type="module">
-    import { expose, onUpdated } from "@collage/collage";
+    import { expose, onUpdated } from "@collage/core";
 
     function isCollageUUID(id) {
       return id && /^collage-fragment-[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i.test(id);
diff --git a/src/core/handshake-plugin/samples/locationReloadFragment.html b/src/core/handshake-plugin/samples/locationReloadFragment.html
index 3e69756..556b2bf 100644
--- a/src/core/handshake-plugin/samples/locationReloadFragment.html
+++ b/src/core/handshake-plugin/samples/locationReloadFragment.html
@@ -7,7 +7,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>Document</title>
   <script type="module">
-    import { expose, onUpdated, onConfigUpdated } from "@collage/collage";
+    import { expose, onUpdated, onConfigUpdated } from "@collage/core";
 
     function isCollageUUID(id) {
       return id && /^collage-fragment-[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i.test(id);
diff --git a/src/core/services-plugin/service-functions/samples/index.html b/src/core/services-plugin/service-functions/samples/index.html
index ddffbae..34911f6 100644
--- a/src/core/services-plugin/service-functions/samples/index.html
+++ b/src/core/services-plugin/service-functions/samples/index.html
@@ -21,7 +21,7 @@
       }
     </style>
     <script type="module">
-      import { expose } from "@collage/collage";
+      import { expose } from "@collage/core";
 
       expose({
         services: {
diff --git a/src/core/services-plugin/service-functions/samples/modalArrangement.html b/src/core/services-plugin/service-functions/samples/modalArrangement.html
index 4169776..5aec2f5 100644
--- a/src/core/services-plugin/service-functions/samples/modalArrangement.html
+++ b/src/core/services-plugin/service-functions/samples/modalArrangement.html
@@ -40,7 +40,7 @@
     }
   </style>
   <script type="module">
-    import { expose } from "@collage/collage";
+    import { expose } from "@collage/core";
     function findFragment(id) {
       return [...document.querySelectorAll('collage-fragment')]
         .find(element => element.querySelector('iframe').name == id);
diff --git a/src/core/services-plugin/service-functions/samples/modalFragment.html b/src/core/services-plugin/service-functions/samples/modalFragment.html
index 5c28fe0..f455c77 100644
--- a/src/core/services-plugin/service-functions/samples/modalFragment.html
+++ b/src/core/services-plugin/service-functions/samples/modalFragment.html
@@ -17,7 +17,7 @@
     }
   </style>
   <script type="module">
-    import { expose } from "@collage/collage";
+    import { expose } from "@collage/core";
 
     expose({
       services: {
diff --git a/src/core/services-plugin/service-functions/samples/service-child.html b/src/core/services-plugin/service-functions/samples/service-child.html
index 1084472..727f620 100644
--- a/src/core/services-plugin/service-functions/samples/service-child.html
+++ b/src/core/services-plugin/service-functions/samples/service-child.html
@@ -11,7 +11,7 @@
       }
     </style>
     <script type="module">
-      import { expose } from "@collage/collage";
+      import { expose } from "@collage/core";
 
       expose({
         services: {
diff --git a/src/core/services-plugin/service-functions/samples/service-child2.html b/src/core/services-plugin/service-functions/samples/service-child2.html
index 1de8fcb..42e2f1c 100644
--- a/src/core/services-plugin/service-functions/samples/service-child2.html
+++ b/src/core/services-plugin/service-functions/samples/service-child2.html
@@ -12,7 +12,7 @@
       }
     </style>
     <script type="module">
-      import { expose } from "@collage/collage";
+      import { expose } from "@collage/core";
 
       expose({
         services: {
diff --git a/src/core/topics-plugin/service-topics/samples/index.html b/src/core/topics-plugin/service-topics/samples/index.html
index d026430..e2d5d99 100644
--- a/src/core/topics-plugin/service-topics/samples/index.html
+++ b/src/core/topics-plugin/service-topics/samples/index.html
@@ -7,7 +7,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <title>Document</title>
   <script type="module">
-    import { expose, onLoaded } from "@collage/collage";
+    import { expose, onLoaded } from "@collage/core";
     const services = {
       language: {
         switchTo() {
diff --git a/src/core/topics-plugin/service-topics/samples/topic-receiver.html b/src/core/topics-plugin/service-topics/samples/topic-receiver.html
index 23c0e77..8cbed8b 100644
--- a/src/core/topics-plugin/service-topics/samples/topic-receiver.html
+++ b/src/core/topics-plugin/service-topics/samples/topic-receiver.html
@@ -7,7 +7,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <title>Document</title>
   <script type="module">
-    import { expose } from "@collage/collage";
+    import { expose } from "@collage/core";
 
     const services = {
       language: {
diff --git a/src/core/topics-plugin/service-topics/samples/topic-receiver2.html b/src/core/topics-plugin/service-topics/samples/topic-receiver2.html
index a54604a..3a81bb3 100644
--- a/src/core/topics-plugin/service-topics/samples/topic-receiver2.html
+++ b/src/core/topics-plugin/service-topics/samples/topic-receiver2.html
@@ -7,7 +7,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <title>Document</title>
   <script type="module">
-    import { expose } from "@collage/collage";
+    import { expose } from "@collage/core";
 
     const services = {
       language: {
diff --git a/src/core/topics-plugin/simple-topics/samples/index.html b/src/core/topics-plugin/simple-topics/samples/index.html
index 670e7f6..4cecdb0 100644
--- a/src/core/topics-plugin/simple-topics/samples/index.html
+++ b/src/core/topics-plugin/simple-topics/samples/index.html
@@ -7,7 +7,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>Document</title>
   <script type="module">
-    import { expose, onLoaded } from "@collage/collage";
+    import { expose, onLoaded } from "@collage/core";
     expose({}).then((context) => {
 
       const subscriptions = [];
diff --git a/src/core/topics-plugin/simple-topics/samples/topic-receiver.html b/src/core/topics-plugin/simple-topics/samples/topic-receiver.html
index a1208f4..21850f1 100644
--- a/src/core/topics-plugin/simple-topics/samples/topic-receiver.html
+++ b/src/core/topics-plugin/simple-topics/samples/topic-receiver.html
@@ -7,7 +7,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>Document</title>
   <script type="module">
-    import { expose } from "@collage/collage";
+    import { expose } from "@collage/core";
     expose({}).then((context) => {
       const subscriptions = [];
 
diff --git a/src/core/topics-plugin/simple-topics/samples/topic-receiver2.html b/src/core/topics-plugin/simple-topics/samples/topic-receiver2.html
index 20d9acf..f1cd641 100644
--- a/src/core/topics-plugin/simple-topics/samples/topic-receiver2.html
+++ b/src/core/topics-plugin/simple-topics/samples/topic-receiver2.html
@@ -7,7 +7,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>Document</title>
   <script type="module">
-    import { expose } from "@collage/collage";
+    import { expose } from "@collage/core";
     expose({}).then((context) => {
 
       const subscriptions = [];
diff --git a/vite.config.js b/vite.config.js
index 006911d..bfb17f6 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -6,14 +6,14 @@ export default defineConfig({
   build: {
     lib: {
       entry: 'src/index.ts',
-      name: '@collage/collage',
+      name: '@collage/core',
       fileName: (format) => `collage.${format}.js`,
     },
     sourcemap: true,
   },
   resolve: {
     alias: {
-      '@collage/collage': '/src/index.ts',
+      '@collage/core': '/src/index.ts',
     },
   },
   server: {