diff --git a/L2J_DataPack_BETA/dist/game/data/skillTrees/documentation.txt b/L2J_DataPack_BETA/dist/game/data/skillTrees/documentation.txt
index 3bdb4382fc80ecdaccaa66211f1ea42007a2c221..010a95d9117f548d84d032abb4a809ad8f4b0b96 100644
--- a/L2J_DataPack_BETA/dist/game/data/skillTrees/documentation.txt
+++ b/L2J_DataPack_BETA/dist/game/data/skillTrees/documentation.txt
@@ -47,5 +47,5 @@ residenceSkill = Boolean to identify if a residential skill or not.
 skillId = Skill Id.
 skillLvl = Skill level.
 skillName = Skill name.
-socialClass = Rank Id (like vassal, baron, elder, and others).
+socialClass = Rank Id (like VASSAL, BARON, ELDER, and others).
 subClassConditions = condition for SubClass level and slot.
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/skillTrees/pledgeSkillTree.xml b/L2J_DataPack_BETA/dist/game/data/skillTrees/pledgeSkillTree.xml
index 04cdb798f88c0cadfbab850eee27411413cba09c..2dafc3a0d956c3be7307a1d020861281700e9a85 100644
--- a/L2J_DataPack_BETA/dist/game/data/skillTrees/pledgeSkillTree.xml
+++ b/L2J_DataPack_BETA/dist/game/data/skillTrees/pledgeSkillTree.xml
@@ -4,184 +4,184 @@
 		<!-- Confirmed CT2.5 -->
 		<!-- Clan Skills -->
 		<skill skillName="Clan Body" skillId="370" skillLvl="1" getLevel="5" levelUpSp="1500">
-			<socialClass>Apprentice</socialClass>
+			<socialClass>APPRENTICE</socialClass>
 			<item id="9816" count="10" />
 		</skill>
 		<skill skillName="Clan Body" skillId="370" skillLvl="2" getLevel="7" levelUpSp="6900">
-			<socialClass>Apprentice</socialClass>
+			<socialClass>APPRENTICE</socialClass>
 			<item id="9816" count="10" />
 		</skill>
 		<skill skillName="Clan Body" skillId="370" skillLvl="3" getLevel="11" levelUpSp="13200">
-			<socialClass>Apprentice</socialClass>
+			<socialClass>APPRENTICE</socialClass>
 			<item id="9816" count="10" />
 		</skill>
 		<skill skillName="Clan Spirituality" skillId="371" skillLvl="1" getLevel="6" levelUpSp="2100">
-			<socialClass>Elder</socialClass>
+			<socialClass>ELDER</socialClass>
 			<item id="9817" count="10" />
 		</skill>
 		<skill skillName="Clan Spirituality" skillId="371" skillLvl="2" getLevel="7" levelUpSp="5600">
-			<socialClass>Elder</socialClass>
+			<socialClass>ELDER</socialClass>
 			<item id="9817" count="10" />
 		</skill>
 		<skill skillName="Clan Spirituality" skillId="371" skillLvl="3" getLevel="8" levelUpSp="12000">
-			<socialClass>Elder</socialClass>
+			<socialClass>ELDER</socialClass>
 			<item id="9817" count="10" />
 		</skill>
 		<skill skillName="Clan Soul" skillId="372" skillLvl="1" getLevel="8" levelUpSp="12000">
-			<socialClass>Baron</socialClass>
+			<socialClass>BARON</socialClass>
 			<item id="9818" count="10" />
 		</skill>
 		<skill skillName="Clan Regeneration" skillId="373" skillLvl="1" getLevel="5" levelUpSp="1500">
-			<socialClass>Apprentice</socialClass>
+			<socialClass>APPRENTICE</socialClass>
 			<item id="9816" count="10" />
 		</skill>
 		<skill skillName="Clan Regeneration" skillId="373" skillLvl="2" getLevel="7" levelUpSp="6900">
