diff --git a/bobgreenhouse/prototypes/updates.lua b/bobgreenhouse/prototypes/updates.lua
index 19b4bc28c..16af18851 100644
--- a/bobgreenhouse/prototypes/updates.lua
+++ b/bobgreenhouse/prototypes/updates.lua
@@ -11,10 +11,10 @@ if data.raw.item["bob-glass"] then
   bobmods.lib.recipe.replace_ingredient("bob-greenhouse", "copper-plate", "bob-glass")
 end
 
-if data.raw.fluid["bob-ammonia"] and data.raw.fluid["bob-nitric-acid"] then
+if data.raw.fluid["ammonia"] and data.raw.fluid["bob-nitric-acid"] then
   data.raw.recipe["bob-fertiliser"].ingredients = {
     { type = "fluid", name = "bob-nitric-acid", amount = 10 },
-    { type = "fluid", name = "bob-ammonia", amount = 10 },
+    { type = "fluid", name = "ammonia", amount = 10 },
   }
 elseif data.raw.fluid["bob-nitrogen"] then
   data.raw.recipe["bob-fertiliser"].ingredients = {
diff --git a/bobrevamp/info.json b/bobrevamp/info.json
index 33093b6cb..288dd073c 100644
--- a/bobrevamp/info.json
+++ b/bobrevamp/info.json
@@ -1,6 +1,6 @@
 {
   "name": "bobrevamp",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "factorio_version": "2.0",
   "title": "Bob's Revamp mod",
   "author": "Bobingabout",
diff --git a/bobrevamp/locale/cs/bobrevamp.cfg b/bobrevamp/locale/cs/bobrevamp.cfg
index 69d4fc54b..701068e09 100644
--- a/bobrevamp/locale/cs/bobrevamp.cfg
+++ b/bobrevamp/locale/cs/bobrevamp.cfg
@@ -19,7 +19,7 @@ bob-rtg=Radiotermoelektrický generátor
 
 
 [fluid-name]
-bob-ammonia=Amoniak
+ammonia=Amoniak
 bob-dinitrogen-tetroxide=Oxid dusičitý
 bob-hydrazine=Hydrazin
 bob-hydrogen-peroxide=Peroxid vodíku
diff --git a/bobrevamp/locale/de/bobrevamp.cfg b/bobrevamp/locale/de/bobrevamp.cfg
index c6b045267..43e8823a3 100644
--- a/bobrevamp/locale/de/bobrevamp.cfg
+++ b/bobrevamp/locale/de/bobrevamp.cfg
@@ -19,7 +19,7 @@ bob-rtg=Radionuklidbatterie
 
 
 [fluid-name]
-bob-ammonia=Ammoniak
+ammonia=Ammoniak
 bob-dinitrogen-tetroxide=Distickstofftetroxid
 bob-hydrazine=Hydrazin
 bob-hydrogen-peroxide=Wasserstoffperoxid
diff --git a/bobrevamp/locale/en/bobrevamp.cfg b/bobrevamp/locale/en/bobrevamp.cfg
index 66ebf2a82..523de14bf 100644
--- a/bobrevamp/locale/en/bobrevamp.cfg
+++ b/bobrevamp/locale/en/bobrevamp.cfg
@@ -19,7 +19,7 @@ bob-rtg=Radio thermoelectric generator
 
 
 [fluid-name]
-bob-ammonia=Ammonia
+ammonia=Ammonia
 bob-dinitrogen-tetroxide=Dinitrogen tetroxide
 bob-hydrazine=Hydrazine
 bob-hydrogen-peroxide=Hydrogen peroxide
diff --git a/bobrevamp/locale/fr/bobrevamp.cfg b/bobrevamp/locale/fr/bobrevamp.cfg
index 021ebb2d7..1b0fca3bb 100644
--- a/bobrevamp/locale/fr/bobrevamp.cfg
+++ b/bobrevamp/locale/fr/bobrevamp.cfg
@@ -19,7 +19,7 @@ bob-rtg=Générateur de radio thermoélectrique
 
 
 [fluid-name]
-bob-ammonia=Ammoniaque
+ammonia=Ammoniaque
 bob-dinitrogen-tetroxide=Peroxyde d'azote
 bob-hydrazine=Hydrazine
 bob-hydrogen-peroxide=Peroxyde d'hydrogène
diff --git a/bobrevamp/locale/it/bobrevamp.cfg b/bobrevamp/locale/it/bobrevamp.cfg
index 6e49d7601..df7417646 100644
--- a/bobrevamp/locale/it/bobrevamp.cfg
+++ b/bobrevamp/locale/it/bobrevamp.cfg
@@ -13,7 +13,7 @@ bob-heat-shield-tile=Piastra dello scudo termico
 
 
 [fluid-name]
-bob-ammonia=Ammoniaca
+ammonia=Ammoniaca
 bob-dinitrogen-tetroxide=Triossido di diazoto
 bob-hydrazine=Idrazina
 bob-hydrogen-peroxide=Perossido di idrogeno
diff --git a/bobrevamp/locale/ja/bobrevamp.cfg b/bobrevamp/locale/ja/bobrevamp.cfg
index fce650846..99fed78b0 100644
--- a/bobrevamp/locale/ja/bobrevamp.cfg
+++ b/bobrevamp/locale/ja/bobrevamp.cfg
@@ -19,7 +19,7 @@ bob-rtg=無線熱電発電機
 
 
 [fluid-name]
-bob-ammonia=アンモニア
+ammonia=アンモニア
 bob-dinitrogen-tetroxide=四酸化二窒素
 bob-hydrazine=ヒドラジン
 bob-hydrogen-peroxide=過酸化水素
diff --git a/bobrevamp/locale/ko/bobrevamp.cfg b/bobrevamp/locale/ko/bobrevamp.cfg
index 5f32638e6..d4570443e 100644
--- a/bobrevamp/locale/ko/bobrevamp.cfg
+++ b/bobrevamp/locale/ko/bobrevamp.cfg
@@ -25,7 +25,7 @@ bob-sodium-cobaltate=코발트산 나트륨
 bob-rtg=방사성동위원소 열전발전기
 
 [fluid-name]
-bob-ammonia=암모니아
+ammonia=암모니아
 bob-dinitrogen-tetroxide=사산화 이질소
 bob-hydrazine=하이드라진
 bob-hydrogen-peroxide=과산화 수소
@@ -73,4 +73,4 @@ bobmods-revamp-nuclear=원자력 개편
 bobmods-revamp-old-oil=활성화하면, 원유 처리 공정을 개편합니다.\n또한 기본 게임의 황, 황산 제작법을 제거하고 Mining Space Industries 모드가 설치된 경우 황이나 이산화 황을 얻을 수 있는 수단을 추가합니다.
 bobmods-revamp-oil=활성화하면, 원유 처리 공정을 보다 현실적으로 개편합니다.\n원유 처리에 석유 가스 대신 석유 가스로 처리 할 수 있는 사워 가스로 대체합니다.\nMCI 모드가 설치된 경우 기본 게임의 황, 황산 제작법을 제거하고 사워 가스 처리 제작법에 황화수소가 필요하도록 추가합니다.\n이 설정은 다른 석유 및 황 개편 설정보다 우선적으로 적용됩니다.
 bobmods-revamp-hardmode=활성화하면, 단순화된 화학 공정 중 일부를 확장하여 보다 현실적으로 만듭니다.\n이 설정은 이산화 질소, 질산, 황산, 과염소산 리튬, 염화칼슘, 탄산 나트륨, 산화 코발트, 석유 가스 열분해를 수소 제작법에 적용합니다.
-bobmods-revamp-nuclear=활성화하면, 원자로 MK2를 토륨 원자로로, 원자로 MK3를 중수소 원자로로 변경하고 기술 연구를 이에 맞게 재구성합니다.
\ No newline at end of file
+bobmods-revamp-nuclear=활성화하면, 원자로 MK2를 토륨 원자로로, 원자로 MK3를 중수소 원자로로 변경하고 기술 연구를 이에 맞게 재구성합니다.
diff --git a/bobrevamp/locale/nl/bobrevamp.cfg b/bobrevamp/locale/nl/bobrevamp.cfg
index c1fec545d..f20d3bca3 100644
--- a/bobrevamp/locale/nl/bobrevamp.cfg
+++ b/bobrevamp/locale/nl/bobrevamp.cfg
@@ -19,7 +19,7 @@ bob-rtg=Radio Thermo-elektrische generator
 
 
 [fluid-name]
-bob-ammonia=Ammoniak
+ammonia=Ammoniak
 bob-dinitrogen-tetroxide=Distikstoftetroxide
 bob-hydrazine=Hydrazine
 bob-hydrogen-peroxide=Waterstofperoxide
diff --git a/bobrevamp/locale/pl/bobrevamp.cfg b/bobrevamp/locale/pl/bobrevamp.cfg
index b2ddebeae..f230251cd 100644
--- a/bobrevamp/locale/pl/bobrevamp.cfg
+++ b/bobrevamp/locale/pl/bobrevamp.cfg
@@ -19,7 +19,7 @@ bob-rtg=Radioizotopowy generator termoelektryczny
 
 
 [fluid-name]
-bob-ammonia=Amoniak
+ammonia=Amoniak
 bob-dinitrogen-tetroxide=Tetratlenek diazotu
 bob-hydrazine=Hydrazyna
 bob-hydrogen-peroxide=Nadtlenek wodoru
diff --git a/bobrevamp/locale/pt-BR/bobrevamp.cfg b/bobrevamp/locale/pt-BR/bobrevamp.cfg
index 32387a8c9..9091e1572 100644
--- a/bobrevamp/locale/pt-BR/bobrevamp.cfg
+++ b/bobrevamp/locale/pt-BR/bobrevamp.cfg
@@ -19,7 +19,7 @@ bob-rtg=Gerador termoelétrico de radioisótopos
 
 
 [fluid-name]
-bob-ammonia=Amônia
+ammonia=Amônia
 bob-dinitrogen-tetroxide=Tetróxido de dinitrogênio
 bob-hydrazine=Hidrazina
 bob-hydrogen-peroxide=Peróxido de hidrogênio
diff --git a/bobrevamp/locale/ru/bobrevamp.cfg b/bobrevamp/locale/ru/bobrevamp.cfg
index 492bd2015..876f6b864 100644
--- a/bobrevamp/locale/ru/bobrevamp.cfg
+++ b/bobrevamp/locale/ru/bobrevamp.cfg
@@ -19,7 +19,7 @@ bob-rtg=РИТЭГ
 
 
 [fluid-name]
-bob-ammonia=Аммиак
+ammonia=Аммиак
 bob-dinitrogen-tetroxide=Тетраоксид диазота
 bob-hydrazine=Гидразин
 bob-hydrogen-peroxide=Перекись водорода
diff --git a/bobrevamp/locale/tr/bobrevamp.cfg b/bobrevamp/locale/tr/bobrevamp.cfg
index 38be4eb26..1088b5f46 100644
--- a/bobrevamp/locale/tr/bobrevamp.cfg
+++ b/bobrevamp/locale/tr/bobrevamp.cfg
@@ -19,7 +19,7 @@ bob-rtg=Radyo Termoelektrik Üreteç
 
 
 [fluid-name]
-bob-ammonia=Amonyak
+ammonia=Amonyak
 bob-dinitrogen-tetroxide=Azot tetroksit
 bob-hydrazine=Hidrazin
 bob-hydrogen-peroxide=Hidrojen peroksit
diff --git a/bobrevamp/locale/uk/bobrevamp.cfg b/bobrevamp/locale/uk/bobrevamp.cfg
index c1161a5db..e13616ddd 100644
--- a/bobrevamp/locale/uk/bobrevamp.cfg
+++ b/bobrevamp/locale/uk/bobrevamp.cfg
@@ -19,7 +19,7 @@ bob-rtg=Радіотермоелектричний генератор
 
 
 [fluid-name]
-bob-ammonia=Аміак
+ammonia=Аміак
 bob-dinitrogen-tetroxide=Азотний тетраоксид
 bob-hydrazine=Гідразин
 bob-hydrogen-peroxide=Гідроген пероксид
diff --git a/bobrevamp/locale/zh-CN/bobrevamp.cfg b/bobrevamp/locale/zh-CN/bobrevamp.cfg
index a041684e8..54dd04fba 100644
--- a/bobrevamp/locale/zh-CN/bobrevamp.cfg
+++ b/bobrevamp/locale/zh-CN/bobrevamp.cfg
@@ -19,7 +19,7 @@ bob-rtg=放射性同位素温差发电机
 
 
 [fluid-name]
-bob-ammonia=氨
+ammonia=氨
 bob-dinitrogen-tetroxide=四氧化氮
 bob-hydrazine=肼
 bob-hydrogen-peroxide=过氧化氢
diff --git a/bobrevamp/locale/zh-TW/bobrevamp.cfg b/bobrevamp/locale/zh-TW/bobrevamp.cfg
index 236e7da14..04f1fb276 100644
--- a/bobrevamp/locale/zh-TW/bobrevamp.cfg
+++ b/bobrevamp/locale/zh-TW/bobrevamp.cfg
@@ -19,7 +19,7 @@ bob-rtg=放射性熱電發電機
 
 
 [fluid-name]
-bob-ammonia=氨
+ammonia=氨
 bob-dinitrogen-tetroxide=四氧化二氮
 bob-hydrazine=聯氨
 bob-hydrogen-peroxide=過氧化氫
diff --git a/bobrevamp/migrations/bobrevamp_2.0.0.json b/bobrevamp/migrations/bobrevamp_2.0.0.json
index 5b7b74f7b..04974ef67 100644
--- a/bobrevamp/migrations/bobrevamp_2.0.0.json
+++ b/bobrevamp/migrations/bobrevamp_2.0.0.json
@@ -1,7 +1,6 @@
 {
   "fluid":
   [
-    ["ammonia", "bob-ammonia"],
     ["ammoniated-brine", "bob-ammoniated-brine"],
     ["brine", "bob-brine"],
     ["carbon-dioxide", "bob-carbon-dioxide"],
@@ -13,7 +12,6 @@
   ],
   "item":
   [
-    ["ammonia-barrel", "bob-ammonia-barrel"],
     ["ammoniated-brine-barrel", "bob-ammoniated-brine-barrel"],
     ["ammonium-chloride", "bob-ammonium-chloride"],
     ["brine-barrel", "bob-brine-barrel"],
@@ -34,7 +32,6 @@
   ],
   "recipe":
   [
-    ["ammonia", "bob-ammonia"],
     ["ammoniated-brine", "bob-ammoniated-brine"],
     ["ammonium-chloride-recycling", "bob-ammonium-chloride-reprocessing"],
     ["brine", "bob-brine"],
@@ -42,7 +39,6 @@
     ["carbon-dioxide", "bob-carbon-dioxide"],
     ["carbon-dioxide-oil-processing", "bob-carbon-dioxide-oil-processing"],
     ["dinitrogen-tetroxide", "bob-dinitrogen-tetroxide"],
-    ["empty-ammonia-barrel", "empty-bob-ammonia-barrel"],
     ["empty-ammoniated-brine-barrel", "empty-bob-ammoniated-brine-barrel"],
     ["empty-brine-barrel", "empty-bob-brine-barrel"],
     ["empty-carbon-dioxide-barrel", "empty-bob-carbon-dioxide-barrel"],
@@ -52,7 +48,6 @@
     ["empty-nitric-oxide-barrel", "empty-bob-nitric-oxide-barrel"],
     ["empty-sour-gas-barrel", "empty-bob-sour-gas-barrel"],
     ["enriched-fuel-from-hydrazine", "bob-enriched-fuel-from-hydrazine"],
-    ["fill-ammonia-barrel", "bob-ammonia-barrel"],
     ["fill-ammoniated-brine-barrel", "bob-ammoniated-brine-barrel"],
     ["fill-brine-barrel", "bob-brine-barrel"],
     ["fill-carbon-dioxide-barrel", "bob-carbon-dioxide-barrel"],
@@ -74,7 +69,6 @@
     ["sodium-cobaltate", "bob-sodium-cobaltate"],
     ["sodium-perchlorate", "bob-sodium-perchlorate"],
     ["solid-fuel-from-sour-gas", "bob-solid-fuel-from-sour-gas"],
-    ["void-ammonia", "void-bob-ammonia"],
     ["void-carbon-dioxide", "void-bob-carbon-dioxide"],
     ["void-sour-gas", "void-bob-sour-gas"]
   ],
diff --git a/bobrevamp/migrations/bobrevamp_2.0.6.json b/bobrevamp/migrations/bobrevamp_2.0.6.json
new file mode 100644
index 000000000..e4d945728
--- /dev/null
+++ b/bobrevamp/migrations/bobrevamp_2.0.6.json
@@ -0,0 +1,17 @@
+{
+  "fluid":
+  [
+    ["bob-ammonia", "ammonia"]
+  ],
+  "item":
+  [
+    ["bob-ammonia-barrel", "ammonia-barrel"]
+  ],
+  "recipe":
+  [
+    ["bob-ammonia", "ammonia"],
+    ["empty-bob-ammonia-barrel", "empty-ammonia-barrel"],
+    ["bob-ammonia-barrel", "ammonia-barrel"],
+    ["void-bob-ammonia", "void-ammonia"]
+  ]
+}
\ No newline at end of file
diff --git a/bobrevamp/prototypes/rocket-fuel-updates.lua b/bobrevamp/prototypes/rocket-fuel-updates.lua
index 753049c02..b951be04d 100644
--- a/bobrevamp/prototypes/rocket-fuel-updates.lua
+++ b/bobrevamp/prototypes/rocket-fuel-updates.lua
@@ -1,4 +1,4 @@
-if data.raw.fluid["bob-ammonia"] and data.raw.fluid["bob-hydrazine"] and data.raw.fluid["bob-dinitrogen-tetroxide"] then
+if data.raw.fluid["ammonia"] and data.raw.fluid["bob-hydrazine"] and data.raw.fluid["bob-dinitrogen-tetroxide"] then
   if data.raw.fluid["bob-pure-water"] then
     bobmods.lib.recipe.remove_result("bob-hydrazine", "water")
     bobmods.lib.recipe.add_result("bob-hydrazine", { type = "fluid", name = "bob-pure-water", amount = 4 })
@@ -20,10 +20,10 @@ if data.raw.fluid["bob-ammonia"] and data.raw.fluid["bob-hydrazine"] and data.ra
   data.raw.item["rocket-fuel"].fuel_emissions_multiplier = 1.2
 
   if data.raw.technology["bob-nitrogen-processing"] then
-    bobmods.lib.tech.add_recipe_unlock("bob-nitrogen-processing", "bob-ammonia")
+    bobmods.lib.tech.add_recipe_unlock("bob-nitrogen-processing", "ammonia")
     bobmods.lib.tech.add_prerequisite("bob-hydrazine", "bob-nitrogen-processing")
   else
-    bobmods.lib.tech.add_recipe_unlock("bob-chemical-plant", "bob-ammonia")
+    bobmods.lib.tech.add_recipe_unlock("bob-chemical-plant", "ammonia")
     bobmods.lib.tech.add_recipe_unlock("bob-chemical-plant", "bob-nitrogen-dioxide")
     bobmods.lib.tech.add_prerequisite("bob-hydrazine", "bob-chemical-plant")
   end
@@ -35,7 +35,7 @@ if data.raw.fluid["bob-ammonia"] and data.raw.fluid["bob-hydrazine"] and data.ra
     bobmods.lib.tech.add_prerequisite("bob-hydrazine", "flammables")
   end
 
-  bobmods.lib.create_gas_bottle(data.raw.fluid["bob-ammonia"])
+  bobmods.lib.create_gas_bottle(data.raw.fluid["ammonia"])
   bobmods.lib.create_gas_bottle(data.raw.fluid["bob-nitrogen-dioxide"])
 
   if data.raw.fluid["bob-nitric-oxide"] then
diff --git a/bobrevamp/prototypes/rocket-fuel.lua b/bobrevamp/prototypes/rocket-fuel.lua
index d62257383..c4f580879 100644
--- a/bobrevamp/prototypes/rocket-fuel.lua
+++ b/bobrevamp/prototypes/rocket-fuel.lua
@@ -2,7 +2,7 @@ if data.raw.fluid["bob-hydrogen"] and data.raw.fluid["bob-oxygen"] and data.raw.
   data:extend({
     {
       type = "fluid",
-      name = "bob-ammonia",
+      name = "ammonia",
       icon = "__bobrevamp__/graphics/icons/ammonia.png",
       icon_size = 64,
       subgroup = "fluid",
@@ -85,7 +85,7 @@ if data.raw.fluid["bob-hydrogen"] and data.raw.fluid["bob-oxygen"] and data.raw.
   data:extend({
     {
       type = "recipe",
-      name = "bob-ammonia",
+      name = "ammonia",
       icon = "__bobrevamp__/graphics/icons/ammonia.png",
       icon_size = 64,
       order = "b[fluid-chemistry]-b[ammonia]",
@@ -98,9 +98,9 @@ if data.raw.fluid["bob-hydrogen"] and data.raw.fluid["bob-oxygen"] and data.raw.
         { type = "fluid", name = "bob-hydrogen", amount = 24 },
       },
       results = {
-        { type = "fluid", name = "bob-ammonia", amount = 20 },
+        { type = "fluid", name = "ammonia", amount = 20 },
       },
-      main_product = "bob-ammonia",
+      main_product = "ammonia",
       crafting_machine_tint = {
         primary = { r = 0.0, g = 0.0, b = 1.0, a = 0.000 },
         secondary = { r = 0.7, g = 0.7, b = 0.7, a = 0.000 },
@@ -144,7 +144,7 @@ if data.raw.fluid["bob-hydrogen"] and data.raw.fluid["bob-oxygen"] and data.raw.
       subgroup = "fluid-recipes",
       enabled = false,
       ingredients = {
-        { type = "fluid", name = "bob-ammonia", amount = 20 },
+        { type = "fluid", name = "ammonia", amount = 20 },
         { type = "fluid", name = "bob-hydrogen-peroxide", amount = 4 },
       },
       results = {
@@ -210,7 +210,7 @@ if data.raw.fluid["bob-hydrogen"] and data.raw.fluid["bob-oxygen"] and data.raw.
   })
 
   if bobmods.plates.make_void_fluid_recipe then
-    bobmods.plates.make_void_fluid_recipe("bob-ammonia", 25, 15)
+    bobmods.plates.make_void_fluid_recipe("ammonia", 25, 15)
   end
 
   if settings.startup["bobmods-revamp-hardmode"].value == true then
@@ -241,7 +241,7 @@ if data.raw.fluid["bob-hydrogen"] and data.raw.fluid["bob-oxygen"] and data.raw.
         subgroup = "fluid-recipes",
         enabled = false,
         ingredients = {
-          { type = "fluid", name = "bob-ammonia", amount = 20 },
+          { type = "fluid", name = "ammonia", amount = 20 },
           { type = "fluid", name = "bob-oxygen", amount = 25 },
         },
         results = {
diff --git a/bobrevamp/prototypes/rtg.lua b/bobrevamp/prototypes/rtg.lua
index 83d193a44..861545985 100644
--- a/bobrevamp/prototypes/rtg.lua
+++ b/bobrevamp/prototypes/rtg.lua
@@ -123,7 +123,7 @@ if bobmods.plates and settings.startup["bobmods-revamp-rtg"].value == true then
         enabled = false,
         ingredients = {
           { type = "fluid", name = "bob-brine", amount = 10 },
-          { type = "fluid", name = "bob-ammonia", amount = 25 },
+          { type = "fluid", name = "ammonia", amount = 25 },
         },
         results = {
           { type = "fluid", name = "bob-ammoniated-brine", amount = 10 },
@@ -201,7 +201,7 @@ if bobmods.plates and settings.startup["bobmods-revamp-rtg"].value == true then
         },
         results = {
           { type = "item", name = "bob-calcium-chloride", amount = 1 },
-          { type = "fluid", name = "bob-ammonia", amount = 50 },
+          { type = "fluid", name = "ammonia", amount = 50 },
           { type = "fluid", name = "water", amount = 10 },
         },
         crafting_machine_tint = {