diff --git a/src/Bundle/ChillMainBundle/chill.webpack.config.js b/src/Bundle/ChillMainBundle/chill.webpack.config.js
index 5da1e6f14..6ee6e82f8 100644
--- a/src/Bundle/ChillMainBundle/chill.webpack.config.js
+++ b/src/Bundle/ChillMainBundle/chill.webpack.config.js
@@ -62,6 +62,6 @@ module.exports = function(encore, entries)
     encore.addEntry('ckeditor5', __dirname + '/Resources/public/modules/ckeditor5/index.js');
 
     // Address
-    encore.addEntry('address', __dirname + '/Resources/public/vuejs/Address/index.js');
+    encore.addEntry('vue_address', __dirname + '/Resources/public/vuejs/Address/index.js');
 
 };
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
index d0a118f62..c15869b1d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
@@ -359,5 +359,5 @@
 
 {% block css %}
   {{ parent() }}
-  {{ encore_entry_link_tags('accompanying_course_work_list') }}
+  {{ encore_entry_link_tags('vue_accourse_work_list') }}
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/create.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/create.html.twig
index d19c1f93f..19f32089e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/create.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/create.html.twig
@@ -15,10 +15,10 @@
     window.accompanyingCourse = {{ json|json_encode|raw }};
   </script>
 
-  {{ encore_entry_script_tags('accompanying_course_work_create') }}
+  {{ encore_entry_script_tags('vue_accourse_work_create') }}
 {% endblock %}
 
 {% block css %}
   {{ parent() }}
-  {{ encore_entry_link_tags('accompanying_course_work_create') }}
+  {{ encore_entry_link_tags('vue_accourse_work_create') }}
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/edit.html.twig
index 53314cf17..d40881559 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/edit.html.twig
@@ -16,10 +16,10 @@
     window.accompanyingCourseWork = {{ json|json_encode|raw }};
   </script>
 
-  {{ encore_entry_script_tags('accompanying_course_work_edit') }}
+  {{ encore_entry_script_tags('vue_accourse_work_edit') }}
 {% endblock %}
 
 {% block css %}
   {{ parent() }}
-  {{ encore_entry_link_tags('accompanying_course_work_edit') }}
+  {{ encore_entry_link_tags('vue_accourse_work_edit') }}
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_by_accompanying_period.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_by_accompanying_period.html.twig
index cc7bf2049..6b057307e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_by_accompanying_period.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_by_accompanying_period.html.twig
@@ -120,5 +120,5 @@
 
 {% block css %}
   {{ parent() }}
-  {{ encore_entry_link_tags('accompanying_course_work_list') }}
+  {{ encore_entry_link_tags('vue_accourse_work_list') }}
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig
index 12e1471e1..c03d9bc34 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig
@@ -28,7 +28,7 @@
     {% endblock %}
 
     {% block stylesheets %}
-        <link href="{{ asset('build/address.css') }}" type="text/css" rel="stylesheet" />
+        {{ encore_entry_link_tags('vue_address') }}
     {% endblock %}
 
     {% block js %}
@@ -38,7 +38,7 @@
             window.mode = 'edit';
             window.vueRootComponent = 'app';
         </script>
