diff --git a/Content.Server/Body/Systems/RespiratorSystem.cs b/Content.Server/Body/Systems/RespiratorSystem.cs
index f2037f52754..25561411219 100644
--- a/Content.Server/Body/Systems/RespiratorSystem.cs
+++ b/Content.Server/Body/Systems/RespiratorSystem.cs
@@ -74,7 +74,7 @@ public override void Update(float frameTime)
 
             respirator.NextUpdate += respirator.UpdateInterval;
 
-            if (_mobState.IsDead(uid) || HasComp<BreathingImmunityComponent>(uid)) // GoobStation: BreathingImmunity
+            if (_mobState.IsDead(uid) || HasComp<BreathingImmunityComponent>(uid)) // backmen: surgery
                 continue;
 
             UpdateSaturation(uid, -(float) respirator.UpdateInterval.TotalSeconds, respirator);
diff --git a/Content.Shared/Backmen/Surgery/Body/BreathingImmunityComponent.cs b/Content.Shared/Backmen/Surgery/Body/BreathingImmunityComponent.cs
index 175e5537763..7fb1fce61a0 100644
--- a/Content.Shared/Backmen/Surgery/Body/BreathingImmunityComponent.cs
+++ b/Content.Shared/Backmen/Surgery/Body/BreathingImmunityComponent.cs
@@ -1,7 +1,7 @@
 namespace Content.Shared.Backmen.Surgery.Body;
 
 /// <summary>
-/// GoobStation: Disables a mobs need for air when this component is added.
+/// Backmen: Disables a mobs need for air when this component is added.
 /// It will neither breathe nor take airloss damage.
 /// </summary>
 [RegisterComponent]
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
index fa085d36267..f92877e962d 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
@@ -99,13 +99,15 @@
     - type: NightVision
       isToggle: true
       color: "#808080"
-    - type: Body # GoobStation: Special carp organs
+    # start-backmen: surgery
+    - type: Body
       prototype: Carp
-    - type: SurgeryTarget # GoobStation
-    - type: UserInterface # GoobStation
+    - type: SurgeryTarget
+    - type: UserInterface
       interfaces:
         enum.SurgeryUIKey.Key:
           type: SurgeryBui
+    # end-backmen: surgery
 
 - type: entity
   parent: BaseMobCarp
diff --git a/Resources/Prototypes/_Backmen/Body/Prototypes/shadowkin.yml b/Resources/Prototypes/_Backmen/Body/Prototypes/shadowkin.yml
index 652fee55b3d..b111c558d18 100644
--- a/Resources/Prototypes/_Backmen/Body/Prototypes/shadowkin.yml
+++ b/Resources/Prototypes/_Backmen/Body/Prototypes/shadowkin.yml
@@ -23,7 +23,7 @@
         stomach: OrganShadowkinStomach
         liver:  OrganShadowkinLiver
         kidneys: OrganShadowkinKidneys
-        lungs: OrganHumanLungs
+        lungs: OrganSpaceAnimalLungs
     right arm:
       part: RightArmShadowkin
       connections:
diff --git a/Resources/Prototypes/status_effects.yml b/Resources/Prototypes/status_effects.yml
index 1eeaf93b095..7d8938c6f52 100644
--- a/Resources/Prototypes/status_effects.yml
+++ b/Resources/Prototypes/status_effects.yml
@@ -36,7 +36,7 @@
 
 - type: statusEffect
   id: PressureImmunity
-  alwaysAllowed: true # GoobStation: Used by space animal heart to work on anything
+  alwaysAllowed: true # Backmen: Used by space animal heart to work on anything
 
 - type: statusEffect
   id: Muted