diff --git a/resources/templates/anti_air/S-300_Site.miz b/resources/templates/anti_air/S-300_Site.miz
new file mode 100644
index 00000000..17f43f7e
Binary files /dev/null and b/resources/templates/anti_air/S-300_Site.miz differ
diff --git a/resources/templates/anti_air/S-300_Site.yaml b/resources/templates/anti_air/S-300_Site.yaml
new file mode 100644
index 00000000..9337f244
--- /dev/null
+++ b/resources/templates/anti_air/S-300_Site.yaml
@@ -0,0 +1,89 @@
+name: S-300 Site
+role: AntiAir
+tasks:
+  - LORAD
+groups:
+  - name: S-300 Site SR1
+    group: 1
+    unit_count:
+      - 1
+    unit_types:
+      - S-300PS 40B6MD sr # SA-10
+      - S-300PS SA-10B 40B6MD MAST sr # SA-10B
+      - S-300V 9S15 sr # SA-12
+      - S-300PMU1 40B6MD sr # SA-20 + B, is the 5N66E
+      - S-300VM 9S15M2 sr # SA-23
+  - name: S-300 Site SR2
+    group: 1
+    unit_count:
+      - 1
+    unit_types:
+      - S-300PS 64H6E sr # SA-10
+      - S-300PS 64H6E TRAILER sr # SA-10B
+      - S-300V 9S19 sr # SA-12
+      - S-300PMU1 64N6E sr # SA-20 + B
+      - S-300VM 9S19M2 sr # SA-23
+  - name: S-300 Site CP
+    group: 1
+    unit_count:
+      - 1
+    unit_types:
+      - S-300PS 54K6 cp # SA-10
+      - S-300PS SA-10B 54K6 cp # SA-10B
+      - S-300V 9S457 cp # SA-12
+      - S-300PMU1 54K6 cp # SA-20
+      - S-300PMU2 54K6E2 cp # SA-20B
+      - S-300VM 9S457ME cp # SA-23
+  - name: S-300 Site TR
+    group: 1
+    unit_count:
+      - 1
+    unit_types:
+      - S-300PS 40B6M tr # SA-10
+      - S-300PS 30N6 TRAILER tr # SA-10B
+      - S-300V 9S32 tr # SA-12
+      - S-300PMU1 40B6M tr # SA-20, is the 30N6E!
+      - S-300PMU2 92H6E tr # SA-20B
+      - S-300VM 9S32ME tr # SA-23
+  - name: S-300 Site LN1
+    group: 1
+    unit_count:
+      - 3
+    unit_types:
+      - S-300PS 5P85C ln # SA-10
+      - S-300PS 5P85SE_mod ln # SA-10B
+      - S-300V 9A82 ln # SA-12
+      - S-300PMU1 5P85CE ln # SA-20
+      - S-300PMU2 5P85SE2 ln # SA-20B
+      - S-300VM 9A82ME ln # SA-23
+  - name: S-300 Site LN2
+    group: 1
+    unit_count:
+      - 3
+    unit_types:
+      - S-300PS 5P85D ln # SA-10
+      - S-300PS 5P85SU_mod ln # SA-10B
+      - S-300V 9A83 ln # SA-12
+      - S-300PMU1 5P85DE ln # SA-20
+      - S-300PMU2 5P85SE2 ln # SA-20B
+      - S-300VM 9A83ME ln # SA-23
+  - name: S-300 Site AAA
+    group: 2
+    unit_count:
+      - 2
+    unit_classes:
+      - AAA
+  - name: S-300 Site SHORAD1
+    group: 3
+    unit_count:
+      - 0
+      - 2
+    unit_classes:
+      - SHORAD
+  - name: S-300 Site SHORAD2
+    group: 3
+    unit_count:
+      - 0
+      - 2
+    unit_classes:
+      - SHORAD
diff --git a/resources/templates/anti_air/SA-10.miz b/resources/templates/anti_air/SA-10.miz
deleted file mode 100644
index 669c54ec..00000000
Binary files a/resources/templates/anti_air/SA-10.miz and /dev/null differ
diff --git a/resources/templates/anti_air/SA-10_S-300PS_Battery.yaml b/resources/templates/anti_air/SA-10_S-300PS_Battery.yaml
deleted file mode 100644
index 191f354b..00000000
--- a/resources/templates/anti_air/SA-10_S-300PS_Battery.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
-name: SA-10/S-300PS Battery
-role: AntiAir
-tasks:
-  - LORAD
-groups:
-  - name: SA-10/S-300PS Battery SR1
-    group: 1
-    unit_count:
-      - 1
-    unit_types:
-      - S-300PS 40B6MD sr
-  - name: SA-10/S-300PS Battery SR2
-    group: 1
-    unit_count:
-      - 1
-    unit_types:
-      - S-300PS 64H6E sr
-  - name: SA-10/S-300PS Battery CP
-    group: 1
-    unit_count:
-      - 1
-    unit_types:
-      - S-300PS 54K6 cp
-  - name: SA-10/S-300PS Battery TR
-    group: 1
-    unit_count:
-      - 1
-    unit_types:
-      - S-300PS 40B6M tr
-  - name: SA-10/S-300PS Battery LN1
-    group: 1
-    unit_count:
-      - 3
-    unit_types:
-      - S-300PS 5P85C ln
-  - name: SA-10/S-300PS Battery LN2
-    group: 1
-    unit_count:
-      - 3
-    unit_types:
-      - S-300PS 5P85D ln
-  - name: SA-10/S-300PS Battery AAA
-    group: 2
-    unit_count:
-      - 2
-    unit_classes:
-      - AAA
-  - name: SA-10/S-300PS Battery SHORAD1
-    group: 3
-    unit_count:
-      - 0
-      - 2
-    unit_classes:
-      - SHORAD
-#  - name: SA-10/S-300PS Battery SHORAD2
-#    group: 3
-#    unit_count:
-#      - 0
-#      - 2
-#    unit_classes:
-#      - SHORAD
-template_file: resources/templates/anti_air/SA-10.miz
diff --git a/resources/templates/anti_air/SA-12_S-300V_Battery.yaml b/resources/templates/anti_air/SA-12_S-300V_Battery.yaml
deleted file mode 100644
index d322f26f..00000000
--- a/resources/templates/anti_air/SA-12_S-300V_Battery.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
-name: SA-12/S-300V Battery
-role: AntiAir
-tasks:
-  - LORAD
-groups:
-  - name: SA-12/S-300V Battery 0
-    group: 1
-    unit_count:
-      - 1
-    unit_types:
-      - S-300V 9S15 sr
-  - name: SA-12/S-300V Battery 1
-    group: 1
-    unit_count:
-      - 1
-    unit_types:
-      - S-300V 9S19 sr
-  - name: SA-12/S-300V Battery 2
-    group: 1
-    unit_count:
-      - 1
-    unit_types:
-      - S-300V 9S457 cp
-  - name: SA-12/S-300V Battery 3
-    group: 1
-    unit_count:
-      - 1
-    unit_types:
-      - S-300V 9S32 tr
-  - name: SA-12/S-300V Battery 4
-    group: 1
-    unit_count:
-      - 3
-    unit_types:
-      - S-300V 9A82 ln
-  - name: SA-12/S-300V Battery 5
-    group: 1
-    unit_count:
-      - 3
-    unit_types:
-      - S-300V 9A83 ln
-  - name: SA-12/S-300V Battery 6
-    group: 2
-    unit_count:
-      - 2
-    unit_types:
-      - 2S6 Tunguska
-  - name: SA-12/S-300V Battery 7
-    group: 3
-    unit_count:
-      - 2
-    unit_types:
-      - Tor 9A331
-template_file: resources/templates/anti_air/legacy_ground_templates.miz
diff --git a/resources/templates/anti_air/SA-20B_S-300PMU-2_Battery.yaml b/resources/templates/anti_air/SA-20B_S-300PMU-2_Battery.yaml
deleted file mode 100644
index 3388a534..00000000
--- a/resources/templates/anti_air/SA-20B_S-300PMU-2_Battery.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-name: SA-20B/S-300PMU-2 Battery
-role: AntiAir
-tasks:
-  - LORAD
-groups:
-  - name: SA-20B/S-300PMU-2 Battery 0
-    group: 1
-    unit_count:
-      - 1
-    unit_types:
-      - S-300PMU1 40B6MD sr
-  - name: SA-20B/S-300PMU-2 Battery 1
-    group: 1
-    unit_count:
-      - 1
-    unit_types:
-      - S-300PMU1 64N6E sr
-  - name: SA-20B/S-300PMU-2 Battery 2
-    group: 1
-    unit_count:
-      - 1
-    unit_types:
-      - S-300PMU2 54K6E2 cp
-  - name: SA-20B/S-300PMU-2 Battery 3
-    group: 1
-    unit_count:
-      - 1
-    unit_types:
-      - S-300PMU2 92H6E tr
-  - name: SA-20B/S-300PMU-2 Battery 4
-    group: 1
-    unit_count:
-      - 6
-    unit_types:
-      - S-300PMU2 5P85SE2 ln
-  - name: SA-20B/S-300PMU-2 Battery 5
-    group: 2
-    unit_count:
-      - 2
-    unit_types:
-      - 2S6 Tunguska
-  - name: SA-20B/S-300PMU-2 Battery 6
-    group: 3
-    unit_count:
-      - 2
-    unit_types:
-      - Tor 9A331
-template_file: resources/templates/anti_air/legacy_ground_templates.miz
diff --git a/resources/templates/anti_air/SA-20_S-300PMU-1_Battery.yaml b/resources/templates/anti_air/SA-20_S-300PMU-1_Battery.yaml
deleted file mode 100644
index 3cc02315..00000000
--- a/resources/templates/anti_air/SA-20_S-300PMU-1_Battery.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
-name: SA-20/S-300PMU-1 Battery
-role: AntiAir
-tasks:
-  - LORAD
-groups:
-  - name: SA-20/S-300PMU-1 Battery 0
-    group: 1
-    unit_count:
-      - 1
-    unit_types:
-      - S-300PMU1 40B6MD sr
-  - name: SA-20/S-300PMU-1 Battery 1
-    group: 1
-    unit_count:
-      - 1
-    unit_types:
-      - S-300PMU1 64N6E sr
-  - name: SA-20/S-300PMU-1 Battery 2
-    group: 1
-    unit_count:
-      - 1
-    unit_types:
-      - S-300PMU1 54K6 cp
-  - name: SA-20/S-300PMU-1 Battery 3
-    group: 1
-    unit_count:
-      - 1
-    unit_types:
-      - S-300PMU1 40B6M tr
-  - name: SA-20/S-300PMU-1 Battery 4
-    group: 1
-    unit_count:
-      - 3
-    unit_types:
-      - S-300PMU1 5P85CE ln
-  - name: SA-20/S-300PMU-1 Battery 5
-    group: 1
-    unit_count:
-      - 3
-    unit_types:
-      - S-300PMU1 5P85DE ln
-  - name: SA-20/S-300PMU-1 Battery 6
-    group: 2
-    unit_count:
-      - 2
-    unit_types:
-      - 2S6 Tunguska
-  - name: SA-20/S-300PMU-1 Battery 7
-    group: 3
-    unit_count:
-      - 2
-    unit_types:
-      - Tor 9A331
-template_file: resources/templates/anti_air/legacy_ground_templates.miz
diff --git a/resources/templates/anti_air/SA-23_S-300VM_Battery.yaml b/resources/templates/anti_air/SA-23_S-300VM_Battery.yaml
deleted file mode 100644
index 5c4f431b..00000000
--- a/resources/templates/anti_air/SA-23_S-300VM_Battery.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
-name: SA-23/S-300VM Battery
-role: AntiAir
-tasks:
-  - LORAD
-groups:
-  - name: SA-23/S-300VM Battery 0
-    group: 1
-    unit_count:
-      - 1
-    unit_types:
-      - S-300VM 9S15M2 sr
-  - name: SA-23/S-300VM Battery 1
-    group: 1
-    unit_count:
-      - 1
-    unit_types:
-      - S-300VM 9S19M2 sr
-  - name: SA-23/S-300VM Battery 2
-    group: 1
-    unit_count:
-      - 1
-    unit_types:
-      - S-300VM 9S457ME cp
-  - name: SA-23/S-300VM Battery 3
-    group: 1
-    unit_count:
-      - 1
-    unit_types:
-      - S-300VM 9S32ME tr
-  - name: SA-23/S-300VM Battery 4
-    group: 1
-    unit_count:
-      - 3
-    unit_types:
-      - S-300VM 9A82ME ln
-  - name: SA-23/S-300VM Battery 5
-    group: 1
-    unit_count:
-      - 3
-    unit_types:
-      - S-300VM 9A83ME ln
-  - name: SA-23/S-300VM Battery 6
-    group: 2
-    unit_count:
-      - 2
-    unit_types:
-      - 2S6 Tunguska
-  - name: SA-23/S-300VM Battery 7
-    group: 3
-    unit_count:
-      - 2
-    unit_types:
-      - Tor 9A331
-template_file: resources/templates/anti_air/legacy_ground_templates.miz
diff --git a/resources/templates/anti_air/legacy_ground_templates.miz b/resources/templates/anti_air/legacy_ground_templates.miz
index 4d1a5920..ee171192 100644
Binary files a/resources/templates/anti_air/legacy_ground_templates.miz and b/resources/templates/anti_air/legacy_ground_templates.miz differ
diff --git a/resources/templates/naval/Chinese-Navy.yaml b/resources/templates/naval/Chinese-Navy.yaml
deleted file mode 100644
index 84684247..00000000
--- a/resources/templates/naval/Chinese-Navy.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-name: Chinese Navy
-role: Naval
-tasks:
-  - Navy
-groups:
-  - name: Chinese Navy 0
-    unit_count:
-      - 0
-      - 2
-    unit_types:
-      - Type_054A
-  - name: Chinese Navy 1
-    unit_count:
-      - 0
-      - 2
-    unit_types:
-      - Type_052C
-      - Type_052B
-template_file: resources/templates/naval/legacy_naval_templates.miz
diff --git a/resources/templates/naval/Naval-Group.yaml b/resources/templates/naval/Naval-Group.yaml
new file mode 100644
index 00000000..7a644e50
--- /dev/null
+++ b/resources/templates/naval/Naval-Group.yaml
@@ -0,0 +1,23 @@
+name: Naval Group
+role: Naval
+tasks:
+  - Navy
+groups:
+  - name: Naval Group 0
+    unit_count:
+      - 2
+    unit_classes:
+      - Frigate
+  - name: Naval Group 1
+    unit_count:
+      - 2
+    unit_classes:
+      - Destroyer
+  - name: Naval Group 2
+    optional: true
+    unit_count:
+      - 0
+      - 1
+    unit_classes:
+      - Cruiser
+template_file: resources/templates/naval/naval.miz
diff --git a/resources/templates/naval/Naval-Two-Ship.yaml b/resources/templates/naval/Naval-Two-Ship.yaml
index 690e161b..cf30fef0 100644
--- a/resources/templates/naval/Naval-Two-Ship.yaml
+++ b/resources/templates/naval/Naval-Two-Ship.yaml
@@ -4,10 +4,11 @@ generic: true
 tasks:
   - Navy
 groups:
-  - name: Naval Group 0
+  - name: Naval Two Ship
     unit_count:
       - 2
     unit_classes:
+      - Frigate
       - Destroyer
       - Cruiser
       - Boat
diff --git a/resources/templates/naval/Russian-Navy.yaml b/resources/templates/naval/Russian-Navy.yaml
deleted file mode 100644
index 32286e3a..00000000
--- a/resources/templates/naval/Russian-Navy.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-name: Russian Navy
-role: Naval
-tasks:
-  - Navy
-groups:
-  - name: Russian Navy 0
-    unit_count:
-      - 0
-      - 2
-    unit_types:
-      - ALBATROS
-      - MOLNIYA
-  - name: Russian Navy 1
-    unit_count:
-      - 0
-      - 2
-    unit_types:
-      - NEUSTRASH
-      - REZKY
-  - name: Russian Navy 2
-    optional: true
-    unit_count:
-      - 0
-      - 1
-    unit_types:
-      - MOSCOW
-template_file: resources/templates/naval/legacy_naval_templates.miz
diff --git a/resources/templates/naval/legacy_naval_templates.miz b/resources/templates/naval/legacy_naval_templates.miz
index cf8fb7c5..b255345e 100644
Binary files a/resources/templates/naval/legacy_naval_templates.miz and b/resources/templates/naval/legacy_naval_templates.miz differ
diff --git a/resources/templates/naval/naval.miz b/resources/templates/naval/naval.miz
index a23b2a8a..7e0ceb22 100644
Binary files a/resources/templates/naval/naval.miz and b/resources/templates/naval/naval.miz differ
diff --git a/resources/units/ships/ALBATROS.yaml b/resources/units/ships/ALBATROS.yaml
index a509e14f..3044e831 100644
--- a/resources/units/ships/ALBATROS.yaml
+++ b/resources/units/ships/ALBATROS.yaml
@@ -1,4 +1,4 @@
-class: Destroyer
+class: Frigate
 price: 0
 variants:
   Corvette 1124.4 Grish: null
