diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/npcs/34400-34499.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/npcs/34400-34499.xml
index a503eae10c..b447ae7e7c 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/npcs/34400-34499.xml
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/npcs/34400-34499.xml
@@ -1340,7 +1340,7 @@
 			<height normal="29.35" />
 		</collision>
 	</npc>
-	<npc id="34471" level="85" type="Folk" name="Leona Blackbird" title="Lord">
+	<npc id="34471" level="85" type="FriendlyNpc" name="Leona Blackbird" title="Lord">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1360,7 +1360,7 @@
 			<height normal="22.4" />
 		</collision>
 	</npc>
-	<npc id="34472" level="85" type="Folk" name="Devianne" title="Truth Seeker">
+	<npc id="34472" level="85" type="FriendlyNpc" name="Devianne" title="Truth Seeker">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1379,7 +1379,7 @@
 			<height normal="21" />
 		</collision>
 	</npc>
-	<npc id="34473" level="85" type="Folk" name="Elikia" title="Verdure Elder">
+	<npc id="34473" level="85" type="FriendlyNpc" name="Elikia" title="Verdure Elder">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1399,7 +1399,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="34474" level="85" type="Folk" name="Sporcha" title="Blackbird Clan">
+	<npc id="34474" level="85" type="FriendlyNpc" name="Sporcha" title="Blackbird Clan">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1418,7 +1418,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="34475" level="85" type="Folk" name="Aliber" title="Bringer of Truth">
+	<npc id="34475" level="85" type="FriendlyNpc" name="Aliber" title="Bringer of Truth">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/npcs/34400-34499.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/npcs/34400-34499.xml
index 67e050f808..f5fbd385a0 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/npcs/34400-34499.xml
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/npcs/34400-34499.xml
@@ -1340,7 +1340,7 @@
 			<height normal="29.35" />
 		</collision>
 	</npc>
-	<npc id="34471" level="85" type="Folk" name="Leona Blackbird" title="Lord">
+	<npc id="34471" level="85" type="FriendlyNpc" name="Leona Blackbird" title="Lord">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1360,7 +1360,7 @@
 			<height normal="22.4" />
 		</collision>
 	</npc>
-	<npc id="34472" level="85" type="Folk" name="Devianne" title="Truth Seeker">
+	<npc id="34472" level="85" type="FriendlyNpc" name="Devianne" title="Truth Seeker">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1379,7 +1379,7 @@
 			<height normal="21" />
 		</collision>
 	</npc>
-	<npc id="34473" level="85" type="Folk" name="Elikia" title="Verdure Elder">
+	<npc id="34473" level="85" type="FriendlyNpc" name="Elikia" title="Verdure Elder">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1399,7 +1399,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="34474" level="85" type="Folk" name="Sporcha" title="Blackbird Clan">
+	<npc id="34474" level="85" type="FriendlyNpc" name="Sporcha" title="Blackbird Clan">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1418,7 +1418,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="34475" level="85" type="Folk" name="Aliber" title="Bringer of Truth">
+	<npc id="34475" level="85" type="FriendlyNpc" name="Aliber" title="Bringer of Truth">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/npcs/34400-34499.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/npcs/34400-34499.xml
index 4492f3deaa..95fbd3d8a1 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/npcs/34400-34499.xml
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/npcs/34400-34499.xml
@@ -1340,7 +1340,7 @@
 			<height normal="29.35" />
 		</collision>
 	</npc>
-	<npc id="34471" level="85" type="Folk" name="Leona Blackbird" title="Lord">
+	<npc id="34471" level="85" type="FriendlyNpc" name="Leona Blackbird" title="Lord">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1360,7 +1360,7 @@
 			<height normal="22.4" />
 		</collision>
 	</npc>
-	<npc id="34472" level="85" type="Folk" name="Devianne" title="Truth Seeker">
+	<npc id="34472" level="85" type="FriendlyNpc" name="Devianne" title="Truth Seeker">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1379,7 +1379,7 @@
 			<height normal="21" />
 		</collision>
 	</npc>
-	<npc id="34473" level="85" type="Folk" name="Elikia" title="Verdure Elder">
+	<npc id="34473" level="85" type="FriendlyNpc" name="Elikia" title="Verdure Elder">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1399,7 +1399,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="34474" level="85" type="Folk" name="Sporcha" title="Blackbird Clan">
+	<npc id="34474" level="85" type="FriendlyNpc" name="Sporcha" title="Blackbird Clan">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1418,7 +1418,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="34475" level="85" type="Folk" name="Aliber" title="Bringer of Truth">
+	<npc id="34475" level="85" type="FriendlyNpc" name="Aliber" title="Bringer of Truth">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/34400-34499.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/34400-34499.xml
index 4492f3deaa..95fbd3d8a1 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/34400-34499.xml
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/34400-34499.xml
@@ -1340,7 +1340,7 @@
 			<height normal="29.35" />
 		</collision>
 	</npc>
-	<npc id="34471" level="85" type="Folk" name="Leona Blackbird" title="Lord">
+	<npc id="34471" level="85" type="FriendlyNpc" name="Leona Blackbird" title="Lord">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1360,7 +1360,7 @@
 			<height normal="22.4" />
 		</collision>
 	</npc>
-	<npc id="34472" level="85" type="Folk" name="Devianne" title="Truth Seeker">
+	<npc id="34472" level="85" type="FriendlyNpc" name="Devianne" title="Truth Seeker">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1379,7 +1379,7 @@
 			<height normal="21" />
 		</collision>
 	</npc>
-	<npc id="34473" level="85" type="Folk" name="Elikia" title="Verdure Elder">
+	<npc id="34473" level="85" type="FriendlyNpc" name="Elikia" title="Verdure Elder">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1399,7 +1399,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="34474" level="85" type="Folk" name="Sporcha" title="Blackbird Clan">
+	<npc id="34474" level="85" type="FriendlyNpc" name="Sporcha" title="Blackbird Clan">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1418,7 +1418,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="34475" level="85" type="Folk" name="Aliber" title="Bringer of Truth">
+	<npc id="34475" level="85" type="FriendlyNpc" name="Aliber" title="Bringer of Truth">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/34400-34499.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/34400-34499.xml
index 4492f3deaa..95fbd3d8a1 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/34400-34499.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/34400-34499.xml
@@ -1340,7 +1340,7 @@
 			<height normal="29.35" />
 		</collision>
 	</npc>
-	<npc id="34471" level="85" type="Folk" name="Leona Blackbird" title="Lord">
+	<npc id="34471" level="85" type="FriendlyNpc" name="Leona Blackbird" title="Lord">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1360,7 +1360,7 @@
 			<height normal="22.4" />
 		</collision>
 	</npc>
-	<npc id="34472" level="85" type="Folk" name="Devianne" title="Truth Seeker">
+	<npc id="34472" level="85" type="FriendlyNpc" name="Devianne" title="Truth Seeker">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1379,7 +1379,7 @@
 			<height normal="21" />
 		</collision>
 	</npc>
-	<npc id="34473" level="85" type="Folk" name="Elikia" title="Verdure Elder">
+	<npc id="34473" level="85" type="FriendlyNpc" name="Elikia" title="Verdure Elder">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1399,7 +1399,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="34474" level="85" type="Folk" name="Sporcha" title="Blackbird Clan">
+	<npc id="34474" level="85" type="FriendlyNpc" name="Sporcha" title="Blackbird Clan">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1418,7 +1418,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="34475" level="85" type="Folk" name="Aliber" title="Bringer of Truth">
+	<npc id="34475" level="85" type="FriendlyNpc" name="Aliber" title="Bringer of Truth">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>