diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/ai/CreatureAI.java
index a81769105c..0db56af7ae 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/ai/CreatureAI.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/ai/CreatureAI.java
@@ -60,7 +60,7 @@ import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
  * <ul>
  * <li>AttackableAI</li>
  * <li>DoorAI</li>
- * <li>L2PlayerAI</li>
+ * <li>PlayerAI</li>
  * <li>SummonAI</li>
  * </ul>
  */
@@ -923,7 +923,7 @@ public class CreatureAI extends AbstractAI
 	 * </ul>
 	 * <B><U> Example of use </U> :</B>
 	 * <ul>
-	 * <li>L2PLayerAI, SummonAI</li>
+	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
 	 * @param offset The Interact area radius
@@ -1030,7 +1030,7 @@ public class CreatureAI extends AbstractAI
 	 * </ul>
 	 * <B><U> Example of use </U> :</B>
 	 * <ul>
-	 * <li>L2PLayerAI, SummonAI</li>
+	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
 	 * @return True if the target is lost or dead (false if fakedeath)
@@ -1063,7 +1063,7 @@ public class CreatureAI extends AbstractAI
 	 * </ul>
 	 * <B><U> Example of use </U> :</B>
 	 * <ul>
-	 * <li>L2PLayerAI, SummonAI</li>
+	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
 	 * @return True if the target is lost
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/ai/PlayableAI.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/ai/PlayableAI.java
index a851c6399a..85e55cf15b 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/ai/PlayableAI.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/ai/PlayableAI.java
@@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
  * This class manages AI of Playable.<br>
  * PlayableAI :
  * <li>SummonAI</li>
- * <li>L2PlayerAI</li>
+ * <li>PlayerAI</li>
  * @author JIV
  */
 public abstract class PlayableAI extends CreatureAI
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java
index ccf7293d38..89419f5b5d 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -163,9 +163,9 @@ import org.l2jmobius.gameserver.util.Util;
  * <li>DoorInstance</li>
  * <li>Playable</li>
  * <li>Npc</li>
- * <li>L2StaticObjectInstance</li>
- * <li>L2Trap</li>
- * <li>L2Vehicle</li>
+ * <li>StaticObjectInstance</li>
+ * <li>Trap</li>
+ * <li>Vehicle</li>
  * </ul>
  * <br>
  * <b>Concept of CreatureTemplate:</b><br>
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
index e2904a0653..ccba1ab560 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
@@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.util.MinionList;
 /**
  * This class manages all Monsters. MonsterInstance:
  * <ul>
- * <li>L2MinionInstance</li>
+ * <li>MinionInstance</li>
  * <li>RaidBossInstance</li>
  * <li>GrandBossInstance</li>
  * </ul>
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/ai/CreatureAI.java
index a81769105c..0db56af7ae 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/ai/CreatureAI.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/ai/CreatureAI.java
@@ -60,7 +60,7 @@ import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
  * <ul>
  * <li>AttackableAI</li>
  * <li>DoorAI</li>
- * <li>L2PlayerAI</li>
+ * <li>PlayerAI</li>
  * <li>SummonAI</li>
  * </ul>
  */
@@ -923,7 +923,7 @@ public class CreatureAI extends AbstractAI
 	 * </ul>
 	 * <B><U> Example of use </U> :</B>
 	 * <ul>
-	 * <li>L2PLayerAI, SummonAI</li>
+	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
 	 * @param offset The Interact area radius
@@ -1030,7 +1030,7 @@ public class CreatureAI extends AbstractAI
 	 * </ul>
 	 * <B><U> Example of use </U> :</B>
 	 * <ul>
-	 * <li>L2PLayerAI, SummonAI</li>
+	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
 	 * @return True if the target is lost or dead (false if fakedeath)
@@ -1063,7 +1063,7 @@ public class CreatureAI extends AbstractAI
 	 * </ul>
 	 * <B><U> Example of use </U> :</B>
 	 * <ul>
-	 * <li>L2PLayerAI, SummonAI</li>
+	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
 	 * @return True if the target is lost
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/ai/PlayableAI.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/ai/PlayableAI.java
index a851c6399a..85e55cf15b 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/ai/PlayableAI.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/ai/PlayableAI.java
@@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
  * This class manages AI of Playable.<br>
  * PlayableAI :
  * <li>SummonAI</li>
- * <li>L2PlayerAI</li>
+ * <li>PlayerAI</li>
  * @author JIV
  */
 public abstract class PlayableAI extends CreatureAI
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java
index ccf7293d38..89419f5b5d 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -163,9 +163,9 @@ import org.l2jmobius.gameserver.util.Util;
  * <li>DoorInstance</li>
  * <li>Playable</li>
  * <li>Npc</li>
