diff --git a/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolRegistry.java b/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolRegistry.java
index 86ace60b6..3b2e0cc1e 100644
--- a/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolRegistry.java
+++ b/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolRegistry.java
@@ -5,12 +5,12 @@ import com.google.common.collect.Sets;
 import org.bukkit.Bukkit;
 import us.myles.ViaVersion.api.Pair;
 import us.myles.ViaVersion.protocols.base.BaseProtocol;
-import us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3.Protocol1_9_1_2TO1_9_3;
+import us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4.Protocol1_9_1_2TO1_9_3_4;
 import us.myles.ViaVersion.protocols.protocol1_9_1to1_9.Protocol1_9_1TO1_9;
 import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.Protocol1_9_3TO1_9_1_2;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9TO1_8;
 import us.myles.ViaVersion.protocols.protocol1_9to1_9_1.Protocol1_9TO1_9_1;
-import us.myles.ViaVersion.protocols.protocolsnapshotto1_9_3.ProtocolSnapshotTo1_9_3;
+import us.myles.ViaVersion.protocols.protocolsnapshotto1_9_3.ProtocolSnapshotTo1_9_3_4;
 
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
@@ -33,8 +33,8 @@ public class ProtocolRegistry {
         registerProtocol(new Protocol1_9_3TO1_9_1_2(), Arrays.asList(ProtocolVersion.v1_9_3.getId()), ProtocolVersion.v1_9_2.getId());
         // Only supported for 1.9.4 server to 1.9 (nothing else)
         registerProtocol(new Protocol1_9TO1_9_1(), Arrays.asList(ProtocolVersion.v1_9.getId()), ProtocolVersion.v1_9_2.getId());
-        registerProtocol(new Protocol1_9_1_2TO1_9_3(), Arrays.asList(ProtocolVersion.v1_9_1.getId(), ProtocolVersion.v1_9_2.getId()), ProtocolVersion.v1_9_3.getId());
-        registerProtocol(new ProtocolSnapshotTo1_9_3(), Collections.singletonList(ProtocolVersion.SNAPSHOT.getId()), ProtocolVersion.v1_9_3.getId());
+        registerProtocol(new Protocol1_9_1_2TO1_9_3_4(), Arrays.asList(ProtocolVersion.v1_9_1.getId(), ProtocolVersion.v1_9_2.getId()), ProtocolVersion.v1_9_3.getId());
+        registerProtocol(new ProtocolSnapshotTo1_9_3_4(), Collections.singletonList(ProtocolVersion.SNAPSHOT.getId()), ProtocolVersion.v1_9_3.getId());
 
     }
 
diff --git a/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3/BlockEntity.java b/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/BlockEntity.java
similarity index 98%
rename from src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3/BlockEntity.java
rename to src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/BlockEntity.java
index 52471fb0d..916d7f0dc 100644
--- a/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3/BlockEntity.java
+++ b/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/BlockEntity.java
@@ -1,4 +1,4 @@
-package us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3;
+package us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4;
 
 import lombok.Getter;
 import org.spacehq.opennbt.tag.builtin.CompoundTag;
diff --git a/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3/Chunk1_9_3.java b/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/Chunk1_9_3_4.java
similarity index 77%
rename from src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3/Chunk1_9_3.java
rename to src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/Chunk1_9_3_4.java
index a15acd907..aa6d6a2ad 100644
--- a/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3/Chunk1_9_3.java
+++ b/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/Chunk1_9_3_4.java
@@ -1,4 +1,4 @@
-package us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3;
+package us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -8,7 +8,7 @@ import java.util.List;
 
 @Data
 @AllArgsConstructor
