diff --git a/Content.Shared/Atmos/GasPrototype.cs b/Content.Shared/Atmos/GasPrototype.cs
index 3186b09847..1878f6a9b0 100644
--- a/Content.Shared/Atmos/GasPrototype.cs
+++ b/Content.Shared/Atmos/GasPrototype.cs
@@ -67,17 +67,17 @@ namespace Content.Shared.Atmos
         {
             var serializer = YamlObjectSerializer.NewReader(mapping);
 
-            serializer.DataField(this, x => ID, "id", string.Empty);
-            serializer.DataField(this, x => Name, "name", string.Empty);
-            serializer.DataField(this, x => OverlayPath, "overlayPath", string.Empty);
-            serializer.DataField(this, x => SpecificHeat, "specificHeat", 0f);
-            serializer.DataField(this, x => HeatCapacityRatio, "heatCapacityRatio", 1.4f);
-            serializer.DataField(this, x => MolarMass, "molarMass", 1f);
-            serializer.DataField(this, x => GasMolesVisible, "gasMolesVisible", 0.25f);
-            serializer.DataField(this, x => GasOverlayTexture, "gasOverlayTexture", string.Empty);
-            serializer.DataField(this, x => GasOverlaySprite, "gasOverlaySprite", string.Empty);
-            serializer.DataField(this, x => GasOverlayState, "gasOverlayState", string.Empty);
-            serializer.DataField(this, x => Color, "color", string.Empty);
+            serializer.DataField(this, x => x.ID, "id", string.Empty);
+            serializer.DataField(this, x => x.Name, "name", string.Empty);
+            serializer.DataField(this, x => x.OverlayPath, "overlayPath", string.Empty);
+            serializer.DataField(this, x => x.SpecificHeat, "specificHeat", 0f);
+            serializer.DataField(this, x => x.HeatCapacityRatio, "heatCapacityRatio", 1.4f);
+            serializer.DataField(this, x => x.MolarMass, "molarMass", 1f);
+            serializer.DataField(this, x => x.GasMolesVisible, "gasMolesVisible", 0.25f);
+            serializer.DataField(this, x => x.GasOverlayTexture, "gasOverlayTexture", string.Empty);
+            serializer.DataField(this, x => x.GasOverlaySprite, "gasOverlaySprite", string.Empty);
+            serializer.DataField(this, x => x.GasOverlayState, "gasOverlayState", string.Empty);
+            serializer.DataField(this, x => x.Color, "color", string.Empty);
         }
     }
 }
diff --git a/Content.Shared/GameObjects/Components/SharedExpendableLightComponent.cs b/Content.Shared/GameObjects/Components/SharedExpendableLightComponent.cs
index 5db6ad8f9b..64ad517b91 100644
--- a/Content.Shared/GameObjects/Components/SharedExpendableLightComponent.cs
+++ b/Content.Shared/GameObjects/Components/SharedExpendableLightComponent.cs
@@ -64,17 +64,17 @@ namespace Content.Shared.GameObjects.Components
         {
             base.ExposeData(serializer);
 
-            serializer.DataField(this, x => TurnOnBehaviourID, "turnOnBehaviourID", string.Empty);
-            serializer.DataField(this, x => FadeOutBehaviourID, "fadeOutBehaviourID", string.Empty);
-            serializer.DataField(this, x => GlowDuration, "glowDuration", 60 * 15f);
-            serializer.DataField(this, x => FadeOutDuration, "fadeOutDuration", 60 * 5f);
-            serializer.DataField(this, x => SpentName, "spentName", string.Empty);
-            serializer.DataField(this, x => SpentDesc, "spentDesc", string.Empty);
-            serializer.DataField(this, x => IconStateLit, "iconStateOn", string.Empty);
-            serializer.DataField(this, x => IconStateSpent, "iconStateSpent", string.Empty);
-            serializer.DataField(this, x => LitSound, "litSound", string.Empty);
-            serializer.DataField(this, x => LoopedSound, "loopedSound", string.Empty);
-            serializer.DataField(this, x => DieSound, "dieSound", string.Empty);
+            serializer.DataField(this, x => x.TurnOnBehaviourID, "turnOnBehaviourID", string.Empty);
+            serializer.DataField(this, x => x.FadeOutBehaviourID, "fadeOutBehaviourID", string.Empty);
+            serializer.DataField(this, x => x.GlowDuration, "glowDuration", 60 * 15f);
+            serializer.DataField(this, x => x.FadeOutDuration, "fadeOutDuration", 60 * 5f);
+            serializer.DataField(this, x => x.SpentName, "spentName", string.Empty);
+            serializer.DataField(this, x => x.SpentDesc, "spentDesc", string.Empty);
+            serializer.DataField(this, x => x.IconStateLit, "iconStateOn", string.Empty);
+            serializer.DataField(this, x => x.IconStateSpent, "iconStateSpent", string.Empty);
+            serializer.DataField(this, x => x.LitSound, "litSound", string.Empty);
+            serializer.DataField(this, x => x.LoopedSound, "loopedSound", string.Empty);
+            serializer.DataField(this, x => x.DieSound, "dieSound", string.Empty);
         }
     }
 }