-			<socialClass>Apprentice</socialClass>
+			<socialClass>APPRENTICE</socialClass>
 			<item id="9816" count="10" />
 		</skill>
 		<skill skillName="Clan Regeneration" skillId="373" skillLvl="3" getLevel="11" levelUpSp="13200">
-			<socialClass>Apprentice</socialClass>
+			<socialClass>APPRENTICE</socialClass>
 			<item id="9816" count="10" />
 		</skill>
 		<skill skillName="Clan Morale" skillId="374" skillLvl="1" getLevel="6" levelUpSp="2600">
-			<socialClass>Knight</socialClass>
+			<socialClass>KNIGHT</socialClass>
 			<item id="9817" count="10" />
 		</skill>
 		<skill skillName="Clan Morale" skillId="374" skillLvl="2" getLevel="8" levelUpSp="13000">
-			<socialClass>Knight</socialClass>
+			<socialClass>KNIGHT</socialClass>
 			<item id="9817" count="10" />
 		</skill>
 		<skill skillName="Clan Clarity" skillId="375" skillLvl="1" getLevel="8" levelUpSp="12000">
-			<socialClass>Baron</socialClass>
+			<socialClass>BARON</socialClass>
 			<item id="9818" count="10" />
 		</skill>
 		<skill skillName="Clan Might" skillId="376" skillLvl="1" getLevel="6" levelUpSp="3000">
-			<socialClass>Heir</socialClass>
+			<socialClass>HEIR</socialClass>
 			<item id="9815" count="10" />
 		</skill>
 		<skill skillName="Clan Might" skillId="376" skillLvl="2" getLevel="7" levelUpSp="6500">
-			<socialClass>Heir</socialClass>
+			<socialClass>HEIR</socialClass>
 			<item id="9815" count="10" />
 		</skill>
 		<skill skillName="Clan Might" skillId="376" skillLvl="3" getLevel="8" levelUpSp="13000">
-			<socialClass>Heir</socialClass>
+			<socialClass>HEIR</socialClass>
 			<item id="9815" count="10" />
 		</skill>
 		<skill skillName="Clan Shield" skillId="377" skillLvl="1" getLevel="6" levelUpSp="3000">
-			<socialClass>Heir</socialClass>
+			<socialClass>HEIR</socialClass>
 			<item id="9816" count="10" />
 		</skill>
 		<skill skillName="Clan Shield" skillId="377" skillLvl="2" getLevel="7" levelUpSp="6500">
-			<socialClass>Heir</socialClass>
+			<socialClass>HEIR</socialClass>
 			<item id="9816" count="10" />
 		</skill>
 		<skill skillName="Clan Shield" skillId="377" skillLvl="3" getLevel="8" levelUpSp="13000">
-			<socialClass>Heir</socialClass>
+			<socialClass>HEIR</socialClass>
 			<item id="9816" count="10" />
 		</skill>
 		<skill skillName="Clan Empower" skillId="378" skillLvl="1" getLevel="8" levelUpSp="12000">
-			<socialClass>Baron</socialClass>
+			<socialClass>BARON</socialClass>
 			<item id="9818" count="10" />
 		</skill>
 		<skill skillName="Clan M. Def." skillId="379" skillLvl="1" getLevel="5" levelUpSp="1500">
-			<socialClass>Apprentice</socialClass>
+			<socialClass>APPRENTICE</socialClass>
 			<item id="9818" count="10" />
 		</skill>
 		<skill skillName="Clan M. Def." skillId="379" skillLvl="2" getLevel="7" levelUpSp="6900">
-			<socialClass>Apprentice</socialClass>
+			<socialClass>APPRENTICE</socialClass>
 			<item id="9818" count="10" />
 		</skill>
 		<skill skillName="Clan M. Def." skillId="379" skillLvl="3" getLevel="11" levelUpSp="13200">
-			<socialClass>Apprentice</socialClass>
+			<socialClass>APPRENTICE</socialClass>
 			<item id="9818" count="10" />
 		</skill>
 		<skill skillName="Clan Guidance" skillId="380" skillLvl="1" getLevel="7" levelUpSp="5600">
