diff --git a/dist/game/data/scripts/handlers/EffectMasterHandler.java b/dist/game/data/scripts/handlers/EffectMasterHandler.java
index f960541c39c59cbe4c13cdf49b229b3a5f832e13..6b53803aebba43202ad2d3c9f8fee865e03763ce 100644
--- a/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -101,11 +101,11 @@ public final class EffectMasterHandler
 		HeadquarterCreate.class,
 		Heal.class,
 		HealOverTime.class,
-		HealPercent.class,
 		Hide.class,
 		Hp.class,
 		HpByLevel.class,
 		HpDrain.class,
+		HpPerMax.class,
 		ImmobileBuff.class,
 		ImmobilePetBuff.class,
 		Lethal.class,
@@ -117,11 +117,11 @@ public final class EffectMasterHandler
 		ManaDamOverTime.class,
 		ManaHealByLevel.class,
 		ManaHealOverTime.class,
-		ManaHealPercent.class,
 		MaxCp.class,
 		MaxHp.class,
 		Mp.class,
 		MpConsumePerLevel.class,
+		MpPerMax.class,
 		Mute.class,
 		NoblesseBless.class,
 		OpenChest.class,
diff --git a/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java b/dist/game/data/scripts/handlers/effecthandlers/HpPerMax.java
similarity index 89%
rename from dist/game/data/scripts/handlers/effecthandlers/HealPercent.java
rename to dist/game/data/scripts/handlers/effecthandlers/HpPerMax.java
index 5e6929fae671d2bd8b9b678440383db0cb7a80cd..123a0fa13682875e4e79136d4be72fd95c7ff68b 100644
--- a/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java
+++ b/dist/game/data/scripts/handlers/effecthandlers/HpPerMax.java
@@ -28,14 +28,14 @@ import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 
 /**
- * Heal Percent effect implementation.
+ * Hp Per Max effect implementation.
  * @author UnAfraid
  */
