diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/00000-00099.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/00000-00099.xml
index 9fb87e40ee1c61e286ed71ad54372a094b55df8a..737b2e1c2e7bb2103c35dbdd6c3b07f558e5066d 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/00000-00099.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/00000-00099.xml
@@ -138,7 +138,7 @@
 		<set name="operateType" val="A1" />
 		<set name="castRange" val="40" />
 		<set name="effectRange" val="400" />
-		<set name="numCharges" val="3" /> <!-- 3 Charges are consumed -->
+		<set name="chargeConsume" val="3" />
 		<enchant1 name="power" val="#ench1Power" />
 		<enchant1 name="magicLvl" val="#enchantMagicLvl" />
 		<enchant2 name="mpConsume" val="#ench2MpConsume" />
@@ -186,7 +186,7 @@
 		<set name="operateType" val="A1" />
 		<set name="castRange" val="600" />
 		<set name="effectRange" val="1100" />
-		<set name="numCharges" val="2" /> <!-- 2 Charges are consumed -->
+		<set name="chargeConsume" val="2" />
 		<enchant1 name="magicLvl" val="#enchantMagicLvl" />
 		<enchant1 name="power" val="#ench1Power" />
 		<enchant2 name="magicLvl" val="#enchantMagicLvl" />
@@ -1241,7 +1241,7 @@
 		<set name="castRange" val="600" />
 		<set name="effectRange" val="1100" />
 		<!-- charge values -->
-		<set name="numCharges" val="1" />
+		<set name="chargeConsume" val="1" />
 		<enchant1 name="magicLvl" val="#enchantMagicLvl" />
 		<enchant1 name="power" val="#ench1Power" />
 		<enchant2 name="magicLvl" val="#enchantMagicLvl" />
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/00200-00299.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/00200-00299.xml
index a37c9dcbeca47b5550d5a6b2b6e6e15f87b387ae..dff5d6551daab946552615ad9f563457402cdaec 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/00200-00299.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/00200-00299.xml
@@ -1380,7 +1380,7 @@
 		<set name="operateType" val="A1" />
 		<set name="castRange" val="40" />
 		<set name="effectRange" val="400" />
-		<set name="numCharges" val="4" /> <!-- 4 Charges are consumed -->
+		<set name="chargeConsume" val="4" />
 		<enchant1 name="power" val="#ench1Power" />
 		<enchant1 name="magicLvl" val="#enchantMagicLvl" />
 		<enchant2 name="mpConsume" val="#ench2MpConsume" />
@@ -2229,7 +2229,7 @@
 		<set name="operateType" val="A1" />
 		<set name="castRange" val="40" />
 		<set name="effectRange" val="400" />
-		<set name="numCharges" val="2" /> <!-- 2 Charges are consumed -->
+		<set name="chargeConsume" val="2" />
 		<enchant1 name="magicLvl" val="#enchantMagicLvl" />
 		<enchant1 name="power" val="#ench1Power" />
 		<enchant2 name="magicLvl" val="#enchantMagicLvl" />
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/00400-00499.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/00400-00499.xml
index 24f9baf315b50c1e05420c95364888aa1962418e..3c778ee617e6df07027391da10005bfbf72668c6 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/00400-00499.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/00400-00499.xml
@@ -1455,7 +1455,7 @@
 		<set name="aggroPoints" val="673" />
 		<set name="hitTime" val="2000" />
 		<set name="magicLvl" val="78" />
-		<set name="numCharges" val="3" /> <!-- 3 Charges are consumed -->
+		<set name="chargeConsume" val="3" />
 		<set name="operateType" val="A2" />
 		<set name="removedOnDamage" val="true" />
 		<set name="reuseDelay" val="900000" />
@@ -1477,7 +1477,7 @@
 	<skill id="442" levels="1" name="Sonic Barrier">
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalType" val="invincibility" />
-		<set name="numCharges" val="5" /> <!-- 5 Charges are consumed -->
+		<set name="chargeConsume" val="5" />
 		<set name="mpConsume" val="65" />
 		<set name="magicLvl" val="79" />
 		<set name="target" val="TARGET_SELF" />
@@ -1506,7 +1506,7 @@
 		<set name="reuseDelay" val="900000" />
 		<set name="skillType" val="BUFF" />
 		<set name="operateType" val="A2" />
-		<set name="numCharges" val="4" /> <!-- 4 Charges are consumed -->
+		<set name="chargeConsume" val="4" />
 		<set name="removedOnAnyActionExceptMove" val="true" />
 		<cond msgId="113" addName="1">
 			<and>
