diff --git a/assets/common/entity/dungeon/fallback/boss.ron b/assets/common/entity/dungeon/fallback/boss.ron
index 3f11d76f76..75c4df67af 100644
--- a/assets/common/entity/dungeon/fallback/boss.ron
+++ b/assets/common/entity/dungeon/fallback/boss.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Crazy Sheep"),
+    name: Name("Crazy Sheep"),
     body: RandomWith("sheep"),
     alignment: Alignment(Enemy),
 
diff --git a/assets/common/entity/dungeon/fallback/enemy.ron b/assets/common/entity/dungeon/fallback/enemy.ron
index 04b2f43071..47f2e8acdf 100644
--- a/assets/common/entity/dungeon/fallback/enemy.ron
+++ b/assets/common/entity/dungeon/fallback/enemy.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Yan Hus"),
+    name: Name("Yan Hus"),
     body: RandomWith("humanoid"),
     alignment: Alignment(Enemy),
 
diff --git a/assets/common/entity/dungeon/fallback/miniboss.ron b/assets/common/entity/dungeon/fallback/miniboss.ron
index befb2f8cf6..94112f89f0 100644
--- a/assets/common/entity/dungeon/fallback/miniboss.ron
+++ b/assets/common/entity/dungeon/fallback/miniboss.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Big Goose"),
+    name: Name("Big Goose"),
     body: RandomWith("goose"),
     alignment: Alignment(Enemy),
 
diff --git a/assets/common/entity/dungeon/tier-0/boss.ron b/assets/common/entity/dungeon/tier-0/boss.ron
index b0cecbc954..b681c19cb5 100644
--- a/assets/common/entity/dungeon/tier-0/boss.ron
+++ b/assets/common/entity/dungeon/tier-0/boss.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Harvester"),
+    name: Name("Harvester"),
     body: RandomWith("harvester"),
     alignment: Alignment(Enemy),
 
diff --git a/assets/common/entity/dungeon/tier-0/bow.ron b/assets/common/entity/dungeon/tier-0/bow.ron
index 55829f748f..7ff0555517 100644
--- a/assets/common/entity/dungeon/tier-0/bow.ron
+++ b/assets/common/entity/dungeon/tier-0/bow.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Gnarling Stalker"),
+    name: Name("Gnarling Stalker"),
     body: RandomWith("gnarling"),
     alignment: Alignment(Enemy),
 
diff --git a/assets/common/entity/dungeon/tier-0/miniboss.ron b/assets/common/entity/dungeon/tier-0/miniboss.ron
index d17e7fd605..c02abcefee 100644
--- a/assets/common/entity/dungeon/tier-0/miniboss.ron
+++ b/assets/common/entity/dungeon/tier-0/miniboss.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Deadwood"),
+    name: Name("Deadwood"),
     body: RandomWith("deadwood"),
     alignment: Alignment(Enemy),
 
diff --git a/assets/common/entity/dungeon/tier-0/spear.ron b/assets/common/entity/dungeon/tier-0/spear.ron
index d71328be25..e30541c047 100644
--- a/assets/common/entity/dungeon/tier-0/spear.ron
+++ b/assets/common/entity/dungeon/tier-0/spear.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Gnarling Mugger"),
+    name: Name("Gnarling Mugger"),
     body: RandomWith("gnarling"),
     alignment: Alignment(Enemy),
 
diff --git a/assets/common/entity/dungeon/tier-0/staff.ron b/assets/common/entity/dungeon/tier-0/staff.ron
index e9d9e4e376..cbcd59a973 100644
--- a/assets/common/entity/dungeon/tier-0/staff.ron
+++ b/assets/common/entity/dungeon/tier-0/staff.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Gnarling Shaman"),
+    name: Name("Gnarling Shaman"),
     body: RandomWith("gnarling"),
     alignment: Alignment(Enemy),
 
diff --git a/assets/common/entity/dungeon/tier-1/boss.ron b/assets/common/entity/dungeon/tier-1/boss.ron
index 63bacdcfc8..28b829d9bc 100644
--- a/assets/common/entity/dungeon/tier-1/boss.ron
+++ b/assets/common/entity/dungeon/tier-1/boss.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Yeti"),
+    name: Name("Yeti"),
     body: RandomWith("yeti"),
     alignment: Alignment(Enemy),
 
diff --git a/assets/common/entity/dungeon/tier-1/bow.ron b/assets/common/entity/dungeon/tier-1/bow.ron
index 06078fb1e2..df8961b483 100644
--- a/assets/common/entity/dungeon/tier-1/bow.ron
+++ b/assets/common/entity/dungeon/tier-1/bow.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Adlet Tracker"),
+    name: Name("Adlet Tracker"),
     body: RandomWith("adlet"),
     alignment: Alignment(Enemy),
 
diff --git a/assets/common/entity/dungeon/tier-1/rat.ron b/assets/common/entity/dungeon/tier-1/rat.ron
index aeab6f2370..f5d548b923 100644
--- a/assets/common/entity/dungeon/tier-1/rat.ron
+++ b/assets/common/entity/dungeon/tier-1/rat.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Rat"),
+    name: Name("Rat"),
     body: RandomWith("rat"),
     alignment: Alignment(Enemy),
 
diff --git a/assets/common/entity/dungeon/tier-1/spear.ron b/assets/common/entity/dungeon/tier-1/spear.ron
index 4fb7d51fa2..882e6ea05d 100644
--- a/assets/common/entity/dungeon/tier-1/spear.ron
+++ b/assets/common/entity/dungeon/tier-1/spear.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Adlet Hunter"),
+    name: Name("Adlet Hunter"),
     body: RandomWith("adlet"),
     alignment: Alignment(Enemy),
 
diff --git a/assets/common/entity/dungeon/tier-1/staff.ron b/assets/common/entity/dungeon/tier-1/staff.ron
index 1c9e8762f5..314e450021 100644
--- a/assets/common/entity/dungeon/tier-1/staff.ron
+++ b/assets/common/entity/dungeon/tier-1/staff.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Adlet Shaman"),
+    name: Name("Adlet Shaman"),
     body: RandomWith("adlet"),
     alignment: Alignment(Enemy),
 
diff --git a/assets/common/entity/dungeon/tier-2/boss.ron b/assets/common/entity/dungeon/tier-2/boss.ron
index 2139489071..a9b4c2b26b 100644
--- a/assets/common/entity/dungeon/tier-2/boss.ron
+++ b/assets/common/entity/dungeon/tier-2/boss.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Tidal Warrior"),
+    name: Name("Tidal Warrior"),
     body: RandomWith("tidalwarrior"),
     alignment: Alignment(Enemy),
 
diff --git a/assets/common/entity/dungeon/tier-2/bow.ron b/assets/common/entity/dungeon/tier-2/bow.ron
index 7e6c2d6dbc..f780d5c7d0 100644
--- a/assets/common/entity/dungeon/tier-2/bow.ron
+++ b/assets/common/entity/dungeon/tier-2/bow.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Sahagin Sniper"),
+    name: Name("Sahagin Sniper"),
     body: RandomWith("sahagin"),
     alignment: Alignment(Enemy),
 
diff --git a/assets/common/entity/dungeon/tier-2/hakulaq.ron b/assets/common/entity/dungeon/tier-2/hakulaq.ron
index 7f9199585a..46bc76a674 100644
--- a/assets/common/entity/dungeon/tier-2/hakulaq.ron
+++ b/assets/common/entity/dungeon/tier-2/hakulaq.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Hakulaq"),
+    name: Name("Hakulaq"),
     body: RandomWith("hakulaq"),
     alignment: Alignment(Enemy),
 
diff --git a/assets/common/entity/dungeon/tier-2/spear.ron b/assets/common/entity/dungeon/tier-2/spear.ron
index 239162caf8..2d867f83fa 100644
--- a/assets/common/entity/dungeon/tier-2/spear.ron
+++ b/assets/common/entity/dungeon/tier-2/spear.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Sahagin Spearman"),
+    name: Name("Sahagin Spearman"),
     body: RandomWith("sahagin"),
     alignment: Alignment(Enemy),
 
