diff --git a/packages/person-profile/assets/index.html b/packages/person-profile/assets/index.html
index 203379580e878c714d8beda2552cec8a05c7519c..29e3d858e4cc2e679a9238c03f77ed3a22ef906c 100644
--- a/packages/person-profile/assets/index.html
+++ b/packages/person-profile/assets/index.html
@@ -2,7 +2,7 @@
 <html>
 <head>
     <meta charset="UTF-8">
-    <script type="module" src="bundle.js"></script>
+    <script type="module" src="vpu-person-profile-demo.js"></script>
 </head>
 
 <body>
diff --git a/packages/person-profile/assets/vpu-person-profile.metadata.json b/packages/person-profile/assets/vpu-person-profile.metadata.json
index 3d9ab2f72f5309e26b75d3473cf5bf93fcdbe3a2..b9e00c257614f9189ba1d8b493da9bd7010f665d 100644
--- a/packages/person-profile/assets/vpu-person-profile.metadata.json
+++ b/packages/person-profile/assets/vpu-person-profile.metadata.json
@@ -1,6 +1,6 @@
 {
   "element": "vpu-person-profile",
-  "module_src": "person-profile.js",
+  "module_src": "vpu-person-profile.js",
   "name": {
     "de": "Benutzerprofil",
     "en": "User profile"
diff --git a/packages/person-profile/package.json b/packages/person-profile/package.json
index f31ed47d6094324987a58f3b69a114b157461f52..4c56323ce6cb1ae5220a3d889c60cd11a2060e9a 100644
--- a/packages/person-profile/package.json
+++ b/packages/person-profile/package.json
@@ -1,7 +1,7 @@
 {
   "name": "vpu-person-profile",
   "version": "1.0.0",
-  "main": "src/index.js",
+  "main": "src/vpu-person-profile.js",
   "devDependencies": {
     "karma": "^4.2.0",
     "karma-chai": "^0.1.0",
diff --git a/packages/person-profile/rollup.config.js b/packages/person-profile/rollup.config.js
index d170616d3c99d875b41357090319478230d7d41a..de4e11e170ae5dbe764de861fb200ce8ee0bf25c 100644
--- a/packages/person-profile/rollup.config.js
+++ b/packages/person-profile/rollup.config.js
@@ -14,16 +14,19 @@ const build = (typeof process.env.BUILD !== 'undefined') ? process.env.BUILD : '
 console.log("build: " + build);
 
 export default {
-    input: (build != 'test') ? 'src/demo.js' : 'test/**/*.js',
+    input: (build != 'test') ? ['src/vpu-person-profile.js', 'src/vpu-person-profile-demo.js'] : 'test/**/*.js',
     output: {
-        file: 'dist/bundle.js',
-        format: 'esm'
+        dir: 'dist',
+        entryFileNames: '[name].js',
+        chunkFileNames: 'shared/[name].[hash].[format].js',
+        format: 'esm',
+        sourcemap: true
     },
     plugins: [
         del({
             targets: 'dist/*'
         }),
-        multiEntry(),
+        (build == 'test') ? multiEntry() : false,
         consts({
             environment: build,
         }),
@@ -51,6 +54,7 @@ export default {
         copy({
             targets: [
                 {src: 'assets/index.html', dest: 'dist'},
+                {src: 'assets/vpu-person-profile.metadata.json', dest: 'dist'},
                 {src: 'node_modules/vpu-common/assets/icons/*.svg', dest: 'dist/local/vpu-common/icons'},
             ],
         }),
diff --git a/packages/person-profile/src/demo.js b/packages/person-profile/src/demo.js
index 01e0c43aba4106247207dbef4f2600c72933aa8e..c89a0e174e91cff508989fb7ff45244428feb626 100644
--- a/packages/person-profile/src/demo.js
+++ b/packages/person-profile/src/demo.js
@@ -1,2 +1 @@
-import 'vpu-auth';
-import './person-profile-demo.js';
+import './vpu-person-profile-demo.js';
diff --git a/packages/person-profile/src/index.js b/packages/person-profile/src/index.js
deleted file mode 100644
index ac6be2e82f3c560e4d8f776409584e8ecbec8747..0000000000000000000000000000000000000000
--- a/packages/person-profile/src/index.js
+++ /dev/null
@@ -1 +0,0 @@
-import './person-profile.js';
diff --git a/packages/person-profile/src/person-profile-demo.js b/packages/person-profile/src/vpu-person-profile-demo.js
similarity index 98%
rename from packages/person-profile/src/person-profile-demo.js
rename to packages/person-profile/src/vpu-person-profile-demo.js
index cd026c2100f988f25251719d4b06e798ca2e0616..b5e7452b16a40df004fdc45a821f4937183bf85b 100644
--- a/packages/person-profile/src/person-profile-demo.js
+++ b/packages/person-profile/src/vpu-person-profile-demo.js
@@ -1,7 +1,8 @@
+import 'vpu-auth';
 import {i18n} from './i18n.js';
 import {css, html, LitElement} from 'lit-element';
 import VPULitElement from 'vpu-common/vpu-lit-element';
-import './person-profile.js';
+import './vpu-person-profile.js';
 import * as commonUtils from 'vpu-common/utils';
 import bulmaCSSPath from "bulma/css/bulma.min.css";
 import $ from 'jquery';
diff --git a/packages/person-profile/src/person-profile.js b/packages/person-profile/src/vpu-person-profile.js
similarity index 100%
rename from packages/person-profile/src/person-profile.js
rename to packages/person-profile/src/vpu-person-profile.js
diff --git a/packages/person-profile/test/unit.js b/packages/person-profile/test/unit.js
index 102c83a22448c02d0e1e6fb5f7b4c5c844dc252f..9c4ca04eb3842f3ac53b316fafae40d0f1fc7b09 100644
--- a/packages/person-profile/test/unit.js
+++ b/packages/person-profile/test/unit.js
@@ -1,4 +1,4 @@
-import '../src/person-profile.js';
+import '../src/vpu-person-profile.js';
 import '../src/demo.js';
 
 describe('vpu-person-profile demo', () => {