diff --git a/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml
index 2fd17e31cf..0b79409ecd 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml
@@ -9,6 +9,9 @@
     sprite: Clothing/Head/Helmets/eva.rsi
   - type: Clothing
     sprite: Clothing/Head/Helmets/eva.rsi
+  - type: Tag
+    tags:
+    - HelmetEVA
 
 #Large EVA Helmet
 - type: entity
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
index 8d8aa5eeb1..c04d8d1dc9 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
@@ -9,6 +9,9 @@
     sprite: Clothing/OuterClothing/Suits/eva.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Suits/eva.rsi
+  - type: Tag
+    tags:
+    - SuitEVA
 
 #Syndicate EVA
 - type: entity
diff --git a/Resources/Prototypes/InventoryTemplates/monkey_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/monkey_inventory_template.yml
index 48dd9fc038..7764b7af7f 100644
--- a/Resources/Prototypes/InventoryTemplates/monkey_inventory_template.yml
+++ b/Resources/Prototypes/InventoryTemplates/monkey_inventory_template.yml
@@ -53,5 +53,5 @@
     displayName: Suit
     whitelist:
       tags:
-        - HardsuitEVA
+        - SuitEVA
 
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/clothing/clown_hardsuit.yml b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/clown_hardsuit.yml
index 6719d14582..da5ea21edf 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/clothing/clown_hardsuit.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/clown_hardsuit.yml
@@ -9,14 +9,14 @@
             - material: Cloth
               amount: 5
               doAfter: 1
-            - tag: HardsuitEVA
-              name: EVA suit
+            - tag: SuitEVA
+              name: An EVA suit
               icon:
                 sprite: Clothing/OuterClothing/Suits/eva.rsi
                 state: icon
               doAfter: 1
             - tag: HelmetEVA
-              name: EVA helmet
+              name: An EVA helmet
               icon:
                 sprite: Clothing/Head/Helmets/eva.rsi
                 state: icon
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 1c255b80a0..02f47070c4 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -355,9 +355,6 @@
 - type: Tag
   id: Hardsuit # Prevent melee injectors that can't penetrate hardsuits from injecting the wearer (nettles)
 
-- type: Tag
-  id: HardsuitEVA
-
 - type: Tag
   id: Head
 
@@ -710,6 +707,9 @@
 - type: Tag
   id: SubdermalImplant
 
+- type: Tag
+  id: SuitEVA
+
 - type: Tag
   id: SurveillanceCameraMonitorCircuitboard