diff --git a/Content.Server/GameObjects/Components/Atmos/FlammableComponent.cs b/Content.Server/GameObjects/Components/Atmos/FlammableComponent.cs
index c3b6f7bbb1..4fdca8dc5f 100644
--- a/Content.Server/GameObjects/Components/Atmos/FlammableComponent.cs
+++ b/Content.Server/GameObjects/Components/Atmos/FlammableComponent.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using Content.Server.Atmos;
 using Content.Server.GameObjects.Components.Mobs;
@@ -218,7 +218,7 @@ namespace Content.Server.GameObjects.Components.Atmos
         {
             switch (reagent.ID)
             {
-                case "chem.H2O":
+                case "chem.Water":
                     Extinguish();
                     AdjustFireStacks(-1.5f);
                     return ReagentUnit.Zero;
diff --git a/Content.Server/GameObjects/Components/Chemistry/RehydratableComponent.cs b/Content.Server/GameObjects/Components/Chemistry/RehydratableComponent.cs
index 2dff3ccaf9..a6194d8efb 100644
--- a/Content.Server/GameObjects/Components/Chemistry/RehydratableComponent.cs
+++ b/Content.Server/GameObjects/Components/Chemistry/RehydratableComponent.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable enable
 using Content.Server.GameObjects.EntitySystems;
 using Content.Server.Utility;
 using Content.Shared.Chemistry;
@@ -31,7 +31,7 @@ namespace Content.Server.GameObjects.Components.Chemistry
         public override void ExposeData(ObjectSerializer serializer)
         {
             base.ExposeData(serializer);
-            serializer.DataField(ref _catalystPrototype, "catalyst", "chem.H2O");
+            serializer.DataField(ref _catalystPrototype, "catalyst", "chem.Water");
             serializer.DataField(ref _targetPrototype, "target", null);
         }
 
diff --git a/Content.Server/GameObjects/Components/Nutrition/CreamPiedComponent.cs b/Content.Server/GameObjects/Components/Nutrition/CreamPiedComponent.cs
index 1e1188efa9..4261cdbdb5 100644
--- a/Content.Server/GameObjects/Components/Nutrition/CreamPiedComponent.cs
+++ b/Content.Server/GameObjects/Components/Nutrition/CreamPiedComponent.cs
@@ -1,4 +1,4 @@
-using Content.Server.GameObjects.Components.Mobs;
+using Content.Server.GameObjects.Components.Mobs;
 using Content.Server.Utility;
 using Content.Shared.Chemistry;
 using Content.Shared.GameObjects.Components.Nutrition;
@@ -42,7 +42,7 @@ namespace Content.Server.GameObjects.Components.Nutrition
             switch (reagent.ID)
             {
                 case "chem.SpaceCleaner":
-                case "chem.H2O":
+                case "chem.Water":
                     Wash();
                     break;
             }
diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/soda_dispenser.yml b/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/soda_dispenser.yml
index a47eccd325..8e08cedbe8 100644
--- a/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/soda_dispenser.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/soda_dispenser.yml
@@ -17,5 +17,5 @@
   - chem.Coffee
   - chem.Tea
   - chem.Ice
-  - chem.H2O
+  - chem.Water
   - chem.Cream
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/water_tank.yml b/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/water_tank.yml
index b02d01d163..0ee94cbd70 100644
--- a/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/water_tank.yml
+++ b/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/water_tank.yml
@@ -19,5 +19,5 @@
   - type: SolutionContainer
     contents:
       reagents:
-      - ReagentId: chem.H2O
+      - ReagentId: chem.Water
         Quantity: 1500
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/drinks_bottles.yml b/Resources/Prototypes/Entities/Objects/Consumable/drinks_bottles.yml
index 42bf6ba0aa..82619079a7 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/drinks_bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks_bottles.yml
@@ -111,7 +111,7 @@
     maxVol: 80
     contents:
       reagents:
-      - ReagentId: chem.H2O
+      - ReagentId: chem.Water
         Quantity: 80
   - type: Sprite
     sprite: Objects/Consumable/Drinks/kahluabottle.rsi
@@ -218,4 +218,3 @@
         Quantity: 80
   - type: Sprite
     sprite: Objects/Consumable/Drinks/winebottle.rsi
-
diff --git a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
index ed5fc0166b..6eb6422959 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
@@ -17,7 +17,7 @@
       caps: AddTo, RemoveFrom, NoExamine
       contents:
         reagents:
-          - ReagentId: chem.H2O
+          - ReagentId: chem.Water
             Quantity: 100
     - type: ItemCooldown
     - type: Spray
diff --git a/Resources/Prototypes/Entities/Objects/Specific/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/janitor.yml
index c394e7e57c..2792c4b479 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/janitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/janitor.yml
@@ -222,7 +222,7 @@
       caps: AddTo, RemoveFrom
       contents:
         reagents:
-          - ReagentId: chem.H2O
+          - ReagentId: chem.Water
             Quantity: 100
 
 - type: entity
diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
index 199de7734d..6274f75836 100644
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -186,7 +186,7 @@
   result: FoodSpaghettiBoiled
   time: 5
   reagents:
-    chem.H2O: 5
+    chem.Water: 5
   solids:
     FoodSpaghetti: 1
 
@@ -196,7 +196,7 @@
   result: FoodPastaTomato
   time: 10
   reagents:
-    chem.H2O: 5
+    chem.Water: 5
   solids:
     FoodSpaghetti: 1
     FoodTomato: 2
@@ -207,7 +207,7 @@
   result: FoodMeatballSpaghetti
   time: 10
   reagents:
-    chem.H2O: 5
+    chem.Water: 5
   solids:
     FoodSpaghetti: 1
     FoodMeatball: 2
@@ -218,7 +218,7 @@
   result: FoodCrabSpaghetti
   time: 10
   reagents:
-    chem.H2O: 5
+    chem.Water: 5
   solids:
     FoodCrabMeat: 2
 
@@ -294,7 +294,7 @@
   result: FoodMeatballSoup
   time: 10
   reagents:
-    chem.H2O: 10
+    chem.Water: 10
   solids:
     FoodMeatball: 1
     FoodCarrot: 1
@@ -306,7 +306,7 @@
   result: FoodNettleSoup
   time: 10
   reagents:
-    chem.H2O: 10
+    chem.Water: 10
   solids:
     FoodNettle: 1
     FoodEgg: 1