diff --git a/SpigotCore_12/src/de/steamwar/inventory/SWInventory_v12.java b/SpigotCore_12/src/de/steamwar/inventory/SWInventory_12.java
similarity index 84%
rename from SpigotCore_12/src/de/steamwar/inventory/SWInventory_v12.java
rename to SpigotCore_12/src/de/steamwar/inventory/SWInventory_12.java
index 6e8e006..2c7ee2c 100644
--- a/SpigotCore_12/src/de/steamwar/inventory/SWInventory_v12.java
+++ b/SpigotCore_12/src/de/steamwar/inventory/SWInventory_12.java
@@ -4,8 +4,8 @@ import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftInventoryCustom;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
-class SWInventory_v12 {
-    private SWInventory_v12(){}
+class SWInventory_12 {
+    private SWInventory_12(){}
 
     static Inventory get(Player player, int size, String title){
         return new CraftInventoryCustom(player, size, title);
diff --git a/SpigotCore_12/src/de/steamwar/inventory/SWItem_v12.java b/SpigotCore_12/src/de/steamwar/inventory/SWItem_12.java
similarity index 90%
rename from SpigotCore_12/src/de/steamwar/inventory/SWItem_v12.java
rename to SpigotCore_12/src/de/steamwar/inventory/SWItem_12.java
index f852bca..c1a16c3 100644
--- a/SpigotCore_12/src/de/steamwar/inventory/SWItem_v12.java
+++ b/SpigotCore_12/src/de/steamwar/inventory/SWItem_12.java
@@ -4,8 +4,8 @@ import org.bukkit.Material;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.inventory.meta.SkullMeta;
 
-class SWItem_v12 {
-    private SWItem_v12(){}
+class SWItem_12 {
+    private SWItem_12(){}
 
     static Material getMaterial(String material){
         return Material.valueOf(material);
diff --git a/SpigotCore_14/src/de/steamwar/inventory/SWInventory_v14.java b/SpigotCore_14/src/de/steamwar/inventory/SWInventory_14.java
similarity index 84%
rename from SpigotCore_14/src/de/steamwar/inventory/SWInventory_v14.java
rename to SpigotCore_14/src/de/steamwar/inventory/SWInventory_14.java
index e24fa02..18deaa6 100644
--- a/SpigotCore_14/src/de/steamwar/inventory/SWInventory_v14.java
+++ b/SpigotCore_14/src/de/steamwar/inventory/SWInventory_14.java
@@ -4,8 +4,8 @@ import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftInventoryCustom;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
-class SWInventory_v14 {
-    private SWInventory_v14() {}
+class SWInventory_14 {
+    private SWInventory_14() {}
 
     static Inventory get(Player player, int size, String title){
         return new CraftInventoryCustom(player, size, title);
diff --git a/SpigotCore_14/src/de/steamwar/inventory/SWItem_v14.java b/SpigotCore_14/src/de/steamwar/inventory/SWItem_14.java
similarity index 96%
rename from SpigotCore_14/src/de/steamwar/inventory/SWItem_v14.java
rename to SpigotCore_14/src/de/steamwar/inventory/SWItem_14.java
index d881616..f83a56b 100644
--- a/SpigotCore_14/src/de/steamwar/inventory/SWItem_v14.java
+++ b/SpigotCore_14/src/de/steamwar/inventory/SWItem_14.java
@@ -2,8 +2,8 @@ package de.steamwar.inventory;
 
 import org.bukkit.Material;
 
-class SWItem_v14 {
-    private SWItem_v14(){}
+class SWItem_14 {
+    private SWItem_14(){}
 
     static Material getMaterial(String material) {
         return Material.valueOf("LEGACY_" + material);
diff --git a/SpigotCore_8/src/de/steamwar/inventory/SWInventory_v8.java b/SpigotCore_8/src/de/steamwar/inventory/SWInventory_8.java
similarity index 85%
rename from SpigotCore_8/src/de/steamwar/inventory/SWInventory_v8.java
rename to SpigotCore_8/src/de/steamwar/inventory/SWInventory_8.java
index 51c13bc..d1f1d21 100644
--- a/SpigotCore_8/src/de/steamwar/inventory/SWInventory_v8.java
+++ b/SpigotCore_8/src/de/steamwar/inventory/SWInventory_8.java
@@ -4,8 +4,8 @@ import org.bukkit.craftbukkit.v1_8_R3.inventory.CraftInventoryCustom;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
-class SWInventory_v8 {
-    private SWInventory_v8(){}
+class SWInventory_8 {
+    private SWInventory_8(){}
 
     static Inventory get(Player player, int size, String title){
         return new CraftInventoryCustom(player, size, title);
diff --git a/SpigotCore_8/src/de/steamwar/inventory/SWItem_v8.java b/SpigotCore_8/src/de/steamwar/inventory/SWItem_8.java
similarity index 83%
rename from SpigotCore_8/src/de/steamwar/inventory/SWItem_v8.java
rename to SpigotCore_8/src/de/steamwar/inventory/SWItem_8.java
index 88fd025..2b770b4 100644
--- a/SpigotCore_8/src/de/steamwar/inventory/SWItem_v8.java
+++ b/SpigotCore_8/src/de/steamwar/inventory/SWItem_8.java
@@ -3,8 +3,8 @@ package de.steamwar.inventory;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.inventory.meta.SkullMeta;
 
-class SWItem_v8 {
-    private SWItem_v8(){}
+class SWItem_8 {
+    private SWItem_8(){}
 
     static void setSkullOwner(OfflinePlayer player, SkullMeta meta){
         meta.setOwner(player.getName());
diff --git a/SpigotCore_Main/src/de/steamwar/inventory/SWInventory.java b/SpigotCore_Main/src/de/steamwar/inventory/SWInventory.java
index 0c7e621..143262b 100644
--- a/SpigotCore_Main/src/de/steamwar/inventory/SWInventory.java
+++ b/SpigotCore_Main/src/de/steamwar/inventory/SWInventory.java
@@ -26,13 +26,13 @@ public class SWInventory implements Listener {
         player = p;
         switch(Core.getVersion()){
             case 8:
-                inventory = SWInventory_v8.get(p, size, t);
+                inventory = SWInventory_8.get(p, size, t);
                 break;
             case 14:
-                inventory = SWInventory_v14.get(p, size, t);
+                inventory = SWInventory_14.get(p, size, t);
                 break;
             default:
-                inventory = SWInventory_v12.get(p, size, t);
+                inventory = SWInventory_12.get(p, size, t);
         }
     }
 
diff --git a/SpigotCore_Main/src/de/steamwar/inventory/SWItem.java b/SpigotCore_Main/src/de/steamwar/inventory/SWItem.java
index 43f5dfe..8b8df63 100644
--- a/SpigotCore_Main/src/de/steamwar/inventory/SWItem.java
+++ b/SpigotCore_Main/src/de/steamwar/inventory/SWItem.java
@@ -24,10 +24,10 @@ public class SWItem {
         SkullMeta headmeta = (SkullMeta) head.getItemMeta();
         switch(Core.getVersion()){
             case 8:
-                SWItem_v8.setSkullOwner(player, headmeta);
+                SWItem_8.setSkullOwner(player, headmeta);
                 break;
             default:
-                SWItem_v12.setSkullOwner(player, headmeta);
+                SWItem_12.setSkullOwner(player, headmeta);
         }
         headmeta.setDisplayName(player.getName());
         head.setItemMeta(headmeta);
@@ -39,9 +39,9 @@ public class SWItem {
         try{
             switch(Core.getVersion()){
                 case 14:
-                    return SWItem_v14.getMaterial(material);
+                    return SWItem_14.getMaterial(material);
                 default:
-                    return SWItem_v12.getMaterial(material);
+                    return SWItem_12.getMaterial(material);
             }
         }catch(IllegalArgumentException e){
             return Material.STONE;
@@ -51,9 +51,9 @@ public class SWItem {
     public static Material getDye(int colorCode){
         switch(Core.getVersion()){
             case 14:
-                return SWItem_v14.getDye(colorCode);
+                return SWItem_14.getDye(colorCode);
             default:
-                return SWItem_v12.getDye();
+                return SWItem_12.getDye();
         }
     }