diff --git a/src/Umbraco.Web.UI.Client/src/common/services/udihelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/udiParser.service.js
similarity index 80%
rename from src/Umbraco.Web.UI.Client/src/common/services/udihelper.service.js
rename to src/Umbraco.Web.UI.Client/src/common/services/udiParser.service.js
index e554745dd0..1bc384841d 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/udihelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/udiParser.service.js
@@ -3,16 +3,16 @@
 
     /**
     * @ngdoc service
-    * @name umbraco.services.udiHelper
-    * @description A helper object used to work with UDIs
+    * @name umbraco.services.udiParser
+    * @description A object used to parse UDIs
     **/
-    function udiHelper() {
+    function udiParser() {
         return {
-            
+
             /**
              * @ngdoc method
-             * @name umbraco.services.udiHelper#parse
-             * @methodOf umbraco.services.udiHelper
+             * @name umbraco.services.udiParser#parse
+             * @methodOf umbraco.services.udiParser
              * @function
              *
              * @description
@@ -42,6 +42,6 @@
         }
     }
 
-    angular.module("umbraco.services").factory("udiHelper", udiHelper);
+    angular.module("umbraco.services").factory("udiParser", udiParser);
 
 })();
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js
index dc022da32d..56897d2716 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js
@@ -1,6 +1,6 @@
 //used for the media picker dialog
 angular.module("umbraco").controller("Umbraco.Editors.LinkPickerController",
-    function ($scope, eventsService, entityResource, contentResource, mediaResource, mediaHelper, udiHelper, userService, localizationService, tinyMceService, editorService) {
+    function ($scope, eventsService, entityResource, contentResource, mediaResource, mediaHelper, udiParser, userService, localizationService, tinyMceService, editorService) {
         
         var vm = this;
         var dialogOptions = $scope.model;
@@ -66,9 +66,9 @@ angular.module("umbraco").controller("Umbraco.Editors.LinkPickerController",
 
                 if ($scope.model.target.udi) {
                     // extract the entity type from the udi and set target.isMedia accordingly
-                    var udi = udiHelper.parse(id);
+                    var udi = udiParser.parse(id);
 
-                    if (udi && udi.entityType === 'media') {
+                    if (udi && udi.entityType === "media") {
                         $scope.model.target.isMedia = true;
                     } else {
                         delete $scope.model.target.isMedia;
diff --git a/src/Umbraco.Web.UI.Client/test/unit/common/services/udi-helper.spec.js b/src/Umbraco.Web.UI.Client/test/unit/common/services/udi-parser.spec.js
similarity index 81%
rename from src/Umbraco.Web.UI.Client/test/unit/common/services/udi-helper.spec.js
rename to src/Umbraco.Web.UI.Client/test/unit/common/services/udi-parser.spec.js
index 0f8bc94399..6d7cdffef3 100644
--- a/src/Umbraco.Web.UI.Client/test/unit/common/services/udi-helper.spec.js
+++ b/src/Umbraco.Web.UI.Client/test/unit/common/services/udi-parser.spec.js
@@ -1,11 +1,11 @@
-describe("udiHelper tests", function () {
+describe("udiParser tests", function () {
 
-    var udiHelper;
+    var udiParser;
 
     beforeEach(module('umbraco.services'));
 
     beforeEach(inject(function ($injector) {
-        udiHelper = $injector.get('udiHelper');        
+        udiParser = $injector.get('udiParser');
     }));
 
     describe("Parse UDI", function () {
@@ -14,7 +14,7 @@ describe("udiHelper tests", function () {
             var key = "c0a62ced-6402-4025-8d46-a234a34f6a56";
             var value = "umb://" + entityType + "/" + key;
 
-            var udi = udiHelper.parse(value);
+            var udi = udiParser.parse(value);
 
             expect(udi.entityType).toBe(entityType);
             expect(udi.value).toBe(key);
@@ -25,7 +25,7 @@ describe("udiHelper tests", function () {
             var key = "f82f3313-f8e9-42b0-a67f-80a7f452dd21";
             var value = "umb://" + entityType + "/" + key;
 
-            var udi = udiHelper.parse(value);
+            var udi = udiParser.parse(value);
 
             expect(udi.entityType).toBe(entityType);
             expect(udi.value).toBe(key);
@@ -34,7 +34,7 @@ describe("udiHelper tests", function () {
         it("returns the full UDI when calling toString() on the returned value", function() {
             var value = "umb://document/c0a62ced-6402-4025-8d46-a234a34f6a56";
 
-            var udi = udiHelper.parse(value);
+            var udi = udiParser.parse(value);
 
             expect(udi.toString()).toBe(value);
         });
@@ -43,7 +43,7 @@ describe("udiHelper tests", function () {
             var entityType = "media";
             var value = "umb://" + entityType;
 
-            var udi = udiHelper.parse(value);
+            var udi = udiParser.parse(value);
 
             expect(udi.entityType).toBe(entityType);
             expect(udi.value).toBeNull();
@@ -53,7 +53,7 @@ describe("udiHelper tests", function () {
         it("returns null if the input is invalid", function() {
             var value = "not an UDI";
 
-            var udi = udiHelper.parse(value);
+            var udi = udiParser.parse(value);
 
             expect(udi).toBeNull();
         });