diff --git a/stable-crust/grid/mfd-map.json b/stable-crust/grid/mfd-map.json
index a7a1fc192825bc90f685c51aea001123e47774f9..16a999ce9eb6d7ab7e6e9afef471c617349bf017 100644
--- a/stable-crust/grid/mfd-map.json
+++ b/stable-crust/grid/mfd-map.json
@@ -1,20 +1,58 @@
 {
-  "grid-mmax-craton": [
-      { "id": "M1", "weight": 0.2, "value": { "type": "GR", "mMax": 6.5, "mMin": 4.7, "Δm": 0.1, "b": 1.0 }},
-      { "id": "M2", "weight": 0.5, "value": { "type": "GR", "mMax": 7.0, "mMin": 4.7, "Δm": 0.1, "b": 1.0 }},
-      { "id": "M3", "weight": 0.2, "value": { "type": "GR", "mMax": 7.5, "mMin": 4.7, "Δm": 0.1, "b": 1.0 }},
-      { "id": "M4", "weight": 0.1, "value": { "type": "GR", "mMax": 8.0, "mMin": 4.7, "Δm": 0.1, "b": 1.0 }}
-  ],
-  "grid-mmax-margin-1": [
-      { "id": "M1", "weight": 0.1, "value": { "type": "GR", "mMax": 6.8, "mMin": 4.7, "Δm": 0.1, "b": 1.0 }},
-      { "id": "M2", "weight": 0.3, "value": { "type": "GR", "mMax": 7.2, "mMin": 4.7, "Δm": 0.1, "b": 1.0 }},
-      { "id": "M3", "weight": 0.5, "value": { "type": "GR", "mMax": 7.6, "mMin": 4.7, "Δm": 0.1, "b": 1.0 }},
-      { "id": "M4", "weight": 0.1, "value": { "type": "GR", "mMax": 8.0, "mMin": 4.7, "Δm": 0.1, "b": 1.0 }}
-  ],
-  "grid-mmax-margin-2": [
-      { "id": "M1", "weight": 0.2, "value": { "type": "GR", "mMax": 6.8, "mMin": 4.7, "Δm": 0.1, "b": 1.0 }},
-      { "id": "M2", "weight": 0.3, "value": { "type": "GR", "mMax": 7.2, "mMin": 4.7, "Δm": 0.1, "b": 1.0 }},
-      { "id": "M3", "weight": 0.4, "value": { "type": "GR", "mMax": 7.6, "mMin": 4.7, "Δm": 0.1, "b": 1.0 }},
-      { "id": "M4", "weight": 0.1, "value": { "type": "GR", "mMax": 8.0, "mMin": 4.7, "Δm": 0.1, "b": 1.0 }}
+  "grid-mmax-craton-gk": [
+      { "id": "M1", "weight": 0.2, "value": { "type": "GR", "mMax": 6.5, "mMin": 4.7, "Δm": 0.1, "b": 0.81 }},
+      { "id": "M2", "weight": 0.5, "value": { "type": "GR", "mMax": 7.0, "mMin": 4.7, "Δm": 0.1, "b": 0.81 }},
+      { "id": "M3", "weight": 0.2, "value": { "type": "GR", "mMax": 7.5, "mMin": 4.7, "Δm": 0.1, "b": 0.81 }},
+      { "id": "M4", "weight": 0.1, "value": { "type": "GR", "mMax": 8.0, "mMin": 4.7, "Δm": 0.1, "b": 0.81 }}
+  ],
+  "grid-mmax-margin-1-gk": [
+      { "id": "M1", "weight": 0.1, "value": { "type": "GR", "mMax": 6.8, "mMin": 4.7, "Δm": 0.1, "b": 0.81 }},
+      { "id": "M2", "weight": 0.3, "value": { "type": "GR", "mMax": 7.2, "mMin": 4.7, "Δm": 0.1, "b": 0.81 }},
+      { "id": "M3", "weight": 0.5, "value": { "type": "GR", "mMax": 7.6, "mMin": 4.7, "Δm": 0.1, "b": 0.81 }},
+      { "id": "M4", "weight": 0.1, "value": { "type": "GR", "mMax": 8.0, "mMin": 4.7, "Δm": 0.1, "b": 0.81 }}
+  ],
+  "grid-mmax-margin-2-gk": [
+      { "id": "M1", "weight": 0.2, "value": { "type": "GR", "mMax": 6.8, "mMin": 4.7, "Δm": 0.1, "b": 0.81 }},
+      { "id": "M2", "weight": 0.3, "value": { "type": "GR", "mMax": 7.2, "mMin": 4.7, "Δm": 0.1, "b": 0.81 }},
+      { "id": "M3", "weight": 0.4, "value": { "type": "GR", "mMax": 7.6, "mMin": 4.7, "Δm": 0.1, "b": 0.81 }},
+      { "id": "M4", "weight": 0.1, "value": { "type": "GR", "mMax": 8.0, "mMin": 4.7, "Δm": 0.1, "b": 0.81 }}
+  ],
+
+  "grid-mmax-craton-nn": [
+      { "id": "M1", "weight": 0.2, "value": { "type": "GR", "mMax": 6.5, "mMin": 4.7, "Δm": 0.1, "b": 0.93 }},
+      { "id": "M2", "weight": 0.5, "value": { "type": "GR", "mMax": 7.0, "mMin": 4.7, "Δm": 0.1, "b": 0.93 }},
+      { "id": "M3", "weight": 0.2, "value": { "type": "GR", "mMax": 7.5, "mMin": 4.7, "Δm": 0.1, "b": 0.93 }},
+      { "id": "M4", "weight": 0.1, "value": { "type": "GR", "mMax": 8.0, "mMin": 4.7, "Δm": 0.1, "b": 0.93 }}
+  ],
+  "grid-mmax-margin-1-nn": [
+      { "id": "M1", "weight": 0.1, "value": { "type": "GR", "mMax": 6.8, "mMin": 4.7, "Δm": 0.1, "b": 0.93 }},
+      { "id": "M2", "weight": 0.3, "value": { "type": "GR", "mMax": 7.2, "mMin": 4.7, "Δm": 0.1, "b": 0.93 }},
+      { "id": "M3", "weight": 0.5, "value": { "type": "GR", "mMax": 7.6, "mMin": 4.7, "Δm": 0.1, "b": 0.93 }},
+      { "id": "M4", "weight": 0.1, "value": { "type": "GR", "mMax": 8.0, "mMin": 4.7, "Δm": 0.1, "b": 0.93 }}
+  ],
+  "grid-mmax-margin-2-nn": [
+      { "id": "M1", "weight": 0.2, "value": { "type": "GR", "mMax": 6.8, "mMin": 4.7, "Δm": 0.1, "b": 0.93 }},
+      { "id": "M2", "weight": 0.3, "value": { "type": "GR", "mMax": 7.2, "mMin": 4.7, "Δm": 0.1, "b": 0.93 }},
+      { "id": "M3", "weight": 0.4, "value": { "type": "GR", "mMax": 7.6, "mMin": 4.7, "Δm": 0.1, "b": 0.93 }},
+      { "id": "M4", "weight": 0.1, "value": { "type": "GR", "mMax": 8.0, "mMin": 4.7, "Δm": 0.1, "b": 0.93 }}
+  ],
+
+  "grid-mmax-craton-r85": [
+      { "id": "M1", "weight": 0.2, "value": { "type": "GR", "mMax": 6.5, "mMin": 4.7, "Δm": 0.1, "b": 0.94 }},
+      { "id": "M2", "weight": 0.5, "value": { "type": "GR", "mMax": 7.0, "mMin": 4.7, "Δm": 0.1, "b": 0.94 }},
+      { "id": "M3", "weight": 0.2, "value": { "type": "GR", "mMax": 7.5, "mMin": 4.7, "Δm": 0.1, "b": 0.94 }},
+      { "id": "M4", "weight": 0.1, "value": { "type": "GR", "mMax": 8.0, "mMin": 4.7, "Δm": 0.1, "b": 0.94 }}
+  ],
+  "grid-mmax-margin-1-r85": [
+      { "id": "M1", "weight": 0.1, "value": { "type": "GR", "mMax": 6.8, "mMin": 4.7, "Δm": 0.1, "b": 0.94 }},
+      { "id": "M2", "weight": 0.3, "value": { "type": "GR", "mMax": 7.2, "mMin": 4.7, "Δm": 0.1, "b": 0.94 }},
+      { "id": "M3", "weight": 0.5, "value": { "type": "GR", "mMax": 7.6, "mMin": 4.7, "Δm": 0.1, "b": 0.94 }},
+      { "id": "M4", "weight": 0.1, "value": { "type": "GR", "mMax": 8.0, "mMin": 4.7, "Δm": 0.1, "b": 0.94 }}
+  ],
+  "grid-mmax-margin-2-r85": [
+      { "id": "M1", "weight": 0.2, "value": { "type": "GR", "mMax": 6.8, "mMin": 4.7, "Δm": 0.1, "b": 0.94 }},
+      { "id": "M2", "weight": 0.3, "value": { "type": "GR", "mMax": 7.2, "mMin": 4.7, "Δm": 0.1, "b": 0.94 }},
+      { "id": "M3", "weight": 0.4, "value": { "type": "GR", "mMax": 7.6, "mMin": 4.7, "Δm": 0.1, "b": 0.94 }},
+      { "id": "M4", "weight": 0.1, "value": { "type": "GR", "mMax": 8.0, "mMin": 4.7, "Δm": 0.1, "b": 0.94 }}
   ]
 }
diff --git a/stable-crust/grid/sscn/gk/adaptive/rate-tree.json b/stable-crust/grid/sscn/gk/adaptive/rate-tree.json
index ee68a43234e1df86e5bcbb3145d3d9dd870ec1c9..b20a3bcca83c7ed8034d3a98c1b88167ec8578f2 100644
--- a/stable-crust/grid/sscn/gk/adaptive/rate-tree.json
+++ b/stable-crust/grid/sscn/gk/adaptive/rate-tree.json
@@ -2,6 +2,6 @@
   {
     "id": "R1",
     "weight": 1.0,
-    "value" : 8491.730594
+    "value" : 1626.931380639120
   }
 ]
