diff --git a/AreaShop/src/main/java/me/wiefferink/areashop/commands/DelFriendCommand.java b/AreaShop/src/main/java/me/wiefferink/areashop/commands/DelFriendCommand.java
index d18c54f7..993f98e5 100644
--- a/AreaShop/src/main/java/me/wiefferink/areashop/commands/DelFriendCommand.java
+++ b/AreaShop/src/main/java/me/wiefferink/areashop/commands/DelFriendCommand.java
@@ -37,7 +37,7 @@ public class DelFriendCommand extends AreashopCommandBean {
     private final CommandFlag<GeneralRegion> regionFlag;
 
     @Inject
-    public DelFriendCloudCommand(
+    public DelFriendCommand(
             @Nonnull MessageBridge messageBridge,
             @Nonnull IFileManager fileManager
     ) {
diff --git a/AreaShop/src/main/java/me/wiefferink/areashop/commands/DelSignCommand.java b/AreaShop/src/main/java/me/wiefferink/areashop/commands/DelSignCommand.java
index 4e6bfe5d..d2904e20 100644
--- a/AreaShop/src/main/java/me/wiefferink/areashop/commands/DelSignCommand.java
+++ b/AreaShop/src/main/java/me/wiefferink/areashop/commands/DelSignCommand.java
@@ -26,7 +26,7 @@ public class DelSignCommand extends AreashopCommandBean {
 	private final SignManager signManager;
 	private final MessageBridge messageBridge;
 	@Inject
-	public DelSignCloudCommand(@Nonnull MessageBridge messageBridge, @Nonnull SignManager signManager) {
+	public DelSignCommand(@Nonnull MessageBridge messageBridge, @Nonnull SignManager signManager) {
 		this.signManager = signManager;
 		this.messageBridge = messageBridge;
 	}
diff --git a/AreaShop/src/main/java/me/wiefferink/areashop/commands/GroupAddCommand.java b/AreaShop/src/main/java/me/wiefferink/areashop/commands/GroupAddCommand.java
index c1156685..0db2e1db 100644
--- a/AreaShop/src/main/java/me/wiefferink/areashop/commands/GroupAddCommand.java
+++ b/AreaShop/src/main/java/me/wiefferink/areashop/commands/GroupAddCommand.java
@@ -39,7 +39,7 @@ public class GroupAddCommand extends AreashopCommandBean {
     private final CommandFlag<GeneralRegion> regionFlag;
 
     @Inject
-    public GroupAddCloudCommand(
+    public GroupAddCommand(
             @Nonnull MessageBridge messageBridge,
             @Nonnull IFileManager fileManager,
             @Nonnull RegionFactory regionFactory
diff --git a/AreaShop/src/main/java/me/wiefferink/areashop/commands/GroupDelCommand.java b/AreaShop/src/main/java/me/wiefferink/areashop/commands/GroupDelCommand.java
index ec8278ff..230cef27 100644
--- a/AreaShop/src/main/java/me/wiefferink/areashop/commands/GroupDelCommand.java
+++ b/AreaShop/src/main/java/me/wiefferink/areashop/commands/GroupDelCommand.java
@@ -39,7 +39,7 @@ public class GroupDelCommand extends AreashopCommandBean {
     private final CommandFlag<GeneralRegion> regionFlag;
 
     @Inject
-    public GroupDelCloudCommand(
+    public GroupDelCommand(
             @Nonnull MessageBridge messageBridge,
             @Nonnull IFileManager fileManager,
             @Nonnull RegionFactory regionFactory
diff --git a/AreaShop/src/main/java/me/wiefferink/areashop/commands/GroupInfoCommand.java b/AreaShop/src/main/java/me/wiefferink/areashop/commands/GroupInfoCommand.java
index f0fe62a7..427680d3 100644
--- a/AreaShop/src/main/java/me/wiefferink/areashop/commands/GroupInfoCommand.java
+++ b/AreaShop/src/main/java/me/wiefferink/areashop/commands/GroupInfoCommand.java
@@ -28,7 +28,7 @@ public class GroupInfoCommand extends AreashopCommandBean {
     private final MessageBridge messageBridge;
 
     @Inject
-    public GroupInfoCloudCommand(@Nonnull MessageBridge messageBridge, @Nonnull IFileManager fileManager) {
+    public GroupInfoCommand(@Nonnull MessageBridge messageBridge, @Nonnull IFileManager fileManager) {
         this.messageBridge = messageBridge;
         this.fileManager = fileManager;
     }
diff --git a/AreaShop/src/main/java/me/wiefferink/areashop/commands/GroupListCommand.java b/AreaShop/src/main/java/me/wiefferink/areashop/commands/GroupListCommand.java
index f9a51114..a0fa7d87 100644
--- a/AreaShop/src/main/java/me/wiefferink/areashop/commands/GroupListCommand.java
+++ b/AreaShop/src/main/java/me/wiefferink/areashop/commands/GroupListCommand.java
@@ -22,7 +22,7 @@ public class GroupListCommand extends AreashopCommandBean {
 	private final IFileManager fileManager;
 
 	@Inject
-	public GroupListCloudCommand(@Nonnull MessageBridge messageBridge, @Nonnull IFileManager fileManager) {
+	public GroupListCommand(@Nonnull MessageBridge messageBridge, @Nonnull IFileManager fileManager) {
 		this.messageBridge = messageBridge;
 		this.fileManager = fileManager;
 	}
diff --git a/AreaShop/src/main/java/me/wiefferink/areashop/commands/LinkSignsCommand.java b/AreaShop/src/main/java/me/wiefferink/areashop/commands/LinkSignsCommand.java
index 1b25731f..5e68f570 100644
--- a/AreaShop/src/main/java/me/wiefferink/areashop/commands/LinkSignsCommand.java
+++ b/AreaShop/src/main/java/me/wiefferink/areashop/commands/LinkSignsCommand.java
@@ -29,7 +29,7 @@ public class LinkSignsCommand extends AreashopCommandBean {
     private final CommandFlag<String> profileFlag;
 
     @Inject
-    public LinkSignsCloudCommand(
+    public LinkSignsCommand(
             @Nonnull MessageBridge messageBridge,
             @Nonnull SignLinkerManager signLinkerManager,
             @Nonnull AreaShop plugin
diff --git a/AreaShop/src/main/java/me/wiefferink/areashop/commands/util/AreashopCommands.java b/AreaShop/src/main/java/me/wiefferink/areashop/commands/util/AreashopCommands.java
index 7490ef42..58a8bb37 100644
--- a/AreaShop/src/main/java/me/wiefferink/areashop/commands/util/AreashopCommands.java
+++ b/AreaShop/src/main/java/me/wiefferink/areashop/commands/util/AreashopCommands.java
@@ -10,10 +10,16 @@
 import me.wiefferink.areashop.commands.AddSignCommand;
 import me.wiefferink.areashop.commands.BuyCommand;
 import me.wiefferink.areashop.commands.DelCommand;
+import me.wiefferink.areashop.commands.DelFriendCommand;
+import me.wiefferink.areashop.commands.DelSignCommand;
 import me.wiefferink.areashop.commands.FindCommand;
+import me.wiefferink.areashop.commands.GroupAddCommand;
+import me.wiefferink.areashop.commands.GroupDelCommand;
+import me.wiefferink.areashop.commands.GroupInfoCommand;
+import me.wiefferink.areashop.commands.GroupListCommand;
 import me.wiefferink.areashop.commands.HelpCommand;
 import me.wiefferink.areashop.commands.InfoCommand;
-import me.wiefferink.areashop.commands.LinkSignsCloudCommand;
+import me.wiefferink.areashop.commands.LinkSignsCommand;
 import me.wiefferink.areashop.commands.MeCommand;
 import me.wiefferink.areashop.commands.MessageCommand;
 import me.wiefferink.areashop.commands.ReloadCommand;
@@ -61,16 +67,16 @@ public class AreashopCommands {
             AddSignCommand.class,
             BuyCommand.class,
             DelCommand.class,
-            DelFriendCloudCommand.class,
-            DelSignCloudCommand.class,
+            DelFriendCommand.class,
+            DelSignCommand.class,
             FindCommand.class,
-            GroupAddCloudCommand.class,
-            GroupDelCloudCommand.class,
-            GroupInfoCloudCommand.class,
-            GroupListCloudCommand.class,
+            GroupAddCommand.class,
+            GroupDelCommand.class,
+            GroupInfoCommand.class,
+            GroupListCommand.class,
             HelpCommand.class,
             InfoCommand.class,
-            LinkSignsCloudCommand.class,
+            LinkSignsCommand.class,
             MeCommand.class,
             MessageCommand.class,
             ReloadCommand.class,