diff --git a/dashboard-ui/about.html b/dashboard-ui/about.html
index 07b14cd8b8..677888f227 100644
--- a/dashboard-ui/about.html
+++ b/dashboard-ui/about.html
@@ -13,7 +13,7 @@
                         <a href="support.html" data-role="button">General</a>
                         <a href="log.html" data-role="button">View Log</a>
                         <a href="supporter.html" data-role="button">Become a Supporter</a>
-                        <a href="supporterKey.html" data-role="button">Supporter Key</a>
+                        <a href="supporterkey.html" data-role="button">Supporter Key</a>
                         <a href="about.html" data-role="button" class="ui-btn-active">About</a>
                     </div>
                     <p>
diff --git a/dashboard-ui/addplugin.html b/dashboard-ui/addplugin.html
index 23a7941920..018995d21e 100644
--- a/dashboard-ui/addplugin.html
+++ b/dashboard-ui/addplugin.html
@@ -9,7 +9,7 @@
         <div data-role="content">
             <div class="content-primary">
                 <p>
-                    <a data-role="button" data-icon="arrow-left" data-inline="true" data-mini="true" data-theme="b" href="pluginCatalog.html">Plugin Catalog</a>
+                    <a data-role="button" data-icon="arrow-left" data-inline="true" data-mini="true" data-theme="b" href="plugincatalog.html">Plugin Catalog</a>
                 </p>
                 <form id="addPluginForm">
                     <p id="tagline" style="font-style: italic;"></p>
diff --git a/dashboard-ui/advancedmetadata.html b/dashboard-ui/advancedmetadata.html
index 6ea3d7e74b..9ba525af40 100644
--- a/dashboard-ui/advancedmetadata.html
+++ b/dashboard-ui/advancedmetadata.html
@@ -11,8 +11,8 @@
             <div class="content-primary">
                 <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
                     <a href="metadata.html" data-role="button">Basics</a>
-                    <a href="metadataImages.html" data-role="button">Images</a>
-                    <a href="advancedMetadata.html" data-role="button" class="ui-btn-active">Advanced</a>
+                    <a href="metadataimages.html" data-role="button">Images</a>
+                    <a href="advancedmetadata.html" data-role="button" class="ui-btn-active">Advanced</a>
                 </div>
 
                 <form id="advancedMetadataConfigurationForm">
diff --git a/dashboard-ui/dashboard.html b/dashboard-ui/dashboard.html
index 3e67503df9..40b51a4ca2 100644
--- a/dashboard-ui/dashboard.html
+++ b/dashboard-ui/dashboard.html
@@ -47,7 +47,7 @@
                         <h3>Running Tasks</h3>
                         <div id="divRunningTasks">
                         </div>
-                        <p><a href="scheduledTasks.html">Manage Scheduled Tasks</a></p>
+                        <p><a href="scheduledtasks.html">Manage Scheduled Tasks</a></p>
                     </div>
                 </div>
             </div>
diff --git a/dashboard-ui/edituser.html b/dashboard-ui/edituser.html
index 85ae14132e..5a6a0695f4 100644
--- a/dashboard-ui/edituser.html
+++ b/dashboard-ui/edituser.html
@@ -10,8 +10,8 @@
             <div class="content-primary">
                 <div data-role="controlgroup" data-type="horizontal" class="localnav" id="userProfileNavigation" style="display: none;" data-mini="true">
                     <a href="#" data-role="button" class="ui-btn-active">Profile</a>
-                    <a href="#" data-role="button" onclick="Dashboard.navigate('userImage.html', true);">Image</a>
-                    <a href="#" data-role="button" onclick="Dashboard.navigate('updatePassword.html', true);">Password</a>
+                    <a href="#" data-role="button" onclick="Dashboard.navigate('userimage.html', true);">Image</a>
+                    <a href="#" data-role="button" onclick="Dashboard.navigate('updatepassword.html', true);">Password</a>
                     <a href="#" data-role="button" onclick="Dashboard.navigate('library.html', true);">Media Library</a>
                 </div>
                 <form id="editUserProfileForm">
diff --git a/dashboard-ui/library.html b/dashboard-ui/library.html
index 9ba35b03ac..9b52ae4816 100644
--- a/dashboard-ui/library.html
+++ b/dashboard-ui/library.html
@@ -9,9 +9,9 @@
         <div data-role="content">
             <div class="content-primary">
                 <div data-role="controlgroup" data-type="horizontal" class="localnav" id="userProfileNavigation" style="display: none;" data-mini="true">
