diff --git a/Geometry/HGCalCommonData/data/hgcalwafer/v17/hgcalwafer.xml b/Geometry/HGCalCommonData/data/hgcalwafer/v17/hgcalwafer.xml
index 4b5e49a0822c4..094c34be50d28 100644
--- a/Geometry/HGCalCommonData/data/hgcalwafer/v17/hgcalwafer.xml
+++ b/Geometry/HGCalCommonData/data/hgcalwafer/v17/hgcalwafer.xml
@@ -638,7 +638,7 @@
       0, 0, 0, 0, 0, 0, 0, 1, 0 </Vector>
     <Vector name="Layers" type="numeric" nEntries="10"> 
       8, 5, 6, 5, 7, 4, 3, 2, 1, 0 </Vector>
-    <String name="SenseName"    value="HGCalEECellSensitive"/>
+    <String name="SenseName"     value="HGCalEECellSensitive"/>
     <Numeric name="SenseType"    value="0"/>
     <Numeric name="SenseThick"   value="[CellThicknessFine]"/>
   </Algorithm>
@@ -674,7 +674,7 @@
       0, 0, 0, 0, 0, 0, 0, 1, 0 </Vector>
     <Vector name="Layers" type="numeric" nEntries="10">
       0, 1, 2, 3, 4, 7, 5, 6, 5, 8 </Vector>
-    <String name="SenseName"    value="HGCalEECellSensitive"/>
+    <String name="SenseName"     value="HGCalEECellSensitive"/>
     <Numeric name="SenseType"    value="0"/>
     <Numeric name="SenseThick"   value="[CellThicknessFine]"/>
   </Algorithm>
@@ -710,7 +710,7 @@
       0, 0, 0, 0, 0, 0, 0, 1, 0 </Vector>
     <Vector name="Layers" type="numeric" nEntries="10"> 
       8, 5, 6, 5, 7, 4, 3, 2, 1, 0 </Vector>
-    <String name="SenseName"    value="HGCalEECellSensitive"/>
+    <String name="SenseName"     value="HGCalEECellSensitive"/>
     <Numeric name="SenseType"    value="1"/>
     <Numeric name="SenseThick"   value="[CellThicknessCoarse1]"/>
   </Algorithm>
@@ -746,7 +746,7 @@
       0, 0, 0, 0, 0, 0, 0, 1, 0 </Vector>
     <Vector name="Layers" type="numeric" nEntries="10"> 
       0, 1, 2, 3, 4, 7, 5, 6, 5, 8 </Vector>
-    <String name="SenseName"    value="HGCalEECellSensitive"/>
+    <String name="SenseName"     value="HGCalEECellSensitive"/>
     <Numeric name="SenseType"    value="1"/>
     <Numeric name="SenseThick"   value="[CellThicknessCoarse1]"/>
   </Algorithm>
@@ -782,7 +782,7 @@
       0, 0, 0, 0, 0, 0, 0, 1, 0 </Vector>
     <Vector name="Layers" type="numeric" nEntries="10"> 
       8, 5, 6, 5, 7, 4, 3, 2, 1, 0 </Vector>
-    <String name="SenseName"    value="HGCalEECellSensitive"/>
+    <String name="SenseName"     value="HGCalEECellSensitive"/>
     <Numeric name="SenseType"    value="2"/>
     <Numeric name="SenseThick"   value="[CellThicknessCoarse2]"/>
   </Algorithm>
@@ -818,7 +818,7 @@
       0, 0, 0, 0, 0, 0, 0, 1, 0 </Vector>
     <Vector name="Layers" type="numeric" nEntries="10"> 
       0, 1, 2, 3, 4, 7, 5, 6, 5, 8 </Vector>
-    <String name="SenseName"    value="HGCalEECellSensitive"/>
+    <String name="SenseName"     value="HGCalEECellSensitive"/>
     <Numeric name="SenseType"    value="2"/>
     <Numeric name="SenseThick"   value="[CellThicknessCoarse2]"/>
   </Algorithm>
@@ -854,7 +854,7 @@
       0, 0, 0, 0, 0, 0, 1, 0 </Vector>
     <Vector name="Layers" type="numeric" nEntries="10"> 
       7, 4, 5, 4, 6, 4, 3, 2, 1, 0 </Vector>
-    <String name="SenseName"    value="HGCalHECellSensitive"/>
+    <String name="SenseName"     value="HGCalHESiliconCellSensitive"/>
     <Numeric name="SenseType"    value="0"/>
     <Numeric name="SenseThick"   value="[CellThicknessFine]"/>
   </Algorithm>