-public class Chunk1_9_3 {
+public class Chunk1_9_3_4 {
     private int x;
     private int z;
     private boolean groundUp;
diff --git a/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3/Chunk1_9_3Type.java b/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/Chunk1_9_3_4Type.java
similarity index 71%
rename from src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3/Chunk1_9_3Type.java
rename to src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/Chunk1_9_3_4Type.java
index 05d698e8e..eed280e50 100644
--- a/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3/Chunk1_9_3Type.java
+++ b/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/Chunk1_9_3_4Type.java
@@ -1,4 +1,4 @@
-package us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3;
+package us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4;
 
 import io.netty.buffer.ByteBuf;
 import org.spacehq.opennbt.tag.builtin.CompoundTag;
@@ -7,13 +7,13 @@ import us.myles.ViaVersion.api.type.Type;
 import java.util.ArrayList;
 import java.util.List;
 
-public class Chunk1_9_3Type extends Type<Chunk1_9_3> {
-    public Chunk1_9_3Type() {
-        super("1.9.3 Chunk", Chunk1_9_3.class);
+public class Chunk1_9_3_4Type extends Type<Chunk1_9_3_4> {
+    public Chunk1_9_3_4Type() {
+        super("1.9.3 Chunk", Chunk1_9_3_4.class);
     }
 
     @Override
-    public Chunk1_9_3 read(ByteBuf input) throws Exception {
+    public Chunk1_9_3_4 read(ByteBuf input) throws Exception {
         int chunkX = input.readInt();
         int chunkZ = input.readInt();
 
@@ -29,11 +29,11 @@ public class Chunk1_9_3Type extends Type<Chunk1_9_3> {
         for (int i = 0; i < blockEntities; i++) {
             nbtData.add(Type.NBT.read(input));
         }
-        return new Chunk1_9_3(chunkX, chunkZ, groundUp, primaryBitmask, sections, nbtData);
+        return new Chunk1_9_3_4(chunkX, chunkZ, groundUp, primaryBitmask, sections, nbtData);
     }
 
     @Override
-    public void write(ByteBuf buffer, Chunk1_9_3 chunk) throws Exception {
+    public void write(ByteBuf buffer, Chunk1_9_3_4 chunk) throws Exception {
         buffer.writeInt(chunk.getX());
         buffer.writeInt(chunk.getZ());
 
diff --git a/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3/Protocol1_9_1_2TO1_9_3.java b/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/Protocol1_9_1_2TO1_9_3_4.java
similarity index 90%
rename from src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3/Protocol1_9_1_2TO1_9_3.java
rename to src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/Protocol1_9_1_2TO1_9_3_4.java
index 1660769ef..51649a0b1 100644
--- a/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3/Protocol1_9_1_2TO1_9_3.java
+++ b/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/Protocol1_9_1_2TO1_9_3_4.java
@@ -1,4 +1,4 @@
-package us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3;
+package us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4;
 
 import org.spacehq.opennbt.tag.builtin.CompoundTag;
 import us.myles.ViaVersion.api.PacketWrapper;
@@ -10,8 +10,8 @@ import us.myles.ViaVersion.api.remapper.PacketRemapper;
 import us.myles.ViaVersion.api.type.Type;
 import us.myles.ViaVersion.packets.State;
 
-public class Protocol1_9_1_2TO1_9_3 extends Protocol {
-    public static Type<Chunk1_9_3> CHUNK = new Chunk1_9_3Type();
+public class Protocol1_9_1_2TO1_9_3_4 extends Protocol {
+    public static Type<Chunk1_9_3_4> CHUNK = new Chunk1_9_3_4Type();
 
     @Override
     protected void registerPackets() {
@@ -56,7 +56,7 @@ public class Protocol1_9_1_2TO1_9_3 extends Protocol {
                 handler(new PacketHandler() {
                     @Override
                     public void handle(PacketWrapper wrapper) throws Exception {
-                        Chunk1_9_3 chunk = wrapper.passthrough(CHUNK);
+                        Chunk1_9_3_4 chunk = wrapper.passthrough(CHUNK);
                         BlockEntity.handle(chunk.getBlockEntities(), wrapper.user());
                     }
                 });
diff --git a/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_9_3/ProtocolSnapshotTo1_9_3.java b/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_9_3/ProtocolSnapshotTo1_9_3_4.java
similarity index 96%
rename from src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_9_3/ProtocolSnapshotTo1_9_3.java
rename to src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_9_3/ProtocolSnapshotTo1_9_3_4.java
index be69833f0..f55d74cb4 100644
--- a/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_9_3/ProtocolSnapshotTo1_9_3.java
+++ b/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_9_3/ProtocolSnapshotTo1_9_3_4.java
@@ -10,10 +10,12 @@ import us.myles.ViaVersion.api.remapper.ValueTransformer;
 import us.myles.ViaVersion.api.type.Type;
 import us.myles.ViaVersion.packets.State;
 import us.myles.ViaVersion.protocols.protocolsnapshotto1_9_3.storage.ResourcePackTracker;
+import us.myles.ViaVersion.protocols.protocolsnapshotto1_9_3.types.MetaListSnapshotType;
+import us.myles.ViaVersion.protocols.protocolsnapshotto1_9_3.types.MetaSnapshotType;
 
 import java.util.List;
 
-public class ProtocolSnapshotTo1_9_3 extends Protocol {
+public class ProtocolSnapshotTo1_9_3_4 extends Protocol {
     public static final Type<List<Metadata>> METADATA_LIST = new MetaListSnapshotType();
     public static final Type<Metadata> METADATA = new MetaSnapshotType();
     public static ValueTransformer<Short, Float> toNewPitch = new ValueTransformer<Short, Float>(Type.FLOAT) {
diff --git a/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_9_3/MetaListSnapshotType.java b/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_9_3/types/MetaListSnapshotType.java
similarity index 65%
rename from src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_9_3/MetaListSnapshotType.java
rename to src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_9_3/types/MetaListSnapshotType.java
index 3d877106b..ebd0a7a1d 100644
--- a/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_9_3/MetaListSnapshotType.java
+++ b/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_9_3/types/MetaListSnapshotType.java
@@ -1,10 +1,11 @@
-package us.myles.ViaVersion.protocols.protocolsnapshotto1_9_3;
+package us.myles.ViaVersion.protocols.protocolsnapshotto1_9_3.types;
 
 import io.netty.buffer.ByteBuf;
 import us.myles.ViaVersion.api.minecraft.metadata.Metadata;
 import us.myles.ViaVersion.api.type.Type;
 import us.myles.ViaVersion.api.type.types.minecraft.MetaListTypeTemplate;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.metadata.NewType;
+import us.myles.ViaVersion.protocols.protocolsnapshotto1_9_3.ProtocolSnapshotTo1_9_3_4;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -16,7 +17,7 @@ public class MetaListSnapshotType extends MetaListTypeTemplate {
         List<Metadata> list = new ArrayList<>();
         Metadata meta;
         do {
-            meta = ProtocolSnapshotTo1_9_3.METADATA.read(buffer);
+            meta = ProtocolSnapshotTo1_9_3_4.METADATA.read(buffer);
             if (meta != null)
                 list.add(meta);
         } while (meta != null);
@@ -30,11 +31,11 @@ public class MetaListSnapshotType extends MetaListTypeTemplate {
             if (m.getId() >= 5)
                 m.setId(m.getId() + 1);
             if (m.getId() == 4)
-                ProtocolSnapshotTo1_9_3.METADATA.write(buffer, new Metadata(5, NewType.Boolean.getTypeID(), Type.BOOLEAN, false)); // No gravity metadata
-            ProtocolSnapshotTo1_9_3.METADATA.write(buffer, m);
+                ProtocolSnapshotTo1_9_3_4.METADATA.write(buffer, new Metadata(5, NewType.Boolean.getTypeID(), Type.BOOLEAN, false)); // No gravity metadata
+            ProtocolSnapshotTo1_9_3_4.METADATA.write(buffer, m);
         }
 
         // Write end of list
-        ProtocolSnapshotTo1_9_3.METADATA.write(buffer, null);
+        ProtocolSnapshotTo1_9_3_4.METADATA.write(buffer, null);
     }
 }
diff --git a/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_9_3/MetaSnapshotType.java b/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_9_3/types/MetaSnapshotType.java
similarity index 93%
rename from src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_9_3/MetaSnapshotType.java
rename to src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_9_3/types/MetaSnapshotType.java
index 0fcaa72cc..ca5b41430 100644
--- a/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_9_3/MetaSnapshotType.java
+++ b/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_9_3/types/MetaSnapshotType.java
@@ -1,4 +1,4 @@
-package us.myles.ViaVersion.protocols.protocolsnapshotto1_9_3;
+package us.myles.ViaVersion.protocols.protocolsnapshotto1_9_3.types;
 
 import io.netty.buffer.ByteBuf;
 import us.myles.ViaVersion.api.minecraft.metadata.Metadata;