- * <li>L2StaticObjectInstance</li>
- * <li>L2Trap</li>
- * <li>L2Vehicle</li>
+ * <li>StaticObjectInstance</li>
+ * <li>Trap</li>
+ * <li>Vehicle</li>
  * </ul>
  * <br>
  * <b>Concept of CreatureTemplate:</b><br>
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
index e2904a0653..ccba1ab560 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
@@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.util.MinionList;
 /**
  * This class manages all Monsters. MonsterInstance:
  * <ul>
- * <li>L2MinionInstance</li>
+ * <li>MinionInstance</li>
  * <li>RaidBossInstance</li>
  * <li>GrandBossInstance</li>
  * </ul>
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/ai/CreatureAI.java
index a81769105c..0db56af7ae 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/ai/CreatureAI.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/ai/CreatureAI.java
@@ -60,7 +60,7 @@ import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
  * <ul>
  * <li>AttackableAI</li>
  * <li>DoorAI</li>
- * <li>L2PlayerAI</li>
+ * <li>PlayerAI</li>
  * <li>SummonAI</li>
  * </ul>
  */
@@ -923,7 +923,7 @@ public class CreatureAI extends AbstractAI
 	 * </ul>
 	 * <B><U> Example of use </U> :</B>
 	 * <ul>
-	 * <li>L2PLayerAI, SummonAI</li>
+	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
 	 * @param offset The Interact area radius
@@ -1030,7 +1030,7 @@ public class CreatureAI extends AbstractAI
 	 * </ul>
 	 * <B><U> Example of use </U> :</B>
 	 * <ul>
-	 * <li>L2PLayerAI, SummonAI</li>
+	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
 	 * @return True if the target is lost or dead (false if fakedeath)
@@ -1063,7 +1063,7 @@ public class CreatureAI extends AbstractAI
 	 * </ul>
 	 * <B><U> Example of use </U> :</B>
 	 * <ul>
-	 * <li>L2PLayerAI, SummonAI</li>
+	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
 	 * @return True if the target is lost
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/ai/PlayableAI.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/ai/PlayableAI.java
index a851c6399a..85e55cf15b 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/ai/PlayableAI.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/ai/PlayableAI.java
@@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
  * This class manages AI of Playable.<br>
  * PlayableAI :
  * <li>SummonAI</li>
- * <li>L2PlayerAI</li>
+ * <li>PlayerAI</li>
  * @author JIV
  */
 public abstract class PlayableAI extends CreatureAI
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java
index ce770c757c..450c3c7b29 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -163,9 +163,9 @@ import org.l2jmobius.gameserver.util.Util;
  * <li>DoorInstance</li>
  * <li>Playable</li>
  * <li>Npc</li>
- * <li>L2StaticObjectInstance</li>
- * <li>L2Trap</li>
- * <li>L2Vehicle</li>
+ * <li>StaticObjectInstance</li>
+ * <li>Trap</li>
+ * <li>Vehicle</li>
  * </ul>
  * <br>
  * <b>Concept of CreatureTemplate:</b><br>
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
index e2904a0653..ccba1ab560 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
@@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.util.MinionList;
 /**
  * This class manages all Monsters. MonsterInstance:
  * <ul>
- * <li>L2MinionInstance</li>
+ * <li>MinionInstance</li>
  * <li>RaidBossInstance</li>
  * <li>GrandBossInstance</li>
  * </ul>
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/CreatureAI.java
index a81769105c..0db56af7ae 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/CreatureAI.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/CreatureAI.java
@@ -60,7 +60,7 @@ import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
  * <ul>
  * <li>AttackableAI</li>
  * <li>DoorAI</li>
- * <li>L2PlayerAI</li>
+ * <li>PlayerAI</li>
  * <li>SummonAI</li>
  * </ul>
  */
@@ -923,7 +923,7 @@ public class CreatureAI extends AbstractAI
 	 * </ul>
 	 * <B><U> Example of use </U> :</B>
 	 * <ul>
-	 * <li>L2PLayerAI, SummonAI</li>
+	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
 	 * @param offset The Interact area radius
@@ -1030,7 +1030,7 @@ public class CreatureAI extends AbstractAI
 	 * </ul>
 	 * <B><U> Example of use </U> :</B>
 	 * <ul>
-	 * <li>L2PLayerAI, SummonAI</li>
+	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
 	 * @return True if the target is lost or dead (false if fakedeath)
@@ -1063,7 +1063,7 @@ public class CreatureAI extends AbstractAI
 	 * </ul>
 	 * <B><U> Example of use </U> :</B>
 	 * <ul>
-	 * <li>L2PLayerAI, SummonAI</li>
+	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
 	 * @return True if the target is lost
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/PlayableAI.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/PlayableAI.java
index a851c6399a..85e55cf15b 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/PlayableAI.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/PlayableAI.java
@@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
  * This class manages AI of Playable.<br>
  * PlayableAI :
  * <li>SummonAI</li>
- * <li>L2PlayerAI</li>
+ * <li>PlayerAI</li>
  * @author JIV
  */
 public abstract class PlayableAI extends CreatureAI
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java
index ce770c757c..450c3c7b29 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -163,9 +163,9 @@ import org.l2jmobius.gameserver.util.Util;
  * <li>DoorInstance</li>
  * <li>Playable</li>
  * <li>Npc</li>
