diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/NpcData.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/NpcData.java
index 93e662257b..1408ede6ac 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/NpcData.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/NpcData.java
@@ -764,7 +764,7 @@ public class NpcData implements IXmlReader
 	 */
 	public List<NpcTemplate> getAllNpcStartingWith(String text)
 	{
-		return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text));
+		return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
 	}
 	
 	/**
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index d97936cc29..e5f9c5ffb0 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -132,7 +132,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		_id = set.getInt("id");
 		_displayId = set.getInt("displayId", _id);
 		_level = set.getByte("level", (byte) 70);
-		_type = set.getString("type", "Npc");
+		_type = set.getString("type", "Folk");
 		_name = set.getString("name", "");
 		_usingServerSideName = set.getBoolean("usingServerSideName", false);
 		_title = set.getString("title", "");
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/NpcData.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/NpcData.java
index 93e662257b..1408ede6ac 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/NpcData.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/NpcData.java
@@ -764,7 +764,7 @@ public class NpcData implements IXmlReader
 	 */
 	public List<NpcTemplate> getAllNpcStartingWith(String text)
 	{
-		return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text));
+		return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
 	}
 	
 	/**
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index d97936cc29..e5f9c5ffb0 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -132,7 +132,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		_id = set.getInt("id");
 		_displayId = set.getInt("displayId", _id);
 		_level = set.getByte("level", (byte) 70);
-		_type = set.getString("type", "Npc");
+		_type = set.getString("type", "Folk");
 		_name = set.getString("name", "");
 		_usingServerSideName = set.getBoolean("usingServerSideName", false);
 		_title = set.getString("title", "");
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/NpcData.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/NpcData.java
index 93e662257b..1408ede6ac 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/NpcData.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/NpcData.java
@@ -764,7 +764,7 @@ public class NpcData implements IXmlReader
 	 */
 	public List<NpcTemplate> getAllNpcStartingWith(String text)
 	{
-		return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text));
+		return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
 	}
 	
 	/**
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index d97936cc29..e5f9c5ffb0 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -132,7 +132,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		_id = set.getInt("id");
 		_displayId = set.getInt("displayId", _id);
 		_level = set.getByte("level", (byte) 70);
-		_type = set.getString("type", "Npc");
+		_type = set.getString("type", "Folk");
 		_name = set.getString("name", "");
 		_usingServerSideName = set.getBoolean("usingServerSideName", false);
 		_title = set.getString("title", "");
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/NpcData.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/NpcData.java
index 93e662257b..1408ede6ac 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/NpcData.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/NpcData.java
@@ -764,7 +764,7 @@ public class NpcData implements IXmlReader
 	 */
 	public List<NpcTemplate> getAllNpcStartingWith(String text)
 	{
-		return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text));
+		return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
 	}
 	
 	/**
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index d97936cc29..e5f9c5ffb0 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -132,7 +132,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		_id = set.getInt("id");
 		_displayId = set.getInt("displayId", _id);
 		_level = set.getByte("level", (byte) 70);
-		_type = set.getString("type", "Npc");
+		_type = set.getString("type", "Folk");
 		_name = set.getString("name", "");
 		_usingServerSideName = set.getBoolean("usingServerSideName", false);
 		_title = set.getString("title", "");
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/NpcData.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/NpcData.java
index 93e662257b..1408ede6ac 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/NpcData.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/NpcData.java
@@ -764,7 +764,7 @@ public class NpcData implements IXmlReader
 	 */
 	public List<NpcTemplate> getAllNpcStartingWith(String text)
 	{
-		return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text));
+		return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
 	}
 	
 	/**
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index d97936cc29..e5f9c5ffb0 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -132,7 +132,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		_id = set.getInt("id");
 		_displayId = set.getInt("displayId", _id);
 		_level = set.getByte("level", (byte) 70);
-		_type = set.getString("type", "Npc");
+		_type = set.getString("type", "Folk");
 		_name = set.getString("name", "");
 		_usingServerSideName = set.getBoolean("usingServerSideName", false);
 		_title = set.getString("title", "");
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/NpcData.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/NpcData.java
index 93e662257b..1408ede6ac 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/NpcData.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/NpcData.java
@@ -764,7 +764,7 @@ public class NpcData implements IXmlReader
 	 */
 	public List<NpcTemplate> getAllNpcStartingWith(String text)
 	{
-		return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text));
+		return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
 	}
 	
 	/**
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index d97936cc29..e5f9c5ffb0 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -132,7 +132,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		_id = set.getInt("id");
 		_displayId = set.getInt("displayId", _id);
 		_level = set.getByte("level", (byte) 70);
-		_type = set.getString("type", "Npc");
+		_type = set.getString("type", "Folk");
 		_name = set.getString("name", "");
 		_usingServerSideName = set.getBoolean("usingServerSideName", false);
 		_title = set.getString("title", "");
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/NpcData.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/NpcData.java
index 93e662257b..1408ede6ac 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/NpcData.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/NpcData.java
@@ -764,7 +764,7 @@ public class NpcData implements IXmlReader
 	 */
 	public List<NpcTemplate> getAllNpcStartingWith(String text)
 	{
-		return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text));
+		return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
 	}
 	
 	/**
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index d97936cc29..e5f9c5ffb0 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -132,7 +132,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		_id = set.getInt("id");
 		_displayId = set.getInt("displayId", _id);
 		_level = set.getByte("level", (byte) 70);
-		_type = set.getString("type", "Npc");
+		_type = set.getString("type", "Folk");
 		_name = set.getString("name", "");
 		_usingServerSideName = set.getBoolean("usingServerSideName", false);
 		_title = set.getString("title", "");
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/NpcData.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/NpcData.java
index 93e662257b..1408ede6ac 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/NpcData.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/NpcData.java
@@ -764,7 +764,7 @@ public class NpcData implements IXmlReader
 	 */
 	public List<NpcTemplate> getAllNpcStartingWith(String text)
 	{
-		return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text));
+		return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
 	}
 	
 	/**
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index d97936cc29..e5f9c5ffb0 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -132,7 +132,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		_id = set.getInt("id");
 		_displayId = set.getInt("displayId", _id);
 		_level = set.getByte("level", (byte) 70);
-		_type = set.getString("type", "Npc");
+		_type = set.getString("type", "Folk");
 		_name = set.getString("name", "");
 		_usingServerSideName = set.getBoolean("usingServerSideName", false);
 		_title = set.getString("title", "");
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/NpcData.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/NpcData.java
index 8fd31e81ad..0163e4d618 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/NpcData.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/NpcData.java
@@ -764,7 +764,7 @@ public class NpcData implements IXmlReader
 	 */
 	public List<NpcTemplate> getAllNpcStartingWith(String text)
 	{
-		return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text));
+		return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
 	}
 	
 	/**
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index 7c0e609c36..02708c8410 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -132,7 +132,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		_id = set.getInt("id");
 		_displayId = set.getInt("displayId", _id);
 		_level = set.getInt("level", 85);
-		_type = set.getString("type", "Npc");
+		_type = set.getString("type", "Folk");
 		_name = set.getString("name", "");
 		_usingServerSideName = set.getBoolean("usingServerSideName", false);
 		_title = set.getString("title", "");
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/NpcData.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/NpcData.java
index 8fd31e81ad..0163e4d618 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/NpcData.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/NpcData.java
@@ -764,7 +764,7 @@ public class NpcData implements IXmlReader
 	 */
 	public List<NpcTemplate> getAllNpcStartingWith(String text)
 	{
-		return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text));
+		return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
 	}
 	
 	/**
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index 7c0e609c36..02708c8410 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -132,7 +132,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		_id = set.getInt("id");
 		_displayId = set.getInt("displayId", _id);
 		_level = set.getInt("level", 85);
-		_type = set.getString("type", "Npc");
+		_type = set.getString("type", "Folk");
 		_name = set.getString("name", "");
 		_usingServerSideName = set.getBoolean("usingServerSideName", false);
 		_title = set.getString("title", "");
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/NpcData.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/NpcData.java
index 8fd31e81ad..0163e4d618 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/NpcData.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/NpcData.java
@@ -764,7 +764,7 @@ public class NpcData implements IXmlReader
 	 */
 	public List<NpcTemplate> getAllNpcStartingWith(String text)
 	{
-		return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text));
+		return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
 	}
 	
 	/**
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index 7c0e609c36..02708c8410 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -132,7 +132,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		_id = set.getInt("id");
 		_displayId = set.getInt("displayId", _id);
 		_level = set.getInt("level", 85);
-		_type = set.getString("type", "Npc");
+		_type = set.getString("type", "Folk");
 		_name = set.getString("name", "");
 		_usingServerSideName = set.getBoolean("usingServerSideName", false);
 		_title = set.getString("title", "");
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/NpcTable.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/NpcTable.java
index 16124c4615..bfe5b1b01d 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/NpcTable.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/NpcTable.java
@@ -681,7 +681,7 @@ public class NpcTable
 		final List<NpcTemplate> list = new ArrayList<>();
 		for (NpcTemplate t : _npcs.values())
 		{
-			if (t.getName().startsWith(letter) && "Npc".equals(t.getType()))
+			if (t.getName().startsWith(letter) && "Folk".equals(t.getType()))
 			{
 				list.add(t);
 			}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/NpcTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/NpcTable.java
index 16124c4615..bfe5b1b01d 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/NpcTable.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/NpcTable.java
@@ -681,7 +681,7 @@ public class NpcTable
 		final List<NpcTemplate> list = new ArrayList<>();
 		for (NpcTemplate t : _npcs.values())
 		{
-			if (t.getName().startsWith(letter) && "Npc".equals(t.getType()))
+			if (t.getName().startsWith(letter) && "Folk".equals(t.getType()))
 			{
 				list.add(t);
 			}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/NpcData.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/NpcData.java
index ed0b6a273a..a99990b977 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/NpcData.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/NpcData.java
@@ -761,7 +761,7 @@ public class NpcData implements IXmlReader
 	 */
 	public List<NpcTemplate> getAllNpcStartingWith(String text)
 	{
-		return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text));
+		return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
 	}
 	
 	/**
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index 3b0e6a85dd..753455f02c 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -121,7 +121,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		_id = set.getInt("id");
 		_displayId = set.getInt("displayId", _id);
 		_level = set.getByte("level", (byte) 70);
-		_type = set.getString("type", "Npc");
+		_type = set.getString("type", "Folk");
 		_name = set.getString("name", "");
 		_usingServerSideName = set.getBoolean("usingServerSideName", false);
 		_title = set.getString("title", "");
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/NpcData.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/NpcData.java
index ed0b6a273a..a99990b977 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/NpcData.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/NpcData.java
@@ -761,7 +761,7 @@ public class NpcData implements IXmlReader
 	 */
 	public List<NpcTemplate> getAllNpcStartingWith(String text)
 	{
-		return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text));
+		return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
 	}
 	
 	/**
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index 3b0e6a85dd..753455f02c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -121,7 +121,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		_id = set.getInt("id");
 		_displayId = set.getInt("displayId", _id);
 		_level = set.getByte("level", (byte) 70);
-		_type = set.getString("type", "Npc");
+		_type = set.getString("type", "Folk");
 		_name = set.getString("name", "");
 		_usingServerSideName = set.getBoolean("usingServerSideName", false);
 		_title = set.getString("title", "");
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/NpcData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/NpcData.java
index 93e662257b..1408ede6ac 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/NpcData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/NpcData.java
@@ -764,7 +764,7 @@ public class NpcData implements IXmlReader
 	 */
 	public List<NpcTemplate> getAllNpcStartingWith(String text)
 	{
-		return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text));
+		return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index 20289e1e3a..ba48584e6c 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -133,7 +133,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		_id = set.getInt("id");
 		_displayId = set.getInt("displayId", _id);
 		_level = set.getByte("level", (byte) 70);
