From 3b437f56df062b2b4c9abd6f2faf57b5181abd0c Mon Sep 17 00:00:00 2001
From: brutzman <brutzman@nps.edu>
Date: Sun, 3 Apr 2022 18:48:33 -0700
Subject: [PATCH] latest build

---
 .../land/CSSC5YJ16C101Sapleslauncher.java     | 49 ------------------
 .../land/CSSC6HY3Sawhorselauncher.java        | 49 ------------------
 .../land/CSSC7HY4Sadsacklauncher.java         | 49 ------------------
 .../chn/platform/land/DF15M9launcher.java     | 49 ------------------
 .../HQ16TrackingandGuidanceRADARVehicle.java  |  6 +--
 ... HQ16TrackingandGuidanceRadarVehicle.java} | 28 +++++------
 .../platform/land/SY1StyxASCMlauncher.java    | 49 ------------------
 .../land/YJ1C802CSSN8SaccadeASCMlauncher.java | 49 ------------------
 .../platform/land/Leopard2improvedMBT.java    | 49 ------------------
 .../dnk/platform/surface/Absalonclass.java    | 49 ------------------
 .../fra/platform/land/AMX10RCarmoredcar.java  | 49 ------------------
 .../land/SSM1A1Btype8890launcher.java         | 49 ------------------
 .../rus/platform/land/DKVDecontruck.java      | 50 -------------------
 .../platform/land/GAZ664x42000kgtruck.java    | 49 ------------------
 .../rus/platform/land/GAZ66Commandvan.java    | 50 -------------------
 .../rus/platform/land/GAZ66Signalsvan.java    | 50 -------------------
 .../platform/land/FMCM113APCambulance.java    | 49 ------------------
 .../land/M1059smokegeneratingsystem.java      | 49 ------------------
 ...M1129StrykerMortarCarrierw120mmmortar.java | 50 -------------------
 .../platform/land/M113A2recoveryvehicle.java  | 49 ------------------
 .../land/M113M113A1M113A2bulldozer.java       | 49 ------------------
 .../usa/platform/land/M48tractortruck.java    | 50 -------------------
 .../usa/platform/land/M49fueltanker.java      | 50 -------------------
 .../land/M577M577A1M577A2commandpost.java     | 49 ------------------
 .../land/M578lightarmoredrecoveryvehicle.java | 49 ------------------
 .../land/M728combatengineervehicle.java       | 49 ------------------
 .../land/M88mediumrecoveryvehicle.java        | 49 ------------------
 .../entities/usa/platform/land/M977cargo.java | 50 -------------------
 .../usa/platform/land/M978fuelservicing.java  | 50 -------------------
 .../usa/platform/land/M983tractor.java        | 50 -------------------
 .../platform/land/M984A1M984E1wrecker.java    | 50 -------------------
 .../entities/usa/platform/land/M985cargo.java | 50 -------------------
 .../land/M9armoredcombatearthmover.java       | 49 ------------------
 .../land/StretchedM577A2E2commandpost.java    | 49 ------------------
 .../usa/platform/land/Toolspartstrailer.java  | 49 ------------------
 .../usa/platform/land/Weldingtrailer.java     | 49 ------------------
 src/overview.html                             | 10 ++--
 37 files changed, 22 insertions(+), 1699 deletions(-)
 delete mode 100644 src-generated/edu/nps/moves/dis7/entities/chn/platform/land/CSSC5YJ16C101Sapleslauncher.java
 delete mode 100644 src-generated/edu/nps/moves/dis7/entities/chn/platform/land/CSSC6HY3Sawhorselauncher.java
 delete mode 100644 src-generated/edu/nps/moves/dis7/entities/chn/platform/land/CSSC7HY4Sadsacklauncher.java
 delete mode 100644 src-generated/edu/nps/moves/dis7/entities/chn/platform/land/DF15M9launcher.java
 rename src-generated/edu/nps/moves/dis7/entities/chn/platform/land/{PL9SAMSystemquadrail.java => HQ16TrackingandGuidanceRadarVehicle.java} (54%)
 delete mode 100644 src-generated/edu/nps/moves/dis7/entities/chn/platform/land/SY1StyxASCMlauncher.java
 delete mode 100644 src-generated/edu/nps/moves/dis7/entities/chn/platform/land/YJ1C802CSSN8SaccadeASCMlauncher.java
 delete mode 100644 src-generated/edu/nps/moves/dis7/entities/deu/platform/land/Leopard2improvedMBT.java
 delete mode 100644 src-generated/edu/nps/moves/dis7/entities/dnk/platform/surface/Absalonclass.java
 delete mode 100644 src-generated/edu/nps/moves/dis7/entities/fra/platform/land/AMX10RCarmoredcar.java
 delete mode 100644 src-generated/edu/nps/moves/dis7/entities/jpn/platform/land/SSM1A1Btype8890launcher.java
 delete mode 100644 src-generated/edu/nps/moves/dis7/entities/rus/platform/land/DKVDecontruck.java
 delete mode 100644 src-generated/edu/nps/moves/dis7/entities/rus/platform/land/GAZ664x42000kgtruck.java
 delete mode 100644 src-generated/edu/nps/moves/dis7/entities/rus/platform/land/GAZ66Commandvan.java
 delete mode 100644 src-generated/edu/nps/moves/dis7/entities/rus/platform/land/GAZ66Signalsvan.java
 delete mode 100644 src-generated/edu/nps/moves/dis7/entities/usa/platform/land/FMCM113APCambulance.java
 delete mode 100644 src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M1059smokegeneratingsystem.java
 delete mode 100644 src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M1129StrykerMortarCarrierw120mmmortar.java
 delete mode 100644 src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M113A2recoveryvehicle.java
 delete mode 100644 src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M113M113A1M113A2bulldozer.java
 delete mode 100644 src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M48tractortruck.java
 delete mode 100644 src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M49fueltanker.java
 delete mode 100644 src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M577M577A1M577A2commandpost.java
 delete mode 100644 src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M578lightarmoredrecoveryvehicle.java
 delete mode 100644 src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M728combatengineervehicle.java
 delete mode 100644 src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M88mediumrecoveryvehicle.java
 delete mode 100644 src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M977cargo.java
 delete mode 100644 src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M978fuelservicing.java
 delete mode 100644 src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M983tractor.java
 delete mode 100644 src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M984A1M984E1wrecker.java
 delete mode 100644 src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M985cargo.java
 delete mode 100644 src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M9armoredcombatearthmover.java
 delete mode 100644 src-generated/edu/nps/moves/dis7/entities/usa/platform/land/StretchedM577A2E2commandpost.java
 delete mode 100644 src-generated/edu/nps/moves/dis7/entities/usa/platform/land/Toolspartstrailer.java
 delete mode 100644 src-generated/edu/nps/moves/dis7/entities/usa/platform/land/Weldingtrailer.java

diff --git a/src-generated/edu/nps/moves/dis7/entities/chn/platform/land/CSSC5YJ16C101Sapleslauncher.java b/src-generated/edu/nps/moves/dis7/entities/chn/platform/land/CSSC5YJ16C101Sapleslauncher.java
deleted file mode 100644
index ef0e9330b4..0000000000
--- a/src-generated/edu/nps/moves/dis7/entities/chn/platform/land/CSSC5YJ16C101Sapleslauncher.java
+++ /dev/null
@@ -1,49 +0,0 @@
-// autogenerated using string template entitytypecommon.txt
-
-package edu.nps.moves.dis7.entities.chn.platform.land;
-
-import edu.nps.moves.dis7.pdus.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * <p> Entity class <b><code>CSSC5YJ16C101SaplesLauncher</code></b> collects multiple enumeration values together to uniquely define this entity. </p>
- * <p> <i>Usage:</i> create an instance of this class with <code>CSSC5YJ16C101SaplesLauncher.createInstance()</code> or <code>new CSSC5YJ16C101SaplesLauncher()</code>. </p>
- * <ul>
- *     <li> Country: China, Peoples Republic of (CHN) = <code>45</code>; </li>
- *     <li> Entity kind: PlatformDomain = <code>LAND</code>; </li>
- *     <li> Domain: Platform = <code>1</code>; </li>
- *     <li> Category: Self-Propelled Artillery = <code>4</code>; </li>
- *     <li> SubCategory: CSSC5YJ16C101SaplesLauncher  = <code>17</code>; </li>
- *     <li> Specific:  <code>(none)</code>; </li>
- *     <li> Entity type uid: 16901; </li>
- *     <li> Online document reference: <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/blob/master/specifications/README.md" target="_blank">SISO-REF-010-v29 (2021-05-19)</a>. </li>
- * </ul>
- * <p> Full name: edu.nps.moves.dis7.source.generator.entityTypes.GenerateEntityTypes$SubCategoryElem@516be40f. </p>
- * @see Country#CHINA_PEOPLES_REPUBLIC_OF_CHN
- * @see EntityKind#PLATFORM
- * @see Domain
- * @see PlatformDomain
- * @see Category
- * @see SelfPropelledArtillery
- * @see SubCategory
-
- */
-public final class CSSC5YJ16C101SaplesLauncher extends EntityType
-{
-    /** Default constructor */
-    public CSSC5YJ16C101SaplesLauncher()
-    {
-        setCountry(Country.CHINA_PEOPLES_REPUBLIC_OF_CHN);
-        setEntityKind(EntityKind.PLATFORM);
-        setDomain(Domain.inst(PlatformDomain.LAND));
-
-        setCategory((byte)4); // uid 16884, Self-Propelled Artillery
-        setSubCategory((byte)17); // uid 16901, CSSC-5 (YJ-16/C-101) Saples Launcher
-    }
-    /** Create a new instance of this final (unmodifiable) class
-      * @return copy of class for use as data */
-    public static CSSC5YJ16C101SaplesLauncher createInstance()
-    {
-            return new CSSC5YJ16C101SaplesLauncher();
-    }
-}
diff --git a/src-generated/edu/nps/moves/dis7/entities/chn/platform/land/CSSC6HY3Sawhorselauncher.java b/src-generated/edu/nps/moves/dis7/entities/chn/platform/land/CSSC6HY3Sawhorselauncher.java
deleted file mode 100644
index aa59073364..0000000000
--- a/src-generated/edu/nps/moves/dis7/entities/chn/platform/land/CSSC6HY3Sawhorselauncher.java
+++ /dev/null
@@ -1,49 +0,0 @@
-// autogenerated using string template entitytypecommon.txt
-
-package edu.nps.moves.dis7.entities.chn.platform.land;
-
-import edu.nps.moves.dis7.pdus.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * <p> Entity class <b><code>CSSC6HY3SawhorseLauncher</code></b> collects multiple enumeration values together to uniquely define this entity. </p>
- * <p> <i>Usage:</i> create an instance of this class with <code>CSSC6HY3SawhorseLauncher.createInstance()</code> or <code>new CSSC6HY3SawhorseLauncher()</code>. </p>
- * <ul>
- *     <li> Country: China, Peoples Republic of (CHN) = <code>45</code>; </li>
- *     <li> Entity kind: PlatformDomain = <code>LAND</code>; </li>
- *     <li> Domain: Platform = <code>1</code>; </li>
- *     <li> Category: Self-Propelled Artillery = <code>4</code>; </li>
- *     <li> SubCategory: CSSC6HY3SawhorseLauncher  = <code>18</code>; </li>
- *     <li> Specific:  <code>(none)</code>; </li>
- *     <li> Entity type uid: 16902; </li>
- *     <li> Online document reference: <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/blob/master/specifications/README.md" target="_blank">SISO-REF-010-v29 (2021-05-19)</a>. </li>
- * </ul>
- * <p> Full name: edu.nps.moves.dis7.source.generator.entityTypes.GenerateEntityTypes$SubCategoryElem@3c0a50da. </p>
- * @see Country#CHINA_PEOPLES_REPUBLIC_OF_CHN
- * @see EntityKind#PLATFORM
- * @see Domain
- * @see PlatformDomain
- * @see Category
- * @see SelfPropelledArtillery
- * @see SubCategory
-
- */
-public final class CSSC6HY3SawhorseLauncher extends EntityType
-{
-    /** Default constructor */
-    public CSSC6HY3SawhorseLauncher()
-    {
-        setCountry(Country.CHINA_PEOPLES_REPUBLIC_OF_CHN);
-        setEntityKind(EntityKind.PLATFORM);
-        setDomain(Domain.inst(PlatformDomain.LAND));
-
-        setCategory((byte)4); // uid 16884, Self-Propelled Artillery
-        setSubCategory((byte)18); // uid 16902, CSSC-6 (HY-3) Sawhorse Launcher
-    }
-    /** Create a new instance of this final (unmodifiable) class
-      * @return copy of class for use as data */
-    public static CSSC6HY3SawhorseLauncher createInstance()
-    {
-            return new CSSC6HY3SawhorseLauncher();
-    }
-}
diff --git a/src-generated/edu/nps/moves/dis7/entities/chn/platform/land/CSSC7HY4Sadsacklauncher.java b/src-generated/edu/nps/moves/dis7/entities/chn/platform/land/CSSC7HY4Sadsacklauncher.java
deleted file mode 100644
index 75135376fb..0000000000
--- a/src-generated/edu/nps/moves/dis7/entities/chn/platform/land/CSSC7HY4Sadsacklauncher.java
+++ /dev/null
@@ -1,49 +0,0 @@
-// autogenerated using string template entitytypecommon.txt
-
-package edu.nps.moves.dis7.entities.chn.platform.land;
-
-import edu.nps.moves.dis7.pdus.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * <p> Entity class <b><code>CSSC7HY4SadsackLauncher</code></b> collects multiple enumeration values together to uniquely define this entity. </p>
- * <p> <i>Usage:</i> create an instance of this class with <code>CSSC7HY4SadsackLauncher.createInstance()</code> or <code>new CSSC7HY4SadsackLauncher()</code>. </p>
- * <ul>
- *     <li> Country: China, Peoples Republic of (CHN) = <code>45</code>; </li>
- *     <li> Entity kind: PlatformDomain = <code>LAND</code>; </li>
- *     <li> Domain: Platform = <code>1</code>; </li>
- *     <li> Category: Self-Propelled Artillery = <code>4</code>; </li>
- *     <li> SubCategory: CSSC7HY4SadsackLauncher  = <code>19</code>; </li>
- *     <li> Specific:  <code>(none)</code>; </li>
- *     <li> Entity type uid: 16903; </li>
- *     <li> Online document reference: <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/blob/master/specifications/README.md" target="_blank">SISO-REF-010-v29 (2021-05-19)</a>. </li>
- * </ul>
- * <p> Full name: edu.nps.moves.dis7.source.generator.entityTypes.GenerateEntityTypes$SubCategoryElem@646be2c3. </p>
- * @see Country#CHINA_PEOPLES_REPUBLIC_OF_CHN
- * @see EntityKind#PLATFORM
- * @see Domain
- * @see PlatformDomain
- * @see Category
- * @see SelfPropelledArtillery
- * @see SubCategory
-
- */
-public final class CSSC7HY4SadsackLauncher extends EntityType
-{
-    /** Default constructor */
-    public CSSC7HY4SadsackLauncher()
-    {
-        setCountry(Country.CHINA_PEOPLES_REPUBLIC_OF_CHN);
-        setEntityKind(EntityKind.PLATFORM);
-        setDomain(Domain.inst(PlatformDomain.LAND));
-
-        setCategory((byte)4); // uid 16884, Self-Propelled Artillery
-        setSubCategory((byte)19); // uid 16903, CSSC-7 (HY-4) Sadsack Launcher
-    }
-    /** Create a new instance of this final (unmodifiable) class
-      * @return copy of class for use as data */
-    public static CSSC7HY4SadsackLauncher createInstance()
-    {
-            return new CSSC7HY4SadsackLauncher();
-    }
-}
diff --git a/src-generated/edu/nps/moves/dis7/entities/chn/platform/land/DF15M9launcher.java b/src-generated/edu/nps/moves/dis7/entities/chn/platform/land/DF15M9launcher.java
deleted file mode 100644
index 304462e10c..0000000000
--- a/src-generated/edu/nps/moves/dis7/entities/chn/platform/land/DF15M9launcher.java
+++ /dev/null
@@ -1,49 +0,0 @@
-// autogenerated using string template entitytypecommon.txt
-
-package edu.nps.moves.dis7.entities.chn.platform.land;
-
-import edu.nps.moves.dis7.pdus.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * <p> Entity class <b><code>DF15M9Launcher</code></b> collects multiple enumeration values together to uniquely define this entity. </p>
- * <p> <i>Usage:</i> create an instance of this class with <code>DF15M9Launcher.createInstance()</code> or <code>new DF15M9Launcher()</code>. </p>
- * <ul>
- *     <li> Country: China, Peoples Republic of (CHN) = <code>45</code>; </li>
- *     <li> Entity kind: PlatformDomain = <code>LAND</code>; </li>
- *     <li> Domain: Platform = <code>1</code>; </li>
- *     <li> Category: Self-Propelled Artillery = <code>4</code>; </li>
- *     <li> SubCategory: DF15M9Launcher  = <code>16</code>; </li>
- *     <li> Specific:  <code>(none)</code>; </li>
- *     <li> Entity type uid: 16900; </li>
- *     <li> Online document reference: <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/blob/master/specifications/README.md" target="_blank">SISO-REF-010-v29 (2021-05-19)</a>. </li>
- * </ul>
- * <p> Full name: edu.nps.moves.dis7.source.generator.entityTypes.GenerateEntityTypes$SubCategoryElem@473b46c3. </p>
- * @see Country#CHINA_PEOPLES_REPUBLIC_OF_CHN
- * @see EntityKind#PLATFORM
- * @see Domain
- * @see PlatformDomain
- * @see Category
- * @see SelfPropelledArtillery
- * @see SubCategory
-
- */
-public final class DF15M9Launcher extends EntityType
-{
-    /** Default constructor */
-    public DF15M9Launcher()
-    {
-        setCountry(Country.CHINA_PEOPLES_REPUBLIC_OF_CHN);
-        setEntityKind(EntityKind.PLATFORM);
-        setDomain(Domain.inst(PlatformDomain.LAND));
-
-        setCategory((byte)4); // uid 16884, Self-Propelled Artillery
-        setSubCategory((byte)16); // uid 16900, DF-15 (M9) Launcher
-    }
-    /** Create a new instance of this final (unmodifiable) class
-      * @return copy of class for use as data */
-    public static DF15M9Launcher createInstance()
-    {
-            return new DF15M9Launcher();
-    }
-}
diff --git a/src-generated/edu/nps/moves/dis7/entities/chn/platform/land/HQ16TrackingandGuidanceRADARVehicle.java b/src-generated/edu/nps/moves/dis7/entities/chn/platform/land/HQ16TrackingandGuidanceRADARVehicle.java
index 9186beb360..3380a05aca 100644
--- a/src-generated/edu/nps/moves/dis7/entities/chn/platform/land/HQ16TrackingandGuidanceRADARVehicle.java
+++ b/src-generated/edu/nps/moves/dis7/entities/chn/platform/land/HQ16TrackingandGuidanceRADARVehicle.java
@@ -9,16 +9,16 @@ import edu.nps.moves.dis7.enumerations.*;
  * <p> Entity class <b><code>HQ16TrackingandGuidanceRadarVehicle</code></b> collects multiple enumeration values together to uniquely define this entity. </p>
  * <p> <i>Usage:</i> create an instance of this class with <code>HQ16TrackingandGuidanceRadarVehicle.createInstance()</code> or <code>new HQ16TrackingandGuidanceRadarVehicle()</code>. </p>
  * <ul>