-        {{ encore_entry_script_tags('address') }}
+        {{ encore_entry_script_tags('vue_address') }}
     {% endblock %}
 
 {% endblock personcontent %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
index add66b2ea..68af0967c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
@@ -28,7 +28,7 @@
     {% endblock %}
 
     {% block stylesheets %}
-        <link href="{{ asset('build/address.css') }}" type="text/css" rel="stylesheet" />
+        {{ encore_entry_link_tags('vue_address') }}
     {% endblock %}
 
     {% block js %}
@@ -37,7 +37,7 @@
             window.mode = 'new';
             window.vueRootComponent = 'app';
         </script>
-        {{ encore_entry_script_tags('address') }}
+        {{ encore_entry_script_tags('vue_address') }}
     {% endblock %}
 
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig
index 95c57d7bc..935eb70fa 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig
@@ -10,7 +10,7 @@
     </div>
 
     {% block stylesheets %}
-        <link href="{{ asset('build/address.css') }}" type="text/css" rel="stylesheet" />
+        {{ encore_entry_link_tags('vue_address') }}
     {% endblock %}
 
     {% block js %}
@@ -20,7 +20,7 @@
             window.mode = 'edit';
             window.vueRootComponent = 'app';
         </script>
-        {{ encore_entry_script_tags('household_address') }}
+        {{ encore_entry_script_tags('vue_household_address') }}
     {% endblock %}
 
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig
index 16f693e61..095ae26ff 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig
@@ -10,7 +10,7 @@
     </div>
 
     {% block stylesheets %}
-        <link href="{{ asset('build/address.css') }}" type="text/css" rel="stylesheet" />
+        {{ encore_entry_link_tags('vue_address') }}
     {% endblock %}
 
     {% block js %}
@@ -18,7 +18,7 @@
             window.householdId = {{ household.id|e('js') }};
             window.vueRootComponent = 'app';
         </script>
-        {{ encore_entry_script_tags('household_address') }}
+        {{ encore_entry_script_tags('vue_household_address') }}
     {% endblock %}
 
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/members_editor.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/members_editor.html.twig
index acfa4e201..e2bb5940e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/members_editor.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/members_editor.html.twig
@@ -17,9 +17,9 @@
     window.household_members_editor_data = {{ data|json_encode|raw }};
     window.household_members_editor_expand_suggestions = {{ expandSuggestions }};
   </script>
-  {{ encore_entry_script_tags('household_members_editor') }}
+  {{ encore_entry_script_tags('vue_household_members_editor') }}
 {% endblock %}
 
 {% block css %}
-  {{ encore_entry_link_tags('household_members_editor') }}
+  {{ encore_entry_link_tags('vue_household_members_editor') }}
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/chill.webpack.config.js b/src/Bundle/ChillPersonBundle/chill.webpack.config.js
index a41b07286..5eaaca076 100644
--- a/src/Bundle/ChillPersonBundle/chill.webpack.config.js
+++ b/src/Bundle/ChillPersonBundle/chill.webpack.config.js
@@ -8,12 +8,13 @@ module.exports = function(encore, entries)
         ChillPersonAssets: __dirname + '/Resources/public'
     });
 
-    encore.addEntry('household_address', __dirname + '/Resources/public/vuejs/HouseholdAddress/index.js');
-    encore.addEntry('household_members_editor', __dirname + '/Resources/public/vuejs/HouseholdMembersEditor/index.js');
+    encore.addEntry('vue_household_address', __dirname + '/Resources/public/vuejs/HouseholdAddress/index.js');
+    encore.addEntry('vue_household_members_editor', __dirname + '/Resources/public/vuejs/HouseholdMembersEditor/index.js');
     encore.addEntry('vue_accourse', __dirname + '/Resources/public/vuejs/AccompanyingCourse/index.js');
+    encore.addEntry('vue_accourse_work_create', __dirname + '/Resources/public/vuejs/AccompanyingCourseWorkCreate/index.js');
+    encore.addEntry('vue_accourse_work_edit', __dirname + '/Resources/public/vuejs/AccompanyingCourseWorkEdit/index.js');
+    
+    encore.addEntry('vue_accourse_work_list', __dirname + '/Resources/public/modules/accompanying_course_work_list/index.js'); // why in modules ?
     encore.addEntry('household_edit_metadata', __dirname + '/Resources/public/modules/household_edit_metadata/index.js');
-    encore.addEntry('accompanying_course_work_create', __dirname + '/Resources/public/vuejs/AccompanyingCourseWorkCreate/index.js');
-    encore.addEntry('accompanying_course_work_edit', __dirname + '/Resources/public/vuejs/AccompanyingCourseWorkEdit/index.js');
-    encore.addEntry('accompanying_course_work_list', __dirname + '/Resources/public/modules/accompanying_course_work_list/index.js');
     encore.addEntry('person', __dirname + '/Resources/public/js/person.js');
 };