-                    <a href="#" data-role="button" onclick="Dashboard.navigate('editUser.html', true);">Profile</a>
-                    <a href="#" data-role="button" onclick="Dashboard.navigate('userImage.html', true);">Image</a>
-                    <a href="#" data-role="button" onclick="Dashboard.navigate('updatePassword.html', true);">Password</a>
+                    <a href="#" data-role="button" onclick="Dashboard.navigate('edituser.html', true);">Profile</a>
+                    <a href="#" data-role="button" onclick="Dashboard.navigate('userimage.html', true);">Image</a>
+                    <a href="#" data-role="button" onclick="Dashboard.navigate('updatepassword.html', true);">Password</a>
                     <a href="#" data-role="button" class="ui-btn-active">Media Library</a>
                 </div>
                 <div class="readOnlyContent">
diff --git a/dashboard-ui/log.html b/dashboard-ui/log.html
index 0cc5bbbf17..0b6287ef03 100644
--- a/dashboard-ui/log.html
+++ b/dashboard-ui/log.html
@@ -12,7 +12,7 @@
                     <a href="support.html" data-role="button">General</a>
                     <a href="log.html" data-role="button" class="ui-btn-active">View Log</a>
                     <a href="supporter.html" data-role="button">Become a Supporter</a>
-                    <a href="supporterKey.html" data-role="button">Supporter Key</a>
+                    <a href="supporterkey.html" data-role="button">Supporter Key</a>
                     <a href="about.html" data-role="button">About</a>
                 </div>
                 <p>
diff --git a/dashboard-ui/metadata.html b/dashboard-ui/metadata.html
index 15b2943e43..65a879c65d 100644
--- a/dashboard-ui/metadata.html
+++ b/dashboard-ui/metadata.html
@@ -11,8 +11,8 @@
             <div class="content-primary">
                 <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
                     <a href="metadata.html" data-role="button" class="ui-btn-active">Basics</a>
-                    <a href="metadataImages.html" data-role="button">Images</a>
-                    <a href="advancedMetadata.html" data-role="button">Advanced</a>
+                    <a href="metadataimages.html" data-role="button">Images</a>
+                    <a href="advancedmetadata.html" data-role="button">Advanced</a>
                 </div>
 
                 <form id="metadataConfigurationForm">
diff --git a/dashboard-ui/metadataimages.html b/dashboard-ui/metadataimages.html
index 41cf20616a..069ee0f5fc 100644
--- a/dashboard-ui/metadataimages.html
+++ b/dashboard-ui/metadataimages.html
@@ -11,8 +11,8 @@
             <div class="content-primary">
                 <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
                     <a href="metadata.html" data-role="button">Basics</a>
-                    <a href="metadataImages.html" data-role="button" class="ui-btn-active">Images</a>
-                    <a href="advancedMetadata.html" data-role="button">Advanced</a>
+                    <a href="metadataimages.html" data-role="button" class="ui-btn-active">Images</a>
+                    <a href="advancedmetadata.html" data-role="button">Advanced</a>
                 </div>
 
                 <form id="metadataImagesConfigurationForm">
diff --git a/dashboard-ui/plugincatalog.html b/dashboard-ui/plugincatalog.html
index 1b5ad74286..ab37487777 100644
--- a/dashboard-ui/plugincatalog.html
+++ b/dashboard-ui/plugincatalog.html
@@ -10,8 +10,8 @@
             <div class="content-primary">
                 <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
                     <a href="plugins.html" data-role="button">Installed Plugins</a>
-                    <a href="pluginCatalog.html" data-role="button" class="ui-btn-active">Plugin Catalog</a>
-                    <a href="pluginUpdates.html" data-role="button">Automatic Updates</a>
+                    <a href="plugincatalog.html" data-role="button" class="ui-btn-active">Plugin Catalog</a>
+                    <a href="pluginupdates.html" data-role="button">Automatic Updates</a>
                 </div>
 
                 <div id="pluginTiles"></div>
diff --git a/dashboard-ui/plugins.html b/dashboard-ui/plugins.html
index ee74ae3756..c423efc072 100644
--- a/dashboard-ui/plugins.html
+++ b/dashboard-ui/plugins.html
@@ -10,8 +10,8 @@
             <div class="content-primary">
                 <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
                     <a href="plugins.html" data-role="button" class="ui-btn-active">Installed Plugins</a>
