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/blocklist.block.component.js
index ab2590e249..f30112568e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.block.component.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.block.component.js
@@ -3,16 +3,16 @@
 
     /**
      * @ngdoc component
-     * @name umbraco.directives.directive:umbBlockListBlockContent
+     * @name umbraco.directives.directive:umbBlockListBlock
      * @description
      * The component for a style-inheriting block of the block list property editor.
      */
     
     angular
         .module("umbraco")
-        .component("umbBlockListBlockContent", {
+        .component("umbBlockListBlock", {
             template: '<div ng-include="model.view"></div>',
-            controller: BlockListBlockContentController,
+            controller: BlockListBlockController,
             controllerAs: "model",
             bindings: {
                 view: "@",
@@ -23,7 +23,7 @@
         }
     );
 
-    function BlockListBlockContentController($scope) {
+    function BlockListBlockController($scope) {
         var model = this;
         model.$onInit = function() {
             $scope.block = model.block;
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/blocklist.component.html
index ea3537b52a..5f2737d263 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.component.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.component.html
@@ -20,10 +20,10 @@
 
                 <div class="umb-block-list__block" ng-class="{'--active':layout.$block.active}">
 
-                    <umb-block-list-scoped-block-content ng-if="layout.$block.config.stylesheet" class="umb-block-list__block--content blockelement__draggable-element" view="{{layout.$block.view}}" stylesheet="/{{::layout.$block.config.stylesheet}}" api="vm.blockEditorApi" block="layout.$block" index="$index">
-                    </umb-block-list-scoped-block-content>
-                    <umb-block-list-block-content ng-if="!layout.$block.config.stylesheet" class="umb-block-list__block--content" view="{{layout.$block.view}}" api="vm.blockEditorApi" block="layout.$block" index="$index">
-                    </umb-block-list-block-content>
+                    <umb-block-list-scoped-block ng-if="layout.$block.config.stylesheet" class="umb-block-list__block--content blockelement__draggable-element" view="{{layout.$block.view}}" stylesheet="/{{::layout.$block.config.stylesheet}}" api="vm.blockEditorApi" block="layout.$block" index="$index">
+                    </umb-block-list-scoped-block>
+                    <umb-block-list-block ng-if="!layout.$block.config.stylesheet" class="umb-block-list__block--content" view="{{layout.$block.view}}" api="vm.blockEditorApi" block="layout.$block" index="$index">
+                    </umb-block-list-block>
 
                     <div class="umb-block-list__block--actions">
                         <button type="button" class="btn-reset umb-outline action --settings" localize="title" title="actions_editSettings" ng-click="vm.blockEditorApi.openSettingsForBlock(layout.$block);" ng-if="layout.$block.showSettings === true">
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/blocklist.scopedblock.component.js
index f0a387f1e8..e67a568557 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/blocklist.scopedblock.component.js
@@ -3,15 +3,15 @@
 
     /**
      * @ngdoc component
-     * @name umbraco.directives.directive:umbBlockListScopedBlockContent
+     * @name umbraco.directives.directive:umbBlockListScopedBlock
      * @description
      * The component for a style-scoped block of the block list property editor.
      */
     
     angular
         .module("umbraco")
-        .component("umbBlockListScopedBlockContent", {
-            controller: BlockListScopedBlockContentController,
+        .component("umbBlockListScopedBlock", {
+            controller: BlockListScopedBlockController,
             controllerAs: "model",
             bindings: {
                 stylesheet: "@",
@@ -23,7 +23,7 @@
         }
     );
 
-    function BlockListScopedBlockContentController($compile, $element, $scope) {
+    function BlockListScopedBlockController($compile, $element, $scope) {
         var model = this;
         model.$onInit = function() {
             $scope.block = model.block;