- *     <li> Country: China, Peoples Republic of (CHN) = <code>45</code>; </li>
+ *     <li> Country: China, People's Republic of (CHN) = <code>45</code>; </li>
  *     <li> Entity kind: PlatformDomain = <code>LAND</code>; </li>
  *     <li> Domain: Platform = <code>1</code>; </li>
  *     <li> Category: Air Defense/Missile Defense Unit Equipment = <code>28</code>; </li>
  *     <li> SubCategory: HQ16SAMSystem  = <code>10</code>; </li>
  *     <li> Specific: HQ16TrackingandGuidanceRadarVehicle  = <code>3</code>; </li>
  *     <li> Entity type uid: 31930; </li>
- *     <li> Online document reference: <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/blob/master/specifications/README.md" target="_blank">SISO-REF-010-v29 (2021-05-19)</a>. </li>
+ *     <li> Online document reference: <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/blob/master/specifications/README.md" target="_blank">SISO-REF-010-v30-DRAFT-20220129-d11 (2022-01-29)</a>. </li>
  * </ul>
- * <p> Full name: edu.nps.moves.dis7.source.generator.entityTypes.GenerateEntityTypes$SpecificElem@3ee0fea4. </p>
+ * <p> Full name: edu.nps.moves.dis7.source.generator.entityTypes.GenerateEntityTypes$SpecificElem@4df50bcc. </p>
  * @see Country#CHINA_PEOPLES_REPUBLIC_OF_CHN
  * @see EntityKind#PLATFORM
  * @see Domain
diff --git a/src-generated/edu/nps/moves/dis7/entities/chn/platform/land/PL9SAMSystemquadrail.java b/src-generated/edu/nps/moves/dis7/entities/chn/platform/land/HQ16TrackingandGuidanceRadarVehicle.java
similarity index 54%
rename from src-generated/edu/nps/moves/dis7/entities/chn/platform/land/PL9SAMSystemquadrail.java
rename to src-generated/edu/nps/moves/dis7/entities/chn/platform/land/HQ16TrackingandGuidanceRadarVehicle.java
index beb6e40777..3380a05aca 100644
--- a/src-generated/edu/nps/moves/dis7/entities/chn/platform/land/PL9SAMSystemquadrail.java
+++ b/src-generated/edu/nps/moves/dis7/entities/chn/platform/land/HQ16TrackingandGuidanceRadarVehicle.java
@@ -6,19 +6,19 @@ import edu.nps.moves.dis7.pdus.*;
 import edu.nps.moves.dis7.enumerations.*;
 
 /**
- * <p> Entity class <b><code>PL9SAMSystemQuadRail</code></b> collects multiple enumeration values together to uniquely define this entity. </p>
- * <p> <i>Usage:</i> create an instance of this class with <code>PL9SAMSystemQuadRail.createInstance()</code> or <code>new PL9SAMSystemQuadRail()</code>. </p>
+ * <p> Entity class <b><code>HQ16TrackingandGuidanceRadarVehicle</code></b> collects multiple enumeration values together to uniquely define this entity. </p>
+ * <p> <i>Usage:</i> create an instance of this class with <code>HQ16TrackingandGuidanceRadarVehicle.createInstance()</code> or <code>new HQ16TrackingandGuidanceRadarVehicle()</code>. </p>
  * <ul>
- *     <li> Country: China, Peoples Republic of (CHN) = <code>45</code>; </li>
+ *     <li> Country: China, People's Republic of (CHN) = <code>45</code>; </li>
  *     <li> Entity kind: PlatformDomain = <code>LAND</code>; </li>
  *     <li> Domain: Platform = <code>1</code>; </li>
  *     <li> Category: Air Defense/Missile Defense Unit Equipment = <code>28</code>; </li>
- *     <li> SubCategory: SelfPropelledVSHORADGunMissileSystem  = <code>4</code>; </li>
- *     <li> Specific: PL9SAMSystemQuadRail  = <code>1</code>; </li>
- *     <li> Entity type uid: 16956; </li>
- *     <li> Online document reference: <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/blob/master/specifications/README.md" target="_blank">SISO-REF-010-v29 (2021-05-19)</a>. </li>
+ *     <li> SubCategory: HQ16SAMSystem  = <code>10</code>; </li>
+ *     <li> Specific: HQ16TrackingandGuidanceRadarVehicle  = <code>3</code>; </li>
+ *     <li> Entity type uid: 31930; </li>
+ *     <li> Online document reference: <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/blob/master/specifications/README.md" target="_blank">SISO-REF-010-v30-DRAFT-20220129-d11 (2022-01-29)</a>. </li>
  * </ul>
- * <p> Full name: edu.nps.moves.dis7.source.generator.entityTypes.GenerateEntityTypes$SpecificElem@534df152. </p>
+ * <p> Full name: edu.nps.moves.dis7.source.generator.entityTypes.GenerateEntityTypes$SpecificElem@4df50bcc. </p>
  * @see Country#CHINA_PEOPLES_REPUBLIC_OF_CHN
  * @see EntityKind#PLATFORM
  * @see Domain
@@ -28,23 +28,23 @@ import edu.nps.moves.dis7.enumerations.*;
  * @see SubCategory
 
  */
-public final class PL9SAMSystemQuadRail extends EntityType
+public final class HQ16TrackingandGuidanceRadarVehicle extends EntityType
 {
     /** Default constructor */
-    public PL9SAMSystemQuadRail()
+    public HQ16TrackingandGuidanceRadarVehicle()
     {
         setCountry(Country.CHINA_PEOPLES_REPUBLIC_OF_CHN);
         setEntityKind(EntityKind.PLATFORM);
         setDomain(Domain.inst(PlatformDomain.LAND));
 
         setCategory((byte)28); // uid 16937, Air Defense/Missile Defense Unit Equipment
-        setSubCategory((byte)4); // uid 16955, Self-Propelled VSHORAD Gun/Missile System
-        setSpecific((byte)1); // uid 16956, PL-9 SAM System (Quad Rail)
+        setSubCategory((byte)10); // uid 31927, HQ-16 SAM System
+        setSpecific((byte)3); // uid 31930, HQ-16 Tracking and Guidance Radar Vehicle
     }
     /** Create a new instance of this final (unmodifiable) class
       * @return copy of class for use as data */
-    public static PL9SAMSystemQuadRail createInstance()
+    public static HQ16TrackingandGuidanceRadarVehicle createInstance()
     {
-            return new PL9SAMSystemQuadRail();
+            return new HQ16TrackingandGuidanceRadarVehicle();
     }
 }
