diff --git a/Resources/Locale/en-US/_NF/job/job-names.ftl b/Resources/Locale/en-US/_NF/job/job-names.ftl
index ce77de75560..6442a05b338 100644
--- a/Resources/Locale/en-US/_NF/job/job-names.ftl
+++ b/Resources/Locale/en-US/_NF/job/job-names.ftl
@@ -11,7 +11,7 @@ job-name-pilot = Pilot
 job-name-pirate = Pirate
 job-name-pirate-captain = Pirate Captain
 job-name-pirate-first-mate = Pirate First Mate
-job-name-security-guard = Security Guard
+job-name-security-guard = Civil Guard
 job-name-sheriff = Sheriff
 job-name-stc = Station Traffic Controller
 job-name-sr = Station Representative
@@ -28,7 +28,7 @@ JobPilot = Pilot
 JobPirate = Pirate
 JobPirateCaptain = Pirate Captain
 JobPirateFirstMate = Pirate First Mate
-JobSecurityGuard = Security Guard
+JobCivilGuard = Civil Guard
 JobSTC = Station Traffic Controller
 
 # Upstream Removed
diff --git a/Resources/Maps/_NF/Outpost/frontier.yml b/Resources/Maps/_NF/Outpost/frontier.yml
index ed88e1e34aa..a49164631b0 100644
--- a/Resources/Maps/_NF/Outpost/frontier.yml
+++ b/Resources/Maps/_NF/Outpost/frontier.yml
@@ -16843,7 +16843,7 @@ entities:
       parent: 2173
     - type: DisposalRouter
       tags:
-      - stationguard
+      - civilguard
 - proto: DisposalTrunk
   entities:
   - uid: 430
@@ -27690,7 +27690,7 @@ entities:
       pos: 39.5,15.5
       parent: 2173
     - type: MailingUnit
-      tag: stationguard
+      tag: civilguard
 - proto: MailTeleporter
   entities:
   - uid: 5000
@@ -32064,7 +32064,7 @@ entities:
     - type: Transform
       pos: -39.5,1.5
       parent: 2173
-- proto: SpawnPointSecurityGuard
+- proto: SpawnPointCivilGuard
   entities:
   - uid: 4817
     components:
diff --git a/Resources/Maps/_NF/POI/trademall.yml b/Resources/Maps/_NF/POI/trademall.yml
index 69117b4baaa..e65d301e1b5 100644
--- a/Resources/Maps/_NF/POI/trademall.yml
+++ b/Resources/Maps/_NF/POI/trademall.yml
@@ -36586,7 +36586,7 @@ entities:
       rot: 3.141592653589793 rad
       pos: 46.5,5.5
       parent: 1
-- proto: SpawnPointSecurityGuard
+- proto: SpawnPointCivilGuard
   entities:
   - uid: 5534
     components:
diff --git a/Resources/Maps/_NF/Test/dev_map.yml b/Resources/Maps/_NF/Test/dev_map.yml
index f5dc63852ae..039254af3fa 100644
--- a/Resources/Maps/_NF/Test/dev_map.yml
+++ b/Resources/Maps/_NF/Test/dev_map.yml
@@ -7020,7 +7020,7 @@ entities:
     - type: Transform
       pos: -3.5,2.5
       parent: 179
-- proto: SpawnPointSecurityGuard
+- proto: SpawnPointCivilGuard
   entities:
   - uid: 1457
     components:
diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml
index 2b151e88215..05ccfb356f8 100644
--- a/Resources/Prototypes/Roles/Jobs/departments.yml
+++ b/Resources/Prototypes/Roles/Jobs/departments.yml
@@ -113,7 +113,7 @@
 #  - Warden # Frontier
   - PrisonGuard ##nyano
   - Brigmedic # Frontier
-#  - SecurityGuard # Frontier
+#  - CivilGuard # Frontier
   - NFDetective # Frontier
   - Cadet # Frontier
   - Deputy # Frontier
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml
index 0c08090110b..9c03b231ac0 100644
--- a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml
@@ -46,8 +46,8 @@
 - type: entity
   parent: ClothingUniformSkirtBase
   id: ClothingUniformJumpskirtSecGuard
-  name: security guard's uniform
-  description: A specialized uniform for Frontier Outpost's station guard. Crisp and official to let dock loiterers know you mean business.
+  name: civil guard's uniform
+  description: A specialized uniform for Frontier Outpost's civil guard. Crisp and official to let dock loiterers know you mean business.
   components:
   - type: Sprite
     sprite: _NF/Clothing/Uniforms/Jumpskirt/security_guard.rsi
@@ -91,13 +91,13 @@
   parent: ClothingUniformSkirtBase
   id: ClothingUniformJumpskirtPrivateSec
   name: private security jumpskirt
-  description: A specialized uniform for a private security guard. For the discerning private contractor in need of a professional look.
+  description: A specialized uniform for a private civil guard. For the discerning private contractor in need of a professional look.
   components:
   - type: Sprite
     sprite: _NF/Clothing/Uniforms/Jumpskirt/private_security.rsi
   - type: Clothing
     sprite: _NF/Clothing/Uniforms/Jumpskirt/private_security.rsi
-    
+
 - type: entity
   parent: ClothingUniformJumpskirtHoP
   id: ClothingUniformJumpskirtSr
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml
index 31654fddce0..ffb2ca9ca7e 100644
--- a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -46,8 +46,8 @@
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitSecGuard
-  name: security guard's uniform
-  description: A specialized uniform for Frontier Outpost's station guard. Crisp and official to let dock loiterers know you mean business.
+  name: civil guard's uniform
+  description: A specialized uniform for Frontier Outpost's civil guard. Crisp and official to let dock loiterers know you mean business.
   components:
   - type: Sprite
     sprite: _NF/Clothing/Uniforms/Jumpsuit/security_guard.rsi
@@ -208,7 +208,7 @@
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitPrivateSec
   name: private security jumpsuit
-  description: A specialized uniform for a private security guard. For the discerning private contractor in need of a professional look.
+  description: A specialized uniform for a private civil guard. For the discerning private contractor in need of a professional look.
   components:
   - type: Sprite
     sprite: _NF/Clothing/Uniforms/Jumpsuit/private_security.rsi
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/jobs.yml
index 4ce80106b89..b0c5985f6fd 100644
--- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/jobs.yml
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/jobs.yml
@@ -79,17 +79,17 @@
       - state: stc
 
 - type: entity
-  id: SpawnPointSecurityGuard
+  id: SpawnPointCivilGuard
   parent: SpawnPointJobBase
-  name: security guard
+  name: civil guard
   components:
   - type: SpawnPoint
-    job_id: SecurityGuard
+    job_id: CivilGuard
   - type: Sprite
     sprite: _NF/Markers/jobs.rsi
     layers:
       - state: green
-      - state: securityguard
+      - state: civilguard
 
 - type: entity
   id: SpawnPointERTMailCarrier
diff --git a/Resources/Prototypes/_NF/Entities/Markers/pacified_zone.yml b/Resources/Prototypes/_NF/Entities/Markers/pacified_zone.yml
index 186fbbd879d..9d12901d636 100644
--- a/Resources/Prototypes/_NF/Entities/Markers/pacified_zone.yml
+++ b/Resources/Prototypes/_NF/Entities/Markers/pacified_zone.yml
@@ -20,7 +20,7 @@
       - NFDetective
       - SeniorOfficer
       - Sheriff
-      - SecurityGuard
+      - CivilGuard
       - StationRepresentative
       - StationTrafficController
 
@@ -96,4 +96,4 @@
   suffix: Panic Bunker, 100
   components:
   - type: PacifiedZoneGenerator
-    radius: 100
\ No newline at end of file
+    radius: 100
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/identification_cards.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/identification_cards.yml
index d5e3a37e318..112f6aeb391 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/identification_cards.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/identification_cards.yml
@@ -157,11 +157,11 @@
 
 - type: entity
   parent: SecurityIDCard
-  id: SecurityGuardIDCard
-  name: security guard ID card
+  id: CivilGuardIDCard
+  name: civil guard ID card
   components:
   - type: PresetIdCard
-    job: SecurityGuard
+    job: CivilGuard
 
 - type: entity
   parent: ERTChaplainIDCard
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/ship_vouchers.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/ship_vouchers.yml
index 3f6639e2cdb..176fed41600 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/ship_vouchers.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/ship_vouchers.yml
@@ -110,13 +110,13 @@
 - type: entity
   parent: ShipVoucherFrontierJanitor
   id: ShipVoucherFrontierGuard
-  name: station guard ship voucher
+  name: civil guard ship voucher
   description: Allows for one free guard ship purchase from the Frontier Staff Shipyard. Destroyed on sale.
   components:
   - type: Sprite
     layers:
     - state: blue
-    - state: voucherstationguard
+    - state: vouchercivilguard
   - type: ShipyardVoucher
     access:
-    - Brig # odd, but potentially restricts cadets in lieu of a security guard-only access level
+    - Brig # odd, but potentially restricts cadets in lieu of a civil guard-only access level
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml
index bb6b2b77feb..49cbcfa5787 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml
@@ -85,12 +85,12 @@
 
 - type: entity
   parent: BaseSecurityPDA
-  id: SecurityGuardPDA
-  name: security guard PDA
+  id: CivilGuardPDA
+  name: civil guard PDA
   description: Red to hide the stains of passenger blood.
   components:
   - type: Pda
-    id: SecurityGuardIDCard
+    id: CivilGuardIDCard
   - type: Appearance
     appearanceDataInit:
       enum.PdaVisuals.PdaType:
@@ -478,6 +478,6 @@
     - NotekeeperCartridge
     - NewsReaderCartridge
     - BountyContractsCartridge
-    - AstroNavCartridge    
+    - AstroNavCartridge
     - LedgerCartridge
     - MedTekCartridge #medtek preloaded. Should be ok.
diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/SecurityGuard/bags.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/SecurityGuard/bags.yml
index c5c41e3d92f..d3cac23c891 100644
--- a/Resources/Prototypes/_NF/Loadouts/Jobs/SecurityGuard/bags.yml
+++ b/Resources/Prototypes/_NF/Loadouts/Jobs/SecurityGuard/bags.yml
@@ -1,19 +1,19 @@
 - type: loadout
-  id: SecurityGuardBackpack
+  id: CivilGuardBackpack
   equipment:
     back: ClothingBackpackSecurity
 
 - type: loadout
-  id: SecurityGuardSatchel
+  id: CivilGuardSatchel
   equipment:
     back: ClothingBackpackSatchelSecurity
 
 - type: loadout
-  id: SecurityGuardDuffel
+  id: CivilGuardDuffel
   equipment:
     back: ClothingBackpackDuffelSecurity
 
 - type: loadout
-  id: SecurityGuardMessenger
+  id: CivilGuardMessenger
   equipment:
-    back: ClothingBackpackMessengerSecurity
\ No newline at end of file
+    back: ClothingBackpackMessengerSecurity
diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/SecurityGuard/ears.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/SecurityGuard/ears.yml
index 044490d96af..8fe8cd0f817 100644
--- a/Resources/Prototypes/_NF/Loadouts/Jobs/SecurityGuard/ears.yml
+++ b/Resources/Prototypes/_NF/Loadouts/Jobs/SecurityGuard/ears.yml
@@ -1,9 +1,9 @@
 - type: loadout
-  id: SecurityGuardClothingHeadsetSecurityCommon
+  id: CivilGuardClothingHeadsetSecurityCommon
   equipment:
     ears: ClothingHeadsetSecurityCommon
 
 - type: loadout
-  id: SecurityGuardClothingHeadsetAltSecurityCommon
+  id: CivilGuardClothingHeadsetAltSecurityCommon
   equipment:
-    ears: ClothingHeadsetAltSecurityCommon
\ No newline at end of file
+    ears: ClothingHeadsetAltSecurityCommon
diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/SecurityGuard/jumpsuit.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/SecurityGuard/jumpsuit.yml
index 581f961d2f7..62a7f954dde 100644
--- a/Resources/Prototypes/_NF/Loadouts/Jobs/SecurityGuard/jumpsuit.yml
+++ b/Resources/Prototypes/_NF/Loadouts/Jobs/SecurityGuard/jumpsuit.yml
@@ -1,9 +1,9 @@
 - type: loadout
-  id: SecurityGuardJumpsuit
+  id: CivilGuardJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitSecGuard
 
 - type: loadout
-  id: SecurityGuardJumpskirt
+  id: CivilGuardJumpskirt
   equipment:
-    jumpsuit: ClothingUniformJumpskirtSecGuard
\ No newline at end of file
+    jumpsuit: ClothingUniformJumpskirtSecGuard
diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/SecurityGuard/pda.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/SecurityGuard/pda.yml
index d2fed8c1c59..f3682fc2f70 100644
--- a/Resources/Prototypes/_NF/Loadouts/Jobs/SecurityGuard/pda.yml
+++ b/Resources/Prototypes/_NF/Loadouts/Jobs/SecurityGuard/pda.yml
@@ -1,5 +1,4 @@
 - type: loadout
-  id: SecurityGuardSecurityGuardPDA
+  id: CivilGuardCivilGuardPDA
   equipment:
-    id: SecurityGuardPDA
-    
\ No newline at end of file
+    id: CivilGuardPDA
diff --git a/Resources/Prototypes/_NF/Loadouts/role_loadouts.yml b/Resources/Prototypes/_NF/Loadouts/role_loadouts.yml
index e3d6c71e4a4..62dc3ba913d 100644
--- a/Resources/Prototypes/_NF/Loadouts/role_loadouts.yml
+++ b/Resources/Prototypes/_NF/Loadouts/role_loadouts.yml
@@ -183,19 +183,19 @@
   - NFSpeciesSpecific
 
 - type: roleLoadout
-  id: JobSecurityGuard
+  id: JobCivilGuard
   groups:
-  - SecurityGuardHead
-  - SecurityGuardJumpsuit
-  - SecurityGuardGloves
-  - SecurityGuardBackpack
-  - SecurityGuardOuterClothing
-  - SecurityGuardShoes
-  - SecurityGuardFace
-  - SecurityGuardBelt
-  - SecurityGuardEars
+  - CivilGuardHead
+  - CivilGuardJumpsuit
+  - CivilGuardGloves
+  - CivilGuardBackpack
+  - CivilGuardOuterClothing
+  - CivilGuardShoes
+  - CivilGuardFace
+  - CivilGuardBelt
+  - CivilGuardEars
   - NfsdBoxSurvival
-  - SecurityGuardPDA
+  - CivilGuardPDA
   - ContractorCartridge
   - ContractorImplanter
   - ContractorEncryptionKey
diff --git a/Resources/Prototypes/_NF/Loadouts/security_guard_groups.yml b/Resources/Prototypes/_NF/Loadouts/security_guard_groups.yml
index 1b1afceca84..20dc9e3e555 100644
--- a/Resources/Prototypes/_NF/Loadouts/security_guard_groups.yml
+++ b/Resources/Prototypes/_NF/Loadouts/security_guard_groups.yml
@@ -1,5 +1,5 @@
 - type: loadoutGroup
-  id: SecurityGuardGloves
+  id: CivilGuardGloves
   name: loadout-group-contractor-gloves
   loadouts:
   - CombatGloves
@@ -9,7 +9,7 @@
   - CombatGloves
 
 - type: loadoutGroup
-  id: SecurityGuardHead
+  id: CivilGuardHead
   name: loadout-group-contractor-head
   minLimit: 0
   loadouts:
@@ -17,28 +17,28 @@
   - SecurityHelmet
 
 - type: loadoutGroup
-  id: SecurityGuardJumpsuit
+  id: CivilGuardJumpsuit
   name: loadout-group-contractor-jumpsuit
   loadouts:
-  - SecurityGuardJumpsuit
-  - SecurityGuardJumpskirt
+  - CivilGuardJumpsuit
+  - CivilGuardJumpskirt
   fallbacks:
-  - SecurityGuardJumpsuit
-  - SecurityGuardJumpskirt
+  - CivilGuardJumpsuit
+  - CivilGuardJumpskirt
 
 - type: loadoutGroup
-  id: SecurityGuardBackpack
+  id: CivilGuardBackpack
   name: loadout-group-contractor-backpack
   loadouts:
-  - SecurityGuardBackpack
-  - SecurityGuardSatchel
-  - SecurityGuardDuffel
-  - SecurityGuardMessenger
+  - CivilGuardBackpack
+  - CivilGuardSatchel
+  - CivilGuardDuffel
+  - CivilGuardMessenger
   fallbacks:
-  - SecurityGuardBackpack
+  - CivilGuardBackpack
 
 - type: loadoutGroup
-  id: SecurityGuardOuterClothing
+  id: CivilGuardOuterClothing
   name: loadout-group-contractor-outerclothing
   loadouts:
   - ArmorVest
@@ -47,7 +47,7 @@
   - ArmorVest
 
 - type: loadoutGroup