diff --git a/stable-crust/grid/sscn/gk/adaptive/rupture-sets.json b/stable-crust/grid/sscn/gk/adaptive/rupture-sets.json
index 6970eb6e03ea2c0292d10eb1bad10ba6d15fb60e..b76eba3011baeebb1a0caf4ffe4d951a4c8bf090 100644
--- a/stable-crust/grid/sscn/gk/adaptive/rupture-sets.json
+++ b/stable-crust/grid/sscn/gk/adaptive/rupture-sets.json
@@ -3,49 +3,49 @@
     "name": "SSCn Craton [1,9,10] (gk, adaptive)",
     "id": 80331,
     "feature": 8013,
-    "mfd-tree": "grid-mmax-craton",
+    "mfd-tree": "grid-mmax-craton-gk",
     "spatial-pdf": "pdf-gk-adaptive.csv"
   },
   {
     "name": "SSCn Gulf Coast [2,3] (gk, adaptive)",
     "id": 80341,
     "feature": 8014,
-    "mfd-tree": "grid-mmax-margin-1",
+    "mfd-tree": "grid-mmax-margin-1-gk",
     "spatial-pdf": "pdf-gk-adaptive.csv"
   },
   {
     "name": "SSCn Mesozoic [4,5] (gk, adaptive)",
     "id": 80351,
     "feature": 8015,
-    "mfd-tree": "grid-mmax-margin-1",
+    "mfd-tree": "grid-mmax-margin-1-gk",
     "spatial-pdf": "pdf-gk-adaptive.csv"
   },
   {
     "name": "SSCn Mesozoic [6] (gk, adaptive)",
     "id": 80361,
     "feature": 8016,
-    "mfd-tree": "grid-mmax-margin-2",
+    "mfd-tree": "grid-mmax-margin-2-gk",
     "spatial-pdf": "pdf-gk-adaptive.csv"
   },
   {
     "name": "SSCn Paleozoic [7] (gk, adaptive)",
     "id": 80371,
     "feature": 8017,
-    "mfd-tree": "grid-mmax-margin-2",
+    "mfd-tree": "grid-mmax-margin-2-gk",
     "spatial-pdf": "pdf-gk-adaptive.csv"
   },
   {
     "name": "SSCn Paleozoic [8] (gk, adaptive)",
     "id": 80381,
     "feature": 8018,
-    "mfd-tree": "grid-mmax-margin-2",
+    "mfd-tree": "grid-mmax-margin-2-gk",
     "spatial-pdf": "pdf-gk-adaptive.csv"
   },
   {
     "name": "SSCn default (gk, adaptive)",
     "id": 80391,
     "feature": 8019,
-    "mfd-tree": "grid-mmax-craton",
+    "mfd-tree": "grid-mmax-craton-gk",
     "spatial-pdf": "pdf-gk-adaptive.csv"
   }
 ]
