diff --git a/Content.Client/UserInterface/Screens/DefaultGameScreen.xaml.cs b/Content.Client/UserInterface/Screens/DefaultGameScreen.xaml.cs
index 9e5b71230ad..1a33de70a97 100644
--- a/Content.Client/UserInterface/Screens/DefaultGameScreen.xaml.cs
+++ b/Content.Client/UserInterface/Screens/DefaultGameScreen.xaml.cs
@@ -27,7 +27,7 @@ public DefaultGameScreen()
         Chat.OnResized += ChatOnResized;
         Chat.OnChatResizeFinish += ChatOnResizeFinish;
         MainViewport.OnResized += ResizeActionContainer;
-        MainViewport.OnResized += ResizeAlertsContainer;
+        MainViewport.OnResized += ResizeAlertsContainer; // Corvax-Next-Surgery
         Inventory.OnResized += ResizeActionContainer;
     }
 
@@ -37,11 +37,13 @@ private void ResizeActionContainer()
         Actions.ActionsContainer.MaxGridHeight = MainViewport.Size.Y - indent;
     }
 
+	// Corvax-Next-Surgery-Start
     private void ResizeAlertsContainer()
     {
         float indent = Chat.Size.Y + Targeting.Size.Y + 120;
         Alerts.AlertContainer.MaxGridHeight = Math.Max(MainViewport.Size.Y - indent, 1);
     }
