diff --git a/subduction/interface/Cascadia/README.md b/subduction/interface/Cascadia/README.md
index 1fc89aa0977a3046d48445ad190b86e41873b99b..53ca998e6894ff3eb45e0069b353f7f10289c360 100644
--- a/subduction/interface/Cascadia/README.md
+++ b/subduction/interface/Cascadia/README.md
@@ -7,8 +7,8 @@ the ID: `3199`.
 ## Magnitude Frequency Distributions (MFDs)
 
 The single (a.k.a. 'characteristic') magnitude frequency distributions for the different sections
- and combinations thereof are based on the magnitude (area) scaling relations listed below,
- in order of increasing implied magnitude, and are identified as follows:
+and combinations thereof are based on the magnitude (area) scaling relations listed below,
+in order of increasing implied magnitude, and are identified as follows:
 
 * `M1`: Strasser et al. (2010)
 * `M2`: Murotani et al. (2008)
@@ -40,37 +40,47 @@ additive branches and to supply scale factors.
 The ID ranges of features used to define the geometry of current and past Casacadia models are
 listed in the table below.
 
-| Grouping              | ID Range       |
-| ---------------------:|:-------------- |
-| 2008 Sections         | `[3100..3103]` |
-| 2014/2018 Sections    | `[3110..3142]` |
-| 2014/2018 Ruptures    | `[3150..3149]` |
-| 2023 Sections         | `[3200..3281]` |
-| 2023 Ruptures         | `[3300..??]`   |
+| Grouping              | ID Range             |
+| ---------------------:|:-------------------- |
+| 2008 Sections         | `[3100..3103]`       |
+| 2014/2018 Sections    | `[3110..3142]`       |
+| 2014/2018 Ruptures    | `[3150..3149]`       |
+| 2023 Sections         | `[3200..3281]`       |
+| 2023 Ruptures         | `[100000..100902]`   |
 
+TODO: Most likely will change the rupture ID's for 2023. Replace in table.
 
 ## Rupture Reference (2023)
 
-The table below lists the IDs used for rupture sets on branches of the 2023
-Casacadia logic tree.
-
-| Sections             | 1    | 2    | 3    | 4    |                         |
-|:-------------------- |:----:|:----:|:----:|:----:|:-----------------------:|
-| Bottom               | 3200..3206 | 3207..3209 | 3210..3212 | 3213..3221 | |
-| Middle               | 3230..3236 | 3237..3239 | 3240..3242 | 3243..3251 | |
-| Top                  | 3260..3266 | 3267..3269 | 3270..3272 | 3273..3281 | |
-| __Ruptures__         |      |      |      |      | [ Bottom, Middle, Top ] |
-| Full, 1-2-3-4        | â—†    | â—†    | â—†    | â—†    | [ 3170, 3171, 3172 ]    |
-| Segmented, 1         | â—†    |      |      |      | [ 3110, 3111, 3112 ]    |
-| Segmented, 1-2       | â—†    | â—†    |      |      | [ 3150, 3151, 3152 ]    |
-| Segmented, 1-2-3     | â—†    | â—†    | â—†    |      | [ 3160, 3161, 3162 ]    |
-| Segmented, 4         |      |      |      | â—†    | [ 3140, 3141, 3142 ]    |
-| Unsegmented, 1-2-3   | â—†    | â—†    | â—†    |      | [ 3160, 3161, 3162 ]    |
-| Unsegmented, 1-2-3-4 | â—†    | â—†    | â—†    | â—†    | [ 3170, 3171, 3172 ]    |
-
-TODO GEA17 models need to be added to the table above, which may warrant reformatting
-to something more like the table below and/or names that more closely resemble the
-names in the spreadsheet GEA12 Case A etc.
+The table below lists the section IDs used for rupture sets on branches of the 2023 
+Cascadia logic tree. The Full and Unsegmented ruptures remain the same but the Segmented 
+ruptures now have a GEA12 branch (same as 2014/2018) and a  GEA17 branch. Sections have 
+also been split into 50-km subsections (e.g., 2014/2018 Section 1 is now 7 50-km sections 
+[1-1:1-7], Section 2 is now 3 50-km sections [2-1:2-3], Section 3 is now 3 50-km sections 
+[3-1:3-3], and Section 4 is now 9 50-km sections [4-1:4-9]). All section IDs have been 
+updated, and new rupture IDs have been assigned.
+
+| Sections                            | 1-1:1-7    | 2-1:2-3    | 3-1:3-3    | 4-1:4-9    |                            |
+|:----------------------------------- |:----------:|:----------:|:----------:|:----------:|:--------------------------:|
+| Bottom                              | 3200..3206 | 3207..3209 | 3210..3212 | 3213..3221 |                            |
+| Middle                              | 3230..3236 | 3237..3239 | 3240..3242 | 3243..3251 |                            |
+| Top                                 | 3260..3266 | 3267..3269 | 3270..3272 | 3273..3281 |                            |
+| __Ruptures__                        |            |            |            |            | [ Bottom, Middle, Top ]    |
+| Full, GEA12-A, 1-1:4-9              | â—†â—†â—†â—†â—†â—†â—†    | â—†â—†â—†        | â—†â—†â—†        | â—†â—†â—†â—†â—†â—†â—†â—†â—†  | [ 100002, 100001, 100000 ] |
+| Segmented, GEA12, D, 1-1:1-7        | â—†â—†â—†â—†â—†â—†â—†    |            |            |            | [ 100302, 100301, 100300 ] |
+| Segmented, GEA12, C, 1-1:2-3        | â—†â—†â—†â—†â—†â—†â—†    | â—†â—†â—†        |            |            | [ 100202, 100201, 100200 ] |
+| Segmented, GEA12, B, 1-1:3-3        | â—†â—†â—†â—†â—†â—†â—†    | â—†â—†â—†        | â—†â—†â—†        |            | [ 100102, 100101, 100100 ] |
+| Segmented, GEA12, Northern, 4-1:4-9 |            |            |            | â—†â—†â—†â—†â—†â—†â—†â—†â—†  | [ 100402, 100401, 100400 ] |
+| Segmented, GEA17, E, 1-3:1-4        | â—‡â—‡â—†â—†â—‡â—‡â—‡    |            |            |            | [ 100802, 100801, 100800 ] |
+| Segmented, GEA17, D, 1-1:1:6        | â—†â—†â—†â—†â—†â—†â—‡    |            |            |            | [ 100702, 100701, 100700 ] |
+| Segmented, GEA17, C', 1-1:2-3       | â—†â—†â—†â—†â—†â—†â—†    | â—†â—†â—†        |            |            | [ 100202, 100201, 100200 ] |
+| Segmented, GEA17, C, 1-1:3-2        | â—†â—†â—†â—†â—†â—†â—†    | â—†â—†â—†        | â—†â—†â—‡        |            | [ 100602, 100601, 100600 ] |
+| Segmented, GEA17, B, 1-1:4-3        | â—†â—†â—†â—†â—†â—†â—†    | â—†â—†â—†        | â—†â—†â—†        | â—†â—†â—†â—‡â—‡â—‡â—‡â—‡â—‡  | [ 100502, 100501, 100500 ] |   
+| Segmented, GEA17, F, 3-3:4-4        |            |            | â—‡â—‡â—†        | â—†â—†â—†â—†â—‡â—‡â—‡â—‡â—‡  | [ 100902, 100901, 100900 ] |
+| Unsegmented, GEA12-B, 1-1:3-3       | â—†â—†â—†â—†â—†â—†â—†    | â—†â—†â—†        | â—†â—†â—†        |            | [ 100102, 100101, 100100 ] |
+| Unsegmented, GEA12-A, 1-1:4-9       | â—†â—†â—†â—†â—†â—†â—†    | â—†â—†â—†        | â—†â—†â—†        | â—†â—†â—†â—†â—†â—†â—†â—†â—†  | [ 100002, 100001, 100000 ] |
+
+TODO: Most likely will change the rupture ID's for 2023. Replace in table.
 
 ## Cluster Model (2023)
 
@@ -112,21 +122,21 @@ IDs are 3380 to 3410.
 ## Rupture Reference (2014, 2018)
 
 The table below lists the IDs used for rupture sets on different branches of the 2014 & 2018
-Casacadia logic tree.
-
-| Sections             | 1    | 2    | 3    | 4    |                         |
-|:-------------------- |:----:|:----:|:----:|:----:|:-----------------------:|
-| Bottom               | 3110 | 3120 | 3130 | 3140 |                         |
-| Middle               | 3111 | 3121 | 3131 | 3141 |                         |
-| Top                  | 3112 | 3122 | 3132 | 3142 |                         |
-| __Ruptures__         |      |      |      |      | [ Bottom, Middle, Top ] |
-| Full, 1-2-3-4        | â—†    | â—†    | â—†    | â—†    | [ 3170, 3171, 3172 ]    |
-| Segmented, 1         | â—†    |      |      |      | [ 3110, 3111, 3112 ]    |
-| Segmented, 1-2       | â—†    | â—†    |      |      | [ 3150, 3151, 3152 ]    |
-| Segmented, 1-2-3     | â—†    | â—†    | â—†    |      | [ 3160, 3161, 3162 ]    |
-| Segmented, 4         |      |      |      | â—†    | [ 3140, 3141, 3142 ]    |
-| Unsegmented, 1-2-3   | â—†    | â—†    | â—†    |      | [ 3160, 3161, 3162 ]    |
-| Unsegmented, 1-2-3-4 | â—†    | â—†    | â—†    | â—†    | [ 3170, 3171, 3172 ]    |
+Cascadia logic tree (based on the GEA12 model).
+
+| Sections                | 1    | 2    | 3    | 4    |                         |
+|:----------------------- |:----:|:----:|:----:|:----:|:-----------------------:|
+| Bottom                  | 3110 | 3120 | 3130 | 3140 |                         |
+| Middle                  | 3111 | 3121 | 3131 | 3141 |                         |
+| Top                     | 3112 | 3122 | 3132 | 3142 |                         |
+| __Ruptures__            |      |      |      |      | [ Bottom, Middle, Top ] |
+| Full, A, 1-2-3-4        | â—†    | â—†    | â—†    | â—†    | [ 3170, 3171, 3172 ]    |
+| Segmented, D, 1         | â—†    |      |      |      | [ 3110, 3111, 3112 ]    |
+| Segmented, C, 1-2       | â—†    | â—†    |      |      | [ 3150, 3151, 3152 ]    |
+| Segmented, B, 1-2-3     | â—†    | â—†    | â—†    |      | [ 3160, 3161, 3162 ]    |
+| Segmented, Northern, 4  |      |      |      | â—†    | [ 3140, 3141, 3142 ]    |
+| Unsegmented, B, 1-2-3   | â—†    | â—†    | â—†    |      | [ 3160, 3161, 3162 ]    |
+| Unsegmented, A, 1-2-3-4 | â—†    | â—†    | â—†    | â—†    | [ 3170, 3171, 3172 ]    |
 
 ## Logic Tree Weight Adjustments
 