-                    <a href="pluginCatalog.html" data-role="button">Plugin Catalog</a>
-                    <a href="pluginUpdates.html" data-role="button">Automatic Updates</a>
+                    <a href="plugincatalog.html" data-role="button">Plugin Catalog</a>
+                    <a href="pluginupdates.html" data-role="button">Automatic Updates</a>
                 </div>
 
                 <div class="readOnlyContent">
diff --git a/dashboard-ui/pluginupdates.html b/dashboard-ui/pluginupdates.html
index ed5ba54b11..a0b661c2bb 100644
--- a/dashboard-ui/pluginupdates.html
+++ b/dashboard-ui/pluginupdates.html
@@ -10,8 +10,8 @@
             <div class="content-primary">
                 <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
                     <a href="plugins.html" data-role="button">Installed Plugins</a>
-                    <a href="pluginCatalog.html" data-role="button">Plugin Catalog</a>
-                    <a href="pluginUpdates.html" data-role="button" class="ui-btn-active">Automatic Updates</a>
+                    <a href="pluginctalog.html" data-role="button">Plugin Catalog</a>
+                    <a href="pluginupdates.html" data-role="button" class="ui-btn-active">Automatic Updates</a>
                 </div>
 
                 <form id="pluginUpdatesForm">
diff --git a/dashboard-ui/scripts/edituserpage.js b/dashboard-ui/scripts/edituserpage.js
index 0d362e5dea..b674d0b941 100644
--- a/dashboard-ui/scripts/edituserpage.js
+++ b/dashboard-ui/scripts/edituserpage.js
@@ -150,7 +150,7 @@
         if (userId) {
             Dashboard.alert("Settings saved.");
         } else {
-            Dashboard.navigate("userProfiles.html");
+            Dashboard.navigate("userprofiles.html");
         }
     },
 
diff --git a/dashboard-ui/scripts/scheduledtaskspage.js b/dashboard-ui/scripts/scheduledtaskspage.js
index 3be7ccc30e..297044f82c 100644
--- a/dashboard-ui/scripts/scheduledtaskspage.js
+++ b/dashboard-ui/scripts/scheduledtaskspage.js
@@ -92,7 +92,7 @@
 
             html += "<li>";
 
-            html += "<a href='scheduledTask.html?id=" + task.Id + "'>";
+            html += "<a href='scheduledtask.html?id=" + task.Id + "'>";
 
             html += "<h3>" + task.Name + "</h3>";
 
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index e86d969b4c..abeb381300 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -434,7 +434,7 @@ var Dashboard = {
 
             var hasPrimaryImage = item.ImageTags && item.ImageTags.Primary;
 
-            var href = item.IsFolder ? (item.Id ? "itemList.html?parentId=" + item.Id : "#") : "itemDetails.html?id=" + item.Id;
+            var href = item.IsFolder ? (item.Id ? "itemlist.html?parentId=" + item.Id : "#") : "itemdetails.html?id=" + item.Id;
 
             var showText = options.showTitle || !hasPrimaryImage || (item.Type !== 'Movie' && item.Type !== 'Series' && item.Type !== 'Season' && item.Type !== 'Trailer');
 
@@ -539,7 +539,7 @@ var Dashboard = {
             html += '<img style="max-height:125px;max-width:200px;" src="' + imageUrl + '" />';
             html += '</p>';
 
-            html += '<p><button type="button" onclick="Dashboard.navigate(\'editUser.html?userId=' + user.Id + '\');" data-icon="user">View Profile</button></p>';
+            html += '<p><button type="button" onclick="Dashboard.navigate(\'edituser.html?userId=' + user.Id + '\');" data-icon="user">View Profile</button></p>';
             html += '<p><button type="button" onclick="Dashboard.logout();" data-icon="lock">Sign Out</button></p>';
             html += '</div>';
 
@@ -857,11 +857,11 @@ var Dashboard = {
             selected: page.hasClass("pluginConfigurationPage")
         }, {
             name: "User Profiles",
-            href: "userProfiles.html",
+            href: "userprofiles.html",
             selected: page.hasClass("userProfilesConfigurationPage")
         }, {
             name: "Display Settings",
-            href: "uiSettings.html",
+            href: "uisettings.html",
             selected: pageElem.id == "displaySettingsPage"
         }, {
             name: "Advanced",
@@ -869,7 +869,7 @@ var Dashboard = {
             selected: pageElem.id == "advancedConfigurationPage"
         }, {
             name: "Scheduled Tasks",
-            href: "scheduledTasks.html",
+            href: "scheduledtasks.html",
             selected: pageElem.id == "scheduledTasksPage" || pageElem.id == "scheduledTaskPage"
         }, {
             name: "Help",
diff --git a/dashboard-ui/scripts/supporterpage.js b/dashboard-ui/scripts/supporterpage.js
index 77df261c50..2692f4eaf2 100644
--- a/dashboard-ui/scripts/supporterpage.js
+++ b/dashboard-ui/scripts/supporterpage.js
@@ -19,7 +19,7 @@
             } else {
                 $('.supporterOnly', page).hide();
             }
-            $('#paypalReturnUrl', page).val(ApiClient.getUrl("dashboard/supporterKey.html"));
+            $('#paypalReturnUrl', page).val(ApiClient.getUrl("dashboard/supporterkey.html"));
             Dashboard.hideLoadingMsg();
         });
     }
