diff --git a/src/Umbraco.Web.UI.Client/src/less/belle.less b/src/Umbraco.Web.UI.Client/src/less/belle.less
index 445d87fbb9..91039fa62a 100644
--- a/src/Umbraco.Web.UI.Client/src/less/belle.less
+++ b/src/Umbraco.Web.UI.Client/src/less/belle.less
@@ -202,7 +202,7 @@
 // Property Editors
 @import "../views/propertyeditors/blockeditor/blockcard/umb-block-card-grid.less";
 @import "../views/propertyeditors/blockeditor/blockcard/blockcard.component.less";
-@import "../views/propertyeditors/blocklist/blocklist.component.less";
+@import "../views/propertyeditors/blocklist/umb-block-list-property-editor.less";
 @import "../views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.less";
 @import "../views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.overlay.less";
 @import "../views/propertyeditors/notsupported/notsupported.less";
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.content.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.content.html
new file mode 100644
index 0000000000..15c3b9594f
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.content.html
@@ -0,0 +1 @@
+<umb-element-editor-content model="model.content"></umb-element-editor-content>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.controller.js
index 08ffb4a9ae..e230d270a8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.controller.js
@@ -28,7 +28,7 @@ angular.module("umbraco")
             // replace view of content app.
             var contentApp = apps.find(entry => entry.alias === "umbContent");
             if(contentApp) {
-                contentApp.view = "views/common/infiniteeditors/elementeditor/elementeditor.content.html";
+                contentApp.view = "views/common/infiniteeditors/blockeditor/blockeditor.content.html";
                 if($scope.model.hideContent) {
                     apps.splice(apps.indexOf(contentApp), 1);
                 } else if ($scope.model.openSettings !== true) {
@@ -49,7 +49,7 @@ angular.module("umbraco")
                         "name": settingsName,
                         "alias": "settings",
                         "icon": "icon-settings",
-                        "view": "views/common/infiniteeditors/elementeditor/elementeditor.settings.html"
+                        "view": "views/common/infiniteeditors/blockeditor/blockeditor.settings.html"
                     };
                     vm.tabs.push(settingsTab);
                     if ($scope.model.openSettings) {
@@ -69,7 +69,7 @@ angular.module("umbraco")
 
         vm.close = function() {
             if ($scope.model && $scope.model.close) {
-                // TODO: If content has changed, we should notify user.
+                // TODO: check if content/settings has changed and ask user if they are sure.
                 $scope.model.close($scope.model);
             }
         }
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/elementeditor/elementeditor.settings.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.settings.html
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/elementeditor/elementeditor.settings.html
rename to src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.settings.html
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/elementeditor/elementeditor.content.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/elementeditor/elementeditor.content.html
deleted file mode 100644
index eb8c72c579..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/elementeditor/elementeditor.content.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div>
-    <umb-element-editor-content model="model.content"></umb-element-editor-content>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/elementeditor/elementEditor.content.component.html b/src/Umbraco.Web.UI.Client/src/views/components/elementeditor/umb-element-editor-content.component.html
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/elementeditor/elementEditor.content.component.html
rename to src/Umbraco.Web.UI.Client/src/views/components/elementeditor/umb-element-editor-content.component.html
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/elementeditor/elementEditor.content.component.js b/src/Umbraco.Web.UI.Client/src/views/components/elementeditor/umbelementeditorcontent.component.js
similarity index 80%
rename from src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/elementeditor/elementEditor.content.component.js
rename to src/Umbraco.Web.UI.Client/src/views/components/elementeditor/umbelementeditorcontent.component.js
index ccde5a3a73..6e4f2f42ae 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/elementeditor/elementEditor.content.component.js
+++ b/src/Umbraco.Web.UI.Client/src/views/components/elementeditor/umbelementeditorcontent.component.js
@@ -4,7 +4,7 @@
     angular
         .module('umbraco.directives')
         .component('umbElementEditorContent', {
-            templateUrl: 'views/common/infiniteeditors/elementeditor/elementEditor.content.component.html',
+            templateUrl: 'views/components/elementeditor/umb-element-editor-content.component.html',
             controller: ElementEditorContentComponentController,
             controllerAs: 'vm',
             bindings: {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.html
index eea9f01ff3..efadc4dfd6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.html
@@ -1 +1 @@
-<block-list-property-editor property-form="propertyForm" model="model"/>
+<umb-block-list-property-editor property-form="propertyForm" model="model"/>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.block.component.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-block.component.js
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.block.component.js
rename to src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-block.component.js
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.component.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.html
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.component.html
rename to src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.html
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.component.less b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.less
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.component.less
rename to src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.less
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.scopedblock.component.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-scoped-block.component.js
similarity index 90%
rename from src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.scopedblock.component.js
rename to src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-scoped-block.component.js
index 1b95b904cb..492423c132 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.scopedblock.component.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-scoped-block.component.js
@@ -6,6 +6,8 @@
      * @name umbraco.directives.directive:umbBlockListScopedBlock
      * @description
      * The component for a style-scoped block of the block list property editor.
+     * Uses a ShadowDom to make a scoped element.
+     * This way the backoffice styling does not collide with the block style.
      */
     
     angular
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.component.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js
similarity index 98%
rename from src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.component.js
rename to src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js
index 597f0bf588..fe1d8cbf6a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.component.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js
@@ -4,7 +4,7 @@
 
     /**
      * @ngdoc directive
-     * @name umbraco.directives.directive:blockListPropertyEditor
+     * @name umbraco.directives.directive:umbBlockListPropertyEditor
      * @function
      *
      * @description
@@ -12,8 +12,8 @@
      */
     angular
         .module("umbraco")
-        .component("blockListPropertyEditor", {
-            templateUrl: "views/propertyeditors/blocklist/blocklist.component.html",
+        .component("umbBlockListPropertyEditor", {
+            templateUrl: "views/propertyeditors/blocklist/umb-block-list-property-editor.html",
             controller: BlockListController,
             controllerAs: "vm",
             bindings: {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.component.createButton.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.createButton.controller.js
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.component.createButton.controller.js
rename to src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.createButton.controller.js