diff --git a/carbon-recipe.lua b/carbon-recipe.lua
index df8d3de..dc1ff86 100644
--- a/carbon-recipe.lua
+++ b/carbon-recipe.lua
@@ -277,7 +277,6 @@ data:extend({
     order = "b-b"
   },
 })
-local ammonia = mods.Krastorio2 and "kr-ammonia" or "ammonia"
 data:extend({
 -- graphene
   {
@@ -303,7 +302,7 @@ data:extend({
     energy_required = 5,
     ingredients = (mods["space-age"] or util.k2()) and {
       {type="item", name="graphite", amount=1},
-      {type="fluid", name=ammonia, amount=5},
+      {type="fluid", name="kr-ammonia", amount=5},
       {type="fluid", name="sulfuric-acid", amount=5},
     } or {
       {type="item", name="graphite", amount=1},
@@ -611,7 +610,7 @@ if mods["space-age"] then
   data:extend({
   {
     type = "surface-property",
-    name = "oxygen",
+    name = "kr-oxygen",
     default_value = 19,
   },
   -- make graphite from diamonds on some surfaces
@@ -628,7 +627,7 @@ if mods["space-age"] then
     allow_productivity=true,
     energy_required = 16,
     surface_conditions = {
-      {property = "oxygen", max = 20},
+      {property = "kr-oxygen", max = 20},
     },
     ingredients = {
       {type="item", name="rough-diamond", amount=1},
@@ -676,10 +675,10 @@ if mods["space-age"] then
   })
   util.add_unlock("biochamber", "graphite-synthesis")
   util.set_recipe_time("burnt-spoilage", 4)
-  util.set_surface_property("nauvis", "oxygen", 21)
-  util.set_surface_property("gleba", "oxygen", 30)
-  util.set_surface_property("fulgora", "oxygen", 15)
-  util.set_surface_property("vulcanus", "oxygen", 12)
-  util.set_surface_property("aquilo", "oxygen", 10)
-  util.set_surface_property("space-platform", "oxygen", 0)
+  util.set_surface_property("nauvis", "kr-oxygen", 21)
+  util.set_surface_property("gleba", "kr-oxygen", 30)
+  util.set_surface_property("fulgora", "kr-oxygen", 15)
+  util.set_surface_property("vulcanus", "kr-oxygen", 12)
+  util.set_surface_property("aquilo", "kr-oxygen", 10)
+  util.set_surface_property("space-platform", "kr-oxygen", 0)
 end
diff --git a/prototypes/activated-carbon.lua b/prototypes/activated-carbon.lua
index 6b68a38..160732f 100644
--- a/prototypes/activated-carbon.lua
+++ b/prototypes/activated-carbon.lua
@@ -20,7 +20,7 @@ if mods["wood-industry"] then precursor = "charcoal" end
     order = "d[graphite-carbon-fiber]",
     enabled = false,
     energy_required = 2.5,
-    ingredients = data.raw.fluid["ammonia"] and
+    ingredients = data.raw.fluid["kr-ammonia"] and
     {
       util.item(precursor),
       util.fluid("steam"),
@@ -45,7 +45,7 @@ if mods["wood-industry"] then precursor = "charcoal" end
     order = "d[graphite-carbon-fiber]",
     enabled = false,
     energy_required = 2.5,
-    ingredients = data.raw.fluid["ammonia"] and
+    ingredients = data.raw.fluid["kr-ammonia"] and
     {
       util.item("carbon-black", 5),
       util.fluid("steam"),
diff --git a/prototypes/carbon-asteroid-updates.lua b/prototypes/carbon-asteroid-updates.lua
index 866b6bb..8e2b30a 100644
--- a/prototypes/carbon-asteroid-updates.lua
+++ b/prototypes/carbon-asteroid-updates.lua
@@ -21,7 +21,7 @@ if mods["space-age"] then
         {icon="__bzcarbon__/graphics/icons/flake-graphite.png", icon_size=128, scale=0.125, shift={8,0}},
         {icon="__bzcarbon__/graphics/icons/rough-diamond.png", icon_size=128, scale=0.125, shift={-8,0}},
       },
-      category = "crushing",
+      category = "kr-crushing",
       subgroup="space-crushing",
       order = "b-a-z-b",
       auto_recycle = false,
diff --git a/prototypes/carbon-fiber.lua b/prototypes/carbon-fiber.lua
index 38b6926..a693eab 100644
--- a/prototypes/carbon-fiber.lua
+++ b/prototypes/carbon-fiber.lua
@@ -19,7 +19,7 @@ if mods["space-age"] then
         util.item("spoilage", 1),
       },
       results = {
-        util.fluid("ammonia", 10),
+        util.fluid("kr-ammonia", 10),
       },
     }
   })
@@ -41,10 +41,10 @@ data:extend({
     order = "d[graphite-carbon-fiber]",
     enabled = false,
     energy_required = 1,
-    ingredients = data.raw.fluid["ammonia"] and
+    ingredients = data.raw.fluid["kr-ammonia"] and
     {
       {type="fluid", name="petroleum-gas", amount=5},
-      {type="fluid", name="ammonia", amount=5},
+      {type="fluid", name="kr-ammonia", amount=5},
     } or {
       {type="fluid", name="petroleum-gas", amount=10},
     },
@@ -58,8 +58,8 @@ if mods["space-age"] then
   util.remove_ingredient("polyacrylonitrile", "petroleum-gas")
   util.add_ingredient("polyacrylonitrile", "jelly", 10)
   util.add_ingredient("polyacrylonitrile", "jelly", 10)
-  util.add_ingredient("polyacrylonitrile", "ammonia", 10)
-  util.add_ingredient("carbon-fiber", "ammonia", 10)
+  util.add_ingredient("polyacrylonitrile", "kr-ammonia", 10)
+  util.add_ingredient("carbon-fiber", "kr-ammonia", 10)
   util.replace_ingredient("carbon-fiber", "carbon", "polyacrylonitrile")
   util.set_item_icons("carbon-fiber", { {icon = "__bzcarbon__/graphics/icons/carbon-fiber.png", icon_size = 128,} })
   util.add_unlock("biochamber", "ammonia-from-spoilage")