diff --git a/src-generated/edu/nps/moves/dis7/entities/chn/platform/land/SY1StyxASCMlauncher.java b/src-generated/edu/nps/moves/dis7/entities/chn/platform/land/SY1StyxASCMlauncher.java
deleted file mode 100644
index 2bee40b573..0000000000
--- a/src-generated/edu/nps/moves/dis7/entities/chn/platform/land/SY1StyxASCMlauncher.java
+++ /dev/null
@@ -1,49 +0,0 @@
-// autogenerated using string template entitytypecommon.txt
-
-package edu.nps.moves.dis7.entities.chn.platform.land;
-
-import edu.nps.moves.dis7.pdus.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * <p> Entity class <b><code>SY1StyxASCMLauncher</code></b> collects multiple enumeration values together to uniquely define this entity. </p>
- * <p> <i>Usage:</i> create an instance of this class with <code>SY1StyxASCMLauncher.createInstance()</code> or <code>new SY1StyxASCMLauncher()</code>. </p>
- * <ul>
- *     <li> Country: China, Peoples Republic of (CHN) = <code>45</code>; </li>
- *     <li> Entity kind: PlatformDomain = <code>LAND</code>; </li>
- *     <li> Domain: Platform = <code>1</code>; </li>
- *     <li> Category: Self-Propelled Artillery = <code>4</code>; </li>
- *     <li> SubCategory: SY1StyxASCMLauncher  = <code>13</code>; </li>
- *     <li> Specific:  <code>(none)</code>; </li>
- *     <li> Entity type uid: 16897; </li>
- *     <li> Online document reference: <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/blob/master/specifications/README.md" target="_blank">SISO-REF-010-v29 (2021-05-19)</a>. </li>
- * </ul>
- * <p> Full name: edu.nps.moves.dis7.source.generator.entityTypes.GenerateEntityTypes$SubCategoryElem@146044d7. </p>
- * @see Country#CHINA_PEOPLES_REPUBLIC_OF_CHN
- * @see EntityKind#PLATFORM
- * @see Domain
- * @see PlatformDomain
- * @see Category
- * @see SelfPropelledArtillery
- * @see SubCategory
-
- */
-public final class SY1StyxASCMLauncher extends EntityType
-{
-    /** Default constructor */
-    public SY1StyxASCMLauncher()
-    {
-        setCountry(Country.CHINA_PEOPLES_REPUBLIC_OF_CHN);
-        setEntityKind(EntityKind.PLATFORM);
-        setDomain(Domain.inst(PlatformDomain.LAND));
-
-        setCategory((byte)4); // uid 16884, Self-Propelled Artillery
-        setSubCategory((byte)13); // uid 16897, SY-1 (Styx) ASCM Launcher
-    }
-    /** Create a new instance of this final (unmodifiable) class
-      * @return copy of class for use as data */
-    public static SY1StyxASCMLauncher createInstance()
-    {
-            return new SY1StyxASCMLauncher();
-    }
-}
diff --git a/src-generated/edu/nps/moves/dis7/entities/chn/platform/land/YJ1C802CSSN8SaccadeASCMlauncher.java b/src-generated/edu/nps/moves/dis7/entities/chn/platform/land/YJ1C802CSSN8SaccadeASCMlauncher.java
deleted file mode 100644
index f651fa8562..0000000000
--- a/src-generated/edu/nps/moves/dis7/entities/chn/platform/land/YJ1C802CSSN8SaccadeASCMlauncher.java
+++ /dev/null
@@ -1,49 +0,0 @@
-// autogenerated using string template entitytypecommon.txt
-
-package edu.nps.moves.dis7.entities.chn.platform.land;
-
-import edu.nps.moves.dis7.pdus.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * <p> Entity class <b><code>YJ1C802CSSN8SaccadeASCMLauncher</code></b> collects multiple enumeration values together to uniquely define this entity. </p>
- * <p> <i>Usage:</i> create an instance of this class with <code>YJ1C802CSSN8SaccadeASCMLauncher.createInstance()</code> or <code>new YJ1C802CSSN8SaccadeASCMLauncher()</code>. </p>
- * <ul>
- *     <li> Country: China, Peoples Republic of (CHN) = <code>45</code>; </li>
- *     <li> Entity kind: PlatformDomain = <code>LAND</code>; </li>
- *     <li> Domain: Platform = <code>1</code>; </li>
- *     <li> Category: Self-Propelled Artillery = <code>4</code>; </li>
- *     <li> SubCategory: YJ1C802CSSN8SaccadeASCMLauncher  = <code>14</code>; </li>
- *     <li> Specific:  <code>(none)</code>; </li>
- *     <li> Entity type uid: 16898; </li>
- *     <li> Online document reference: <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/blob/master/specifications/README.md" target="_blank">SISO-REF-010-v29 (2021-05-19)</a>. </li>
- * </ul>
- * <p> Full name: edu.nps.moves.dis7.source.generator.entityTypes.GenerateEntityTypes$SubCategoryElem@1e9e725a. </p>
- * @see Country#CHINA_PEOPLES_REPUBLIC_OF_CHN
- * @see EntityKind#PLATFORM
- * @see Domain
- * @see PlatformDomain
- * @see Category
- * @see SelfPropelledArtillery
- * @see SubCategory
-
- */
-public final class YJ1C802CSSN8SaccadeASCMLauncher extends EntityType
-{
-    /** Default constructor */
-    public YJ1C802CSSN8SaccadeASCMLauncher()
-    {
-        setCountry(Country.CHINA_PEOPLES_REPUBLIC_OF_CHN);
-        setEntityKind(EntityKind.PLATFORM);
-        setDomain(Domain.inst(PlatformDomain.LAND));
-
-        setCategory((byte)4); // uid 16884, Self-Propelled Artillery
-        setSubCategory((byte)14); // uid 16898, YJ-1/C-802/CSS-N-8 Saccade ASCM Launcher
-    }
-    /** Create a new instance of this final (unmodifiable) class
-      * @return copy of class for use as data */
-    public static YJ1C802CSSN8SaccadeASCMLauncher createInstance()
-    {
-            return new YJ1C802CSSN8SaccadeASCMLauncher();
-    }
-}
diff --git a/src-generated/edu/nps/moves/dis7/entities/deu/platform/land/Leopard2improvedMBT.java b/src-generated/edu/nps/moves/dis7/entities/deu/platform/land/Leopard2improvedMBT.java
deleted file mode 100644
index 240a01aef8..0000000000
--- a/src-generated/edu/nps/moves/dis7/entities/deu/platform/land/Leopard2improvedMBT.java
+++ /dev/null
@@ -1,49 +0,0 @@
-// autogenerated using string template entitytypecommon.txt
-
-package edu.nps.moves.dis7.entities.deu.platform.land;
-
-import edu.nps.moves.dis7.pdus.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * <p> Entity class <b><code>Leopard2ImprovedMBT</code></b> collects multiple enumeration values together to uniquely define this entity. </p>
- * <p> <i>Usage:</i> create an instance of this class with <code>Leopard2ImprovedMBT.createInstance()</code> or <code>new Leopard2ImprovedMBT()</code>. </p>
- * <ul>
- *     <li> Country: Germany (DEU) = <code>78</code>; </li>
- *     <li> Entity kind: PlatformDomain = <code>LAND</code>; </li>
- *     <li> Domain: Platform = <code>1</code>; </li>
- *     <li> Category: Tank = <code>1</code>; </li>
- *     <li> SubCategory: Leopard2ImprovedMBT  = <code>3</code>; </li>
- *     <li> Specific:  <code>(none)</code>; </li>
- *     <li> Entity type uid: 16248; </li>
- *     <li> Online document reference: <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/blob/master/specifications/README.md" target="_blank">SISO-REF-010-v29 (2021-05-19)</a>. </li>
- * </ul>
- * <p> Full name: edu.nps.moves.dis7.source.generator.entityTypes.GenerateEntityTypes$SubCategoryElem@1787bc24. </p>
- * @see Country#GERMANY_DEU
- * @see EntityKind#PLATFORM
- * @see Domain
- * @see PlatformDomain
- * @see Category
- * @see Tank
- * @see SubCategory
-
- */
-public final class Leopard2ImprovedMBT extends EntityType
-{
-    /** Default constructor */
-    public Leopard2ImprovedMBT()
-    {
-        setCountry(Country.GERMANY_DEU);
-        setEntityKind(EntityKind.PLATFORM);
-        setDomain(Domain.inst(PlatformDomain.LAND));
-
-        setCategory((byte)1); // uid 16240, Tank
-        setSubCategory((byte)3); // uid 16248, Leopard 2 (Improved) MBT
-    }
-    /** Create a new instance of this final (unmodifiable) class
-      * @return copy of class for use as data */
-    public static Leopard2ImprovedMBT createInstance()
-    {
-            return new Leopard2ImprovedMBT();
-    }
-}
diff --git a/src-generated/edu/nps/moves/dis7/entities/dnk/platform/surface/Absalonclass.java b/src-generated/edu/nps/moves/dis7/entities/dnk/platform/surface/Absalonclass.java
deleted file mode 100644
index d47e8d15cd..0000000000
--- a/src-generated/edu/nps/moves/dis7/entities/dnk/platform/surface/Absalonclass.java
+++ /dev/null
@@ -1,49 +0,0 @@
-// autogenerated using string template entitytypecommon.txt
-
-package edu.nps.moves.dis7.entities.dnk.platform.surface;
-
-import edu.nps.moves.dis7.pdus.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * <p> Entity class <b><code>AbsalonClass</code></b> collects multiple enumeration values together to uniquely define this entity. </p>
- * <p> <i>Usage:</i> create an instance of this class with <code>AbsalonClass.createInstance()</code> or <code>new AbsalonClass()</code>. </p>
- * <ul>
- *     <li> Country: Denmark (DNK) = <code>57</code>; </li>
- *     <li> Entity kind: PlatformDomain = <code>SURFACE</code>; </li>
- *     <li> Domain: Platform = <code>1</code>; </li>
- *     <li> Category: Guided Missile Frigate (FFG) = <code>6</code>; </li>
- *     <li> SubCategory: AbsalonClass  = <code>2</code>; </li>
- *     <li> Specific:  <code>(none)</code>; </li>
- *     <li> Entity type uid: 34192; </li>
- *     <li> Online document reference: <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/blob/master/specifications/README.md" target="_blank">SISO-REF-010-v29 (2021-05-19)</a>. </li>
- * </ul>
- * <p> Full name: edu.nps.moves.dis7.source.generator.entityTypes.GenerateEntityTypes$SubCategoryElem@32910148. </p>
- * @see Country#ACTION_RESPONSE_RELIABLE
- * @see EntityKind#PLATFORM
- * @see Domain
- * @see PlatformDomain
- * @see Category
- * @see GuidedMissileFrigateFFG
- * @see SubCategory
-
- */
-public final class AbsalonClass extends EntityType
-{
-    /** Default constructor */
-    public AbsalonClass()
-    {
-        setCountry(Country.ACTION_RESPONSE_RELIABLE);
-        setEntityKind(EntityKind.PLATFORM);
-        setDomain(Domain.inst(PlatformDomain.SURFACE));
-
-        setCategory((byte)6); // uid 25430, Guided Missile Frigate (FFG)
-        setSubCategory((byte)2); // uid 34192, Absalon Class
-    }
-    /** Create a new instance of this final (unmodifiable) class
-      * @return copy of class for use as data */
-    public static AbsalonClass createInstance()
-    {
-            return new AbsalonClass();
-    }
-}
diff --git a/src-generated/edu/nps/moves/dis7/entities/fra/platform/land/AMX10RCarmoredcar.java b/src-generated/edu/nps/moves/dis7/entities/fra/platform/land/AMX10RCarmoredcar.java
deleted file mode 100644
index 6f0b818bc6..0000000000
--- a/src-generated/edu/nps/moves/dis7/entities/fra/platform/land/AMX10RCarmoredcar.java
+++ /dev/null
@@ -1,49 +0,0 @@
-// autogenerated using string template entitytypecommon.txt
-
-package edu.nps.moves.dis7.entities.fra.platform.land;
-
-import edu.nps.moves.dis7.pdus.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * <p> Entity class <b><code>AMX10RCArmoredCar</code></b> collects multiple enumeration values together to uniquely define this entity. </p>
- * <p> <i>Usage:</i> create an instance of this class with <code>AMX10RCArmoredCar.createInstance()</code> or <code>new AMX10RCArmoredCar()</code>. </p>
- * <ul>
- *     <li> Country: France (FRA) = <code>71</code>; </li>
- *     <li> Entity kind: PlatformDomain = <code>LAND</code>; </li>
- *     <li> Domain: Platform = <code>1</code>; </li>
- *     <li> Category: Armored Fighting Vehicle = <code>2</code>; </li>
- *     <li> SubCategory: AMX10RCArmoredCar  = <code>6</code>; </li>
- *     <li> Specific:  <code>(none)</code>; </li>
- *     <li> Entity type uid: 15651; </li>
- *     <li> Online document reference: <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/blob/master/specifications/README.md" target="_blank">SISO-REF-010-v29 (2021-05-19)</a>. </li>
- * </ul>
- * <p> Full name: edu.nps.moves.dis7.source.generator.entityTypes.GenerateEntityTypes$SubCategoryElem@a530d0a. </p>
- * @see Country#FRANCE_FRA
- * @see EntityKind#PLATFORM
- * @see Domain
- * @see PlatformDomain
- * @see Category
- * @see ArmoredFightingVehicle
- * @see SubCategory
-
- */
-public final class AMX10RCArmoredCar extends EntityType
-{
-    /** Default constructor */
-    public AMX10RCArmoredCar()
-    {
-        setCountry(Country.FRANCE_FRA);
-        setEntityKind(EntityKind.PLATFORM);
-        setDomain(Domain.inst(PlatformDomain.LAND));
-
-        setCategory((byte)2); // uid 15645, Armored Fighting Vehicle
-        setSubCategory((byte)6); // uid 15651, AMX-10RC Armored Car
-    }
-    /** Create a new instance of this final (unmodifiable) class
-      * @return copy of class for use as data */
-    public static AMX10RCArmoredCar createInstance()
-    {
-            return new AMX10RCArmoredCar();
-    }
-}
diff --git a/src-generated/edu/nps/moves/dis7/entities/jpn/platform/land/SSM1A1Btype8890launcher.java b/src-generated/edu/nps/moves/dis7/entities/jpn/platform/land/SSM1A1Btype8890launcher.java
deleted file mode 100644
index f78d51f075..0000000000
--- a/src-generated/edu/nps/moves/dis7/entities/jpn/platform/land/SSM1A1Btype8890launcher.java
+++ /dev/null
@@ -1,49 +0,0 @@
-// autogenerated using string template entitytypecommon.txt
-
-package edu.nps.moves.dis7.entities.jpn.platform.land;
-
-import edu.nps.moves.dis7.pdus.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * <p> Entity class <b><code>SSM1A1BType8890Launcher</code></b> collects multiple enumeration values together to uniquely define this entity. </p>
- * <p> <i>Usage:</i> create an instance of this class with <code>SSM1A1BType8890Launcher.createInstance()</code> or <code>new SSM1A1BType8890Launcher()</code>. </p>
- * <ul>
- *     <li> Country: Japan (JPN) = <code>110</code>; </li>
- *     <li> Entity kind: PlatformDomain = <code>LAND</code>; </li>
- *     <li> Domain: Platform = <code>1</code>; </li>
- *     <li> Category: Self-Propelled Artillery = <code>4</code>; </li>
- *     <li> SubCategory: SSM1A1BType8890Launcher  = <code>1</code>; </li>
- *     <li> Specific:  <code>(none)</code>; </li>
- *     <li> Entity type uid: 18884; </li>
- *     <li> Online document reference: <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/blob/master/specifications/README.md" target="_blank">SISO-REF-010-v29 (2021-05-19)</a>. </li>
- * </ul>
- * <p> Full name: edu.nps.moves.dis7.source.generator.entityTypes.GenerateEntityTypes$SubCategoryElem@1fc0053e. </p>
- * @see Country#JAPAN_JPN
- * @see EntityKind#PLATFORM
- * @see Domain
- * @see PlatformDomain
- * @see Category
- * @see SelfPropelledArtillery
- * @see SubCategory
-
- */
-public final class SSM1A1BType8890Launcher extends EntityType
-{
-    /** Default constructor */
-    public SSM1A1BType8890Launcher()
-    {
-        setCountry(Country.JAPAN_JPN);
-        setEntityKind(EntityKind.PLATFORM);
-        setDomain(Domain.inst(PlatformDomain.LAND));
-
-        setCategory((byte)4); // uid 18883, Self-Propelled Artillery
-        setSubCategory((byte)1); // uid 18884, SSM-1A/1B (Type 88/90) Launcher
-    }
-    /** Create a new instance of this final (unmodifiable) class
-      * @return copy of class for use as data */
-    public static SSM1A1BType8890Launcher createInstance()
-    {
-            return new SSM1A1BType8890Launcher();
-    }
-}
diff --git a/src-generated/edu/nps/moves/dis7/entities/rus/platform/land/DKVDecontruck.java b/src-generated/edu/nps/moves/dis7/entities/rus/platform/land/DKVDecontruck.java
deleted file mode 100644
index 35e91758c9..0000000000
--- a/src-generated/edu/nps/moves/dis7/entities/rus/platform/land/DKVDecontruck.java
+++ /dev/null
@@ -1,50 +0,0 @@
-// autogenerated using string template entitytypecommon.txt
-
-package edu.nps.moves.dis7.entities.rus.platform.land;
-
-import edu.nps.moves.dis7.pdus.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * <p> Entity class <b><code>DKVDeconTruck</code></b> collects multiple enumeration values together to uniquely define this entity. </p>
- * <p> <i>Usage:</i> create an instance of this class with <code>DKVDeconTruck.createInstance()</code> or <code>new DKVDeconTruck()</code>. </p>
- * <ul>
- *     <li> Country: Russia (RUS) = <code>222</code>; </li>
- *     <li> Entity kind: PlatformDomain = <code>LAND</code>; </li>
- *     <li> Domain: Platform = <code>1</code>; </li>
- *     <li> Category: Large Wheeled Utility Vehicle = <code>7</code>; </li>
- *     <li> SubCategory: GAZ664x42000kgTruck  = <code>8</code>; </li>
- *     <li> Specific: DKVDeconTruck  = <code>3</code>; </li>
- *     <li> Entity type uid: 12887; </li>
- *     <li> Online document reference: <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/blob/master/specifications/README.md" target="_blank">SISO-REF-010-v29 (2021-05-19)</a>. </li>
- * </ul>
- * <p> Full name: edu.nps.moves.dis7.source.generator.entityTypes.GenerateEntityTypes$SpecificElem@3bb8aabc. </p>
- * @see Country#RUSSIA_RUS
- * @see EntityKind#PLATFORM
- * @see Domain
- * @see PlatformDomain
- * @see Category
- * @see LargeWheeledUtilityVehicle
- * @see SubCategory
-
- */
-public final class DKVDeconTruck extends EntityType
-{
-    /** Default constructor */
-    public DKVDeconTruck()
-    {
-        setCountry(Country.RUSSIA_RUS);
-        setEntityKind(EntityKind.PLATFORM);
-        setDomain(Domain.inst(PlatformDomain.LAND));
-
-        setCategory((byte)7); // uid 12867, Large Wheeled Utility Vehicle
-        setSubCategory((byte)8); // uid 12884, GAZ-66 4x4 2000-kg Truck
-        setSpecific((byte)3); // uid 12887, DKV Decon Truck
-    }
-    /** Create a new instance of this final (unmodifiable) class
-      * @return copy of class for use as data */
-    public static DKVDeconTruck createInstance()
-    {
-            return new DKVDeconTruck();
-    }
-}
diff --git a/src-generated/edu/nps/moves/dis7/entities/rus/platform/land/GAZ664x42000kgtruck.java b/src-generated/edu/nps/moves/dis7/entities/rus/platform/land/GAZ664x42000kgtruck.java
deleted file mode 100644
index 3e3b15ff6b..0000000000
--- a/src-generated/edu/nps/moves/dis7/entities/rus/platform/land/GAZ664x42000kgtruck.java
+++ /dev/null
@@ -1,49 +0,0 @@
-// autogenerated using string template entitytypecommon.txt
-
-package edu.nps.moves.dis7.entities.rus.platform.land;
-
-import edu.nps.moves.dis7.pdus.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * <p> Entity class <b><code>GAZ664x42000kgTruck</code></b> collects multiple enumeration values together to uniquely define this entity. </p>
- * <p> <i>Usage:</i> create an instance of this class with <code>GAZ664x42000kgTruck.createInstance()</code> or <code>new GAZ664x42000kgTruck()</code>. </p>
- * <ul>
- *     <li> Country: Russia (RUS) = <code>222</code>; </li>
- *     <li> Entity kind: PlatformDomain = <code>LAND</code>; </li>
- *     <li> Domain: Platform = <code>1</code>; </li>
- *     <li> Category: Large Wheeled Utility Vehicle = <code>7</code>; </li>
- *     <li> SubCategory: GAZ664x42000kgTruck  = <code>8</code>; </li>
- *     <li> Specific:  <code>(none)</code>; </li>
- *     <li> Entity type uid: 12884; </li>
- *     <li> Online document reference: <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/blob/master/specifications/README.md" target="_blank">SISO-REF-010-v29 (2021-05-19)</a>. </li>
- * </ul>
- * <p> Full name: edu.nps.moves.dis7.source.generator.entityTypes.GenerateEntityTypes$SubCategoryElem@44cb460e. </p>
- * @see Country#RUSSIA_RUS
- * @see EntityKind#PLATFORM
- * @see Domain
- * @see PlatformDomain
- * @see Category
- * @see LargeWheeledUtilityVehicle
- * @see SubCategory
-
- */
-public final class GAZ664x42000kgTruck extends EntityType
-{
-    /** Default constructor */
-    public GAZ664x42000kgTruck()
-    {
-        setCountry(Country.RUSSIA_RUS);
-        setEntityKind(EntityKind.PLATFORM);
-        setDomain(Domain.inst(PlatformDomain.LAND));
-
-        setCategory((byte)7); // uid 12867, Large Wheeled Utility Vehicle
-        setSubCategory((byte)8); // uid 12884, GAZ-66 4x4 2000-kg Truck
-    }
-    /** Create a new instance of this final (unmodifiable) class
-      * @return copy of class for use as data */
-    public static GAZ664x42000kgTruck createInstance()
-    {
-            return new GAZ664x42000kgTruck();
-    }
-}
diff --git a/src-generated/edu/nps/moves/dis7/entities/rus/platform/land/GAZ66Commandvan.java b/src-generated/edu/nps/moves/dis7/entities/rus/platform/land/GAZ66Commandvan.java
deleted file mode 100644
index cc0cc284a3..0000000000
--- a/src-generated/edu/nps/moves/dis7/entities/rus/platform/land/GAZ66Commandvan.java
+++ /dev/null
@@ -1,50 +0,0 @@
-// autogenerated using string template entitytypecommon.txt
-
-package edu.nps.moves.dis7.entities.rus.platform.land;
-
-import edu.nps.moves.dis7.pdus.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * <p> Entity class <b><code>GAZ66CommandVan</code></b> collects multiple enumeration values together to uniquely define this entity. </p>
- * <p> <i>Usage:</i> create an instance of this class with <code>GAZ66CommandVan.createInstance()</code> or <code>new GAZ66CommandVan()</code>. </p>
- * <ul>
- *     <li> Country: Russia (RUS) = <code>222</code>; </li>
- *     <li> Entity kind: PlatformDomain = <code>LAND</code>; </li>
- *     <li> Domain: Platform = <code>1</code>; </li>
- *     <li> Category: Large Wheeled Utility Vehicle = <code>7</code>; </li>
- *     <li> SubCategory: GAZ664x42000kgTruck  = <code>8</code>; </li>
- *     <li> Specific: GAZ66CommandVan  = <code>2</code>; </li>
- *     <li> Entity type uid: 12886; </li>
- *     <li> Online document reference: <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/blob/master/specifications/README.md" target="_blank">SISO-REF-010-v29 (2021-05-19)</a>. </li>
- * </ul>
- * <p> Full name: edu.nps.moves.dis7.source.generator.entityTypes.GenerateEntityTypes$SpecificElem@705f83a7. </p>
- * @see Country#RUSSIA_RUS
- * @see EntityKind#PLATFORM
- * @see Domain
- * @see PlatformDomain
- * @see Category
- * @see LargeWheeledUtilityVehicle
- * @see SubCategory
-
- */
-public final class GAZ66CommandVan extends EntityType
-{
-    /** Default constructor */
-    public GAZ66CommandVan()
-    {
-        setCountry(Country.RUSSIA_RUS);
-        setEntityKind(EntityKind.PLATFORM);
-        setDomain(Domain.inst(PlatformDomain.LAND));
-
-        setCategory((byte)7); // uid 12867, Large Wheeled Utility Vehicle
-        setSubCategory((byte)8); // uid 12884, GAZ-66 4x4 2000-kg Truck
-        setSpecific((byte)2); // uid 12886, GAZ-66 Command Van
-    }
-    /** Create a new instance of this final (unmodifiable) class
-      * @return copy of class for use as data */
-    public static GAZ66CommandVan createInstance()
-    {
-            return new GAZ66CommandVan();
-    }
-}
diff --git a/src-generated/edu/nps/moves/dis7/entities/rus/platform/land/GAZ66Signalsvan.java b/src-generated/edu/nps/moves/dis7/entities/rus/platform/land/GAZ66Signalsvan.java
deleted file mode 100644
index 18de913cea..0000000000
--- a/src-generated/edu/nps/moves/dis7/entities/rus/platform/land/GAZ66Signalsvan.java
+++ /dev/null
@@ -1,50 +0,0 @@
-// autogenerated using string template entitytypecommon.txt
-
-package edu.nps.moves.dis7.entities.rus.platform.land;
-
-import edu.nps.moves.dis7.pdus.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * <p> Entity class <b><code>GAZ66SignalsVan</code></b> collects multiple enumeration values together to uniquely define this entity. </p>
- * <p> <i>Usage:</i> create an instance of this class with <code>GAZ66SignalsVan.createInstance()</code> or <code>new GAZ66SignalsVan()</code>. </p>
- * <ul>
- *     <li> Country: Russia (RUS) = <code>222</code>; </li>
- *     <li> Entity kind: PlatformDomain = <code>LAND</code>; </li>
- *     <li> Domain: Platform = <code>1</code>; </li>
- *     <li> Category: Large Wheeled Utility Vehicle = <code>7</code>; </li>
- *     <li> SubCategory: GAZ664x42000kgTruck  = <code>8</code>; </li>
- *     <li> Specific: GAZ66SignalsVan  = <code>1</code>; </li>
- *     <li> Entity type uid: 12885; </li>
- *     <li> Online document reference: <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/blob/master/specifications/README.md" target="_blank">SISO-REF-010-v29 (2021-05-19)</a>. </li>
- * </ul>
- * <p> Full name: edu.nps.moves.dis7.source.generator.entityTypes.GenerateEntityTypes$SpecificElem@22bd2039. </p>
- * @see Country#RUSSIA_RUS
- * @see EntityKind#PLATFORM
- * @see Domain
- * @see PlatformDomain
- * @see Category
- * @see LargeWheeledUtilityVehicle
- * @see SubCategory
-
- */
-public final class GAZ66SignalsVan extends EntityType
-{
-    /** Default constructor */
-    public GAZ66SignalsVan()
-    {
-        setCountry(Country.RUSSIA_RUS);
-        setEntityKind(EntityKind.PLATFORM);
-        setDomain(Domain.inst(PlatformDomain.LAND));
-
-        setCategory((byte)7); // uid 12867, Large Wheeled Utility Vehicle
-        setSubCategory((byte)8); // uid 12884, GAZ-66 4x4 2000-kg Truck
-        setSpecific((byte)1); // uid 12885, GAZ-66 Signals Van
-    }
-    /** Create a new instance of this final (unmodifiable) class
-      * @return copy of class for use as data */
-    public static GAZ66SignalsVan createInstance()
-    {
-            return new GAZ66SignalsVan();
-    }
-}
diff --git a/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/FMCM113APCambulance.java b/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/FMCM113APCambulance.java
deleted file mode 100644
index 0683c72fb0..0000000000
--- a/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/FMCM113APCambulance.java
+++ /dev/null
@@ -1,49 +0,0 @@
-// autogenerated using string template entitytypecommon.txt
-
-package edu.nps.moves.dis7.entities.usa.platform.land;
-
-import edu.nps.moves.dis7.pdus.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * <p> Entity class <b><code>FMCM113APCAmbulance</code></b> collects multiple enumeration values together to uniquely define this entity. </p>
- * <p> <i>Usage:</i> create an instance of this class with <code>FMCM113APCAmbulance.createInstance()</code> or <code>new FMCM113APCAmbulance()</code>. </p>
- * <ul>
- *     <li> Country: United States of America (USA) = <code>225</code>; </li>
- *     <li> Entity kind: PlatformDomain = <code>LAND</code>; </li>
- *     <li> Domain: Platform = <code>1</code>; </li>
- *     <li> Category: Armored Utility Vehicle = <code>3</code>; </li>
- *     <li> SubCategory: FMCM113APCAmbulance  = <code>14</code>; </li>
- *     <li> Specific:  <code>(none)</code>; </li>
- *     <li> Entity type uid: 10258; </li>
- *     <li> Online document reference: <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/blob/master/specifications/README.md" target="_blank">SISO-REF-010-v29 (2021-05-19)</a>. </li>
- * </ul>
- * <p> Full name: edu.nps.moves.dis7.source.generator.entityTypes.GenerateEntityTypes$SubCategoryElem@41ccb3b9. </p>
- * @see Country#UNITED_STATES_OF_AMERICA_USA
- * @see EntityKind#PLATFORM
- * @see Domain
- * @see PlatformDomain
- * @see Category
- * @see ArmoredUtilityVehicle
- * @see SubCategory
-
- */
-public final class FMCM113APCAmbulance extends EntityType
-{
-    /** Default constructor */
-    public FMCM113APCAmbulance()
-    {
-        setCountry(Country.UNITED_STATES_OF_AMERICA_USA);
-        setEntityKind(EntityKind.PLATFORM);
-        setDomain(Domain.inst(PlatformDomain.LAND));
-
-        setCategory((byte)3); // uid 10233, Armored Utility Vehicle
-        setSubCategory((byte)14); // uid 10258, FMC (M113) APC Ambulance
-    }
-    /** Create a new instance of this final (unmodifiable) class
-      * @return copy of class for use as data */
-    public static FMCM113APCAmbulance createInstance()
-    {
-            return new FMCM113APCAmbulance();
-    }
-}
diff --git a/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M1059smokegeneratingsystem.java b/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M1059smokegeneratingsystem.java
deleted file mode 100644
index ab3b0ddc64..0000000000
--- a/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M1059smokegeneratingsystem.java
+++ /dev/null
@@ -1,49 +0,0 @@
-// autogenerated using string template entitytypecommon.txt
-
-package edu.nps.moves.dis7.entities.usa.platform.land;
-
-import edu.nps.moves.dis7.pdus.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * <p> Entity class <b><code>M1059SmokeGeneratingSystem</code></b> collects multiple enumeration values together to uniquely define this entity. </p>
- * <p> <i>Usage:</i> create an instance of this class with <code>M1059SmokeGeneratingSystem.createInstance()</code> or <code>new M1059SmokeGeneratingSystem()</code>. </p>
- * <ul>
- *     <li> Country: United States of America (USA) = <code>225</code>; </li>
- *     <li> Entity kind: PlatformDomain = <code>LAND</code>; </li>
- *     <li> Domain: Platform = <code>1</code>; </li>
- *     <li> Category: Armored Utility Vehicle = <code>3</code>; </li>
- *     <li> SubCategory: M1059SmokeGeneratingSystem  = <code>20</code>; </li>
- *     <li> Specific:  <code>(none)</code>; </li>
- *     <li> Entity type uid: 10264; </li>
- *     <li> Online document reference: <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/blob/master/specifications/README.md" target="_blank">SISO-REF-010-v29 (2021-05-19)</a>. </li>
- * </ul>
- * <p> Full name: edu.nps.moves.dis7.source.generator.entityTypes.GenerateEntityTypes$SubCategoryElem@64f9f455. </p>
- * @see Country#UNITED_STATES_OF_AMERICA_USA
- * @see EntityKind#PLATFORM
- * @see Domain
- * @see PlatformDomain
- * @see Category
- * @see ArmoredUtilityVehicle
- * @see SubCategory
-
- */
-public final class M1059SmokeGeneratingSystem extends EntityType
-{
-    /** Default constructor */
-    public M1059SmokeGeneratingSystem()
-    {
-        setCountry(Country.UNITED_STATES_OF_AMERICA_USA);
-        setEntityKind(EntityKind.PLATFORM);
-        setDomain(Domain.inst(PlatformDomain.LAND));
-
-        setCategory((byte)3); // uid 10233, Armored Utility Vehicle
-        setSubCategory((byte)20); // uid 10264, M1059 Smoke Generating System
-    }
-    /** Create a new instance of this final (unmodifiable) class
-      * @return copy of class for use as data */
-    public static M1059SmokeGeneratingSystem createInstance()
-    {
-            return new M1059SmokeGeneratingSystem();
-    }
-}
diff --git a/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M1129StrykerMortarCarrierw120mmmortar.java b/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M1129StrykerMortarCarrierw120mmmortar.java
deleted file mode 100644
index c381708547..0000000000
--- a/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M1129StrykerMortarCarrierw120mmmortar.java
+++ /dev/null
@@ -1,50 +0,0 @@
-// autogenerated using string template entitytypecommon.txt
-
-package edu.nps.moves.dis7.entities.usa.platform.land;
-
-import edu.nps.moves.dis7.pdus.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * <p> Entity class <b><code>M1129StrykerMortarCarrierw120mmMortar</code></b> collects multiple enumeration values together to uniquely define this entity. </p>
- * <p> <i>Usage:</i> create an instance of this class with <code>M1129StrykerMortarCarrierw120mmMortar.createInstance()</code> or <code>new M1129StrykerMortarCarrierw120mmMortar()</code>. </p>
- * <ul>
- *     <li> Country: United States of America (USA) = <code>225</code>; </li>
- *     <li> Entity kind: PlatformDomain = <code>LAND</code>; </li>
- *     <li> Domain: Platform = <code>1</code>; </li>
- *     <li> Category: Armored Fighting Vehicle = <code>2</code>; </li>
- *     <li> SubCategory: LightArmoredVehicleLAVStryker  = <code>5</code>; </li>
- *     <li> Specific: M1129StrykerMortarCarrierw120mmMortar  = <code>24</code>; </li>
- *     <li> Entity type uid: 10139; </li>
- *     <li> Online document reference: <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/blob/master/specifications/README.md" target="_blank">SISO-REF-010-v29 (2021-05-19)</a>. </li>
- * </ul>
- * <p> Full name: edu.nps.moves.dis7.source.generator.entityTypes.GenerateEntityTypes$SpecificElem@630bf683. </p>
- * @see Country#UNITED_STATES_OF_AMERICA_USA
- * @see EntityKind#PLATFORM
- * @see Domain
- * @see PlatformDomain
- * @see Category
- * @see ArmoredFightingVehicle
- * @see SubCategory
-
- */
-public final class M1129StrykerMortarCarrierw120mmMortar extends EntityType
-{
-    /** Default constructor */
-    public M1129StrykerMortarCarrierw120mmMortar()
-    {
-        setCountry(Country.UNITED_STATES_OF_AMERICA_USA);
-        setEntityKind(EntityKind.PLATFORM);
-        setDomain(Domain.inst(PlatformDomain.LAND));
-
-        setCategory((byte)2); // uid 10067, Armored Fighting Vehicle
-        setSubCategory((byte)5); // uid 10115, Light Armored Vehicle (LAV) Stryker
-        setSpecific((byte)24); // uid 10139, M1129 Stryker Mortar Carrier w/120-mm Mortar
-    }
-    /** Create a new instance of this final (unmodifiable) class
-      * @return copy of class for use as data */
-    public static M1129StrykerMortarCarrierw120mmMortar createInstance()
-    {
-            return new M1129StrykerMortarCarrierw120mmMortar();
-    }
-}
diff --git a/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M113A2recoveryvehicle.java b/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M113A2recoveryvehicle.java
deleted file mode 100644
index e5a4aa3190..0000000000
--- a/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M113A2recoveryvehicle.java
+++ /dev/null
@@ -1,49 +0,0 @@
-// autogenerated using string template entitytypecommon.txt
-
-package edu.nps.moves.dis7.entities.usa.platform.land;
-
-import edu.nps.moves.dis7.pdus.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * <p> Entity class <b><code>M113A2RecoveryVehicle</code></b> collects multiple enumeration values together to uniquely define this entity. </p>
- * <p> <i>Usage:</i> create an instance of this class with <code>M113A2RecoveryVehicle.createInstance()</code> or <code>new M113A2RecoveryVehicle()</code>. </p>
- * <ul>
- *     <li> Country: United States of America (USA) = <code>225</code>; </li>
- *     <li> Entity kind: PlatformDomain = <code>LAND</code>; </li>
- *     <li> Domain: Platform = <code>1</code>; </li>
- *     <li> Category: Armored Utility Vehicle = <code>3</code>; </li>
- *     <li> SubCategory: M113A2RecoveryVehicle  = <code>15</code>; </li>
- *     <li> Specific:  <code>(none)</code>; </li>
- *     <li> Entity type uid: 10259; </li>
- *     <li> Online document reference: <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/blob/master/specifications/README.md" target="_blank">SISO-REF-010-v29 (2021-05-19)</a>. </li>
- * </ul>
- * <p> Full name: edu.nps.moves.dis7.source.generator.entityTypes.GenerateEntityTypes$SubCategoryElem@53d9826f. </p>
- * @see Country#UNITED_STATES_OF_AMERICA_USA
- * @see EntityKind#PLATFORM
- * @see Domain
- * @see PlatformDomain
- * @see Category
- * @see ArmoredUtilityVehicle
- * @see SubCategory
-
- */
-public final class M113A2RecoveryVehicle extends EntityType
-{
-    /** Default constructor */
-    public M113A2RecoveryVehicle()
-    {
-        setCountry(Country.UNITED_STATES_OF_AMERICA_USA);
-        setEntityKind(EntityKind.PLATFORM);
-        setDomain(Domain.inst(PlatformDomain.LAND));
-
-        setCategory((byte)3); // uid 10233, Armored Utility Vehicle
-        setSubCategory((byte)15); // uid 10259, M113A2 Recovery Vehicle
-    }
-    /** Create a new instance of this final (unmodifiable) class
-      * @return copy of class for use as data */
-    public static M113A2RecoveryVehicle createInstance()
-    {
-            return new M113A2RecoveryVehicle();
-    }
-}
diff --git a/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M113M113A1M113A2bulldozer.java b/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M113M113A1M113A2bulldozer.java
deleted file mode 100644
index ad2b68c08c..0000000000
--- a/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M113M113A1M113A2bulldozer.java
+++ /dev/null
@@ -1,49 +0,0 @@
-// autogenerated using string template entitytypecommon.txt
-
-package edu.nps.moves.dis7.entities.usa.platform.land;
-
-import edu.nps.moves.dis7.pdus.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * <p> Entity class <b><code>M113M113A1M113A2Bulldozer</code></b> collects multiple enumeration values together to uniquely define this entity. </p>
- * <p> <i>Usage:</i> create an instance of this class with <code>M113M113A1M113A2Bulldozer.createInstance()</code> or <code>new M113M113A1M113A2Bulldozer()</code>. </p>
- * <ul>
- *     <li> Country: United States of America (USA) = <code>225</code>; </li>
- *     <li> Entity kind: PlatformDomain = <code>LAND</code>; </li>
- *     <li> Domain: Platform = <code>1</code>; </li>
- *     <li> Category: Armored Utility Vehicle = <code>3</code>; </li>
- *     <li> SubCategory: M113M113A1M113A2Bulldozer  = <code>10</code>; </li>
- *     <li> Specific:  <code>(none)</code>; </li>
- *     <li> Entity type uid: 10252; </li>
- *     <li> Online document reference: <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/blob/master/specifications/README.md" target="_blank">SISO-REF-010-v29 (2021-05-19)</a>. </li>
- * </ul>
- * <p> Full name: edu.nps.moves.dis7.source.generator.entityTypes.GenerateEntityTypes$SubCategoryElem@b27b210. </p>
- * @see Country#UNITED_STATES_OF_AMERICA_USA
- * @see EntityKind#PLATFORM
- * @see Domain
- * @see PlatformDomain
- * @see Category
- * @see ArmoredUtilityVehicle
- * @see SubCategory
-
- */
-public final class M113M113A1M113A2Bulldozer extends EntityType
-{
-    /** Default constructor */
-    public M113M113A1M113A2Bulldozer()
-    {
-        setCountry(Country.UNITED_STATES_OF_AMERICA_USA);
-        setEntityKind(EntityKind.PLATFORM);
-        setDomain(Domain.inst(PlatformDomain.LAND));
-
-        setCategory((byte)3); // uid 10233, Armored Utility Vehicle
-        setSubCategory((byte)10); // uid 10252, M113/M113A1/M113A2 Bulldozer
-    }
-    /** Create a new instance of this final (unmodifiable) class
-      * @return copy of class for use as data */
-    public static M113M113A1M113A2Bulldozer createInstance()
-    {
-            return new M113M113A1M113A2Bulldozer();
-    }
-}
diff --git a/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M48tractortruck.java b/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M48tractortruck.java
deleted file mode 100644
index 9e05635d8b..0000000000
--- a/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M48tractortruck.java
+++ /dev/null
@@ -1,50 +0,0 @@
-// autogenerated using string template entitytypecommon.txt
-
-package edu.nps.moves.dis7.entities.usa.platform.land;
-
-import edu.nps.moves.dis7.pdus.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * <p> Entity class <b><code>M48TractorTruck</code></b> collects multiple enumeration values together to uniquely define this entity. </p>
- * <p> <i>Usage:</i> create an instance of this class with <code>M48TractorTruck.createInstance()</code> or <code>new M48TractorTruck()</code>. </p>
- * <ul>
- *     <li> Country: United States of America (USA) = <code>225</code>; </li>
- *     <li> Entity kind: PlatformDomain = <code>LAND</code>; </li>
- *     <li> Domain: Platform = <code>1</code>; </li>
- *     <li> Category: Large Wheeled Utility Vehicle = <code>7</code>; </li>
- *     <li> SubCategory: M35M44A26x6212tonCargoTruck  = <code>1</code>; </li>
- *     <li> Specific: M48TractorTruck  = <code>10</code>; </li>
- *     <li> Entity type uid: 10429; </li>
- *     <li> Online document reference: <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/blob/master/specifications/README.md" target="_blank">SISO-REF-010-v29 (2021-05-19)</a>. </li>
- * </ul>
- * <p> Full name: edu.nps.moves.dis7.source.generator.entityTypes.GenerateEntityTypes$SpecificElem@7f353a0f. </p>
- * @see Country#UNITED_STATES_OF_AMERICA_USA
- * @see EntityKind#PLATFORM
- * @see Domain
- * @see PlatformDomain
- * @see Category
- * @see LargeWheeledUtilityVehicle
- * @see SubCategory
-
- */
-public final class M48TractorTruck extends EntityType
-{
-    /** Default constructor */
-    public M48TractorTruck()
-    {
-        setCountry(Country.UNITED_STATES_OF_AMERICA_USA);
-        setEntityKind(EntityKind.PLATFORM);
-        setDomain(Domain.inst(PlatformDomain.LAND));
-
-        setCategory((byte)7); // uid 10418, Large Wheeled Utility Vehicle
-        setSubCategory((byte)1); // uid 10419, M35/M44A2 6x6 2-1/2-ton Cargo Truck
-        setSpecific((byte)10); // uid 10429, M48 Tractor Truck
-    }
-    /** Create a new instance of this final (unmodifiable) class
-      * @return copy of class for use as data */
-    public static M48TractorTruck createInstance()
-    {
-            return new M48TractorTruck();
-    }
-}
diff --git a/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M49fueltanker.java b/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M49fueltanker.java
deleted file mode 100644
index 683153af5d..0000000000
--- a/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M49fueltanker.java
+++ /dev/null
@@ -1,50 +0,0 @@
-// autogenerated using string template entitytypecommon.txt
-
-package edu.nps.moves.dis7.entities.usa.platform.land;
-
-import edu.nps.moves.dis7.pdus.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * <p> Entity class <b><code>M49FuelTanker</code></b> collects multiple enumeration values together to uniquely define this entity. </p>
- * <p> <i>Usage:</i> create an instance of this class with <code>M49FuelTanker.createInstance()</code> or <code>new M49FuelTanker()</code>. </p>
- * <ul>
- *     <li> Country: United States of America (USA) = <code>225</code>; </li>
- *     <li> Entity kind: PlatformDomain = <code>LAND</code>; </li>
- *     <li> Domain: Platform = <code>1</code>; </li>
- *     <li> Category: Large Wheeled Utility Vehicle = <code>7</code>; </li>
- *     <li> SubCategory: M35M44A26x6212tonCargoTruck  = <code>1</code>; </li>
- *     <li> Specific: M49FuelTanker  = <code>11</code>; </li>
- *     <li> Entity type uid: 10430; </li>
- *     <li> Online document reference: <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/blob/master/specifications/README.md" target="_blank">SISO-REF-010-v29 (2021-05-19)</a>. </li>
- * </ul>
- * <p> Full name: edu.nps.moves.dis7.source.generator.entityTypes.GenerateEntityTypes$SpecificElem@7ea2412c. </p>
- * @see Country#UNITED_STATES_OF_AMERICA_USA
- * @see EntityKind#PLATFORM
- * @see Domain
- * @see PlatformDomain
- * @see Category
- * @see LargeWheeledUtilityVehicle
- * @see SubCategory
-
- */
-public final class M49FuelTanker extends EntityType
-{
-    /** Default constructor */
-    public M49FuelTanker()
-    {
-        setCountry(Country.UNITED_STATES_OF_AMERICA_USA);
-        setEntityKind(EntityKind.PLATFORM);
-        setDomain(Domain.inst(PlatformDomain.LAND));
-
-        setCategory((byte)7); // uid 10418, Large Wheeled Utility Vehicle
-        setSubCategory((byte)1); // uid 10419, M35/M44A2 6x6 2-1/2-ton Cargo Truck
-        setSpecific((byte)11); // uid 10430, M49 Fuel Tanker
-    }
-    /** Create a new instance of this final (unmodifiable) class
-      * @return copy of class for use as data */
-    public static M49FuelTanker createInstance()
-    {
-            return new M49FuelTanker();
-    }
-}
diff --git a/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M577M577A1M577A2commandpost.java b/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M577M577A1M577A2commandpost.java
deleted file mode 100644
index f346ff7e29..0000000000
--- a/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M577M577A1M577A2commandpost.java
+++ /dev/null
@@ -1,49 +0,0 @@
-// autogenerated using string template entitytypecommon.txt
-
-package edu.nps.moves.dis7.entities.usa.platform.land;
-
-import edu.nps.moves.dis7.pdus.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * <p> Entity class <b><code>M577M577A1M577A2CommandPost</code></b> collects multiple enumeration values together to uniquely define this entity. </p>
- * <p> <i>Usage:</i> create an instance of this class with <code>M577M577A1M577A2CommandPost.createInstance()</code> or <code>new M577M577A1M577A2CommandPost()</code>. </p>
- * <ul>
- *     <li> Country: United States of America (USA) = <code>225</code>; </li>
- *     <li> Entity kind: PlatformDomain = <code>LAND</code>; </li>
- *     <li> Domain: Platform = <code>1</code>; </li>
- *     <li> Category: Armored Utility Vehicle = <code>3</code>; </li>
- *     <li> SubCategory: M577M577A1M577A2CommandPost  = <code>11</code>; </li>
- *     <li> Specific:  <code>(none)</code>; </li>
- *     <li> Entity type uid: 10253; </li>
- *     <li> Online document reference: <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/blob/master/specifications/README.md" target="_blank">SISO-REF-010-v29 (2021-05-19)</a>. </li>
- * </ul>
- * <p> Full name: edu.nps.moves.dis7.source.generator.entityTypes.GenerateEntityTypes$SubCategoryElem@3e8799f. </p>
- * @see Country#UNITED_STATES_OF_AMERICA_USA
- * @see EntityKind#PLATFORM
- * @see Domain
- * @see PlatformDomain
- * @see Category
- * @see ArmoredUtilityVehicle
- * @see SubCategory
-
- */
-public final class M577M577A1M577A2CommandPost extends EntityType
-{
-    /** Default constructor */
-    public M577M577A1M577A2CommandPost()
-    {
-        setCountry(Country.UNITED_STATES_OF_AMERICA_USA);
-        setEntityKind(EntityKind.PLATFORM);
-        setDomain(Domain.inst(PlatformDomain.LAND));
-
-        setCategory((byte)3); // uid 10233, Armored Utility Vehicle
-        setSubCategory((byte)11); // uid 10253, M577/M577A1/M577A2 Command Post
-    }
-    /** Create a new instance of this final (unmodifiable) class
-      * @return copy of class for use as data */
-    public static M577M577A1M577A2CommandPost createInstance()
-    {
-            return new M577M577A1M577A2CommandPost();
-    }
-}
diff --git a/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M578lightarmoredrecoveryvehicle.java b/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M578lightarmoredrecoveryvehicle.java
deleted file mode 100644
index 8f7e7605b5..0000000000
--- a/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M578lightarmoredrecoveryvehicle.java
+++ /dev/null
@@ -1,49 +0,0 @@
-// autogenerated using string template entitytypecommon.txt
-
-package edu.nps.moves.dis7.entities.usa.platform.land;
-
-import edu.nps.moves.dis7.pdus.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * <p> Entity class <b><code>M578LightArmoredRecoveryVehicle</code></b> collects multiple enumeration values together to uniquely define this entity. </p>
- * <p> <i>Usage:</i> create an instance of this class with <code>M578LightArmoredRecoveryVehicle.createInstance()</code> or <code>new M578LightArmoredRecoveryVehicle()</code>. </p>
- * <ul>
- *     <li> Country: United States of America (USA) = <code>225</code>; </li>
- *     <li> Entity kind: PlatformDomain = <code>LAND</code>; </li>
- *     <li> Domain: Platform = <code>1</code>; </li>
- *     <li> Category: Armored Utility Vehicle = <code>3</code>; </li>
- *     <li> SubCategory: M578LightArmoredRecoveryVehicle  = <code>2</code>; </li>
- *     <li> Specific:  <code>(none)</code>; </li>
- *     <li> Entity type uid: 10238; </li>
- *     <li> Online document reference: <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/blob/master/specifications/README.md" target="_blank">SISO-REF-010-v29 (2021-05-19)</a>. </li>
- * </ul>
- * <p> Full name: edu.nps.moves.dis7.source.generator.entityTypes.GenerateEntityTypes$SubCategoryElem@4373f66f. </p>
- * @see Country#UNITED_STATES_OF_AMERICA_USA
- * @see EntityKind#PLATFORM
- * @see Domain
- * @see PlatformDomain
- * @see Category
- * @see ArmoredUtilityVehicle
- * @see SubCategory
-
- */
-public final class M578LightArmoredRecoveryVehicle extends EntityType
-{
-    /** Default constructor */
-    public M578LightArmoredRecoveryVehicle()
-    {
-        setCountry(Country.UNITED_STATES_OF_AMERICA_USA);
-        setEntityKind(EntityKind.PLATFORM);
-        setDomain(Domain.inst(PlatformDomain.LAND));
-
-        setCategory((byte)3); // uid 10233, Armored Utility Vehicle
-        setSubCategory((byte)2); // uid 10238, M578 Light Armored Recovery Vehicle
-    }
-    /** Create a new instance of this final (unmodifiable) class
-      * @return copy of class for use as data */
-    public static M578LightArmoredRecoveryVehicle createInstance()
-    {
-            return new M578LightArmoredRecoveryVehicle();
-    }
-}
diff --git a/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M728combatengineervehicle.java b/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M728combatengineervehicle.java
deleted file mode 100644
index bf416e478c..0000000000
--- a/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M728combatengineervehicle.java
+++ /dev/null
@@ -1,49 +0,0 @@
-// autogenerated using string template entitytypecommon.txt
-
-package edu.nps.moves.dis7.entities.usa.platform.land;
-
-import edu.nps.moves.dis7.pdus.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * <p> Entity class <b><code>M728CombatEngineerVehicle</code></b> collects multiple enumeration values together to uniquely define this entity. </p>
- * <p> <i>Usage:</i> create an instance of this class with <code>M728CombatEngineerVehicle.createInstance()</code> or <code>new M728CombatEngineerVehicle()</code>. </p>
- * <ul>
- *     <li> Country: United States of America (USA) = <code>225</code>; </li>
- *     <li> Entity kind: PlatformDomain = <code>LAND</code>; </li>
- *     <li> Domain: Platform = <code>1</code>; </li>
- *     <li> Category: Armored Utility Vehicle = <code>3</code>; </li>
- *     <li> SubCategory: M728CombatEngineerVehicle  = <code>5</code>; </li>
- *     <li> Specific:  <code>(none)</code>; </li>
- *     <li> Entity type uid: 10246; </li>
- *     <li> Online document reference: <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/blob/master/specifications/README.md" target="_blank">SISO-REF-010-v29 (2021-05-19)</a>. </li>
- * </ul>
- * <p> Full name: edu.nps.moves.dis7.source.generator.entityTypes.GenerateEntityTypes$SubCategoryElem@6f3f0ae. </p>
- * @see Country#UNITED_STATES_OF_AMERICA_USA
- * @see EntityKind#PLATFORM
- * @see Domain
- * @see PlatformDomain
- * @see Category
- * @see ArmoredUtilityVehicle
- * @see SubCategory
-
- */
-public final class M728CombatEngineerVehicle extends EntityType
-{
-    /** Default constructor */
-    public M728CombatEngineerVehicle()
-    {
-        setCountry(Country.UNITED_STATES_OF_AMERICA_USA);
-        setEntityKind(EntityKind.PLATFORM);
-        setDomain(Domain.inst(PlatformDomain.LAND));
-
-        setCategory((byte)3); // uid 10233, Armored Utility Vehicle
-        setSubCategory((byte)5); // uid 10246, M728 Combat Engineer Vehicle
-    }
-    /** Create a new instance of this final (unmodifiable) class
-      * @return copy of class for use as data */
-    public static M728CombatEngineerVehicle createInstance()
-    {
-            return new M728CombatEngineerVehicle();
-    }
-}
diff --git a/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M88mediumrecoveryvehicle.java b/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M88mediumrecoveryvehicle.java
deleted file mode 100644
index af3b59c3ac..0000000000
--- a/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M88mediumrecoveryvehicle.java
+++ /dev/null
@@ -1,49 +0,0 @@
-// autogenerated using string template entitytypecommon.txt
-
-package edu.nps.moves.dis7.entities.usa.platform.land;
-
-import edu.nps.moves.dis7.pdus.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * <p> Entity class <b><code>M88MediumRecoveryVehicle</code></b> collects multiple enumeration values together to uniquely define this entity. </p>
- * <p> <i>Usage:</i> create an instance of this class with <code>M88MediumRecoveryVehicle.createInstance()</code> or <code>new M88MediumRecoveryVehicle()</code>. </p>
- * <ul>
- *     <li> Country: United States of America (USA) = <code>225</code>; </li>
- *     <li> Entity kind: PlatformDomain = <code>LAND</code>; </li>
- *     <li> Domain: Platform = <code>1</code>; </li>
- *     <li> Category: Armored Utility Vehicle = <code>3</code>; </li>
- *     <li> SubCategory: M88MediumRecoveryVehicle  = <code>1</code>; </li>
- *     <li> Specific:  <code>(none)</code>; </li>
- *     <li> Entity type uid: 10234; </li>
- *     <li> Online document reference: <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/blob/master/specifications/README.md" target="_blank">SISO-REF-010-v29 (2021-05-19)</a>. </li>
- * </ul>
- * <p> Full name: edu.nps.moves.dis7.source.generator.entityTypes.GenerateEntityTypes$SubCategoryElem@4cffcc61. </p>
- * @see Country#UNITED_STATES_OF_AMERICA_USA
- * @see EntityKind#PLATFORM
- * @see Domain
- * @see PlatformDomain
- * @see Category
- * @see ArmoredUtilityVehicle
- * @see SubCategory
-
- */
-public final class M88MediumRecoveryVehicle extends EntityType
-{
-    /** Default constructor */
-    public M88MediumRecoveryVehicle()
-    {
-        setCountry(Country.UNITED_STATES_OF_AMERICA_USA);
-        setEntityKind(EntityKind.PLATFORM);
-        setDomain(Domain.inst(PlatformDomain.LAND));
-
-        setCategory((byte)3); // uid 10233, Armored Utility Vehicle
-        setSubCategory((byte)1); // uid 10234, M88 Medium Recovery Vehicle
-    }
-    /** Create a new instance of this final (unmodifiable) class
-      * @return copy of class for use as data */
-    public static M88MediumRecoveryVehicle createInstance()
-    {
-            return new M88MediumRecoveryVehicle();
-    }
-}
diff --git a/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M977cargo.java b/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M977cargo.java
deleted file mode 100644
index f59a97c93c..0000000000
--- a/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M977cargo.java
+++ /dev/null
@@ -1,50 +0,0 @@
-// autogenerated using string template entitytypecommon.txt
-
-package edu.nps.moves.dis7.entities.usa.platform.land;
-
-import edu.nps.moves.dis7.pdus.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * <p> Entity class <b><code>M977Cargo</code></b> collects multiple enumeration values together to uniquely define this entity. </p>
- * <p> <i>Usage:</i> create an instance of this class with <code>M977Cargo.createInstance()</code> or <code>new M977Cargo()</code>. </p>
- * <ul>
- *     <li> Country: United States of America (USA) = <code>225</code>; </li>
- *     <li> Entity kind: PlatformDomain = <code>LAND</code>; </li>
- *     <li> Domain: Platform = <code>1</code>; </li>
- *     <li> Category: Large Wheeled Utility Vehicle = <code>7</code>; </li>
- *     <li> SubCategory: OshkoshHeavyExpandedMobilityTacticalTruckHEMTT8x89979kg  = <code>19</code>; </li>
- *     <li> Specific: M977Cargo  = <code>1</code>; </li>
- *     <li> Entity type uid: 10544; </li>
- *     <li> Online document reference: <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/blob/master/specifications/README.md" target="_blank">SISO-REF-010-v29 (2021-05-19)</a>. </li>
- * </ul>
- * <p> Full name: edu.nps.moves.dis7.source.generator.entityTypes.GenerateEntityTypes$SpecificElem@71aaf151. </p>
- * @see Country#UNITED_STATES_OF_AMERICA_USA
- * @see EntityKind#PLATFORM
- * @see Domain
- * @see PlatformDomain
- * @see Category
- * @see LargeWheeledUtilityVehicle
- * @see SubCategory
-
- */
-public final class M977Cargo extends EntityType
-{
-    /** Default constructor */
-    public M977Cargo()
-    {
-        setCountry(Country.UNITED_STATES_OF_AMERICA_USA);
-        setEntityKind(EntityKind.PLATFORM);
-        setDomain(Domain.inst(PlatformDomain.LAND));
-
-        setCategory((byte)7); // uid 10418, Large Wheeled Utility Vehicle
-        setSubCategory((byte)19); // uid 10543, Oshkosh Heavy Expanded Mobility Tactical Truck (HEMTT) 8x8 9979-kg
-        setSpecific((byte)1); // uid 10544, M977 Cargo
-    }
-    /** Create a new instance of this final (unmodifiable) class
-      * @return copy of class for use as data */
-    public static M977Cargo createInstance()
-    {
-            return new M977Cargo();
-    }
-}
diff --git a/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M978fuelservicing.java b/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M978fuelservicing.java
deleted file mode 100644
index 289d64a67f..0000000000
--- a/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M978fuelservicing.java
+++ /dev/null
@@ -1,50 +0,0 @@
-// autogenerated using string template entitytypecommon.txt
-
-package edu.nps.moves.dis7.entities.usa.platform.land;
-
-import edu.nps.moves.dis7.pdus.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * <p> Entity class <b><code>M978FuelServicing</code></b> collects multiple enumeration values together to uniquely define this entity. </p>
- * <p> <i>Usage:</i> create an instance of this class with <code>M978FuelServicing.createInstance()</code> or <code>new M978FuelServicing()</code>. </p>
- * <ul>
- *     <li> Country: United States of America (USA) = <code>225</code>; </li>
- *     <li> Entity kind: PlatformDomain = <code>LAND</code>; </li>
- *     <li> Domain: Platform = <code>1</code>; </li>
- *     <li> Category: Large Wheeled Utility Vehicle = <code>7</code>; </li>
- *     <li> SubCategory: OshkoshHeavyExpandedMobilityTacticalTruckHEMTT8x89979kg  = <code>19</code>; </li>
- *     <li> Specific: M978FuelServicing  = <code>2</code>; </li>
- *     <li> Entity type uid: 10545; </li>
- *     <li> Online document reference: <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/blob/master/specifications/README.md" target="_blank">SISO-REF-010-v29 (2021-05-19)</a>. </li>
- * </ul>
- * <p> Full name: edu.nps.moves.dis7.source.generator.entityTypes.GenerateEntityTypes$SpecificElem@43ecfeb5. </p>
- * @see Country#UNITED_STATES_OF_AMERICA_USA
- * @see EntityKind#PLATFORM
- * @see Domain
- * @see PlatformDomain
- * @see Category
- * @see LargeWheeledUtilityVehicle
- * @see SubCategory
-
- */
-public final class M978FuelServicing extends EntityType
-{
-    /** Default constructor */
-    public M978FuelServicing()
-    {
-        setCountry(Country.UNITED_STATES_OF_AMERICA_USA);
-        setEntityKind(EntityKind.PLATFORM);
-        setDomain(Domain.inst(PlatformDomain.LAND));
-
-        setCategory((byte)7); // uid 10418, Large Wheeled Utility Vehicle
-        setSubCategory((byte)19); // uid 10543, Oshkosh Heavy Expanded Mobility Tactical Truck (HEMTT) 8x8 9979-kg
-        setSpecific((byte)2); // uid 10545, M978 Fuel Servicing
-    }
-    /** Create a new instance of this final (unmodifiable) class
-      * @return copy of class for use as data */
-    public static M978FuelServicing createInstance()
-    {
-            return new M978FuelServicing();
-    }
-}
diff --git a/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M983tractor.java b/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M983tractor.java
deleted file mode 100644
index 22192cfadc..0000000000
--- a/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M983tractor.java
+++ /dev/null
@@ -1,50 +0,0 @@
-// autogenerated using string template entitytypecommon.txt
-
-package edu.nps.moves.dis7.entities.usa.platform.land;
-
-import edu.nps.moves.dis7.pdus.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * <p> Entity class <b><code>M983Tractor</code></b> collects multiple enumeration values together to uniquely define this entity. </p>
- * <p> <i>Usage:</i> create an instance of this class with <code>M983Tractor.createInstance()</code> or <code>new M983Tractor()</code>. </p>
- * <ul>
- *     <li> Country: United States of America (USA) = <code>225</code>; </li>
- *     <li> Entity kind: PlatformDomain = <code>LAND</code>; </li>
- *     <li> Domain: Platform = <code>1</code>; </li>
- *     <li> Category: Large Wheeled Utility Vehicle = <code>7</code>; </li>
- *     <li> SubCategory: OshkoshHeavyExpandedMobilityTacticalTruckHEMTT8x89979kg  = <code>19</code>; </li>
- *     <li> Specific: M983Tractor  = <code>3</code>; </li>
- *     <li> Entity type uid: 10546; </li>
- *     <li> Online document reference: <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/blob/master/specifications/README.md" target="_blank">SISO-REF-010-v29 (2021-05-19)</a>. </li>
- * </ul>
- * <p> Full name: edu.nps.moves.dis7.source.generator.entityTypes.GenerateEntityTypes$SpecificElem@51efb731. </p>
- * @see Country#UNITED_STATES_OF_AMERICA_USA
- * @see EntityKind#PLATFORM
- * @see Domain
- * @see PlatformDomain
- * @see Category
- * @see LargeWheeledUtilityVehicle
- * @see SubCategory
-
- */
-public final class M983Tractor extends EntityType
-{
-    /** Default constructor */
-    public M983Tractor()
-    {
-        setCountry(Country.UNITED_STATES_OF_AMERICA_USA);
-        setEntityKind(EntityKind.PLATFORM);
-        setDomain(Domain.inst(PlatformDomain.LAND));
-
-        setCategory((byte)7); // uid 10418, Large Wheeled Utility Vehicle
-        setSubCategory((byte)19); // uid 10543, Oshkosh Heavy Expanded Mobility Tactical Truck (HEMTT) 8x8 9979-kg
-        setSpecific((byte)3); // uid 10546, M983 Tractor
-    }
-    /** Create a new instance of this final (unmodifiable) class
-      * @return copy of class for use as data */
-    public static M983Tractor createInstance()
-    {
-            return new M983Tractor();
-    }
-}
diff --git a/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M984A1M984E1wrecker.java b/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M984A1M984E1wrecker.java
deleted file mode 100644
index de363a175e..0000000000
--- a/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M984A1M984E1wrecker.java
+++ /dev/null
@@ -1,50 +0,0 @@
-// autogenerated using string template entitytypecommon.txt
-
-package edu.nps.moves.dis7.entities.usa.platform.land;
-
-import edu.nps.moves.dis7.pdus.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * <p> Entity class <b><code>M984A1M984E1Wrecker</code></b> collects multiple enumeration values together to uniquely define this entity. </p>
- * <p> <i>Usage:</i> create an instance of this class with <code>M984A1M984E1Wrecker.createInstance()</code> or <code>new M984A1M984E1Wrecker()</code>. </p>
- * <ul>
- *     <li> Country: United States of America (USA) = <code>225</code>; </li>
- *     <li> Entity kind: PlatformDomain = <code>LAND</code>; </li>
- *     <li> Domain: Platform = <code>1</code>; </li>
- *     <li> Category: Large Wheeled Utility Vehicle = <code>7</code>; </li>
- *     <li> SubCategory: OshkoshHeavyExpandedMobilityTacticalTruckHEMTT8x89979kg  = <code>19</code>; </li>
- *     <li> Specific: M984A1M984E1Wrecker  = <code>4</code>; </li>
- *     <li> Entity type uid: 10547; </li>
- *     <li> Online document reference: <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/blob/master/specifications/README.md" target="_blank">SISO-REF-010-v29 (2021-05-19)</a>. </li>
- * </ul>
- * <p> Full name: edu.nps.moves.dis7.source.generator.entityTypes.GenerateEntityTypes$SpecificElem@3e377967. </p>
- * @see Country#UNITED_STATES_OF_AMERICA_USA
- * @see EntityKind#PLATFORM
- * @see Domain
- * @see PlatformDomain
- * @see Category
- * @see LargeWheeledUtilityVehicle
- * @see SubCategory
-
- */
-public final class M984A1M984E1Wrecker extends EntityType
-{
-    /** Default constructor */
-    public M984A1M984E1Wrecker()
-    {
-        setCountry(Country.UNITED_STATES_OF_AMERICA_USA);
-        setEntityKind(EntityKind.PLATFORM);
-        setDomain(Domain.inst(PlatformDomain.LAND));
-
-        setCategory((byte)7); // uid 10418, Large Wheeled Utility Vehicle
-        setSubCategory((byte)19); // uid 10543, Oshkosh Heavy Expanded Mobility Tactical Truck (HEMTT) 8x8 9979-kg
-        setSpecific((byte)4); // uid 10547, M984A1/M984E1 Wrecker
-    }
-    /** Create a new instance of this final (unmodifiable) class
-      * @return copy of class for use as data */
-    public static M984A1M984E1Wrecker createInstance()
-    {
-            return new M984A1M984E1Wrecker();
-    }
-}
diff --git a/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M985cargo.java b/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M985cargo.java
deleted file mode 100644
index 5d8ce173e5..0000000000
--- a/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M985cargo.java
+++ /dev/null
@@ -1,50 +0,0 @@
-// autogenerated using string template entitytypecommon.txt
-
-package edu.nps.moves.dis7.entities.usa.platform.land;
-
-import edu.nps.moves.dis7.pdus.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * <p> Entity class <b><code>M985Cargo</code></b> collects multiple enumeration values together to uniquely define this entity. </p>
- * <p> <i>Usage:</i> create an instance of this class with <code>M985Cargo.createInstance()</code> or <code>new M985Cargo()</code>. </p>
- * <ul>
- *     <li> Country: United States of America (USA) = <code>225</code>; </li>
- *     <li> Entity kind: PlatformDomain = <code>LAND</code>; </li>
- *     <li> Domain: Platform = <code>1</code>; </li>
- *     <li> Category: Large Wheeled Utility Vehicle = <code>7</code>; </li>
- *     <li> SubCategory: OshkoshHeavyExpandedMobilityTacticalTruckHEMTT8x89979kg  = <code>19</code>; </li>
- *     <li> Specific: M985Cargo  = <code>5</code>; </li>
- *     <li> Entity type uid: 10548; </li>
- *     <li> Online document reference: <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/blob/master/specifications/README.md" target="_blank">SISO-REF-010-v29 (2021-05-19)</a>. </li>
- * </ul>
- * <p> Full name: edu.nps.moves.dis7.source.generator.entityTypes.GenerateEntityTypes$SpecificElem@14422d9d. </p>
- * @see Country#UNITED_STATES_OF_AMERICA_USA
- * @see EntityKind#PLATFORM
- * @see Domain
- * @see PlatformDomain
- * @see Category
- * @see LargeWheeledUtilityVehicle
- * @see SubCategory
-
- */
-public final class M985Cargo extends EntityType
-{
-    /** Default constructor */
-    public M985Cargo()
-    {
-        setCountry(Country.UNITED_STATES_OF_AMERICA_USA);
-        setEntityKind(EntityKind.PLATFORM);
-        setDomain(Domain.inst(PlatformDomain.LAND));
-
-        setCategory((byte)7); // uid 10418, Large Wheeled Utility Vehicle
-        setSubCategory((byte)19); // uid 10543, Oshkosh Heavy Expanded Mobility Tactical Truck (HEMTT) 8x8 9979-kg
-        setSpecific((byte)5); // uid 10548, M985 Cargo
-    }
-    /** Create a new instance of this final (unmodifiable) class
-      * @return copy of class for use as data */
-    public static M985Cargo createInstance()
-    {
-            return new M985Cargo();
-    }
-}
diff --git a/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M9armoredcombatearthmover.java b/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M9armoredcombatearthmover.java
deleted file mode 100644
index fc15090a66..0000000000
--- a/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/M9armoredcombatearthmover.java
+++ /dev/null
@@ -1,49 +0,0 @@
-// autogenerated using string template entitytypecommon.txt
-
-package edu.nps.moves.dis7.entities.usa.platform.land;
-
-import edu.nps.moves.dis7.pdus.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * <p> Entity class <b><code>M9ArmoredCombatEarthmover</code></b> collects multiple enumeration values together to uniquely define this entity. </p>
- * <p> <i>Usage:</i> create an instance of this class with <code>M9ArmoredCombatEarthmover.createInstance()</code> or <code>new M9ArmoredCombatEarthmover()</code>. </p>
- * <ul>
- *     <li> Country: United States of America (USA) = <code>225</code>; </li>
- *     <li> Entity kind: PlatformDomain = <code>LAND</code>; </li>
- *     <li> Domain: Platform = <code>1</code>; </li>
- *     <li> Category: Armored Utility Vehicle = <code>3</code>; </li>
- *     <li> SubCategory: M9ArmoredCombatEarthmover  = <code>6</code>; </li>
- *     <li> Specific:  <code>(none)</code>; </li>
- *     <li> Entity type uid: 10247; </li>
- *     <li> Online document reference: <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/blob/master/specifications/README.md" target="_blank">SISO-REF-010-v29 (2021-05-19)</a>. </li>
- * </ul>
- * <p> Full name: edu.nps.moves.dis7.source.generator.entityTypes.GenerateEntityTypes$SubCategoryElem@6baf25d7. </p>
- * @see Country#UNITED_STATES_OF_AMERICA_USA
- * @see EntityKind#PLATFORM
- * @see Domain
- * @see PlatformDomain
- * @see Category
- * @see ArmoredUtilityVehicle
- * @see SubCategory
-
- */
-public final class M9ArmoredCombatEarthmover extends EntityType
-{
-    /** Default constructor */
-    public M9ArmoredCombatEarthmover()
-    {
-        setCountry(Country.UNITED_STATES_OF_AMERICA_USA);
-        setEntityKind(EntityKind.PLATFORM);
-        setDomain(Domain.inst(PlatformDomain.LAND));
-
-        setCategory((byte)3); // uid 10233, Armored Utility Vehicle
-        setSubCategory((byte)6); // uid 10247, M9 Armored Combat Earthmover
-    }
-    /** Create a new instance of this final (unmodifiable) class
-      * @return copy of class for use as data */
-    public static M9ArmoredCombatEarthmover createInstance()
-    {
-            return new M9ArmoredCombatEarthmover();
-    }
-}
diff --git a/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/StretchedM577A2E2commandpost.java b/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/StretchedM577A2E2commandpost.java
deleted file mode 100644
index 42baf4c263..0000000000
--- a/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/StretchedM577A2E2commandpost.java
+++ /dev/null
@@ -1,49 +0,0 @@
-// autogenerated using string template entitytypecommon.txt
-
-package edu.nps.moves.dis7.entities.usa.platform.land;
-
-import edu.nps.moves.dis7.pdus.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * <p> Entity class <b><code>StretchedM577A2E2CommandPost</code></b> collects multiple enumeration values together to uniquely define this entity. </p>
- * <p> <i>Usage:</i> create an instance of this class with <code>StretchedM577A2E2CommandPost.createInstance()</code> or <code>new StretchedM577A2E2CommandPost()</code>. </p>
- * <ul>
- *     <li> Country: United States of America (USA) = <code>225</code>; </li>
- *     <li> Entity kind: PlatformDomain = <code>LAND</code>; </li>
- *     <li> Domain: Platform = <code>1</code>; </li>
- *     <li> Category: Armored Utility Vehicle = <code>3</code>; </li>
- *     <li> SubCategory: StretchedM577A2E2CommandPost  = <code>12</code>; </li>
- *     <li> Specific:  <code>(none)</code>; </li>
- *     <li> Entity type uid: 10256; </li>
- *     <li> Online document reference: <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/blob/master/specifications/README.md" target="_blank">SISO-REF-010-v29 (2021-05-19)</a>. </li>
- * </ul>
- * <p> Full name: edu.nps.moves.dis7.source.generator.entityTypes.GenerateEntityTypes$SubCategoryElem@3b353651. </p>
- * @see Country#UNITED_STATES_OF_AMERICA_USA
- * @see EntityKind#PLATFORM
- * @see Domain
- * @see PlatformDomain
- * @see Category
- * @see ArmoredUtilityVehicle
- * @see SubCategory
-
- */
-public final class StretchedM577A2E2CommandPost extends EntityType
-{
-    /** Default constructor */
-    public StretchedM577A2E2CommandPost()
-    {
-        setCountry(Country.UNITED_STATES_OF_AMERICA_USA);
-        setEntityKind(EntityKind.PLATFORM);
-        setDomain(Domain.inst(PlatformDomain.LAND));
-
-        setCategory((byte)3); // uid 10233, Armored Utility Vehicle
-        setSubCategory((byte)12); // uid 10256, Stretched M577A2E2 Command Post
-    }
-    /** Create a new instance of this final (unmodifiable) class
-      * @return copy of class for use as data */
-    public static StretchedM577A2E2CommandPost createInstance()
-    {
-            return new StretchedM577A2E2CommandPost();
-    }
-}
diff --git a/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/Toolspartstrailer.java b/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/Toolspartstrailer.java
deleted file mode 100644
index 3c75821bc1..0000000000
--- a/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/Toolspartstrailer.java
+++ /dev/null
@@ -1,49 +0,0 @@
-// autogenerated using string template entitytypecommon.txt
-
-package edu.nps.moves.dis7.entities.usa.platform.land;
-
-import edu.nps.moves.dis7.pdus.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * <p> Entity class <b><code>ToolsPartsTrailer</code></b> collects multiple enumeration values together to uniquely define this entity. </p>
- * <p> <i>Usage:</i> create an instance of this class with <code>ToolsPartsTrailer.createInstance()</code> or <code>new ToolsPartsTrailer()</code>. </p>
- * <ul>
- *     <li> Country: United States of America (USA) = <code>225</code>; </li>
- *     <li> Entity kind: PlatformDomain = <code>LAND</code>; </li>
- *     <li> Domain: Platform = <code>1</code>; </li>
- *     <li> Category: Maintenance equipment trailer = <code>20</code>; </li>
- *     <li> SubCategory: ToolsPartsTrailer  = <code>3</code>; </li>
- *     <li> Specific:  <code>(none)</code>; </li>
- *     <li> Entity type uid: 10649; </li>
- *     <li> Online document reference: <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/blob/master/specifications/README.md" target="_blank">SISO-REF-010-v29 (2021-05-19)</a>. </li>
- * </ul>
- * <p> Full name: edu.nps.moves.dis7.source.generator.entityTypes.GenerateEntityTypes$SubCategoryElem@629a9f26. </p>
- * @see Country#UNITED_STATES_OF_AMERICA_USA
- * @see EntityKind#PLATFORM
- * @see Domain
- * @see PlatformDomain
- * @see Category
- * @see Maintenanceequipmenttrailer
- * @see SubCategory
-
- */
-public final class ToolsPartsTrailer extends EntityType
-{
-    /** Default constructor */
-    public ToolsPartsTrailer()
-    {
-        setCountry(Country.UNITED_STATES_OF_AMERICA_USA);
-        setEntityKind(EntityKind.PLATFORM);
-        setDomain(Domain.inst(PlatformDomain.LAND));
-
-        setCategory((byte)20); // uid 10646, Maintenance equipment trailer
-        setSubCategory((byte)3); // uid 10649, Tools/Parts Trailer
-    }
-    /** Create a new instance of this final (unmodifiable) class
-      * @return copy of class for use as data */
-    public static ToolsPartsTrailer createInstance()
-    {
-            return new ToolsPartsTrailer();
-    }
-}
diff --git a/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/Weldingtrailer.java b/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/Weldingtrailer.java
deleted file mode 100644
index 053d7df2de..0000000000
--- a/src-generated/edu/nps/moves/dis7/entities/usa/platform/land/Weldingtrailer.java
+++ /dev/null
@@ -1,49 +0,0 @@
-// autogenerated using string template entitytypecommon.txt
-
-package edu.nps.moves.dis7.entities.usa.platform.land;
-
-import edu.nps.moves.dis7.pdus.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * <p> Entity class <b><code>WeldingTrailer</code></b> collects multiple enumeration values together to uniquely define this entity. </p>
- * <p> <i>Usage:</i> create an instance of this class with <code>WeldingTrailer.createInstance()</code> or <code>new WeldingTrailer()</code>. </p>
- * <ul>
- *     <li> Country: United States of America (USA) = <code>225</code>; </li>
- *     <li> Entity kind: PlatformDomain = <code>LAND</code>; </li>
- *     <li> Domain: Platform = <code>1</code>; </li>
- *     <li> Category: Maintenance equipment trailer = <code>20</code>; </li>
- *     <li> SubCategory: WeldingTrailer  = <code>1</code>; </li>
- *     <li> Specific:  <code>(none)</code>; </li>
- *     <li> Entity type uid: 10647; </li>
- *     <li> Online document reference: <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/blob/master/specifications/README.md" target="_blank">SISO-REF-010-v29 (2021-05-19)</a>. </li>
- * </ul>
- * <p> Full name: edu.nps.moves.dis7.source.generator.entityTypes.GenerateEntityTypes$SubCategoryElem@3d40a3b4. </p>
- * @see Country#UNITED_STATES_OF_AMERICA_USA
- * @see EntityKind#PLATFORM
- * @see Domain
- * @see PlatformDomain
- * @see Category
- * @see Maintenanceequipmenttrailer
- * @see SubCategory
-
- */
-public final class WeldingTrailer extends EntityType
-{
-    /** Default constructor */
-    public WeldingTrailer()
-    {
-        setCountry(Country.UNITED_STATES_OF_AMERICA_USA);
-        setEntityKind(EntityKind.PLATFORM);
-        setDomain(Domain.inst(PlatformDomain.LAND));
-
-        setCategory((byte)20); // uid 10646, Maintenance equipment trailer
-        setSubCategory((byte)1); // uid 10647, Welding Trailer
-    }
-    /** Create a new instance of this final (unmodifiable) class
-      * @return copy of class for use as data */
-    public static WeldingTrailer createInstance()
-    {
-            return new WeldingTrailer();
-    }
-}
diff --git a/src/overview.html b/src/overview.html
index 8e2670183f..2fd9f1fc4d 100644
--- a/src/overview.html
+++ b/src/overview.html
@@ -1,9 +1,9 @@
 <html>
     <body>
         <p>
-            <a href="https://github.com/open-dis/open-dis7-java" target="_blank"><img src="OpenDisSurferDude.png" title="Open-Dis Surfer Dude, Thanks Don McGregor!" alt="Open-Dis Surfer Dude, Thanks Don McGregor!" style="float:right"/></a>
+            <a href="https://github.com/open-dis/opendis7-java" target="_blank" title="Open-Dis Surfer Dude, Thanks Don McGregor!"><img src="OpenDisSurferDude.png" alt="Open-Dis Surfer Dude, Thanks Don McGregor!" style="float:right"/></a>
             The
-            <a href="https://github.com/open-dis/open-dis7-java" target="_blank">open-dis7-java</a> 
+            <a href="https://github.com/open-dis/opendis7-java" target="_blank">opendis7-java</a> 
             library provides a complete type-safe Java implementation of both
             the DIS Protocol version 7 (IEEE 1278.1-2012) and SISO-REF-010 Enumerations specifications,
             interfaces and objects, all as open source.
@@ -30,16 +30,16 @@
             </li>
             <li>
                 Experimental
-                <a href="https://savage.nps.edu/open-dis7-java/xml/DIS_7_2012.autogenerated.xsd" target="_blank">DIS XML schema</a>
+                <a href="https://savage.nps.edu/opendis7-java/xml/DIS_7_2012.autogenerated.xsd" target="_blank">DIS XML schema</a>
                 and
-                <a href="https://savage.nps.edu/open-dis7-java/xml/SchemaDocumentation" target="_blank">documentation</a>
+                <a href="https://savage.nps.edu/opendis7-java/xml/SchemaDocumentation" target="_blank">documentation</a>
                 assist with data-centric processing of DIS streams.
             </li>
         </ul>
         
         <p>
             Distribution binary available at 
-            <a href="https://savage.nps.edu/open-dis7-java/open-dis7-full.jar">open-dis7-full.jar</a>.
+            <a href="https://savage.nps.edu/opendis7-java/open-dis7-full.jar">open-dis7-full.jar</a>.
             Further examples, presentations and projects are provided in
             <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500" target="_blank">Networked Graphics MV3500</a>
             course archive by the
-- 
GitLab