diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/Protocol1_10To1_11.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/Protocol1_10To1_11.java
index eef12f9d..80a7245f 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/Protocol1_10To1_11.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/Protocol1_10To1_11.java
@@ -13,10 +13,10 @@ package nl.matsv.viabackwards.protocol.protocol1_10to1_11;
 import lombok.Getter;
 import nl.matsv.viabackwards.api.BackwardsProtocol;
 import nl.matsv.viabackwards.api.entities.storage.EntityTracker;
-import nl.matsv.viabackwards.protocol.protocol1_10to1_11.packets.BlockItemPackets;
+import nl.matsv.viabackwards.protocol.protocol1_10to1_11.packets.BlockItemPackets1_11;
 import nl.matsv.viabackwards.protocol.protocol1_10to1_11.packets.EntityPackets1_11;
-import nl.matsv.viabackwards.protocol.protocol1_10to1_11.packets.PlayerPackets;
-import nl.matsv.viabackwards.protocol.protocol1_10to1_11.packets.SoundPackets;
+import nl.matsv.viabackwards.protocol.protocol1_10to1_11.packets.PlayerPackets1_11;
+import nl.matsv.viabackwards.protocol.protocol1_10to1_11.packets.SoundPackets1_11;
 import nl.matsv.viabackwards.protocol.protocol1_10to1_11.storage.WindowTracker;
 import us.myles.ViaVersion.api.data.UserConnection;
 import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
