diff --git a/src/main/java/org/spacehq/mc/protocol/data/MagicValues.java b/src/main/java/org/spacehq/mc/protocol/data/MagicValues.java
index 8772ab0e..d0ccd363 100644
--- a/src/main/java/org/spacehq/mc/protocol/data/MagicValues.java
+++ b/src/main/java/org/spacehq/mc/protocol/data/MagicValues.java
@@ -86,17 +86,17 @@ public class MagicValues {
     private static final Map<Object, List<Object>> values = new HashMap<Object, List<Object>>();
 
     static {
-        register(AttributeType.MAX_HEALTH, "generic.maxHealth");
-        register(AttributeType.FOLLOW_RANGE, "generic.followRange");
-        register(AttributeType.KNOCKBACK_RESISTANCE, "generic.knockbackResistance");
-        register(AttributeType.MOVEMENT_SPEED, "generic.movementSpeed");
-        register(AttributeType.ATTACK_DAMAGE, "generic.attackDamage");
-        register(AttributeType.ATTACK_SPEED, "generic.attackSpeed");
-        register(AttributeType.ARMOR, "generic.armor");
-        register(AttributeType.ARMOR_TOUGHNESS, "generic.armorToughness");
-        register(AttributeType.LUCK, "generic.luck");
+        register(AttributeType.GENERIC_MAX_HEALTH, "generic.maxHealth");
+        register(AttributeType.GENERIC_FOLLOW_RANGE, "generic.followRange");
+        register(AttributeType.GENERIC_KNOCKBACK_RESISTANCE, "generic.knockbackResistance");
+        register(AttributeType.GENERIC_MOVEMENT_SPEED, "generic.movementSpeed");
+        register(AttributeType.GENERIC_ATTACK_DAMAGE, "generic.attackDamage");
+        register(AttributeType.GENERIC_ATTACK_SPEED, "generic.attackSpeed");
+        register(AttributeType.GENERIC_ARMOR, "generic.armor");
+        register(AttributeType.GENERIC_ARMOR_TOUGHNESS, "generic.armorToughness");
+        register(AttributeType.GENERIC_LUCK, "generic.luck");
         register(AttributeType.HORSE_JUMP_STRENGTH, "horse.jumpStrength");
-        register(AttributeType.ZOMBIE_SPAWN_REINFORCEMENTS_CHANCE, "zombie.spawnReinforcements");
+        register(AttributeType.ZOMBIE_SPAWN_REINFORCEMENTS, "zombie.spawnReinforcements");
 
         register(ModifierType.CREATURE_FLEE_SPEED_BONUS, UUID.fromString("E199AD21-BA8A-4C53-8D13-6182D5C69D3A"));
         register(ModifierType.ENDERMAN_ATTACK_SPEED_BOOST, UUID.fromString("020E0DFB-87AE-4653-9556-831010E291A0"));
diff --git a/src/main/java/org/spacehq/mc/protocol/data/game/entity/attribute/AttributeType.java b/src/main/java/org/spacehq/mc/protocol/data/game/entity/attribute/AttributeType.java
index 2d04a4a2..280c5ac0 100644
--- a/src/main/java/org/spacehq/mc/protocol/data/game/entity/attribute/AttributeType.java
+++ b/src/main/java/org/spacehq/mc/protocol/data/game/entity/attribute/AttributeType.java
@@ -2,17 +2,17 @@ package org.spacehq.mc.protocol.data.game.entity.attribute;
 
 public enum AttributeType {
 
-    MAX_HEALTH(20, 0, 1024),
-    FOLLOW_RANGE(32, 0, 2048),
-    KNOCKBACK_RESISTANCE(0, 0, 1),
-    MOVEMENT_SPEED(0.699999988079071, 0, 1024),
-    ATTACK_DAMAGE(2, 0, 2048),
-    ATTACK_SPEED(4, 0, 1024),
-    ARMOR(0, 0, 30),
-    ARMOR_TOUGHNESS(0, 0, 20),
-    LUCK(0, -1024, 1024),
+    GENERIC_MAX_HEALTH(20, 0, 1024),
+    GENERIC_FOLLOW_RANGE(32, 0, 2048),
+    GENERIC_KNOCKBACK_RESISTANCE(0, 0, 1),
+    GENERIC_MOVEMENT_SPEED(0.699999988079071, 0, 1024),
+    GENERIC_ATTACK_DAMAGE(2, 0, 2048),
+    GENERIC_ATTACK_SPEED(4, 0, 1024),
+    GENERIC_ARMOR(0, 0, 30),
+    GENERIC_ARMOR_TOUGHNESS(0, 0, 20),
+    GENERIC_LUCK(0, -1024, 1024),
     HORSE_JUMP_STRENGTH(0.7, 0, 2),
-    ZOMBIE_SPAWN_REINFORCEMENTS_CHANCE(0, 0, 1);
+    ZOMBIE_SPAWN_REINFORCEMENTS(0, 0, 1);
 
     private double def;
     private double min;