diff --git a/Content.Shared/Clothing/Components/ToggleableClothingComponent.cs b/Content.Shared/Clothing/Components/ToggleableClothingComponent.cs
index 9dc31bc2c9..74c5d7a6ba 100644
--- a/Content.Shared/Clothing/Components/ToggleableClothingComponent.cs
+++ b/Content.Shared/Clothing/Components/ToggleableClothingComponent.cs
@@ -21,7 +21,7 @@ public sealed partial class ToggleableClothingComponent : Component
     ///     Action used to toggle the clothing on or off.
     /// </summary>
     [DataField("actionId", customTypeSerializer: typeof(PrototypeIdSerializer<InstantActionPrototype>))]
-    public string ActionId = "ToggleSuitHelmet";
+    public string ActionId = "ToggleSuitPiece";
     public InstantAction? ToggleAction = null;
 
     /// <summary>
@@ -33,6 +33,7 @@ public sealed partial class ToggleableClothingComponent : Component
     /// <summary>
     ///     The inventory slot that the clothing is equipped to.
     /// </summary>
+    [ViewVariables(VVAccess.ReadWrite)]
     [DataField("slot")]
     public string Slot = "head";
 
diff --git a/Resources/Locale/en-US/actions/actions/hardsuit.ftl b/Resources/Locale/en-US/actions/actions/hardsuit.ftl
index 38acd9df3a..13de007370 100644
--- a/Resources/Locale/en-US/actions/actions/hardsuit.ftl
+++ b/Resources/Locale/en-US/actions/actions/hardsuit.ftl
@@ -1,2 +1,2 @@
-action-name-hardsuit = Toggle Helmet
-action-description-hardsuit = Remember to equip the helmet before flinging yourself into space.
\ No newline at end of file
+action-name-hardsuit = Toggle Suit Piece
+action-description-hardsuit = Remember to equip the important pieces of your suit before going into action.
diff --git a/Resources/Prototypes/Actions/types.yml b/Resources/Prototypes/Actions/types.yml
index 2bf3b9b98a..719ed715ed 100644
--- a/Resources/Prototypes/Actions/types.yml
+++ b/Resources/Prototypes/Actions/types.yml
@@ -96,7 +96,7 @@
   event: !type:UseDnaScramblerImplantEvent
 
 - type: instantAction
-  id: ToggleSuitHelmet
+  id: ToggleSuitPiece
   name: action-name-hardsuit
   description: action-description-hardsuit
   itemIconStyle: BigItem
diff --git a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml
index a1d23368e3..e893c4b841 100644
--- a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml
@@ -127,6 +127,7 @@
     clothingPrototype: ClothingHeadHatHoodGoliathCloak
     requiredSlot:
     - neck
+    slot: head
   - type: ContainerContainer
     containers:
       toggleable-clothing: !type:ContainerSlot {}
@@ -152,6 +153,7 @@
     clothingPrototype: ClothingHeadHatHoodMoth
     requiredSlot:
     - neck
+    slot: head
   - type: ContainerContainer
     containers:
       toggleable-clothing: !type:ContainerSlot {}
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
index 7a83e7dfcc..c11e981ebb 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
@@ -68,6 +68,7 @@
         Heat: 0.90
         Radiation: 0.25
   - type: ToggleableClothing
+    slot: head
   - type: ContainerContainer
     containers:
       toggleable-clothing: !type:ContainerSlot {}
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
index 8732c05dbf..3d0adacf7e 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
@@ -48,6 +48,7 @@
     coefficient: 0.5
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetEVALarge
+    slot: head
   - type: ContainerContainer
     containers:
       toggleable-clothing: !type:ContainerSlot {}