diff --git a/src/main/java/com/bergerkiller/bukkit/common/internal/logic/EntityTypingHandler_1_14.java b/src/main/java/com/bergerkiller/bukkit/common/internal/logic/EntityTypingHandler_1_14.java
index aa80976b2..465d16a2c 100644
--- a/src/main/java/com/bergerkiller/bukkit/common/internal/logic/EntityTypingHandler_1_14.java
+++ b/src/main/java/com/bergerkiller/bukkit/common/internal/logic/EntityTypingHandler_1_14.java
@@ -293,11 +293,9 @@ class EntityTypingHandler_1_14 extends EntityTypingHandler {
          *     EntityTypes entitytypes = entity.getEntityType();
          *     int i = entitytypes.getChunkRange() * 16;
          * #endif
-         * 
-         * #if spigot
+         *
          *     i = org.spigotmc.TrackingRange.getEntityTrackingRange(entity, i);
-         * #endif
-         * 
+         *
          * #if version >= 1.18
          *     int j = entitytypes.updateInterval();
          *     boolean trackDeltas = entitytypes.trackDeltas();
diff --git a/src/main/java/com/bergerkiller/bukkit/common/wrappers/EntityTracker.java b/src/main/java/com/bergerkiller/bukkit/common/wrappers/EntityTracker.java
index b18feecb7..6affd20d1 100644
--- a/src/main/java/com/bergerkiller/bukkit/common/wrappers/EntityTracker.java
+++ b/src/main/java/com/bergerkiller/bukkit/common/wrappers/EntityTracker.java
@@ -105,14 +105,14 @@ public class EntityTracker extends BasicWrapper<EntityTrackerHandle> {
      * @return previously set entity tracker entry, null if there was none
      */
     public EntityTrackerEntryHandle setEntry(Entity entity, EntityTrackerEntryHandle entityTrackerEntry) {
-        // On PaperSpigot, the entry is also stored in the entity itself
+        // On Paper, the entry is also stored in the entity itself
         if (EntityHandle.T.tracker.isAvailable()) {
             EntityHandle.T.tracker.set(HandleConversion.toEntityHandle(entity), entityTrackerEntry);
         }
 
         return handle.putEntry(entity.getEntityId(), entityTrackerEntry);
     }
-    
+
     /**
      * Gets the entity tracker entry of an entity
      *
diff --git a/src/main/templates/com/bergerkiller/templates/net/minecraft/entity/entity.txt b/src/main/templates/com/bergerkiller/templates/net/minecraft/entity/entity.txt
index d69a3afea..619878a05 100644
--- a/src/main/templates/com/bergerkiller/templates/net/minecraft/entity/entity.txt
+++ b/src/main/templates/com/bergerkiller/templates/net/minecraft/entity/entity.txt
@@ -44,7 +44,7 @@ class Entity {
     protected (org.bukkit.entity.Entity) CraftEntity bukkitEntityField:bukkitEntity;
 #endif
 
-optional (EntityTrackerEntryHandle) EntityTrackerEntry tracker;
+    optional (EntityTrackerEntryHandle) net.minecraft.server.level.EntityTrackerEntry tracker;
 
 #if version >= 1.17
     private static optional java.util.concurrent.atomic.AtomicInteger opt_atomic_entityCount:ENTITY_COUNTER;