diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java
index 8863d07..f96792f 100644
--- a/src/main/java/com/bbn/hadder/Hadder.java
+++ b/src/main/java/com/bbn/hadder/Hadder.java
@@ -47,7 +47,7 @@ public class Hadder {
                         helpCommand,
                         new TestCommand(),
                         new BanCommand(),
-                        new PrefixCommand(),
+                        new UserPrefixCommand(),
                         new ShutdownCommand(),
                         new KickCommand(),
                         new PingCommand(),
@@ -58,7 +58,7 @@ public class Hadder {
                         new EqualsCommand(),
                         new InviteCommand(),
                         new NickCommand(),
-                        new GuildPrefixCommand(),
+                        new PrefixCommand(),
                         new BlowjobCommand(),
                         new PornCommand(),
                         new AnalCommand(),
diff --git a/src/main/java/com/bbn/hadder/commands/moderation/GuildPrefixCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/PrefixCommand.java
similarity index 93%
rename from src/main/java/com/bbn/hadder/commands/moderation/GuildPrefixCommand.java
rename to src/main/java/com/bbn/hadder/commands/moderation/PrefixCommand.java
index 35bfb2b..01a7d9a 100644
--- a/src/main/java/com/bbn/hadder/commands/moderation/GuildPrefixCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/moderation/PrefixCommand.java
@@ -5,7 +5,7 @@ import com.bbn.hadder.commands.CommandEvent;
 import com.bbn.hadder.utils.MessageEditor;
 import net.dv8tion.jda.api.Permission;
 
-public class GuildPrefixCommand implements Command {
+public class PrefixCommand implements Command {
 
     @Override
     public void executed(String[] args, CommandEvent event) {
@@ -38,7 +38,7 @@ public class GuildPrefixCommand implements Command {
 
     @Override
     public String[] labels() {
-        return new String[]{"guildprefix"};
+        return new String[]{"prefix"};
     }
 
     @Override
@@ -48,6 +48,6 @@ public class GuildPrefixCommand implements Command {
 
     @Override
     public String usage() {
-        return "guildprefix";
+        return "prefix";
     }
 }
diff --git a/src/main/java/com/bbn/hadder/commands/settings/PrefixCommand.java b/src/main/java/com/bbn/hadder/commands/settings/UserPrefixCommand.java
similarity index 89%
rename from src/main/java/com/bbn/hadder/commands/settings/PrefixCommand.java
rename to src/main/java/com/bbn/hadder/commands/settings/UserPrefixCommand.java
index 4bb58af..bf360fe 100644
--- a/src/main/java/com/bbn/hadder/commands/settings/PrefixCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/settings/UserPrefixCommand.java
@@ -8,7 +8,7 @@ import com.bbn.hadder.commands.Command;
 import com.bbn.hadder.commands.CommandEvent;
 import com.bbn.hadder.utils.MessageEditor;
 
-public class PrefixCommand implements Command {
+public class UserPrefixCommand implements Command {
 
     public void executed(String[] args, CommandEvent event) {
         if (args.length == 1) {
@@ -26,7 +26,7 @@ public class PrefixCommand implements Command {
 
     @Override
     public String[] labels() {
-        return new String[] { "prefix" };
+        return new String[] { "userprefix" };
     }
 
     @Override
@@ -36,6 +36,6 @@ public class PrefixCommand implements Command {
 
     @Override
     public String usage() {
-        return "prefix";
+        return "userprefix";
     }
 }
diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties
index e9a7e23..717588b 100644
--- a/src/main/resources/Translations/Translations_en.properties
+++ b/src/main/resources/Translations/Translations_en.properties
@@ -7,8 +7,8 @@ Hadder = Hadder
 searchterm = <SearchTerm>
 username = <Username>
 number = <Number>/all
-guildprefix = <New Guild-Prefix>
 prefix = <New Prefix>
+userprefix = <New User-Prefix>
 vc-name/id = <VoiceChannelID|VoiceChannelName>
 user+nickname = <@user> <New Nickname>
 region = <region>