diff --git a/paper-api/src/main/java/org/bukkit/entity/EntityType.java b/paper-api/src/main/java/org/bukkit/entity/EntityType.java
index e84da0628407..5cbd14263618 100644
--- a/paper-api/src/main/java/org/bukkit/entity/EntityType.java
+++ b/paper-api/src/main/java/org/bukkit/entity/EntityType.java
@@ -37,8 +37,6 @@
 import org.bukkit.entity.minecart.RideableMinecart;
 import org.bukkit.entity.minecart.SpawnerMinecart;
 import org.bukkit.entity.minecart.StorageMinecart;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.potion.PotionEffectType;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -98,7 +96,7 @@ public enum EntityType implements Keyed, Translatable, net.kyori.adventure.trans
     EXPERIENCE_ORB("experience_orb", ExperienceOrb.class, 2),
     EYE_OF_ENDER("eye_of_ender", EnderSignal.class, 15),
     FALLING_BLOCK("falling_block", FallingBlock.class, 21),
-    FIREBALL("fireball", Fireball.class, 12),
+    FIREBALL("fireball", LargeFireball.class, 12),
     FIREWORK_ROCKET("firework_rocket", Firework.class, 22),
     FISHING_BOBBER("fishing_bobber", FishHook.class, -1, false),
     FOX("fox", Fox.class, -1),
diff --git a/paper-generator/src/main/java/io/papermc/generator/rewriter/types/simple/EntityTypeRewriter.java b/paper-generator/src/main/java/io/papermc/generator/rewriter/types/simple/EntityTypeRewriter.java
index 3b8785d64dee..d1cd5ee841df 100644
--- a/paper-generator/src/main/java/io/papermc/generator/rewriter/types/simple/EntityTypeRewriter.java
+++ b/paper-generator/src/main/java/io/papermc/generator/rewriter/types/simple/EntityTypeRewriter.java
@@ -15,10 +15,10 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import net.minecraft.util.Util;
 import net.minecraft.core.Holder;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.ResourceKey;
+import net.minecraft.util.Util;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.Mob;
@@ -41,6 +41,7 @@ public class EntityTypeRewriter extends EnumRegistryRewriter<EntityType<?>> {
         .put("EndCrystal", "EnderCrystal")
         .put("FireworkRocket", "Firework")
         .put("FishingBobber", "FishHook")
+        .put("Fireball", "LargeFireball")
         .put("LeashKnot", "LeashHitch")
         .put("LightningBolt", "LightningStrike")
         .put("Tnt", "TNTPrimed")
@@ -173,6 +174,6 @@ private String toBukkitClass(Holder.Reference<EntityType<?>> reference) {
             .orElseThrow(() -> new IllegalStateException("Could not find entity class for " + reference.key().identifier()))
             .resolve(runtime);
         Preconditions.checkArgument(org.bukkit.entity.Entity.class.isAssignableFrom(resolvedClass.knownClass()), "Generic type must be an entity");
-        return this.importCollector.getShortName(this.classNamedView.findFirst(CLASS_RENAMES.getOrDefault(className, className)).resolve(runtime));
+        return this.importCollector.getShortName(resolvedClass);
     }
 }
diff --git a/paper-server/src/test/java/org/bukkit/craftbukkit/entity/EntityTypesTest.java b/paper-server/src/test/java/org/bukkit/craftbukkit/entity/EntityTypesTest.java
index 76573dbcf8e7..ac97c21f1c66 100644
--- a/paper-server/src/test/java/org/bukkit/craftbukkit/entity/EntityTypesTest.java
+++ b/paper-server/src/test/java/org/bukkit/craftbukkit/entity/EntityTypesTest.java
@@ -185,6 +185,7 @@ public <T extends Entity> void testEntityClass(Class<T> clazz) {
     public void testEntityType(EntityType entityType) {
         CraftEntityTypes.EntityTypeData<?, ?> entityTypeData = CraftEntityTypes.getEntityTypeData(entityType);
         assertNotNull(entityTypeData, String.format("Entity type %s does not have an entity type data, please add on to CraftEntityTypes.", entityType));
+        assertEquals(entityTypeData.entityClass(), entityType.getEntityClass(), String.format("Entity type class for %s does not match CraftEntityTypes.", entityType));
     }
 
     @AfterAll