diff --git a/stable-crust/grid/sscn/gk/fixed/rate-tree.json b/stable-crust/grid/sscn/gk/fixed/rate-tree.json
index 20a78021fc413f4f3472bdf9b5c8785ea198326f..b20a3bcca83c7ed8034d3a98c1b88167ec8578f2 100644
--- a/stable-crust/grid/sscn/gk/fixed/rate-tree.json
+++ b/stable-crust/grid/sscn/gk/fixed/rate-tree.json
@@ -2,6 +2,6 @@
   {
     "id": "R1",
     "weight": 1.0,
-    "value" : 8167.91820768891
+    "value" : 1626.931380639120
   }
 ]
diff --git a/stable-crust/grid/sscn/gk/fixed/rupture-sets.json b/stable-crust/grid/sscn/gk/fixed/rupture-sets.json
index 605ceb279dd158cdde62e433ce19a708236619fe..ac186ad6e86739a2f5c0460067ca7d81cbd54bad 100644
--- a/stable-crust/grid/sscn/gk/fixed/rupture-sets.json
+++ b/stable-crust/grid/sscn/gk/fixed/rupture-sets.json
@@ -3,49 +3,49 @@
     "name": "SSCn Craton [1,9,10] (gk, fixed)",
     "id": 80231,
     "feature": 8013,
-    "mfd-tree": "grid-mmax-craton",
+    "mfd-tree": "grid-mmax-craton-gk",
     "spatial-pdf": "pdf-gk-fixed.csv"
   },
   {
     "name": "SSCn Gulf Coast [2,3] (gk, fixed)",
     "id": 80241,
     "feature": 8014,
-    "mfd-tree": "grid-mmax-margin-1",
+    "mfd-tree": "grid-mmax-margin-1-gk",
     "spatial-pdf": "pdf-gk-fixed.csv"
   },
   {
     "name": "SSCn Mesozoic [4,5] (gk, fixed)",
     "id": 80251,
     "feature": 8015,
-    "mfd-tree": "grid-mmax-margin-1",
+    "mfd-tree": "grid-mmax-margin-1-gk",
     "spatial-pdf": "pdf-gk-fixed.csv"
   },
   {
     "name": "SSCn Mesozoic [6] (gk, fixed)",
     "id": 80261,
     "feature": 8016,
-    "mfd-tree": "grid-mmax-margin-2",
+    "mfd-tree": "grid-mmax-margin-2-gk",
     "spatial-pdf": "pdf-gk-fixed.csv"
   },
   {
     "name": "SSCn Paleozoic [7] (gk, fixed)",
     "id": 80271,
     "feature": 8017,
-    "mfd-tree": "grid-mmax-margin-2",
+    "mfd-tree": "grid-mmax-margin-2-gk",
     "spatial-pdf": "pdf-gk-fixed.csv"
   },
   {
     "name": "SSCn Paleozoic [8] (gk, fixed)",
     "id": 80281,
     "feature": 8018,
-    "mfd-tree": "grid-mmax-margin-2",
+    "mfd-tree": "grid-mmax-margin-2-gk",
     "spatial-pdf": "pdf-gk-fixed.csv"
   },
   {
     "name": "SSCn default (gk, fixed)",
     "id": 80291,
     "feature": 8019,
-    "mfd-tree": "grid-mmax-craton",
+    "mfd-tree": "grid-mmax-craton-gk",
     "spatial-pdf": "pdf-gk-fixed.csv"
   }
 ]
