diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/UpgradeEquipmentData.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/EquipmentUpgradeData.xml
similarity index 99%
rename from L2J_Mobius_6.0_Fafurion/dist/game/data/UpgradeEquipmentData.xml
rename to L2J_Mobius_6.0_Fafurion/dist/game/data/EquipmentUpgradeData.xml
index a6cdb34cc7..8cdd434915 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/UpgradeEquipmentData.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/EquipmentUpgradeData.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/UpgradeEquipmentData.xsd">
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/EquipmentUpgradeData.xsd">
 	<upgrade id="1433" item="48202,5" materials="48212,1" adena="100000" result="48203,0" />
 	<upgrade id="1434" item="48203,5" materials="48213,1" adena="100000" result="48204,0" />
 	<upgrade id="1435" item="48205,5" materials="48212,1" adena="100000" result="48206,0" />
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/xsd/UpgradeEquipmentData.xsd b/L2J_Mobius_6.0_Fafurion/dist/game/data/xsd/EquipmentUpgradeData.xsd
similarity index 100%
rename from L2J_Mobius_6.0_Fafurion/dist/game/data/xsd/UpgradeEquipmentData.xsd
rename to L2J_Mobius_6.0_Fafurion/dist/game/data/xsd/EquipmentUpgradeData.xsd
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/GameServer.java
index 98811b5278..bf5b5c9f52 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/GameServer.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/GameServer.java
@@ -64,6 +64,7 @@ import org.l2jmobius.gameserver.data.xml.impl.EnchantItemHPBonusData;
 import org.l2jmobius.gameserver.data.xml.impl.EnchantItemOptionsData;
 import org.l2jmobius.gameserver.data.xml.impl.EnchantSkillGroupsData;
 import org.l2jmobius.gameserver.data.xml.impl.EnsoulData;
+import org.l2jmobius.gameserver.data.xml.impl.EquipmentUpgradeData;
 import org.l2jmobius.gameserver.data.xml.impl.EventEngineData;
 import org.l2jmobius.gameserver.data.xml.impl.ExperienceData;
 import org.l2jmobius.gameserver.data.xml.impl.ExtendDropData;
@@ -98,7 +99,6 @@ import org.l2jmobius.gameserver.data.xml.impl.SpawnsData;
 import org.l2jmobius.gameserver.data.xml.impl.StaticObjectData;
 import org.l2jmobius.gameserver.data.xml.impl.TeleportersData;
 import org.l2jmobius.gameserver.data.xml.impl.TransformData;
-import org.l2jmobius.gameserver.data.xml.impl.UpgradeEquipmentData;
 import org.l2jmobius.gameserver.data.xml.impl.VariationData;
 import org.l2jmobius.gameserver.datatables.BotReportTable;
 import org.l2jmobius.gameserver.datatables.EventDroplist;
@@ -263,7 +263,7 @@ public class GameServer
 		EnchantItemHPBonusData.getInstance();
 		BuyListData.getInstance();
 		MultisellData.getInstance();
-		UpgradeEquipmentData.getInstance();
+		EquipmentUpgradeData.getInstance();
 		RecipeData.getInstance();
 		ArmorSetsData.getInstance();
 		FishingData.getInstance();
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/UpgradeEquipmentData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/EquipmentUpgradeData.java
similarity index 81%
rename from L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/UpgradeEquipmentData.java
rename to L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/EquipmentUpgradeData.java
index 1b043c1075..77a26665bd 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/UpgradeEquipmentData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/EquipmentUpgradeData.java
@@ -28,18 +28,18 @@ import org.w3c.dom.Document;
 import org.l2jmobius.commons.util.IXmlReader;
 import org.l2jmobius.gameserver.datatables.ItemTable;
 import org.l2jmobius.gameserver.model.StatsSet;
+import org.l2jmobius.gameserver.model.holders.EquipmentUpgradeHolder;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
-import org.l2jmobius.gameserver.model.holders.UpgradeEquipmentHolder;
 
 /**
  * @author Mobius
  */
