diff --git a/package.json b/package.json
index a65b93cad..a88e5342c 100644
--- a/package.json
+++ b/package.json
@@ -93,7 +93,7 @@
           "src/components/cardbuilder/cardBuilder.js",
           "src/scripts/fileDownloader.js",
           "src/components/images/imageLoader.js",
-          "src/components/lazyloader/lazyloader-intersectionobserver.js",
+          "src/components/lazyLoader/lazyLoaderIntersectionObserver.js",
           "src/components/playback/mediasession.js",
           "src/components/sanatizefilename.js",
           "src/components/scrollManager.js",
@@ -103,7 +103,7 @@
           "src/scripts/imagehelper.js",
           "src/scripts/inputManager.js",
           "src/scripts/deleteHelper.js",
-          "src/components/actionsheet/actionsheet.js",
+          "src/components/actionSheet/actionSheet.js",
           "src/components/playmenu.js",
           "src/components/indicators/indicators.js",
           "src/scripts/keyboardNavigation.js",
diff --git a/src/components/actionsheet/actionsheet.css b/src/components/actionSheet/actionSheet.css
similarity index 100%
rename from src/components/actionsheet/actionsheet.css
rename to src/components/actionSheet/actionSheet.css
diff --git a/src/components/actionsheet/actionsheet.js b/src/components/actionSheet/actionSheet.js
similarity index 99%
rename from src/components/actionsheet/actionsheet.js
rename to src/components/actionSheet/actionSheet.js
index 18239f8de..65b198254 100644
--- a/src/components/actionsheet/actionsheet.js
+++ b/src/components/actionSheet/actionSheet.js
@@ -3,7 +3,7 @@ import layoutManager from 'layoutManager';
 import globalize from 'globalize';
 import dom from 'dom';
 import 'emby-button';
-import 'css!./actionsheet';
+import 'css!./actionSheet';
 import 'material-icons';
 import 'scrollStyles';
 import 'listViewStyle';
