diff --git a/Content.Server/_NF/ShuttleRecords/ShuttleRecordsSystem.Console.cs b/Content.Server/_NF/ShuttleRecords/ShuttleRecordsSystem.Console.cs
index bbd0c906675..0d497b8e19a 100644
--- a/Content.Server/_NF/ShuttleRecords/ShuttleRecordsSystem.Console.cs
+++ b/Content.Server/_NF/ShuttleRecords/ShuttleRecordsSystem.Console.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Server._NF.Bank;
 using Content.Server.Cargo.Components;
 using Content.Shared._NF.Bank.BUI;
@@ -7,7 +7,7 @@
 using Content.Shared._NF.ShuttleRecords.Events;
 using Content.Shared.Access.Components;
 using Content.Shared.Database;
-using Content.Shared.Shipyard.Components;
+using Content.Shared._NF.Shipyard.Components;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
 
diff --git a/Content.Server/_NF/ShuttleRecords/ShuttleRecordsSystem.cs b/Content.Server/_NF/ShuttleRecords/ShuttleRecordsSystem.cs
index f3b9242d422..dae89c7caf4 100644
--- a/Content.Server/_NF/ShuttleRecords/ShuttleRecordsSystem.cs
+++ b/Content.Server/_NF/ShuttleRecords/ShuttleRecordsSystem.cs
@@ -1,4 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using Content.Server._NF.SectorServices;
 using Content.Server._NF.ShuttleRecords.Components;
 using Content.Server.Administration.Logs;
@@ -7,7 +7,7 @@
 using Content.Server.Station.Systems;
 using Content.Shared._NF.ShuttleRecords;
 using Content.Shared.Access.Systems;
-using Content.Shared.Shipyard.Components;
+using Content.Shared._NF.Shipyard.Components;
 using Robust.Server.GameObjects;
 using Robust.Shared.Timing;
 
diff --git a/Content.Server/_NF/Smuggling/DeadDropSystem.cs b/Content.Server/_NF/Smuggling/DeadDropSystem.cs
index 6c658e2a661..feab33da1f6 100644
--- a/Content.Server/_NF/Smuggling/DeadDropSystem.cs
+++ b/Content.Server/_NF/Smuggling/DeadDropSystem.cs
@@ -5,7 +5,7 @@
 using Content.Server._NF.Smuggling.Components;
 using Content.Server.Administration.Logs;
 using Content.Server.Radio.EntitySystems;
-using Content.Server.Shipyard.Systems;
+using Content.Server._NF.Shipyard.Systems;
 using Content.Server.Shuttles.Components;
 using Content.Server.Shuttles.Systems;
 using Content.Server.Station.Components;
diff --git a/Content.Server/_NF/StationEvents/Events/BluespaceErrorRule.cs b/Content.Server/_NF/StationEvents/Events/BluespaceErrorRule.cs
index 1073ea56e15..fcc9457ebc5 100644
--- a/Content.Server/_NF/StationEvents/Events/BluespaceErrorRule.cs
+++ b/Content.Server/_NF/StationEvents/Events/BluespaceErrorRule.cs
@@ -14,12 +14,11 @@
 using Content.Server.Procedural;
 using Robust.Shared.Prototypes;
 using Content.Shared.Salvage;
-using Content.Server.Warps;
-using Content.Server.Station.Systems;
 using Content.Server.Maps.NameGenerators;
-using Content.Shared.Dataset;
+using Content.Server.StationEvents.Events;
+using Content.Server._NF.Station.Systems;
 
-namespace Content.Server.StationEvents.Events;
+namespace Content.Server._NF.StationEvents.Events;
 
 public sealed class BluespaceErrorRule : StationEventSystem<BluespaceErrorRuleComponent>
 {