diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/tabbedcontent.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbtabbedcontent.directive.js
similarity index 87%
rename from src/Umbraco.Web.UI.Client/src/common/directives/components/content/tabbedcontent.directive.js
rename to src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbtabbedcontent.directive.js
index 7e097f6082..015255c577 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/tabbedcontent.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbtabbedcontent.directive.js
@@ -7,7 +7,7 @@
         var directive = {
             restrict: 'E',
             replace: true,
-            templateUrl: 'views/components/content/tabbed-content.html',
+            templateUrl: 'views/components/content/umb-tabbed-content.html',
             controller: function ($scope) {
                 
                 //expose the property/methods for other directives to use
@@ -40,6 +40,6 @@
 
     }
     
-    angular.module('umbraco.directives').directive('tabbedContent', tabbedContentDirective);
+    angular.module('umbraco.directives').directive('umbTabbedContent', tabbedContentDirective);
 
 })();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/variantcontent.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontent.directive.js
similarity index 96%
rename from src/Umbraco.Web.UI.Client/src/common/directives/components/content/variantcontent.directive.js
rename to src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontent.directive.js
index b362b822fc..299c56cc7f 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/variantcontent.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontent.directive.js
@@ -11,7 +11,7 @@
         var directive = {
             restrict: 'E',
             replace: true,
-            templateUrl: 'views/components/content/variant-content.html',
+            templateUrl: 'views/components/content/umb-variant-content.html',
             link: function (scope) {
 
                 /**
@@ -124,6 +124,6 @@
 
     }
 
-    angular.module('umbraco.directives').directive('variantContent', variantContentDirective);
+    angular.module('umbraco.directives').directive('umbVariantContent', variantContentDirective);
 
 })();
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/edit.html b/src/Umbraco.Web.UI.Client/src/views/components/content/edit.html
index c4ac56ff96..14bbc8b576 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/content/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/content/edit.html
@@ -8,12 +8,13 @@
             
             <div class="umb-split-views">
                 <div class="umb-split-view" ng-class="{'umb-split-view--collapsed': editor.collapsed}" ng-repeat="editor in editors">
-                    <variant-content page="page"
-                                     content="content"
-                                     editor="editor"
-                                     editors="editors"
-                                     init-variant="initVariant(variant)">
-                    </variant-content>
+                    <umb-variant-content
+                        page="page"
+                        content="content"
+                        editor="editor"
+                        editors="editors"
+                        init-variant="initVariant(variant)">
+                    </umb-variant-content>
                 </div>
             </div>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/tabbed-content.html b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-tabbed-content.html
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/views/components/content/tabbed-content.html
rename to src/Umbraco.Web.UI.Client/src/views/components/content/umb-tabbed-content.html
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/variant-content.html b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-variant-content.html
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/views/components/content/variant-content.html
rename to src/Umbraco.Web.UI.Client/src/views/components/content/umb-variant-content.html
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/apps/content/content.html b/src/Umbraco.Web.UI.Client/src/views/content/apps/content/content.html
index 76d939a81e..d391f2cd95 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/apps/content/content.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/apps/content/content.html
@@ -1,5 +1,8 @@
 <div class="form-horizontal" ng-controller="Umbraco.Editors.Content.Apps.ContentController as vm">
 
-    <tabbed-content ng-if="!vm.loading" content="vm.content"></tabbed-content>
+    <umb-tabbed-content
+        ng-if="!vm.loading"
+        content="vm.content">
+    </umb-tabbed-content>
     
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/apps/content/content.html b/src/Umbraco.Web.UI.Client/src/views/media/apps/content/content.html
index 8c16a451d9..c0e2c2ae33 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/apps/content/content.html
+++ b/src/Umbraco.Web.UI.Client/src/views/media/apps/content/content.html
@@ -3,7 +3,7 @@
 
         <div class="umb-expansion-panel__header" ng-click="group.open = !group.open">
             <div>{{ group.label }}</div>
-            <ins class="umb-expansion-panel__expand icon-navigation-right" ng-class="{'icon-navigation-down': !group.open, 'icon-navigation-up': group.open}">&nbsp;</ins>
+            <ins class="umb-expansion-panel__expand" ng-class="{'icon-navigation-down': !group.open, 'icon-navigation-up': group.open}">&nbsp;</ins>
         </div>
 
         <div class="umb-expansion-panel__content" ng-show="group.open">