diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/duffelbag.yml
index aef256c7c2b..213d5a4146b 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/duffelbag.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/duffelbag.yml
@@ -56,7 +56,7 @@
   - type: StorageFill
     contents:
       - id: WeaponLauncherNfsdLake
-      - id: BoxTrackingDarts
+      - id: NFBoxDartsTracking
 
 - type: entity
   parent: ClothingBackpackDuffelNfsdBrown
diff --git a/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml b/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml
index b94881e22d6..4b3a4ba4af5 100644
--- a/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml
+++ b/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml
@@ -1248,7 +1248,7 @@
   productEntity: ClothingBackpackDuffelNfsdTrackingBundle
   icon: { sprite: _NF/Clothing/Back/Duffels/nfsd_brown.rsi, state: icon }
   cost:
-    FrontierUplinkCoin: 4
+    FrontierUplinkCoin: 2
   categories:
     - UplinkSecurityBundles
   conditions:
@@ -1314,7 +1314,7 @@
   id: UplinkSecurityTrackingDartsAmmo
   name:  uplink-security-trackingdart-ammo-name
   description: uplink-security-trackingdart-ammo-desc
-  productEntity: BoxTrackingDartsAmmo
+  productEntity: NFBoxDartsTrackingAmmo
   icon: { sprite: Objects/Storage/boxes.rsi, state: box }
   cost:
     FrontierUplinkCoin: 1
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Fun/darts.yml b/Resources/Prototypes/_NF/Entities/Objects/Fun/darts.yml
index 4d138b0f55d..ca007e43323 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Fun/darts.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Fun/darts.yml
@@ -1,3 +1,63 @@
+- type: entity
+  name: tracking dart
+  id: NFDartTracking
+  parent: Dart
+  components:
+  - type: EmbeddableProjectile
+    embedOnThrow: false
+    sound: /Audio/Weapons/star_hit.ogg
+    removalTime: 5
+  - type: Projectile
+    deleteOnCollide: false
+    onlyCollideWhenShot: true
+    damage:
+      types:
+        Piercing: 4
+  - type: Tag
+    tags:
+    - NFTrackingDart
+  - type: Ammo
+    muzzleFlash: null
+  - type: Sprite
+    sprite: _NF/Objects/Weapons/Guns/Projectiles/tracking_dart.rsi
+    layers:
+    - state: icon
+      map: [ base ]
+    - state: unshaded
+      shader: unshaded
+  - type: Dumpable
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape: !type:PhysShapeCircle
+          radius: 0.2
+        density: 5
+        mask:
+        - ItemMask
+        restitution: 0.3
+        friction: 0.2
+      projectile:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.2,-0.2,0.2,0.2"
+        hard: false
+        mask:
+        - Impassable
+        - BulletImpassable
+
+- type: entity
+  name: tracking kit box
+  parent: BoxDarts
+  id: NFBoxDartsTracking
+  description: A box of tracking darts and pinpointers.
+  components:
+  - type: StorageFill
+    contents:
+      - id: NFDartTracking
+        amount: 3
+      - id: PinpointerUniversal
+        amount: 3
+
 - type: entity
   name: dartboard
   id: TargetDartsFlatpack
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Misc/traking_dart.yml b/Resources/Prototypes/_NF/Entities/Objects/Misc/traking_dart.yml
deleted file mode 100644
index 05c8e4b3ab8..00000000000
--- a/Resources/Prototypes/_NF/Entities/Objects/Misc/traking_dart.yml
+++ /dev/null
@@ -1,69 +0,0 @@
-- type: entity
-  name: tracking dart
-  id: TrackingDart
-  parent: BaseItem
-  components:
-  - type: ThrowingAngle
-    angle: 315
-  - type: EmbeddableProjectile
-    embedOnThrow: false
-    sound: /Audio/Weapons/star_hit.ogg
-    removalTime: 3
-  - type: Projectile
-    deleteOnCollide: false
-    onlyCollideWhenShot: true
-    damage:
-      types:
-        Piercing: 20
-  - type: Tag
-    tags:
-    - TrackingDart
-    - Trash
-  - type: Ammo
-    muzzleFlash: null
-  - type: Sprite
-    sprite: _NF/Objects/Weapons/Guns/Projectiles/tracking_dart.rsi
-    layers:
-    - state: icon
-      map: [ base ]
-    - state: unshaded
-      shader: unshaded
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape: !type:PhysShapeCircle
-          radius: 0.2
-        density: 5
-        mask:
-        - ItemMask
-        restitution: 0.3
-        friction: 0.2
-      projectile:
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.2,-0.2,0.2,0.2"
-        hard: false
-        mask:
-        - Impassable
-        - BulletImpassable
-  - type: Appearance
-  - type: Dumpable
-
-- type: entity
-  name: tracking kit box
-  parent: BoxCardboard
-  id: BoxTrackingDarts
-  description: A box of tracking darts and pinpointers.
-  components:
-  - type: Storage
-    grid:
-    - 0,0,4,3
-  - type: StorageFill
-    contents:
-      - id: TrackingDart
-        amount: 5
-      - id: PinpointerUniversal
-        amount: 5
-  - type: Sprite
-    layers:
-      - state: box
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/nfsd.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/nfsd.yml
index 2da5f443299..7e671b500f7 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/nfsd.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/nfsd.yml
@@ -12,10 +12,10 @@
 - type: entity
   name: tracking darts box
   parent: BoxMagazine
-  id: BoxTrackingDartsAmmo
+  id: NFBoxDartsTrackingAmmo
   description: A box of tracking darts.
   components:
   - type: StorageFill
     contents:
-      - id: TrackingDart
+      - id: NFTrackingDart
         amount: 4
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
index f7a48587693..8308bfee6a2 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
@@ -50,7 +50,7 @@
     proto: null
     whitelist:
       tags:
-        - TrackingDart
+        - NFTrackingDart
         - Grenade
   - type: StaticPrice
     price: 50
diff --git a/Resources/Prototypes/_NF/tags.yml b/Resources/Prototypes/_NF/tags.yml
index f154aabe9ea..c50304749a7 100644
--- a/Resources/Prototypes/_NF/tags.yml
+++ b/Resources/Prototypes/_NF/tags.yml
@@ -132,7 +132,7 @@
   id: MagazineNovaliteC1
 
 - type: Tag
-  id: TrackingDart
+  id: NFTrackingDart
 
 - type: Tag
   id: SpeedLoaderRifleHeavy