- * <li>L2StaticObjectInstance</li>
- * <li>L2Trap</li>
- * <li>L2Vehicle</li>
+ * <li>StaticObjectInstance</li>
+ * <li>Trap</li>
+ * <li>Vehicle</li>
  * </ul>
  * <br>
  * <b>Concept of CreatureTemplate:</b><br>
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
index e2904a0653..ccba1ab560 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
@@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.util.MinionList;
 /**
  * This class manages all Monsters. MonsterInstance:
  * <ul>
- * <li>L2MinionInstance</li>
+ * <li>MinionInstance</li>
  * <li>RaidBossInstance</li>
  * <li>GrandBossInstance</li>
  * </ul>
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/ai/CreatureAI.java
index a81769105c..0db56af7ae 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/ai/CreatureAI.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/ai/CreatureAI.java
@@ -60,7 +60,7 @@ import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
  * <ul>
  * <li>AttackableAI</li>
  * <li>DoorAI</li>
- * <li>L2PlayerAI</li>
+ * <li>PlayerAI</li>
  * <li>SummonAI</li>
  * </ul>
  */
@@ -923,7 +923,7 @@ public class CreatureAI extends AbstractAI
 	 * </ul>
 	 * <B><U> Example of use </U> :</B>
 	 * <ul>
-	 * <li>L2PLayerAI, SummonAI</li>
+	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
 	 * @param offset The Interact area radius
@@ -1030,7 +1030,7 @@ public class CreatureAI extends AbstractAI
 	 * </ul>
 	 * <B><U> Example of use </U> :</B>
 	 * <ul>
-	 * <li>L2PLayerAI, SummonAI</li>
+	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
 	 * @return True if the target is lost or dead (false if fakedeath)
@@ -1063,7 +1063,7 @@ public class CreatureAI extends AbstractAI
 	 * </ul>
 	 * <B><U> Example of use </U> :</B>
 	 * <ul>
-	 * <li>L2PLayerAI, SummonAI</li>
+	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
 	 * @return True if the target is lost
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/ai/PlayableAI.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/ai/PlayableAI.java
index a851c6399a..85e55cf15b 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/ai/PlayableAI.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/ai/PlayableAI.java
@@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
  * This class manages AI of Playable.<br>
  * PlayableAI :
  * <li>SummonAI</li>
- * <li>L2PlayerAI</li>
+ * <li>PlayerAI</li>
  * @author JIV
  */
 public abstract class PlayableAI extends CreatureAI
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java
index ce770c757c..450c3c7b29 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -163,9 +163,9 @@ import org.l2jmobius.gameserver.util.Util;
  * <li>DoorInstance</li>
  * <li>Playable</li>
  * <li>Npc</li>
- * <li>L2StaticObjectInstance</li>
- * <li>L2Trap</li>
- * <li>L2Vehicle</li>
+ * <li>StaticObjectInstance</li>
+ * <li>Trap</li>
+ * <li>Vehicle</li>
  * </ul>
  * <br>
  * <b>Concept of CreatureTemplate:</b><br>
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
index e2904a0653..ccba1ab560 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
@@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.util.MinionList;
 /**
  * This class manages all Monsters. MonsterInstance:
  * <ul>
- * <li>L2MinionInstance</li>
+ * <li>MinionInstance</li>
  * <li>RaidBossInstance</li>
  * <li>GrandBossInstance</li>
  * </ul>
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/ai/CreatureAI.java
index a81769105c..0db56af7ae 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/ai/CreatureAI.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/ai/CreatureAI.java
@@ -60,7 +60,7 @@ import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
  * <ul>
  * <li>AttackableAI</li>
  * <li>DoorAI</li>
- * <li>L2PlayerAI</li>
+ * <li>PlayerAI</li>
  * <li>SummonAI</li>
  * </ul>
  */
@@ -923,7 +923,7 @@ public class CreatureAI extends AbstractAI
 	 * </ul>
 	 * <B><U> Example of use </U> :</B>
 	 * <ul>
-	 * <li>L2PLayerAI, SummonAI</li>
+	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
 	 * @param offset The Interact area radius
@@ -1030,7 +1030,7 @@ public class CreatureAI extends AbstractAI
 	 * </ul>
 	 * <B><U> Example of use </U> :</B>
 	 * <ul>
-	 * <li>L2PLayerAI, SummonAI</li>
+	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
 	 * @return True if the target is lost or dead (false if fakedeath)
@@ -1063,7 +1063,7 @@ public class CreatureAI extends AbstractAI
 	 * </ul>
 	 * <B><U> Example of use </U> :</B>
 	 * <ul>
-	 * <li>L2PLayerAI, SummonAI</li>
+	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
 	 * @return True if the target is lost
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/ai/PlayableAI.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/ai/PlayableAI.java
index a851c6399a..85e55cf15b 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/ai/PlayableAI.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/ai/PlayableAI.java
@@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
  * This class manages AI of Playable.<br>
  * PlayableAI :
  * <li>SummonAI</li>
- * <li>L2PlayerAI</li>
+ * <li>PlayerAI</li>
  * @author JIV
  */
 public abstract class PlayableAI extends CreatureAI
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java
index ce770c757c..450c3c7b29 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -163,9 +163,9 @@ import org.l2jmobius.gameserver.util.Util;
  * <li>DoorInstance</li>
  * <li>Playable</li>
  * <li>Npc</li>