-			<socialClass>Elder</socialClass>
+			<socialClass>ELDER</socialClass>
 			<item id="9814" count="10" />
 		</skill>
 		<skill skillName="Clan Guidance" skillId="380" skillLvl="2" getLevel="8" levelUpSp="12000">
-			<socialClass>Elder</socialClass>
+			<socialClass>ELDER</socialClass>
 			<item id="9814" count="10" />
 		</skill>
 		<skill skillName="Clan Agility" skillId="381" skillLvl="1" getLevel="8" levelUpSp="12000">
-			<socialClass>Elder</socialClass>
+			<socialClass>ELDER</socialClass>
 			<item id="9814" count="10" />
 		</skill>
 		<skill skillName="Clan Shield Defense" skillId="382" skillLvl="1" getLevel="7" levelUpSp="5100">
-			<socialClass>Baron</socialClass>
+			<socialClass>BARON</socialClass>
 			<item id="9814" count="10" />
 		</skill>
 		<skill skillName="Clan Shield Defense" skillId="382" skillLvl="2" getLevel="8" levelUpSp="12000">
-			<socialClass>Baron</socialClass>
+			<socialClass>BARON</socialClass>
 			<item id="9814" count="10" />
 		</skill>
 		<skill skillName="Clan Shield Block" skillId="383" skillLvl="1" getLevel="6" levelUpSp="2100">
-			<socialClass>Elder</socialClass>
+			<socialClass>ELDER</socialClass>
 			<item id="9815" count="10" />
 		</skill>
 		<skill skillName="Clan Shield Block" skillId="383" skillLvl="2" getLevel="8" levelUpSp="12000">
-			<socialClass>Elder</socialClass>
+			<socialClass>ELDER</socialClass>
 			<item id="9815" count="10" />
 		</skill>
 		<skill skillName="Clan Cyclonic Resistance" skillId="384" skillLvl="1" getLevel="7" levelUpSp="5100">
-			<socialClass>Baron</socialClass>
+			<socialClass>BARON</socialClass>
 			<item id="8176" count="1" />
 		</skill>
 		<skill skillName="Clan Cyclonic Resistance" skillId="384" skillLvl="2" getLevel="8" levelUpSp="12000">
-			<socialClass>Baron</socialClass>
+			<socialClass>BARON</socialClass>
 			<item id="8176" count="1" />
 		</skill>
 		<skill skillName="Clan Magmatic Resistance" skillId="385" skillLvl="1" getLevel="7" levelUpSp="5100">
-			<socialClass>Baron</socialClass>
+			<socialClass>BARON</socialClass>
 			<item id="8176" count="1" />
 		</skill>
 		<skill skillName="Clan Magmatic Resistance" skillId="385" skillLvl="2" getLevel="8" levelUpSp="12000">
-			<socialClass>Baron</socialClass>
+			<socialClass>BARON</socialClass>
 			<item id="8176" count="1" />
 		</skill>
 		<skill skillName="Clan Resist Shock" skillId="386" skillLvl="1" getLevel="7" levelUpSp="5100">
-			<socialClass>Baron</socialClass>
+			<socialClass>BARON</socialClass>
 			<item id="8176" count="1" />
 		</skill>
 		<skill skillName="Clan Resist Shock" skillId="386" skillLvl="2" getLevel="8" levelUpSp="12000">
-			<socialClass>Baron</socialClass>
+			<socialClass>BARON</socialClass>
 			<item id="8176" count="1" />
 		</skill>
 		<skill skillName="Clan Resist Hold" skillId="387" skillLvl="1" getLevel="7" levelUpSp="5100">
-			<socialClass>Baron</socialClass>
+			<socialClass>BARON</socialClass>
 			<item id="8176" count="1" />
 		</skill>
 		<skill skillName="Clan Resist Hold" skillId="387" skillLvl="2" getLevel="8" levelUpSp="12000">
-			<socialClass>Baron</socialClass>
+			<socialClass>BARON</socialClass>
 			<item id="8176" count="1" />
 		</skill>
 		<skill skillName="Clan Resist Sleep" skillId="388" skillLvl="1" getLevel="7" levelUpSp="5100">
