diff --git a/src/Skybrud.LinkPicker/App_Plugins/Skybrud.LinkPicker/Scripts/Controllers/Elements/Links.js b/src/Skybrud.LinkPicker/App_Plugins/Skybrud.LinkPicker/Scripts/Controllers/Elements/LinkList.js
similarity index 96%
rename from src/Skybrud.LinkPicker/App_Plugins/Skybrud.LinkPicker/Scripts/Controllers/Elements/Links.js
rename to src/Skybrud.LinkPicker/App_Plugins/Skybrud.LinkPicker/Scripts/Controllers/Elements/LinkList.js
index 6049397..f0040ab 100644
--- a/src/Skybrud.LinkPicker/App_Plugins/Skybrud.LinkPicker/Scripts/Controllers/Elements/Links.js
+++ b/src/Skybrud.LinkPicker/App_Plugins/Skybrud.LinkPicker/Scripts/Controllers/Elements/LinkList.js
@@ -1,4 +1,4 @@
-angular.module("umbraco").controller("Skybrud.LinkPicker.Elements.Controller", function ($scope, editorService) {
+angular.module("umbraco").controller("Skybrud.LinkPicker.Elements.LinkList.Controller", function ($scope, editorService) {
 
     function parseUmbracoLink(link) {
         if (!link) return null;
diff --git a/src/Skybrud.LinkPicker/App_Plugins/Skybrud.LinkPicker/Views/Elements/Links.html b/src/Skybrud.LinkPicker/App_Plugins/Skybrud.LinkPicker/Views/Elements/LinkList.html
similarity index 98%
rename from src/Skybrud.LinkPicker/App_Plugins/Skybrud.LinkPicker/Views/Elements/Links.html
rename to src/Skybrud.LinkPicker/App_Plugins/Skybrud.LinkPicker/Views/Elements/LinkList.html
index 937d25e..d8b1c2a 100644
--- a/src/Skybrud.LinkPicker/App_Plugins/Skybrud.LinkPicker/Views/Elements/Links.html
+++ b/src/Skybrud.LinkPicker/App_Plugins/Skybrud.LinkPicker/Views/Elements/LinkList.html
@@ -1,4 +1,4 @@
-<div class="skybrud-elements-links" ng-controller="Skybrud.LinkPicker.Elements.Controller">
+<div class="skybrud-elements-links" ng-controller="Skybrud.LinkPicker.Elements.LinkList.Controller">
     <div ui-sortable="sortableOptions" ng-model="items">
         <div class="linkpicker-preview linkpicker-preview--sortable" ng-repeat="item in items">
             <i class="linkpicker-preview__icon icon-document" ng-if="item.value.properties.link.type == 'content'"></i>
diff --git a/src/Skybrud.LinkPicker/App_Plugins/Skybrud.LinkPicker/package.manifest b/src/Skybrud.LinkPicker/App_Plugins/Skybrud.LinkPicker/package.manifest
index 7dc777d..36d52c7 100644
--- a/src/Skybrud.LinkPicker/App_Plugins/Skybrud.LinkPicker/package.manifest
+++ b/src/Skybrud.LinkPicker/App_Plugins/Skybrud.LinkPicker/package.manifest
@@ -4,6 +4,6 @@
   ],
   "javascript": [
     "/App_Plugins/Skybrud.LinkPicker/Scripts/Controllers/Link.js",
-    "/App_Plugins/Skybrud.LinkPicker/Scripts/Controllers/Elements/Links.js"
+    "/App_Plugins/Skybrud.LinkPicker/Scripts/Controllers/Elements/LinkList.js"
   ]
 }
\ No newline at end of file