diff --git a/data/json/items/software.json b/data/json/items/software.json
index 3d9593eacfe25..3ebaee2697ade 100644
--- a/data/json/items/software.json
+++ b/data/json/items/software.json
@@ -62,6 +62,24 @@
     "price": "2 USD",
     "price_postapoc": "0 cent"
   },
+  {
+    "id": "software_encryption_codes",
+    "copy-from": "software",
+    "type": "GENERIC",
+    "name": { "str_sp": "encryption codes" },
+    "description": "There are numerous security keys with dates for potential future access to encrypted archived data.",
+    "price": "2 USD",
+    "price_postapoc": "0 cent"
+  },
+  {
+    "id": "software_archived_data",
+    "copy-from": "software",
+    "type": "GENERIC",
+    "name": { "str_sp": "archive data" },
+    "description": "Extremely compressed research data, observation and experiment statistics.  The only pattern you manage to recognize is an increase in the amount of report closer to the Cataclysm, but also a reduction in the number of facilities still submitting reports.",
+    "price": "2 USD",
+    "price_postapoc": "0 cent"
+  },
   {
     "id": "software_electronics_reference",
     "copy-from": "software",
diff --git a/data/json/mapgen/LIXA_mapgen.json b/data/json/mapgen/LIXA_mapgen.json
index 38328e587782e..4fa965a5d3f10 100644
--- a/data/json/mapgen/LIXA_mapgen.json
+++ b/data/json/mapgen/LIXA_mapgen.json
@@ -543,7 +543,6 @@
           { "item": "LIXA_lab_postit", "chance": 3, "repeat": 1 },
           { "item": "LIXA_lab_file", "chance": 7, "repeat": 2 },
           { "item": "software_math", "chance": 3, "repeat": 1 },
-          { "item": "software_lab_data", "chance": 2, "repeat": 4 },
           { "item": "software_electronics_reference", "chance": 4, "repeat": 2 }
         ],
         "q": [ { "item": "adderall", "amount": [ 2, 5 ] } ],
diff --git a/data/json/npcs/refugee_center/surface_staff/NPC_old_guard_doctor.json b/data/json/npcs/refugee_center/surface_staff/NPC_old_guard_doctor.json
index 7f53cbfe0a46e..556b9aa114b7c 100644
--- a/data/json/npcs/refugee_center/surface_staff/NPC_old_guard_doctor.json
+++ b/data/json/npcs/refugee_center/surface_staff/NPC_old_guard_doctor.json
@@ -142,7 +142,7 @@
     "goal": "MGOAL_FIND_ANY_ITEM",
     "difficulty": 5,
     "value": 50000,
-    "item": "software_lab_data",
+    "item": "software_encryption_codes",
     "start": "create_hidden_lab_console",
     "origins": [ "ORIGIN_SECONDARY" ],
     "followup": "MISSION_SCIENCE_REP_4",
@@ -165,7 +165,7 @@
     "goal": "MGOAL_FIND_ANY_ITEM",
     "difficulty": 5,
     "value": 50000,
-    "item": "software_lab_data",
+    "item": "software_archived_data",
     "start": "create_ice_lab_console",
     "origins": [ "ORIGIN_SECONDARY" ],
     "followup": "MISSION_SCIENCE_REP_5",
diff --git a/data/json/npcs/robofac/robofac_intercom/robofac_intercom.json b/data/json/npcs/robofac/robofac_intercom/robofac_intercom.json
index 9d50fe413820a..42db2d371dccb 100644
--- a/data/json/npcs/robofac/robofac_intercom/robofac_intercom.json
+++ b/data/json/npcs/robofac/robofac_intercom/robofac_intercom.json
@@ -81,7 +81,7 @@
         "group": "NC_ROBOFAC_INTERCOM_trade_hm12",
         "rigid": true,
         "strict": true,
-        "condition": { "u_has_var": "dialogue_hub_rnd_completed_robofac_intercom_robot_sm_1", "value": "yes" }
+        "condition": { "u_has_var": "dialogue_intercom_completed_robofac_intercom_robot_sm_1", "value": "yes" }
       },
       {
         "group": "NC_ROBOFAC_INTERCOM_trade_envirosuit",