Core part for

https://bitbucket.org/l2jserver/l2j_datapack/commits/07158cedeef429909b99d6e95685d4e51c31b050

src/main/java/com/l2jserver/gameserver/model/actor/L2Character.java

@@ -1690,7 +1690,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 					return;
 				}
 				
-				if ((skill.isContinuous() && !skill.isDebuff()) || skill.hasEffectType(L2EffectType.CPHEAL, L2EffectType.HEAL))
+				if ((skill.isContinuous() && !skill.isDebuff()) || skill.hasEffectType(L2EffectType.CP, L2EffectType.HEAL))
 				{
 					doit = true;
 				}

src/main/java/com/l2jserver/gameserver/model/actor/instance/L2TamedBeastInstance.java

@@ -380,7 +380,7 @@ public final class L2TamedBeastInstance extends L2FeedableBeastInstance
 			for (Skill skill : getTemplate().getSkills().values())
 			{
 				// if the skill is a buff, check if the owner has it already [ owner.getEffect(L2Skill skill) ]
-				if ((Rnd.get(5) < chance) && skill.hasEffectType(L2EffectType.CPHEAL, L2EffectType.HEAL, L2EffectType.MANAHEAL_BY_LEVEL, L2EffectType.MANAHEAL_PERCENT))
+				if ((Rnd.get(5) < chance) && skill.hasEffectType(L2EffectType.CP, L2EffectType.HEAL, L2EffectType.MANAHEAL_BY_LEVEL, L2EffectType.MANAHEAL_PERCENT))
 				{
 					sitCastAndFollow(skill, _owner);
 				}

src/main/java/com/l2jserver/gameserver/model/effects/L2EffectType.java

@@ -31,7 +31,7 @@ public enum L2EffectType
 	BUFF,
 	CHARM_OF_LUCK,
 	CHAT_BLOCK,
-	CPHEAL,
+	CP,
 	DEBUFF,
 	DISPEL,
 	DISPEL_BY_SLOT,

src/main/java/com/l2jserver/gameserver/network/SystemMessageId.java

@@ -8194,13 +8194,13 @@ public final class SystemMessageId
 	 * ID: 1405<br>
 	 * Message: $s1 CP has been restored.
 	 */
-	public static final SystemMessageId S1_CP_WILL_BE_RESTORED = new SystemMessageId(1405);
+	public static final SystemMessageId S1_CP_HAS_BEEN_RESTORED = new SystemMessageId(1405);
 	
 	/**
 	 * ID: 1406<br>
 	 * Message: $s2 CP has been restored by $c1.
 	 */
-	public static final SystemMessageId S2_CP_WILL_BE_RESTORED_BY_C1 = new SystemMessageId(1406);
+	public static final SystemMessageId S2_CP_HAS_BEEN_RESTORED_BY_C1 = new SystemMessageId(1406);
 	
 	/**
 	 * ID: 1407<br>