\ No newline at end of file
diff --git a/resources/units/ships/MOLNIYA.yaml b/resources/units/ships/MOLNIYA.yaml
index 71cd3170..a42c0122 100644
--- a/resources/units/ships/MOLNIYA.yaml
+++ b/resources/units/ships/MOLNIYA.yaml
@@ -1,4 +1,4 @@
-class: Cruiser
+class: Frigate
 price: 0
 variants:
   Corvette 1241.1 Molniya: null
\ No newline at end of file
diff --git a/resources/units/ships/MOSCOW.yaml b/resources/units/ships/MOSCOW.yaml
index bd379a37..62ddba21 100644
--- a/resources/units/ships/MOSCOW.yaml
+++ b/resources/units/ships/MOSCOW.yaml
@@ -1,4 +1,4 @@
-class: Destroyer
+class: Cruiser
 price: 0
 variants:
   Cruiser 1164 Moskva: null
\ No newline at end of file
diff --git a/resources/units/ships/Type_054A.yaml b/resources/units/ships/Type_054A.yaml
index a813245a..6aaefd5d 100644
--- a/resources/units/ships/Type_054A.yaml
+++ b/resources/units/ships/Type_054A.yaml
@@ -1,4 +1,4 @@
-class: Cruiser
+class: Frigate
 price: 0
 variants:
   Type 054A Frigate: null