diff --git a/dashboard-ui/scripts/userprofilespage.js b/dashboard-ui/scripts/userprofilespage.js
index c8a6f49d8a..57e6f7c747 100644
--- a/dashboard-ui/scripts/userprofilespage.js
+++ b/dashboard-ui/scripts/userprofilespage.js
@@ -22,7 +22,7 @@
 
             html += "<li>";
 
-            html += "<a onclick='Dashboard.navigate(\"editUser.html?userId=" + user.Id + "\");' href='#'>";
+            html += "<a onclick='Dashboard.navigate(\"edituser.html?userId=" + user.Id + "\");' href='#'>";
 
             if (user.PrimaryImageTag) {
 
diff --git a/dashboard-ui/scripts/wizardstartpage.js b/dashboard-ui/scripts/wizardstartpage.js
index 4d3dbfd198..344d4321b2 100644
--- a/dashboard-ui/scripts/wizardstartpage.js
+++ b/dashboard-ui/scripts/wizardstartpage.js
@@ -6,10 +6,10 @@
 
             if (users.length > 1) {
 
-                Dashboard.navigate('wizardLibrary.html');
+                Dashboard.navigate('wizardlibrary.html');
 
             } else {
-                Dashboard.navigate('wizardUser.html');
+                Dashboard.navigate('wizarduser.html');
             }
         });
 
diff --git a/dashboard-ui/scripts/wizarduserpage.js b/dashboard-ui/scripts/wizarduserpage.js
index a01654ae1a..617b052270 100644
--- a/dashboard-ui/scripts/wizarduserpage.js
+++ b/dashboard-ui/scripts/wizarduserpage.js
@@ -51,7 +51,7 @@
         
         Dashboard.hideLoadingMsg();
 
-        Dashboard.navigate('wizardLibrary.html');
+        Dashboard.navigate('wizardlibrary.html');
     }
 
 };
diff --git a/dashboard-ui/support.html b/dashboard-ui/support.html
index 185ae01e61..a5c5057fff 100644
--- a/dashboard-ui/support.html
+++ b/dashboard-ui/support.html
@@ -13,7 +13,7 @@
                         <a href="support.html" data-role="button" class="ui-btn-active">General</a>
                         <a href="log.html" data-role="button">View Log</a>
                         <a href="supporter.html" data-role="button">Become a Supporter</a>
-                        <a href="supporterKey.html" data-role="button">Supporter Key</a>
+                        <a href="supporterkey.html" data-role="button">Supporter Key</a>
                         <a href="about.html" data-role="button">About</a>
                     </div>
                     <h2>General Help</h2>
diff --git a/dashboard-ui/supporter.html b/dashboard-ui/supporter.html
index f45748211d..2e2f1eb7b7 100644
--- a/dashboard-ui/supporter.html
+++ b/dashboard-ui/supporter.html
@@ -13,7 +13,7 @@
                         <a href="support.html" data-role="button">General</a>
                         <a href="log.html" data-role="button">View Log</a>
                         <a href="supporter.html" data-role="button" class="ui-btn-active">Become a Supporter</a>
-                        <a href="supporterKey.html" data-role="button">Supporter Key</a>
+                        <a href="supporterkey.html" data-role="button">Supporter Key</a>
                         <a href="about.html" data-role="button">About</a>
                     </div>
                     <h2>Support the Media Browser Team</h2>
