diff --git a/src/main/java/scratch/kevin/ThreadedHazardCurveCalcExample.java b/src/main/java/scratch/kevin/ThreadedHazardCurveCalcExample.java
index 0074d353..473ebe75 100644
--- a/src/main/java/scratch/kevin/ThreadedHazardCurveCalcExample.java
+++ b/src/main/java/scratch/kevin/ThreadedHazardCurveCalcExample.java
@@ -15,7 +15,7 @@
 import org.opensha.sha.calc.HazardCurveCalculator;
 import org.opensha.sha.calc.sourceFilters.SourceFilterManager;
 import org.opensha.sha.calc.sourceFilters.SourceFilters;
-import org.opensha.sha.earthquake.rupForecastImpl.nshm23.erf.NSHM23_WUS_BranchAveragedERF;
+import org.opensha.sha.earthquake.rupForecastImpl.nshm23.erf.NSHM23_BranchAveragedERF;
 import org.opensha.sha.earthquake.rupForecastImpl.nshm23.util.NSHM23_RegionLoader;
 import org.opensha.sha.gui.infoTools.IMT_Info;
 import org.opensha.sha.imr.AttenRelRef;
@@ -26,7 +26,7 @@ public class ThreadedHazardCurveCalcExample {
 
 	public static void main(String[] args) throws IOException {
 		// ERF
-		NSHM23_WUS_BranchAveragedERF erf = new NSHM23_WUS_BranchAveragedERF();
+		NSHM23_BranchAveragedERF erf = new NSHM23_BranchAveragedERF();
 		erf.getTimeSpan().setDuration(1d);
 		erf.updateForecast();
 		
diff --git a/src/main/java/scratch/kevin/miscFigures/SingleEventAndFullHazardCurve.java b/src/main/java/scratch/kevin/miscFigures/SingleEventAndFullHazardCurve.java
index f4849f54..fb722a28 100644
--- a/src/main/java/scratch/kevin/miscFigures/SingleEventAndFullHazardCurve.java
+++ b/src/main/java/scratch/kevin/miscFigures/SingleEventAndFullHazardCurve.java
@@ -31,7 +31,7 @@
 import org.opensha.sha.earthquake.faultSysSolution.FaultSystemRupSet;
 import org.opensha.sha.earthquake.faultSysSolution.FaultSystemSolution;
 import org.opensha.sha.earthquake.faultSysSolution.util.FaultSectionUtils;
-import org.opensha.sha.earthquake.rupForecastImpl.nshm23.erf.NSHM23_WUS_BranchAveragedERF;
+import org.opensha.sha.earthquake.rupForecastImpl.nshm23.erf.NSHM23_BranchAveragedERF;
 import org.opensha.sha.faultSurface.FaultSection;
 import org.opensha.sha.faultSurface.RuptureSurface;
 import org.opensha.sha.gui.infoTools.IMT_Info;
@@ -48,7 +48,7 @@ public class SingleEventAndFullHazardCurve {
 
 	public static void main(String[] args) throws IOException {
 		ModuleArchive.VERBOSE_DEFAULT = false;
-		NSHM23_WUS_BranchAveragedERF erf = new NSHM23_WUS_BranchAveragedERF();
+		NSHM23_BranchAveragedERF erf = new NSHM23_BranchAveragedERF();
 		
 		File outputDir = new File("/tmp");
 		
diff --git a/src/main/java/scratch/kevin/pointSources/GriddedHazardBenchmark.java b/src/main/java/scratch/kevin/pointSources/GriddedHazardBenchmark.java
index e31e9c0c..736c2f9b 100644
--- a/src/main/java/scratch/kevin/pointSources/GriddedHazardBenchmark.java
+++ b/src/main/java/scratch/kevin/pointSources/GriddedHazardBenchmark.java
@@ -15,7 +15,7 @@
 import org.opensha.sha.earthquake.param.BackgroundRupType;
 import org.opensha.sha.earthquake.param.IncludeBackgroundOption;
 import org.opensha.sha.earthquake.param.IncludeBackgroundParam;
-import org.opensha.sha.earthquake.rupForecastImpl.nshm23.erf.NSHM23_WUS_BranchAveragedERF;
+import org.opensha.sha.earthquake.rupForecastImpl.nshm23.erf.NSHM23_BranchAveragedERF;
 import org.opensha.sha.earthquake.rupForecastImpl.nshm23.util.NSHM23_RegionLoader;
 import org.opensha.sha.earthquake.util.GridCellSupersamplingSettings;
 import org.opensha.sha.earthquake.util.GriddedSeismicitySettings;
@@ -33,7 +33,7 @@
 public class GriddedHazardBenchmark {
 
 	public static void main(String[] args) throws IOException {
-		NSHM23_WUS_BranchAveragedERF erf = new NSHM23_WUS_BranchAveragedERF();
+		NSHM23_BranchAveragedERF erf = new NSHM23_BranchAveragedERF();
 		erf.setParameter(IncludeBackgroundParam.NAME, IncludeBackgroundOption.ONLY);
 		
 		GriddedSeismicitySettings settings = erf.getGriddedSeismicitySettings();
diff --git a/src/main/java/scratch/kevin/pointSources/GriddedHazardSingleSiteComparison.java b/src/main/java/scratch/kevin/pointSources/GriddedHazardSingleSiteComparison.java
index e0b3da8a..11cb2f25 100644
--- a/src/main/java/scratch/kevin/pointSources/GriddedHazardSingleSiteComparison.java
+++ b/src/main/java/scratch/kevin/pointSources/GriddedHazardSingleSiteComparison.java
@@ -34,7 +34,7 @@
 import org.opensha.sha.earthquake.param.BackgroundRupType;
 import org.opensha.sha.earthquake.param.IncludeBackgroundOption;
 import org.opensha.sha.earthquake.param.IncludeBackgroundParam;
-import org.opensha.sha.earthquake.rupForecastImpl.nshm23.erf.NSHM23_WUS_BranchAveragedERF;
+import org.opensha.sha.earthquake.rupForecastImpl.nshm23.erf.NSHM23_BranchAveragedERF;
 import org.opensha.sha.earthquake.util.GridCellSupersamplingSettings;
 import org.opensha.sha.earthquake.util.GriddedFiniteRuptureSettings;
 import org.opensha.sha.earthquake.util.GriddedSeismicitySettings;
@@ -53,7 +53,7 @@
 public class GriddedHazardSingleSiteComparison {
 
 	public static void main(String[] args) throws IOException {
-		BaseFaultSystemSolutionERF erf = new NSHM23_WUS_BranchAveragedERF();
+		BaseFaultSystemSolutionERF erf = new NSHM23_BranchAveragedERF();
 		erf.updateForecast();
 		
 //		PointSourceDistanceCorrections corrType = PointSourceDistanceCorrections.ANALYTICAL_TWENTY_POINT;