diff --git a/L2J_DataPack/dist/game/data/stats/npcs/01500-01600.xml b/L2J_DataPack/dist/game/data/stats/npcs/01500-01600.xml
index 3595104d19840c4e545aa83967cf050cbb2098ad..7b91b270155a9644e0b228ac82d818073f4fa1e8 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/01500-01600.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/01500-01600.xml
@@ -4791,7 +4791,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1585" level="55" type="L2Npc" name="Granny Tiger ">
+	<npc id="1585" level="55" type="L2Npc" name="Granny Tiger">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_DataPack/dist/game/data/stats/npcs/04300-04400.xml b/L2J_DataPack/dist/game/data/stats/npcs/04300-04400.xml
index 2cd143961e76b4a05d29b81ff0e2cbabd5643434..93e306b9b590adb4c6994dcb504c8147e5f43d96 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/04300-04400.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/04300-04400.xml
@@ -394,7 +394,7 @@
 			<height normal="35" />
 		</collision>
 	</npc>
-	<npc id="4315" level="70" type="L2Warehouse" name="Warehouse Keeper" title="Fantasy Isle Warehouse Keeper ">
+	<npc id="4315" level="70" type="L2Warehouse" name="Warehouse Keeper" title="Fantasy Isle Warehouse Keeper">
 		<!-- TODO: Must be confirmed -->
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
diff --git a/L2J_DataPack/dist/game/data/stats/npcs/13000-13100.xml b/L2J_DataPack/dist/game/data/stats/npcs/13000-13100.xml
index 4652b4c1e3da575f49f32c8754b628f8f08aaf24..21d34f4aa2ce61590b488a1edcea8222a5cc49f0 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/13000-13100.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/13000-13100.xml
@@ -261,7 +261,7 @@
 			<height normal="0.01" />
 		</collision>
 	</npc>
-	<npc id="13014" level="85" type="L2Npc" name=" ">
+	<npc id="13014" level="85" type="L2Npc" name="">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_DataPack/dist/game/data/stats/npcs/13100-13200.xml b/L2J_DataPack/dist/game/data/stats/npcs/13100-13200.xml
index b98fe9c68c8bc2ebc2928acdc99dd8d2b88b8ce0..53baded947d39570fd01df6c7d95bf5e9dee8dca 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/13100-13200.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/13100-13200.xml
@@ -1635,7 +1635,7 @@
 			<height normal="36" />
 		</collision>
 	</npc>
-	<npc id="13142" level="55" type="L2Npc" name="Final Form ">
+	<npc id="13142" level="55" type="L2Npc" name="Final Form">
 		<!-- Confirmed CT2.5 -->
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
@@ -1672,7 +1672,7 @@
 			<height normal="38" />
 		</collision>
 	</npc>
-	<npc id="13143" level="55" type="L2Npc" name="Final Form ">
+	<npc id="13143" level="55" type="L2Npc" name="Final Form">
 		<!-- Confirmed CT2.5 -->
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_DataPack/dist/game/data/stats/npcs/14200-14300.xml b/L2J_DataPack/dist/game/data/stats/npcs/14200-14300.xml
index 57543304eb9e75a0627815b8bc09c6caa93d9fbb..dc8689e3a4e898156b51387ac3b9554a85ea0e12 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/14200-14300.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/14200-14300.xml
@@ -4166,7 +4166,7 @@
 			<height normal="15" />
 		</collision>
 	</npc>
-	<npc id="14295" level="22" type="L2Pet" name="Boxer the Unicorn ">
+	<npc id="14295" level="22" type="L2Pet" name="Boxer the Unicorn">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="HealMagic" id="4025" level="2" /> <!-- Master Recharge -->
@@ -4252,7 +4252,7 @@
 			<height normal="18" />
 		</collision>
 	</npc>
-	<npc id="14297" level="32" type="L2Pet" name="Boxer the Unicorn ">
+	<npc id="14297" level="32" type="L2Pet" name="Boxer the Unicorn">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="HealMagic" id="4025" level="3" /> <!-- Master Recharge -->
@@ -4338,7 +4338,7 @@
 			<height normal="18" />
 		</collision>
 	</npc>
-	<npc id="14299" level="42" type="L2Pet" name="Boxer the Unicorn ">
+	<npc id="14299" level="42" type="L2Pet" name="Boxer the Unicorn">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="HealMagic" id="4025" level="4" /> <!-- Master Recharge -->
diff --git a/L2J_DataPack/dist/game/data/stats/npcs/14300-14400.xml b/L2J_DataPack/dist/game/data/stats/npcs/14300-14400.xml
index d5fffb26154ecd7b7d57dde6e0fffc234805f979..7c626bc5e9f1288a010db4a37302f62be48f90ae 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/14300-14400.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/14300-14400.xml
@@ -1914,7 +1914,7 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="14344" level="27" type="L2Pet" name="Mirage the Unicorn ">
+	<npc id="14344" level="27" type="L2Pet" name="Mirage the Unicorn">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4261" level="2" /> <!-- Mega Storm Strike -->
@@ -2000,7 +2000,7 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="14346" level="37" type="L2Pet" name="Mirage the Unicorn ">
+	<npc id="14346" level="37" type="L2Pet" name="Mirage the Unicorn">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4261" level="3" /> <!-- Mega Storm Strike -->
@@ -2086,7 +2086,7 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="14348" level="46" type="L2Pet" name="Mirage the Unicorn ">
+	<npc id="14348" level="46" type="L2Pet" name="Mirage the Unicorn">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4261" level="4" /> <!-- Mega Storm Strike -->
@@ -2645,7 +2645,7 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="14361" level="78" type="L2Pet" name="Mirage the Unicorn ">
+	<npc id="14361" level="78" type="L2Pet" name="Mirage the Unicorn">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4261" level="8" /> <!-- Mega Storm Strike -->
@@ -2688,7 +2688,7 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="14362" level="78" type="L2Pet" name="Mirage the Unicorn ">
+	<npc id="14362" level="78" type="L2Pet" name="Mirage the Unicorn">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4261" level="8" /> <!-- Mega Storm Strike -->
@@ -2731,7 +2731,7 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="14363" level="78" type="L2Pet" name="Mirage the Unicorn ">
+	<npc id="14363" level="78" type="L2Pet" name="Mirage the Unicorn">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4261" level="8" /> <!-- Mega Storm Strike -->
@@ -2774,7 +2774,7 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="14364" level="78" type="L2Pet" name="Mirage the Unicorn ">
+	<npc id="14364" level="78" type="L2Pet" name="Mirage the Unicorn">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4261" level="8" /> <!-- Mega Storm Strike -->
@@ -2817,7 +2817,7 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="14365" level="79" type="L2Pet" name="Mirage the Unicorn ">
+	<npc id="14365" level="79" type="L2Pet" name="Mirage the Unicorn">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4261" level="8" /> <!-- Mega Storm Strike -->
@@ -2860,7 +2860,7 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="14366" level="79" type="L2Pet" name="Mirage the Unicorn ">
+	<npc id="14366" level="79" type="L2Pet" name="Mirage the Unicorn">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4261" level="8" /> <!-- Mega Storm Strike -->
@@ -2903,7 +2903,7 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="14367" level="79" type="L2Pet" name="Mirage the Unicorn ">
+	<npc id="14367" level="79" type="L2Pet" name="Mirage the Unicorn">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4261" level="9" /> <!-- Mega Storm Strike -->
@@ -2946,7 +2946,7 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="14368" level="79" type="L2Pet" name="Mirage the Unicorn ">
+	<npc id="14368" level="79" type="L2Pet" name="Mirage the Unicorn">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4261" level="9" /> <!-- Mega Storm Strike -->
@@ -2989,7 +2989,7 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="14369" level="80" type="L2Pet" name="Mirage the Unicorn ">
+	<npc id="14369" level="80" type="L2Pet" name="Mirage the Unicorn">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4261" level="9" /> <!-- Mega Storm Strike -->
@@ -3033,7 +3033,7 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="14370" level="80" type="L2Pet" name="Mirage the Unicorn ">
+	<npc id="14370" level="80" type="L2Pet" name="Mirage the Unicorn">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4261" level="9" /> <!-- Mega Storm Strike -->
@@ -3077,7 +3077,7 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="14371" level="80" type="L2Pet" name="Mirage the Unicorn ">
+	<npc id="14371" level="80" type="L2Pet" name="Mirage the Unicorn">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4261" level="9" /> <!-- Mega Storm Strike -->
@@ -3121,7 +3121,7 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="14372" level="80" type="L2Pet" name="Mirage the Unicorn ">
+	<npc id="14372" level="80" type="L2Pet" name="Mirage the Unicorn">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4261" level="9" /> <!-- Mega Storm Strike -->
@@ -3165,7 +3165,7 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="14373" level="81" type="L2Pet" name="Mirage the Unicorn ">
+	<npc id="14373" level="81" type="L2Pet" name="Mirage the Unicorn">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4261" level="10" /> <!-- Mega Storm Strike -->
@@ -3209,7 +3209,7 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="14374" level="81" type="L2Pet" name="Mirage the Unicorn ">
+	<npc id="14374" level="81" type="L2Pet" name="Mirage the Unicorn">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4261" level="10" /> <!-- Mega Storm Strike -->
@@ -3253,7 +3253,7 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="14375" level="81" type="L2Pet" name="Mirage the Unicorn ">
+	<npc id="14375" level="81" type="L2Pet" name="Mirage the Unicorn">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4261" level="10" /> <!-- Mega Storm Strike -->
@@ -3297,7 +3297,7 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="14376" level="81" type="L2Pet" name="Mirage the Unicorn ">
+	<npc id="14376" level="81" type="L2Pet" name="Mirage the Unicorn">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4261" level="10" /> <!-- Mega Storm Strike -->
@@ -3341,7 +3341,7 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="14377" level="82" type="L2Pet" name="Mirage the Unicorn ">
+	<npc id="14377" level="82" type="L2Pet" name="Mirage the Unicorn">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4261" level="10" /> <!-- Mega Storm Strike -->
@@ -3385,7 +3385,7 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="14378" level="82" type="L2Pet" name="Mirage the Unicorn ">
+	<npc id="14378" level="82" type="L2Pet" name="Mirage the Unicorn">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4261" level="10" /> <!-- Mega Storm Strike -->
@@ -3429,7 +3429,7 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="14379" level="82" type="L2Pet" name="Mirage the Unicorn ">
+	<npc id="14379" level="82" type="L2Pet" name="Mirage the Unicorn">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4261" level="11" /> <!-- Mega Storm Strike -->
@@ -3473,7 +3473,7 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="14380" level="82" type="L2Pet" name="Mirage the Unicorn ">
+	<npc id="14380" level="82" type="L2Pet" name="Mirage the Unicorn">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4261" level="11" /> <!-- Mega Storm Strike -->
@@ -3517,7 +3517,7 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="14381" level="83" type="L2Pet" name="Mirage the Unicorn ">
+	<npc id="14381" level="83" type="L2Pet" name="Mirage the Unicorn">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4261" level="11" /> <!-- Mega Storm Strike -->
@@ -3561,7 +3561,7 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="14382" level="83" type="L2Pet" name="Mirage the Unicorn ">
+	<npc id="14382" level="83" type="L2Pet" name="Mirage the Unicorn">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4261" level="11" /> <!-- Mega Storm Strike -->
@@ -3605,7 +3605,7 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="14383" level="83" type="L2Pet" name="Mirage the Unicorn ">
+	<npc id="14383" level="83" type="L2Pet" name="Mirage the Unicorn">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4261" level="11" /> <!-- Mega Storm Strike -->
@@ -3649,7 +3649,7 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="14384" level="83" type="L2Pet" name="Mirage the Unicorn ">
+	<npc id="14384" level="83" type="L2Pet" name="Mirage the Unicorn">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4261" level="11" /> <!-- Mega Storm Strike -->
@@ -3693,7 +3693,7 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="14385" level="84" type="L2Pet" name="Mirage the Unicorn ">
+	<npc id="14385" level="84" type="L2Pet" name="Mirage the Unicorn">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4261" level="12" /> <!-- Mega Storm Strike -->
@@ -3737,7 +3737,7 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="14386" level="84" type="L2Pet" name="Mirage the Unicorn ">
+	<npc id="14386" level="84" type="L2Pet" name="Mirage the Unicorn">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4261" level="12" /> <!-- Mega Storm Strike -->
@@ -3781,7 +3781,7 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="14387" level="84" type="L2Pet" name="Mirage the Unicorn ">
+	<npc id="14387" level="84" type="L2Pet" name="Mirage the Unicorn">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4261" level="12" /> <!-- Mega Storm Strike -->
@@ -3825,7 +3825,7 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="14388" level="85" type="L2Pet" name="Mirage the Unicorn ">
+	<npc id="14388" level="85" type="L2Pet" name="Mirage the Unicorn">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4261" level="12" /> <!-- Mega Storm Strike -->
@@ -3869,7 +3869,7 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="14389" level="85" type="L2Pet" name="Mirage the Unicorn ">
+	<npc id="14389" level="85" type="L2Pet" name="Mirage the Unicorn">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4261" level="12" /> <!-- Mega Storm Strike -->
@@ -3913,7 +3913,7 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="14390" level="85" type="L2Pet" name="Mirage the Unicorn ">
+	<npc id="14390" level="85" type="L2Pet" name="Mirage the Unicorn">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4261" level="12" /> <!-- Mega Storm Strike -->
diff --git a/L2J_DataPack/dist/game/data/stats/npcs/18800-18900.xml b/L2J_DataPack/dist/game/data/stats/npcs/18800-18900.xml
index b3ea293934538da5a314e09f58621cd2c6fc9eaa..88dad3e476813adeffd2a68f8e9f41df15422b26 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/18800-18900.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/18800-18900.xml
@@ -2138,7 +2138,7 @@
 			<height normal="30" />
 		</collision>
 	</npc>
