diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5d9db8331..5dbd48f78 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 Mostly based on [keepachangelog](https://keepachangelog.com/en/1.0.0/) except date format. a-c-f-r-o
 
+## [5.1.7] - 08.08.2024
+
+### Fixed
+
+- Fixed some command groups incorrectly showing up as modules
+
 ## [5.1.6] - 07.08.2024
 
 ### Added
diff --git a/src/NadekoBot/Modules/Administration/DangerousCommands/CleanupCommands.cs b/src/NadekoBot/Modules/Administration/DangerousCommands/CleanupCommands.cs
index 17d48b69e..622d6dd09 100644
--- a/src/NadekoBot/Modules/Administration/DangerousCommands/CleanupCommands.cs
+++ b/src/NadekoBot/Modules/Administration/DangerousCommands/CleanupCommands.cs
@@ -1,9 +1,11 @@
-namespace NadekoBot.Modules.Administration.DangerousCommands;
+using NadekoBot.Modules.Administration.DangerousCommands;
+
+namespace NadekoBot.Modules.Administration;
 
 public partial class Administration 
 {
     [Group]
-    public class CleanupCommands : CleanupModuleBase
+    public partial class CleanupCommands : CleanupModuleBase
     {
         private readonly ICleanupService _svc;
 
diff --git a/src/NadekoBot/Modules/Utility/Ai/UtilityCommands.cs b/src/NadekoBot/Modules/Utility/Ai/UtilityCommands.cs
index 7f8c139fd..389abf946 100644
--- a/src/NadekoBot/Modules/Utility/Ai/UtilityCommands.cs
+++ b/src/NadekoBot/Modules/Utility/Ai/UtilityCommands.cs
@@ -1,8 +1,9 @@
 namespace NadekoBot.Modules.Utility;
 
-public partial class UtilityCommands
+public partial class Utility
 {
-    public class PromptCommands : NadekoModule<IAiAssistantService>
+    [Group]
+    public partial class PromptCommands : NadekoModule<IAiAssistantService>
     {
         [Cmd]
         [RequireContext(ContextType.Guild)]
diff --git a/src/NadekoBot/NadekoBot.csproj b/src/NadekoBot/NadekoBot.csproj
index e7c83e12a..7bf69e7ef 100644
--- a/src/NadekoBot/NadekoBot.csproj
+++ b/src/NadekoBot/NadekoBot.csproj
@@ -4,7 +4,7 @@
         <Nullable>enable</Nullable>
         <ImplicitUsings>true</ImplicitUsings>
         <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
-        <Version>5.1.6</Version>
+        <Version>5.1.7</Version>
 
         <!-- Output/build -->
         <RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory>