diff --git a/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/BlockGenerator.kt b/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/BlockGenerator.kt
index 159f62d..be256ea 100644
--- a/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/BlockGenerator.kt
+++ b/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/BlockGenerator.kt
@@ -11,6 +11,7 @@ import de.bixilon.pixlyzer.util.ReflectionUtil.getField
 import de.bixilon.pixlyzer.util.ReflectionUtil.getGetter
 import de.bixilon.pixlyzer.util.ReflectionUtil.variable
 import de.bixilon.pixlyzer.util.Util
+import de.bixilon.pixlyzer.util.Util.realName
 import net.minecraft.block.Block
 import net.minecraft.block.BlockState
 import net.minecraft.block.Blocks
@@ -70,7 +71,7 @@ object BlockGenerator : Generator(
                 blockData.addProperty("has_dynamic_shape", block.hasDynamicBounds())
             }
 
-            blockData.addProperty("class", block::class.java.simpleName)
+            blockData.addProperty("class", block::class.java.realName)
 
             if (block is FluidBlock) {
                 (FLUID_BLOCK_FLUID_FIELD.get(block) as Fluid).let {
diff --git a/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/EntityGenerator.kt b/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/EntityGenerator.kt
index 344d650..ff020c1 100644
--- a/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/EntityGenerator.kt
+++ b/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/EntityGenerator.kt
@@ -7,6 +7,7 @@ import de.bixilon.pixlyzer.generator.Generator
 import de.bixilon.pixlyzer.util.ReflectionUtil.getClass
 import de.bixilon.pixlyzer.util.ReflectionUtil.getField
 import de.bixilon.pixlyzer.util.ReflectionUtil.getGetter
+import de.bixilon.pixlyzer.util.Util.realName
 import net.minecraft.entity.Entity
 import net.minecraft.entity.EntityType
 import net.minecraft.entity.LivingEntity
@@ -88,7 +89,7 @@ object EntityGenerator : Generator(
 
             val entityClass = entity::class.java
 
-            entityData.addProperty("class", entityClass.simpleName)
+            entityData.addProperty("class", entityClass.realName)
             entityClassMappings[entityClass] = resourceLocation
 
             data.add(resourceLocation.toString(), entityData)
diff --git a/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/FluidGenerator.kt b/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/FluidGenerator.kt
index 8d3ac43..5c0cf61 100644
--- a/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/FluidGenerator.kt
+++ b/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/FluidGenerator.kt
@@ -2,6 +2,7 @@ package de.bixilon.pixlyzer.generator.generators
 
 import com.google.gson.JsonObject
 import de.bixilon.pixlyzer.generator.Generator
+import de.bixilon.pixlyzer.util.Util.realName
 import net.minecraft.fluid.EmptyFluid
 import net.minecraft.fluid.LavaFluid
 import net.minecraft.fluid.WaterFluid
@@ -64,6 +65,8 @@ object FluidGenerator : Generator(
                 }
             }
 
+            fluidData.addProperty("class", fluid::class.java.realName)
+
             if (render.size() > 0) {
                 fluidData.add("render", render)
             }
diff --git a/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/ItemGenerator.kt b/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/ItemGenerator.kt
index 26e7a19..979bf78 100644
--- a/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/ItemGenerator.kt
+++ b/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/ItemGenerator.kt
@@ -8,6 +8,7 @@ import de.bixilon.pixlyzer.util.ReflectionUtil.getClass
 import de.bixilon.pixlyzer.util.ReflectionUtil.getField
 import de.bixilon.pixlyzer.util.ReflectionUtil.getGetter
 import de.bixilon.pixlyzer.util.Util.nullCast
+import de.bixilon.pixlyzer.util.Util.realName
 import de.bixilon.pixlyzer.util.Util.toJsonArray
 import net.minecraft.block.Block
 import net.minecraft.block.BlockState
@@ -212,7 +213,7 @@ object ItemGenerator : Generator(
             }
 
 
-            itemData.addProperty("class", item::class.java.simpleName)
+            itemData.addProperty("class", item::class.java.realName)
 
 
             data.add(resourceLocation.toString(), itemData)
diff --git a/src/main/kotlin/de/bixilon/pixlyzer/util/Util.kt b/src/main/kotlin/de/bixilon/pixlyzer/util/Util.kt
index f3e2dc9..0fe19c4 100644
--- a/src/main/kotlin/de/bixilon/pixlyzer/util/Util.kt
+++ b/src/main/kotlin/de/bixilon/pixlyzer/util/Util.kt
@@ -64,4 +64,6 @@ object Util {
         return array
     }
 
+    val Class<*>.realName: String
+        get() = this.name.removePrefix(this.packageName).removePrefix(".")
 }