diff --git a/Lib/Launchpad/App/Launchpad.ahk b/Lib/Launchpad/App/Launchpad.ahk
index 8ae17aec..16b696dd 100644
--- a/Lib/Launchpad/App/Launchpad.ahk
+++ b/Lib/Launchpad/App/Launchpad.ahk
@@ -21,12 +21,12 @@
 
     GetDefaultModules(config) {
         modules := super.GetDefaultModules(config)
-        modules["Bethesda"] := "BethesdaModule"
-        modules["Blizzard"] := "BlizzardModule"
-        modules["Epic"] := "EpicModule"
-        modules["Origin"] := "OriginModule"
-        modules["Riot"] := "RiotModule"
-        modules["Steam"] := "SteamModule"
+        modules["Bethesda"] := "Bethesda"
+        modules["Blizzard"] := "Blizzard"
+        modules["Epic"] := "Epic"
+        modules["Origin"] := "Origin"
+        modules["Riot"] := "Riot"
+        modules["Steam"] := "Steam"
         return modules
     }
 
diff --git a/Lib/Launchpad/Includes.ahk b/Lib/Launchpad/Includes.ahk
index 56ac2f41..0a23dbee 100644
--- a/Lib/Launchpad/Includes.ahk
+++ b/Lib/Launchpad/Includes.ahk
@@ -57,20 +57,20 @@
 #Include Installer\DependencyInstaller.ahk
 #Include Installer\LaunchpadUpdate.ahk
 #Include Locator\GameExeLocator.ahk
-#Include Modules\Bethesda\BethesdaModule.ahk
+#Include Modules\Bethesda\Bethesda.module.ahk
 #Include Modules\Bethesda\GamePlatform\BethesdaPlatform.ahk
-#Include Modules\Blizzard\BlizzardModule.ahk
+#Include Modules\Blizzard\Blizzard.module.ahk
 #Include Modules\Blizzard\Config\BlizzardProductDb.ahk
 #Include Modules\Blizzard\GamePlatform\BlizzardPlatform.ahk
-#Include Modules\Epic\EpicModule.ahk
+#Include Modules\Epic\Epic.module.ahk
 #Include Modules\Epic\GamePlatform\EpicPlatform.ahk
 #Include Modules\LaunchpadApi\AuthProvider\LaunchpadApiAuthProvider.ahk
 #Include Modules\LaunchpadApi\DataSource\ApiDataSource.ahk
-#Include Modules\Origin\OriginModule.ahk
+#Include Modules\Origin\Origin.module.ahk
 #Include Modules\Origin\GamePlatform\OriginPlatform.ahk
-#Include Modules\Riot\RiotModule.ahk
+#Include Modules\Riot\Riot.module.ahk
 #Include Modules\Riot\GamePlatform\RiotPlatform.ahk
-#Include Modules\Steam\SteamModule.ahk
+#Include Modules\Steam\Steam.module.ahk
 #Include Modules\Steam\GamePlatform\SteamPlatform.ahk
 #Include Service\BuilderManager.ahk
 #Include Service\LauncherManager.ahk
