diff --git a/game/armedforces/armedforces.py b/game/armedforces/armedforces.py
index b829a604..b2666266 100644
--- a/game/armedforces/armedforces.py
+++ b/game/armedforces/armedforces.py
@@ -40,7 +40,7 @@ class ArmedForces:
         # all layouts which are usable by the given faction.
         for layout in LAYOUTS.layouts:
             if layout.generic and layout.usable_by_faction(faction):
-                # Creates a faction compatible GorceGroup
+                # Creates a faction compatible ForceGroup
                 self.add_or_update_force_group(ForceGroup.for_layout(layout, faction))
 
         # Add all preset groups afterwards to prevent them being merged with generics
diff --git a/resources/groups/WW2Essex.yaml b/resources/groups/WW2Essex.yaml
index 22624be2..301ce369 100644
--- a/resources/groups/WW2Essex.yaml
+++ b/resources/groups/WW2Essex.yaml
@@ -4,4 +4,4 @@ tasks:
 units:
   - USS Bennington (CV-20)
 layouts:
-  - WW2 Essex Carrier
\ No newline at end of file
+  - Single Carrier
\ No newline at end of file
diff --git a/resources/layouts/naval/WW2-Essex_Carrier.miz b/resources/layouts/naval/Carrier_Group_Single.miz
similarity index 71%
rename from resources/layouts/naval/WW2-Essex_Carrier.miz
rename to resources/layouts/naval/Carrier_Group_Single.miz
index a1dcb96e..2312b72c 100644
Binary files a/resources/layouts/naval/WW2-Essex_Carrier.miz and b/resources/layouts/naval/Carrier_Group_Single.miz differ
diff --git a/resources/layouts/naval/WW2-Essex_Carrier.yaml b/resources/layouts/naval/Carrier_Group_Single.yaml
similarity index 64%
rename from resources/layouts/naval/WW2-Essex_Carrier.yaml
rename to resources/layouts/naval/Carrier_Group_Single.yaml
index 9b4c0040..d4c1ef8f 100644
--- a/resources/layouts/naval/WW2-Essex_Carrier.yaml
+++ b/resources/layouts/naval/Carrier_Group_Single.yaml
@@ -1,10 +1,13 @@
-name: WW2 Essex Carrier
+name: Single Carrier
 tasks:
   - AircraftCarrier
+generic: true
 groups:
   - Carrier: # the word "Carrier" or "LHA" needs to be present in the group-name
-    - name: WW2 Carrier Group 0
+    - name: Carrier Group 0
       unit_count:
         - 1
       unit_types:
+        - ara_vdm
         - Essex
+        - cva-31