diff --git a/versionsupport_1_12_R1/src/main/java/com/andrei1058/bedwars/support/version/v1_12_R1/v1_12_R1.java b/versionsupport_1_12_R1/src/main/java/com/andrei1058/bedwars/support/version/v1_12_R1/v1_12_R1.java
index bae30a535..16a952ff7 100644
--- a/versionsupport_1_12_R1/src/main/java/com/andrei1058/bedwars/support/version/v1_12_R1/v1_12_R1.java
+++ b/versionsupport_1_12_R1/src/main/java/com/andrei1058/bedwars/support/version/v1_12_R1/v1_12_R1.java
@@ -548,9 +548,10 @@ public org.bukkit.inventory.ItemStack setShopUpgradeIdentifier(org.bukkit.invent
         NBTTagCompound tag = i.getTag();
         if (tag == null) {
             tag = new NBTTagCompound();
-            i.setTag(tag);
         }
-        tag.setString("tierIdentifier", identifier);
+
+        tag.setString(VersionSupport.PLUGIN_TAG_TIER_KEY, identifier);
+        i.setTag(tag);
         return CraftItemStack.asBukkitCopy(i);
     }
 
diff --git a/versionsupport_1_8_R3/src/main/java/com/andrei1058/bedwars/support/version/v1_8_R3/v1_8_R3.java b/versionsupport_1_8_R3/src/main/java/com/andrei1058/bedwars/support/version/v1_8_R3/v1_8_R3.java
index d5ec519ca..38fee7c37 100644
--- a/versionsupport_1_8_R3/src/main/java/com/andrei1058/bedwars/support/version/v1_8_R3/v1_8_R3.java
+++ b/versionsupport_1_8_R3/src/main/java/com/andrei1058/bedwars/support/version/v1_8_R3/v1_8_R3.java
@@ -602,9 +602,10 @@ public org.bukkit.inventory.ItemStack setShopUpgradeIdentifier(org.bukkit.invent
         NBTTagCompound tag = i.getTag();
         if (tag == null) {
             tag = new NBTTagCompound();
-            i.setTag(tag);
         }
-        tag.setString("tierIdentifier", identifier);
+
+        tag.setString(VersionSupport.PLUGIN_TAG_TIER_KEY, identifier);
+        i.setTag(tag);
         return CraftItemStack.asBukkitCopy(i);
     }
 
diff --git a/versionsupport_v1_16_R3/src/main/java/com/andrei1058/bedwars/support/version/v1_16_R3/v1_16_R3.java b/versionsupport_v1_16_R3/src/main/java/com/andrei1058/bedwars/support/version/v1_16_R3/v1_16_R3.java
index abaefe746..4ac05dfc5 100644
--- a/versionsupport_v1_16_R3/src/main/java/com/andrei1058/bedwars/support/version/v1_16_R3/v1_16_R3.java
+++ b/versionsupport_v1_16_R3/src/main/java/com/andrei1058/bedwars/support/version/v1_16_R3/v1_16_R3.java
@@ -533,9 +533,10 @@ public org.bukkit.inventory.ItemStack setShopUpgradeIdentifier(org.bukkit.invent
         NBTTagCompound tag = i.getTag();
         if (tag == null) {
             tag = new NBTTagCompound();
-            i.setTag(tag);
         }
-        tag.setString("tierIdentifier", identifier);
+
+        tag.setString(VersionSupport.PLUGIN_TAG_TIER_KEY, identifier);
+        i.setTag(tag);
         return CraftItemStack.asBukkitCopy(i);
     }
 
diff --git a/versionsupport_v1_17_R1/src/main/java/com/andrei1058/bedwars/support/version/v1_17_R1/v1_17_R1.java b/versionsupport_v1_17_R1/src/main/java/com/andrei1058/bedwars/support/version/v1_17_R1/v1_17_R1.java
index 517776844..df665e4f7 100644
--- a/versionsupport_v1_17_R1/src/main/java/com/andrei1058/bedwars/support/version/v1_17_R1/v1_17_R1.java
+++ b/versionsupport_v1_17_R1/src/main/java/com/andrei1058/bedwars/support/version/v1_17_R1/v1_17_R1.java
@@ -563,9 +563,10 @@ public org.bukkit.inventory.ItemStack setShopUpgradeIdentifier(org.bukkit.invent
         NBTTagCompound tag = i.getTag();
         if (tag == null) {
             tag = new NBTTagCompound();
-            i.setTag(tag);
         }
-        tag.setString("tierIdentifier", identifier);
+
+        tag.setString(VersionSupport.PLUGIN_TAG_TIER_KEY, identifier);
+        i.setTag(tag);
         return CraftItemStack.asBukkitCopy(i);
     }
 
diff --git a/versionsupport_v1_18_R2/src/main/java/com/andrei1058/bedwars/support/version/v1_18_R2/v1_18_R2.java b/versionsupport_v1_18_R2/src/main/java/com/andrei1058/bedwars/support/version/v1_18_R2/v1_18_R2.java
index c8539da7d..44e1e1512 100644
--- a/versionsupport_v1_18_R2/src/main/java/com/andrei1058/bedwars/support/version/v1_18_R2/v1_18_R2.java
+++ b/versionsupport_v1_18_R2/src/main/java/com/andrei1058/bedwars/support/version/v1_18_R2/v1_18_R2.java
@@ -543,9 +543,10 @@ public org.bukkit.inventory.ItemStack setShopUpgradeIdentifier(org.bukkit.invent
         NBTTagCompound tag = i.t();
         if (tag == null) {
             tag = new NBTTagCompound();
-            i.c(tag);
         }
-        tag.a("tierIdentifier", identifier);
+
+        tag.a(VersionSupport.PLUGIN_TAG_TIER_KEY, identifier);
+        i.c(tag);
         return CraftItemStack.asBukkitCopy(i);
     }