-			<socialClass>Baron</socialClass>
+			<socialClass>BARON</socialClass>
 			<item id="8176" count="1" />
 		</skill>
 		<skill skillName="Clan Resist Sleep" skillId="388" skillLvl="2" getLevel="8" levelUpSp="12000">
-			<socialClass>Baron</socialClass>
+			<socialClass>BARON</socialClass>
 			<item id="8176" count="1" />
 		</skill>
 		<skill skillName="Clan Wind Walk" skillId="389" skillLvl="1" getLevel="8" levelUpSp="11000">
-			<socialClass>Viscount</socialClass>
+			<socialClass>VISCOUNT</socialClass>
 			<item id="8175" count="1" />
 		</skill>
 		<skill skillName="Clan Luck" skillId="390" skillLvl="1" getLevel="7" levelUpSp="6900">
-			<socialClass>Apprentice</socialClass>
+			<socialClass>APPRENTICE</socialClass>
 			<item id="8175" count="1" />
 		</skill>
 		<skill skillName="Clan Luck" skillId="390" skillLvl="2" getLevel="8" levelUpSp="14000">
-			<socialClass>Apprentice</socialClass>
+			<socialClass>APPRENTICE</socialClass>
 			<item id="8175" count="1" />
 		</skill>
 		<skill skillName="Clan Imperium" skillId="391" skillLvl="1" getLevel="5">
-			<socialClass>Knight</socialClass>
+			<socialClass>KNIGHT</socialClass>
 			<item id="8176" count="1" />
 		</skill>
 		<!-- Castle/Fort Skills -->
 		<skill skillName="Residence Body" skillId="590" skillLvl="1" getLevel="4" residenceSkill="true">
-			<socialClass>Apprentice</socialClass>
+			<socialClass>APPRENTICE</socialClass>
 			<residenceId>4</residenceId>
 			<residenceId>7</residenceId>
 			<residenceId>101</residenceId>
@@ -189,124 +189,124 @@
 			<residenceId>121</residenceId>
 		</skill>
 		<skill skillName="Residence Spirit" skillId="591" skillLvl="1" getLevel="4" residenceSkill="true">
-			<socialClass>Apprentice</socialClass>
+			<socialClass>APPRENTICE</socialClass>
 			<residenceId>2</residenceId>
 			<residenceId>109</residenceId>
 			<residenceId>120</residenceId>
 		</skill>
 		<skill skillName="Residence Soul" skillId="592" skillLvl="1" getLevel="4" residenceSkill="true">
-			<socialClass>Apprentice</socialClass>
+			<socialClass>APPRENTICE</socialClass>
 			<residenceId>3</residenceId>
 			<residenceId>9</residenceId>
 			<residenceId>108</residenceId>
 			<residenceId>119</residenceId>
 		</skill>
 		<skill skillName="Residence Health" skillId="593" skillLvl="1" getLevel="4" residenceSkill="true">
-			<socialClass>Apprentice</socialClass>
+			<socialClass>APPRENTICE</socialClass>
 			<residenceId>1</residenceId>
 			<residenceId>8</residenceId>
 			<residenceId>106</residenceId>
 			<residenceId>121</residenceId>
 		</skill>
 		<skill skillName="Residence Moral" skillId="594" skillLvl="1" getLevel="4" residenceSkill="true">
-			<socialClass>Apprentice</socialClass>
+			<socialClass>APPRENTICE</socialClass>
 			<residenceId>7</residenceId>
 			<residenceId>105</residenceId>
 			<residenceId>120</residenceId>
 		</skill>
 		<skill skillName="Residence Clarity" skillId="595" skillLvl="1" getLevel="4" residenceSkill="true">
-			<socialClass>Apprentice</socialClass>
+			<socialClass>APPRENTICE</socialClass>
 			<residenceId>6</residenceId>
 			<residenceId>104</residenceId>
 			<residenceId>119</residenceId>
 		</skill>
 		<skill skillName="Residence Might" skillId="596" skillLvl="1" getLevel="4" residenceSkill="true">
