diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/maildrobe.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/maildrobe.yml
index 182a2064c4c..061bd16021c 100644
--- a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/maildrobe.yml
+++ b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/maildrobe.yml
@@ -10,7 +10,7 @@
     ClothingHeadMailCarrier: 2
     ClothingEyesHudMail: 2 # Frontier
     MailBag: 2
-    ClothingHeadsetMailCarrier: 2 # Frontier ClothingHeadsetCargo<ClothingHeadsetMailCarrier
+    ClothingHeadsetService: 2 # Frontier ClothingHeadsetCargo<ClothingHeadsetService
     ClothingUniformJumpsuitValet: 2
     ClothingUniformJumpskirtValet: 2
     ClothingOuterWinterCoatMail: 2
diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml
index 09d250d2512..3c5b145f865 100644
--- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml
+++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml
@@ -27,7 +27,7 @@
     outerClothing: ClothingOuterWinterCoatMail
     eyes: ClothingEyesHudMail
     id: MailCarrierPDA
-    ears: ClothingHeadsetMailCarrier # Frontier - ClothingHeadsetCargo<ClothingHeadsetMailCarrier
+    ears: ClothingHeadsetService # Frontier - ClothingHeadsetCargo<ClothingHeadsetService
     belt: MailBag
   innerClothingSkirt: ClothingUniformJumpskirtMailCarrier
   satchel: ClothingBackpackSatchelFilled
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets.yml
index ca4eb733edf..97cba4b9b38 100644
--- a/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets.yml
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets.yml
@@ -8,18 +8,6 @@
       key_slots:
       - EncryptionKeyCommon
 
-- type: entity
-  parent: ClothingHeadsetCargo
-  id: ClothingHeadsetMailCarrier
-  name: mail carrier headset
-  description: A headset used by mail carrier employees.
-  components:
-  - type: ContainerFill
-    containers:
-      key_slots:
-      - EncryptionKeyService
-      - EncryptionKeyCargo
-
 - type: entity
   parent: ClothingHeadset
   id: ClothingHeadsetNFSD