+	// Corvax-Next-Surgery-End
 
     private void ChatOnResizeFinish(Vector2 _)
     {
diff --git a/Content.Client/UserInterface/Systems/Alerts/Widgets/AlertsUI.xaml b/Content.Client/UserInterface/Systems/Alerts/Widgets/AlertsUI.xaml
index 330c794321d..0731524f496 100644
--- a/Content.Client/UserInterface/Systems/Alerts/Widgets/AlertsUI.xaml
+++ b/Content.Client/UserInterface/Systems/Alerts/Widgets/AlertsUI.xaml
@@ -3,8 +3,8 @@
                   xmlns:partStatus="clr-namespace:Content.Client._CorvaxNext.UserInterface.Systems.PartStatus.Widgets"
                   MinSize="64 64">
     <GridContainer Columns="1" HorizontalAlignment="Right" VerticalAlignment="Top">
-        <PanelContainer >
-            <GridContainer Name="AlertContainer" Columns="1" HorizontalAlignment="Right" VerticalAlignment="Center" Access="Public" />
+        <PanelContainer>
+            <GridContainer Name="AlertContainer" Columns="1" HorizontalAlignment="Right" VerticalAlignment="Center" Access="Public" /> <!-- Corvax-Next-Surgery -->
         </PanelContainer>
         <partStatus:PartStatusControl Name="PartStatus" Access="Protected"/>
     </GridContainer>
diff --git a/Content.Client/UserInterface/Systems/Alerts/Widgets/AlertsUI.xaml.cs b/Content.Client/UserInterface/Systems/Alerts/Widgets/AlertsUI.xaml.cs
index 636fc8572fd..43002cc7bfe 100644
--- a/Content.Client/UserInterface/Systems/Alerts/Widgets/AlertsUI.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Alerts/Widgets/AlertsUI.xaml.cs
@@ -20,7 +20,7 @@ public sealed partial class AlertsUI : UIWidget
     public AlertsUI()
     {
         RobustXamlLoader.Load(this);
-        LayoutContainer.SetGrowHorizontal(this, LayoutContainer.GrowDirection.Begin);
+        LayoutContainer.SetGrowHorizontal(this, LayoutContainer.GrowDirection.Begin); // Corvax-Next-Surgery
     }
 
     public void SyncControls(AlertsSystem alertsSystem,
diff --git a/Content.Client/Backmen/Overlays/Shaders/SaturationScaleOverlay.cs b/Content.Client/_CorvaxNext/Overlays/Shaders/SaturationScaleOverlay.cs
similarity index 100%
rename from Content.Client/Backmen/Overlays/Shaders/SaturationScaleOverlay.cs
rename to Content.Client/_CorvaxNext/Overlays/Shaders/SaturationScaleOverlay.cs
diff --git a/Content.Client/Backmen/Overlays/Systems/SaturationScaleSystem.cs b/Content.Client/_CorvaxNext/Overlays/Systems/SaturationScaleSystem.cs
similarity index 100%
rename from Content.Client/Backmen/Overlays/Systems/SaturationScaleSystem.cs
rename to Content.Client/_CorvaxNext/Overlays/Systems/SaturationScaleSystem.cs
diff --git a/Content.IntegrationTests/Tests/Minds/MindTest.DeleteAllThenGhost.cs b/Content.IntegrationTests/Tests/Minds/MindTest.DeleteAllThenGhost.cs
index ab9e96ab919..d4fad0dde91 100644
--- a/Content.IntegrationTests/Tests/Minds/MindTest.DeleteAllThenGhost.cs
+++ b/Content.IntegrationTests/Tests/Minds/MindTest.DeleteAllThenGhost.cs
@@ -34,7 +34,7 @@ public async Task DeleteAllThenGhost()
             Console.WriteLine(pair.Client.EntMan.ToPrettyString(ent));
         }
 
-        Assert.That(pair.Client.EntMan.EntityCount, Is.AtMost(1)); // Tolerate at most one client entity
+        Assert.That(pair.Client.EntMan.EntityCount, Is.AtMost(1)); // Corvax-Next-Surgery: Tolerate at most one client entity
 
         // Create a new map.
         int mapId = 1;
diff --git a/Content.IntegrationTests/Tests/Movement/SlippingTest.cs b/Content.IntegrationTests/Tests/Movement/SlippingTest.cs
index f1938573824..9b6c1a1bbbe 100644
--- a/Content.IntegrationTests/Tests/Movement/SlippingTest.cs
+++ b/Content.IntegrationTests/Tests/Movement/SlippingTest.cs
@@ -31,9 +31,11 @@ public async Task BananaSlipTest()
     {
         var sys = SEntMan.System<SlipTestSystem>();
         await SpawnTarget("TrashBananaPeel");
-
+		
+		// Corvax-Next-Surgery-Start
         // var modifier = Comp<MovementSpeedModifierComponent>(Player).SprintSpeedModifier;
-        // Assert.That(modifier, Is.EqualTo(1), "Player is not moving at full speed."); // Yeeting this pointless Assert because it's not actually important.
+        // Assert.That(modifier, Is.EqualTo(1), "Player is not moving at full speed."); Yeeting this pointless Assert because it's not actually important.
+		// Corvax-Next-Surgery-End
 
         // Player is to the left of the banana peel and has not slipped.
         Assert.That(Delta(), Is.GreaterThan(0.5f));
diff --git a/Content.Server/Arcade/BlockGame/BlockGame.cs b/Content.Server/Arcade/BlockGame/BlockGame.cs
index 5f7cce30416..8bfd065dcd5 100644
--- a/Content.Server/Arcade/BlockGame/BlockGame.cs
+++ b/Content.Server/Arcade/BlockGame/BlockGame.cs
@@ -83,8 +83,8 @@ private void InvokeGameover()
         {
             _highScorePlacement = _arcadeSystem.RegisterHighScore(meta.EntityName, Points);
             SendHighscoreUpdate();
-            var ev = new MoodEffectEvent("ArcadePlay"); // _CorvaxNext: mood
-            _entityManager.EventBus.RaiseLocalEvent(meta.Owner, ev);
+            var ev = new MoodEffectEvent("ArcadePlay"); // Corvax-Next-Mood
+            _entityManager.EventBus.RaiseLocalEvent(meta.Owner, ev); // Corvax-Next-Mood
         }
         SendMessage(new BlockGameMessages.BlockGameGameOverScreenMessage(Points, _highScorePlacement?.LocalPlacement, _highScorePlacement?.GlobalPlacement));
     }
diff --git a/Content.Server/Backmen/Mood/MoodComponent.cs b/Content.Server/_CorvaxNext/Mood/MoodComponent.cs
similarity index 100%
rename from Content.Server/Backmen/Mood/MoodComponent.cs
rename to Content.Server/_CorvaxNext/Mood/MoodComponent.cs
diff --git a/Content.Server/Backmen/Mood/MoodSystem.cs b/Content.Server/_CorvaxNext/Mood/MoodSystem.cs
similarity index 100%
rename from Content.Server/Backmen/Mood/MoodSystem.cs
rename to Content.Server/_CorvaxNext/Mood/MoodSystem.cs
diff --git a/Content.Server/Backmen/Traits/Assorted/ModifyMoodTraitComponent.cs b/Content.Server/_CorvaxNext/Traits/Assorted/ModifyMoodTraitComponent.cs
similarity index 100%
rename from Content.Server/Backmen/Traits/Assorted/ModifyMoodTraitComponent.cs
rename to Content.Server/_CorvaxNext/Traits/Assorted/ModifyMoodTraitComponent.cs
diff --git a/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs b/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs
index ea9278b71ba..d66a49fb1d6 100644
--- a/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs
+++ b/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs
@@ -28,8 +28,8 @@ public sealed class HungerSystem : EntitySystem
     [Dependency] private readonly MobStateSystem _mobState = default!;
     [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!;
     [Dependency] private readonly SharedJetpackSystem _jetpack = default!;
-    [Dependency] private readonly INetManager _net = default!;
-    [Dependency] private readonly IConfigurationManager _config = default!;
+    [Dependency] private readonly INetManager _net = default!; // Corvax-Next-Surgery
+    [Dependency] private readonly IConfigurationManager _config = default!; // Corvax-Next-Surgery
 
     [ValidatePrototypeId<SatiationIconPrototype>]
     private const string HungerIconOverfedId = "HungerIconOverfed";
@@ -65,9 +65,9 @@ private void OnShutdown(EntityUid uid, HungerComponent component, ComponentShutd
 
     private void OnRefreshMovespeed(EntityUid uid, HungerComponent component, RefreshMovementSpeedModifiersEvent args)
     {
-        if (_config.GetCVar(NextVars.MoodEnabled)
-            || component.CurrentThreshold > HungerThreshold.Starving
-            || _jetpack.IsUserFlying(uid))
+        if (_config.GetCVar(NextVars.MoodEnabled) // Corvax-Next-Surgery
+            || component.CurrentThreshold > HungerThreshold.Starving // Corvax-Next-Surgery
+            || _jetpack.IsUserFlying(uid)) // Corvax-Next-Surgery
             return;
 
         args.ModifySpeed(component.StarvingSlowdownModifier, component.StarvingSlowdownModifier);
@@ -153,12 +153,12 @@ private void DoHungerThresholdEffects(EntityUid uid, HungerComponent? component
 
         if (GetMovementThreshold(component.CurrentThreshold) != GetMovementThreshold(component.LastThreshold))
         {
-            if (!_config.GetCVar(NextVars.MoodEnabled))
-                _movementSpeedModifier.RefreshMovementSpeedModifiers(uid);
-            else if (_net.IsServer)
+            if (!_config.GetCVar(NextVars.MoodEnabled)) // Corvax-Next-Surgery
+                _movementSpeedModifier.RefreshMovementSpeedModifiers(uid); // Corvax-Next-Surgery
+            else if (_net.IsServer) // Corvax-Next-Surgery
             {
-                var ev = new MoodEffectEvent("Hunger" + component.CurrentThreshold); // _CorvaxNext: mood
-                RaiseLocalEvent(uid, ev);
+                var ev = new MoodEffectEvent("Hunger" + component.CurrentThreshold); // Corvax-Next-Surgery
+                RaiseLocalEvent(uid, ev); // Corvax-Next-Surgery
             }
         }
 
diff --git a/Content.Shared/Backmen/Mood/MoodCategoryPrototype.cs b/Content.Shared/_CorvaxNext/Mood/MoodCategoryPrototype.cs
similarity index 100%
rename from Content.Shared/Backmen/Mood/MoodCategoryPrototype.cs
rename to Content.Shared/_CorvaxNext/Mood/MoodCategoryPrototype.cs
diff --git a/Content.Shared/Backmen/Mood/MoodEffectPrototype.cs b/Content.Shared/_CorvaxNext/Mood/MoodEffectPrototype.cs
similarity index 100%
rename from Content.Shared/Backmen/Mood/MoodEffectPrototype.cs
rename to Content.Shared/_CorvaxNext/Mood/MoodEffectPrototype.cs
diff --git a/Content.Shared/Backmen/Mood/MoodEvents.cs b/Content.Shared/_CorvaxNext/Mood/MoodEvents.cs
similarity index 100%
rename from Content.Shared/Backmen/Mood/MoodEvents.cs
rename to Content.Shared/_CorvaxNext/Mood/MoodEvents.cs
diff --git a/Content.Shared/Backmen/Mood/SharedMoodComponent.cs b/Content.Shared/_CorvaxNext/Mood/SharedMoodComponent.cs
similarity index 100%
rename from Content.Shared/Backmen/Mood/SharedMoodComponent.cs
rename to Content.Shared/_CorvaxNext/Mood/SharedMoodComponent.cs
diff --git a/Content.Shared/Backmen/Overlays/SaturationScaleComponent.cs b/Content.Shared/_CorvaxNext/Overlays/SaturationScaleComponent.cs
similarity index 100%
rename from Content.Shared/Backmen/Overlays/SaturationScaleComponent.cs
rename to Content.Shared/_CorvaxNext/Overlays/SaturationScaleComponent.cs
diff --git a/Resources/Prototypes/_Backmen/Alerts/categories.yml b/Resources/Prototypes/_CorvaxNext/Alerts/categories.yml
similarity index 100%
rename from Resources/Prototypes/_Backmen/Alerts/categories.yml
rename to Resources/Prototypes/_CorvaxNext/Alerts/categories.yml
diff --git a/Resources/Prototypes/_Backmen/Alerts/mood.yml b/Resources/Prototypes/_CorvaxNext/Alerts/mood.yml
similarity index 100%
rename from Resources/Prototypes/_Backmen/Alerts/mood.yml
rename to Resources/Prototypes/_CorvaxNext/Alerts/mood.yml
diff --git a/Resources/Prototypes/_Backmen/Mood/categories.yml b/Resources/Prototypes/_CorvaxNext/Mood/categories.yml
similarity index 100%
rename from Resources/Prototypes/_Backmen/Mood/categories.yml
rename to Resources/Prototypes/_CorvaxNext/Mood/categories.yml
diff --git a/Resources/Prototypes/_Backmen/Mood/genericNeeds.yml b/Resources/Prototypes/_CorvaxNext/Mood/genericNeeds.yml
similarity index 100%
rename from Resources/Prototypes/_Backmen/Mood/genericNeeds.yml
rename to Resources/Prototypes/_CorvaxNext/Mood/genericNeeds.yml
diff --git a/Resources/Prototypes/_Backmen/Mood/genericNegativeEffects.yml b/Resources/Prototypes/_CorvaxNext/Mood/genericNegativeEffects.yml
similarity index 100%
rename from Resources/Prototypes/_Backmen/Mood/genericNegativeEffects.yml
rename to Resources/Prototypes/_CorvaxNext/Mood/genericNegativeEffects.yml
diff --git a/Resources/Prototypes/_Backmen/Mood/genericPositiveEffects.yml b/Resources/Prototypes/_CorvaxNext/Mood/genericPositiveEffects.yml
similarity index 100%
rename from Resources/Prototypes/_Backmen/Mood/genericPositiveEffects.yml
rename to Resources/Prototypes/_CorvaxNext/Mood/genericPositiveEffects.yml
diff --git a/Resources/Prototypes/_Backmen/Recipes/Lathes/robotics.yml b/Resources/Prototypes/_CorvaxNext/Recipes/Lathes/robotics.yml
similarity index 100%
rename from Resources/Prototypes/_Backmen/Recipes/Lathes/robotics.yml
rename to Resources/Prototypes/_CorvaxNext/Recipes/Lathes/robotics.yml
diff --git a/Resources/Prototypes/_Backmen/Recipes/Lathes/security.yml b/Resources/Prototypes/_CorvaxNext/Recipes/Lathes/security.yml
similarity index 100%
rename from Resources/Prototypes/_Backmen/Recipes/Lathes/security.yml
rename to Resources/Prototypes/_CorvaxNext/Recipes/Lathes/security.yml
diff --git a/Resources/Prototypes/_Backmen/Research/civilianservices.yml b/Resources/Prototypes/_CorvaxNext/Research/civilianservices.yml
similarity index 100%
rename from Resources/Prototypes/_Backmen/Research/civilianservices.yml
rename to Resources/Prototypes/_CorvaxNext/Research/civilianservices.yml
diff --git a/Resources/Prototypes/_Backmen/Traits/categories.yml b/Resources/Prototypes/_CorvaxNext/Traits/categories.yml
similarity index 100%
rename from Resources/Prototypes/_Backmen/Traits/categories.yml
rename to Resources/Prototypes/_CorvaxNext/Traits/categories.yml
diff --git a/Resources/Prototypes/_Backmen/Traits/neutral.yml b/Resources/Prototypes/_CorvaxNext/Traits/neutral.yml
similarity index 100%
rename from Resources/Prototypes/_Backmen/Traits/neutral.yml
rename to Resources/Prototypes/_CorvaxNext/Traits/neutral.yml