-	<npc id="18850" level="85" type="L2QuestGuard" name="Jinia ">
+	<npc id="18850" level="85" type="L2QuestGuard" name="Jinia">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="Skill01_ID" id="6641" level="1" /> <!-- Holy Ball -->
@@ -2222,7 +2222,7 @@
 			<height normal="27.5" />
 		</collision>
 	</npc>
-	<npc id="18852" level="85" type="L2Npc" name="Sirra ">
+	<npc id="18852" level="85" type="L2Npc" name="Sirra">
 		<!-- Confirmed CT2.5 -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
@@ -2678,7 +2678,7 @@
 			<height normal="35" grown="42.2" />
 		</collision>
 	</npc>
-	<npc id="18863" level="84" type="L2Monster" name="Seer Ugoros" title="Tanta Lizardmen ">
+	<npc id="18863" level="84" type="L2Monster" name="Seer Ugoros" title="Tanta Lizardmen">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="Skill01_ID" id="6426" level="1" /> <!-- Priest's Ire -->
diff --git a/L2J_DataPack/dist/game/data/stats/npcs/18900-19000.xml b/L2J_DataPack/dist/game/data/stats/npcs/18900-19000.xml
index c78b4b1cbbc7c519eaedae601d400a72077530ad..1917a9257563bfbe805bf498821e96816b492403 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/18900-19000.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/18900-19000.xml
@@ -1228,7 +1228,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="18921" level="84" type="L2Npc" name="Square Base ">
+	<npc id="18921" level="84" type="L2Npc" name="Square Base">
 		<!-- Confirmed CT2.5 -->
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
diff --git a/L2J_DataPack/dist/game/data/stats/npcs/20200-20300.xml b/L2J_DataPack/dist/game/data/stats/npcs/20200-20300.xml
index 64a417385e34d168720e504ff25388912331b6a9..f441455f726ab64ab3dcdfca65dc2dd0048d7786 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/20200-20300.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/20200-20300.xml
@@ -8260,7 +8260,7 @@
 			<height normal="22" grown="27" />
 		</collision>
 	</npc>
-	<npc id="20297" level="23" type="L2Monster" name="Virud Lizardman Shaman ">
+	<npc id="20297" level="23" type="L2Monster" name="Virud Lizardman Shaman">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="75" />
@@ -8313,7 +8313,7 @@
 			<height normal="29" />
 		</collision>
 	</npc>
-	<npc id="20298" level="23" type="L2Monster" name="Virud Lizardman Shaman ">
+	<npc id="20298" level="23" type="L2Monster" name="Virud Lizardman Shaman">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="75" />
diff --git a/L2J_DataPack/dist/game/data/stats/npcs/20500-20600.xml b/L2J_DataPack/dist/game/data/stats/npcs/20500-20600.xml
index b9c64ca3e499b4a2107b977d37b1630aecfd4a12..ac0d790a1e7034f44d0b53aee16565f4e447f5ee 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/20500-20600.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/20500-20600.xml
@@ -6961,7 +6961,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="20574" level="51" type="L2Monster" name="Elder Tarlk Basilisk ">
+	<npc id="20574" level="51" type="L2Monster" name="Elder Tarlk Basilisk">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_DataPack/dist/game/data/stats/npcs/20700-20800.xml b/L2J_DataPack/dist/game/data/stats/npcs/20700-20800.xml
index 98b025f13eccc175cb0ac9ca4a8feefc3f76cc1a..f20be1e9f2c9cba171c712f3bb81d7cfd8578a53 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/20700-20800.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/20700-20800.xml
@@ -2947,7 +2947,7 @@
 			<height normal="33.5" />
 		</collision>
 	</npc>
-	<npc id="20774" level="70" type="L2Monster" name="Conjurer Bat ">
+	<npc id="20774" level="70" type="L2Monster" name="Conjurer Bat">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_DataPack/dist/game/data/stats/npcs/21000-21100.xml b/L2J_DataPack/dist/game/data/stats/npcs/21000-21100.xml
index 36901db52e2b92683be380ced7a4d221d8b61710..9c024a5f63b0cf9f872573c4779b4e592b79db1a 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/21000-21100.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/21000-21100.xml
@@ -1098,7 +1098,7 @@
 			<height normal="27" />
 		</collision>
 	</npc>
-	<npc id="21009" level="63" type="L2Monster" name="Doom Trooper ">
+	<npc id="21009" level="63" type="L2Monster" name="Doom Trooper">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -7527,7 +7527,7 @@
 			<height normal="24.5" />
 		</collision>
 	</npc>
-	<npc id="21096" level="22" type="L2Monster" name="Cloudy Beast ">
+	<npc id="21096" level="22" type="L2Monster" name="Cloudy Beast">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="90" />
diff --git a/L2J_DataPack/dist/game/data/stats/npcs/21200-21300.xml b/L2J_DataPack/dist/game/data/stats/npcs/21200-21300.xml
index e5f5e409e9697a3b3aa69b3bac8ea12ab99e6fc7..18a4e9674baccdd263ddda51045ee8c56b3d4c50 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/21200-21300.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/21200-21300.xml
@@ -2403,7 +2403,7 @@
 			<height normal="42" />
 		</collision>
 	</npc>
-	<npc id="21228" level="70" type="L2Monster" name="Sepulcher Guard ">
+	<npc id="21228" level="70" type="L2Monster" name="Sepulcher Guard">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="80" />
@@ -4349,7 +4349,7 @@
 			<height normal="42" />
 		</collision>
 	</npc>
-	<npc id="21252" level="70" type="L2Monster" name="Crypt Guard ">
+	<npc id="21252" level="70" type="L2Monster" name="Crypt Guard">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="80" />
@@ -8553,7 +8553,7 @@
 			<height normal="34" />
 		</collision>
 	</npc>
-	<npc id="21296" level="70" type="L2Monster" name="Canyon Bandersnatch ">
+	<npc id="21296" level="70" type="L2Monster" name="Canyon Bandersnatch">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="78" />
@@ -8717,7 +8717,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="21298" level="71" type="L2Monster" name="Eye of Restrainer ">
+	<npc id="21298" level="71" type="L2Monster" name="Eye of Restrainer">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_DataPack/dist/game/data/stats/npcs/21400-21500.xml b/L2J_DataPack/dist/game/data/stats/npcs/21400-21500.xml
index ad9d6b6a5847a105d48e6d90e3623128da6e9f8f..6b9401a9e4d167c7f0abf9c25281847b9edeea5b 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/21400-21500.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/21400-21500.xml
@@ -2957,7 +2957,7 @@
 			<height normal="43.6" grown="52.5" />
 		</collision>
 	</npc>
