diff --git a/assets/common/npc_names.json b/assets/common/npc_names.json
index 93bd98ab9f..a78a16af92 100644
--- a/assets/common/npc_names.json
+++ b/assets/common/npc_names.json
@@ -1,4 +1,104 @@
 {
+    "humanoid" : [
+        "Adon",
+        "Agro",
+        "Arlo",
+        "Azamarr",
+        "Baashar",
+        "Barak",
+        "Barton",
+        "Baske",
+        "Baxar",
+        "Blaiz",
+        "Caelan",
+        "Cassian",
+        "Clawsen",
+        "Colborn",
+        "Dagfinn",
+        "Dagrod",
+        "Dimian",
+        "Domnhar",
+        "Ebraheim",
+        "Eldermar",
+        "Embre",
+        "Esdel",
+        "Eune",
+        "Fangar",
+        "Favroe",
+        "Feron",
+        "Feston",
+        "Fintis",
+        "Gatlen",
+        "Gatlin",
+        "Gentar",
+        "Gethrod",
+        "Graff",
+        "Gunnar",
+        "Hagalbar",
+        "Hawke",
+        "Hemm",
+        "Henndar",
+        "Hezra",
+        "Hodus",
+        "Ishmael",
+        "Jakrin",
+        "Jareth",
+        "Jaris",
+        "Jather",
+        "Jerrick",
+        "Jessop",
+        "Jinto",
+        "Joz",
+        "Kadric",
+        "Kagran",
+        "Kent",
+        "Khron",
+        "Kontas",
+        "Krinn",
+        "Lassrin",
+        "Lenox",
+        "Lothe",
+        "Lustros",
+        "Lydan",
+        "Mavrek",
+        "Moki",
+        "Nazim",
+        "Nesso",
+        "Ophni",
+        "Pakker",
+        "Paquin",
+        "Paskel",
+        "Pike",
+        "Ptorik",
+        "Quintis",
+        "Rankar",
+        "Renham",
+        "Revvyn",
+        "Riordan",
+        "Rivik",
+        "Rourke",
+        "Roux",
+        "Ryven",
+        "Sarkin",
+        "Straus",
+        "Syrin",
+        "Talon",
+        "Tekren",
+        "Tez",
+        "Turrek",
+        "Tyvrik",
+        "Vadim",
+        "Vale",
+        "Varog",
+        "Verssek",
+        "Weston",
+        "Whit",
+        "Wulfe",
+        "Yorjan",
+        "Zaden",
+        "Zagaroth",
+        "Zenner"
+    ],
     "wolf": [
         "Achak",
         "Adalwolf",
diff --git a/common/src/npc.rs b/common/src/npc.rs
index 49108438b9..8864d5d73c 100644
--- a/common/src/npc.rs
+++ b/common/src/npc.rs
@@ -7,6 +7,7 @@ use std::io::Error;
 use std::sync::Arc;
 
 pub enum NpcKind {
+    Humanoid,
     Wolf,
     Pig,
 }
@@ -14,6 +15,7 @@ pub enum NpcKind {
 impl NpcKind {
     fn as_str(&self) -> &'static str {
         match *self {
+            NpcKind::Humanoid => "humanoid",
             NpcKind::Wolf => "wolf",
             NpcKind::Pig => "pig",
         }
diff --git a/server/src/cmd.rs b/server/src/cmd.rs
index cdcc19f1f2..a926e22df7 100644
--- a/server/src/cmd.rs
+++ b/server/src/cmd.rs
@@ -288,7 +288,7 @@ fn handle_enemy(server: &mut Server, entity: EcsEntity, args: String, action: &C
             server
                 .create_npc(
                     pos,
-                    get_npc_name(NpcKind::Wolf),
+                    get_npc_name(NpcKind::Humanoid),
                     comp::Body::Humanoid(comp::HumanoidBody::random()),
                 )
                 .with(comp::Agent::Enemy { target: None })