diff --git a/subduction/interface/Cascadia/bottom/full-rupture/cluster-out/rupture-set.json b/subduction/interface/Cascadia/bottom/full-rupture/cluster-out/rupture-set.json
index 27c3efdba52484d31b0a2b788ba6f82ad2fcc1ab..f67d2f96f23aac5b741d8c13fb202ff01495a5ee 100644
--- a/subduction/interface/Cascadia/bottom/full-rupture/cluster-out/rupture-set.json
+++ b/subduction/interface/Cascadia/bottom/full-rupture/cluster-out/rupture-set.json
@@ -1,6 +1,6 @@
 {
   "name": "Cascadia (full, bottom)",
-  "id": 3170,
+  "id": 100002,
   "sections": [
     3200, 3201, 3202, 3203, 3204, 3205, 3206,
     3207, 3208, 3209,
diff --git a/subduction/interface/Cascadia/bottom/full-rupture/source-tree-2.json b/subduction/interface/Cascadia/bottom/full-rupture/source-tree-2.json
deleted file mode 100644
index 5c8a6723e20830152d9e859a4a64d44abb0e1cba..0000000000000000000000000000000000000000
--- a/subduction/interface/Cascadia/bottom/full-rupture/source-tree-2.json
+++ /dev/null
@@ -1,6 +0,0 @@
-[
-  {
-    "id": "cluster-out",
-    "weight": 1.0
-  }
-]
diff --git a/subduction/interface/Cascadia/bottom/partial-rupture/segmented/sections-1-2-3/rupture-set.json b/subduction/interface/Cascadia/bottom/partial-rupture/segmented/GEA12/B/rupture-set.json
similarity index 51%
rename from subduction/interface/Cascadia/bottom/partial-rupture/segmented/sections-1-2-3/rupture-set.json
rename to subduction/interface/Cascadia/bottom/partial-rupture/segmented/GEA12/B/rupture-set.json
index 309fcdfddf74336e9810e14720a10a1a227c9a60..d0a5d8cb2370b2bcbad039efc1d05db1c6ee3763 100644
--- a/subduction/interface/Cascadia/bottom/partial-rupture/segmented/sections-1-2-3/rupture-set.json
+++ b/subduction/interface/Cascadia/bottom/partial-rupture/segmented/GEA12/B/rupture-set.json
@@ -1,10 +1,10 @@
 {
-  "name": "Cascadia (segmented, 1-2-3, bottom)",
-  "id": 3160,
+  "name": "Cascadia (segmented, GEA12, B, bottom)",
+  "id": 100102,
   "sections": [
     3200, 3201, 3202, 3203, 3204, 3205, 3206,
     3207, 3208, 3209,
     3210, 3211, 3212
   ],
-  "mfd-tree": "segmented-1-2-3-bottom"
+  "mfd-tree": "segmented-GEA12-B-bottom"
 }
diff --git a/subduction/interface/Cascadia/bottom/partial-rupture/segmented/GEA12/C/rupture-set.json b/subduction/interface/Cascadia/bottom/partial-rupture/segmented/GEA12/C/rupture-set.json
new file mode 100644
index 0000000000000000000000000000000000000000..8e3fd948cf1a6897cda837b1bfc27d291090d6d4
--- /dev/null
+++ b/subduction/interface/Cascadia/bottom/partial-rupture/segmented/GEA12/C/rupture-set.json
@@ -0,0 +1,9 @@
+{
+  "name": "Cascadia (segmented, GEA12, C, bottom)",
+  "id": 100202,
+  "sections": [
+    3200, 3201, 3202, 3203, 3204, 3205, 3206,
+    3207, 3208, 3209
+  ],
+  "mfd-tree": "segmented-GEA12-C-bottom"
+}
diff --git a/subduction/interface/Cascadia/bottom/partial-rupture/segmented/GEA12/D/rupture-set.json b/subduction/interface/Cascadia/bottom/partial-rupture/segmented/GEA12/D/rupture-set.json
new file mode 100644
index 0000000000000000000000000000000000000000..a0487d10a548ddf491ad76df67bb622c1abe1375
--- /dev/null
+++ b/subduction/interface/Cascadia/bottom/partial-rupture/segmented/GEA12/D/rupture-set.json
@@ -0,0 +1,8 @@
+{
+  "name": "Cascadia (segmented, GEA12, D, bottom)",
+  "id": 100302,
+  "sections": [
+    3200, 3201, 3202, 3203, 3204, 3205, 3206
+  ],
+  "mfd-tree": "segmented-GEA12-D-bottom"
+}
diff --git a/subduction/interface/Cascadia/bottom/partial-rupture/segmented/GEA12/northern/rupture-set.json b/subduction/interface/Cascadia/bottom/partial-rupture/segmented/GEA12/northern/rupture-set.json
new file mode 100644
index 0000000000000000000000000000000000000000..43da88c6bb4049a2c989e7d0aadd19041d28e291
--- /dev/null
+++ b/subduction/interface/Cascadia/bottom/partial-rupture/segmented/GEA12/northern/rupture-set.json
@@ -0,0 +1,8 @@
+{
+  "name": "Cascadia (segmented, GEA12, northern, bottom)",
+  "id": 100402,
+  "sections": [
+    3213, 3214, 3215, 3216, 3217, 3218, 3219, 3220, 3221
+  ],
+  "mfd-tree": "segmented-GEA12-northern-bottom"
+}
diff --git a/subduction/interface/Cascadia/bottom/partial-rupture/segmented/GEA12/source-group.json b/subduction/interface/Cascadia/bottom/partial-rupture/segmented/GEA12/source-group.json
new file mode 100644
index 0000000000000000000000000000000000000000..dc3028f0bfe817f82cece325c84e671675af1cb6
--- /dev/null
+++ b/subduction/interface/Cascadia/bottom/partial-rupture/segmented/GEA12/source-group.json
@@ -0,0 +1,18 @@
+[
+  {
+    "id": "B",
+    "scale": 1.0
+  },
+  {
+    "id": "C",
+    "scale": 1.0
+  },
+  {
+    "id": "D",
+    "scale": 1.0
+  }, 
+  {
+    "id": "northern",
+    "scale": 0.25
+  }
+]
diff --git a/subduction/interface/Cascadia/bottom/partial-rupture/segmented/GEA17/B/rupture-set.json b/subduction/interface/Cascadia/bottom/partial-rupture/segmented/GEA17/B/rupture-set.json
new file mode 100644
index 0000000000000000000000000000000000000000..35cab98cad8bdded1d3e9be8ba008a2c4a2d2d1b
--- /dev/null
+++ b/subduction/interface/Cascadia/bottom/partial-rupture/segmented/GEA17/B/rupture-set.json
@@ -0,0 +1,11 @@
+{
+  "name": "Cascadia (segmented, GEA17, B, bottom)",
+  "id": 100502,
+  "sections": [
+    3200, 3201, 3202, 3203, 3204, 3205, 3206,
+    3207, 3208, 3209,
+    3210, 3211, 3212,
+    3213, 3214, 3215
+  ],
+  "mfd-tree": "segmented-GEA17-B-bottom"
+}
diff --git a/subduction/interface/Cascadia/bottom/partial-rupture/segmented/GEA17/C'/rupture-set.json b/subduction/interface/Cascadia/bottom/partial-rupture/segmented/GEA17/C'/rupture-set.json
new file mode 100644
index 0000000000000000000000000000000000000000..163b7db4f1bbd5f69c99e9ad18cf1cfbcc7159da
--- /dev/null
+++ b/subduction/interface/Cascadia/bottom/partial-rupture/segmented/GEA17/C'/rupture-set.json
@@ -0,0 +1,9 @@
+{
+  "name": "Cascadia (segmented, GEA17, C', bottom)",
+  "id": 100202,
+  "sections": [
+    3200, 3201, 3202, 3203, 3204, 3205, 3206,
+    3207, 3208, 3209
+  ],
+  "mfd-tree": "segmented-GEA17-C'-bottom"
+}
diff --git a/subduction/interface/Cascadia/bottom/partial-rupture/segmented/GEA17/C/rupture-set.json b/subduction/interface/Cascadia/bottom/partial-rupture/segmented/GEA17/C/rupture-set.json
new file mode 100644
index 0000000000000000000000000000000000000000..1872a45f6da48d611da7e780b8d53ae5b5f1159c
--- /dev/null
+++ b/subduction/interface/Cascadia/bottom/partial-rupture/segmented/GEA17/C/rupture-set.json
@@ -0,0 +1,10 @@
+{
+  "name": "Cascadia (segmented, GEA17, C, bottom)",
+  "id": 100602,
+  "sections": [
+    3200, 3201, 3202, 3203, 3204, 3205, 3206,
+    3207, 3208, 3209,
+    3210, 3211
+  ],
+  "mfd-tree": "segmented-GEA17-C-bottom"
+}
diff --git a/subduction/interface/Cascadia/bottom/partial-rupture/segmented/GEA17/D/rupture-set.json b/subduction/interface/Cascadia/bottom/partial-rupture/segmented/GEA17/D/rupture-set.json
new file mode 100644
index 0000000000000000000000000000000000000000..3b612b87276f2968c27f9d1e4f1d0d4281b66610
--- /dev/null
+++ b/subduction/interface/Cascadia/bottom/partial-rupture/segmented/GEA17/D/rupture-set.json
@@ -0,0 +1,8 @@
+{
+  "name": "Cascadia (segmented, GEA17, D, bottom)",
+  "id": 100702,
+  "sections": [
+    3200, 3201, 3202, 3203, 3204, 3205
+  ],
+  "mfd-tree": "segmented-GEA17-D-bottom"
+}
diff --git a/subduction/interface/Cascadia/bottom/partial-rupture/segmented/GEA17/E/rupture-set.json b/subduction/interface/Cascadia/bottom/partial-rupture/segmented/GEA17/E/rupture-set.json
new file mode 100644
index 0000000000000000000000000000000000000000..aee01490bc83cb321cb3d75c26233a9a63ac99f6
--- /dev/null
+++ b/subduction/interface/Cascadia/bottom/partial-rupture/segmented/GEA17/E/rupture-set.json
@@ -0,0 +1,8 @@
+{
+  "name": "Cascadia (segmented, GEA17, E, bottom)",
+  "id": 100802,
+  "sections": [
+    3202, 3203
+  ],
+  "mfd-tree": "segmented-GEA17-E-bottom"
+}
diff --git a/subduction/interface/Cascadia/bottom/partial-rupture/segmented/GEA17/F/rupture-set.json b/subduction/interface/Cascadia/bottom/partial-rupture/segmented/GEA17/F/rupture-set.json
new file mode 100644
index 0000000000000000000000000000000000000000..c65042678643c5534290b400ecc763490436f8b7
--- /dev/null
+++ b/subduction/interface/Cascadia/bottom/partial-rupture/segmented/GEA17/F/rupture-set.json
@@ -0,0 +1,9 @@
+{
+  "name": "Cascadia (segmented, GEA17, F, bottom)",
+  "id": 100902,
+  "sections": [
+    3212,
+    3213, 3214, 3215, 3216
+  ],
+  "mfd-tree": "segmented-GEA17-F-bottom"
+}
diff --git a/subduction/interface/Cascadia/bottom/partial-rupture/segmented/GEA17/source-group.json b/subduction/interface/Cascadia/bottom/partial-rupture/segmented/GEA17/source-group.json
new file mode 100644
index 0000000000000000000000000000000000000000..65a420dda76403274215b4e5ca2d566905491459
--- /dev/null
+++ b/subduction/interface/Cascadia/bottom/partial-rupture/segmented/GEA17/source-group.json
@@ -0,0 +1,26 @@
+[
+  {
+    "id": "B",
+    "scale": 1.0
+  },
+  {
+    "id": "C",
+    "scale": 1.0
+  },
+  {
+    "id": "C'",
+    "scale": 1.0
+  },
+  {
+    "id": "D",
+    "scale": 1.0
+  },
+  {
+    "id": "E",
+    "scale": 1.0
+  },
+  {
+    "id": "F",
+    "scale": 1.0
+  }
+]
diff --git a/subduction/interface/Cascadia/bottom/partial-rupture/segmented/section-1/rupture-set.json b/subduction/interface/Cascadia/bottom/partial-rupture/segmented/section-1/rupture-set.json
deleted file mode 100644
index 4a0063b55434030ce6d65641c81e710230a45c6b..0000000000000000000000000000000000000000
--- a/subduction/interface/Cascadia/bottom/partial-rupture/segmented/section-1/rupture-set.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "Cascadia (segmented, 1, bottom)",
-  "id": 3110,
-  "sections": [
-    3200, 3201, 3202, 3203, 3204, 3205, 3206
-  ],
-  "mfd-tree": "segmented-1-bottom"
-}
diff --git a/subduction/interface/Cascadia/bottom/partial-rupture/segmented/section-4/rupture-set.json b/subduction/interface/Cascadia/bottom/partial-rupture/segmented/section-4/rupture-set.json
deleted file mode 100644
index dc8aa5d50d89fec1398a1155aceb7c192907da9b..0000000000000000000000000000000000000000
--- a/subduction/interface/Cascadia/bottom/partial-rupture/segmented/section-4/rupture-set.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "Cascadia (segmented, 4, bottom)",
-  "id": 3140,
-  "sections": [
-    3213, 3214, 3215, 3216, 3217, 3218, 3219, 3220, 3221
-  ],
-  "mfd-tree": "segmented-4-bottom"
-}
diff --git a/subduction/interface/Cascadia/bottom/partial-rupture/segmented/sections-1-2/rupture-set.json b/subduction/interface/Cascadia/bottom/partial-rupture/segmented/sections-1-2/rupture-set.json
deleted file mode 100644
index 9184d5b260cea0fa6a963f88b1d808159394542c..0000000000000000000000000000000000000000
--- a/subduction/interface/Cascadia/bottom/partial-rupture/segmented/sections-1-2/rupture-set.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "name": "Cascadia (segmented, 1-2, bottom)",
-  "id": 3150,
-  "sections": [
-    3200, 3201, 3202, 3203, 3204, 3205, 3206,
-    3207, 3208, 3209
-  ],
-  "mfd-tree": "segmented-1-2-bottom"
-}
diff --git a/subduction/interface/Cascadia/bottom/partial-rupture/segmented/source-group.json b/subduction/interface/Cascadia/bottom/partial-rupture/segmented/source-group.json
deleted file mode 100644
index 64a4ab9707a933b3d06b6680dcf0955d07403c0a..0000000000000000000000000000000000000000
--- a/subduction/interface/Cascadia/bottom/partial-rupture/segmented/source-group.json
+++ /dev/null
@@ -1,18 +0,0 @@
-[
-  {
-    "id": "section-1",
-    "scale": 1.2
-  },
-  {
-    "id": "sections-1-2",
-    "scale": 1.2
-  },
-  {
-    "id": "sections-1-2-3",
-    "scale": 1.2
-  },
-  {
-    "id": "section-4",
-    "scale": 0.25
-  }
-]
diff --git a/subduction/interface/Cascadia/bottom/partial-rupture/segmented/source-tree.json b/subduction/interface/Cascadia/bottom/partial-rupture/segmented/source-tree.json
new file mode 100644
index 0000000000000000000000000000000000000000..34c8b899a1aceea20c1af34b2eb04248a6a31fa3
--- /dev/null
+++ b/subduction/interface/Cascadia/bottom/partial-rupture/segmented/source-tree.json
@@ -0,0 +1,10 @@
+[
+  {
+    "id": "GEA12",
+    "weight": 0.5
+  },
+  {
+    "id": "GEA17",
+    "weight": 0.5
+  }
+]
diff --git a/subduction/interface/Cascadia/bottom/partial-rupture/unsegmented/sections-1-2-3-4/scaled/rupture-set.json b/subduction/interface/Cascadia/bottom/partial-rupture/unsegmented/GEA12-A/scaled/rupture-set.json
similarity index 74%
rename from subduction/interface/Cascadia/bottom/partial-rupture/unsegmented/sections-1-2-3-4/scaled/rupture-set.json
rename to subduction/interface/Cascadia/bottom/partial-rupture/unsegmented/GEA12-A/scaled/rupture-set.json
index 16165545ccfed0bb771548c9824e7857330dc5c0..d65b58e7f376f023305f075d24f0671567943279 100644
--- a/subduction/interface/Cascadia/bottom/partial-rupture/unsegmented/sections-1-2-3-4/scaled/rupture-set.json
+++ b/subduction/interface/Cascadia/bottom/partial-rupture/unsegmented/GEA12-A/scaled/rupture-set.json
@@ -1,6 +1,6 @@
 {
-  "name": "Cascadia (unsegmented, 1-2-3-4, bottom)",
-  "id": 3170,
+  "name": "Cascadia (unsegmented, GEA12-A, bottom)",
+  "id": 100002,
   "sections": [
     3200, 3201, 3202, 3203, 3204, 3205, 3206,
     3207, 3208, 3209,
diff --git a/subduction/interface/Cascadia/bottom/partial-rupture/unsegmented/sections-1-2-3-4/source-group.json b/subduction/interface/Cascadia/bottom/partial-rupture/unsegmented/GEA12-A/source-group.json
similarity index 100%
rename from subduction/interface/Cascadia/bottom/partial-rupture/unsegmented/sections-1-2-3-4/source-group.json
rename to subduction/interface/Cascadia/bottom/partial-rupture/unsegmented/GEA12-A/source-group.json
diff --git a/subduction/interface/Cascadia/bottom/partial-rupture/unsegmented/sections-1-2-3/scaled/rupture-set.json b/subduction/interface/Cascadia/bottom/partial-rupture/unsegmented/GEA12-B/scaled/rupture-set.json
similarity index 67%
rename from subduction/interface/Cascadia/bottom/partial-rupture/unsegmented/sections-1-2-3/scaled/rupture-set.json
rename to subduction/interface/Cascadia/bottom/partial-rupture/unsegmented/GEA12-B/scaled/rupture-set.json
index c9edfa5156a30785de1fc35d1a28b952e5cef9bc..b8f549087154d9ac1d8f440dd1974d7b8922199f 100644
--- a/subduction/interface/Cascadia/bottom/partial-rupture/unsegmented/sections-1-2-3/scaled/rupture-set.json
+++ b/subduction/interface/Cascadia/bottom/partial-rupture/unsegmented/GEA12-B/scaled/rupture-set.json
@@ -1,6 +1,6 @@
 {
-  "name": "Cascadia (unsegmented, 1-2-3, bottom)",
-  "id": 3160,
+  "name": "Cascadia (unsegmented, GEA12-B, bottom)",
+  "id": 100102,
   "sections": [
     3200, 3201, 3202, 3203, 3204, 3205, 3206,
     3207, 3208, 3209,
diff --git a/subduction/interface/Cascadia/bottom/partial-rupture/unsegmented/sections-1-2-3/source-group.json b/subduction/interface/Cascadia/bottom/partial-rupture/unsegmented/GEA12-B/source-group.json
similarity index 100%
rename from subduction/interface/Cascadia/bottom/partial-rupture/unsegmented/sections-1-2-3/source-group.json
rename to subduction/interface/Cascadia/bottom/partial-rupture/unsegmented/GEA12-B/source-group.json
diff --git a/subduction/interface/Cascadia/bottom/partial-rupture/unsegmented/source-tree.json b/subduction/interface/Cascadia/bottom/partial-rupture/unsegmented/source-tree.json
index fb1e0996df7f6b66fa0ce60a1beadd02589e3a4d..72cb587b7772aa3396851f3fe347381070a42896 100644
--- a/subduction/interface/Cascadia/bottom/partial-rupture/unsegmented/source-tree.json
+++ b/subduction/interface/Cascadia/bottom/partial-rupture/unsegmented/source-tree.json
@@ -1,10 +1,10 @@
 [
   {
-    "id": "sections-1-2-3",
+    "id": "GEA12-B",
     "weight": 0.75
   },
   {
-    "id": "sections-1-2-3-4",
+    "id": "GEA12-A",
     "weight": 0.25
   }
 ]
diff --git a/subduction/interface/Cascadia/mfd-map.json b/subduction/interface/Cascadia/mfd-map.json
index fca3c8834862630500518bc5eaeb36e4fc96c8d4..0d26d0f9e8ac41acaadfd117d3a31a691e28fac2 100644
--- a/subduction/interface/Cascadia/mfd-map.json
+++ b/subduction/interface/Cascadia/mfd-map.json
@@ -11,76 +11,166 @@
   ],
   "full-top": [
     { "id": "M1", "weight": 0.334, "value": { "type": "SINGLE", "m": 8.61, "rate": 0.0019 }},
-    { "id": "M2", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.72, "rate": 0.0019 }},
+    { "id": "M2", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.73, "rate": 0.0019 }},
     { "id": "M3", "weight": 0.333, "value": { "type": "SINGLE", "m": 9.01, "rate": 0.0019 }}
   ],
-  "segmented-1-2-3-bottom": [
-    { "id": "M1", "weight": 0.334, "value": { "type": "SINGLE", "m": 8.65, "rate": 0.0001739 }},
-    { "id": "M2", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.77, "rate": 0.0001739 }},
-    { "id": "M3", "weight": 0.333, "value": { "type": "SINGLE", "m": 9.07, "rate": 0.0001739 }}
-  ],
-  "segmented-1-2-3-middle": [
-    { "id": "M1", "weight": 0.334, "value": { "type": "SINGLE", "m": 8.44, "rate": 0.0001739 }},
-    { "id": "M2", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.53, "rate": 0.0001739 }},
-    { "id": "M3", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.78, "rate": 0.0001739 }}
-  ],
-  "segmented-1-2-3-top": [
-    { "id": "M1", "weight": 0.334, "value": { "type": "SINGLE", "m": 8.37, "rate": 0.0001739 }},
-    { "id": "M2", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.44, "rate": 0.0001739 }},
-    { "id": "M3", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.68, "rate": 0.0001739 }}
-  ],
-  "segmented-1-2-bottom": [
-    { "id": "M1", "weight": 0.334, "value": { "type": "SINGLE", "m": 8.55, "rate": 0.0003913 }},
-    { "id": "M2", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.65, "rate": 0.0003913 }},
-    { "id": "M3", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.92, "rate": 0.0003913 }}
-  ],
-  "segmented-1-2-middle": [
-    { "id": "M1", "weight": 0.334, "value": { "type": "SINGLE", "m": 8.33, "rate": 0.0003913 }},
-    { "id": "M2", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.39, "rate": 0.0003913 }},
-    { "id": "M3", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.62, "rate": 0.0003913 }}
-  ],
-  "segmented-1-2-top": [
-    { "id": "M1", "weight": 0.334, "value": { "type": "SINGLE", "m": 8.25, "rate": 0.0003913 }},
-    { "id": "M2", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.30, "rate": 0.0003913 }},
-    { "id": "M3", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.52, "rate": 0.0003913 }}
-  ],
-  "segmented-1-bottom": [
-    { "id": "M1", "weight": 0.334, "value": { "type": "SINGLE", "m": 8.42, "rate": 0.0004348 }},
-    { "id": "M2", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.50, "rate": 0.0004348 }},
-    { "id": "M3", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.75, "rate": 0.0004348 }}
-  ],
-  "segmented-1-middle": [
-    { "id": "M1", "weight": 0.334, "value": { "type": "SINGLE", "m": 8.19, "rate": 0.0004348 }},
-    { "id": "M2", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.22, "rate": 0.0004348 }},
-    { "id": "M3", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.43, "rate": 0.0004348 }}
-  ],
-  "segmented-1-top": [
-    { "id": "M1", "weight": 0.334, "value": { "type": "SINGLE", "m": 8.11, "rate": 0.0004348 }},
-    { "id": "M2", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.13, "rate": 0.0004348 }},
-    { "id": "M3", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.32, "rate": 0.0004348 }}
-  ],
-  "segmented-4-bottom": [
-    { "id": "M1", "weight": 0.334, "value": { "type": "SINGLE", "m": 8.54, "rate": 0.001 }},
+  "segmented-GEA12-D-bottom": [
+    { "id": "M1", "weight": 0.334, "value": { "type": "SINGLE", "m": 8.42, "rate": 0.0005438 }},
+    { "id": "M2", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.51, "rate": 0.0005438 }},
+    { "id": "M3", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.75, "rate": 0.0005438 }}
+  ],
+  "segmented-GEA12-D-middle": [
+    { "id": "M1", "weight": 0.334, "value": { "type": "SINGLE", "m": 8.19, "rate": 0.0005438 }},
+    { "id": "M2", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.23, "rate": 0.0005438 }},
+    { "id": "M3", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.43, "rate": 0.0005438 }}
+  ],
+  "segmented-GEA12-D-top": [
+    { "id": "M1", "weight": 0.334, "value": { "type": "SINGLE", "m": 8.12, "rate": 0.0005438 }},
+    { "id": "M2", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.14, "rate": 0.0005438 }},
+    { "id": "M3", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.33, "rate": 0.0005438 }}
+  ],
+  "segmented-GEA12-C-bottom": [
+    { "id": "M1", "weight": 0.334, "value": { "type": "SINGLE", "m": 8.55, "rate": 0.0004888 }},
+    { "id": "M2", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.65, "rate": 0.0004888 }},
+    { "id": "M3", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.92, "rate": 0.0004888 }}
+  ],
+  "segmented-GEA12-C-middle": [
+    { "id": "M1", "weight": 0.334, "value": { "type": "SINGLE", "m": 8.33, "rate": 0.0004888 }},
+    { "id": "M2", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.39, "rate": 0.0004888 }},
+    { "id": "M3", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.62, "rate": 0.0004888 }}
+  ],
+  "segmented-GEA12-C-top": [
+    { "id": "M1", "weight": 0.334, "value": { "type": "SINGLE", "m": 8.26, "rate": 0.0004888 }},
+    { "id": "M2", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.30, "rate": 0.0004888 }},
+    { "id": "M3", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.52, "rate": 0.0004888 }}
+  ],
+  "segmented-GEA12-B-bottom": [
+    { "id": "M1", "weight": 0.334, "value": { "type": "SINGLE", "m": 8.65, "rate": 0.0002174 }},
+    { "id": "M2", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.77, "rate": 0.0002174 }},
+    { "id": "M3", "weight": 0.333, "value": { "type": "SINGLE", "m": 9.07, "rate": 0.0002174 }}
+  ],
+  "segmented-GEA12-B-middle": [
+    { "id": "M1", "weight": 0.334, "value": { "type": "SINGLE", "m": 8.44, "rate": 0.0002174 }},
+    { "id": "M2", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.53, "rate": 0.0002174 }},
+    { "id": "M3", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.78, "rate": 0.0002174 }}
+  ],
+  "segmented-GEA12-B-top": [
+    { "id": "M1", "weight": 0.334, "value": { "type": "SINGLE", "m": 8.38, "rate": 0.0002174 }},
+    { "id": "M2", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.45, "rate": 0.0002174 }},
+    { "id": "M3", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.69, "rate": 0.0002174 }}
+  ],
+  "segmented-GEA12-northern-bottom": [
+    { "id": "M1", "weight": 0.334, "value": { "type": "SINGLE", "m": 8.53, "rate": 0.001 }},
     { "id": "M2", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.64, "rate": 0.001 }},
     { "id": "M3", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.91, "rate": 0.001 }}
   ],