-		_type = set.getString("type", "Npc");
+		_type = set.getString("type", "Folk");
 		_name = set.getString("name", "");
 		_usingServerSideName = set.getBoolean("usingServerSideName", false);
 		_title = set.getString("title", "");
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/NpcData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/NpcData.java
index 93e662257b..1408ede6ac 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/NpcData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/NpcData.java
@@ -764,7 +764,7 @@ public class NpcData implements IXmlReader
 	 */
 	public List<NpcTemplate> getAllNpcStartingWith(String text)
 	{
-		return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text));
+		return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index 20289e1e3a..ba48584e6c 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -133,7 +133,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		_id = set.getInt("id");
 		_displayId = set.getInt("displayId", _id);
 		_level = set.getByte("level", (byte) 70);
-		_type = set.getString("type", "Npc");
+		_type = set.getString("type", "Folk");
 		_name = set.getString("name", "");
 		_usingServerSideName = set.getBoolean("usingServerSideName", false);
 		_title = set.getString("title", "");
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/NpcData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/NpcData.java
index 93e662257b..1408ede6ac 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/NpcData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/NpcData.java
@@ -764,7 +764,7 @@ public class NpcData implements IXmlReader
 	 */
 	public List<NpcTemplate> getAllNpcStartingWith(String text)
 	{
-		return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text));
+		return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index 20289e1e3a..ba48584e6c 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -133,7 +133,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		_id = set.getInt("id");
 		_displayId = set.getInt("displayId", _id);
 		_level = set.getByte("level", (byte) 70);
