diff --git a/pom.xml b/pom.xml
index 3a4b9e8..195c1c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,7 +91,7 @@
 		<dependency>
 			<groupId>world.bentobox</groupId>
 			<artifactId>bentobox</artifactId>
-			<version>0.10.1-SNAPSHOT</version>
+			<version>0.12.0-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>
diff --git a/src/main/java/world/bentobox/bskyblock/commands/AdminCommand.java b/src/main/java/world/bentobox/bskyblock/commands/AdminCommand.java
index 6977024..be9a476 100644
--- a/src/main/java/world/bentobox/bskyblock/commands/AdminCommand.java
+++ b/src/main/java/world/bentobox/bskyblock/commands/AdminCommand.java
@@ -2,27 +2,27 @@ package world.bentobox.bskyblock.commands;
 
 import java.util.List;
 
-import world.bentobox.bentobox.api.commands.admin.AdminWhyCommand;
-import world.bentobox.bskyblock.BSkyBlock;
 import world.bentobox.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bentobox.api.commands.admin.AdminClearResetsAllCommand;
-import world.bentobox.bentobox.api.commands.admin.AdminClearResetsCommand;
+import world.bentobox.bentobox.api.commands.admin.AdminClearresetsCommand;
+import world.bentobox.bentobox.api.commands.admin.AdminClearresetsallCommand;
 import world.bentobox.bentobox.api.commands.admin.AdminDeleteCommand;
-import world.bentobox.bentobox.api.commands.admin.AdminGetRankCommand;
+import world.bentobox.bentobox.api.commands.admin.AdminGetrankCommand;
 import world.bentobox.bentobox.api.commands.admin.AdminInfoCommand;
 import world.bentobox.bentobox.api.commands.admin.AdminRegisterCommand;
-import world.bentobox.bentobox.api.commands.admin.AdminSetRankCommand;
+import world.bentobox.bentobox.api.commands.admin.AdminSetrankCommand;
 import world.bentobox.bentobox.api.commands.admin.AdminTeleportCommand;
 import world.bentobox.bentobox.api.commands.admin.AdminUnregisterCommand;
 import world.bentobox.bentobox.api.commands.admin.AdminVersionCommand;
+import world.bentobox.bentobox.api.commands.admin.AdminWhyCommand;
 import world.bentobox.bentobox.api.commands.admin.range.AdminRangeCommand;
 import world.bentobox.bentobox.api.commands.admin.schem.AdminSchemCommand;
 import world.bentobox.bentobox.api.commands.admin.team.AdminTeamAddCommand;
 import world.bentobox.bentobox.api.commands.admin.team.AdminTeamDisbandCommand;
 import world.bentobox.bentobox.api.commands.admin.team.AdminTeamKickCommand;
-import world.bentobox.bentobox.api.commands.admin.team.AdminTeamMakeLeaderCommand;
+import world.bentobox.bentobox.api.commands.admin.team.AdminTeamSetownerCommand;
 import world.bentobox.bentobox.api.localization.TextVariables;
 import world.bentobox.bentobox.api.user.User;
+import world.bentobox.bskyblock.BSkyBlock;
 
 public class AdminCommand extends CompositeCommand {
 
@@ -32,7 +32,6 @@ public class AdminCommand extends CompositeCommand {
 
     @Override
     public void setup() {
-        setPermissionPrefix("bskyblock");
         setPermission("admin.*");
         setOnlyPlayer(false);
         setParametersHelp("commands.admin.help.parameters");
@@ -42,14 +41,14 @@ public class AdminCommand extends CompositeCommand {
         new AdminTeleportCommand(this, "tp");
         new AdminTeleportCommand(this, "tpnether");
         new AdminTeleportCommand(this, "tpend");
-        new AdminGetRankCommand(this);
-        new AdminSetRankCommand(this);
+        new AdminGetrankCommand(this);
+        new AdminSetrankCommand(this);
         new AdminInfoCommand(this);
         // Team commands
         new AdminTeamAddCommand(this);
         new AdminTeamKickCommand(this);
         new AdminTeamDisbandCommand(this);
-        new AdminTeamMakeLeaderCommand(this);
+        new AdminTeamSetownerCommand(this);
         // Schems
         new AdminSchemCommand(this);
         // Register/unregister islands
@@ -58,8 +57,8 @@ public class AdminCommand extends CompositeCommand {
         // Range
         new AdminRangeCommand(this);
         // Resets
-        new AdminClearResetsCommand(this);
-        new AdminClearResetsAllCommand(this);
+        new AdminClearresetsCommand(this);
+        new AdminClearresetsallCommand(this);
         // Delete
         new AdminDeleteCommand(this);
         // Why
diff --git a/src/main/java/world/bentobox/bskyblock/commands/IslandCommand.java b/src/main/java/world/bentobox/bskyblock/commands/IslandCommand.java
index bba615c..b16e1d0 100644
--- a/src/main/java/world/bentobox/bskyblock/commands/IslandCommand.java
+++ b/src/main/java/world/bentobox/bskyblock/commands/IslandCommand.java
@@ -3,7 +3,6 @@ package world.bentobox.bskyblock.commands;
 import java.util.ArrayList;
 import java.util.List;
 
-import world.bentobox.bskyblock.BSkyBlock;
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.commands.island.IslandBanCommand;
 import world.bentobox.bentobox.api.commands.island.IslandBanlistCommand;
@@ -19,6 +18,7 @@ import world.bentobox.bentobox.api.commands.island.IslandUnbanCommand;
 import world.bentobox.bentobox.api.commands.island.team.IslandTeamCommand;
 import world.bentobox.bentobox.api.localization.TextVariables;
 import world.bentobox.bentobox.api.user.User;
+import world.bentobox.bskyblock.BSkyBlock;
 
 public class IslandCommand extends CompositeCommand {
 
@@ -34,7 +34,6 @@ public class IslandCommand extends CompositeCommand {
         setDescription("commands.island.help.description");
         setOnlyPlayer(true);
         // Permission
-        setPermissionPrefix("bskyblock");
         setPermission("island");
         setWorld(((BSkyBlock)getAddon()).getIslandWorld());
         // Set up subcommands