diff --git a/assets/common/entity/dungeon/tier-2/staff.ron b/assets/common/entity/dungeon/tier-2/staff.ron
index cba57b3351..e1a883baa7 100644
--- a/assets/common/entity/dungeon/tier-2/staff.ron
+++ b/assets/common/entity/dungeon/tier-2/staff.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Sahagin Sorcerer"),
+    name: Name("Sahagin Sorcerer"),
     body: RandomWith("sahagin"),
     alignment: Alignment(Enemy),
 
diff --git a/assets/common/entity/dungeon/tier-3/bonerattler.ron b/assets/common/entity/dungeon/tier-3/bonerattler.ron
index 79d7c5e2d3..0af1afa98f 100644
--- a/assets/common/entity/dungeon/tier-3/bonerattler.ron
+++ b/assets/common/entity/dungeon/tier-3/bonerattler.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Bonerattler"),
+    name: Name("Bonerattler"),
     body: RandomWith("bonerattler"),
     alignment: Alignment(Enemy),
 
diff --git a/assets/common/entity/dungeon/tier-3/boss.ron b/assets/common/entity/dungeon/tier-3/boss.ron
index a8b075c9b2..ecc9b398d5 100644
--- a/assets/common/entity/dungeon/tier-3/boss.ron
+++ b/assets/common/entity/dungeon/tier-3/boss.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Clay Golem"),
+    name: Name("Clay Golem"),
     body: RandomWith("claygolem"),
     alignment: Alignment(Enemy),
 
diff --git a/assets/common/entity/dungeon/tier-3/bow.ron b/assets/common/entity/dungeon/tier-3/bow.ron
index 445d697338..386a4dc500 100644
--- a/assets/common/entity/dungeon/tier-3/bow.ron
+++ b/assets/common/entity/dungeon/tier-3/bow.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Haniwa Archer"),
+    name: Name("Haniwa Archer"),
     body: RandomWith("haniwa"),
     alignment: Alignment(Enemy),
 
diff --git a/assets/common/entity/dungeon/tier-3/sentry.ron b/assets/common/entity/dungeon/tier-3/sentry.ron
index 43c519c834..253e6b6070 100644
--- a/assets/common/entity/dungeon/tier-3/sentry.ron
+++ b/assets/common/entity/dungeon/tier-3/sentry.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Haniwa Sentry"),
+    name: Name("Haniwa Sentry"),
     body: Exact(Object(HaniwaSentry)),
     alignment: Alignment(Enemy),
 
diff --git a/assets/common/entity/dungeon/tier-3/spear.ron b/assets/common/entity/dungeon/tier-3/spear.ron
index 10614bd9c0..1999cd45af 100644
--- a/assets/common/entity/dungeon/tier-3/spear.ron
+++ b/assets/common/entity/dungeon/tier-3/spear.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Haniwa Guard"),
+    name: Name("Haniwa Guard"),
     body: RandomWith("haniwa"),
     alignment: Alignment(Enemy),
 
diff --git a/assets/common/entity/dungeon/tier-3/staff.ron b/assets/common/entity/dungeon/tier-3/staff.ron
index 5066edc088..d71561c3c5 100644
--- a/assets/common/entity/dungeon/tier-3/staff.ron
+++ b/assets/common/entity/dungeon/tier-3/staff.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Haniwa Sorcerer"),
+    name: Name("Haniwa Sorcerer"),
     body: RandomWith("haniwa"),
     alignment: Alignment(Enemy),
 
diff --git a/assets/common/entity/dungeon/tier-4/boss.ron b/assets/common/entity/dungeon/tier-4/boss.ron
index 0d4da80c24..23fdfabe82 100644
--- a/assets/common/entity/dungeon/tier-4/boss.ron
+++ b/assets/common/entity/dungeon/tier-4/boss.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Minotaur"),
+    name: Name("Minotaur"),
     body: RandomWith("minotaur"),
     alignment: Alignment(Enemy),
 
diff --git a/assets/common/entity/dungeon/tier-4/bow.ron b/assets/common/entity/dungeon/tier-4/bow.ron
index a2a220054e..f56692f884 100644
--- a/assets/common/entity/dungeon/tier-4/bow.ron
+++ b/assets/common/entity/dungeon/tier-4/bow.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Myrmidon Marksman"),
+    name: Name("Myrmidon Marksman"),
     body: RandomWith("myrmidon"),
     alignment: Alignment(Enemy),
 
diff --git a/assets/common/entity/dungeon/tier-4/miniboss.ron b/assets/common/entity/dungeon/tier-4/miniboss.ron
index ffe140c084..352fc3a70e 100644
--- a/assets/common/entity/dungeon/tier-4/miniboss.ron
+++ b/assets/common/entity/dungeon/tier-4/miniboss.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Dullahan"),
+    name: Name("Dullahan"),
     body: RandomWith("dullahan"),
     alignment: Alignment(Enemy),
 
diff --git a/assets/common/entity/dungeon/tier-4/spear.ron b/assets/common/entity/dungeon/tier-4/spear.ron
index 1ebf5dec71..579f971a70 100644
--- a/assets/common/entity/dungeon/tier-4/spear.ron
+++ b/assets/common/entity/dungeon/tier-4/spear.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Myrmidon Hoplite"),
+    name: Name("Myrmidon Hoplite"),
     body: RandomWith("myrmidon"),
     alignment: Alignment(Enemy),
 
diff --git a/assets/common/entity/dungeon/tier-4/staff.ron b/assets/common/entity/dungeon/tier-4/staff.ron
index 1f174c1924..e5a800e39a 100644
--- a/assets/common/entity/dungeon/tier-4/staff.ron
+++ b/assets/common/entity/dungeon/tier-4/staff.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Myrmidon Wizard"),
+    name: Name("Myrmidon Wizard"),
     body: RandomWith("myrmidon"),
     alignment: Alignment(Enemy),
 
diff --git a/assets/common/entity/dungeon/tier-5/beastmaster.ron b/assets/common/entity/dungeon/tier-5/beastmaster.ron
index 98c11b8d41..fc58c78a73 100644
--- a/assets/common/entity/dungeon/tier-5/beastmaster.ron
+++ b/assets/common/entity/dungeon/tier-5/beastmaster.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Beastmaster"),
+    name: Name("Beastmaster"),
     body: RandomWith("humanoid"),
     alignment: Alignment(Enemy),
 
diff --git a/assets/common/entity/dungeon/tier-5/boss.ron b/assets/common/entity/dungeon/tier-5/boss.ron
index ebeaebefec..4de7ebd0da 100644
--- a/assets/common/entity/dungeon/tier-5/boss.ron
+++ b/assets/common/entity/dungeon/tier-5/boss.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Mindflayer"),
+    name: Name("Mindflayer"),
     body: RandomWith("mindflayer"),
     alignment: Alignment(Enemy),
 
diff --git a/assets/common/entity/dungeon/tier-5/cultist.ron b/assets/common/entity/dungeon/tier-5/cultist.ron
index 1b6728c34f..88e29509b0 100644
--- a/assets/common/entity/dungeon/tier-5/cultist.ron
+++ b/assets/common/entity/dungeon/tier-5/cultist.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Cultist"),
+    name: Name("Cultist"),
     body: RandomWith("humanoid"),
     alignment: Alignment(Enemy),
 
diff --git a/assets/common/entity/dungeon/tier-5/hound.ron b/assets/common/entity/dungeon/tier-5/hound.ron
index 0cbf1e7c8b..85c3702bde 100644
--- a/assets/common/entity/dungeon/tier-5/hound.ron
+++ b/assets/common/entity/dungeon/tier-5/hound.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Tamed Darkhound"),
+    name: Name("Tamed Darkhound"),
     body: RandomWith("darkhound"),
     alignment: Alignment(Enemy),
 