-			<socialClass>Apprentice</socialClass>
+			<socialClass>APPRENTICE</socialClass>
 			<residenceId>5</residenceId>
 			<residenceId>107</residenceId>
 			<residenceId>118</residenceId>
 		</skill>
 		<skill skillName="Residence Shield" skillId="597" skillLvl="1" getLevel="4" residenceSkill="true">
-			<socialClass>Apprentice</socialClass>
+			<socialClass>APPRENTICE</socialClass>
 			<residenceId>2</residenceId>
 			<residenceId>110</residenceId>
 			<residenceId>117</residenceId>
 		</skill>
 		<skill skillName="Residence Empower" skillId="598" skillLvl="1" getLevel="4" residenceSkill="true">
-			<socialClass>Apprentice</socialClass>
+			<socialClass>APPRENTICE</socialClass>
 			<residenceId>4</residenceId>
 			<residenceId>107</residenceId>
 			<residenceId>116</residenceId>
 		</skill>
 		<skill skillName="Residence Magic Barrier" skillId="599" skillLvl="1" getLevel="4" residenceSkill="true">
-			<socialClass>Apprentice</socialClass>
+			<socialClass>APPRENTICE</socialClass>
 			<residenceId>6</residenceId>
 			<residenceId>8</residenceId>
 			<residenceId>108</residenceId>
 			<residenceId>115</residenceId>
 		</skill>
 		<skill skillName="Residence Guidance" skillId="600" skillLvl="1" getLevel="4" residenceSkill="true">
-			<socialClass>Apprentice</socialClass>
+			<socialClass>APPRENTICE</socialClass>
 			<residenceId>1</residenceId>
 			<residenceId>9</residenceId>
 			<residenceId>110</residenceId>
 			<residenceId>112</residenceId>
 		</skill>
 		<skill skillName="Residence Agility" skillId="601" skillLvl="1" getLevel="4" residenceSkill="true">
-			<socialClass>Apprentice</socialClass>
+			<socialClass>APPRENTICE</socialClass>
 			<residenceId>3</residenceId>
 			<residenceId>103</residenceId>
 			<residenceId>118</residenceId>
 		</skill>
 		<skill skillName="Residence Shield Block" skillId="602" skillLvl="1" getLevel="4" residenceSkill="true">
-			<socialClass>Apprentice</socialClass>
+			<socialClass>APPRENTICE</socialClass>
 			<residenceId>5</residenceId>
 			<residenceId>102</residenceId>
 			<residenceId>117</residenceId>
 		</skill>
 		<skill skillName="Residence Shield Defense" skillId="603" skillLvl="1" getLevel="4" residenceSkill="true">
-			<socialClass>Apprentice</socialClass>
+			<socialClass>APPRENTICE</socialClass>
 			<residenceId>7</residenceId>
 			<residenceId>101</residenceId>
 			<residenceId>116</residenceId>
 		</skill>
 		<skill skillName="Residence Resist Typhoon" skillId="604" skillLvl="1" getLevel="4" residenceSkill="true">
-			<socialClass>Apprentice</socialClass>
+			<socialClass>APPRENTICE</socialClass>
 			<residenceId>8</residenceId>
 			<residenceId>102</residenceId>
 			<residenceId>115</residenceId>
 		</skill>
 		<skill skillName="Residence Resist Lava" skillId="605" skillLvl="1" getLevel="4" residenceSkill="true">
-			<socialClass>Apprentice</socialClass>
+			<socialClass>APPRENTICE</socialClass>
 			<residenceId>4</residenceId>
 			<residenceId>103</residenceId>
 			<residenceId>114</residenceId>
 		</skill>
 		<skill skillName="Residence Fortitude" skillId="606" skillLvl="1" getLevel="4" residenceSkill="true">
-			<socialClass>Apprentice</socialClass>
+			<socialClass>APPRENTICE</socialClass>
 			<residenceId>1</residenceId>
 			<residenceId>104</residenceId>
 			<residenceId>113</residenceId>
 		</skill>
 		<skill skillName="Residence Freedom" skillId="607" skillLvl="1" getLevel="4" residenceSkill="true">
