Use upper case for all instance storing variables.

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ItemsAutoDestroy.java

@@ -37,7 +37,7 @@ public final class ItemsAutoDestroy
 	
 	public static ItemsAutoDestroy getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	public synchronized void addItem(ItemInstance item)
@@ -93,6 +93,6 @@ public final class ItemsAutoDestroy
 	
 	private static class SingletonHolder
 	{
-		protected static final ItemsAutoDestroy _instance = new ItemsAutoDestroy();
+		protected static final ItemsAutoDestroy INSTANCE = new ItemsAutoDestroy();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/LoginServerThread.java

@@ -144,7 +144,7 @@ public class LoginServerThread extends Thread
 	 */
 	public static LoginServerThread getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	@Override
@@ -836,6 +836,6 @@ public class LoginServerThread extends Thread
 	
 	private static class SingletonHolder
 	{
-		protected static final LoginServerThread _instance = new LoginServerThread();
+		protected static final LoginServerThread INSTANCE = new LoginServerThread();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/MonsterRace.java

@@ -132,11 +132,11 @@ public class MonsterRace
 	
 	public static MonsterRace getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final MonsterRace _instance = new MonsterRace();
+		protected static final MonsterRace INSTANCE = new MonsterRace();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/RecipeController.java

@@ -754,11 +754,11 @@ public class RecipeController
 	
 	public static RecipeController getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final RecipeController _instance = new RecipeController();
+		protected static final RecipeController INSTANCE = new RecipeController();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/SevenSigns.java

@@ -406,7 +406,7 @@ public class SevenSigns
 	
 	public static SevenSigns getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	public static long calcContributionScore(long blueCount, long greenCount, long redCount)
@@ -1745,6 +1745,6 @@ public class SevenSigns
 	
 	private static class SingletonHolder
 	{
-		protected static final SevenSigns _instance = new SevenSigns();
+		protected static final SevenSigns INSTANCE = new SevenSigns();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/SevenSignsFestival.java

@@ -802,7 +802,7 @@ public class SevenSignsFestival implements SpawnListener
 	
 	public static SevenSignsFestival getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	/**
@@ -2448,6 +2448,6 @@ public class SevenSignsFestival implements SpawnListener
 	
 	private static class SingletonHolder
 	{
-		protected static final SevenSignsFestival _instance = new SevenSignsFestival();
+		protected static final SevenSignsFestival INSTANCE = new SevenSignsFestival();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/Shutdown.java

@@ -620,11 +620,11 @@ public class Shutdown extends Thread
 	 */
 	public static Shutdown getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final Shutdown _instance = new Shutdown();
+		protected static final Shutdown INSTANCE = new Shutdown();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java

@@ -69,11 +69,11 @@ public class WarehouseCacheManager
 	
 	public static WarehouseCacheManager getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final WarehouseCacheManager _instance = new WarehouseCacheManager();
+		protected static final WarehouseCacheManager INSTANCE = new WarehouseCacheManager();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/communitybbs/Manager/ForumsBBSManager.java

@@ -158,11 +158,11 @@ public class ForumsBBSManager extends BaseBBSManager
 	 */
 	public static ForumsBBSManager getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final ForumsBBSManager _instance = new ForumsBBSManager();
+		protected static final ForumsBBSManager INSTANCE = new ForumsBBSManager();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/communitybbs/Manager/PostBBSManager.java

@@ -178,11 +178,11 @@ public class PostBBSManager extends BaseBBSManager
 	
 	public static PostBBSManager getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final PostBBSManager _instance = new PostBBSManager();
+		protected static final PostBBSManager INSTANCE = new PostBBSManager();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/communitybbs/Manager/TopicBBSManager.java

@@ -296,11 +296,11 @@ public class TopicBBSManager extends BaseBBSManager
 	
 	public static TopicBBSManager getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final TopicBBSManager _instance = new TopicBBSManager();
+		protected static final TopicBBSManager INSTANCE = new TopicBBSManager();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java

@@ -162,11 +162,11 @@ public final class AnnouncementsTable
 	 */
 	public static AnnouncementsTable getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final AnnouncementsTable _instance = new AnnouncementsTable();
+		protected static final AnnouncementsTable INSTANCE = new AnnouncementsTable();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/sql/impl/CharNameTable.java

@@ -238,11 +238,11 @@ public class CharNameTable
 	
 	public static CharNameTable getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final CharNameTable _instance = new CharNameTable();
+		protected static final CharNameTable INSTANCE = new CharNameTable();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/sql/impl/CharSummonTable.java

@@ -241,11 +241,11 @@ public class CharSummonTable
 	
 	public static CharSummonTable getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final CharSummonTable _instance = new CharSummonTable();
+		protected static final CharSummonTable INSTANCE = new CharSummonTable();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/sql/impl/ClanTable.java

@@ -533,11 +533,11 @@ public class ClanTable
 	
 	public static ClanTable getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final ClanTable _instance = new ClanTable();
+		protected static final ClanTable INSTANCE = new ClanTable();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/sql/impl/CrestTable.java

@@ -209,11 +209,11 @@ public final class CrestTable
 	
 	public static CrestTable getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final CrestTable _instance = new CrestTable();
+		protected static final CrestTable INSTANCE = new CrestTable();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/sql/impl/PetNameTable.java

@@ -36,7 +36,7 @@ public class PetNameTable
 	
 	public static PetNameTable getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	public boolean doesPetNameExist(String name, int petNpcId)
@@ -110,6 +110,6 @@ public class PetNameTable
 	
 	private static class SingletonHolder
 	{
-		protected static final PetNameTable _instance = new PetNameTable();
+		protected static final PetNameTable INSTANCE = new PetNameTable();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/sql/impl/SummonEffectsTable.java

@@ -175,11 +175,11 @@ public class SummonEffectsTable
 	
 	public static SummonEffectsTable getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final SummonEffectsTable _instance = new SummonEffectsTable();
+		protected static final SummonEffectsTable INSTANCE = new SummonEffectsTable();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/sql/impl/TeleportLocationTable.java

@@ -115,11 +115,11 @@ public class TeleportLocationTable
 	
 	public static TeleportLocationTable getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final TeleportLocationTable _instance = new TeleportLocationTable();
+		protected static final TeleportLocationTable INSTANCE = new TeleportLocationTable();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java

@@ -342,11 +342,11 @@ public final class AdminData implements IXmlReader
 	 */
 	public static AdminData getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final AdminData _instance = new AdminData();
+		protected static final AdminData INSTANCE = new AdminData();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java

@@ -184,11 +184,11 @@ public final class ArmorSetsData implements IXmlReader
 	 */
 	public static ArmorSetsData getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final ArmorSetsData _instance = new ArmorSetsData();
+		protected static final ArmorSetsData INSTANCE = new ArmorSetsData();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/BuyListData.java

@@ -192,11 +192,11 @@ public final class BuyListData implements IXmlReader
 	
 	public static BuyListData getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final BuyListData _instance = new BuyListData();
+		protected static final BuyListData INSTANCE = new BuyListData();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/CategoryData.java

@@ -116,11 +116,11 @@ public final class CategoryData implements IXmlReader
 	
 	public static CategoryData getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final CategoryData _instance = new CategoryData();
+		protected static final CategoryData INSTANCE = new CategoryData();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/ClassListData.java

@@ -112,11 +112,11 @@ public final class ClassListData implements IXmlReader
 	 */
 	public static ClassListData getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final ClassListData _instance = new ClassListData();
+		protected static final ClassListData INSTANCE = new ClassListData();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java

@@ -250,11 +250,11 @@ public class DoorData implements IXmlReader
 	
 	public static DoorData getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final DoorData _instance = new DoorData();
+		protected static final DoorData INSTANCE = new DoorData();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java

@@ -155,11 +155,11 @@ public class EnchantItemData implements IXmlReader
 	 */
 	public static EnchantItemData getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final EnchantItemData _instance = new EnchantItemData();
+		protected static final EnchantItemData INSTANCE = new EnchantItemData();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemGroupsData.java

@@ -157,11 +157,11 @@ public final class EnchantItemGroupsData implements IXmlReader
 	
 	public static EnchantItemGroupsData getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final EnchantItemGroupsData _instance = new EnchantItemGroupsData();
+		protected static final EnchantItemGroupsData INSTANCE = new EnchantItemGroupsData();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java

@@ -148,11 +148,11 @@ public class EnchantItemHPBonusData implements IXmlReader
 	 */
 	public static EnchantItemHPBonusData getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final EnchantItemHPBonusData _instance = new EnchantItemHPBonusData();
+		protected static final EnchantItemHPBonusData INSTANCE = new EnchantItemHPBonusData();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java

@@ -114,11 +114,11 @@ public class EnchantItemOptionsData implements IXmlReader
 	 */
 	public static EnchantItemOptionsData getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final EnchantItemOptionsData _instance = new EnchantItemOptionsData();
+		protected static final EnchantItemOptionsData INSTANCE = new EnchantItemOptionsData();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java

@@ -236,11 +236,11 @@ public class EnchantSkillGroupsData implements IXmlReader
 	 */
 	public static EnchantSkillGroupsData getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final EnchantSkillGroupsData _instance = new EnchantSkillGroupsData();
+		protected static final EnchantSkillGroupsData INSTANCE = new EnchantSkillGroupsData();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java

@@ -107,11 +107,11 @@ public final class ExperienceData implements IXmlReader
 	 */
 	public static ExperienceData getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final ExperienceData _instance = new ExperienceData();
+		protected static final ExperienceData INSTANCE = new ExperienceData();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java

@@ -115,11 +115,11 @@ public class FakePlayerData implements IXmlReader
 	
 	public static FakePlayerData getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final FakePlayerData _instance = new FakePlayerData();
+		protected static final FakePlayerData INSTANCE = new FakePlayerData();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/FishData.java

@@ -159,11 +159,11 @@ public final class FishData implements IXmlReader
 	 */
 	public static FishData getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final FishData _instance = new FishData();
+		protected static final FishData INSTANCE = new FishData();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/FishingMonstersData.java

@@ -111,11 +111,11 @@ public final class FishingMonstersData implements IXmlReader
 	 */
 	public static FishingMonstersData getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final FishingMonstersData _instance = new FishingMonstersData();
+		protected static final FishingMonstersData INSTANCE = new FishingMonstersData();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/FishingRodsData.java

@@ -94,11 +94,11 @@ public final class FishingRodsData implements IXmlReader
 	 */
 	public static FishingRodsData getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final FishingRodsData _instance = new FishingRodsData();
+		protected static final FishingRodsData INSTANCE = new FishingRodsData();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java

@@ -168,11 +168,11 @@ public final class HennaData implements IXmlReader
 	 */
 	public static HennaData getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final HennaData _instance = new HennaData();
+		protected static final HennaData INSTANCE = new HennaData();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java

@@ -153,11 +153,11 @@ public final class HitConditionBonusData implements IXmlReader
 	 */
 	public static HitConditionBonusData getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final HitConditionBonusData _instance = new HitConditionBonusData();
+		protected static final HitConditionBonusData INSTANCE = new HitConditionBonusData();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java

@@ -128,11 +128,11 @@ public final class InitialEquipmentData implements IXmlReader
 	 */
 	public static InitialEquipmentData getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final InitialEquipmentData _instance = new InitialEquipmentData();
+		protected static final InitialEquipmentData INSTANCE = new InitialEquipmentData();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/InitialShortcutData.java

@@ -357,11 +357,11 @@ public final class InitialShortcutData implements IXmlReader
 	 */
 	public static InitialShortcutData getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final InitialShortcutData _instance = new InitialShortcutData();
+		protected static final InitialShortcutData INSTANCE = new InitialShortcutData();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/KarmaData.java

@@ -81,11 +81,11 @@ public class KarmaData implements IXmlReader
 	 */
 	public static KarmaData getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final KarmaData _instance = new KarmaData();
+		protected static final KarmaData INSTANCE = new KarmaData();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java

@@ -402,11 +402,11 @@ public final class MultisellData implements IXmlReader
 	
 	public static MultisellData getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final MultisellData _instance = new MultisellData();
+		protected static final MultisellData INSTANCE = new MultisellData();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java

@@ -799,11 +799,11 @@ public class NpcData implements IXmlReader
 	 */
 	public static NpcData getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final NpcData _instance = new NpcData();
+		protected static final NpcData INSTANCE = new NpcData();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java

@@ -151,11 +151,11 @@ public class OptionData implements IXmlReader
 	 */
 	public static OptionData getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final OptionData _instance = new OptionData();
+		protected static final OptionData INSTANCE = new OptionData();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java

@@ -226,11 +226,11 @@ public final class PetDataTable implements IXmlReader
 	 */
 	public static PetDataTable getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final PetDataTable _instance = new PetDataTable();
+		protected static final PetDataTable INSTANCE = new PetDataTable();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/PetSkillData.java

@@ -163,11 +163,11 @@ public class PetSkillData implements IXmlReader
 	
 	public static PetSkillData getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final PetSkillData _instance = new PetSkillData();
+		protected static final PetSkillData INSTANCE = new PetSkillData();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java

@@ -181,11 +181,11 @@ public final class PlayerTemplateData implements IXmlReader
 	
 	public static PlayerTemplateData getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final PlayerTemplateData _instance = new PlayerTemplateData();
+		protected static final PlayerTemplateData INSTANCE = new PlayerTemplateData();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/PlayerXpPercentLostData.java

@@ -81,11 +81,11 @@ public final class PlayerXpPercentLostData implements IXmlReader
 	 */
 	public static PlayerXpPercentLostData getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final PlayerXpPercentLostData _instance = new PlayerXpPercentLostData();
+		protected static final PlayerXpPercentLostData INSTANCE = new PlayerXpPercentLostData();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java

@@ -100,11 +100,11 @@ public class PrimeShopData implements IXmlReader
 	
 	public static PrimeShopData getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final PrimeShopData _instance = new PrimeShopData();
+		protected static final PrimeShopData INSTANCE = new PrimeShopData();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java

@@ -267,7 +267,7 @@ public class RecipeData implements IXmlReader
 	 */
 	public static RecipeData getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	/**
@@ -275,6 +275,6 @@ public class RecipeData implements IXmlReader
 	 */
 	private static class SingletonHolder
 	{
-		protected static final RecipeData _instance = new RecipeData();
+		protected static final RecipeData INSTANCE = new RecipeData();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/SecondaryAuthData.java

@@ -130,11 +130,11 @@ public class SecondaryAuthData implements IXmlReader
 	
 	public static SecondaryAuthData getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final SecondaryAuthData _instance = new SecondaryAuthData();
+		protected static final SecondaryAuthData INSTANCE = new SecondaryAuthData();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java

@@ -114,12 +114,12 @@ public class SiegeScheduleData implements IXmlReader
 	
 	public static SiegeScheduleData getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final SiegeScheduleData _instance = new SiegeScheduleData();
+		protected static final SiegeScheduleData INSTANCE = new SiegeScheduleData();
 	}
 	
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java

@@ -162,11 +162,11 @@ public final class SkillData
 	
 	public static SkillData getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final SkillData _instance = new SkillData();
+		protected static final SkillData INSTANCE = new SkillData();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/SkillLearnData.java

@@ -89,11 +89,11 @@ public final class SkillLearnData implements IXmlReader
 	 */
 	public static SkillLearnData getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final SkillLearnData _instance = new SkillLearnData();
+		protected static final SkillLearnData INSTANCE = new SkillLearnData();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java

@@ -1355,7 +1355,7 @@ public final class SkillTreesData implements IXmlReader
 	 */
 	public static SkillTreesData getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	/**
@@ -1363,6 +1363,6 @@ public final class SkillTreesData implements IXmlReader
 	 */
 	private static class SingletonHolder
 	{
-		protected static final SkillTreesData _instance = new SkillTreesData();
+		protected static final SkillTreesData INSTANCE = new SkillTreesData();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java

@@ -108,11 +108,11 @@ public final class StaticObjectData implements IXmlReader
 	 */
 	public static StaticObjectData getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final StaticObjectData _instance = new StaticObjectData();
+		protected static final StaticObjectData INSTANCE = new StaticObjectData();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java

@@ -234,11 +234,11 @@ public final class TransformData implements IXmlReader
 	
 	public static TransformData getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final TransformData _instance = new TransformData();
+		protected static final TransformData INSTANCE = new TransformData();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/UIData.java

@@ -184,11 +184,11 @@ public class UIData implements IXmlReader
 	
 	public static UIData getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final UIData _instance = new UIData();
+		protected static final UIData INSTANCE = new UIData();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/datatables/AugmentationData.java

@@ -1040,11 +1040,11 @@ public class AugmentationData
 	
 	public static AugmentationData getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final AugmentationData _instance = new AugmentationData();
+		protected static final AugmentationData INSTANCE = new AugmentationData();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/datatables/EventDroplist.java

@@ -118,11 +118,11 @@ public class EventDroplist
 	
 	public static EventDroplist getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final EventDroplist _instance = new EventDroplist();
+		protected static final EventDroplist INSTANCE = new EventDroplist();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/datatables/ItemTable.java

@@ -108,7 +108,7 @@ public class ItemTable
 	 */
 	public static ItemTable getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	protected ItemTable()
@@ -443,6 +443,6 @@ public class ItemTable
 	
 	private static class SingletonHolder
 	{
-		protected static final ItemTable _instance = new ItemTable();
+		protected static final ItemTable INSTANCE = new ItemTable();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/datatables/MerchantPriceConfigTable.java

@@ -47,7 +47,7 @@ public class MerchantPriceConfigTable implements InstanceListManager
 	
 	public static MerchantPriceConfigTable getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static final String MPCS_FILE = "MerchantPriceConfig.xml";
@@ -286,6 +286,6 @@ public class MerchantPriceConfigTable implements InstanceListManager
 	
 	private static class SingletonHolder
 	{
-		protected static final MerchantPriceConfigTable _instance = new MerchantPriceConfigTable();
+		protected static final MerchantPriceConfigTable INSTANCE = new MerchantPriceConfigTable();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/datatables/NpcPersonalAIData.java

@@ -125,11 +125,11 @@ public class NpcPersonalAIData
 	 */
 	public static NpcPersonalAIData getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final NpcPersonalAIData _instance = new NpcPersonalAIData();
+		protected static final NpcPersonalAIData INSTANCE = new NpcPersonalAIData();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/datatables/SpawnTable.java

@@ -605,11 +605,11 @@ public final class SpawnTable implements IXmlReader
 	
 	public static SpawnTable getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final SpawnTable _instance = new SpawnTable();
+		protected static final SpawnTable INSTANCE = new SpawnTable();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/engines/DocumentEngine.java

@@ -183,11 +183,11 @@ public class DocumentEngine
 	
 	private static class SingletonHolder
 	{
-		protected static final DocumentEngine _instance = new DocumentEngine();
+		protected static final DocumentEngine INSTANCE = new DocumentEngine();
 	}
 	
 	public static DocumentEngine getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java

@@ -929,11 +929,11 @@ public class GeoEngine
 	 */
 	public static GeoEngine getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final GeoEngine _instance = Config.PATHFINDING ? new GeoEnginePathfinding() : new GeoEngine();
+		protected static final GeoEngine INSTANCE = Config.PATHFINDING ? new GeoEnginePathfinding() : new GeoEngine();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/handler/ActionHandler.java

@@ -30,7 +30,7 @@ public class ActionHandler implements IHandler<IActionHandler, InstanceType>
 	
 	public static ActionHandler getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	protected ActionHandler()
@@ -73,6 +73,6 @@ public class ActionHandler implements IHandler<IActionHandler, InstanceType>
 	
 	private static class SingletonHolder
 	{
-		protected static final ActionHandler _instance = new ActionHandler();
+		protected static final ActionHandler INSTANCE = new ActionHandler();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/handler/ActionShiftHandler.java

@@ -68,11 +68,11 @@ public class ActionShiftHandler implements IHandler<IActionShiftHandler, Instanc
 	
 	public static ActionShiftHandler getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final ActionShiftHandler _instance = new ActionShiftHandler();
+		protected static final ActionShiftHandler INSTANCE = new ActionShiftHandler();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/handler/BypassHandler.java

@@ -67,11 +67,11 @@ public class BypassHandler implements IHandler<IBypassHandler, String>
 	
 	public static BypassHandler getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final BypassHandler _instance = new BypassHandler();
+		protected static final BypassHandler INSTANCE = new BypassHandler();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/handler/ChatHandler.java

@@ -81,11 +81,11 @@ public class ChatHandler implements IHandler<IChatHandler, ChatType>
 	
 	public static ChatHandler getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final ChatHandler _instance = new ChatHandler();
+		protected static final ChatHandler INSTANCE = new ChatHandler();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/handler/CommunityBoardHandler.java

@@ -223,11 +223,11 @@ public final class CommunityBoardHandler implements IHandler<IParseBoardHandler,
 	
 	public static CommunityBoardHandler getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final CommunityBoardHandler _instance = new CommunityBoardHandler();
+		protected static final CommunityBoardHandler INSTANCE = new CommunityBoardHandler();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/handler/EffectHandler.java

@@ -72,11 +72,11 @@ public final class EffectHandler implements IHandler<Class<? extends AbstractEff
 	
 	private static final class SingletonHolder
 	{
-		protected static final EffectHandler _instance = new EffectHandler();
+		protected static final EffectHandler INSTANCE = new EffectHandler();
 	}
 	
 	public static EffectHandler getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/handler/ItemHandler.java

@@ -87,11 +87,11 @@ public class ItemHandler implements IHandler<IItemHandler, EtcItem>
 	 */
 	public static ItemHandler getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final ItemHandler _instance = new ItemHandler();
+		protected static final ItemHandler INSTANCE = new ItemHandler();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/handler/PunishmentHandler.java

@@ -59,11 +59,11 @@ public class PunishmentHandler implements IHandler<IPunishmentHandler, Punishmen
 	
 	public static PunishmentHandler getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final PunishmentHandler _instance = new PunishmentHandler();
+		protected static final PunishmentHandler INSTANCE = new PunishmentHandler();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/handler/TargetHandler.java

@@ -59,11 +59,11 @@ public class TargetHandler implements IHandler<ITargetTypeHandler, Enum<TargetTy
 	
 	public static TargetHandler getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final TargetHandler _instance = new TargetHandler();
+		protected static final TargetHandler INSTANCE = new TargetHandler();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/handler/TelnetHandler.java

@@ -68,11 +68,11 @@ public class TelnetHandler implements IHandler<ITelnetHandler, String>
 	
 	public static TelnetHandler getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final TelnetHandler _instance = new TelnetHandler();
+		protected static final TelnetHandler INSTANCE = new TelnetHandler();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/handler/UserCommandHandler.java

@@ -63,11 +63,11 @@ public class UserCommandHandler implements IHandler<IUserCommandHandler, Integer
 	
 	public static UserCommandHandler getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final UserCommandHandler _instance = new UserCommandHandler();
+		protected static final UserCommandHandler INSTANCE = new UserCommandHandler();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/handler/VoicedCommandHandler.java

@@ -63,11 +63,11 @@ public class VoicedCommandHandler implements IHandler<IVoicedCommandHandler, Str
 	
 	public static VoicedCommandHandler getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final VoicedCommandHandler _instance = new VoicedCommandHandler();
+		protected static final VoicedCommandHandler INSTANCE = new VoicedCommandHandler();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java

@@ -283,11 +283,11 @@ public class AirShipManager
 	
 	public static AirShipManager getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final AirShipManager _instance = new AirShipManager();
+		protected static final AirShipManager INSTANCE = new AirShipManager();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java

@@ -286,11 +286,11 @@ public final class AntiFeedManager
 	
 	public static AntiFeedManager getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final AntiFeedManager _instance = new AntiFeedManager();
+		protected static final AntiFeedManager INSTANCE = new AntiFeedManager();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java

@@ -39,7 +39,7 @@ public class BoatManager
 	
 	public static BoatManager getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	protected BoatManager()
@@ -190,6 +190,6 @@ public class BoatManager
 	
 	private static class SingletonHolder
 	{
-		protected static final BoatManager _instance = new BoatManager();
+		protected static final BoatManager INSTANCE = new BoatManager();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CHSiegeManager.java

@@ -199,11 +199,11 @@ public final class CHSiegeManager
 	
 	public static CHSiegeManager getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static final class SingletonHolder
 	{
-		protected static final CHSiegeManager _instance = new CHSiegeManager();
+		protected static final CHSiegeManager INSTANCE = new CHSiegeManager();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java

@@ -349,11 +349,11 @@ public final class CastleManager implements InstanceListManager
 	
 	public static CastleManager getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final CastleManager _instance = new CastleManager();
+		protected static final CastleManager INSTANCE = new CastleManager();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java

@@ -805,11 +805,11 @@ public final class CastleManorManager implements IXmlReader, IStorable
 	// -------------------------------------------------------
 	public static CastleManorManager getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final CastleManorManager _instance = new CastleManorManager();
+		protected static final CastleManorManager INSTANCE = new CastleManorManager();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java

@@ -178,11 +178,11 @@ public final class ClanHallAuctionManager
 	
 	public static ClanHallAuctionManager getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final ClanHallAuctionManager _instance = new ClanHallAuctionManager();
+		protected static final ClanHallAuctionManager INSTANCE = new ClanHallAuctionManager();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/ClanHallManager.java

@@ -298,11 +298,11 @@ public final class ClanHallManager
 	
 	public static ClanHallManager getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final ClanHallManager _instance = new ClanHallManager();
+		protected static final ClanHallManager INSTANCE = new ClanHallManager();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CoupleManager.java

@@ -138,11 +138,11 @@ public final class CoupleManager
 	
 	public static CoupleManager getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final CoupleManager _instance = new CoupleManager();
+		protected static final CoupleManager INSTANCE = new CoupleManager();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java

@@ -416,11 +416,11 @@ public final class CursedWeaponsManager
 	
 	public static CursedWeaponsManager getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final CursedWeaponsManager _instance = new CursedWeaponsManager();
+		protected static final CursedWeaponsManager INSTANCE = new CursedWeaponsManager();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/DayNightSpawnManager.java

@@ -43,7 +43,7 @@ public final class DayNightSpawnManager
 	
 	public static DayNightSpawnManager getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	protected DayNightSpawnManager()
@@ -259,6 +259,6 @@ public final class DayNightSpawnManager
 	
 	private static class SingletonHolder
 	{
-		protected static final DayNightSpawnManager _instance = new DayNightSpawnManager();
+		protected static final DayNightSpawnManager INSTANCE = new DayNightSpawnManager();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java

@@ -58,7 +58,7 @@ public final class DimensionalRiftManager
 	
 	public static DimensionalRiftManager getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	protected DimensionalRiftManager()
@@ -482,6 +482,6 @@ public final class DimensionalRiftManager
 	
 	private static class SingletonHolder
 	{
-		protected static final DimensionalRiftManager _instance = new DimensionalRiftManager();
+		protected static final DimensionalRiftManager INSTANCE = new DimensionalRiftManager();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/DuelManager.java

@@ -208,11 +208,11 @@ public final class DuelManager
 	
 	public static DuelManager getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final DuelManager _instance = new DuelManager();
+		protected static final DuelManager INSTANCE = new DuelManager();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/FactionManager.java

@@ -105,11 +105,11 @@ public class FactionManager
 	
 	public static FactionManager getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final FactionManager _instance = new FactionManager();
+		protected static final FactionManager INSTANCE = new FactionManager();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java

@@ -186,11 +186,11 @@ public final class FakePlayerChatManager implements IXmlReader
 	
 	public static FakePlayerChatManager getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final FakePlayerChatManager _instance = new FakePlayerChatManager();
+		protected static final FakePlayerChatManager INSTANCE = new FakePlayerChatManager();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/FishingChampionshipManager.java

@@ -49,11 +49,11 @@ public class FishingChampionshipManager
 	private static final String DELETE = "DELETE FROM fishing_championship";
 	private static final String SELECT = "SELECT `player_name`, `fish_length`, `rewarded` FROM fishing_championship";
 	
-	private static final FishingChampionshipManager _instance = new FishingChampionshipManager();
+	private static final FishingChampionshipManager INSTANCE = new FishingChampionshipManager();
 	
 	public static FishingChampionshipManager getInstance()
 	{
-		return _instance;
+		return INSTANCE;
 	}
 	
 	protected long _enddate = 0;

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/FortManager.java

@@ -197,11 +197,11 @@ public final class FortManager implements InstanceListManager
 	
 	public static FortManager getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final FortManager _instance = new FortManager();
+		protected static final FortManager INSTANCE = new FortManager();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java

@@ -345,11 +345,11 @@ public final class FortSiegeManager
 	
 	public static FortSiegeManager getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final FortSiegeManager _instance = new FortSiegeManager();
+		protected static final FortSiegeManager INSTANCE = new FortSiegeManager();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java

@@ -1559,11 +1559,11 @@ public final class FourSepulchersManager
 	
 	public static FourSepulchersManager getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final FourSepulchersManager _instance = new FourSepulchersManager();
+		protected static final FourSepulchersManager INSTANCE = new FourSepulchersManager();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/GlobalVariablesManager.java

@@ -116,11 +116,11 @@ public final class GlobalVariablesManager extends AbstractVariables
 	 */
 	public static GlobalVariablesManager getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final GlobalVariablesManager _instance = new GlobalVariablesManager();
+		protected static final GlobalVariablesManager INSTANCE = new GlobalVariablesManager();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java

@@ -370,11 +370,11 @@ public final class GrandBossManager implements IStorable
 	 */
 	public static GrandBossManager getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final GrandBossManager _instance = new GrandBossManager();
+		protected static final GrandBossManager INSTANCE = new GrandBossManager();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/HandysBlockCheckerManager.java

@@ -373,11 +373,11 @@ public final class HandysBlockCheckerManager
 	 */
 	public static HandysBlockCheckerManager getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final HandysBlockCheckerManager _instance = new HandysBlockCheckerManager();
+		protected static final HandysBlockCheckerManager INSTANCE = new HandysBlockCheckerManager();
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java

@@ -401,11 +401,11 @@ public final class InstanceManager implements IXmlReader
 	 */
 	public static InstanceManager getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final InstanceManager _instance = new InstanceManager();
+		protected static final InstanceManager INSTANCE = new InstanceManager();
 	}
 }