- * <li>L2StaticObjectInstance</li>
- * <li>L2Trap</li>
- * <li>L2Vehicle</li>
+ * <li>StaticObjectInstance</li>
+ * <li>Trap</li>
+ * <li>Vehicle</li>
  * </ul>
  * <br>
  * <b>Concept of CreatureTemplate:</b><br>
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
index e2904a0653..ccba1ab560 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
@@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.util.MinionList;
 /**
  * This class manages all Monsters. MonsterInstance:
  * <ul>
- * <li>L2MinionInstance</li>
+ * <li>MinionInstance</li>
  * <li>RaidBossInstance</li>
  * <li>GrandBossInstance</li>
  * </ul>
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/ai/CreatureAI.java
index a81769105c..0db56af7ae 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/ai/CreatureAI.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/ai/CreatureAI.java
@@ -60,7 +60,7 @@ import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
  * <ul>
  * <li>AttackableAI</li>
  * <li>DoorAI</li>
- * <li>L2PlayerAI</li>
+ * <li>PlayerAI</li>
  * <li>SummonAI</li>
  * </ul>
  */
@@ -923,7 +923,7 @@ public class CreatureAI extends AbstractAI
 	 * </ul>
 	 * <B><U> Example of use </U> :</B>
 	 * <ul>
-	 * <li>L2PLayerAI, SummonAI</li>
+	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
 	 * @param offset The Interact area radius
@@ -1030,7 +1030,7 @@ public class CreatureAI extends AbstractAI
 	 * </ul>
 	 * <B><U> Example of use </U> :</B>
 	 * <ul>
-	 * <li>L2PLayerAI, SummonAI</li>
+	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
 	 * @return True if the target is lost or dead (false if fakedeath)
@@ -1063,7 +1063,7 @@ public class CreatureAI extends AbstractAI
 	 * </ul>
 	 * <B><U> Example of use </U> :</B>
 	 * <ul>
-	 * <li>L2PLayerAI, SummonAI</li>
+	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
 	 * @return True if the target is lost
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/ai/PlayableAI.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/ai/PlayableAI.java
index a851c6399a..85e55cf15b 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/ai/PlayableAI.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/ai/PlayableAI.java
@@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
  * This class manages AI of Playable.<br>
  * PlayableAI :
  * <li>SummonAI</li>
- * <li>L2PlayerAI</li>
+ * <li>PlayerAI</li>
  * @author JIV
  */
 public abstract class PlayableAI extends CreatureAI
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java
index ce770c757c..450c3c7b29 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -163,9 +163,9 @@ import org.l2jmobius.gameserver.util.Util;
  * <li>DoorInstance</li>
  * <li>Playable</li>
  * <li>Npc</li>
- * <li>L2StaticObjectInstance</li>
- * <li>L2Trap</li>
- * <li>L2Vehicle</li>
+ * <li>StaticObjectInstance</li>
+ * <li>Trap</li>
+ * <li>Vehicle</li>
  * </ul>
  * <br>
  * <b>Concept of CreatureTemplate:</b><br>
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
index e2904a0653..ccba1ab560 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
@@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.util.MinionList;
 /**
  * This class manages all Monsters. MonsterInstance:
  * <ul>
- * <li>L2MinionInstance</li>
+ * <li>MinionInstance</li>
  * <li>RaidBossInstance</li>
  * <li>GrandBossInstance</li>
  * </ul>
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/CreatureAI.java
index 3cb22ae941..f6415f696a 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/CreatureAI.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/CreatureAI.java
@@ -50,7 +50,7 @@ import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
  * <BR>
  * <li>AttackableAI</li>
  * <li>DoorAI</li>
- * <li>L2PlayerAI</li>
+ * <li>PlayerAI</li>
  * <li>SummonAI</li><BR>
  * <BR>
  */
@@ -985,7 +985,7 @@ public class CreatureAI extends AbstractAI
 	 * <BR>
 	 * <B><U> Example of use </U> :</B><BR>
 	 * <BR>
-	 * <li>L2PLayerAI, SummonAI</li><BR>
+	 * <li>PLayerAI, SummonAI</li><BR>
 	 * <BR>
 	 * @param target The targeted WorldObject
 	 * @param offset The Interact area radius
@@ -1109,7 +1109,7 @@ public class CreatureAI extends AbstractAI
 	 * <BR>
 	 * <B><U> Example of use </U> :</B><BR>
 	 * <BR>
-	 * <li>L2PLayerAI, SummonAI</li><BR>
+	 * <li>PLayerAI, SummonAI</li><BR>
 	 * <BR>
 	 * @param target The targeted WorldObject
 	 * @return True if the target is lost or dead (false if fakedeath)
@@ -1144,7 +1144,7 @@ public class CreatureAI extends AbstractAI
 	 * <BR>
 	 * <B><U> Example of use </U> :</B><BR>
 	 * <BR>
-	 * <li>L2PLayerAI, SummonAI</li><BR>
+	 * <li>PLayerAI, SummonAI</li><BR>
 	 * <BR>
 	 * @param target The targeted WorldObject
 	 * @return True if the target is lost
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/WorldObject.java
index 925b912b78..97bd1233c9 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/WorldObject.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/WorldObject.java
@@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.network.serverpackets.GetItem;
  * <BR>
  * <li>Creature</li>
  * <li>ItemInstance</li>