diff --git a/stable-crust/grid/sscn/nn/adaptive/rate-tree.json b/stable-crust/grid/sscn/nn/adaptive/rate-tree.json
index ee68a43234e1df86e5bcbb3145d3d9dd870ec1c9..a36a2dfa0a9b6315f53829aa0877410983b57ab5 100644
--- a/stable-crust/grid/sscn/nn/adaptive/rate-tree.json
+++ b/stable-crust/grid/sscn/nn/adaptive/rate-tree.json
@@ -2,6 +2,6 @@
   {
     "id": "R1",
     "weight": 1.0,
-    "value" : 8491.730594
+    "value" : 4347.002141478890
   }
 ]
diff --git a/stable-crust/grid/sscn/nn/adaptive/rupture-sets.json b/stable-crust/grid/sscn/nn/adaptive/rupture-sets.json
index 4f4f6d866658b42e3ec6ce6476b44fe7a8026e26..d240a6ac096a25d16b284c9b51d269927b3f16b4 100644
--- a/stable-crust/grid/sscn/nn/adaptive/rupture-sets.json
+++ b/stable-crust/grid/sscn/nn/adaptive/rupture-sets.json
@@ -3,49 +3,49 @@
     "name": "SSCn Craton [1,9,10] (nn, adaptive)",
     "id": 80332,
     "feature": 8013,
-    "mfd-tree": "grid-mmax-craton",
+    "mfd-tree": "grid-mmax-craton-nn",
     "spatial-pdf": "pdf-nn-adaptive.csv"
   },
   {
     "name": "SSCn Gulf Coast [2,3] (nn, adaptive)",
     "id": 80342,
     "feature": 8014,
-    "mfd-tree": "grid-mmax-margin-1",
+    "mfd-tree": "grid-mmax-margin-1-nn",
     "spatial-pdf": "pdf-nn-adaptive.csv"
   },
   {
     "name": "SSCn Mesozoic [4,5] (nn, adaptive)",
     "id": 80352,
     "feature": 8015,
-    "mfd-tree": "grid-mmax-margin-1",
+    "mfd-tree": "grid-mmax-margin-1-nn",
     "spatial-pdf": "pdf-nn-adaptive.csv"
   },
   {
     "name": "SSCn Mesozoic [6] (nn, adaptive)",
     "id": 80362,
     "feature": 8016,
-    "mfd-tree": "grid-mmax-margin-2",
+    "mfd-tree": "grid-mmax-margin-2-nn",
     "spatial-pdf": "pdf-nn-adaptive.csv"
   },
   {
     "name": "SSCn Paleozoic [7] (nn, adaptive)",
     "id": 80372,
     "feature": 8017,
-    "mfd-tree": "grid-mmax-margin-2",
+    "mfd-tree": "grid-mmax-margin-2-nn",
     "spatial-pdf": "pdf-nn-adaptive.csv"
   },
   {
     "name": "SSCn Paleozoic [8] (nn, adaptive)",
     "id": 80382,
     "feature": 8018,
-    "mfd-tree": "grid-mmax-margin-2",
+    "mfd-tree": "grid-mmax-margin-2-nn",
     "spatial-pdf": "pdf-nn-adaptive.csv"
   },
   {
     "name": "SSCn default (nn, adaptive)",
     "id": 80392,
     "feature": 8019,
-    "mfd-tree": "grid-mmax-craton",
+    "mfd-tree": "grid-mmax-craton-nn",
     "spatial-pdf": "pdf-nn-adaptive.csv"
   }
 ]
diff --git a/stable-crust/grid/sscn/nn/fixed/rate-tree.json b/stable-crust/grid/sscn/nn/fixed/rate-tree.json
index 20a78021fc413f4f3472bdf9b5c8785ea198326f..a36a2dfa0a9b6315f53829aa0877410983b57ab5 100644
--- a/stable-crust/grid/sscn/nn/fixed/rate-tree.json
+++ b/stable-crust/grid/sscn/nn/fixed/rate-tree.json
@@ -2,6 +2,6 @@
   {
     "id": "R1",
     "weight": 1.0,
-    "value" : 8167.91820768891
+    "value" : 4347.002141478890
   }
 ]
diff --git a/stable-crust/grid/sscn/nn/fixed/rupture-sets.json b/stable-crust/grid/sscn/nn/fixed/rupture-sets.json
index 57a2f8b0f19de65fb7744fdcb2f806e2dec5f8e8..1e47be7c04b0a580f81313fcb6b6f3ee9fddb422 100644
--- a/stable-crust/grid/sscn/nn/fixed/rupture-sets.json
+++ b/stable-crust/grid/sscn/nn/fixed/rupture-sets.json
@@ -3,49 +3,49 @@
     "name": "SSCn Craton [1,9,10] (nn, fixed)",
     "id": 80232,
     "feature": 8013,