@@ -890,7 +890,7 @@
       0, 0, 0, 0, 0, 0, 1, 0 </Vector>
     <Vector name="Layers" type="numeric" nEntries="10"> 
       0, 1, 2, 3, 4, 6, 4, 5, 4, 7 </Vector>
-    <String name="SenseName"    value="HGCalHECellSensitive"/>
+    <String name="SenseName"     value="HGCalHESiliconCellSensitive"/>
     <Numeric name="SenseType"    value="0"/>
     <Numeric name="SenseThick"   value="[CellThicknessFine]"/>
   </Algorithm>
@@ -926,7 +926,7 @@
       0, 0, 0, 0, 0, 0, 1, 0 </Vector>
     <Vector name="Layers" type="numeric" nEntries="10"> 
       7, 4, 5, 4, 6, 4, 3, 2, 1, 0 </Vector>
-    <String name="SenseName"    value="HGCalHECellSensitive"/>
+    <String name="SenseName"     value="HGCalHESiliconCellSensitive"/>
     <Numeric name="SenseType"    value="1"/>
     <Numeric name="SenseThick"   value="[CellThicknessCoarse1]"/>
   </Algorithm>
@@ -962,7 +962,7 @@
       0, 0, 0, 0, 0, 0, 1, 0 </Vector>
     <Vector name="Layers" type="numeric" nEntries="10"> 
       0, 1, 2, 3, 4, 6, 4, 5, 4, 7 </Vector>
-    <String name="SenseName"    value="HGCalHECellSensitive"/>
+    <String name="SenseName"     value="HGCalHESiliconCellSensitive"/>
     <Numeric name="SenseType"    value="1"/>
     <Numeric name="SenseThick"   value="[CellThicknessCoarse1]"/>
   </Algorithm>
@@ -998,7 +998,7 @@
       0, 0, 0, 0, 0, 0, 1, 0 </Vector>
     <Vector name="Layers" type="numeric" nEntries="10"> 
       7, 4, 5, 4, 6, 4, 3, 2, 1, 0 </Vector>
-    <String name="SenseName"    value="HGCalHECellSensitive"/>
+    <String name="SenseName"     value="HGCalHESiliconCellSensitive"/>
     <Numeric name="SenseType"    value="2"/>
     <Numeric name="SenseThick"   value="[CellThicknessCoarse2]"/>
   </Algorithm>
@@ -1034,7 +1034,7 @@
       0, 0, 0, 0, 0, 0, 1, 0 </Vector>
     <Vector name="Layers" type="numeric" nEntries="10"> 
       0, 1, 2, 3, 4, 6, 4, 5, 4, 7 </Vector>
-    <String name="SenseName"    value="HGCalHECellSensitive"/>
+    <String name="SenseName"     value="HGCalHESiliconCellSensitive"/>
     <Numeric name="SenseType"    value="2"/>
     <Numeric name="SenseThick"   value="[CellThicknessCoarse2]"/>
   </Algorithm>
diff --git a/Geometry/HGCalCommonData/data/hgcalwafer/v17n/hgcalwafer.xml b/Geometry/HGCalCommonData/data/hgcalwafer/v17n/hgcalwafer.xml
index 350696df3a1b4..d0f6fd0195007 100644
--- a/Geometry/HGCalCommonData/data/hgcalwafer/v17n/hgcalwafer.xml
+++ b/Geometry/HGCalCommonData/data/hgcalwafer/v17n/hgcalwafer.xml
@@ -434,7 +434,7 @@
       0, 0, 0, 0, 0, 0, 0, 1, 0 </Vector>
     <Vector name="Layers" type="numeric" nEntries="10"> 
       8, 5, 6, 5, 7, 4, 3, 2, 1, 0 </Vector>
-    <String name="SenseName"    value="HGCalEECellSensitive"/>
+    <String name="SenseName"     value="HGCalEECellSensitive"/>
     <Numeric name="SenseType"    value="-1"/>
     <Numeric name="SenseThick"   value="[CellThicknessFine]"/>
   </Algorithm>
@@ -470,7 +470,7 @@
       0, 0, 0, 0, 0, 0, 0, 1, 0 </Vector>
     <Vector name="Layers" type="numeric" nEntries="10">
       0, 1, 2, 3, 4, 7, 5, 6, 5, 8 </Vector>
-    <String name="SenseName"    value="HGCalEECellSensitive"/>
+    <String name="SenseName"     value="HGCalEECellSensitive"/>
     <Numeric name="SenseType"    value="-1"/>
     <Numeric name="SenseThick"   value="[CellThicknessFine]"/>
   </Algorithm>
@@ -506,7 +506,7 @@
       0, 0, 0, 0, 0, 0, 0, 1, 0 </Vector>
     <Vector name="Layers" type="numeric" nEntries="10"> 
       8, 5, 6, 5, 7, 4, 3, 2, 1, 0 </Vector>
-    <String name="SenseName"    value="HGCalEECellSensitive"/>
+    <String name="SenseName"     value="HGCalEECellSensitive"/>
     <Numeric name="SenseType"    value="-1"/>
     <Numeric name="SenseThick"   value="[CellThicknessCoarse1]"/>
   </Algorithm>
@@ -542,7 +542,7 @@
       0, 0, 0, 0, 0, 0, 0, 1, 0 </Vector>
     <Vector name="Layers" type="numeric" nEntries="10"> 
       0, 1, 2, 3, 4, 7, 5, 6, 5, 8 </Vector>
-    <String name="SenseName"    value="HGCalEECellSensitive"/>
+    <String name="SenseName"     value="HGCalEECellSensitive"/>
     <Numeric name="SenseType"    value="-1"/>
     <Numeric name="SenseThick"   value="[CellThicknessCoarse1]"/>
   </Algorithm>
@@ -578,7 +578,7 @@
       0, 0, 0, 0, 0, 0, 0, 1, 0 </Vector>
     <Vector name="Layers" type="numeric" nEntries="10"> 
       8, 5, 6, 5, 7, 4, 3, 2, 1, 0 </Vector>
-    <String name="SenseName"    value="HGCalEECellSensitive"/>
+    <String name="SenseName"     value="HGCalEECellSensitive"/>
     <Numeric name="SenseType"    value="-1"/>
     <Numeric name="SenseThick"   value="[CellThicknessCoarse2]"/>
   </Algorithm>
@@ -614,7 +614,7 @@
       0, 0, 0, 0, 0, 0, 0, 1, 0 </Vector>
     <Vector name="Layers" type="numeric" nEntries="10"> 
       0, 1, 2, 3, 4, 7, 5, 6, 5, 8 </Vector>
-    <String name="SenseName"    value="HGCalEECellSensitive"/>
+    <String name="SenseName"     value="HGCalEECellSensitive"/>
     <Numeric name="SenseType"    value="-1"/>
     <Numeric name="SenseThick"   value="[CellThicknessCoarse2]"/>
   </Algorithm>
@@ -650,7 +650,7 @@
       0, 0, 0, 0, 0, 0, 1, 0 </Vector>
     <Vector name="Layers" type="numeric" nEntries="10"> 
       7, 4, 5, 4, 6, 4, 3, 2, 1, 0 </Vector>
-    <String name="SenseName"    value="HGCalHECellSensitive"/>
+    <String name="SenseName"     value="HGCalHESiliconCellSensitive"/>
     <Numeric name="SenseType"    value="-1"/>
     <Numeric name="SenseThick"   value="[CellThicknessFine]"/>
   </Algorithm>
@@ -686,7 +686,7 @@
       0, 0, 0, 0, 0, 0, 1, 0 </Vector>
     <Vector name="Layers" type="numeric" nEntries="10"> 
       0, 1, 2, 3, 4, 6, 4, 5, 4, 7 </Vector>
-    <String name="SenseName"    value="HGCalHECellSensitive"/>
+    <String name="SenseName"     value="HGCalHESiliconCellSensitive"/>
     <Numeric name="SenseType"    value="-1"/>
     <Numeric name="SenseThick"   value="[CellThicknessFine]"/>
   </Algorithm>
@@ -722,7 +722,7 @@
       0, 0, 0, 0, 0, 0, 1, 0 </Vector>
     <Vector name="Layers" type="numeric" nEntries="10"> 
       7, 4, 5, 4, 6, 4, 3, 2, 1, 0 </Vector>
-    <String name="SenseName"    value="HGCalHECellSensitive"/>
+    <String name="SenseName"     value="HGCalHESiliconCellSensitive"/>
     <Numeric name="SenseType"    value="-1"/>
     <Numeric name="SenseThick"   value="[CellThicknessCoarse1]"/>
   </Algorithm>
@@ -758,7 +758,7 @@
       0, 0, 0, 0, 0, 0, 1, 0 </Vector>
     <Vector name="Layers" type="numeric" nEntries="10"> 
       0, 1, 2, 3, 4, 6, 4, 5, 4, 7 </Vector>
