diff --git a/src/Umbraco.Web.UI.Client/gulp/tasks/views.js b/src/Umbraco.Web.UI.Client/gulp/tasks/views.js
index acfe8eb671..ab6d0c8d61 100644
--- a/src/Umbraco.Web.UI.Client/gulp/tasks/views.js
+++ b/src/Umbraco.Web.UI.Client/gulp/tasks/views.js
@@ -2,6 +2,7 @@
 
 var config = require('../config');
 var gulp = require('gulp');
+var rename = require('gulp-rename');
 
 var _ = require('lodash');
 var MergeStream = require('merge-stream');
@@ -12,15 +13,19 @@ function views() {
 
     _.forEach(config.sources.views, function (group) {
 
-      
+        var task = gulp.src(group.files)
+            .pipe(rename(function(path) {
+               path.dirname = path.dirname.toLowerCase();
+               path.basename = path.basename.toLowerCase();
+               path.extname = path.extname.toLowerCase();
+             }));
 
-        var task = gulp.src(group.files);
-        
         _.forEach(config.roots, function(root){
-            console.log("copying " + group.files + " to " + root + config.targets.views + group.folder)
-            task = task.pipe( gulp.dest(root + config.targets.views + group.folder));    
+            var destPath = root + config.targets.views + group.folder;
+            console.log("copying " + group.files + " to " + destPath)
+            task = task.pipe( gulp.dest(destPath));
         })
-        
+
         stream.add (task);
 
     });
diff --git a/src/Umbraco.Web.UI.Client/gulp/tasks/watchTask.js b/src/Umbraco.Web.UI.Client/gulp/tasks/watchTask.js
index 744481391a..7afb8d363f 100644
--- a/src/Umbraco.Web.UI.Client/gulp/tasks/watchTask.js
+++ b/src/Umbraco.Web.UI.Client/gulp/tasks/watchTask.js
@@ -4,6 +4,7 @@ const config = require('../config');
 const {watch, series, parallel, dest, src} = require('gulp');
 
 var _ = require('lodash');
+var rename = require('gulp-rename');
 var MergeStream = require('merge-stream');
 
 var processJs = require('../util/processJs');
@@ -12,9 +13,9 @@ var processLess = require('../util/processLess');
 var {js} = require('./js');
 
 function watchTask(cb) {
-    
+
     var watchInterval = 500;
-    
+
     //Setup a watcher for all groups of JS files
     _.forEach(config.sources.js, function (group) {
         if(group.watch !== false) {
@@ -36,11 +37,17 @@ function watchTask(cb) {
             viewWatcher = watch(group.files, { ignoreInitial: true, interval: watchInterval },
                 parallel(
                     function MoveViewsAndRegenerateJS() {
-                        var task = src(group.files);
+                        var task = src(group.files)
+                                 .pipe(rename(function(path) {
+                                        path.dirname = path.dirname.toLowerCase();
+                                        path.basename = path.basename.toLowerCase();
+                                        path.extname = path.extname.toLowerCase();
+                                     }));
 
                         _.forEach(config.roots, function(root){
-                            console.log("copying " + group.files + " to " + root + config.targets.views + group.folder);
-                            task = task.pipe( dest(root + config.targets.views + group.folder) );
+                            var destPath = root + config.targets.views + group.folder;
+                            console.log("copying " + group.files + " to " + destPath);
+                            task = task.pipe( dest(destPath) );
                         });
                     },
                     js
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js b/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
index f903c44ad5..ade4e2322c 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
@@ -319,7 +319,7 @@ function navigationService($routeParams, $location, $q, $injector, eventsService
             appState.setGlobalState("showTray", false);
         },
 
-        /**     
+        /**
          * @ngdoc method
          * @name umbraco.services.navigationService#syncTree
          * @methodOf umbraco.services.navigationService
@@ -352,14 +352,14 @@ function navigationService($routeParams, $location, $q, $injector, eventsService
             });
         },
 
-        /**     
+        /**
          * @ngdoc method
          * @name umbraco.services.navigationService#hasTree
          * @methodOf umbraco.services.navigationService
          *
          * @description
          * Checks if a tree with the given alias exists.
-         * 
+         *
          * @param {String} treeAlias the tree alias to check
          */
         hasTree: function (treeAlias) {
@@ -628,12 +628,12 @@ function navigationService($routeParams, $location, $q, $injector, eventsService
         getTreeTemplateUrl: function (treeAlias, action) {
             var packageTreeFolder = treeService.getTreePackageFolder(treeAlias);
             if (packageTreeFolder) {
-                return Umbraco.Sys.ServerVariables.umbracoSettings.appPluginsPath +
+                return (Umbraco.Sys.ServerVariables.umbracoSettings.appPluginsPath +
                     "/" + packageTreeFolder +
-                    "/backoffice/" + treeAlias + "/" + action + ".html";
+                    "/backoffice/" + treeAlias + "/" + action + ".html").toLowerCase();
             }
             else {
-                return "views/" + treeAlias + "/" + action + ".html";
+                return ("views/" + treeAlias + "/" + action + ".html").toLowerCase();;
             }
         },