-	<npc id="21434" level="78" type="L2Monster" name="Seer of Blood ">
+	<npc id="21434" level="78" type="L2Monster" name="Seer of Blood">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="90" />
@@ -3374,7 +3374,7 @@
 			<height normal="28.5" />
 		</collision>
 	</npc>
-	<npc id="21439" level="66" type="L2Monster" name="Heathen Executed ">
+	<npc id="21439" level="66" type="L2Monster" name="Heathen Executed">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="130" />
diff --git a/L2J_DataPack/dist/game/data/stats/npcs/21500-21600.xml b/L2J_DataPack/dist/game/data/stats/npcs/21500-21600.xml
index 8eacb42101f69cffb755e3a3a189a27991bbc93b..bbd163eefb6327456d651d556d9170ecc97b03a4 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/21500-21600.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/21500-21600.xml
@@ -8849,7 +8849,7 @@
 			<height normal="30" />
 		</collision>
 	</npc>
-	<npc id="21576" level="70" type="L2Monster" name="Ghost of Guillotine ">
+	<npc id="21576" level="70" type="L2Monster" name="Ghost of Guillotine">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="57" />
@@ -8969,7 +8969,7 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="21577" level="70" type="L2Monster" name="Ghost of Guillotine ">
+	<npc id="21577" level="70" type="L2Monster" name="Ghost of Guillotine">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="57" />
diff --git a/L2J_DataPack/dist/game/data/stats/npcs/21600-21700.xml b/L2J_DataPack/dist/game/data/stats/npcs/21600-21700.xml
index 7092f971ccd213ecce90ddeee08af30d30ff92a4..d94ecbfde4885ceb40826c8f731ae2f0bac7cc7b 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/21600-21700.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/21600-21700.xml
@@ -3715,7 +3715,7 @@
 			<height normal="22" grown="27" />
 		</collision>
 	</npc>
-	<npc id="21640" level="37" type="L2Monster" name="Tasaba Lizardman Shaman ">
+	<npc id="21640" level="37" type="L2Monster" name="Tasaba Lizardman Shaman">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="75" />
@@ -8460,7 +8460,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="21693" level="45" type="L2RiftInvader" name="Dimension Invader Berserker ">
+	<npc id="21693" level="45" type="L2RiftInvader" name="Dimension Invader Berserker">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="215" />
diff --git a/L2J_DataPack/dist/game/data/stats/npcs/22100-22200.xml b/L2J_DataPack/dist/game/data/stats/npcs/22100-22200.xml
index 94ac6c91bfe370eafe1d57e2791bf65d3bf56cdb..058e691cdcc944061d563dc903611aaee90a370a 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/22100-22200.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/22100-22200.xml
@@ -1084,7 +1084,7 @@
 			<height normal="43.6" />
 		</collision>
 	</npc>
-	<npc id="22112" level="74" type="L2Monster" name="Cannibalistic Stakato Follower ">
+	<npc id="22112" level="74" type="L2Monster" name="Cannibalistic Stakato Follower">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="90" />
@@ -1270,7 +1270,7 @@
 			<height normal="48.8" grown="59.4" />
 		</collision>
 	</npc>
-	<npc id="22114" level="75" type="L2Monster" name="Cannibalistic Stakato Leader ">
+	<npc id="22114" level="75" type="L2Monster" name="Cannibalistic Stakato Leader">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="80" />
diff --git a/L2J_DataPack/dist/game/data/stats/npcs/22300-22400.xml b/L2J_DataPack/dist/game/data/stats/npcs/22300-22400.xml
index aaaf2775c8acbcde6ec2a0d6c3b001a7c27e5047..75504c916c65223251282ed52d508ba7dd37de6b 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/22300-22400.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/22300-22400.xml
@@ -1302,7 +1302,7 @@
 			<height normal="41" />
 		</collision>
 	</npc>
-	<npc id="22315" level="83" type="L2Monster" name="Garden Guard ">
+	<npc id="22315" level="83" type="L2Monster" name="Garden Guard">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -8059,7 +8059,7 @@
 			<height normal="47.5" />
 		</collision>
 	</npc>
-	<npc id="22397" level="83" type="L2Monster" name="Foundry Foreman  ">
+	<npc id="22397" level="83" type="L2Monster" name="Foundry Foreman">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="160" />
diff --git a/L2J_DataPack/dist/game/data/stats/npcs/22400-22500.xml b/L2J_DataPack/dist/game/data/stats/npcs/22400-22500.xml
index 76c84a0986daae36a9f4873a0a08d106e1e2ece3..a07b9560a944d75602a2ca347ae1de233a13b4dd 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/22400-22500.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/22400-22500.xml
@@ -225,7 +225,7 @@
 			<height normal="80" />
 		</collision>
 	</npc>
-	<npc id="22403" level="83" type="L2Monster" name="Foundry Foreman  ">
+	<npc id="22403" level="83" type="L2Monster" name="Foundry Foreman">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="100" />
diff --git a/L2J_DataPack/dist/game/data/stats/npcs/22800-22900.xml b/L2J_DataPack/dist/game/data/stats/npcs/22800-22900.xml
index 5c534ab36ecdd0ceb0b2588c021361ed405848a0..25e03154acbf846eb33eae6ad86e61365124ffc9 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/22800-22900.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/22800-22900.xml
@@ -3683,7 +3683,7 @@
 			<height normal="32" />
 		</collision>
 	</npc>
-	<npc id="22843" level="85" type="L2Monster" name="Maluk Sniper ">
+	<npc id="22843" level="85" type="L2Monster" name="Maluk Sniper">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="IsAggressive" value="1" />
@@ -4035,7 +4035,7 @@
 			<height normal="49.9" />
 		</collision>
 	</npc>
-	<npc id="22847" level="85" type="L2Monster" name="Dragon Knight Warrior ">
+	<npc id="22847" level="85" type="L2Monster" name="Dragon Knight Warrior">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="Skill01_ID" id="6760" level="1" /> <!-- Dragon Strike -->
diff --git a/L2J_DataPack/dist/game/data/stats/npcs/25300-25400.xml b/L2J_DataPack/dist/game/data/stats/npcs/25300-25400.xml
index a2ef63722ad898a6381b3782283bd9b4d073ef61..a431b7c21b64edf92e3c7e9c9b48a0afb2d9df76 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/25300-25400.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/25300-25400.xml
@@ -4007,7 +4007,7 @@
 			<height normal="40.3" />
 		</collision>
 	</npc>
-	<npc id="25373" level="21" type="L2RaidBoss" name="Malex Herald of Dagoniel " title="Raid Boss">
+	<npc id="25373" level="21" type="L2RaidBoss" name="Malex Herald of Dagoniel" title="Raid Boss">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<minions name="Privates">
@@ -4872,7 +4872,7 @@
 			<height normal="55" />
 		</collision>
 	</npc>
-	<npc id="25389" level="34" type="L2Monster" name="Red Eye Archer " title="Raid Fighter">
+	<npc id="25389" level="34" type="L2Monster" name="Red Eye Archer" title="Raid Fighter">
 		<!-- Confirmed CT2.5 -->
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
diff --git a/L2J_DataPack/dist/game/data/stats/npcs/25400-25500.xml b/L2J_DataPack/dist/game/data/stats/npcs/25400-25500.xml
index 64f8574742e10320b3f4f23bbbb331999eb198ab..f59cc8e080dce3ddcc6ec5853e79d3ae9f609f6d 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/25400-25500.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/25400-25500.xml
@@ -362,7 +362,7 @@
 			<height normal="39" />
 		</collision>
 	</npc>
-	<npc id="25407" level="60" type="L2RaidBoss" name="Lord Ishka " title="Raid Boss">
+	<npc id="25407" level="60" type="L2RaidBoss" name="Lord Ishka" title="Raid Boss">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<minions name="Privates">
@@ -883,7 +883,7 @@
 			<height normal="125" />
 		</collision>
 	</npc>
-	<npc id="25416" level="39" type="L2Monster" name="Nakondas' Slave " title="Raid Fighter">
+	<npc id="25416" level="39" type="L2Monster" name="Nakondas' Slave" title="Raid Fighter">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic_a" id="4194" level="3" /> <!-- BOSS Aura Burn -->
@@ -926,7 +926,7 @@
 			<height normal="72" />
 		</collision>
 	</npc>
-	<npc id="25417" level="39" type="L2Monster" name="Nakondas' Chain " title="Raid Fighter">
+	<npc id="25417" level="39" type="L2Monster" name="Nakondas' Chain" title="Raid Fighter">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="HealMagic_a" id="4783" level="3" /> <!-- BOSS Heal -->
@@ -2641,7 +2641,7 @@
 			<height normal="38" />
 		</collision>
 	</npc>
-	<npc id="25448" level="70" type="L2Monster" name="Immortal Savior " title="Raid Fighter">
+	<npc id="25448" level="70" type="L2Monster" name="Immortal Savior" title="Raid Fighter">
 		<!-- Confirmed CT2.5 -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
@@ -3583,7 +3583,7 @@
 			<height normal="35" />
 		</collision>
 	</npc>
-	<npc id="25466" level="55" type="L2Monster" name="Garangky Guard " title="Raid Fighter">
+	<npc id="25466" level="55" type="L2Monster" name="Garangky Guard" title="Raid Fighter">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="PhysicalSpecial_a" id="4743" level="5" /> <!-- BOSS Strike -->
@@ -5286,7 +5286,7 @@
 			<height normal="72" />
 		</collision>
 	</npc>
-	<npc id="25497" level="51" type="L2Monster" name="Fafurion's Envoy   " title="Raid Fighter">
+	<npc id="25497" level="51" type="L2Monster" name="Fafurion's Envoy" title="Raid Fighter">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="PhysicalSpecial_a" id="4743" level="5" /> <!-- BOSS Strike -->
diff --git a/L2J_DataPack/dist/game/data/stats/npcs/25500-25600.xml b/L2J_DataPack/dist/game/data/stats/npcs/25500-25600.xml
index 22bb4e02caec33bbb516ddc2d0b80525011040fa..21e0abdb8d9f0af3e8d53630d90b1ee56b69dcfb 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/25500-25600.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/25500-25600.xml
@@ -471,7 +471,7 @@
 			<height normal="16.6" />
 		</collision>
 	</npc>