diff --git a/dashboard-ui/supporterkey.html b/dashboard-ui/supporterkey.html
index c81e9a3fe3..6db5ae4845 100644
--- a/dashboard-ui/supporterkey.html
+++ b/dashboard-ui/supporterkey.html
@@ -13,7 +13,7 @@
                         <a href="support.html" data-role="button">General</a>
                         <a href="log.html" data-role="button">View Log</a>
                         <a href="supporter.html" data-role="button">Become a Supporter</a>
-                        <a href="supporterKey.html" data-role="button" class="ui-btn-active">Supporter Key</a>
+                        <a href="supporterkey.html" data-role="button" class="ui-btn-active">Supporter Key</a>
                         <a href="about.html" data-role="button">About</a>
                     </div>
                     <h2>Supporter Key</h2>
diff --git a/dashboard-ui/updatepassword.html b/dashboard-ui/updatepassword.html
index 88306e3ede..708ff48a58 100644
--- a/dashboard-ui/updatepassword.html
+++ b/dashboard-ui/updatepassword.html
@@ -9,8 +9,8 @@
         <div data-role="content">
             <div class="content-primary">
                 <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
-                    <a href="#" onclick="Dashboard.navigate('editUser.html', true);" data-role="button">Profile</a>
-                    <a href="#" data-role="button" onclick="Dashboard.navigate('userImage.html', true);">Image</a>
+                    <a href="#" onclick="Dashboard.navigate('edituser.html', true);" data-role="button">Profile</a>
+                    <a href="#" data-role="button" onclick="Dashboard.navigate('userimage.html', true);">Image</a>
                     <a href="#" data-role="button" class="ui-btn-active">Password</a>
                     <a href="#" data-role="button" onclick="Dashboard.navigate('library.html', true);">Media Library</a>
                 </div>
diff --git a/dashboard-ui/userimage.html b/dashboard-ui/userimage.html
index c28d2129ef..a2d02eed2d 100644
--- a/dashboard-ui/userimage.html
+++ b/dashboard-ui/userimage.html
@@ -9,9 +9,9 @@
         <div data-role="content">
             <div class="content-primary">
                 <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
-                    <a href="#" onclick="Dashboard.navigate('editUser.html', true);" data-role="button">Profile</a>
+                    <a href="#" onclick="Dashboard.navigate('edituser.html', true);" data-role="button">Profile</a>
                     <a href="#" data-role="button" class="ui-btn-active">Image</a>
-                    <a href="#" data-role="button" onclick="Dashboard.navigate('updatePassword.html', true);">Password</a>
+                    <a href="#" data-role="button" onclick="Dashboard.navigate('updatepassword.html', true);">Password</a>
                     <a href="#" data-role="button" onclick="Dashboard.navigate('library.html', true);">Media Library</a>
                 </div>
                 <div class="readOnlyContent">
diff --git a/dashboard-ui/userprofiles.html b/dashboard-ui/userprofiles.html
index d94cfd7cb5..4fb1204de3 100644
--- a/dashboard-ui/userprofiles.html
+++ b/dashboard-ui/userprofiles.html
@@ -10,7 +10,7 @@
             <div class="content-primary">
                 <div class="readOnlyContent">
                     <p id="pAddUser">
-                        <button type="button" data-icon="plus" onclick="Dashboard.navigate('editUser.html');">
+                        <button type="button" data-icon="plus" onclick="Dashboard.navigate('edituser.html');">
                             Add User
                         </button>
                     </p>
diff --git a/dashboard-ui/wizardlibrary.html b/dashboard-ui/wizardlibrary.html
index c07dd6b0c6..a6cc8a7fcf 100644
--- a/dashboard-ui/wizardlibrary.html
+++ b/dashboard-ui/wizardlibrary.html
@@ -50,7 +50,7 @@
 
                 <div class="wizardNavigation">
                     <button type="button" data-iconpos="left" data-icon="arrow-left" data-inline="true" onclick="history.back();">Previous</button>
-                    <button type="button" data-iconpos="right" data-icon="arrow-right" data-inline="true" onclick="Dashboard.navigate('wizardFinish.html');">Next</button>
+                    <button type="button" data-iconpos="right" data-icon="arrow-right" data-inline="true" onclick="Dashboard.navigate('wizardfinish.html');">Next</button>
                 </div>
             </div>