@@ -1679,7 +1679,7 @@
 		</enchant3for>
 	</skill>
 	<skill id="451" levels="2" name="Sonic Move">
-		<table name="#numCharges"> 2 3 </table> <!-- 2 3 Charges are consumed -->
+		<table name="#chargeConsume"> 2 3 </table>
 		<table name="#runSpd"> 40 66 </table>
 		<table name="#mpConsume"> 29 32 </table>
 		<table name="#magicLvl"> 62 68 </table>
@@ -1689,14 +1689,14 @@
 		<set name="hitTime" val="1000" />
 		<set name="reuseDelay" val="30000" />
 		<set name="target" val="TARGET_SELF" />
-		<set name="numCharges" val="#numCharges" />
+		<set name="chargeConsume" val="#chargeConsume" />
 		<set name="mpConsume" val="#mpConsume" />
 		<set name="operateType" val="A2" />
 		<set name="skillType" val="BUFF" />
 		<cond msgId="113" addName="1">
 			<and>
 				<using kind="Dual Sword" />
-				<player Charges="#numCharges" /> <!-- Requires 2nd 3rd stage of Sword Energy recharge. -->
+				<player Charges="#chargeConsume" />
 			</and>
 		</cond>
 		<for>
@@ -1921,17 +1921,17 @@
 		<table name="#mpConsume"> 33 37 </table>
 		<table name="#magicLvl"> 60 66 </table>
 		<table name="#negateAbnormals"> root_physically,3;root_magically,3 speed_down,3;root_physically,3;root_magically,3 </table>
-		<table name="#numCharges"> 2 3 </table> <!-- 2 3 Charges are consumed -->
+		<table name="#chargeConsume"> 2 3 </table>
 		<set name="hitTime" val="3000" />
 		<set name="mpConsume" val="#mpConsume" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="negateAbnormals" val="#negateAbnormals" />
-		<set name="numCharges" val="#numCharges" />
+		<set name="chargeConsume" val="#chargeConsume" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="4000" />
 		<set name="target" val="TARGET_SELF" />
 		<cond msgId="113" addName="1">
-			<player Charges="#numCharges" /> <!-- Level 2 3 Focused Force charge required. -->
+			<player Charges="#chargeConsume" /> <!-- Level 2 3 Focused Force charge required. -->
 		</cond>
 		<for>
 			<effect name="Negate" noicon="1" val="0" />
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/00500-00599.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/00500-00599.xml
index b81a30141b62e46c6ab61ee9ddf7113c31d3ce69..4605d05da8f4d326b7ccfdd6e6ed0c4159622a34 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/00500-00599.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/00500-00599.xml
@@ -1859,7 +1859,7 @@
 		<set name="coolTime" val="720" />
 		<set name="reuseDelay" val="3000" />
 		<set name="nextActionAttack" val="true" />
-		<set name="numCharges" val="2" />
+		<set name="chargeConsume" val="2" />
 		<cond msgId="113" addName="1">
 			<player Charges="2" />
 		</cond>
@@ -1881,7 +1881,7 @@
 		<set name="hitTime" val="2500" />
 		<set name="reuseDelay" val="15000" />
 		<set name="skillRadius" val="150" />
-		<set name="numCharges" val="3" />
+		<set name="chargeConsume" val="3" />
 		<cond msgId="113" addName="1">
 			<player Charges="3" />
 		</cond>
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/00700-00799.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/00700-00799.xml
index 53f1444e90b4249258652230ce00efb63f3fcc7a..c864974c70ef46bb25e6858bbc6ff0537bee01c7 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/00700-00799.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/00700-00799.xml
@@ -1574,7 +1574,7 @@
 		<set name="lvlDepend" val="1" />
 		<set name="magicLvl" val="81" />
 		<set name="mpConsume" val="58" />
-		<set name="numCharges" val="2" /> <!-- 2 Charges are consumed -->
+		<set name="chargeConsume" val="2" />
 		<set name="operateType" val="A2" />
 		<set name="power" val="80" /> <!-- Base Land Rate -->
 		<set name="reuseDelay" val="15000" />
@@ -1602,7 +1602,7 @@
 		<set name="lvlDepend" val="1" />
 		<set name="magicLvl" val="81" />
 		<set name="mpConsume" val="37" />
-		<set name="numCharges" val="2" /> <!-- 2 Charges are consumed -->
+		<set name="chargeConsume" val="2" />
 		<set name="operateType" val="A2" />
 		<set name="overHit" val="true" />
 		<set name="power" val="4500" />