diff --git a/src/components/alphapicker/alphapicker.js b/src/components/alphaPicker/alphaPicker.js
similarity index 100%
rename from src/components/alphapicker/alphapicker.js
rename to src/components/alphaPicker/alphaPicker.js
diff --git a/src/components/alphapicker/style.css b/src/components/alphaPicker/style.css
similarity index 100%
rename from src/components/alphapicker/style.css
rename to src/components/alphaPicker/style.css
diff --git a/src/components/appfooter/appfooter.css b/src/components/appFooter/appFooter.css
similarity index 100%
rename from src/components/appfooter/appfooter.css
rename to src/components/appFooter/appFooter.css
diff --git a/src/components/appfooter/appfooter.js b/src/components/appFooter/appFooter.js
similarity index 93%
rename from src/components/appfooter/appfooter.js
rename to src/components/appFooter/appFooter.js
index 07d7701ff..033a0b008 100644
--- a/src/components/appfooter/appfooter.js
+++ b/src/components/appFooter/appFooter.js
@@ -1,4 +1,4 @@
-define(['browser', 'css!./appfooter'], function (browser) {
+define(['browser', 'css!./appFooter'], function (browser) {
     'use strict';
 
     function render(options) {
diff --git a/src/components/channelmapper/channelmapper.js b/src/components/channelMapper/channelMapper.js
similarity index 100%
rename from src/components/channelmapper/channelmapper.js
rename to src/components/channelMapper/channelMapper.js
diff --git a/src/components/collectioneditor/collectioneditor.js b/src/components/collectionEditor/collectionEditor.js
similarity index 100%
rename from src/components/collectioneditor/collectioneditor.js
rename to src/components/collectionEditor/collectionEditor.js
diff --git a/src/components/displaysettings/displaysettings.js b/src/components/displaySettings/displaySettings.js
similarity index 99%
rename from src/components/displaysettings/displaysettings.js
rename to src/components/displaySettings/displaySettings.js
index 2b7b4bb60..b6938bc95 100644
--- a/src/components/displaysettings/displaysettings.js
+++ b/src/components/displaySettings/displaySettings.js
@@ -269,7 +269,7 @@ define(['require', 'browser', 'layoutManager', 'appSettings', 'pluginManager', '
     }
 
     function embed(options, self) {
-        require(['text!./displaysettings.template.html'], function (template) {
+        require(['text!./displaySettings.template.html'], function (template) {
             options.element.innerHTML = globalize.translateDocument(template, 'core');
             options.element.querySelector('form').addEventListener('submit', onSubmit.bind(self));
             if (options.enableSaveButton) {
diff --git a/src/components/displaysettings/displaysettings.template.html b/src/components/displaySettings/displaySettings.template.html
similarity index 100%
rename from src/components/displaysettings/displaysettings.template.html
rename to src/components/displaySettings/displaySettings.template.html
diff --git a/src/components/homescreensettings/homescreensettings.js b/src/components/homeScreenSettings/homeScreenSettings.js
similarity index 99%
rename from src/components/homescreensettings/homescreensettings.js
rename to src/components/homeScreenSettings/homeScreenSettings.js
index 15812647c..b07e6de3c 100644
--- a/src/components/homescreensettings/homescreensettings.js
+++ b/src/components/homeScreenSettings/homeScreenSettings.js
@@ -470,7 +470,7 @@ define(['require', 'apphost', 'layoutManager', 'focusManager', 'globalize', 'loa
 
     function embed(options, self) {
 
-        require(['text!./homescreensettings.template.html'], function (template) {
+        require(['text!./homeScreenSettings.template.html'], function (template) {
 
             for (var i = 1; i <= numConfigurableSections; i++) {
                 template = template.replace('{section' + i + 'label}', globalize.translate('LabelHomeScreenSectionValue', i));
diff --git a/src/components/homescreensettings/homescreensettings.template.html b/src/components/homeScreenSettings/homeScreenSettings.template.html
similarity index 100%
rename from src/components/homescreensettings/homescreensettings.template.html
rename to src/components/homeScreenSettings/homeScreenSettings.template.html
diff --git a/src/components/imagedownloader/imagedownloader.js b/src/components/imageDownloader/imageDownloader.js
similarity index 99%
rename from src/components/imagedownloader/imagedownloader.js
rename to src/components/imageDownloader/imageDownloader.js
index 3e0d00ac2..b30f1bf31 100644
--- a/src/components/imagedownloader/imagedownloader.js
+++ b/src/components/imageDownloader/imageDownloader.js
@@ -320,7 +320,7 @@ define(['dom', 'loading', 'apphost', 'dialogHelper', 'connectionManager', 'image
     function showEditor(itemId, serverId, itemType) {
         loading.show();
 
-        require(['text!./imagedownloader.template.html'], function (template) {
+        require(['text!./imageDownloader.template.html'], function (template) {
 
             var apiClient = connectionManager.getApiClient(serverId);
 
diff --git a/src/components/imagedownloader/imagedownloader.template.html b/src/components/imageDownloader/imageDownloader.template.html
similarity index 100%
rename from src/components/imagedownloader/imagedownloader.template.html
rename to src/components/imageDownloader/imageDownloader.template.html
diff --git a/src/components/imageoptionseditor/imageoptionseditor.js b/src/components/imageOptionsEditor/imageOptionsEditor.js
similarity index 97%
rename from src/components/imageoptionseditor/imageoptionseditor.js
rename to src/components/imageOptionsEditor/imageOptionsEditor.js
index 73a6d119d..cd8345fbb 100644
--- a/src/components/imageoptionseditor/imageoptionseditor.js
+++ b/src/components/imageOptionsEditor/imageOptionsEditor.js
@@ -82,7 +82,7 @@ define(['globalize', 'dom', 'dialogHelper', 'emby-checkbox', 'emby-select', 'emb
         this.show = function (itemType, options, availableOptions) {
             return new Promise(function (resolve, reject) {
                 var xhr = new XMLHttpRequest();
-                xhr.open('GET', 'components/imageoptionseditor/imageoptionseditor.template.html', true);
+                xhr.open('GET', 'components/imageOptionsEditor/imageOptionsEditor.template.html', true);
 
                 xhr.onload = function (e) {
                     var template = this.response;
diff --git a/src/components/imageoptionseditor/imageoptionseditor.template.html b/src/components/imageOptionsEditor/imageOptionsEditor.template.html
similarity index 100%
rename from src/components/imageoptionseditor/imageoptionseditor.template.html
rename to src/components/imageOptionsEditor/imageOptionsEditor.template.html
diff --git a/src/components/lazyloader/lazyloader-intersectionobserver.js b/src/components/lazyLoader/lazyLoaderIntersectionObserver.js
similarity index 100%
rename from src/components/lazyloader/lazyloader-intersectionobserver.js
rename to src/components/lazyLoader/lazyLoaderIntersectionObserver.js
diff --git a/src/components/metadataeditor/metadataeditor.js b/src/components/metadataEditor/metadataEditor.js
similarity index 99%
rename from src/components/metadataeditor/metadataeditor.js
rename to src/components/metadataEditor/metadataEditor.js
index e1c1c8001..899bab778 100644
--- a/src/components/metadataeditor/metadataeditor.js
+++ b/src/components/metadataEditor/metadataEditor.js
@@ -1067,7 +1067,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
     function show(itemId, serverId, resolve, reject) {
         loading.show();
 
-        require(['text!./metadataeditor.template.html'], function (template) {
+        require(['text!./metadataEditor.template.html'], function (template) {
 
             var dialogOptions = {
                 removeOnClose: true,
@@ -1124,7 +1124,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
 
                 loading.show();
 
-                require(['text!./metadataeditor.template.html'], function (template) {
+                require(['text!./metadataEditor.template.html'], function (template) {
 
                     elem.innerHTML = globalize.translateDocument(template, 'core');
 
diff --git a/src/components/metadataeditor/metadataeditor.template.html b/src/components/metadataEditor/metadataEditor.template.html
similarity index 100%
rename from src/components/metadataeditor/metadataeditor.template.html
rename to src/components/metadataEditor/metadataEditor.template.html
diff --git a/src/components/metadataeditor/personeditor.js b/src/components/metadataEditor/personEditor.js
similarity index 98%
rename from src/components/metadataeditor/personeditor.js
rename to src/components/metadataEditor/personEditor.js
index 9fb6fdec6..e71a7441c 100644
--- a/src/components/metadataeditor/personeditor.js
+++ b/src/components/metadataEditor/personEditor.js
@@ -11,7 +11,7 @@ define(['dialogHelper', 'layoutManager', 'globalize', 'require', 'paper-icon-but
     function show(person) {
         return new Promise(function (resolve, reject) {
 
-            require(['text!./personeditor.template.html'], function (template) {
+            require(['text!./personEditor.template.html'], function (template) {
 
                 var dialogOptions = {
                     removeOnClose: true,
diff --git a/src/components/metadataeditor/personeditor.template.html b/src/components/metadataEditor/personEditor.template.html
similarity index 100%
rename from src/components/metadataeditor/personeditor.template.html
rename to src/components/metadataEditor/personEditor.template.html
diff --git a/src/controllers/livetvstatus.js b/src/controllers/livetvstatus.js
index 737d49496..82d0b697d 100644
--- a/src/controllers/livetvstatus.js
+++ b/src/controllers/livetvstatus.js
@@ -155,7 +155,7 @@ define(['jQuery', 'globalize', 'scripts/taskbutton', 'dom', 'libraryMenu', 'layo
     }
 
     function mapChannels(page, providerId) {
-        require(['components/channelmapper/channelmapper'], function (channelmapper) {
+        require(['components/channelMapper/channelMapper'], function (channelmapper) {
             new channelmapper({
                 serverId: ApiClient.serverInfo().Id,
                 providerId: providerId
diff --git a/src/scripts/site.js b/src/scripts/site.js
index 19ae9bb3d..ddb152eb4 100644
--- a/src/scripts/site.js
+++ b/src/scripts/site.js
@@ -375,7 +375,7 @@ var AppInfo = {};
 
         define('filesystem', [scriptsPath + '/filesystem'], returnFirstDependency);
 
-        define('lazyLoader', [componentsPath + '/lazyloader/lazyloader-intersectionobserver'], returnFirstDependency);
+        define('lazyLoader', [componentsPath + '/lazyLoader/lazyLoaderIntersectionObserver'], returnFirstDependency);
         define('shell', [scriptsPath + '/shell'], returnFirstDependency);
 
         if ('registerElement' in document) {
@@ -641,7 +641,7 @@ var AppInfo = {};
             playlisteditor: componentsPath + '/playlisteditor/playlisteditor',
             medialibrarycreator: componentsPath + '/mediaLibraryCreator/mediaLibraryCreator',
             medialibraryeditor: componentsPath + '/mediaLibraryEditor/mediaLibraryEditor',
-            imageoptionseditor: componentsPath + '/imageoptionseditor/imageoptionseditor',
+            imageoptionseditor: componentsPath + '/imageOptionsEditor/imageOptionsEditor',
             apphost: componentsPath + '/apphost',
             visibleinviewport: bowerPath + '/visibleinviewport',
             qualityoptions: componentsPath + '/qualityOptions',
@@ -738,7 +738,7 @@ var AppInfo = {};
 
         // there are several objects that need to be instantiated
         // TODO find a better way to do this
-        define('appFooter', [componentsPath + '/appfooter/appfooter'], returnFirstDependency);
+        define('appFooter', [componentsPath + '/appFooter/appFooter'], returnFirstDependency);
         define('appFooter-shared', ['appFooter'], createSharedAppFooter);
 
         // TODO remove these libraries
@@ -773,23 +773,23 @@ var AppInfo = {};
 
         define('chromecastHelper', [componentsPath + '/chromecast/chromecasthelpers'], returnFirstDependency);
         define('mediaSession', [componentsPath + '/playback/mediasession'], returnFirstDependency);
-        define('actionsheet', [componentsPath + '/actionsheet/actionsheet'], returnFirstDependency);
+        define('actionsheet', [componentsPath + '/actionSheet/actionSheet'], returnFirstDependency);
         define('tunerPicker', [componentsPath + '/tunerPicker'], returnFirstDependency);
         define('mainTabsManager', [componentsPath + '/maintabsmanager'], returnFirstDependency);
         define('imageLoader', [componentsPath + '/images/imageLoader'], returnFirstDependency);
         define('directorybrowser', [componentsPath + '/directorybrowser/directorybrowser'], returnFirstDependency);
-        define('metadataEditor', [componentsPath + '/metadataeditor/metadataeditor'], returnFirstDependency);
-        define('personEditor', [componentsPath + '/metadataeditor/personeditor'], returnFirstDependency);
+        define('metadataEditor', [componentsPath + '/metadataEditor/metadataEditor'], returnFirstDependency);
+        define('personEditor', [componentsPath + '/metadataEditor/personEditor'], returnFirstDependency);
         define('playerSelectionMenu', [componentsPath + '/playback/playerSelectionMenu'], returnFirstDependency);
         define('playerSettingsMenu', [componentsPath + '/playback/playersettingsmenu'], returnFirstDependency);
         define('playMethodHelper', [componentsPath + '/playback/playmethodhelper'], returnFirstDependency);
         define('brightnessOsd', [componentsPath + '/playback/brightnessosd'], returnFirstDependency);
         define('alphaNumericShortcuts', [scriptsPath + '/alphanumericshortcuts'], returnFirstDependency);
         define('multiSelect', [componentsPath + '/multiSelect/multiSelect'], returnFirstDependency);
-        define('alphaPicker', [componentsPath + '/alphapicker/alphapicker'], returnFirstDependency);
+        define('alphaPicker', [componentsPath + '/alphaPicker/alphaPicker'], returnFirstDependency);
         define('tabbedView', [componentsPath + '/tabbedview/tabbedview'], returnFirstDependency);
         define('itemsTab', [componentsPath + '/tabbedview/itemstab'], returnFirstDependency);
-        define('collectionEditor', [componentsPath + '/collectioneditor/collectioneditor'], returnFirstDependency);
+        define('collectionEditor', [componentsPath + '/collectionEditor/collectionEditor'], returnFirstDependency);
         define('serverRestartDialog', [componentsPath + '/serverRestartDialog'], returnFirstDependency);
         define('playlistEditor', [componentsPath + '/playlisteditor/playlisteditor'], returnFirstDependency);
         define('recordingCreator', [componentsPath + '/recordingcreator/recordingcreator'], returnFirstDependency);
@@ -805,7 +805,7 @@ var AppInfo = {};
         define('mediaInfo', [componentsPath + '/mediainfo/mediainfo'], returnFirstDependency);
         define('itemContextMenu', [componentsPath + '/itemContextMenu'], returnFirstDependency);
         define('imageEditor', [componentsPath + '/imageeditor/imageeditor'], returnFirstDependency);
-        define('imageDownloader', [componentsPath + '/imagedownloader/imagedownloader'], returnFirstDependency);
+        define('imageDownloader', [componentsPath + '/imageDownloader/imageDownloader'], returnFirstDependency);
         define('dom', [scriptsPath + '/dom'], returnFirstDependency);
         define('playerStats', [componentsPath + '/playerstats/playerstats'], returnFirstDependency);
         define('searchFields', [componentsPath + '/search/searchfields'], returnFirstDependency);
@@ -813,9 +813,9 @@ var AppInfo = {};
         define('upNextDialog', [componentsPath + '/upnextdialog/upnextdialog'], returnFirstDependency);
         define('subtitleAppearanceHelper', [componentsPath + '/subtitlesettings/subtitleappearancehelper'], returnFirstDependency);
         define('subtitleSettings', [componentsPath + '/subtitlesettings/subtitlesettings'], returnFirstDependency);
-        define('displaySettings', [componentsPath + '/displaysettings/displaysettings'], returnFirstDependency);
+        define('displaySettings', [componentsPath + '/displaySettings/displaySettings'], returnFirstDependency);
         define('playbackSettings', [componentsPath + '/playbackSettings/playbackSettings'], returnFirstDependency);
-        define('homescreenSettings', [componentsPath + '/homescreensettings/homescreensettings'], returnFirstDependency);
+        define('homescreenSettings', [componentsPath + '/homeScreenSettings/homeScreenSettings'], returnFirstDependency);
         define('playbackManager', [componentsPath + '/playback/playbackmanager'], getPlaybackManager);
         define('layoutManager', [componentsPath + '/layoutManager', 'apphost'], getLayoutManager);
         define('homeSections', [componentsPath + '/homesections/homesections'], returnFirstDependency);