diff --git a/Lib/Launchpad/Modules/Bethesda/BethesdaModule.ahk b/Lib/Launchpad/Modules/Bethesda/Bethesda.module.ahk
similarity index 100%
rename from Lib/Launchpad/Modules/Bethesda/BethesdaModule.ahk
rename to Lib/Launchpad/Modules/Bethesda/Bethesda.module.ahk
diff --git a/Lib/Launchpad/Modules/Blizzard/BlizzardModule.ahk b/Lib/Launchpad/Modules/Blizzard/Blizzard.module.ahk
similarity index 100%
rename from Lib/Launchpad/Modules/Blizzard/BlizzardModule.ahk
rename to Lib/Launchpad/Modules/Blizzard/Blizzard.module.ahk
diff --git a/Lib/Launchpad/Modules/Epic/EpicModule.ahk b/Lib/Launchpad/Modules/Epic/Epic.module.ahk
similarity index 100%
rename from Lib/Launchpad/Modules/Epic/EpicModule.ahk
rename to Lib/Launchpad/Modules/Epic/Epic.module.ahk
diff --git a/Lib/Launchpad/Modules/Origin/OriginModule.ahk b/Lib/Launchpad/Modules/Origin/Origin.module.ahk
similarity index 100%
rename from Lib/Launchpad/Modules/Origin/OriginModule.ahk
rename to Lib/Launchpad/Modules/Origin/Origin.module.ahk
diff --git a/Lib/Launchpad/Modules/Riot/RiotModule.ahk b/Lib/Launchpad/Modules/Riot/Riot.module.ahk
similarity index 100%
rename from Lib/Launchpad/Modules/Riot/RiotModule.ahk
rename to Lib/Launchpad/Modules/Riot/Riot.module.ahk
diff --git a/Lib/Launchpad/Modules/Steam/SteamModule.ahk b/Lib/Launchpad/Modules/Steam/Steam.module.ahk
similarity index 100%
rename from Lib/Launchpad/Modules/Steam/SteamModule.ahk
rename to Lib/Launchpad/Modules/Steam/Steam.module.ahk
diff --git a/Lib/Shared/AppLib/App/AppBase.ahk b/Lib/Shared/AppLib/App/AppBase.ahk
index d9fe0556..f2e99c47 100644
--- a/Lib/Shared/AppLib/App/AppBase.ahk
+++ b/Lib/Shared/AppLib/App/AppBase.ahk
@@ -170,7 +170,7 @@ class AppBase {
 
     GetDefaultModules(config) {
         modules := Map()
-        modules["Auth"] := "AuthModule"
+        modules["Auth"] := "Auth"
         return modules
     }
 
diff --git a/Lib/Shared/AppLib/BulkOperation/ComponentLoader/ClassComponentLoader.ahk b/Lib/Shared/AppLib/BulkOperation/ComponentLoader/ClassComponentLoader.ahk
index 22001036..d024bac6 100644
--- a/Lib/Shared/AppLib/BulkOperation/ComponentLoader/ClassComponentLoader.ahk
+++ b/Lib/Shared/AppLib/BulkOperation/ComponentLoader/ClassComponentLoader.ahk
@@ -3,7 +3,8 @@ class ClassComponentLoader extends ComponentLoaderBase {
 
     LoadComponent(key, componentInfo) {
         if (Type(componentInfo) == "String") {
-            componentInfo := Map("class", componentInfo)
+            className := componentInfo . this.componentManager.classSuffix
+            componentInfo := Map("class", className)
         }
 
         className := this.GetComponentClass(key, componentInfo)
diff --git a/Lib/Shared/AppLib/Service/ContainerService/ContainerServiceBase.ahk b/Lib/Shared/AppLib/Service/ContainerService/ContainerServiceBase.ahk
index 5d8c35bd..d19ff7ee 100644
--- a/Lib/Shared/AppLib/Service/ContainerService/ContainerServiceBase.ahk
+++ b/Lib/Shared/AppLib/Service/ContainerService/ContainerServiceBase.ahk
@@ -10,6 +10,7 @@ class ContainerServiceBase extends AppServiceBase {
     loadAlterEvent := ""
     loader := ""
     discoverer := ""
+    classSuffix := ""
 
     __New(app, defaultComponentInfo := "", defaultComponents := "", autoLoad := true) {
         this.defaultComponentInfo := defaultComponentInfo
diff --git a/Lib/Shared/AppLib/Service/ContainerService/ModuleManager.ahk b/Lib/Shared/AppLib/Service/ContainerService/ModuleManager.ahk
index 0a071907..6356f374 100644
--- a/Lib/Shared/AppLib/Service/ContainerService/ModuleManager.ahk
+++ b/Lib/Shared/AppLib/Service/ContainerService/ModuleManager.ahk
@@ -4,6 +4,7 @@ class ModuleManager extends ConfigurableContainerServiceBase {
     loadEvent := Events.MODULE_LOAD
     loadAlterEvent := Events.MODULE_LOAD_ALTER
     moduleDirs := []
+    classSuffix := "Module"
 
     __New(app, configPath, moduleDirs := "", defaultModuleInfo := "", defaultModules := "", autoLoad := true) {
         configObj := ModuleConfig(app, configPath, true)
diff --git a/Lib/Shared/Includes.ahk b/Lib/Shared/Includes.ahk
index 4ddd7bd0..9186cf7d 100644
--- a/Lib/Shared/Includes.ahk
+++ b/Lib/Shared/Includes.ahk
@@ -153,7 +153,7 @@
 #Include DataLib\StructuredData\StructuredDataBase.ahk
 #Include DataLib\StructuredData\VdfData.ahk
 #Include DataLib\StructuredData\Xml.ahk
-#Include Modules\Auth\AuthModule.ahk
+#Include Modules\Auth\Auth.module.ahk
 #Include ThemeLib\LV_Constants.ahk
 #Include ThemeLib\AnimatedGif\AnimatedGif.ahk
 #Include ThemeLib\GuiShape\GuiShapeBase.ahk
diff --git a/Lib/Shared/Modules/Auth/AuthModule.ahk b/Lib/Shared/Modules/Auth/Auth.module.ahk
similarity index 100%
rename from Lib/Shared/Modules/Auth/AuthModule.ahk
rename to Lib/Shared/Modules/Auth/Auth.module.ahk