-		_type = set.getString("type", "Npc");
+		_type = set.getString("type", "Folk");
 		_name = set.getString("name", "");
 		_usingServerSideName = set.getBoolean("usingServerSideName", false);
 		_title = set.getString("title", "");
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/NpcData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/NpcData.java
index ed8a8ee06f..402284eef6 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/NpcData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/NpcData.java
@@ -767,7 +767,7 @@ public class NpcData implements IXmlReader
 	 */
 	public List<NpcTemplate> getAllNpcStartingWith(String text)
 	{
-		return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text));
+		return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index 22bef5d4a0..c5224c48b7 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -136,7 +136,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		_id = set.getInt("id");
 		_displayId = set.getInt("displayId", _id);
 		_level = set.getByte("level", (byte) 70);
-		_type = set.getString("type", "Npc");
+		_type = set.getString("type", "Folk");
 		_name = set.getString("name", "");
 		_usingServerSideName = set.getBoolean("usingServerSideName", false);
 		_title = set.getString("title", "");
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/NpcData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/NpcData.java
index ed8a8ee06f..402284eef6 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/NpcData.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/NpcData.java
@@ -767,7 +767,7 @@ public class NpcData implements IXmlReader
 	 */
 	public List<NpcTemplate> getAllNpcStartingWith(String text)
 	{
-		return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text));
+		return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index 22bef5d4a0..c5224c48b7 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -136,7 +136,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		_id = set.getInt("id");
 		_displayId = set.getInt("displayId", _id);
 		_level = set.getByte("level", (byte) 70);