-	<npc id="25509" level="53" type="L2RaidBoss" name="Dark Shaman Varangka " title="Raid Boss">
+	<npc id="25509" level="53" type="L2RaidBoss" name="Dark Shaman Varangka" title="Raid Boss">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<minions name="Privates">
@@ -794,7 +794,7 @@
 			<height normal="50.8" />
 		</collision>
 	</npc>
-	<npc id="25515" level="79" type="L2Monster" name="Spiked Stakato  " title="Raid Fighter">
+	<npc id="25515" level="79" type="L2Monster" name="Spiked Stakato" title="Raid Fighter">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic_a" id="4195" level="8" /> <!-- BOSS Twister -->
@@ -838,7 +838,7 @@
 			<height normal="21" />
 		</collision>
 	</npc>
-	<npc id="25516" level="79" type="L2Monster" name="Spiked Stakato  " title="Raid Fighter">
+	<npc id="25516" level="79" type="L2Monster" name="Spiked Stakato" title="Raid Fighter">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="PhysicalSpecial_a" id="4726" level="8" /> <!-- Stun -->
diff --git a/L2J_DataPack/dist/game/data/stats/npcs/27000-27100.xml b/L2J_DataPack/dist/game/data/stats/npcs/27000-27100.xml
index 812a64680fb69b687d246a4d2010a1c661309216..0b77c7b9e65b175881523a5c0167c1a980693f6e 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/27000-27100.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/27000-27100.xml
@@ -2512,7 +2512,7 @@
 			<height normal="30" />
 		</collision>
 	</npc>
-	<npc id="27078" level="39" type="L2Monster" name="Trimden Lord " title="Quest Monster">
+	<npc id="27078" level="39" type="L2Monster" name="Trimden Lord" title="Quest Monster">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="80" />
diff --git a/L2J_DataPack/dist/game/data/stats/npcs/27100-27200.xml b/L2J_DataPack/dist/game/data/stats/npcs/27100-27200.xml
index 554a26f05fa3d261137dc26d7109ab0edcc09bc6..8d911da5b7121c81f402e7ba6741cef872c9ea18 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/27100-27200.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/27100-27200.xml
@@ -2308,7 +2308,7 @@
 			<height normal="37" />
 		</collision>
 	</npc>
-	<npc id="27153" level="3" type="L2Monster" name="Alexandro Sanches " title="Dark Lord">
+	<npc id="27153" level="3" type="L2Monster" name="Alexandro Sanches" title="Dark Lord">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_DataPack/dist/game/data/stats/npcs/27200-27300.xml b/L2J_DataPack/dist/game/data/stats/npcs/27200-27300.xml
index d28e9272f9e6c30733c9660090b2105d3566bfdb..aed11b5dafd1b8d3863df72094376ce0b76257e6 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/27200-27300.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/27200-27300.xml
@@ -3972,7 +3972,7 @@
 			<height normal="55" />
 		</collision>
 	</npc>
-	<npc id="27290" level="76" type="L2Monster" name="White Wing Commander " title="Quest Monster">
+	<npc id="27290" level="76" type="L2Monster" name="White Wing Commander" title="Quest Monster">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="90" />
diff --git a/L2J_DataPack/dist/game/data/stats/npcs/29000-29100.xml b/L2J_DataPack/dist/game/data/stats/npcs/29000-29100.xml
index 8ba3734ddf79afbc049f5ccc84a19547b9ab2790..56ad852d78e1f1dbcce427fc27c6f7909a0a0f92 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/29000-29100.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/29000-29100.xml
@@ -3053,7 +3053,7 @@
 			<height normal="40" />
 		</collision>
 	</npc>
-	<npc id="29052" level="85" type="L2Monster" name=" ">
+	<npc id="29052" level="85" type="L2Monster" name="">
 		<!-- Confirmed CT2.5 -->
 		<race>CONSTRUCT</race>
 		<sex>FEMALE</sex>
@@ -3093,7 +3093,7 @@
 			<height normal="35" />
 		</collision>
 	</npc>
-	<npc id="29053" level="85" type="L2Monster" name=" ">
+	<npc id="29053" level="85" type="L2Monster" name="">
 		<!-- Confirmed CT2.5 -->
 		<race>CONSTRUCT</race>
 		<sex>FEMALE</sex>
@@ -5910,7 +5910,7 @@
 			<height normal="41.8" />
 		</collision>
 	</npc>
-	<npc id="29097" level="80" type="L2Monster" name="Disciple of Splendor " title="Raid Fighter">
+	<npc id="29097" level="80" type="L2Monster" name="Disciple of Splendor" title="Raid Fighter">
 		<!-- Confirmed CT2.5 -->
 		<race>DIVINE</race>
 		<sex>MALE</sex>
diff --git a/L2J_DataPack/dist/game/data/stats/npcs/30000-30100.xml b/L2J_DataPack/dist/game/data/stats/npcs/30000-30100.xml
index d852b5ade8dc15bbc4a6afb8bda5d0422e42a367..bfc36f8f386b1489df665c8e0f9178f132e5d9cb 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/30000-30100.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/30000-30100.xml
@@ -1337,7 +1337,7 @@
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="30047" level="70" type="L2Merchant" name="Firon" title="Wharf Manager ">
+	<npc id="30047" level="70" type="L2Merchant" name="Firon" title="Wharf Manager">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_DataPack/dist/game/data/stats/npcs/30100-30200.xml b/L2J_DataPack/dist/game/data/stats/npcs/30100-30200.xml
index 94d2da36988f54ed452125b7981aed43802e4ae5..d5c476b1b7587cf853627cbfb33b783f948ee115 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/30100-30200.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/30100-30200.xml
@@ -1018,7 +1018,7 @@
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="30129" level="70" type="L2Npc" name="Mitraell" title="Hierarch ">
+	<npc id="30129" level="70" type="L2Npc" name="Mitraell" title="Hierarch">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1499,7 +1499,7 @@
 			<height normal="22.5" />
 		</collision>
 	</npc>
-	<npc id="30141" level="70" type="L2Npc" name="Talloth" title="Tetrarch ">
+	<npc id="30141" level="70" type="L2Npc" name="Talloth" title="Tetrarch">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1984,7 +1984,7 @@
 			<height normal="21" />
 		</collision>
 	</npc>
-	<npc id="30154" level="70" type="L2VillageMasterPriest" name="Asterios" title="Hierarch ">
+	<npc id="30154" level="70" type="L2VillageMasterPriest" name="Asterios" title="Hierarch">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_DataPack/dist/game/data/stats/npcs/30200-30300.xml b/L2J_DataPack/dist/game/data/stats/npcs/30200-30300.xml
index 5889a6f4b88346b21e500e0ec3d734b2681ed662..f6af4a381eaa63a53ba3612f3cce3386df8f6824 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/30200-30300.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/30200-30300.xml
@@ -568,7 +568,7 @@
 			<height normal="21" />
 		</collision>
 	</npc>
-	<npc id="30224" level="80" type="L2Guard" name="Rayla" title="Sentry Knight ">
+	<npc id="30224" level="80" type="L2Guard" name="Rayla" title="Sentry Knight">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_DataPack/dist/game/data/stats/npcs/30300-30400.xml b/L2J_DataPack/dist/game/data/stats/npcs/30300-30400.xml
index 9aaaf1f0ec33449e9eb49a098597fa7b2234744c..498111b232ca99296a8a6f44bf638969077fe9ba 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/30300-30400.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/30300-30400.xml
@@ -2718,7 +2718,7 @@
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="30387" level="70" type="L2Merchant" name="Clancy" title="Wharf Manager ">
+	<npc id="30387" level="70" type="L2Merchant" name="Clancy" title="Wharf Manager">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_DataPack/dist/game/data/stats/npcs/30400-30500.xml b/L2J_DataPack/dist/game/data/stats/npcs/30400-30500.xml
index 00f6f8f0b567e7bab77202171c2fc40ad31532c7..f93a9f13ca26881fba30235a583fa8765c1c3bed 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/30400-30500.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/30400-30500.xml
@@ -885,7 +885,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="30422" level="70" type="L2Npc" name="Kalinta" title="Abyssal Celebrant ">
+	<npc id="30422" level="70" type="L2Npc" name="Kalinta" title="Abyssal Celebrant">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2565,7 +2565,7 @@
 			<height normal="22" />
 		</collision>
 	</npc>
-	<npc id="30498" level="70" type="L2VillageMasterDwarf" name="Moke" title="Warehouse Chief ">
+	<npc id="30498" level="70" type="L2VillageMasterDwarf" name="Moke" title="Warehouse Chief">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_DataPack/dist/game/data/stats/npcs/30500-30600.xml b/L2J_DataPack/dist/game/data/stats/npcs/30500-30600.xml
index 1ab8eb151e2bda87718e7396ac61feaae32e6ceb..7f3b3d8da80367aa2ddd90f02fa2b9ddcccf9fb3 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/30500-30600.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/30500-30600.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
-	<npc id="30500" level="70" type="L2VillageMasterOrc" name="Osborn" title="High Prefect ">
+	<npc id="30500" level="70" type="L2VillageMasterOrc" name="Osborn" title="High Prefect">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -120,7 +120,7 @@
 			<height normal="29" />
 		</collision>
 	</npc>
-	<npc id="30503" level="70" type="L2VillageMasterDwarf" name="Rikadio" title="Warehouse Chief ">
+	<npc id="30503" level="70" type="L2VillageMasterDwarf" name="Rikadio" title="Warehouse Chief">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -200,7 +200,7 @@
 			<height normal="16.5" />
 		</collision>
 	</npc>
-	<npc id="30505" level="70" type="L2VillageMasterOrc" name="Drikus" title="High Prefect ">
+	<npc id="30505" level="70" type="L2VillageMasterOrc" name="Drikus" title="High Prefect">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -320,7 +320,7 @@
 			<height normal="29" />
 		</collision>
 	</npc>
-	<npc id="30508" level="70" type="L2VillageMasterOrc" name="Castor" title="High Prefect ">
+	<npc id="30508" level="70" type="L2VillageMasterOrc" name="Castor" title="High Prefect">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -440,7 +440,7 @@
 			<height normal="29" />
 		</collision>
 	</npc>
-	<npc id="30511" level="70" type="L2VillageMasterDwarf" name="Gesto" title="Warehouse Chief ">
+	<npc id="30511" level="70" type="L2VillageMasterDwarf" name="Gesto" title="Warehouse Chief">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -522,7 +522,7 @@
 			<height normal="16.5" />
 		</collision>
 	</npc>
