diff --git a/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_teamster.json b/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_teamster.json
index 37c3d5daa6486..233e50b14d50e 100644
--- a/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_teamster.json
+++ b/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_teamster.json
@@ -4,12 +4,32 @@
     "id": "evac_teamster",
     "//": "Appears in the refugee center as a source of information and eventually missions.  Works with the free merchant caravans.",
     "name_suffix": "Teamster",
-    "class": "NC_SCAVENGER",
+    "class": "NC_FREE_MERCHANT_TEAMSTER",
     "attitude": 0,
     "mission": 3,
     "chat": "TALK_FREE_MERCHANT_TEAMSTER",
-    "faction": "free_merchants",
-    "traits": [ { "trait": "IGNORE_SOUND" }, { "trait": "NO_BASH" }, { "trait": "RETURN_TO_START_POS" } ]
+    "faction": "free_merchants"
+  },
+  {
+    "type": "npc_class",
+    "id": "NC_FREE_MERCHANT_TEAMSTER",
+    "name": { "str": "Teamster" },
+    "job_description": "I'm just a trader.",
+    "traits": [
+      { "group": "BG_survival_story_EVACUEE" },
+      { "group": "NPC_starting_traits" },
+      { "group": "Appearance_demographics" },
+      { "trait": "IGNORE_SOUND" },
+      { "trait": "NO_BASH" },
+      { "trait": "RETURN_TO_START_POS" }
+    ],
+    "skills": [
+      { "skill": "ALL", "level": { "sum": [ { "dice": [ 3, 2 ] }, { "constant": -3 } ] } },
+      { "skill": "gun", "bonus": { "rng": [ 2, 4 ] } },
+      { "skill": "pistol", "bonus": { "rng": [ 2, 5 ] } },
+      { "skill": "rifle", "bonus": { "rng": [ 0, 3 ] } },
+      { "skill": "archery", "bonus": { "rng": [ 0, 3 ] } }
+    ]
   },
   {
     "//": "table of contents - these options will appear in the listed dialogue topics",
diff --git a/data/json/npcs/refugee_center/surface_staff/Generic_class_definitions b/data/json/npcs/refugee_center/surface_staff/generic_class_definitions.json
similarity index 100%
rename from data/json/npcs/refugee_center/surface_staff/Generic_class_definitions
rename to data/json/npcs/refugee_center/surface_staff/generic_class_definitions.json