diff --git a/src/bower_components/apiclient/credentials.js b/src/bower_components/apiclient/credentialprovider.js
similarity index 100%
rename from src/bower_components/apiclient/credentials.js
rename to src/bower_components/apiclient/credentialprovider.js
diff --git a/src/components/cardbuilder/cardbuilder.js b/src/components/cardbuilder/cardBuilder.js
similarity index 100%
rename from src/components/cardbuilder/cardbuilder.js
rename to src/components/cardbuilder/cardBuilder.js
diff --git a/src/components/cardbuilder/roundcard.css b/src/components/cardbuilder/roundcard.css
deleted file mode 100644
index d0bd950972..0000000000
--- a/src/components/cardbuilder/roundcard.css
+++ /dev/null
@@ -1,7 +0,0 @@
-.card-round:focus > .cardBox-focustransform {
-    transform: scale(1.26, 1.26);
-}
-
-.cardImageContainer-round, .cardImage-round {
-    border-radius: 1000px;
-}
diff --git a/src/components/focusmanager.js b/src/components/focusManager.js
similarity index 100%
rename from src/components/focusmanager.js
rename to src/components/focusManager.js
diff --git a/src/components/viewManager/viewManager.js b/src/components/viewManager/viewManager.js
index 606c7e98c1..f594e446a2 100644
--- a/src/components/viewManager/viewManager.js
+++ b/src/components/viewManager/viewManager.js
@@ -1,10 +1,10 @@
-define(['viewcontainer', 'focusManager', 'queryString', 'layoutManager'], function (viewcontainer, focusManager, queryString, layoutManager) {
+define(['viewContainer', 'focusManager', 'queryString', 'layoutManager'], function (viewContainer, focusManager, queryString, layoutManager) {
     'use strict';
 
     var currentView;
     var dispatchPageEvents;
 
-    viewcontainer.setOnBeforeChange(function (newView, isRestored, options) {
+    viewContainer.setOnBeforeChange(function (newView, isRestored, options) {
 
         var lastView = currentView;
         if (lastView) {
@@ -125,7 +125,7 @@ define(['viewcontainer', 'focusManager', 'queryString', 'layoutManager'], functi
 
     function resetCachedViews() {
         // Reset all cached views whenever the skin changes
-        viewcontainer.reset();
+        viewContainer.reset();
     }
 
     document.addEventListener('skinunload', resetCachedViews);
@@ -146,7 +146,7 @@ define(['viewcontainer', 'focusManager', 'queryString', 'layoutManager'], functi
             return;
         }
 
-        viewcontainer.loadView(options).then(function (view) {
+        viewContainer.loadView(options).then(function (view) {
 
             onViewChange(view, options);
         });
@@ -163,7 +163,7 @@ define(['viewcontainer', 'focusManager', 'queryString', 'layoutManager'], functi
             currentView.activeElement = document.activeElement;
         }
 
-        return viewcontainer.tryRestoreView(options).then(function (view) {
+        return viewContainer.tryRestoreView(options).then(function (view) {
 
             onViewChanging();
             onViewChange(view, options, true);
diff --git a/src/scripts/site.js b/src/scripts/site.js
index 9f5007fa78..84a87223e7 100644
--- a/src/scripts/site.js
+++ b/src/scripts/site.js
@@ -687,7 +687,7 @@ var AppInfo = {};
             humanedate: "components/humanedate",
             libraryBrowser: "scripts/librarybrowser",
             events: apiClientBowerPath + "/events",
-            credentialprovider: apiClientBowerPath + "/credentials",
+            credentialprovider: apiClientBowerPath + "/credentialprovider",
             connectionManagerFactory: bowerPath + "/apiclient/connectionmanager",
             visibleinviewport: componentsPath + "/visibleinviewport",
             browserdeviceprofile: componentsPath + "/browserdeviceprofile",
@@ -696,7 +696,7 @@ var AppInfo = {};
             qualityoptions: componentsPath + "/qualityoptions",
             hammer: bowerPath + "/hammerjs/hammer.min",
             page: "thirdparty/page",
-            focusManager: componentsPath + "/focusmanager",
+            focusManager: componentsPath + "/focusManager",
             datetime: componentsPath + "/datetime",
             globalize: componentsPath + "/globalize",
             itemHelper: componentsPath + "/itemhelper",
@@ -784,9 +784,8 @@ var AppInfo = {};
         define("refreshDialog", [componentsPath + "/refreshdialog/refreshdialog"], returnFirstDependency);
         define("backdrop", [componentsPath + "/backdrop/backdrop"], returnFirstDependency);
         define("fetchHelper", [componentsPath + "/fetchhelper"], returnFirstDependency);
-        define("roundCardStyle", ["cardStyle", "css!" + componentsPath + "/cardbuilder/roundcard"], returnFirstDependency);
         define("cardStyle", ["css!" + componentsPath + "/cardbuilder/card"], returnFirstDependency);
-        define("cardBuilder", [componentsPath + "/cardbuilder/cardbuilder"], returnFirstDependency);
+        define("cardBuilder", [componentsPath + "/cardbuilder/cardBuilder"], returnFirstDependency);
         define("peoplecardbuilder", [componentsPath + "/cardbuilder/peoplecardbuilder"], returnFirstDependency);
         define("chaptercardbuilder", [componentsPath + "/cardbuilder/chaptercardbuilder"], returnFirstDependency);
         define("flexStyles", ["css!" + componentsPath + "/flexstyles"], returnFirstDependency);
@@ -831,7 +830,6 @@ var AppInfo = {};
         define("viewSettings", [componentsPath + "/viewsettings/viewsettings"], returnFirstDependency);
         define("filterMenu", [componentsPath + "/filtermenu/filtermenu"], returnFirstDependency);
         define("sortMenu", [componentsPath + "/sortmenu/sortmenu"], returnFirstDependency);
-        define("connectionmanager", [apiClientBowerPath + "/connectionmanager"]);
         define("serversync", [apiClientBowerPath + "/sync/serversync"], returnFirstDependency);
         define("multiserversync", [apiClientBowerPath + "/sync/multiserversync"], returnFirstDependency);
         define("mediasync", [apiClientBowerPath + "/sync/mediasync"], returnFirstDependency);
@@ -854,7 +852,7 @@ var AppInfo = {};
         define("imageUploader", [componentsPath + "/imageuploader/imageuploader"], returnFirstDependency);
         define("navdrawer", ["components/navdrawer/navdrawer"], returnFirstDependency);
         define("htmlMediaHelper", [componentsPath + "/htmlMediaHelper"], returnFirstDependency);
-        define("viewcontainer", ["components/viewContainer"], returnFirstDependency);
+        define("viewContainer", ["components/viewContainer"], returnFirstDependency);
         define("queryString", [bowerPath + "/query-string/index"], function () {
             return queryString;
         });