@@ -25,14 +25,14 @@ public class Protocol1_10To1_11 extends BackwardsProtocol {
     @Getter
     private EntityPackets1_11 entityPackets; // Required for the item rewriter
     @Getter
-    private BlockItemPackets blockItemPackets;
+    private BlockItemPackets1_11 blockItemPackets;
 
     @Override
     protected void registerPackets() {
         (entityPackets = new EntityPackets1_11()).register(this);
-        new PlayerPackets().register(this);
-        (blockItemPackets = new BlockItemPackets()).register(this);
-        new SoundPackets().register(this);
+        new PlayerPackets1_11().register(this);
+        (blockItemPackets = new BlockItemPackets1_11()).register(this);
+        new SoundPackets1_11().register(this);
     }
 
     @Override
diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/BlockItemPackets.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/BlockItemPackets1_11.java
similarity index 99%
rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/BlockItemPackets.java
rename to core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/BlockItemPackets1_11.java
index 5b704a1e..b307e3c3 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/BlockItemPackets.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/BlockItemPackets1_11.java
@@ -37,7 +37,7 @@ import us.myles.viaversion.libs.opennbt.tag.builtin.StringTag;
 import java.util.Arrays;
 import java.util.Optional;
 
-public class BlockItemPackets extends BlockItemRewriter<Protocol1_10To1_11> {
+public class BlockItemPackets1_11 extends BlockItemRewriter<Protocol1_10To1_11> {
     @Override
     protected void registerPackets(Protocol1_10To1_11 protocol) {
         /* Item packets */
diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/PlayerPackets.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/PlayerPackets1_11.java
similarity index 99%
rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/PlayerPackets.java
rename to core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/PlayerPackets1_11.java
index 4d58e095..fc68c750 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/PlayerPackets.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/PlayerPackets1_11.java
@@ -19,7 +19,7 @@ import us.myles.ViaVersion.api.type.Type;
 import us.myles.ViaVersion.packets.State;
 import us.myles.ViaVersion.protocols.protocol1_11to1_10.Protocol1_11To1_10;
 
-public class PlayerPackets {
+public class PlayerPackets1_11 {
     private static final ValueTransformer<Short, Float> toNewFloat = new ValueTransformer<Short, Float>(Type.FLOAT) {
         @Override
         public Float transform(PacketWrapper wrapper, Short inputValue) throws Exception {
diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/SoundPackets.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/SoundPackets1_11.java
similarity index 98%
rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/SoundPackets.java
rename to core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/SoundPackets1_11.java
index eb9a7c81..57f2841e 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/SoundPackets.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/SoundPackets1_11.java
@@ -18,7 +18,7 @@ import us.myles.ViaVersion.api.remapper.PacketRemapper;
 import us.myles.ViaVersion.api.type.Type;
 import us.myles.ViaVersion.packets.State;
 
-public class SoundPackets extends SoundRewriter<Protocol1_10To1_11> {
+public class SoundPackets1_11 extends SoundRewriter<Protocol1_10To1_11> {
     @Override
     protected void registerPackets(Protocol1_10To1_11 protocol) {
         // Named sound effect
diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/Protocol1_11To1_11_1.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/Protocol1_11To1_11_1.java
index 8e1774d7..64c00d23 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/Protocol1_11To1_11_1.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/Protocol1_11To1_11_1.java
@@ -14,7 +14,7 @@ import lombok.Getter;
 import nl.matsv.viabackwards.api.BackwardsProtocol;
 import nl.matsv.viabackwards.api.entities.storage.EntityTracker;
 import nl.matsv.viabackwards.protocol.protocol1_11to1_11_1.packets.EntityPackets1_11_1;
-import nl.matsv.viabackwards.protocol.protocol1_11to1_11_1.packets.ItemPackets;
+import nl.matsv.viabackwards.protocol.protocol1_11to1_11_1.packets.ItemPackets1_11_1;
 import us.myles.ViaVersion.api.data.UserConnection;
 import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
 
@@ -25,7 +25,7 @@ public class Protocol1_11To1_11_1 extends BackwardsProtocol {
     @Override
     protected void registerPackets() {
         (entityPackets = new EntityPackets1_11_1()).register(this);
-        new ItemPackets().register(this);
+        new ItemPackets1_11_1().register(this);
     }
 
     @Override
diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/packets/ItemPackets.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/packets/ItemPackets1_11_1.java
similarity index 98%
rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/packets/ItemPackets.java
rename to core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/packets/ItemPackets1_11_1.java
index 62e60acd..9bef1f9b 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/packets/ItemPackets.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/packets/ItemPackets1_11_1.java
@@ -21,7 +21,7 @@ import us.myles.ViaVersion.api.remapper.PacketRemapper;
 import us.myles.ViaVersion.api.type.Type;
 import us.myles.ViaVersion.packets.State;
 
-public class ItemPackets extends BlockItemRewriter<Protocol1_11To1_11_1> {
+public class ItemPackets1_11_1 extends BlockItemRewriter<Protocol1_11To1_11_1> {
 
     @Override
     protected void registerPackets(Protocol1_11To1_11_1 protocol) {
diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12to1_11_1/Protocol1_11_1To1_12.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12to1_11_1/Protocol1_11_1To1_12.java
index 50ec9716..a2b96b92 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12to1_11_1/Protocol1_11_1To1_12.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12to1_11_1/Protocol1_11_1To1_12.java
@@ -25,7 +25,7 @@ public class Protocol1_11_1To1_12 extends BackwardsProtocol {
 
     @Override
     protected void registerPackets() {
-        new ChangedPacketIds().register(this);
+        new ChangedPacketIds1_12().register(this);
         (entityPackets = new EntityPackets1_12()).register(this);
         (blockItemPackets = new BlockItemPackets1_12()).register(this);
         new SoundPackets1_12().register(this);
diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12to1_11_1/packets/ChangedPacketIds.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12to1_11_1/packets/ChangedPacketIds1_12.java
similarity index 99%
rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12to1_11_1/packets/ChangedPacketIds.java
rename to core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12to1_11_1/packets/ChangedPacketIds1_12.java
index 1d483f57..dac5e6ce 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12to1_11_1/packets/ChangedPacketIds.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12to1_11_1/packets/ChangedPacketIds1_12.java
@@ -17,7 +17,7 @@ import us.myles.ViaVersion.api.remapper.PacketHandler;
 import us.myles.ViaVersion.api.remapper.PacketRemapper;
 import us.myles.ViaVersion.packets.State;
 
-public class ChangedPacketIds extends Rewriter<Protocol1_11_1To1_12> {
+public class ChangedPacketIds1_12 extends Rewriter<Protocol1_11_1To1_12> {
 
     @Override
     protected void registerPackets(Protocol1_11_1To1_12 p) {
diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/Protocol1_9_4To1_10.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/Protocol1_9_4To1_10.java
index 0ab9276e..7b3470c3 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/Protocol1_9_4To1_10.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/Protocol1_9_4To1_10.java
@@ -13,23 +13,23 @@ package nl.matsv.viabackwards.protocol.protocol1_9_4to1_10;
 import lombok.Getter;
 import nl.matsv.viabackwards.api.BackwardsProtocol;
 import nl.matsv.viabackwards.api.entities.storage.EntityTracker;
-import nl.matsv.viabackwards.protocol.protocol1_9_4to1_10.packets.BlockItemPackets;
-import nl.matsv.viabackwards.protocol.protocol1_9_4to1_10.packets.ChangedPackets;
+import nl.matsv.viabackwards.protocol.protocol1_9_4to1_10.packets.BlockItemPackets1_10;
+import nl.matsv.viabackwards.protocol.protocol1_9_4to1_10.packets.ChangedPackets1_10;
 import nl.matsv.viabackwards.protocol.protocol1_9_4to1_10.packets.EntityPackets1_10;
-import nl.matsv.viabackwards.protocol.protocol1_9_4to1_10.packets.SoundPackets;
+import nl.matsv.viabackwards.protocol.protocol1_9_4to1_10.packets.SoundPackets1_10;
 import us.myles.ViaVersion.api.data.UserConnection;
 import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
 
 @Getter
 public class Protocol1_9_4To1_10 extends BackwardsProtocol {
     private EntityPackets1_10 entityPackets; // Required for the item rewriter
-    private BlockItemPackets blockItemPackets;
+    private BlockItemPackets1_10 blockItemPackets;
 
     protected void registerPackets() {
-        new ChangedPackets().register(this);
-        new SoundPackets().register(this);
+        new ChangedPackets1_10().register(this);
+        new SoundPackets1_10().register(this);
         (entityPackets = new EntityPackets1_10()).register(this);
-        (blockItemPackets = new BlockItemPackets()).register(this);
+        (blockItemPackets = new BlockItemPackets1_10()).register(this);
     }
 
     public void init(UserConnection user) {
diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/BlockItemPackets.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/BlockItemPackets1_10.java
similarity index 99%
rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/BlockItemPackets.java
rename to core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/BlockItemPackets1_10.java
index 231ddc49..5632f056 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/BlockItemPackets.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/BlockItemPackets1_10.java
@@ -25,7 +25,7 @@ import us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4.chunks.Chunk1_9_3_
 import us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4.types.Chunk1_9_3_4Type;
 import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
 
-public class BlockItemPackets extends BlockItemRewriter<Protocol1_9_4To1_10> {
+public class BlockItemPackets1_10 extends BlockItemRewriter<Protocol1_9_4To1_10> {
 
     protected void registerPackets(Protocol1_9_4To1_10 protocol) {
         /* Item packets */
diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/ChangedPackets.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/ChangedPackets1_10.java
similarity index 98%
rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/ChangedPackets.java
rename to core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/ChangedPackets1_10.java
index 1c206c21..abc6b529 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/ChangedPackets.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/ChangedPackets1_10.java
@@ -15,7 +15,7 @@ import us.myles.ViaVersion.api.remapper.PacketRemapper;
 import us.myles.ViaVersion.api.type.Type;
 import us.myles.ViaVersion.packets.State;
 
-public class ChangedPackets {
+public class ChangedPackets1_10 {
 
     public void register(BackwardsProtocol protocol) {
         /* ServerBound packets */
diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/SoundPackets.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/SoundPackets1_10.java
similarity index 98%
rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/SoundPackets.java
rename to core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/SoundPackets1_10.java
index 714f55a8..62d2d85f 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/SoundPackets.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/SoundPackets1_10.java
@@ -19,7 +19,7 @@ import us.myles.ViaVersion.api.remapper.ValueTransformer;
 import us.myles.ViaVersion.api.type.Type;
 import us.myles.ViaVersion.packets.State;
 
-public class SoundPackets extends SoundRewriter<Protocol1_9_4To1_10> {
+public class SoundPackets1_10 extends SoundRewriter<Protocol1_9_4To1_10> {
     protected static ValueTransformer<Float, Short> toOldPitch = new ValueTransformer<Float, Short>(Type.UNSIGNED_BYTE) {
         public Short transform(PacketWrapper packetWrapper, Float inputValue) throws Exception {
             return (short) Math.round(inputValue * 63.5F);