diff --git a/src/NadekoBot/Common/NadekoModule.cs b/src/NadekoBot/Common/NadekoModule.cs
index b8f2aee17..0aa3fbce2 100644
--- a/src/NadekoBot/Common/NadekoModule.cs
+++ b/src/NadekoBot/Common/NadekoModule.cs
@@ -134,12 +134,4 @@ public abstract class NadekoModule : ModuleBase
 public abstract class NadekoModule<TService> : NadekoModule
 {
     public TService _service { get; set; }
-}
-
-public abstract class NadekoSubmodule : NadekoModule
-{
-}
-
-public abstract class NadekoSubmodule<TService> : NadekoModule<TService>
-{
 }
\ No newline at end of file
diff --git a/src/NadekoBot/Common/OldCreds.cs b/src/NadekoBot/Common/OldCreds.cs
index 8b14615b0..ce94a6bdf 100644
--- a/src/NadekoBot/Common/OldCreds.cs
+++ b/src/NadekoBot/Common/OldCreds.cs
@@ -1,4 +1,5 @@
-namespace NadekoBot.Common;
+#nullable disable
+namespace NadekoBot.Common;
 
 public class OldCreds
 {
diff --git a/src/NadekoBot/Modules/Administration/AutoAssignableRoles/AutoAssignRoleCommands.cs b/src/NadekoBot/Modules/Administration/AutoAssignableRoles/AutoAssignRoleCommands.cs
index 572cfe04b..6e8d19539 100644
--- a/src/NadekoBot/Modules/Administration/AutoAssignableRoles/AutoAssignRoleCommands.cs
+++ b/src/NadekoBot/Modules/Administration/AutoAssignableRoles/AutoAssignRoleCommands.cs
@@ -6,7 +6,7 @@ namespace NadekoBot.Modules.Administration;
 public partial class Administration
 {
     [Group]
-    public partial class AutoAssignRoleCommands : NadekoSubmodule<AutoAssignRoleService>
+    public partial class AutoAssignRoleCommands : NadekoModule<AutoAssignRoleService>
     {
         [Cmd]
         [RequireContext(ContextType.Guild)]
diff --git a/src/NadekoBot/Modules/Administration/DangerousCommands/DangerousCommands.cs b/src/NadekoBot/Modules/Administration/DangerousCommands/DangerousCommands.cs
index 1af7d57e4..847107354 100644
--- a/src/NadekoBot/Modules/Administration/DangerousCommands/DangerousCommands.cs
+++ b/src/NadekoBot/Modules/Administration/DangerousCommands/DangerousCommands.cs
@@ -8,7 +8,7 @@ namespace NadekoBot.Modules.Administration
     {
         [Group]
         [OwnerOnly]
-        public partial class DangerousCommands : NadekoSubmodule<DangerousCommandsService>
+        public partial class DangerousCommands : NadekoModule<DangerousCommandsService>
         {
             private async Task InternalExecSql(string sql, params object[] reps)
             {
diff --git a/src/NadekoBot/Modules/Administration/GameVoiceChannel/GameVoiceChannelCommands.cs b/src/NadekoBot/Modules/Administration/GameVoiceChannel/GameVoiceChannelCommands.cs
index 7ca790b5e..1b7060440 100644
--- a/src/NadekoBot/Modules/Administration/GameVoiceChannel/GameVoiceChannelCommands.cs
+++ b/src/NadekoBot/Modules/Administration/GameVoiceChannel/GameVoiceChannelCommands.cs
@@ -6,7 +6,7 @@ namespace NadekoBot.Modules.Administration;
 public partial class Administration
 {
     [Group]
-    public partial class GameVoiceChannelCommands : NadekoSubmodule<GameVoiceChannelService>
+    public partial class GameVoiceChannelCommands : NadekoModule<GameVoiceChannelService>
     {
         [Cmd]
         [RequireContext(ContextType.Guild)]
diff --git a/src/NadekoBot/Modules/Administration/GreetBye/GreetCommands.cs b/src/NadekoBot/Modules/Administration/GreetBye/GreetCommands.cs
index db7ffaf4f..2055a746b 100644
--- a/src/NadekoBot/Modules/Administration/GreetBye/GreetCommands.cs
+++ b/src/NadekoBot/Modules/Administration/GreetBye/GreetCommands.cs
@@ -3,7 +3,7 @@ namespace NadekoBot.Modules.Administration;
 public partial class Administration
 {
     [Group]
-    public partial class GreetCommands : NadekoSubmodule<GreetService>
+    public partial class GreetCommands : NadekoModule<GreetService>
     {
         [Cmd]
         [RequireContext(ContextType.Guild)]
diff --git a/src/NadekoBot/Modules/Administration/LocalizationCommands.cs b/src/NadekoBot/Modules/Administration/LocalizationCommands.cs
index 7cbba679d..2048529cb 100644
--- a/src/NadekoBot/Modules/Administration/LocalizationCommands.cs
+++ b/src/NadekoBot/Modules/Administration/LocalizationCommands.cs
@@ -6,7 +6,7 @@ namespace NadekoBot.Modules.Administration;
 public partial class Administration
 {
     [Group]
-    public partial class LocalizationCommands : NadekoSubmodule
+    public partial class LocalizationCommands : NadekoModule
     {
         private static readonly IReadOnlyDictionary<string, string> _supportedLocales = new Dictionary<string, string>
         {
diff --git a/src/NadekoBot/Modules/Administration/Mute/MuteCommands.cs b/src/NadekoBot/Modules/Administration/Mute/MuteCommands.cs
index ba0a210e1..53646475e 100644
--- a/src/NadekoBot/Modules/Administration/Mute/MuteCommands.cs
+++ b/src/NadekoBot/Modules/Administration/Mute/MuteCommands.cs
@@ -7,7 +7,7 @@ namespace NadekoBot.Modules.Administration;
 public partial class Administration
 {
     [Group]
-    public partial class MuteCommands : NadekoSubmodule<MuteService>
+    public partial class MuteCommands : NadekoModule<MuteService>
     {
         private async Task<bool> VerifyMutePermissions(IGuildUser runnerUser, IGuildUser targetUser)
         {
diff --git a/src/NadekoBot/Modules/Administration/PermOverrides/DiscordPermOverrideCommands.cs b/src/NadekoBot/Modules/Administration/PermOverrides/DiscordPermOverrideCommands.cs
index b9905eee3..d1f8eeea5 100644
--- a/src/NadekoBot/Modules/Administration/PermOverrides/DiscordPermOverrideCommands.cs
+++ b/src/NadekoBot/Modules/Administration/PermOverrides/DiscordPermOverrideCommands.cs
@@ -7,7 +7,7 @@ namespace NadekoBot.Modules.Administration;
 public partial class Administration
 {
     [Group]
-    public partial class DiscordPermOverrideCommands : NadekoSubmodule<DiscordPermOverrideService>
+    public partial class DiscordPermOverrideCommands : NadekoModule<DiscordPermOverrideService>
     {
         // override stats, it should require that the user has managessages guild permission
         // .po 'stats' add user guild managemessages
diff --git a/src/NadekoBot/Modules/Administration/PlayingRotate/PlayingRotateCommands.cs b/src/NadekoBot/Modules/Administration/PlayingRotate/PlayingRotateCommands.cs
index 16faea228..61e8b0750 100644
--- a/src/NadekoBot/Modules/Administration/PlayingRotate/PlayingRotateCommands.cs
+++ b/src/NadekoBot/Modules/Administration/PlayingRotate/PlayingRotateCommands.cs
@@ -6,7 +6,7 @@ namespace NadekoBot.Modules.Administration;
 public partial class Administration
 {
     [Group]
-    public partial class PlayingRotateCommands : NadekoSubmodule<PlayingRotateService>
+    public partial class PlayingRotateCommands : NadekoModule<PlayingRotateService>
     {
         [Cmd]
         [OwnerOnly]
diff --git a/src/NadekoBot/Modules/Administration/Prefix/PrefixCommands.cs b/src/NadekoBot/Modules/Administration/Prefix/PrefixCommands.cs
index 40fdd3256..2b175cd00 100644
--- a/src/NadekoBot/Modules/Administration/Prefix/PrefixCommands.cs
+++ b/src/NadekoBot/Modules/Administration/Prefix/PrefixCommands.cs
@@ -4,7 +4,7 @@ namespace NadekoBot.Modules.Administration;
 public partial class Administration
 {
     [Group]
-    public partial class PrefixCommands : NadekoSubmodule
+    public partial class PrefixCommands : NadekoModule
     {
         public enum Set
         {
diff --git a/src/NadekoBot/Modules/Administration/Protection/ProtectionCommands.cs b/src/NadekoBot/Modules/Administration/Protection/ProtectionCommands.cs
index 8cc82e684..2642aefeb 100644
--- a/src/NadekoBot/Modules/Administration/Protection/ProtectionCommands.cs
+++ b/src/NadekoBot/Modules/Administration/Protection/ProtectionCommands.cs
@@ -8,7 +8,7 @@ namespace NadekoBot.Modules.Administration;
 public partial class Administration
 {
     [Group]
-    public partial class ProtectionCommands : NadekoSubmodule<ProtectionService>
+    public partial class ProtectionCommands : NadekoModule<ProtectionService>
     {
         [Cmd]
         [RequireContext(ContextType.Guild)]
diff --git a/src/NadekoBot/Modules/Administration/Prune/PruneCommands.cs b/src/NadekoBot/Modules/Administration/Prune/PruneCommands.cs
index 1bbb78513..a864fd8fe 100644
--- a/src/NadekoBot/Modules/Administration/Prune/PruneCommands.cs
+++ b/src/NadekoBot/Modules/Administration/Prune/PruneCommands.cs
@@ -6,7 +6,7 @@ namespace NadekoBot.Modules.Administration;
 public partial class Administration
 {
     [Group]
-    public partial class PruneCommands : NadekoSubmodule<PruneService>
+    public partial class PruneCommands : NadekoModule<PruneService>
     {
         private static readonly TimeSpan _twoWeeks = TimeSpan.FromDays(14);
 
diff --git a/src/NadekoBot/Modules/Administration/Role/RoleCommands.cs b/src/NadekoBot/Modules/Administration/Role/RoleCommands.cs
index e33c68058..d1d33192a 100644
--- a/src/NadekoBot/Modules/Administration/Role/RoleCommands.cs
+++ b/src/NadekoBot/Modules/Administration/Role/RoleCommands.cs
@@ -9,7 +9,7 @@ namespace NadekoBot.Modules.Administration;
 
 public partial class Administration
 {
-    public partial class RoleCommands : NadekoSubmodule<RoleCommandsService>
+    public partial class RoleCommands : NadekoModule<RoleCommandsService>
     {
         public enum Exclude { Excl }
 
diff --git a/src/NadekoBot/Modules/Administration/Self/SelfCommands.cs b/src/NadekoBot/Modules/Administration/Self/SelfCommands.cs
index 1e7203009..54a725834 100644
--- a/src/NadekoBot/Modules/Administration/Self/SelfCommands.cs
+++ b/src/NadekoBot/Modules/Administration/Self/SelfCommands.cs
@@ -7,7 +7,7 @@ namespace NadekoBot.Modules.Administration;
 public partial class Administration
 {
     [Group]
-    public partial class SelfCommands : NadekoSubmodule<SelfService>
+    public partial class SelfCommands : NadekoModule<SelfService>
     {
         public enum SettableUserStatus
         {
diff --git a/src/NadekoBot/Modules/Administration/SelfAssignableRoles/SelfAssignedRolesCommands.cs b/src/NadekoBot/Modules/Administration/SelfAssignableRoles/SelfAssignedRolesCommands.cs
index 91d56f70b..368680854 100644
--- a/src/NadekoBot/Modules/Administration/SelfAssignableRoles/SelfAssignedRolesCommands.cs
+++ b/src/NadekoBot/Modules/Administration/SelfAssignableRoles/SelfAssignedRolesCommands.cs
@@ -7,7 +7,7 @@ namespace NadekoBot.Modules.Administration;
 public partial class Administration
 {
     [Group]
-    public partial class SelfAssignedRolesCommands : NadekoSubmodule<SelfAssignedRolesService>
+    public partial class SelfAssignedRolesCommands : NadekoModule<SelfAssignedRolesService>
     {
         [Cmd]
         [RequireContext(ContextType.Guild)]
diff --git a/src/NadekoBot/Modules/Administration/ServerLog/ServerLogCommands.cs b/src/NadekoBot/Modules/Administration/ServerLog/ServerLogCommands.cs
index efb5e8484..7a5f57110 100644
--- a/src/NadekoBot/Modules/Administration/ServerLog/ServerLogCommands.cs
+++ b/src/NadekoBot/Modules/Administration/ServerLog/ServerLogCommands.cs
@@ -7,7 +7,7 @@ public partial class Administration
 {
     [Group]
     [NoPublicBot]
-    public partial class LogCommands : NadekoSubmodule<ILogCommandService>
+    public partial class LogCommands : NadekoModule<ILogCommandService>
     {
         [Cmd]
         [RequireContext(ContextType.Guild)]
diff --git a/src/NadekoBot/Modules/Administration/Timezone/TimeZoneCommands.cs b/src/NadekoBot/Modules/Administration/Timezone/TimeZoneCommands.cs
index 62095b689..09811de83 100644
--- a/src/NadekoBot/Modules/Administration/Timezone/TimeZoneCommands.cs
+++ b/src/NadekoBot/Modules/Administration/Timezone/TimeZoneCommands.cs
@@ -6,7 +6,7 @@ namespace NadekoBot.Modules.Administration;
 public partial class Administration
 {
     [Group]
-    public partial class TimeZoneCommands : NadekoSubmodule<GuildTimezoneService>
+    public partial class TimeZoneCommands : NadekoModule<GuildTimezoneService>
     {
         [Cmd]
         [RequireContext(ContextType.Guild)]
diff --git a/src/NadekoBot/Modules/Administration/UserPunish/UserPunishCommands.cs b/src/NadekoBot/Modules/Administration/UserPunish/UserPunishCommands.cs
index 1b8a99de1..1787f2021 100644
--- a/src/NadekoBot/Modules/Administration/UserPunish/UserPunishCommands.cs
+++ b/src/NadekoBot/Modules/Administration/UserPunish/UserPunishCommands.cs
@@ -11,7 +11,7 @@ namespace NadekoBot.Modules.Administration;
 public partial class Administration
 {
     [Group]
-    public partial class UserPunishCommands : NadekoSubmodule<UserPunishService>
+    public partial class UserPunishCommands : NadekoModule<UserPunishService>
     {
         public enum AddRole
         {
diff --git a/src/NadekoBot/Modules/Administration/VcRole/VcRoleCommands.cs b/src/NadekoBot/Modules/Administration/VcRole/VcRoleCommands.cs
index 0b1e44e04..30c82599f 100644
--- a/src/NadekoBot/Modules/Administration/VcRole/VcRoleCommands.cs
+++ b/src/NadekoBot/Modules/Administration/VcRole/VcRoleCommands.cs
@@ -6,7 +6,7 @@ namespace NadekoBot.Modules.Administration;
 public partial class Administration
 {
     [Group]
-    public partial class VcRoleCommands : NadekoSubmodule<VcRoleService>
+    public partial class VcRoleCommands : NadekoModule<VcRoleService>
     {
         [Cmd]
         [UserPerm(GuildPerm.ManageRoles)]
diff --git a/src/NadekoBot/Modules/Gambling/DiceRoll/DiceRollCommands.cs b/src/NadekoBot/Modules/Gambling/DiceRoll/DiceRollCommands.cs
index 4dfd7e087..995326d5b 100644
--- a/src/NadekoBot/Modules/Gambling/DiceRoll/DiceRollCommands.cs
+++ b/src/NadekoBot/Modules/Gambling/DiceRoll/DiceRollCommands.cs
@@ -9,7 +9,7 @@ namespace NadekoBot.Modules.Gambling;
 public partial class Gambling
 {
     [Group]
-    public partial class DiceRollCommands : NadekoSubmodule
+    public partial class DiceRollCommands : NadekoModule
     {
         private static readonly Regex _dndRegex = new(@"^(?<n1>\d+)d(?<n2>\d+)(?:\+(?<add>\d+))?(?:\-(?<sub>\d+))?$",
             RegexOptions.Compiled);
diff --git a/src/NadekoBot/Modules/Gambling/Draw/DrawCommands.cs b/src/NadekoBot/Modules/Gambling/Draw/DrawCommands.cs
index 4214af0a1..d707c96d9 100644
--- a/src/NadekoBot/Modules/Gambling/Draw/DrawCommands.cs
+++ b/src/NadekoBot/Modules/Gambling/Draw/DrawCommands.cs
@@ -9,7 +9,7 @@ namespace NadekoBot.Modules.Gambling;
 public partial class Gambling
 {
     [Group]
-    public partial class DrawCommands : NadekoSubmodule
+    public partial class DrawCommands : NadekoModule
     {
         private static readonly ConcurrentDictionary<IGuild, Deck> _allDecks = new();
         private readonly IImageCache _images;
diff --git a/src/NadekoBot/Modules/Games/Acrophobia/AcropobiaCommands.cs b/src/NadekoBot/Modules/Games/Acrophobia/AcropobiaCommands.cs
index 0efc4f8ed..0ab079a7d 100644
--- a/src/NadekoBot/Modules/Games/Acrophobia/AcropobiaCommands.cs
+++ b/src/NadekoBot/Modules/Games/Acrophobia/AcropobiaCommands.cs
@@ -8,7 +8,7 @@ namespace NadekoBot.Modules.Games;
 public partial class Games
 {
     [Group]
-    public partial class AcropobiaCommands : NadekoSubmodule<GamesService>
+    public partial class AcropobiaCommands : NadekoModule<GamesService>
     {
         private readonly DiscordSocketClient _client;
 
diff --git a/src/NadekoBot/Modules/Games/ChatterBot/CleverBotCommands.cs b/src/NadekoBot/Modules/Games/ChatterBot/CleverBotCommands.cs
index ee4809a64..00a0a59a0 100644
--- a/src/NadekoBot/Modules/Games/ChatterBot/CleverBotCommands.cs
+++ b/src/NadekoBot/Modules/Games/ChatterBot/CleverBotCommands.cs
@@ -7,7 +7,7 @@ namespace NadekoBot.Modules.Games;
 public partial class Games
 {
     [Group]
-    public partial class ChatterBotCommands : NadekoSubmodule<ChatterBotService>
+    public partial class ChatterBotCommands : NadekoModule<ChatterBotService>
     {
         private readonly DbService _db;
 
diff --git a/src/NadekoBot/Modules/Games/Hangman/HangmanCommands.cs b/src/NadekoBot/Modules/Games/Hangman/HangmanCommands.cs
index f2f58bf7a..5dfdd0504 100644
--- a/src/NadekoBot/Modules/Games/Hangman/HangmanCommands.cs
+++ b/src/NadekoBot/Modules/Games/Hangman/HangmanCommands.cs
@@ -5,7 +5,7 @@ namespace NadekoBot.Modules.Games;
 public partial class Games
 {
     [Group]
-    public partial class HangmanCommands : NadekoSubmodule<IHangmanService>
+    public partial class HangmanCommands : NadekoModule<IHangmanService>
     {
         [Cmd]
         [RequireContext(ContextType.Guild)]
diff --git a/src/NadekoBot/Modules/Games/Nunchi/NunchiCommands.cs b/src/NadekoBot/Modules/Games/Nunchi/NunchiCommands.cs
index 2ac83c328..793e42af9 100644
--- a/src/NadekoBot/Modules/Games/Nunchi/NunchiCommands.cs
+++ b/src/NadekoBot/Modules/Games/Nunchi/NunchiCommands.cs
@@ -7,7 +7,7 @@ namespace NadekoBot.Modules.Games;
 public partial class Games
 {
     [Group]
-    public partial class NunchiCommands : NadekoSubmodule<GamesService>
+    public partial class NunchiCommands : NadekoModule<GamesService>
     {
         private readonly DiscordSocketClient _client;
 
diff --git a/src/NadekoBot/Modules/Games/Polls/PollCommands.cs b/src/NadekoBot/Modules/Games/Polls/PollCommands.cs
index 378492148..51fd8e986 100644
--- a/src/NadekoBot/Modules/Games/Polls/PollCommands.cs
+++ b/src/NadekoBot/Modules/Games/Polls/PollCommands.cs
@@ -8,7 +8,7 @@ namespace NadekoBot.Modules.Games;
 public partial class Games
 {
     [Group]
-    public partial class PollCommands : NadekoSubmodule<PollService>
+    public partial class PollCommands : NadekoModule<PollService>
     {
         private readonly DiscordSocketClient _client;
 
diff --git a/src/NadekoBot/Modules/Games/SpeedTyping/SpeedTypingCommands.cs b/src/NadekoBot/Modules/Games/SpeedTyping/SpeedTypingCommands.cs
index e90e37edf..524f18240 100644
--- a/src/NadekoBot/Modules/Games/SpeedTyping/SpeedTypingCommands.cs
+++ b/src/NadekoBot/Modules/Games/SpeedTyping/SpeedTypingCommands.cs
@@ -7,7 +7,7 @@ namespace NadekoBot.Modules.Games;
 public partial class Games
 {
     [Group]
-    public partial class SpeedTypingCommands : NadekoSubmodule<GamesService>
+    public partial class SpeedTypingCommands : NadekoModule<GamesService>
     {
         private readonly GamesService _games;
         private readonly DiscordSocketClient _client;
diff --git a/src/NadekoBot/Modules/Games/TicTacToe/TicTacToeCommands.cs b/src/NadekoBot/Modules/Games/TicTacToe/TicTacToeCommands.cs
index e04a8c287..066fe6d4c 100644
--- a/src/NadekoBot/Modules/Games/TicTacToe/TicTacToeCommands.cs
+++ b/src/NadekoBot/Modules/Games/TicTacToe/TicTacToeCommands.cs
@@ -7,7 +7,7 @@ namespace NadekoBot.Modules.Games;
 public partial class Games
 {
     [Group]
-    public partial class TicTacToeCommands : NadekoSubmodule<GamesService>
+    public partial class TicTacToeCommands : NadekoModule<GamesService>
     {
         private readonly SemaphoreSlim _sem = new(1, 1);
         private readonly DiscordSocketClient _client;
diff --git a/src/NadekoBot/Modules/Games/Trivia/TriviaCommands.cs b/src/NadekoBot/Modules/Games/Trivia/TriviaCommands.cs
index 8b357386d..d7f00e1b1 100644
--- a/src/NadekoBot/Modules/Games/Trivia/TriviaCommands.cs
+++ b/src/NadekoBot/Modules/Games/Trivia/TriviaCommands.cs
@@ -7,7 +7,7 @@ namespace NadekoBot.Modules.Games;
 public partial class Games
 {
     [Group]
-    public partial class TriviaCommands : NadekoSubmodule<GamesService>
+    public partial class TriviaCommands : NadekoModule<GamesService>
     {
         private readonly IDataCache _cache;
         private readonly ICurrencyService _cs;
diff --git a/src/NadekoBot/Modules/Permissions/Blacklist/BlacklistCommands.cs b/src/NadekoBot/Modules/Permissions/Blacklist/BlacklistCommands.cs
index 0803bac58..e60559d59 100644
--- a/src/NadekoBot/Modules/Permissions/Blacklist/BlacklistCommands.cs
+++ b/src/NadekoBot/Modules/Permissions/Blacklist/BlacklistCommands.cs
@@ -7,7 +7,7 @@ namespace NadekoBot.Modules.Permissions;
 public partial class Permissions
 {
     [Group]
-    public partial class BlacklistCommands : NadekoSubmodule<BlacklistService>
+    public partial class BlacklistCommands : NadekoModule<BlacklistService>
     {
         private readonly DiscordSocketClient _client;
 
diff --git a/src/NadekoBot/Modules/Permissions/CommandCooldown/CmdCdsCommands.cs b/src/NadekoBot/Modules/Permissions/CommandCooldown/CmdCdsCommands.cs
index b26831e87..970d84e1d 100644
--- a/src/NadekoBot/Modules/Permissions/CommandCooldown/CmdCdsCommands.cs
+++ b/src/NadekoBot/Modules/Permissions/CommandCooldown/CmdCdsCommands.cs
@@ -10,7 +10,7 @@ namespace NadekoBot.Modules.Permissions;
 public partial class Permissions
 {
     [Group]
-    public partial class CmdCdsCommands : NadekoSubmodule
+    public partial class CmdCdsCommands : NadekoModule
     {
         private ConcurrentDictionary<ulong, ConcurrentHashSet<CommandCooldown>> CommandCooldowns
             => _service.CommandCooldowns;
diff --git a/src/NadekoBot/Modules/Permissions/Filter/FilterCommands.cs b/src/NadekoBot/Modules/Permissions/Filter/FilterCommands.cs
index 1e7d0b7fb..def33b5d2 100644
--- a/src/NadekoBot/Modules/Permissions/Filter/FilterCommands.cs
+++ b/src/NadekoBot/Modules/Permissions/Filter/FilterCommands.cs
@@ -9,7 +9,7 @@ namespace NadekoBot.Modules.Permissions;
 public partial class Permissions
 {
     [Group]
-    public partial class FilterCommands : NadekoSubmodule<FilterService>
+    public partial class FilterCommands : NadekoModule<FilterService>
     {
         private readonly DbService _db;
 
diff --git a/src/NadekoBot/Modules/Permissions/GlobalPermissions/GlobalPermissionCommands.cs b/src/NadekoBot/Modules/Permissions/GlobalPermissions/GlobalPermissionCommands.cs
index e4176a6e4..382e40e92 100644
--- a/src/NadekoBot/Modules/Permissions/GlobalPermissions/GlobalPermissionCommands.cs
+++ b/src/NadekoBot/Modules/Permissions/GlobalPermissions/GlobalPermissionCommands.cs
@@ -7,7 +7,7 @@ namespace NadekoBot.Modules.Permissions;
 public partial class Permissions
 {
     [Group]
-    public partial class GlobalPermissionCommands : NadekoSubmodule
+    public partial class GlobalPermissionCommands : NadekoModule
     {
         private readonly GlobalPermissionService _service;
         private readonly DbService _db;
diff --git a/src/NadekoBot/Modules/Permissions/ResetPermissionsCommands.cs b/src/NadekoBot/Modules/Permissions/ResetPermissionsCommands.cs
index 093d48d18..89619dea2 100644
--- a/src/NadekoBot/Modules/Permissions/ResetPermissionsCommands.cs
+++ b/src/NadekoBot/Modules/Permissions/ResetPermissionsCommands.cs
@@ -6,7 +6,7 @@ namespace NadekoBot.Modules.Permissions;
 public partial class Permissions
 {
     [Group]
-    public partial class ResetPermissionsCommands : NadekoSubmodule
+    public partial class ResetPermissionsCommands : NadekoModule
     {
         private readonly GlobalPermissionService _gps;
         private readonly PermissionService _perms;
diff --git a/src/NadekoBot/Modules/Searches/Anime/AnimeSearchCommands.cs b/src/NadekoBot/Modules/Searches/Anime/AnimeSearchCommands.cs
index 0fdb0b76a..62e754041 100644
--- a/src/NadekoBot/Modules/Searches/Anime/AnimeSearchCommands.cs
+++ b/src/NadekoBot/Modules/Searches/Anime/AnimeSearchCommands.cs
@@ -8,7 +8,7 @@ namespace NadekoBot.Modules.Searches;
 public partial class Searches
 {
     [Group]
-    public partial class AnimeSearchCommands : NadekoSubmodule<AnimeSearchService>
+    public partial class AnimeSearchCommands : NadekoModule<AnimeSearchService>
     {
         // [NadekoCommand, Aliases]
         // public async Task Novel([Leftover] string query)
diff --git a/src/NadekoBot/Modules/Searches/Crypto/CryptoCommands.cs b/src/NadekoBot/Modules/Searches/Crypto/CryptoCommands.cs
index 8c3ef782b..8016d6add 100644
--- a/src/NadekoBot/Modules/Searches/Crypto/CryptoCommands.cs
+++ b/src/NadekoBot/Modules/Searches/Crypto/CryptoCommands.cs
@@ -6,7 +6,7 @@ namespace NadekoBot.Modules.Searches;
 
 public partial class Searches
 {
-    public partial class FinanceCommands : NadekoSubmodule<CryptoService>
+    public partial class FinanceCommands : NadekoModule<CryptoService>
     {
         private readonly IStockDataService _stocksService;
         private readonly IStockChartDrawingService _stockDrawingService;
diff --git a/src/NadekoBot/Modules/Searches/Feeds/FeedCommands.cs b/src/NadekoBot/Modules/Searches/Feeds/FeedCommands.cs
index ad8ca1d28..e97559df5 100644
--- a/src/NadekoBot/Modules/Searches/Feeds/FeedCommands.cs
+++ b/src/NadekoBot/Modules/Searches/Feeds/FeedCommands.cs
@@ -8,7 +8,7 @@ namespace NadekoBot.Modules.Searches;
 public partial class Searches
 {
     [Group]
-    public partial class FeedCommands : NadekoSubmodule<FeedsService>
+    public partial class FeedCommands : NadekoModule<FeedsService>
     {
         private static readonly Regex _ytChannelRegex =
             new(@"youtube\.com\/(?:c\/|channel\/|user\/)?(?<channelid>[a-zA-Z0-9\-]{1,})");
diff --git a/src/NadekoBot/Modules/Searches/JokeCommands.cs b/src/NadekoBot/Modules/Searches/JokeCommands.cs
index 1f63a09c1..e872f3adb 100644
--- a/src/NadekoBot/Modules/Searches/JokeCommands.cs
+++ b/src/NadekoBot/Modules/Searches/JokeCommands.cs
@@ -6,7 +6,7 @@ namespace NadekoBot.Modules.Searches;
 public partial class Searches
 {
     [Group]
-    public partial class JokeCommands : NadekoSubmodule<SearchesService>
+    public partial class JokeCommands : NadekoModule<SearchesService>
     {
         [Cmd]
         public async partial Task Yomama()
diff --git a/src/NadekoBot/Modules/Searches/MemegenCommands.cs b/src/NadekoBot/Modules/Searches/MemegenCommands.cs
index 71ee0315f..48c3d4fad 100644
--- a/src/NadekoBot/Modules/Searches/MemegenCommands.cs
+++ b/src/NadekoBot/Modules/Searches/MemegenCommands.cs
@@ -8,7 +8,7 @@ namespace NadekoBot.Modules.Searches;
 public partial class Searches
 {
     [Group]
-    public partial class MemegenCommands : NadekoSubmodule
+    public partial class MemegenCommands : NadekoModule
     {
         private static readonly ImmutableDictionary<char, string> _map = new Dictionary<char, string>
         {
diff --git a/src/NadekoBot/Modules/Searches/OsuCommands.cs b/src/NadekoBot/Modules/Searches/OsuCommands.cs
index 36e515458..ed302dbdc 100644
--- a/src/NadekoBot/Modules/Searches/OsuCommands.cs
+++ b/src/NadekoBot/Modules/Searches/OsuCommands.cs
@@ -7,7 +7,7 @@ namespace NadekoBot.Modules.Searches;
 public partial class Searches
 {
     [Group]
-    public partial class OsuCommands : NadekoSubmodule
+    public partial class OsuCommands : NadekoModule
     {
         private readonly IBotCredentials _creds;
         private readonly IHttpClientFactory _httpFactory;
diff --git a/src/NadekoBot/Modules/Searches/PathOfExileCommands.cs b/src/NadekoBot/Modules/Searches/PathOfExileCommands.cs
index 74568319c..bb183f5e5 100644
--- a/src/NadekoBot/Modules/Searches/PathOfExileCommands.cs
+++ b/src/NadekoBot/Modules/Searches/PathOfExileCommands.cs
@@ -12,7 +12,7 @@ namespace NadekoBot.Modules.Searches;
 public partial class Searches
 {
     [Group]
-    public partial class PathOfExileCommands : NadekoSubmodule<SearchesService>
+    public partial class PathOfExileCommands : NadekoModule<SearchesService>
     {
         private const string POE_URL = "https://www.pathofexile.com/character-window/get-characters?accountName=";
         private const string PON_URL = "http://poe.ninja/api/Data/GetCurrencyOverview?league=";
diff --git a/src/NadekoBot/Modules/Searches/PlaceCommands.cs b/src/NadekoBot/Modules/Searches/PlaceCommands.cs
index b2670ad92..8342b9c03 100644
--- a/src/NadekoBot/Modules/Searches/PlaceCommands.cs
+++ b/src/NadekoBot/Modules/Searches/PlaceCommands.cs
@@ -4,7 +4,7 @@ namespace NadekoBot.Modules.Searches;
 public partial class Searches
 {
     [Group]
-    public partial class PlaceCommands : NadekoSubmodule
+    public partial class PlaceCommands : NadekoModule
     {
         public enum PlaceType
         {
diff --git a/src/NadekoBot/Modules/Searches/PokemonSearchCommands.cs b/src/NadekoBot/Modules/Searches/PokemonSearchCommands.cs
index 2b25f00ce..2049e72a7 100644
--- a/src/NadekoBot/Modules/Searches/PokemonSearchCommands.cs
+++ b/src/NadekoBot/Modules/Searches/PokemonSearchCommands.cs
@@ -7,7 +7,7 @@ namespace NadekoBot.Modules.Searches;
 public partial class Searches
 {
     [Group]
-    public partial class PokemonSearchCommands : NadekoSubmodule<SearchesService>
+    public partial class PokemonSearchCommands : NadekoModule<SearchesService>
     {
         public IReadOnlyDictionary<string, SearchPokemon> Pokemons
             => _cache.LocalData.Pokemons;
diff --git a/src/NadekoBot/Modules/Searches/StreamNotification/StreamNotificationCommands.cs b/src/NadekoBot/Modules/Searches/StreamNotification/StreamNotificationCommands.cs
index c6daf62af..e3f99a971 100644
--- a/src/NadekoBot/Modules/Searches/StreamNotification/StreamNotificationCommands.cs
+++ b/src/NadekoBot/Modules/Searches/StreamNotification/StreamNotificationCommands.cs
@@ -9,7 +9,7 @@ namespace NadekoBot.Modules.Searches;
 public partial class Searches
 {
     [Group]
-    public partial class StreamNotificationCommands : NadekoSubmodule<StreamNotificationService>
+    public partial class StreamNotificationCommands : NadekoModule<StreamNotificationService>
     {
         private readonly DbService _db;
 
diff --git a/src/NadekoBot/Modules/Searches/Translate/TranslatorCommands.cs b/src/NadekoBot/Modules/Searches/Translate/TranslatorCommands.cs
index a99847ced..f714d59de 100644
--- a/src/NadekoBot/Modules/Searches/Translate/TranslatorCommands.cs
+++ b/src/NadekoBot/Modules/Searches/Translate/TranslatorCommands.cs
@@ -4,7 +4,7 @@ namespace NadekoBot.Modules.Searches;
 public partial class Searches
 {
     [Group]
-    public partial class TranslateCommands : NadekoSubmodule<ITranslateService>
+    public partial class TranslateCommands : NadekoModule<ITranslateService>
     {
         public enum AutoDeleteAutoTranslate
         {
diff --git a/src/NadekoBot/Modules/Searches/XkcdCommands.cs b/src/NadekoBot/Modules/Searches/XkcdCommands.cs
index 8df65047b..7718a99f0 100644
--- a/src/NadekoBot/Modules/Searches/XkcdCommands.cs
+++ b/src/NadekoBot/Modules/Searches/XkcdCommands.cs
@@ -6,7 +6,7 @@ namespace NadekoBot.Modules.Searches;
 public partial class Searches
 {
     [Group]
-    public partial class XkcdCommands : NadekoSubmodule
+    public partial class XkcdCommands : NadekoModule
     {
         private const string XKCD_URL = "https://xkcd.com";
         private readonly IHttpClientFactory _httpFactory;
diff --git a/src/NadekoBot/Modules/Searches/YoutubeTrack/YtUploadCommands.cs b/src/NadekoBot/Modules/Searches/YoutubeTrack/YtUploadCommands.cs
index 9ab3ee2f2..880222c68 100644
--- a/src/NadekoBot/Modules/Searches/YoutubeTrack/YtUploadCommands.cs
+++ b/src/NadekoBot/Modules/Searches/YoutubeTrack/YtUploadCommands.cs
@@ -4,7 +4,7 @@ namespace NadekoBot.Modules.Searches;
 public partial class Searches
 {
     // [Group]
-    // public partial class YtTrackCommands : NadekoSubmodule<YtTrackService>
+    // public partial class YtTrackCommands : NadekoModule<YtTrackService>
     // {
     //     ;
     //     [RequireContext(ContextType.Guild)]
diff --git a/src/NadekoBot/Modules/Utility/Calc/CalcCommands.cs b/src/NadekoBot/Modules/Utility/Calc/CalcCommands.cs
index 33143060c..0a892f9e3 100644
--- a/src/NadekoBot/Modules/Utility/Calc/CalcCommands.cs
+++ b/src/NadekoBot/Modules/Utility/Calc/CalcCommands.cs
@@ -7,7 +7,7 @@ namespace NadekoBot.Modules.Utility;
 public partial class Utility
 {
     [Group]
-    public partial class CalcCommands : NadekoSubmodule
+    public partial class CalcCommands : NadekoModule
     {
         [Cmd]
         public async partial Task Calculate([Leftover] string expression)
diff --git a/src/NadekoBot/Modules/Utility/CommandMap/CommandMapCommands.cs b/src/NadekoBot/Modules/Utility/CommandMap/CommandMapCommands.cs
index 362a9b3b7..e9a789dd4 100644
--- a/src/NadekoBot/Modules/Utility/CommandMap/CommandMapCommands.cs
+++ b/src/NadekoBot/Modules/Utility/CommandMap/CommandMapCommands.cs
@@ -9,7 +9,7 @@ namespace NadekoBot.Modules.Utility;
 public partial class Utility
 {
     [Group]
-    public partial class CommandMapCommands : NadekoSubmodule<CommandMapService>
+    public partial class CommandMapCommands : NadekoModule<CommandMapService>
     {
         private readonly DbService _db;
         private readonly DiscordSocketClient _client;
diff --git a/src/NadekoBot/Modules/Utility/ConfigCommands.cs b/src/NadekoBot/Modules/Utility/ConfigCommands.cs
index b358c73f1..067a815df 100644
--- a/src/NadekoBot/Modules/Utility/ConfigCommands.cs
+++ b/src/NadekoBot/Modules/Utility/ConfigCommands.cs
@@ -3,7 +3,7 @@ namespace NadekoBot.Modules.Utility;
 
 public partial class Utility
 {
-    public partial class ConfigCommands : NadekoSubmodule
+    public partial class ConfigCommands : NadekoModule
     {
         private readonly IEnumerable<IConfigService> _settingServices;
 
diff --git a/src/NadekoBot/Modules/Utility/Info/InfoCommands.cs b/src/NadekoBot/Modules/Utility/Info/InfoCommands.cs
index 1797b09ee..4b9e85761 100644
--- a/src/NadekoBot/Modules/Utility/Info/InfoCommands.cs
+++ b/src/NadekoBot/Modules/Utility/Info/InfoCommands.cs
@@ -6,7 +6,7 @@ namespace NadekoBot.Modules.Utility;
 public partial class Utility
 {
     [Group]
-    public partial class InfoCommands : NadekoSubmodule
+    public partial class InfoCommands : NadekoModule
     {
         private readonly DiscordSocketClient _client;
         private readonly IStatsService _stats;
diff --git a/src/NadekoBot/Modules/Utility/Info/InviteCommands.cs b/src/NadekoBot/Modules/Utility/Info/InviteCommands.cs
index a25b34692..62dae53bd 100644
--- a/src/NadekoBot/Modules/Utility/Info/InviteCommands.cs
+++ b/src/NadekoBot/Modules/Utility/Info/InviteCommands.cs
@@ -6,7 +6,7 @@ namespace NadekoBot.Modules.Utility;
 public partial class Utility
 {
     [Group]
-    public partial class InviteCommands : NadekoSubmodule<InviteService>
+    public partial class InviteCommands : NadekoModule<InviteService>
     {
         [Cmd]
         [RequireContext(ContextType.Guild)]
diff --git a/src/NadekoBot/Modules/Utility/Quote/QuoteCommands.cs b/src/NadekoBot/Modules/Utility/Quote/QuoteCommands.cs
index 4e5eead68..ebca3c24e 100644
--- a/src/NadekoBot/Modules/Utility/Quote/QuoteCommands.cs
+++ b/src/NadekoBot/Modules/Utility/Quote/QuoteCommands.cs
@@ -10,7 +10,7 @@ namespace NadekoBot.Modules.Utility;
 public partial class Utility
 {
     [Group]
-    public partial class QuoteCommands : NadekoSubmodule
+    public partial class QuoteCommands : NadekoModule
     {
         private const string PREPEND_EXPORT =
             @"# Keys are keywords, Each key has a LIST of quotes in the following format:
diff --git a/src/NadekoBot/Modules/Utility/Remind/RemindCommands.cs b/src/NadekoBot/Modules/Utility/Remind/RemindCommands.cs
index d22566715..384eb8e4e 100644
--- a/src/NadekoBot/Modules/Utility/Remind/RemindCommands.cs
+++ b/src/NadekoBot/Modules/Utility/Remind/RemindCommands.cs
@@ -10,7 +10,7 @@ namespace NadekoBot.Modules.Utility;
 public partial class Utility
 {
     [Group]
-    public partial class RemindCommands : NadekoSubmodule<RemindService>
+    public partial class RemindCommands : NadekoModule<RemindService>
     {
         public enum MeOrHere
         {
diff --git a/src/NadekoBot/Modules/Utility/Repeater/RepeatCommands.cs b/src/NadekoBot/Modules/Utility/Repeater/RepeatCommands.cs
index fd51ae033..cfe27b0ef 100644
--- a/src/NadekoBot/Modules/Utility/Repeater/RepeatCommands.cs
+++ b/src/NadekoBot/Modules/Utility/Repeater/RepeatCommands.cs
@@ -7,7 +7,7 @@ namespace NadekoBot.Modules.Utility;
 public partial class Utility
 {
     [Group]
-    public partial class RepeatCommands : NadekoSubmodule<RepeaterService>
+    public partial class RepeatCommands : NadekoModule<RepeaterService>
     {
         [Cmd]
         [RequireContext(ContextType.Guild)]
diff --git a/src/NadekoBot/Modules/Utility/StreamRole/StreamRoleCommands.cs b/src/NadekoBot/Modules/Utility/StreamRole/StreamRoleCommands.cs
index 943ab55cd..028127765 100644
--- a/src/NadekoBot/Modules/Utility/StreamRole/StreamRoleCommands.cs
+++ b/src/NadekoBot/Modules/Utility/StreamRole/StreamRoleCommands.cs
@@ -6,7 +6,7 @@ namespace NadekoBot.Modules.Utility;
 
 public partial class Utility
 {
-    public partial class StreamRoleCommands : NadekoSubmodule<StreamRoleService>
+    public partial class StreamRoleCommands : NadekoModule<StreamRoleService>
     {
         [Cmd]
         [BotPerm(GuildPerm.ManageRoles)]
diff --git a/src/NadekoBot/Modules/Utility/UnitConversion/UnitConversionCommands.cs b/src/NadekoBot/Modules/Utility/UnitConversion/UnitConversionCommands.cs
index 6aa62eb1a..1d2d8ff6c 100644
--- a/src/NadekoBot/Modules/Utility/UnitConversion/UnitConversionCommands.cs
+++ b/src/NadekoBot/Modules/Utility/UnitConversion/UnitConversionCommands.cs
@@ -6,7 +6,7 @@ namespace NadekoBot.Modules.Utility;
 public partial class Utility
 {
     [Group]
-    public partial class UnitConverterCommands : NadekoSubmodule<ConverterService>
+    public partial class UnitConverterCommands : NadekoModule<ConverterService>
     {
         [Cmd]
         public async partial Task ConvertList()
diff --git a/src/NadekoBot/Modules/Utility/VerboseErrors/VerboseErrorCommands.cs b/src/NadekoBot/Modules/Utility/VerboseErrors/VerboseErrorCommands.cs
index fcc1f45fc..313a4f70e 100644
--- a/src/NadekoBot/Modules/Utility/VerboseErrors/VerboseErrorCommands.cs
+++ b/src/NadekoBot/Modules/Utility/VerboseErrors/VerboseErrorCommands.cs
@@ -6,7 +6,7 @@ namespace NadekoBot.Modules.Utility;
 public partial class Utility
 {
     [Group]
-    public partial class VerboseErrorCommands : NadekoSubmodule<VerboseErrorsService>
+    public partial class VerboseErrorCommands : NadekoModule<VerboseErrorsService>
     {
         [Cmd]
         [RequireContext(ContextType.Guild)]
diff --git a/src/NadekoBot/Modules/Xp/Club/Club.cs b/src/NadekoBot/Modules/Xp/Club/Club.cs
index 956a1a040..e6295ac66 100644
--- a/src/NadekoBot/Modules/Xp/Club/Club.cs
+++ b/src/NadekoBot/Modules/Xp/Club/Club.cs
@@ -7,7 +7,7 @@ namespace NadekoBot.Modules.Xp;
 public partial class Xp
 {
     [Group]
-    public partial class Club : NadekoSubmodule<ClubService>
+    public partial class Club : NadekoModule<ClubService>
     {
         private readonly XpService _xps;
 
diff --git a/src/NadekoBot/Modules/Xp/ResetCommands.cs b/src/NadekoBot/Modules/Xp/ResetCommands.cs
index bec854091..aba08b4fb 100644
--- a/src/NadekoBot/Modules/Xp/ResetCommands.cs
+++ b/src/NadekoBot/Modules/Xp/ResetCommands.cs
@@ -5,7 +5,7 @@ namespace NadekoBot.Modules.Xp;
 
 public partial class Xp
 {
-    public partial class ResetCommands : NadekoSubmodule<XpService>
+    public partial class ResetCommands : NadekoModule<XpService>
     {
         [Cmd]
         [RequireContext(ContextType.Guild)]