diff --git a/src/org/opensha2/calc/CalcConfig.java b/src/org/opensha2/calc/CalcConfig.java
index 2315eca254b809051dee84cdb9b991a097e0fff1..e5fa5e3d5cfd5a338bdf3c62b62cefcda620f92f 100644
--- a/src/org/opensha2/calc/CalcConfig.java
+++ b/src/org/opensha2/calc/CalcConfig.java
@@ -146,9 +146,9 @@ public final class CalcConfig {
     /**
      * The value format for hazard curves.
      *
-     * <p><b>Default:</b> {@link CurveValue#ANNUAL_RATE}
+     * <p><b>Default:</b> {@link ValueFormat#ANNUAL_RATE}
      */
-    public final CurveValue valueType;
+    public final ValueFormat valueType;
 
     private final double[] defaultImls;
     private final Map<Imt, double[]> customImls;
@@ -162,7 +162,7 @@ public final class CalcConfig {
         double truncationLevel,
         Set<Imt> imts,
         boolean gmmUncertainty,
-        CurveValue valueType,
+        ValueFormat valueType,
         double[] defaultImls,
         Map<Imt, double[]> customImls,
         Map<Imt, XySequence> modelCurves,
@@ -240,7 +240,7 @@ public final class CalcConfig {
       Double truncationLevel;
       Set<Imt> imts;
       Boolean gmmUncertainty;
-      CurveValue valueType;
+      ValueFormat valueType;
       double[] defaultImls;
       Map<Imt, double[]> customImls;
 
@@ -306,7 +306,7 @@ public final class CalcConfig {
         b.truncationLevel = 3.0;
         b.imts = EnumSet.of(Imt.PGA, Imt.SA0P2, Imt.SA1P0);
         b.gmmUncertainty = false;
-        b.valueType = CurveValue.ANNUAL_RATE;
+        b.valueType = ValueFormat.ANNUAL_RATE;
         b.defaultImls = IMLS_PGA_SA;
         b.customImls = Maps.newHashMap();
         b.customImls.put(Imt.PGV, IMLS_PGV);
@@ -702,9 +702,9 @@ public final class CalcConfig {
     /**
      * The value format for rate data.
      *
-     * <p><b>Default:</b> {@link CurveValue#ANNUAL_RATE}
+     * <p><b>Default:</b> {@link ValueFormat#ANNUAL_RATE}
      */
-    public final CurveValue values;
+    public final ValueFormat values;
 
     /**
      * The timespan of interest when computing Poisson probabilities.
@@ -717,7 +717,7 @@ public final class CalcConfig {
         Bins bins,
         double distance,
         Distribution distribution,
-        CurveValue values,
+        ValueFormat values,
         double timespan) {
 
       this.bins = bins;
@@ -745,7 +745,7 @@ public final class CalcConfig {
       Bins bins;
       Double distance;
       Distribution distribution;
-      CurveValue values;
+      ValueFormat values;
       Double timespan;
 
       Rate build() {
@@ -788,7 +788,7 @@ public final class CalcConfig {
         b.bins = Bins.defaults();
         b.distance = 20.0;
         b.distribution = Distribution.INCREMENTAL;
-        b.values = CurveValue.ANNUAL_RATE;
+        b.values = ValueFormat.ANNUAL_RATE;
         b.timespan = 30.0;
         return b;
       }
@@ -1232,14 +1232,14 @@ public final class CalcConfig {
 
     /**
      * Set the timespan for earthquake probabilities. Calling this method also
-     * sets {@link Rate#values} to {@link CurveValue#POISSON_PROBABILITY} to
+     * sets {@link Rate#values} to {@link ValueFormat#POISSON_PROBABILITY} to
      * ensure consistency.
      * 
      * @see Rate#timespan
      */
     public Builder timespan(double timespan) {
       this.rate.timespan = timespan;
-      this.rate.values = CurveValue.POISSON_PROBABILITY;
+      this.rate.values = ValueFormat.POISSON_PROBABILITY;
       return this;
     }
 
diff --git a/src/org/opensha2/calc/EqRate.java b/src/org/opensha2/calc/EqRate.java
index 9875440583c747b158f0569bbb8ddec21c316d61..ee9f2c9a3e18314204ccca37fcee660f608c9924 100644
--- a/src/org/opensha2/calc/EqRate.java
+++ b/src/org/opensha2/calc/EqRate.java
@@ -81,7 +81,7 @@ public class EqRate {
     if (rateConfig.distribution == Distribution.CUMULATIVE) {
       rates = toCumulative(rates);
     }
-    if (rateConfig.values == CurveValue.POISSON_PROBABILITY) {
+    if (rateConfig.values == ValueFormat.POISSON_PROBABILITY) {
       rates = toPoissonProbability(rates, rateConfig.timespan);
     }
     return rates;
diff --git a/src/org/opensha2/calc/EqRateExport.java b/src/org/opensha2/calc/EqRateExport.java
index 0e4d7370dcce88c35fb60f20fe34bc501592382e..efca392a92053f6f4999528cdb8ca323fb2aefce 100644
--- a/src/org/opensha2/calc/EqRateExport.java
+++ b/src/org/opensha2/calc/EqRateExport.java
@@ -73,7 +73,7 @@ public final class EqRateExport {
   static Path improvedOutputDirectory(CalcConfig config) {
     Path out = config.output.directory;
     if (out.toString().equals(CalcConfig.DEFAULT_OUT)) {
-      return (config.rate.values == CurveValue.POISSON_PROBABILITY) ? Paths.get("eq-prob")
+      return (config.rate.values == ValueFormat.POISSON_PROBABILITY) ? Paths.get("eq-prob")
           : Paths.get("eq-rate");
     }
     return out;
diff --git a/src/org/opensha2/calc/HazardExport.java b/src/org/opensha2/calc/HazardExport.java
index acc23bb76f8c20cec9994219d06f04b8207114cc..2889ac1a59059792b2679905122151205dd66848 100644
--- a/src/org/opensha2/calc/HazardExport.java
+++ b/src/org/opensha2/calc/HazardExport.java
@@ -251,7 +251,7 @@ public final class HazardExport {
     OpenOption[] options = firstBatch ? WRITE : APPEND;
 
     Function<Double, String> formatter = Parsing.formatDoubleFunction(RATE_FMT);
-    if (demo.config.curve.valueType == CurveValue.POISSON_PROBABILITY) {
+    if (demo.config.curve.valueType == ValueFormat.POISSON_PROBABILITY) {
       formatter = Functions.compose(
           formatter,
           Mfds.annualRateToProbabilityConverter());
diff --git a/src/org/opensha2/calc/CurveValue.java b/src/org/opensha2/calc/ValueFormat.java
similarity index 92%
rename from src/org/opensha2/calc/CurveValue.java
rename to src/org/opensha2/calc/ValueFormat.java
index 12eb2709063730dd854f1b8e5d46a0495dba4819..31d06922bfd88c99f7a4a7921905c019db88647c 100644
--- a/src/org/opensha2/calc/CurveValue.java
+++ b/src/org/opensha2/calc/ValueFormat.java
@@ -7,7 +7,7 @@ import org.opensha2.internal.Parsing;
  *
  * @author Peter Powers
  */
-public enum CurveValue {
+public enum ValueFormat {
 
   /** Annual-rate. */
   ANNUAL_RATE,