diff --git a/pom.xml b/pom.xml
index f93deea..2c162aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,7 +69,7 @@
         <dependency>
             <groupId>org.spongepowered</groupId>
             <artifactId>spongeapi</artifactId>
-            <version>4.0.0</version>
+            <version>5.0.0</version>
             <type>jar</type>
             <optional>true</optional>
             <scope>provided</scope>
diff --git a/src/main/java/org/kitteh/vanish/Vanish.java b/src/main/java/org/kitteh/vanish/Vanish.java
index d318f8b..38f210d 100644
--- a/src/main/java/org/kitteh/vanish/Vanish.java
+++ b/src/main/java/org/kitteh/vanish/Vanish.java
@@ -33,7 +33,7 @@
 /**
  * Spiritual successor to VanishNoPacket, for Sponge.
  */
-@Plugin(id = "org.kitteh.vanish", name = "Vanish", version = "4.0.3")
+@Plugin(id = "vanish", name = "Vanish", version = "4.0.3-API5")
 public class Vanish {
     public static final String PERMISSION_VANISH = "vanish.vanish";
 
diff --git a/src/main/java/org/kitteh/vanish/VanishCommand.java b/src/main/java/org/kitteh/vanish/VanishCommand.java
index f23f94b..076d184 100644
--- a/src/main/java/org/kitteh/vanish/VanishCommand.java
+++ b/src/main/java/org/kitteh/vanish/VanishCommand.java
@@ -39,11 +39,13 @@
 import org.spongepowered.api.text.Text;
 import org.spongepowered.api.text.format.TextColors;
 import org.spongepowered.api.world.Location;
+import org.spongepowered.api.world.World;
 
-import javax.annotation.Nonnull;
 import java.util.HashSet;
 import java.util.Set;
 
+import javax.annotation.Nonnull;
+
 /**
  * Vanish!
  */
@@ -54,7 +56,7 @@ class VanishCommand implements CommandExecutor {
 
     VanishCommand(Vanish plugin) {
         this.plugin = plugin;
-        this.effect = ParticleEffect.builder().type(ParticleTypes.SMOKE_LARGE).count(1).build();
+        this.effect = ParticleEffect.builder().type(ParticleTypes.LARGE_SMOKE).quantity(1).build();
     }
 
     @Nonnull
@@ -65,19 +67,18 @@ public CommandResult execute(@Nonnull CommandSource commandSource, @Nonnull Comm
             return CommandResult.empty();
         }
         Player player = (Player) commandSource;
-        boolean wasVisible = player.get(Keys.INVISIBLE).orElse(false);
-        player.offer(Keys.INVISIBLE, !wasVisible);
-        player.offer(Keys.INVISIBILITY_IGNORES_COLLISION, !wasVisible);
-        player.offer(Keys.INVISIBILITY_PREVENTS_TARGETING, !wasVisible);
+        boolean wasVisible = player.get(Keys.VANISH).orElse(false);
+        player.offer(Keys.VANISH, !wasVisible);
+        player.offer(Keys.VANISH_IGNORES_COLLISION, !wasVisible);
+        player.offer(Keys.VANISH_PREVENTS_TARGETING, !wasVisible);
         if (player.hasPermission(Vanish.PERMISSION_EFFECTS_BATS)) {
             Set<Entity> bats = new HashSet<>();
-            Location location = player.getLocation();
+            Location<World> location = player.getLocation();
             for (int i = 0; i < 10; i++) {
-                location.getExtent().createEntity(EntityTypes.BAT, location.getPosition()).ifPresent(bat -> {
-                    bats.add(bat);
-                    location.getExtent().spawnEntity(bat, Cause.builder().owner(this.plugin).build()); // TODO Am I doing this right?
-                    bat.offer(Keys.INVULNERABILITY_TICKS, LIFE_TICKS);
-                });
+                final Entity bat = location.getExtent().createEntity(EntityTypes.BAT, location.getPosition());
+                bats.add(bat);
+                location.getExtent().spawnEntity(bat, Cause.builder().owner(this.plugin).build()); // TODO Am I doing this right?
+                bat.offer(Keys.INVULNERABILITY_TICKS, LIFE_TICKS);
             }
             // TODO remove on shutdown too!
             Sponge.getScheduler().createTaskBuilder().delayTicks(LIFE_TICKS).execute(() -> {