-    "mfd-tree": "grid-mmax-craton",
+    "mfd-tree": "grid-mmax-craton-nn",
     "spatial-pdf": "pdf-nn-fixed.csv"
   },
   {
     "name": "SSCn Gulf Coast [2,3] (nn, fixed)",
     "id": 80242,
     "feature": 8014,
-    "mfd-tree": "grid-mmax-margin-1",
+    "mfd-tree": "grid-mmax-margin-1-nn",
     "spatial-pdf": "pdf-nn-fixed.csv"
   },
   {
     "name": "SSCn Mesozoic [4,5] (nn, fixed)",
     "id": 80252,
     "feature": 8015,
-    "mfd-tree": "grid-mmax-margin-1",
+    "mfd-tree": "grid-mmax-margin-1-nn",
     "spatial-pdf": "pdf-nn-fixed.csv"
   },
   {
     "name": "SSCn Mesozoic [6] (nn, fixed)",
     "id": 80262,
     "feature": 8016,
-    "mfd-tree": "grid-mmax-margin-2",
+    "mfd-tree": "grid-mmax-margin-2-nn",
     "spatial-pdf": "pdf-nn-fixed.csv"
   },
   {
     "name": "SSCn Paleozoic [7] (nn, fixed)",
     "id": 80272,
     "feature": 8017,
-    "mfd-tree": "grid-mmax-margin-2",
+    "mfd-tree": "grid-mmax-margin-2-nn",
     "spatial-pdf": "pdf-nn-fixed.csv"
   },
   {
     "name": "SSCn Paleozoic [8] (nn, fixed)",
     "id": 80282,
     "feature": 8018,
-    "mfd-tree": "grid-mmax-margin-2",
+    "mfd-tree": "grid-mmax-margin-2-nn",
     "spatial-pdf": "pdf-nn-fixed.csv"
   },
   {
     "name": "SSCn default (nn, fixed)",
     "id": 80292,
     "feature": 8019,
-    "mfd-tree": "grid-mmax-craton",
+    "mfd-tree": "grid-mmax-craton-nn",
     "spatial-pdf": "pdf-nn-fixed.csv"
   }
 ]
diff --git a/stable-crust/grid/sscn/r85/adaptive/rate-tree.json b/stable-crust/grid/sscn/r85/adaptive/rate-tree.json
index ee68a43234e1df86e5bcbb3145d3d9dd870ec1c9..cb1c35c16059dd7951a63e13684da7ba99870a6b 100644
--- a/stable-crust/grid/sscn/r85/adaptive/rate-tree.json
+++ b/stable-crust/grid/sscn/r85/adaptive/rate-tree.json
@@ -2,6 +2,6 @@
   {
     "id": "R1",
     "weight": 1.0,
-    "value" : 8491.730594
+    "value" : 5358.070262599910
   }
 ]
diff --git a/stable-crust/grid/sscn/r85/adaptive/rupture-sets.json b/stable-crust/grid/sscn/r85/adaptive/rupture-sets.json
index c8c3892b6f584863afaa599f45a4af6ed8eada08..34679af54ffb553001dfe4fcf346ab1d648eb30c 100644
--- a/stable-crust/grid/sscn/r85/adaptive/rupture-sets.json
+++ b/stable-crust/grid/sscn/r85/adaptive/rupture-sets.json
@@ -3,49 +3,49 @@
     "name": "SSCn Craton [1,9,10] (r85, adaptive)",
     "id": 80333,
     "feature": 8013,
-    "mfd-tree": "grid-mmax-craton",
+    "mfd-tree": "grid-mmax-craton-r85",
     "spatial-pdf": "pdf-r85-adaptive.csv"
   },
   {
     "name": "SSCn Gulf Coast [2,3] (r85, adaptive)",
     "id": 80343,
     "feature": 8014,
-    "mfd-tree": "grid-mmax-margin-1",
+    "mfd-tree": "grid-mmax-margin-1-r85",
     "spatial-pdf": "pdf-r85-adaptive.csv"
   },
   {
     "name": "SSCn Mesozoic [4,5] (r85, adaptive)",
     "id": 80353,
     "feature": 8015,
-    "mfd-tree": "grid-mmax-margin-1",
+    "mfd-tree": "grid-mmax-margin-1-r85",
     "spatial-pdf": "pdf-r85-adaptive.csv"
   },
   {
     "name": "SSCn Mesozoic [6] (r85, adaptive)",
     "id": 80363,
     "feature": 8016,
-    "mfd-tree": "grid-mmax-margin-2",
+    "mfd-tree": "grid-mmax-margin-2-r85",
     "spatial-pdf": "pdf-r85-adaptive.csv"
   },
   {
     "name": "SSCn Paleozoic [7] (r85, adaptive)",
     "id": 80373,
     "feature": 8017,
-    "mfd-tree": "grid-mmax-margin-2",
+    "mfd-tree": "grid-mmax-margin-2-r85",
     "spatial-pdf": "pdf-r85-adaptive.csv"
   },
   {
     "name": "SSCn Paleozoic [8] (r85, adaptive)",
     "id": 80383,
     "feature": 8018,
-    "mfd-tree": "grid-mmax-margin-2",
+    "mfd-tree": "grid-mmax-margin-2-r85",
     "spatial-pdf": "pdf-r85-adaptive.csv"
   },
   {
     "name": "SSCn default (r85, adaptive)",
     "id": 80393,
     "feature": 8019,
-    "mfd-tree": "grid-mmax-craton",
+    "mfd-tree": "grid-mmax-craton-r85",
     "spatial-pdf": "pdf-r85-adaptive.csv"
   }
 ]