-  "segmented-4-middle": [
+  "segmented-GEA12-northern-middle": [
     { "id": "M1", "weight": 0.334, "value": { "type": "SINGLE", "m": 8.43, "rate": 0.001 }},
     { "id": "M2", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.52, "rate": 0.001 }},
     { "id": "M3", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.77, "rate": 0.001 }}
   ],
-  "segmented-4-top": [
+  "segmented-GEA12-northern-top": [
     { "id": "M1", "weight": 0.334, "value": { "type": "SINGLE", "m": 8.34, "rate": 0.001 }},
     { "id": "M2", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.40, "rate": 0.001 }},
     { "id": "M3", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.63, "rate": 0.001 }}
   ],
+  "segmented-GEA17-E-bottom": [
+    { "id": "M1", "weight": 0.334, "value": { "type": "SINGLE", "m": 7.94, "rate": 0.000208 }},
+    { "id": "M2", "weight": 0.333, "value": { "type": "SINGLE", "m": 7.93, "rate": 0.000208 }},
+    { "id": "M3", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.09, "rate": 0.000208 }}
+  ],
+  "segmented-GEA17-E-middle": [
+    { "id": "M1", "weight": 0.334, "value": { "type": "SINGLE", "m": 7.68, "rate": 0.000208 }},
+    { "id": "M2", "weight": 0.333, "value": { "type": "SINGLE", "m": 7.63, "rate": 0.000208 }},
+    { "id": "M3", "weight": 0.333, "value": { "type": "SINGLE", "m": 7.73, "rate": 0.000208 }}
+  ],
+  "segmented-GEA17-E-top": [
+    { "id": "M1", "weight": 0.334, "value": { "type": "SINGLE", "m": 7.59, "rate": 0.000208 }},
+    { "id": "M2", "weight": 0.333, "value": { "type": "SINGLE", "m": 7.52, "rate": 0.000208 }},
+    { "id": "M3", "weight": 0.333, "value": { "type": "SINGLE", "m": 7.61, "rate": 0.000208 }}
+  ],
+  "segmented-GEA17-D-bottom": [
+    { "id": "M1", "weight": 0.334, "value": { "type": "SINGLE", "m": 8.37, "rate": 0.000468 }},
+    { "id": "M2", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.45, "rate": 0.000468 }},
+    { "id": "M3", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.68, "rate": 0.000468 }}
+  ],
+  "segmented-GEA17-D-middle": [
+    { "id": "M1", "weight": 0.334, "value": { "type": "SINGLE", "m": 8.14, "rate": 0.000468 }},
+    { "id": "M2", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.17, "rate": 0.000468 }},
+    { "id": "M3", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.36, "rate": 0.000468 }}
+  ],
+  "segmented-GEA17-D-top": [
+    { "id": "M1", "weight": 0.334, "value": { "type": "SINGLE", "m": 8.06, "rate": 0.000468 }},
+    { "id": "M2", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.07, "rate": 0.000468 }},
+    { "id": "M3", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.25, "rate": 0.000468 }}
+  ],
+  "segmented-GEA17-C'-bottom": [
+    { "id": "M1", "weight": 0.334, "value": { "type": "SINGLE", "m": 8.55, "rate": 0.000104 }},
+    { "id": "M2", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.65, "rate": 0.000104 }},
+    { "id": "M3", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.92, "rate": 0.000104 }}
+  ],
+  "segmented-GEA17-C'-middle": [
+    { "id": "M1", "weight": 0.334, "value": { "type": "SINGLE", "m": 8.33, "rate": 0.000104 }},
+    { "id": "M2", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.39, "rate": 0.000104 }},
+    { "id": "M3", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.62, "rate": 0.000104 }}
+  ],
+  "segmented-GEA17-C'-top": [
+    { "id": "M1", "weight": 0.334, "value": { "type": "SINGLE", "m": 8.26, "rate": 0.000104 }},
+    { "id": "M2", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.30, "rate": 0.000104 }},
+    { "id": "M3", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.52, "rate": 0.000104 }}
+  ],
+  "segmented-GEA17-C-bottom": [
+    { "id": "M1", "weight": 0.334, "value": { "type": "SINGLE", "m": 8.62, "rate": 0.000364 }},
+    { "id": "M2", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.73, "rate": 0.000364 }},
+    { "id": "M3", "weight": 0.333, "value": { "type": "SINGLE", "m": 9.02, "rate": 0.000364 }}
+  ],
+  "segmented-GEA17-C-middle": [
+    { "id": "M1", "weight": 0.334, "value": { "type": "SINGLE", "m": 8.41, "rate": 0.000364 }},
+    { "id": "M2", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.48, "rate": 0.000364 }},
+    { "id": "M3", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.73, "rate": 0.000364 }}
+  ],
+  "segmented-GEA17-C-top": [
+    { "id": "M1", "weight": 0.334, "value": { "type": "SINGLE", "m": 8.34, "rate": 0.000364 }},
+    { "id": "M2", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.40, "rate": 0.000364 }},
+    { "id": "M3", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.63, "rate": 0.000364 }}
+  ],
+  "segmented-GEA17-B-bottom": [
+    { "id": "M1", "weight": 0.334, "value": { "type": "SINGLE", "m": 8.75, "rate": 0.000156 }},
+    { "id": "M2", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.89, "rate": 0.000156 }},
+    { "id": "M3", "weight": 0.333, "value": { "type": "SINGLE", "m": 9.20, "rate": 0.000156 }}
+  ],
+  "segmented-GEA17-B-middle": [
+    { "id": "M1", "weight": 0.334, "value": { "type": "SINGLE", "m": 8.57, "rate": 0.000156 }},
+    { "id": "M2", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.67, "rate": 0.000156 }},
+    { "id": "M3", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.95, "rate": 0.000156 }}
+  ],
+  "segmented-GEA17-B-top": [
+    { "id": "M1", "weight": 0.334, "value": { "type": "SINGLE", "m": 8.49, "rate": 0.000156 }},
+    { "id": "M2", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.59, "rate": 0.000156 }},
+    { "id": "M3", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.85, "rate": 0.000156 }}
+  ],
+  "segmented-GEA17-F-bottom": [
+    { "id": "M1", "weight": 0.334, "value": { "type": "SINGLE", "m": 8.40, "rate": 0.0001 }},
+    { "id": "M2", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.47, "rate": 0.0001 }},
+    { "id": "M3", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.71, "rate": 0.0001 }}
+  ],
+  "segmented-GEA17-F-middle": [
+    { "id": "M1", "weight": 0.334, "value": { "type": "SINGLE", "m": 8.28, "rate": 0.0001 }},
+    { "id": "M2", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.33, "rate": 0.0001 }},
+    { "id": "M3", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.55, "rate": 0.0001 }}
+  ],
+  "segmented-GEA17-F-top": [
+    { "id": "M1", "weight": 0.334, "value": { "type": "SINGLE", "m": 8.19, "rate": 0.0001 }},
+    { "id": "M2", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.23, "rate": 0.0001 }},
+    { "id": "M3", "weight": 0.333, "value": { "type": "SINGLE", "m": 8.43, "rate": 0.0001 }}
+  ],
   "unsegmented": [
     { 
       "id": "B0",
       "weight": 0.5,
       "value": { 
         "type": "GR",
-        "a": -3.90309,
+        "a": -3.806,
         "b": 0.0,
         "mMin": 7.95,
         "mMax": 8.75,
@@ -92,7 +182,7 @@
       "weight": 0.5,
       "value": {
         "type": "GR",
-        "a": 4.388115,
+        "a": 4.485,
         "b": 1.0,
         "mMin": 7.95,
         "mMax": 8.75,
@@ -100,7 +190,6 @@
       }
     }
   ],
-
   "cluster-2-1-bottom": [
     { "id": "M1", "weight": 0.125, "value": { "type": "SINGLE", "m": 8.58 }},
     { "id": "M2", "weight": 0.125, "value": { "type": "SINGLE", "m": 8.69 }},
diff --git a/subduction/interface/Cascadia/middle/full-rupture/cluster-out/rupture-set.json b/subduction/interface/Cascadia/middle/full-rupture/cluster-out/rupture-set.json
index b7dfdad0e3883fcd89f178c974030a01f8e7b31f..ea9b147369f61437b381df595c63099214655385 100644
--- a/subduction/interface/Cascadia/middle/full-rupture/cluster-out/rupture-set.json
+++ b/subduction/interface/Cascadia/middle/full-rupture/cluster-out/rupture-set.json
@@ -1,6 +1,6 @@
 {
   "name": "Cascadia (full, middle)",
-  "id": 3171,
+  "id": 100001,
   "sections": [
     3230, 3231, 3232, 3233, 3234, 3235, 3236,
     3237, 3238, 3239,
diff --git a/subduction/interface/Cascadia/middle/full-rupture/source-tree-2.json b/subduction/interface/Cascadia/middle/full-rupture/source-tree-2.json
deleted file mode 100644
index 5c8a6723e20830152d9e859a4a64d44abb0e1cba..0000000000000000000000000000000000000000
--- a/subduction/interface/Cascadia/middle/full-rupture/source-tree-2.json
+++ /dev/null
@@ -1,6 +0,0 @@
-[
-  {
-    "id": "cluster-out",
-    "weight": 1.0
-  }
-]
diff --git a/subduction/interface/Cascadia/middle/partial-rupture/segmented/sections-1-2-3/rupture-set.json b/subduction/interface/Cascadia/middle/partial-rupture/segmented/GEA12/B/rupture-set.json
similarity index 51%
rename from subduction/interface/Cascadia/middle/partial-rupture/segmented/sections-1-2-3/rupture-set.json
rename to subduction/interface/Cascadia/middle/partial-rupture/segmented/GEA12/B/rupture-set.json
index a4dbdda0e9e8b217e029da8f075faa5ca954eb5c..be6fa131a63b96d0689527c547fb9262eff06680 100644
--- a/subduction/interface/Cascadia/middle/partial-rupture/segmented/sections-1-2-3/rupture-set.json
+++ b/subduction/interface/Cascadia/middle/partial-rupture/segmented/GEA12/B/rupture-set.json
@@ -1,10 +1,10 @@
 {
-  "name": "Cascadia (segmented, 1-2-3, middle)",
-  "id": 3161,
+  "name": "Cascadia (segmented, GEA12, B, middle)",
+  "id": 100101,
   "sections": [
     3230, 3231, 3232, 3233, 3234, 3235, 3236,
     3237, 3238, 3239,
     3240, 3241, 3242
   ],
-  "mfd-tree": "segmented-1-2-3-middle"
+  "mfd-tree": "segmented-GEA12-B-middle"
 }
diff --git a/subduction/interface/Cascadia/middle/partial-rupture/segmented/GEA12/C/rupture-set.json b/subduction/interface/Cascadia/middle/partial-rupture/segmented/GEA12/C/rupture-set.json
new file mode 100644
index 0000000000000000000000000000000000000000..7886346440ad9472428f72d235dc0c567afe116f
--- /dev/null
+++ b/subduction/interface/Cascadia/middle/partial-rupture/segmented/GEA12/C/rupture-set.json
@@ -0,0 +1,9 @@
+{
+  "name": "Cascadia (segmented, GEA12, C, middle)",
+  "id": 100201,
+  "sections": [
+    3230, 3231, 3232, 3233, 3234, 3235, 3236,
+    3237, 3238, 3239
+  ],
+  "mfd-tree": "segmented-GEA12-C-middle"
+}
diff --git a/subduction/interface/Cascadia/middle/partial-rupture/segmented/GEA12/D/rupture-set.json b/subduction/interface/Cascadia/middle/partial-rupture/segmented/GEA12/D/rupture-set.json
new file mode 100644
index 0000000000000000000000000000000000000000..a160af68eeb3856e6487beb47f97e6a8e0d172af
--- /dev/null
+++ b/subduction/interface/Cascadia/middle/partial-rupture/segmented/GEA12/D/rupture-set.json
@@ -0,0 +1,8 @@
+{
+  "name": "Cascadia (segmented, GEA12, D, middle)",
+  "id": 100301,
+  "sections": [
+    3230, 3231, 3232, 3233, 3234, 3235, 3236
+  ],
+  "mfd-tree": "segmented-GEA12-D-middle"
+}
diff --git a/subduction/interface/Cascadia/middle/partial-rupture/segmented/GEA12/northern/rupture-set.json b/subduction/interface/Cascadia/middle/partial-rupture/segmented/GEA12/northern/rupture-set.json
new file mode 100644
index 0000000000000000000000000000000000000000..7d622795aeda2dcde9d7976a9f8cfa21dd899bcb
--- /dev/null
+++ b/subduction/interface/Cascadia/middle/partial-rupture/segmented/GEA12/northern/rupture-set.json
@@ -0,0 +1,8 @@
+{
+  "name": "Cascadia (segmented, GEA12, northern, middle)",
+  "id": 100401,
+  "sections": [
+    3243, 3244, 3245, 3246, 3247, 3248, 3249, 3250, 3251
+  ],
+  "mfd-tree": "segmented-GEA12-northern-middle"
+}
diff --git a/subduction/interface/Cascadia/middle/partial-rupture/segmented/GEA12/source-group.json b/subduction/interface/Cascadia/middle/partial-rupture/segmented/GEA12/source-group.json
new file mode 100644
index 0000000000000000000000000000000000000000..dc3028f0bfe817f82cece325c84e671675af1cb6
--- /dev/null
+++ b/subduction/interface/Cascadia/middle/partial-rupture/segmented/GEA12/source-group.json
@@ -0,0 +1,18 @@
+[
+  {
+    "id": "B",
+    "scale": 1.0
+  },
+  {
+    "id": "C",
+    "scale": 1.0
+  },
+  {
+    "id": "D",
+    "scale": 1.0
+  }, 
+  {
+    "id": "northern",
+    "scale": 0.25
+  }
+]
diff --git a/subduction/interface/Cascadia/middle/partial-rupture/segmented/GEA17/B/rupture-set.json b/subduction/interface/Cascadia/middle/partial-rupture/segmented/GEA17/B/rupture-set.json
new file mode 100644
index 0000000000000000000000000000000000000000..7dfc7a28a61502a789ea13239c4a89d0c7a9ee1e
--- /dev/null
+++ b/subduction/interface/Cascadia/middle/partial-rupture/segmented/GEA17/B/rupture-set.json
@@ -0,0 +1,11 @@
+{
+  "name": "Cascadia (segmented, GEA17, B, middle)",
+  "id": 100501,
+  "sections": [
+    3230, 3231, 3232, 3233, 3234, 3235, 3236,
+    3237, 3238, 3239,
+    3240, 3241, 3242,
+    3243, 3244, 3245
+  ],
+  "mfd-tree": "segmented-GEA17-B-middle"
+}
diff --git a/subduction/interface/Cascadia/middle/partial-rupture/segmented/GEA17/C'/rupture-set.json b/subduction/interface/Cascadia/middle/partial-rupture/segmented/GEA17/C'/rupture-set.json
new file mode 100644
index 0000000000000000000000000000000000000000..a31754719f4d0117df33b1578e18012c1012e2a4
--- /dev/null
+++ b/subduction/interface/Cascadia/middle/partial-rupture/segmented/GEA17/C'/rupture-set.json
@@ -0,0 +1,9 @@
+{
+  "name": "Cascadia (segmented, GEA17, C', middle)",
+  "id": 100201,
+  "sections": [
+    3230, 3231, 3232, 3233, 3234, 3235, 3236,
+    3237, 3238, 3239
+  ],
+  "mfd-tree": "segmented-GEA17-C'-middle"
+}
diff --git a/subduction/interface/Cascadia/middle/partial-rupture/segmented/GEA17/C/rupture-set.json b/subduction/interface/Cascadia/middle/partial-rupture/segmented/GEA17/C/rupture-set.json
new file mode 100644
index 0000000000000000000000000000000000000000..8a3fc03accab0cec5c267bb082dc3ee405d327ab
--- /dev/null
+++ b/subduction/interface/Cascadia/middle/partial-rupture/segmented/GEA17/C/rupture-set.json
@@ -0,0 +1,10 @@
+{
+  "name": "Cascadia (segmented, GEA17, C, middle)",
+  "id": 100601,
+  "sections": [
+    3230, 3231, 3232, 3233, 3234, 3235, 3236,
+    3237, 3238, 3239,
+    3240, 3241
+  ],
+  "mfd-tree": "segmented-GEA17-C-middle"
+}
diff --git a/subduction/interface/Cascadia/middle/partial-rupture/segmented/GEA17/D/rupture-set.json b/subduction/interface/Cascadia/middle/partial-rupture/segmented/GEA17/D/rupture-set.json
new file mode 100644
index 0000000000000000000000000000000000000000..fb402a23145a31bd0b7b93516dce41fc814e54a5
--- /dev/null
+++ b/subduction/interface/Cascadia/middle/partial-rupture/segmented/GEA17/D/rupture-set.json
@@ -0,0 +1,8 @@
+{
+  "name": "Cascadia (segmented, GEA17, D, middle)",
+  "id": 100701,
+  "sections": [
+    3230, 3231, 3232, 3233, 3234, 3235
+  ],
+  "mfd-tree": "segmented-GEA17-D-middle"
+}
diff --git a/subduction/interface/Cascadia/middle/partial-rupture/segmented/GEA17/E/rupture-set.json b/subduction/interface/Cascadia/middle/partial-rupture/segmented/GEA17/E/rupture-set.json
new file mode 100644
index 0000000000000000000000000000000000000000..ba9faf69f388637086b8f0992511d5f530a502fd
--- /dev/null
+++ b/subduction/interface/Cascadia/middle/partial-rupture/segmented/GEA17/E/rupture-set.json
@@ -0,0 +1,8 @@
+{
+  "name": "Cascadia (segmented, GEA17, E, middle)",
+  "id": 100801,
+  "sections": [
+    3232, 3233
+  ],
+  "mfd-tree": "segmented-GEA17-E-middle"
+}
diff --git a/subduction/interface/Cascadia/middle/partial-rupture/segmented/GEA17/F/rupture-set.json b/subduction/interface/Cascadia/middle/partial-rupture/segmented/GEA17/F/rupture-set.json
new file mode 100644
index 0000000000000000000000000000000000000000..f12ef401fb860d91b958ad59c999ed022b3047df
--- /dev/null
+++ b/subduction/interface/Cascadia/middle/partial-rupture/segmented/GEA17/F/rupture-set.json
@@ -0,0 +1,9 @@
+{
+  "name": "Cascadia (segmented, GEA17, F, middle)",
+  "id": 100901,
+  "sections": [
+    3242,
+    3243, 3244, 3245, 3246
+  ],
+  "mfd-tree": "segmented-GEA17-F-middle"
+}
diff --git a/subduction/interface/Cascadia/middle/partial-rupture/segmented/GEA17/source-group.json b/subduction/interface/Cascadia/middle/partial-rupture/segmented/GEA17/source-group.json
new file mode 100644
index 0000000000000000000000000000000000000000..65a420dda76403274215b4e5ca2d566905491459
--- /dev/null
+++ b/subduction/interface/Cascadia/middle/partial-rupture/segmented/GEA17/source-group.json
@@ -0,0 +1,26 @@
+[
+  {
+    "id": "B",
+    "scale": 1.0
+  },
+  {
+    "id": "C",
+    "scale": 1.0
+  },
+  {
+    "id": "C'",
+    "scale": 1.0
+  },
+  {
+    "id": "D",
+    "scale": 1.0
+  },
+  {
+    "id": "E",
+    "scale": 1.0
+  },
+  {
+    "id": "F",
+    "scale": 1.0
+  }
+]
diff --git a/subduction/interface/Cascadia/middle/partial-rupture/segmented/section-1/rupture-set.json b/subduction/interface/Cascadia/middle/partial-rupture/segmented/section-1/rupture-set.json
deleted file mode 100644
index 15399b249489772c57cc71fd63b2a8c2dc58e919..0000000000000000000000000000000000000000
--- a/subduction/interface/Cascadia/middle/partial-rupture/segmented/section-1/rupture-set.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "Cascadia (segmented, 1, middle)",
-  "id": 3111,
-  "sections": [
-    3230, 3231, 3232, 3233, 3234, 3235, 3236
-  ],
-  "mfd-tree": "segmented-1-middle"
-}
diff --git a/subduction/interface/Cascadia/middle/partial-rupture/segmented/section-4/rupture-set.json b/subduction/interface/Cascadia/middle/partial-rupture/segmented/section-4/rupture-set.json
deleted file mode 100644
index 96a087a2dfac5ee421aab6db0c9511df33c0a77b..0000000000000000000000000000000000000000
--- a/subduction/interface/Cascadia/middle/partial-rupture/segmented/section-4/rupture-set.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "Cascadia (segmented, 4, middle)",
-  "id": 3141,
-  "sections": [
-    3243, 3244, 3245, 3246, 3247, 3248, 3249, 3250, 3251
-  ],
-  "mfd-tree": "segmented-4-middle"
-}
diff --git a/subduction/interface/Cascadia/middle/partial-rupture/segmented/sections-1-2/rupture-set.json b/subduction/interface/Cascadia/middle/partial-rupture/segmented/sections-1-2/rupture-set.json
deleted file mode 100644
index 3b9fe3be2ee10fa6a9d021b364bd714cc409210c..0000000000000000000000000000000000000000
--- a/subduction/interface/Cascadia/middle/partial-rupture/segmented/sections-1-2/rupture-set.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "name": "Cascadia (segmented, 1-2, middle)",
-  "id": 3151,
-  "sections": [
-    3230, 3231, 3232, 3233, 3234, 3235, 3236,
-    3237, 3238, 3239
-  ],
-  "mfd-tree": "segmented-1-2-middle"
-}
diff --git a/subduction/interface/Cascadia/middle/partial-rupture/segmented/source-group.json b/subduction/interface/Cascadia/middle/partial-rupture/segmented/source-group.json
deleted file mode 100644
index 64a4ab9707a933b3d06b6680dcf0955d07403c0a..0000000000000000000000000000000000000000
--- a/subduction/interface/Cascadia/middle/partial-rupture/segmented/source-group.json
+++ /dev/null
@@ -1,18 +0,0 @@
-[
-  {
-    "id": "section-1",
-    "scale": 1.2
-  },
-  {
-    "id": "sections-1-2",
-    "scale": 1.2
-  },
-  {
-    "id": "sections-1-2-3",
-    "scale": 1.2
-  },
-  {
-    "id": "section-4",
-    "scale": 0.25
-  }
-]
diff --git a/subduction/interface/Cascadia/middle/partial-rupture/segmented/source-tree.json b/subduction/interface/Cascadia/middle/partial-rupture/segmented/source-tree.json
new file mode 100644
index 0000000000000000000000000000000000000000..34c8b899a1aceea20c1af34b2eb04248a6a31fa3
--- /dev/null
+++ b/subduction/interface/Cascadia/middle/partial-rupture/segmented/source-tree.json
@@ -0,0 +1,10 @@
+[
+  {
+    "id": "GEA12",
+    "weight": 0.5
+  },
+  {
+    "id": "GEA17",
+    "weight": 0.5
+  }
+]
diff --git a/subduction/interface/Cascadia/middle/partial-rupture/unsegmented/sections-1-2-3-4/scaled/rupture-set.json b/subduction/interface/Cascadia/middle/partial-rupture/unsegmented/GEA12-A/scaled/rupture-set.json
similarity index 74%
rename from subduction/interface/Cascadia/middle/partial-rupture/unsegmented/sections-1-2-3-4/scaled/rupture-set.json
rename to subduction/interface/Cascadia/middle/partial-rupture/unsegmented/GEA12-A/scaled/rupture-set.json
index c5a7af638c1d6686b29367ca908148e1a838e8c2..41d55473b1a1081ece91a6feb6f97fd7b9069497 100644
--- a/subduction/interface/Cascadia/middle/partial-rupture/unsegmented/sections-1-2-3-4/scaled/rupture-set.json
+++ b/subduction/interface/Cascadia/middle/partial-rupture/unsegmented/GEA12-A/scaled/rupture-set.json
@@ -1,6 +1,6 @@
 {
-  "name": "Cascadia (unsegmented, 1-2-3-4, middle)",
-  "id": 3171,
+  "name": "Cascadia (unsegmented, GEA12-A, middle)",
+  "id": 100001,
   "sections": [
     3230, 3231, 3232, 3233, 3234, 3235, 3236,
     3237, 3238, 3239,
diff --git a/subduction/interface/Cascadia/middle/partial-rupture/unsegmented/sections-1-2-3-4/source-group.json b/subduction/interface/Cascadia/middle/partial-rupture/unsegmented/GEA12-A/source-group.json
similarity index 100%
rename from subduction/interface/Cascadia/middle/partial-rupture/unsegmented/sections-1-2-3-4/source-group.json
rename to subduction/interface/Cascadia/middle/partial-rupture/unsegmented/GEA12-A/source-group.json
diff --git a/subduction/interface/Cascadia/middle/partial-rupture/unsegmented/sections-1-2-3/scaled/rupture-set.json b/subduction/interface/Cascadia/middle/partial-rupture/unsegmented/GEA12-B/scaled/rupture-set.json
similarity index 67%
rename from subduction/interface/Cascadia/middle/partial-rupture/unsegmented/sections-1-2-3/scaled/rupture-set.json
rename to subduction/interface/Cascadia/middle/partial-rupture/unsegmented/GEA12-B/scaled/rupture-set.json
index ebb5b20f0ba705bceb86335cf90bb59f55d6e61f..f0194668c9b5f5befc584988f2a82b02a412240a 100644
--- a/subduction/interface/Cascadia/middle/partial-rupture/unsegmented/sections-1-2-3/scaled/rupture-set.json
+++ b/subduction/interface/Cascadia/middle/partial-rupture/unsegmented/GEA12-B/scaled/rupture-set.json
@@ -1,6 +1,6 @@
 {
-  "name": "Cascadia (unsegmented, 1-2-3, middle)",
-  "id": 3161,
+  "name": "Cascadia (unsegmented, GEA12-B, middle)",
+  "id": 100101,
   "sections": [
     3230, 3231, 3232, 3233, 3234, 3235, 3236,
     3237, 3238, 3239,
diff --git a/subduction/interface/Cascadia/middle/partial-rupture/unsegmented/sections-1-2-3/source-group.json b/subduction/interface/Cascadia/middle/partial-rupture/unsegmented/GEA12-B/source-group.json
similarity index 100%
rename from subduction/interface/Cascadia/middle/partial-rupture/unsegmented/sections-1-2-3/source-group.json
rename to subduction/interface/Cascadia/middle/partial-rupture/unsegmented/GEA12-B/source-group.json
diff --git a/subduction/interface/Cascadia/middle/partial-rupture/unsegmented/source-tree.json b/subduction/interface/Cascadia/middle/partial-rupture/unsegmented/source-tree.json
index fb1e0996df7f6b66fa0ce60a1beadd02589e3a4d..72cb587b7772aa3396851f3fe347381070a42896 100644
--- a/subduction/interface/Cascadia/middle/partial-rupture/unsegmented/source-tree.json
+++ b/subduction/interface/Cascadia/middle/partial-rupture/unsegmented/source-tree.json
@@ -1,10 +1,10 @@
 [
   {
-    "id": "sections-1-2-3",
+    "id": "GEA12-B",
     "weight": 0.75
   },
   {
-    "id": "sections-1-2-3-4",
+    "id": "GEA12-A",
     "weight": 0.25
   }
 ]
diff --git a/subduction/interface/Cascadia/top/full-rupture/cluster-out/rupture-set.json b/subduction/interface/Cascadia/top/full-rupture/cluster-out/rupture-set.json
index 9492e55ad0728016dc17b5f388c75789eee6c9e9..c78e98e40828a6583e80c37543baf8ef265aa3b1 100644
--- a/subduction/interface/Cascadia/top/full-rupture/cluster-out/rupture-set.json
+++ b/subduction/interface/Cascadia/top/full-rupture/cluster-out/rupture-set.json
@@ -1,6 +1,6 @@
 {
   "name": "Cascadia (full, top)",
-  "id": 3172,
+  "id": 100000,
   "sections": [
     3260, 3261, 3262, 3263, 3264, 3265, 3266,
     3267, 3268, 3269,
diff --git a/subduction/interface/Cascadia/top/full-rupture/source-tree-2.json b/subduction/interface/Cascadia/top/full-rupture/source-tree-2.json
deleted file mode 100644
index 5c8a6723e20830152d9e859a4a64d44abb0e1cba..0000000000000000000000000000000000000000
--- a/subduction/interface/Cascadia/top/full-rupture/source-tree-2.json
+++ /dev/null
@@ -1,6 +0,0 @@
-[
-  {
-    "id": "cluster-out",
-    "weight": 1.0
-  }
-]
diff --git a/subduction/interface/Cascadia/top/partial-rupture/segmented/sections-1-2-3/rupture-set.json b/subduction/interface/Cascadia/top/partial-rupture/segmented/GEA12/B/rupture-set.json
similarity index 52%
rename from subduction/interface/Cascadia/top/partial-rupture/segmented/sections-1-2-3/rupture-set.json
rename to subduction/interface/Cascadia/top/partial-rupture/segmented/GEA12/B/rupture-set.json
index 22a721c7111e7a641bbae5fe2466dbb9a7136489..e433834bc8ddd70ed39daa95237d46b58cefa5e8 100644
--- a/subduction/interface/Cascadia/top/partial-rupture/segmented/sections-1-2-3/rupture-set.json
+++ b/subduction/interface/Cascadia/top/partial-rupture/segmented/GEA12/B/rupture-set.json
@@ -1,10 +1,10 @@
 {
-  "name": "Cascadia (segmented, 1-2-3, top)",
-  "id": 3162,
+  "name": "Cascadia (segmented, GEA12, B, top)",
+  "id": 100100,
   "sections": [
     3260, 3261, 3262, 3263, 3264, 3265, 3266,
     3267, 3268, 3269,
     3270, 3271, 3272
   ],
-  "mfd-tree": "segmented-1-2-3-top"
+  "mfd-tree": "segmented-GEA12-B-top"
 }
diff --git a/subduction/interface/Cascadia/top/partial-rupture/segmented/GEA12/C/rupture-set.json b/subduction/interface/Cascadia/top/partial-rupture/segmented/GEA12/C/rupture-set.json
new file mode 100644
index 0000000000000000000000000000000000000000..f3b65cc9ebdb99fd6fff0f7d927359682c2e3ce7
--- /dev/null
+++ b/subduction/interface/Cascadia/top/partial-rupture/segmented/GEA12/C/rupture-set.json
@@ -0,0 +1,9 @@
+{
+  "name": "Cascadia (segmented, GEA12, C, top)",
+  "id": 100200,
+  "sections": [
+    3260, 3261, 3262, 3263, 3264, 3265, 3266,
+    3267, 3268, 3269
+  ],
+  "mfd-tree": "segmented-GEA12-C-top"
+}
diff --git a/subduction/interface/Cascadia/top/partial-rupture/segmented/GEA12/D/rupture-set.json b/subduction/interface/Cascadia/top/partial-rupture/segmented/GEA12/D/rupture-set.json
new file mode 100644
index 0000000000000000000000000000000000000000..2d013e9ecd8d5c670149d0a30f5cfcabcabf7007
--- /dev/null
+++ b/subduction/interface/Cascadia/top/partial-rupture/segmented/GEA12/D/rupture-set.json
@@ -0,0 +1,8 @@
+{
+  "name": "Cascadia (segmented, GEA12, D, top)",
+  "id": 100300,
+  "sections": [
+    3260, 3261, 3262, 3263, 3264, 3265, 3266
+  ],
+  "mfd-tree": "segmented-GEA12-D-top"
+}
diff --git a/subduction/interface/Cascadia/top/partial-rupture/segmented/GEA12/northern/rupture-set.json b/subduction/interface/Cascadia/top/partial-rupture/segmented/GEA12/northern/rupture-set.json
new file mode 100644
index 0000000000000000000000000000000000000000..70f058e363ce295b5fa74d2056892da0d6b02242
--- /dev/null
+++ b/subduction/interface/Cascadia/top/partial-rupture/segmented/GEA12/northern/rupture-set.json
@@ -0,0 +1,8 @@
+{
+  "name": "Cascadia (segmented, GEA12, northern, top)",
+  "id": 100400,
+  "sections": [
+    3273, 3274, 3275, 3276, 3277, 3278, 3279, 3280, 3281
+  ],
+  "mfd-tree": "segmented-GEA12-northern-top"
+}
diff --git a/subduction/interface/Cascadia/top/partial-rupture/segmented/GEA12/source-group.json b/subduction/interface/Cascadia/top/partial-rupture/segmented/GEA12/source-group.json
new file mode 100644
index 0000000000000000000000000000000000000000..dc3028f0bfe817f82cece325c84e671675af1cb6
--- /dev/null
+++ b/subduction/interface/Cascadia/top/partial-rupture/segmented/GEA12/source-group.json
@@ -0,0 +1,18 @@
+[
+  {
+    "id": "B",
+    "scale": 1.0
+  },
+  {
+    "id": "C",
+    "scale": 1.0
+  },
+  {
+    "id": "D",
+    "scale": 1.0
+  }, 
+  {
+    "id": "northern",
+    "scale": 0.25
+  }
+]
diff --git a/subduction/interface/Cascadia/top/partial-rupture/segmented/GEA17/B/rupture-set.json b/subduction/interface/Cascadia/top/partial-rupture/segmented/GEA17/B/rupture-set.json
new file mode 100644
index 0000000000000000000000000000000000000000..39b1d5c929e1e7259a6689c2af2030167e674f06
--- /dev/null
+++ b/subduction/interface/Cascadia/top/partial-rupture/segmented/GEA17/B/rupture-set.json
@@ -0,0 +1,11 @@
+{
+  "name": "Cascadia (segmented, GEA17, B, top)",
+  "id": 100500,
+  "sections": [
+    3260, 3261, 3262, 3263, 3264, 3265, 3266,
+    3267, 3268, 3269,
+    3270, 3271, 3272,
+    3273, 3274, 3275
+  ],
+  "mfd-tree": "segmented-GEA17-B-top"
+}
diff --git a/subduction/interface/Cascadia/top/partial-rupture/segmented/GEA17/C'/rupture-set.json b/subduction/interface/Cascadia/top/partial-rupture/segmented/GEA17/C'/rupture-set.json
new file mode 100644
index 0000000000000000000000000000000000000000..267103039818c5afab08a109c13e02571f5bad5f
--- /dev/null
+++ b/subduction/interface/Cascadia/top/partial-rupture/segmented/GEA17/C'/rupture-set.json
@@ -0,0 +1,9 @@
+{
+  "name": "Cascadia (segmented, GEA17, C', top)",
+  "id": 100200,
+  "sections": [
+    3260, 3261, 3262, 3263, 3264, 3265, 3266,
+    3267, 3268, 3269
+  ],
+  "mfd-tree": "segmented-GEA17-C'-top"
+}
diff --git a/subduction/interface/Cascadia/top/partial-rupture/segmented/GEA17/C/rupture-set.json b/subduction/interface/Cascadia/top/partial-rupture/segmented/GEA17/C/rupture-set.json
new file mode 100644
index 0000000000000000000000000000000000000000..1d0a9f0b59462133bd130b9f609071dd6cf210c1
--- /dev/null
+++ b/subduction/interface/Cascadia/top/partial-rupture/segmented/GEA17/C/rupture-set.json
@@ -0,0 +1,10 @@
+{
+  "name": "Cascadia (segmented, GEA17, C, top)",
+  "id": 100600,
+  "sections": [
+    3260, 3261, 3262, 3263, 3264, 3265, 3266,
+    3267, 3268, 3269,
+    3270, 3271
+  ],
+  "mfd-tree": "segmented-GEA17-C-top"
+}
diff --git a/subduction/interface/Cascadia/top/partial-rupture/segmented/GEA17/D/rupture-set.json b/subduction/interface/Cascadia/top/partial-rupture/segmented/GEA17/D/rupture-set.json
new file mode 100644
index 0000000000000000000000000000000000000000..47e26eca413b68cde63f5c7311d744fe9de17b50
--- /dev/null
+++ b/subduction/interface/Cascadia/top/partial-rupture/segmented/GEA17/D/rupture-set.json
@@ -0,0 +1,8 @@
+{
+  "name": "Cascadia (segmented, GEA17, D, top)",
+  "id": 100700,
+  "sections": [
+    3260, 3261, 3262, 3263, 3264, 3265
+  ],
+  "mfd-tree": "segmented-GEA17-D-top"
+}
diff --git a/subduction/interface/Cascadia/top/partial-rupture/segmented/GEA17/E/rupture-set.json b/subduction/interface/Cascadia/top/partial-rupture/segmented/GEA17/E/rupture-set.json
new file mode 100644
index 0000000000000000000000000000000000000000..692060628c1cff4b2049f479dda63d49c6a137d8
--- /dev/null
+++ b/subduction/interface/Cascadia/top/partial-rupture/segmented/GEA17/E/rupture-set.json
@@ -0,0 +1,8 @@
+{
+  "name": "Cascadia (segmented, GEA17, E, top)",
+  "id": 100800,
+  "sections": [
+    3262, 3263
+  ],
+  "mfd-tree": "segmented-GEA17-E-top"
+}
diff --git a/subduction/interface/Cascadia/top/partial-rupture/segmented/GEA17/F/rupture-set.json b/subduction/interface/Cascadia/top/partial-rupture/segmented/GEA17/F/rupture-set.json
new file mode 100644
index 0000000000000000000000000000000000000000..75b2f453e7b68d4e859a606dc073d6cb7cf3f5ce
--- /dev/null
+++ b/subduction/interface/Cascadia/top/partial-rupture/segmented/GEA17/F/rupture-set.json
@@ -0,0 +1,9 @@
+{
+  "name": "Cascadia (segmented, GEA17, F, top)",
+  "id": 100900,
+  "sections": [
+    3272,
+    3273, 3274, 3275, 3276
+  ],
+  "mfd-tree": "segmented-GEA17-F-top"
+}
diff --git a/subduction/interface/Cascadia/top/partial-rupture/segmented/GEA17/source-group.json b/subduction/interface/Cascadia/top/partial-rupture/segmented/GEA17/source-group.json
new file mode 100644
index 0000000000000000000000000000000000000000..65a420dda76403274215b4e5ca2d566905491459
--- /dev/null
+++ b/subduction/interface/Cascadia/top/partial-rupture/segmented/GEA17/source-group.json
@@ -0,0 +1,26 @@
+[
+  {
+    "id": "B",
+    "scale": 1.0
+  },
+  {
+    "id": "C",
+    "scale": 1.0
+  },
+  {
+    "id": "C'",
+    "scale": 1.0
+  },
+  {
+    "id": "D",
+    "scale": 1.0
+  },
+  {
+    "id": "E",
+    "scale": 1.0
+  },
+  {
+    "id": "F",
+    "scale": 1.0
+  }
+]
diff --git a/subduction/interface/Cascadia/top/partial-rupture/segmented/section-1/rupture-set.json b/subduction/interface/Cascadia/top/partial-rupture/segmented/section-1/rupture-set.json
deleted file mode 100644
index f9016450d5d15740f0eb30c6ac7dcc4d68ce9bfe..0000000000000000000000000000000000000000
--- a/subduction/interface/Cascadia/top/partial-rupture/segmented/section-1/rupture-set.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "Cascadia (segmented, 1, top)",
-  "id": 3112,
-  "sections": [
-    3260, 3261, 3262, 3263, 3264, 3265, 3266
-  ],
-  "mfd-tree": "segmented-1-top"
-}
diff --git a/subduction/interface/Cascadia/top/partial-rupture/segmented/section-4/rupture-set.json b/subduction/interface/Cascadia/top/partial-rupture/segmented/section-4/rupture-set.json
deleted file mode 100644
index 0fbf3cb074c0d82f2f8e629a488b509f046af48c..0000000000000000000000000000000000000000
--- a/subduction/interface/Cascadia/top/partial-rupture/segmented/section-4/rupture-set.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "Cascadia (segmented, 4, top)",
-  "id": 3142,
-  "sections": [
-    3273, 3274, 3275, 3276, 3277, 3278, 3279, 3280, 3281
-  ],
-  "mfd-tree": "segmented-4-top"
-}
diff --git a/subduction/interface/Cascadia/top/partial-rupture/segmented/sections-1-2/rupture-set.json b/subduction/interface/Cascadia/top/partial-rupture/segmented/sections-1-2/rupture-set.json
deleted file mode 100644
index 53e0d113d8cf578e62a0d1f41224a944a8c7249b..0000000000000000000000000000000000000000
--- a/subduction/interface/Cascadia/top/partial-rupture/segmented/sections-1-2/rupture-set.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "name": "Cascadia (segmented, 1-2, top)",
-  "id": 3152,
-  "sections": [
-    3260, 3261, 3262, 3263, 3264, 3265, 3266,
-    3267, 3268, 3269
-  ],
-  "mfd-tree": "segmented-1-2-top"
-}
diff --git a/subduction/interface/Cascadia/top/partial-rupture/segmented/source-group.json b/subduction/interface/Cascadia/top/partial-rupture/segmented/source-group.json
deleted file mode 100644
index 64a4ab9707a933b3d06b6680dcf0955d07403c0a..0000000000000000000000000000000000000000
--- a/subduction/interface/Cascadia/top/partial-rupture/segmented/source-group.json
+++ /dev/null
@@ -1,18 +0,0 @@
-[
-  {
-    "id": "section-1",
-    "scale": 1.2
-  },
-  {
-    "id": "sections-1-2",
-    "scale": 1.2
-  },
-  {
-    "id": "sections-1-2-3",
-    "scale": 1.2
-  },
-  {
-    "id": "section-4",
-    "scale": 0.25
-  }
-]
diff --git a/subduction/interface/Cascadia/top/partial-rupture/segmented/source-tree.json b/subduction/interface/Cascadia/top/partial-rupture/segmented/source-tree.json
new file mode 100644
index 0000000000000000000000000000000000000000..c6965a8c960a02802c1733f10bddcfe905b5d33f
--- /dev/null
+++ b/subduction/interface/Cascadia/top/partial-rupture/segmented/source-tree.json
@@ -0,0 +1,10 @@
+[
+  {
+    "id": "GEA12",
+    "weight": 0.5
+  },
+  {
+     "id": "GEA17",
+     "weight": 0.5
+  }
+]
diff --git a/subduction/interface/Cascadia/top/partial-rupture/unsegmented/sections-1-2-3-4/scaled/rupture-set.json b/subduction/interface/Cascadia/top/partial-rupture/unsegmented/GEA12-A/scaled/rupture-set.json
similarity index 75%
rename from subduction/interface/Cascadia/top/partial-rupture/unsegmented/sections-1-2-3-4/scaled/rupture-set.json
rename to subduction/interface/Cascadia/top/partial-rupture/unsegmented/GEA12-A/scaled/rupture-set.json
index 21812a742e0f3417d5ed558727fa53f339a76112..c08bbd67956f645bd9b23b0cbc4b4c260fad6e99 100644
--- a/subduction/interface/Cascadia/top/partial-rupture/unsegmented/sections-1-2-3-4/scaled/rupture-set.json
+++ b/subduction/interface/Cascadia/top/partial-rupture/unsegmented/GEA12-A/scaled/rupture-set.json
@@ -1,6 +1,6 @@
 {
-  "name": "Cascadia (unsegmented, 1-2-3-4, top)",
-  "id": 3172,
+  "name": "Cascadia (unsegmented, GEA12-A, top)",
+  "id": 100000,
   "sections": [
     3260, 3261, 3262, 3263, 3264, 3265, 3266,
     3267, 3268, 3269,
diff --git a/subduction/interface/Cascadia/top/partial-rupture/unsegmented/sections-1-2-3-4/source-group.json b/subduction/interface/Cascadia/top/partial-rupture/unsegmented/GEA12-A/source-group.json
similarity index 100%
rename from subduction/interface/Cascadia/top/partial-rupture/unsegmented/sections-1-2-3-4/source-group.json
rename to subduction/interface/Cascadia/top/partial-rupture/unsegmented/GEA12-A/source-group.json
diff --git a/subduction/interface/Cascadia/top/partial-rupture/unsegmented/sections-1-2-3/scaled/rupture-set.json b/subduction/interface/Cascadia/top/partial-rupture/unsegmented/GEA12-B/scaled/rupture-set.json
similarity index 68%
rename from subduction/interface/Cascadia/top/partial-rupture/unsegmented/sections-1-2-3/scaled/rupture-set.json
rename to subduction/interface/Cascadia/top/partial-rupture/unsegmented/GEA12-B/scaled/rupture-set.json
index 7541b4755a562f5726ad97860ee761ceab5f9e3a..5d616dfba23dff4fceb52101ce5fd15710d57dff 100644
--- a/subduction/interface/Cascadia/top/partial-rupture/unsegmented/sections-1-2-3/scaled/rupture-set.json
+++ b/subduction/interface/Cascadia/top/partial-rupture/unsegmented/GEA12-B/scaled/rupture-set.json
@@ -1,6 +1,6 @@
 {
-  "name": "Cascadia (unsegmented, 1-2-3, top)",
-  "id": 3162,
+  "name": "Cascadia (unsegmented, GEA12-B, top)",
+  "id": 100100,
   "sections": [
     3260, 3261, 3262, 3263, 3264, 3265, 3266,
     3267, 3268, 3269,
diff --git a/subduction/interface/Cascadia/top/partial-rupture/unsegmented/sections-1-2-3/source-group.json b/subduction/interface/Cascadia/top/partial-rupture/unsegmented/GEA12-B/source-group.json
similarity index 100%
rename from subduction/interface/Cascadia/top/partial-rupture/unsegmented/sections-1-2-3/source-group.json
rename to subduction/interface/Cascadia/top/partial-rupture/unsegmented/GEA12-B/source-group.json
diff --git a/subduction/interface/Cascadia/top/partial-rupture/unsegmented/source-tree.json b/subduction/interface/Cascadia/top/partial-rupture/unsegmented/source-tree.json
index fb1e0996df7f6b66fa0ce60a1beadd02589e3a4d..72cb587b7772aa3396851f3fe347381070a42896 100644
--- a/subduction/interface/Cascadia/top/partial-rupture/unsegmented/source-tree.json
+++ b/subduction/interface/Cascadia/top/partial-rupture/unsegmented/source-tree.json
@@ -1,10 +1,10 @@
 [
   {
-    "id": "sections-1-2-3",
+    "id": "GEA12-B",
     "weight": 0.75
   },
   {
-    "id": "sections-1-2-3-4",
+    "id": "GEA12-A",
     "weight": 0.25
   }
 ]