-	<npc id="30513" level="70" type="L2VillageMasterOrc" name="Penatus" title="High Prefect ">
+	<npc id="30513" level="70" type="L2VillageMasterOrc" name="Penatus" title="High Prefect">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -803,7 +803,7 @@
 			<height normal="18" />
 		</collision>
 	</npc>
-	<npc id="30520" level="70" type="L2VillageMasterDwarf" name="Reed" title="Warehouse Chief ">
+	<npc id="30520" level="70" type="L2VillageMasterDwarf" name="Reed" title="Warehouse Chief">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2654,7 +2654,7 @@
 			<height normal="26" />
 		</collision>
 	</npc>
-	<npc id="30566" level="70" type="L2Npc" name="Varkees" title="Atuba Chief ">
+	<npc id="30566" level="70" type="L2Npc" name="Varkees" title="Atuba Chief">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2695,7 +2695,7 @@
 			<height normal="28.5" />
 		</collision>
 	</npc>
-	<npc id="30567" level="70" type="L2Npc" name="Tantus" title="Neruga Chief ">
+	<npc id="30567" level="70" type="L2Npc" name="Tantus" title="Neruga Chief">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2937,7 +2937,7 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="30573" level="70" type="L2Npc" name="Vulkus" title="Flame Guardian ">
+	<npc id="30573" level="70" type="L2Npc" name="Vulkus" title="Flame Guardian">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -3587,7 +3587,7 @@
 			<height normal="26" />
 		</collision>
 	</npc>
-	<npc id="30590" level="70" type="L2Npc" name="Rosheek" title="Khavatari ">
+	<npc id="30590" level="70" type="L2Npc" name="Rosheek" title="Khavatari">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -3627,7 +3627,7 @@
 			<height normal="28.5" />
 		</collision>
 	</npc>
-	<npc id="30591" level="70" type="L2Npc" name="Toruku" title="Khavatari ">
+	<npc id="30591" level="70" type="L2Npc" name="Toruku" title="Khavatari">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -3749,7 +3749,7 @@
 			<height normal="25.5" />
 		</collision>
 	</npc>
-	<npc id="30594" level="70" type="L2VillageMasterDwarf" name="Ranspo" title="Warehouse Chief ">
+	<npc id="30594" level="70" type="L2VillageMasterDwarf" name="Ranspo" title="Warehouse Chief">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_DataPack/dist/game/data/stats/npcs/30600-30700.xml b/L2J_DataPack/dist/game/data/stats/npcs/30600-30700.xml
index 18006734db89d94b8566907ad6fe76e9751f62c7..44dbd02def70ba0bea06c286c8030b881eeb4f64 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/30600-30700.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/30600-30700.xml
@@ -2103,7 +2103,7 @@
 			<height normal="22" />
 		</collision>
 	</npc>
-	<npc id="30657" level="70" type="L2Npc" name="Seresin" title="Cardinal ">
+	<npc id="30657" level="70" type="L2Npc" name="Seresin" title="Cardinal">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2865,7 +2865,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="30676" level="70" type="L2VillageMasterDwarf" name="Croop" title="Warehouse Chief ">
+	<npc id="30676" level="70" type="L2VillageMasterDwarf" name="Croop" title="Warehouse Chief">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -3070,7 +3070,7 @@
 			<height normal="22.2" />
 		</collision>
 	</npc>
-	<npc id="30681" level="70" type="L2VillageMasterOrc" name="Karia" title="High Prefect ">
+	<npc id="30681" level="70" type="L2VillageMasterOrc" name="Karia" title="High Prefect">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -3231,7 +3231,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="30685" level="70" type="L2VillageMasterDwarf" name="Baxt" title="Warehouse Chief ">
+	<npc id="30685" level="70" type="L2VillageMasterDwarf" name="Baxt" title="Warehouse Chief">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_DataPack/dist/game/data/stats/npcs/30700-30800.xml b/L2J_DataPack/dist/game/data/stats/npcs/30700-30800.xml
index b7319434ddcd067a50624ccaf8f2f1b7c6bddc17..e4948d05b44a17001099c2e0a7206dfc372e5e97 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/30700-30800.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/30700-30800.xml
@@ -162,7 +162,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="30704" level="70" type="L2VillageMasterOrc" name="Garvarentz" title="High Prefect ">
+	<npc id="30704" level="70" type="L2VillageMasterOrc" name="Garvarentz" title="High Prefect">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1613,7 +1613,7 @@
 			<height normal="18.5" />
 		</collision>
 	</npc>
-	<npc id="30739" level="70" type="L2Npc" name="Keltir" title="Royal Servant ">
+	<npc id="30739" level="70" type="L2Npc" name="Keltir" title="Royal Servant">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="80" />
@@ -1654,7 +1654,7 @@
 			<height normal="10" />
 		</collision>
 	</npc>
-	<npc id="30740" level="70" type="L2Npc" name="Toad" title="Royal Servant ">
+	<npc id="30740" level="70" type="L2Npc" name="Toad" title="Royal Servant">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1695,7 +1695,7 @@
 			<height normal="10" />
 		</collision>
 	</npc>
-	<npc id="30741" level="70" type="L2Npc" name="Rabbit" title="Royal Servant ">
+	<npc id="30741" level="70" type="L2Npc" name="Rabbit" title="Royal Servant">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_DataPack/dist/game/data/stats/npcs/30800-30900.xml b/L2J_DataPack/dist/game/data/stats/npcs/30800-30900.xml
index 1f822bd15122e55ca567aef1da9b7e512cd98a5d..c85fca6534b1a504940cf5820194a6a3002a439c 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/30800-30900.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/30800-30900.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
-	<npc id="30827" level="70" type="L2PetManager" name="Lundy" title="Pet Manager ">
+	<npc id="30827" level="70" type="L2PetManager" name="Lundy" title="Pet Manager">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -72,7 +72,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="30828" level="70" type="L2PetManager" name="Waters" title="Pet Manager ">
+	<npc id="30828" level="70" type="L2PetManager" name="Waters" title="Pet Manager">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -144,7 +144,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="30829" level="70" type="L2PetManager" name="Cooper" title="Pet Manager ">
+	<npc id="30829" level="70" type="L2PetManager" name="Cooper" title="Pet Manager">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -216,7 +216,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="30830" level="70" type="L2PetManager" name="Joey" title="Pet Manager ">
+	<npc id="30830" level="70" type="L2PetManager" name="Joey" title="Pet Manager">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -288,7 +288,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="30831" level="70" type="L2PetManager" name="Nelson" title="Pet Manager ">
+	<npc id="30831" level="70" type="L2PetManager" name="Nelson" title="Pet Manager">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -883,7 +883,7 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="30845" level="70" type="L2VillageMasterDwarf" name="Klump" title="Warehouse Chief ">
+	<npc id="30845" level="70" type="L2VillageMasterDwarf" name="Klump" title="Warehouse Chief">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1701,7 +1701,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="30865" level="70" type="L2VillageMasterOrc" name="Ladanza" title="High Prefect ">
+	<npc id="30865" level="70" type="L2VillageMasterOrc" name="Ladanza" title="High Prefect">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2913,7 +2913,7 @@
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="30894" level="70" type="L2VillageMasterDwarf" name="Natools" title="Warehouse Chief ">
+	<npc id="30894" level="70" type="L2VillageMasterDwarf" name="Natools" title="Warehouse Chief">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_DataPack/dist/game/data/stats/npcs/30900-31000.xml b/L2J_DataPack/dist/game/data/stats/npcs/30900-31000.xml
index cea377793d0dfbd691bc5992e49663d57277906b..527f10962232a2261c0d6ed9342889f7c8d5877a 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/30900-31000.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/30900-31000.xml
@@ -529,7 +529,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="30913" level="70" type="L2VillageMasterOrc" name="Tushku" title="High Prefect ">
+	<npc id="30913" level="70" type="L2VillageMasterOrc" name="Tushku" title="High Prefect">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2846,7 +2846,7 @@
 			<height normal="20.5" />
 		</collision>
 	</npc>
-	<npc id="30970" level="70" type="L2Npc" name="Dorothy" title="Locksmith ">
+	<npc id="30970" level="70" type="L2Npc" name="Dorothy" title="Locksmith">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2886,7 +2886,7 @@
 			<height normal="22.4" />
 		</collision>
 	</npc>
-	<npc id="30971" level="70" type="L2Npc" name="Orpheus" title="Mad Doctor ">
+	<npc id="30971" level="70" type="L2Npc" name="Orpheus" title="Mad Doctor">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -3586,7 +3586,7 @@
 			<height normal="8" />
 		</collision>
 	</npc>
-	<npc id="30988" level="70" type="L2Npc" name="Verce" title="Leathersmith ">
+	<npc id="30988" level="70" type="L2Npc" name="Verce" title="Leathersmith">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_DataPack/dist/game/data/stats/npcs/31400-31500.xml b/L2J_DataPack/dist/game/data/stats/npcs/31400-31500.xml
index cabfc2670338f429b9b34f77a3601bc368898592..f264c327da6a56aa7799d8f2a7f9721cf9b77e02 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/31400-31500.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/31400-31500.xml
@@ -434,7 +434,7 @@
 			<height normal="21.3" />
 		</collision>
 	</npc>
-	<npc id="31413" level="70" type="L2Merchant" name="Antonio" title="Spellbook Seller ">
+	<npc id="31413" level="70" type="L2Merchant" name="Antonio" title="Spellbook Seller">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -474,7 +474,7 @@
 			<height normal="22" />
 		</collision>
 	</npc>
-	<npc id="31414" level="70" type="L2Merchant" name="Lynn" title="Spellbook Seller ">
+	<npc id="31414" level="70" type="L2Merchant" name="Lynn" title="Spellbook Seller">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -514,7 +514,7 @@
 			<height normal="25.5" />
 		</collision>
 	</npc>
-	<npc id="31415" level="70" type="L2Merchant" name="Triya" title="Spellbook Seller ">
+	<npc id="31415" level="70" type="L2Merchant" name="Triya" title="Spellbook Seller">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -554,7 +554,7 @@
 			<height normal="22" />
 		</collision>
 	</npc>