diff --git a/stable-crust/grid/sscn/r85/fixed/rate-tree.json b/stable-crust/grid/sscn/r85/fixed/rate-tree.json
index 20a78021fc413f4f3472bdf9b5c8785ea198326f..cb1c35c16059dd7951a63e13684da7ba99870a6b 100644
--- a/stable-crust/grid/sscn/r85/fixed/rate-tree.json
+++ b/stable-crust/grid/sscn/r85/fixed/rate-tree.json
@@ -2,6 +2,6 @@
   {
     "id": "R1",
     "weight": 1.0,
-    "value" : 8167.91820768891
+    "value" : 5358.070262599910
   }
 ]
diff --git a/stable-crust/grid/sscn/r85/fixed/rupture-sets.json b/stable-crust/grid/sscn/r85/fixed/rupture-sets.json
index dfb4761edca56bef7efe6a4b2c516c72b7ee5fdf..17d0a60cb3f579569fe0d898ebb1a247c9bf83ef 100644
--- a/stable-crust/grid/sscn/r85/fixed/rupture-sets.json
+++ b/stable-crust/grid/sscn/r85/fixed/rupture-sets.json
@@ -3,49 +3,49 @@
     "name": "SSCn Craton [1,9,10] (r85, fixed)",
     "id": 80233,
     "feature": 8013,
-    "mfd-tree": "grid-mmax-craton",
+    "mfd-tree": "grid-mmax-craton-r85",
     "spatial-pdf": "pdf-r85-fixed.csv"
   },
   {
     "name": "SSCn Gulf Coast [2,3] (r85, fixed)",
     "id": 80243,
     "feature": 8014,
-    "mfd-tree": "grid-mmax-margin-1",
+    "mfd-tree": "grid-mmax-margin-1-r85",
     "spatial-pdf": "pdf-r85-fixed.csv"
   },
   {
     "name": "SSCn Mesozoic [4,5] (r85, fixed)",
     "id": 80253,
     "feature": 8015,
-    "mfd-tree": "grid-mmax-margin-1",
+    "mfd-tree": "grid-mmax-margin-1-r85",
     "spatial-pdf": "pdf-r85-fixed.csv"
   },
   {
     "name": "SSCn Mesozoic [6] (r85, fixed)",
     "id": 80263,
     "feature": 8016,
-    "mfd-tree": "grid-mmax-margin-2",
+    "mfd-tree": "grid-mmax-margin-2-r85",
     "spatial-pdf": "pdf-r85-fixed.csv"
   },
   {
     "name": "SSCn Paleozoic [7] (r85, fixed)",
     "id": 80273,
     "feature": 8017,
-    "mfd-tree": "grid-mmax-margin-2",
+    "mfd-tree": "grid-mmax-margin-2-r85",
     "spatial-pdf": "pdf-r85-fixed.csv"
   },
   {
     "name": "SSCn Paleozoic [8] (r85, fixed)",
     "id": 80283,
     "feature": 8018,
-    "mfd-tree": "grid-mmax-margin-2",
+    "mfd-tree": "grid-mmax-margin-2-r85",
     "spatial-pdf": "pdf-r85-fixed.csv"
   },
   {
     "name": "SSCn default (r85, fixed)",
     "id": 80293,
     "feature": 8019,
-    "mfd-tree": "grid-mmax-craton",
+    "mfd-tree": "grid-mmax-craton-r85",
     "spatial-pdf": "pdf-r85-fixed.csv"
   }
 ]
diff --git a/stable-crust/grid/usgs/gk/adaptive/rate-tree.json b/stable-crust/grid/usgs/gk/adaptive/rate-tree.json
index ee68a43234e1df86e5bcbb3145d3d9dd870ec1c9..b20a3bcca83c7ed8034d3a98c1b88167ec8578f2 100644
--- a/stable-crust/grid/usgs/gk/adaptive/rate-tree.json
+++ b/stable-crust/grid/usgs/gk/adaptive/rate-tree.json
@@ -2,6 +2,6 @@
   {
     "id": "R1",
     "weight": 1.0,
-    "value" : 8491.730594
+    "value" : 1626.931380639120
   }
 ]
diff --git a/stable-crust/grid/usgs/gk/adaptive/rupture-sets.json b/stable-crust/grid/usgs/gk/adaptive/rupture-sets.json
index e9aaf27917ad5b3c9f63a5955b672b8db5beff04..dc80c4becea0eefa8b063a7d0375e19e4007da02 100644
--- a/stable-crust/grid/usgs/gk/adaptive/rupture-sets.json
+++ b/stable-crust/grid/usgs/gk/adaptive/rupture-sets.json
@@ -3,21 +3,21 @@
     "name": "USGS Craton [1,3,4] (gk, adaptive)",
     "id": 80301,
     "feature": 8010,
-    "mfd-tree": "grid-mmax-craton",
+    "mfd-tree": "grid-mmax-craton-gk",
     "spatial-pdf": "pdf-gk-adaptive.csv"
   },
   {
     "name": "USGS Extended Margin [2] (gk, adaptive)",
     "id": 80311,
     "feature": 8011,
-    "mfd-tree": "grid-mmax-margin-1",
+    "mfd-tree": "grid-mmax-margin-1-gk",
     "spatial-pdf": "pdf-gk-adaptive.csv"
   },
   {
     "name": "USGS default (gk, adaptive)",
     "id": 80321,
     "feature": 8012,
-    "mfd-tree": "grid-mmax-craton",
+    "mfd-tree": "grid-mmax-craton-gk",
     "spatial-pdf": "pdf-gk-adaptive.csv"
   }
 ]
