diff --git a/src/main/java/us/tastybento/bskyblock/commands/island/teams/AbstractTeamCommand.java b/src/main/java/us/tastybento/bskyblock/commands/island/teams/AbstractIslandTeamCommand.java
similarity index 88%
rename from src/main/java/us/tastybento/bskyblock/commands/island/teams/AbstractTeamCommand.java
rename to src/main/java/us/tastybento/bskyblock/commands/island/teams/AbstractIslandTeamCommand.java
index 844609757..40aa11973 100644
--- a/src/main/java/us/tastybento/bskyblock/commands/island/teams/AbstractTeamCommand.java
+++ b/src/main/java/us/tastybento/bskyblock/commands/island/teams/AbstractIslandTeamCommand.java
@@ -20,7 +20,7 @@ import us.tastybento.bskyblock.config.Settings;
  * @author ben
  *
  */
-public abstract class AbstractTeamCommand extends CompositeCommand {
+public abstract class AbstractIslandTeamCommand extends CompositeCommand {
     
     protected final static boolean DEBUG = false;
     protected BiMap<UUID, UUID> inviteList = HashBiMap.create(); 
@@ -32,7 +32,7 @@ public abstract class AbstractTeamCommand extends CompositeCommand {
     // TODO: It would be good if these could be auto-provided
     protected User user;
     
-    public AbstractTeamCommand(CompositeCommand command, String label, String... aliases) {
+    public AbstractIslandTeamCommand(CompositeCommand command, String label, String... aliases) {
         super(command, label,aliases);
     }
    
diff --git a/src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandInviteAcceptCommand.java b/src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandInviteAcceptCommand.java
index 4476048f7..e1c0893d0 100644
--- a/src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandInviteAcceptCommand.java
+++ b/src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandInviteAcceptCommand.java
@@ -13,7 +13,7 @@ import us.tastybento.bskyblock.api.events.team.TeamEvent.TeamReason;
 import us.tastybento.bskyblock.config.Settings;
 import us.tastybento.bskyblock.database.objects.Island;
 
-public class IslandInviteAcceptCommand extends AbstractTeamCommand {
+public class IslandInviteAcceptCommand extends AbstractIslandTeamCommand {
 
     public IslandInviteAcceptCommand(CompositeCommand islandCommand) {
         super(islandCommand, "accept");
diff --git a/src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandInviteRejectCommand.java b/src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandInviteRejectCommand.java
index 0b1d0d363..d8527c955 100644
--- a/src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandInviteRejectCommand.java
+++ b/src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandInviteRejectCommand.java
@@ -9,7 +9,7 @@ import us.tastybento.bskyblock.api.events.team.TeamEvent.TeamReason;
 import us.tastybento.bskyblock.commands.IslandCommand;
 import us.tastybento.bskyblock.config.Settings;
 
-public class IslandInviteRejectCommand extends AbstractTeamCommand {
+public class IslandInviteRejectCommand extends AbstractIslandTeamCommand {
 
 
     public IslandInviteRejectCommand(IslandCommand islandCommand) {
diff --git a/src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandLeaveCommand.java b/src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandLeaveCommand.java
index 8bb9526f1..f25c77f04 100644
--- a/src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandLeaveCommand.java
+++ b/src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandLeaveCommand.java
@@ -4,7 +4,7 @@ import us.tastybento.bskyblock.api.commands.CompositeCommand;
 import us.tastybento.bskyblock.api.commands.User;
 import us.tastybento.bskyblock.config.Settings;
 
-public class IslandLeaveCommand extends AbstractTeamCommand {
+public class IslandLeaveCommand extends AbstractIslandTeamCommand {
 
     public IslandLeaveCommand(CompositeCommand islandCommand) {
         super(islandCommand, "leave");
diff --git a/src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandTeamCommand.java b/src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandTeamCommand.java
index cfe65ac65..710ce3370 100644
--- a/src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandTeamCommand.java
+++ b/src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandTeamCommand.java
@@ -14,7 +14,7 @@ import us.tastybento.bskyblock.api.events.team.TeamEvent;
 import us.tastybento.bskyblock.api.events.team.TeamEvent.TeamReason;
 import us.tastybento.bskyblock.config.Settings;
 
-public class IslandTeamCommand extends AbstractTeamCommand {
+public class IslandTeamCommand extends AbstractIslandTeamCommand {
 
     private static final boolean DEBUG = false;
 
diff --git a/src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandTeamInviteCommand.java b/src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandTeamInviteCommand.java
index 1bb381c01..1dd7430ce 100644
--- a/src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandTeamInviteCommand.java
+++ b/src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandTeamInviteCommand.java
@@ -20,7 +20,7 @@ import us.tastybento.bskyblock.api.events.team.TeamEvent.TeamReason;
 import us.tastybento.bskyblock.config.Settings;
 import us.tastybento.bskyblock.util.Util;
 
-public class IslandTeamInviteCommand extends AbstractTeamCommand {
+public class IslandTeamInviteCommand extends AbstractIslandTeamCommand {
 
     public IslandTeamInviteCommand(CompositeCommand islandTeamCommand) {
         super(islandTeamCommand, "invite");
diff --git a/src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandTeamPromoteCommand.java b/src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandTeamPromoteCommand.java
index 9563cc3f0..ebcd84034 100644
--- a/src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandTeamPromoteCommand.java
+++ b/src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandTeamPromoteCommand.java
@@ -17,7 +17,7 @@ import us.tastybento.bskyblock.api.events.team.TeamEvent.TeamReason;
 import us.tastybento.bskyblock.config.Settings;
 import us.tastybento.bskyblock.database.objects.Island;
 
-public class IslandTeamPromoteCommand extends AbstractTeamCommand {
+public class IslandTeamPromoteCommand extends AbstractIslandTeamCommand {
 
     public IslandTeamPromoteCommand(CompositeCommand islandCommand) {
         super(islandCommand, "promote", "makeleader");
diff --git a/src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandTeamUninviteCommand.java b/src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandTeamUninviteCommand.java
index b3184275b..b2b7859ee 100644
--- a/src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandTeamUninviteCommand.java
+++ b/src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandTeamUninviteCommand.java
@@ -9,7 +9,7 @@ import us.tastybento.bskyblock.api.events.team.TeamEvent;
 import us.tastybento.bskyblock.api.events.team.TeamEvent.TeamReason;
 import us.tastybento.bskyblock.config.Settings;
 
-public class IslandTeamUninviteCommand extends AbstractTeamCommand {
+public class IslandTeamUninviteCommand extends AbstractIslandTeamCommand {
     
     public IslandTeamUninviteCommand(CompositeCommand islandCommand) {
         super(islandCommand, "uninvite");