-  id: SecurityGuardShoes
+  id: CivilGuardShoes
   name: loadout-group-contractor-shoes
   loadouts:
   - LeatherShoes
@@ -57,16 +57,16 @@
   - LeatherShoes
 
 - type: loadoutGroup
-  id: SecurityGuardEars
+  id: CivilGuardEars
   name: loadout-group-contractor-ears
   loadouts:
-  - SecurityGuardClothingHeadsetSecurityCommon
-  - SecurityGuardClothingHeadsetAltSecurityCommon
+  - CivilGuardClothingHeadsetSecurityCommon
+  - CivilGuardClothingHeadsetAltSecurityCommon
   fallbacks:
-  - SecurityGuardClothingHeadsetSecurityCommon
+  - CivilGuardClothingHeadsetSecurityCommon
 
 - type: loadoutGroup
-  id: SecurityGuardBelt
+  id: CivilGuardBelt
   name: loadout-group-contractor-belt
   loadouts:
   - SecurityBelt
@@ -75,16 +75,16 @@
   - SecurityBelt
 
 - type: loadoutGroup
-  id: SecurityGuardPDA
+  id: CivilGuardPDA
   name: loadout-group-contractor-id
   hidden: true # No point in showing this, it gets auto-selected.
   loadouts:
-  - SecurityGuardSecurityGuardPDA
+  - CivilGuardCivilGuardPDA
   fallbacks:
-  - SecurityGuardSecurityGuardPDA
+  - CivilGuardCivilGuardPDA
 
 - type: loadoutGroup
-  id: SecurityGuardFace
+  id: CivilGuardFace
   name: loadout-group-contractor-face
   hidden: true # No point in showing this, it gets auto-selected.
   loadouts:
diff --git a/Resources/Prototypes/_NF/Maps/Outpost/frontier.yml b/Resources/Prototypes/_NF/Maps/Outpost/frontier.yml
index aac8912f5f7..7f3bee999f5 100644
--- a/Resources/Prototypes/_NF/Maps/Outpost/frontier.yml
+++ b/Resources/Prototypes/_NF/Maps/Outpost/frontier.yml
@@ -27,7 +27,7 @@
             Mercenary: [ -1, -1 ]
             StationRepresentative: [ 1, 1 ]
             StationTrafficController: [ 1, 1 ]
-            SecurityGuard: [ 1, 1 ]
+            CivilGuard: [ 2, 2 ]
             Valet: [ 1, 1 ]
             NFJanitor: [ 1, 1 ]
             MailCarrier: [ 1, 1 ]
diff --git a/Resources/Prototypes/_NF/Maps/debug.yml b/Resources/Prototypes/_NF/Maps/debug.yml
index 832f072e3e0..1dcd4e2c843 100644
--- a/Resources/Prototypes/_NF/Maps/debug.yml
+++ b/Resources/Prototypes/_NF/Maps/debug.yml
@@ -16,7 +16,7 @@
             Mercenary: [ -1, -1 ]
             StationRepresentative: [ -1, -1 ]
             StationTrafficController: [ -1, -1 ]
-            SecurityGuard: [ -1, -1 ]
+            CivilGuard: [ -1, -1 ]
             Valet: [ -1, -1 ]
             NFJanitor: [ -1, -1 ]
             MailCarrier: [ -1, -1 ]
@@ -33,4 +33,4 @@
             Pirate: [ -1, -1]
             Prisoner: [ -1, -1]
         - type: StationDeadDrop
-          maxDeadDrops: 20 # Testing
\ No newline at end of file
+          maxDeadDrops: 20 # Testing
diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Frontier/security_guard.yml b/Resources/Prototypes/_NF/Roles/Jobs/Frontier/security_guard.yml
index 491b7605c2e..74b74aecca3 100644
--- a/Resources/Prototypes/_NF/Roles/Jobs/Frontier/security_guard.yml
+++ b/Resources/Prototypes/_NF/Roles/Jobs/Frontier/security_guard.yml
@@ -1,14 +1,14 @@
 - type: job
-  id: SecurityGuard
+  id: CivilGuard
   name: job-name-security-guard
   description: job-description-security-guard
   playTimeTracker: JobSecurityGuard
   requirements:
     - !type:OverallPlaytimeRequirement
       time: 36000 # Frontier - 10 hrs
-  startingGear: SecurityGuardGear
+  startingGear: CivilGuardGear
   alwaysUseSpawner: true