-	<npc id="31416" level="70" type="L2Merchant" name="Aren" title="Spellbook Seller ">
+	<npc id="31416" level="70" type="L2Merchant" name="Aren" title="Spellbook Seller">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -594,7 +594,7 @@
 			<height normal="22" />
 		</collision>
 	</npc>
-	<npc id="31417" level="70" type="L2Merchant" name="Berynel" title="Spellbook Seller ">
+	<npc id="31417" level="70" type="L2Merchant" name="Berynel" title="Spellbook Seller">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -634,7 +634,7 @@
 			<height normal="21" />
 		</collision>
 	</npc>
-	<npc id="31418" level="70" type="L2Merchant" name="Rouke" title="Spellbook Seller ">
+	<npc id="31418" level="70" type="L2Merchant" name="Rouke" title="Spellbook Seller">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -674,7 +674,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="31419" level="70" type="L2Merchant" name="Lorel" title="Spellbook Seller ">
+	<npc id="31419" level="70" type="L2Merchant" name="Lorel" title="Spellbook Seller">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -714,7 +714,7 @@
 			<height normal="21" />
 		</collision>
 	</npc>
-	<npc id="31420" level="70" type="L2Merchant" name="Tomanel" title="Spellbook Seller ">
+	<npc id="31420" level="70" type="L2Merchant" name="Tomanel" title="Spellbook Seller">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -754,7 +754,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="31421" level="70" type="L2Merchant" name="Ratriya" title="Spellbook Seller ">
+	<npc id="31421" level="70" type="L2Merchant" name="Ratriya" title="Spellbook Seller">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -794,7 +794,7 @@
 			<height normal="25.5" />
 		</collision>
 	</npc>
-	<npc id="31422" level="70" type="L2Merchant" name="Migel" title="Spellbook Seller ">
+	<npc id="31422" level="70" type="L2Merchant" name="Migel" title="Spellbook Seller">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -834,7 +834,7 @@
 			<height normal="22" />
 		</collision>
 	</npc>
-	<npc id="31423" level="70" type="L2Merchant" name="Romas" title="Spellbook Seller ">
+	<npc id="31423" level="70" type="L2Merchant" name="Romas" title="Spellbook Seller">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -874,7 +874,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="31424" level="70" type="L2Merchant" name="Shantra" title="Amulet Seller ">
+	<npc id="31424" level="70" type="L2Merchant" name="Shantra" title="Amulet Seller">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -914,7 +914,7 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="31425" level="70" type="L2Merchant" name="Koram" title="Amulet Seller ">
+	<npc id="31425" level="70" type="L2Merchant" name="Koram" title="Amulet Seller">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -954,7 +954,7 @@
 			<height normal="29" />
 		</collision>
 	</npc>
-	<npc id="31426" level="70" type="L2Merchant" name="Jaka" title="Amulet Seller ">
+	<npc id="31426" level="70" type="L2Merchant" name="Jaka" title="Amulet Seller">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -994,7 +994,7 @@
 			<height normal="29" />
 		</collision>
 	</npc>
-	<npc id="31427" level="70" type="L2Merchant" name="Urgal" title="Amulet Seller ">
+	<npc id="31427" level="70" type="L2Merchant" name="Urgal" title="Amulet Seller">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1034,7 +1034,7 @@
 			<height normal="29" />
 		</collision>
 	</npc>
-	<npc id="31428" level="70" type="L2Merchant" name="Shafa" title="Amulet Seller ">
+	<npc id="31428" level="70" type="L2Merchant" name="Shafa" title="Amulet Seller">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1074,7 +1074,7 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="31429" level="70" type="L2Merchant" name="Shitara" title="Amulet Seller ">
+	<npc id="31429" level="70" type="L2Merchant" name="Shitara" title="Amulet Seller">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1114,7 +1114,7 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="31430" level="70" type="L2Merchant" name="Donai" title="Amulet Seller ">
+	<npc id="31430" level="70" type="L2Merchant" name="Donai" title="Amulet Seller">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1154,7 +1154,7 @@
 			<height normal="29" />
 		</collision>
 	</npc>
-	<npc id="31431" level="70" type="L2Merchant" name="Karai" title="Amulet Seller ">
+	<npc id="31431" level="70" type="L2Merchant" name="Karai" title="Amulet Seller">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_DataPack/dist/game/data/stats/npcs/31500-31600.xml b/L2J_DataPack/dist/game/data/stats/npcs/31500-31600.xml
index 81864a650d2972934af5aea6c390ead45e800239..287878013d17503f6b9b9aca8a20005ebd0372ef 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/31500-31600.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/31500-31600.xml
@@ -3683,7 +3683,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="31589" level="70" type="L2Npc" name="Duda-Mara Totem Spirit ">
+	<npc id="31589" level="70" type="L2Npc" name="Duda-Mara Totem Spirit">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_DataPack/dist/game/data/stats/npcs/31600-31700.xml b/L2J_DataPack/dist/game/data/stats/npcs/31600-31700.xml
index 0e2d2831f25690912572adf52cc5fc35f807922c..87092fa48668175676f01da2f12c49951ceaa05e 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/31600-31700.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/31600-31700.xml
@@ -2733,7 +2733,7 @@
 			<height normal="21.5" />
 		</collision>
 	</npc>
-	<npc id="31667" level="70" type="L2Merchant" name="Raik" title="Amulet Seller ">
+	<npc id="31667" level="70" type="L2Merchant" name="Raik" title="Amulet Seller">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -3688,7 +3688,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="31690" level="70" type="L2OlympiadManager" name="Monument of Heroes ">
+	<npc id="31690" level="70" type="L2OlympiadManager" name="Monument of Heroes">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_DataPack/dist/game/data/stats/npcs/31700-31800.xml b/L2J_DataPack/dist/game/data/stats/npcs/31700-31800.xml
index 32f4fef8ddaeff55ade3338a300154f7759ce869..961ac7afc8d17bd445c71f8cbfaf69f1e248f532 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/31700-31800.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/31700-31800.xml
@@ -365,7 +365,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="31709" level="70" type="L2Npc" name="Ketra Van Captain ">
+	<npc id="31709" level="70" type="L2Npc" name="Ketra Van Captain">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="NoFnHi" value="1" />
diff --git a/L2J_DataPack/dist/game/data/stats/npcs/31900-32000.xml b/L2J_DataPack/dist/game/data/stats/npcs/31900-32000.xml
index 75e17b6fced4251d2dee54faa7725887fb8dc18f..9f82495619ac23242081585496896f78662e616e 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/31900-32000.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/31900-32000.xml
@@ -2794,7 +2794,7 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="31958" level="70" type="L2VillageMasterDwarf" name="Yasheni" title="Warehouse Chief ">
+	<npc id="31958" level="70" type="L2VillageMasterDwarf" name="Yasheni" title="Warehouse Chief">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -3575,7 +3575,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="31977" level="70" type="L2VillageMasterOrc" name="Shaka" title="High Prefect ">
+	<npc id="31977" level="70" type="L2VillageMasterOrc" name="Shaka" title="High Prefect">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_DataPack/dist/game/data/stats/npcs/32000-32100.xml b/L2J_DataPack/dist/game/data/stats/npcs/32000-32100.xml
index 73c10a1b70991ace61dac3991dd3738786f5ac12..78ce5e7992998aadcd4b9fdd74d49ee180ff460c 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/32000-32100.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/32000-32100.xml
@@ -533,7 +533,7 @@
 			<height normal="20.5" />
 		</collision>
 	</npc>
-	<npc id="32014" level="70" type="L2Npc" name="Ivan " title="Runaway Youth">
+	<npc id="32014" level="70" type="L2Npc" name="Ivan" title="Runaway Youth">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2320,7 +2320,7 @@
 			<height normal="16.5" />
 		</collision>
 	</npc>
-	<npc id="32056" level="70" type="L2Npc" name="Aren" title="Khavatari ">
+	<npc id="32056" level="70" type="L2Npc" name="Aren" title="Khavatari">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_DataPack/dist/game/data/stats/npcs/32300-32400.xml b/L2J_DataPack/dist/game/data/stats/npcs/32300-32400.xml
index ed0a89ebe55d93762bec7489d9f08563039383ff..876d030bdb7d2e7faa2bd7de45aaa6cf416e5401 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/32300-32400.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/32300-32400.xml
@@ -2237,7 +2237,7 @@
 			<height normal="14" />
 		</collision>
 	</npc>
-	<npc id="32362" level="70" type="L2Npc" name="Hellbound Native ">
+	<npc id="32362" level="70" type="L2Npc" name="Hellbound Native">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_DataPack/dist/game/data/stats/npcs/32400-32500.xml b/L2J_DataPack/dist/game/data/stats/npcs/32400-32500.xml
index 3356c1a929d4dce8234075dad56362ee29b261cc..0783bc5ef52355396ac39e4e31ee393d23e16a1f 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/32400-32500.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/32400-32500.xml
@@ -3426,7 +3426,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="32499" level="70" type="L2Npc" name="Ketra Orc Shaman ">
+	<npc id="32499" level="70" type="L2Npc" name="Ketra Orc Shaman">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="90" />
diff --git a/L2J_DataPack/dist/game/data/stats/npcs/32500-32600.xml b/L2J_DataPack/dist/game/data/stats/npcs/32500-32600.xml
index 890ed692dd798ef0e8a99caa132711cfd7126c47..d479bfa22cfde83d47552e6c3344d331951cb7be 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/32500-32600.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/32500-32600.xml
@@ -708,7 +708,7 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="32518" level="70" type="L2Npc" name="Vortex Gate " title="Aerial Cleft">
+	<npc id="32518" level="70" type="L2Npc" name="Vortex Gate" title="Aerial Cleft">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -752,7 +752,7 @@
 			<height normal="130" />
 		</collision>
 	</npc>