diff --git a/stable-crust/grid/usgs/gk/fixed/rate-tree.json b/stable-crust/grid/usgs/gk/fixed/rate-tree.json
index 20a78021fc413f4f3472bdf9b5c8785ea198326f..b20a3bcca83c7ed8034d3a98c1b88167ec8578f2 100644
--- a/stable-crust/grid/usgs/gk/fixed/rate-tree.json
+++ b/stable-crust/grid/usgs/gk/fixed/rate-tree.json
@@ -2,6 +2,6 @@
   {
     "id": "R1",
     "weight": 1.0,
-    "value" : 8167.91820768891
+    "value" : 1626.931380639120
   }
 ]
diff --git a/stable-crust/grid/usgs/gk/fixed/rupture-sets.json b/stable-crust/grid/usgs/gk/fixed/rupture-sets.json
index 3692a1052814dad4bfaeed3d04317303192d0f54..df5b699a3336eb94be7a91c1f84e8713341cc5e2 100644
--- a/stable-crust/grid/usgs/gk/fixed/rupture-sets.json
+++ b/stable-crust/grid/usgs/gk/fixed/rupture-sets.json
@@ -3,21 +3,21 @@
     "name": "USGS Craton [1,3,4] (gk, fixed)",
     "id": 80201,
     "feature": 8010,
-    "mfd-tree": "grid-mmax-craton",
+    "mfd-tree": "grid-mmax-craton-gk",
     "spatial-pdf": "pdf-gk-fixed.csv"
   },
   {
     "name": "USGS Extended Margin [2] (gk, fixed)",
     "id": 80211,
     "feature": 8011,
-    "mfd-tree": "grid-mmax-margin-1",
+    "mfd-tree": "grid-mmax-margin-1-gk",
     "spatial-pdf": "pdf-gk-fixed.csv"
   },
   {
     "name": "USGS default (gk, fixed)",
     "id": 80221,
     "feature": 8012,
-    "mfd-tree": "grid-mmax-craton",
+    "mfd-tree": "grid-mmax-craton-gk",
     "spatial-pdf": "pdf-gk-fixed.csv"
   }
 ]
diff --git a/stable-crust/grid/usgs/nn/adaptive/rate-tree.json b/stable-crust/grid/usgs/nn/adaptive/rate-tree.json
index ee68a43234e1df86e5bcbb3145d3d9dd870ec1c9..a36a2dfa0a9b6315f53829aa0877410983b57ab5 100644
--- a/stable-crust/grid/usgs/nn/adaptive/rate-tree.json
+++ b/stable-crust/grid/usgs/nn/adaptive/rate-tree.json
@@ -2,6 +2,6 @@
   {
     "id": "R1",
     "weight": 1.0,
-    "value" : 8491.730594
+    "value" : 4347.002141478890
   }
 ]
diff --git a/stable-crust/grid/usgs/nn/adaptive/rupture-sets.json b/stable-crust/grid/usgs/nn/adaptive/rupture-sets.json
index bce1c3ea2f944a5bcd9dbbc01f72fd195b38b2fb..87723e777b8cf5319c14f659df0996321ba39fab 100644
--- a/stable-crust/grid/usgs/nn/adaptive/rupture-sets.json
+++ b/stable-crust/grid/usgs/nn/adaptive/rupture-sets.json
@@ -3,21 +3,21 @@
     "name": "USGS Craton [1,3,4] (nn, adaptive)",
     "id": 80302,
     "feature": 8010,
-    "mfd-tree": "grid-mmax-craton",
+    "mfd-tree": "grid-mmax-craton-nn",
     "spatial-pdf": "pdf-nn-adaptive.csv"
   },
   {
     "name": "USGS Extended Margin [2] (nn, adaptive)",
     "id": 80312,
     "feature": 8011,
-    "mfd-tree": "grid-mmax-margin-1",
+    "mfd-tree": "grid-mmax-margin-1-nn",
     "spatial-pdf": "pdf-nn-adaptive.csv"
   },
   {
     "name": "USGS default (nn, adaptive)",
     "id": 80322,
     "feature": 8012,
-    "mfd-tree": "grid-mmax-craton",
+    "mfd-tree": "grid-mmax-craton-nn",
     "spatial-pdf": "pdf-nn-adaptive.csv"
   }
 ]
diff --git a/stable-crust/grid/usgs/nn/fixed/rate-tree.json b/stable-crust/grid/usgs/nn/fixed/rate-tree.json
index 20a78021fc413f4f3472bdf9b5c8785ea198326f..a36a2dfa0a9b6315f53829aa0877410983b57ab5 100644
--- a/stable-crust/grid/usgs/nn/fixed/rate-tree.json
+++ b/stable-crust/grid/usgs/nn/fixed/rate-tree.json
@@ -2,6 +2,6 @@
   {
     "id": "R1",
     "weight": 1.0,
-    "value" : 8167.91820768891
+    "value" : 4347.002141478890
   }
 ]
