diff --git a/src/NadekoBot/Modules/Administration/Administration.cs b/src/NadekoBot/Modules/Administration/Administration.cs
index 3a33a41d..af0d13df 100644
--- a/src/NadekoBot/Modules/Administration/Administration.cs
+++ b/src/NadekoBot/Modules/Administration/Administration.cs
@@ -16,7 +16,7 @@ using NadekoBot.Services.Database.Models;
 
 namespace NadekoBot.Modules.Administration
 {
-    [Module(".", AppendSpace = false)]
+    [NadekoModule("Administration", ".")]
     public partial class Administration : DiscordModule
     {
         public Administration(ILocalization loc, CommandService cmds, DiscordSocketClient client) : base(loc, cmds, client)
diff --git a/src/NadekoBot/Modules/ClashOfClans/ClashOfClans.cs b/src/NadekoBot/Modules/ClashOfClans/ClashOfClans.cs
index 9dc4ebf1..542946cd 100644
--- a/src/NadekoBot/Modules/ClashOfClans/ClashOfClans.cs
+++ b/src/NadekoBot/Modules/ClashOfClans/ClashOfClans.cs
@@ -14,7 +14,7 @@ using NadekoBot.Services.Database;
 
 namespace NadekoBot.Modules.ClashOfClans
 {
-    [Module(",", AppendSpace = false)]
+    [NadekoModule("ClashOfClans", ",")]
     public class ClashOfClans : DiscordModule
     {
         public static ConcurrentDictionary<ulong, List<ClashWar>> ClashWars { get; set; } = new ConcurrentDictionary<ulong, List<ClashWar>>();
diff --git a/src/NadekoBot/Modules/Gambling/Gambling.cs b/src/NadekoBot/Modules/Gambling/Gambling.cs
index 03bd9173..4585a820 100644
--- a/src/NadekoBot/Modules/Gambling/Gambling.cs
+++ b/src/NadekoBot/Modules/Gambling/Gambling.cs
@@ -14,7 +14,7 @@ using System.Collections.Generic;
 
 namespace NadekoBot.Modules.Gambling
 {
-    [Module("$", AppendSpace = false)]
+    [NadekoModule("Gambling", "$")]
     public partial class Gambling : DiscordModule
     {
         public static string CurrencyName { get; set; }
diff --git a/src/NadekoBot/Modules/Games/Games.cs b/src/NadekoBot/Modules/Games/Games.cs
index d3e2840c..99083ae7 100644
--- a/src/NadekoBot/Modules/Games/Games.cs
+++ b/src/NadekoBot/Modules/Games/Games.cs
@@ -12,7 +12,7 @@ using NadekoBot.Services.Database;
 
 namespace NadekoBot.Modules.Games
 {
-    [Module(">", AppendSpace = false)]
+    [NadekoModule("Games", ">")]
     public partial class Games : DiscordModule
     {
         private IEnumerable<string> _8BallResponses {
diff --git a/src/NadekoBot/Modules/Help/Help.cs b/src/NadekoBot/Modules/Help/Help.cs
index 81e986ed..070b6930 100644
--- a/src/NadekoBot/Modules/Help/Help.cs
+++ b/src/NadekoBot/Modules/Help/Help.cs
@@ -12,7 +12,7 @@ using Discord.WebSocket;
 
 namespace NadekoBot.Modules.Help
 {
-    [Module("-", AppendSpace = false)]
+    [NadekoModule("Help", "-")]
     public partial class Help : DiscordModule
     {
         public string HelpString {
diff --git a/src/NadekoBot/Modules/Music/Music.cs b/src/NadekoBot/Modules/Music/Music.cs
index dc0186a2..5675eff1 100644
--- a/src/NadekoBot/Modules/Music/Music.cs
+++ b/src/NadekoBot/Modules/Music/Music.cs
@@ -17,7 +17,7 @@ using NadekoBot.Services.Database;
 
 namespace NadekoBot.Modules.Music
 {
-    [Module("!!", AppendSpace = false)]
+    [NadekoModule("ClashOfClans", "!!")]
     public partial class Music : DiscordModule
     {
         public static ConcurrentDictionary<ulong, MusicPlayer> MusicPlayers = new ConcurrentDictionary<ulong, MusicPlayer>();
diff --git a/src/NadekoBot/Modules/NSFW/NSFW.cs b/src/NadekoBot/Modules/NSFW/NSFW.cs
index 2cb651ca..ae9f6c19 100644
--- a/src/NadekoBot/Modules/NSFW/NSFW.cs
+++ b/src/NadekoBot/Modules/NSFW/NSFW.cs
@@ -15,7 +15,7 @@ using NadekoBot.Extensions;
 
 namespace NadekoBot.Modules.NSFW
 {
-    [Module("~", AppendSpace = false)]
+    [NadekoModule("NSFW", "~")]
     public class NSFW : DiscordModule
     {
         public NSFW(ILocalization loc, CommandService cmds, DiscordSocketClient client) : base(loc, cmds, client)
diff --git a/src/NadekoBot/Modules/Searches/Searches.cs b/src/NadekoBot/Modules/Searches/Searches.cs
index b5debb4e..2e987145 100644
--- a/src/NadekoBot/Modules/Searches/Searches.cs
+++ b/src/NadekoBot/Modules/Searches/Searches.cs
@@ -16,7 +16,7 @@ using NadekoBot.Modules.Searches.IMDB;
 
 namespace NadekoBot.Modules.Searches
 {
-    [Module("~", AppendSpace = false)]
+    [NadekoModule("Searches", "~")]
     public partial class Searches : DiscordModule
     {
         private IGoogleApiService _google { get; }
diff --git a/src/NadekoBot/Modules/Translator/Translator.cs b/src/NadekoBot/Modules/Translator/Translator.cs
index c1cf0850..e974746a 100644
--- a/src/NadekoBot/Modules/Translator/Translator.cs
+++ b/src/NadekoBot/Modules/Translator/Translator.cs
@@ -9,7 +9,7 @@ using Discord.WebSocket;
 
 namespace NadekoBot.Modules.Translator
 {
-    [Module("~", AppendSpace = false)]
+    [NadekoModule("Translator", "~")]
     public class Translator : DiscordModule
     {
         public Translator(ILocalization loc, CommandService cmds, DiscordSocketClient client) : base(loc, cmds, client)
diff --git a/src/NadekoBot/Modules/Utility/Utility.cs b/src/NadekoBot/Modules/Utility/Utility.cs
index a10441c7..2464d5c9 100644
--- a/src/NadekoBot/Modules/Utility/Utility.cs
+++ b/src/NadekoBot/Modules/Utility/Utility.cs
@@ -15,7 +15,7 @@ using Discord.WebSocket;
 namespace NadekoBot.Modules.Utility
 {
 
-    [Module(".", AppendSpace = false)]
+    [NadekoModule("Utility", ".")]
     public partial class Utility : DiscordModule
     {
         public Utility(ILocalization loc, CommandService cmds, DiscordSocketClient client) : base(loc, cmds, client)
diff --git a/src/NadekoBot/NadekoBot.cs b/src/NadekoBot/NadekoBot.cs
index 1b292bc4..081d5c24 100644
--- a/src/NadekoBot/NadekoBot.cs
+++ b/src/NadekoBot/NadekoBot.cs
@@ -32,12 +32,6 @@ namespace NadekoBot
         {
             SetupLogger();
 
-            for (int i = 0; i < 100; i++)
-            {
-                var rnd = new NadekoRandom();
-                Console.WriteLine(rnd.Next(-10, -1));
-            }
-
             //create client
             Client = new DiscordSocketClient(new DiscordSocketConfig
             {
diff --git a/src/NadekoBot/Services/Database/NadekoContext.cs b/src/NadekoBot/Services/Database/NadekoContext.cs
index 61dedb35..46e42179 100644
--- a/src/NadekoBot/Services/Database/NadekoContext.cs
+++ b/src/NadekoBot/Services/Database/NadekoContext.cs
@@ -43,6 +43,7 @@ namespace NadekoBot.Services.Database
                 {
                     new ModulePrefix() { ModuleName = "Administration", Prefix = "." },
                     new ModulePrefix() { ModuleName = "Searches", Prefix = "~" },
+                    new ModulePrefix() { ModuleName = "Translator", Prefix = "~" },
                     new ModulePrefix() { ModuleName = "NSFW", Prefix = "~" },
                     new ModulePrefix() { ModuleName = "ClashOfClans", Prefix = "," },
                     new ModulePrefix() { ModuleName = "Help", Prefix = "-" },