diff --git a/src/main/java/gov/usgs/earthquake/nshmp/gmm/ChapmanGuo_2021.java b/src/main/java/gov/usgs/earthquake/nshmp/gmm/ChapmanGuo_2021.java
index 60c9b6a3e7782cc893fb6bd1ceed6e27e51b2aee..8d1f9cc474b8dcd0ed53b93acf15e7afd712353b 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/gmm/ChapmanGuo_2021.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/gmm/ChapmanGuo_2021.java
@@ -115,12 +115,6 @@ class ChapmanGuo_2021 {
     return interpolate(z1, z2, zf);
   }
 
-  // public static void main(String[] args) {
-  // // 0.74631047
-  // double scale = cpaPsaRatio(Imt.PGA, 0.8, 8.2, 100);
-  // System.out.println(scale);
-  // }
-
   private static double interpolate(double lo, double hi, double fraction) {
     return lo + fraction * (hi - lo);
   }
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/gmm/Gmm.java b/src/main/java/gov/usgs/earthquake/nshmp/gmm/Gmm.java
index 6951d2c0e82d7be119873dcef084c652623ca20d..69def58b5a85c245ea17cd9b620677a0aec37504 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/gmm/Gmm.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/gmm/Gmm.java
@@ -32,6 +32,7 @@ import gov.usgs.earthquake.nshmp.gmm.CeusMb.SilvaEtAl_2002_J;
 import gov.usgs.earthquake.nshmp.gmm.CeusMb.TavakoliPezeshk_2005_AB;
 import gov.usgs.earthquake.nshmp.gmm.CeusMb.TavakoliPezeshk_2005_J;
 import gov.usgs.earthquake.nshmp.gmm.GmmInput.Constraints;
+import gov.usgs.earthquake.nshmp.gmm.NgaEast.NgaEast_2018;
 
 /**
  * {@link GroundMotionModel} (Gmm) identifiers. Use these to generate
@@ -854,8 +855,8 @@ public enum Gmm {
 
   /** @see NgaEast_2018 */
   NGA_EAST_2018(
-      NgaEast.NgaEastBase.class,
-      NgaEast.NgaEastBase.NAME,
+      NgaEast.NgaEast_2018.class,
+      NgaEast.NgaEast_2018.NAME,
       NgaEast.COEFFS_SIGMA_PANEL,
       NgaEast.CONSTRAINTS),
 