diff --git a/stable-crust/grid/usgs/nn/fixed/rupture-sets.json b/stable-crust/grid/usgs/nn/fixed/rupture-sets.json
index 637c168eb00c4d9d01d8d5ea07dcc3be8e012b68..cd953bc0033329eafc2f1daa81829426b3ceaa24 100644
--- a/stable-crust/grid/usgs/nn/fixed/rupture-sets.json
+++ b/stable-crust/grid/usgs/nn/fixed/rupture-sets.json
@@ -3,21 +3,21 @@
     "name": "USGS Craton [1,3,4] (nn, fixed)",
     "id": 80202,
     "feature": 8010,
-    "mfd-tree": "grid-mmax-craton",
+    "mfd-tree": "grid-mmax-craton-nn",
     "spatial-pdf": "pdf-nn-fixed.csv"
   },
   {
     "name": "USGS Extended Margin [2] (nn, fixed)",
     "id": 80212,
     "feature": 8011,
-    "mfd-tree": "grid-mmax-margin-1",
+    "mfd-tree": "grid-mmax-margin-1-nn",
     "spatial-pdf": "pdf-nn-fixed.csv"
   },
   {
     "name": "USGS default (nn, fixed)",
     "id": 80222,
     "feature": 8012,
-    "mfd-tree": "grid-mmax-craton",
+    "mfd-tree": "grid-mmax-craton-nn",
     "spatial-pdf": "pdf-nn-fixed.csv"
   }
 ]
diff --git a/stable-crust/grid/usgs/r85/adaptive/rate-tree.json b/stable-crust/grid/usgs/r85/adaptive/rate-tree.json
index ee68a43234e1df86e5bcbb3145d3d9dd870ec1c9..cb1c35c16059dd7951a63e13684da7ba99870a6b 100644
--- a/stable-crust/grid/usgs/r85/adaptive/rate-tree.json
+++ b/stable-crust/grid/usgs/r85/adaptive/rate-tree.json
@@ -2,6 +2,6 @@
   {
     "id": "R1",
     "weight": 1.0,
-    "value" : 8491.730594
+    "value" : 5358.070262599910
   }
 ]
diff --git a/stable-crust/grid/usgs/r85/adaptive/rupture-sets.json b/stable-crust/grid/usgs/r85/adaptive/rupture-sets.json
index 2422788803bf504d2c4559308725ea0452756cd4..12489a281a44b794bfd786fe025889b0ba6f3479 100644
--- a/stable-crust/grid/usgs/r85/adaptive/rupture-sets.json
+++ b/stable-crust/grid/usgs/r85/adaptive/rupture-sets.json
@@ -3,21 +3,21 @@
     "name": "USGS Craton [1,3,4] (r85, adaptive)",
     "id": 80303,
     "feature": 8010,
-    "mfd-tree": "grid-mmax-craton",
+    "mfd-tree": "grid-mmax-craton-r85",
     "spatial-pdf": "pdf-r85-adaptive.csv"
   },
   {
     "name": "USGS Extended Margin [2] (r85, adaptive)",
     "id": 80313,
     "feature": 8011,
-    "mfd-tree": "grid-mmax-margin-1",
+    "mfd-tree": "grid-mmax-margin-1-r85",
     "spatial-pdf": "pdf-r85-adaptive.csv"
   },
   {
     "name": "USGS default (r85, adaptive)",
     "id": 80323,
     "feature": 8012,
-    "mfd-tree": "grid-mmax-craton",
+    "mfd-tree": "grid-mmax-craton-r85",
     "spatial-pdf": "pdf-r85-adaptive.csv"
   }
 ]
diff --git a/stable-crust/grid/usgs/r85/fixed/rate-tree.json b/stable-crust/grid/usgs/r85/fixed/rate-tree.json
index 20a78021fc413f4f3472bdf9b5c8785ea198326f..cb1c35c16059dd7951a63e13684da7ba99870a6b 100644
--- a/stable-crust/grid/usgs/r85/fixed/rate-tree.json
+++ b/stable-crust/grid/usgs/r85/fixed/rate-tree.json
@@ -2,6 +2,6 @@
   {
     "id": "R1",
     "weight": 1.0,
-    "value" : 8167.91820768891
+    "value" : 5358.070262599910
   }
 ]
diff --git a/stable-crust/grid/usgs/r85/fixed/rupture-sets.json b/stable-crust/grid/usgs/r85/fixed/rupture-sets.json
index b713d3a470d23854f76e1e0ed450336ce2bbef38..32db76a170db2e06ec047f52d4b745536ad1b87c 100644
--- a/stable-crust/grid/usgs/r85/fixed/rupture-sets.json
+++ b/stable-crust/grid/usgs/r85/fixed/rupture-sets.json
@@ -3,21 +3,21 @@
     "name": "USGS Craton [1,3,4] (r85, fixed)",
     "id": 80203,
     "feature": 8010,
-    "mfd-tree": "grid-mmax-craton",
+    "mfd-tree": "grid-mmax-craton-r85",
     "spatial-pdf": "pdf-r85-fixed.csv"
   },
   {
     "name": "USGS Extended Margin [2] (r85, fixed)",
     "id": 80213,
     "feature": 8011,
-    "mfd-tree": "grid-mmax-margin-1",
+    "mfd-tree": "grid-mmax-margin-1-r85",
     "spatial-pdf": "pdf-r85-fixed.csv"
   },
   {
     "name": "USGS default (r85, fixed)",
     "id": 80223,
     "feature": 8012,
-    "mfd-tree": "grid-mmax-craton",
+    "mfd-tree": "grid-mmax-craton-r85",
     "spatial-pdf": "pdf-r85-fixed.csv"
   }
 ]