-  icon: "JobIconSecurityGuard"
+  icon: "JobIconCivilGuard"
   supervisors: job-supervisors-sr
   weight: 80
   displayWeight: 20 # Second from the bottom
@@ -30,7 +30,7 @@
     prototype: FrontierBirthdayGift
 
 - type: startingGear
-  id: SecurityGuardGear
+  id: CivilGuardGear
   equipment:
     eyes: ClothingEyesGlassesSunglasses #ClothingEyesGlassesSecurity
     pocket1: WeaponPistolMk58 #WeaponPistolMk58Nonlethal
@@ -42,4 +42,4 @@
     - Flash
     - MagazinePistol
     - MagazinePistolRubber
-    - ShipVoucherFrontierGuard
\ No newline at end of file
+    - ShipVoucherFrontierGuard
diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Frontier/sr.yml b/Resources/Prototypes/_NF/Roles/Jobs/Frontier/sr.yml
index 2514a8669af..c0189b570e7 100644
--- a/Resources/Prototypes/_NF/Roles/Jobs/Frontier/sr.yml
+++ b/Resources/Prototypes/_NF/Roles/Jobs/Frontier/sr.yml
@@ -8,7 +8,7 @@
       time: 72000 # 20 hrs
     - !type:RoleTimeRequirement
       role: JobSecurityGuard
-      time: 10800 # 3 hrs as security guard
+      time: 10800 # 3 hrs as civil guard
   whitelisted: true
   startingGear: SrGear
   alwaysUseSpawner: true
diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Frontier/stc.yml b/Resources/Prototypes/_NF/Roles/Jobs/Frontier/stc.yml
index 35e1106fada..c4780b8ed0f 100644
--- a/Resources/Prototypes/_NF/Roles/Jobs/Frontier/stc.yml
+++ b/Resources/Prototypes/_NF/Roles/Jobs/Frontier/stc.yml
@@ -10,9 +10,9 @@
       time: 72000 # 20 hrs
     - !type:RoleTimeRequirement
       role: JobSecurityGuard
-      time: 10800 # 3 hrs as security guard
+      time: 10800 # 3 hrs as civil guard
   canBeAntag: false
-  icon: "JobIconStc" 
+  icon: "JobIconStc"
   supervisors: job-supervisors-sr
   weight: 160
   displayWeight: 50 # Second from the top
@@ -36,4 +36,4 @@
     back:
     - Flash
     - RubberStampStc
-    - EncryptionKeyStationMaster
\ No newline at end of file
+    - EncryptionKeyStationMaster
diff --git a/Resources/Prototypes/_NF/Roles/Jobs/departments.yml b/Resources/Prototypes/_NF/Roles/Jobs/departments.yml
index b22dfeb379e..35808709b25 100644
--- a/Resources/Prototypes/_NF/Roles/Jobs/departments.yml
+++ b/Resources/Prototypes/_NF/Roles/Jobs/departments.yml
@@ -11,7 +11,7 @@
   - Valet # nyano
   - NFJanitor
   - MailCarrier # nyano
-  - SecurityGuard
+  - CivilGuard
 
 - type: department
   id: Antag
diff --git a/Resources/Prototypes/_NF/Roles/play_time_trackers.yml b/Resources/Prototypes/_NF/Roles/play_time_trackers.yml
index b93bdc3f891..92644c7af52 100644
--- a/Resources/Prototypes/_NF/Roles/play_time_trackers.yml
+++ b/Resources/Prototypes/_NF/Roles/play_time_trackers.yml
@@ -21,10 +21,10 @@
 
 - type: playTimeTracker
   id: JobPirateCaptain
-  
+
 - type: playTimeTracker
   id: JobPirateFirstMate
-  
+
 - type: playTimeTracker
   id: JobPirate
 
diff --git a/Resources/Prototypes/_NF/Shipyard/Sr/watchdog.yml b/Resources/Prototypes/_NF/Shipyard/Sr/watchdog.yml
index cb7935a64f1..59b4b0df33d 100644
--- a/Resources/Prototypes/_NF/Shipyard/Sr/watchdog.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Sr/watchdog.yml
@@ -13,7 +13,7 @@
   id: Watchdog
   parent: BaseVessel
   name: SBI Watchdog