-public class UpgradeEquipmentData implements IXmlReader
+public class EquipmentUpgradeData implements IXmlReader
 {
-	private static Logger LOGGER = Logger.getLogger(UpgradeEquipmentData.class.getName());
-	private static final Map<Integer, UpgradeEquipmentHolder> _upgrades = new HashMap<>();
+	private static Logger LOGGER = Logger.getLogger(EquipmentUpgradeData.class.getName());
+	private static final Map<Integer, EquipmentUpgradeHolder> _upgrades = new HashMap<>();
 	
-	protected UpgradeEquipmentData()
+	protected EquipmentUpgradeData()
 	{
 		load();
 	}
@@ -48,7 +48,7 @@ public class UpgradeEquipmentData implements IXmlReader
 	public void load()
 	{
 		_upgrades.clear();
-		parseDatapackFile("data/UpgradeEquipmentData.xml");
+		parseDatapackFile("data/EquipmentUpgradeData.xml");
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _upgrades.size() + " upgrade equipment data.");
 	}
 	
@@ -90,23 +90,23 @@ public class UpgradeEquipmentData implements IXmlReader
 			}
 			else
 			{
-				_upgrades.put(id, new UpgradeEquipmentHolder(id, requiredItemId, requiredItemEnchant, materialList, adena, resultItemId, resultItemEnchant));
+				_upgrades.put(id, new EquipmentUpgradeHolder(id, requiredItemId, requiredItemEnchant, materialList, adena, resultItemId, resultItemEnchant));
 			}
 		}));
 	}
 	
-	public UpgradeEquipmentHolder getUpgrade(int id)
+	public EquipmentUpgradeHolder getUpgrade(int id)
 	{
 		return _upgrades.get(id);
 	}
 	
-	public static UpgradeEquipmentData getInstance()
+	public static EquipmentUpgradeData getInstance()
 	{
 		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final UpgradeEquipmentData INSTANCE = new UpgradeEquipmentData();
+		protected static final EquipmentUpgradeData INSTANCE = new EquipmentUpgradeData();
 	}
 }
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/UpgradeEquipmentHolder.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/EquipmentUpgradeHolder.java
similarity index 91%
rename from L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/UpgradeEquipmentHolder.java
rename to L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/EquipmentUpgradeHolder.java
index 85dd2b465c..81f706730a 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/UpgradeEquipmentHolder.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/EquipmentUpgradeHolder.java
@@ -21,7 +21,7 @@ import java.util.List;
 /**
  * @author Mobius
  */