-public final class HealPercent extends AbstractEffect
+public final class HpPerMax extends AbstractEffect
 {
 	private final int _power;
 	
-	public HealPercent(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
+	public HpPerMax(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 		super(attachCond, applyCond, set, params);
 		
diff --git a/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java b/dist/game/data/scripts/handlers/effecthandlers/MpPerMax.java
similarity index 89%
rename from dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java
rename to dist/game/data/scripts/handlers/effecthandlers/MpPerMax.java
index bdd0f0b022efa7fff95acfe54d5ee388220f21a4..c8809ea5104e2e0edba268f04f25a9376aad71cd 100644
--- a/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java
+++ b/dist/game/data/scripts/handlers/effecthandlers/MpPerMax.java
@@ -28,14 +28,14 @@ import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 
 /**
- * Mana Heal Percent effect implementation.
+ * Mp Per Max effect implementation.
  * @author UnAfraid
  */
-public final class ManaHealPercent extends AbstractEffect
+public final class MpPerMax extends AbstractEffect
 {
 	private final double _power;
 	
-	public ManaHealPercent(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
+	public MpPerMax(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 		super(attachCond, applyCond, set, params);
 		
diff --git a/dist/game/data/stats/skills/00100-00199.xml b/dist/game/data/stats/skills/00100-00199.xml
index 326e077ec6bbbcbc0d0cb6bb9a3a11efc4341405..ebd4a0f416862e6659a0eaf0ae62a333ef45b044 100644
--- a/dist/game/data/stats/skills/00100-00199.xml
+++ b/dist/game/data/stats/skills/00100-00199.xml
@@ -1419,7 +1419,7 @@
 			<player hp="10" />
 		</cond>
 		<effects>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="100" />
 			</effect>
 		</effects>
diff --git a/dist/game/data/stats/skills/00300-00399.xml b/dist/game/data/stats/skills/00300-00399.xml
index 55e871d32862ac6c31226018c056fd27a1ec8bd4..2fe2fbeb4a6a759981ce6248be34bd9d2fac58ac 100644
--- a/dist/game/data/stats/skills/00300-00399.xml
+++ b/dist/game/data/stats/skills/00300-00399.xml
@@ -1372,7 +1372,7 @@
 			<effect name="HealOverTime" ticks="5">
 				<param power="50" />
 			</effect>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="50" />
 			</effect>
 		</effects>
diff --git a/dist/game/data/stats/skills/00700-00799.xml b/dist/game/data/stats/skills/00700-00799.xml
index 455eb6e902aeb088564bf567fb1df5fd34c352c6..3e4a06567c3a2a34dbd87186dc9fc2b3174d4639 100644
--- a/dist/game/data/stats/skills/00700-00799.xml
+++ b/dist/game/data/stats/skills/00700-00799.xml
@@ -83,10 +83,10 @@
 			<player mp="10" />
 		</cond>
 		<effects>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="100" />
 			</effect>
-			<effect name="ManaHealPercent">
+			<effect name="MpPerMax">
 				<param power="100" />
 			</effect>
 		</effects>
@@ -2370,7 +2370,7 @@
 			<effect name="HealOverTime" ticks="5">
 				<param power="50" />
 			</effect>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="50" />
 			</effect>
 		</effects>
diff --git a/dist/game/data/stats/skills/00800-00899.xml b/dist/game/data/stats/skills/00800-00899.xml
index bb12d2bcc9e8565402d89149abdf3014024c5947..d071626955341d4306168bc07701d5735f14e736 100644
--- a/dist/game/data/stats/skills/00800-00899.xml
+++ b/dist/game/data/stats/skills/00800-00899.xml
@@ -486,7 +486,7 @@
 			<target race="CONSTRUCT" />
 		</cond>
 		<effects>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="#amount" />
 			</effect>
 		</effects>
@@ -765,7 +765,7 @@
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="100" />
 			</effect>
 		</effects>
diff --git a/dist/game/data/stats/skills/01200-01299.xml b/dist/game/data/stats/skills/01200-01299.xml
index 5303d427601b2c7dae7823ccfc3ceaacddb68c51..d1526e556b3c57defe82475a24beca503cb2e555 100644
--- a/dist/game/data/stats/skills/01200-01299.xml
+++ b/dist/game/data/stats/skills/01200-01299.xml
@@ -2132,12 +2132,12 @@
 			</not>
 		</cond>
 		<effects>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="#amount" />
 			</effect>
 		</effects>
 		<enchant1Effects>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="#ench1power" />
 			</effect>
 		</enchant1Effects>
@@ -2631,7 +2631,7 @@
 			<player mp="25" />
 		</cond>
 		<effects>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="100" />
 			</effect>
 		</effects>
@@ -2640,7 +2640,7 @@
 				<param amount="#ench2Bravery" />
 				<param mode="DIFF" />
 			</effect>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="100" />
 			</effect>
 		</enchant2Effects>
diff --git a/dist/game/data/stats/skills/01400-01499.xml b/dist/game/data/stats/skills/01400-01499.xml
index 5d834774b5ec657aa763f49220baad2ed5b74c43..a683b97336acd7ceb40ec1ee04b8fde8a1792dc9 100644
--- a/dist/game/data/stats/skills/01400-01499.xml
+++ b/dist/game/data/stats/skills/01400-01499.xml
@@ -924,7 +924,7 @@
 		<set name="staticReuse" val="true" />
 		<set name="targetType" val="CLAN" />
 		<effects>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="100" />
 			</effect>
 		</effects>
@@ -3403,7 +3403,7 @@
 			<target active_effect_id="1487" />
 		</cond>
 		<effects>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="#amount" />
 			</effect>
 			<effect name="DispelBySlot">
@@ -3411,7 +3411,7 @@
 			</effect>
 		</effects>
 		<enchant1Effects>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="#ench1amount" />
 			</effect>
 			<effect name="DispelBySlot">
diff --git a/dist/game/data/stats/skills/01500-01599.xml b/dist/game/data/stats/skills/01500-01599.xml
index 4922b9ab5d7fcf0f6c3bd2300e578b1d738ee6f0..3f07b031227baaa4551e363f56cf5e6738e10f15 100644
--- a/dist/game/data/stats/skills/01500-01599.xml
+++ b/dist/game/data/stats/skills/01500-01599.xml
@@ -186,10 +186,10 @@
 				<param amount="9000" />
 				<param mode="DIFF" />
 			</effect>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="100" />
 			</effect>
-			<effect name="ManaHealPercent">
+			<effect name="MpPerMax">
 				<param power="100" />
 			</effect>
 		</effects>
@@ -219,10 +219,10 @@
 				<param amount="9000" />
 				<param mode="DIFF" />
 			</effect>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="100" />
 			</effect>
-			<effect name="ManaHealPercent">
+			<effect name="MpPerMax">
 				<param power="100" />
 			</effect>
 			<effect name="DispelByCategory">
@@ -1813,7 +1813,7 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="AREA_FRIENDLY" />
 		<effects>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="30" />
 			</effect>
 		</effects>
diff --git a/dist/game/data/stats/skills/02100-02199.xml b/dist/game/data/stats/skills/02100-02199.xml
index 1668e2c3993667424ed0f3fb173c8c2b25c937c7..8fda5df0db43fc31b0c6c6d4d7ba808735c024b1 100644
--- a/dist/game/data/stats/skills/02100-02199.xml
+++ b/dist/game/data/stats/skills/02100-02199.xml
@@ -634,10 +634,10 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="3" />
 			</effect>
-			<effect name="ManaHealPercent">
+			<effect name="MpPerMax">
 				<param power="1" />
 			</effect>
 		</effects>
diff --git a/dist/game/data/stats/skills/02200-02299.xml b/dist/game/data/stats/skills/02200-02299.xml
index 2f6a35fd16f93a94c795945ed62d351ef72fd14e..3c72aa8cc967537ab028baf49a4a6eea49f72e6b 100644
--- a/dist/game/data/stats/skills/02200-02299.xml
+++ b/dist/game/data/stats/skills/02200-02299.xml
@@ -999,7 +999,7 @@
 				<param amount="60" />
 				<param mode="DIFF" />
 			</effect>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="17" />
 			</effect>
 		</effects>
@@ -1023,7 +1023,7 @@
 				<param amount="20" />
 				<param mode="DIFF" />
 			</effect>
-			<effect name="ManaHealPercent">
+			<effect name="MpPerMax">
 				<param power="4" />
 			</effect>
 		</effects>
@@ -1725,7 +1725,7 @@
 			<player flyMounted="false" />
 		</cond>
 		<effects>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="#amount" />
 			</effect>
 		</effects>
@@ -1746,7 +1746,7 @@
 			<player flyMounted="false" />
 		</cond>
 		<effects>
-			<effect name="ManaHealPercent">
+			<effect name="MpPerMax">
 				<param power="#amount" />
 			</effect>
 		</effects>
diff --git a/dist/game/data/stats/skills/02300-02399.xml b/dist/game/data/stats/skills/02300-02399.xml
index da2bdcf62a8a81722052b3effdf98f92cb2c38bf..a1064cb59f8e31a216b9fa132f534ec3c29ed327 100644
--- a/dist/game/data/stats/skills/02300-02399.xml
+++ b/dist/game/data/stats/skills/02300-02399.xml
@@ -1322,7 +1322,7 @@
 			<target npcId="18482" />
 		</cond>
 		<effects>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="30" />
 			</effect>
 		</effects>
diff --git a/dist/game/data/stats/skills/02400-02499.xml b/dist/game/data/stats/skills/02400-02499.xml
index 93f15a2895908984497391827004caf281fb4c93..959122baed3ee63aeb67f876dc7a128b7733bda9 100644
--- a/dist/game/data/stats/skills/02400-02499.xml
+++ b/dist/game/data/stats/skills/02400-02499.xml
@@ -1925,7 +1925,7 @@
 			<player flyMounted="false" />
 		</cond>
 		<effects>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="15" />
 			</effect>
 		</effects>
@@ -1944,7 +1944,7 @@
 			<player flyMounted="false" />
 		</cond>
 		<effects>
-			<effect name="ManaHealPercent">
+			<effect name="MpPerMax">
 				<param power="12" />
 			</effect>
 		</effects>
diff --git a/dist/game/data/stats/skills/02500-02599.xml b/dist/game/data/stats/skills/02500-02599.xml
index fc888dce97b8d36f248e93023542fb217414b08c..8640062ae9d4b0d877019bce16aed7fcdc6a1fb8 100644
--- a/dist/game/data/stats/skills/02500-02599.xml
+++ b/dist/game/data/stats/skills/02500-02599.xml
@@ -1751,7 +1751,7 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="30" />
 			</effect>
 		</effects>
diff --git a/dist/game/data/stats/skills/02700-02799.xml b/dist/game/data/stats/skills/02700-02799.xml
index 299e4cf0ca571125d35b9d8bf661d5ecce7ee71f..1b2304e39875d71d7992e66558c100bbd5d12f44 100644
--- a/dist/game/data/stats/skills/02700-02799.xml
+++ b/dist/game/data/stats/skills/02700-02799.xml
@@ -2791,7 +2791,7 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="#hpHeal" />
 			</effect>
 		</effects>
@@ -2808,7 +2808,7 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="ManaHealPercent">
+			<effect name="MpPerMax">
 				<param power="#mpHeal" />
 			</effect>
 		</effects>
@@ -2826,10 +2826,10 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="#hpHeal" />
 			</effect>
-			<effect name="ManaHealPercent">
+			<effect name="MpPerMax">
 				<param power="#mpHeal" />
 			</effect>
 		</effects>
diff --git a/dist/game/data/stats/skills/02800-02899.xml b/dist/game/data/stats/skills/02800-02899.xml
index ce7b76d6ed7bd347c1f5bf0ea2acb85e382473f0..f22adeeaf0dcca7c41cad025f89a6723317fd7f1 100644
--- a/dist/game/data/stats/skills/02800-02899.xml
+++ b/dist/game/data/stats/skills/02800-02899.xml
@@ -48,10 +48,10 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="100" />
 			</effect>
-			<effect name="ManaHealPercent">
+			<effect name="MpPerMax">
 				<param power="100" />
 			</effect>
 		</effects>
diff --git a/dist/game/data/stats/skills/03400-03499.xml b/dist/game/data/stats/skills/03400-03499.xml
index 52f9e0d53461aa905145434c6bb94788fcbe66c2..74af55a7fe7f2b074c92c72b58889727afb60bd7 100644
--- a/dist/game/data/stats/skills/03400-03499.xml
+++ b/dist/game/data/stats/skills/03400-03499.xml
@@ -454,10 +454,10 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="100" />
 			</effect>
-			<effect name="ManaHealPercent">
+			<effect name="MpPerMax">
 				<param power="100" />
 			</effect>
 		</effects>
diff --git a/dist/game/data/stats/skills/03500-03599.xml b/dist/game/data/stats/skills/03500-03599.xml
index 9f9d7dc5ff70bc02abb46537dcb4c945ad3b92cb..403bd9cf9aacbea1150e437f2a459c1c26a828cf 100644
--- a/dist/game/data/stats/skills/03500-03599.xml
+++ b/dist/game/data/stats/skills/03500-03599.xml
@@ -1538,7 +1538,7 @@
 			</not>
 		</cond>
 		<effects>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="100" />
 			</effect>
 		</effects>
@@ -1576,7 +1576,7 @@
 			</not>
 		</cond>
 		<effects>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="100" />
 			</effect>
 		</effects>
diff --git a/dist/game/data/stats/skills/04200-04299.xml b/dist/game/data/stats/skills/04200-04299.xml
index c50f7849849a5e2a7c6e7696c10484fa4ea183cd..f3e8e49ba6ea772238e6fd6f78dfdfa63b5bc721 100644
--- a/dist/game/data/stats/skills/04200-04299.xml
+++ b/dist/game/data/stats/skills/04200-04299.xml
@@ -295,7 +295,7 @@
 			<effect name="HealOverTime" ticks="1">
 				<param power="#hot" />
 			</effect>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="3" />
 			</effect>
 		</effects>
diff --git a/dist/game/data/stats/skills/04400-04499.xml b/dist/game/data/stats/skills/04400-04499.xml
index fc8e56fcf8b539567ac7f9ee9e0e6197a65e3ed9..18d7cb655d790382c6509239c312a67225d81316 100644
--- a/dist/game/data/stats/skills/04400-04499.xml
+++ b/dist/game/data/stats/skills/04400-04499.xml
@@ -1232,7 +1232,7 @@
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="ONE" />
 		<effects>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="#amount" />
 			</effect>
 		</effects>
@@ -1467,7 +1467,7 @@
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="ONE" />
 		<effects>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="50" />
 			</effect>
 		</effects>
diff --git a/dist/game/data/stats/skills/04500-04599.xml b/dist/game/data/stats/skills/04500-04599.xml
index 8f6c951e08181d7319e81364b8b64765a0097c49..38ccd1a2e24faafc45e69c8669068bfae4204144 100644
--- a/dist/game/data/stats/skills/04500-04599.xml
+++ b/dist/game/data/stats/skills/04500-04599.xml
@@ -376,7 +376,7 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="AURA" />
 		<effects>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="5" />
 			</effect>
 		</effects>
@@ -391,7 +391,7 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="AURA" />
 		<effects>
-			<effect name="ManaHealPercent">
+			<effect name="MpPerMax">
 				<param power="5" />
 			</effect>
 		</effects>
diff --git a/dist/game/data/stats/skills/05000-05099.xml b/dist/game/data/stats/skills/05000-05099.xml
index 041d7f74f063fbd2880d77815b8cc1bdcae623b7..7cfa4e77ec780b0e3dd84cfa8fd3f471ce6ee515 100644
--- a/dist/game/data/stats/skills/05000-05099.xml
+++ b/dist/game/data/stats/skills/05000-05099.xml
@@ -187,7 +187,7 @@
 			<effect name="DispelByCategory">
 				<param slot="BUFF" rate="#activateRate" max="#maxNegated" />
 			</effect>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="#healPercent" />
 			</effect>
 		</effects>
@@ -403,7 +403,7 @@
 			<effect name="Grow">
 				<mul stat="runSpd" val="1.22" />
 			</effect>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="20" />
 			</effect>
 		</effects>
diff --git a/dist/game/data/stats/skills/05200-05299.xml b/dist/game/data/stats/skills/05200-05299.xml
index c8836e7dcd2a6ff981620d5fa469f91faad839dd..fc949efa78aeddc5d1571ccfef74827ad136df1d 100644
--- a/dist/game/data/stats/skills/05200-05299.xml
+++ b/dist/game/data/stats/skills/05200-05299.xml
@@ -127,7 +127,7 @@
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="ONE" />
 		<effects>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="100" />
 			</effect>
 		</effects>
diff --git a/dist/game/data/stats/skills/05700-05799.xml b/dist/game/data/stats/skills/05700-05799.xml
index 89cec15a9e9a29f3c1a52ff8e3d3118530ca21d9..817e7b3bcc56acd14a24bad49aeb563c4418ec65 100644
--- a/dist/game/data/stats/skills/05700-05799.xml
+++ b/dist/game/data/stats/skills/05700-05799.xml
@@ -853,10 +853,10 @@
 				<param amount="5000" />
 				<param mode="DIFF" />
 			</effect>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="100" />
 			</effect>
-			<effect name="ManaHealPercent">
+			<effect name="MpPerMax">
 				<param power="100" />
 			</effect>
 		</effects>
@@ -872,7 +872,7 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
 		<effects>
-			<effect name="ManaHealPercent">
+			<effect name="MpPerMax">
 				<param power="100" />
 			</effect>
 		</effects>
diff --git a/dist/game/data/stats/skills/05800-05899.xml b/dist/game/data/stats/skills/05800-05899.xml
index aeb784c3dbe41b94009cddbd24a24c1e39ad0b10..4f6bb0f07c4bc137b3c28410beafff5179862743 100644
--- a/dist/game/data/stats/skills/05800-05899.xml
+++ b/dist/game/data/stats/skills/05800-05899.xml
@@ -505,7 +505,7 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="CLAN_MEMBER" />
 		<effects>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="10" />
 			</effect>
 		</effects>
@@ -532,7 +532,7 @@
 			<effect name="HealOverTime" ticks="1">
 				<param power="270" />
 			</effect>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="20" />
 			</effect>
 		</effects>
diff --git a/dist/game/data/stats/skills/06200-06299.xml b/dist/game/data/stats/skills/06200-06299.xml
index 3fca168a3985cd34dc84a2da051790d996077bba..412ea8c3390543c9f013dc117587d04457c58919 100644
--- a/dist/game/data/stats/skills/06200-06299.xml
+++ b/dist/game/data/stats/skills/06200-06299.xml
@@ -1192,10 +1192,10 @@
 				<param amount="100" />
 				<param mode="PER" />
 			</effect>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="100" />
 			</effect>
-			<effect name="ManaHealPercent">
+			<effect name="MpPerMax">
 				<param power="100" />
 			</effect>
 		</effects>
diff --git a/dist/game/data/stats/skills/06300-06399.xml b/dist/game/data/stats/skills/06300-06399.xml
index bb5c20a9c7da39afdbf9ab88f484b6cd6d9e1f27..0e79b55bb96bdc4db11a538dc97640d53a8114cf 100644
--- a/dist/game/data/stats/skills/06300-06399.xml
+++ b/dist/game/data/stats/skills/06300-06399.xml
@@ -412,7 +412,7 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="15" />
 			</effect>
 		</effects>
@@ -740,7 +740,7 @@
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="ENEMY_ONLY" />
 		<effects>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="5" />
 			</effect>
 		</effects>
diff --git a/dist/game/data/stats/skills/06400-06499.xml b/dist/game/data/stats/skills/06400-06499.xml
index 04e3f222308fd303fbe881a94e7ebabdb7c44c8b..fb6fd10c6d476c1b7c42e5f40fe3d1a9664e9bbd 100644
--- a/dist/game/data/stats/skills/06400-06499.xml
+++ b/dist/game/data/stats/skills/06400-06499.xml
@@ -652,7 +652,7 @@
 			<effect name="DefenceTrait">
 				<param HOLD="100" />
 			</effect>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="90" />
 			</effect>
 		</effects>
@@ -691,7 +691,7 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
 		<effects>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="30" />
 			</effect>
 		</effects>
diff --git a/dist/game/data/stats/skills/06600-06699.xml b/dist/game/data/stats/skills/06600-06699.xml
index d689d2a404a5d717fe5bf27794d0bae59177d931..c5944106f411170f7487890077adebc4803a7ab6 100644
--- a/dist/game/data/stats/skills/06600-06699.xml
+++ b/dist/game/data/stats/skills/06600-06699.xml
@@ -343,7 +343,7 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
 		<effects>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="15" />
 			</effect>
 		</effects>
@@ -360,7 +360,7 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
 		<effects>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="25" />
 			</effect>
 		</effects>
@@ -377,7 +377,7 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
 		<effects>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="100" />
 			</effect>
 		</effects>
@@ -394,7 +394,7 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
 		<effects>
-			<effect name="ManaHealPercent">
+			<effect name="MpPerMax">
 				<param power="11" />
 			</effect>
 		</effects>
@@ -411,7 +411,7 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
 		<effects>
-			<effect name="ManaHealPercent">
+			<effect name="MpPerMax">
 				<param power="18" />
 			</effect>
 		</effects>
@@ -428,7 +428,7 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
 		<effects>
-			<effect name="ManaHealPercent">
+			<effect name="MpPerMax">
 				<param power="100" />
 			</effect>
 		</effects>
diff --git a/dist/game/data/stats/skills/06700-06799.xml b/dist/game/data/stats/skills/06700-06799.xml
index fa74cf0798c2d968bc938247832ff215f33473eb..76fad2328b22be69fe4bcdc8cf51dcd4731fea57 100644
--- a/dist/game/data/stats/skills/06700-06799.xml
+++ b/dist/game/data/stats/skills/06700-06799.xml
@@ -525,7 +525,7 @@
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="AURA" />
 		<effects>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="100" />
 			</effect>
 		</effects>
@@ -701,7 +701,7 @@
 			<player hp="10" />
 		</cond>
 		<effects>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="100" />
 			</effect>
 		</effects>
@@ -988,7 +988,7 @@
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="ONE" />
 		<effects>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="100" />
 			</effect>
 		</effects>
@@ -1107,7 +1107,7 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
 		<effects>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="10" />
 			</effect>
 		</effects>
diff --git a/dist/game/data/stats/skills/06800-06899.xml b/dist/game/data/stats/skills/06800-06899.xml
index d835907a22feb3982196e178c452ea4339ede307..b6b75d67f4d8768fc672681ac32377b6adcc39f8 100644
--- a/dist/game/data/stats/skills/06800-06899.xml
+++ b/dist/game/data/stats/skills/06800-06899.xml
@@ -364,7 +364,7 @@
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="ONE" />
 		<effects>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="100" />
 			</effect>
 		</effects>
@@ -1682,10 +1682,10 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="100" />
 			</effect>
-			<effect name="ManaHealPercent">
+			<effect name="MpPerMax">
 				<param power="100" />
 			</effect>
 		</effects>
diff --git a/dist/game/data/stats/skills/21000-21099.xml b/dist/game/data/stats/skills/21000-21099.xml
index 03f473abeefbf37eb5ead7bee149d4dca573df4b..a86d44186c546c4f374f1576e00fe202e467c907 100644
--- a/dist/game/data/stats/skills/21000-21099.xml
+++ b/dist/game/data/stats/skills/21000-21099.xml
@@ -642,10 +642,10 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="100" />
 			</effect>
-			<effect name="ManaHealPercent">
+			<effect name="MpPerMax">
 				<param power="50" />
 			</effect>
 		</effects>
diff --git a/dist/game/data/stats/skills/22000-22099.xml b/dist/game/data/stats/skills/22000-22099.xml
index d6377a1fe479a4586711bdc437ea80c9a9ca96a4..9a7e1659b79de6f79023d921cc08491d7137eed5 100644
--- a/dist/game/data/stats/skills/22000-22099.xml
+++ b/dist/game/data/stats/skills/22000-22099.xml
@@ -842,7 +842,7 @@
 			<player levelRange="#levelRange" />
 		</cond>
 		<effects>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="50" />
 			</effect>
 		</effects>
diff --git a/dist/game/data/stats/skills/22200-22299.xml b/dist/game/data/stats/skills/22200-22299.xml
index fcb5972e7bc58af92c3384f4582be9a0404a1063..34641021748ae60f2b706a6add91404c425ba70a 100644
--- a/dist/game/data/stats/skills/22200-22299.xml
+++ b/dist/game/data/stats/skills/22200-22299.xml
@@ -318,7 +318,7 @@
 		<set name="reuseDelay" val="300000" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="ManaHealPercent">
+			<effect name="MpPerMax">
 				<param power="50" />
 			</effect>
 		</effects>
@@ -382,7 +382,7 @@
 		<set name="reuseDelay" val="300000" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="100" />
 			</effect>
 		</effects>
@@ -399,7 +399,7 @@
 		<set name="reuseDelay" val="300000" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="100" />
 			</effect>
 		</effects>
diff --git a/dist/game/data/stats/skills/23100-23199.xml b/dist/game/data/stats/skills/23100-23199.xml
index e250a40fd0c88c9e576c30d3f5c63f7e21443205..96c8749b118e03eaae6b5a59c49d340d022a4ece 100644
--- a/dist/game/data/stats/skills/23100-23199.xml
+++ b/dist/game/data/stats/skills/23100-23199.xml
@@ -938,10 +938,10 @@
 				<param amount="9000" />
 				<param mode="DIFF" />
 			</effect>
-			<effect name="HealPercent">
+			<effect name="HpPerMax">
 				<param power="100" />
 			</effect>
-			<effect name="ManaHealPercent">
+			<effect name="MpPerMax">
 				<param power="100" />
 			</effect>
 		</effects>