@@ -870,8 +871,8 @@ public enum Gmm {
 
   /** @see NgaEast_2018 */
   NGA_EAST_SEEDS_2018(
-      NgaEast.UsgsSeeds.class,
-      NgaEast.UsgsSeeds.NAME,
+      NgaEast.UsgsSeeds_2018.class,
+      NgaEast.UsgsSeeds_2018.NAME,
       NgaEast.COEFFS_SIGMA_PANEL,
       NgaEast.CONSTRAINTS),
 
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/gmm/NgaEast.java b/src/main/java/gov/usgs/earthquake/nshmp/gmm/NgaEast.java
index 89c8cca761665b29b002887d6217666ddc21cfdb..2012c18ac3352e72b3bf6a6c576a2b4ed8e6cdd5 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/gmm/NgaEast.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/gmm/NgaEast.java
@@ -166,7 +166,7 @@ public abstract class NgaEast implements GroundMotionModel {
    * the aleatory variability logic tree.
    */
 
-  static final String NAME = "NGA-East (2018)";
+  static final String NAME = "NGA-East";
 
   static final Constraints CONSTRAINTS = Constraints.builder()
       .set(MW, Range.closed(4.0, 8.2))
@@ -366,8 +366,8 @@ public abstract class NgaEast implements GroundMotionModel {
    * Base model used for sammons and seed model groups that share common site
    * class and sigma models.
    */
-  static class NgaEastBase extends NgaEast {
-
+  static class NgaEast_2018 extends NgaEast {
+    static final String NAME = NgaEast.NAME + " (2018)";
     static final int MODEL_COUNT = 17;
     static final String[] MEAN_IDS = IntStream.range(1, MODEL_COUNT + 1)
         .mapToObj(i -> "Sammons" + i)
@@ -380,7 +380,7 @@ public abstract class NgaEast implements GroundMotionModel {
     final double[] μWts;
 
     /* Specifiy an array of models ids. */
-    NgaEastBase(Imt imt) {
+    NgaEast_2018(Imt imt) {
       super(imt);
       this.tables = GroundMotionTables.getNgaEast(imt);
       this.pgaTables = GroundMotionTables.getNgaEast(Imt.PGA);
@@ -409,7 +409,7 @@ public abstract class NgaEast implements GroundMotionModel {
 
   /* Guo and Chapman Gulf Coastal Plain Amplification (CPA) model. */
   @Deprecated
-  static class Usgs17Cpa extends NgaEastBase {
+  static class Usgs17Cpa extends NgaEast_2018 {
 
     // static final String NAME = "NGA-East (2023)";
     static final String NAME = NgaEast.NAME + " (Gulf Coast)";
@@ -444,7 +444,7 @@ public abstract class NgaEast implements GroundMotionModel {
    * (2020) and (2) the Gulf and Atlantic coastal plain effects model of Chapman
    * & Guo (2021).
    */
-  static class NgaEast_2023 extends NgaEastBase {
+  static class NgaEast_2023 extends NgaEast_2018 {
 
     static final String NAME = "NGA-East (2023)";
 
@@ -484,8 +484,8 @@ public abstract class NgaEast implements GroundMotionModel {
    * individual seed models which results in repeated position lookups. Both
    * sigma models considered include coefficients for PGV.
    */
-  static class UsgsSeeds extends NgaEast {
-    static final String NAME = "NGA-East Seed Tree (2018)";
+  static class UsgsSeeds_2018 extends NgaEast {
+    static final String NAME = NgaEast.NAME + " Seed Tree (2018)";
     static final String SEED_PREFIX = "NGA_EAST_SEED_";
     static final String SP16_ID = "SP16";
     static final Set<Gmm> noPgvSeeds = EnumSet.of(
@@ -532,7 +532,7 @@ public abstract class NgaEast implements GroundMotionModel {
           .toArray();
     }
 
-    UsgsSeeds(Imt imt) {
+    UsgsSeeds_2018(Imt imt) {
       super(imt);
       this.tables = getImtTables(imt);
       this.pgaTables = getImtTables(Imt.PGA);
@@ -577,10 +577,9 @@ public abstract class NgaEast implements GroundMotionModel {
 
   /* Guo and Chapman Gulf Coastal Plain Amplification (CPA) model. */
   @Deprecated
-  static class UsgsSeedsCpa extends UsgsSeeds {
+  static class UsgsSeedsCpa extends UsgsSeeds_2018 {
 
-    // static final String NAME = "NGA-East Seed Tree (2023)";
-    static final String NAME = UsgsSeeds.NAME + " (Gulf Coast)";
+    static final String NAME = UsgsSeeds_2018.NAME + " (Gulf Coast)";
 
     UsgsSeedsCpa(Imt imt) {
       super(imt);
@@ -615,10 +614,9 @@ public abstract class NgaEast implements GroundMotionModel {
   }
 
   /* Guo and Chapman Gulf Coastal Plain Amplification (CPA) model. */
-  static class UsgsSeeds_2023 extends UsgsSeeds {
+  static class UsgsSeeds_2023 extends UsgsSeeds_2018 {
 
-    // static final String NAME = "NGA-East Seed Tree (2023)";
-    static final String NAME = UsgsSeeds.NAME + " (Gulf Coast)";
+    static final String NAME = NgaEast.NAME + " Seed Tree (2023)";
 
     UsgsSeeds_2023(Imt imt) {
       super(imt);