\ No newline at end of file
diff --git a/resources/units/unit_groups/Chinese-Navy.yaml b/resources/units/unit_groups/Chinese-Navy.yaml
index a885cb9c..693d52ed 100644
--- a/resources/units/unit_groups/Chinese-Navy.yaml
+++ b/resources/units/unit_groups/Chinese-Navy.yaml
@@ -7,4 +7,4 @@ ship_units:
   - Type 052B Destroyer
   - Type 054A Frigate
 templates:
-  - Chinese Navy
\ No newline at end of file
+  - Naval Group
\ No newline at end of file
diff --git a/resources/units/unit_groups/Russian-Navy.yaml b/resources/units/unit_groups/Russian-Navy.yaml
index 1475ba43..278a5933 100644
--- a/resources/units/unit_groups/Russian-Navy.yaml
+++ b/resources/units/unit_groups/Russian-Navy.yaml
@@ -9,4 +9,4 @@ ship_units:
   - Frigate 1135M Rezky
   - Cruiser 1164 Moskva
 templates:
-  - Russian Navy
\ No newline at end of file
+  - Naval Group
\ No newline at end of file
diff --git a/resources/units/unit_groups/SA-10.yaml b/resources/units/unit_groups/SA-10.yaml
index 2970b545..086fec46 100644
--- a/resources/units/unit_groups/SA-10.yaml
+++ b/resources/units/unit_groups/SA-10.yaml
@@ -10,4 +10,4 @@ ground_units:
   - SAM SA-10 S-300 "Grumble" TEL D
   - SAM SA-10 S-300 "Grumble" TEL C
 templates:
-  - SA-10/S-300PS Battery
\ No newline at end of file
+  - S-300 Site
\ No newline at end of file
diff --git a/resources/units/unit_groups/SA-10B.yaml b/resources/units/unit_groups/SA-10B.yaml
index a56e12f6..1696919d 100644
--- a/resources/units/unit_groups/SA-10B.yaml
+++ b/resources/units/unit_groups/SA-10B.yaml
@@ -10,4 +10,4 @@ ground_units:
   - SAM SA-10B S-300PS 5P85SE LN
   - SAM SA-10B S-300PS 5P85SU LN
 templates:
-  - SA-10/S-300PS Battery
\ No newline at end of file
+  - S-300 Site
\ No newline at end of file
diff --git a/resources/units/unit_groups/SA-12.yaml b/resources/units/unit_groups/SA-12.yaml
index d89c57cd..266d60eb 100644
--- a/resources/units/unit_groups/SA-12.yaml
+++ b/resources/units/unit_groups/SA-12.yaml
@@ -10,4 +10,4 @@ ground_units:
   - SAM SA-12 S-300V 9A82 LN
   - SAM SA-12 S-300V 9A83 LN
 templates:
-  - SA-12/S-300V Battery
\ No newline at end of file
+  - S-300 Site
\ No newline at end of file
diff --git a/resources/units/unit_groups/SA-20.yaml b/resources/units/unit_groups/SA-20.yaml
index 3085716b..bd6313ef 100644
--- a/resources/units/unit_groups/SA-20.yaml
+++ b/resources/units/unit_groups/SA-20.yaml
@@ -10,4 +10,4 @@ ground_units:
   - SAM SA-20 S-300PMU1 LN 5P85CE
   - SAM SA-20 S-300PMU1 LN 5P85DE
 templates:
-  - SA-20/S-300PMU-1 Battery
\ No newline at end of file
+  - S-300 Site
\ No newline at end of file
diff --git a/resources/units/unit_groups/SA-20B.yaml b/resources/units/unit_groups/SA-20B.yaml
index 5176786b..23032287 100644
--- a/resources/units/unit_groups/SA-20B.yaml
+++ b/resources/units/unit_groups/SA-20B.yaml
@@ -9,4 +9,4 @@ ground_units:
   - SAM SA-20B S-300PMU2 TR 92H6E(truck)
   - SAM SA-20B S-300PMU2 LN 5P85SE2
 templates:
-  - SA-20B/S-300PMU-2 Battery
\ No newline at end of file
+  - S-300 Site
\ No newline at end of file
diff --git a/resources/units/unit_groups/SA-23.yaml b/resources/units/unit_groups/SA-23.yaml
index ed5a75bc..e4f880bd 100644
--- a/resources/units/unit_groups/SA-23.yaml
+++ b/resources/units/unit_groups/SA-23.yaml
@@ -10,4 +10,4 @@ ground_units:
   - SAM SA-23 S-300VM 9A82ME LN
   - SAM SA-23 S-300VM 9A83ME LN
 templates:
-  - SA-23/S-300VM Battery
\ No newline at end of file
+  - S-300 Site
\ No newline at end of file