diff --git a/Resources/Maps/_NF/Shuttles/Blackmarket/menace.yml b/Resources/Maps/_NF/Shuttles/BlackMarket1/menace.yml
similarity index 100%
rename from Resources/Maps/_NF/Shuttles/Blackmarket/menace.yml
rename to Resources/Maps/_NF/Shuttles/BlackMarket1/menace.yml
diff --git a/Resources/Maps/_NF/Shuttles/Blackmarket/schooner.yml b/Resources/Maps/_NF/Shuttles/BlackMarket1/schooner.yml
similarity index 100%
rename from Resources/Maps/_NF/Shuttles/Blackmarket/schooner.yml
rename to Resources/Maps/_NF/Shuttles/BlackMarket1/schooner.yml
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_shipyard.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_shipyard.yml
index 789e16d199b..8c3e294d585 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_shipyard.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_shipyard.yml
@@ -99,7 +99,7 @@
       type: ShipyardConsoleBoundUserInterface
 
 - type: entity
-  id: ComputerShipyardNFSD
+  id: ComputerShipyardNfsd
   parent: [BaseStructureDisableToolUse, BaseStructureIndestructible, ComputerShipyard]
   name: nfsd shipyard console
   description: Used to buy nfsd patrol vessels
@@ -116,10 +116,10 @@
     - map: ["computerLayerKeys"]
       state: telesci_key
   - type: ActivatableUI
-    key: enum.ShipyardConsoleUiKey.Nfsd
+    key: enum.ShipyardConsoleUiKey.Security
   - type: UserInterface
     interfaces:
-    - key: enum.ShipyardConsoleUiKey.Nfsd
+    - key: enum.ShipyardConsoleUiKey.Security
       type: ShipyardConsoleBoundUserInterface
 
 - type: entity
diff --git a/Resources/Prototypes/_NF/Shipyard/Blackmarket/menace.yml b/Resources/Prototypes/_NF/Shipyard/BlackMarket1/menace.yml
similarity index 100%
rename from Resources/Prototypes/_NF/Shipyard/Blackmarket/menace.yml
rename to Resources/Prototypes/_NF/Shipyard/BlackMarket1/menace.yml
diff --git a/Resources/Prototypes/_NF/Shipyard/Blackmarket/schooner.yml b/Resources/Prototypes/_NF/Shipyard/BlackMarket1/schooner.yml
similarity index 100%
rename from Resources/Prototypes/_NF/Shipyard/Blackmarket/schooner.yml
rename to Resources/Prototypes/_NF/Shipyard/BlackMarket1/schooner.yml
diff --git a/Resources/Prototypes/_NF/Shipyard/liquidator.yml b/Resources/Prototypes/_NF/Shipyard/liquidator.yml
index 86deba46cc6..27e60a035e0 100644
--- a/Resources/Prototypes/_NF/Shipyard/liquidator.yml
+++ b/Resources/Prototypes/_NF/Shipyard/liquidator.yml
@@ -12,7 +12,7 @@
   id: Liquidator
   name: NT Liquidator
   description: A small vessel equipped with everything you need to make even the dirtiest ship squeaky clean (ducky slippers included).
-  price: 31600 # 27480+4120 from 15% markup
+  price: 34000 # 27480+4120 from 15% markup
   category: Small
   group: Civilian
   shuttlePath: /Maps/_NF/Shuttles/liquidator.yml
diff --git a/Resources/Prototypes/_NF/Shipyard/metastable.yml b/Resources/Prototypes/_NF/Shipyard/metastable.yml
index bc641d98998..86bf8499b27 100644
--- a/Resources/Prototypes/_NF/Shipyard/metastable.yml
+++ b/Resources/Prototypes/_NF/Shipyard/metastable.yml
@@ -2,7 +2,7 @@
   id: Metastable
   name: TC Metastable
   description: An incredibly compressed variation of a standard Nanotransen station. Intended to service other ships with anything they might need.
-  price: 89000
+  price: 95000
   category: Medium
   group: Civilian
   shuttlePath: /Maps/_NF/Shuttles/metastable.yml