diff --git a/src/main/java/me/clip/placeholderapi/commands/CommandHandler.java b/src/main/java/me/clip/placeholderapi/commands/CommandHandler.java
index 932f307..dfdbcac 100644
--- a/src/main/java/me/clip/placeholderapi/commands/CommandHandler.java
+++ b/src/main/java/me/clip/placeholderapi/commands/CommandHandler.java
@@ -3,8 +3,8 @@ package me.clip.placeholderapi.commands;
 import com.google.common.collect.Lists;
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.commands.command.*;
-import me.clip.placeholderapi.commands.command.ecloud.InfoCommand;
-import me.clip.placeholderapi.commands.command.ecloud.ListCommand;
+import me.clip.placeholderapi.commands.command.ecloud.EcloudInfoCommand;
+import me.clip.placeholderapi.commands.command.ecloud.EcloudListCommand;
 import me.clip.placeholderapi.commands.command.ecloud.*;
 import me.clip.placeholderapi.util.Msg;
 import org.bukkit.command.CommandExecutor;
@@ -20,14 +20,14 @@ public final class CommandHandler implements CommandExecutor {
     private static final Command DEFAULT = new VersionCommand();
 
     private static final List<Command> COMMANDS = Lists.newArrayList(
-            new ClearCommand(),
-            new DownloadCommand(),
-            new InfoCommand(),
-            new ListCommand(),
-            new PlaceholdersCommand(),
-            new RefreshCommand(),
-            new StatusCommand(),
-            new VersionInfoCommand(),
+            new EcloudClearCommand(),
+            new EcloudDownloadCommand(),
+            new EcloudInfoCommand(),
+            new EcloudListCommand(),
+            new EcloudPlaceholdersCommand(),
+            new EcloudRefreshCommand(),
+            new EcloudStatusCommand(),
+            new EcloudVersionInfoCommand(),
             new EcloudCommand(),
             new BcParseCommand(),
             new ParseCommand(),
@@ -35,8 +35,8 @@ public final class CommandHandler implements CommandExecutor {
             new DisableEcloudCommand(),
             new EnableCloudCommand(),
             new HelpCommand(),
-            new me.clip.placeholderapi.commands.command.InfoCommand(),
-            new me.clip.placeholderapi.commands.command.ListCommand(),
+            new InfoCommand(),
+            new ListCommand(),
             new RegisterCommand(),
             new ReloadCommand(),
             DEFAULT,
diff --git a/src/main/java/me/clip/placeholderapi/commands/command/ecloud/ClearCommand.java b/src/main/java/me/clip/placeholderapi/commands/command/ecloud/EcloudClearCommand.java
similarity index 87%
rename from src/main/java/me/clip/placeholderapi/commands/command/ecloud/ClearCommand.java
rename to src/main/java/me/clip/placeholderapi/commands/command/ecloud/EcloudClearCommand.java
index db6a3c3..3a77d89 100644
--- a/src/main/java/me/clip/placeholderapi/commands/command/ecloud/ClearCommand.java
+++ b/src/main/java/me/clip/placeholderapi/commands/command/ecloud/EcloudClearCommand.java
@@ -6,8 +6,8 @@ import me.clip.placeholderapi.util.Msg;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
 
-public final class ClearCommand extends Command {
-    public ClearCommand() {
+public final class EcloudClearCommand extends Command {
+    public EcloudClearCommand() {
         super("ecloud clear", permissions("placeholderapi.ecloud"));
     }
 
diff --git a/src/main/java/me/clip/placeholderapi/commands/command/ecloud/DownloadCommand.java b/src/main/java/me/clip/placeholderapi/commands/command/ecloud/EcloudDownloadCommand.java
similarity index 96%
rename from src/main/java/me/clip/placeholderapi/commands/command/ecloud/DownloadCommand.java
rename to src/main/java/me/clip/placeholderapi/commands/command/ecloud/EcloudDownloadCommand.java
index 7402104..d9bac27 100644
--- a/src/main/java/me/clip/placeholderapi/commands/command/ecloud/DownloadCommand.java
+++ b/src/main/java/me/clip/placeholderapi/commands/command/ecloud/EcloudDownloadCommand.java
@@ -11,8 +11,8 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
-public final class DownloadCommand extends Command {
-    public DownloadCommand() {
+public final class EcloudDownloadCommand extends Command {
+    public EcloudDownloadCommand() {
         super("ecloud download", options("&cAn expansion name must be specified!", 1, "placeholderapi.ecloud"));
     }
 
diff --git a/src/main/java/me/clip/placeholderapi/commands/command/ecloud/InfoCommand.java b/src/main/java/me/clip/placeholderapi/commands/command/ecloud/EcloudInfoCommand.java
similarity index 96%
rename from src/main/java/me/clip/placeholderapi/commands/command/ecloud/InfoCommand.java
rename to src/main/java/me/clip/placeholderapi/commands/command/ecloud/EcloudInfoCommand.java
index 32e9768..de40e0b 100644
--- a/src/main/java/me/clip/placeholderapi/commands/command/ecloud/InfoCommand.java
+++ b/src/main/java/me/clip/placeholderapi/commands/command/ecloud/EcloudInfoCommand.java
@@ -11,8 +11,8 @@ import org.jetbrains.annotations.NotNull;
 
 import static me.clip.placeholderapi.util.Msg.color;
 
-public final class InfoCommand extends Command {
-    public InfoCommand() {
+public final class EcloudInfoCommand extends Command {
+    public EcloudInfoCommand() {
         super("ecloud info", options("&cAn expansion name must be specified!", 1, "placeholderapi.ecloud"));
     }
 
diff --git a/src/main/java/me/clip/placeholderapi/commands/command/ecloud/ListCommand.java b/src/main/java/me/clip/placeholderapi/commands/command/ecloud/EcloudListCommand.java
similarity index 98%
rename from src/main/java/me/clip/placeholderapi/commands/command/ecloud/ListCommand.java
rename to src/main/java/me/clip/placeholderapi/commands/command/ecloud/EcloudListCommand.java
index 2314d5d..adc545e 100644
--- a/src/main/java/me/clip/placeholderapi/commands/command/ecloud/ListCommand.java
+++ b/src/main/java/me/clip/placeholderapi/commands/command/ecloud/EcloudListCommand.java
@@ -16,7 +16,7 @@ import java.util.stream.Collectors;
 
 import static me.clip.placeholderapi.util.Msg.color;
 
-public final class ListCommand extends Command {
+public final class EcloudListCommand extends Command {
     private static final int MINIMUM_ARGUMENTS = 1;
     private static final Set<String> COMPLETIONS = Sets.newHashSet(
             "all",
@@ -24,7 +24,7 @@ public final class ListCommand extends Command {
             "installed"
     );
 
-    public ListCommand() {
+    public EcloudListCommand() {
         super("ecloud list", options("&cIncorrect usage! &7/papi ecloud list <all/author/installed> (page)",
                 MINIMUM_ARGUMENTS, "placeholderapi.ecloud"));
     }
diff --git a/src/main/java/me/clip/placeholderapi/commands/command/ecloud/PlaceholdersCommand.java b/src/main/java/me/clip/placeholderapi/commands/command/ecloud/EcloudPlaceholdersCommand.java
similarity index 95%
rename from src/main/java/me/clip/placeholderapi/commands/command/ecloud/PlaceholdersCommand.java
rename to src/main/java/me/clip/placeholderapi/commands/command/ecloud/EcloudPlaceholdersCommand.java
index d6fc3d0..49ded05 100644
--- a/src/main/java/me/clip/placeholderapi/commands/command/ecloud/PlaceholdersCommand.java
+++ b/src/main/java/me/clip/placeholderapi/commands/command/ecloud/EcloudPlaceholdersCommand.java
@@ -12,8 +12,8 @@ import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
 
-public final class PlaceholdersCommand extends Command {
-    public PlaceholdersCommand() {
+public final class EcloudPlaceholdersCommand extends Command {
+    public EcloudPlaceholdersCommand() {
         super("ecloud placeholders", options("&cAn expansion name must be specified!", 1, "placeholderapi.ecloud"));
     }
 
diff --git a/src/main/java/me/clip/placeholderapi/commands/command/ecloud/RefreshCommand.java b/src/main/java/me/clip/placeholderapi/commands/command/ecloud/EcloudRefreshCommand.java
similarity index 90%
rename from src/main/java/me/clip/placeholderapi/commands/command/ecloud/RefreshCommand.java
rename to src/main/java/me/clip/placeholderapi/commands/command/ecloud/EcloudRefreshCommand.java
index e9ec785..8e1dd8b 100644
--- a/src/main/java/me/clip/placeholderapi/commands/command/ecloud/RefreshCommand.java
+++ b/src/main/java/me/clip/placeholderapi/commands/command/ecloud/EcloudRefreshCommand.java
@@ -7,8 +7,8 @@ import me.clip.placeholderapi.util.Msg;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
 
-public final class RefreshCommand extends Command {
-    public RefreshCommand() {
+public final class EcloudRefreshCommand extends Command {
+    public EcloudRefreshCommand() {
         super("ecloud refresh", permissions("placeholderapi.ecloud"));
     }
 
diff --git a/src/main/java/me/clip/placeholderapi/commands/command/ecloud/StatusCommand.java b/src/main/java/me/clip/placeholderapi/commands/command/ecloud/EcloudStatusCommand.java
similarity index 92%
rename from src/main/java/me/clip/placeholderapi/commands/command/ecloud/StatusCommand.java
rename to src/main/java/me/clip/placeholderapi/commands/command/ecloud/EcloudStatusCommand.java
index 2bbf8ad..fa5eec6 100644
--- a/src/main/java/me/clip/placeholderapi/commands/command/ecloud/StatusCommand.java
+++ b/src/main/java/me/clip/placeholderapi/commands/command/ecloud/EcloudStatusCommand.java
@@ -6,8 +6,8 @@ import me.clip.placeholderapi.util.Msg;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
 
-public final class StatusCommand extends Command {
-    public StatusCommand() {
+public final class EcloudStatusCommand extends Command {
+    public EcloudStatusCommand() {
         super("ecloud status", permissions("placeholderapi.ecloud"));
     }
 
diff --git a/src/main/java/me/clip/placeholderapi/commands/command/ecloud/VersionInfoCommand.java b/src/main/java/me/clip/placeholderapi/commands/command/ecloud/EcloudVersionInfoCommand.java
similarity index 94%
rename from src/main/java/me/clip/placeholderapi/commands/command/ecloud/VersionInfoCommand.java
rename to src/main/java/me/clip/placeholderapi/commands/command/ecloud/EcloudVersionInfoCommand.java
index 4d000b6..59637ea 100644
--- a/src/main/java/me/clip/placeholderapi/commands/command/ecloud/VersionInfoCommand.java
+++ b/src/main/java/me/clip/placeholderapi/commands/command/ecloud/EcloudVersionInfoCommand.java
@@ -9,8 +9,8 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
-public final class VersionInfoCommand extends Command {
-    public VersionInfoCommand() {
+public final class EcloudVersionInfoCommand extends Command {
+    public EcloudVersionInfoCommand() {
         super("ecloud versioninfo", options("&cIncorrect usage! &7/papi ecloud versioninfo <name> <version>",
                 2, "placeholderapi.ecloud"));
     }