-public class UpgradeEquipmentHolder
+public class EquipmentUpgradeHolder
 {
 	private final int _id;
 	private final int _requiredItemId;
@@ -31,7 +31,7 @@ public class UpgradeEquipmentHolder
 	private final int _resultItemId;
 	private final int _resultItemEnchant;
 	
-	public UpgradeEquipmentHolder(int id, int requiredItemId, int requiredItemEnchant, List<ItemHolder> materials, long adena, int resultItemId, int resultItemEnchant)
+	public EquipmentUpgradeHolder(int id, int requiredItemId, int requiredItemEnchant, List<ItemHolder> materials, long adena, int resultItemId, int resultItemEnchant)
 	{
 		_id = id;
 		_requiredItemId = requiredItemId;
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java
index 7c2a4dbe4f..8e3bbd164a 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java
@@ -17,10 +17,10 @@
 package org.l2jmobius.gameserver.network.clientpackets.equipmentupgrade;
 
 import org.l2jmobius.commons.network.PacketReader;
-import org.l2jmobius.gameserver.data.xml.impl.UpgradeEquipmentData;
+import org.l2jmobius.gameserver.data.xml.impl.EquipmentUpgradeData;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.holders.EquipmentUpgradeHolder;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
-import org.l2jmobius.gameserver.model.holders.UpgradeEquipmentHolder;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
@@ -58,7 +58,7 @@ public class RequestUpgradeSystemResult implements IClientIncomingPacket
 			return;
 		}
 		
-		final UpgradeEquipmentHolder upgradeHolder = UpgradeEquipmentData.getInstance().getUpgrade(_upgradeId);
+		final EquipmentUpgradeHolder upgradeHolder = EquipmentUpgradeData.getInstance().getUpgrade(_upgradeId);
 		if (upgradeHolder == null)
 		{
 			player.sendPacket(new ExUpgradeSystemResult(0, 0));
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/UpgradeEquipmentData.xml b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/EquipmentUpgradeData.xml
similarity index 97%
rename from L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/UpgradeEquipmentData.xml
rename to L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/EquipmentUpgradeData.xml
index 60dfbf7b7b..63825c4aa3 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/UpgradeEquipmentData.xml
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/EquipmentUpgradeData.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/UpgradeEquipmentData.xsd">
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/EquipmentUpgradeData.xsd">
 	<upgrade id="1" item="91244,5" materials="1459,200" adena="2000000" result="91245,0" />
 	<upgrade id="2" item="91245,5" materials="1460,1500" adena="10000000" result="91246,0" />
 	<upgrade id="3" item="91246,5" materials="1460,5000" adena="50000000" result="91247,0" />
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/xsd/UpgradeEquipmentData.xsd b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/xsd/EquipmentUpgradeData.xsd
similarity index 100%
rename from L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/xsd/UpgradeEquipmentData.xsd
rename to L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/xsd/EquipmentUpgradeData.xsd
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/GameServer.java
index 9d01b182ec..cdfaac09a2 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/GameServer.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/GameServer.java
@@ -61,6 +61,7 @@ import org.l2jmobius.gameserver.data.xml.impl.EnchantItemHPBonusData;
 import org.l2jmobius.gameserver.data.xml.impl.EnchantItemOptionsData;
 import org.l2jmobius.gameserver.data.xml.impl.EnchantSkillGroupsData;
 import org.l2jmobius.gameserver.data.xml.impl.EnsoulData;
+import org.l2jmobius.gameserver.data.xml.impl.EquipmentUpgradeData;
 import org.l2jmobius.gameserver.data.xml.impl.EventEngineData;
 import org.l2jmobius.gameserver.data.xml.impl.ExperienceData;
 import org.l2jmobius.gameserver.data.xml.impl.ExtendDropData;
@@ -94,7 +95,6 @@ import org.l2jmobius.gameserver.data.xml.impl.SpawnsData;
 import org.l2jmobius.gameserver.data.xml.impl.StaticObjectData;
 import org.l2jmobius.gameserver.data.xml.impl.TeleportersData;
 import org.l2jmobius.gameserver.data.xml.impl.TransformData;
-import org.l2jmobius.gameserver.data.xml.impl.UpgradeEquipmentData;
 import org.l2jmobius.gameserver.data.xml.impl.VariationData;
 import org.l2jmobius.gameserver.datatables.BotReportTable;
 import org.l2jmobius.gameserver.datatables.EventDroplist;
@@ -258,7 +258,7 @@ public class GameServer
 		EnchantItemHPBonusData.getInstance();
 		BuyListData.getInstance();
 		MultisellData.getInstance();
-		UpgradeEquipmentData.getInstance();
+		EquipmentUpgradeData.getInstance();
 		RecipeData.getInstance();
 		ArmorSetsData.getInstance();
 		FishingData.getInstance();
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/UpgradeEquipmentData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/EquipmentUpgradeData.java
similarity index 81%
rename from L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/UpgradeEquipmentData.java
rename to L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/EquipmentUpgradeData.java
index 1b043c1075..77a26665bd 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/UpgradeEquipmentData.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/EquipmentUpgradeData.java
@@ -28,18 +28,18 @@ import org.w3c.dom.Document;
 import org.l2jmobius.commons.util.IXmlReader;
 import org.l2jmobius.gameserver.datatables.ItemTable;
 import org.l2jmobius.gameserver.model.StatsSet;
+import org.l2jmobius.gameserver.model.holders.EquipmentUpgradeHolder;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
-import org.l2jmobius.gameserver.model.holders.UpgradeEquipmentHolder;
 
 /**
  * @author Mobius
  */
-public class UpgradeEquipmentData implements IXmlReader
+public class EquipmentUpgradeData implements IXmlReader
 {
-	private static Logger LOGGER = Logger.getLogger(UpgradeEquipmentData.class.getName());
-	private static final Map<Integer, UpgradeEquipmentHolder> _upgrades = new HashMap<>();
+	private static Logger LOGGER = Logger.getLogger(EquipmentUpgradeData.class.getName());
+	private static final Map<Integer, EquipmentUpgradeHolder> _upgrades = new HashMap<>();
 	
-	protected UpgradeEquipmentData()
+	protected EquipmentUpgradeData()
 	{
 		load();
 	}
@@ -48,7 +48,7 @@ public class UpgradeEquipmentData implements IXmlReader
 	public void load()
 	{
 		_upgrades.clear();
-		parseDatapackFile("data/UpgradeEquipmentData.xml");
+		parseDatapackFile("data/EquipmentUpgradeData.xml");
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _upgrades.size() + " upgrade equipment data.");
 	}
 	
@@ -90,23 +90,23 @@ public class UpgradeEquipmentData implements IXmlReader
 			}
 			else
 			{
-				_upgrades.put(id, new UpgradeEquipmentHolder(id, requiredItemId, requiredItemEnchant, materialList, adena, resultItemId, resultItemEnchant));
+				_upgrades.put(id, new EquipmentUpgradeHolder(id, requiredItemId, requiredItemEnchant, materialList, adena, resultItemId, resultItemEnchant));
 			}
 		}));
 	}
 	