-			<socialClass>Apprentice</socialClass>
+			<socialClass>APPRENTICE</socialClass>
 			<residenceId>6</residenceId>
 			<residenceId>105</residenceId>
 			<residenceId>112</residenceId>
 		</skill>
 		<skill skillName="Residence Vigilance" skillId="608" skillLvl="1" getLevel="4" residenceSkill="true">
-			<socialClass>Apprentice</socialClass>
+			<socialClass>APPRENTICE</socialClass>
 			<residenceId>5</residenceId>
 			<residenceId>106</residenceId>
 			<residenceId>111</residenceId>
 		</skill>
 		<skill skillName="Residence Movement" skillId="609" skillLvl="1" getLevel="4" residenceSkill="true">
-			<socialClass>Apprentice</socialClass>
+			<socialClass>APPRENTICE</socialClass>
 			<residenceId>2</residenceId>
 			<residenceId>114</residenceId>
 		</skill>
 		<skill skillName="Residence Death Fortune" skillId="610" skillLvl="1" getLevel="4" residenceSkill="true">
-			<socialClass>Apprentice</socialClass>
+			<socialClass>APPRENTICE</socialClass>
 			<residenceId>3</residenceId>
 			<residenceId>9</residenceId>
 			<residenceId>109</residenceId>
@@ -315,39 +315,39 @@
 		</skill>
 		<!-- Territory Skills -->
 		<skill skillName="Gludio Territory Benefaction" skillId="848" skillLvl="1" getLevel="5" residenceSkill="true">
-			<socialClass>Apprentice</socialClass>
+			<socialClass>APPRENTICE</socialClass>
 			<residenceId>81</residenceId>
 		</skill>
 		<skill skillName="Dion Territory Benefaction" skillId="849" skillLvl="1" getLevel="5" residenceSkill="true">
-			<socialClass>Apprentice</socialClass>
+			<socialClass>APPRENTICE</socialClass>
 			<residenceId>82</residenceId>
 		</skill>
 		<skill skillName="Giran Territory Benefaction" skillId="850" skillLvl="1" getLevel="5" residenceSkill="true">
-			<socialClass>Apprentice</socialClass>
+			<socialClass>APPRENTICE</socialClass>
 			<residenceId>83</residenceId>
 		</skill>
 		<skill skillName="Oren Territory Benefaction" skillId="851" skillLvl="1" getLevel="5" residenceSkill="true">
-			<socialClass>Apprentice</socialClass>
+			<socialClass>APPRENTICE</socialClass>
 			<residenceId>84</residenceId>
 		</skill>
 		<skill skillName="Aden Territory Benefaction" skillId="852" skillLvl="1" getLevel="5" residenceSkill="true">
-			<socialClass>Apprentice</socialClass>
+			<socialClass>APPRENTICE</socialClass>
 			<residenceId>85</residenceId>
 		</skill>
 		<skill skillName="Innadril Territory Benefaction" skillId="853" skillLvl="1" getLevel="5" residenceSkill="true">
-			<socialClass>Apprentice</socialClass>
+			<socialClass>APPRENTICE</socialClass>
 			<residenceId>86</residenceId>
 		</skill>
 		<skill skillName="Goddard Territory Benefaction" skillId="854" skillLvl="1" getLevel="5" residenceSkill="true">
-			<socialClass>Apprentice</socialClass>
+			<socialClass>APPRENTICE</socialClass>
 			<residenceId>87</residenceId>
 		</skill>
 		<skill skillName="Rune Territory Benefaction" skillId="855" skillLvl="1" getLevel="5" residenceSkill="true">
-			<socialClass>Apprentice</socialClass>
+			<socialClass>APPRENTICE</socialClass>
 			<residenceId>88</residenceId>
 		</skill>
 		<skill skillName="Schuttgart Territory Benefaction" skillId="856" skillLvl="1" getLevel="5" residenceSkill="true">
