diff --git a/data/json/ammo_effects.json b/data/json/ammo_effects.json
index d57f44c4fea0a..8bcf4e929f081 100644
--- a/data/json/ammo_effects.json
+++ b/data/json/ammo_effects.json
@@ -168,7 +168,7 @@
   {
     "id": "ROBOT_DAZZLE",
     "type": "ammo_effect",
-    "//": "Applies sensor-stunning effect to robots. Hardcoded"
+    "//": "Applies sensor-stunning effect to robots.  Only intended to affect ROBOTs not CYBORGs. Hardcoded"
   },
   {
     "id": "RECYCLED",
diff --git a/data/json/monsters/cyborgs.json b/data/json/monsters/cyborgs.json
index 09b33e9d56aaf..856b1a3ee64a7 100644
--- a/data/json/monsters/cyborgs.json
+++ b/data/json/monsters/cyborgs.json
@@ -3,6 +3,7 @@
     "id": "mon_broken_cyborg",
     "type": "MONSTER",
     "name": { "str": "broken cyborg" },
+    "//": "The human mind is no longer working in this body, therefore it qualifies as a ROBOT and not as a CYBORG",
     "description": "A robot body with the head of a human.  All kinds of electronic wires and devices are implanted in its head.  The remaining patches of skin look diseased or rotting.  This cyborg moves erratically and has a confused and deranged look in its eyes.  Any personality or humanity it once had is clearly gone for good.",
     "default_faction": "science",
     "bodytype": "human",
diff --git a/data/json/species.json b/data/json/species.json
index 70473c998d88e..d76547750c0e9 100644
--- a/data/json/species.json
+++ b/data/json/species.json
@@ -24,6 +24,7 @@
     "type": "SPECIES",
     "id": "CYBORG",
     "description": "an alien cyborg",
+    "//": "The difference between a ROBOT and a CYBORG is that a CYBORG has a human mind controlling it and ROBOT does not",
     "flags": [ "DRACULIN_IMMUNE" ],
     "footsteps": "heavy thuds."
   },
@@ -181,6 +182,7 @@
   {
     "type": "SPECIES",
     "id": "ROBOT",
+    "//": "The difference between a ROBOT and a CYBORG is that a CYBORG has a human mind controlling it and ROBOT does not",
     "description": "a robot",
     "footsteps": "mechanical whirring.",
     "bleeds": "fd_mechanical_fluid"