diff --git a/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_o.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_adminchat.java
similarity index 94%
rename from src/main/java/me/totalfreedom/totalfreedommod/commands/Command_o.java
rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_adminchat.java
index 8da5a5de..b5feac59 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_o.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_adminchat.java
@@ -12,8 +12,8 @@ import org.bukkit.entity.Player;
 @CommandParameters(
         description = "AdminChat - Talk privately with other admins. Using <command> itself will toggle AdminChat on and off for all messages.",
         usage = "/<command> [message...]",
-        aliases = "adminchat")
-public class Command_o extends FreedomCommand
+        aliases = "o,ac")
+public class Command_adminchat extends FreedomCommand
 {
 
     @Override
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_csay.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_consolesay.java
similarity index 91%
rename from src/main/java/me/totalfreedom/totalfreedommod/commands/Command_csay.java
rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_consolesay.java
index 2c5697ec..855ca143 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_csay.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_consolesay.java
@@ -8,8 +8,8 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = PlayerRank.SUPER_ADMIN, source = SourceType.ONLY_CONSOLE)
-@CommandParameters(description = "Telnet command - Send a chat message with chat formatting over telnet.", usage = "/<command> <message...>")
-public class Command_csay extends FreedomCommand
+@CommandParameters(description = "Telnet command - Send a chat message with chat formatting over telnet.", usage = "/<command> <message...>", aliases = "csay")
+public class Command_consolesay extends FreedomCommand
 {
 
     @Override
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_rd.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_entitywipe.java
similarity index 88%
rename from src/main/java/me/totalfreedom/totalfreedommod/commands/Command_rd.java
rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_entitywipe.java
index f84f324d..993a3819 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_rd.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_entitywipe.java
@@ -7,8 +7,8 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = PlayerRank.SUPER_ADMIN, source = SourceType.BOTH)
-@CommandParameters(description = "Remove various server entities that may cause lag, such as dropped items, minecarts, and boats.", usage = "/<command> <carts>")
-public class Command_rd extends FreedomCommand
+@CommandParameters(description = "Remove various server entities that may cause lag, such as dropped items, minecarts, and boats.", usage = "/<command> <carts>", aliases = "ew,rd")
+public class Command_entitywipe extends FreedomCommand
 {
 
     @Override
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_fr.java b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_freeze.java
similarity index 95%
rename from src/main/java/me/totalfreedom/totalfreedommod/commands/Command_fr.java
rename to src/main/java/me/totalfreedom/totalfreedommod/commands/Command_freeze.java
index e544e36e..dc9d5252 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_fr.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/commands/Command_freeze.java
@@ -9,8 +9,8 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = PlayerRank.SUPER_ADMIN, source = SourceType.BOTH)
-@CommandParameters(description = "Freeze players (toggles on and off).", usage = "/<command> [target | purge]")
-public class Command_fr extends FreedomCommand
+@CommandParameters(description = "Freeze players (toggles on and off).", usage = "/<command> [target | purge]", aliases = "fr")
+public class Command_freeze extends FreedomCommand
 {
 
     @Override