-			<socialClass>Apprentice</socialClass>
+			<socialClass>APPRENTICE</socialClass>
 			<residenceId>89</residenceId>
 		</skill>
 	</skillTree>
diff --git a/L2J_DataPack_BETA/dist/game/data/skillTrees/subPledgeSkillTree.xml b/L2J_DataPack_BETA/dist/game/data/skillTrees/subPledgeSkillTree.xml
index bb0602c21fc865b032084ab5ce257e75a9a272a7..f1bb574e29c9926bcc896537109183bd6486f36a 100644
--- a/L2J_DataPack_BETA/dist/game/data/skillTrees/subPledgeSkillTree.xml
+++ b/L2J_DataPack_BETA/dist/game/data/skillTrees/subPledgeSkillTree.xml
@@ -3,75 +3,75 @@
 	<skillTree type="subPledgeSkillTree">
 		<!-- Confirmed CT2.5 -->
 		<skill skillName="Fire Squad" skillId="611" skillLvl="1" getLevel="8" levelUpSp="12000">
-			<socialClass>Knight</socialClass>
+			<socialClass>KNIGHT</socialClass>
 			<item id="9910" count="8" />
 		</skill>
 		<skill skillName="Fire Squad" skillId="611" skillLvl="2" getLevel="9" levelUpSp="17400">
-			<socialClass>Knight</socialClass>
+			<socialClass>KNIGHT</socialClass>
 			<item id="9910" count="11" />
 		</skill>
 		<skill skillName="Fire Squad" skillId="611" skillLvl="3" getLevel="10" levelUpSp="24000">
-			<socialClass>Knight</socialClass>
+			<socialClass>KNIGHT</socialClass>
 			<item id="9911" count="2" />
 		</skill>
 		<skill skillName="Water Squad" skillId="612" skillLvl="1" getLevel="7" levelUpSp="10400">
-			<socialClass>Knight</socialClass>
+			<socialClass>KNIGHT</socialClass>
 			<item id="9910" count="4" />
 		</skill>
 		<skill skillName="Water Squad" skillId="612" skillLvl="2" getLevel="8" levelUpSp="12000">
-			<socialClass>Knight</socialClass>
+			<socialClass>KNIGHT</socialClass>
 			<item id="9910" count="8" />
 		</skill>
 		<skill skillName="Water Squad" skillId="612" skillLvl="3" getLevel="9" levelUpSp="17400">
-			<socialClass>Knight</socialClass>
+			<socialClass>KNIGHT</socialClass>
 			<item id="9910" count="11" />
 		</skill>
 		<skill skillName="Wind Squad" skillId="613" skillLvl="1" getLevel="8" levelUpSp="12000">
-			<socialClass>Knight</socialClass>
+			<socialClass>KNIGHT</socialClass>
 			<item id="9910" count="8" />
 		</skill>
 		<skill skillName="Wind Squad" skillId="613" skillLvl="2" getLevel="9" levelUpSp="17400">
-			<socialClass>Knight</socialClass>
+			<socialClass>KNIGHT</socialClass>
 			<item id="9910" count="11" />
 		</skill>
 		<skill skillName="Wind Squad" skillId="613" skillLvl="3" getLevel="10" levelUpSp="24000">
-			<socialClass>Knight</socialClass>
+			<socialClass>KNIGHT</socialClass>
 			<item id="9911" count="2" />
 		</skill>
 		<skill skillName="Earth Squad" skillId="614" skillLvl="1" getLevel="8" levelUpSp="12000">
-			<socialClass>Knight</socialClass>
+			<socialClass>KNIGHT</socialClass>
 			<item id="9910" count="8" />
 		</skill>
 		<skill skillName="Earth Squad" skillId="614" skillLvl="2" getLevel="9" levelUpSp="17400">
-			<socialClass>Knight</socialClass>
+			<socialClass>KNIGHT</socialClass>
 			<item id="9910" count="11" />
 		</skill>
 		<skill skillName="Earth Squad" skillId="614" skillLvl="3" getLevel="10" levelUpSp="24000">