diff --git a/assets/common/entity/dungeon/tier-5/husk.ron b/assets/common/entity/dungeon/tier-5/husk.ron
index e68a99f04a..936a938867 100644
--- a/assets/common/entity/dungeon/tier-5/husk.ron
+++ b/assets/common/entity/dungeon/tier-5/husk.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Cultist Husk"),
+    name: Name("Cultist Husk"),
     body: RandomWith("husk"),
     alignment: Alignment(Enemy),
 
diff --git a/assets/common/entity/dungeon/tier-5/husk_brute.ron b/assets/common/entity/dungeon/tier-5/husk_brute.ron
index 7e77ad8aca..9c16fa0721 100644
--- a/assets/common/entity/dungeon/tier-5/husk_brute.ron
+++ b/assets/common/entity/dungeon/tier-5/husk_brute.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Husk Brute"),
+    name: Name("Husk Brute"),
     body: RandomWith("husk_brute"),
     alignment: Alignment(Enemy),
 
diff --git a/assets/common/entity/dungeon/tier-5/turret.ron b/assets/common/entity/dungeon/tier-5/turret.ron
index 9470ff47ac..c31a081875 100644
--- a/assets/common/entity/dungeon/tier-5/turret.ron
+++ b/assets/common/entity/dungeon/tier-5/turret.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Possessed Turret"),
+    name: Name("Possessed Turret"),
     body: Exact(Object(Crossbow)),
     alignment: Alignment(Enemy),
 
diff --git a/assets/common/entity/dungeon/tier-5/warlock.ron b/assets/common/entity/dungeon/tier-5/warlock.ron
index 3119ad911f..0ee439d4df 100644
--- a/assets/common/entity/dungeon/tier-5/warlock.ron
+++ b/assets/common/entity/dungeon/tier-5/warlock.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Cultist Warlock"),
+    name: Name("Cultist Warlock"),
     body: RandomWith("cultist_warlock"),
     alignment: Alignment(Enemy),
 
diff --git a/assets/common/entity/dungeon/tier-5/warlord.ron b/assets/common/entity/dungeon/tier-5/warlord.ron
index 07909a78df..22bbe5741f 100644
--- a/assets/common/entity/dungeon/tier-5/warlord.ron
+++ b/assets/common/entity/dungeon/tier-5/warlord.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Cultist Warlord"),
+    name: Name("Cultist Warlord"),
     body: RandomWith("cultist_warlord"),
     alignment: Alignment(Enemy),
 
