diff --git a/src/common/components/action-alt.vue b/src/common/components/ActionAlt.vue
similarity index 100%
rename from src/common/components/action-alt.vue
rename to src/common/components/ActionAlt.vue
diff --git a/src/common/components/action-row.vue b/src/common/components/ActionRow.vue
similarity index 100%
rename from src/common/components/action-row.vue
rename to src/common/components/ActionRow.vue
diff --git a/src/common/components/button.vue b/src/common/components/Button.vue
similarity index 100%
rename from src/common/components/button.vue
rename to src/common/components/Button.vue
diff --git a/src/common/components/shortcut-button.vue b/src/common/components/ShortcutButton.vue
similarity index 100%
rename from src/common/components/shortcut-button.vue
rename to src/common/components/ShortcutButton.vue
diff --git a/src/options/App.vue b/src/options/App.vue
index 8f4b8c3..a2914ec 100644
--- a/src/options/App.vue
+++ b/src/options/App.vue
@@ -108,9 +108,9 @@ import ObjectCopy from '../ext/lib/ObjectCopy.js';
 
 import Settings from '../ext/lib/Settings.js';
 
-import GeneralSettings from './general-settings';
+import GeneralSettings from './GeneralSettings';
 import ControlsSettings from './controls-settings/controls-settings';
-import AddEditActionPopup from './controls-settings/add-edit-action-popup';
+import AddEditActionPopup from './controls-settings/AddEditActionPopup';
 import ConfirmPopup from './common/ConfirmationPopup';
 import About from './about'
 
diff --git a/src/options/autodetection-settings.vue b/src/options/AutodetectionSettings.vue
similarity index 100%
rename from src/options/autodetection-settings.vue
rename to src/options/AutodetectionSettings.vue
diff --git a/src/options/general-settings.vue b/src/options/GeneralSettings.vue
similarity index 99%
rename from src/options/general-settings.vue
rename to src/options/GeneralSettings.vue
index 5f3c488..3f5b465 100644
--- a/src/options/general-settings.vue
+++ b/src/options/GeneralSettings.vue
@@ -128,7 +128,7 @@
 </template>
 
 <script>
-import Button from '../common/components/button';
+import Button from '../common/components/Button';
 import Stretch from '../common/enums/stretch.enum';
 import ExtensionMode from '../common/enums/extension-mode.enum';
 import VideoAlignment from '../common/enums/video-alignment.enum';
diff --git a/src/options/common/ConfirmationPopup.vue b/src/options/common/ConfirmationPopup.vue
index fcca86c..de41f18 100644
--- a/src/options/common/ConfirmationPopup.vue
+++ b/src/options/common/ConfirmationPopup.vue
@@ -21,7 +21,7 @@
 </template>
 
 <script>
