Use upper case for all instance storing variables.

L2J_Mobius_5.0_Salvation/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_5.0_Salvation/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
@@ -837,6 +837,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_5.0_Salvation/java/org/l2jmobius/gameserver/MonsterRace.java

@@ -131,11 +131,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_5.0_Salvation/java/org/l2jmobius/gameserver/Shutdown.java

@@ -595,11 +595,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_5.0_Salvation/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_5.0_Salvation/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_5.0_Salvation/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_5.0_Salvation/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_5.0_Salvation/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_5.0_Salvation/java/org/l2jmobius/gameserver/data/sql/impl/CharNameTable.java

@@ -301,11 +301,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_5.0_Salvation/java/org/l2jmobius/gameserver/data/sql/impl/CharSummonTable.java

@@ -249,11 +249,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_5.0_Salvation/java/org/l2jmobius/gameserver/data/sql/impl/ClanTable.java

@@ -479,11 +479,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_5.0_Salvation/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_5.0_Salvation/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_5.0_Salvation/java/org/l2jmobius/gameserver/data/sql/impl/SummonEffectsTable.java

@@ -82,11 +82,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_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java

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

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java

@@ -344,11 +344,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_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/AlchemyData.java

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

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java

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

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java

@@ -175,11 +175,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_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java

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

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java

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

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/BuyListData.java

@@ -164,11 +164,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_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/CastleData.java

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

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/CategoryData.java

@@ -115,11 +115,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_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java

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

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/ClanMasteryData.java

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

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/ClanShopData.java

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

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/ClassListData.java

@@ -120,11 +120,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_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java

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

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java

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

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java

@@ -275,11 +275,11 @@ public final 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_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java

@@ -157,11 +157,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_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemGroupsData.java

@@ -159,11 +159,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_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java

@@ -111,11 +111,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_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java

@@ -120,11 +120,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_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java

@@ -132,11 +132,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_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/EnsoulData.java

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

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java

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

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java

@@ -142,11 +142,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_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java

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

L2J_Mobius_5.0_Salvation/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_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/FishingData.java

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

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java

@@ -185,11 +185,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_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java

@@ -163,11 +163,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_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java

@@ -131,11 +131,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_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/InitialShortcutData.java

@@ -360,11 +360,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_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/ItemCrystallizationData.java

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

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/KarmaData.java

@@ -89,11 +89,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_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java

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

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java

@@ -263,11 +263,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_5.0_Salvation/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_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java

@@ -121,11 +121,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_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java

@@ -238,11 +238,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_5.0_Salvation/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_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java

@@ -208,11 +208,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_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/PlayerXpPercentLostData.java

@@ -89,11 +89,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_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java

@@ -142,11 +142,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_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java

@@ -171,7 +171,7 @@ public class RecipeData implements IXmlReader
 	 */
 	public static RecipeData getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	/**
@@ -179,6 +179,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_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/SayuneData.java

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

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/SecondaryAuthData.java

@@ -132,11 +132,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_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java

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

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java

@@ -116,12 +116,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_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java

@@ -687,11 +687,11 @@ public class SkillData implements IXmlReader
 	
 	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_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java

@@ -1790,7 +1790,7 @@ public final class SkillTreesData implements IXmlReader
 	 */
 	public static SkillTreesData getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	/**
@@ -1798,6 +1798,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_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java

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

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java

@@ -111,11 +111,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_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java

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

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java

@@ -226,11 +226,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_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/VariationData.java

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

L2J_Mobius_5.0_Salvation/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_5.0_Salvation/java/org/l2jmobius/gameserver/datatables/ItemTable.java

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

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/datatables/SpawnTable.java

@@ -324,11 +324,11 @@ public final class SpawnTable
 	
 	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_5.0_Salvation/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java

@@ -65,11 +65,11 @@ public class DocumentBaseGeneral extends DocumentBase
 	
 	public static DocumentBaseGeneral getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final DocumentBaseGeneral _instance = new DocumentBaseGeneral(null);
+		protected static final DocumentBaseGeneral INSTANCE = new DocumentBaseGeneral(null);
 	}
 }

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/engines/DocumentEngine.java

@@ -108,11 +108,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_5.0_Salvation/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java

@@ -943,11 +943,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_5.0_Salvation/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_5.0_Salvation/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_5.0_Salvation/java/org/l2jmobius/gameserver/handler/AffectObjectHandler.java

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

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/handler/AffectScopeHandler.java

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

L2J_Mobius_5.0_Salvation/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_5.0_Salvation/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_5.0_Salvation/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_5.0_Salvation/java/org/l2jmobius/gameserver/handler/ConditionHandler.java

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

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/handler/DailyMissionHandler.java

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

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/handler/EffectHandler.java

@@ -60,11 +60,11 @@ public final class EffectHandler
 	
 	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_5.0_Salvation/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_5.0_Salvation/java/org/l2jmobius/gameserver/handler/PlayerActionHandler.java

@@ -56,11 +56,11 @@ public class PlayerActionHandler implements IHandler<IPlayerActionHandler, Strin
 	
 	public static PlayerActionHandler getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final PlayerActionHandler _instance = new PlayerActionHandler();
+		protected static final PlayerActionHandler INSTANCE = new PlayerActionHandler();
 	}
 }

L2J_Mobius_5.0_Salvation/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_5.0_Salvation/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java

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

L2J_Mobius_5.0_Salvation/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_5.0_Salvation/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_5.0_Salvation/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_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java

@@ -315,11 +315,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_5.0_Salvation/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_5.0_Salvation/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()
@@ -196,6 +196,6 @@ public class BoatManager
 	
 	private static class SingletonHolder
 	{
-		protected static final BoatManager _instance = new BoatManager();
+		protected static final BoatManager INSTANCE = new BoatManager();
 	}
 }

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java

@@ -266,11 +266,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_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java

@@ -809,11 +809,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_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java

@@ -448,11 +448,11 @@ public class CeremonyOfChaosManager extends AbstractEventManager<CeremonyOfChaos
 	
 	public static CeremonyOfChaosManager getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final CeremonyOfChaosManager _instance = new CeremonyOfChaosManager();
+		protected static final CeremonyOfChaosManager INSTANCE = new CeremonyOfChaosManager();
 	}
 }

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java

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