diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/CreatureAI.java
index 4fe4903e73..1bef53e763 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/CreatureAI.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/CreatureAI.java
@@ -498,7 +498,7 @@ public class CreatureAI extends AbstractAI
 			return;
 		}
 		
-		if ((object instanceof ItemInstance) && (((ItemInstance) object).getLocation() != ItemLocation.VOID))
+		if ((object instanceof ItemInstance) && (((ItemInstance) object).getItemLocation() != ItemLocation.VOID))
 		{
 			// Cancel action client side by sending Server->Client packet ActionFailed to the PlayerInstance actor
 			clientActionFailed();
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminCreateItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminCreateItem.java
index 66121c045b..0d421a7f30 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminCreateItem.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminCreateItem.java
@@ -292,7 +292,7 @@ public class AdminCreateItem implements IAdminCommandHandler
 	{
 		for (ItemInstance item : activeChar.getInventory().getItems())
 		{
-			if (item.getLocation() == ItemInstance.ItemLocation.INVENTORY)
+			if (item.getItemLocation() == ItemInstance.ItemLocation.INVENTORY)
 			{
 				activeChar.getInventory().destroyItem("Destroy", item.getObjectId(), item.getCount(), activeChar, null);
 			}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SummonItems.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SummonItems.java
index 241b6f2709..97b071e905 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SummonItems.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SummonItems.java
@@ -245,7 +245,7 @@ public class SummonItems implements IItemHandler
 				_player.sendPacket(new MagicSkillLaunched(_player, 2046, 1));
 				
 				// check for summon item validity
-				if ((_item == null) || (_item.getOwnerId() != _player.getObjectId()) || (_item.getLocation() != ItemInstance.ItemLocation.INVENTORY))
+				if ((_item == null) || (_item.getOwnerId() != _player.getObjectId()) || (_item.getItemLocation() != ItemInstance.ItemLocation.INVENTORY))
 				{
 					return;
 				}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/PlayerFreight.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/PlayerFreight.java
index 3757c84147..f39b1a4c1c 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/PlayerFreight.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/PlayerFreight.java
@@ -123,7 +123,7 @@ public class PlayerFreight extends ItemContainer
 		super.addItem(item);
 		if (_activeLocationId > 0)
 		{
-			item.setLocation(item.getLocation(), _activeLocationId);
+			item.setLocation(item.getItemLocation(), _activeLocationId);
 		}
 	}
 	
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ItemInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ItemInstance.java
index b34bf234ed..2f4bf04f90 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ItemInstance.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ItemInstance.java
@@ -214,10 +214,10 @@ public final class ItemInstance extends WorldObject
 	}
 	
 	/**
-	 * Gets the location.
-	 * @return the location
+	 * Gets the item location.
+	 * @return the item location
 	 */
-	public ItemLocation getLocation()
+	public ItemLocation getItemLocation()
 	{
 		return _loc;
 	}
@@ -1080,7 +1080,7 @@ public final class ItemInstance extends WorldObject
 				inst._mana = manaLeft;
 				
 				// consume 1 mana
-				if ((inst._mana > 0) && (inst.getLocation() == ItemLocation.PAPERDOLL))
+				if ((inst._mana > 0) && (inst.getItemLocation() == ItemLocation.PAPERDOLL))
 				{
 					inst.decreaseMana(false);
 				}
@@ -1096,7 +1096,7 @@ public final class ItemInstance extends WorldObject
 					
 					return null;
 				}
-				else if ((inst._mana > 0) && (inst.getLocation() == ItemLocation.PAPERDOLL))
+				else if ((inst._mana > 0) && (inst.getItemLocation() == ItemLocation.PAPERDOLL))
 				{
 					inst.scheduleConsumeManaTask();
 				}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
index 2486e2b589..0181bcc632 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
@@ -339,7 +339,7 @@ public class PetInstance extends Summon
 	{
 		for (ItemInstance item : _inventory.getItems())
 		{
-			if ((item.getLocation() == ItemInstance.ItemLocation.PET_EQUIP) && (item.getItem().getBodyPart() == Item.SLOT_R_HAND))
+			if ((item.getItemLocation() == ItemInstance.ItemLocation.PET_EQUIP) && (item.getItem().getBodyPart() == Item.SLOT_R_HAND))
 			{
 				return item;
 			}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
index 382b4cbcca..250b6202f5 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
@@ -630,7 +630,7 @@ public final class RequestEnchantItem extends GameClientPacket
 					return;
 				}
 				
-				if ((item.getLocation() != ItemInstance.ItemLocation.INVENTORY) && (item.getLocation() != ItemInstance.ItemLocation.PAPERDOLL))
+				if ((item.getItemLocation() != ItemInstance.ItemLocation.INVENTORY) && (item.getItemLocation() != ItemInstance.ItemLocation.PAPERDOLL))
 				{
 					player.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITION);
 					return;
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/thread/daemons/ItemsAutoDestroy.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/thread/daemons/ItemsAutoDestroy.java
index 1acf23b21d..b37dd6d3e6 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/thread/daemons/ItemsAutoDestroy.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/thread/daemons/ItemsAutoDestroy.java
@@ -72,7 +72,7 @@ public class ItemsAutoDestroy
 		
 		for (ItemInstance item : _items)
 		{
-			if ((item == null) || (item.getDropTime() == 0) || (item.getLocation() != ItemInstance.ItemLocation.VOID))
+			if ((item == null) || (item.getDropTime() == 0) || (item.getItemLocation() != ItemInstance.ItemLocation.VOID))
 			{
 				_items.remove(item);
 			}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/status/GameStatusThread.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/status/GameStatusThread.java
index d31c285655..27361c85c0 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/status/GameStatusThread.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/status/GameStatusThread.java
@@ -1046,7 +1046,7 @@ public class GameStatusThread extends Thread
 				}
 				if (obj instanceof ItemInstance)
 				{
-					if (((ItemInstance) obj).getLocation() == ItemInstance.ItemLocation.VOID)
+					if (((ItemInstance) obj).getItemLocation() == ItemInstance.ItemLocation.VOID)
 					{
 						itemVoidCount++;
 					}