-	public UpgradeEquipmentHolder getUpgrade(int id)
+	public EquipmentUpgradeHolder getUpgrade(int id)
 	{
 		return _upgrades.get(id);
 	}
 	
-	public static UpgradeEquipmentData getInstance()
+	public static EquipmentUpgradeData getInstance()
 	{
 		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final UpgradeEquipmentData INSTANCE = new UpgradeEquipmentData();
+		protected static final EquipmentUpgradeData INSTANCE = new EquipmentUpgradeData();
 	}
 }
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/UpgradeEquipmentHolder.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/EquipmentUpgradeHolder.java
similarity index 91%
rename from L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/UpgradeEquipmentHolder.java
rename to L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/EquipmentUpgradeHolder.java
index 85dd2b465c..81f706730a 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/UpgradeEquipmentHolder.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/EquipmentUpgradeHolder.java
@@ -21,7 +21,7 @@ import java.util.List;
 /**
  * @author Mobius
  */
-public class UpgradeEquipmentHolder
+public class EquipmentUpgradeHolder
 {
 	private final int _id;
 	private final int _requiredItemId;
@@ -31,7 +31,7 @@ public class UpgradeEquipmentHolder
 	private final int _resultItemId;
 	private final int _resultItemEnchant;
 	
-	public UpgradeEquipmentHolder(int id, int requiredItemId, int requiredItemEnchant, List<ItemHolder> materials, long adena, int resultItemId, int resultItemEnchant)
+	public EquipmentUpgradeHolder(int id, int requiredItemId, int requiredItemEnchant, List<ItemHolder> materials, long adena, int resultItemId, int resultItemEnchant)
 	{
 		_id = id;
 		_requiredItemId = requiredItemId;
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java
index 7c2a4dbe4f..8e3bbd164a 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java
@@ -17,10 +17,10 @@
 package org.l2jmobius.gameserver.network.clientpackets.equipmentupgrade;
 
 import org.l2jmobius.commons.network.PacketReader;
-import org.l2jmobius.gameserver.data.xml.impl.UpgradeEquipmentData;
+import org.l2jmobius.gameserver.data.xml.impl.EquipmentUpgradeData;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.holders.EquipmentUpgradeHolder;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
-import org.l2jmobius.gameserver.model.holders.UpgradeEquipmentHolder;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
@@ -58,7 +58,7 @@ public class RequestUpgradeSystemResult implements IClientIncomingPacket
 			return;
 		}
 		
-		final UpgradeEquipmentHolder upgradeHolder = UpgradeEquipmentData.getInstance().getUpgrade(_upgradeId);
+		final EquipmentUpgradeHolder upgradeHolder = EquipmentUpgradeData.getInstance().getUpgrade(_upgradeId);
 		if (upgradeHolder == null)
 		{
 			player.sendPacket(new ExUpgradeSystemResult(0, 0));