diff --git a/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_14.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_14.java
index 3eb72a246..e97f0d6d9 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_14.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_14.java
@@ -26,6 +26,7 @@ import com.google.common.base.Preconditions;
 import com.viaversion.viaversion.api.protocol.Protocol;
 import com.viaversion.viaversion.util.EntityTypeUtil;
 import java.util.Locale;
+import com.viaversion.viaversion.util.Key;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 public enum EntityTypes1_14 implements EntityType {
@@ -211,7 +212,7 @@ public enum EntityTypes1_14 implements EntityType {
 
     EntityTypes1_14(final EntityType parent) {
         this.parent = parent;
-        this.identifier = "minecraft:" + name().toLowerCase(Locale.ROOT);
+        this.identifier =  Key.namespaced(name().toLowerCase(Locale.ROOT));
     }
 
     EntityTypes1_14(final EntityType parent, @Nullable final String identifier) {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_15.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_15.java
index 13016af32..e717bb316 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_15.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_15.java
@@ -26,6 +26,7 @@ import com.google.common.base.Preconditions;
 import com.viaversion.viaversion.api.protocol.Protocol;
 import com.viaversion.viaversion.util.EntityTypeUtil;
 import java.util.Locale;
+import com.viaversion.viaversion.util.Key;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 public enum EntityTypes1_15 implements EntityType {
@@ -212,7 +213,7 @@ public enum EntityTypes1_15 implements EntityType {
 
     EntityTypes1_15(final EntityType parent) {
         this.parent = parent;
-        this.identifier = "minecraft:" + name().toLowerCase(Locale.ROOT);
+        this.identifier =  Key.namespaced(name().toLowerCase(Locale.ROOT));
     }
 
     EntityTypes1_15(final EntityType parent, @Nullable final String identifier) {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_16.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_16.java
index 27af3eeaf..ca223acfd 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_16.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_16.java
@@ -26,6 +26,7 @@ import com.google.common.base.Preconditions;
 import com.viaversion.viaversion.api.protocol.Protocol;
 import com.viaversion.viaversion.util.EntityTypeUtil;
 import java.util.Locale;
+import com.viaversion.viaversion.util.Key;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 public enum EntityTypes1_16 implements EntityType {
@@ -216,7 +217,7 @@ public enum EntityTypes1_16 implements EntityType {
 
     EntityTypes1_16(final EntityType parent) {
         this.parent = parent;
-        this.identifier = "minecraft:" + name().toLowerCase(Locale.ROOT);
+        this.identifier =  Key.namespaced(name().toLowerCase(Locale.ROOT));
     }
 
     EntityTypes1_16(final EntityType parent, @Nullable final String identifier) {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_16_2.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_16_2.java
index ee0fe9cf7..bfcff532d 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_16_2.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_16_2.java
@@ -26,6 +26,7 @@ import com.google.common.base.Preconditions;
 import com.viaversion.viaversion.api.protocol.Protocol;
 import com.viaversion.viaversion.util.EntityTypeUtil;
 import java.util.Locale;
+import com.viaversion.viaversion.util.Key;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 public enum EntityTypes1_16_2 implements EntityType {
@@ -219,7 +220,7 @@ public enum EntityTypes1_16_2 implements EntityType {
 
     EntityTypes1_16_2(final EntityType parent) {
         this.parent = parent;
-        this.identifier = "minecraft:" + name().toLowerCase(Locale.ROOT);
+        this.identifier =  Key.namespaced(name().toLowerCase(Locale.ROOT));
     }
 
     EntityTypes1_16_2(final EntityType parent, @Nullable final String identifier) {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_17.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_17.java
index 1fda2142c..3df2caccc 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_17.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_17.java
@@ -26,6 +26,7 @@ import com.google.common.base.Preconditions;
 import com.viaversion.viaversion.api.protocol.Protocol;
 import com.viaversion.viaversion.util.EntityTypeUtil;
 import java.util.Locale;
+import com.viaversion.viaversion.util.Key;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 public enum EntityTypes1_17 implements EntityType {
@@ -225,7 +226,7 @@ public enum EntityTypes1_17 implements EntityType {
 
     EntityTypes1_17(final EntityType parent) {
         this.parent = parent;
-        this.identifier = "minecraft:" + name().toLowerCase(Locale.ROOT);
+        this.identifier =  Key.namespaced(name().toLowerCase(Locale.ROOT));
     }
 
     EntityTypes1_17(final EntityType parent, @Nullable final String identifier) {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_19.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_19.java
index d9f9c63e4..d6e2a3d17 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_19.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_19.java
@@ -26,6 +26,7 @@ import com.google.common.base.Preconditions;
 import com.viaversion.viaversion.api.protocol.Protocol;
 import com.viaversion.viaversion.util.EntityTypeUtil;
 import java.util.Locale;
+import com.viaversion.viaversion.util.Key;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 public enum EntityTypes1_19 implements EntityType {
@@ -230,7 +231,7 @@ public enum EntityTypes1_19 implements EntityType {
 
     EntityTypes1_19(final EntityType parent) {
         this.parent = parent;
-        this.identifier = "minecraft:" + name().toLowerCase(Locale.ROOT);
+        this.identifier =  Key.namespaced(name().toLowerCase(Locale.ROOT));
     }
 
     EntityTypes1_19(final EntityType parent, @Nullable final String identifier) {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_19_3.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_19_3.java
index 6f26e2d30..2acb3e3a7 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_19_3.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_19_3.java
@@ -26,6 +26,7 @@ import com.google.common.base.Preconditions;
 import com.viaversion.viaversion.api.protocol.Protocol;
 import com.viaversion.viaversion.util.EntityTypeUtil;
 import java.util.Locale;
+import com.viaversion.viaversion.util.Key;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 public enum EntityTypes1_19_3 implements EntityType {
@@ -231,7 +232,7 @@ public enum EntityTypes1_19_3 implements EntityType {
 
     EntityTypes1_19_3(final EntityType parent) {
         this.parent = parent;
-        this.identifier = "minecraft:" + name().toLowerCase(Locale.ROOT);
+        this.identifier =  Key.namespaced(name().toLowerCase(Locale.ROOT));
     }
 
     EntityTypes1_19_3(final EntityType parent, @Nullable final String identifier) {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_19_4.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_19_4.java
index e41f89cf7..bc1faf071 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_19_4.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_19_4.java
@@ -26,6 +26,7 @@ import com.google.common.base.Preconditions;
 import com.viaversion.viaversion.api.protocol.Protocol;
 import com.viaversion.viaversion.util.EntityTypeUtil;
 import java.util.Locale;
+import com.viaversion.viaversion.util.Key;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 public enum EntityTypes1_19_4 implements EntityType {
@@ -238,7 +239,7 @@ public enum EntityTypes1_19_4 implements EntityType {
 
     EntityTypes1_19_4(final EntityType parent) {
         this.parent = parent;
-        this.identifier = "minecraft:" + name().toLowerCase(Locale.ROOT);
+        this.identifier =  Key.namespaced(name().toLowerCase(Locale.ROOT));
     }
 
     EntityTypes1_19_4(final EntityType parent, @Nullable final String identifier) {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_20_3.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_20_3.java
index 59bb50734..8d1155864 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_20_3.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_20_3.java
@@ -26,6 +26,7 @@ import com.google.common.base.Preconditions;
 import com.viaversion.viaversion.api.protocol.Protocol;
 import com.viaversion.viaversion.util.EntityTypeUtil;
 import java.util.Locale;
+import com.viaversion.viaversion.util.Key;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 public enum EntityTypes1_20_3 implements EntityType {
@@ -240,7 +241,7 @@ public enum EntityTypes1_20_3 implements EntityType {
 
     EntityTypes1_20_3(final EntityType parent) {
         this.parent = parent;
-        this.identifier = "minecraft:" + name().toLowerCase(Locale.ROOT);
+        this.identifier =  Key.namespaced(name().toLowerCase(Locale.ROOT));
     }
 
     EntityTypes1_20_3(final EntityType parent, @Nullable final String identifier) {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_20_5.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_20_5.java
index 2c3f24728..b2cce48e5 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_20_5.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_20_5.java
@@ -26,6 +26,7 @@ import com.google.common.base.Preconditions;
 import com.viaversion.viaversion.api.protocol.Protocol;
 import com.viaversion.viaversion.util.EntityTypeUtil;
 import java.util.Locale;
+import com.viaversion.viaversion.util.Key;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 public enum EntityTypes1_20_5 implements EntityType {
@@ -246,7 +247,7 @@ public enum EntityTypes1_20_5 implements EntityType {
 
     EntityTypes1_20_5(final EntityType parent) {
         this.parent = parent;
-        this.identifier = "minecraft:" + name().toLowerCase(Locale.ROOT);
+        this.identifier =  Key.namespaced(name().toLowerCase(Locale.ROOT));
     }
 
     EntityTypes1_20_5(final EntityType parent, @Nullable final String identifier) {
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/rewriter/BlockItemPacketRewriter1_20_5.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/rewriter/BlockItemPacketRewriter1_20_5.java
index 460054bb4..d906ca951 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/rewriter/BlockItemPacketRewriter1_20_5.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/rewriter/BlockItemPacketRewriter1_20_5.java
@@ -1202,7 +1202,7 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
 
             if (Key.stripMinecraftNamespace(id).equals("sweeping")) {
                 // Renamed
-                id = "minecraft:sweeping_edge";
+                id = Key.namespaced("sweeping_edge");
             }
 
             final int intId = Enchantments1_20_5.keyToId(id);