diff --git a/assets/common/entity/template.ron b/assets/common/entity/template.ron
index 0a35c81854..5743f305a3 100644
--- a/assets/common/entity/template.ron
+++ b/assets/common/entity/template.ron
@@ -1,6 +1,9 @@
 EntityConfig (
     /// Name of Entity
-    name: Some("Paddy"),
+    /// Can be Name(String) with given name
+    /// or Automatic which will call automatic name depend on Body
+    /// or Uninit (means it should be specified somewhere in code)
+    name: Name("Paddy"),
 
     /// Body
     /// Can be Exact (Body with all fields e.g BodyType, Species, Hair color and such)
@@ -18,7 +21,7 @@ EntityConfig (
     loot: LootTable("common.loot_tables.humanoids"),
 
     /// Hands:
-    /// - TwoHanded(ItemSpec) for one weapon 2h or 1h,
+    /// - TwoHanded(ItemSpec) for one 2h or 1h weapon,
     /// - Paired(ItemSpec) for two 1h weapons aka berserker mode,
     /// - Mix {
     ///     mainhand: ItemSpec,
diff --git a/assets/common/entity/village/dummy.ron b/assets/common/entity/village/dummy.ron
index d9a83aa730..96e7b9d467 100644
--- a/assets/common/entity/village/dummy.ron
+++ b/assets/common/entity/village/dummy.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Training Dummy"),
+    name: Name("Training Dummy"),
     body: Exact(Object(TrainingDummy)),
     alignment: Alignment(Passive),
 
diff --git a/assets/common/entity/village/guard.ron b/assets/common/entity/village/guard.ron
index d1b7cb2754..fc31245bca 100644
--- a/assets/common/entity/village/guard.ron
+++ b/assets/common/entity/village/guard.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Guard"),
+    name: Name("Guard"),
     body: RandomWith("humanoid"),
     alignment: Alignment(Npc),
 
diff --git a/assets/common/entity/village/merchant.ron b/assets/common/entity/village/merchant.ron
index 09aaefc238..d0632f737b 100644
--- a/assets/common/entity/village/merchant.ron
+++ b/assets/common/entity/village/merchant.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Merchant"),
+    name: Name("Merchant"),
     body: RandomWith("humanoid"),
     alignment: Alignment(Npc),
 
diff --git a/assets/common/entity/village/villager.ron b/assets/common/entity/village/villager.ron
index eb7e7fbe92..4335b0df45 100644
--- a/assets/common/entity/village/villager.ron
+++ b/assets/common/entity/village/villager.ron
@@ -1,6 +1,5 @@
 EntityConfig (
-    // name is specified outsite
-    name: None,
+    name: Automatic,
     body: RandomWith("humanoid"),
     alignment: Alignment(Npc),
 
diff --git a/assets/common/entity/wild/aggressive/alligator.ron b/assets/common/entity/wild/aggressive/alligator.ron
new file mode 100644
index 0000000000..9e63eb22a2
--- /dev/null
+++ b/assets/common/entity/wild/aggressive/alligator.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("alligator"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/aggressive/archaeos.ron b/assets/common/entity/wild/aggressive/archaeos.ron
new file mode 100644
index 0000000000..ef9fd560d9
--- /dev/null
+++ b/assets/common/entity/wild/aggressive/archaeos.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("archaeos"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/aggressive/asp.ron b/assets/common/entity/wild/aggressive/asp.ron
new file mode 100644
index 0000000000..f40cbcb3ee
--- /dev/null
+++ b/assets/common/entity/wild/aggressive/asp.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("asp"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/aggressive/batfox.ron b/assets/common/entity/wild/aggressive/batfox.ron
new file mode 100644
index 0000000000..dd0c68e9a3
--- /dev/null
+++ b/assets/common/entity/wild/aggressive/batfox.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("batfox"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/aggressive/bear.ron b/assets/common/entity/wild/aggressive/bear.ron
new file mode 100644
index 0000000000..66d3bd0042
--- /dev/null
+++ b/assets/common/entity/wild/aggressive/bear.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("bear"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/aggressive/bonerattler.ron b/assets/common/entity/wild/aggressive/bonerattler.ron
new file mode 100644
index 0000000000..e5fa5910b1
--- /dev/null
+++ b/assets/common/entity/wild/aggressive/bonerattler.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("bonerattler"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/aggressive/cockatrice.ron b/assets/common/entity/wild/aggressive/cockatrice.ron
new file mode 100644
index 0000000000..a367c30fcc
--- /dev/null
+++ b/assets/common/entity/wild/aggressive/cockatrice.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("cockatrice"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/aggressive/crocodile.ron b/assets/common/entity/wild/aggressive/crocodile.ron
new file mode 100644
index 0000000000..b839d4b4e5
--- /dev/null
+++ b/assets/common/entity/wild/aggressive/crocodile.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("crocodile"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/aggressive/cyclope.ron b/assets/common/entity/wild/aggressive/cyclope.ron
new file mode 100644
index 0000000000..2e679b9458
--- /dev/null
+++ b/assets/common/entity/wild/aggressive/cyclope.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("cyclops"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/aggressive/deadwood.ron b/assets/common/entity/wild/aggressive/deadwood.ron
new file mode 100644
index 0000000000..ebbcadf2e6
--- /dev/null
+++ b/assets/common/entity/wild/aggressive/deadwood.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("deadwood"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/aggressive/dodarock.ron b/assets/common/entity/wild/aggressive/dodarock.ron
new file mode 100644
index 0000000000..444d4ae085
--- /dev/null
+++ b/assets/common/entity/wild/aggressive/dodarock.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("dodarock"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/aggressive/dreadhorn.ron b/assets/common/entity/wild/aggressive/dreadhorn.ron
index e348d57ad5..e42bc14392 100644
--- a/assets/common/entity/wild/aggressive/dreadhorn.ron
+++ b/assets/common/entity/wild/aggressive/dreadhorn.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Dreadhorn"),
+    name: Automatic,
     body: RandomWith("dreadhorn"),
     alignment: Alignment(Enemy),
 
diff --git a/assets/common/entity/wild/aggressive/frostfang.ron b/assets/common/entity/wild/aggressive/frostfang.ron
index f3c7376892..c315373e4c 100644
--- a/assets/common/entity/wild/aggressive/frostfang.ron
+++ b/assets/common/entity/wild/aggressive/frostfang.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Frostfang"),
+    name: Automatic,
     body: RandomWith("frostfang"),
     alignment: Alignment(Enemy),
 
diff --git a/assets/common/entity/wild/aggressive/grolgar.ron b/assets/common/entity/wild/aggressive/grolgar.ron
index 47863b0fa8..2b868ac934 100644
--- a/assets/common/entity/wild/aggressive/grolgar.ron
+++ b/assets/common/entity/wild/aggressive/grolgar.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Grolgar"),
+    name: Automatic,
     body: RandomWith("grolgar"),
     alignment: Alignment(Enemy),
 
diff --git a/assets/common/entity/wild/aggressive/hakulaq.ron b/assets/common/entity/wild/aggressive/hakulaq.ron
new file mode 100644
index 0000000000..68e4b77697
--- /dev/null
+++ b/assets/common/entity/wild/aggressive/hakulaq.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("hakulaq"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/aggressive/hyena.ron b/assets/common/entity/wild/aggressive/hyena.ron
new file mode 100644
index 0000000000..dea8ade1f6
--- /dev/null
+++ b/assets/common/entity/wild/aggressive/hyena.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("hyena"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/aggressive/icepike.ron b/assets/common/entity/wild/aggressive/icepike.ron
new file mode 100644
index 0000000000..2cb568b75d
--- /dev/null
+++ b/assets/common/entity/wild/aggressive/icepike.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("icepike"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/aggressive/lavadrake.ron b/assets/common/entity/wild/aggressive/lavadrake.ron
new file mode 100644
index 0000000000..43f9dfd981
--- /dev/null
+++ b/assets/common/entity/wild/aggressive/lavadrake.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("lavadrake"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/aggressive/lion.ron b/assets/common/entity/wild/aggressive/lion.ron
new file mode 100644
index 0000000000..703577cfa1
--- /dev/null
+++ b/assets/common/entity/wild/aggressive/lion.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("lion"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/aggressive/mammoth.ron b/assets/common/entity/wild/aggressive/mammoth.ron
index 744cac3adb..6bf88c0e38 100644
--- a/assets/common/entity/wild/aggressive/mammoth.ron
+++ b/assets/common/entity/wild/aggressive/mammoth.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Mammoth"),
+    name: Automatic,
     body: RandomWith("mammoth"),
     alignment: Alignment(Enemy),
 
diff --git a/assets/common/entity/wild/aggressive/maneater.ron b/assets/common/entity/wild/aggressive/maneater.ron
new file mode 100644
index 0000000000..92ff16fa66
--- /dev/null
+++ b/assets/common/entity/wild/aggressive/maneater.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("maneater"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/aggressive/mighty_saurok.ron b/assets/common/entity/wild/aggressive/mighty_saurok.ron
new file mode 100644
index 0000000000..4fd00cc454
--- /dev/null
+++ b/assets/common/entity/wild/aggressive/mighty_saurok.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("saurok_mighty"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/aggressive/monitor.ron b/assets/common/entity/wild/aggressive/monitor.ron
new file mode 100644
index 0000000000..2195fd63de
--- /dev/null
+++ b/assets/common/entity/wild/aggressive/monitor.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("monitor"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/aggressive/mountain_troll.ron b/assets/common/entity/wild/aggressive/mountain_troll.ron
index 8aad271d4c..ef24ea5561 100644
--- a/assets/common/entity/wild/aggressive/mountain_troll.ron
+++ b/assets/common/entity/wild/aggressive/mountain_troll.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Mountain Troll"),
+    name: Automatic,
     body: RandomWith("troll_mountain"),
     alignment: Alignment(Enemy),
 
diff --git a/assets/common/entity/wild/aggressive/ngoubou.ron b/assets/common/entity/wild/aggressive/ngoubou.ron
new file mode 100644
index 0000000000..191d6642ac
--- /dev/null
+++ b/assets/common/entity/wild/aggressive/ngoubou.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("ngoubou"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/aggressive/ntouka.ron b/assets/common/entity/wild/aggressive/ntouka.ron
new file mode 100644
index 0000000000..de2e848273
--- /dev/null
+++ b/assets/common/entity/wild/aggressive/ntouka.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("ntouka"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/aggressive/occult_saurok.ron b/assets/common/entity/wild/aggressive/occult_saurok.ron
new file mode 100644
index 0000000000..332ce79602
--- /dev/null
+++ b/assets/common/entity/wild/aggressive/occult_saurok.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("saurok_occult"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/aggressive/odonto.ron b/assets/common/entity/wild/aggressive/odonto.ron
new file mode 100644
index 0000000000..a8cba7c234
--- /dev/null
+++ b/assets/common/entity/wild/aggressive/odonto.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("odonto"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/aggressive/ogre.ron b/assets/common/entity/wild/aggressive/ogre.ron
new file mode 100644
index 0000000000..7e3e655cfa
--- /dev/null
+++ b/assets/common/entity/wild/aggressive/ogre.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("ogre"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/aggressive/rocksnapper.ron b/assets/common/entity/wild/aggressive/rocksnapper.ron
index 089828f836..b003b4f4d7 100644
--- a/assets/common/entity/wild/aggressive/rocksnapper.ron
+++ b/assets/common/entity/wild/aggressive/rocksnapper.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Rock Snapper"),
+    name: Automatic,
     body: RandomWith("rocksnapper"),
     alignment: Alignment(Enemy),
 
diff --git a/assets/common/entity/wild/aggressive/roshwalr.ron b/assets/common/entity/wild/aggressive/roshwalr.ron
index cda5c15ee3..cee362c67b 100644
--- a/assets/common/entity/wild/aggressive/roshwalr.ron
+++ b/assets/common/entity/wild/aggressive/roshwalr.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Roshwalr"),
+    name: Automatic,
     body: Exact(QuadrupedMedium(Body(
         species: Roshwalr,
         body_type: Male,
diff --git a/assets/common/entity/wild/aggressive/roshwalr_boss.ron b/assets/common/entity/wild/aggressive/roshwalr_boss.ron
new file mode 100644
index 0000000000..2f105614a1
--- /dev/null
+++ b/assets/common/entity/wild/aggressive/roshwalr_boss.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: Exact(QuadrupedMedium(Body(species: Roshwalr, body_type: Female))),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/aggressive/saber.ron b/assets/common/entity/wild/aggressive/saber.ron
new file mode 100644
index 0000000000..08e39d6245
--- /dev/null
+++ b/assets/common/entity/wild/aggressive/saber.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("sabertooth"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/aggressive/sand_raptor.ron b/assets/common/entity/wild/aggressive/sand_raptor.ron
new file mode 100644
index 0000000000..82f5a1abf3
--- /dev/null
+++ b/assets/common/entity/wild/aggressive/sand_raptor.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("raptor_sand"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/aggressive/sandshark.ron b/assets/common/entity/wild/aggressive/sandshark.ron
new file mode 100644
index 0000000000..23df7e3f49
--- /dev/null
+++ b/assets/common/entity/wild/aggressive/sandshark.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("sandshark"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/aggressive/sly_saurok.ron b/assets/common/entity/wild/aggressive/sly_saurok.ron
new file mode 100644
index 0000000000..d52795bda5
--- /dev/null
+++ b/assets/common/entity/wild/aggressive/sly_saurok.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("saurok_sly"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/aggressive/snow_leopard.ron b/assets/common/entity/wild/aggressive/snow_leopard.ron
index 95e9d44d22..fbdeb737a3 100644
--- a/assets/common/entity/wild/aggressive/snow_leopard.ron
+++ b/assets/common/entity/wild/aggressive/snow_leopard.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Snow Leopard"),
+    name: Automatic,
     body: RandomWith("snowleopard"),
     alignment: Alignment(Enemy),
 
diff --git a/assets/common/entity/wild/aggressive/snow_raptor.ron b/assets/common/entity/wild/aggressive/snow_raptor.ron
index 53cfcc3726..f892f197a3 100644
--- a/assets/common/entity/wild/aggressive/snow_raptor.ron
+++ b/assets/common/entity/wild/aggressive/snow_raptor.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Snow Raptor"),
+    name: Automatic,
     body: RandomWith("raptor_snow"),
     alignment: Alignment(Enemy),
 
diff --git a/assets/common/entity/wild/aggressive/sunlizard.ron b/assets/common/entity/wild/aggressive/sunlizard.ron
new file mode 100644
index 0000000000..0d5d11803b
--- /dev/null
+++ b/assets/common/entity/wild/aggressive/sunlizard.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("sunlizard"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/aggressive/swamp_troll.ron b/assets/common/entity/wild/aggressive/swamp_troll.ron
new file mode 100644
index 0000000000..d8410db0e0
--- /dev/null
+++ b/assets/common/entity/wild/aggressive/swamp_troll.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("troll_swamp"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/aggressive/tarasque.ron b/assets/common/entity/wild/aggressive/tarasque.ron
new file mode 100644
index 0000000000..9240f05109
--- /dev/null
+++ b/assets/common/entity/wild/aggressive/tarasque.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("tarasque"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/aggressive/tiger.ron b/assets/common/entity/wild/aggressive/tiger.ron
new file mode 100644
index 0000000000..309c9e7df7
--- /dev/null
+++ b/assets/common/entity/wild/aggressive/tiger.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("tiger"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/aggressive/wendigo.ron b/assets/common/entity/wild/aggressive/wendigo.ron
index 9cae3b1e53..8fef962284 100644
--- a/assets/common/entity/wild/aggressive/wendigo.ron
+++ b/assets/common/entity/wild/aggressive/wendigo.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Wendigo"),
+    name: Automatic,
     body: RandomWith("wendigo"),
     alignment: Alignment(Enemy),
 
diff --git a/assets/common/entity/wild/aggressive/wolf.ron b/assets/common/entity/wild/aggressive/wolf.ron
index b343a1c642..57509f6382 100644
--- a/assets/common/entity/wild/aggressive/wolf.ron
+++ b/assets/common/entity/wild/aggressive/wolf.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Wolf"),
+    name: Automatic,
     body: RandomWith("wolf"),
     alignment: Alignment(Enemy),
 
diff --git a/assets/common/entity/wild/aggressive/wood_raptor.ron b/assets/common/entity/wild/aggressive/wood_raptor.ron
new file mode 100644
index 0000000000..fbc093e14a
--- /dev/null
+++ b/assets/common/entity/wild/aggressive/wood_raptor.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("raptor_wood"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/aggressive/yale.ron b/assets/common/entity/wild/aggressive/yale.ron
index fafe4c20c9..0ea8d6dc09 100644
--- a/assets/common/entity/wild/aggressive/yale.ron
+++ b/assets/common/entity/wild/aggressive/yale.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Yale"),
+    name: Automatic,
     body: RandomWith("yale"),
     alignment: Alignment(Enemy),
 
diff --git a/assets/common/entity/wild/peaceful/alpaca.ron b/assets/common/entity/wild/peaceful/alpaca.ron
index d29584c4f7..b1b06b53a9 100644
--- a/assets/common/entity/wild/peaceful/alpaca.ron
+++ b/assets/common/entity/wild/peaceful/alpaca.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Alpaca"),
+    name: Automatic,
     body: RandomWith("alpaca"),
     alignment: Alignment(Wild),
 
diff --git a/assets/common/entity/wild/peaceful/antelope.ron b/assets/common/entity/wild/peaceful/antelope.ron
new file mode 100644
index 0000000000..573e457850
--- /dev/null
+++ b/assets/common/entity/wild/peaceful/antelope.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("antelope"),
+    alignment: Alignment(Wild),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/peaceful/arctic_fox.ron b/assets/common/entity/wild/peaceful/arctic_fox.ron
index 45816ff39b..4a289c0644 100644
--- a/assets/common/entity/wild/peaceful/arctic_fox.ron
+++ b/assets/common/entity/wild/peaceful/arctic_fox.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Fox"),
+    name: Name("Arctic Fox"),
     body: Exact(QuadrupedSmall(Body(species: Fox, body_type: Female))),
     alignment: Alignment(Wild),
 
diff --git a/assets/common/entity/wild/peaceful/arctic_hare.ron b/assets/common/entity/wild/peaceful/arctic_hare.ron
index 2e4265de09..566b5c15e2 100644
--- a/assets/common/entity/wild/peaceful/arctic_hare.ron
+++ b/assets/common/entity/wild/peaceful/arctic_hare.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Hare"),
+    name: Name("Arctic Hare"),
     body: Exact(QuadrupedSmall(Body(species: Hare, body_type: Female))),
     alignment: Alignment(Wild),
 
diff --git a/assets/common/entity/wild/peaceful/axolotl.ron b/assets/common/entity/wild/peaceful/axolotl.ron
new file mode 100644
index 0000000000..f7b04e723e
--- /dev/null
+++ b/assets/common/entity/wild/peaceful/axolotl.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("axolotl"),
+    alignment: Alignment(Wild),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/peaceful/beaver.ron b/assets/common/entity/wild/peaceful/beaver.ron
new file mode 100644
index 0000000000..fb7ed84625
--- /dev/null
+++ b/assets/common/entity/wild/peaceful/beaver.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("beaver"),
+    alignment: Alignment(Wild),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/peaceful/boar.ron b/assets/common/entity/wild/peaceful/boar.ron
new file mode 100644
index 0000000000..bba9eac893
--- /dev/null
+++ b/assets/common/entity/wild/peaceful/boar.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("boar"),
+    alignment: Alignment(Wild),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/peaceful/camel.ron b/assets/common/entity/wild/peaceful/camel.ron
new file mode 100644
index 0000000000..fd574f17e1
--- /dev/null
+++ b/assets/common/entity/wild/peaceful/camel.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("camel"),
+    alignment: Alignment(Wild),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/peaceful/catoblepas.ron b/assets/common/entity/wild/peaceful/catoblepas.ron
new file mode 100644
index 0000000000..d15457d45c
--- /dev/null
+++ b/assets/common/entity/wild/peaceful/catoblepas.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("catoblepas"),
+    alignment: Alignment(Wild),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/peaceful/cattle.ron b/assets/common/entity/wild/peaceful/cattle.ron
new file mode 100644
index 0000000000..72cc745057
--- /dev/null
+++ b/assets/common/entity/wild/peaceful/cattle.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("cattle"),
+    alignment: Alignment(Wild),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/peaceful/chicken.ron b/assets/common/entity/wild/peaceful/chicken.ron
new file mode 100644
index 0000000000..7d65a663ee
--- /dev/null
+++ b/assets/common/entity/wild/peaceful/chicken.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("chicken"),
+    alignment: Alignment(Wild),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/peaceful/clownfish.ron b/assets/common/entity/wild/peaceful/clownfish.ron
new file mode 100644
index 0000000000..76c8698071
--- /dev/null
+++ b/assets/common/entity/wild/peaceful/clownfish.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("clownfish"),
+    alignment: Alignment(Wild),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/peaceful/deer.ron b/assets/common/entity/wild/peaceful/deer.ron
new file mode 100644
index 0000000000..0b12f635ca
--- /dev/null
+++ b/assets/common/entity/wild/peaceful/deer.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("deer"),
+    alignment: Alignment(Wild),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/peaceful/donkey.ron b/assets/common/entity/wild/peaceful/donkey.ron
new file mode 100644
index 0000000000..5838cf2710
--- /dev/null
+++ b/assets/common/entity/wild/peaceful/donkey.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("donkey"),
+    alignment: Alignment(Wild),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/peaceful/duck.ron b/assets/common/entity/wild/peaceful/duck.ron
new file mode 100644
index 0000000000..c0f9283508
--- /dev/null
+++ b/assets/common/entity/wild/peaceful/duck.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("duck"),
+    alignment: Alignment(Wild),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/peaceful/eagle.ron b/assets/common/entity/wild/peaceful/eagle.ron
index aae26839af..093606f786 100644
--- a/assets/common/entity/wild/peaceful/eagle.ron
+++ b/assets/common/entity/wild/peaceful/eagle.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Eagle"),
+    name: Automatic,
     body: RandomWith("eagle"),
     alignment: Alignment(Wild),
 
diff --git a/assets/common/entity/wild/peaceful/forest_fox.ron b/assets/common/entity/wild/peaceful/forest_fox.ron
new file mode 100644
index 0000000000..f2a7e88651
--- /dev/null
+++ b/assets/common/entity/wild/peaceful/forest_fox.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Name("Forest Fox"),
+    body: Exact(QuadrupedSmall(Body(species: Fox, body_type: Male))),
+    alignment: Alignment(Wild),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/peaceful/frog.ron b/assets/common/entity/wild/peaceful/frog.ron
new file mode 100644
index 0000000000..6bc65393f6
--- /dev/null
+++ b/assets/common/entity/wild/peaceful/frog.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("frog"),
+    alignment: Alignment(Wild),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/peaceful/fungome.ron b/assets/common/entity/wild/peaceful/fungome.ron
new file mode 100644
index 0000000000..96540f5d61
--- /dev/null
+++ b/assets/common/entity/wild/peaceful/fungome.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("fungome"),
+    alignment: Alignment(Wild),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/peaceful/gecko.ron b/assets/common/entity/wild/peaceful/gecko.ron
new file mode 100644
index 0000000000..830c51cb0d
--- /dev/null
+++ b/assets/common/entity/wild/peaceful/gecko.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("gecko"),
+    alignment: Alignment(Wild),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/peaceful/goat.ron b/assets/common/entity/wild/peaceful/goat.ron
new file mode 100644
index 0000000000..9f33ed002e
--- /dev/null
+++ b/assets/common/entity/wild/peaceful/goat.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("goat"),
+    alignment: Alignment(Wild),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/peaceful/goose.ron b/assets/common/entity/wild/peaceful/goose.ron
new file mode 100644
index 0000000000..294f05754a
--- /dev/null
+++ b/assets/common/entity/wild/peaceful/goose.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("goose"),
+    alignment: Alignment(Wild),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/peaceful/highland.ron b/assets/common/entity/wild/peaceful/highland.ron
index 3ddd070faf..ef992cd8fb 100644
--- a/assets/common/entity/wild/peaceful/highland.ron
+++ b/assets/common/entity/wild/peaceful/highland.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Highland"),
+    name: Automatic,
     body: RandomWith("highland"),
     alignment: Alignment(Wild),
 
diff --git a/assets/common/entity/wild/peaceful/hirdrasil.ron b/assets/common/entity/wild/peaceful/hirdrasil.ron
new file mode 100644
index 0000000000..c97924afd9
--- /dev/null
+++ b/assets/common/entity/wild/peaceful/hirdrasil.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("hirdrasil"),
+    alignment: Alignment(Wild),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/peaceful/holladon.ron b/assets/common/entity/wild/peaceful/holladon.ron
new file mode 100644
index 0000000000..a57248dce9
--- /dev/null
+++ b/assets/common/entity/wild/peaceful/holladon.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("holladon"),
+    alignment: Alignment(Wild),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/peaceful/horse.ron b/assets/common/entity/wild/peaceful/horse.ron
new file mode 100644
index 0000000000..b42067c4c8
--- /dev/null
+++ b/assets/common/entity/wild/peaceful/horse.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("horse"),
+    alignment: Alignment(Wild),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/peaceful/jackalope.ron b/assets/common/entity/wild/peaceful/jackalope.ron
new file mode 100644
index 0000000000..130aad374a
--- /dev/null
+++ b/assets/common/entity/wild/peaceful/jackalope.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("jackalope"),
+    alignment: Alignment(Wild),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/peaceful/kelpie.ron b/assets/common/entity/wild/peaceful/kelpie.ron
new file mode 100644
index 0000000000..1062c5bedb
--- /dev/null
+++ b/assets/common/entity/wild/peaceful/kelpie.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("kelpie"),
+    alignment: Alignment(Wild),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/peaceful/llama.ron b/assets/common/entity/wild/peaceful/llama.ron
index 2ca5721c68..3b40a2149e 100644
--- a/assets/common/entity/wild/peaceful/llama.ron
+++ b/assets/common/entity/wild/peaceful/llama.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Llama"),
+    name: Automatic,
     body: RandomWith("llama"),
     alignment: Alignment(Wild),
 
diff --git a/assets/common/entity/wild/peaceful/marlin.ron b/assets/common/entity/wild/peaceful/marlin.ron
new file mode 100644
index 0000000000..e127c8aeba
--- /dev/null
+++ b/assets/common/entity/wild/peaceful/marlin.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("marlin"),
+    alignment: Alignment(Wild),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/peaceful/moose.ron b/assets/common/entity/wild/peaceful/moose.ron
index f720464d76..47953674fc 100644
--- a/assets/common/entity/wild/peaceful/moose.ron
+++ b/assets/common/entity/wild/peaceful/moose.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Moose"),
+    name: Automatic,
     body: RandomWith("moose"),
     alignment: Alignment(Wild),
 
diff --git a/assets/common/entity/wild/peaceful/mouflon.ron b/assets/common/entity/wild/peaceful/mouflon.ron
index 940edec652..c324dcbba5 100644
--- a/assets/common/entity/wild/peaceful/mouflon.ron
+++ b/assets/common/entity/wild/peaceful/mouflon.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Mouflon"),
+    name: Automatic,
     body: RandomWith("mouflon"),
     alignment: Alignment(Wild),
 
diff --git a/assets/common/entity/wild/peaceful/owl.ron b/assets/common/entity/wild/peaceful/owl.ron
index f4cfc3118a..dd23ad327a 100644
--- a/assets/common/entity/wild/peaceful/owl.ron
+++ b/assets/common/entity/wild/peaceful/owl.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Owl"),
+    name: Automatic,
     body: RandomWith("owl"),
     alignment: Alignment(Wild),
 
diff --git a/assets/common/entity/wild/peaceful/pangolin.ron b/assets/common/entity/wild/peaceful/pangolin.ron
new file mode 100644
index 0000000000..ba207dd831
--- /dev/null
+++ b/assets/common/entity/wild/peaceful/pangolin.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("pangolin"),
+    alignment: Alignment(Wild),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/peaceful/parrot.ron b/assets/common/entity/wild/peaceful/parrot.ron
new file mode 100644
index 0000000000..d680c71647
--- /dev/null
+++ b/assets/common/entity/wild/peaceful/parrot.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("parrot"),
+    alignment: Alignment(Wild),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/peaceful/peacock.ron b/assets/common/entity/wild/peaceful/peacock.ron
new file mode 100644
index 0000000000..b34c2e830d
--- /dev/null
+++ b/assets/common/entity/wild/peaceful/peacock.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("peacock"),
+    alignment: Alignment(Wild),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/peaceful/pig.ron b/assets/common/entity/wild/peaceful/pig.ron
new file mode 100644
index 0000000000..3c20ae39cd
--- /dev/null
+++ b/assets/common/entity/wild/peaceful/pig.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("pig"),
+    alignment: Alignment(Wild),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/peaceful/piranha.ron b/assets/common/entity/wild/peaceful/piranha.ron
new file mode 100644
index 0000000000..dc1f92651b
--- /dev/null
+++ b/assets/common/entity/wild/peaceful/piranha.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("piranha"),
+    alignment: Alignment(Wild),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/peaceful/porcupine.ron b/assets/common/entity/wild/peaceful/porcupine.ron
new file mode 100644
index 0000000000..79fdade2b9
--- /dev/null
+++ b/assets/common/entity/wild/peaceful/porcupine.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("porcupine"),
+    alignment: Alignment(Wild),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/peaceful/quokka.ron b/assets/common/entity/wild/peaceful/quokka.ron
new file mode 100644
index 0000000000..e25c15cb3c
--- /dev/null
+++ b/assets/common/entity/wild/peaceful/quokka.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("quokka"),
+    alignment: Alignment(Wild),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/peaceful/rabbit.ron b/assets/common/entity/wild/peaceful/rabbit.ron
new file mode 100644
index 0000000000..23ff937e6e
--- /dev/null
+++ b/assets/common/entity/wild/peaceful/rabbit.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("rabbit"),
+    alignment: Alignment(Wild),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/peaceful/raccoon.ron b/assets/common/entity/wild/peaceful/raccoon.ron
new file mode 100644
index 0000000000..b941c98a24
--- /dev/null
+++ b/assets/common/entity/wild/peaceful/raccoon.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("raccoon"),
+    alignment: Alignment(Wild),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/peaceful/rat.ron b/assets/common/entity/wild/peaceful/rat.ron
new file mode 100644
index 0000000000..d911990b8b
--- /dev/null
+++ b/assets/common/entity/wild/peaceful/rat.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("rat"),
+    alignment: Alignment(Wild),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/peaceful/river_salamander.ron b/assets/common/entity/wild/peaceful/river_salamander.ron
new file mode 100644
index 0000000000..3f2914df60
--- /dev/null
+++ b/assets/common/entity/wild/peaceful/river_salamander.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Name("River Salamander"),
+    body: Exact(QuadrupedLow(Body(species: Salamander, body_type: Female))),
+    alignment: Alignment(Wild),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/peaceful/sand_hare.ron b/assets/common/entity/wild/peaceful/sand_hare.ron
new file mode 100644
index 0000000000..84a417974c
--- /dev/null
+++ b/assets/common/entity/wild/peaceful/sand_hare.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Name("Sand Hare"),
+    body: Exact(QuadrupedSmall(Body(species: Hare, body_type: Male))),
+    alignment: Alignment(Wild),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/peaceful/sand_salamander.ron b/assets/common/entity/wild/peaceful/sand_salamander.ron
new file mode 100644
index 0000000000..2740438c2b
--- /dev/null
+++ b/assets/common/entity/wild/peaceful/sand_salamander.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Name("Desert Salamander"),
+    body: Exact(QuadrupedLow(Body(species: Salamander, body_type: Male))),
+    alignment: Alignment(Wild),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/peaceful/sheep.ron b/assets/common/entity/wild/peaceful/sheep.ron
new file mode 100644
index 0000000000..fff177dfd3
--- /dev/null
+++ b/assets/common/entity/wild/peaceful/sheep.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("sheep"),
+    alignment: Alignment(Wild),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/peaceful/skunk.ron b/assets/common/entity/wild/peaceful/skunk.ron
new file mode 100644
index 0000000000..6e782adcfb
--- /dev/null
+++ b/assets/common/entity/wild/peaceful/skunk.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("skunk"),
+    alignment: Alignment(Wild),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/peaceful/squirrel.ron b/assets/common/entity/wild/peaceful/squirrel.ron
new file mode 100644
index 0000000000..9daac3cd8e
--- /dev/null
+++ b/assets/common/entity/wild/peaceful/squirrel.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("squirrel"),
+    alignment: Alignment(Wild),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/peaceful/tortoise.ron b/assets/common/entity/wild/peaceful/tortoise.ron
new file mode 100644
index 0000000000..4104f1c43a
--- /dev/null
+++ b/assets/common/entity/wild/peaceful/tortoise.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("tortoise"),
+    alignment: Alignment(Wild),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/peaceful/truffler.ron b/assets/common/entity/wild/peaceful/truffler.ron
new file mode 100644
index 0000000000..c0c9adfc1f
--- /dev/null
+++ b/assets/common/entity/wild/peaceful/truffler.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("truffler"),
+    alignment: Alignment(Wild),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/peaceful/turtle.ron b/assets/common/entity/wild/peaceful/turtle.ron
new file mode 100644
index 0000000000..4b55182fa6
--- /dev/null
+++ b/assets/common/entity/wild/peaceful/turtle.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("turtle"),
+    alignment: Alignment(Wild),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/common/entity/wild/peaceful/tuskram.ron b/assets/common/entity/wild/peaceful/tuskram.ron
index bd4bc62f6c..32c091db3a 100644
--- a/assets/common/entity/wild/peaceful/tuskram.ron
+++ b/assets/common/entity/wild/peaceful/tuskram.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Tuskram"),
+    name: Automatic,
     body: RandomWith("tuskram"),
     alignment: Alignment(Wild),
 
diff --git a/assets/common/entity/wild/peaceful/yak.ron b/assets/common/entity/wild/peaceful/yak.ron
index 32ffaba58b..95323b48d2 100644
--- a/assets/common/entity/wild/peaceful/yak.ron
+++ b/assets/common/entity/wild/peaceful/yak.ron
@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Yak"),
+    name: Automatic,
     body: RandomWith("yak"),
     alignment: Alignment(Wild),
 
diff --git a/assets/common/entity/wild/peaceful/zebra.ron b/assets/common/entity/wild/peaceful/zebra.ron
new file mode 100644
index 0000000000..fd7667965b
--- /dev/null
+++ b/assets/common/entity/wild/peaceful/zebra.ron
@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("zebra"),
+    alignment: Alignment(Wild),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)
diff --git a/assets/world/wildlife/spawn/desert/river.ron b/assets/world/wildlife/spawn/desert/river.ron
index 8b60349da6..a032786de7 100644
--- a/assets/world/wildlife/spawn/desert/river.ron
+++ b/assets/world/wildlife/spawn/desert/river.ron
@@ -4,7 +4,7 @@ SpawnEntry (
     rules: [
         Pack(
             groups: [
-                (1, (1, 1, "common.entity.wild.agressive.crocodile")),
+                (1, (1, 1, "common.entity.wild.aggressive.crocodile")),
             ],
             is_underwater: false,
             day_period: [Night, Morning, Noon, Evening],
diff --git a/assets/world/wildlife/spawn/desert/wasteland.ron b/assets/world/wildlife/spawn/desert/wasteland.ron
index f42867d2ed..2752064ade 100644
--- a/assets/world/wildlife/spawn/desert/wasteland.ron
+++ b/assets/world/wildlife/spawn/desert/wasteland.ron
@@ -14,7 +14,7 @@ SpawnEntry (
                 (20, (1, 1, "common.entity.wild.aggressive.ntouka")),
                 (20, (1, 1, "common.entity.wild.aggressive.archaeos")),
                 // Ultra_rare
-                (1, (1, 1, "common.entity.wild.agressive.roshwalr_boss")),
+                (1, (1, 1, "common.entity.wild.aggressive.roshwalr_boss")),
             ],
             is_underwater: false,
             day_period: [Night, Morning, Noon, Evening],
diff --git a/assets/world/wildlife/spawn/temperate/rainforest.ron b/assets/world/wildlife/spawn/temperate/rainforest.ron
index 317870f474..c60b19cf5e 100644
--- a/assets/world/wildlife/spawn/temperate/rainforest.ron
+++ b/assets/world/wildlife/spawn/temperate/rainforest.ron
@@ -25,10 +25,10 @@ SpawnEntry (
                 (2, (1, 1, "common.entity.wild.peaceful.goose")),
                 (2, (1, 1, "common.entity.wild.peaceful.peacock")),
                 (2, (1, 1, "common.entity.wild.peaceful.skunk")),
-                (2, (1, 1, "common.entity.wild.peaceful.raccon")),
+                (2, (1, 1, "common.entity.wild.peaceful.raccoon")),
                 (2, (1, 1, "common.entity.wild.peaceful.catoblepas")),
                 (2, (1, 1, "common.entity.wild.peaceful.turtle")),
-                (2, (1, 1, "common.entity.wild.peaceful.hidrasil")),
+                (2, (1, 1, "common.entity.wild.peaceful.hirdrasil")),
                 (2, (1, 1, "common.entity.wild.peaceful.truffler")),
             ],
             is_underwater: false,
@@ -39,7 +39,7 @@ SpawnEntry (
                 // Solitary
                 (1, (1, 1, "common.entity.wild.aggressive.batfox")),
                 (5, (1, 1, "common.entity.wild.peaceful.forest_fox")),
-                (5, (1, 1, "common.entity.wild.peaceful.raccon")),
+                (5, (1, 1, "common.entity.wild.peaceful.raccoon")),
                 // Pack
                 (5, (1, 3, "common.entity.wild.peaceful.rat")),
                 (5, (1, 3, "common.entity.wild.peaceful.squirrel")),
diff --git a/assets/world/wildlife/spawn/temperate/water.ron b/assets/world/wildlife/spawn/temperate/water.ron
index 55be4600d2..9906d3fa64 100644
--- a/assets/world/wildlife/spawn/temperate/water.ron
+++ b/assets/world/wildlife/spawn/temperate/water.ron
@@ -5,7 +5,7 @@ SpawnEntry (
         Pack(
             groups: [
                 (1, (3, 4, "common.entity.wild.peaceful.marlin")),
-                (1, (3, 4, "common.entity.wild.peaceful.pirahna")),
+                (1, (3, 4, "common.entity.wild.peaceful.piranha")),
                 (1, (3, 4, "common.entity.wild.peaceful.clownfish")),
             ],
             is_underwater: true,
diff --git a/common/src/generation.rs b/common/src/generation.rs
index 32b7fde77b..f587a10f28 100644
--- a/common/src/generation.rs
+++ b/common/src/generation.rs
@@ -14,16 +14,16 @@ use serde::Deserialize;
 use vek::*;
 
 #[derive(Debug, Deserialize, Clone)]
-enum BodyBuilder {
-    RandomWith(String),
-    Exact(Body),
+enum NameKind {
+    Name(String),
+    Automatic,
     Uninit,
 }
 
 #[derive(Debug, Deserialize, Clone)]
-enum LootKind {
-    Item(String),
-    LootTable(String),
+enum BodyBuilder {
+    RandomWith(String),
+    Exact(Body),
     Uninit,
 }
 
@@ -34,9 +34,10 @@ enum AlignmentMark {
 }
 
 #[derive(Debug, Deserialize, Clone)]
-enum Meta {
-    LoadoutAsset(String),
-    SkillSetAsset(String),
+enum LootKind {
+    Item(String),
+    LootTable(String),
+    Uninit,
 }
 
 #[derive(Debug, Deserialize, Clone)]
@@ -50,9 +51,15 @@ enum Hands {
     Uninit,
 }
 
+#[derive(Debug, Deserialize, Clone)]
+enum Meta {
+    LoadoutAsset(String),
+    SkillSetAsset(String),
+}
+
 #[derive(Debug, Deserialize, Clone)]
 pub struct EntityConfig {
-    name: Option<String>,
+    name: NameKind,
     body: BodyBuilder,
     alignment: AlignmentMark,
     loot: LootKind,
@@ -140,10 +147,6 @@ impl EntityInfo {
             meta,
         } = config;
 
-        if let Some(name) = name {
-            self = self.with_name(name);
-        }
-
         match body {
             BodyBuilder::RandomWith(string) => {
                 let npc::NpcBody(_body_kind, mut body_creator) =
@@ -159,6 +162,17 @@ impl EntityInfo {
             BodyBuilder::Uninit => {},
         }
 
+        // NOTE: set name after body, as it's used with automatic name
+        match name {
+            NameKind::Name(name) => {
+                self = self.with_name(name);
+            },
+            NameKind::Automatic => {
+                self = self.with_automatic_name();
+            },
+            NameKind::Uninit => {},
+        }
+
         if let AlignmentMark::Alignment(alignment) = alignment {
             self = self.with_alignment(alignment);
         }
@@ -381,8 +395,8 @@ mod tests {
                 hands,
                 loot,
                 body,
+                name,
                 meta,
-                name: _name,           // can't fail if serialized, it's a boring String
                 alignment: _alignment, // can't fail if serialized, it's a boring enum
             } = EntityConfig::from_asset_expect(config_asset);
 
@@ -409,7 +423,16 @@ mod tests {
                         });
                     let _ = body_creator();
                 },
-                BodyBuilder::Exact { .. } | BodyBuilder::Uninit => {},
+                BodyBuilder::Uninit => {
+                    if let NameKind::Automatic = name {
+                        // there is a big chance to call automatic name
+                        // when body is yet undefined
+                        //
+                        // use .with_automatic_name() in code explicitly
+                        panic!("Used Automatic name with Uninit body in {}", config_asset);
+                    }
+                },
+                BodyBuilder::Exact { .. } => {},
             }
 
             match loot {
diff --git a/world/src/layer/wildlife.rs b/world/src/layer/wildlife.rs
index ad81f61fa4..5492f04261 100644
--- a/world/src/layer/wildlife.rs
+++ b/world/src/layer/wildlife.rs
@@ -20,7 +20,7 @@ const BASE_DENSITY: f32 = 1.0e-5; // Base wildlife density
 
 #[derive(Clone, Debug, Deserialize)]
 pub struct SpawnEntry {
-    /// User-facing info for wiki, statistical tools.
+    /// User-facing info for wiki, statistical tools, etc.
     pub name: String,
     pub note: String,
     /// Rules describing what and when to spawn
@@ -309,7 +309,7 @@ pub fn apply_wildlife_supplement<'a, R: Rng>(
                     }) {
                         let mut entity = entity.clone();
                         entity.pos += offs_wpos2d.with_z(solid_end).map(|e| e as f32);
-                        supplement.add_entity(entity.with_automatic_name());
+                        supplement.add_entity(entity);
                     }
                 }
             }
diff --git a/world/src/site/settlement/mod.rs b/world/src/site/settlement/mod.rs
index 2f18b78b0a..3c0c751063 100644
--- a/world/src/site/settlement/mod.rs
+++ b/world/src/site/settlement/mod.rs
@@ -1022,8 +1022,7 @@ fn human(pos: Vec3<f32>, economy: &SiteInformation, dynamic_rng: &mut impl Rng)
             .with_asset_expect("common.entity.village.merchant"),
         _ => entity
             .with_lazy_loadout(villager_loadout)
-            .with_asset_expect("common.entity.village.villager")
-            .with_automatic_name(),
+            .with_asset_expect("common.entity.village.villager"),
     }
 }