-	<npc id="32519" level="70" type="L2Npc" name="Vortex Gate " title="Aerial Cleft">
+	<npc id="32519" level="70" type="L2Npc" name="Vortex Gate" title="Aerial Cleft">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2566,7 +2566,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="32566" level="70" type="L2Npc" name="Ginby" title="Soldier ">
+	<npc id="32566" level="70" type="L2Npc" name="Ginby" title="Soldier">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2729,7 +2729,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="32570" level="70" type="L2Npc" name="Eric" title="Herb Collector ">
+	<npc id="32570" level="70" type="L2Npc" name="Eric" title="Herb Collector">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_DataPack/dist/game/data/stats/npcs/32600-32700.xml b/L2J_DataPack/dist/game/data/stats/npcs/32600-32700.xml
index 9488a4005d40e9d1ef7a23b79e64d7c5da86b49d..0a9229d60ee626f97809f6959401db9c3cd49c61 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/32600-32700.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/32600-32700.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
-	<npc id="32600" level="70" type="L2Npc" name="Alegria" title="Birthday  Helper">
+	<npc id="32600" level="70" type="L2Npc" name="Alegria" title="Birthday Helper">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_DataPack/dist/game/data/stats/npcs/32700-32800.xml b/L2J_DataPack/dist/game/data/stats/npcs/32700-32800.xml
index 5ce17a514fac8cae26d37d9b057959f43017077f..610ade0f2eb5c2dc93931ef2dab25c2a028a7ace 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/32700-32800.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/32700-32800.xml
@@ -430,7 +430,7 @@
 			<height normal="18" />
 		</collision>
 	</npc>
-	<npc id="32712" level="80" type="L2Teleporter" name="Somulitan" title="Zaken Researcher ">
+	<npc id="32712" level="80" type="L2Teleporter" name="Somulitan" title="Zaken Researcher">
 		<!-- Confirmed CT2.5 -->
 		<race>ELF</race>
 		<sex>MALE</sex>
@@ -500,7 +500,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="32714" level="80" type="L2Teleporter" name="Asher " title="Gatekeeper">
+	<npc id="32714" level="80" type="L2Teleporter" name="Asher" title="Gatekeeper">
 		<!-- Confirmed CT2.5 -->
 		<race>HUMAN</race>
 		<sex>MALE</sex>
@@ -2131,7 +2131,7 @@
 			<height normal="30" />
 		</collision>
 	</npc>
-	<npc id="32760" level="80" type="L2Npc" name="Jinia ">
+	<npc id="32760" level="80" type="L2Npc" name="Jinia">
 		<!-- Confirmed CT2.5 -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
@@ -2201,7 +2201,7 @@
 			<height normal="27.5" />
 		</collision>
 	</npc>
-	<npc id="32762" level="80" type="L2Npc" name="Sirra ">
+	<npc id="32762" level="80" type="L2Npc" name="Sirra">
 		<!-- Confirmed CT2.5 -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
@@ -2236,7 +2236,7 @@
 			<height normal="22" />
 		</collision>
 	</npc>
-	<npc id="32763" level="80" type="L2Npc" name="Sirra " title="Ice Fairy">
+	<npc id="32763" level="80" type="L2Npc" name="Sirra" title="Ice Fairy">
 		<!-- Confirmed CT2.5 -->
 		<race>ELEMENTAL</race>
 		<sex>FEMALE</sex>
@@ -2884,7 +2884,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="32781" level="80" type="L2Npc" name="Jinia ">
+	<npc id="32781" level="80" type="L2Npc" name="Jinia">
 		<!-- Confirmed CT2.5 -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_DataPack/dist/game/data/stats/npcs/35300-35400.xml b/L2J_DataPack/dist/game/data/stats/npcs/35300-35400.xml
index 4213300397f35e532d664481bdd0aad5ba463597..0a4deaaea8f96ca4e97492ae0c3758707b7d7bbb 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/35300-35400.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/35300-35400.xml
@@ -769,7 +769,7 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="35316" level="75" type="L2Merchant" name="Neurath" title="Chamberlain ">
+	<npc id="35316" level="75" type="L2Merchant" name="Neurath" title="Chamberlain">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="fnAgitBuff" value="castlebuff" />
diff --git a/L2J_DataPack/dist/game/data/stats/npcs/35400-35500.xml b/L2J_DataPack/dist/game/data/stats/npcs/35400-35500.xml
index 4ba09b6bf6ae5a0228d94208c713200ccfff2b7d..41a89cae6478c2de4a6889b1a8d962038d2cc0e1 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/35400-35500.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/35400-35500.xml
@@ -688,7 +688,7 @@
 			<height normal="27" />
 		</collision>
 	</npc>
-	<npc id="35414" level="76" type="L2Defender" name="Doom Trooper ">
+	<npc id="35414" level="76" type="L2Defender" name="Doom Trooper">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_DataPack/dist/game/data/stats/npcs/35500-35600.xml b/L2J_DataPack/dist/game/data/stats/npcs/35500-35600.xml
index 57220211aca38ce0b8ee487047278bcb5cd11df3..456bd5f4b6f03a54a6e5b457d8671d62c419edd4 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/35500-35600.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/35500-35600.xml
@@ -843,7 +843,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="35518" level="79" type="L2Defender" name="Royal Knight" title="Schuttgart ">
+	<npc id="35518" level="79" type="L2Defender" name="Royal Knight" title="Schuttgart">
 		<!-- Confirmed CT2.5 -->
 		<race>CASTLE_GUARD</race>
 		<sex>MALE</sex>
@@ -886,7 +886,7 @@
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="35519" level="77" type="L2Defender" name="Court Sorcerer" title="Schuttgart ">
+	<npc id="35519" level="77" type="L2Defender" name="Court Sorcerer" title="Schuttgart">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4026" level="1" /> <!-- Gludio Flame -->
@@ -933,7 +933,7 @@
 			<height normal="22.5" />
 		</collision>
 	</npc>
-	<npc id="35520" level="77" type="L2Defender" name="Court Sorcerer" title="Schuttgart ">
+	<npc id="35520" level="77" type="L2Defender" name="Court Sorcerer" title="Schuttgart">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="MagicHeal" id="4027" level="1" /> <!-- Gludio Heal -->
@@ -980,7 +980,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="35521" level="77" type="L2Defender" name="Court Guard" title="Schuttgart ">
+	<npc id="35521" level="77" type="L2Defender" name="Court Guard" title="Schuttgart">
 		<!-- Confirmed CT2.5 -->
 		<race>CASTLE_GUARD</race>
 		<sex>MALE</sex>
@@ -1023,7 +1023,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="35522" level="75" type="L2Defender" name="Guard" title="Schuttgart ">
+	<npc id="35522" level="75" type="L2Defender" name="Guard" title="Schuttgart">
 		<!-- Confirmed CT2.5 -->
 		<race>CASTLE_GUARD</race>
 		<sex>MALE</sex>
@@ -1066,7 +1066,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="35523" level="75" type="L2Defender" name="Guard" title="Schuttgart ">
+	<npc id="35523" level="75" type="L2Defender" name="Guard" title="Schuttgart">
 		<!-- Confirmed CT2.5 -->
 		<race>CASTLE_GUARD</race>
 		<sex>MALE</sex>
@@ -1109,7 +1109,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="35524" level="75" type="L2Defender" name="Guard" title="Schuttgart ">
+	<npc id="35524" level="75" type="L2Defender" name="Guard" title="Schuttgart">
 		<!-- Confirmed CT2.5 -->
 		<race>CASTLE_GUARD</race>
 		<sex>MALE</sex>
@@ -1152,7 +1152,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="35525" level="75" type="L2Defender" name="Guard" title="Schuttgart ">
+	<npc id="35525" level="75" type="L2Defender" name="Guard" title="Schuttgart">
 		<!-- Confirmed CT2.5 -->
 		<race>CASTLE_GUARD</race>
 		<sex>FEMALE</sex>
@@ -1195,7 +1195,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="35526" level="75" type="L2Defender" name="Guard" title="Schuttgart ">
+	<npc id="35526" level="75" type="L2Defender" name="Guard" title="Schuttgart">
 		<!-- Confirmed CT2.5 -->
 		<race>CASTLE_GUARD</race>
 		<sex>FEMALE</sex>
@@ -1238,7 +1238,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="35527" level="75" type="L2Defender" name="Guard" title="Schuttgart ">
+	<npc id="35527" level="75" type="L2Defender" name="Guard" title="Schuttgart">
 		<!-- Confirmed CT2.5 -->
 		<race>CASTLE_GUARD</race>
 		<sex>FEMALE</sex>
@@ -1281,7 +1281,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="35528" level="75" type="L2Defender" name="Guard" title="Schuttgart ">
+	<npc id="35528" level="75" type="L2Defender" name="Guard" title="Schuttgart">
 		<!-- Confirmed CT2.5 -->
 		<race>CASTLE_GUARD</race>
 		<sex>MALE</sex>
@@ -1324,7 +1324,7 @@
 			<height normal="27" />
 		</collision>
 	</npc>
-	<npc id="35529" level="75" type="L2Defender" name="Guard" title="Schuttgart ">
+	<npc id="35529" level="75" type="L2Defender" name="Guard" title="Schuttgart">
 		<!-- Confirmed CT2.5 -->
 		<race>CASTLE_GUARD</race>
 		<sex>MALE</sex>
@@ -1367,7 +1367,7 @@
 			<height normal="27" />
 		</collision>
 	</npc>
-	<npc id="35530" level="75" type="L2Defender" name="Guard" title="Schuttgart ">
+	<npc id="35530" level="75" type="L2Defender" name="Guard" title="Schuttgart">
 		<!-- Confirmed CT2.5 -->
 		<race>CASTLE_GUARD</race>
 		<sex>MALE</sex>
@@ -1410,7 +1410,7 @@
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="35531" level="79" type="L2Defender" name="Royal Knight" title="Schuttgart ">
+	<npc id="35531" level="79" type="L2Defender" name="Royal Knight" title="Schuttgart">
 		<!-- Confirmed CT2.5 -->
 		<race>CASTLE_GUARD</race>
 		<sex>MALE</sex>
@@ -1453,7 +1453,7 @@
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="35532" level="77" type="L2Defender" name="Court Sorcerer" title="Schuttgart ">
+	<npc id="35532" level="77" type="L2Defender" name="Court Sorcerer" title="Schuttgart">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4026" level="1" /> <!-- Gludio Flame -->
@@ -1500,7 +1500,7 @@
 			<height normal="22.5" />
 		</collision>
 	</npc>
-	<npc id="35533" level="77" type="L2Defender" name="Court Sorcerer" title="Schuttgart ">
+	<npc id="35533" level="77" type="L2Defender" name="Court Sorcerer" title="Schuttgart">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="MagicHeal" id="4027" level="1" /> <!-- Gludio Heal -->
@@ -1547,7 +1547,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="35534" level="77" type="L2Defender" name="Court Guard" title="Schuttgart ">
+	<npc id="35534" level="77" type="L2Defender" name="Court Guard" title="Schuttgart">
 		<!-- Confirmed CT2.5 -->
 		<race>CASTLE_GUARD</race>
 		<sex>MALE</sex>