-			<socialClass>Knight</socialClass>
+			<socialClass>KNIGHT</socialClass>
 			<item id="9911" count="2" />
 		</skill>
 		<skill skillName="Divine Squad" skillId="615" skillLvl="1" getLevel="7" levelUpSp="10400">
-			<socialClass>Knight</socialClass>
+			<socialClass>KNIGHT</socialClass>
 			<item id="9910" count="4" />
 		</skill>
 		<skill skillName="Divine Squad" skillId="615" skillLvl="2" getLevel="8" levelUpSp="12000">
-			<socialClass>Knight</socialClass>
+			<socialClass>KNIGHT</socialClass>
 			<item id="9910" count="8" />
 		</skill>
 		<skill skillName="Divine Squad" skillId="615" skillLvl="3" getLevel="9" levelUpSp="17400">
-			<socialClass>Knight</socialClass>
+			<socialClass>KNIGHT</socialClass>
 			<item id="9910" count="1" />
 		</skill>
 		<skill skillName="Dark Squad" skillId="616" skillLvl="1" getLevel="8" levelUpSp="12000">
-			<socialClass>Knight</socialClass>
+			<socialClass>KNIGHT</socialClass>
 			<item id="9910" count="8" />
 		</skill>
 		<skill skillName="Dark Squad" skillId="616" skillLvl="2" getLevel="9" levelUpSp="17400">
-			<socialClass>Knight</socialClass>
+			<socialClass>KNIGHT</socialClass>
 			<item id="9910" count="11" />
 		</skill>
 		<skill skillName="Dark Squad" skillId="616" skillLvl="3" getLevel="10" levelUpSp="24000">
-			<socialClass>Knight</socialClass>
+			<socialClass>KNIGHT</socialClass>
 			<item id="9911" count="2" />
 		</skill>
 	</skillTree>
diff --git a/L2J_DataPack_BETA/dist/game/data/xsd/skillTrees.xsd b/L2J_DataPack_BETA/dist/game/data/xsd/skillTrees.xsd
index ff910cf2c501895a601b69b3d0896ae9fd74583f..0346a2a2b82a1953a7d1f5617bdc90b1445181f9 100644
--- a/L2J_DataPack_BETA/dist/game/data/xsd/skillTrees.xsd
+++ b/L2J_DataPack_BETA/dist/game/data/xsd/skillTrees.xsd
@@ -32,20 +32,20 @@
 										<xs:element name="socialClass" minOccurs="0" maxOccurs="1">
 											<xs:simpleType>
 												<xs:restriction base="xs:token">
-													<xs:enumeration value="Vagabond" />
-													<xs:enumeration value="Vassal" />
-													<xs:enumeration value="Apprentice" />
-													<xs:enumeration value="Heir" />
-													<xs:enumeration value="Knight" />
-													<xs:enumeration value="Elder" />
-													<xs:enumeration value="Baron" />
-													<xs:enumeration value="Viscount" />
-													<xs:enumeration value="Count" />
-													<xs:enumeration value="Marquis" />
-													<xs:enumeration value="Duke" />
-													<xs:enumeration value="GrandDuke" />
-													<xs:enumeration value="DistinguishedKing" />
-													<xs:enumeration value="Emperor" />
+													<xs:enumeration value="VAGABOND" />
+													<xs:enumeration value="VASSAL" />
+													<xs:enumeration value="APPRENTICE" />
+													<xs:enumeration value="HEIR" />
+													<xs:enumeration value="KNIGHT" />
+													<xs:enumeration value="ELDER" />
+													<xs:enumeration value="BARON" />
+													<xs:enumeration value="VISCOUNT" />
+													<xs:enumeration value="COUNT" />
+													<xs:enumeration value="MARQUIS" />
+													<xs:enumeration value="DUKE" />
+													<xs:enumeration value="GRAND_DUKE" />
+													<xs:enumeration value="DISTINGUISHED_KING" />
+													<xs:enumeration value="EMPEROR" />
 												</xs:restriction>
 											</xs:simpleType>
 										</xs:element>