diff --git a/core/src/main/java/org/geysermc/geyser/entity/attribute/GeyserAttributeType.java b/core/src/main/java/org/geysermc/geyser/entity/attribute/GeyserAttributeType.java
index 833f2f46d..10e93810e 100644
--- a/core/src/main/java/org/geysermc/geyser/entity/attribute/GeyserAttributeType.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/attribute/GeyserAttributeType.java
@@ -35,22 +35,22 @@ import lombok.Getter;
 public enum GeyserAttributeType {
 
     // Universal Attributes
-    FOLLOW_RANGE("minecraft:generic.follow_range", "minecraft:follow_range", 0f, 2048f, 32f),
-    KNOCKBACK_RESISTANCE("minecraft:generic.knockback_resistance", "minecraft:knockback_resistance", 0f, 1f, 0f),
-    MOVEMENT_SPEED("minecraft:generic.movement_speed", "minecraft:movement", 0f, 1024f, 0.1f),
-    FLYING_SPEED("minecraft:generic.flying_speed", "minecraft:movement", 0.0f, 1024.0f, 0.4000000059604645f),
-    ATTACK_DAMAGE("minecraft:generic.attack_damage", "minecraft:attack_damage", 0f, 2048f, 1f),
-    HORSE_JUMP_STRENGTH("minecraft:horse.jump_strength", "minecraft:horse.jump_strength", 0.0f, 2.0f, 0.7f),
-    LUCK("minecraft:generic.luck", "minecraft:luck", -1024f, 1024f, 0f),
+    FOLLOW_RANGE("minecraft:follow_range", "minecraft:follow_range", 0f, 2048f, 32f),
+    KNOCKBACK_RESISTANCE("minecraft:knockback_resistance", "minecraft:knockback_resistance", 0f, 1f, 0f),
+    MOVEMENT_SPEED("minecraft:movement_speed", "minecraft:movement", 0f, 1024f, 0.1f),
+    FLYING_SPEED("minecraft:flying_speed", "minecraft:movement", 0.0f, 1024.0f, 0.4000000059604645f),
+    ATTACK_DAMAGE("minecraft:attack_damage", "minecraft:attack_damage", 0f, 2048f, 1f),
+    HORSE_JUMP_STRENGTH("minecraft:jump_strength", "minecraft:horse.jump_strength", 0.0f, 2.0f, 0.7f),
+    LUCK("minecraft:luck", "minecraft:luck", -1024f, 1024f, 0f),
 
     // Java Attributes
-    ARMOR("minecraft:generic.armor", null, 0f, 30f, 0f),
-    ARMOR_TOUGHNESS("minecraft:generic.armor_toughness", null, 0F, 20f, 0f),
-    ATTACK_KNOCKBACK("minecraft:generic.attack_knockback", null, 1.5f, Float.MAX_VALUE, 0f),
-    ATTACK_SPEED("minecraft:generic.attack_speed", null, 0f, 1024f, 4f),
-    MAX_HEALTH("minecraft:generic.max_health", null, 0f, 1024f, 20f),
-    SCALE("minecraft:generic.scale", null, 0.0625f, 16f, 1f),
-    BLOCK_INTERACTION_RANGE("minecraft:player.block_interaction_range", null, 0.0f, 64f, 4.5f),
+    ARMOR("minecraft:armor", null, 0f, 30f, 0f),
+    ARMOR_TOUGHNESS("minecraft:armor_toughness", null, 0F, 20f, 0f),
+    ATTACK_KNOCKBACK("minecraft:attack_knockback", null, 1.5f, Float.MAX_VALUE, 0f),
+    ATTACK_SPEED("minecraft:attack_speed", null, 0f, 1024f, 4f),
+    MAX_HEALTH("minecraft:max_health", null, 0f, 1024f, 20f),
+    SCALE("minecraft:scale", null, 0.0625f, 16f, 1f),
+    BLOCK_INTERACTION_RANGE("minecraft:block_interaction_range", null, 0.0f, 64f, 4.5f),
     MINING_EFFICIENCY("minecraft:mining_efficiency", null, 0f, 1024f, 0f),
     BLOCK_BREAK_SPEED("minecraft:block_break_speed", null, 0f, 1024f, 1f),
     SUBMERGED_MINING_SPEED("minecraft:submerged_mining_speed", null, 0f, 20f, 0.2f),