-    <String name="SenseName"    value="HGCalHECellSensitive"/>
+    <String name="SenseName"     value="HGCalHESiliconCellSensitive"/>
     <Numeric name="SenseType"    value="-1"/>
     <Numeric name="SenseThick"   value="[CellThicknessCoarse1]"/>
   </Algorithm>
@@ -794,7 +794,7 @@
       0, 0, 0, 0, 0, 0, 1, 0 </Vector>
     <Vector name="Layers" type="numeric" nEntries="10"> 
       7, 4, 5, 4, 6, 4, 3, 2, 1, 0 </Vector>
-    <String name="SenseName"    value="HGCalHECellSensitive"/>
+    <String name="SenseName"     value="HGCalHESiliconCellSensitive"/>
     <Numeric name="SenseType"    value="-1"/>
     <Numeric name="SenseThick"   value="[CellThicknessCoarse2]"/>
   </Algorithm>
@@ -830,7 +830,7 @@
       0, 0, 0, 0, 0, 0, 1, 0 </Vector>
     <Vector name="Layers" type="numeric" nEntries="10"> 
       0, 1, 2, 3, 4, 6, 4, 5, 4, 7 </Vector>
-    <String name="SenseName"    value="HGCalHECellSensitive"/>
+    <String name="SenseName"     value="HGCalHESiliconCellSensitive"/>
     <Numeric name="SenseType"    value="-1"/>
     <Numeric name="SenseThick"   value="[CellThicknessCoarse2]"/>
   </Algorithm>
diff --git a/Geometry/HGCalCommonData/data/hgcalwafer/v17p/hgcalwafer.xml b/Geometry/HGCalCommonData/data/hgcalwafer/v17p/hgcalwafer.xml
index 86e340b6f926b..6793dd42dff9f 100644
--- a/Geometry/HGCalCommonData/data/hgcalwafer/v17p/hgcalwafer.xml
+++ b/Geometry/HGCalCommonData/data/hgcalwafer/v17p/hgcalwafer.xml
@@ -50,7 +50,7 @@
       0, 0, 0, 0, 0, 0, 0, 1, 0 </Vector>
     <Vector name="Layers" type="numeric" nEntries="10"> 
       8, 5, 6, 5, 7, 4, 3, 2, 1, 0 </Vector>
-    <String name="SenseName"    value="HGCalEECellSensitive"/>
+    <String name="SenseName"     value="HGCalEECellSensitive"/>
     <Numeric name="SenseType"    value="0"/>
     <Numeric name="SenseThick"   value="[CellThicknessFine]"/>
   </Algorithm>
@@ -86,7 +86,7 @@
       0, 0, 0, 0, 0, 0, 0, 1, 0 </Vector>
     <Vector name="Layers" type="numeric" nEntries="10">
       0, 1, 2, 3, 4, 7, 5, 6, 5, 8 </Vector>
-    <String name="SenseName"    value="HGCalEECellSensitive"/>
+    <String name="SenseName"     value="HGCalEECellSensitive"/>
     <Numeric name="SenseType"    value="0"/>
     <Numeric name="SenseThick"   value="[CellThicknessFine]"/>
   </Algorithm>
@@ -122,7 +122,7 @@
       0, 0, 0, 0, 0, 0, 0, 1, 0 </Vector>
     <Vector name="Layers" type="numeric" nEntries="10"> 
       8, 5, 6, 5, 7, 4, 3, 2, 1, 0 </Vector>
-    <String name="SenseName"    value="HGCalEECellSensitive"/>
+    <String name="SenseName"     value="HGCalEECellSensitive"/>
     <Numeric name="SenseType"    value="1"/>
     <Numeric name="SenseThick"   value="[CellThicknessCoarse1]"/>
   </Algorithm>
@@ -158,7 +158,7 @@
       0, 0, 0, 0, 0, 0, 0, 1, 0 </Vector>
     <Vector name="Layers" type="numeric" nEntries="10"> 
       0, 1, 2, 3, 4, 7, 5, 6, 5, 8 </Vector>
-    <String name="SenseName"    value="HGCalEECellSensitive"/>
+    <String name="SenseName"     value="HGCalEECellSensitive"/>
     <Numeric name="SenseType"    value="1"/>
     <Numeric name="SenseThick"   value="[CellThicknessCoarse1]"/>
   </Algorithm>
@@ -194,7 +194,7 @@
       0, 0, 0, 0, 0, 0, 0, 1, 0 </Vector>
     <Vector name="Layers" type="numeric" nEntries="10"> 
       8, 5, 6, 5, 7, 4, 3, 2, 1, 0 </Vector>
-    <String name="SenseName"    value="HGCalEECellSensitive"/>
+    <String name="SenseName"     value="HGCalEECellSensitive"/>
     <Numeric name="SenseType"    value="2"/>
     <Numeric name="SenseThick"   value="[CellThicknessCoarse2]"/>
   </Algorithm>
@@ -230,7 +230,7 @@
       0, 0, 0, 0, 0, 0, 0, 1, 0 </Vector>
     <Vector name="Layers" type="numeric" nEntries="10"> 
       0, 1, 2, 3, 4, 7, 5, 6, 5, 8 </Vector>
-    <String name="SenseName"    value="HGCalEECellSensitive"/>
+    <String name="SenseName"     value="HGCalEECellSensitive"/>
     <Numeric name="SenseType"    value="2"/>
     <Numeric name="SenseThick"   value="[CellThicknessCoarse2]"/>
   </Algorithm>
@@ -266,7 +266,7 @@
       0, 0, 0, 0, 0, 0, 1, 0 </Vector>
     <Vector name="Layers" type="numeric" nEntries="10"> 
       7, 4, 5, 4, 6, 4, 3, 2, 1, 0 </Vector>
-    <String name="SenseName"    value="HGCalHECellSensitive"/>
+    <String name="SenseName"     value="HGCalHESiliconCellSensitive"/>
     <Numeric name="SenseType"    value="0"/>
     <Numeric name="SenseThick"   value="[CellThicknessFine]"/>
   </Algorithm>
@@ -302,7 +302,7 @@
       0, 0, 0, 0, 0, 0, 1, 0 </Vector>
     <Vector name="Layers" type="numeric" nEntries="10"> 
       0, 1, 2, 3, 4, 6, 4, 5, 4, 7 </Vector>
-    <String name="SenseName"    value="HGCalHECellSensitive"/>
+    <String name="SenseName"     value="HGCalHESiliconCellSensitive"/>
     <Numeric name="SenseType"    value="0"/>
     <Numeric name="SenseThick"   value="[CellThicknessFine]"/>
   </Algorithm>
@@ -338,7 +338,7 @@
       0, 0, 0, 0, 0, 0, 1, 0 </Vector>
     <Vector name="Layers" type="numeric" nEntries="10"> 
       7, 4, 5, 4, 6, 4, 3, 2, 1, 0 </Vector>
-    <String name="SenseName"    value="HGCalHECellSensitive"/>
+    <String name="SenseName"     value="HGCalHESiliconCellSensitive"/>
     <Numeric name="SenseType"    value="1"/>
     <Numeric name="SenseThick"   value="[CellThicknessCoarse1]"/>
   </Algorithm>
@@ -374,7 +374,7 @@
       0, 0, 0, 0, 0, 0, 1, 0 </Vector>
     <Vector name="Layers" type="numeric" nEntries="10"> 
       0, 1, 2, 3, 4, 6, 4, 5, 4, 7 </Vector>
-    <String name="SenseName"    value="HGCalHECellSensitive"/>
+    <String name="SenseName"     value="HGCalHESiliconCellSensitive"/>
     <Numeric name="SenseType"    value="1"/>
     <Numeric name="SenseThick"   value="[CellThicknessCoarse1]"/>
   </Algorithm>
@@ -410,7 +410,7 @@
       0, 0, 0, 0, 0, 0, 1, 0 </Vector>
     <Vector name="Layers" type="numeric" nEntries="10"> 
       7, 4, 5, 4, 6, 4, 3, 2, 1, 0 </Vector>
-    <String name="SenseName"    value="HGCalHECellSensitive"/>
+    <String name="SenseName"     value="HGCalHESiliconCellSensitive"/>
     <Numeric name="SenseType"    value="2"/>
     <Numeric name="SenseThick"   value="[CellThicknessCoarse2]"/>
   </Algorithm>
@@ -446,7 +446,7 @@
       0, 0, 0, 0, 0, 0, 1, 0 </Vector>
     <Vector name="Layers" type="numeric" nEntries="10"> 
       0, 1, 2, 3, 4, 6, 4, 5, 4, 7 </Vector>
-    <String name="SenseName"    value="HGCalHECellSensitive"/>
+    <String name="SenseName"     value="HGCalHESiliconCellSensitive"/>
     <Numeric name="SenseType"    value="2"/>
     <Numeric name="SenseThick"   value="[CellThicknessCoarse2]"/>
   </Algorithm>