@@ -1590,7 +1590,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="35535" level="75" type="L2Defender" name="Guard" title="Schuttgart ">
+	<npc id="35535" level="75" type="L2Defender" name="Guard" title="Schuttgart">
 		<!-- Confirmed CT2.5 -->
 		<race>CASTLE_GUARD</race>
 		<sex>MALE</sex>
@@ -1633,7 +1633,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="35536" level="75" type="L2Defender" name="Guard" title="Schuttgart ">
+	<npc id="35536" level="75" type="L2Defender" name="Guard" title="Schuttgart">
 		<!-- Confirmed CT2.5 -->
 		<race>CASTLE_GUARD</race>
 		<sex>MALE</sex>
@@ -1676,7 +1676,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="35537" level="75" type="L2Defender" name="Guard" title="Schuttgart ">
+	<npc id="35537" level="75" type="L2Defender" name="Guard" title="Schuttgart">
 		<!-- Confirmed CT2.5 -->
 		<race>CASTLE_GUARD</race>
 		<sex>MALE</sex>
@@ -1719,7 +1719,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="35538" level="75" type="L2Defender" name="Guard" title="Schuttgart ">
+	<npc id="35538" level="75" type="L2Defender" name="Guard" title="Schuttgart">
 		<!-- Confirmed CT2.5 -->
 		<race>CASTLE_GUARD</race>
 		<sex>FEMALE</sex>
@@ -1762,7 +1762,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="35539" level="75" type="L2Defender" name="Guard" title="Schuttgart ">
+	<npc id="35539" level="75" type="L2Defender" name="Guard" title="Schuttgart">
 		<!-- Confirmed CT2.5 -->
 		<race>CASTLE_GUARD</race>
 		<sex>FEMALE</sex>
@@ -1805,7 +1805,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="35540" level="75" type="L2Defender" name="Guard" title="Schuttgart ">
+	<npc id="35540" level="75" type="L2Defender" name="Guard" title="Schuttgart">
 		<!-- Confirmed CT2.5 -->
 		<race>CASTLE_GUARD</race>
 		<sex>FEMALE</sex>
@@ -1848,7 +1848,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="35541" level="75" type="L2Defender" name="Guard" title="Schuttgart ">
+	<npc id="35541" level="75" type="L2Defender" name="Guard" title="Schuttgart">
 		<!-- Confirmed CT2.5 -->
 		<race>CASTLE_GUARD</race>
 		<sex>MALE</sex>
@@ -1891,7 +1891,7 @@
 			<height normal="27" />
 		</collision>
 	</npc>
-	<npc id="35542" level="75" type="L2Defender" name="Guard" title="Schuttgart ">
+	<npc id="35542" level="75" type="L2Defender" name="Guard" title="Schuttgart">
 		<!-- Confirmed CT2.5 -->
 		<race>CASTLE_GUARD</race>
 		<sex>MALE</sex>
@@ -1934,7 +1934,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="35543" level="75" type="L2Defender" name="Guard" title="Schuttgart ">
+	<npc id="35543" level="75" type="L2Defender" name="Guard" title="Schuttgart">
 		<!-- Confirmed CT2.5 -->
 		<race>CASTLE_GUARD</race>
 		<sex>MALE</sex>
@@ -1977,7 +1977,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="35544" level="75" type="L2CastleDoormen" name="Gatekeeper" title="Schuttgart ">
+	<npc id="35544" level="75" type="L2CastleDoormen" name="Gatekeeper" title="Schuttgart">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2040,7 +2040,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="35545" level="75" type="L2CastleDoormen" name="Gatekeeper" title="Schuttgart ">
+	<npc id="35545" level="75" type="L2CastleDoormen" name="Gatekeeper" title="Schuttgart">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2103,7 +2103,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="35546" level="75" type="L2CastleDoormen" name="Gatekeeper" title="Schuttgart ">
+	<npc id="35546" level="75" type="L2CastleDoormen" name="Gatekeeper" title="Schuttgart">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2166,7 +2166,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="35547" level="75" type="L2Npc" name="Mass Gatekeeper" title="Schuttgart ">
+	<npc id="35547" level="75" type="L2Npc" name="Mass Gatekeeper" title="Schuttgart">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2209,7 +2209,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="35548" level="75" type="L2CastleDoormen" name="Outer Doorman" title="Schuttgart ">
+	<npc id="35548" level="75" type="L2CastleDoormen" name="Outer Doorman" title="Schuttgart">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2258,7 +2258,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="35549" level="75" type="L2CastleDoormen" name="Inner Doorman" title="Schuttgart ">
+	<npc id="35549" level="75" type="L2CastleDoormen" name="Inner Doorman" title="Schuttgart">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2306,7 +2306,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="35550" level="75" type="L2CastleDoormen" name="Inner Doorman" title="Schuttgart ">
+	<npc id="35550" level="75" type="L2CastleDoormen" name="Inner Doorman" title="Schuttgart">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2354,7 +2354,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="35551" level="75" type="L2CastleDoormen" name="Doorman  " title="Schuttgart ">
+	<npc id="35551" level="75" type="L2CastleDoormen" name="Doorman" title="Schuttgart">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2402,7 +2402,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="35552" level="75" type="L2CastleDoormen" name="Doorman  " title="Schuttgart ">
+	<npc id="35552" level="75" type="L2CastleDoormen" name="Doorman" title="Schuttgart">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2450,7 +2450,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="35553" level="75" type="L2Npc" name="Blacksmith" title="Schuttgart ">
+	<npc id="35553" level="75" type="L2Npc" name="Blacksmith" title="Schuttgart">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2491,7 +2491,7 @@
 			<height normal="16.5" />
 		</collision>
 	</npc>
-	<npc id="35554" level="75" type="L2Warehouse" name="Warehouse Keeper" title="Schuttgart ">
+	<npc id="35554" level="75" type="L2Warehouse" name="Warehouse Keeper" title="Schuttgart">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2667,7 +2667,7 @@
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="35558" level="75" type="L2Merchant" name="Manor Manager" title="Schuttgart ">
+	<npc id="35558" level="75" type="L2Merchant" name="Manor Manager" title="Schuttgart">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_DataPack/dist/game/data/stats/npcs/35600-35700.xml b/L2J_DataPack/dist/game/data/stats/npcs/35600-35700.xml
index a6e5bc64473813fc89fda8efc7e71c39cf66b970..1914f8fdf9682b2a230118b51de1f316e8f19e41 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/35600-35700.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/35600-35700.xml
@@ -1961,7 +1961,7 @@
 			<height normal="23.5" grown="29" />
 		</collision>
 	</npc>
-	<npc id="35643" level="56" type="L2Npc" name="Gate  ">
+	<npc id="35643" level="56" type="L2Npc" name="Gate">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>ETC</sex>
diff --git a/L2J_DataPack/dist/game/data/stats/npcs/35700-35800.xml b/L2J_DataPack/dist/game/data/stats/npcs/35700-35800.xml
index d70e7578cfe947842622328e9a003f2eca430b30..de84da64ae6a21200afaabbe48b59e4ffc03d0e6 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/35700-35800.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/35700-35800.xml
@@ -1343,7 +1343,7 @@
 			<height normal="30" />
 		</collision>
 	</npc>
-	<npc id="35722" level="78" type="L2Defender" name="Minister " title="Officer's Barracks">
+	<npc id="35722" level="78" type="L2Defender" name="Minister" title="Officer's Barracks">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -5182,7 +5182,7 @@
 			<height normal="30" />
 		</collision>
 	</npc>
-	<npc id="35791" level="78" type="L2Defender" name="Minister " title="Officer's Barracks">
+	<npc id="35791" level="78" type="L2Defender" name="Minister" title="Officer's Barracks">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_DataPack/dist/game/data/stats/npcs/35800-35900.xml b/L2J_DataPack/dist/game/data/stats/npcs/35800-35900.xml
index 51536df27223c0cb2189214f86f85f683d5a78d9..d2e1e02739158fdfa621ca8ba6c0dff0fa5474f4 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/35800-35900.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/35800-35900.xml
@@ -5110,7 +5110,7 @@
 			<height normal="30" />
 		</collision>
 	</npc>
-	<npc id="35891" level="78" type="L2Defender" name="Minister " title="Officer's Barracks">
+	<npc id="35891" level="78" type="L2Defender" name="Minister" title="Officer's Barracks">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_DataPack/dist/game/data/stats/npcs/35900-36000.xml b/L2J_DataPack/dist/game/data/stats/npcs/35900-36000.xml
index 54bf02888d1e6da00ed507acc12a286b356cce38..40be162976bb7a1c21ee9cb9dffa6153ec207f73 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/35900-36000.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/35900-36000.xml
@@ -3370,7 +3370,7 @@
 			<height normal="30" />
 		</collision>
 	</npc>
-	<npc id="35960" level="78" type="L2Defender" name="Minister " title="Officer's Barracks">
+	<npc id="35960" level="78" type="L2Defender" name="Minister" title="Officer's Barracks">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -5469,7 +5469,7 @@
 			<height normal="30" />
 		</collision>
 	</npc>
-	<npc id="35998" level="78" type="L2Defender" name="Minister " title="Officer's Barracks">
+	<npc id="35998" level="78" type="L2Defender" name="Minister" title="Officer's Barracks">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_DataPack/dist/game/data/stats/npcs/36200-36300.xml b/L2J_DataPack/dist/game/data/stats/npcs/36200-36300.xml
index b22a2c6ff9e6a33ffd7bd9685159b168a5160209..4a8505310b73278cb14e0bb4b7e9df81c784a063 100644
--- a/L2J_DataPack/dist/game/data/stats/npcs/36200-36300.xml
+++ b/L2J_DataPack/dist/game/data/stats/npcs/36200-36300.xml
@@ -2437,7 +2437,7 @@
 			<height normal="30" />
 		</collision>
 	</npc>
-	<npc id="36243" level="78" type="L2Defender" name="Minister " title="Officer's Barracks">
+	<npc id="36243" level="78" type="L2Defender" name="Minister" title="Officer's Barracks">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />