diff --git a/src/test/resources/e2e/nshm-alaska-2007/ANCHORAGE_AK.json b/src/test/resources/e2e/nshm-alaska-2007/ANCHORAGE_AK.json
index 886951bec69353c8ba655447b9cbe6dba926c835..5ab02cbd60df91f5146c87892e4e86886ed412bf 100644
--- a/src/test/resources/e2e/nshm-alaska-2007/ANCHORAGE_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2007/ANCHORAGE_AK.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       0.0
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -91,7 +91,7 @@
       0.0
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -137,4 +137,4 @@
       7.2501279465804674E-9
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-alaska-2007/FAIRBANKS_AK.json b/src/test/resources/e2e/nshm-alaska-2007/FAIRBANKS_AK.json
index 2aa60b551bd41fa82c05f03852fe88971183d70e..596c48db81cb4a9a83348e95c17120a40900a2d4 100644
--- a/src/test/resources/e2e/nshm-alaska-2007/FAIRBANKS_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2007/FAIRBANKS_AK.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       0.0
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -91,7 +91,7 @@
       0.0
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -137,4 +137,4 @@
       3.762744898891126E-9
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-alaska-2007/JUNEAU_AK.json b/src/test/resources/e2e/nshm-alaska-2007/JUNEAU_AK.json
index 4132d0178ba2f3879188826bac6a637cb141b378..6445e4458d324e3128a6b60e9204dbddfeb36c00 100644
--- a/src/test/resources/e2e/nshm-alaska-2007/JUNEAU_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2007/JUNEAU_AK.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       0.0
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -91,7 +91,7 @@
       0.0
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -137,4 +137,4 @@
       3.0346597226294626E-10
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-alaska-2007/KODIAK_AK.json b/src/test/resources/e2e/nshm-alaska-2007/KODIAK_AK.json
index 51c37bc2a0464189f276b2c2aa1a7a7e3b6f6a5d..71a8362ba9102e0986fce3205dbe74b545133371 100644
--- a/src/test/resources/e2e/nshm-alaska-2007/KODIAK_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2007/KODIAK_AK.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       0.0
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -91,7 +91,7 @@
       0.0
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -137,4 +137,4 @@
       5.993776825224994E-9
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-alaska-2007/VALDEZ_AK.json b/src/test/resources/e2e/nshm-alaska-2007/VALDEZ_AK.json
index 250d6bc05dcec1665f1d1fa20f71428fbaf6b482..3a56a718926bca3c3e410862bfb199c761b969aa 100644
--- a/src/test/resources/e2e/nshm-alaska-2007/VALDEZ_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2007/VALDEZ_AK.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       0.0
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -91,7 +91,7 @@
       0.0
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -137,4 +137,4 @@
       5.44663885326246E-9
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-alaska-2023/ANCHORAGE_AK.json b/src/test/resources/e2e/nshm-alaska-2023/ANCHORAGE_AK.json
index e214bc0427cc7f39a5f0d8d65288fec0941640d7..d9addf3b66b9de0bb043b041f237c54c317be6f0 100644
--- a/src/test/resources/e2e/nshm-alaska-2023/ANCHORAGE_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2023/ANCHORAGE_AK.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       3.013028621585243E-7
     ]
   },
-  "5.00 Second Spectral Acceleration": {
+  "SA5P0": {
     "xs": [
       -6.908755779315721,
       -6.502290170873972,
@@ -91,7 +91,7 @@
       0.0
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -137,7 +137,7 @@
       1.1051926173257162E-6
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -183,4 +183,4 @@
       2.9396669346552432E-5
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-alaska-2023/FAIRBANKS_AK.json b/src/test/resources/e2e/nshm-alaska-2023/FAIRBANKS_AK.json
index 30ba94f035175b5bada05ba1beaa9a12a9f369f5..37fa914a833cd46f4e29aa3efeb372130fe905cc 100644
--- a/src/test/resources/e2e/nshm-alaska-2023/FAIRBANKS_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2023/FAIRBANKS_AK.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       4.380256208276404E-11
     ]
   },
-  "5.00 Second Spectral Acceleration": {
+  "SA5P0": {
     "xs": [
       -6.908755779315721,
       -6.502290170873972,
@@ -91,7 +91,7 @@
       0.0
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -137,7 +137,7 @@
       1.7289401638074338E-11
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -183,4 +183,4 @@
       1.0436138874114594E-7
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-alaska-2023/JUNEAU_AK.json b/src/test/resources/e2e/nshm-alaska-2023/JUNEAU_AK.json
index 4a44296b8a771562e39f48ee8739b504c0eafd23..2bc3cbf8334edfde4e84ccf5a14404979b5a637a 100644
--- a/src/test/resources/e2e/nshm-alaska-2023/JUNEAU_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2023/JUNEAU_AK.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       4.240103338446744E-11
     ]
   },
-  "5.00 Second Spectral Acceleration": {
+  "SA5P0": {
     "xs": [
       -6.908755779315721,
       -6.502290170873972,
@@ -91,7 +91,7 @@
       0.0
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -137,7 +137,7 @@
       4.082286883282842E-12
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -183,4 +183,4 @@
       3.63015145137678E-8
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-alaska-2023/KODIAK_AK.json b/src/test/resources/e2e/nshm-alaska-2023/KODIAK_AK.json
index 9d31e574b63aa4ea18263ebdde4c140068956172..75407a2aa83fc68a4a2b8d73e767feb6369e1e05 100644
--- a/src/test/resources/e2e/nshm-alaska-2023/KODIAK_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2023/KODIAK_AK.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       4.559925657574019E-7
     ]
   },
-  "5.00 Second Spectral Acceleration": {
+  "SA5P0": {
     "xs": [
       -6.908755779315721,
       -6.502290170873972,
@@ -91,7 +91,7 @@
       0.0
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -137,7 +137,7 @@
       3.6126001839969183E-6
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -183,4 +183,4 @@
       4.070985240786104E-5
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-alaska-2023/VALDEZ_AK.json b/src/test/resources/e2e/nshm-alaska-2023/VALDEZ_AK.json
index 47892fa58a4583b58e05d2d5a704bbf9b7fca9dd..819f30472f49ec00a988d47d0dc9baaa6f6d5e92 100644
--- a/src/test/resources/e2e/nshm-alaska-2023/VALDEZ_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2023/VALDEZ_AK.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       6.504792547924437E-7
     ]
   },
-  "5.00 Second Spectral Acceleration": {
+  "SA5P0": {
     "xs": [
       -6.908755779315721,
       -6.502290170873972,
@@ -91,7 +91,7 @@
       0.0
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -137,7 +137,7 @@
       4.964851901415382E-6
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -183,4 +183,4 @@
       4.367787680902291E-5
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-conus-2018/BOSTON_MA.json b/src/test/resources/e2e/nshm-conus-2018/BOSTON_MA.json
index 6cd46fdf5aab35ccb26cf26318ed43260739e97d..b713b4730941f6c23f03b1cbb5d99893fc23c926 100644
--- a/src/test/resources/e2e/nshm-conus-2018/BOSTON_MA.json
+++ b/src/test/resources/e2e/nshm-conus-2018/BOSTON_MA.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       6.503383766857791E-10
     ]
   },
-  "5.00 Second Spectral Acceleration": {
+  "SA5P0": {
     "xs": [
       -6.908755779315721,
       -6.502290170873972,
@@ -91,7 +91,7 @@
       1.0385526508492285E-12
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -137,7 +137,7 @@
       1.2462940285422412E-7
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -183,4 +183,4 @@
       9.342364439170646E-8
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-conus-2018/CHICAGO_IL.json b/src/test/resources/e2e/nshm-conus-2018/CHICAGO_IL.json
index c9f8abcc0014707c5ae80b09d8ac7d4b42e79b64..1c2f1aa91936faea87eb4af2eef6ae8549e3f991 100644
--- a/src/test/resources/e2e/nshm-conus-2018/CHICAGO_IL.json
+++ b/src/test/resources/e2e/nshm-conus-2018/CHICAGO_IL.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       1.0633132855584107E-10
     ]
   },
-  "5.00 Second Spectral Acceleration": {
+  "SA5P0": {
     "xs": [
       -6.908755779315721,
       -6.502290170873972,
@@ -91,7 +91,7 @@
       3.1469632224157163E-13
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -137,7 +137,7 @@
       3.549954903295298E-8
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -183,4 +183,4 @@
       2.265638077580196E-8
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-conus-2018/LOS_ANGELES_CA.json b/src/test/resources/e2e/nshm-conus-2018/LOS_ANGELES_CA.json
index ec0f3335bf5438bdc76fa037fd953b3adccef8bd..0ca4ff14dbc66d5323b7f7656b60fc77d00d9acd 100644
--- a/src/test/resources/e2e/nshm-conus-2018/LOS_ANGELES_CA.json
+++ b/src/test/resources/e2e/nshm-conus-2018/LOS_ANGELES_CA.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       3.5384348649550975E-9
     ]
   },
-  "5.00 Second Spectral Acceleration": {
+  "SA5P0": {
     "xs": [
       -6.908755779315721,
       -6.502290170873972,
@@ -91,7 +91,7 @@
       0.0
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -137,7 +137,7 @@
       1.1414950535737366E-8
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -183,4 +183,4 @@
       2.3576513888748992E-6
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-conus-2018/NEW_MADRID_MO.json b/src/test/resources/e2e/nshm-conus-2018/NEW_MADRID_MO.json
index cbfaef763ed3464290ca15cec470c1473758237a..638bda0f3c92e6135ac4e64a495233c9f2f46ee9 100644
--- a/src/test/resources/e2e/nshm-conus-2018/NEW_MADRID_MO.json
+++ b/src/test/resources/e2e/nshm-conus-2018/NEW_MADRID_MO.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       3.2819885795529324E-6
     ]
   },
-  "5.00 Second Spectral Acceleration": {
+  "SA5P0": {
     "xs": [
       -6.908755779315721,
       -6.502290170873972,
@@ -91,7 +91,7 @@
       3.603564897905062E-8
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -137,7 +137,7 @@
       7.632592705118938E-5
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -183,4 +183,4 @@
       1.1269789534198826E-4
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-conus-2018/NEW_YORK_NY.json b/src/test/resources/e2e/nshm-conus-2018/NEW_YORK_NY.json
index e16e65b3f1d48e858080fb32d4cc02ae21ad15ec..aa3feff22cf9b84612521c8144bb93e5dda4319b 100644
--- a/src/test/resources/e2e/nshm-conus-2018/NEW_YORK_NY.json
+++ b/src/test/resources/e2e/nshm-conus-2018/NEW_YORK_NY.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       9.713305930824852E-10
     ]
   },
-  "5.00 Second Spectral Acceleration": {
+  "SA5P0": {
     "xs": [
       -6.908755779315721,
       -6.502290170873972,
@@ -91,7 +91,7 @@
       1.5324451927867105E-12
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -137,7 +137,7 @@
       1.967278678289316E-7
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -183,4 +183,4 @@
       1.4238886738032342E-7
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-conus-2018/RENO_NV.json b/src/test/resources/e2e/nshm-conus-2018/RENO_NV.json
index a3d21f9edbd8e822d3398c2ca9a4a92136e50559..9dfb5d5ea6a15308a9b9a535a856b88a8a1ef0c0 100644
--- a/src/test/resources/e2e/nshm-conus-2018/RENO_NV.json
+++ b/src/test/resources/e2e/nshm-conus-2018/RENO_NV.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       8.240992980384035E-11
     ]
   },
-  "5.00 Second Spectral Acceleration": {
+  "SA5P0": {
     "xs": [
       -6.908755779315721,
       -6.502290170873972,
@@ -91,7 +91,7 @@
       0.0
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -137,7 +137,7 @@
       4.063222371389606E-12
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -183,4 +183,4 @@
       3.3625843088903307E-7
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-conus-2018/SALT_LAKE_CITY_UT.json b/src/test/resources/e2e/nshm-conus-2018/SALT_LAKE_CITY_UT.json
index d4c53478937a7f9a14b446ee40bff966f0904a6c..99e7a3ea8f76c5e293cb0411f772790d28c0946a 100644
--- a/src/test/resources/e2e/nshm-conus-2018/SALT_LAKE_CITY_UT.json
+++ b/src/test/resources/e2e/nshm-conus-2018/SALT_LAKE_CITY_UT.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       4.214779787490519E-9
     ]
   },
-  "5.00 Second Spectral Acceleration": {
+  "SA5P0": {
     "xs": [
       -6.908755779315721,
       -6.502290170873972,
@@ -91,7 +91,7 @@
       7.36531590202622E-14
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -137,7 +137,7 @@
       2.2680106464068334E-8
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -183,4 +183,4 @@
       2.7011160805776843E-6
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-conus-2018/SAN_FRANCISCO_CA.json b/src/test/resources/e2e/nshm-conus-2018/SAN_FRANCISCO_CA.json
index 1ef0c588a4967cb4085ef7cac588beb242ba2dbd..9e4d5bdc8dd9b7fd9e3ad312cc85f8fb264ba9fa 100644
--- a/src/test/resources/e2e/nshm-conus-2018/SAN_FRANCISCO_CA.json
+++ b/src/test/resources/e2e/nshm-conus-2018/SAN_FRANCISCO_CA.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       5.0449196459382226E-12
     ]
   },
-  "5.00 Second Spectral Acceleration": {
+  "SA5P0": {
     "xs": [
       -6.908755779315721,
       -6.502290170873972,
@@ -91,7 +91,7 @@
       0.0
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -137,7 +137,7 @@
       2.574987545635484E-12
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -183,4 +183,4 @@
       1.1332666265240459E-7
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-conus-2018/SEATTLE_WA.json b/src/test/resources/e2e/nshm-conus-2018/SEATTLE_WA.json
index a84b8b1376497287ff07f012c35ae9d408a78118..5fdef9a913b5d44d70cfb0989689b32429f3467a 100644
--- a/src/test/resources/e2e/nshm-conus-2018/SEATTLE_WA.json
+++ b/src/test/resources/e2e/nshm-conus-2018/SEATTLE_WA.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       2.354050123798512E-8
     ]
   },
-  "5.00 Second Spectral Acceleration": {
+  "SA5P0": {
     "xs": [
       -6.908755779315721,
       -6.502290170873972,
@@ -91,7 +91,7 @@
       8.135310824349085E-12
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -137,7 +137,7 @@
       6.68125464781831E-10
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -183,4 +183,4 @@
       4.7281340794708457E-7
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-conus-2023/BOSTON_MA.json b/src/test/resources/e2e/nshm-conus-2023/BOSTON_MA.json
index fe0a6ab2a822ff39e5029fbbf2535474bfa5f86f..3060b72020cbeaf5ce720183afb98968c7aaa738 100644
--- a/src/test/resources/e2e/nshm-conus-2023/BOSTON_MA.json
+++ b/src/test/resources/e2e/nshm-conus-2023/BOSTON_MA.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       2.742272834535854E-9
     ]
   },
-  "5.00 Second Spectral Acceleration": {
+  "SA5P0": {
     "xs": [
       -6.908755779315721,
       -6.502290170873972,
@@ -91,7 +91,7 @@
       7.028579358099718E-11
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -137,7 +137,7 @@
       3.963193550050804E-7
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -183,4 +183,4 @@
       2.3647467423869639E-7
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-conus-2023/CHICAGO_IL.json b/src/test/resources/e2e/nshm-conus-2023/CHICAGO_IL.json
index ad6fc7160f93d542188037446372e7e4f909a24c..e7202e7b0760bb5ed797830484dde16f982a14a6 100644
--- a/src/test/resources/e2e/nshm-conus-2023/CHICAGO_IL.json
+++ b/src/test/resources/e2e/nshm-conus-2023/CHICAGO_IL.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       2.5802146447004877E-10
     ]
   },
-  "5.00 Second Spectral Acceleration": {
+  "SA5P0": {
     "xs": [
       -6.908755779315721,
       -6.502290170873972,
@@ -91,7 +91,7 @@
       9.381018392075353E-12
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -137,7 +137,7 @@
       6.060200630189975E-8
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -183,4 +183,4 @@
       3.1124228394497636E-8
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-conus-2023/LOS_ANGELES_CA.json b/src/test/resources/e2e/nshm-conus-2023/LOS_ANGELES_CA.json
index 5b374db83ce20564d2c89a3f0e344ea26c03d50e..8fee081489a664bfede191d91c8e7f92f56e9511 100644
--- a/src/test/resources/e2e/nshm-conus-2023/LOS_ANGELES_CA.json
+++ b/src/test/resources/e2e/nshm-conus-2023/LOS_ANGELES_CA.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       5.2588487621771735E-8
     ]
   },
-  "5.00 Second Spectral Acceleration": {
+  "SA5P0": {
     "xs": [
       -6.908755779315721,
       -6.502290170873972,
@@ -91,7 +91,7 @@
       3.1737259531833734E-14
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -137,7 +137,7 @@
       5.830091651054837E-8
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -183,4 +183,4 @@
       5.041371572081886E-6
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-conus-2023/NEW_MADRID_MO.json b/src/test/resources/e2e/nshm-conus-2023/NEW_MADRID_MO.json
index c7e628963db3207517d111b44772edd60afcf32a..a9d80102529ce1ca68f46ad05893ff32a800708e 100644
--- a/src/test/resources/e2e/nshm-conus-2023/NEW_MADRID_MO.json
+++ b/src/test/resources/e2e/nshm-conus-2023/NEW_MADRID_MO.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       6.721429379688255E-6
     ]
   },
-  "5.00 Second Spectral Acceleration": {
+  "SA5P0": {
     "xs": [
       -6.908755779315721,
       -6.502290170873972,
@@ -91,7 +91,7 @@
       2.7985578953711946E-7
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -137,7 +137,7 @@
       8.845979888500936E-5
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -183,4 +183,4 @@
       1.083218280210284E-4
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-conus-2023/NEW_YORK_NY.json b/src/test/resources/e2e/nshm-conus-2023/NEW_YORK_NY.json
index b4f11335ee841f08c501ef6c710079a4f93e731c..6809afc016713e8a3d03e9ee16f7a01a5cabff15 100644
--- a/src/test/resources/e2e/nshm-conus-2023/NEW_YORK_NY.json
+++ b/src/test/resources/e2e/nshm-conus-2023/NEW_YORK_NY.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       4.2393461421128455E-9
     ]
   },
-  "5.00 Second Spectral Acceleration": {
+  "SA5P0": {
     "xs": [
       -6.908755779315721,
       -6.502290170873972,
@@ -91,7 +91,7 @@
       1.0719894546654211E-10
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -137,7 +137,7 @@
       6.313004310982963E-7
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -183,4 +183,4 @@
       3.6913561822247894E-7
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-conus-2023/RENO_NV.json b/src/test/resources/e2e/nshm-conus-2023/RENO_NV.json
index 6bcef8843f0d819bf0904e922ec7eb8afcaeb3ac..f4820e25dfb955da046b59721dace830cbefd869 100644
--- a/src/test/resources/e2e/nshm-conus-2023/RENO_NV.json
+++ b/src/test/resources/e2e/nshm-conus-2023/RENO_NV.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       1.0054998350751101E-11
     ]
   },
-  "5.00 Second Spectral Acceleration": {
+  "SA5P0": {
     "xs": [
       -6.908755779315721,
       -6.502290170873972,
@@ -91,7 +91,7 @@
       0.0
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -137,7 +137,7 @@
       1.7885452404470933E-10
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -183,4 +183,4 @@
       4.01123348460218E-7
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-conus-2023/SALT_LAKE_CITY_UT.json b/src/test/resources/e2e/nshm-conus-2023/SALT_LAKE_CITY_UT.json
index 5b0ad4f6ea6ba92f27a5e4e04a14e13e4a25e281..bd2bc1d977888d8df32d2639ac62aa280902e3d5 100644
--- a/src/test/resources/e2e/nshm-conus-2023/SALT_LAKE_CITY_UT.json
+++ b/src/test/resources/e2e/nshm-conus-2023/SALT_LAKE_CITY_UT.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       1.3362154203028717E-8
     ]
   },
-  "5.00 Second Spectral Acceleration": {
+  "SA5P0": {
     "xs": [
       -6.908755779315721,
       -6.502290170873972,
@@ -91,7 +91,7 @@
       0.0
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -137,7 +137,7 @@
       2.266803290550335E-8
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -183,4 +183,4 @@
       2.386951424389801E-6
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-conus-2023/SAN_FRANCISCO_CA.json b/src/test/resources/e2e/nshm-conus-2023/SAN_FRANCISCO_CA.json
index 96cf327400d2471f892810d0aa52fd2f92a24d92..f5e68379543eba5f286fc65de6de2a5a75e07597 100644
--- a/src/test/resources/e2e/nshm-conus-2023/SAN_FRANCISCO_CA.json
+++ b/src/test/resources/e2e/nshm-conus-2023/SAN_FRANCISCO_CA.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       4.275203391051003E-11
     ]
   },
-  "5.00 Second Spectral Acceleration": {
+  "SA5P0": {
     "xs": [
       -6.908755779315721,
       -6.502290170873972,
@@ -91,7 +91,7 @@
       0.0
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -137,7 +137,7 @@
       2.588602412382955E-11
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -183,4 +183,4 @@
       2.2239402021916294E-7
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-conus-2023/SEATTLE_WA.json b/src/test/resources/e2e/nshm-conus-2023/SEATTLE_WA.json
index 3de9d73216c8092b865bf0643e4c3fdff4e21223..67bc5eb983f8e8de71407ee2e347810bc05acd22 100644
--- a/src/test/resources/e2e/nshm-conus-2023/SEATTLE_WA.json
+++ b/src/test/resources/e2e/nshm-conus-2023/SEATTLE_WA.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       2.2378453810730706E-8
     ]
   },
-  "5.00 Second Spectral Acceleration": {
+  "SA5P0": {
     "xs": [
       -6.908755779315721,
       -6.502290170873972,
@@ -91,7 +91,7 @@
       4.389238001777538E-12
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -137,7 +137,7 @@
       9.671006675588189E-8
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -183,4 +183,4 @@
       4.100982884701552E-6
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-hawaii-2021/HILO_HI.json b/src/test/resources/e2e/nshm-hawaii-2021/HILO_HI.json
index 9390be337d6cc84abbb1248e717909dd205225c6..d6ebbb57607012d9632569477d7f7c22c32caba2 100644
--- a/src/test/resources/e2e/nshm-hawaii-2021/HILO_HI.json
+++ b/src/test/resources/e2e/nshm-hawaii-2021/HILO_HI.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       4.7166583187373387E-8
     ]
   },
-  "5.00 Second Spectral Acceleration": {
+  "SA5P0": {
     "xs": [
       -6.908755779315721,
       -6.502290170873972,
@@ -91,7 +91,7 @@
       3.427414499140028E-10
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -137,7 +137,7 @@
       2.0121735347546392E-7
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -183,4 +183,4 @@
       5.139667971021216E-6
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-hawaii-2021/HONOLULU_HI.json b/src/test/resources/e2e/nshm-hawaii-2021/HONOLULU_HI.json
index 755d3992618291fcf58c8f92320fe65d48e12145..eb99e2dca984d4fc15ff043aebe204a57209eb38 100644
--- a/src/test/resources/e2e/nshm-hawaii-2021/HONOLULU_HI.json
+++ b/src/test/resources/e2e/nshm-hawaii-2021/HONOLULU_HI.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       8.894088492362763E-10
     ]
   },
-  "5.00 Second Spectral Acceleration": {
+  "SA5P0": {
     "xs": [
       -6.908755779315721,
       -6.502290170873972,
@@ -91,7 +91,7 @@
       8.040835683421514E-12
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -137,7 +137,7 @@
       5.03174786246266E-9
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -183,4 +183,4 @@
       1.0763757443621396E-7
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-hawaii-2021/KAILUA_KONA_HI.json b/src/test/resources/e2e/nshm-hawaii-2021/KAILUA_KONA_HI.json
index bbc560143e94c4e6fa1a8fe56cefaa2bab4352cc..d5764459162ab229d6ef6b792a4b66d12f49cc98 100644
--- a/src/test/resources/e2e/nshm-hawaii-2021/KAILUA_KONA_HI.json
+++ b/src/test/resources/e2e/nshm-hawaii-2021/KAILUA_KONA_HI.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       4.4135240737735364E-8
     ]
   },
-  "5.00 Second Spectral Acceleration": {
+  "SA5P0": {
     "xs": [
       -6.908755779315721,
       -6.502290170873972,
@@ -91,7 +91,7 @@
       7.198489307670766E-9
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -137,7 +137,7 @@
       2.3097496341714198E-7
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -183,4 +183,4 @@
       6.280186508295586E-6
     ]
   }
-}
\ No newline at end of file
+}