diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6504bbdb5b..a40b6d01d7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -11,7 +11,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     container:
-      image: eclipse-temurin:17-jdk
+      image: eclipse-temurin:21-jdk
 
     permissions:
       contents: read
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 174144661c..f839b6dcca 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -9,7 +9,7 @@ jobs:
   build-and-release:
     runs-on: ubuntu-latest
     container:
-      image: eclipse-temurin:17-jdk
+      image: eclipse-temurin:21-jdk
 
     permissions:
       contents: write
diff --git a/build.xml b/build.xml
index 35aa2f16a7..cfa7685871 100644
--- a/build.xml
+++ b/build.xml
@@ -195,8 +195,7 @@ POSSIBILITY OF SUCH DAMAGE.
     <target name="view.javadoc.local" description="view local package javadoc in web browser (NetBeans only)">
         <echo message="view local javadoc in ${dist.javadoc.dir} subdirectory"/>
         <!-- nbbrowse requires NetBeans IDE; commented out for headless/CI compatibility -->
-        <nbbrowse file="${dist.javadoc.dir}/index.html" />
-        <!-- nbbrowse file="${dist.javadoc.dir}/index.html" -->
+        <!-- <nbbrowse file="${dist.javadoc.dir}/index.html" /> -->
         <!-- TODO implementation-independent approach if possible, but note that other Ant approaches usually have to be customized for each OS. -->
     </target>
 
diff --git a/nbproject/project.properties b/nbproject/project.properties
index cf7f329c7d..a073b8f6ea 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -79,6 +79,7 @@ javac.test.classpath=\
     ${file.reference.apiguardian-api-1.1.0.jar}:\
     ${file.reference.junit-jupiter-api-5.7.0.jar}:\
     ${file.reference.junit-jupiter-engine-5.7.0.jar}:\
+    ${file.reference.opentest4j-1.2.0.jar}:\
     ${libs.junit_5.classpath}
 javac.test.modulepath=\
     ${javac.modulepath}
diff --git a/src-generated/edu/nps/moves/dis7/entities/oth/culturalfeature/land/Abatis8tree.java b/src-generated/edu/nps/moves/dis7/entities/oth/culturalfeature/land/Abatis8Tree.java
similarity index 100%
rename from src-generated/edu/nps/moves/dis7/entities/oth/culturalfeature/land/Abatis8tree.java
rename to src-generated/edu/nps/moves/dis7/entities/oth/culturalfeature/land/Abatis8Tree.java
diff --git a/src-generated/edu/nps/moves/dis7/entities/oth/culturalfeature/land/Concertinafence3roll.java b/src-generated/edu/nps/moves/dis7/entities/oth/culturalfeature/land/ConcertinaFence3Roll.java
similarity index 100%
rename from src-generated/edu/nps/moves/dis7/entities/oth/culturalfeature/land/Concertinafence3roll.java
rename to src-generated/edu/nps/moves/dis7/entities/oth/culturalfeature/land/ConcertinaFence3Roll.java
diff --git a/src-generated/edu/nps/moves/dis7/entities/oth/culturalfeature/land/Logcribrectangular.java b/src-generated/edu/nps/moves/dis7/entities/oth/culturalfeature/land/LogCribRectangular.java
similarity index 100%
rename from src-generated/edu/nps/moves/dis7/entities/oth/culturalfeature/land/Logcribrectangular.java
rename to src-generated/edu/nps/moves/dis7/entities/oth/culturalfeature/land/LogCribRectangular.java
diff --git a/src-generated/edu/nps/moves/dis7/entities/rus/munition/antiship/_533mmtorpedo.java b/src-generated/edu/nps/moves/dis7/entities/rus/munition/antiship/_533mmTorpedo.java
similarity index 100%
rename from src-generated/edu/nps/moves/dis7/entities/rus/munition/antiship/_533mmtorpedo.java
rename to src-generated/edu/nps/moves/dis7/entities/rus/munition/antiship/_533mmTorpedo.java
diff --git a/src-generated/edu/nps/moves/dis7/entities/rus/platform/air/ORION.java b/src-generated/edu/nps/moves/dis7/entities/rus/platform/air/Orion.java
similarity index 100%
rename from src-generated/edu/nps/moves/dis7/entities/rus/platform/air/ORION.java
rename to src-generated/edu/nps/moves/dis7/entities/rus/platform/air/Orion.java
diff --git a/src-generated/edu/nps/moves/dis7/entities/rus/platform/air/ORION2Helios.java b/src-generated/edu/nps/moves/dis7/entities/rus/platform/air/Orion2Helios.java
similarity index 100%
rename from src-generated/edu/nps/moves/dis7/entities/rus/platform/air/ORION2Helios.java
rename to src-generated/edu/nps/moves/dis7/entities/rus/platform/air/Orion2Helios.java
diff --git a/src-generated/edu/nps/moves/dis7/entities/rus/platform/air/ORIONE.java b/src-generated/edu/nps/moves/dis7/entities/rus/platform/air/OrionE.java
similarity index 100%
rename from src-generated/edu/nps/moves/dis7/entities/rus/platform/air/ORIONE.java
rename to src-generated/edu/nps/moves/dis7/entities/rus/platform/air/OrionE.java
diff --git a/src-generated/edu/nps/moves/dis7/entities/rus/platform/air/ORIONSirius.java b/src-generated/edu/nps/moves/dis7/entities/rus/platform/air/OrionSirius.java
similarity index 100%
rename from src-generated/edu/nps/moves/dis7/entities/rus/platform/air/ORIONSirius.java
rename to src-generated/edu/nps/moves/dis7/entities/rus/platform/air/OrionSirius.java