-		_type = set.getString("type", "Npc");
+		_type = set.getString("type", "Folk");
 		_name = set.getString("name", "");
 		_usingServerSideName = set.getBoolean("usingServerSideName", false);
 		_title = set.getString("title", "");
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/NpcData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/NpcData.java
index ed8a8ee06f..402284eef6 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/NpcData.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/NpcData.java
@@ -767,7 +767,7 @@ public class NpcData implements IXmlReader
 	 */
 	public List<NpcTemplate> getAllNpcStartingWith(String text)
 	{
-		return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text));
+		return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index 22bef5d4a0..c5224c48b7 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -136,7 +136,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		_id = set.getInt("id");
 		_displayId = set.getInt("displayId", _id);
 		_level = set.getByte("level", (byte) 70);
-		_type = set.getString("type", "Npc");
+		_type = set.getString("type", "Folk");
 		_name = set.getString("name", "");
 		_usingServerSideName = set.getBoolean("usingServerSideName", false);
 		_title = set.getString("title", "");
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/NpcData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/NpcData.java
index b8409a11e2..2263bdf336 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/NpcData.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/NpcData.java
@@ -774,7 +774,7 @@ public class NpcData implements IXmlReader
 	 */
 	public List<NpcTemplate> getAllNpcStartingWith(String text)
 	{
-		return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text));
+		return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index 2c56475748..d5c09a78d3 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -132,7 +132,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		_id = set.getInt("id");
 		_displayId = set.getInt("displayId", _id);
 		_level = set.getByte("level", (byte) 70);
-		_type = set.getString("type", "Npc");
+		_type = set.getString("type", "Folk");
 		_name = set.getString("name", "");
 		_usingServerSideName = set.getBoolean("usingServerSideName", false);
 		_title = set.getString("title", "");
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/NpcData.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/NpcData.java
index 533b05497f..daff7eb562 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/NpcData.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/NpcData.java
@@ -788,7 +788,7 @@ public class NpcData implements IXmlReader
 	 */
 	public List<NpcTemplate> getAllNpcStartingWith(String text)
 	{
-		return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text));
+		return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
 	}
 	
 	/**
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index 3f17c38fec..e61f742bc0 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -135,7 +135,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		_id = set.getInt("id");
 		_displayId = set.getInt("displayId", _id);
 		_level = set.getInt("level", 85);
-		_type = set.getString("type", "Npc");
+		_type = set.getString("type", "Folk");
 		_name = set.getString("name", "");
 		_usingServerSideName = set.getBoolean("usingServerSideName", false);
 		_title = set.getString("title", "");
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/NpcData.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/NpcData.java
index 533b05497f..daff7eb562 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/NpcData.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/NpcData.java
@@ -788,7 +788,7 @@ public class NpcData implements IXmlReader
 	 */
 	public List<NpcTemplate> getAllNpcStartingWith(String text)
 	{
-		return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text));
+		return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
 	}
 	
 	/**
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index 3f17c38fec..e61f742bc0 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -135,7 +135,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		_id = set.getInt("id");
 		_displayId = set.getInt("displayId", _id);
 		_level = set.getInt("level", 85);
-		_type = set.getString("type", "Npc");
+		_type = set.getString("type", "Folk");
 		_name = set.getString("name", "");
 		_usingServerSideName = set.getBoolean("usingServerSideName", false);
 		_title = set.getString("title", "");
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/NpcData.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/NpcData.java
index 533b05497f..daff7eb562 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/NpcData.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/NpcData.java
@@ -788,7 +788,7 @@ public class NpcData implements IXmlReader
 	 */
 	public List<NpcTemplate> getAllNpcStartingWith(String text)
 	{
-		return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text));
+		return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
 	}
 	
 	/**
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index 3f17c38fec..e61f742bc0 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -135,7 +135,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		_id = set.getInt("id");
 		_displayId = set.getInt("displayId", _id);
 		_level = set.getInt("level", 85);
-		_type = set.getString("type", "Npc");
+		_type = set.getString("type", "Folk");
 		_name = set.getString("name", "");
 		_usingServerSideName = set.getBoolean("usingServerSideName", false);
 		_title = set.getString("title", "");