diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorld.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorld.java
index c6b8a979d..1b22ccf80 100644
--- a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorld.java
+++ b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorld.java
@@ -46,6 +46,8 @@ import org.spongepowered.api.data.property.block.SkyLuminanceProperty;
 import org.spongepowered.api.entity.EntitySnapshot;
 import org.spongepowered.api.entity.EntityTypes;
 import org.spongepowered.api.event.cause.Cause;
+import org.spongepowered.api.text.Text;
+import org.spongepowered.api.text.channel.MessageChannel;
 import org.spongepowered.api.world.World;
 
 import static com.google.common.base.Preconditions.checkNotNull;
@@ -170,16 +172,14 @@ public abstract class SpongeWorld extends AbstractWorld {
         }
     }
 
-
-
     @Override
     public WorldData getWorldData() {
-        return ForgeWorldData.getInstance();
+        return SpongeWorldData.getInstance();
     }
 
     @Override
     public boolean isValidBlockType(int id) {
-        return (id == 0) || (IDHelper.resolveItem(id) != null);
+        return (id == 0) || (IDHelper.resolveBlock(id) != null);
     }
 
     @Override
diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/ForgeWorldData.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorldData.java
similarity index 88%
rename from worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/ForgeWorldData.java
rename to worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorldData.java
index 177932daf..bc0d18069 100644
--- a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/ForgeWorldData.java
+++ b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorldData.java
@@ -25,9 +25,9 @@ import com.sk89q.worldedit.world.registry.LegacyWorldData;
 /**
  * World data for the Forge platform.
  */
-class ForgeWorldData extends LegacyWorldData {
+class SpongeWorldData extends LegacyWorldData {
 
-    private static final ForgeWorldData INSTANCE = new ForgeWorldData();
+    private static final SpongeWorldData INSTANCE = new SpongeWorldData();
     private final BiomeRegistry biomeRegistry = new SpongeBiomeRegistry();
 
     @Override
@@ -40,7 +40,7 @@ class ForgeWorldData extends LegacyWorldData {
      *
      * @return an instance
      */
-    public static ForgeWorldData getInstance() {
+    public static SpongeWorldData getInstance() {
         return INSTANCE;
     }