diff --git a/nms/v1_10_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_10_R1/NmsManagerImpl.java b/nms/v1_10_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_10_R1/VersionNMSManager.java
similarity index 97%
rename from nms/v1_10_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_10_R1/NmsManagerImpl.java
rename to nms/v1_10_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_10_R1/VersionNMSManager.java
index bcafa57d..c54164b2 100644
--- a/nms/v1_10_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_10_R1/NmsManagerImpl.java
+++ b/nms/v1_10_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_10_R1/VersionNMSManager.java
@@ -31,7 +31,7 @@ import org.bukkit.inventory.ItemStack;
 
 import java.util.Map;
 
-public class NmsManagerImpl implements NMSManager {
+public class VersionNMSManager implements NMSManager {
     
     private static final ReflectField<Map<Class<?>, String>> ENTITY_NAMES_BY_CLASS_FIELD = ReflectField.lookup(new ClassToken<Map<Class<?>, String>>(){}, EntityTypes.class, "d");
     private static final ReflectField<Map<Class<?>, Integer>> ENTITY_IDS_BY_CLASS_FIELD = ReflectField.lookup(new ClassToken<Map<Class<?>, Integer>>(){}, EntityTypes.class, "f");
@@ -41,7 +41,7 @@ public class NmsManagerImpl implements NMSManager {
     private final ItemPickupManager itemPickupManager;
     private final PacketController packetController;
 
-    public NmsManagerImpl(ItemPickupManager itemPickupManager, PacketController packetController) {
+    public VersionNMSManager(ItemPickupManager itemPickupManager, PacketController packetController) {
         this.itemPickupManager = itemPickupManager;
         this.packetController = packetController;
     }
diff --git a/nms/v1_11_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_11_R1/NmsManagerImpl.java b/nms/v1_11_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_11_R1/VersionNMSManager.java
similarity index 97%
rename from nms/v1_11_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_11_R1/NmsManagerImpl.java
rename to nms/v1_11_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_11_R1/VersionNMSManager.java
index d4f6f00a..9859f469 100644
--- a/nms/v1_11_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_11_R1/NmsManagerImpl.java
+++ b/nms/v1_11_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_11_R1/VersionNMSManager.java
@@ -31,7 +31,7 @@ import org.bukkit.craftbukkit.v1_11_R1.CraftWorld;
 import org.bukkit.craftbukkit.v1_11_R1.entity.CraftEntity;
 import org.bukkit.inventory.ItemStack;
 
-public class NmsManagerImpl implements NMSManager {
+public class VersionNMSManager implements NMSManager {
     
     private static final ReflectField<RegistryID<Class<? extends Entity>>> REGISTRY_ID_FIELD = ReflectField.lookup(new ClassToken<RegistryID<Class<? extends Entity>>>(){}, RegistryMaterials.class, "a");
     private static final ReflectField<Object[]> ID_TO_CLASS_MAP_FIELD = ReflectField.lookup(Object[].class, RegistryID.class, "d");
@@ -41,7 +41,7 @@ public class NmsManagerImpl implements NMSManager {
     private final ItemPickupManager itemPickupManager;
     private final PacketController packetController;
 
-    public NmsManagerImpl(ItemPickupManager itemPickupManager, PacketController packetController) {
+    public VersionNMSManager(ItemPickupManager itemPickupManager, PacketController packetController) {
         this.itemPickupManager = itemPickupManager;
         this.packetController = packetController;
     }
diff --git a/nms/v1_12_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_12_R1/NmsManagerImpl.java b/nms/v1_12_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_12_R1/VersionNMSManager.java
similarity index 97%
rename from nms/v1_12_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_12_R1/NmsManagerImpl.java
rename to nms/v1_12_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_12_R1/VersionNMSManager.java
index f11f253c..558b419d 100644
--- a/nms/v1_12_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_12_R1/NmsManagerImpl.java
+++ b/nms/v1_12_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_12_R1/VersionNMSManager.java
@@ -31,7 +31,7 @@ import org.bukkit.craftbukkit.v1_12_R1.CraftWorld;
 import org.bukkit.craftbukkit.v1_12_R1.entity.CraftEntity;
 import org.bukkit.inventory.ItemStack;
 
-public class NmsManagerImpl implements NMSManager {
+public class VersionNMSManager implements NMSManager {
     
     private static final ReflectField<RegistryID<Class<? extends Entity>>> REGISTRY_ID_FIELD = ReflectField.lookup(new ClassToken<RegistryID<Class<? extends Entity>>>(){}, RegistryMaterials.class, "a");
     private static final ReflectField<Object[]> ID_TO_CLASS_MAP_FIELD = ReflectField.lookup(Object[].class, RegistryID.class, "d");
@@ -41,7 +41,7 @@ public class NmsManagerImpl implements NMSManager {
     private final ItemPickupManager itemPickupManager;
     private final PacketController packetController;
 
-    public NmsManagerImpl(ItemPickupManager itemPickupManager, PacketController packetController) {
+    public VersionNMSManager(ItemPickupManager itemPickupManager, PacketController packetController) {
         this.itemPickupManager = itemPickupManager;
         this.packetController = packetController;
     }
diff --git a/nms/v1_13_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R1/NmsManagerImpl.java b/nms/v1_13_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R1/VersionNMSManager.java
similarity index 98%
rename from nms/v1_13_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R1/NmsManagerImpl.java
rename to nms/v1_13_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R1/VersionNMSManager.java
index d6dff0e7..273c3b51 100644
--- a/nms/v1_13_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R1/NmsManagerImpl.java
+++ b/nms/v1_13_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R1/VersionNMSManager.java
@@ -37,7 +37,7 @@ import org.bukkit.inventory.ItemStack;
 
 import java.util.List;
 
-public class NmsManagerImpl implements NMSManager {
+public class VersionNMSManager implements NMSManager {
     
     private static final ReflectField<RegistryID<EntityTypes<?>>> REGISTRY_ID_FIELD = ReflectField.lookup(new ClassToken<RegistryID<EntityTypes<?>>>(){}, RegistryMaterials.class, "a");
     private static final ReflectField<Object[]> ID_TO_CLASS_MAP_FIELD = ReflectField.lookup(Object[].class, RegistryID.class, "d");
@@ -48,7 +48,7 @@ public class NmsManagerImpl implements NMSManager {
     private final ItemPickupManager itemPickupManager;
     private final PacketController packetController;
 
-    public NmsManagerImpl(ItemPickupManager itemPickupManager, PacketController packetController) {
+    public VersionNMSManager(ItemPickupManager itemPickupManager, PacketController packetController) {
         this.itemPickupManager = itemPickupManager;
         this.packetController = packetController;
     }
diff --git a/nms/v1_13_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R2/NmsManagerImpl.java b/nms/v1_13_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R2/VersionNMSManager.java
similarity index 98%
rename from nms/v1_13_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R2/NmsManagerImpl.java
rename to nms/v1_13_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R2/VersionNMSManager.java
index 346738b7..a9309414 100644
--- a/nms/v1_13_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R2/NmsManagerImpl.java
+++ b/nms/v1_13_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R2/VersionNMSManager.java
@@ -38,7 +38,7 @@ import org.bukkit.inventory.ItemStack;
 
 import java.util.List;
 
-public class NmsManagerImpl implements NMSManager {
+public class VersionNMSManager implements NMSManager {
     
     private static final ReflectField<RegistryID<EntityTypes<?>>> REGISTRY_ID_FIELD = ReflectField.lookup(new ClassToken<RegistryID<EntityTypes<?>>>(){}, RegistryMaterials.class, "b");
     private static final ReflectField<Object[]> ID_TO_CLASS_MAP_FIELD = ReflectField.lookup(Object[].class, RegistryID.class, "d");
@@ -49,7 +49,7 @@ public class NmsManagerImpl implements NMSManager {
     private final ItemPickupManager itemPickupManager;
     private final PacketController packetController;
 
-    public NmsManagerImpl(ItemPickupManager itemPickupManager, PacketController packetController) {
+    public VersionNMSManager(ItemPickupManager itemPickupManager, PacketController packetController) {
         this.itemPickupManager = itemPickupManager;
         this.packetController = packetController;
     }
diff --git a/nms/v1_14_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_14_R1/NmsManagerImpl.java b/nms/v1_14_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_14_R1/VersionNMSManager.java
similarity index 98%
rename from nms/v1_14_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_14_R1/NmsManagerImpl.java
rename to nms/v1_14_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_14_R1/VersionNMSManager.java
index e6130190..347bdddf 100644
--- a/nms/v1_14_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_14_R1/NmsManagerImpl.java
+++ b/nms/v1_14_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_14_R1/VersionNMSManager.java
@@ -39,7 +39,7 @@ import org.bukkit.inventory.ItemStack;
 
 import java.util.List;
 
-public class NmsManagerImpl implements NMSManager {
+public class VersionNMSManager implements NMSManager {
     
     private static final ReflectField<RegistryID<EntityTypes<?>>> REGISTRY_ID_FIELD = ReflectField.lookup(new ClassToken<RegistryID<EntityTypes<?>>>(){}, RegistryMaterials.class, "b");
     private static final ReflectField<Object[]> ID_TO_CLASS_MAP_FIELD = ReflectField.lookup(Object[].class, RegistryID.class, "d");
@@ -48,7 +48,7 @@ public class NmsManagerImpl implements NMSManager {
     private final ItemPickupManager itemPickupManager;
     private final PacketController packetController;
 
-    public NmsManagerImpl(ItemPickupManager itemPickupManager, PacketController packetController) {
+    public VersionNMSManager(ItemPickupManager itemPickupManager, PacketController packetController) {
         this.itemPickupManager = itemPickupManager;
         this.packetController = packetController;
     }
diff --git a/nms/v1_15_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_15_R1/NmsManagerImpl.java b/nms/v1_15_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_15_R1/VersionNMSManager.java
similarity index 98%
rename from nms/v1_15_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_15_R1/NmsManagerImpl.java
rename to nms/v1_15_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_15_R1/VersionNMSManager.java
index 93bc0de7..a6399761 100644
--- a/nms/v1_15_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_15_R1/NmsManagerImpl.java
+++ b/nms/v1_15_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_15_R1/VersionNMSManager.java
@@ -38,7 +38,7 @@ import org.bukkit.inventory.ItemStack;
 
 import java.util.List;
 
-public class NmsManagerImpl implements NMSManager {
+public class VersionNMSManager implements NMSManager {
     
     private static final ReflectField<RegistryID<EntityTypes<?>>> REGISTRY_ID_FIELD = ReflectField.lookup(new ClassToken<RegistryID<EntityTypes<?>>>(){}, RegistryMaterials.class, "b");
     private static final ReflectField<Object[]> ID_TO_CLASS_MAP_FIELD = ReflectField.lookup(Object[].class, RegistryID.class, "d");
@@ -47,7 +47,7 @@ public class NmsManagerImpl implements NMSManager {
     private final ItemPickupManager itemPickupManager;
     private final PacketController packetController;
 
-    public NmsManagerImpl(ItemPickupManager itemPickupManager, PacketController packetController) {
+    public VersionNMSManager(ItemPickupManager itemPickupManager, PacketController packetController) {
         this.itemPickupManager = itemPickupManager;
         this.packetController = packetController;
     }
diff --git a/nms/v1_16_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R1/NmsManagerImpl.java b/nms/v1_16_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R1/VersionNMSManager.java
similarity index 98%
rename from nms/v1_16_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R1/NmsManagerImpl.java
rename to nms/v1_16_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R1/VersionNMSManager.java
index 715c3416..d54be4f1 100644
--- a/nms/v1_16_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R1/NmsManagerImpl.java
+++ b/nms/v1_16_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R1/VersionNMSManager.java
@@ -38,7 +38,7 @@ import org.bukkit.inventory.ItemStack;
 
 import java.util.List;
 
-public class NmsManagerImpl implements NMSManager {
+public class VersionNMSManager implements NMSManager {
     
     private static final ReflectField<RegistryID<EntityTypes<?>>> REGISTRY_ID_FIELD = ReflectField.lookup(new ClassToken<RegistryID<EntityTypes<?>>>(){}, RegistryMaterials.class, "b");
     private static final ReflectField<Object[]> ID_TO_CLASS_MAP_FIELD = ReflectField.lookup(Object[].class, RegistryID.class, "d");
@@ -47,7 +47,7 @@ public class NmsManagerImpl implements NMSManager {
     private final ItemPickupManager itemPickupManager;
     private final PacketController packetController;
 
-    public NmsManagerImpl(ItemPickupManager itemPickupManager, PacketController packetController) {
+    public VersionNMSManager(ItemPickupManager itemPickupManager, PacketController packetController) {
         this.itemPickupManager = itemPickupManager;
         this.packetController = packetController;
     }
diff --git a/nms/v1_16_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R2/NmsManagerImpl.java b/nms/v1_16_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R2/VersionNMSManager.java
similarity index 98%
rename from nms/v1_16_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R2/NmsManagerImpl.java
rename to nms/v1_16_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R2/VersionNMSManager.java
index d75ebc2d..3b71fef7 100644
--- a/nms/v1_16_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R2/NmsManagerImpl.java
+++ b/nms/v1_16_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R2/VersionNMSManager.java
@@ -38,7 +38,7 @@ import org.bukkit.inventory.ItemStack;
 import java.util.List;
 import java.util.Map;
 
-public class NmsManagerImpl implements NMSManager {
+public class VersionNMSManager implements NMSManager {
     
     private static final ReflectField<Map<EntityTypes<?>, Integer>> REGISTRY_TO_ID_FIELD = ReflectField.lookup(new ClassToken<Map<EntityTypes<?>, Integer>>(){}, RegistryMaterials.class, "bg");
     private static final ReflectMethod<Void> REGISTER_ENTITY_METHOD = ReflectMethod.lookup(void.class, WorldServer.class, "registerEntity", Entity.class);
@@ -46,7 +46,7 @@ public class NmsManagerImpl implements NMSManager {
     private final ItemPickupManager itemPickupManager;
     private final PacketController packetController;
 
-    public NmsManagerImpl(ItemPickupManager itemPickupManager, PacketController packetController) {
+    public VersionNMSManager(ItemPickupManager itemPickupManager, PacketController packetController) {
         this.itemPickupManager = itemPickupManager;
         this.packetController = packetController;
     }
diff --git a/nms/v1_16_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R3/NmsManagerImpl.java b/nms/v1_16_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R3/VersionNMSManager.java
similarity index 98%
rename from nms/v1_16_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R3/NmsManagerImpl.java
rename to nms/v1_16_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R3/VersionNMSManager.java
index 69bccd03..f8ebc695 100644
--- a/nms/v1_16_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R3/NmsManagerImpl.java
+++ b/nms/v1_16_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R3/VersionNMSManager.java
@@ -38,7 +38,7 @@ import org.bukkit.inventory.ItemStack;
 import java.util.List;
 import java.util.Map;
 
-public class NmsManagerImpl implements NMSManager {
+public class VersionNMSManager implements NMSManager {
     
     private static final ReflectField<Map<EntityTypes<?>, Integer>> REGISTRY_TO_ID_FIELD = ReflectField.lookup(new ClassToken<Map<EntityTypes<?>, Integer>>(){}, RegistryMaterials.class, "bg");
     private static final ReflectMethod<Void> REGISTER_ENTITY_METHOD = ReflectMethod.lookup(void.class, WorldServer.class, "registerEntity", Entity.class);
@@ -46,7 +46,7 @@ public class NmsManagerImpl implements NMSManager {
     private final ItemPickupManager itemPickupManager;
     private final PacketController packetController;
 
-    public NmsManagerImpl(ItemPickupManager itemPickupManager, PacketController packetController) {
+    public VersionNMSManager(ItemPickupManager itemPickupManager, PacketController packetController) {
         this.itemPickupManager = itemPickupManager;
         this.packetController = packetController;
     }
diff --git a/nms/v1_8_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R2/NmsManagerImpl.java b/nms/v1_8_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R2/VersionNMSManager.java
similarity index 97%
rename from nms/v1_8_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R2/NmsManagerImpl.java
rename to nms/v1_8_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R2/VersionNMSManager.java
index 1b4f318f..51165c81 100644
--- a/nms/v1_8_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R2/NmsManagerImpl.java
+++ b/nms/v1_8_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R2/VersionNMSManager.java
@@ -32,7 +32,7 @@ import org.bukkit.inventory.ItemStack;
 
 import java.util.Map;
 
-public class NmsManagerImpl implements NMSManager {
+public class VersionNMSManager implements NMSManager {
     
     private static final ReflectField<Map<Class<?>, String>> ENTITY_NAMES_BY_CLASS_FIELD = ReflectField.lookup(new ClassToken<Map<Class<?>, String>>(){}, EntityTypes.class, "d");
     private static final ReflectField<Map<Class<?>, Integer>> ENTITY_IDS_BY_CLASS_FIELD = ReflectField.lookup(new ClassToken<Map<Class<?>, Integer>>(){}, EntityTypes.class, "f");
@@ -42,7 +42,7 @@ public class NmsManagerImpl implements NMSManager {
     private final ItemPickupManager itemPickupManager;
     private final PacketController packetController;
 
-    public NmsManagerImpl(ItemPickupManager itemPickupManager, PacketController packetController) {
+    public VersionNMSManager(ItemPickupManager itemPickupManager, PacketController packetController) {
         this.itemPickupManager = itemPickupManager;
         this.packetController = packetController;
     }
diff --git a/nms/v1_8_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R3/NmsManagerImpl.java b/nms/v1_8_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R3/VersionNMSManager.java
similarity index 97%
rename from nms/v1_8_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R3/NmsManagerImpl.java
rename to nms/v1_8_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R3/VersionNMSManager.java
index fc430e40..5074e695 100644
--- a/nms/v1_8_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R3/NmsManagerImpl.java
+++ b/nms/v1_8_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R3/VersionNMSManager.java
@@ -32,7 +32,7 @@ import org.bukkit.inventory.ItemStack;
 
 import java.util.Map;
 
-public class NmsManagerImpl implements NMSManager {
+public class VersionNMSManager implements NMSManager {
     
     private static final ReflectField<Map<Class<?>, String>> ENTITY_NAMES_BY_CLASS_FIELD = ReflectField.lookup(new ClassToken<Map<Class<?>, String>>(){}, EntityTypes.class, "d");
     private static final ReflectField<Map<Class<?>, Integer>> ENTITY_IDS_BY_CLASS_FIELD = ReflectField.lookup(new ClassToken<Map<Class<?>, Integer>>(){}, EntityTypes.class, "f");
@@ -42,7 +42,7 @@ public class NmsManagerImpl implements NMSManager {
     private final ItemPickupManager itemPickupManager;
     private final PacketController packetController;
 
-    public NmsManagerImpl(ItemPickupManager itemPickupManager, PacketController packetController) {
+    public VersionNMSManager(ItemPickupManager itemPickupManager, PacketController packetController) {
         this.itemPickupManager = itemPickupManager;
         this.packetController = packetController;
     }
diff --git a/nms/v1_9_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R1/NmsManagerImpl.java b/nms/v1_9_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R1/VersionNMSManager.java
similarity index 97%
rename from nms/v1_9_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R1/NmsManagerImpl.java
rename to nms/v1_9_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R1/VersionNMSManager.java
index 833be772..2764835b 100644
--- a/nms/v1_9_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R1/NmsManagerImpl.java
+++ b/nms/v1_9_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R1/VersionNMSManager.java
@@ -31,7 +31,7 @@ import org.bukkit.inventory.ItemStack;
 
 import java.util.Map;
 
-public class NmsManagerImpl implements NMSManager {
+public class VersionNMSManager implements NMSManager {
     
     private static final ReflectField<Map<Class<?>, String>> ENTITY_NAMES_BY_CLASS_FIELD = ReflectField.lookup(new ClassToken<Map<Class<?>, String>>(){}, EntityTypes.class, "d");
     private static final ReflectField<Map<Class<?>, Integer>> ENTITY_IDS_BY_CLASS_FIELD = ReflectField.lookup(new ClassToken<Map<Class<?>, Integer>>(){}, EntityTypes.class, "f");
@@ -41,7 +41,7 @@ public class NmsManagerImpl implements NMSManager {
     private final ItemPickupManager itemPickupManager;
     private final PacketController packetController;
 
-    public NmsManagerImpl(ItemPickupManager itemPickupManager, PacketController packetController) {
+    public VersionNMSManager(ItemPickupManager itemPickupManager, PacketController packetController) {
         this.itemPickupManager = itemPickupManager;
         this.packetController = packetController;
     }
diff --git a/nms/v1_9_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R2/NmsManagerImpl.java b/nms/v1_9_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R2/VersionNMSManager.java
similarity index 97%
rename from nms/v1_9_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R2/NmsManagerImpl.java
rename to nms/v1_9_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R2/VersionNMSManager.java
index 8ad0f13b..d8d0bb1e 100644
--- a/nms/v1_9_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R2/NmsManagerImpl.java
+++ b/nms/v1_9_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R2/VersionNMSManager.java
@@ -31,7 +31,7 @@ import org.bukkit.inventory.ItemStack;
 
 import java.util.Map;
 
-public class NmsManagerImpl implements NMSManager {
+public class VersionNMSManager implements NMSManager {
 
     private static final ReflectField<Map<Class<?>, String>> ENTITY_NAMES_BY_CLASS_FIELD = ReflectField.lookup(new ClassToken<Map<Class<?>, String>>(){}, EntityTypes.class, "d");
     private static final ReflectField<Map<Class<?>, Integer>> ENTITY_IDS_BY_CLASS_FIELD = ReflectField.lookup(new ClassToken<Map<Class<?>, Integer>>(){}, EntityTypes.class, "f");
@@ -41,7 +41,7 @@ public class NmsManagerImpl implements NMSManager {
     private final ItemPickupManager itemPickupManager;
     private final PacketController packetController;
 
-    public NmsManagerImpl(ItemPickupManager itemPickupManager, PacketController packetController) {
+    public VersionNMSManager(ItemPickupManager itemPickupManager, PacketController packetController) {
         this.itemPickupManager = itemPickupManager;
         this.packetController = packetController;
     }
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/HolographicDisplays.java b/plugin/src/main/java/me/filoghost/holographicdisplays/HolographicDisplays.java
index 0d07265b..73759304 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/HolographicDisplays.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/HolographicDisplays.java
@@ -88,7 +88,7 @@ public class HolographicDisplays extends FCommonsPlugin implements PacketControl
         
         NMSManager nmsManager;
         try {
-            nmsManager = NMSVersion.get().createNMSManager(this, this);
+            nmsManager = NMSVersion.createNMSManager(this, this);
             nmsManager.setup();
         } catch (Exception e) {
             throw new PluginEnableException(e, "Couldn't initialize the NMS manager.");
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/util/NMSVersion.java b/plugin/src/main/java/me/filoghost/holographicdisplays/util/NMSVersion.java
index f1ba8c03..c17d77a7 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/util/NMSVersion.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/util/NMSVersion.java
@@ -19,20 +19,20 @@ import java.util.regex.Pattern;
  */
 public enum NMSVersion {
     
-    v1_8_R2(me.filoghost.holographicdisplays.nms.v1_8_R2.NmsManagerImpl::new),
-    v1_8_R3(me.filoghost.holographicdisplays.nms.v1_8_R3.NmsManagerImpl::new),
-    v1_9_R1(me.filoghost.holographicdisplays.nms.v1_9_R1.NmsManagerImpl::new),
-    v1_9_R2(me.filoghost.holographicdisplays.nms.v1_9_R2.NmsManagerImpl::new),
-    v1_10_R1(me.filoghost.holographicdisplays.nms.v1_10_R1.NmsManagerImpl::new),
-    v1_11_R1(me.filoghost.holographicdisplays.nms.v1_11_R1.NmsManagerImpl::new),
-    v1_12_R1(me.filoghost.holographicdisplays.nms.v1_12_R1.NmsManagerImpl::new),
-    v1_13_R1(me.filoghost.holographicdisplays.nms.v1_13_R1.NmsManagerImpl::new),
-    v1_13_R2(me.filoghost.holographicdisplays.nms.v1_13_R2.NmsManagerImpl::new),
-    v1_14_R1(me.filoghost.holographicdisplays.nms.v1_14_R1.NmsManagerImpl::new),
-    v1_15_R1(me.filoghost.holographicdisplays.nms.v1_15_R1.NmsManagerImpl::new),
-    v1_16_R1(me.filoghost.holographicdisplays.nms.v1_16_R1.NmsManagerImpl::new),
-    v1_16_R2(me.filoghost.holographicdisplays.nms.v1_16_R2.NmsManagerImpl::new),
-    v1_16_R3(me.filoghost.holographicdisplays.nms.v1_16_R3.NmsManagerImpl::new);
+    v1_8_R2(me.filoghost.holographicdisplays.nms.v1_8_R2.VersionNMSManager::new),
+    v1_8_R3(me.filoghost.holographicdisplays.nms.v1_8_R3.VersionNMSManager::new),
+    v1_9_R1(me.filoghost.holographicdisplays.nms.v1_9_R1.VersionNMSManager::new),
+    v1_9_R2(me.filoghost.holographicdisplays.nms.v1_9_R2.VersionNMSManager::new),
+    v1_10_R1(me.filoghost.holographicdisplays.nms.v1_10_R1.VersionNMSManager::new),
+    v1_11_R1(me.filoghost.holographicdisplays.nms.v1_11_R1.VersionNMSManager::new),
+    v1_12_R1(me.filoghost.holographicdisplays.nms.v1_12_R1.VersionNMSManager::new),
+    v1_13_R1(me.filoghost.holographicdisplays.nms.v1_13_R1.VersionNMSManager::new),
+    v1_13_R2(me.filoghost.holographicdisplays.nms.v1_13_R2.VersionNMSManager::new),
+    v1_14_R1(me.filoghost.holographicdisplays.nms.v1_14_R1.VersionNMSManager::new),
+    v1_15_R1(me.filoghost.holographicdisplays.nms.v1_15_R1.VersionNMSManager::new),
+    v1_16_R1(me.filoghost.holographicdisplays.nms.v1_16_R1.VersionNMSManager::new),
+    v1_16_R2(me.filoghost.holographicdisplays.nms.v1_16_R2.VersionNMSManager::new),
+    v1_16_R3(me.filoghost.holographicdisplays.nms.v1_16_R3.VersionNMSManager::new);
     
     private static final NMSVersion CURRENT_VERSION = extractCurrentVersion();
     
@@ -42,8 +42,8 @@ public enum NMSVersion {
         this.nmsManagerConstructor = nmsManagerConstructor;
     }
 
-    public NMSManager createNMSManager(ItemPickupManager itemPickupManager, PacketController packetController) {
-        return nmsManagerConstructor.create(itemPickupManager, packetController);
+    public static NMSManager createNMSManager(ItemPickupManager itemPickupManager, PacketController packetController) {
+        return getValid().nmsManagerConstructor.create(itemPickupManager, packetController);
     }
 
     private static NMSVersion extractCurrentVersion() {
@@ -64,13 +64,13 @@ public enum NMSVersion {
         return CURRENT_VERSION != null;
     }
 
-    public static NMSVersion get() {
+    private static NMSVersion getValid() {
         Preconditions.checkState(isValid(), "Current version is not valid");
         return CURRENT_VERSION;
     }
 
     public static boolean isGreaterEqualThan(NMSVersion other) {
-        return get().ordinal() >= other.ordinal();
+        return getValid().ordinal() >= other.ordinal();
     }