diff --git a/src/extension.js b/src/extension.js
index 094d8c4..71ed503 100644
--- a/src/extension.js
+++ b/src/extension.js
@@ -8,7 +8,7 @@ import { Extension } from 'resource:///org/gnome/shell/extensions/extension.js';
 import * as debug from './debug.js';
 
 import { ColorSchemeSwitcher } from './modules/ColorSchemeSwitcher.js';
-import { SwitcherCommands } from './modules/SwitcherCommands.js';
+import { CommandsSwitcher } from './modules/CommandsSwitcher.js';
 import { Timer } from './modules/Timer.js';
 
 
@@ -29,7 +29,7 @@ export default class NightThemeSwitcher extends Extension {
 
         [
             new ColorSchemeSwitcher({ timer, settings: this.getSettings(`${this.metadata['settings-schema']}.color-scheme`) }),
-            new SwitcherCommands({ timer, settings: this.getSettings(`${this.metadata['settings-schema']}.commands`) }),
+            new CommandsSwitcher({ timer, settings: this.getSettings(`${this.metadata['settings-schema']}.commands`) }),
         ].forEach(module => this.#modules.push(module));
 
         this.#modules.forEach(module => module.enable());
diff --git a/src/meson.build b/src/meson.build
index 7249ac9..f1acabc 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -27,8 +27,8 @@ icons = [
 ]
 modules = [
   'modules/ColorSchemeSwitcher.js',
+  'modules/CommandsSwitcher.js',
   'modules/Switcher.js',
-  'modules/SwitcherCommands.js',
   'modules/Timer.js',
 ]
 preferences = [
diff --git a/src/modules/SwitcherCommands.js b/src/modules/CommandsSwitcher.js
similarity index 95%
rename from src/modules/SwitcherCommands.js
rename to src/modules/CommandsSwitcher.js
index 404bd81..d815d96 100644
--- a/src/modules/SwitcherCommands.js
+++ b/src/modules/CommandsSwitcher.js
@@ -13,7 +13,7 @@ import { Switcher } from './Switcher.js';
 /**
  * The Commands Switcher spawns commands according to the time.
  */
-export class SwitcherCommands extends Switcher {
+export class CommandsSwitcher extends Switcher {
     #settings;
 
     /**
diff --git a/src/po/POTFILES b/src/po/POTFILES
index 6e99123..1c0e0db 100644
--- a/src/po/POTFILES
+++ b/src/po/POTFILES
@@ -19,8 +19,8 @@ src/enums/ColorScheme.js
 src/enums/Time.js
 
 src/modules/ColorSchemeSwitcher.js
+src/modules/CommandsSwitcher.js
 src/modules/Switcher.js
-src/modules/SwitcherCommands.js
 src/modules/Timer.js
 
 src/preferences/BackgroundButton.js