diff --git a/src/org/opensha2/DeaggCalc.java b/src/org/opensha2/DeaggCalc.java
index c257be7ed594d2361192983e3ad157cb6cfda476..32347b9eafafd83e6dbf4b63f7d5c8203d731523 100644
--- a/src/org/opensha2/DeaggCalc.java
+++ b/src/org/opensha2/DeaggCalc.java
@@ -5,7 +5,7 @@ import static java.util.concurrent.Executors.newFixedThreadPool;
 import static org.opensha2.internal.TextUtils.NEWLINE;
 
 import org.opensha2.calc.CalcConfig;
-import org.opensha2.calc.Calcs;
+import org.opensha2.calc.HazardCalcs;
 import org.opensha2.calc.Deaggregation;
 import org.opensha2.calc.Hazard;
 import org.opensha2.calc.ResultHandler;
@@ -187,7 +187,7 @@ public class DeaggCalc {
   public static Deaggregation calc(
       Hazard hazard,
       double returnPeriod) {
-    return Calcs.deaggregation(hazard, returnPeriod);
+    return HazardCalcs.deaggregation(hazard, returnPeriod);
   }
 
   private static final String PROGRAM = DeaggCalc.class.getSimpleName();
diff --git a/src/org/opensha2/HazardCalc.java b/src/org/opensha2/HazardCalc.java
index 587d963641d3153e45692f2fb9f02c9f770de2cd..45b2de6bfcb53b72bf718d17b96da5bd3907145c 100644
--- a/src/org/opensha2/HazardCalc.java
+++ b/src/org/opensha2/HazardCalc.java
@@ -5,7 +5,7 @@ import static java.util.concurrent.Executors.newFixedThreadPool;
 import static org.opensha2.internal.TextUtils.NEWLINE;
 
 import org.opensha2.calc.CalcConfig;
-import org.opensha2.calc.Calcs;
+import org.opensha2.calc.HazardCalcs;
 import org.opensha2.calc.Deaggregation;
 import org.opensha2.calc.Hazard;
 import org.opensha2.calc.ResultHandler;
@@ -227,7 +227,7 @@ public class HazardCalc {
       Site site,
       Optional<Executor> executor) {
     try {
-      return Calcs.hazard(model, config, site, executor);
+      return HazardCalcs.hazard(model, config, site, executor);
     } catch (ExecutionException | InterruptedException e) {
       throw new RuntimeException(e);
     }
diff --git a/src/org/opensha2/calc/Calcs.java b/src/org/opensha2/calc/HazardCalcs.java
similarity index 99%
rename from src/org/opensha2/calc/Calcs.java
rename to src/org/opensha2/calc/HazardCalcs.java
index 5ac0226c35385350a7a36c60a1623b54cf77a91e..0675c85e93bc8fd141098a054173e4f6ff673dbf 100644
--- a/src/org/opensha2/calc/Calcs.java
+++ b/src/org/opensha2/calc/HazardCalcs.java
@@ -37,7 +37,7 @@ import java.util.logging.Logger;
  *
  * @author Peter Powers
  */
-public class Calcs {
+public class HazardCalcs {
 
   /*
    * Developer notes:
@@ -135,7 +135,7 @@ public class Calcs {
     if (ex.isPresent()) {
       return asyncHazardCurve(model, config, site, ex.get());
     }
-    Logger log = Logger.getLogger(Calcs.class.getName());
+    Logger log = Logger.getLogger(HazardCalcs.class.getName());
     return hazardCurve(model, config, site, log);
   }
 
diff --git a/src/org/opensha2/eq/model/PointSources.java b/src/org/opensha2/eq/model/PointSources.java
index 584b9880bf5a51c28630bd56fcc94b18d2b1755f..058d78d77c69684194d25cb5759f05ace44f7773 100644
--- a/src/org/opensha2/eq/model/PointSources.java
+++ b/src/org/opensha2/eq/model/PointSources.java
@@ -1,6 +1,6 @@
 package org.opensha2.eq.model;
 
-import org.opensha2.calc.Calcs;
+import org.opensha2.calc.HazardCalcs;
 import org.opensha2.calc.InputList;
 import org.opensha2.calc.Site;
 import org.opensha2.data.IntervalData;
@@ -58,7 +58,7 @@ public class PointSources {
         magDepthMap,
         maxDepth);
     
-    return Calcs.sourceToInputs(site).apply(source);
+    return HazardCalcs.sourceToInputs(site).apply(source);
   }
 
   /**
@@ -94,7 +94,7 @@ public class PointSources {
     
     List<InputList> inputsList = new ArrayList<>();
     for (Site site : sites) {
-      InputList inputs = Calcs.sourceToInputs(site).apply(source);
+      InputList inputs = HazardCalcs.sourceToInputs(site).apply(source);
       inputsList.add(inputs);
     }
     return inputsList;
@@ -130,7 +130,7 @@ public class PointSources {
 
     List<InputList> inputsList = new ArrayList<>();
     for (Site site : sites) {
-      InputList inputs = Calcs.sourceToInputs(site).apply(source);
+      InputList inputs = HazardCalcs.sourceToInputs(site).apply(source);
       inputsList.add(inputs);
     }
     return inputsList;