- * <li>L2Potion</li>
+ * <li>Potion</li>
  */
 public abstract class WorldObject
 {
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java
index cdd7e69777..8c397235bd 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java
@@ -72,10 +72,10 @@ import org.l2jmobius.gameserver.util.Util;
  * <BR>
  * Attackable :<BR>
  * <BR>
- * <li>L2ArtefactInstance</li>
+ * <li>ArtefactInstance</li>
  * <li>FriendlyMobInstance</li>
  * <li>MonsterInstance</li>
- * <li>L2SiegeGuardInstance</li>
+ * <li>SiegeGuardInstance</li>
  * @version $Revision: 1.24.2.3.2.16 $ $Date: 2009/04/13 02:11:03 $
  * @author scoria dev
  */
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 99a97b007e..6194da34bf 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -4179,7 +4179,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
 	 * <BR>
 	 * <B><U> Overridden in</U> :</B><BR>
 	 * <BR>
-	 * <li>L2NPCInstance</li>
+	 * <li>NPCInstance</li>
 	 * <li>PlayerInstance</li>
 	 * <li>Summon</li>
 	 * <li>DoorInstance</li><BR>
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
index 9b24aa3bf3..0e443969ca 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
@@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.util.MinionList;
 /**
  * This class manages all Monsters. MonsterInstance :<BR>
  * <BR>
- * <li>L2MinionInstance</li>
+ * <li>MinionInstance</li>
  * <li>RaidBossInstance</li>
  * <li>GrandBossInstance</li>
  * @version $Revision: 1.20.4.6 $ $Date: 2005/04/06 16:13:39 $
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java
index 9edd756e8c..e04aa3ef09 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java
@@ -100,7 +100,7 @@ import org.l2jmobius.gameserver.taskmanager.DecayTaskManager;
  * Creature :<BR>
  * <BR>
  * <li>Attackable</li>
- * <li>L2BoxInstance</li>
+ * <li>BoxInstance</li>
  * <li>FolkInstance</li>
  * @version $Revision: 1.32.2.7.2.24 $ $Date: 2009/04/13 09:17:09 $
  * @author programmos, scoria dev
@@ -646,7 +646,7 @@ public class NpcInstance extends Creature
 	 * <BR>
 	 * <B><U> Overriden in </U> :</B><BR>
 	 * <BR>
-	 * <li>L2ArtefactInstance : Manage only fisrt click to select Artefact</li><BR>
+	 * <li>ArtefactInstance : Manage only fisrt click to select Artefact</li><BR>
 	 * <BR>
 	 * <li>GuardInstance :</li><BR>
 	 * <BR>
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/CreatureAI.java
index 0ef99d6297..a8d82e6b8c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/CreatureAI.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/CreatureAI.java
@@ -65,7 +65,7 @@ import org.l2jmobius.gameserver.util.Util;
  * <ul>
  * <li>AttackableAI</li>
  * <li>DoorAI</li>
- * <li>L2PlayerAI</li>
+ * <li>PlayerAI</li>
  * <li>SummonAI</li>
  * </ul>
  */
@@ -972,7 +972,7 @@ public class CreatureAI extends AbstractAI
 	 * </ul>
 	 * <B><U> Example of use </U> :</B>
 	 * <ul>
-	 * <li>L2PLayerAI, SummonAI</li>
+	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
 	 * @param offset The Interact area radius
@@ -1079,7 +1079,7 @@ public class CreatureAI extends AbstractAI
 	 * </ul>
 	 * <B><U> Example of use </U> :</B>
 	 * <ul>
-	 * <li>L2PLayerAI, SummonAI</li>
+	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
 	 * @return True if the target is lost or dead (false if fakedeath)
@@ -1112,7 +1112,7 @@ public class CreatureAI extends AbstractAI
 	 * </ul>
 	 * <B><U> Example of use </U> :</B>
 	 * <ul>
-	 * <li>L2PLayerAI, SummonAI</li>
+	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
 	 * @return True if the target is lost
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/PlayableAI.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/PlayableAI.java
index dc6c4e9b43..1a0a98dbd2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/PlayableAI.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/PlayableAI.java
@@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
  * This class manages AI of Playable.<br>
  * PlayableAI :
  * <li>SummonAI</li>
- * <li>L2PlayerAI</li>
+ * <li>PlayerAI</li>
  * @author JIV
  */
 public abstract class PlayableAI extends CreatureAI
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 2a5de0fbd8..ca398c1f67 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -163,9 +163,9 @@ import org.l2jmobius.gameserver.util.Util;
  * <li>DoorInstance</li>
  * <li>Playable</li>
  * <li>Npc</li>
- * <li>L2StaticObjectInstance</li>
- * <li>L2Trap</li>
- * <li>L2Vehicle</li>
+ * <li>StaticObjectInstance</li>
+ * <li>Trap</li>
+ * <li>Vehicle</li>
  * </ul>
  * <br>
  * <b>Concept of CreatureTemplate:</b><br>
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
index 04ae85b3b0..7776ed7535 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
@@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.util.MinionList;
 /**
  * This class manages all Monsters. MonsterInstance:
  * <ul>
- * <li>L2MinionInstance</li>
+ * <li>MinionInstance</li>
  * <li>RaidBossInstance</li>
  * <li>GrandBossInstance</li>
  * </ul>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/CreatureAI.java
index e94ecaae84..7c28ca874b 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/CreatureAI.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/CreatureAI.java
@@ -60,7 +60,7 @@ import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
  * <ul>
  * <li>AttackableAI</li>
  * <li>DoorAI</li>
- * <li>L2PlayerAI</li>
+ * <li>PlayerAI</li>
  * <li>SummonAI</li>
  * </ul>
  */
@@ -923,7 +923,7 @@ public class CreatureAI extends AbstractAI
 	 * </ul>
 	 * <B><U> Example of use </U> :</B>
 	 * <ul>
-	 * <li>L2PLayerAI, SummonAI</li>
+	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
 	 * @param offset The Interact area radius
@@ -1030,7 +1030,7 @@ public class CreatureAI extends AbstractAI
 	 * </ul>
 	 * <B><U> Example of use </U> :</B>
 	 * <ul>
-	 * <li>L2PLayerAI, SummonAI</li>
+	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
 	 * @return True if the target is lost or dead (false if fakedeath)
@@ -1063,7 +1063,7 @@ public class CreatureAI extends AbstractAI
 	 * </ul>
 	 * <B><U> Example of use </U> :</B>
 	 * <ul>
-	 * <li>L2PLayerAI, SummonAI</li>
+	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
 	 * @return True if the target is lost
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/PlayableAI.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/PlayableAI.java
index a851c6399a..85e55cf15b 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/PlayableAI.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/PlayableAI.java
@@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
  * This class manages AI of Playable.<br>
  * PlayableAI :
  * <li>SummonAI</li>
- * <li>L2PlayerAI</li>
+ * <li>PlayerAI</li>
  * @author JIV
  */
 public abstract class PlayableAI extends CreatureAI
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 37794e7e5e..0cc114a8cc 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -163,9 +163,9 @@ import org.l2jmobius.gameserver.util.Util;
  * <li>DoorInstance</li>
  * <li>Playable</li>
  * <li>Npc</li>
- * <li>L2StaticObjectInstance</li>
- * <li>L2Trap</li>
- * <li>L2Vehicle</li>
+ * <li>StaticObjectInstance</li>
+ * <li>Trap</li>
+ * <li>Vehicle</li>
  * </ul>
  * <br>
  * <b>Concept of CreatureTemplate:</b><br>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
index e2904a0653..ccba1ab560 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
@@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.util.MinionList;
 /**
  * This class manages all Monsters. MonsterInstance:
  * <ul>
- * <li>L2MinionInstance</li>
+ * <li>MinionInstance</li>
  * <li>RaidBossInstance</li>
  * <li>GrandBossInstance</li>
  * </ul>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/CreatureAI.java
index e94ecaae84..7c28ca874b 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/CreatureAI.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/CreatureAI.java
@@ -60,7 +60,7 @@ import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
  * <ul>
  * <li>AttackableAI</li>
  * <li>DoorAI</li>
- * <li>L2PlayerAI</li>
+ * <li>PlayerAI</li>
  * <li>SummonAI</li>
  * </ul>
  */
@@ -923,7 +923,7 @@ public class CreatureAI extends AbstractAI
 	 * </ul>
 	 * <B><U> Example of use </U> :</B>
 	 * <ul>
-	 * <li>L2PLayerAI, SummonAI</li>
+	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
 	 * @param offset The Interact area radius
@@ -1030,7 +1030,7 @@ public class CreatureAI extends AbstractAI
 	 * </ul>
 	 * <B><U> Example of use </U> :</B>
 	 * <ul>
-	 * <li>L2PLayerAI, SummonAI</li>
+	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
 	 * @return True if the target is lost or dead (false if fakedeath)
@@ -1063,7 +1063,7 @@ public class CreatureAI extends AbstractAI
 	 * </ul>
 	 * <B><U> Example of use </U> :</B>
 	 * <ul>
-	 * <li>L2PLayerAI, SummonAI</li>
+	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
 	 * @return True if the target is lost
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/PlayableAI.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/PlayableAI.java
index a851c6399a..85e55cf15b 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/PlayableAI.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/PlayableAI.java
@@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
  * This class manages AI of Playable.<br>
  * PlayableAI :
  * <li>SummonAI</li>
- * <li>L2PlayerAI</li>
+ * <li>PlayerAI</li>
  * @author JIV
  */
 public abstract class PlayableAI extends CreatureAI
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 37794e7e5e..0cc114a8cc 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -163,9 +163,9 @@ import org.l2jmobius.gameserver.util.Util;
  * <li>DoorInstance</li>
  * <li>Playable</li>
  * <li>Npc</li>
- * <li>L2StaticObjectInstance</li>
- * <li>L2Trap</li>
- * <li>L2Vehicle</li>
+ * <li>StaticObjectInstance</li>
+ * <li>Trap</li>
+ * <li>Vehicle</li>
  * </ul>
  * <br>
  * <b>Concept of CreatureTemplate:</b><br>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
index e2904a0653..ccba1ab560 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
@@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.util.MinionList;
 /**
  * This class manages all Monsters. MonsterInstance:
  * <ul>
- * <li>L2MinionInstance</li>
+ * <li>MinionInstance</li>
  * <li>RaidBossInstance</li>
  * <li>GrandBossInstance</li>
  * </ul>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/CreatureAI.java
index e94ecaae84..7c28ca874b 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/CreatureAI.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/CreatureAI.java
@@ -60,7 +60,7 @@ import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
  * <ul>
  * <li>AttackableAI</li>
  * <li>DoorAI</li>
- * <li>L2PlayerAI</li>
+ * <li>PlayerAI</li>
  * <li>SummonAI</li>
  * </ul>
  */
@@ -923,7 +923,7 @@ public class CreatureAI extends AbstractAI
 	 * </ul>
 	 * <B><U> Example of use </U> :</B>
 	 * <ul>
-	 * <li>L2PLayerAI, SummonAI</li>
+	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
 	 * @param offset The Interact area radius
@@ -1030,7 +1030,7 @@ public class CreatureAI extends AbstractAI
 	 * </ul>
 	 * <B><U> Example of use </U> :</B>
 	 * <ul>
-	 * <li>L2PLayerAI, SummonAI</li>
+	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
 	 * @return True if the target is lost or dead (false if fakedeath)
@@ -1063,7 +1063,7 @@ public class CreatureAI extends AbstractAI
 	 * </ul>
 	 * <B><U> Example of use </U> :</B>
 	 * <ul>
-	 * <li>L2PLayerAI, SummonAI</li>
+	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
 	 * @return True if the target is lost
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/PlayableAI.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/PlayableAI.java
index a851c6399a..85e55cf15b 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/PlayableAI.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/PlayableAI.java
@@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
  * This class manages AI of Playable.<br>
  * PlayableAI :
  * <li>SummonAI</li>
- * <li>L2PlayerAI</li>
+ * <li>PlayerAI</li>
  * @author JIV
  */
 public abstract class PlayableAI extends CreatureAI
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 37794e7e5e..0cc114a8cc 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -163,9 +163,9 @@ import org.l2jmobius.gameserver.util.Util;
  * <li>DoorInstance</li>
  * <li>Playable</li>
  * <li>Npc</li>
- * <li>L2StaticObjectInstance</li>
- * <li>L2Trap</li>
- * <li>L2Vehicle</li>
+ * <li>StaticObjectInstance</li>
+ * <li>Trap</li>
+ * <li>Vehicle</li>
  * </ul>
  * <br>
  * <b>Concept of CreatureTemplate:</b><br>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
index e2904a0653..ccba1ab560 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
@@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.util.MinionList;
 /**
  * This class manages all Monsters. MonsterInstance:
  * <ul>
- * <li>L2MinionInstance</li>
+ * <li>MinionInstance</li>
  * <li>RaidBossInstance</li>
  * <li>GrandBossInstance</li>
  * </ul>
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/CreatureAI.java
index e94ecaae84..7c28ca874b 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/CreatureAI.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/CreatureAI.java
@@ -60,7 +60,7 @@ import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
  * <ul>
  * <li>AttackableAI</li>
  * <li>DoorAI</li>
- * <li>L2PlayerAI</li>
+ * <li>PlayerAI</li>
  * <li>SummonAI</li>
  * </ul>
  */
@@ -923,7 +923,7 @@ public class CreatureAI extends AbstractAI
 	 * </ul>
 	 * <B><U> Example of use </U> :</B>
 	 * <ul>
-	 * <li>L2PLayerAI, SummonAI</li>
+	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
 	 * @param offset The Interact area radius
@@ -1030,7 +1030,7 @@ public class CreatureAI extends AbstractAI
 	 * </ul>
 	 * <B><U> Example of use </U> :</B>
 	 * <ul>
-	 * <li>L2PLayerAI, SummonAI</li>
+	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
 	 * @return True if the target is lost or dead (false if fakedeath)
@@ -1063,7 +1063,7 @@ public class CreatureAI extends AbstractAI
 	 * </ul>
 	 * <B><U> Example of use </U> :</B>
 	 * <ul>
-	 * <li>L2PLayerAI, SummonAI</li>
+	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
 	 * @return True if the target is lost
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/PlayableAI.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/PlayableAI.java
index a851c6399a..85e55cf15b 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/PlayableAI.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/PlayableAI.java
@@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
  * This class manages AI of Playable.<br>
  * PlayableAI :
  * <li>SummonAI</li>
- * <li>L2PlayerAI</li>
+ * <li>PlayerAI</li>
  * @author JIV
  */
 public abstract class PlayableAI extends CreatureAI
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 65c57efdb1..000842d06d 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -164,9 +164,9 @@ import org.l2jmobius.gameserver.util.Util;
  * <li>DoorInstance</li>
  * <li>Playable</li>
  * <li>Npc</li>
- * <li>L2StaticObjectInstance</li>
- * <li>L2Trap</li>
- * <li>L2Vehicle</li>
+ * <li>StaticObjectInstance</li>
+ * <li>Trap</li>
+ * <li>Vehicle</li>
  * </ul>
  * <br>
  * <b>Concept of CreatureTemplate:</b><br>
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
index e2904a0653..ccba1ab560 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
@@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.util.MinionList;
 /**
  * This class manages all Monsters. MonsterInstance:
  * <ul>
- * <li>L2MinionInstance</li>
+ * <li>MinionInstance</li>
  * <li>RaidBossInstance</li>
  * <li>GrandBossInstance</li>
  * </ul>
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/CreatureAI.java
index e94ecaae84..7c28ca874b 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/CreatureAI.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/CreatureAI.java
@@ -60,7 +60,7 @@ import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
  * <ul>
  * <li>AttackableAI</li>
  * <li>DoorAI</li>
- * <li>L2PlayerAI</li>
+ * <li>PlayerAI</li>
  * <li>SummonAI</li>
  * </ul>
  */
@@ -923,7 +923,7 @@ public class CreatureAI extends AbstractAI
 	 * </ul>
 	 * <B><U> Example of use </U> :</B>
 	 * <ul>
-	 * <li>L2PLayerAI, SummonAI</li>
+	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
 	 * @param offset The Interact area radius
@@ -1030,7 +1030,7 @@ public class CreatureAI extends AbstractAI
 	 * </ul>
 	 * <B><U> Example of use </U> :</B>
 	 * <ul>
-	 * <li>L2PLayerAI, SummonAI</li>
+	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
 	 * @return True if the target is lost or dead (false if fakedeath)
@@ -1063,7 +1063,7 @@ public class CreatureAI extends AbstractAI
 	 * </ul>
 	 * <B><U> Example of use </U> :</B>
 	 * <ul>
-	 * <li>L2PLayerAI, SummonAI</li>
+	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
 	 * @return True if the target is lost
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/PlayableAI.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/PlayableAI.java
index a851c6399a..85e55cf15b 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/PlayableAI.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/PlayableAI.java
@@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
  * This class manages AI of Playable.<br>
  * PlayableAI :
  * <li>SummonAI</li>
- * <li>L2PlayerAI</li>
+ * <li>PlayerAI</li>
  * @author JIV
  */
 public abstract class PlayableAI extends CreatureAI
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 65c57efdb1..000842d06d 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -164,9 +164,9 @@ import org.l2jmobius.gameserver.util.Util;
  * <li>DoorInstance</li>
  * <li>Playable</li>
  * <li>Npc</li>
- * <li>L2StaticObjectInstance</li>
- * <li>L2Trap</li>
- * <li>L2Vehicle</li>
+ * <li>StaticObjectInstance</li>
+ * <li>Trap</li>
+ * <li>Vehicle</li>
  * </ul>
  * <br>
  * <b>Concept of CreatureTemplate:</b><br>
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
index e2904a0653..ccba1ab560 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
@@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.util.MinionList;
 /**
  * This class manages all Monsters. MonsterInstance:
  * <ul>
- * <li>L2MinionInstance</li>
+ * <li>MinionInstance</li>
  * <li>RaidBossInstance</li>
  * <li>GrandBossInstance</li>
  * </ul>
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/CreatureAI.java
index e94ecaae84..7c28ca874b 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/CreatureAI.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/CreatureAI.java
@@ -60,7 +60,7 @@ import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
  * <ul>
  * <li>AttackableAI</li>
  * <li>DoorAI</li>
- * <li>L2PlayerAI</li>
+ * <li>PlayerAI</li>
  * <li>SummonAI</li>
  * </ul>
  */
@@ -923,7 +923,7 @@ public class CreatureAI extends AbstractAI
 	 * </ul>
 	 * <B><U> Example of use </U> :</B>
 	 * <ul>
-	 * <li>L2PLayerAI, SummonAI</li>
+	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
 	 * @param offset The Interact area radius
@@ -1030,7 +1030,7 @@ public class CreatureAI extends AbstractAI
 	 * </ul>
 	 * <B><U> Example of use </U> :</B>
 	 * <ul>
-	 * <li>L2PLayerAI, SummonAI</li>
+	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
 	 * @return True if the target is lost or dead (false if fakedeath)
@@ -1063,7 +1063,7 @@ public class CreatureAI extends AbstractAI
 	 * </ul>
 	 * <B><U> Example of use </U> :</B>
 	 * <ul>
-	 * <li>L2PLayerAI, SummonAI</li>
+	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
 	 * @return True if the target is lost
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/PlayableAI.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/PlayableAI.java
index a851c6399a..85e55cf15b 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/PlayableAI.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/PlayableAI.java
@@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
  * This class manages AI of Playable.<br>
  * PlayableAI :
  * <li>SummonAI</li>
- * <li>L2PlayerAI</li>
+ * <li>PlayerAI</li>
  * @author JIV
  */
 public abstract class PlayableAI extends CreatureAI
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 65c57efdb1..000842d06d 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -164,9 +164,9 @@ import org.l2jmobius.gameserver.util.Util;
  * <li>DoorInstance</li>
  * <li>Playable</li>
  * <li>Npc</li>
- * <li>L2StaticObjectInstance</li>
- * <li>L2Trap</li>
- * <li>L2Vehicle</li>
+ * <li>StaticObjectInstance</li>
+ * <li>Trap</li>
+ * <li>Vehicle</li>
  * </ul>
  * <br>
  * <b>Concept of CreatureTemplate:</b><br>
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
index e2904a0653..ccba1ab560 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
@@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.util.MinionList;
 /**
  * This class manages all Monsters. MonsterInstance:
  * <ul>
- * <li>L2MinionInstance</li>
+ * <li>MinionInstance</li>
  * <li>RaidBossInstance</li>
  * <li>GrandBossInstance</li>
  * </ul>