diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umblistview.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umblistviewsettings.directive.js
similarity index 93%
rename from src/Umbraco.Web.UI.Client/src/common/directives/components/umblistview.directive.js
rename to src/Umbraco.Web.UI.Client/src/common/directives/components/umblistviewsettings.directive.js
index dadcefce95..ae9da02237 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umblistview.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umblistviewsettings.directive.js
@@ -1,7 +1,7 @@
 (function() {
   'use strict';
 
-  function ListViewDirective(contentTypeResource, dataTypeResource, dataTypeHelper) {
+  function ListViewSettingsDirective(contentTypeResource, dataTypeResource, dataTypeHelper) {
 
     function link(scope, el, attr, ctrl) {
 
@@ -135,7 +135,7 @@
     var directive = {
       restrict: 'E',
       replace: true,
-      templateUrl: 'views/components/umb-list-view.html',
+      templateUrl: 'views/components/umb-list-view-settings.html',
       scope: {
         enableListView: "=",
         listViewName: "=",
@@ -148,6 +148,6 @@
     return directive;
   }
 
-  angular.module('umbraco.directives').directive('umbListView', ListViewDirective);
+  angular.module('umbraco.directives').directive('umbListViewSettings', ListViewSettingsDirective);
 
 })();
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-list-view.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-list-view-settings.html
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/views/components/umb-list-view.html
rename to src/Umbraco.Web.UI.Client/src/views/components/umb-list-view-settings.html
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/listview/listview.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/listview/listview.html
index da9378c22f..4c681fe14e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/listview/listview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/listview/listview.html
@@ -9,12 +9,12 @@
 
     <div class="sub-view-column-right">
 
-      <umb-list-view
+      <umb-list-view-settings
         enable-list-view="model.isContainer"
         model-alias="model.alias"
         list-view-name="model.listViewEditorName"
         content-type="documentType">
-      </umb-list-view>
+      </umb-list-view-settings>
 
     </div>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatypes/views/listview/listview.html b/src/Umbraco.Web.UI.Client/src/views/mediatypes/views/listview/listview.html
index 301029bb1d..4aab0613b8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/views/listview/listview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/views/listview/listview.html
@@ -9,12 +9,12 @@
 
     <div class="sub-view-column-right">
 
-      <umb-list-view
+      <umb-list-view-settings
         enable-list-view="model.isContainer"
         model-alias="model.alias"
         list-view-name="model.listViewEditorName"
         content-type="mediaType">
-      </umb-list-view>
+      </umb-list-view-settings>
 
     </div>