-import ShortcutButton from '../../common/components/shortcut-button.vue' 
+import ShortcutButton from '../../common/components/ShortcutButton.vue' 
 
 export default {
   props: {
diff --git a/src/options/controls-settings/add-edit-action-popup.vue b/src/options/controls-settings/AddEditActionPopup.vue
similarity index 96%
rename from src/options/controls-settings/add-edit-action-popup.vue
rename to src/options/controls-settings/AddEditActionPopup.vue
index d8c7472..18c48af 100644
--- a/src/options/controls-settings/add-edit-action-popup.vue
+++ b/src/options/controls-settings/AddEditActionPopup.vue
@@ -90,12 +90,12 @@
 </template>
 
 <script>
-import ShortcutButton from '../../common/components/shortcut-button.vue' 
+import ShortcutButton from '../../common/components/ShortcutButton.vue' 
 import Stretch from '../../common/enums/stretch.enum';
 import KeyboardShortcutParser from '../../common/js/KeyboardShortcutParser';
-import CommandChain from './command-builder/command-chain';
-import CommandAddEdit from './command-builder/command-add-edit';
-import ScopeSettings from './scope-settings-component/scope-settings';
+import CommandChain from './command-builder/CommandChain';
+import CommandAddEdit from './command-builder/CommandAddEdit';
+import ScopeSettings from './ScopeSettings-component/ScopeSettings';
 
 export default {
   props: {
diff --git a/src/options/controls-settings/controls-settings.vue b/src/options/controls-settings/ControlsSettings.vue
similarity index 98%
rename from src/options/controls-settings/controls-settings.vue
rename to src/options/controls-settings/ControlsSettings.vue
index ac480ce..9a10d99 100644
--- a/src/options/controls-settings/controls-settings.vue
+++ b/src/options/controls-settings/ControlsSettings.vue
@@ -112,9 +112,9 @@
 </template>
 
 <script>
-import Button from '../../common/components/button';
+import Button from '../../common/components/Button';
 import Stretch from '../../common/enums/stretch.enum';
-import ActionAlt from '../../common/components/action-alt';
+import ActionAlt from '../../common/components/ActionAlt';
 
 export default {
   components: {
diff --git a/src/options/controls-settings/command-builder/command-add-edit.vue b/src/options/controls-settings/command-builder/CommandAddEdit.vue
similarity index 100%
rename from src/options/controls-settings/command-builder/command-add-edit.vue
rename to src/options/controls-settings/command-builder/CommandAddEdit.vue
diff --git a/src/options/controls-settings/command-builder/command-block.vue b/src/options/controls-settings/command-builder/CommandBlock.vue
similarity index 100%
rename from src/options/controls-settings/command-builder/command-block.vue
rename to src/options/controls-settings/command-builder/CommandBlock.vue
diff --git a/src/options/controls-settings/command-builder/command-chain.vue b/src/options/controls-settings/command-builder/CommandChain.vue
similarity index 92%
rename from src/options/controls-settings/command-builder/command-chain.vue
rename to src/options/controls-settings/command-builder/CommandChain.vue
index 567c9bc..7f95679 100644
--- a/src/options/controls-settings/command-builder/command-chain.vue
+++ b/src/options/controls-settings/command-builder/CommandChain.vue
@@ -21,8 +21,8 @@
 </template>
 
 <script>
-import CommandBlock from './command-block';
-import CommandAddEdit from './command-add-edit';
+import CommandBlock from './CommandBlock';
+import CommandAddEdit from './CommandAddEdit';
 
 export default {
   created () {
diff --git a/src/options/controls-settings/scope-settings-component/scope-settings.vue b/src/options/controls-settings/scope-settings-component/ScopeSettings.vue
similarity index 94%
rename from src/options/controls-settings/scope-settings-component/scope-settings.vue
rename to src/options/controls-settings/scope-settings-component/ScopeSettings.vue
index c9f3653..b3aa10d 100644
--- a/src/options/controls-settings/scope-settings-component/scope-settings.vue
+++ b/src/options/controls-settings/scope-settings-component/ScopeSettings.vue
@@ -39,15 +39,16 @@
 </template>
 
 <script>
-import SetShortcutButton from './set-shortcut-button';
+import SetShortcutButton from './SetShortcutButton.vue';
+
 
 export default {
+  components: {
+    SetShortcutButton
+  },
   props: {
     scopeOptions: Object,
   },
-  components: {
-    SetShortcutButton,
-  },
   methods: {
     setLabel(label) {
       if (label.trim() === '') {
diff --git a/src/options/controls-settings/scope-settings-component/set-shortcut-button.vue b/src/options/controls-settings/scope-settings-component/SetShortcutButton.vue
similarity index 100%
rename from src/options/controls-settings/scope-settings-component/set-shortcut-button.vue
rename to src/options/controls-settings/scope-settings-component/SetShortcutButton.vue
diff --git a/src/popup/panels/DefaultSettingsPanel.vue b/src/popup/panels/DefaultSettingsPanel.vue
index 0b4a5ce..ce9832a 100644
--- a/src/popup/panels/DefaultSettingsPanel.vue
+++ b/src/popup/panels/DefaultSettingsPanel.vue
@@ -96,7 +96,7 @@
 <script>
 import ExecAction from '../js/ExecAction'
 import KeyboardShortcutParser from '../../common/js/KeyboardShortcutParser'
-import ShortcutButton from '../../common/components/shortcut-button'
+import ShortcutButton from '../../common/components/ShortcutButton'
 
 export default {
   data() {
diff --git a/src/popup/panels/VideoPanel.vue b/src/popup/panels/VideoPanel.vue
index 64f2133..2dd64e7 100644
--- a/src/popup/panels/VideoPanel.vue
+++ b/src/popup/panels/VideoPanel.vue
@@ -101,7 +101,7 @@
 <script>
 import ExecAction from '../js/ExecAction'
 import KeyboardShortcutParser from '../../common/js/KeyboardShortcutParser'
-import ShortcutButton from '../../common/components/shortcut-button'
+import ShortcutButton from '../../common/components/ShortcutButton'
 
 export default {
   data() {