diff --git a/frontend/app/components/wp-buttons/create-button/types-drop-down-menu.service.js b/frontend/app/components/wp-buttons/wp-create-button/types-drop-down-menu.service.js
similarity index 93%
rename from frontend/app/components/wp-buttons/create-button/types-drop-down-menu.service.js
rename to frontend/app/components/wp-buttons/wp-create-button/types-drop-down-menu.service.js
index e6fa989ded..47692eb205 100644
--- a/frontend/app/components/wp-buttons/create-button/types-drop-down-menu.service.js
+++ b/frontend/app/components/wp-buttons/wp-create-button/types-drop-down-menu.service.js
@@ -33,7 +33,7 @@ angular
 
 function typesDropDownMenu(ngContextMenu) {
   return ngContextMenu({
-    templateUrl: '/components/wp-buttons/create-button/types-drop-down-menu.template.html',
+    templateUrl: '/components/wp-buttons/wp-create-button/types-drop-down-menu.template.html',
     container: '.wp-create-button'
   });
 }
diff --git a/frontend/app/components/wp-buttons/create-button/types-drop-down-menu.template.html b/frontend/app/components/wp-buttons/wp-create-button/types-drop-down-menu.template.html
similarity index 100%
rename from frontend/app/components/wp-buttons/create-button/types-drop-down-menu.template.html
rename to frontend/app/components/wp-buttons/wp-create-button/types-drop-down-menu.template.html
diff --git a/frontend/app/components/wp-buttons/create-button/create-button.directive.html b/frontend/app/components/wp-buttons/wp-create-button/wp-create-button.directive.html
similarity index 100%
rename from frontend/app/components/wp-buttons/create-button/create-button.directive.html
rename to frontend/app/components/wp-buttons/wp-create-button/wp-create-button.directive.html
diff --git a/frontend/app/components/wp-buttons/create-button/create-button.directive.js b/frontend/app/components/wp-buttons/wp-create-button/wp-create-button.directive.js
similarity index 96%
rename from frontend/app/components/wp-buttons/create-button/create-button.directive.js
rename to frontend/app/components/wp-buttons/wp-create-button/wp-create-button.directive.js
index d4088a06ea..3e6d728ec4 100644
--- a/frontend/app/components/wp-buttons/create-button/create-button.directive.js
+++ b/frontend/app/components/wp-buttons/wp-create-button/wp-create-button.directive.js
@@ -33,7 +33,7 @@ angular
 function wpCreateButton() {
   return {
     restrict: 'E',
-    templateUrl: '/components/wp-buttons/create-button/create-button.directive.html',
+    templateUrl: '/components/wp-buttons/wp-create-button/wp-create-button.directive.html',
 
     scope: {
       projectIdentifier: '=',
diff --git a/frontend/app/components/wp-buttons/view-button/view-button.directive.html b/frontend/app/components/wp-buttons/wp-view-button/wp-view-button.directive.html
similarity index 100%
rename from frontend/app/components/wp-buttons/view-button/view-button.directive.html
rename to frontend/app/components/wp-buttons/wp-view-button/wp-view-button.directive.html
diff --git a/frontend/app/components/wp-buttons/view-button/view-button.directive.js b/frontend/app/components/wp-buttons/wp-view-button/wp-view-button.directive.js
similarity index 96%
rename from frontend/app/components/wp-buttons/view-button/view-button.directive.js
rename to frontend/app/components/wp-buttons/wp-view-button/wp-view-button.directive.js
index da9b60156e..ca06e49b33 100644
--- a/frontend/app/components/wp-buttons/view-button/view-button.directive.js
+++ b/frontend/app/components/wp-buttons/wp-view-button/wp-view-button.directive.js
@@ -33,7 +33,7 @@ angular
 function wpViewButton() {
   return {
     restrict: 'E',
-    templateUrl: '/components/wp-buttons/view-button/view-button.directive.html',
+    templateUrl: '/components/wp-buttons/wp-view-button/wp-view-button.directive.html',
 
     controller: WorkPackageViewButtonController
   };
diff --git a/frontend/app/components/wp-buttons/watcher-button/watcher-button.directive.html b/frontend/app/components/wp-buttons/wp-watcher-button/wp-watcher-button.directive.html
similarity index 100%
rename from frontend/app/components/wp-buttons/watcher-button/watcher-button.directive.html
rename to frontend/app/components/wp-buttons/wp-watcher-button/wp-watcher-button.directive.html
diff --git a/frontend/app/components/wp-buttons/watcher-button/watcher-button.directive.js b/frontend/app/components/wp-buttons/wp-watcher-button/wp-watcher-button.directive.js
similarity index 96%
rename from frontend/app/components/wp-buttons/watcher-button/watcher-button.directive.js
rename to frontend/app/components/wp-buttons/wp-watcher-button/wp-watcher-button.directive.js
index 16de6e82d5..b31ac75d8f 100644
--- a/frontend/app/components/wp-buttons/watcher-button/watcher-button.directive.js
+++ b/frontend/app/components/wp-buttons/wp-watcher-button/wp-watcher-button.directive.js
@@ -33,7 +33,7 @@ angular
 function wpWatcherButton() {
   return {
     replace: true,
-    templateUrl: '/components/wp-buttons/watcher-button/watcher-button.directive.html',
+    templateUrl: '/components/wp-buttons/wp-watcher-button/wp-watcher-button.directive.html',
 
     scope: {
       workPackage: '=',