-  description: "A refurbished and repainted older model of the NSF Templar for use for Mercenaries and 'repurposed' for the Station Guard, mind the gap."
+  description: "A refurbished and repainted older model of the NSF Templar for use for Mercenaries and 'repurposed' for the civil guard, mind the gap."
   price: 20000
   category: Small
   group: Sr
diff --git a/Resources/Prototypes/_NF/StatusIcon/job.yml b/Resources/Prototypes/_NF/StatusIcon/job.yml
index e4980ea942c..1dcde939a6b 100644
--- a/Resources/Prototypes/_NF/StatusIcon/job.yml
+++ b/Resources/Prototypes/_NF/StatusIcon/job.yml
@@ -48,7 +48,7 @@
 
 - type: jobIcon
   parent: JobIcon
-  id: JobIconSecurityGuard
+  id: JobIconCivilGuard
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: SecurityOfficer
diff --git a/Resources/Textures/_NF/Markers/jobs.rsi/securityguard.png b/Resources/Textures/_NF/Markers/jobs.rsi/civilguard.png
similarity index 100%
rename from Resources/Textures/_NF/Markers/jobs.rsi/securityguard.png
rename to Resources/Textures/_NF/Markers/jobs.rsi/civilguard.png
diff --git a/Resources/Textures/_NF/Markers/jobs.rsi/meta.json b/Resources/Textures/_NF/Markers/jobs.rsi/meta.json
index 2d4201da5b1..95059c8b10d 100644
--- a/Resources/Textures/_NF/Markers/jobs.rsi/meta.json
+++ b/Resources/Textures/_NF/Markers/jobs.rsi/meta.json
@@ -23,7 +23,7 @@
       "name": "pilot"
     },
     {
-      "name": "securityguard"
+      "name": "civilguard"
     },
     {
       "name": "stc"
diff --git a/Resources/Textures/_NF/Objects/Misc/shipyard_voucher.rsi/meta.json b/Resources/Textures/_NF/Objects/Misc/shipyard_voucher.rsi/meta.json
index acb06485cd7..f7cbfea382c 100644
--- a/Resources/Textures/_NF/Objects/Misc/shipyard_voucher.rsi/meta.json
+++ b/Resources/Textures/_NF/Objects/Misc/shipyard_voucher.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "blue-inhand-left, blue-inhand-right, voucherstationguard taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e.",
+  "copyright": "blue-inhand-left, blue-inhand-right, vouchercivilguard taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e.",
   "copyright": "blue, nfsd, voucher* by Whatstone (Discord)",
   "size": {
     "x": 32,
@@ -43,7 +43,7 @@
       "name": "vouchersergeant"
     },
     {
-      "name": "voucherstationguard"
+      "name": "vouchercivilguard"
     },
     {
       "name": "vouchervalet"
diff --git a/Resources/Textures/_NF/Objects/Misc/shipyard_voucher.rsi/voucherstationguard.png b/Resources/Textures/_NF/Objects/Misc/shipyard_voucher.rsi/vouchercivilguard.png
similarity index 100%
rename from Resources/Textures/_NF/Objects/Misc/shipyard_voucher.rsi/voucherstationguard.png
rename to Resources/Textures/_NF/Objects/Misc/shipyard_voucher.rsi/vouchercivilguard.png
diff --git a/Resources/_NF/migration.yml b/Resources/_NF/migration.yml
index 3ef46463509..d1cf20556ed 100644
--- a/Resources/_NF/migration.yml
+++ b/Resources/_NF/migration.yml
@@ -174,7 +174,7 @@ RandomItem: null
 # 2024-12-14
 VehicleJanicart: NFVehicleJanicart
 
-# 2024-12-22 Barrels 
+# 2024-12-22 Barrels
 CrateSpaceCleaner: ChemicalBarrelSpaceCleaner
 
 # 2024-12-24 Trading Crate Destinations
@@ -198,3 +198,8 @@ PoweredlightColoredRed: PoweredlightRed
 PoweredlightBlueInterior: PoweredlightBlue
 PoweredlightColoredFrostyBlue: PoweredlightCyan
 PoweredlightColoredBlack: PoweredlightBlack
+
+# 2025-01-26 Civil Guard role
+SpawnPointSecurityGuard: SpawnPointCivilGuard
+SecurityGuardIDCard: CivilGuardIDCard
+SecurityGuardPDA: CivilGuardPDA