diff --git a/Resources/Prototypes/Entities/Buildings/Storage/closet_types.yml b/Resources/Prototypes/Entities/Buildings/Storage/closet_types.yml
index 01c5dec55b..d96a0ec332 100644
--- a/Resources/Prototypes/Entities/Buildings/Storage/closet_types.yml
+++ b/Resources/Prototypes/Entities/Buildings/Storage/closet_types.yml
@@ -19,7 +19,8 @@
 
 - type: entity
   id: LockerToolFilled
-  name: Tool Locker (Filled)
+  name: Tool Locker
+  suffix: Filled
   parent: LockerTool
   components:
   - type: ToolLockerFill
diff --git a/Resources/Prototypes/Entities/Items/toolbox.yml b/Resources/Prototypes/Entities/Items/toolbox.yml
index ad15f412a3..71505b1445 100644
--- a/Resources/Prototypes/Entities/Items/toolbox.yml
+++ b/Resources/Prototypes/Entities/Items/toolbox.yml
@@ -47,7 +47,8 @@
 
 - type: entity
   id: YellowToolboxItemFilled
-  name: Electrical Toolbox (Filled)
+  name: Electrical Toolbox
+  suffix: Filled
   parent: YellowToolboxItem
   components:
   - type: ToolboxElectricalFill