diff --git a/etc/peer/models/Set2-Case2a-fast/active-crust/gmm-tree.json b/etc/peer/models/Set2-Case2a-fast/active-crust/gmm-tree.json
index 3425f0a5a3a608d9800b9d92761c45123a173e31..f04c7190b45da51b7725acabb77c9f279d5f4ec7 100644
--- a/etc/peer/models/Set2-Case2a-fast/active-crust/gmm-tree.json
+++ b/etc/peer/models/Set2-Case2a-fast/active-crust/gmm-tree.json
@@ -1,3 +1,3 @@
 [
-  { "id": "ASK_14_BASE", "weight": 1.0 }
+  { "id": "ASK_14_VS30_MEASURED", "weight": 1.0 }
 ]
diff --git a/etc/peer/models/Set2-Case2a-fast/sites.csv b/etc/peer/models/Set2-Case2a-fast/sites.csv
index f87b4f6c4dcbcc3c5e7fa1083ab095689856a276..4fec53983cdc09e54484ee9d152302cbb009d43b 100644
--- a/etc/peer/models/Set2-Case2a-fast/sites.csv
+++ b/etc/peer/models/Set2-Case2a-fast/sites.csv
@@ -1,7 +1,7 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault3-Site1,-64.91005, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site2,-65.04497, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site3,-65.08995, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site4,-65.13490, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site5,-65.22483, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site6,-65.00900,-0.42718,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault3-Site1,-64.91005, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site2,-65.04497, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site3,-65.08995, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site4,-65.13490, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site5,-65.22483, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site6,-65.00900,-0.42718,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case2a/active-crust/gmm-tree.json b/etc/peer/models/Set2-Case2a/active-crust/gmm-tree.json
index 3425f0a5a3a608d9800b9d92761c45123a173e31..f04c7190b45da51b7725acabb77c9f279d5f4ec7 100644
--- a/etc/peer/models/Set2-Case2a/active-crust/gmm-tree.json
+++ b/etc/peer/models/Set2-Case2a/active-crust/gmm-tree.json
@@ -1,3 +1,3 @@
 [
-  { "id": "ASK_14_BASE", "weight": 1.0 }
+  { "id": "ASK_14_VS30_MEASURED", "weight": 1.0 }
 ]
diff --git a/etc/peer/models/Set2-Case2a/sites.csv b/etc/peer/models/Set2-Case2a/sites.csv
index f87b4f6c4dcbcc3c5e7fa1083ab095689856a276..4fec53983cdc09e54484ee9d152302cbb009d43b 100644
--- a/etc/peer/models/Set2-Case2a/sites.csv
+++ b/etc/peer/models/Set2-Case2a/sites.csv
@@ -1,7 +1,7 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault3-Site1,-64.91005, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site2,-65.04497, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site3,-65.08995, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site4,-65.13490, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site5,-65.22483, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site6,-65.00900,-0.42718,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault3-Site1,-64.91005, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site2,-65.04497, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site3,-65.08995, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site4,-65.13490, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site5,-65.22483, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site6,-65.00900,-0.42718,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case2b-fast/sites.csv b/etc/peer/models/Set2-Case2b-fast/sites.csv
index f87b4f6c4dcbcc3c5e7fa1083ab095689856a276..4fec53983cdc09e54484ee9d152302cbb009d43b 100644
--- a/etc/peer/models/Set2-Case2b-fast/sites.csv
+++ b/etc/peer/models/Set2-Case2b-fast/sites.csv
@@ -1,7 +1,7 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault3-Site1,-64.91005, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site2,-65.04497, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site3,-65.08995, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site4,-65.13490, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site5,-65.22483, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site6,-65.00900,-0.42718,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault3-Site1,-64.91005, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site2,-65.04497, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site3,-65.08995, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site4,-65.13490, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site5,-65.22483, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site6,-65.00900,-0.42718,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case2b/sites.csv b/etc/peer/models/Set2-Case2b/sites.csv
index f87b4f6c4dcbcc3c5e7fa1083ab095689856a276..4fec53983cdc09e54484ee9d152302cbb009d43b 100644
--- a/etc/peer/models/Set2-Case2b/sites.csv
+++ b/etc/peer/models/Set2-Case2b/sites.csv
@@ -1,7 +1,7 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault3-Site1,-64.91005, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site2,-65.04497, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site3,-65.08995, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site4,-65.13490, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site5,-65.22483, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site6,-65.00900,-0.42718,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault3-Site1,-64.91005, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site2,-65.04497, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site3,-65.08995, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site4,-65.13490, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site5,-65.22483, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site6,-65.00900,-0.42718,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case2c-fast/sites.csv b/etc/peer/models/Set2-Case2c-fast/sites.csv
index f87b4f6c4dcbcc3c5e7fa1083ab095689856a276..4fec53983cdc09e54484ee9d152302cbb009d43b 100644
--- a/etc/peer/models/Set2-Case2c-fast/sites.csv
+++ b/etc/peer/models/Set2-Case2c-fast/sites.csv
@@ -1,7 +1,7 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault3-Site1,-64.91005, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site2,-65.04497, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site3,-65.08995, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site4,-65.13490, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site5,-65.22483, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site6,-65.00900,-0.42718,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault3-Site1,-64.91005, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site2,-65.04497, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site3,-65.08995, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site4,-65.13490, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site5,-65.22483, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site6,-65.00900,-0.42718,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case2c/sites.csv b/etc/peer/models/Set2-Case2c/sites.csv
index f87b4f6c4dcbcc3c5e7fa1083ab095689856a276..4fec53983cdc09e54484ee9d152302cbb009d43b 100644
--- a/etc/peer/models/Set2-Case2c/sites.csv
+++ b/etc/peer/models/Set2-Case2c/sites.csv
@@ -1,7 +1,7 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault3-Site1,-64.91005, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site2,-65.04497, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site3,-65.08995, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site4,-65.13490, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site5,-65.22483, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site6,-65.00900,-0.42718,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault3-Site1,-64.91005, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site2,-65.04497, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site3,-65.08995, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site4,-65.13490, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site5,-65.22483, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site6,-65.00900,-0.42718,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case2d-fast/active-crust/gmm-tree.json b/etc/peer/models/Set2-Case2d-fast/active-crust/gmm-tree.json
index 621c1ab1d988df52a31b7e0c0f55c6cf41de9d6d..b6df255630c09b5c554c1a8c55d138c3913bd9e9 100644
--- a/etc/peer/models/Set2-Case2d-fast/active-crust/gmm-tree.json
+++ b/etc/peer/models/Set2-Case2d-fast/active-crust/gmm-tree.json
@@ -1,3 +1,3 @@
 [
-  { "id": "CY_14_BASE", "weight": 1.0 }
+  { "id": "CY_14_VS30_MEASURED", "weight": 1.0 }
 ]
diff --git a/etc/peer/models/Set2-Case2d-fast/sites.csv b/etc/peer/models/Set2-Case2d-fast/sites.csv
index f87b4f6c4dcbcc3c5e7fa1083ab095689856a276..4fec53983cdc09e54484ee9d152302cbb009d43b 100644
--- a/etc/peer/models/Set2-Case2d-fast/sites.csv
+++ b/etc/peer/models/Set2-Case2d-fast/sites.csv
@@ -1,7 +1,7 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault3-Site1,-64.91005, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site2,-65.04497, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site3,-65.08995, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site4,-65.13490, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site5,-65.22483, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site6,-65.00900,-0.42718,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault3-Site1,-64.91005, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site2,-65.04497, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site3,-65.08995, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site4,-65.13490, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site5,-65.22483, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site6,-65.00900,-0.42718,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case2d/sites.csv b/etc/peer/models/Set2-Case2d/sites.csv
index f87b4f6c4dcbcc3c5e7fa1083ab095689856a276..4fec53983cdc09e54484ee9d152302cbb009d43b 100644
--- a/etc/peer/models/Set2-Case2d/sites.csv
+++ b/etc/peer/models/Set2-Case2d/sites.csv
@@ -1,7 +1,7 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault3-Site1,-64.91005, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site2,-65.04497, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site3,-65.08995, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site4,-65.13490, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site5,-65.22483, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site6,-65.00900,-0.42718,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault3-Site1,-64.91005, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site2,-65.04497, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site3,-65.08995, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site4,-65.13490, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site5,-65.22483, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site6,-65.00900,-0.42718,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case3a-fast/sites.csv b/etc/peer/models/Set2-Case3a-fast/sites.csv
index f87b4f6c4dcbcc3c5e7fa1083ab095689856a276..4fec53983cdc09e54484ee9d152302cbb009d43b 100644
--- a/etc/peer/models/Set2-Case3a-fast/sites.csv
+++ b/etc/peer/models/Set2-Case3a-fast/sites.csv
@@ -1,7 +1,7 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault3-Site1,-64.91005, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site2,-65.04497, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site3,-65.08995, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site4,-65.13490, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site5,-65.22483, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site6,-65.00900,-0.42718,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault3-Site1,-64.91005, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site2,-65.04497, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site3,-65.08995, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site4,-65.13490, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site5,-65.22483, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site6,-65.00900,-0.42718,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case3a/sites.csv b/etc/peer/models/Set2-Case3a/sites.csv
index f87b4f6c4dcbcc3c5e7fa1083ab095689856a276..4fec53983cdc09e54484ee9d152302cbb009d43b 100644
--- a/etc/peer/models/Set2-Case3a/sites.csv
+++ b/etc/peer/models/Set2-Case3a/sites.csv
@@ -1,7 +1,7 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault3-Site1,-64.91005, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site2,-65.04497, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site3,-65.08995, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site4,-65.13490, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site5,-65.22483, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site6,-65.00900,-0.42718,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault3-Site1,-64.91005, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site2,-65.04497, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site3,-65.08995, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site4,-65.13490, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site5,-65.22483, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site6,-65.00900,-0.42718,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case3b-fast/sites.csv b/etc/peer/models/Set2-Case3b-fast/sites.csv
index f87b4f6c4dcbcc3c5e7fa1083ab095689856a276..4fec53983cdc09e54484ee9d152302cbb009d43b 100644
--- a/etc/peer/models/Set2-Case3b-fast/sites.csv
+++ b/etc/peer/models/Set2-Case3b-fast/sites.csv
@@ -1,7 +1,7 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault3-Site1,-64.91005, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site2,-65.04497, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site3,-65.08995, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site4,-65.13490, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site5,-65.22483, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site6,-65.00900,-0.42718,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault3-Site1,-64.91005, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site2,-65.04497, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site3,-65.08995, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site4,-65.13490, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site5,-65.22483, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site6,-65.00900,-0.42718,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case3b/sites.csv b/etc/peer/models/Set2-Case3b/sites.csv
index f87b4f6c4dcbcc3c5e7fa1083ab095689856a276..4fec53983cdc09e54484ee9d152302cbb009d43b 100644
--- a/etc/peer/models/Set2-Case3b/sites.csv
+++ b/etc/peer/models/Set2-Case3b/sites.csv
@@ -1,7 +1,7 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault3-Site1,-64.91005, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site2,-65.04497, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site3,-65.08995, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site4,-65.13490, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site5,-65.22483, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site6,-65.00900,-0.42718,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault3-Site1,-64.91005, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site2,-65.04497, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site3,-65.08995, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site4,-65.13490, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site5,-65.22483, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site6,-65.00900,-0.42718,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case3c-fast/sites.csv b/etc/peer/models/Set2-Case3c-fast/sites.csv
index f87b4f6c4dcbcc3c5e7fa1083ab095689856a276..4fec53983cdc09e54484ee9d152302cbb009d43b 100644
--- a/etc/peer/models/Set2-Case3c-fast/sites.csv
+++ b/etc/peer/models/Set2-Case3c-fast/sites.csv
@@ -1,7 +1,7 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault3-Site1,-64.91005, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site2,-65.04497, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site3,-65.08995, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site4,-65.13490, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site5,-65.22483, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site6,-65.00900,-0.42718,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault3-Site1,-64.91005, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site2,-65.04497, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site3,-65.08995, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site4,-65.13490, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site5,-65.22483, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site6,-65.00900,-0.42718,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case3c/sites.csv b/etc/peer/models/Set2-Case3c/sites.csv
index f87b4f6c4dcbcc3c5e7fa1083ab095689856a276..4fec53983cdc09e54484ee9d152302cbb009d43b 100644
--- a/etc/peer/models/Set2-Case3c/sites.csv
+++ b/etc/peer/models/Set2-Case3c/sites.csv
@@ -1,7 +1,7 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault3-Site1,-64.91005, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site2,-65.04497, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site3,-65.08995, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site4,-65.13490, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site5,-65.22483, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site6,-65.00900,-0.42718,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault3-Site1,-64.91005, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site2,-65.04497, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site3,-65.08995, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site4,-65.13490, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site5,-65.22483, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site6,-65.00900,-0.42718,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case3d-fast/sites.csv b/etc/peer/models/Set2-Case3d-fast/sites.csv
index f87b4f6c4dcbcc3c5e7fa1083ab095689856a276..4fec53983cdc09e54484ee9d152302cbb009d43b 100644
--- a/etc/peer/models/Set2-Case3d-fast/sites.csv
+++ b/etc/peer/models/Set2-Case3d-fast/sites.csv
@@ -1,7 +1,7 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault3-Site1,-64.91005, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site2,-65.04497, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site3,-65.08995, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site4,-65.13490, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site5,-65.22483, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site6,-65.00900,-0.42718,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault3-Site1,-64.91005, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site2,-65.04497, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site3,-65.08995, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site4,-65.13490, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site5,-65.22483, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site6,-65.00900,-0.42718,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case3d/sites.csv b/etc/peer/models/Set2-Case3d/sites.csv
index f87b4f6c4dcbcc3c5e7fa1083ab095689856a276..4fec53983cdc09e54484ee9d152302cbb009d43b 100644
--- a/etc/peer/models/Set2-Case3d/sites.csv
+++ b/etc/peer/models/Set2-Case3d/sites.csv
@@ -1,7 +1,7 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault3-Site1,-64.91005, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site2,-65.04497, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site3,-65.08995, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site4,-65.13490, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site5,-65.22483, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site6,-65.00900,-0.42718,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault3-Site1,-64.91005, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site2,-65.04497, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site3,-65.08995, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site4,-65.13490, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site5,-65.22483, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site6,-65.00900,-0.42718,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case4a-fast/sites.csv b/etc/peer/models/Set2-Case4a-fast/sites.csv
index 37f17e6637586ca5384a572aaf78a4731ec480f6..82ec41bbd5f5073c5b5af52c80218a2a7d002c7b 100644
--- a/etc/peer/models/Set2-Case4a-fast/sites.csv
+++ b/etc/peer/models/Set2-Case4a-fast/sites.csv
@@ -1,2 +1,2 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault5-Site1,-65.00900, 0.00000,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault5-Site1,-65.00900, 0.00000,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case4a/sites.csv b/etc/peer/models/Set2-Case4a/sites.csv
index 37f17e6637586ca5384a572aaf78a4731ec480f6..82ec41bbd5f5073c5b5af52c80218a2a7d002c7b 100644
--- a/etc/peer/models/Set2-Case4a/sites.csv
+++ b/etc/peer/models/Set2-Case4a/sites.csv
@@ -1,2 +1,2 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault5-Site1,-65.00900, 0.00000,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault5-Site1,-65.00900, 0.00000,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case4b-fast/sites.csv b/etc/peer/models/Set2-Case4b-fast/sites.csv
index 37f17e6637586ca5384a572aaf78a4731ec480f6..82ec41bbd5f5073c5b5af52c80218a2a7d002c7b 100644
--- a/etc/peer/models/Set2-Case4b-fast/sites.csv
+++ b/etc/peer/models/Set2-Case4b-fast/sites.csv
@@ -1,2 +1,2 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault5-Site1,-65.00900, 0.00000,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault5-Site1,-65.00900, 0.00000,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case4b/sites.csv b/etc/peer/models/Set2-Case4b/sites.csv
index 37f17e6637586ca5384a572aaf78a4731ec480f6..82ec41bbd5f5073c5b5af52c80218a2a7d002c7b 100644
--- a/etc/peer/models/Set2-Case4b/sites.csv
+++ b/etc/peer/models/Set2-Case4b/sites.csv
@@ -1,2 +1,2 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault5-Site1,-65.00900, 0.00000,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault5-Site1,-65.00900, 0.00000,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case5a/sites.csv b/etc/peer/models/Set2-Case5a/sites.csv
index a89656bccce20189ff44b4224bc46e1010589184..6d1f6f186dd52882cf8c4d4e6ce33cffd28d2739 100644
--- a/etc/peer/models/Set2-Case5a/sites.csv
+++ b/etc/peer/models/Set2-Case5a/sites.csv
@@ -1,2 +1,2 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault6-Site1,-65.13490, 0.00000,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault6-Site1,-65.13490, 0.00000,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case5b/sites.csv b/etc/peer/models/Set2-Case5b/sites.csv
index a89656bccce20189ff44b4224bc46e1010589184..6d1f6f186dd52882cf8c4d4e6ce33cffd28d2739 100644
--- a/etc/peer/models/Set2-Case5b/sites.csv
+++ b/etc/peer/models/Set2-Case5b/sites.csv
@@ -1,2 +1,2 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault6-Site1,-65.13490, 0.00000,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault6-Site1,-65.13490, 0.00000,760,0.048,0.607