diff --git a/stable-crust/fault/CO/Cheraw/sscn/recurrence-rate/rupture-set.json b/stable-crust/fault/CO/Cheraw/sscn/recurrence-rate/rupture-set.json
index 0c685bf29cb1d63c050e3dff2afd32b90d9e4677..96bbd92b33498ccac8924eaf6dc47a00a5f010f8 100644
--- a/stable-crust/fault/CO/Cheraw/sscn/recurrence-rate/rupture-set.json
+++ b/stable-crust/fault/CO/Cheraw/sscn/recurrence-rate/rupture-set.json
@@ -1,5 +1,5 @@
 {
-  "name": "Cheraw (SSCn, full)",
+  "name": "Cheraw (SSCn, recurrence-rate, full)",
   "id": 2181,
   "mfd-tree": [
     { "id": "M1", "weight": 0.3, "value": { "type": "SINGLE", "m": 6.8 }},
diff --git a/stable-crust/fault/CO/Cheraw/sscn/slip-rate/full-rupture/rupture-set.json b/stable-crust/fault/CO/Cheraw/sscn/slip-rate/full-rupture/rupture-set.json
index ab299d178dbd3d80121fd24a5318dc3de57778c8..540caa6369366097e7ec0137e0ce42c10e3a59f1 100644
--- a/stable-crust/fault/CO/Cheraw/sscn/slip-rate/full-rupture/rupture-set.json
+++ b/stable-crust/fault/CO/Cheraw/sscn/slip-rate/full-rupture/rupture-set.json
@@ -1,5 +1,5 @@
 {
-  "name": "Cheraw (SSCn, full)",
+  "name": "Cheraw (SSCn, slip-rate, full)",
   "id": 2181,
   "mfd-tree": [
     { "id": "M1", "weight": 0.3, "value": { "type": "SINGLE", "m": 6.8, "rate": 1.987E-04 }},
diff --git a/stable-crust/fault/CO/Cheraw/sscn/slip-rate/partial-rupture/rupture-set.json b/stable-crust/fault/CO/Cheraw/sscn/slip-rate/partial-rupture/rupture-set.json
index d6589b4ecaeb0ac2fd2b2d99dbda97da6c3c37cd..1f6ea02bf23342d3c35eaf37925e3e15b4ee6d90 100644
--- a/stable-crust/fault/CO/Cheraw/sscn/slip-rate/partial-rupture/rupture-set.json
+++ b/stable-crust/fault/CO/Cheraw/sscn/slip-rate/partial-rupture/rupture-set.json
@@ -1,5 +1,5 @@
 {
-  "name": "Cheraw (SSCn, partial)",
+  "name": "Cheraw (SSCn, slip-rate, partial)",
   "id": 2181,
   "mfd-tree": [
     {
diff --git a/stable-crust/fault/CO/Cheraw/usgs/rupture-set.json b/stable-crust/fault/CO/Cheraw/usgs/rupture-set.json
index d2bc719c1540bd165e5a40bccecf552241e53d57..82ebfc97128c61432e6e04628e0287f4e271f615 100644
--- a/stable-crust/fault/CO/Cheraw/usgs/rupture-set.json
+++ b/stable-crust/fault/CO/Cheraw/usgs/rupture-set.json
@@ -7,8 +7,8 @@
       "weight": 0.5,
       "value": {
         "type": "SINGLE",
-        "m": 7.0,
-        "rate": 0.00020419
+        "m": 7.4,
+        "rate": 0.00005129
       }
     },
     {
@@ -16,10 +16,10 @@
       "weight": 0.5,
       "value": {
         "type": "GR",
-        "a": 2.39162,
+        "a": 2.01032,
         "b": 0.95,
         "mMin": 6.5,
-        "mMax": 7.0,
+        "mMax": 7.4,
         "Δm": 0.1
       }
     }
diff --git a/stable-crust/fault/MO/Commerce/2-eqs/rate-tree.json b/stable-crust/fault/MO/Commerce/2-eq/rate-tree.json
similarity index 100%
rename from stable-crust/fault/MO/Commerce/2-eqs/rate-tree.json
rename to stable-crust/fault/MO/Commerce/2-eq/rate-tree.json
diff --git a/stable-crust/fault/MO/Commerce/2-eqs/rupture-set.json b/stable-crust/fault/MO/Commerce/2-eq/rupture-set.json
similarity index 74%
rename from stable-crust/fault/MO/Commerce/2-eqs/rupture-set.json
rename to stable-crust/fault/MO/Commerce/2-eq/rupture-set.json
index 9cdd084f01e1e103e59ca1522c68149953ecf7e6..8c52ecb1b1fe0514c17516e83c88b82186124204 100644
--- a/stable-crust/fault/MO/Commerce/2-eqs/rupture-set.json
+++ b/stable-crust/fault/MO/Commerce/2-eq/rupture-set.json
@@ -1,5 +1,5 @@
 {
-  "name": "Commerce",
+  "name": "Commerce (2-eq)",
   "id": 60000,
   "mfd-tree": "commerce",
   "properties": {
diff --git a/stable-crust/fault/MO/Commerce/3-eqs/rate-tree.json b/stable-crust/fault/MO/Commerce/3-eq/rate-tree.json
similarity index 100%
rename from stable-crust/fault/MO/Commerce/3-eqs/rate-tree.json
rename to stable-crust/fault/MO/Commerce/3-eq/rate-tree.json
diff --git a/stable-crust/fault/MO/Commerce/3-eqs/rupture-set.json b/stable-crust/fault/MO/Commerce/3-eq/rupture-set.json
similarity index 74%
rename from stable-crust/fault/MO/Commerce/3-eqs/rupture-set.json
rename to stable-crust/fault/MO/Commerce/3-eq/rupture-set.json
index 9cdd084f01e1e103e59ca1522c68149953ecf7e6..d38d0010d2a867c188aef3e286e165b49f8a8dcf 100644
--- a/stable-crust/fault/MO/Commerce/3-eqs/rupture-set.json
+++ b/stable-crust/fault/MO/Commerce/3-eq/rupture-set.json
@@ -1,5 +1,5 @@
 {
-  "name": "Commerce",
+  "name": "Commerce (3-eq)",
   "id": 60000,
   "mfd-tree": "commerce",
   "properties": {
diff --git a/stable-crust/fault/MO/Commerce/source-tree.json b/stable-crust/fault/MO/Commerce/source-tree.json
index 72ca85432a72edc590ba723cddaae792480ded7a..5e3e3803ca5a4e5e31faaa44191ad38d12757c8c 100644
--- a/stable-crust/fault/MO/Commerce/source-tree.json
+++ b/stable-crust/fault/MO/Commerce/source-tree.json
@@ -1,10 +1,10 @@
 [
   {
-    "id": "2-eqs",
+    "id": "2-eq",
     "weight": 0.75
   },
   {
-    "id": "3-eqs",
+    "id": "3-eq",
     "weight": 0.25
   }
 ]
diff --git a/stable-crust/fault/TN/Eastern Rift Margin (North)/1-eq/rupture-set.json b/stable-crust/fault/TN/Eastern Rift Margin (North)/1-eq/rupture-set.json
index 87e8787d4607b1823542d60e803db8f6862c7d98..8e74f5ea9d914e83d7b9caa10c91315f6d7d339c 100644
--- a/stable-crust/fault/TN/Eastern Rift Margin (North)/1-eq/rupture-set.json	
+++ b/stable-crust/fault/TN/Eastern Rift Margin (North)/1-eq/rupture-set.json	
@@ -1,5 +1,5 @@
 {
-  "name": "Eastern Rift Margin (North)",
+  "name": "Eastern Rift Margin (North, 1-eq)",
   "id": 3800,
   "mfd-tree": "eastern-rift-margin-north",
   "properties": {
diff --git a/stable-crust/fault/TN/Eastern Rift Margin (North)/2-eqs/rate-tree.json b/stable-crust/fault/TN/Eastern Rift Margin (North)/2-eq/rate-tree.json
similarity index 100%
rename from stable-crust/fault/TN/Eastern Rift Margin (North)/2-eqs/rate-tree.json
rename to stable-crust/fault/TN/Eastern Rift Margin (North)/2-eq/rate-tree.json
diff --git a/stable-crust/fault/TN/Eastern Rift Margin (North)/2-eqs/rupture-set.json b/stable-crust/fault/TN/Eastern Rift Margin (North)/2-eq/rupture-set.json
similarity index 68%
rename from stable-crust/fault/TN/Eastern Rift Margin (North)/2-eqs/rupture-set.json
rename to stable-crust/fault/TN/Eastern Rift Margin (North)/2-eq/rupture-set.json
index 87e8787d4607b1823542d60e803db8f6862c7d98..c74c3a7db9ea8bbe8b2f51c31e804861625a20f0 100644
--- a/stable-crust/fault/TN/Eastern Rift Margin (North)/2-eqs/rupture-set.json	
+++ b/stable-crust/fault/TN/Eastern Rift Margin (North)/2-eq/rupture-set.json	
@@ -1,5 +1,5 @@
 {
-  "name": "Eastern Rift Margin (North)",
+  "name": "Eastern Rift Margin (North, 2-eq)",
   "id": 3800,
   "mfd-tree": "eastern-rift-margin-north",
   "properties": {
diff --git a/stable-crust/fault/TN/Eastern Rift Margin (North)/source-tree.json b/stable-crust/fault/TN/Eastern Rift Margin (North)/source-tree.json
index d841d062517268768cd5b344143b1fe57247df4a..8dbcf58ba94f7535999e69640be03a700a8cca01 100644
--- a/stable-crust/fault/TN/Eastern Rift Margin (North)/source-tree.json	
+++ b/stable-crust/fault/TN/Eastern Rift Margin (North)/source-tree.json	
@@ -4,7 +4,7 @@
     "weight": 0.9
   },
   {
-    "id": "2-eqs",
+    "id": "2-eq",
     "weight": 0.1
   }
 ]
diff --git a/stable-crust/fault/TN/Eastern Rift Margin (South)/crittenden-co/2-eqs/rate-tree.json b/stable-crust/fault/TN/Eastern Rift Margin (South)/crittenden-co/2-eq/rate-tree.json
similarity index 100%
rename from stable-crust/fault/TN/Eastern Rift Margin (South)/crittenden-co/2-eqs/rate-tree.json
rename to stable-crust/fault/TN/Eastern Rift Margin (South)/crittenden-co/2-eq/rate-tree.json
diff --git a/stable-crust/fault/TN/Eastern Rift Margin (South)/crittenden-co/3-eqs/rupture-set.json b/stable-crust/fault/TN/Eastern Rift Margin (South)/crittenden-co/2-eq/rupture-set.json
similarity index 68%
rename from stable-crust/fault/TN/Eastern Rift Margin (South)/crittenden-co/3-eqs/rupture-set.json
rename to stable-crust/fault/TN/Eastern Rift Margin (South)/crittenden-co/2-eq/rupture-set.json
index 057ce900694466c595c41938b975ade79f2279b3..4e7cf5a18b78f8ae450c46db892b92d0045c3f8f 100644
--- a/stable-crust/fault/TN/Eastern Rift Margin (South)/crittenden-co/3-eqs/rupture-set.json	
+++ b/stable-crust/fault/TN/Eastern Rift Margin (South)/crittenden-co/2-eq/rupture-set.json	
@@ -1,5 +1,5 @@
 {
-  "name": "Eastern Rift Margin (South) (crittenden-co)",
+  "name": "Eastern Rift Margin (South, Crittenden Co, 2-eq)",
   "id": 3801,
   "sections": [3802, 3803, 3806],
   "mfd-tree": "eastern-rift-margin-south",
diff --git a/stable-crust/fault/TN/Eastern Rift Margin (South)/crittenden-co/3-eqs/rate-tree.json b/stable-crust/fault/TN/Eastern Rift Margin (South)/crittenden-co/3-eq/rate-tree.json
similarity index 100%
rename from stable-crust/fault/TN/Eastern Rift Margin (South)/crittenden-co/3-eqs/rate-tree.json
rename to stable-crust/fault/TN/Eastern Rift Margin (South)/crittenden-co/3-eq/rate-tree.json
diff --git a/stable-crust/fault/TN/Eastern Rift Margin (South)/crittenden-co/4-eqs/rupture-set.json b/stable-crust/fault/TN/Eastern Rift Margin (South)/crittenden-co/3-eq/rupture-set.json
similarity index 68%
rename from stable-crust/fault/TN/Eastern Rift Margin (South)/crittenden-co/4-eqs/rupture-set.json
rename to stable-crust/fault/TN/Eastern Rift Margin (South)/crittenden-co/3-eq/rupture-set.json
index 057ce900694466c595c41938b975ade79f2279b3..ca52af80a32892150be5a69a8e7b557a2cb301f8 100644
--- a/stable-crust/fault/TN/Eastern Rift Margin (South)/crittenden-co/4-eqs/rupture-set.json	
+++ b/stable-crust/fault/TN/Eastern Rift Margin (South)/crittenden-co/3-eq/rupture-set.json	
@@ -1,5 +1,5 @@
 {
-  "name": "Eastern Rift Margin (South) (crittenden-co)",
+  "name": "Eastern Rift Margin (South, Crittenden Co, 3-eq)",
   "id": 3801,
   "sections": [3802, 3803, 3806],
   "mfd-tree": "eastern-rift-margin-south",
diff --git a/stable-crust/fault/TN/Eastern Rift Margin (South)/crittenden-co/4-eqs/rate-tree.json b/stable-crust/fault/TN/Eastern Rift Margin (South)/crittenden-co/4-eq/rate-tree.json
similarity index 100%
rename from stable-crust/fault/TN/Eastern Rift Margin (South)/crittenden-co/4-eqs/rate-tree.json
rename to stable-crust/fault/TN/Eastern Rift Margin (South)/crittenden-co/4-eq/rate-tree.json
diff --git a/stable-crust/fault/TN/Eastern Rift Margin (South)/crittenden-co/2-eqs/rupture-set.json b/stable-crust/fault/TN/Eastern Rift Margin (South)/crittenden-co/4-eq/rupture-set.json
similarity index 68%
rename from stable-crust/fault/TN/Eastern Rift Margin (South)/crittenden-co/2-eqs/rupture-set.json
rename to stable-crust/fault/TN/Eastern Rift Margin (South)/crittenden-co/4-eq/rupture-set.json
index 057ce900694466c595c41938b975ade79f2279b3..bbd4ffdd9aa48cfb62d5f01a0425620a0c0329ba 100644
--- a/stable-crust/fault/TN/Eastern Rift Margin (South)/crittenden-co/2-eqs/rupture-set.json	
+++ b/stable-crust/fault/TN/Eastern Rift Margin (South)/crittenden-co/4-eq/rupture-set.json	
@@ -1,5 +1,5 @@
 {
-  "name": "Eastern Rift Margin (South) (crittenden-co)",
+  "name": "Eastern Rift Margin (South, Crittenden Co, 4-eq)",
   "id": 3801,
   "sections": [3802, 3803, 3806],
   "mfd-tree": "eastern-rift-margin-south",
diff --git a/stable-crust/fault/TN/Eastern Rift Margin (South)/crittenden-co/source-tree.json b/stable-crust/fault/TN/Eastern Rift Margin (South)/crittenden-co/source-tree.json
index aee189bc57d7af87e8fae8d61e70892f19d107eb..15d3d296fe04ac57e7333b6a8a7b04f7dd6b85dc 100644
--- a/stable-crust/fault/TN/Eastern Rift Margin (South)/crittenden-co/source-tree.json	
+++ b/stable-crust/fault/TN/Eastern Rift Margin (South)/crittenden-co/source-tree.json	
@@ -1,14 +1,14 @@
 [
   {
-    "id": "2-eqs",
+    "id": "2-eq",
     "weight": 0.333
   },
   {
-    "id": "3-eqs",
+    "id": "3-eq",
     "weight": 0.334
   },
     {
-    "id": "4-eqs",
+    "id": "4-eq",
     "weight": 0.333
   }
 ]
diff --git a/stable-crust/fault/TN/Eastern Rift Margin (South)/meeman-shelby/2-eqs/rate-tree.json b/stable-crust/fault/TN/Eastern Rift Margin (South)/meeman-shelby/2-eq/rate-tree.json
similarity index 100%
rename from stable-crust/fault/TN/Eastern Rift Margin (South)/meeman-shelby/2-eqs/rate-tree.json
rename to stable-crust/fault/TN/Eastern Rift Margin (South)/meeman-shelby/2-eq/rate-tree.json
diff --git a/stable-crust/fault/TN/Eastern Rift Margin (South)/meeman-shelby/3-eqs/rupture-set.json b/stable-crust/fault/TN/Eastern Rift Margin (South)/meeman-shelby/2-eq/rupture-set.json
similarity index 67%
rename from stable-crust/fault/TN/Eastern Rift Margin (South)/meeman-shelby/3-eqs/rupture-set.json
rename to stable-crust/fault/TN/Eastern Rift Margin (South)/meeman-shelby/2-eq/rupture-set.json
index 19ccdda08dd5f1f3780eca32047d8e2d583b0d23..693bbfcb55d07f70767ce83132a9ce86954f4bf0 100644
--- a/stable-crust/fault/TN/Eastern Rift Margin (South)/meeman-shelby/3-eqs/rupture-set.json	
+++ b/stable-crust/fault/TN/Eastern Rift Margin (South)/meeman-shelby/2-eq/rupture-set.json	
@@ -1,5 +1,5 @@
 {
-  "name": "Eastern Rift Margin (South) (meeman-shelby)",
+  "name": "Eastern Rift Margin (South, Meeman-Shelby, 2-eq)",
   "id": 3805,
   "sections": [3802, 3804],
   "mfd-tree": "eastern-rift-margin-south",
diff --git a/stable-crust/fault/TN/Eastern Rift Margin (South)/meeman-shelby/3-eqs/rate-tree.json b/stable-crust/fault/TN/Eastern Rift Margin (South)/meeman-shelby/3-eq/rate-tree.json
similarity index 100%
rename from stable-crust/fault/TN/Eastern Rift Margin (South)/meeman-shelby/3-eqs/rate-tree.json
rename to stable-crust/fault/TN/Eastern Rift Margin (South)/meeman-shelby/3-eq/rate-tree.json
diff --git a/stable-crust/fault/TN/Eastern Rift Margin (South)/meeman-shelby/4-eqs/rupture-set.json b/stable-crust/fault/TN/Eastern Rift Margin (South)/meeman-shelby/3-eq/rupture-set.json
similarity index 67%
rename from stable-crust/fault/TN/Eastern Rift Margin (South)/meeman-shelby/4-eqs/rupture-set.json
rename to stable-crust/fault/TN/Eastern Rift Margin (South)/meeman-shelby/3-eq/rupture-set.json
index 19ccdda08dd5f1f3780eca32047d8e2d583b0d23..0e96e670ffc4e5ebee652430f0dd277e347dbac8 100644
--- a/stable-crust/fault/TN/Eastern Rift Margin (South)/meeman-shelby/4-eqs/rupture-set.json	
+++ b/stable-crust/fault/TN/Eastern Rift Margin (South)/meeman-shelby/3-eq/rupture-set.json	
@@ -1,5 +1,5 @@
 {
-  "name": "Eastern Rift Margin (South) (meeman-shelby)",
+  "name": "Eastern Rift Margin (South, Meeman-Shelby, 3-eq)",
   "id": 3805,
   "sections": [3802, 3804],
   "mfd-tree": "eastern-rift-margin-south",
diff --git a/stable-crust/fault/TN/Eastern Rift Margin (South)/meeman-shelby/4-eqs/rate-tree.json b/stable-crust/fault/TN/Eastern Rift Margin (South)/meeman-shelby/4-eq/rate-tree.json
similarity index 100%
rename from stable-crust/fault/TN/Eastern Rift Margin (South)/meeman-shelby/4-eqs/rate-tree.json
rename to stable-crust/fault/TN/Eastern Rift Margin (South)/meeman-shelby/4-eq/rate-tree.json
diff --git a/stable-crust/fault/TN/Eastern Rift Margin (South)/meeman-shelby/2-eqs/rupture-set.json b/stable-crust/fault/TN/Eastern Rift Margin (South)/meeman-shelby/4-eq/rupture-set.json
similarity index 67%
rename from stable-crust/fault/TN/Eastern Rift Margin (South)/meeman-shelby/2-eqs/rupture-set.json
rename to stable-crust/fault/TN/Eastern Rift Margin (South)/meeman-shelby/4-eq/rupture-set.json
index 19ccdda08dd5f1f3780eca32047d8e2d583b0d23..c4526ef8023bc9020ebdd1b9d6c1ffb27b6f6d26 100644
--- a/stable-crust/fault/TN/Eastern Rift Margin (South)/meeman-shelby/2-eqs/rupture-set.json	
+++ b/stable-crust/fault/TN/Eastern Rift Margin (South)/meeman-shelby/4-eq/rupture-set.json	
@@ -1,5 +1,5 @@
 {
-  "name": "Eastern Rift Margin (South) (meeman-shelby)",
+  "name": "Eastern Rift Margin (South, Meeman-Shelby, 4-eq)",
   "id": 3805,
   "sections": [3802, 3804],
   "mfd-tree": "eastern-rift-margin-south",
diff --git a/stable-crust/fault/TN/Eastern Rift Margin (South)/meeman-shelby/source-tree.json b/stable-crust/fault/TN/Eastern Rift Margin (South)/meeman-shelby/source-tree.json
index aee189bc57d7af87e8fae8d61e70892f19d107eb..15d3d296fe04ac57e7333b6a8a7b04f7dd6b85dc 100644
--- a/stable-crust/fault/TN/Eastern Rift Margin (South)/meeman-shelby/source-tree.json	
+++ b/stable-crust/fault/TN/Eastern Rift Margin (South)/meeman-shelby/source-tree.json	
@@ -1,14 +1,14 @@
 [
   {
-    "id": "2-eqs",
+    "id": "2-eq",
     "weight": 0.333
   },
   {
-    "id": "3-eqs",
+    "id": "3-eq",
     "weight": 0.334
   },
     {
-    "id": "4-eqs",
+    "id": "4-eq",
     "weight": 0.333
   }
 ]