diff --git a/etc/examples/2-custom-config/config.json b/etc/examples/2-custom-config/config.json
index 81bf3596947088e04bbc5108d24b5be880cfddf9..dedc561bf973a910e6d33c8c4d880b11bd807432 100644
--- a/etc/examples/2-custom-config/config.json
+++ b/etc/examples/2-custom-config/config.json
@@ -1,9 +1,9 @@
 {
-  "curve": {
+  "hazard": {
     "exceedanceModel": "TRUNCATION_UPPER_ONLY",
     "truncationLevel": 3.0,
     "imts": ["PGA", "SA0P2", "SA1P0"],
-    "valueType": "POISSON_PROBABILITY",
+    "valueFormat": "POISSON_PROBABILITY",
     "customImls": {
       "PGA":   [0.0050, 0.0070, 0.0098, 0.0137, 0.0192, 0.0269, 0.0376, 0.0527, 0.0738, 0.103, 0.145, 0.203, 0.284, 0.397, 0.556, 0.778, 1.09, 1.52, 2.2, 3.3],
       "SA0P2": [0.0050, 0.0075, 0.0113, 0.0169, 0.0253, 0.0380, 0.0570, 0.0854, 0.128, 0.192, 0.288, 0.432, 0.649, 0.973, 1.46, 2.19, 3.28, 4.92, 7.38],
diff --git a/etc/examples/3-sites-file/config.json b/etc/examples/3-sites-file/config.json
index 36b53806121cf46ef9f089a5b98f731671d9087a..2176e0eaaaa0d550a178e85ef778a9dfc20325b5 100644
--- a/etc/examples/3-sites-file/config.json
+++ b/etc/examples/3-sites-file/config.json
@@ -1,5 +1,5 @@
 {
-  "curve": {
+  "hazard": {
     "exceedanceModel": "TRUNCATION_UPPER_ONLY",
     "truncationLevel": 3.0,
     "imts": ["PGA", "SA0P2", "SA1P0"],
diff --git a/etc/examples/4-hazard-map/config.json b/etc/examples/4-hazard-map/config.json
index 3f0c8770259373994e61c9bf4de2461f024522b6..d5e60bba4e1b63548914619a163eb695e4bcc85a 100644
--- a/etc/examples/4-hazard-map/config.json
+++ b/etc/examples/4-hazard-map/config.json
@@ -1,5 +1,5 @@
 {
-  "curve": {
+  "hazard": {
     "exceedanceModel": "TRUNCATION_UPPER_ONLY",
     "truncationLevel": 3.0,
     "imts": ["PGA", "SA0P2", "SA1P0"]
diff --git a/etc/examples/5-complex-model/config-map.json b/etc/examples/5-complex-model/config-map.json
index 9a474d5bcef9dbf81d33aa4bf3eab631c0463e3d..eb5b93211fd2a1c5ef110a279bc9db610b2b8a17 100644
--- a/etc/examples/5-complex-model/config-map.json
+++ b/etc/examples/5-complex-model/config-map.json
@@ -1,5 +1,5 @@
 {
-  "curve": {
+  "hazard": {
     "imts": ["SA1P0", "SA2P0"]
   },
   "output": {
diff --git a/etc/examples/5-complex-model/config-sites.json b/etc/examples/5-complex-model/config-sites.json
index 5ead4a5a402768b2a7009dd29f47027158d940f4..5db53ac5881be0ca48864cb8f47741ea854e45de 100644
--- a/etc/examples/5-complex-model/config-sites.json
+++ b/etc/examples/5-complex-model/config-sites.json
@@ -1,5 +1,5 @@
 {
-  "curve": {
+  "hazard": {
     "imts": ["SA1P0", "SA2P0"]
   },
   "output": {
diff --git a/etc/examples/6-enhanced-output/config.json b/etc/examples/6-enhanced-output/config.json
index 02ae2a887033bcce2e546b071e5731f234462110..1023392b357b71b62837d33b37fc609d3eb3f3a3 100644
--- a/etc/examples/6-enhanced-output/config.json
+++ b/etc/examples/6-enhanced-output/config.json
@@ -1,6 +1,6 @@
 {
   "output": {
-    "curveTypes": ["TOTAL", "GMM", "SOURCE"],
+    "dataTypes": ["TOTAL", "GMM", "SOURCE"],
     "flushLimit": 1
   }
 }
diff --git a/etc/examples/7-deaggregation/config.json b/etc/examples/7-deaggregation/config.json
index 87347bfc46a6d78ac834df85a3a3ce5be63ded8e..e7d35261718b6cdec91e5b0593cad3b6d31582ca 100644
--- a/etc/examples/7-deaggregation/config.json
+++ b/etc/examples/7-deaggregation/config.json
@@ -1,6 +1,6 @@
 {
   "output": {
-    "curveTypes": ["TOTAL", "GMM"],
+    "dataTypes": ["TOTAL", "GMM"],
     "flushLimit": 1
   }
 }
diff --git a/etc/examples/8-probabilities/config-map.json b/etc/examples/8-probabilities/config-map.json
index 1cee52136ae1a89a7c2b6797681a6de9da761fae..44e663c7e51dcf2768032bf47f90b0c0a1ac5ca9 100644
--- a/etc/examples/8-probabilities/config-map.json
+++ b/etc/examples/8-probabilities/config-map.json
@@ -1,11 +1,11 @@
 {
   "output": {
-    "curveTypes": ["SOURCE"]
+    "dataTypes": ["SOURCE"]
   },
   "rate": {
     "distance": 10.0,
-    "values": "POISSON_PROBABILITY",
-    "distribution": "CUMULATIVE",
+    "valueFormat": "POISSON_PROBABILITY",
+    "distributionFormat": "CUMULATIVE",
     "timespan": 50.0
   }
 }
diff --git a/etc/examples/8-probabilities/config-sites.json b/etc/examples/8-probabilities/config-sites.json
index e5e9a3a8b75bd2ec40b16511b4f1a19bec7814af..2c5b56ccf107cfbce37b683de0b8f4bfd6011b32 100644
--- a/etc/examples/8-probabilities/config-sites.json
+++ b/etc/examples/8-probabilities/config-sites.json
@@ -1,5 +1,5 @@
 {
   "output": {
-    "curveTypes": ["SOURCE"]
+    "dataTypes": ["SOURCE"]
   }
 }