diff --git a/Detector/Muon/src/Filters/GetBoxesVol.cpp b/Detector/Muon/src/Filters/GetBoxesVol.cpp
index 2a61e9ed44c3693198d7bb8be735bc465577b6e4..b24d1e897ac31177e18609e9274495dbc0aacf97 100644
--- a/Detector/Muon/src/Filters/GetBoxesVol.cpp
+++ b/Detector/Muon/src/Filters/GetBoxesVol.cpp
@@ -54,11 +54,11 @@ void GetBoxesVol( dd4hep::Detector& description, xml_h e, std::map<std::string,
 
     dd4hep::Box    Box( BoxSizeX / 2., BoxSizeY / 2., BoxSizeZ / 2. );
     dd4hep::Volume BoxVol( box_name, Box, BoxMaterial );
-    if ( material.compare( "MuonFilterIron" ) == 0 ) {
+    if ( material.compare( "Muon:FilterIron" ) == 0 ) {
       BoxVol.setVisAttributes( description, "Muon:MuonFilterIron" );
-    } else if ( material.compare( "Steel" ) == 0 ) {
+    } else if ( material.compare( "Muon:Steel" ) == 0 ) {
       BoxVol.setVisAttributes( description, "Muon:MuonFilterSteel" );
-    } else if ( material.compare( "Concrete" ) == 0 ) {
+    } else if ( material.compare( "Muon:Concrete" ) == 0 ) {
       BoxVol.setVisAttributes( description, "Muon:MuonFilterConcrete" );
     } else { /* material = Air */
       BoxVol.setVisAttributes( description, "Muon:MuonFilterAir" );
diff --git a/Detector/Muon/src/muon_geo_beam_plugs.cpp b/Detector/Muon/src/muon_geo_beam_plugs.cpp
index 5c12e0945fb2987b1414a0407336556c9451fce5..6b5786ba5103def035293c11414f14ca3a89f20a 100644
--- a/Detector/Muon/src/muon_geo_beam_plugs.cpp
+++ b/Detector/Muon/src/muon_geo_beam_plugs.cpp
@@ -72,7 +72,7 @@ static Ref_t BuildBeamPlug( Detector& description, xml_h e, SensitiveDetector )
                      BeamPlugBigRad + offset );
   SubtractionSolid BeamPlug( BeamPlugBox, BeamPlugHole );
 
-  Volume lv_BeamPlug( logvol_name, BeamPlug, description.material( "MuonFilterIron" ) );
+  Volume lv_BeamPlug( logvol_name, BeamPlug, description.material( "Muon:FilterIron" ) );
   lv_BeamPlug.setVisAttributes( description, "Muon:BeamPlugVis" );
 
   // Place beam plug in mother volume
diff --git a/Detector/Muon/src/muon_geo_filters.cpp b/Detector/Muon/src/muon_geo_filters.cpp
index 4842f0eca5da038cd718734d3f319d0176348958..45c9e44d05cfc8424fce0793621ba445019a1a9d 100644
--- a/Detector/Muon/src/muon_geo_filters.cpp
+++ b/Detector/Muon/src/muon_geo_filters.cpp
@@ -272,7 +272,7 @@ static Ref_t BuildFilters( Detector& description, xml_h e, SensitiveDetector ) {
       double   Box2SizeX, Box2SizeY, Box2SizeZ;
       double   Box1RotAngle;
       double   offset = 0.000001;
-      Material Iron   = description.material( "MuonFilterIron" );
+      Material Iron   = description.material( "Muon:FilterIron" );
 
       xml_comp_t un  = l.child( _LBU( Union ) );
       xml_comp_t sub = un.child( _U( subtraction ) );
diff --git a/Detector/Muon/src/muon_geo_stations.cpp b/Detector/Muon/src/muon_geo_stations.cpp
index 8044cf5e47d12db56df0ab8afb7dd86a4b1838d2..1c0095d206ce3e989aba9ec1daabab6fb41d3f94 100644
--- a/Detector/Muon/src/muon_geo_stations.cpp
+++ b/Detector/Muon/src/muon_geo_stations.cpp
@@ -48,7 +48,7 @@ Assembly BuildChamber( Detector& description, SensitiveDetector sens, chamber_de
                    inner_frame_size_z / 2. + offset ); // Add offset to avoid overlaps between the frame and the chamber
                                                        // box
   SubtractionSolid frame( outer_frame, inner_frame );
-  Volume           frame_volume( "ChamberFrame", frame, description.material( "G10Air" ) );
+  Volume           frame_volume( "ChamberFrame", frame, description.material( "Muon:G10Air" ) );
   // frame_volume.setVisAttributes(description, "Muon:FrameVis");
   chamber.placeVolume( frame_volume, Position( 0., 0., ch.FrameZ ) ); // Frame volume placed in the chamber
 
@@ -67,20 +67,20 @@ Assembly BuildChamber( Detector& description, SensitiveDetector sens, chamber_de
   double copper_30mic_size_z = ch.Copper30micSizeZ - offset;
   Volume copper_30mic( "Copper30micBox",
                        Box( copper_30mic_size_x / 2., copper_30mic_size_y / 2., copper_30mic_size_z / 2. ),
-                       description.material( "MuonCopper" ) );
+                       description.material( "Copper" ) );
   // copper_30mic.setVisAttributes(description, "Muon:EndCapVis");
 
   double g10_gap_size_x = ch.G10GapSizeX - offset;
   double g10_gap_size_y = ch.G10GapSizeY - offset;
   double g10_gap_size_z = ch.G10GapSizeZ - offset;
   Volume g10_gap( "G10GapBox", Box( g10_gap_size_x / 2., g10_gap_size_y / 2., g10_gap_size_z / 2. ),
-                  description.material( "G10" ) );
+                  description.material( "Muon:G10" ) );
 
   double poly_gap_size_x = ch.PolyGapSizeX - offset;
   double poly_gap_size_y = ch.PolyGapSizeY - offset;
   double poly_gap_size_z = ch.PolyGapSizeZ - offset;
   Volume poly_gap( "PolyGapBox", Box( poly_gap_size_x / 2., poly_gap_size_y / 2., poly_gap_size_z / 2. ),
-                   description.material( "MuonPolyurethane" ) ); // To be used later on in EndCaps
+                   description.material( "Muon:Polyurethane" ) ); // To be used later on in EndCaps
 
   // Create the GasGapLayers 1, 5 and 9 first.
   double gas_gap_layer1_size_x = ch.GasGapLayer1SizeX - offset;
@@ -97,17 +97,17 @@ Assembly BuildChamber( Detector& description, SensitiveDetector sens, chamber_de
   sens.setType( "tracker" );
   Volume gas_gap_layer5( "GasGapLayer5",
                          Box( gas_gap_layer5_size_x / 2., gas_gap_layer5_size_y / 2., gas_gap_layer5_size_z / 2. ),
-                         description.material( "S_CPC_gas" ) );
+                         description.material( "Muon:S_CPC_gas" ) );
   gas_gap_layer5.setSensitiveDetector( sens );
 
   // GasGapLayer1 volume
   Volume gas_gap_layer1( "GasGapLayer1",
                          Box( gas_gap_layer1_size_x / 2., gas_gap_layer1_size_y / 2., gas_gap_layer1_size_z / 2. ),
-                         description.material( "MuonPolyurethane" ) );
+                         description.material( "Muon:Polyurethane" ) );
   // GasGapLayer9 volume
   Volume gas_gap_layer9( "GasGapLayer9",
                          Box( gas_gap_layer9_size_x / 2., gas_gap_layer9_size_y / 2., gas_gap_layer9_size_z / 2. ),
-                         description.material( "MuonPolyurethane" ) );
+                         description.material( "Muon:Polyurethane" ) );
 
   // GasGapLayer3 volume
   double   copper_30mic_layer3_z = ch.Copper30micLayer3Z;
diff --git a/Detector/Muon/src/muon_geo_supports.cpp b/Detector/Muon/src/muon_geo_supports.cpp
index 43c4e6f6629b88d2a0d339b8e65ee80ce3d8b0a1..f16924a7ccd6d050b16ea0969871fdfb04bbdff3 100644
--- a/Detector/Muon/src/muon_geo_supports.cpp
+++ b/Detector/Muon/src/muon_geo_supports.cpp
@@ -125,7 +125,7 @@ static Ref_t BuildSideSupport( Detector& description, xml_h e, SensitiveDetector
   Box              outer_box( OutBoxSize[0] / 2., OutBoxSize[1] / 2., OutBoxSize[2] / 2. );
   Box              inner_box( InnBoxSize[0] / 2. + offset, InnBoxSize[1] / 2. + offset, InnBoxSize[2] / 2. + offset );
   SubtractionSolid single_support_panel( outer_box, inner_box );
-  Volume           lv_SupporPanel( "SupportPanel", single_support_panel, description.material( "Aluminium" ) );
+  Volume           lv_SupporPanel( "SupportPanel", single_support_panel, description.material( "Aluminum" ) );
   lv_SupporPanel.setVisAttributes( description, "Muon:SideSupportVis" );
 
   // Place back and front support panels inside the SideSupport vol
diff --git a/compact/before-rich1-geom-update-26052022/LHCb.xml b/compact/before-rich1-geom-update-26052022/LHCb.xml
index fe251d75b1967e2bc54edd585511e2a7ea15a4ca..ccaa6397118a77966f59aa4a3ac6c1f7d6d9063c 100644
--- a/compact/before-rich1-geom-update-26052022/LHCb.xml
+++ b/compact/before-rich1-geom-update-26052022/LHCb.xml
@@ -110,7 +110,7 @@
 
 
   <include ref="BlockWall/parameters.xml"/>
-  <include ref="BlockWall/detector.xml"/> 
+  <include ref="BlockWall/detector.xml"/>
 
   <include ref="GValve/parameters.xml"/>
   <include ref="GValve/detector.xml"/> 
@@ -145,12 +145,11 @@
   <include ref="FT/conditions.xml"/>
 
   <include ref="Muon/detector.xml"/>
-  <include ref="Muon/conditions.xml"/>  
- 
+  <include ref="Muon/conditions.xml"/>
   <include ref="ECAL/parameters.xml"/>
   <include ref="ECAL/detector.xml"/>
   <include ref="ECAL/conditions.xml"/>
- 
+
   <include ref="HCAL/parameters.xml"/>
   <include ref="HCAL/detector.xml"/>
   <include ref="HCAL/conditions.xml"/>
diff --git a/compact/before-rich1-geom-update-26052022/Muon/Muon/BeamPlugs/M2ASideBeamPlug.xml b/compact/before-rich1-geom-update-26052022/Muon/Muon/BeamPlugs/M2ASideBeamPlug.xml
index e246cff464a37f506f9070f9a9d0230fce13ab09..5d3c32555def5a36996802eb89cac947c09e126a 100644
--- a/compact/before-rich1-geom-update-26052022/Muon/Muon/BeamPlugs/M2ASideBeamPlug.xml
+++ b/compact/before-rich1-geom-update-26052022/Muon/Muon/BeamPlugs/M2ASideBeamPlug.xml
@@ -23,7 +23,7 @@
       </physvol>
 
 
-      <logvol name="lvM2ASideBeamPlug" material="Muon/MuonFilterIron">
+      <logvol name="lvM2ASideBeamPlug" material="Muon:FilterIron">
 	<subtraction name="M2ASideBeamPlugSub">
 	  <!-- box up to 50mm in Y and 70mm in X from closest chamber -->
 	  <box name="M2ASideBeamPlugBox" sizeX="227.05*mm" sizeY="395*mm" sizeZ="395*mm"/>
diff --git a/compact/before-rich1-geom-update-26052022/Muon/Muon/BeamPlugs/M2CSideBeamPlug.xml b/compact/before-rich1-geom-update-26052022/Muon/Muon/BeamPlugs/M2CSideBeamPlug.xml
index 0a1ef80a739b02765b2f73033c60011604216330..e376a4fae5d345f70f382db1224be79b7d235b14 100644
--- a/compact/before-rich1-geom-update-26052022/Muon/Muon/BeamPlugs/M2CSideBeamPlug.xml
+++ b/compact/before-rich1-geom-update-26052022/Muon/Muon/BeamPlugs/M2CSideBeamPlug.xml
@@ -23,7 +23,7 @@
       </physvol>
 
 
-      <logvol name="lvM2CSideBeamPlug" material="Muon/MuonFilterIron">
+      <logvol name="lvM2CSideBeamPlug" material="Muon:FilterIron">
 	<subtraction name="M2CSideBeamPlugSub">
 	  <!-- box up to 50mm in Y and 70mm in X from closest chamber -->
 	  <box name="M2CSideBeamPlugBox" sizeX="227.05*mm" sizeY="395*mm" sizeZ="395*mm"/>
diff --git a/compact/before-rich1-geom-update-26052022/Muon/Muon/BeamPlugs/M3ASideBeamPlug.xml b/compact/before-rich1-geom-update-26052022/Muon/Muon/BeamPlugs/M3ASideBeamPlug.xml
index b7ba2a42170aeb78ebb5dd09494513b87fc81b6c..120e8bb56eda653245fddddc572eb4218244d086 100644
--- a/compact/before-rich1-geom-update-26052022/Muon/Muon/BeamPlugs/M3ASideBeamPlug.xml
+++ b/compact/before-rich1-geom-update-26052022/Muon/Muon/BeamPlugs/M3ASideBeamPlug.xml
@@ -23,7 +23,7 @@
       </physvol>
 
 
-      <logvol name="lvM3ASideBeamPlug" material="Muon/MuonFilterIron">
+      <logvol name="lvM3ASideBeamPlug" material="Muon:FilterIron">
 	<subtraction name="M3ASideBeamPlugSub">
 	  <!-- box up to 50mm in Y and 70mm in X from closest chamber -->
 	  <box name="M3ASideBeamPlugBox" sizeX="250.1*mm" sizeY="434.8*mm" sizeZ="395*mm"/>
diff --git a/compact/before-rich1-geom-update-26052022/Muon/Muon/BeamPlugs/M3CSideBeamPlug.xml b/compact/before-rich1-geom-update-26052022/Muon/Muon/BeamPlugs/M3CSideBeamPlug.xml
index d8e79974c2a890f1ec3672d83201a58546641372..72dfa2e9e3563f187cd48e4f9d2914538c3dacd7 100644
--- a/compact/before-rich1-geom-update-26052022/Muon/Muon/BeamPlugs/M3CSideBeamPlug.xml
+++ b/compact/before-rich1-geom-update-26052022/Muon/Muon/BeamPlugs/M3CSideBeamPlug.xml
@@ -23,7 +23,7 @@
       </physvol>
 
 
-      <logvol name="lvM3CSideBeamPlug" material="Muon/MuonFilterIron">
+      <logvol name="lvM3CSideBeamPlug" material="Muon:FilterIron">
 	<subtraction name="M3CSideBeamPlugSub">
 	  <!-- box up to 50mm in Y and 70mm in X from closest chamber -->
 	  <box name="M3CSideBeamPlugBox" sizeX="250.1*mm" sizeY="434.8*mm" sizeZ="395*mm"/>
diff --git a/compact/before-rich1-geom-update-26052022/Muon/Muon/BeamPlugs/M4ASideBeamPlug.xml b/compact/before-rich1-geom-update-26052022/Muon/Muon/BeamPlugs/M4ASideBeamPlug.xml
index 116ba21be5ddca456be6a606d953df0d5518f979..3e416ac1340842e4fafa334a87182f54cfd376e4 100644
--- a/compact/before-rich1-geom-update-26052022/Muon/Muon/BeamPlugs/M4ASideBeamPlug.xml
+++ b/compact/before-rich1-geom-update-26052022/Muon/Muon/BeamPlugs/M4ASideBeamPlug.xml
@@ -23,7 +23,7 @@
       </physvol>
 
       
-      <logvol name="lvM4ASideBeamPlug" material="Muon/MuonFilterIron">
+      <logvol name="lvM4ASideBeamPlug" material="Muon:FilterIron">
 	<subtraction name="M4ASideBeamPlugSub">
 	  <!-- box up to 50mm in Y and 70mm in X from closest chamber -->
 	  <box name="M4ASideBeamPlugBox" sizeX="274.7*mm" sizeY="456.4*mm" sizeZ="395*mm"/>
diff --git a/compact/before-rich1-geom-update-26052022/Muon/Muon/BeamPlugs/M4CSideBeamPlug.xml b/compact/before-rich1-geom-update-26052022/Muon/Muon/BeamPlugs/M4CSideBeamPlug.xml
index e48e1c8e4a472aa5ef5951508fc0fbdf63d8b537..e10f2a5deb684f7d7042fcb90eac5307a23d107b 100644
--- a/compact/before-rich1-geom-update-26052022/Muon/Muon/BeamPlugs/M4CSideBeamPlug.xml
+++ b/compact/before-rich1-geom-update-26052022/Muon/Muon/BeamPlugs/M4CSideBeamPlug.xml
@@ -23,7 +23,7 @@
       </physvol>
 
 
-      <logvol name="lvM4CSideBeamPlug" material="Muon/MuonFilterIron">
+      <logvol name="lvM4CSideBeamPlug" material="Muon:FilterIron">
 	<subtraction name="M4CSideBeamPlugSub">
 	  <!-- box up to 50mm in Y and 70mm in X from closest chamber -->
 	  <box name="M4CSideBeamPlugBox" sizeX="274.7*mm" sizeY="456.4*mm" sizeZ="395*mm"/>
diff --git a/compact/before-rich1-geom-update-26052022/Muon/Muon/BeamPlugs/M5ASideBeamPlug.xml b/compact/before-rich1-geom-update-26052022/Muon/Muon/BeamPlugs/M5ASideBeamPlug.xml
index 56927753a488209d494de7c351e61b02dba2e92a..b2a033a1912fd5538077f4bb76e7a431de3c8c2e 100644
--- a/compact/before-rich1-geom-update-26052022/Muon/Muon/BeamPlugs/M5ASideBeamPlug.xml
+++ b/compact/before-rich1-geom-update-26052022/Muon/Muon/BeamPlugs/M5ASideBeamPlug.xml
@@ -23,7 +23,7 @@
       </physvol>
 
 
-      <logvol name="lvM5ASideBeamPlug" material="Muon/MuonFilterIron">
+      <logvol name="lvM5ASideBeamPlug" material="Muon:FilterIron">
 	<subtraction name="M5ASideBeamPlugSub">
 	  <!-- box up to 50mm in Y and 70mm in X from closest chamber -->
 	  <box name="M5ASideBeamPlugBox" sizeX="298.5*mm" sizeY="474.0*mm" sizeZ="395*mm"/>
diff --git a/compact/before-rich1-geom-update-26052022/Muon/Muon/BeamPlugs/M5CSideBeamPlug.xml b/compact/before-rich1-geom-update-26052022/Muon/Muon/BeamPlugs/M5CSideBeamPlug.xml
index 0e226d472f9851f034b90c064ad8c9f1b26a697a..0d74e586b981d26c6813540150d0cd899e981d42 100644
--- a/compact/before-rich1-geom-update-26052022/Muon/Muon/BeamPlugs/M5CSideBeamPlug.xml
+++ b/compact/before-rich1-geom-update-26052022/Muon/Muon/BeamPlugs/M5CSideBeamPlug.xml
@@ -23,7 +23,7 @@
       </physvol>
 
       
-      <logvol name="lvM5CSideBeamPlug" material="Muon/MuonFilterIron">
+      <logvol name="lvM5CSideBeamPlug" material="Muon:FilterIron">
 	<subtraction name="M5CSideBeamPlugSub">
 	  <!-- box up to 50mm in Y and 70mm in X from closest chamber -->
 	  <box name="M5CSideBeamPlugBox" sizeX="298.5*mm" sizeY="474.0*mm" sizeZ="395*mm"/>
diff --git a/compact/before-rich1-geom-update-26052022/Muon/Muon/Filters/Filter1.xml b/compact/before-rich1-geom-update-26052022/Muon/Muon/Filters/Filter1.xml
index 15f7907b96930be7a4bc646c3aa54147ce553922..0f965868d78348a4df764c2fa87e99a4ffb0aa2a 100644
--- a/compact/before-rich1-geom-update-26052022/Muon/Muon/Filters/Filter1.xml
+++ b/compact/before-rich1-geom-update-26052022/Muon/Muon/Filters/Filter1.xml
@@ -160,7 +160,7 @@
       <!--  ****************************  -->
       <!--  Parameters of BeamHole1ASide  -->
       <!--  ****************************  -->
-      <logvol material="Muon/MuonFilterIron" name="lvBeamHole1ASide">
+      <logvol material="Muon:FilterIron" name="lvBeamHole1ASide">
 	<subtraction name="FilterBeam1A">
 	  <box name="BoxBeam1A" sizeX="0.42*m" sizeY="1.200*m" sizeZ="0.8*m"/>
 	  <cons name="BeamHole1A" sizeZ="0.82*m" outerRadiusPZ="182*mm" outerRadiusMZ="173*mm"/>
@@ -175,7 +175,7 @@
       <!--  ****************************  -->
       <!--  Parameters of BeamHole1CSide  -->
       <!--  ****************************  -->
-      <logvol material="Muon/MuonFilterIron" name="lvBeamHole1CSide">
+      <logvol material="Muon:FilterIron" name="lvBeamHole1CSide">
 	<subtraction name="FilterBeam1C">
 	  <box name="BoxBeam1C" sizeX="0.42*m" sizeY="1.200*m" sizeZ="0.8*m"/>
 	  <cons name="BeamHole1C" sizeZ="0.82*m" outerRadiusPZ="182*mm" outerRadiusMZ="173*mm"/>
@@ -360,95 +360,95 @@
       <!--  ********************************************  -->
       <boxes>
 	
-	<logvol material="Muon/MuonFilterIron" name="lvBlock1">
+	<logvol material="Muon:FilterIron" name="lvBlock1">
 	  <box name="Block1" sizeX="1.6*m" sizeY="0.8*m" sizeZ="0.8*m"/>
 	</logvol>
 	
-	<logvol material="Muon/MuonFilterIron" name="lvBlock2">
+	<logvol material="Muon:FilterIron" name="lvBlock2">
 	  <box name="Block2" sizeX="1.6*m" sizeY="0.4*m" sizeZ="0.8*m"/>
 	</logvol>
 	
-	<logvol material="Muon/MuonFilterIron" name="lvBlock3">
+	<logvol material="Muon:FilterIron" name="lvBlock3">
 	  <box name="Block3" sizeX="0.8*m" sizeY="0.4*m" sizeZ="0.8*m"/>
 	</logvol>
 	
-	<logvol material="Muon/MuonFilterIron" name="lvBlock4">
+	<logvol material="Muon:FilterIron" name="lvBlock4">
 	  <box name="Block4" sizeX="0.4*m" sizeY="0.4*m" sizeZ="0.8*m"/>
 	</logvol>
 	
-	<logvol material="Muon/Steel" name="lvSteelPlate1">
+	<logvol material="Muon:Steel" name="lvSteelPlate1">
 	  <box name="SteelPlate1" sizeX="4.815*m" sizeY="0.015*m" sizeZ="0.8*m" />
 	</logvol>
 	
-	<logvol material="Muon/Steel" name="lvSteelPlate2">
+	<logvol material="Muon:Steel" name="lvSteelPlate2">
 	  <box name="SteelPlate2" sizeX="0.4*m" sizeY="0.015*m" sizeZ="0.8*m" />
 	</logvol>
 	
-	<logvol material="Muon/Steel" name="lvSteelPlate3">
+	<logvol material="Muon:Steel" name="lvSteelPlate3">
 	  <box name="SteelPlate3" sizeX="5.215*m" sizeY="0.015*m" sizeZ="0.8*m" />
 	</logvol>
 	
-	<logvol material="Muon/Steel" name="lvSteelPlate4">
+	<logvol material="Muon:Steel" name="lvSteelPlate4">
 	  <box name="SteelPlate4" sizeX="5.22*m" sizeY="1.5*cm" sizeZ="0.8*m"/>
 	</logvol>
 	
-	<logvol material="Muon/Steel" name="lvSteelPlate5">
+	<logvol material="Muon:Steel" name="lvSteelPlate5">
 	  <box name="SteelPlate5" sizeX="5*mm" sizeY="1.5*cm" sizeZ="0.8*m"/>
 	</logvol>
 	
-	<logvol material="Muon/Steel" name="lvSteelPlate6">
+	<logvol material="Muon:Steel" name="lvSteelPlate6">
 	  <box name="SteelPlate6" sizeX="0.4*m" sizeY="0.025*m" sizeZ="0.8*m" />
 	</logvol>
 	
-	<logvol material="Muon/Steel" name="lvSteelPlate7">
+	<logvol material="Muon:Steel" name="lvSteelPlate7">
 	  <box name="SteelPlate7" sizeX="3.609*m" sizeY="0.015*m" sizeZ="0.8*m" />
 	</logvol>
 	
-	<logvol material="Muon/Steel" name="lvSteelPlate8">
+	<logvol material="Muon:Steel" name="lvSteelPlate8">
 	  <box name="SteelPlate8" sizeX="0.805*m" sizeY="0.015*m" sizeZ="0.8*m" />
 	</logvol>
 	
-	<logvol material="Muon/Steel" name="lvSteelPlate9">
+	<logvol material="Muon:Steel" name="lvSteelPlate9">
 	  <box name="SteelPlate9" sizeX="5.62*m" sizeY="1.5*cm" sizeZ="0.8*m"/>
 	</logvol>
 	
-	<logvol material="Muon/Steel" name="lvSteelPlate10">
+	<logvol material="Muon:Steel" name="lvSteelPlate10">
 	  <box name="SteelPlate10" sizeX="5*mm" sizeY="2.5*cm" sizeZ="0.8*m" />
 	</logvol>
 
-	<logvol material="Muon/Steel" name="lvSteelPlate11">
+	<logvol material="Muon:Steel" name="lvSteelPlate11">
 	  <box name="SteelPlate11" sizeX="1.5*cm" sizeY="4.165*m" sizeZ="0.8*m"/>
 	</logvol>
 	
-	<logvol material="Muon/Steel" name="lvSteelPlate12">
+	<logvol material="Muon:Steel" name="lvSteelPlate12">
 	  <box name="SteelPlate12" sizeX="1.5*cm" sizeY="4.58*m" sizeZ="0.8*m"/>
 	</logvol>
 	
-	<logvol material="Muon/Concrete" name="lvConcrete1">
+	<logvol material="Muon:Concrete" name="lvConcrete1">
 	  <box name="Concrete1" sizeX="0.4*m" sizeY="0.005*m" sizeZ="0.8*m" />
 	</logvol>
 	
-	<logvol material="Muon/Concrete" name="lvConcrete2">
+	<logvol material="Muon:Concrete" name="lvConcrete2">
 	  <box name="Concrete2" sizeX="4.815*m" sizeY="0.015*m" sizeZ="0.8*m" />
 	</logvol>
 
-	<logvol material="Muon/Concrete" name="lvConcrete3">
+	<logvol material="Muon:Concrete" name="lvConcrete3">
 	  <box name="Concrete3" sizeX="5.22*m" sizeY="1.5*cm" sizeZ="0.8*m" />
 	</logvol>
 	
-	<logvol material="Muon/Concrete" name="lvConcrete4">
+	<logvol material="Muon:Concrete" name="lvConcrete4">
 	  <box name="Concrete4" sizeX="5.62*m" sizeY="1.5*cm" sizeZ="0.8*m"/>
 	</logvol>
 	
-	<logvol material="Muon/Concrete" name="lvConcrete5">
+	<logvol material="Muon:Concrete" name="lvConcrete5">
 	  <box name="Concrete5" sizeX="5.215*m" sizeY="0.015*m" sizeZ="0.8*m" />
 	</logvol>
 	
-	<logvol material="Muon/Concrete" name="lvConcrete6">
+	<logvol material="Muon:Concrete" name="lvConcrete6">
 	  <box name="Concrete6" sizeX="3.609*m" sizeY="0.015*m" sizeZ="0.8*m" />
 	</logvol>
 	
-	<logvol material="Muon/Concrete" name="lvConcrete7">
+	<logvol material="Muon:Concrete" name="lvConcrete7">
 	  <box name="Concrete7" sizeX="0.8*m" sizeY="0.015*m" sizeZ="0.8*m" />
 	</logvol>
 
diff --git a/compact/before-rich1-geom-update-26052022/Muon/Muon/Filters/Filter2.xml b/compact/before-rich1-geom-update-26052022/Muon/Muon/Filters/Filter2.xml
index a545e67151317760caa8dfee819017da32b1d1c0..82db312ade825e82dc56fbefa508170aa8fc95e8 100644
--- a/compact/before-rich1-geom-update-26052022/Muon/Muon/Filters/Filter2.xml
+++ b/compact/before-rich1-geom-update-26052022/Muon/Muon/Filters/Filter2.xml
@@ -170,7 +170,7 @@
        <!--  ****************************  -->
        <!--  Parameters of BeamHole2ASide  -->
        <!--  ****************************  -->
-       <logvol material="Muon/MuonFilterIron" name="lvBeamHole2ASide">
+       <logvol material="Muon:FilterIron" name="lvBeamHole2ASide">
 	 <subtraction name="FilterBeam2A">
 	   <box name="BoxBeam2A" sizeX="0.42*m" sizeY="1.215*m" sizeZ="0.8*m"/>
 	   <cons name="BeamHole2A" sizeZ="0.88*m" outerRadiusPZ="194*mm" outerRadiusMZ="185*mm"/>
@@ -185,7 +185,7 @@
        <!--  ****************************  -->
        <!--  Parameters of BeamHole2CSide  -->
        <!--  ****************************  -->
-       <logvol material="Muon/MuonFilterIron" name="lvBeamHole2CSide">
+       <logvol material="Muon:FilterIron" name="lvBeamHole2CSide">
 	 <subtraction name="FilterBeam2C">
 	   <box name="BoxBeam2C" sizeX="0.42*m" sizeY="1.215*m" sizeZ="0.8*m"/>
 	   <cons name="BeamHole2C" sizeZ="0.88*m" outerRadiusPZ="194*mm" outerRadiusMZ="185*mm"/>
@@ -352,95 +352,95 @@
        <!--  ********************************************  -->
        <boxes>
 	 
-	 <logvol material="Muon/MuonFilterIron" name="lvBlock1">
+	 <logvol material="Muon:FilterIron" name="lvBlock1">
 	   <box name="Block1" sizeX="1.6*m" sizeY="0.8*m" sizeZ="0.8*m"/>
 	 </logvol>
 	 
-	 <logvol material="Muon/MuonFilterIron" name="lvBlock2">
+	 <logvol material="Muon:FilterIron" name="lvBlock2">
 	   <box name="Block2" sizeX="1.6*m" sizeY="0.4*m" sizeZ="0.8*m"/>
 	 </logvol>
 	 
-	 <logvol material="Muon/MuonFilterIron" name="lvBlock3">
+	 <logvol material="Muon:FilterIron" name="lvBlock3">
 	   <box name="Block3" sizeX="0.8*m" sizeY="0.4*m" sizeZ="0.8*m"/>
 	 </logvol>
 	 
-	 <logvol material="Muon/MuonFilterIron" name="lvBlock4">
+	 <logvol material="Muon:FilterIron" name="lvBlock4">
 	   <box name="Block4" sizeX="0.4*m" sizeY="0.4*m" sizeZ="0.8*m"/>
 	 </logvol>
 	 
-	 <logvol material="Muon/Steel" name="lvSteelPlate1">
+	 <logvol material="Muon:Steel" name="lvSteelPlate1">
 	   <box name="SteelPlate1" sizeX="4.815*m" sizeY="0.015*m" sizeZ="0.8*m" />
 	 </logvol>
 	 
-	 <logvol material="Muon/Steel" name="lvSteelPlate2">
+	 <logvol material="Muon:Steel" name="lvSteelPlate2">
 	   <box name="SteelPlate2" sizeX="0.4*m" sizeY="0.015*m" sizeZ="0.8*m" />
 	 </logvol>
 	 
-	 <logvol material="Muon/Steel" name="lvSteelPlate3">
+	 <logvol material="Muon:Steel" name="lvSteelPlate3">
 	   <box name="SteelPlate3" sizeX="5.215*m" sizeY="0.015*m" sizeZ="0.8*m" />
 	 </logvol>
 	 
-	 <logvol material="Muon/Steel" name="lvSteelPlate4">
+	 <logvol material="Muon:Steel" name="lvSteelPlate4">
 	   <box name="SteelPlate4" sizeX="5.22*m" sizeY="1.5*cm" sizeZ="0.8*m"/>
 	 </logvol>
 	 
-	 <logvol material="Muon/Steel" name="lvSteelPlate5">
+	 <logvol material="Muon:Steel" name="lvSteelPlate5">
 	   <box name="SteelPlate5" sizeX="5*mm" sizeY="1.5*cm" sizeZ="0.8*m"/>
 	 </logvol>
 	 
-	 <logvol material="Muon/Steel" name="lvSteelPlate6">
+	 <logvol material="Muon:Steel" name="lvSteelPlate6">
 	   <box name="SteelPlate6" sizeX="0.4*m" sizeY="0.025*m" sizeZ="0.8*m" />
 	 </logvol>
 
-	 <logvol material="Muon/Steel" name="lvSteelPlate7">
+	 <logvol material="Muon:Steel" name="lvSteelPlate7">
 	   <box name="SteelPlate7" sizeX="3.609*m" sizeY="0.015*m" sizeZ="0.8*m" />
 	 </logvol>
 	 
-	 <logvol material="Muon/Steel" name="lvSteelPlate8">
+	 <logvol material="Muon:Steel" name="lvSteelPlate8">
 	   <box name="SteelPlate8" sizeX="0.805*m" sizeY="0.015*m" sizeZ="0.8*m" />
 	 </logvol>
 
-	 <logvol material="Muon/Steel" name="lvSteelPlate9">
+	 <logvol material="Muon:Steel" name="lvSteelPlate9">
 	   <box name="SteelPlate9" sizeX="5.62*m" sizeY="1.5*cm" sizeZ="0.8*m"/>
 	 </logvol>
 	 
-	 <logvol material="Muon/Steel" name="lvSteelPlate10">
+	 <logvol material="Muon:Steel" name="lvSteelPlate10">
 	   <box name="SteelPlate10" sizeX="5*mm" sizeY="2.5*cm" sizeZ="0.8*m" />
 	 </logvol>
 	 
-	 <logvol material="Muon/Steel" name="lvSteelPlate11">
+	 <logvol material="Muon:Steel" name="lvSteelPlate11">
 	   <box name="SteelPlate11" sizeX="1.5*cm" sizeY="4.165*m" sizeZ="0.8*m"/>
 	 </logvol>
 	 
-	 <logvol material="Muon/Steel" name="lvSteelPlate12">
+	 <logvol material="Muon:Steel" name="lvSteelPlate12">
 	   <box name="SteelPlate12" sizeX="1.5*cm" sizeY="4.58*m" sizeZ="0.8*m"/>
 	 </logvol>
 
-	 <logvol material="Muon/Concrete" name="lvConcrete1">
+	 <logvol material="Muon:Concrete" name="lvConcrete1">
 	   <box name="Concrete1" sizeX="0.4*m" sizeY="0.005*m" sizeZ="0.8*m" />
 	 </logvol>
 	 
-	 <logvol material="Muon/Concrete" name="lvConcrete2">
+	 <logvol material="Muon:Concrete" name="lvConcrete2">
 	   <box name="Concrete2" sizeX="4.815*m" sizeY="0.015*m" sizeZ="0.8*m" />
 	 </logvol>
 	 
-	 <logvol material="Muon/Concrete" name="lvConcrete3">
+	 <logvol material="Muon:Concrete" name="lvConcrete3">
 	   <box name="Concrete3" sizeX="5.22*m" sizeY="1.5*cm" sizeZ="0.8*m" />
 	 </logvol>
 	 
-	 <logvol material="Muon/Concrete" name="lvConcrete4">
+	 <logvol material="Muon:Concrete" name="lvConcrete4">
 	   <box name="Concrete4" sizeX="5.62*m" sizeY="1.5*cm" sizeZ="0.8*m"/>
 	 </logvol>
 	 
-	 <logvol material="Muon/Concrete" name="lvConcrete5">
+	 <logvol material="Muon:Concrete" name="lvConcrete5">
 	   <box name="Concrete5" sizeX="5.215*m" sizeY="0.015*m" sizeZ="0.8*m" />
 	 </logvol>
 	 
-	 <logvol material="Muon/Concrete" name="lvConcrete6">
+	 <logvol material="Muon:Concrete" name="lvConcrete6">
 	   <box name="Concrete6" sizeX="3.609*m" sizeY="0.015*m" sizeZ="0.8*m" />
 	 </logvol>
 	 
-	 <logvol material="Muon/Concrete" name="lvConcrete7">
+	 <logvol material="Muon:Concrete" name="lvConcrete7">
 	   <box name="Concrete7" sizeX="0.8*m" sizeY="0.015*m" sizeZ="0.8*m" />
 	 </logvol>
 	 
diff --git a/compact/before-rich1-geom-update-26052022/Muon/Muon/Filters/Filter3.xml b/compact/before-rich1-geom-update-26052022/Muon/Muon/Filters/Filter3.xml
index e7eb66bf03d377d2af7b97c4bc281ef954893b0b..82a64e36d69104b89dc364deaebc5dde9a0a20ad 100644
--- a/compact/before-rich1-geom-update-26052022/Muon/Muon/Filters/Filter3.xml
+++ b/compact/before-rich1-geom-update-26052022/Muon/Muon/Filters/Filter3.xml
@@ -172,7 +172,7 @@
       <!--  ****************************  -->
       <!--  Parameters of BeamHole3ASide  -->
       <!--  ****************************  -->
-      <logvol material="Muon/MuonFilterIron" name="lvBeamHole3ASide">
+      <logvol material="Muon:FilterIron" name="lvBeamHole3ASide">
 	<subtraction name="FilterBeam3A">
 	  <box name="BoxBeam3A" sizeX="0.42*m" sizeY="1.215*m" sizeZ="0.8*m"/>
 	  <cons name="BeamHole3A" sizeZ="0.82*m" outerRadiusPZ="206*mm" outerRadiusMZ="198*mm"/>
@@ -188,7 +188,7 @@
       <!--  ****************************  -->
       <!--  Parameters of BeamHole3ASide  -->
       <!--  ****************************  -->
-      <logvol material="Muon/MuonFilterIron" name="lvBeamHole3CSide">
+      <logvol material="Muon:FilterIron" name="lvBeamHole3CSide">
 	<subtraction name="FilterBeam3C">
 	  <box name="BoxBeam3C" sizeX="0.42*m" sizeY="1.215*m" sizeZ="0.8*m"/>
 	  <cons name="BeamHole3C" sizeZ="0.82*m" outerRadiusPZ="206*mm" outerRadiusMZ="198*mm"/>
@@ -355,95 +355,95 @@
       <!--  ********************************************  -->
       <boxes>
 	
-	<logvol material="Muon/MuonFilterIron" name="lvBlock1">
+	<logvol material="Muon:FilterIron" name="lvBlock1">
 	  <box name="Block1" sizeX="1.6*m" sizeY="0.8*m" sizeZ="0.8*m"/>
 	</logvol>
 	
-	<logvol material="Muon/MuonFilterIron" name="lvBlock2">
+	<logvol material="Muon:FilterIron" name="lvBlock2">
 	  <box name="Block2" sizeX="1.6*m" sizeY="0.4*m" sizeZ="0.8*m"/>
 	</logvol>
 	
-	<logvol material="Muon/MuonFilterIron" name="lvBlock3">
+	<logvol material="Muon:FilterIron" name="lvBlock3">
 	  <box name="Block3" sizeX="0.8*m" sizeY="0.4*m" sizeZ="0.8*m"/>
 	</logvol>
 	
-	<logvol material="Muon/MuonFilterIron" name="lvBlock4">
+	<logvol material="Muon:FilterIron" name="lvBlock4">
 	  <box name="Block4" sizeX="0.4*m" sizeY="0.4*m" sizeZ="0.8*m"/>
 	</logvol>
 	
-	<logvol material="Muon/Steel" name="lvSteelPlate1">
+	<logvol material="Muon:Steel" name="lvSteelPlate1">
 	  <box name="SteelPlate1" sizeX="4.815*m" sizeY="0.015*m" sizeZ="0.8*m" />
 	</logvol>
 	
-	<logvol material="Muon/Steel" name="lvSteelPlate2">
+	<logvol material="Muon:Steel" name="lvSteelPlate2">
 	  <box name="SteelPlate2" sizeX="0.4*m" sizeY="0.015*m" sizeZ="0.8*m" />
 	</logvol>
 	
-	<logvol material="Muon/Steel" name="lvSteelPlate3">
+	<logvol material="Muon:Steel" name="lvSteelPlate3">
 	  <box name="SteelPlate3" sizeX="5.215*m" sizeY="0.015*m" sizeZ="0.8*m" />
 	</logvol>
 	
-	<logvol material="Muon/Steel" name="lvSteelPlate4">
+	<logvol material="Muon:Steel" name="lvSteelPlate4">
 	  <box name="SteelPlate4" sizeX="5.22*m" sizeY="1.5*cm" sizeZ="0.8*m"/>
 	</logvol>
 	
-	<logvol material="Muon/Steel" name="lvSteelPlate5">
+	<logvol material="Muon:Steel" name="lvSteelPlate5">
 	  <box name="SteelPlate5" sizeX="5*mm" sizeY="1.5*cm" sizeZ="0.8*m"/>
 	</logvol>
 	
-	<logvol material="Muon/Steel" name="lvSteelPlate6">
+	<logvol material="Muon:Steel" name="lvSteelPlate6">
 	  <box name="SteelPlate6" sizeX="0.4*m" sizeY="0.025*m" sizeZ="0.8*m" />
 	</logvol>
 	
-	<logvol material="Muon/Steel" name="lvSteelPlate7">
+	<logvol material="Muon:Steel" name="lvSteelPlate7">
 	  <box name="SteelPlate7" sizeX="3.609*m" sizeY="0.015*m" sizeZ="0.8*m" />
 	</logvol>
 	
-	<logvol material="Muon/Steel" name="lvSteelPlate8">
+	<logvol material="Muon:Steel" name="lvSteelPlate8">
 	  <box name="SteelPlate8" sizeX="0.805*m" sizeY="0.015*m" sizeZ="0.8*m" />
 	</logvol>
 	
-	<logvol material="Muon/Steel" name="lvSteelPlate9">
+	<logvol material="Muon:Steel" name="lvSteelPlate9">
 	  <box name="SteelPlate9" sizeX="5.62*m" sizeY="1.5*cm" sizeZ="0.8*m"/>
 	</logvol>
 	
-	<logvol material="Muon/Steel" name="lvSteelPlate10">
+	<logvol material="Muon:Steel" name="lvSteelPlate10">
 	  <box name="SteelPlate10" sizeX="5*mm" sizeY="2.5*cm" sizeZ="0.8*m" />
 	</logvol>
 	
-	<logvol material="Muon/Steel" name="lvSteelPlate11">
+	<logvol material="Muon:Steel" name="lvSteelPlate11">
 	  <box name="SteelPlate11" sizeX="1.5*cm" sizeY="4.165*m" sizeZ="0.8*m"/>
 	</logvol>
 	
-	<logvol material="Muon/Steel" name="lvSteelPlate12">
+	<logvol material="Muon:Steel" name="lvSteelPlate12">
 	  <box name="SteelPlate12" sizeX="1.5*cm" sizeY="4.58*m" sizeZ="0.8*m"/>
 	</logvol>
 	
-	<logvol material="Muon/Concrete" name="lvConcrete1">
+	<logvol material="Muon:Concrete" name="lvConcrete1">
 	  <box name="Concrete1" sizeX="0.4*m" sizeY="0.005*m" sizeZ="0.8*m" />
 	</logvol>
 	
-	<logvol material="Muon/Concrete" name="lvConcrete2">
+	<logvol material="Muon:Concrete" name="lvConcrete2">
 	  <box name="Concrete2" sizeX="4.815*m" sizeY="0.015*m" sizeZ="0.8*m" />
 	</logvol>
 	
-	<logvol material="Muon/Concrete" name="lvConcrete3">
+	<logvol material="Muon:Concrete" name="lvConcrete3">
 	  <box name="Concrete3" sizeX="5.22*m" sizeY="1.5*cm" sizeZ="0.8*m" />
 	</logvol>
 	
-	<logvol material="Muon/Concrete" name="lvConcrete4">
+	<logvol material="Muon:Concrete" name="lvConcrete4">
 	  <box name="Concrete4" sizeX="5.62*m" sizeY="1.5*cm" sizeZ="0.8*m"/>
 	</logvol>
 	
-	<logvol material="Muon/Concrete" name="lvConcrete5">
+	<logvol material="Muon:Concrete" name="lvConcrete5">
 	  <box name="Concrete5" sizeX="5.215*m" sizeY="0.015*m" sizeZ="0.8*m" />
 	</logvol>
 	
-	<logvol material="Muon/Concrete" name="lvConcrete6">
+	<logvol material="Muon:Concrete" name="lvConcrete6">
 	  <box name="Concrete6" sizeX="3.609*m" sizeY="0.015*m" sizeZ="0.8*m" />
 	</logvol>
 	
-	<logvol material="Muon/Concrete" name="lvConcrete7">
+	<logvol material="Muon:Concrete" name="lvConcrete7">
 	  <box name="Concrete7" sizeX="0.8*m" sizeY="0.015*m" sizeZ="0.8*m" />
 	</logvol>
 	
diff --git a/compact/before-rich1-geom-update-26052022/Muon/Muon/Filters/Filter4.xml b/compact/before-rich1-geom-update-26052022/Muon/Muon/Filters/Filter4.xml
index 2d9b984585161d06b8fcd8efd8aa0d28334ac09e..b75bcb14f1c2ebadcdd5d8db483ae7313751bf5f 100644
--- a/compact/before-rich1-geom-update-26052022/Muon/Muon/Filters/Filter4.xml
+++ b/compact/before-rich1-geom-update-26052022/Muon/Muon/Filters/Filter4.xml
@@ -26,7 +26,7 @@
        </physvol>
 
 
-       <logvol name="lvMuFilter4" material="Muon/MuonFilterIron">
+       <logvol name="lvMuFilter4" material="Muon:FilterIron">
 	 <!-- union the MF4 with an extra iron placed on top of the MF4 during winter technical stop in 2012 -->
 	 <!-- Switched from union -> Union to avoid a clash with the C++ keyword -->
 	 <Union name="MuFilter4Union">
diff --git a/compact/before-rich1-geom-update-26052022/Muon/Muon/Materials/Elements.xml b/compact/before-rich1-geom-update-26052022/Muon/Muon/Materials/Elements.xml
deleted file mode 100644
index 77e41ee24d73606539e14db0b66a2cae157ce5a9..0000000000000000000000000000000000000000
--- a/compact/before-rich1-geom-update-26052022/Muon/Muon/Materials/Elements.xml
+++ /dev/null
@@ -1,951 +0,0 @@
-<materials>
-<!--
-    (c) Copyright 2020 CERN for the benefit of the LHCb Collaboration
-
-    This software is distributed under the terms of the GNU General Public
-    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
-
-    In applying this licence, CERN does not waive the privileges and immunities
-    granted to it by virtue of its status as an Intergovernmental Organization
-    or submit itself to any jurisdiction.
--->
-
-    <isotope N="1" Z="1" name="H1">
-      <atom unit="g/mole" value="1.00782503081372"/>
-    </isotope>
-    <isotope N="2" Z="1" name="H2">
-      <atom unit="g/mole" value="2.01410199966617"/>
-    </isotope>
-    <element name="H">
-      <fraction n="0.999885" ref="H1"/>
-      <fraction n="0.000115" ref="H2"/>
-    </element>
-
-    <isotope N="12" Z="6" name="C12">
-      <atom unit="g/mole" value="12"/>
-    </isotope>
-    <isotope N="13" Z="6" name="C13">
-      <atom unit="g/mole" value="13.0034"/>
-    </isotope>
-    <element name="C">
-      <fraction n="0.9893" ref="C12"/>
-      <fraction n="0.0107" ref="C13"/>
-    </element>
-
-    <isotope N="14" Z="7" name="N14">
-      <atom unit="g/mole" value="14.0031"/>
-    </isotope>
-    <isotope N="15" Z="7" name="N15">
-      <atom unit="g/mole" value="15.0001"/>
-    </isotope>
-    <element name="N">
-      <fraction n="0.99632" ref="N14"/>
-      <fraction n="0.00368" ref="N15"/>
-    </element>
-
-    <isotope N="16" Z="8" name="O16">
-      <atom unit="g/mole" value="15.9949"/>
-    </isotope>
-    <isotope N="17" Z="8" name="O17">
-      <atom unit="g/mole" value="16.9991"/>
-    </isotope>
-    <isotope N="18" Z="8" name="O18">
-      <atom unit="g/mole" value="17.9992"/>
-    </isotope>
-    <element name="O">
-      <fraction n="0.99757" ref="O16"/>
-      <fraction n="0.00038" ref="O17"/>
-      <fraction n="0.00205" ref="O18"/>
-    </element>
-
-    <isotope N="46" Z="22" name="Ti46">
-      <atom unit="g/mole" value="45.9526"/>
-    </isotope>
-    <isotope N="47" Z="22" name="Ti47">
-      <atom unit="g/mole" value="46.9518"/>
-    </isotope>
-    <isotope N="48" Z="22" name="Ti48">
-      <atom unit="g/mole" value="47.9479"/>
-    </isotope>
-    <isotope N="49" Z="22" name="Ti49">
-      <atom unit="g/mole" value="48.9479"/>
-    </isotope>
-    <isotope N="50" Z="22" name="Ti50">
-      <atom unit="g/mole" value="49.9448"/>
-    </isotope>
-    <element name="Ti">
-      <fraction n="0.0825" ref="Ti46"/>
-      <fraction n="0.0744" ref="Ti47"/>
-      <fraction n="0.7372" ref="Ti48"/>
-      <fraction n="0.0541" ref="Ti49"/>
-      <fraction n="0.0518" ref="Ti50"/>
-    </element>
-
- <element Z="89" formula="Ac" name="Ac" >
-  <atom type="A" unit="g/mol" value="227.028" />
- </element>
- <material formula="Ac" name="Actinium" state="solid" >
-  <RL type="X0" unit="cm" value="0.601558" />
-  <NIL type="lambda" unit="cm" value="21.2048" />
-  <D type="density" unit="g/cm3" value="10.07" />
-  <composite n="1" ref="Ac" />
- </material>
- <element Z="47" formula="Ag" name="Ag" >
-  <atom type="A" unit="g/mol" value="107.868" />
- </element>
- <material formula="Ag" name="Silver" state="solid" >
-  <RL type="X0" unit="cm" value="0.854292" />
-  <NIL type="lambda" unit="cm" value="15.8546" />
-  <D type="density" unit="g/cm3" value="10.5" />
-  <composite n="1" ref="Ag" />
- </material>
- <element Z="13" formula="Al" name="Al" >
-  <atom type="A" unit="g/mol" value="26.9815" />
- </element>
- <material formula="Al" name="Aluminum" state="solid" >
-  <RL type="X0" unit="cm" value="8.89632" />
-  <NIL type="lambda" unit="cm" value="38.8766" />
-  <D type="density" unit="g/cm3" value="2.699" />
-  <composite n="1" ref="Al" />
- </material>
- <element Z="95" formula="Am" name="Am" >
-  <atom type="A" unit="g/mol" value="243.061" />
- </element>
- <material formula="Am" name="Americium" state="solid" >
-  <RL type="X0" unit="cm" value="0.42431" />
-  <NIL type="lambda" unit="cm" value="15.9812" />
-  <D type="density" unit="g/cm3" value="13.67" />
-  <composite n="1" ref="Am" />
- </material>
- <element Z="18" formula="Ar" name="Ar" >
-  <atom type="A" unit="g/mol" value="39.9477" />
- </element>
- <material formula="Ar" name="Argon" state="gas" >
-  <RL type="X0" unit="cm" value="11762.1" />
-  <NIL type="lambda" unit="cm" value="71926" />
-  <D type="density" unit="g/cm3" value="0.00166201" />
-  <composite n="1" ref="Ar" />
- </material>
- <element Z="33" formula="As" name="As" >
-  <atom type="A" unit="g/mol" value="74.9216" />
- </element>
- <material formula="As" name="Arsenic" state="solid" >
-  <RL type="X0" unit="cm" value="2.0838" />
-  <NIL type="lambda" unit="cm" value="25.7324" />
-  <D type="density" unit="g/cm3" value="5.73" />
-  <composite n="1" ref="As" />
- </material>
- <element Z="85" formula="At" name="At" >
-  <atom type="A" unit="g/mol" value="209.987" />
- </element>
- <material formula="At" name="Astatine" state="solid" >
-  <RL type="X0" unit="cm" value="0.650799" />
-  <NIL type="lambda" unit="cm" value="22.3202" />
-  <D type="density" unit="g/cm3" value="9.32" />
-  <composite n="1" ref="At" />
- </material>
- <element Z="79" formula="Au" name="Au" >
-  <atom type="A" unit="g/mol" value="196.967" />
- </element>
- <material formula="Au" name="Gold" state="solid" >
-  <RL type="X0" unit="cm" value="0.334436" />
-  <NIL type="lambda" unit="cm" value="10.5393" />
-  <D type="density" unit="g/cm3" value="19.32" />
-  <composite n="1" ref="Au" />
- </material>
- <element Z="5" formula="B" name="B" >
-  <atom type="A" unit="g/mol" value="10.811" />
- </element>
- <material formula="B" name="Boron" state="solid" >
-  <RL type="X0" unit="cm" value="22.2307" />
-  <NIL type="lambda" unit="cm" value="32.2793" />
-  <D type="density" unit="g/cm3" value="2.37" />
-  <composite n="1" ref="B" />
- </material>
- <element Z="56" formula="Ba" name="Ba" >
-  <atom type="A" unit="g/mol" value="137.327" />
- </element>
- <material formula="Ba" name="Barium" state="solid" >
-  <RL type="X0" unit="cm" value="2.37332" />
-  <NIL type="lambda" unit="cm" value="51.6743" />
-  <D type="density" unit="g/cm3" value="3.5" />
-  <composite n="1" ref="Ba" />
- </material>
- <element Z="4" formula="Be" name="Be" >
-  <atom type="A" unit="g/mol" value="9.01218" />
- </element>
- <material formula="Be" name="Beryllium" state="solid" >
-  <RL type="X0" unit="cm" value="35.276" />
-  <NIL type="lambda" unit="cm" value="39.4488" />
-  <D type="density" unit="g/cm3" value="1.848" />
-  <composite n="1" ref="Be" />
- </material>
- <element Z="83" formula="Bi" name="Bi" >
-  <atom type="A" unit="g/mol" value="208.98" />
- </element>
- <material formula="Bi" name="Bismuth" state="solid" >
-  <RL type="X0" unit="cm" value="0.645388" />
-  <NIL type="lambda" unit="cm" value="21.3078" />
-  <D type="density" unit="g/cm3" value="9.747" />
-  <composite n="1" ref="Bi" />
- </material>
- <element Z="97" formula="Bk" name="Bk" >
-  <atom type="A" unit="g/mol" value="247.07" />
- </element>
- <material formula="Bk" name="Berkelium" state="solid" >
-  <RL type="X0" unit="cm" value="0.406479" />
-  <NIL type="lambda" unit="cm" value="15.6902" />
-  <D type="density" unit="g/cm3" value="14" />
-  <composite n="1" ref="Bk" />
- </material>
- <element Z="35" formula="Br" name="Br" >
-  <atom type="A" unit="g/mol" value="79.9035" />
- </element>
- <material formula="Br" name="Bromine" state="gas" >
-  <RL type="X0" unit="cm" value="1615.12" />
-  <NIL type="lambda" unit="cm" value="21299" />
-  <D type="density" unit="g/cm3" value="0.0070721" />
-  <composite n="1" ref="Br" />
- </material>
- <material formula="C" name="Carbon" state="solid" >
-  <RL type="X0" unit="cm" value="21.3485" />
-  <NIL type="lambda" unit="cm" value="40.1008" />
-  <D type="density" unit="g/cm3" value="2" />
-  <composite n="1" ref="C" />
- </material>
- <element Z="20" formula="Ca" name="Ca" >
-  <atom type="A" unit="g/mol" value="40.078" />
- </element>
- <material formula="Ca" name="Calcium" state="solid" >
-  <RL type="X0" unit="cm" value="10.4151" />
-  <NIL type="lambda" unit="cm" value="77.3754" />
-  <D type="density" unit="g/cm3" value="1.55" />
-  <composite n="1" ref="Ca" />
- </material>
- <element Z="48" formula="Cd" name="Cd" >
-  <atom type="A" unit="g/mol" value="112.411" />
- </element>
- <material formula="Cd" name="Cadmium" state="solid" >
-  <RL type="X0" unit="cm" value="1.03994" />
-  <NIL type="lambda" unit="cm" value="19.46" />
-  <D type="density" unit="g/cm3" value="8.65" />
-  <composite n="1" ref="Cd" />
- </material>
- <element Z="58" formula="Ce" name="Ce" >
-  <atom type="A" unit="g/mol" value="140.115" />
- </element>
- <material formula="Ce" name="Cerium" state="solid" >
-  <RL type="X0" unit="cm" value="1.19506" />
-  <NIL type="lambda" unit="cm" value="27.3227" />
-  <D type="density" unit="g/cm3" value="6.657" />
-  <composite n="1" ref="Ce" />
- </material>
- <element Z="98" formula="Cf" name="Cf" >
-  <atom type="A" unit="g/mol" value="251.08" />
- </element>
- <material formula="Cf" name="Californium" state="solid" >
-  <RL type="X0" unit="cm" value="0.568328" />
-  <NIL type="lambda" unit="cm" value="22.085" />
-  <D type="density" unit="g/cm3" value="10" />
-  <composite n="1" ref="Cf" />
- </material>
- <element Z="17" formula="Cl" name="Cl" >
-  <atom type="A" unit="g/mol" value="35.4526" />
- </element>
- <material formula="Cl" name="Chlorine" state="gas" >
-  <RL type="X0" unit="cm" value="6437.34" />
-  <NIL type="lambda" unit="cm" value="38723.9" />
-  <D type="density" unit="g/cm3" value="0.00299473" />
-  <composite n="1" ref="Cl" />
- </material>
- <element Z="96" formula="Cm" name="Cm" >
-  <atom type="A" unit="g/mol" value="247.07" />
- </element>
- <material formula="Cm" name="Curium" state="solid" >
-  <RL type="X0" unit="cm" value="0.428706" />
-  <NIL type="lambda" unit="cm" value="16.2593" />
-  <D type="density" unit="g/cm3" value="13.51" />
-  <composite n="1" ref="Cm" />
- </material>
- <element Z="27" formula="Co" name="Co" >
-  <atom type="A" unit="g/mol" value="58.9332" />
- </element>
- <material formula="Co" name="Cobalt" state="solid" >
-  <RL type="X0" unit="cm" value="1.53005" />
-  <NIL type="lambda" unit="cm" value="15.2922" />
-  <D type="density" unit="g/cm3" value="8.9" />
-  <composite n="1" ref="Co" />
- </material>
- <element Z="24" formula="Cr" name="Cr" >
-  <atom type="A" unit="g/mol" value="51.9961" />
- </element>
- <material formula="Cr" name="Chromium" state="solid" >
-  <RL type="X0" unit="cm" value="2.0814" />
-  <NIL type="lambda" unit="cm" value="18.1933" />
-  <D type="density" unit="g/cm3" value="7.18" />
-  <composite n="1" ref="Cr" />
- </material>
- <element Z="55" formula="Cs" name="Cs" >
-  <atom type="A" unit="g/mol" value="132.905" />
- </element>
- <material formula="Cs" name="Cesium" state="solid" >
-  <RL type="X0" unit="cm" value="4.4342" />
-  <NIL type="lambda" unit="cm" value="95.317" />
-  <D type="density" unit="g/cm3" value="1.873" />
-  <composite n="1" ref="Cs" />
- </material>
- <element Z="29" formula="Cu" name="Cu" >
-  <atom type="A" unit="g/mol" value="63.5456" />
- </element>
- <material formula="Cu" name="Copper" state="solid" >
-  <RL type="X0" unit="cm" value="1.43558" />
-  <NIL type="lambda" unit="cm" value="15.5141" />
-  <D type="density" unit="g/cm3" value="8.96" />
-  <composite n="1" ref="Cu" />
- </material>
- <element Z="66" formula="Dy" name="Dy" >
-  <atom type="A" unit="g/mol" value="162.497" />
- </element>
- <material formula="Dy" name="Dysprosium" state="solid" >
-  <RL type="X0" unit="cm" value="0.85614" />
-  <NIL type="lambda" unit="cm" value="22.2923" />
-  <D type="density" unit="g/cm3" value="8.55" />
-  <composite n="1" ref="Dy" />
- </material>
- <element Z="68" formula="Er" name="Er" >
-  <atom type="A" unit="g/mol" value="167.256" />
- </element>
- <material formula="Er" name="Erbium" state="solid" >
-  <RL type="X0" unit="cm" value="0.788094" />
-  <NIL type="lambda" unit="cm" value="21.2923" />
-  <D type="density" unit="g/cm3" value="9.066" />
-  <composite n="1" ref="Er" />
- </material>
- <element Z="63" formula="Eu" name="Eu" >
-  <atom type="A" unit="g/mol" value="151.964" />
- </element>
- <material formula="Eu" name="Europium" state="solid" >
-  <RL type="X0" unit="cm" value="1.41868" />
-  <NIL type="lambda" unit="cm" value="35.6178" />
-  <D type="density" unit="g/cm3" value="5.243" />
-  <composite n="1" ref="Eu" />
- </material>
- <element Z="9" formula="F" name="F" >
-  <atom type="A" unit="g/mol" value="18.9984" />
- </element>
- <material formula="F" name="Fluorine" state="gas" >
-  <RL type="X0" unit="cm" value="20838.2" />
-  <NIL type="lambda" unit="cm" value="59094.3" />
-  <D type="density" unit="g/cm3" value="0.00158029" />
-  <composite n="1" ref="F" />
- </material>
- <element Z="26" formula="Fe" name="Fe" >
-  <atom type="A" unit="g/mol" value="55.8451" />
- </element>
- <material formula="Fe" name="Iron" state="solid" >
-  <RL type="X0" unit="cm" value="1.75749" />
-  <NIL type="lambda" unit="cm" value="16.959" />
-  <D type="density" unit="g/cm3" value="7.874" />
-  <composite n="1" ref="Fe" />
- </material>
- <element Z="87" formula="Fr" name="Fr" >
-  <atom type="A" unit="g/mol" value="223.02" />
- </element>
- <material formula="Fr" name="Francium" state="solid" >
-  <RL type="X0" unit="cm" value="6.18826" />
-  <NIL type="lambda" unit="cm" value="212.263" />
-  <D type="density" unit="g/cm3" value="1" />
-  <composite n="1" ref="Fr" />
- </material>
- <element Z="31" formula="Ga" name="Ga" >
-  <atom type="A" unit="g/mol" value="69.7231" />
- </element>
- <material formula="Ga" name="Gallium" state="solid" >
-  <RL type="X0" unit="cm" value="2.1128" />
-  <NIL type="lambda" unit="cm" value="24.3351" />
-  <D type="density" unit="g/cm3" value="5.904" />
-  <composite n="1" ref="Ga" />
- </material>
- <element Z="64" formula="Gd" name="Gd" >
-  <atom type="A" unit="g/mol" value="157.252" />
- </element>
- <material formula="Gd" name="Gadolinium" state="solid" >
-  <RL type="X0" unit="cm" value="0.947208" />
-  <NIL type="lambda" unit="cm" value="23.9377" />
-  <D type="density" unit="g/cm3" value="7.9004" />
-  <composite n="1" ref="Gd" />
- </material>
- <element Z="32" formula="Ge" name="Ge" >
-  <atom type="A" unit="g/mol" value="72.6128" />
- </element>
- <material formula="Ge" name="Germanium" state="solid" >
-  <RL type="X0" unit="cm" value="2.3013" />
-  <NIL type="lambda" unit="cm" value="27.3344" />
-  <D type="density" unit="g/cm3" value="5.323" />
-  <composite n="1" ref="Ge" />
- </material>
- <material formula="H" name="Hydrogen" state="gas" >
-  <RL type="X0" unit="cm" value="752776" />
-  <NIL type="lambda" unit="cm" value="421239" />
-  <D type="density" unit="g/cm3" value="8.3748e-05" />
-  <composite n="1" ref="H" />
- </material>
- <element Z="2" formula="He" name="He" >
-  <atom type="A" unit="g/mol" value="4.00264" />
- </element>
- <material formula="He" name="Helium" state="gas" >
-  <RL type="X0" unit="cm" value="567113" />
-  <NIL type="lambda" unit="cm" value="334266" />
-  <D type="density" unit="g/cm3" value="0.000166322" />
-  <composite n="1" ref="He" />
- </material>
- <element Z="72" formula="Hf" name="Hf" >
-  <atom type="A" unit="g/mol" value="178.485" />
- </element>
- <material formula="Hf" name="Hafnium" state="solid" >
-  <RL type="X0" unit="cm" value="0.517717" />
-  <NIL type="lambda" unit="cm" value="14.7771" />
-  <D type="density" unit="g/cm3" value="13.31" />
-  <composite n="1" ref="Hf" />
- </material>
- <element Z="80" formula="Hg" name="Hg" >
-  <atom type="A" unit="g/mol" value="200.599" />
- </element>
- <material formula="Hg" name="Mercury" state="solid" >
-  <RL type="X0" unit="cm" value="0.475241" />
-  <NIL type="lambda" unit="cm" value="15.105" />
-  <D type="density" unit="g/cm3" value="13.546" />
-  <composite n="1" ref="Hg" />
- </material>
- <element Z="67" formula="Ho" name="Ho" >
-  <atom type="A" unit="g/mol" value="164.93" />
- </element>
- <material formula="Ho" name="Holmium" state="solid" >
-  <RL type="X0" unit="cm" value="0.822447" />
-  <NIL type="lambda" unit="cm" value="21.8177" />
-  <D type="density" unit="g/cm3" value="8.795" />
-  <composite n="1" ref="Ho" />
- </material>
- <element Z="53" formula="I" name="I" >
-  <atom type="A" unit="g/mol" value="126.904" />
- </element>
- <material formula="I" name="Iodine" state="solid" >
-  <RL type="X0" unit="cm" value="1.72016" />
-  <NIL type="lambda" unit="cm" value="35.6583" />
-  <D type="density" unit="g/cm3" value="4.93" />
-  <composite n="1" ref="I" />
- </material>
- <element Z="49" formula="In" name="In" >
-  <atom type="A" unit="g/mol" value="114.818" />
- </element>
- <material formula="In" name="Indium" state="solid" >
-  <RL type="X0" unit="cm" value="1.21055" />
-  <NIL type="lambda" unit="cm" value="23.2468" />
-  <D type="density" unit="g/cm3" value="7.31" />
-  <composite n="1" ref="In" />
- </material>
- <element Z="77" formula="Ir" name="Ir" >
-  <atom type="A" unit="g/mol" value="192.216" />
- </element>
- <material formula="Ir" name="Iridium" state="solid" >
-  <RL type="X0" unit="cm" value="0.294142" />
-  <NIL type="lambda" unit="cm" value="9.01616" />
-  <D type="density" unit="g/cm3" value="22.42" />
-  <composite n="1" ref="Ir" />
- </material>
- <element Z="19" formula="K" name="K" >
-  <atom type="A" unit="g/mol" value="39.0983" />
- </element>
- <material formula="K" name="Potassium" state="solid" >
-  <RL type="X0" unit="cm" value="20.0871" />
-  <NIL type="lambda" unit="cm" value="138.041" />
-  <D type="density" unit="g/cm3" value="0.862" />
-  <composite n="1" ref="K" />
- </material>
- <element Z="36" formula="Kr" name="Kr" >
-  <atom type="A" unit="g/mol" value="83.7993" />
- </element>
- <material formula="Kr" name="Krypton" state="gas" >
-  <RL type="X0" unit="cm" value="3269.44" />
-  <NIL type="lambda" unit="cm" value="43962.9" />
-  <D type="density" unit="g/cm3" value="0.00347832" />
-  <composite n="1" ref="Kr" />
- </material>
- <element Z="57" formula="La" name="La" >
-  <atom type="A" unit="g/mol" value="138.905" />
- </element>
- <material formula="La" name="Lanthanum" state="solid" >
-  <RL type="X0" unit="cm" value="1.32238" />
-  <NIL type="lambda" unit="cm" value="29.441" />
-  <D type="density" unit="g/cm3" value="6.154" />
-  <composite n="1" ref="La" />
- </material>
- <element Z="3" formula="Li" name="Li" >
-  <atom type="A" unit="g/mol" value="6.94003" />
- </element>
- <material formula="Li" name="Lithium" state="solid" >
-  <RL type="X0" unit="cm" value="154.997" />
-  <NIL type="lambda" unit="cm" value="124.305" />
-  <D type="density" unit="g/cm3" value="0.534" />
-  <composite n="1" ref="Li" />
- </material>
- <element Z="71" formula="Lu" name="Lu" >
-  <atom type="A" unit="g/mol" value="174.967" />
- </element>
- <material formula="Lu" name="Lutetium" state="solid" >
-  <RL type="X0" unit="cm" value="0.703651" />
-  <NIL type="lambda" unit="cm" value="19.8916" />
-  <D type="density" unit="g/cm3" value="9.84" />
-  <composite n="1" ref="Lu" />
- </material>
- <element Z="12" formula="Mg" name="Mg" >
-  <atom type="A" unit="g/mol" value="24.305" />
- </element>
- <material formula="Mg" name="Magnesium" state="solid" >
-  <RL type="X0" unit="cm" value="14.3859" />
-  <NIL type="lambda" unit="cm" value="58.7589" />
-  <D type="density" unit="g/cm3" value="1.74" />
-  <composite n="1" ref="Mg" />
- </material>
- <element Z="25" formula="Mn" name="Mn" >
-  <atom type="A" unit="g/mol" value="54.938" />
- </element>
- <material formula="Mn" name="Manganese" state="solid" >
-  <RL type="X0" unit="cm" value="1.96772" />
-  <NIL type="lambda" unit="cm" value="17.8701" />
-  <D type="density" unit="g/cm3" value="7.44" />
-  <composite n="1" ref="Mn" />
- </material>
- <element Z="42" formula="Mo" name="Mo" >
-  <atom type="A" unit="g/mol" value="95.9313" />
- </element>
- <material formula="Mo" name="Molybdenum" state="solid" >
-  <RL type="X0" unit="cm" value="0.959107" />
-  <NIL type="lambda" unit="cm" value="15.6698" />
-  <D type="density" unit="g/cm3" value="10.22" />
-  <composite n="1" ref="Mo" />
- </material>
- <material formula="N" name="Nitrogen" state="gas" >
-  <RL type="X0" unit="cm" value="32602.2" />
-  <NIL type="lambda" unit="cm" value="72430.3" />
-  <D type="density" unit="g/cm3" value="0.0011652" />
-  <composite n="1" ref="N" />
- </material>
- <element Z="11" formula="Na" name="Na" >
-  <atom type="A" unit="g/mol" value="22.9898" />
- </element>
- <material formula="Na" name="Sodium" state="solid" >
-  <RL type="X0" unit="cm" value="28.5646" />
-  <NIL type="lambda" unit="cm" value="102.463" />
-  <D type="density" unit="g/cm3" value="0.971" />
-  <composite n="1" ref="Na" />
- </material>
- <element Z="41" formula="Nb" name="Nb" >
-  <atom type="A" unit="g/mol" value="92.9064" />
- </element>
- <material formula="Nb" name="Niobium" state="solid" >
-  <RL type="X0" unit="cm" value="1.15783" />
-  <NIL type="lambda" unit="cm" value="18.4846" />
-  <D type="density" unit="g/cm3" value="8.57" />
-  <composite n="1" ref="Nb" />
- </material>
- <element Z="60" formula="Nd" name="Nd" >
-  <atom type="A" unit="g/mol" value="144.236" />
- </element>
- <material formula="Nd" name="Neodymium" state="solid" >
-  <RL type="X0" unit="cm" value="1.11667" />
-  <NIL type="lambda" unit="cm" value="26.6308" />
-  <D type="density" unit="g/cm3" value="6.9" />
-  <composite n="1" ref="Nd" />
- </material>
- <element Z="10" formula="Ne" name="Ne" >
-  <atom type="A" unit="g/mol" value="20.18" />
- </element>
- <material formula="Ne" name="Neon" state="gas" >
-  <RL type="X0" unit="cm" value="34504.8" />
-  <NIL type="lambda" unit="cm" value="114322" />
-  <D type="density" unit="g/cm3" value="0.000838505" />
-  <composite n="1" ref="Ne" />
- </material>
- <element Z="28" formula="Ni" name="Ni" >
-  <atom type="A" unit="g/mol" value="58.6933" />
- </element>
- <material formula="Ni" name="Nickel" state="solid" >
-  <RL type="X0" unit="cm" value="1.42422" />
-  <NIL type="lambda" unit="cm" value="15.2265" />
-  <D type="density" unit="g/cm3" value="8.902" />
-  <composite n="1" ref="Ni" />
- </material>
- <element Z="93" formula="Np" name="Np" >
-  <atom type="A" unit="g/mol" value="237.048" />
- </element>
- <material formula="Np" name="Neptunium" state="solid" >
-  <RL type="X0" unit="cm" value="0.289676" />
-  <NIL type="lambda" unit="cm" value="10.6983" />
-  <D type="density" unit="g/cm3" value="20.25" />
-  <composite n="1" ref="Np" />
- </material>
- <material formula="O" name="Oxygen" state="gas" >
-  <RL type="X0" unit="cm" value="25713.8" />
-  <NIL type="lambda" unit="cm" value="66233.9" />
-  <D type="density" unit="g/cm3" value="0.00133151" />
-  <composite n="1" ref="O" />
- </material>
- <element Z="76" formula="Os" name="Os" >
-  <atom type="A" unit="g/mol" value="190.225" />
- </element>
- <material formula="Os" name="Osmium" state="solid" >
-  <RL type="X0" unit="cm" value="0.295861" />
-  <NIL type="lambda" unit="cm" value="8.92553" />
-  <D type="density" unit="g/cm3" value="22.57" />
-  <composite n="1" ref="Os" />
- </material>
- <element Z="15" formula="P" name="P" >
-  <atom type="A" unit="g/mol" value="30.9738" />
- </element>
- <material formula="P" name="Phosphorus" state="solid" >
-  <RL type="X0" unit="cm" value="9.63879" />
-  <NIL type="lambda" unit="cm" value="49.9343" />
-  <D type="density" unit="g/cm3" value="2.2" />
-  <composite n="1" ref="P" />
- </material>
- <element Z="91" formula="Pa" name="Pa" >
-  <atom type="A" unit="g/mol" value="231.036" />
- </element>
- <material formula="Pa" name="Protactinium" state="solid" >
-  <RL type="X0" unit="cm" value="0.38607" />
-  <NIL type="lambda" unit="cm" value="13.9744" />
-  <D type="density" unit="g/cm3" value="15.37" />
-  <composite n="1" ref="Pa" />
- </material>
- <element Z="82" formula="Pb" name="Pb" >
-  <atom type="A" unit="g/mol" value="207.217" />
- </element>
- <material formula="Pb" name="Lead" state="solid" >
-  <RL type="X0" unit="cm" value="0.561253" />
-  <NIL type="lambda" unit="cm" value="18.2607" />
-  <D type="density" unit="g/cm3" value="11.35" />
-  <composite n="1" ref="Pb" />
- </material>
- <element Z="46" formula="Pd" name="Pd" >
-  <atom type="A" unit="g/mol" value="106.415" />
- </element>
- <material formula="Pd" name="Palladium" state="solid" >
-  <RL type="X0" unit="cm" value="0.765717" />
-  <NIL type="lambda" unit="cm" value="13.7482" />
-  <D type="density" unit="g/cm3" value="12.02" />
-  <composite n="1" ref="Pd" />
- </material>
- <element Z="61" formula="Pm" name="Pm" >
-  <atom type="A" unit="g/mol" value="144.913" />
- </element>
- <material formula="Pm" name="Promethium" state="solid" >
-  <RL type="X0" unit="cm" value="1.04085" />
-  <NIL type="lambda" unit="cm" value="25.4523" />
-  <D type="density" unit="g/cm3" value="7.22" />
-  <composite n="1" ref="Pm" />
- </material>
- <element Z="84" formula="Po" name="Po" >
-  <atom type="A" unit="g/mol" value="208.982" />
- </element>
- <material formula="Po" name="Polonium" state="solid" >
-  <RL type="X0" unit="cm" value="0.661092" />
-  <NIL type="lambda" unit="cm" value="22.2842" />
-  <D type="density" unit="g/cm3" value="9.32" />
-  <composite n="1" ref="Po" />
- </material>
- <element Z="59" formula="Pr" name="Pr" >
-  <atom type="A" unit="g/mol" value="140.908" />
- </element>
- <material formula="Pr" name="Praseodymium" state="solid" >
-  <RL type="X0" unit="cm" value="1.1562" />
-  <NIL type="lambda" unit="cm" value="27.1312" />
-  <D type="density" unit="g/cm3" value="6.71" />
-  <composite n="1" ref="Pr" />
- </material>
- <element Z="78" formula="Pt" name="Pt" >
-  <atom type="A" unit="g/mol" value="195.078" />
- </element>
- <material formula="Pt" name="Platinum" state="solid" >
-  <RL type="X0" unit="cm" value="0.305053" />
-  <NIL type="lambda" unit="cm" value="9.46584" />
-  <D type="density" unit="g/cm3" value="21.45" />
-  <composite n="1" ref="Pt" />
- </material>
- <element Z="94" formula="Pu" name="Pu" >
-  <atom type="A" unit="g/mol" value="244.064" />
- </element>
- <material formula="Pu" name="Plutonium" state="solid" >
-  <RL type="X0" unit="cm" value="0.298905" />
-  <NIL type="lambda" unit="cm" value="11.0265" />
-  <D type="density" unit="g/cm3" value="19.84" />
-  <composite n="1" ref="Pu" />
- </material>
- <element Z="88" formula="Ra" name="Ra" >
-  <atom type="A" unit="g/mol" value="226.025" />
- </element>
- <material formula="Ra" name="Radium" state="solid" >
-  <RL type="X0" unit="cm" value="1.22987" />
-  <NIL type="lambda" unit="cm" value="42.6431" />
-  <D type="density" unit="g/cm3" value="5" />
-  <composite n="1" ref="Ra" />
- </material>
- <element Z="37" formula="Rb" name="Rb" >
-  <atom type="A" unit="g/mol" value="85.4677" />
- </element>
- <material formula="Rb" name="Rubidium" state="solid" >
-  <RL type="X0" unit="cm" value="7.19774" />
-  <NIL type="lambda" unit="cm" value="100.218" />
-  <D type="density" unit="g/cm3" value="1.532" />
-  <composite n="1" ref="Rb" />
- </material>
- <element Z="75" formula="Re" name="Re" >
-  <atom type="A" unit="g/mol" value="186.207" />
- </element>
- <material formula="Re" name="Rhenium" state="solid" >
-  <RL type="X0" unit="cm" value="0.318283" />
-  <NIL type="lambda" unit="cm" value="9.5153" />
-  <D type="density" unit="g/cm3" value="21.02" />
-  <composite n="1" ref="Re" />
- </material>
- <element Z="45" formula="Rh" name="Rh" >
-  <atom type="A" unit="g/mol" value="102.906" />
- </element>
- <material formula="Rh" name="Rhodium" state="solid" >
-  <RL type="X0" unit="cm" value="0.746619" />
-  <NIL type="lambda" unit="cm" value="13.2083" />
-  <D type="density" unit="g/cm3" value="12.41" />
-  <composite n="1" ref="Rh" />
- </material>
- <element Z="86" formula="Rn" name="Rn" >
-  <atom type="A" unit="g/mol" value="222.018" />
- </element>
- <material formula="Rn" name="Radon" state="gas" >
-  <RL type="X0" unit="cm" value="697.777" />
-  <NIL type="lambda" unit="cm" value="23532" />
-  <D type="density" unit="g/cm3" value="0.00900662" />
-  <composite n="1" ref="Rn" />
- </material>
- <element Z="44" formula="Ru" name="Ru" >
-  <atom type="A" unit="g/mol" value="101.065" />
- </element>
- <material formula="Ru" name="Ruthenium" state="solid" >
-  <RL type="X0" unit="cm" value="0.764067" />
-  <NIL type="lambda" unit="cm" value="13.1426" />
-  <D type="density" unit="g/cm3" value="12.41" />
-  <composite n="1" ref="Ru" />
- </material>
- <element Z="16" formula="S" name="S" >
-  <atom type="A" unit="g/mol" value="32.0661" />
- </element>
- <material formula="S" name="Sulfur" state="solid" >
-  <RL type="X0" unit="cm" value="9.74829" />
-  <NIL type="lambda" unit="cm" value="55.6738" />
-  <D type="density" unit="g/cm3" value="2" />
-  <composite n="1" ref="S" />
- </material>
- <element Z="51" formula="Sb" name="Sb" >
-  <atom type="A" unit="g/mol" value="121.76" />
- </element>
- <material formula="Sb" name="Antimony" state="solid" >
-  <RL type="X0" unit="cm" value="1.30401" />
-  <NIL type="lambda" unit="cm" value="25.8925" />
-  <D type="density" unit="g/cm3" value="6.691" />
-  <composite n="1" ref="Sb" />
- </material>
- <element Z="21" formula="Sc" name="Sc" >
-  <atom type="A" unit="g/mol" value="44.9559" />
- </element>
- <material formula="Sc" name="Scandium" state="solid" >
-  <RL type="X0" unit="cm" value="5.53545" />
-  <NIL type="lambda" unit="cm" value="41.609" />
-  <D type="density" unit="g/cm3" value="2.989" />
-  <composite n="1" ref="Sc" />
- </material>
- <element Z="34" formula="Se" name="Se" >
-  <atom type="A" unit="g/mol" value="78.9594" />
- </element>
- <material formula="Se" name="Selenium" state="solid" >
-  <RL type="X0" unit="cm" value="2.64625" />
-  <NIL type="lambda" unit="cm" value="33.356" />
-  <D type="density" unit="g/cm3" value="4.5" />
-  <composite n="1" ref="Se" />
- </material>
- <element Z="14" formula="Si" name="Si" >
-  <atom type="A" unit="g/mol" value="28.0854" />
- </element>
- <material formula="Si" name="Silicon" state="solid" >
-  <RL type="X0" unit="cm" value="9.36607" />
-  <NIL type="lambda" unit="cm" value="45.7531" />
-  <D type="density" unit="g/cm3" value="2.33" />
-  <composite n="1" ref="Si" />
- </material>
- <element Z="62" formula="Sm" name="Sm" >
-  <atom type="A" unit="g/mol" value="150.366" />
- </element>
- <material formula="Sm" name="Samarium" state="solid" >
-  <RL type="X0" unit="cm" value="1.01524" />
-  <NIL type="lambda" unit="cm" value="24.9892" />
-  <D type="density" unit="g/cm3" value="7.46" />
-  <composite n="1" ref="Sm" />
- </material>
- <element Z="50" formula="Sn" name="Sn" >
-  <atom type="A" unit="g/mol" value="118.71" />
- </element>
- <material formula="Sn" name="Tin" state="solid" >
-  <RL type="X0" unit="cm" value="1.20637" />
-  <NIL type="lambda" unit="cm" value="23.4931" />
-  <D type="density" unit="g/cm3" value="7.31" />
-  <composite n="1" ref="Sn" />
- </material>
- <element Z="38" formula="Sr" name="Sr" >
-  <atom type="A" unit="g/mol" value="87.6166" />
- </element>
- <material formula="Sr" name="Strontium" state="solid" >
-  <RL type="X0" unit="cm" value="4.237" />
-  <NIL type="lambda" unit="cm" value="61.0238" />
-  <D type="density" unit="g/cm3" value="2.54" />
-  <composite n="1" ref="Sr" />
- </material>
- <element Z="73" formula="Ta" name="Ta" >
-  <atom type="A" unit="g/mol" value="180.948" />
- </element>
- <material formula="Ta" name="Tantalum" state="solid" >
-  <RL type="X0" unit="cm" value="0.409392" />
-  <NIL type="lambda" unit="cm" value="11.8846" />
-  <D type="density" unit="g/cm3" value="16.654" />
-  <composite n="1" ref="Ta" />
- </material>
- <element Z="65" formula="Tb" name="Tb" >
-  <atom type="A" unit="g/mol" value="158.925" />
- </element>
- <material formula="Tb" name="Terbium" state="solid" >
-  <RL type="X0" unit="cm" value="0.893977" />
-  <NIL type="lambda" unit="cm" value="23.0311" />
-  <D type="density" unit="g/cm3" value="8.229" />
-  <composite n="1" ref="Tb" />
- </material>
- <element Z="43" formula="Tc" name="Tc" >
-  <atom type="A" unit="g/mol" value="97.9072" />
- </element>
- <material formula="Tc" name="Technetium" state="solid" >
-  <RL type="X0" unit="cm" value="0.833149" />
-  <NIL type="lambda" unit="cm" value="14.0185" />
-  <D type="density" unit="g/cm3" value="11.5" />
-  <composite n="1" ref="Tc" />
- </material>
- <element Z="52" formula="Te" name="Te" >
-  <atom type="A" unit="g/mol" value="127.603" />
- </element>
- <material formula="Te" name="Tellurium" state="solid" >
-  <RL type="X0" unit="cm" value="1.41457" />
-  <NIL type="lambda" unit="cm" value="28.1797" />
-  <D type="density" unit="g/cm3" value="6.24" />
-  <composite n="1" ref="Te" />
- </material>
- <element Z="90" formula="Th" name="Th" >
-  <atom type="A" unit="g/mol" value="232.038" />
- </element>
- <material formula="Th" name="Thorium" state="solid" >
-  <RL type="X0" unit="cm" value="0.51823" />
-  <NIL type="lambda" unit="cm" value="18.353" />
-  <D type="density" unit="g/cm3" value="11.72" />
-  <composite n="1" ref="Th" />
- </material>
- <material formula="Ti" name="Titanium" state="solid" >
-  <RL type="X0" unit="cm" value="3.5602" />
-  <NIL type="lambda" unit="cm" value="27.9395" />
-  <D type="density" unit="g/cm3" value="4.54" />
-  <composite n="1" ref="Ti" />
- </material>
- <element Z="81" formula="Tl" name="Tl" >
-  <atom type="A" unit="g/mol" value="204.383" />
- </element>
- <material formula="Tl" name="Thallium" state="solid" >
-  <RL type="X0" unit="cm" value="0.547665" />
-  <NIL type="lambda" unit="cm" value="17.6129" />
-  <D type="density" unit="g/cm3" value="11.72" />
-  <composite n="1" ref="Tl" />
- </material>
- <element Z="69" formula="Tm" name="Tm" >
-  <atom type="A" unit="g/mol" value="168.934" />
- </element>
- <material formula="Tm" name="Thulium" state="solid" >
-  <RL type="X0" unit="cm" value="0.754428" />
-  <NIL type="lambda" unit="cm" value="20.7522" />
-  <D type="density" unit="g/cm3" value="9.321" />
-  <composite n="1" ref="Tm" />
- </material>
- <element Z="92" formula="U" name="U" >
-  <atom type="A" unit="g/mol" value="238.029" />
- </element>
- <material formula="U" name="Uranium" state="solid" >
-  <RL type="X0" unit="cm" value="0.31663" />
-  <NIL type="lambda" unit="cm" value="11.4473" />
-  <D type="density" unit="g/cm3" value="18.95" />
-  <composite n="1" ref="U" />
- </material>
- <element Z="23" formula="V" name="V" >
-  <atom type="A" unit="g/mol" value="50.9415" />
- </element>
- <material formula="V" name="Vanadium" state="solid" >
-  <RL type="X0" unit="cm" value="2.59285" />
-  <NIL type="lambda" unit="cm" value="21.2187" />
-  <D type="density" unit="g/cm3" value="6.11" />
-  <composite n="1" ref="V" />
- </material>
- <element Z="74" formula="W" name="W" >
-  <atom type="A" unit="g/mol" value="183.842" />
- </element>
- <material formula="W" name="Tungsten" state="solid" >
-  <RL type="X0" unit="cm" value="0.350418" />
-  <NIL type="lambda" unit="cm" value="10.3057" />
-  <D type="density" unit="g/cm3" value="19.3" />
-  <composite n="1" ref="W" />
- </material>
- <element Z="54" formula="Xe" name="Xe" >
-  <atom type="A" unit="g/mol" value="131.292" />
- </element>
- <material formula="Xe" name="Xenon" state="gas" >
-  <RL type="X0" unit="cm" value="1546.2" />
-  <NIL type="lambda" unit="cm" value="32477.9" />
-  <D type="density" unit="g/cm3" value="0.00548536" />
-  <composite n="1" ref="Xe" />
- </material>
- <element Z="39" formula="Y" name="Y" >
-  <atom type="A" unit="g/mol" value="88.9058" />
- </element>
- <material formula="Y" name="Yttrium" state="solid" >
-  <RL type="X0" unit="cm" value="2.32943" />
-  <NIL type="lambda" unit="cm" value="34.9297" />
-  <D type="density" unit="g/cm3" value="4.469" />
-  <composite n="1" ref="Y" />
- </material>
- <element Z="70" formula="Yb" name="Yb" >
-  <atom type="A" unit="g/mol" value="173.038" />
- </element>
- <material formula="Yb" name="Ytterbium" state="solid" >
-  <RL type="X0" unit="cm" value="1.04332" />
-  <NIL type="lambda" unit="cm" value="28.9843" />
-  <D type="density" unit="g/cm3" value="6.73" />
-  <composite n="1" ref="Yb" />
- </material>
- <element Z="30" formula="Zn" name="Zn" >
-  <atom type="A" unit="g/mol" value="65.3955" />
- </element>
- <material formula="Zn" name="Zinc" state="solid" >
-  <RL type="X0" unit="cm" value="1.74286" />
-  <NIL type="lambda" unit="cm" value="19.8488" />
-  <D type="density" unit="g/cm3" value="7.133" />
-  <composite n="1" ref="Zn" />
- </material>
- <element Z="40" formula="Zr" name="Zr" >
-  <atom type="A" unit="g/mol" value="91.2236" />
- </element>
- <material formula="Zr" name="Zirconium" state="solid" >
-  <RL type="X0" unit="cm" value="1.56707" />
-  <NIL type="lambda" unit="cm" value="24.2568" />
-  <D type="density" unit="g/cm3" value="6.506" />
-  <composite n="1" ref="Zr" />
- </material>
-</materials>
\ No newline at end of file
diff --git a/compact/before-rich1-geom-update-26052022/Muon/Muon/Materials/MuonMaterials.xml b/compact/before-rich1-geom-update-26052022/Muon/Muon/Materials/MuonMaterials.xml
index 4b1a9ed36422b21b0e5aebc6887a8694e042ef02..ded175d3833c6167d71bb88a5b43d6da059788e1 100644
--- a/compact/before-rich1-geom-update-26052022/Muon/Muon/Materials/MuonMaterials.xml
+++ b/compact/before-rich1-geom-update-26052022/Muon/Muon/Materials/MuonMaterials.xml
@@ -10,134 +10,92 @@
     or submit itself to any jurisdiction.
 -->
 
-<!--**********  Materials I added myself  **********-->
-  <material name="Air">
-    <MEE unit="eV" value="85.7"/>
-    <D type="density" unit="g/cm3" value="0.00120479" state="gas"/>
-    <fraction n="0.000124000124000124" ref="C"/>
-    <fraction n="0.755267755267755" ref="N"/>
-    <fraction n="0.231781231781232" ref="O"/>
-    <fraction n="0.0128270128270128" ref="Ar"/>
-  </material>
-
-  <material name="Vacuum">
-    <D type="density" unit="g/cm3" value="0.00000000001" state="gas"/>
-    <fraction n="1" ref="Air"/>
-  </material>
-
-  <!-- Renaming of Aluminium-->
-  <material name="Aluminium">
-    <D type="density" unit="g/cm3" value="2.699"/>
-    <fraction n="1" ref="Aluminum"/>
-  </material>
-  <!--  *********************************************  -->
-
-
-  <!-- %%%%%%         epoxy           %%%%%%%% -->
-  <material name="Epoxy">
-    <D type="density" unit="g/cm3" value="1.3"/>
-    <composite ref="Carbon"   n="15"/>
-    <composite ref="Hydrogen" n="44"/>
-    <composite ref="Oxygen"   n="7"/>
-  </material>
-
-  <material name="SiO2">
-    <D type="density" unit="g/cm3" value="2.64"/>
-    <composite n="1" ref="Silicon"/>
-    <composite n="2" ref="Oxygen"/>
-  </material>
-
   <!-- %%%%%%         G10             %%%%%%%% -->
-  <material name="G10">
+  <material name="Muon:G10">
     <D type="density" unit="g/cm3" value="1.7"/>
-    <fraction n="0.853" ref="SiO2"/>
+    <fraction n="0.853" ref="SiliconOxide"/>
     <fraction n="0.147" ref="Epoxy"/>
   </material>
   <!-- %%%%%% G10 0.8mm planels with 50micron Cu cladding
        total thickness is 0.9 mm %%%%%%%% -->
-  <material name="G10CuClad">
+  <material name="Muon:G10CuClad">
     <D type="density" unit="g/cm3" value="1.7"/>
-    <fraction ref="G10" n="0.60"/>
-    <fraction ref="Copper" n="0.40"/>
+    <fraction ref="Muon:G10" n="0.60"/>
+    <fraction ref="Copper"   n="0.40"/>
   </material>
   <!-- %%%%%% G10/Air mix for chamber surrounds %%%%%%%% -->
-  <material name="G10Air">
+  <material name="Muon:G10Air">
     <D type="density" unit="g/cm3" value="0.76"/>
-    <fraction ref="G10" n="0.55"/>
-    <fraction ref="Air"      n="0.45"/>
+    <fraction ref="Muon:G10" n="0.55"/>
+    <fraction ref="Air" n="0.45"/>
   </material>
   <!-- %%%%%%              Honeycomb                 %%%%%% -->
-  <material name="Honeycomb">
+  <material name="Muon:Honeycomb">
     <D type="density" unit="g/cm3" value="0.00628"/>
     <fraction ref="Air"      n="0.97"/>
-    <fraction ref="G10" n="0.03"/>
+    <fraction ref="Muon:G10" n="0.03"/>
   </material>
   <!-- %%%%%%         Polystyrene_Foam                   %%%%%% -->
-  <material name="Polystyrene_Foam">
+  <material name="Muon:Polystyrene_Foam">
     <D type="density" unit="g/cm3" value="0.00350"/>
     <composite ref="Hydrogen" n="1"/>
     <composite ref="Carbon"   n="1"/>
   </material>
 
-  <material name="ArgonGas">
-    <D type="density" unit="g/cm3" value="0.16390E-02" state="gas"/>
-    <composite ref="Argon" n="1"/>
-  </material>
-
-  <material name="CO2">
+  <material name="Muon:CO2">
     <D type="density" unit="g/cm3" value="1.8182E-03" state="gas"/>
     <composite ref="Carbon" n="1"/>
     <composite ref="Oxygen" n="2"/>
   </material>
 
-  <material name="CF4">
+  <material name="Muon:CF4">
     <D type="density" unit="g/cm3" value="0.003884" state="gas"/>
     <composite ref="Carbon" n="1"/>
     <composite ref="Fluorine" n="4"/>
   </material>
 
   <!-- %%%%%%              S_CPC_gas    %%%%%% -->
-  <material name="S_CPC_gas">
+  <material name="Muon:S_CPC_gas">
     <D type="density" unit="g/cm3" value="0.002054" state="gas"/>
-    <fraction ref="ArgonGas" n="0.6"/>
-    <fraction ref="CF4"      n="0.1"/>
-    <fraction ref="CO2"      n="0.3"/>
+    <fraction ref="Argon"    n="0.6"/>
+    <fraction ref="Muon:CF4" n="0.1"/>
+    <fraction ref="Muon:CO2" n="0.3"/>
   </material>
   <!-- %%%%%%             C2_H2_F4    %%%%%% -->
-  <material name="C2_H2_F4">
+  <material name="Muon:C2_H2_F4">
     <D type="density" unit="g/cm3" value="4.0064887" state="gas"/>
     <composite ref="Carbon"   n="2"/>
     <composite ref="Hydrogen" n="2"/>
     <composite ref="Fluorine" n="4"/>
   </material>
   <!-- %%%%%%            SF6    %%%%%% -->
-  <material name="SF6">
+  <material name="Muon:SF6">
     <D type="density" unit="g/cm3" value="2.0094817" state="gas"/>
     <composite ref="Sulfur"   n="1"/>
     <composite ref="Fluorine" n="6"/>
   </material>
   <!-- %%%%%%            C4_H10    %%%%%% -->
-  <material name="C4_H10">
+  <material name="Muon:C4_H10">
     <D type="density" unit="g/cm3" value="8.0008375" state="gas"/>
     <composite ref="Carbon"   n="4"/>
     <composite ref="Hydrogen" n="10"/>
   </material>
   <!-- %%%%%%              S_MRPC_gas    %%%%%% -->
-  <material name="S_MRPC_gas">
+  <material name="Muon:S_MRPC_gas">
     <D type="density" unit="g/cm3" value="0.004514" state="gas"/>
-    <fraction ref="C2_H2_F4" n="0.96"/>
-    <fraction ref="C4_H10"   n="0.03"/>
-    <fraction ref="SF6"      n="0.01"/>
+    <fraction ref="Muon:C2_H2_F4" n="0.96"/>
+    <fraction ref="Muon:C4_H10"   n="0.03"/>
+    <fraction ref="Muon:SF6"      n="0.01"/>
   </material>
   <!-- %%%%%%              Phenolic    %%%%%% -->
-  <material name="Phenolic">
+  <material name="Muon:Phenolic">
     <D type="density" unit="g/cm3" value="1.25"/>
     <fraction n="0.05744" ref="Hydrogen"/>
     <fraction n="0.77459" ref="Carbon"/>
-    <fraction n="0.16797" ref="SF6"/>
+    <fraction n="0.16797" ref="Muon:SF6"/>
   </material>
   <!-- %%%%%%              Muon Filter Iron  %%%%%%%% -->
-  <material name="MuonFilterIron">  
+  <material name="Muon:FilterIron">  
     <D type="density" unit="g/cm3" value="7.5"/>
     <fraction n="0.9851" ref="Iron"/>
     <fraction n="0.005"  ref="Carbon"/>
@@ -147,7 +105,7 @@
   </material>
   
   <!--steel -->
-  <material name="Steel">
+  <material name="Muon:Steel">
     <D type="density" unit="g/cm3" value="7.8"/>
     <fraction n="0.7" ref="Iron"  />
     <fraction n="0.1" ref="Carbon"/>
@@ -156,22 +114,17 @@
   
   
   <!--Concrete-->
-  <material name="Concrete">
+  <material name="Muon:Concrete">
     <D type="density" unit="g/cm3" value="2.5"/>
     <fraction n="0.520" ref="Oxygen"  />
     <fraction n="0.325" ref="Silicon"  />
     <fraction n="0.060" ref="Calcium"  />
     <fraction n="0.015" ref="Sodium"  />
     <fraction n="0.020" ref="Iron"  />
-    <fraction n="0.040" ref="Aluminium"  />
+    <fraction n="0.040" ref="Aluminum"  />
   </material>
-  
-  <material name="MuonCopper">
-    <D type="density" unit="g/cm3" value="8.96"/>
-    <fraction n="1.0" ref="Copper"/>
-  </material>
-  
-  <material name="MuonPolyurethane">
+
+  <material name="Muon:Polyurethane">
     <D type="density" unit="g/cm3" value="0.5"/>
     <fraction n="0.0264" ref="Hydrogen"/>
     <fraction n="0.6911" ref="Carbon"/>
@@ -179,7 +132,7 @@
     <fraction n="0.2092" ref="Oxygen"/>
   </material>
   
-  <material name="Kapton">
+  <material name="Muon:Kapton">
     <D type="density" unit="g/cm3" value="1.42"/>
     <fraction n="0.0264" ref="Hydrogen"/>
     <fraction n="0.6911" ref="Carbon"/>
diff --git a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M2ASideR1ChamPos.xml b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M2ASideR1ChamPos.xml
index e9ecd1793b388678902dab6d4fdf1016e633a0bd..b2f7dd7903850f999f26c0672022f07f4ae30045 100644
--- a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M2ASideR1ChamPos.xml
+++ b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M2ASideR1ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="308.000000*mm" sizeY="252.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
 
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="308.000000*mm" sizeY="252.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
 
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="308.000000*mm" sizeY="252.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
 
@@ -114,21 +114,21 @@
       </physvol>
       </logvol>
 
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
          <box name="Copper30mic" sizeX="308.000000*mm" sizeY="252.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
 
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="308.000000*mm" sizeY="252.800000*mm" sizeZ="1.600000*mm"/>
       </logvol>
 
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="308.000000*mm" sizeY="252.800000*mm" sizeZ="2.900000*mm"/>
       </logvol>
 
 
 
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="390.000000*mm" sizeY="335.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="308.000000*mm" sizeY="252.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M2ASideR2ChamPos.xml b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M2ASideR2ChamPos.xml
index 4cfcb6385fc6c6f33f9a3d3a607245b44459c751..55bf7781fd609a991edae2875ee11747a7e2b2a7 100644
--- a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M2ASideR2ChamPos.xml
+++ b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M2ASideR2ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="612.000000*mm" sizeY="252.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
 
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="612.000000*mm" sizeY="252.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
 
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="612.000000*mm" sizeY="252.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
 
@@ -114,21 +114,21 @@
       </physvol>
       </logvol>
 
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
          <box name="Copper30mic" sizeX="612.000000*mm" sizeY="252.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
 
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="612.000000*mm" sizeY="252.800000*mm" sizeZ="1.600000*mm"/>
       </logvol>
 
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="612.000000*mm" sizeY="252.800000*mm" sizeZ="2.900000*mm"/>
       </logvol>
 
 
 
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="694.000000*mm" sizeY="335.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="612.000000*mm" sizeY="252.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M2ASideR3ChamPos.xml b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M2ASideR3ChamPos.xml
index 061259c331940648f701ea3305896a6e2a118e5e..7f1a2a0b0b4994ab192516f566d9adacf7f84e96 100644
--- a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M2ASideR3ChamPos.xml
+++ b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M2ASideR3ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
 
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
 
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
 
@@ -114,21 +114,21 @@
       </physvol>
       </logvol>
 
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
          <box name="Copper30mic" sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
 
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="0.800000*mm"/>
       </logvol>
 
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="3.700000*mm"/>
       </logvol>
 
 
 
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="1306.000000*mm" sizeY="335.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M2ASideR4ChamPos.xml b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M2ASideR4ChamPos.xml
index cf50c4d9d2e3abe1bc48eb497b2f7b0f9d432639..e7f2c13de9a15b899240d10057331a8d009f0de4 100644
--- a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M2ASideR4ChamPos.xml
+++ b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M2ASideR4ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
 
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5"
              sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
@@ -87,7 +87,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
 
@@ -115,21 +115,21 @@
       </physvol>
       </logvol>
 
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
          <box name="Copper30mic" sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
 
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="0.800000*mm"/>
       </logvol>
 
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="3.700000*mm"/>
       </logvol>
 
 
 
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="1306.000000*mm" sizeY="335.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M3ASideR1ChamPos.xml b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M3ASideR1ChamPos.xml
index bae7c837ab8d6178e8f3e7533a4ff76d2dcf760c..b9d0d2a02394489a34e109ce0586d2e42bb79c84 100644
--- a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M3ASideR1ChamPos.xml
+++ b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M3ASideR1ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="332.000000*mm" sizeY="272.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
 
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="332.000000*mm" sizeY="272.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
 
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="332.000000*mm" sizeY="272.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
 
@@ -114,21 +114,21 @@
       </physvol>
       </logvol>
 
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
          <box name="Copper30mic" sizeX="332.000000*mm" sizeY="272.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
 
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="332.000000*mm" sizeY="272.800000*mm" sizeZ="1.600000*mm"/>
       </logvol>
 
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="332.000000*mm" sizeY="272.800000*mm" sizeZ="2.900000*mm"/>
       </logvol>
 
 
 
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="414.000000*mm" sizeY="355.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="332.000000*mm" sizeY="272.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M3ASideR2ChamPos.xml b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M3ASideR2ChamPos.xml
index ae2addc0f0fdde314d6530b5672a248d715bf7be..4484de136343d9fc89e5c4f431d729b9494ecb39 100644
--- a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M3ASideR2ChamPos.xml
+++ b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M3ASideR2ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="660.000000*mm" sizeY="272.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
 
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="660.000000*mm" sizeY="272.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
 
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="660.000000*mm" sizeY="272.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
 
@@ -114,21 +114,21 @@
       </physvol>
       </logvol>
 
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
          <box name="Copper30mic" sizeX="660.000000*mm" sizeY="272.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
 
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="660.000000*mm" sizeY="272.800000*mm" sizeZ="1.600000*mm"/>
       </logvol>
 
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="660.000000*mm" sizeY="272.800000*mm" sizeZ="2.900000*mm"/>
       </logvol>
 
 
 
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="742.000000*mm" sizeY="355.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="660.000000*mm" sizeY="272.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M3ASideR3ChamPos.xml b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M3ASideR3ChamPos.xml
index e454c7fd5c2bcefc329625c9e1e17770580ca462..d20e9dc4928eee13905c3159adafc5a6848b8b8b 100644
--- a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M3ASideR3ChamPos.xml
+++ b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M3ASideR3ChamPos.xml
@@ -61,7 +61,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
 
@@ -74,7 +74,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
 
@@ -87,7 +87,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
 
@@ -115,21 +115,21 @@
       </physvol>
       </logvol>
 
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
          <box name="Copper30mic" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
 
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="0.800000*mm"/>
       </logvol>
 
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="3.700000*mm"/>
       </logvol>
 
 
 
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="1402.000000*mm" sizeY="355.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M3ASideR4ChamPos.xml b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M3ASideR4ChamPos.xml
index e5d756f6cf83b4810d01015cf4e22b1064b54728..6239c432e8bde2fe9e3dc70b99d9aea80940dcac 100644
--- a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M3ASideR4ChamPos.xml
+++ b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M3ASideR4ChamPos.xml
@@ -62,7 +62,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
 
@@ -75,7 +75,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
 
@@ -88,7 +88,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
 
@@ -116,21 +116,21 @@
       </physvol>
       </logvol>
 
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
          <box name="Copper30mic" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
 
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="0.800000*mm"/>
       </logvol>
 
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="3.700000*mm"/>
       </logvol>
 
 
 
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="1402.000000*mm" sizeY="355.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M4ASideR1ChamPos.xml b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M4ASideR1ChamPos.xml
index 73cb0a9584db893f2fc208896228bac973aab010..a061d194085e961a11519b29d83b50d5cd4c70e1 100644
--- a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M4ASideR1ChamPos.xml
+++ b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M4ASideR1ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="356.000000*mm" sizeY="292.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
 
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="356.000000*mm" sizeY="292.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
 
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="356.000000*mm" sizeY="292.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
 
@@ -114,21 +114,21 @@
       </physvol>
       </logvol>
 
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
          <box name="Copper30mic" sizeX="356.000000*mm" sizeY="292.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
 
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="356.000000*mm" sizeY="292.800000*mm" sizeZ="1.600000*mm"/>
       </logvol>
 
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="356.000000*mm" sizeY="292.800000*mm" sizeZ="2.900000*mm"/>
       </logvol>
 
 
 
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="438.000000*mm" sizeY="375.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="356.000000*mm" sizeY="292.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M4ASideR2ChamPos.xml b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M4ASideR2ChamPos.xml
index 71433ad10e7e4074bcb5007ee931b2a99f32073d..585aacfa1d39ff8f8050dbd33a2d4a8f5b60e01d 100644
--- a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M4ASideR2ChamPos.xml
+++ b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M4ASideR2ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="708.000000*mm" sizeY="292.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
 
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="708.000000*mm" sizeY="292.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
 
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="708.000000*mm" sizeY="292.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
 
@@ -114,21 +114,21 @@
       </physvol>
       </logvol>
 
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
          <box name="Copper30mic" sizeX="708.000000*mm" sizeY="292.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
 
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="708.000000*mm" sizeY="292.800000*mm" sizeZ="1.600000*mm"/>
       </logvol>
 
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="708.000000*mm" sizeY="292.800000*mm" sizeZ="2.900000*mm"/>
       </logvol>
 
 
 
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="790.000000*mm" sizeY="375.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="708.000000*mm" sizeY="292.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M4ASideR3ChamPos.xml b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M4ASideR3ChamPos.xml
index 08b3f9337ff07dce6919f06435eff81c1d64c720..162c8fcfeb5e7738859e494d3d8aa465c66f6be9 100644
--- a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M4ASideR3ChamPos.xml
+++ b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M4ASideR3ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
 
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
 
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
 
@@ -114,21 +114,21 @@
       </physvol>
       </logvol>
 
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
          <box name="Copper30mic" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
 
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="0.800000*mm"/>
       </logvol>
 
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="3.700000*mm"/>
       </logvol>
 
 
 
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="1498.000000*mm" sizeY="375.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M4ASideR4ChamPos.xml b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M4ASideR4ChamPos.xml
index 6d832505e56907dd8dd0211a034ee92a0484a39a..f3480b326d8fd72f4f6ff8e776392abcbcc50748 100644
--- a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M4ASideR4ChamPos.xml
+++ b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M4ASideR4ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
       
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
 
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
       
@@ -114,21 +114,21 @@
 	</physvol>
       </logvol>
       
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
         <box name="Copper30mic" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
       
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="0.800000*mm"/>
       </logvol>
       
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="3.700000*mm"/>
       </logvol>
       
 
       
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="1498.000000*mm" sizeY="375.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M5ASideR1ChamPos.xml b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M5ASideR1ChamPos.xml
index da26633373cfa1a92ffd3bb94940a49d8630f401..f76d4694ce4c3be3c9107248cab1576ba567e093 100644
--- a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M5ASideR1ChamPos.xml
+++ b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M5ASideR1ChamPos.xml
@@ -61,7 +61,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="380.000000*mm" sizeY="312.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
 
@@ -74,7 +74,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="380.000000*mm" sizeY="312.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
 
@@ -87,7 +87,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="380.000000*mm" sizeY="312.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
 
@@ -115,21 +115,21 @@
       </physvol>
       </logvol>
 
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
          <box name="Copper30mic" sizeX="380.000000*mm" sizeY="312.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
 
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="380.000000*mm" sizeY="312.800000*mm" sizeZ="1.600000*mm"/>
       </logvol>
 
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="380.000000*mm" sizeY="312.800000*mm" sizeZ="2.900000*mm"/>
       </logvol>
 
 
 
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="462.000000*mm" sizeY="395.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="380.000000*mm" sizeY="312.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M5ASideR2ChamPos.xml b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M5ASideR2ChamPos.xml
index 978f531624ec8a8a73636b23589e2de775568c61..0df79315555bedff43f46bd5dd47af03f6ff4473 100644
--- a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M5ASideR2ChamPos.xml
+++ b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M5ASideR2ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="756.000000*mm" sizeY="312.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
 
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="756.000000*mm" sizeY="312.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
 
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="756.000000*mm" sizeY="312.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
 
@@ -114,21 +114,21 @@
       </physvol>
       </logvol>
 
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
          <box name="Copper30mic" sizeX="756.000000*mm" sizeY="312.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
 
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="756.000000*mm" sizeY="312.800000*mm" sizeZ="1.600000*mm"/>
       </logvol>
 
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="756.000000*mm" sizeY="312.800000*mm" sizeZ="2.900000*mm"/>
       </logvol>
 
 
 
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="838.000000*mm" sizeY="395.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="756.000000*mm" sizeY="312.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M5ASideR3ChamPos.xml b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M5ASideR3ChamPos.xml
index 901581786996409cdfc3053da02158d44aaf492e..e15084fe2c458ea96600d793b08303f67a98473c 100644
--- a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M5ASideR3ChamPos.xml
+++ b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M5ASideR3ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
 
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
 
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
 
@@ -114,21 +114,21 @@
       </physvol>
       </logvol>
 
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
          <box name="Copper30mic" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
 
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="0.800000*mm"/>
       </logvol>
 
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="3.700000*mm"/>
       </logvol>
 
 
 
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="1594.000000*mm" sizeY="395.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M5ASideR4ChamPos.xml b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M5ASideR4ChamPos.xml
index a786c5193717e110a3f700a6b935a0e23652b98d..c633b51ce336c1a15551503261f8db2df07a89cb 100644
--- a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M5ASideR4ChamPos.xml
+++ b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/ASide/M5ASideR4ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
 
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
 
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
 
@@ -114,21 +114,21 @@
       </physvol>
       </logvol>
 
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
          <box name="Copper30mic" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
 
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="0.800000*mm"/>
       </logvol>
 
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="3.700000*mm"/>
       </logvol>
 
 
 
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="1594.000000*mm" sizeY="395.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M2CSideR1ChamPos.xml b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M2CSideR1ChamPos.xml
index ecc0cbae38473a7a393224c9c1752a404bdd0f61..6634be45a92aa4a97efdee5276bb41f18a636b3e 100644
--- a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M2CSideR1ChamPos.xml
+++ b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M2CSideR1ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="308.000000*mm" sizeY="252.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
 
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="308.000000*mm" sizeY="252.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
 
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="308.000000*mm" sizeY="252.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
       
@@ -114,21 +114,21 @@
 	</physvol>
       </logvol>
       
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
         <box name="Copper30mic" sizeX="308.000000*mm" sizeY="252.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
       
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="308.000000*mm" sizeY="252.800000*mm" sizeZ="1.600000*mm"/>
       </logvol>
       
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="308.000000*mm" sizeY="252.800000*mm" sizeZ="2.900000*mm"/>
       </logvol>
       
       
 
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="390.000000*mm" sizeY="335.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="308.000000*mm" sizeY="252.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M2CSideR2ChamPos.xml b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M2CSideR2ChamPos.xml
index 0e1d3726498fd333ab9fee57bc503d9e2c1c399a..ad2c2ec6bdb6d88740752ab68bd5d302bd5ab43d 100644
--- a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M2CSideR2ChamPos.xml
+++ b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M2CSideR2ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="612.000000*mm" sizeY="252.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
       
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="612.000000*mm" sizeY="252.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
 
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="612.000000*mm" sizeY="252.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
 
@@ -114,21 +114,21 @@
 	</physvol>
       </logvol>
       
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
         <box name="Copper30mic" sizeX="612.000000*mm" sizeY="252.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
 
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="612.000000*mm" sizeY="252.800000*mm" sizeZ="1.600000*mm"/>
       </logvol>
 
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="612.000000*mm" sizeY="252.800000*mm" sizeZ="2.900000*mm"/>
       </logvol>
 
 
 
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="694.000000*mm" sizeY="335.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="612.000000*mm" sizeY="252.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M2CSideR3ChamPos.xml b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M2CSideR3ChamPos.xml
index 11ca298e5064dfc3367cd05328789fd6c3d41d94..428eee9b4a0df2f921dde6c2257a2bc602d19147 100644
--- a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M2CSideR3ChamPos.xml
+++ b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M2CSideR3ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
       
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
 
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
 
@@ -114,21 +114,21 @@
 	</physvol>
       </logvol>
       
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
         <box name="Copper30mic" sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
 
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="0.800000*mm"/>
       </logvol>
 
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="3.700000*mm"/>
       </logvol>
 
 
 
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="1306.000000*mm" sizeY="335.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M2CSideR4ChamPos.xml b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M2CSideR4ChamPos.xml
index 4cc3fc22e415664bdeea784e090bf9a698317584..957f2576530131e9bd59f8dc1b3eb26e823807a7 100644
--- a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M2CSideR4ChamPos.xml
+++ b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M2CSideR4ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
 
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
       
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
       
@@ -114,21 +114,21 @@
 	</physvol>
       </logvol>
       
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
         <box name="Copper30mic" sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
       
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="0.800000*mm"/>
       </logvol>
       
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="3.700000*mm"/>
       </logvol>
       
       
       
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="1306.000000*mm" sizeY="335.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M3CSideR1ChamPos.xml b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M3CSideR1ChamPos.xml
index a5006edec45f25e4706a0049a243111dc8dfc094..7a33e8949fb6a8b8358fb69afeb7c7a2de3de70b 100644
--- a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M3CSideR1ChamPos.xml
+++ b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M3CSideR1ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="332.000000*mm" sizeY="272.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
       
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="332.000000*mm" sizeY="272.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
       
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="332.000000*mm" sizeY="272.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
       
@@ -114,21 +114,21 @@
 	</physvol>
       </logvol>
       
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
         <box name="Copper30mic" sizeX="332.000000*mm" sizeY="272.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
       
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="332.000000*mm" sizeY="272.800000*mm" sizeZ="1.600000*mm"/>
       </logvol>
       
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="332.000000*mm" sizeY="272.800000*mm" sizeZ="2.900000*mm"/>
       </logvol>
       
       
       
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="414.000000*mm" sizeY="355.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="332.000000*mm" sizeY="272.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M3CSideR2ChamPos.xml b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M3CSideR2ChamPos.xml
index b4902140297be941d4d659c268eb355485505eab..64d6f73c91a4be25c8b15b410a44ea7c6271a6f6 100644
--- a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M3CSideR2ChamPos.xml
+++ b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M3CSideR2ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="660.000000*mm" sizeY="272.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
       
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="660.000000*mm" sizeY="272.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
       
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="660.000000*mm" sizeY="272.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
       
@@ -114,21 +114,21 @@
 	</physvol>
       </logvol>
       
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
         <box name="Copper30mic" sizeX="660.000000*mm" sizeY="272.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
       
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="660.000000*mm" sizeY="272.800000*mm" sizeZ="1.600000*mm"/>
       </logvol>
       
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="660.000000*mm" sizeY="272.800000*mm" sizeZ="2.900000*mm"/>
       </logvol>
       
       
       
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="742.000000*mm" sizeY="355.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="660.000000*mm" sizeY="272.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M3CSideR3ChamPos.xml b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M3CSideR3ChamPos.xml
index a757ca330675ca8c5a5ba6e36fabfb7962618e0a..b838af6dcd36efdebe42e02ba07e7192641913ed 100644
--- a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M3CSideR3ChamPos.xml
+++ b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M3CSideR3ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
       
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
       
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
       
@@ -114,21 +114,21 @@
 	</physvol>
       </logvol>
       
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
         <box name="Copper30mic" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
       
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="0.800000*mm"/>
       </logvol>
       
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="3.700000*mm"/>
       </logvol>
       
 
       
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="1402.000000*mm" sizeY="355.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M3CSideR4ChamPos.xml b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M3CSideR4ChamPos.xml
index dbe10f3b7534523eb8a87f7f9e6aa348d3a8f711..e95ef0600013344033f318b00e6c9a3c888a3f33 100644
--- a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M3CSideR4ChamPos.xml
+++ b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M3CSideR4ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
       
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
       
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
       
@@ -114,21 +114,21 @@
 	</physvol>
       </logvol>
       
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
         <box name="Copper30mic" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
       
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="0.800000*mm"/>
       </logvol>
       
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="3.700000*mm"/>
       </logvol>
       
 
       
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="1402.000000*mm" sizeY="355.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M4CSideR1ChamPos.xml b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M4CSideR1ChamPos.xml
index 3fa9055222fa8aa7e4716cc579415534ff213145..0b7bdef38da88aff9e6c149cca17743914696bc2 100644
--- a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M4CSideR1ChamPos.xml
+++ b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M4CSideR1ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="356.000000*mm" sizeY="292.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
       
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="356.000000*mm" sizeY="292.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
       
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="356.000000*mm" sizeY="292.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
       
@@ -114,21 +114,21 @@
 	</physvol>
       </logvol>
       
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
         <box name="Copper30mic" sizeX="356.000000*mm" sizeY="292.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
       
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="356.000000*mm" sizeY="292.800000*mm" sizeZ="1.600000*mm"/>
       </logvol>
 
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="356.000000*mm" sizeY="292.800000*mm" sizeZ="2.900000*mm"/>
       </logvol>
       
       
 
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="438.000000*mm" sizeY="375.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="356.000000*mm" sizeY="292.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M4CSideR2ChamPos.xml b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M4CSideR2ChamPos.xml
index 71cb82aa75bf58bd0c6efa5030e243c9ceb5a898..57507410b906b6d66dfb96761d48ba355d2d1154 100644
--- a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M4CSideR2ChamPos.xml
+++ b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M4CSideR2ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="708.000000*mm" sizeY="292.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
 
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="708.000000*mm" sizeY="292.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
       
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="708.000000*mm" sizeY="292.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
       
@@ -114,21 +114,21 @@
 	</physvol>
       </logvol>
       
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
         <box name="Copper30mic" sizeX="708.000000*mm" sizeY="292.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
       
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="708.000000*mm" sizeY="292.800000*mm" sizeZ="1.600000*mm"/>
       </logvol>
       
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="708.000000*mm" sizeY="292.800000*mm" sizeZ="2.900000*mm"/>
       </logvol>
 
       
 
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="790.000000*mm" sizeY="375.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="708.000000*mm" sizeY="292.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M4CSideR3ChamPos.xml b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M4CSideR3ChamPos.xml
index f1349787b98a92c1b7b33a485dbf0ee20d05db77..78c36a1166cd13da7c530b1d5be7f6e8469f572d 100644
--- a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M4CSideR3ChamPos.xml
+++ b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M4CSideR3ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
       
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
 
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
 
@@ -114,21 +114,21 @@
 	</physvol>
       </logvol>
       
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
         <box name="Copper30mic" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
       
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="0.800000*mm"/>
       </logvol>
 
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="3.700000*mm"/>
       </logvol>
 
 
 
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="1498.000000*mm" sizeY="375.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M4CSideR4ChamPos.xml b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M4CSideR4ChamPos.xml
index d30cf2f556fa911af664086b2790993467a0ea4f..86934a91bb94a38572c6812ec0d073b11fac9313 100644
--- a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M4CSideR4ChamPos.xml
+++ b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M4CSideR4ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
       
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
       
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
       
@@ -114,21 +114,21 @@
 	</physvol>
       </logvol>
       
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
         <box name="Copper30mic" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
       
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="0.800000*mm"/>
       </logvol>
       
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="3.700000*mm"/>
       </logvol>
       
       
       
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="1498.000000*mm" sizeY="375.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M5CSideR1ChamPos.xml b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M5CSideR1ChamPos.xml
index 5520460afc0c85963cc0324aa900f29fa8b985fd..8fc169f5a30c4c8630f2d7a2d6c380b90157c832 100644
--- a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M5CSideR1ChamPos.xml
+++ b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M5CSideR1ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="380.000000*mm" sizeY="312.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
       
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="380.000000*mm" sizeY="312.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
       
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="380.000000*mm" sizeY="312.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
       
@@ -114,21 +114,21 @@
 	</physvol>
       </logvol>
       
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
         <box name="Copper30mic" sizeX="380.000000*mm" sizeY="312.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
       
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="380.000000*mm" sizeY="312.800000*mm" sizeZ="1.600000*mm"/>
       </logvol>
       
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="380.000000*mm" sizeY="312.800000*mm" sizeZ="2.900000*mm"/>
       </logvol>
       
 
       
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="462.000000*mm" sizeY="395.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="380.000000*mm" sizeY="312.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M5CSideR2ChamPos.xml b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M5CSideR2ChamPos.xml
index 163d0d7ac00465038fd5a35e1bf2b6489f6c1549..995ee16838e73c687e3ceefed9dd4f01b1249ad4 100644
--- a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M5CSideR2ChamPos.xml
+++ b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M5CSideR2ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="756.000000*mm" sizeY="312.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
       
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="756.000000*mm" sizeY="312.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
       
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="756.000000*mm" sizeY="312.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
       
@@ -114,21 +114,21 @@
 	</physvol>
       </logvol>
       
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
         <box name="Copper30mic" sizeX="756.000000*mm" sizeY="312.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
 
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="756.000000*mm" sizeY="312.800000*mm" sizeZ="1.600000*mm"/>
       </logvol>
       
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="756.000000*mm" sizeY="312.800000*mm" sizeZ="2.900000*mm"/>
       </logvol>
 
       
 
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="838.000000*mm" sizeY="395.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="756.000000*mm" sizeY="312.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M5CSideR3ChamPos.xml b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M5CSideR3ChamPos.xml
index 9cf204abe30821dbeee9660b3633868fe3995d63..c5c74fe8a7aa2fe24b12323db8c3ae68f4fd5e22 100644
--- a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M5CSideR3ChamPos.xml
+++ b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M5CSideR3ChamPos.xml
@@ -16,7 +16,7 @@
     <detector name="M5R3CSide" type="Muon_Region_v1_0" id="533" parent="M5CSide" vis="Muon:M5R3RegionVis" readout="Region">
 
       <!-- Chamber's parameters -->
-      <logvol name="lvM5R3Cham" material="Air">
+      <logvol name="lvM5R3Cham" material="Muon">
         <box name="ChamberBox" sizeX="1594.000000*mm" sizeY="395.000000*mm" sizeZ="67.000000*mm" />
         <physvol name="pvGap1" logvol="/dd/Geometry/DownstreamRegion/Muon/M5R3Cham/lvGasGap">
           <posXYZ x="0*mm" y="0*mm" z="21.090000*mm"/>
@@ -41,7 +41,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGap" material="Air">
+      <logvol name="lvGasGap" material="Muon">
         <box name="GasGapBox" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="14.06*mm" />
         <physvol name="pvGapLayer1" logvol="/dd/Geometry/DownstreamRegion/Muon/M5R3Cham/lvGasGapLayer1">
           <posXYZ x="0*mm" y="0*mm" z="5.180000*mm"/>
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
       
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
       
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
       
@@ -114,21 +114,21 @@
 	</physvol>
       </logvol>
       
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
         <box name="Copper30mic" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
       
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="0.800000*mm"/>
       </logvol>
       
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="3.700000*mm"/>
       </logvol>
       
 
 
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="1594.000000*mm" sizeY="395.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M5CSideR4ChamPos.xml b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M5CSideR4ChamPos.xml
index 86c0991260e573a6dc2511b1f308a9259625a3cc..4bd8acb3fb761755c062825f6333bce971eeac49 100644
--- a/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M5CSideR4ChamPos.xml
+++ b/compact/before-rich1-geom-update-26052022/Muon/Muon/Regions/CSide/M5CSideR4ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
       
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
       
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
       
@@ -114,21 +114,21 @@
 	</physvol>
       </logvol>
       
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
         <box name="Copper30mic" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
       
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="0.800000*mm"/>
       </logvol>
       
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="3.700000*mm"/>
       </logvol>
       
 
       
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="1594.000000*mm" sizeY="395.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/before-rich1-geom-update-26052022/Muon/Muon/Supports/M2ASideSupports.xml b/compact/before-rich1-geom-update-26052022/Muon/Muon/Supports/M2ASideSupports.xml
index 6eb4371a8c31ac6a5e7147939372ab481f04b586..92ce8b9cdeaa941c4084da711e105be6ce52fb85 100644
--- a/compact/before-rich1-geom-update-26052022/Muon/Muon/Supports/M2ASideSupports.xml
+++ b/compact/before-rich1-geom-update-26052022/Muon/Muon/Supports/M2ASideSupports.xml
@@ -32,7 +32,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvM2SupportPanel" material="Aluminium">
+      <logvol name="lvM2SupportPanel" material="Aluminum">
         <subtraction name="M2Panel">
           <box name="M2PanelOuter"  sizeX="M2SideXOuterSize"      sizeY="M2SideYOuterSize" sizeZ="1.5*mm"/>
           <box name="M2PanelInner"  sizeX="M2SideXInnerSize+2*mm" sizeY="M2SideYInnerSize" sizeZ="2*mm" />
diff --git a/compact/before-rich1-geom-update-26052022/Muon/Muon/Supports/M2CSideSupports.xml b/compact/before-rich1-geom-update-26052022/Muon/Muon/Supports/M2CSideSupports.xml
index b66a69650ed8a779fd6770cae296837552559865..b1c42f9d5bc3483d88f372d76b991c6be7164bdc 100644
--- a/compact/before-rich1-geom-update-26052022/Muon/Muon/Supports/M2CSideSupports.xml
+++ b/compact/before-rich1-geom-update-26052022/Muon/Muon/Supports/M2CSideSupports.xml
@@ -33,7 +33,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvM2SupportPanel" material="Aluminium">
+      <logvol name="lvM2SupportPanel" material="Aluminum">
         <subtraction name="M2Panel">
           <box name="M2PanelOuter" sizeX="M2SideXOuterSize"      sizeY="M2SideYOuterSize" sizeZ="1.5*mm"/>
           <box name="M2PanelInner" sizeX="M2SideXInnerSize+2*mm" sizeY="M2SideYInnerSize" sizeZ="2*mm" />
diff --git a/compact/before-rich1-geom-update-26052022/Muon/Muon/Supports/M3ASideSupports.xml b/compact/before-rich1-geom-update-26052022/Muon/Muon/Supports/M3ASideSupports.xml
index 1d1102793635eed9bba4af149542de849c0b1090..f90c8522feeb89b38dfa5b388291367359a8cf11 100644
--- a/compact/before-rich1-geom-update-26052022/Muon/Muon/Supports/M3ASideSupports.xml
+++ b/compact/before-rich1-geom-update-26052022/Muon/Muon/Supports/M3ASideSupports.xml
@@ -32,7 +32,7 @@
 	</physvol>
       </logvol>
 
-      <logvol name="lvM3SupportPanel" material="Aluminium">
+      <logvol name="lvM3SupportPanel" material="Aluminum">
 	<subtraction name="M3Panel">
 	  <box name="M3PanelOuter"  sizeX="M3SideXOuterSize" sizeY="M3SideYOuterSize" sizeZ="1.5*mm"/>
 	  <box name="M3PanelInner"  sizeX="M3SideXInnerSize" sizeY="M3SideYInnerSize" sizeZ="2*mm" />
diff --git a/compact/before-rich1-geom-update-26052022/Muon/Muon/Supports/M3CSideSupports.xml b/compact/before-rich1-geom-update-26052022/Muon/Muon/Supports/M3CSideSupports.xml
index 5b6390b5636942394cce35e4c0dc40783984a42c..508300659888c916cd27a12adf5feead32dc1266 100644
--- a/compact/before-rich1-geom-update-26052022/Muon/Muon/Supports/M3CSideSupports.xml
+++ b/compact/before-rich1-geom-update-26052022/Muon/Muon/Supports/M3CSideSupports.xml
@@ -33,7 +33,7 @@
 	</physvol>
       </logvol>
 
-      <logvol name="lvM3SupportPanel" material="Aluminium">
+      <logvol name="lvM3SupportPanel" material="Aluminum">
 	<subtraction name="M3Panel">
 	  <box name="M3PanelOuter"  sizeX="M3SideXOuterSize" sizeY="M3SideYOuterSize" sizeZ="1.5*mm"/>
 	  <box name="M3PanelInner"  sizeX="M3SideXInnerSize" sizeY="M3SideYInnerSize" sizeZ="2*mm" />
diff --git a/compact/before-rich1-geom-update-26052022/Muon/Muon/Supports/M4ASideSupports.xml b/compact/before-rich1-geom-update-26052022/Muon/Muon/Supports/M4ASideSupports.xml
index ba754a29db9fd652bb551b6026d9ee5204d67c37..b706932d8729e40a2994570d5c2a102dff6948b7 100644
--- a/compact/before-rich1-geom-update-26052022/Muon/Muon/Supports/M4ASideSupports.xml
+++ b/compact/before-rich1-geom-update-26052022/Muon/Muon/Supports/M4ASideSupports.xml
@@ -32,7 +32,7 @@
 	</physvol>
       </logvol>
 
-      <logvol name="lvM4SupportPanel" material="Aluminium">
+      <logvol name="lvM4SupportPanel" material="Aluminum">
 	<subtraction name="M4Panel">
 	  <box name="M4PanelOuter"  sizeX="M4SideXOuterSize" sizeY="M4SideYOuterSize" sizeZ="1.5*mm"/>
 	  <box name="M4PanelInner"  sizeX="M4SideXInnerSize" sizeY="M4SideYInnerSize" sizeZ="2*mm" />
diff --git a/compact/before-rich1-geom-update-26052022/Muon/Muon/Supports/M4CSideSupports.xml b/compact/before-rich1-geom-update-26052022/Muon/Muon/Supports/M4CSideSupports.xml
index 2d8588174f26bcd8d3c9427e5852aada42a40369..f704c545c00c9c9b5b8ebc8ad91a93ec73a5b648 100644
--- a/compact/before-rich1-geom-update-26052022/Muon/Muon/Supports/M4CSideSupports.xml
+++ b/compact/before-rich1-geom-update-26052022/Muon/Muon/Supports/M4CSideSupports.xml
@@ -33,7 +33,7 @@
 	</physvol>
       </logvol>
 
-      <logvol name="lvM4SupportPanel" material="Aluminium">
+      <logvol name="lvM4SupportPanel" material="Aluminum">
 	<subtraction name="M4Panel">
 	  <box name="M4PanelOuter"  sizeX="M4SideXOuterSize" sizeY="M4SideYOuterSize" sizeZ="1.5*mm"/>
 	  <box name="M4PanelInner"  sizeX="M4SideXInnerSize" sizeY="M4SideYInnerSize" sizeZ="2*mm" />
diff --git a/compact/before-rich1-geom-update-26052022/Muon/Muon/Supports/M5ASideSupports.xml b/compact/before-rich1-geom-update-26052022/Muon/Muon/Supports/M5ASideSupports.xml
index 3c32ce64d54402d03e79229716a500adacd2be56..70ff1e273c71206e993551f24ffc0cc102165165 100644
--- a/compact/before-rich1-geom-update-26052022/Muon/Muon/Supports/M5ASideSupports.xml
+++ b/compact/before-rich1-geom-update-26052022/Muon/Muon/Supports/M5ASideSupports.xml
@@ -32,7 +32,7 @@
 	</physvol>
       </logvol>
 
-      <logvol name="lvM5SupportPanel" material="Aluminium">
+      <logvol name="lvM5SupportPanel" material="Aluminum">
 	<subtraction name="M5Panel">
 	  <box name="M5PanelOuter"  sizeX="M5SideXOuterSize" sizeY="M5SideYOuterSize" sizeZ="1.5*mm"/>
 	  <box name="M5PanelInner"  sizeX="M5SideXInnerSize" sizeY="M5SideYInnerSize" sizeZ="2*mm" />
diff --git a/compact/before-rich1-geom-update-26052022/Muon/Muon/Supports/M5CSideSupports.xml b/compact/before-rich1-geom-update-26052022/Muon/Muon/Supports/M5CSideSupports.xml
index ae0d5f6b39cee66ff45c34c0bb7977873f3f0962..203f4089f4410af8e47cd8ad33a4c92a321bdbfe 100644
--- a/compact/before-rich1-geom-update-26052022/Muon/Muon/Supports/M5CSideSupports.xml
+++ b/compact/before-rich1-geom-update-26052022/Muon/Muon/Supports/M5CSideSupports.xml
@@ -33,7 +33,7 @@
 	</physvol>
       </logvol>
 
-      <logvol name="lvM5SupportPanel" material="Aluminium">
+      <logvol name="lvM5SupportPanel" material="Aluminum">
 	<subtraction name="M5Panel">
 	  <box name="M5PanelOuter"  sizeX="M5SideXOuterSize" sizeY="M5SideYOuterSize" sizeZ="1.5*mm"/>
 	  <box name="M5PanelInner"  sizeX="M5SideXInnerSize" sizeY="M5SideYInnerSize" sizeZ="2*mm" />
diff --git a/compact/before-rich1-geom-update-26052022/Muon/detector.xml b/compact/before-rich1-geom-update-26052022/Muon/detector.xml
index 7ebc5626660a0b27218fc9ad85be460bc67680ed..d86bb6bd7ac3ef217ec7d9aaeb1f959a37327667 100644
--- a/compact/before-rich1-geom-update-26052022/Muon/detector.xml
+++ b/compact/before-rich1-geom-update-26052022/Muon/detector.xml
@@ -19,7 +19,8 @@
 
 
   <includes>
-    <gdmlFile ref="Muon/Materials/Elements.xml"/>
+    <gdmlFile ref="../DDDetectors/compact/materials.xml"/>
+    <gdmlFile ref="../DDDetectors/compact/elements.xml"/>
     <gdmlFile ref="Muon/Materials/MuonMaterials.xml"/>
     <gdmlFile ref="MuonParameters.xml"/>
     <gdmlFile ref="VisAttributes.xml"/>
diff --git a/compact/before-rich1-geom-update-26052022/Muon/fakematerials.xml b/compact/before-rich1-geom-update-26052022/Muon/fakematerials.xml
deleted file mode 100644
index 3767cad4bb32c99bbc902286d72f444714ecd282..0000000000000000000000000000000000000000
--- a/compact/before-rich1-geom-update-26052022/Muon/fakematerials.xml
+++ /dev/null
@@ -1,473 +0,0 @@
-<materials>
-<!--
-    (c) Copyright 2020 CERN for the benefit of the LHCb Collaboration
-
-    This software is distributed under the terms of the GNU General Public
-    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
-
-    In applying this licence, CERN does not waive the privileges and immunities
-    granted to it by virtue of its status as an Intergovernmental Organization
-    or submit itself to any jurisdiction.
--->
-
-<!-- nonsensical test materials -->
-
-    <material density="2.5*g/cm3" name="Concrete" state="solid">
-      <component fractionmass="0.520" name="Oxygen"  />
-      <component fractionmass="0.325" name="Silicon"  />
-      <component fractionmass="0.060" name="Calcium"  />
-      <component fractionmass="0.015" name="Sodium"  />
-      <component fractionmass="0.020" name="Iron"  />
-      <component fractionmass="0.040" name="Aluminium"  />
-    </material>
-
-    <material density="7.8*g/cm3" name="Steel" state="solid">
-      <component fractionmass="0.7" name="Iron"  />
-      <component fractionmass="0.1" name="Carbon"/>
-      <component fractionmass="0.2" name="Copper"/>
-    </material>
-
-    <material name="MuonFilterIron" state="solid">
-      <component fractionmass="0.9851" name="Iron"/>
-      <component fractionmass="0.005" name="Carbon"/>
-      <component fractionmass="0.009" name="Manganese"/>
-      <component fractionmass="0.0004" name="Phosphor"/>
-      <component fractionmass="0.0005" name="Sulfur"/>
-      <D unit="g/cm3" value="7.5"/>
-    </material>
-
-    <material name="MuonCopper" state="solid">
-      <component fractionmass="1.0" name="Copper"/>
-      <D unit="g/cm3" value="8.96"/>
-      <fraction n="1.0" ref="Copper"/>
-    </material>
-
-
-    <material name="G10" state="solid">
-      <component fractionmass="1.0" name="Copper"/>
-      <D unit="g/cm3" value="8.96"/>
-      <fraction n="1.0" ref="Copper"/>
-    </material>
-
-    <material name="MuonPolyurethane" state="solid">
-      <component fractionmass="1.0" name="Copper"/>
-      <D unit="g/cm3" value="8.96"/>
-      <fraction n="1.0" ref="Copper"/>
-    </material>
-
-    <material name="G10Air" state="solid">
-      <component fractionmass="1.0" name="Copper"/>
-      <D unit="g/cm3" value="8.96"/>
-      <fraction n="1.0" ref="Copper"/>
-    </material>
-
-    <material name="S_CPC_gas" state="gas">
-      <D unit="g/cm3" value="0.00120479"/>
-      <fraction n="1" ref="N"/>
-    </material>
-
-    
-    <material name="G4_AIR" state="gas">
-      <MEE unit="eV" value="85.7"/>
-      <D unit="g/cm3" value="0.00120479"/>
-      <fraction n="0.000124000124000124" ref="C"/>
-      <fraction n="0.755267755267755" ref="N"/>
-      <fraction n="0.231781231781232" ref="O"/>
-      <fraction n="0.0128270128270128" ref="Ar"/>
-    </material>
-
-    <material name="Vacuum" state="gas">
-      <D unit="g/cm3" value="0.00000000001"/>
-      <fraction n="1" ref="G4_AIR"/>
-    </material>
-
-
-
-
-
-    <material name="G4_KAPTON" state="solid">
-      <MEE unit="eV" value="79.6"/>
-      <D unit="g/cm3" value="1.42"/>
-      <fraction n="0.026362" ref="H"/>
-      <fraction n="0.691133" ref="C"/>
-      <fraction n="0.07327" ref="N"/>
-      <fraction n="0.209235" ref="O"/>
-    </material>
-    <isotope N="28" Z="14" name="Si28">
-      <atom unit="g/mole" value="27.9769"/>
-    </isotope>
-    <isotope N="29" Z="14" name="Si29">
-      <atom unit="g/mole" value="28.9765"/>
-    </isotope>
-    <isotope N="30" Z="14" name="Si30">
-      <atom unit="g/mole" value="29.9738"/>
-    </isotope>
-    <element name="Si">
-      <fraction n="0.922296077703922" ref="Si28"/>
-      <fraction n="0.0468319531680468" ref="Si29"/>
-      <fraction n="0.0308719691280309" ref="Si30"/>
-    </element>
-    <material name="SiC_foam" state="solid">
-      <MEE unit="eV" value="137.77733431141"/>
-      <D unit="g/cm3" value="0.19"/>
-      <fraction n="0.299548759813591" ref="C"/>
-      <fraction n="0.700451240186409" ref="Si"/>
-    </material>
-    <material Z="13" name="G4_Al" state="solid">
-      <MEE unit="eV" value="166"/>
-      <D unit="g/cm3" value="2.699"/>
-      <atom unit="g/mole" value="26.9815"/>
-      <fraction n="1" ref="Al"/>
-    </material>
-    <material name="G4_Si" state="solid">
-      <MEE unit="eV" value="173"/>
-      <D unit="g/cm3" value="2.33"/>
-      <fraction n="1" ref="Si"/>
-    </material>
-    <isotope N="63" Z="29" name="Cu63">
-      <atom unit="g/mole" value="62.9296"/>
-    </isotope>
-    <isotope N="65" Z="29" name="Cu65">
-      <atom unit="g/mole" value="64.9278"/>
-    </isotope>
-    <element name="Cu">
-      <fraction n="0.6917" ref="Cu63"/>
-      <fraction n="0.3083" ref="Cu65"/>
-    </element>
-    <material name="G4_Cu" state="solid">
-      <MEE unit="eV" value="322"/>
-      <D unit="g/cm3" value="8.96"/>
-      <fraction n="1" ref="Cu"/>
-    </material>
-    <material Z="4" name="G4_Be" state="solid">
-      <MEE unit="eV" value="63.7"/>
-      <D unit="g/cm3" value="1.848"/>
-      <atom unit="g/mole" value="9.01218"/>
-      <fraction n="1" ref="Be"/>
-    </material>
-    <material name="G4_Ti" state="solid">
-      <MEE unit="eV" value="233"/>
-      <D unit="g/cm3" value="4.54"/>
-      <fraction n="1" ref="Ti"/>
-    </material>
-    <material name="styropor" state="solid">
-      <MEE unit="eV" value="65.9436601819466"/>
-      <D unit="g/cm3" value="0.025"/>
-      <fraction n="0.922577329294378" ref="C"/>
-      <fraction n="0.0774226707056217" ref="H"/>
-    </material>
-    <material name="GroundOrHVMix" state="solid">
-      <MEE unit="eV" value="259.806022507979"/>
-      <D unit="g/cm3" value="5.19"/>
-      <fraction n="0.00360636223506744" ref="H"/>
-      <fraction n="0.0945480597302505" ref="C"/>
-      <fraction n="0.0100234489402697" ref="N"/>
-      <fraction n="0.0286236705202312" ref="O"/>
-      <fraction n="0.863198458574181" ref="Cu"/>
-    </material>
-    <isotope N="35" Z="17" name="Cl35">
-      <atom unit="g/mole" value="34.9689"/>
-    </isotope>
-    <isotope N="37" Z="17" name="Cl37">
-      <atom unit="g/mole" value="36.9659"/>
-    </isotope>
-    <element name="Cl">
-      <fraction n="0.7578" ref="Cl35"/>
-      <fraction n="0.2422" ref="Cl37"/>
-    </element>
-    <material name="siPCBMix" state="solid">
-      <MEE unit="eV" value="262.475002085268"/>
-      <D unit="g/cm3" value="5.05076923076923"/>
-      <fraction n="0.014498933901919" ref="Cl"/>
-      <fraction n="0.083477099995865" ref="O"/>
-      <fraction n="0.0654857498400853" ref="Si"/>
-      <fraction n="0.00351122019083304" ref="H"/>
-      <fraction n="0.0142636698452849" ref="C"/>
-      <fraction n="0.818763326226013" ref="Cu"/>
-    </material>
-    <isotope N="36" Z="18" name="Ar36">
-      <atom unit="g/mole" value="35.9675"/>
-    </isotope>
-    <isotope N="38" Z="18" name="Ar38">
-      <atom unit="g/mole" value="37.9627"/>
-    </isotope>
-    <isotope N="40" Z="18" name="Ar40">
-      <atom unit="g/mole" value="39.9624"/>
-    </isotope>
-    <element name="Ar">
-      <fraction n="0.003365" ref="Ar36"/>
-      <fraction n="0.000632" ref="Ar38"/>
-      <fraction n="0.996003" ref="Ar40"/>
-    </element>
-    <material name="G4_AIR" state="gas">
-      <MEE unit="eV" value="85.7"/>
-      <D unit="g/cm3" value="0.00120479"/>
-      <fraction n="0.000124000124000124" ref="C"/>
-      <fraction n="0.755267755267755" ref="N"/>
-      <fraction n="0.231781231781232" ref="O"/>
-      <fraction n="0.0128270128270128" ref="Ar"/>
-    </material>
-    <material name="Vacuum" state="gas">
-      <D unit="g/cm3" value="0.00000000001"/>
-      <fraction n="1" ref="G4_AIR"/>
-    </material>
-    <material name="Air" state="gas">
-      <D unit="g/cm3" value="0.00120479"/>
-      <fraction n="1" ref="G4_AIR"/>
-    </material>
-    <isotope N="180" Z="74" name="W180">
-      <atom unit="g/mole" value="179.947"/>
-    </isotope>
-    <isotope N="182" Z="74" name="W182">
-      <atom unit="g/mole" value="181.948"/>
-    </isotope>
-    <isotope N="183" Z="74" name="W183">
-      <atom unit="g/mole" value="182.95"/>
-    </isotope>
-    <isotope N="184" Z="74" name="W184">
-      <atom unit="g/mole" value="183.951"/>
-    </isotope>
-    <isotope N="186" Z="74" name="W186">
-      <atom unit="g/mole" value="185.954"/>
-    </isotope>
-    <element name="W">
-      <fraction n="0.0012" ref="W180"/>
-      <fraction n="0.265" ref="W182"/>
-      <fraction n="0.1431" ref="W183"/>
-      <fraction n="0.3064" ref="W184"/>
-      <fraction n="0.2843" ref="W186"/>
-    </element>
-    <material name="G4_W" state="solid">
-      <MEE unit="eV" value="727"/>
-      <D unit="g/cm3" value="19.3"/>
-      <fraction n="1" ref="W"/>
-    </material>
-    <material name="g10" state="solid">
-      <MEE unit="eV" value="114.378463512112"/>
-      <D unit="g/cm3" value="1.7"/>
-      <fraction n="0.08" ref="Cl"/>
-      <fraction n="0.460597175271302" ref="O"/>
-      <fraction n="0.361327255" ref="Si"/>
-      <fraction n="0.0193736737588317" ref="H"/>
-      <fraction n="0.078701895969866" ref="C"/>
-    </material>
-    <isotope N="54" Z="26" name="Fe54">
-      <atom unit="g/mole" value="53.9396"/>
-    </isotope>
-    <isotope N="56" Z="26" name="Fe56">
-      <atom unit="g/mole" value="55.9349"/>
-    </isotope>
-    <isotope N="57" Z="26" name="Fe57">
-      <atom unit="g/mole" value="56.9354"/>
-    </isotope>
-    <isotope N="58" Z="26" name="Fe58">
-      <atom unit="g/mole" value="57.9333"/>
-    </isotope>
-    <element name="Fe">
-      <fraction n="0.05845" ref="Fe54"/>
-      <fraction n="0.91754" ref="Fe56"/>
-      <fraction n="0.02119" ref="Fe57"/>
-      <fraction n="0.00282" ref="Fe58"/>
-    </element>
-    <isotope N="50" Z="24" name="Cr50">
-      <atom unit="g/mole" value="49.946"/>
-    </isotope>
-    <isotope N="52" Z="24" name="Cr52">
-      <atom unit="g/mole" value="51.9405"/>
-    </isotope>
-    <isotope N="53" Z="24" name="Cr53">
-      <atom unit="g/mole" value="52.9407"/>
-    </isotope>
-    <isotope N="54" Z="24" name="Cr54">
-      <atom unit="g/mole" value="53.9389"/>
-    </isotope>
-    <element name="Cr">
-      <fraction n="0.04345" ref="Cr50"/>
-      <fraction n="0.83789" ref="Cr52"/>
-      <fraction n="0.09501" ref="Cr53"/>
-      <fraction n="0.02365" ref="Cr54"/>
-    </element>
-    <isotope N="58" Z="28" name="Ni58">
-      <atom unit="g/mole" value="57.9353"/>
-    </isotope>
-    <isotope N="60" Z="28" name="Ni60">
-      <atom unit="g/mole" value="59.9308"/>
-    </isotope>
-    <isotope N="61" Z="28" name="Ni61">
-      <atom unit="g/mole" value="60.9311"/>
-    </isotope>
-    <isotope N="62" Z="28" name="Ni62">
-      <atom unit="g/mole" value="61.9283"/>
-    </isotope>
-    <isotope N="64" Z="28" name="Ni64">
-      <atom unit="g/mole" value="63.928"/>
-    </isotope>
-    <element name="Ni">
-      <fraction n="0.680769" ref="Ni58"/>
-      <fraction n="0.262231" ref="Ni60"/>
-      <fraction n="0.011399" ref="Ni61"/>
-      <fraction n="0.036345" ref="Ni62"/>
-      <fraction n="0.009256" ref="Ni64"/>
-    </element>
-    <material name="stainless_steel" state="solid">
-      <MEE unit="eV" value="282.929693036223"/>
-      <D unit="g/cm3" value="7.87"/>
-      <fraction n="0.70611" ref="Fe"/>
-      <fraction n="0.18784" ref="Cr"/>
-      <fraction n="0.10605" ref="Ni"/>
-    </material>
-    <material name="fanele2" state="solid">
-      <MEE unit="eV" value="75.3984269235952"/>
-      <D unit="g/cm3" value="2.04"/>
-      <fraction n="0.0814736540216391" ref="H"/>
-      <fraction n="0.543350389498575" ref="C"/>
-      <fraction n="0.257623229207059" ref="O"/>
-      <fraction n="0.0266436363636364" ref="N"/>
-      <fraction n="0.0909090909090909" ref="Cu"/>
-    </material>
-    <material name="fanele1" state="solid">
-      <MEE unit="eV" value="83.6887639821308"/>
-      <D unit="g/cm3" value="2.61666666666667"/>
-      <fraction n="0.0746841828531692" ref="H"/>
-      <fraction n="0.498071190373694" ref="C"/>
-      <fraction n="0.236154626773137" ref="O"/>
-      <fraction n="0.0244233333333333" ref="N"/>
-      <fraction n="0.166666666666667" ref="Cu"/>
-    </material>
-    <material name="G4_POLYSTYRENE" state="solid">
-      <MEE unit="eV" value="68.7"/>
-      <D unit="g/cm3" value="1.06"/>
-      <fraction n="0.077418" ref="H"/>
-      <fraction n="0.922582" ref="C"/>
-    </material>
-    <isotope N="79" Z="35" name="Br79">
-      <atom unit="g/mole" value="78.9183"/>
-    </isotope>
-    <isotope N="81" Z="35" name="Br81">
-      <atom unit="g/mole" value="80.9163"/>
-    </isotope>
-    <element name="Br">
-      <fraction n="0.5069" ref="Br79"/>
-      <fraction n="0.4931" ref="Br81"/>
-    </element>
-    <material name="PCB" state="solid">
-      <MEE unit="eV" value="88.255598548367"/>
-      <D unit="g/cm3" value="1.7"/>
-      <fraction n="0.180774" ref="Si"/>
-      <fraction n="0.405633" ref="O"/>
-      <fraction n="0.278042" ref="C"/>
-      <fraction n="0.0684428" ref="H"/>
-      <fraction n="0.0671091" ref="Br"/>
-    </material>
-    <material name="G4_Fe" state="solid">
-      <MEE unit="eV" value="286"/>
-      <D unit="g/cm3" value="7.874"/>
-      <fraction n="1" ref="Fe"/>
-    </material>
-    <material name="beam" state="gas">
-      <P unit="pascal" value="6.25e-06"/>
-      <MEE unit="eV" value="38.5760755714278"/>
-      <D unit="g/cm3" value="1.7e-14"/>
-      <fraction n="0.36264" ref="H"/>
-      <fraction n="0.36276" ref="N"/>
-      <fraction n="0.117748421296248" ref="C"/>
-      <fraction n="0.156851578703752" ref="O"/>
-    </material>
-    <material name="TDR_gas" state="gas">
-      <MEE unit="eV" value="177.374841770826"/>
-      <D unit="g/cm3" value="0.001731"/>
-      <fraction n="0.95667" ref="Ar"/>
-      <fraction n="0.00519198196" ref="H"/>
-      <fraction n="0.02165502376" ref="C"/>
-      <fraction n="0.01648299428" ref="O"/>
-    </material>
-    <material name="epoxy" state="solid">
-      <MEE unit="eV" value="60.8292941662115"/>
-      <D unit="g/cm3" value="1.3"/>
-      <fraction n="0.131793699039672" ref="H"/>
-      <fraction n="0.535387047414054" ref="C"/>
-      <fraction n="0.332819253546274" ref="O"/>
-    </material>
-    <material name="G4_C" state="solid">
-      <MEE unit="eV" value="81"/>
-      <D unit="g/cm3" value="2"/>
-      <fraction n="1" ref="C"/>
-    </material>
-    <isotope N="27" Z="13" name="Al27">
-      <atom unit="g/mole" value="26.9815"/>
-    </isotope>
-    <element name="Al">
-      <fraction n="1" ref="Al27"/>
-    </element>
-    <material name="TPC_endplate_mix" state="solid">
-      <MEE unit="eV" value="97.0754229107761"/>
-      <D unit="g/cm3" value="0.5827515446"/>
-      <fraction n="0.00953598760814401" ref="C"/>
-      <fraction n="0.558898138898139" ref="N"/>
-      <fraction n="0.226789772550668" ref="O"/>
-      <fraction n="0.00949198949198949" ref="Ar"/>
-      <fraction n="0.14" ref="Al"/>
-      <fraction n="0.0096" ref="Cl"/>
-      <fraction n="0.0433592706" ref="Si"/>
-      <fraction n="0.00232484085105981" ref="H"/>
-    </material>
-    <material name="CarbonFiber" state="solid">
-      <MEE unit="eV" value="70.7270877537631"/>
-      <D unit="g/cm3" value="1.46666666666667"/> 
-      <!-- debug <D unit="g/cm3" value="1.4*1.46666666666667"/> -->
-      <fraction n="0.794091986922138" ref="C"/>
-      <fraction n="0.058408571165309" ref="H"/>
-      <fraction n="0.147499441912553" ref="O"/>
-    </material>
-    <material name="G4_GRAPHITE" state="solid">
-      <MEE unit="eV" value="78"/>
-      <D unit="g/cm3" value="2.21"/>
-      <fraction n="1" ref="C"/>
-    </material>
-    <material name="diamond" state="solid">
-      <MEE unit="eV" value="81"/>
-      <D unit="g/cm3" value="3.51"/>
-      <fraction n="1" ref="C"/>
-    </material>
-    <material Z="79" name="G4_Au" state="solid">
-      <MEE unit="eV" value="790"/>
-      <D unit="g/cm3" value="19.32"/>
-      <atom unit="g/mole" value="196.967"/>
-    </material>
-    <material name="G4_POLYETHYLENE" state="solid">
-      <MEE unit="eV" value="57.4"/>
-      <D unit="g/cm3" value="0.94"/>
-      <fraction n="0.143711" ref="H"/>
-      <fraction n="0.856289" ref="C"/>
-    </material>
-    <isotope N="55" Z="25" name="Mn55">
-      <atom unit="g/mole" value="54.938"/>
-    </isotope>
-    <element name="Mn">
-      <fraction n="1" ref="Mn55"/>
-    </element>
-    <material name="Steel235" state="solid">
-      <MEE unit="eV" value="285.146562707739"/>
-      <D unit="g/cm3" value="7.87"/>
-      <fraction n="0.9843" ref="Fe"/>
-      <fraction n="0.0017" ref="C"/>
-      <fraction n="0.014" ref="Mn"/>
-    </material>
-
-    <comment> materials introduced for the BeamCal</comment>
-    <material name="TungstenDens24">
-      <D value="17.8" unit="g/cm3"/>
-      <fraction n="0.93" ref="W"/>
-      <fraction n="0.061" ref="Ni"/>
-      <fraction n="0.009" ref="Fe"/>
-    </material>
-
-    <material name="Kapton">
-      <D value="1.43" unit="g/cm3" />
-      <composite n="22" ref="C"/>
-      <composite n="10" ref="H" />
-      <composite n="2" ref="N" />
-      <composite n="5" ref="O" />
-    </material>
-
-  </materials>
diff --git a/compact/before-rich1-geom-update-26052022/Muon/materials.xml b/compact/before-rich1-geom-update-26052022/Muon/materials.xml
deleted file mode 100644
index 77499dcd060f3b1f5676bdbae32b7426e20aa479..0000000000000000000000000000000000000000
--- a/compact/before-rich1-geom-update-26052022/Muon/materials.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-    (c) Copyright 2021 CERN for the benefit of the LHCb Collaboration
-
-    This software is distributed under the terms of the GNU General Public
-    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
-
-    In applying this licence, CERN does not waive the privileges and immunities
-    granted to it by virtue of its status as an Intergovernmental Organization
-    or submit itself to any jurisdiction.
--->
-<materials>
-
-  <catalog name="Muon">
-    <!-- %%%%%%         epoxy           %%%%%%%% -->
-    <material density="1.3*g/cm3" name="Epoxy" state="solid">
-      <component name="Carbon" natoms="15"/>
-      <component name="Hydrogen" natoms="44"/>
-      <component name="Oxygen" natoms="7"/>
-    </material>
-    <!-- %%%%%%         G10             %%%%%%%% -->
-    <material density="1.7*g/cm3" name="G10" state="solid">
-      <component name="SiO2" natoms="0.853"/>
-      <component name="Muon/Epoxy" natoms="0.147"/>
-    </material>
-    <!-- %%%%%% G10 0.8mm planels with 50micron Cu cladding
-                total thickness is 0.9 mm %%%%%%%% -->
-    <material density="1.7*g/cm3" name="G10CuClad" state="solid">
-      <component name="Muon/G10" fractionmass="0.60"/>
-      <component name="Copper" fractionmass="0.40"/>
-    </material>
-    <!-- %%%%%% G10/Air mix for chamber surrounds %%%%%%%% -->
-    <material density="0.76*g/cm3" name="G10Air" state="solid">
-      <component name="Muon/G10" natoms="0.55"/>
-      <component name="Air" natoms="0.45"/>
-    </material>
-    <!-- %%%%%%              Honeycomb                 %%%%%% -->
-    <material density="0.00628*g/cm3" name="Honeycomb" state="solid">
-      <component name="Air" natoms="0.97"/>
-      <component name="Muon/G10" natoms="0.03"/>
-    </material>
-    <!-- %%%%%%         Polystyrene_Foam                   %%%%%% -->
-    <material density="0.00350*g/cm3" name="Polystyrene_Foam"
-      state="solid">
-      <component name="Hydrogen" natoms="1"/>
-      <component name="Carbon" natoms="1"/>
-    </material>
-    <!-- %%%%%%              S_CPC_gas    %%%%%% -->
-    <material density="0.002054*g/cm3" name="S_CPC_gas" state="gas">
-      <component name="ArgonGas" fractionmass="0.6"/>
-      <component name="CF4"      fractionmass="0.1"/>
-      <component name="CO2"      fractionmass="0.3"/>
-    </material>
-    <!-- %%%%%%             C2_H2_F4    %%%%%% -->
-    <material name="C2_H2_F4" state="gas">
-      <component name="Carbon" natoms="2"/>
-      <component name="Hydrogen" natoms="2"/>
-      <component name="Fluorine" natoms="4"/>
-    </material>
-    <!-- %%%%%%            SF6    %%%%%% -->
-    <material name="SF6" state="gas">
-      <component name="Sulfur" natoms="1"/>
-      <component name="Fluorine" natoms="6"/>
-    </material>
-    <!-- %%%%%%            C4_H10    %%%%%% -->
-    <material name="C4_H10" state="gas">
-      <component name="Carbon" natoms="4"/>
-      <component name="Hydrogen" natoms="10"/>
-    </material>
-    <!-- %%%%%%              S_MRPC_gas    %%%%%% -->
-    <material density="0.004514*g/cm3" name="S_MRPC_gas" state="gas">
-      <component name="Muon/C2_H2_F4" natoms="0.96"/>
-      <component name="Muon/C4_H10" natoms="0.03"/>
-      <component name="Muon/SF6" natoms="0.01"/>
-    </material>
-    <!-- %%%%%%              Phenolic    %%%%%% -->
-    <material name="Phenolic" density="1.25*g/cm3" state="solid">
-      <component fractionmass="0.05744" name="Hydrogen"/>
-      <component fractionmass="0.77459" name="Carbon"/>
-      <component fractionmass="0.16797" name="Muon/SF6"/>
-    </material>
-    <!-- %%%%%%              Muon Filter Iron  %%%%%%%% -->
-    <material density="7.5*g/cm3" name="MuonFilterIron" state="solid">
-      <component fractionmass="0.9851" name="Iron"/>
-      <component fractionmass="0.005" name="Carbon"/>
-      <component fractionmass="0.009" name="Manganese"/>
-      <component fractionmass="0.0004" name="Phosphor"/>
-      <component fractionmass="0.0005" name="Sulfur"/>
-    </material>
-
-
-    <!--steel -->
-    <material density="7.8*g/cm3" name="Steel" state="solid">
-      <component fractionmass="0.7" name="Iron"  />
-      <component fractionmass="0.1" name="Carbon"/>
-      <component fractionmass="0.2" name="Copper"/>
-    </material>
-
-
-<!--Concrete-->
-    <material density="2.5*g/cm3" name="Concrete" state="solid">
-      <component fractionmass="0.520" name="Oxygen"  />
-      <component fractionmass="0.325" name="Silicon"  />
-      <component fractionmass="0.060" name="Calcium"  />
-      <component fractionmass="0.015" name="Sodium"  />
-      <component fractionmass="0.020" name="Iron"  />
-      <component fractionmass="0.040" name="Aluminium"  />
-     </material>
-
-    <material density="8.96*g/cm3" name="MuonCopper" state="solid">
-      <component fractionmass="1.0" name="Copper"  />
-    </material>
-
-    <material density="0.5*g/cm3" name="MuonPolyurethane" state="solid">
-      <component fractionmass="0.0264" name="Hydrogen"/>
-      <component fractionmass="0.6911" name="Carbon"/>
-      <component fractionmass="0.0733" name="Nitrogen"/>
-      <component fractionmass="0.2092" name="Oxygen"/>
-    </material>
-
-    <material density="1.42*g/cm3" name="Kapton" state="solid">
-      <component fractionmass="0.0264" name="Hydrogen"/>
-      <component fractionmass="0.6911" name="Carbon"/>
-      <component fractionmass="0.0733" name="Nitrogen"/>
-      <component fractionmass="0.2092" name="Oxygen"/>
-    </material>
-  </catalog>
-</materials>
-
diff --git a/compact/before-rich1-geom-update-26052022/checksums b/compact/before-rich1-geom-update-26052022/checksums
index 6bfce92b65d9695e2b1776afdf4205b94c4cb355..728eda44a2b06511bdb5c192e98153f7fa711f1e 100644
--- a/compact/before-rich1-geom-update-26052022/checksums
+++ b/compact/before-rich1-geom-update-26052022/checksums
@@ -1,4 +1,4 @@
-/world_volume: 2067784387
+/world_volume: 139437063
 /world_volume/lvAfterMagnetRegion_3: 3219166251
 /world_volume/lvAfterMagnetRegion_3/lvRich2Master_1: 187033957
 /world_volume/lvAfterMagnetRegion_3/lvRich2Master_1/pvRich2EntryWinTubeLock: 1979723490
@@ -80,7 +80,7 @@
 /world_volume/lvBeforeMagnetRegion_1/lvVP_2/pvVPMotionLeft: 1671998993
 /world_volume/lvBeforeMagnetRegion_1/lvVP_2/pvVPMotionRight: 2173770644
 /world_volume/lvBeforeMagnetRegion_1/lvVP_2/pvVacTank: 4180183569
-/world_volume/lvDownstreamRegion_4: 3121702174
+/world_volume/lvDownstreamRegion_4: 1743548306
 /world_volume/lvDownstreamRegion_4/lvAfterMuon_0: 1763508463
 /world_volume/lvDownstreamRegion_4/lvAfterMuon_0/lvBcmDown_0: 3353991402
 /world_volume/lvDownstreamRegion_4/lvAfterMuon_0/lvMBXWDown_1: 3528288914
@@ -91,23 +91,23 @@
 /world_volume/lvDownstreamRegion_4/lvHcal_3: 1966937768
 /world_volume/lvDownstreamRegion_4/lvHcal_3/pvHcalLeft: 4095643253
 /world_volume/lvDownstreamRegion_4/lvHcal_3/pvHcalright: 4217369814
-/world_volume/lvDownstreamRegion_4/lvMuon_1: 3348715730
-/world_volume/lvDownstreamRegion_4/lvMuon_1/lvM2ASideBeamPlug_4: 113116384
-/world_volume/lvDownstreamRegion_4/lvMuon_1/lvM2CSideBeamPlug_5: 521075949
-/world_volume/lvDownstreamRegion_4/lvMuon_1/lvM3ASideBeamPlug_6: 2176621055
-/world_volume/lvDownstreamRegion_4/lvMuon_1/lvM3CSideBeamPlug_7: 1872974569
-/world_volume/lvDownstreamRegion_4/lvMuon_1/lvM4ASideBeamPlug_8: 609448574
-/world_volume/lvDownstreamRegion_4/lvMuon_1/lvM4CSideBeamPlug_9: 1038322291
-/world_volume/lvDownstreamRegion_4/lvMuon_1/lvM5ASideBeamPlug_10: 3206437030
-/world_volume/lvDownstreamRegion_4/lvMuon_1/lvM5CSideBeamPlug_11: 2796462251
-/world_volume/lvDownstreamRegion_4/lvMuon_1/lvMuonFilter_0: 3893711741
-/world_volume/lvDownstreamRegion_4/lvMuon_1/lvMuonFilter_1: 2041008963
-/world_volume/lvDownstreamRegion_4/lvMuon_1/lvMuonFilter_2: 3746874083
-/world_volume/lvDownstreamRegion_4/lvMuon_1/lvMuonFilter_3: 3514794691
-/world_volume/lvDownstreamRegion_4/lvMuon_1/lvStation_12: 29260199
-/world_volume/lvDownstreamRegion_4/lvMuon_1/lvStation_13: 1774741901
-/world_volume/lvDownstreamRegion_4/lvMuon_1/lvStation_14: 982459314
-/world_volume/lvDownstreamRegion_4/lvMuon_1/lvStation_15: 643493299
+/world_volume/lvDownstreamRegion_4/lvMuon_1: 3132273891
+/world_volume/lvDownstreamRegion_4/lvMuon_1/lvM2ASideBeamPlug_4: 753303553
+/world_volume/lvDownstreamRegion_4/lvMuon_1/lvM2CSideBeamPlug_5: 1869197234
+/world_volume/lvDownstreamRegion_4/lvMuon_1/lvM3ASideBeamPlug_6: 3877088785
+/world_volume/lvDownstreamRegion_4/lvMuon_1/lvM3CSideBeamPlug_7: 2458686571
+/world_volume/lvDownstreamRegion_4/lvMuon_1/lvM4ASideBeamPlug_8: 3833609470
+/world_volume/lvDownstreamRegion_4/lvMuon_1/lvM4CSideBeamPlug_9: 2802783053
+/world_volume/lvDownstreamRegion_4/lvMuon_1/lvM5ASideBeamPlug_10: 1087319583
+/world_volume/lvDownstreamRegion_4/lvMuon_1/lvM5CSideBeamPlug_11: 54526380
+/world_volume/lvDownstreamRegion_4/lvMuon_1/lvMuonFilter_0: 861223391
+/world_volume/lvDownstreamRegion_4/lvMuon_1/lvMuonFilter_1: 2519227302
+/world_volume/lvDownstreamRegion_4/lvMuon_1/lvMuonFilter_2: 819710470
+/world_volume/lvDownstreamRegion_4/lvMuon_1/lvMuonFilter_3: 207202214
+/world_volume/lvDownstreamRegion_4/lvMuon_1/lvStation_12: 2843222722
+/world_volume/lvDownstreamRegion_4/lvMuon_1/lvStation_13: 3703153972
+/world_volume/lvDownstreamRegion_4/lvMuon_1/lvStation_14: 2415849227
+/world_volume/lvDownstreamRegion_4/lvMuon_1/lvStation_15: 2469077258
 /world_volume/lvDownstreamRegion_4/lvUX85BakeoutDownstream_5: 3711578364
 /world_volume/lvDownstreamRegion_4/lvUX85BakeoutDownstream_5/pvUX854Bakeout: 3145125225
 /world_volume/lvDownstreamRegion_4/lvUX85BakeoutDownstream_5/pvUX854Win05BakeoutMain: 734953025
diff --git a/compact/before-rich1-geom-update-26052022/debug/Muon_debug.xml b/compact/before-rich1-geom-update-26052022/debug/Muon_debug.xml
index 18acd616c1346f2fa200eacd92949a1d86cdf323..28a42710d4aadd76cda44dcb8962194dfeac2421 100644
--- a/compact/before-rich1-geom-update-26052022/debug/Muon_debug.xml
+++ b/compact/before-rich1-geom-update-26052022/debug/Muon_debug.xml
@@ -17,6 +17,11 @@
   </info>
   <!-- geometry open="true" close="false"/ -->
 
+  <includes>
+    <gdmlFile  ref="../DDDetectors/compact/elements.xml"/>
+    <gdmlFile  ref="../DDDetectors/compact/materials.xml"/>
+  </includes>
+
   <define>
 
     <constant name="world_side" value="50000*m" />
@@ -33,8 +38,6 @@
   </define>
 
   <includes>
-    <gdmlFile ref="../defaults.xml"/>
-    <gdmlFile ref="../Muon/Muon/Materials/Elements.xml"/>
     <gdmlFile ref="../Muon/Muon/Materials/MuonMaterials.xml"/>
     <gdmlFile ref="../Muon/MuonParameters.xml"/>
     <gdmlFile ref="../Muon/VisAttributes.xml"/>
@@ -44,7 +47,7 @@
     <constant name="Muon:parent" value="/world" type="string"/>
   </define>
   
-  <include ref="../Muon/Muon/MuonSystem.xml"/>
+  <include ref="../Muon/Muon/detector.xml"/>
   
   <include ref="../Muon/Muon/Filters/Filter1.xml"/>
   <include ref="../Muon/Muon/Filters/Filter2.xml"/>
@@ -134,12 +137,8 @@
     </readout>
   </readouts>
 
-
-
-  <!-- 
-  <include ref="conditions.xml"/>
-  -->
-
+  <include ref="../global/conditions.xml"/>
+  <include ref="../Muon/conditions.xml"/>
 
   <!--
   <limits>
diff --git a/compact/trunk/Bcm/BcmDown.xml b/compact/trunk/Bcm/BcmDown.xml
index 16c4cb033de838b64870548abe86e3315bdcf662..76461390468a6a43b51e0b449351e7aa11099478 100644
--- a/compact/trunk/Bcm/BcmDown.xml
+++ b/compact/trunk/Bcm/BcmDown.xml
@@ -20,7 +20,7 @@
       <position x="0*mm" y="0*mm" z="2766.0*mm - Regions:MagnetRegionZPos"/>
 
       <!-- G10 contact plate -->
-      <volume name="lvBcmDownContact" material="Bcm/G10" vis="Bcm:ContactVis">
+      <volume name="lvBcmDownContact" material="Bcm:G10" vis="Bcm:ContactVis">
         <shape type="Tube"
                dz="Bcm:ContactThick/2"
                rmin="Bcm:DownContactInRad"
@@ -28,7 +28,7 @@
       </volume>
 
       <!-- Wire -->
-      <volume name="lvBcmDownWire" material="Bcm/Wire" vis="Bcm:WireVis">
+      <volume name="lvBcmDownWire" material="Bcm:Wire" vis="Bcm:WireVis">
         <shape type="BooleanShape" operation="union">
           <shape type="BooleanShape" operation="union">
             <shape type="Tube" dz="Bcm:DownWireStartLength/2" rmax="Bcm:DownWireOutRad" rmin="0*mm"/>
@@ -44,7 +44,7 @@
       </volume>
 
       <!-- Back part of downstream mount -->
-      <volume name="lvBcmDownMountBackSection" material="Bcm/Tekapeek" vis="Bcm:MountVis">
+      <volume name="lvBcmDownMountBackSection" material="Bcm:Tekapeek" vis="Bcm:MountVis">
         <shape type="BooleanShape" operation="subtraction">
           <shape type="BooleanShape" operation="subtraction">
             <shape type="Tube" dz="Bcm:DownMountBackSectionLength/2" 
@@ -64,7 +64,7 @@
       </volume>
 
       <!-- Front part of downstream mount -->
-      <volume name="lvBcmDownMountFront" material="Bcm/Tekapeek" vis="Bcm:MountVis">
+      <volume name="lvBcmDownMountFront" material="Bcm:Tekapeek" vis="Bcm:MountVis">
         <shape type="Tube" dz="Bcm:DownMountFrontLength/2"
                rmax="Bcm:DownMountFrontOutRad"
                rmin="Bcm:DownMountFrontInRad"/>
@@ -105,7 +105,7 @@
       </physvol>
 
       <!-- Diamond sensor with start of placement positioning -->
-      <sensor material="Bcm/Diamond" vis="Bcm:SensorVis"
+      <sensor material="Bcm:Diamond" vis="Bcm:SensorVis"
               dx="Bcm:SensorWidth/2" dy="Bcm:SensorWidth/2" dz="Bcm:SensorThick/2">
         <position r="Bcm:DownSensorRad" phi="90.0*degree" z="Bcm:DownSensorPosZ"/>
       </sensor>
diff --git a/compact/trunk/Bcm/BcmUp.xml b/compact/trunk/Bcm/BcmUp.xml
index 6798b3db336d780e1b586085c523aed02b974dfe..7ea7bd773aadf06e30433295968a97578b8c8f64 100644
--- a/compact/trunk/Bcm/BcmUp.xml
+++ b/compact/trunk/Bcm/BcmUp.xml
@@ -23,12 +23,12 @@
       <position z="-2135.0*mm + Regions:BeforeMagnetZSize/2 - Regions:BeforeVeloZSize/2"/>
 
       <!-- G10 contact plate -->
-      <volume name="lvBcmUpContact" material="Bcm/G10"  vis="Bcm:ContactVis" build="DEFAULT,SIM,REC">
+      <volume name="lvBcmUpContact" material="Bcm:G10"  vis="Bcm:ContactVis" build="DEFAULT,SIM,REC">
          <shape type="Tube" dz="Bcm:ContactThick/2" rmin="Bcm:UpContactInRad" rmax="Bcm:UpContactOutRad"/>
       </volume>
 
       <!-- Wire -->
-      <volume name="lvBcmUpWire" material="Bcm/Wire" vis="Bcm:WireVis" build="DEFAULT,SIM">
+      <volume name="lvBcmUpWire" material="Bcm:Wire" vis="Bcm:WireVis" build="DEFAULT,SIM">
         <shape type="BooleanShape" operation="union">
           <shape type="Tube" dz="Bcm:UpWireStartLength/2" rmax="Bcm:UpWireOutRad" rmin="0*mm"/>
           <shape type="Tube" dz="Bcm:UpWireLongLength/2"  rmax="Bcm:UpWireOutRad" rmin="0*mm"/>
@@ -38,7 +38,7 @@
       </volume>
 
       <!-- Upstream mount -->
-      <volume name="lvBcmUpMount" material="Bcm/Aluminium" vis="Bcm:MountVis" build="DEFAULT,SIM,REC,DISPLAY">
+      <volume name="lvBcmUpMount" material="Bcm:Aluminium" vis="Bcm:MountVis" build="DEFAULT,SIM,REC,DISPLAY">
         <shape type="BooleanShape" operation="subtraction">
           <shape type="BooleanShape" operation="subtraction">
             <shape type="Box"  dx="Bcm:UpMountWidth/2" dy="Bcm:UpMountHeight/2" dz="Bcm:UpMountThick/2"/>
@@ -61,7 +61,7 @@
       </physvol>
 
       <!-- Diamond sensor -->
-      <sensor material="Bcm/Diamond"  vis="Bcm:SensorVis"
+      <sensor material="Bcm:Diamond"  vis="Bcm:SensorVis"
               dx="Bcm:SensorWidth/2."
               dy="Bcm:SensorWidth/2"
               dz="Bcm:SensorThick/2">
diff --git a/compact/trunk/Bcm/parameters.xml b/compact/trunk/Bcm/parameters.xml
index a637b88e574504d455986ccd8d98674b18cf1a4a..7c081e67ae2c7b505305789e24fc9e1ff22a8cfa 100644
--- a/compact/trunk/Bcm/parameters.xml
+++ b/compact/trunk/Bcm/parameters.xml
@@ -71,12 +71,12 @@
   </define>
 
   <materials>
-    <material name="Bcm/Diamond" I="78.0*eV" >
+    <material name="Bcm:Diamond" I="78.0*eV" >
       <D type="density" value="3.52" unit="g/cm3"/>
       <composite ref="Carbon" n="1"/>
     </material>
 
-    <material name="Bcm/Tekapeek">
+    <material name="Bcm:Tekapeek">
       <D type="density" value="1.49" unit="g/cm3"/>
       <composite ref="N" n="2"/>
       <composite ref="H" n="10"/>
@@ -84,29 +84,29 @@
       <composite ref="O" n="5"/>
     </material>
 
-    <material name="Bcm/G10">
+    <material name="Bcm:G10">
       <D type="density" value="1.7" unit="g/cm3"/>
       <composite ref="Si" n="1" />
       <composite ref="O" n="2" />
     </material>
 
-    <material name="Bcm/Aluminium" I="166.0*eV">
+    <material name="Bcm:Aluminium" I="166.0*eV">
       <D type="density" unit="g/cm3" value="2.7" />
       <composite ref="Al" n="1" />
     </material>
 
-    <material name="Bcm/EFTE">
+    <material name="Bcm:EFTE">
       <D type="density" value="1.74" unit="g/cm3"/>
       <composite ref="C" n="1" />
       <composite ref="H" n="2" />
       <composite ref="F" n="2" />
     </material>
 
-    <material name="Bcm/Wire">
+    <material name="Bcm:Wire">
       <D type="density" value="2.33" unit="g/cm3"/>
       <composite ref="Cu" n="0.172" />
-      <composite ref="Bcm/EFTE" n="0.100" />
-      <composite ref="Bcm/Aluminium" n="0.433" />
+      <composite ref="Bcm:EFTE" n="0.100" />
+      <composite ref="Bcm:Aluminium" n="0.433" />
       <composite ref="Air" n="0.295" />
     </material>
   </materials>
diff --git a/compact/trunk/BlockWall/parameters.xml b/compact/trunk/BlockWall/parameters.xml
index 33b9dd9d0c06acbd2fbbe517052f85afe696cd60..70ff1363b30b892f5fc9cabcd65837b18163af07 100644
--- a/compact/trunk/BlockWall/parameters.xml
+++ b/compact/trunk/BlockWall/parameters.xml
@@ -21,7 +21,7 @@
     <constant name="BlockWall:Rad"      value="1500.0*mm"/>
     <constant name="BlockWall:HoleX"    value="200.0*mm"/>
     <constant name="BlockWall:HoleY"    value="200.0*mm"/>
-    <constant name="BlockWall/Iron"     value="Iron"  type="string"/>
+    <constant name="BlockWall:Iron"     value="Iron"  type="string"/>
   </define>
 
   <materials>
diff --git a/compact/trunk/DDDetectors/compact/materials.xml b/compact/trunk/DDDetectors/compact/materials.xml
index 3df015c29fb894ec24782e90b3d01fd4d8fd7cd4..78e4be60b5b2533240c7e440515932a05934019c 100644
--- a/compact/trunk/DDDetectors/compact/materials.xml
+++ b/compact/trunk/DDDetectors/compact/materials.xml
@@ -31,6 +31,12 @@
     <fraction n="0.012" ref="Ar"/>
   </material>
 
+  <material name="Water">
+    <D type="density" unit="g/cm3" value="1.0"/>
+    <composite ref="H" n="2"/>
+    <composite ref="O" n="1"/>
+  </material>
+
   <material name="Epoxy">
     <D type="density" value="1.3" unit="g/cm3"/>
     <composite n="44" ref="H"/>
diff --git a/compact/trunk/GValve/detector.xml b/compact/trunk/GValve/detector.xml
index 2e6e600d81316012729c26e8d789a806e5896b49..b5fb3586a48f62e29bdc18f660dd16831e5c59d6 100644
--- a/compact/trunk/GValve/detector.xml
+++ b/compact/trunk/GValve/detector.xml
@@ -24,11 +24,11 @@
       <position x="250.0*mm" z="-1600.0*mm + Regions:BeforeMagnetZSize/2 - Regions:BeforeVeloZSize/2"/>
 
       <!-- Main tube -->
-      <volume name="lvGValveCyl" material="GValve/Steel" vis="GValve:SteelVis">
+      <volume name="lvGValveCyl" material="GValve:Steel" vis="GValve:SteelVis">
         <shape type="Tube" dz="GValve:CylLength/2" rmin="GValve:CylRad" rmax="GValve:CylRad + GValve:CylThick"/>
       </volume>
       <!-- End plug -->
-      <volume name="lvGValvePlug" material="GValve/Steel" vis="GValve:SteelVis">
+      <volume name="lvGValvePlug" material="GValve:Steel" vis="GValve:SteelVis">
         <shape type="Tube" dz="GValve:PlugLength/2" rmax="GValve:PlugRad"/>
       </volume>
 
diff --git a/compact/trunk/GValve/parameters.xml b/compact/trunk/GValve/parameters.xml
index 176aeeaf95f7387d3518f41c8e5e3af444b4af65..3f2a5190339156cfc22bc4b828556385ad6d7f0e 100644
--- a/compact/trunk/GValve/parameters.xml
+++ b/compact/trunk/GValve/parameters.xml
@@ -26,7 +26,7 @@
 
   <materials>
     <!-- Steel -->
-    <material name="GValve/Steel" state="solid">
+    <material name="GValve:Steel" state="solid">
       <D type="density" value="7.8" unit="g/cm3"/>
       <fraction n="0.7" ref="Iron"  />
       <fraction n="0.1" ref="Carbon"/>
diff --git a/compact/trunk/Magnet/detector.xml b/compact/trunk/Magnet/detector.xml
index dc0515a059d8fb9a359ce25ac560d6eeb1f92c4d..2d7e266012bddd9a2adf0c47de29660eacfc3ec9 100644
--- a/compact/trunk/Magnet/detector.xml
+++ b/compact/trunk/Magnet/detector.xml
@@ -34,7 +34,7 @@
                                  Vertical Yoke                             
        ********************************************************************
       </comment>
-      <volume name="YokeVert" material="Magnet/YokeSteel" vis="Mag:YokeVis">
+      <volume name="YokeVert" material="Magnet:YokeSteel" vis="Mag:YokeVis">
         <shape type="BooleanShape" operation="subtraction">
           <shape type="Box" name="Vertical_Part_Subtraction"
                  dx="Mag:YokeVertSizeX/2"
@@ -68,7 +68,7 @@
                                 Horizontal Yoke                             
        ******************************************************************** 
       </comment>
-      <volume name="YokeHor" material="Magnet/YokeSteel" vis="Mag:YokeVis">
+      <volume name="YokeHor" material="Magnet:YokeSteel" vis="Mag:YokeVis">
         <shape type="BooleanShape" operation="subtraction" name="Horizontal_Yoke">
           <shape type="Trap" name="Horizontal_Trapezoid"
               z="Mag:SizeX/2"
@@ -134,7 +134,7 @@
        % -Z((X1,X2)Y1) % -->
        % +Z((X3,X4)Y2) % -->
       </comment>
-      <volume name="Coil" material="Magnet/CoilAl" vis="Mag:CoilVis">
+      <volume name="Coil" material="Magnet:CoilAl" vis="Mag:CoilVis">
         <shape type="BooleanShape" operation="subtraction">
           <shape type="Trap" name="Basic_Trapezoid"
                  z="Mag:CoilSizeZ/2" 
diff --git a/compact/trunk/Magnet/parameters.xml b/compact/trunk/Magnet/parameters.xml
index e3edb86c43b7a9b5bc8b4448e393ce382db83dd4..aa19ddd5945ac1e36c834907b97f6d743261b972 100644
--- a/compact/trunk/Magnet/parameters.xml
+++ b/compact/trunk/Magnet/parameters.xml
@@ -155,12 +155,12 @@
 
   <comment>Magnet specific material definitions</comment>
   <materials>
-    <material name="Magnet/YokeSteel">
+    <material name="Magnet:YokeSteel">
       <D value="7.85" unit="g/cm3"/>
       <fraction n="0.998" ref="Fe"/>
       <fraction n=".002" ref="C"/>
     </material>
-    <material name="Magnet/CoilAl">
+    <material name="Magnet:CoilAl">
       <D value="2.699" unit="g/cm3"/>
       <fraction n="1.0" ref="Al"/>
     </material>
diff --git a/compact/trunk/Muon/Muon/BeamPlugs/M2ASideBeamPlug.xml b/compact/trunk/Muon/Muon/BeamPlugs/M2ASideBeamPlug.xml
index e246cff464a37f506f9070f9a9d0230fce13ab09..5d3c32555def5a36996802eb89cac947c09e126a 100644
--- a/compact/trunk/Muon/Muon/BeamPlugs/M2ASideBeamPlug.xml
+++ b/compact/trunk/Muon/Muon/BeamPlugs/M2ASideBeamPlug.xml
@@ -23,7 +23,7 @@
       </physvol>
 
 
-      <logvol name="lvM2ASideBeamPlug" material="Muon/MuonFilterIron">
+      <logvol name="lvM2ASideBeamPlug" material="Muon:FilterIron">
 	<subtraction name="M2ASideBeamPlugSub">
 	  <!-- box up to 50mm in Y and 70mm in X from closest chamber -->
 	  <box name="M2ASideBeamPlugBox" sizeX="227.05*mm" sizeY="395*mm" sizeZ="395*mm"/>
diff --git a/compact/trunk/Muon/Muon/BeamPlugs/M2CSideBeamPlug.xml b/compact/trunk/Muon/Muon/BeamPlugs/M2CSideBeamPlug.xml
index 0a1ef80a739b02765b2f73033c60011604216330..e376a4fae5d345f70f382db1224be79b7d235b14 100644
--- a/compact/trunk/Muon/Muon/BeamPlugs/M2CSideBeamPlug.xml
+++ b/compact/trunk/Muon/Muon/BeamPlugs/M2CSideBeamPlug.xml
@@ -23,7 +23,7 @@
       </physvol>
 
 
-      <logvol name="lvM2CSideBeamPlug" material="Muon/MuonFilterIron">
+      <logvol name="lvM2CSideBeamPlug" material="Muon:FilterIron">
 	<subtraction name="M2CSideBeamPlugSub">
 	  <!-- box up to 50mm in Y and 70mm in X from closest chamber -->
 	  <box name="M2CSideBeamPlugBox" sizeX="227.05*mm" sizeY="395*mm" sizeZ="395*mm"/>
diff --git a/compact/trunk/Muon/Muon/BeamPlugs/M3ASideBeamPlug.xml b/compact/trunk/Muon/Muon/BeamPlugs/M3ASideBeamPlug.xml
index b7ba2a42170aeb78ebb5dd09494513b87fc81b6c..120e8bb56eda653245fddddc572eb4218244d086 100644
--- a/compact/trunk/Muon/Muon/BeamPlugs/M3ASideBeamPlug.xml
+++ b/compact/trunk/Muon/Muon/BeamPlugs/M3ASideBeamPlug.xml
@@ -23,7 +23,7 @@
       </physvol>
 
 
-      <logvol name="lvM3ASideBeamPlug" material="Muon/MuonFilterIron">
+      <logvol name="lvM3ASideBeamPlug" material="Muon:FilterIron">
 	<subtraction name="M3ASideBeamPlugSub">
 	  <!-- box up to 50mm in Y and 70mm in X from closest chamber -->
 	  <box name="M3ASideBeamPlugBox" sizeX="250.1*mm" sizeY="434.8*mm" sizeZ="395*mm"/>
diff --git a/compact/trunk/Muon/Muon/BeamPlugs/M3CSideBeamPlug.xml b/compact/trunk/Muon/Muon/BeamPlugs/M3CSideBeamPlug.xml
index d8e79974c2a890f1ec3672d83201a58546641372..72dfa2e9e3563f187cd48e4f9d2914538c3dacd7 100644
--- a/compact/trunk/Muon/Muon/BeamPlugs/M3CSideBeamPlug.xml
+++ b/compact/trunk/Muon/Muon/BeamPlugs/M3CSideBeamPlug.xml
@@ -23,7 +23,7 @@
       </physvol>
 
 
-      <logvol name="lvM3CSideBeamPlug" material="Muon/MuonFilterIron">
+      <logvol name="lvM3CSideBeamPlug" material="Muon:FilterIron">
 	<subtraction name="M3CSideBeamPlugSub">
 	  <!-- box up to 50mm in Y and 70mm in X from closest chamber -->
 	  <box name="M3CSideBeamPlugBox" sizeX="250.1*mm" sizeY="434.8*mm" sizeZ="395*mm"/>
diff --git a/compact/trunk/Muon/Muon/BeamPlugs/M4ASideBeamPlug.xml b/compact/trunk/Muon/Muon/BeamPlugs/M4ASideBeamPlug.xml
index 116ba21be5ddca456be6a606d953df0d5518f979..3e416ac1340842e4fafa334a87182f54cfd376e4 100644
--- a/compact/trunk/Muon/Muon/BeamPlugs/M4ASideBeamPlug.xml
+++ b/compact/trunk/Muon/Muon/BeamPlugs/M4ASideBeamPlug.xml
@@ -23,7 +23,7 @@
       </physvol>
 
       
-      <logvol name="lvM4ASideBeamPlug" material="Muon/MuonFilterIron">
+      <logvol name="lvM4ASideBeamPlug" material="Muon:FilterIron">
 	<subtraction name="M4ASideBeamPlugSub">
 	  <!-- box up to 50mm in Y and 70mm in X from closest chamber -->
 	  <box name="M4ASideBeamPlugBox" sizeX="274.7*mm" sizeY="456.4*mm" sizeZ="395*mm"/>
diff --git a/compact/trunk/Muon/Muon/BeamPlugs/M4CSideBeamPlug.xml b/compact/trunk/Muon/Muon/BeamPlugs/M4CSideBeamPlug.xml
index e48e1c8e4a472aa5ef5951508fc0fbdf63d8b537..e10f2a5deb684f7d7042fcb90eac5307a23d107b 100644
--- a/compact/trunk/Muon/Muon/BeamPlugs/M4CSideBeamPlug.xml
+++ b/compact/trunk/Muon/Muon/BeamPlugs/M4CSideBeamPlug.xml
@@ -23,7 +23,7 @@
       </physvol>
 
 
-      <logvol name="lvM4CSideBeamPlug" material="Muon/MuonFilterIron">
+      <logvol name="lvM4CSideBeamPlug" material="Muon:FilterIron">
 	<subtraction name="M4CSideBeamPlugSub">
 	  <!-- box up to 50mm in Y and 70mm in X from closest chamber -->
 	  <box name="M4CSideBeamPlugBox" sizeX="274.7*mm" sizeY="456.4*mm" sizeZ="395*mm"/>
diff --git a/compact/trunk/Muon/Muon/BeamPlugs/M5ASideBeamPlug.xml b/compact/trunk/Muon/Muon/BeamPlugs/M5ASideBeamPlug.xml
index 56927753a488209d494de7c351e61b02dba2e92a..b2a033a1912fd5538077f4bb76e7a431de3c8c2e 100644
--- a/compact/trunk/Muon/Muon/BeamPlugs/M5ASideBeamPlug.xml
+++ b/compact/trunk/Muon/Muon/BeamPlugs/M5ASideBeamPlug.xml
@@ -23,7 +23,7 @@
       </physvol>
 
 
-      <logvol name="lvM5ASideBeamPlug" material="Muon/MuonFilterIron">
+      <logvol name="lvM5ASideBeamPlug" material="Muon:FilterIron">
 	<subtraction name="M5ASideBeamPlugSub">
 	  <!-- box up to 50mm in Y and 70mm in X from closest chamber -->
 	  <box name="M5ASideBeamPlugBox" sizeX="298.5*mm" sizeY="474.0*mm" sizeZ="395*mm"/>
diff --git a/compact/trunk/Muon/Muon/BeamPlugs/M5CSideBeamPlug.xml b/compact/trunk/Muon/Muon/BeamPlugs/M5CSideBeamPlug.xml
index 0e226d472f9851f034b90c064ad8c9f1b26a697a..0d74e586b981d26c6813540150d0cd899e981d42 100644
--- a/compact/trunk/Muon/Muon/BeamPlugs/M5CSideBeamPlug.xml
+++ b/compact/trunk/Muon/Muon/BeamPlugs/M5CSideBeamPlug.xml
@@ -23,7 +23,7 @@
       </physvol>
 
       
-      <logvol name="lvM5CSideBeamPlug" material="Muon/MuonFilterIron">
+      <logvol name="lvM5CSideBeamPlug" material="Muon:FilterIron">
 	<subtraction name="M5CSideBeamPlugSub">
 	  <!-- box up to 50mm in Y and 70mm in X from closest chamber -->
 	  <box name="M5CSideBeamPlugBox" sizeX="298.5*mm" sizeY="474.0*mm" sizeZ="395*mm"/>
diff --git a/compact/trunk/Muon/Muon/Filters/Filter1.xml b/compact/trunk/Muon/Muon/Filters/Filter1.xml
index 15f7907b96930be7a4bc646c3aa54147ce553922..0f965868d78348a4df764c2fa87e99a4ffb0aa2a 100644
--- a/compact/trunk/Muon/Muon/Filters/Filter1.xml
+++ b/compact/trunk/Muon/Muon/Filters/Filter1.xml
@@ -160,7 +160,7 @@
       <!--  ****************************  -->
       <!--  Parameters of BeamHole1ASide  -->
       <!--  ****************************  -->
-      <logvol material="Muon/MuonFilterIron" name="lvBeamHole1ASide">
+      <logvol material="Muon:FilterIron" name="lvBeamHole1ASide">
 	<subtraction name="FilterBeam1A">
 	  <box name="BoxBeam1A" sizeX="0.42*m" sizeY="1.200*m" sizeZ="0.8*m"/>
 	  <cons name="BeamHole1A" sizeZ="0.82*m" outerRadiusPZ="182*mm" outerRadiusMZ="173*mm"/>
@@ -175,7 +175,7 @@
       <!--  ****************************  -->
       <!--  Parameters of BeamHole1CSide  -->
       <!--  ****************************  -->
-      <logvol material="Muon/MuonFilterIron" name="lvBeamHole1CSide">
+      <logvol material="Muon:FilterIron" name="lvBeamHole1CSide">
 	<subtraction name="FilterBeam1C">
 	  <box name="BoxBeam1C" sizeX="0.42*m" sizeY="1.200*m" sizeZ="0.8*m"/>
 	  <cons name="BeamHole1C" sizeZ="0.82*m" outerRadiusPZ="182*mm" outerRadiusMZ="173*mm"/>
@@ -360,95 +360,95 @@
       <!--  ********************************************  -->
       <boxes>
 	
-	<logvol material="Muon/MuonFilterIron" name="lvBlock1">
+	<logvol material="Muon:FilterIron" name="lvBlock1">
 	  <box name="Block1" sizeX="1.6*m" sizeY="0.8*m" sizeZ="0.8*m"/>
 	</logvol>
 	
-	<logvol material="Muon/MuonFilterIron" name="lvBlock2">
+	<logvol material="Muon:FilterIron" name="lvBlock2">
 	  <box name="Block2" sizeX="1.6*m" sizeY="0.4*m" sizeZ="0.8*m"/>
 	</logvol>
 	
-	<logvol material="Muon/MuonFilterIron" name="lvBlock3">
+	<logvol material="Muon:FilterIron" name="lvBlock3">
 	  <box name="Block3" sizeX="0.8*m" sizeY="0.4*m" sizeZ="0.8*m"/>
 	</logvol>
 	
-	<logvol material="Muon/MuonFilterIron" name="lvBlock4">
+	<logvol material="Muon:FilterIron" name="lvBlock4">
 	  <box name="Block4" sizeX="0.4*m" sizeY="0.4*m" sizeZ="0.8*m"/>
 	</logvol>
 	
-	<logvol material="Muon/Steel" name="lvSteelPlate1">
+	<logvol material="Muon:Steel" name="lvSteelPlate1">
 	  <box name="SteelPlate1" sizeX="4.815*m" sizeY="0.015*m" sizeZ="0.8*m" />
 	</logvol>
 	
-	<logvol material="Muon/Steel" name="lvSteelPlate2">
+	<logvol material="Muon:Steel" name="lvSteelPlate2">
 	  <box name="SteelPlate2" sizeX="0.4*m" sizeY="0.015*m" sizeZ="0.8*m" />
 	</logvol>
 	
-	<logvol material="Muon/Steel" name="lvSteelPlate3">
+	<logvol material="Muon:Steel" name="lvSteelPlate3">
 	  <box name="SteelPlate3" sizeX="5.215*m" sizeY="0.015*m" sizeZ="0.8*m" />
 	</logvol>
 	
-	<logvol material="Muon/Steel" name="lvSteelPlate4">
+	<logvol material="Muon:Steel" name="lvSteelPlate4">
 	  <box name="SteelPlate4" sizeX="5.22*m" sizeY="1.5*cm" sizeZ="0.8*m"/>
 	</logvol>
 	
-	<logvol material="Muon/Steel" name="lvSteelPlate5">
+	<logvol material="Muon:Steel" name="lvSteelPlate5">
 	  <box name="SteelPlate5" sizeX="5*mm" sizeY="1.5*cm" sizeZ="0.8*m"/>
 	</logvol>
 	
-	<logvol material="Muon/Steel" name="lvSteelPlate6">
+	<logvol material="Muon:Steel" name="lvSteelPlate6">
 	  <box name="SteelPlate6" sizeX="0.4*m" sizeY="0.025*m" sizeZ="0.8*m" />
 	</logvol>
 	
-	<logvol material="Muon/Steel" name="lvSteelPlate7">
+	<logvol material="Muon:Steel" name="lvSteelPlate7">
 	  <box name="SteelPlate7" sizeX="3.609*m" sizeY="0.015*m" sizeZ="0.8*m" />
 	</logvol>
 	
-	<logvol material="Muon/Steel" name="lvSteelPlate8">
+	<logvol material="Muon:Steel" name="lvSteelPlate8">
 	  <box name="SteelPlate8" sizeX="0.805*m" sizeY="0.015*m" sizeZ="0.8*m" />
 	</logvol>
 	
-	<logvol material="Muon/Steel" name="lvSteelPlate9">
+	<logvol material="Muon:Steel" name="lvSteelPlate9">
 	  <box name="SteelPlate9" sizeX="5.62*m" sizeY="1.5*cm" sizeZ="0.8*m"/>
 	</logvol>
 	
-	<logvol material="Muon/Steel" name="lvSteelPlate10">
+	<logvol material="Muon:Steel" name="lvSteelPlate10">
 	  <box name="SteelPlate10" sizeX="5*mm" sizeY="2.5*cm" sizeZ="0.8*m" />
 	</logvol>
 
-	<logvol material="Muon/Steel" name="lvSteelPlate11">
+	<logvol material="Muon:Steel" name="lvSteelPlate11">
 	  <box name="SteelPlate11" sizeX="1.5*cm" sizeY="4.165*m" sizeZ="0.8*m"/>
 	</logvol>
 	
-	<logvol material="Muon/Steel" name="lvSteelPlate12">
+	<logvol material="Muon:Steel" name="lvSteelPlate12">
 	  <box name="SteelPlate12" sizeX="1.5*cm" sizeY="4.58*m" sizeZ="0.8*m"/>
 	</logvol>
 	
-	<logvol material="Muon/Concrete" name="lvConcrete1">
+	<logvol material="Muon:Concrete" name="lvConcrete1">
 	  <box name="Concrete1" sizeX="0.4*m" sizeY="0.005*m" sizeZ="0.8*m" />
 	</logvol>
 	
-	<logvol material="Muon/Concrete" name="lvConcrete2">
+	<logvol material="Muon:Concrete" name="lvConcrete2">
 	  <box name="Concrete2" sizeX="4.815*m" sizeY="0.015*m" sizeZ="0.8*m" />
 	</logvol>
 
-	<logvol material="Muon/Concrete" name="lvConcrete3">
+	<logvol material="Muon:Concrete" name="lvConcrete3">
 	  <box name="Concrete3" sizeX="5.22*m" sizeY="1.5*cm" sizeZ="0.8*m" />
 	</logvol>
 	
-	<logvol material="Muon/Concrete" name="lvConcrete4">
+	<logvol material="Muon:Concrete" name="lvConcrete4">
 	  <box name="Concrete4" sizeX="5.62*m" sizeY="1.5*cm" sizeZ="0.8*m"/>
 	</logvol>
 	
-	<logvol material="Muon/Concrete" name="lvConcrete5">
+	<logvol material="Muon:Concrete" name="lvConcrete5">
 	  <box name="Concrete5" sizeX="5.215*m" sizeY="0.015*m" sizeZ="0.8*m" />
 	</logvol>
 	
-	<logvol material="Muon/Concrete" name="lvConcrete6">
+	<logvol material="Muon:Concrete" name="lvConcrete6">
 	  <box name="Concrete6" sizeX="3.609*m" sizeY="0.015*m" sizeZ="0.8*m" />
 	</logvol>
 	
-	<logvol material="Muon/Concrete" name="lvConcrete7">
+	<logvol material="Muon:Concrete" name="lvConcrete7">
 	  <box name="Concrete7" sizeX="0.8*m" sizeY="0.015*m" sizeZ="0.8*m" />
 	</logvol>
 
diff --git a/compact/trunk/Muon/Muon/Filters/Filter2.xml b/compact/trunk/Muon/Muon/Filters/Filter2.xml
index a545e67151317760caa8dfee819017da32b1d1c0..82db312ade825e82dc56fbefa508170aa8fc95e8 100644
--- a/compact/trunk/Muon/Muon/Filters/Filter2.xml
+++ b/compact/trunk/Muon/Muon/Filters/Filter2.xml
@@ -170,7 +170,7 @@
        <!--  ****************************  -->
        <!--  Parameters of BeamHole2ASide  -->
        <!--  ****************************  -->
-       <logvol material="Muon/MuonFilterIron" name="lvBeamHole2ASide">
+       <logvol material="Muon:FilterIron" name="lvBeamHole2ASide">
 	 <subtraction name="FilterBeam2A">
 	   <box name="BoxBeam2A" sizeX="0.42*m" sizeY="1.215*m" sizeZ="0.8*m"/>
 	   <cons name="BeamHole2A" sizeZ="0.88*m" outerRadiusPZ="194*mm" outerRadiusMZ="185*mm"/>
@@ -185,7 +185,7 @@
        <!--  ****************************  -->
        <!--  Parameters of BeamHole2CSide  -->
        <!--  ****************************  -->
-       <logvol material="Muon/MuonFilterIron" name="lvBeamHole2CSide">
+       <logvol material="Muon:FilterIron" name="lvBeamHole2CSide">
 	 <subtraction name="FilterBeam2C">
 	   <box name="BoxBeam2C" sizeX="0.42*m" sizeY="1.215*m" sizeZ="0.8*m"/>
 	   <cons name="BeamHole2C" sizeZ="0.88*m" outerRadiusPZ="194*mm" outerRadiusMZ="185*mm"/>
@@ -352,95 +352,95 @@
        <!--  ********************************************  -->
        <boxes>
 	 
-	 <logvol material="Muon/MuonFilterIron" name="lvBlock1">
+	 <logvol material="Muon:FilterIron" name="lvBlock1">
 	   <box name="Block1" sizeX="1.6*m" sizeY="0.8*m" sizeZ="0.8*m"/>
 	 </logvol>
 	 
-	 <logvol material="Muon/MuonFilterIron" name="lvBlock2">
+	 <logvol material="Muon:FilterIron" name="lvBlock2">
 	   <box name="Block2" sizeX="1.6*m" sizeY="0.4*m" sizeZ="0.8*m"/>
 	 </logvol>
 	 
-	 <logvol material="Muon/MuonFilterIron" name="lvBlock3">
+	 <logvol material="Muon:FilterIron" name="lvBlock3">
 	   <box name="Block3" sizeX="0.8*m" sizeY="0.4*m" sizeZ="0.8*m"/>
 	 </logvol>
 	 
-	 <logvol material="Muon/MuonFilterIron" name="lvBlock4">
+	 <logvol material="Muon:FilterIron" name="lvBlock4">
 	   <box name="Block4" sizeX="0.4*m" sizeY="0.4*m" sizeZ="0.8*m"/>
 	 </logvol>
 	 
-	 <logvol material="Muon/Steel" name="lvSteelPlate1">
+	 <logvol material="Muon:Steel" name="lvSteelPlate1">
 	   <box name="SteelPlate1" sizeX="4.815*m" sizeY="0.015*m" sizeZ="0.8*m" />
 	 </logvol>
 	 
-	 <logvol material="Muon/Steel" name="lvSteelPlate2">
+	 <logvol material="Muon:Steel" name="lvSteelPlate2">
 	   <box name="SteelPlate2" sizeX="0.4*m" sizeY="0.015*m" sizeZ="0.8*m" />
 	 </logvol>
 	 
-	 <logvol material="Muon/Steel" name="lvSteelPlate3">
+	 <logvol material="Muon:Steel" name="lvSteelPlate3">
 	   <box name="SteelPlate3" sizeX="5.215*m" sizeY="0.015*m" sizeZ="0.8*m" />
 	 </logvol>
 	 
-	 <logvol material="Muon/Steel" name="lvSteelPlate4">
+	 <logvol material="Muon:Steel" name="lvSteelPlate4">
 	   <box name="SteelPlate4" sizeX="5.22*m" sizeY="1.5*cm" sizeZ="0.8*m"/>
 	 </logvol>
 	 
-	 <logvol material="Muon/Steel" name="lvSteelPlate5">
+	 <logvol material="Muon:Steel" name="lvSteelPlate5">
 	   <box name="SteelPlate5" sizeX="5*mm" sizeY="1.5*cm" sizeZ="0.8*m"/>
 	 </logvol>
 	 
-	 <logvol material="Muon/Steel" name="lvSteelPlate6">
+	 <logvol material="Muon:Steel" name="lvSteelPlate6">
 	   <box name="SteelPlate6" sizeX="0.4*m" sizeY="0.025*m" sizeZ="0.8*m" />
 	 </logvol>
 
-	 <logvol material="Muon/Steel" name="lvSteelPlate7">
+	 <logvol material="Muon:Steel" name="lvSteelPlate7">
 	   <box name="SteelPlate7" sizeX="3.609*m" sizeY="0.015*m" sizeZ="0.8*m" />
 	 </logvol>
 	 
-	 <logvol material="Muon/Steel" name="lvSteelPlate8">
+	 <logvol material="Muon:Steel" name="lvSteelPlate8">
 	   <box name="SteelPlate8" sizeX="0.805*m" sizeY="0.015*m" sizeZ="0.8*m" />
 	 </logvol>
 
-	 <logvol material="Muon/Steel" name="lvSteelPlate9">
+	 <logvol material="Muon:Steel" name="lvSteelPlate9">
 	   <box name="SteelPlate9" sizeX="5.62*m" sizeY="1.5*cm" sizeZ="0.8*m"/>
 	 </logvol>
 	 
-	 <logvol material="Muon/Steel" name="lvSteelPlate10">
+	 <logvol material="Muon:Steel" name="lvSteelPlate10">
 	   <box name="SteelPlate10" sizeX="5*mm" sizeY="2.5*cm" sizeZ="0.8*m" />
 	 </logvol>
 	 
-	 <logvol material="Muon/Steel" name="lvSteelPlate11">
+	 <logvol material="Muon:Steel" name="lvSteelPlate11">
 	   <box name="SteelPlate11" sizeX="1.5*cm" sizeY="4.165*m" sizeZ="0.8*m"/>
 	 </logvol>
 	 
-	 <logvol material="Muon/Steel" name="lvSteelPlate12">
+	 <logvol material="Muon:Steel" name="lvSteelPlate12">
 	   <box name="SteelPlate12" sizeX="1.5*cm" sizeY="4.58*m" sizeZ="0.8*m"/>
 	 </logvol>
 
-	 <logvol material="Muon/Concrete" name="lvConcrete1">
+	 <logvol material="Muon:Concrete" name="lvConcrete1">
 	   <box name="Concrete1" sizeX="0.4*m" sizeY="0.005*m" sizeZ="0.8*m" />
 	 </logvol>
 	 
-	 <logvol material="Muon/Concrete" name="lvConcrete2">
+	 <logvol material="Muon:Concrete" name="lvConcrete2">
 	   <box name="Concrete2" sizeX="4.815*m" sizeY="0.015*m" sizeZ="0.8*m" />
 	 </logvol>
 	 
-	 <logvol material="Muon/Concrete" name="lvConcrete3">
+	 <logvol material="Muon:Concrete" name="lvConcrete3">
 	   <box name="Concrete3" sizeX="5.22*m" sizeY="1.5*cm" sizeZ="0.8*m" />
 	 </logvol>
 	 
-	 <logvol material="Muon/Concrete" name="lvConcrete4">
+	 <logvol material="Muon:Concrete" name="lvConcrete4">
 	   <box name="Concrete4" sizeX="5.62*m" sizeY="1.5*cm" sizeZ="0.8*m"/>
 	 </logvol>
 	 
-	 <logvol material="Muon/Concrete" name="lvConcrete5">
+	 <logvol material="Muon:Concrete" name="lvConcrete5">
 	   <box name="Concrete5" sizeX="5.215*m" sizeY="0.015*m" sizeZ="0.8*m" />
 	 </logvol>
 	 
-	 <logvol material="Muon/Concrete" name="lvConcrete6">
+	 <logvol material="Muon:Concrete" name="lvConcrete6">
 	   <box name="Concrete6" sizeX="3.609*m" sizeY="0.015*m" sizeZ="0.8*m" />
 	 </logvol>
 	 
-	 <logvol material="Muon/Concrete" name="lvConcrete7">
+	 <logvol material="Muon:Concrete" name="lvConcrete7">
 	   <box name="Concrete7" sizeX="0.8*m" sizeY="0.015*m" sizeZ="0.8*m" />
 	 </logvol>
 	 
diff --git a/compact/trunk/Muon/Muon/Filters/Filter3.xml b/compact/trunk/Muon/Muon/Filters/Filter3.xml
index e7eb66bf03d377d2af7b97c4bc281ef954893b0b..82a64e36d69104b89dc364deaebc5dde9a0a20ad 100644
--- a/compact/trunk/Muon/Muon/Filters/Filter3.xml
+++ b/compact/trunk/Muon/Muon/Filters/Filter3.xml
@@ -172,7 +172,7 @@
       <!--  ****************************  -->
       <!--  Parameters of BeamHole3ASide  -->
       <!--  ****************************  -->
-      <logvol material="Muon/MuonFilterIron" name="lvBeamHole3ASide">
+      <logvol material="Muon:FilterIron" name="lvBeamHole3ASide">
 	<subtraction name="FilterBeam3A">
 	  <box name="BoxBeam3A" sizeX="0.42*m" sizeY="1.215*m" sizeZ="0.8*m"/>
 	  <cons name="BeamHole3A" sizeZ="0.82*m" outerRadiusPZ="206*mm" outerRadiusMZ="198*mm"/>
@@ -188,7 +188,7 @@
       <!--  ****************************  -->
       <!--  Parameters of BeamHole3ASide  -->
       <!--  ****************************  -->
-      <logvol material="Muon/MuonFilterIron" name="lvBeamHole3CSide">
+      <logvol material="Muon:FilterIron" name="lvBeamHole3CSide">
 	<subtraction name="FilterBeam3C">
 	  <box name="BoxBeam3C" sizeX="0.42*m" sizeY="1.215*m" sizeZ="0.8*m"/>
 	  <cons name="BeamHole3C" sizeZ="0.82*m" outerRadiusPZ="206*mm" outerRadiusMZ="198*mm"/>
@@ -355,95 +355,95 @@
       <!--  ********************************************  -->
       <boxes>
 	
-	<logvol material="Muon/MuonFilterIron" name="lvBlock1">
+	<logvol material="Muon:FilterIron" name="lvBlock1">
 	  <box name="Block1" sizeX="1.6*m" sizeY="0.8*m" sizeZ="0.8*m"/>
 	</logvol>
 	
-	<logvol material="Muon/MuonFilterIron" name="lvBlock2">
+	<logvol material="Muon:FilterIron" name="lvBlock2">
 	  <box name="Block2" sizeX="1.6*m" sizeY="0.4*m" sizeZ="0.8*m"/>
 	</logvol>
 	
-	<logvol material="Muon/MuonFilterIron" name="lvBlock3">
+	<logvol material="Muon:FilterIron" name="lvBlock3">
 	  <box name="Block3" sizeX="0.8*m" sizeY="0.4*m" sizeZ="0.8*m"/>
 	</logvol>
 	
-	<logvol material="Muon/MuonFilterIron" name="lvBlock4">
+	<logvol material="Muon:FilterIron" name="lvBlock4">
 	  <box name="Block4" sizeX="0.4*m" sizeY="0.4*m" sizeZ="0.8*m"/>
 	</logvol>
 	
-	<logvol material="Muon/Steel" name="lvSteelPlate1">
+	<logvol material="Muon:Steel" name="lvSteelPlate1">
 	  <box name="SteelPlate1" sizeX="4.815*m" sizeY="0.015*m" sizeZ="0.8*m" />
 	</logvol>
 	
-	<logvol material="Muon/Steel" name="lvSteelPlate2">
+	<logvol material="Muon:Steel" name="lvSteelPlate2">
 	  <box name="SteelPlate2" sizeX="0.4*m" sizeY="0.015*m" sizeZ="0.8*m" />
 	</logvol>
 	
-	<logvol material="Muon/Steel" name="lvSteelPlate3">
+	<logvol material="Muon:Steel" name="lvSteelPlate3">
 	  <box name="SteelPlate3" sizeX="5.215*m" sizeY="0.015*m" sizeZ="0.8*m" />
 	</logvol>
 	
-	<logvol material="Muon/Steel" name="lvSteelPlate4">
+	<logvol material="Muon:Steel" name="lvSteelPlate4">
 	  <box name="SteelPlate4" sizeX="5.22*m" sizeY="1.5*cm" sizeZ="0.8*m"/>
 	</logvol>
 	
-	<logvol material="Muon/Steel" name="lvSteelPlate5">
+	<logvol material="Muon:Steel" name="lvSteelPlate5">
 	  <box name="SteelPlate5" sizeX="5*mm" sizeY="1.5*cm" sizeZ="0.8*m"/>
 	</logvol>
 	
-	<logvol material="Muon/Steel" name="lvSteelPlate6">
+	<logvol material="Muon:Steel" name="lvSteelPlate6">
 	  <box name="SteelPlate6" sizeX="0.4*m" sizeY="0.025*m" sizeZ="0.8*m" />
 	</logvol>
 	
-	<logvol material="Muon/Steel" name="lvSteelPlate7">
+	<logvol material="Muon:Steel" name="lvSteelPlate7">
 	  <box name="SteelPlate7" sizeX="3.609*m" sizeY="0.015*m" sizeZ="0.8*m" />
 	</logvol>
 	
-	<logvol material="Muon/Steel" name="lvSteelPlate8">
+	<logvol material="Muon:Steel" name="lvSteelPlate8">
 	  <box name="SteelPlate8" sizeX="0.805*m" sizeY="0.015*m" sizeZ="0.8*m" />
 	</logvol>
 	
-	<logvol material="Muon/Steel" name="lvSteelPlate9">
+	<logvol material="Muon:Steel" name="lvSteelPlate9">
 	  <box name="SteelPlate9" sizeX="5.62*m" sizeY="1.5*cm" sizeZ="0.8*m"/>
 	</logvol>
 	
-	<logvol material="Muon/Steel" name="lvSteelPlate10">
+	<logvol material="Muon:Steel" name="lvSteelPlate10">
 	  <box name="SteelPlate10" sizeX="5*mm" sizeY="2.5*cm" sizeZ="0.8*m" />
 	</logvol>
 	
-	<logvol material="Muon/Steel" name="lvSteelPlate11">
+	<logvol material="Muon:Steel" name="lvSteelPlate11">
 	  <box name="SteelPlate11" sizeX="1.5*cm" sizeY="4.165*m" sizeZ="0.8*m"/>
 	</logvol>
 	
-	<logvol material="Muon/Steel" name="lvSteelPlate12">
+	<logvol material="Muon:Steel" name="lvSteelPlate12">
 	  <box name="SteelPlate12" sizeX="1.5*cm" sizeY="4.58*m" sizeZ="0.8*m"/>
 	</logvol>
 	
-	<logvol material="Muon/Concrete" name="lvConcrete1">
+	<logvol material="Muon:Concrete" name="lvConcrete1">
 	  <box name="Concrete1" sizeX="0.4*m" sizeY="0.005*m" sizeZ="0.8*m" />
 	</logvol>
 	
-	<logvol material="Muon/Concrete" name="lvConcrete2">
+	<logvol material="Muon:Concrete" name="lvConcrete2">
 	  <box name="Concrete2" sizeX="4.815*m" sizeY="0.015*m" sizeZ="0.8*m" />
 	</logvol>
 	
-	<logvol material="Muon/Concrete" name="lvConcrete3">
+	<logvol material="Muon:Concrete" name="lvConcrete3">
 	  <box name="Concrete3" sizeX="5.22*m" sizeY="1.5*cm" sizeZ="0.8*m" />
 	</logvol>
 	
-	<logvol material="Muon/Concrete" name="lvConcrete4">
+	<logvol material="Muon:Concrete" name="lvConcrete4">
 	  <box name="Concrete4" sizeX="5.62*m" sizeY="1.5*cm" sizeZ="0.8*m"/>
 	</logvol>
 	
-	<logvol material="Muon/Concrete" name="lvConcrete5">
+	<logvol material="Muon:Concrete" name="lvConcrete5">
 	  <box name="Concrete5" sizeX="5.215*m" sizeY="0.015*m" sizeZ="0.8*m" />
 	</logvol>
 	
-	<logvol material="Muon/Concrete" name="lvConcrete6">
+	<logvol material="Muon:Concrete" name="lvConcrete6">
 	  <box name="Concrete6" sizeX="3.609*m" sizeY="0.015*m" sizeZ="0.8*m" />
 	</logvol>
 	
-	<logvol material="Muon/Concrete" name="lvConcrete7">
+	<logvol material="Muon:Concrete" name="lvConcrete7">
 	  <box name="Concrete7" sizeX="0.8*m" sizeY="0.015*m" sizeZ="0.8*m" />
 	</logvol>
 	
diff --git a/compact/trunk/Muon/Muon/Filters/Filter4.xml b/compact/trunk/Muon/Muon/Filters/Filter4.xml
index 2d9b984585161d06b8fcd8efd8aa0d28334ac09e..b75bcb14f1c2ebadcdd5d8db483ae7313751bf5f 100644
--- a/compact/trunk/Muon/Muon/Filters/Filter4.xml
+++ b/compact/trunk/Muon/Muon/Filters/Filter4.xml
@@ -26,7 +26,7 @@
        </physvol>
 
 
-       <logvol name="lvMuFilter4" material="Muon/MuonFilterIron">
+       <logvol name="lvMuFilter4" material="Muon:FilterIron">
 	 <!-- union the MF4 with an extra iron placed on top of the MF4 during winter technical stop in 2012 -->
 	 <!-- Switched from union -> Union to avoid a clash with the C++ keyword -->
 	 <Union name="MuFilter4Union">
diff --git a/compact/trunk/Muon/Muon/Materials/Elements.xml b/compact/trunk/Muon/Muon/Materials/Elements.xml
deleted file mode 100644
index 77e41ee24d73606539e14db0b66a2cae157ce5a9..0000000000000000000000000000000000000000
--- a/compact/trunk/Muon/Muon/Materials/Elements.xml
+++ /dev/null
@@ -1,951 +0,0 @@
-<materials>
-<!--
-    (c) Copyright 2020 CERN for the benefit of the LHCb Collaboration
-
-    This software is distributed under the terms of the GNU General Public
-    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
-
-    In applying this licence, CERN does not waive the privileges and immunities
-    granted to it by virtue of its status as an Intergovernmental Organization
-    or submit itself to any jurisdiction.
--->
-
-    <isotope N="1" Z="1" name="H1">
-      <atom unit="g/mole" value="1.00782503081372"/>
-    </isotope>
-    <isotope N="2" Z="1" name="H2">
-      <atom unit="g/mole" value="2.01410199966617"/>
-    </isotope>
-    <element name="H">
-      <fraction n="0.999885" ref="H1"/>
-      <fraction n="0.000115" ref="H2"/>
-    </element>
-
-    <isotope N="12" Z="6" name="C12">
-      <atom unit="g/mole" value="12"/>
-    </isotope>
-    <isotope N="13" Z="6" name="C13">
-      <atom unit="g/mole" value="13.0034"/>
-    </isotope>
-    <element name="C">
-      <fraction n="0.9893" ref="C12"/>
-      <fraction n="0.0107" ref="C13"/>
-    </element>
-
-    <isotope N="14" Z="7" name="N14">
-      <atom unit="g/mole" value="14.0031"/>
-    </isotope>
-    <isotope N="15" Z="7" name="N15">
-      <atom unit="g/mole" value="15.0001"/>
-    </isotope>
-    <element name="N">
-      <fraction n="0.99632" ref="N14"/>
-      <fraction n="0.00368" ref="N15"/>
-    </element>
-
-    <isotope N="16" Z="8" name="O16">
-      <atom unit="g/mole" value="15.9949"/>
-    </isotope>
-    <isotope N="17" Z="8" name="O17">
-      <atom unit="g/mole" value="16.9991"/>
-    </isotope>
-    <isotope N="18" Z="8" name="O18">
-      <atom unit="g/mole" value="17.9992"/>
-    </isotope>
-    <element name="O">
-      <fraction n="0.99757" ref="O16"/>
-      <fraction n="0.00038" ref="O17"/>
-      <fraction n="0.00205" ref="O18"/>
-    </element>
-
-    <isotope N="46" Z="22" name="Ti46">
-      <atom unit="g/mole" value="45.9526"/>
-    </isotope>
-    <isotope N="47" Z="22" name="Ti47">
-      <atom unit="g/mole" value="46.9518"/>
-    </isotope>
-    <isotope N="48" Z="22" name="Ti48">
-      <atom unit="g/mole" value="47.9479"/>
-    </isotope>
-    <isotope N="49" Z="22" name="Ti49">
-      <atom unit="g/mole" value="48.9479"/>
-    </isotope>
-    <isotope N="50" Z="22" name="Ti50">
-      <atom unit="g/mole" value="49.9448"/>
-    </isotope>
-    <element name="Ti">
-      <fraction n="0.0825" ref="Ti46"/>
-      <fraction n="0.0744" ref="Ti47"/>
-      <fraction n="0.7372" ref="Ti48"/>
-      <fraction n="0.0541" ref="Ti49"/>
-      <fraction n="0.0518" ref="Ti50"/>
-    </element>
-
- <element Z="89" formula="Ac" name="Ac" >
-  <atom type="A" unit="g/mol" value="227.028" />
- </element>
- <material formula="Ac" name="Actinium" state="solid" >
-  <RL type="X0" unit="cm" value="0.601558" />
-  <NIL type="lambda" unit="cm" value="21.2048" />
-  <D type="density" unit="g/cm3" value="10.07" />
-  <composite n="1" ref="Ac" />
- </material>
- <element Z="47" formula="Ag" name="Ag" >
-  <atom type="A" unit="g/mol" value="107.868" />
- </element>
- <material formula="Ag" name="Silver" state="solid" >
-  <RL type="X0" unit="cm" value="0.854292" />
-  <NIL type="lambda" unit="cm" value="15.8546" />
-  <D type="density" unit="g/cm3" value="10.5" />
-  <composite n="1" ref="Ag" />
- </material>
- <element Z="13" formula="Al" name="Al" >
-  <atom type="A" unit="g/mol" value="26.9815" />
- </element>
- <material formula="Al" name="Aluminum" state="solid" >
-  <RL type="X0" unit="cm" value="8.89632" />
-  <NIL type="lambda" unit="cm" value="38.8766" />
-  <D type="density" unit="g/cm3" value="2.699" />
-  <composite n="1" ref="Al" />
- </material>
- <element Z="95" formula="Am" name="Am" >
-  <atom type="A" unit="g/mol" value="243.061" />
- </element>
- <material formula="Am" name="Americium" state="solid" >
-  <RL type="X0" unit="cm" value="0.42431" />
-  <NIL type="lambda" unit="cm" value="15.9812" />
-  <D type="density" unit="g/cm3" value="13.67" />
-  <composite n="1" ref="Am" />
- </material>
- <element Z="18" formula="Ar" name="Ar" >
-  <atom type="A" unit="g/mol" value="39.9477" />
- </element>
- <material formula="Ar" name="Argon" state="gas" >
-  <RL type="X0" unit="cm" value="11762.1" />
-  <NIL type="lambda" unit="cm" value="71926" />
-  <D type="density" unit="g/cm3" value="0.00166201" />
-  <composite n="1" ref="Ar" />
- </material>
- <element Z="33" formula="As" name="As" >
-  <atom type="A" unit="g/mol" value="74.9216" />
- </element>
- <material formula="As" name="Arsenic" state="solid" >
-  <RL type="X0" unit="cm" value="2.0838" />
-  <NIL type="lambda" unit="cm" value="25.7324" />
-  <D type="density" unit="g/cm3" value="5.73" />
-  <composite n="1" ref="As" />
- </material>
- <element Z="85" formula="At" name="At" >
-  <atom type="A" unit="g/mol" value="209.987" />
- </element>
- <material formula="At" name="Astatine" state="solid" >
-  <RL type="X0" unit="cm" value="0.650799" />
-  <NIL type="lambda" unit="cm" value="22.3202" />
-  <D type="density" unit="g/cm3" value="9.32" />
-  <composite n="1" ref="At" />
- </material>
- <element Z="79" formula="Au" name="Au" >
-  <atom type="A" unit="g/mol" value="196.967" />
- </element>
- <material formula="Au" name="Gold" state="solid" >
-  <RL type="X0" unit="cm" value="0.334436" />
-  <NIL type="lambda" unit="cm" value="10.5393" />
-  <D type="density" unit="g/cm3" value="19.32" />
-  <composite n="1" ref="Au" />
- </material>
- <element Z="5" formula="B" name="B" >
-  <atom type="A" unit="g/mol" value="10.811" />
- </element>
- <material formula="B" name="Boron" state="solid" >
-  <RL type="X0" unit="cm" value="22.2307" />
-  <NIL type="lambda" unit="cm" value="32.2793" />
-  <D type="density" unit="g/cm3" value="2.37" />
-  <composite n="1" ref="B" />
- </material>
- <element Z="56" formula="Ba" name="Ba" >
-  <atom type="A" unit="g/mol" value="137.327" />
- </element>
- <material formula="Ba" name="Barium" state="solid" >
-  <RL type="X0" unit="cm" value="2.37332" />
-  <NIL type="lambda" unit="cm" value="51.6743" />
-  <D type="density" unit="g/cm3" value="3.5" />
-  <composite n="1" ref="Ba" />
- </material>
- <element Z="4" formula="Be" name="Be" >
-  <atom type="A" unit="g/mol" value="9.01218" />
- </element>
- <material formula="Be" name="Beryllium" state="solid" >
-  <RL type="X0" unit="cm" value="35.276" />
-  <NIL type="lambda" unit="cm" value="39.4488" />
-  <D type="density" unit="g/cm3" value="1.848" />
-  <composite n="1" ref="Be" />
- </material>
- <element Z="83" formula="Bi" name="Bi" >
-  <atom type="A" unit="g/mol" value="208.98" />
- </element>
- <material formula="Bi" name="Bismuth" state="solid" >
-  <RL type="X0" unit="cm" value="0.645388" />
-  <NIL type="lambda" unit="cm" value="21.3078" />
-  <D type="density" unit="g/cm3" value="9.747" />
-  <composite n="1" ref="Bi" />
- </material>
- <element Z="97" formula="Bk" name="Bk" >
-  <atom type="A" unit="g/mol" value="247.07" />
- </element>
- <material formula="Bk" name="Berkelium" state="solid" >
-  <RL type="X0" unit="cm" value="0.406479" />
-  <NIL type="lambda" unit="cm" value="15.6902" />
-  <D type="density" unit="g/cm3" value="14" />
-  <composite n="1" ref="Bk" />
- </material>
- <element Z="35" formula="Br" name="Br" >
-  <atom type="A" unit="g/mol" value="79.9035" />
- </element>
- <material formula="Br" name="Bromine" state="gas" >
-  <RL type="X0" unit="cm" value="1615.12" />
-  <NIL type="lambda" unit="cm" value="21299" />
-  <D type="density" unit="g/cm3" value="0.0070721" />
-  <composite n="1" ref="Br" />
- </material>
- <material formula="C" name="Carbon" state="solid" >
-  <RL type="X0" unit="cm" value="21.3485" />
-  <NIL type="lambda" unit="cm" value="40.1008" />
-  <D type="density" unit="g/cm3" value="2" />
-  <composite n="1" ref="C" />
- </material>
- <element Z="20" formula="Ca" name="Ca" >
-  <atom type="A" unit="g/mol" value="40.078" />
- </element>
- <material formula="Ca" name="Calcium" state="solid" >
-  <RL type="X0" unit="cm" value="10.4151" />
-  <NIL type="lambda" unit="cm" value="77.3754" />
-  <D type="density" unit="g/cm3" value="1.55" />
-  <composite n="1" ref="Ca" />
- </material>
- <element Z="48" formula="Cd" name="Cd" >
-  <atom type="A" unit="g/mol" value="112.411" />
- </element>
- <material formula="Cd" name="Cadmium" state="solid" >
-  <RL type="X0" unit="cm" value="1.03994" />
-  <NIL type="lambda" unit="cm" value="19.46" />
-  <D type="density" unit="g/cm3" value="8.65" />
-  <composite n="1" ref="Cd" />
- </material>
- <element Z="58" formula="Ce" name="Ce" >
-  <atom type="A" unit="g/mol" value="140.115" />
- </element>
- <material formula="Ce" name="Cerium" state="solid" >
-  <RL type="X0" unit="cm" value="1.19506" />
-  <NIL type="lambda" unit="cm" value="27.3227" />
-  <D type="density" unit="g/cm3" value="6.657" />
-  <composite n="1" ref="Ce" />
- </material>
- <element Z="98" formula="Cf" name="Cf" >
-  <atom type="A" unit="g/mol" value="251.08" />
- </element>
- <material formula="Cf" name="Californium" state="solid" >
-  <RL type="X0" unit="cm" value="0.568328" />
-  <NIL type="lambda" unit="cm" value="22.085" />
-  <D type="density" unit="g/cm3" value="10" />
-  <composite n="1" ref="Cf" />
- </material>
- <element Z="17" formula="Cl" name="Cl" >
-  <atom type="A" unit="g/mol" value="35.4526" />
- </element>
- <material formula="Cl" name="Chlorine" state="gas" >
-  <RL type="X0" unit="cm" value="6437.34" />
-  <NIL type="lambda" unit="cm" value="38723.9" />
-  <D type="density" unit="g/cm3" value="0.00299473" />
-  <composite n="1" ref="Cl" />
- </material>
- <element Z="96" formula="Cm" name="Cm" >
-  <atom type="A" unit="g/mol" value="247.07" />
- </element>
- <material formula="Cm" name="Curium" state="solid" >
-  <RL type="X0" unit="cm" value="0.428706" />
-  <NIL type="lambda" unit="cm" value="16.2593" />
-  <D type="density" unit="g/cm3" value="13.51" />
-  <composite n="1" ref="Cm" />
- </material>
- <element Z="27" formula="Co" name="Co" >
-  <atom type="A" unit="g/mol" value="58.9332" />
- </element>
- <material formula="Co" name="Cobalt" state="solid" >
-  <RL type="X0" unit="cm" value="1.53005" />
-  <NIL type="lambda" unit="cm" value="15.2922" />
-  <D type="density" unit="g/cm3" value="8.9" />
-  <composite n="1" ref="Co" />
- </material>
- <element Z="24" formula="Cr" name="Cr" >
-  <atom type="A" unit="g/mol" value="51.9961" />
- </element>
- <material formula="Cr" name="Chromium" state="solid" >
-  <RL type="X0" unit="cm" value="2.0814" />
-  <NIL type="lambda" unit="cm" value="18.1933" />
-  <D type="density" unit="g/cm3" value="7.18" />
-  <composite n="1" ref="Cr" />
- </material>
- <element Z="55" formula="Cs" name="Cs" >
-  <atom type="A" unit="g/mol" value="132.905" />
- </element>
- <material formula="Cs" name="Cesium" state="solid" >
-  <RL type="X0" unit="cm" value="4.4342" />
-  <NIL type="lambda" unit="cm" value="95.317" />
-  <D type="density" unit="g/cm3" value="1.873" />
-  <composite n="1" ref="Cs" />
- </material>
- <element Z="29" formula="Cu" name="Cu" >
-  <atom type="A" unit="g/mol" value="63.5456" />
- </element>
- <material formula="Cu" name="Copper" state="solid" >
-  <RL type="X0" unit="cm" value="1.43558" />
-  <NIL type="lambda" unit="cm" value="15.5141" />
-  <D type="density" unit="g/cm3" value="8.96" />
-  <composite n="1" ref="Cu" />
- </material>
- <element Z="66" formula="Dy" name="Dy" >
-  <atom type="A" unit="g/mol" value="162.497" />
- </element>
- <material formula="Dy" name="Dysprosium" state="solid" >
-  <RL type="X0" unit="cm" value="0.85614" />
-  <NIL type="lambda" unit="cm" value="22.2923" />
-  <D type="density" unit="g/cm3" value="8.55" />
-  <composite n="1" ref="Dy" />
- </material>
- <element Z="68" formula="Er" name="Er" >
-  <atom type="A" unit="g/mol" value="167.256" />
- </element>
- <material formula="Er" name="Erbium" state="solid" >
-  <RL type="X0" unit="cm" value="0.788094" />
-  <NIL type="lambda" unit="cm" value="21.2923" />
-  <D type="density" unit="g/cm3" value="9.066" />
-  <composite n="1" ref="Er" />
- </material>
- <element Z="63" formula="Eu" name="Eu" >
-  <atom type="A" unit="g/mol" value="151.964" />
- </element>
- <material formula="Eu" name="Europium" state="solid" >
-  <RL type="X0" unit="cm" value="1.41868" />
-  <NIL type="lambda" unit="cm" value="35.6178" />
-  <D type="density" unit="g/cm3" value="5.243" />
-  <composite n="1" ref="Eu" />
- </material>
- <element Z="9" formula="F" name="F" >
-  <atom type="A" unit="g/mol" value="18.9984" />
- </element>
- <material formula="F" name="Fluorine" state="gas" >
-  <RL type="X0" unit="cm" value="20838.2" />
-  <NIL type="lambda" unit="cm" value="59094.3" />
-  <D type="density" unit="g/cm3" value="0.00158029" />
-  <composite n="1" ref="F" />
- </material>
- <element Z="26" formula="Fe" name="Fe" >
-  <atom type="A" unit="g/mol" value="55.8451" />
- </element>
- <material formula="Fe" name="Iron" state="solid" >
-  <RL type="X0" unit="cm" value="1.75749" />
-  <NIL type="lambda" unit="cm" value="16.959" />
-  <D type="density" unit="g/cm3" value="7.874" />
-  <composite n="1" ref="Fe" />
- </material>
- <element Z="87" formula="Fr" name="Fr" >
-  <atom type="A" unit="g/mol" value="223.02" />
- </element>
- <material formula="Fr" name="Francium" state="solid" >
-  <RL type="X0" unit="cm" value="6.18826" />
-  <NIL type="lambda" unit="cm" value="212.263" />
-  <D type="density" unit="g/cm3" value="1" />
-  <composite n="1" ref="Fr" />
- </material>
- <element Z="31" formula="Ga" name="Ga" >
-  <atom type="A" unit="g/mol" value="69.7231" />
- </element>
- <material formula="Ga" name="Gallium" state="solid" >
-  <RL type="X0" unit="cm" value="2.1128" />
-  <NIL type="lambda" unit="cm" value="24.3351" />
-  <D type="density" unit="g/cm3" value="5.904" />
-  <composite n="1" ref="Ga" />
- </material>
- <element Z="64" formula="Gd" name="Gd" >
-  <atom type="A" unit="g/mol" value="157.252" />
- </element>
- <material formula="Gd" name="Gadolinium" state="solid" >
-  <RL type="X0" unit="cm" value="0.947208" />
-  <NIL type="lambda" unit="cm" value="23.9377" />
-  <D type="density" unit="g/cm3" value="7.9004" />
-  <composite n="1" ref="Gd" />
- </material>
- <element Z="32" formula="Ge" name="Ge" >
-  <atom type="A" unit="g/mol" value="72.6128" />
- </element>
- <material formula="Ge" name="Germanium" state="solid" >
-  <RL type="X0" unit="cm" value="2.3013" />
-  <NIL type="lambda" unit="cm" value="27.3344" />
-  <D type="density" unit="g/cm3" value="5.323" />
-  <composite n="1" ref="Ge" />
- </material>
- <material formula="H" name="Hydrogen" state="gas" >
-  <RL type="X0" unit="cm" value="752776" />
-  <NIL type="lambda" unit="cm" value="421239" />
-  <D type="density" unit="g/cm3" value="8.3748e-05" />
-  <composite n="1" ref="H" />
- </material>
- <element Z="2" formula="He" name="He" >
-  <atom type="A" unit="g/mol" value="4.00264" />
- </element>
- <material formula="He" name="Helium" state="gas" >
-  <RL type="X0" unit="cm" value="567113" />
-  <NIL type="lambda" unit="cm" value="334266" />
-  <D type="density" unit="g/cm3" value="0.000166322" />
-  <composite n="1" ref="He" />
- </material>
- <element Z="72" formula="Hf" name="Hf" >
-  <atom type="A" unit="g/mol" value="178.485" />
- </element>
- <material formula="Hf" name="Hafnium" state="solid" >
-  <RL type="X0" unit="cm" value="0.517717" />
-  <NIL type="lambda" unit="cm" value="14.7771" />
-  <D type="density" unit="g/cm3" value="13.31" />
-  <composite n="1" ref="Hf" />
- </material>
- <element Z="80" formula="Hg" name="Hg" >
-  <atom type="A" unit="g/mol" value="200.599" />
- </element>
- <material formula="Hg" name="Mercury" state="solid" >
-  <RL type="X0" unit="cm" value="0.475241" />
-  <NIL type="lambda" unit="cm" value="15.105" />
-  <D type="density" unit="g/cm3" value="13.546" />
-  <composite n="1" ref="Hg" />
- </material>
- <element Z="67" formula="Ho" name="Ho" >
-  <atom type="A" unit="g/mol" value="164.93" />
- </element>
- <material formula="Ho" name="Holmium" state="solid" >
-  <RL type="X0" unit="cm" value="0.822447" />
-  <NIL type="lambda" unit="cm" value="21.8177" />
-  <D type="density" unit="g/cm3" value="8.795" />
-  <composite n="1" ref="Ho" />
- </material>
- <element Z="53" formula="I" name="I" >
-  <atom type="A" unit="g/mol" value="126.904" />
- </element>
- <material formula="I" name="Iodine" state="solid" >
-  <RL type="X0" unit="cm" value="1.72016" />
-  <NIL type="lambda" unit="cm" value="35.6583" />
-  <D type="density" unit="g/cm3" value="4.93" />
-  <composite n="1" ref="I" />
- </material>
- <element Z="49" formula="In" name="In" >
-  <atom type="A" unit="g/mol" value="114.818" />
- </element>
- <material formula="In" name="Indium" state="solid" >
-  <RL type="X0" unit="cm" value="1.21055" />
-  <NIL type="lambda" unit="cm" value="23.2468" />
-  <D type="density" unit="g/cm3" value="7.31" />
-  <composite n="1" ref="In" />
- </material>
- <element Z="77" formula="Ir" name="Ir" >
-  <atom type="A" unit="g/mol" value="192.216" />
- </element>
- <material formula="Ir" name="Iridium" state="solid" >
-  <RL type="X0" unit="cm" value="0.294142" />
-  <NIL type="lambda" unit="cm" value="9.01616" />
-  <D type="density" unit="g/cm3" value="22.42" />
-  <composite n="1" ref="Ir" />
- </material>
- <element Z="19" formula="K" name="K" >
-  <atom type="A" unit="g/mol" value="39.0983" />
- </element>
- <material formula="K" name="Potassium" state="solid" >
-  <RL type="X0" unit="cm" value="20.0871" />
-  <NIL type="lambda" unit="cm" value="138.041" />
-  <D type="density" unit="g/cm3" value="0.862" />
-  <composite n="1" ref="K" />
- </material>
- <element Z="36" formula="Kr" name="Kr" >
-  <atom type="A" unit="g/mol" value="83.7993" />
- </element>
- <material formula="Kr" name="Krypton" state="gas" >
-  <RL type="X0" unit="cm" value="3269.44" />
-  <NIL type="lambda" unit="cm" value="43962.9" />
-  <D type="density" unit="g/cm3" value="0.00347832" />
-  <composite n="1" ref="Kr" />
- </material>
- <element Z="57" formula="La" name="La" >
-  <atom type="A" unit="g/mol" value="138.905" />
- </element>
- <material formula="La" name="Lanthanum" state="solid" >
-  <RL type="X0" unit="cm" value="1.32238" />
-  <NIL type="lambda" unit="cm" value="29.441" />
-  <D type="density" unit="g/cm3" value="6.154" />
-  <composite n="1" ref="La" />
- </material>
- <element Z="3" formula="Li" name="Li" >
-  <atom type="A" unit="g/mol" value="6.94003" />
- </element>
- <material formula="Li" name="Lithium" state="solid" >
-  <RL type="X0" unit="cm" value="154.997" />
-  <NIL type="lambda" unit="cm" value="124.305" />
-  <D type="density" unit="g/cm3" value="0.534" />
-  <composite n="1" ref="Li" />
- </material>
- <element Z="71" formula="Lu" name="Lu" >
-  <atom type="A" unit="g/mol" value="174.967" />
- </element>
- <material formula="Lu" name="Lutetium" state="solid" >
-  <RL type="X0" unit="cm" value="0.703651" />
-  <NIL type="lambda" unit="cm" value="19.8916" />
-  <D type="density" unit="g/cm3" value="9.84" />
-  <composite n="1" ref="Lu" />
- </material>
- <element Z="12" formula="Mg" name="Mg" >
-  <atom type="A" unit="g/mol" value="24.305" />
- </element>
- <material formula="Mg" name="Magnesium" state="solid" >
-  <RL type="X0" unit="cm" value="14.3859" />
-  <NIL type="lambda" unit="cm" value="58.7589" />
-  <D type="density" unit="g/cm3" value="1.74" />
-  <composite n="1" ref="Mg" />
- </material>
- <element Z="25" formula="Mn" name="Mn" >
-  <atom type="A" unit="g/mol" value="54.938" />
- </element>
- <material formula="Mn" name="Manganese" state="solid" >
-  <RL type="X0" unit="cm" value="1.96772" />
-  <NIL type="lambda" unit="cm" value="17.8701" />
-  <D type="density" unit="g/cm3" value="7.44" />
-  <composite n="1" ref="Mn" />
- </material>
- <element Z="42" formula="Mo" name="Mo" >
-  <atom type="A" unit="g/mol" value="95.9313" />
- </element>
- <material formula="Mo" name="Molybdenum" state="solid" >
-  <RL type="X0" unit="cm" value="0.959107" />
-  <NIL type="lambda" unit="cm" value="15.6698" />
-  <D type="density" unit="g/cm3" value="10.22" />
-  <composite n="1" ref="Mo" />
- </material>
- <material formula="N" name="Nitrogen" state="gas" >
-  <RL type="X0" unit="cm" value="32602.2" />
-  <NIL type="lambda" unit="cm" value="72430.3" />
-  <D type="density" unit="g/cm3" value="0.0011652" />
-  <composite n="1" ref="N" />
- </material>
- <element Z="11" formula="Na" name="Na" >
-  <atom type="A" unit="g/mol" value="22.9898" />
- </element>
- <material formula="Na" name="Sodium" state="solid" >
-  <RL type="X0" unit="cm" value="28.5646" />
-  <NIL type="lambda" unit="cm" value="102.463" />
-  <D type="density" unit="g/cm3" value="0.971" />
-  <composite n="1" ref="Na" />
- </material>
- <element Z="41" formula="Nb" name="Nb" >
-  <atom type="A" unit="g/mol" value="92.9064" />
- </element>
- <material formula="Nb" name="Niobium" state="solid" >
-  <RL type="X0" unit="cm" value="1.15783" />
-  <NIL type="lambda" unit="cm" value="18.4846" />
-  <D type="density" unit="g/cm3" value="8.57" />
-  <composite n="1" ref="Nb" />
- </material>
- <element Z="60" formula="Nd" name="Nd" >
-  <atom type="A" unit="g/mol" value="144.236" />
- </element>
- <material formula="Nd" name="Neodymium" state="solid" >
-  <RL type="X0" unit="cm" value="1.11667" />
-  <NIL type="lambda" unit="cm" value="26.6308" />
-  <D type="density" unit="g/cm3" value="6.9" />
-  <composite n="1" ref="Nd" />
- </material>
- <element Z="10" formula="Ne" name="Ne" >
-  <atom type="A" unit="g/mol" value="20.18" />
- </element>
- <material formula="Ne" name="Neon" state="gas" >
-  <RL type="X0" unit="cm" value="34504.8" />
-  <NIL type="lambda" unit="cm" value="114322" />
-  <D type="density" unit="g/cm3" value="0.000838505" />
-  <composite n="1" ref="Ne" />
- </material>
- <element Z="28" formula="Ni" name="Ni" >
-  <atom type="A" unit="g/mol" value="58.6933" />
- </element>
- <material formula="Ni" name="Nickel" state="solid" >
-  <RL type="X0" unit="cm" value="1.42422" />
-  <NIL type="lambda" unit="cm" value="15.2265" />
-  <D type="density" unit="g/cm3" value="8.902" />
-  <composite n="1" ref="Ni" />
- </material>
- <element Z="93" formula="Np" name="Np" >
-  <atom type="A" unit="g/mol" value="237.048" />
- </element>
- <material formula="Np" name="Neptunium" state="solid" >
-  <RL type="X0" unit="cm" value="0.289676" />
-  <NIL type="lambda" unit="cm" value="10.6983" />
-  <D type="density" unit="g/cm3" value="20.25" />
-  <composite n="1" ref="Np" />
- </material>
- <material formula="O" name="Oxygen" state="gas" >
-  <RL type="X0" unit="cm" value="25713.8" />
-  <NIL type="lambda" unit="cm" value="66233.9" />
-  <D type="density" unit="g/cm3" value="0.00133151" />
-  <composite n="1" ref="O" />
- </material>
- <element Z="76" formula="Os" name="Os" >
-  <atom type="A" unit="g/mol" value="190.225" />
- </element>
- <material formula="Os" name="Osmium" state="solid" >
-  <RL type="X0" unit="cm" value="0.295861" />
-  <NIL type="lambda" unit="cm" value="8.92553" />
-  <D type="density" unit="g/cm3" value="22.57" />
-  <composite n="1" ref="Os" />
- </material>
- <element Z="15" formula="P" name="P" >
-  <atom type="A" unit="g/mol" value="30.9738" />
- </element>
- <material formula="P" name="Phosphorus" state="solid" >
-  <RL type="X0" unit="cm" value="9.63879" />
-  <NIL type="lambda" unit="cm" value="49.9343" />
-  <D type="density" unit="g/cm3" value="2.2" />
-  <composite n="1" ref="P" />
- </material>
- <element Z="91" formula="Pa" name="Pa" >
-  <atom type="A" unit="g/mol" value="231.036" />
- </element>
- <material formula="Pa" name="Protactinium" state="solid" >
-  <RL type="X0" unit="cm" value="0.38607" />
-  <NIL type="lambda" unit="cm" value="13.9744" />
-  <D type="density" unit="g/cm3" value="15.37" />
-  <composite n="1" ref="Pa" />
- </material>
- <element Z="82" formula="Pb" name="Pb" >
-  <atom type="A" unit="g/mol" value="207.217" />
- </element>
- <material formula="Pb" name="Lead" state="solid" >
-  <RL type="X0" unit="cm" value="0.561253" />
-  <NIL type="lambda" unit="cm" value="18.2607" />
-  <D type="density" unit="g/cm3" value="11.35" />
-  <composite n="1" ref="Pb" />
- </material>
- <element Z="46" formula="Pd" name="Pd" >
-  <atom type="A" unit="g/mol" value="106.415" />
- </element>
- <material formula="Pd" name="Palladium" state="solid" >
-  <RL type="X0" unit="cm" value="0.765717" />
-  <NIL type="lambda" unit="cm" value="13.7482" />
-  <D type="density" unit="g/cm3" value="12.02" />
-  <composite n="1" ref="Pd" />
- </material>
- <element Z="61" formula="Pm" name="Pm" >
-  <atom type="A" unit="g/mol" value="144.913" />
- </element>
- <material formula="Pm" name="Promethium" state="solid" >
-  <RL type="X0" unit="cm" value="1.04085" />
-  <NIL type="lambda" unit="cm" value="25.4523" />
-  <D type="density" unit="g/cm3" value="7.22" />
-  <composite n="1" ref="Pm" />
- </material>
- <element Z="84" formula="Po" name="Po" >
-  <atom type="A" unit="g/mol" value="208.982" />
- </element>
- <material formula="Po" name="Polonium" state="solid" >
-  <RL type="X0" unit="cm" value="0.661092" />
-  <NIL type="lambda" unit="cm" value="22.2842" />
-  <D type="density" unit="g/cm3" value="9.32" />
-  <composite n="1" ref="Po" />
- </material>
- <element Z="59" formula="Pr" name="Pr" >
-  <atom type="A" unit="g/mol" value="140.908" />
- </element>
- <material formula="Pr" name="Praseodymium" state="solid" >
-  <RL type="X0" unit="cm" value="1.1562" />
-  <NIL type="lambda" unit="cm" value="27.1312" />
-  <D type="density" unit="g/cm3" value="6.71" />
-  <composite n="1" ref="Pr" />
- </material>
- <element Z="78" formula="Pt" name="Pt" >
-  <atom type="A" unit="g/mol" value="195.078" />
- </element>
- <material formula="Pt" name="Platinum" state="solid" >
-  <RL type="X0" unit="cm" value="0.305053" />
-  <NIL type="lambda" unit="cm" value="9.46584" />
-  <D type="density" unit="g/cm3" value="21.45" />
-  <composite n="1" ref="Pt" />
- </material>
- <element Z="94" formula="Pu" name="Pu" >
-  <atom type="A" unit="g/mol" value="244.064" />
- </element>
- <material formula="Pu" name="Plutonium" state="solid" >
-  <RL type="X0" unit="cm" value="0.298905" />
-  <NIL type="lambda" unit="cm" value="11.0265" />
-  <D type="density" unit="g/cm3" value="19.84" />
-  <composite n="1" ref="Pu" />
- </material>
- <element Z="88" formula="Ra" name="Ra" >
-  <atom type="A" unit="g/mol" value="226.025" />
- </element>
- <material formula="Ra" name="Radium" state="solid" >
-  <RL type="X0" unit="cm" value="1.22987" />
-  <NIL type="lambda" unit="cm" value="42.6431" />
-  <D type="density" unit="g/cm3" value="5" />
-  <composite n="1" ref="Ra" />
- </material>
- <element Z="37" formula="Rb" name="Rb" >
-  <atom type="A" unit="g/mol" value="85.4677" />
- </element>
- <material formula="Rb" name="Rubidium" state="solid" >
-  <RL type="X0" unit="cm" value="7.19774" />
-  <NIL type="lambda" unit="cm" value="100.218" />
-  <D type="density" unit="g/cm3" value="1.532" />
-  <composite n="1" ref="Rb" />
- </material>
- <element Z="75" formula="Re" name="Re" >
-  <atom type="A" unit="g/mol" value="186.207" />
- </element>
- <material formula="Re" name="Rhenium" state="solid" >
-  <RL type="X0" unit="cm" value="0.318283" />
-  <NIL type="lambda" unit="cm" value="9.5153" />
-  <D type="density" unit="g/cm3" value="21.02" />
-  <composite n="1" ref="Re" />
- </material>
- <element Z="45" formula="Rh" name="Rh" >
-  <atom type="A" unit="g/mol" value="102.906" />
- </element>
- <material formula="Rh" name="Rhodium" state="solid" >
-  <RL type="X0" unit="cm" value="0.746619" />
-  <NIL type="lambda" unit="cm" value="13.2083" />
-  <D type="density" unit="g/cm3" value="12.41" />
-  <composite n="1" ref="Rh" />
- </material>
- <element Z="86" formula="Rn" name="Rn" >
-  <atom type="A" unit="g/mol" value="222.018" />
- </element>
- <material formula="Rn" name="Radon" state="gas" >
-  <RL type="X0" unit="cm" value="697.777" />
-  <NIL type="lambda" unit="cm" value="23532" />
-  <D type="density" unit="g/cm3" value="0.00900662" />
-  <composite n="1" ref="Rn" />
- </material>
- <element Z="44" formula="Ru" name="Ru" >
-  <atom type="A" unit="g/mol" value="101.065" />
- </element>
- <material formula="Ru" name="Ruthenium" state="solid" >
-  <RL type="X0" unit="cm" value="0.764067" />
-  <NIL type="lambda" unit="cm" value="13.1426" />
-  <D type="density" unit="g/cm3" value="12.41" />
-  <composite n="1" ref="Ru" />
- </material>
- <element Z="16" formula="S" name="S" >
-  <atom type="A" unit="g/mol" value="32.0661" />
- </element>
- <material formula="S" name="Sulfur" state="solid" >
-  <RL type="X0" unit="cm" value="9.74829" />
-  <NIL type="lambda" unit="cm" value="55.6738" />
-  <D type="density" unit="g/cm3" value="2" />
-  <composite n="1" ref="S" />
- </material>
- <element Z="51" formula="Sb" name="Sb" >
-  <atom type="A" unit="g/mol" value="121.76" />
- </element>
- <material formula="Sb" name="Antimony" state="solid" >
-  <RL type="X0" unit="cm" value="1.30401" />
-  <NIL type="lambda" unit="cm" value="25.8925" />
-  <D type="density" unit="g/cm3" value="6.691" />
-  <composite n="1" ref="Sb" />
- </material>
- <element Z="21" formula="Sc" name="Sc" >
-  <atom type="A" unit="g/mol" value="44.9559" />
- </element>
- <material formula="Sc" name="Scandium" state="solid" >
-  <RL type="X0" unit="cm" value="5.53545" />
-  <NIL type="lambda" unit="cm" value="41.609" />
-  <D type="density" unit="g/cm3" value="2.989" />
-  <composite n="1" ref="Sc" />
- </material>
- <element Z="34" formula="Se" name="Se" >
-  <atom type="A" unit="g/mol" value="78.9594" />
- </element>
- <material formula="Se" name="Selenium" state="solid" >
-  <RL type="X0" unit="cm" value="2.64625" />
-  <NIL type="lambda" unit="cm" value="33.356" />
-  <D type="density" unit="g/cm3" value="4.5" />
-  <composite n="1" ref="Se" />
- </material>
- <element Z="14" formula="Si" name="Si" >
-  <atom type="A" unit="g/mol" value="28.0854" />
- </element>
- <material formula="Si" name="Silicon" state="solid" >
-  <RL type="X0" unit="cm" value="9.36607" />
-  <NIL type="lambda" unit="cm" value="45.7531" />
-  <D type="density" unit="g/cm3" value="2.33" />
-  <composite n="1" ref="Si" />
- </material>
- <element Z="62" formula="Sm" name="Sm" >
-  <atom type="A" unit="g/mol" value="150.366" />
- </element>
- <material formula="Sm" name="Samarium" state="solid" >
-  <RL type="X0" unit="cm" value="1.01524" />
-  <NIL type="lambda" unit="cm" value="24.9892" />
-  <D type="density" unit="g/cm3" value="7.46" />
-  <composite n="1" ref="Sm" />
- </material>
- <element Z="50" formula="Sn" name="Sn" >
-  <atom type="A" unit="g/mol" value="118.71" />
- </element>
- <material formula="Sn" name="Tin" state="solid" >
-  <RL type="X0" unit="cm" value="1.20637" />
-  <NIL type="lambda" unit="cm" value="23.4931" />
-  <D type="density" unit="g/cm3" value="7.31" />
-  <composite n="1" ref="Sn" />
- </material>
- <element Z="38" formula="Sr" name="Sr" >
-  <atom type="A" unit="g/mol" value="87.6166" />
- </element>
- <material formula="Sr" name="Strontium" state="solid" >
-  <RL type="X0" unit="cm" value="4.237" />
-  <NIL type="lambda" unit="cm" value="61.0238" />
-  <D type="density" unit="g/cm3" value="2.54" />
-  <composite n="1" ref="Sr" />
- </material>
- <element Z="73" formula="Ta" name="Ta" >
-  <atom type="A" unit="g/mol" value="180.948" />
- </element>
- <material formula="Ta" name="Tantalum" state="solid" >
-  <RL type="X0" unit="cm" value="0.409392" />
-  <NIL type="lambda" unit="cm" value="11.8846" />
-  <D type="density" unit="g/cm3" value="16.654" />
-  <composite n="1" ref="Ta" />
- </material>
- <element Z="65" formula="Tb" name="Tb" >
-  <atom type="A" unit="g/mol" value="158.925" />
- </element>
- <material formula="Tb" name="Terbium" state="solid" >
-  <RL type="X0" unit="cm" value="0.893977" />
-  <NIL type="lambda" unit="cm" value="23.0311" />
-  <D type="density" unit="g/cm3" value="8.229" />
-  <composite n="1" ref="Tb" />
- </material>
- <element Z="43" formula="Tc" name="Tc" >
-  <atom type="A" unit="g/mol" value="97.9072" />
- </element>
- <material formula="Tc" name="Technetium" state="solid" >
-  <RL type="X0" unit="cm" value="0.833149" />
-  <NIL type="lambda" unit="cm" value="14.0185" />
-  <D type="density" unit="g/cm3" value="11.5" />
-  <composite n="1" ref="Tc" />
- </material>
- <element Z="52" formula="Te" name="Te" >
-  <atom type="A" unit="g/mol" value="127.603" />
- </element>
- <material formula="Te" name="Tellurium" state="solid" >
-  <RL type="X0" unit="cm" value="1.41457" />
-  <NIL type="lambda" unit="cm" value="28.1797" />
-  <D type="density" unit="g/cm3" value="6.24" />
-  <composite n="1" ref="Te" />
- </material>
- <element Z="90" formula="Th" name="Th" >
-  <atom type="A" unit="g/mol" value="232.038" />
- </element>
- <material formula="Th" name="Thorium" state="solid" >
-  <RL type="X0" unit="cm" value="0.51823" />
-  <NIL type="lambda" unit="cm" value="18.353" />
-  <D type="density" unit="g/cm3" value="11.72" />
-  <composite n="1" ref="Th" />
- </material>
- <material formula="Ti" name="Titanium" state="solid" >
-  <RL type="X0" unit="cm" value="3.5602" />
-  <NIL type="lambda" unit="cm" value="27.9395" />
-  <D type="density" unit="g/cm3" value="4.54" />
-  <composite n="1" ref="Ti" />
- </material>
- <element Z="81" formula="Tl" name="Tl" >
-  <atom type="A" unit="g/mol" value="204.383" />
- </element>
- <material formula="Tl" name="Thallium" state="solid" >
-  <RL type="X0" unit="cm" value="0.547665" />
-  <NIL type="lambda" unit="cm" value="17.6129" />
-  <D type="density" unit="g/cm3" value="11.72" />
-  <composite n="1" ref="Tl" />
- </material>
- <element Z="69" formula="Tm" name="Tm" >
-  <atom type="A" unit="g/mol" value="168.934" />
- </element>
- <material formula="Tm" name="Thulium" state="solid" >
-  <RL type="X0" unit="cm" value="0.754428" />
-  <NIL type="lambda" unit="cm" value="20.7522" />
-  <D type="density" unit="g/cm3" value="9.321" />
-  <composite n="1" ref="Tm" />
- </material>
- <element Z="92" formula="U" name="U" >
-  <atom type="A" unit="g/mol" value="238.029" />
- </element>
- <material formula="U" name="Uranium" state="solid" >
-  <RL type="X0" unit="cm" value="0.31663" />
-  <NIL type="lambda" unit="cm" value="11.4473" />
-  <D type="density" unit="g/cm3" value="18.95" />
-  <composite n="1" ref="U" />
- </material>
- <element Z="23" formula="V" name="V" >
-  <atom type="A" unit="g/mol" value="50.9415" />
- </element>
- <material formula="V" name="Vanadium" state="solid" >
-  <RL type="X0" unit="cm" value="2.59285" />
-  <NIL type="lambda" unit="cm" value="21.2187" />
-  <D type="density" unit="g/cm3" value="6.11" />
-  <composite n="1" ref="V" />
- </material>
- <element Z="74" formula="W" name="W" >
-  <atom type="A" unit="g/mol" value="183.842" />
- </element>
- <material formula="W" name="Tungsten" state="solid" >
-  <RL type="X0" unit="cm" value="0.350418" />
-  <NIL type="lambda" unit="cm" value="10.3057" />
-  <D type="density" unit="g/cm3" value="19.3" />
-  <composite n="1" ref="W" />
- </material>
- <element Z="54" formula="Xe" name="Xe" >
-  <atom type="A" unit="g/mol" value="131.292" />
- </element>
- <material formula="Xe" name="Xenon" state="gas" >
-  <RL type="X0" unit="cm" value="1546.2" />
-  <NIL type="lambda" unit="cm" value="32477.9" />
-  <D type="density" unit="g/cm3" value="0.00548536" />
-  <composite n="1" ref="Xe" />
- </material>
- <element Z="39" formula="Y" name="Y" >
-  <atom type="A" unit="g/mol" value="88.9058" />
- </element>
- <material formula="Y" name="Yttrium" state="solid" >
-  <RL type="X0" unit="cm" value="2.32943" />
-  <NIL type="lambda" unit="cm" value="34.9297" />
-  <D type="density" unit="g/cm3" value="4.469" />
-  <composite n="1" ref="Y" />
- </material>
- <element Z="70" formula="Yb" name="Yb" >
-  <atom type="A" unit="g/mol" value="173.038" />
- </element>
- <material formula="Yb" name="Ytterbium" state="solid" >
-  <RL type="X0" unit="cm" value="1.04332" />
-  <NIL type="lambda" unit="cm" value="28.9843" />
-  <D type="density" unit="g/cm3" value="6.73" />
-  <composite n="1" ref="Yb" />
- </material>
- <element Z="30" formula="Zn" name="Zn" >
-  <atom type="A" unit="g/mol" value="65.3955" />
- </element>
- <material formula="Zn" name="Zinc" state="solid" >
-  <RL type="X0" unit="cm" value="1.74286" />
-  <NIL type="lambda" unit="cm" value="19.8488" />
-  <D type="density" unit="g/cm3" value="7.133" />
-  <composite n="1" ref="Zn" />
- </material>
- <element Z="40" formula="Zr" name="Zr" >
-  <atom type="A" unit="g/mol" value="91.2236" />
- </element>
- <material formula="Zr" name="Zirconium" state="solid" >
-  <RL type="X0" unit="cm" value="1.56707" />
-  <NIL type="lambda" unit="cm" value="24.2568" />
-  <D type="density" unit="g/cm3" value="6.506" />
-  <composite n="1" ref="Zr" />
- </material>
-</materials>
\ No newline at end of file
diff --git a/compact/trunk/Muon/Muon/Materials/MuonMaterials.xml b/compact/trunk/Muon/Muon/Materials/MuonMaterials.xml
index 4b1a9ed36422b21b0e5aebc6887a8694e042ef02..ded175d3833c6167d71bb88a5b43d6da059788e1 100644
--- a/compact/trunk/Muon/Muon/Materials/MuonMaterials.xml
+++ b/compact/trunk/Muon/Muon/Materials/MuonMaterials.xml
@@ -10,134 +10,92 @@
     or submit itself to any jurisdiction.
 -->
 
-<!--**********  Materials I added myself  **********-->
-  <material name="Air">
-    <MEE unit="eV" value="85.7"/>
-    <D type="density" unit="g/cm3" value="0.00120479" state="gas"/>
-    <fraction n="0.000124000124000124" ref="C"/>
-    <fraction n="0.755267755267755" ref="N"/>
-    <fraction n="0.231781231781232" ref="O"/>
-    <fraction n="0.0128270128270128" ref="Ar"/>
-  </material>
-
-  <material name="Vacuum">
-    <D type="density" unit="g/cm3" value="0.00000000001" state="gas"/>
-    <fraction n="1" ref="Air"/>
-  </material>
-
-  <!-- Renaming of Aluminium-->
-  <material name="Aluminium">
-    <D type="density" unit="g/cm3" value="2.699"/>
-    <fraction n="1" ref="Aluminum"/>
-  </material>
-  <!--  *********************************************  -->
-
-
-  <!-- %%%%%%         epoxy           %%%%%%%% -->
-  <material name="Epoxy">
-    <D type="density" unit="g/cm3" value="1.3"/>
-    <composite ref="Carbon"   n="15"/>
-    <composite ref="Hydrogen" n="44"/>
-    <composite ref="Oxygen"   n="7"/>
-  </material>
-
-  <material name="SiO2">
-    <D type="density" unit="g/cm3" value="2.64"/>
-    <composite n="1" ref="Silicon"/>
-    <composite n="2" ref="Oxygen"/>
-  </material>
-
   <!-- %%%%%%         G10             %%%%%%%% -->
-  <material name="G10">
+  <material name="Muon:G10">
     <D type="density" unit="g/cm3" value="1.7"/>
-    <fraction n="0.853" ref="SiO2"/>
+    <fraction n="0.853" ref="SiliconOxide"/>
     <fraction n="0.147" ref="Epoxy"/>
   </material>
   <!-- %%%%%% G10 0.8mm planels with 50micron Cu cladding
        total thickness is 0.9 mm %%%%%%%% -->
-  <material name="G10CuClad">
+  <material name="Muon:G10CuClad">
     <D type="density" unit="g/cm3" value="1.7"/>
-    <fraction ref="G10" n="0.60"/>
-    <fraction ref="Copper" n="0.40"/>
+    <fraction ref="Muon:G10" n="0.60"/>
+    <fraction ref="Copper"   n="0.40"/>
   </material>
   <!-- %%%%%% G10/Air mix for chamber surrounds %%%%%%%% -->
-  <material name="G10Air">
+  <material name="Muon:G10Air">
     <D type="density" unit="g/cm3" value="0.76"/>
-    <fraction ref="G10" n="0.55"/>
-    <fraction ref="Air"      n="0.45"/>
+    <fraction ref="Muon:G10" n="0.55"/>
+    <fraction ref="Air" n="0.45"/>
   </material>
   <!-- %%%%%%              Honeycomb                 %%%%%% -->
-  <material name="Honeycomb">
+  <material name="Muon:Honeycomb">
     <D type="density" unit="g/cm3" value="0.00628"/>
     <fraction ref="Air"      n="0.97"/>
-    <fraction ref="G10" n="0.03"/>
+    <fraction ref="Muon:G10" n="0.03"/>
   </material>
   <!-- %%%%%%         Polystyrene_Foam                   %%%%%% -->
-  <material name="Polystyrene_Foam">
+  <material name="Muon:Polystyrene_Foam">
     <D type="density" unit="g/cm3" value="0.00350"/>
     <composite ref="Hydrogen" n="1"/>
     <composite ref="Carbon"   n="1"/>
   </material>
 
-  <material name="ArgonGas">
-    <D type="density" unit="g/cm3" value="0.16390E-02" state="gas"/>
-    <composite ref="Argon" n="1"/>
-  </material>
-
-  <material name="CO2">
+  <material name="Muon:CO2">
     <D type="density" unit="g/cm3" value="1.8182E-03" state="gas"/>
     <composite ref="Carbon" n="1"/>
     <composite ref="Oxygen" n="2"/>
   </material>
 
-  <material name="CF4">
+  <material name="Muon:CF4">
     <D type="density" unit="g/cm3" value="0.003884" state="gas"/>
     <composite ref="Carbon" n="1"/>
     <composite ref="Fluorine" n="4"/>
   </material>
 
   <!-- %%%%%%              S_CPC_gas    %%%%%% -->
-  <material name="S_CPC_gas">
+  <material name="Muon:S_CPC_gas">
     <D type="density" unit="g/cm3" value="0.002054" state="gas"/>
-    <fraction ref="ArgonGas" n="0.6"/>
-    <fraction ref="CF4"      n="0.1"/>
-    <fraction ref="CO2"      n="0.3"/>
+    <fraction ref="Argon"    n="0.6"/>
+    <fraction ref="Muon:CF4" n="0.1"/>
+    <fraction ref="Muon:CO2" n="0.3"/>
   </material>
   <!-- %%%%%%             C2_H2_F4    %%%%%% -->
-  <material name="C2_H2_F4">
+  <material name="Muon:C2_H2_F4">
     <D type="density" unit="g/cm3" value="4.0064887" state="gas"/>
     <composite ref="Carbon"   n="2"/>
     <composite ref="Hydrogen" n="2"/>
     <composite ref="Fluorine" n="4"/>
   </material>
   <!-- %%%%%%            SF6    %%%%%% -->
-  <material name="SF6">
+  <material name="Muon:SF6">
     <D type="density" unit="g/cm3" value="2.0094817" state="gas"/>
     <composite ref="Sulfur"   n="1"/>
     <composite ref="Fluorine" n="6"/>
   </material>
   <!-- %%%%%%            C4_H10    %%%%%% -->
-  <material name="C4_H10">
+  <material name="Muon:C4_H10">
     <D type="density" unit="g/cm3" value="8.0008375" state="gas"/>
     <composite ref="Carbon"   n="4"/>
     <composite ref="Hydrogen" n="10"/>
   </material>
   <!-- %%%%%%              S_MRPC_gas    %%%%%% -->
-  <material name="S_MRPC_gas">
+  <material name="Muon:S_MRPC_gas">
     <D type="density" unit="g/cm3" value="0.004514" state="gas"/>
-    <fraction ref="C2_H2_F4" n="0.96"/>
-    <fraction ref="C4_H10"   n="0.03"/>
-    <fraction ref="SF6"      n="0.01"/>
+    <fraction ref="Muon:C2_H2_F4" n="0.96"/>
+    <fraction ref="Muon:C4_H10"   n="0.03"/>
+    <fraction ref="Muon:SF6"      n="0.01"/>
   </material>
   <!-- %%%%%%              Phenolic    %%%%%% -->
-  <material name="Phenolic">
+  <material name="Muon:Phenolic">
     <D type="density" unit="g/cm3" value="1.25"/>
     <fraction n="0.05744" ref="Hydrogen"/>
     <fraction n="0.77459" ref="Carbon"/>
-    <fraction n="0.16797" ref="SF6"/>
+    <fraction n="0.16797" ref="Muon:SF6"/>
   </material>
   <!-- %%%%%%              Muon Filter Iron  %%%%%%%% -->
-  <material name="MuonFilterIron">  
+  <material name="Muon:FilterIron">  
     <D type="density" unit="g/cm3" value="7.5"/>
     <fraction n="0.9851" ref="Iron"/>
     <fraction n="0.005"  ref="Carbon"/>
@@ -147,7 +105,7 @@
   </material>
   
   <!--steel -->
-  <material name="Steel">
+  <material name="Muon:Steel">
     <D type="density" unit="g/cm3" value="7.8"/>
     <fraction n="0.7" ref="Iron"  />
     <fraction n="0.1" ref="Carbon"/>
@@ -156,22 +114,17 @@
   
   
   <!--Concrete-->
-  <material name="Concrete">
+  <material name="Muon:Concrete">
     <D type="density" unit="g/cm3" value="2.5"/>
     <fraction n="0.520" ref="Oxygen"  />
     <fraction n="0.325" ref="Silicon"  />
     <fraction n="0.060" ref="Calcium"  />
     <fraction n="0.015" ref="Sodium"  />
     <fraction n="0.020" ref="Iron"  />
-    <fraction n="0.040" ref="Aluminium"  />
+    <fraction n="0.040" ref="Aluminum"  />
   </material>
-  
-  <material name="MuonCopper">
-    <D type="density" unit="g/cm3" value="8.96"/>
-    <fraction n="1.0" ref="Copper"/>
-  </material>
-  
-  <material name="MuonPolyurethane">
+
+  <material name="Muon:Polyurethane">
     <D type="density" unit="g/cm3" value="0.5"/>
     <fraction n="0.0264" ref="Hydrogen"/>
     <fraction n="0.6911" ref="Carbon"/>
@@ -179,7 +132,7 @@
     <fraction n="0.2092" ref="Oxygen"/>
   </material>
   
-  <material name="Kapton">
+  <material name="Muon:Kapton">
     <D type="density" unit="g/cm3" value="1.42"/>
     <fraction n="0.0264" ref="Hydrogen"/>
     <fraction n="0.6911" ref="Carbon"/>
diff --git a/compact/trunk/Muon/Muon/Regions/ASide/M2ASideR1ChamPos.xml b/compact/trunk/Muon/Muon/Regions/ASide/M2ASideR1ChamPos.xml
index e9ecd1793b388678902dab6d4fdf1016e633a0bd..b2f7dd7903850f999f26c0672022f07f4ae30045 100644
--- a/compact/trunk/Muon/Muon/Regions/ASide/M2ASideR1ChamPos.xml
+++ b/compact/trunk/Muon/Muon/Regions/ASide/M2ASideR1ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="308.000000*mm" sizeY="252.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
 
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="308.000000*mm" sizeY="252.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
 
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="308.000000*mm" sizeY="252.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
 
@@ -114,21 +114,21 @@
       </physvol>
       </logvol>
 
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
          <box name="Copper30mic" sizeX="308.000000*mm" sizeY="252.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
 
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="308.000000*mm" sizeY="252.800000*mm" sizeZ="1.600000*mm"/>
       </logvol>
 
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="308.000000*mm" sizeY="252.800000*mm" sizeZ="2.900000*mm"/>
       </logvol>
 
 
 
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="390.000000*mm" sizeY="335.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="308.000000*mm" sizeY="252.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/trunk/Muon/Muon/Regions/ASide/M2ASideR2ChamPos.xml b/compact/trunk/Muon/Muon/Regions/ASide/M2ASideR2ChamPos.xml
index 4cfcb6385fc6c6f33f9a3d3a607245b44459c751..55bf7781fd609a991edae2875ee11747a7e2b2a7 100644
--- a/compact/trunk/Muon/Muon/Regions/ASide/M2ASideR2ChamPos.xml
+++ b/compact/trunk/Muon/Muon/Regions/ASide/M2ASideR2ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="612.000000*mm" sizeY="252.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
 
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="612.000000*mm" sizeY="252.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
 
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="612.000000*mm" sizeY="252.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
 
@@ -114,21 +114,21 @@
       </physvol>
       </logvol>
 
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
          <box name="Copper30mic" sizeX="612.000000*mm" sizeY="252.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
 
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="612.000000*mm" sizeY="252.800000*mm" sizeZ="1.600000*mm"/>
       </logvol>
 
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="612.000000*mm" sizeY="252.800000*mm" sizeZ="2.900000*mm"/>
       </logvol>
 
 
 
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="694.000000*mm" sizeY="335.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="612.000000*mm" sizeY="252.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/trunk/Muon/Muon/Regions/ASide/M2ASideR3ChamPos.xml b/compact/trunk/Muon/Muon/Regions/ASide/M2ASideR3ChamPos.xml
index 061259c331940648f701ea3305896a6e2a118e5e..7f1a2a0b0b4994ab192516f566d9adacf7f84e96 100644
--- a/compact/trunk/Muon/Muon/Regions/ASide/M2ASideR3ChamPos.xml
+++ b/compact/trunk/Muon/Muon/Regions/ASide/M2ASideR3ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
 
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
 
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
 
@@ -114,21 +114,21 @@
       </physvol>
       </logvol>
 
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
          <box name="Copper30mic" sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
 
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="0.800000*mm"/>
       </logvol>
 
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="3.700000*mm"/>
       </logvol>
 
 
 
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="1306.000000*mm" sizeY="335.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/trunk/Muon/Muon/Regions/ASide/M2ASideR4ChamPos.xml b/compact/trunk/Muon/Muon/Regions/ASide/M2ASideR4ChamPos.xml
index cf50c4d9d2e3abe1bc48eb497b2f7b0f9d432639..e7f2c13de9a15b899240d10057331a8d009f0de4 100644
--- a/compact/trunk/Muon/Muon/Regions/ASide/M2ASideR4ChamPos.xml
+++ b/compact/trunk/Muon/Muon/Regions/ASide/M2ASideR4ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
 
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5"
              sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
@@ -87,7 +87,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
 
@@ -115,21 +115,21 @@
       </physvol>
       </logvol>
 
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
          <box name="Copper30mic" sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
 
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="0.800000*mm"/>
       </logvol>
 
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="3.700000*mm"/>
       </logvol>
 
 
 
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="1306.000000*mm" sizeY="335.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/trunk/Muon/Muon/Regions/ASide/M3ASideR1ChamPos.xml b/compact/trunk/Muon/Muon/Regions/ASide/M3ASideR1ChamPos.xml
index bae7c837ab8d6178e8f3e7533a4ff76d2dcf760c..b9d0d2a02394489a34e109ce0586d2e42bb79c84 100644
--- a/compact/trunk/Muon/Muon/Regions/ASide/M3ASideR1ChamPos.xml
+++ b/compact/trunk/Muon/Muon/Regions/ASide/M3ASideR1ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="332.000000*mm" sizeY="272.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
 
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="332.000000*mm" sizeY="272.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
 
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="332.000000*mm" sizeY="272.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
 
@@ -114,21 +114,21 @@
       </physvol>
       </logvol>
 
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
          <box name="Copper30mic" sizeX="332.000000*mm" sizeY="272.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
 
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="332.000000*mm" sizeY="272.800000*mm" sizeZ="1.600000*mm"/>
       </logvol>
 
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="332.000000*mm" sizeY="272.800000*mm" sizeZ="2.900000*mm"/>
       </logvol>
 
 
 
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="414.000000*mm" sizeY="355.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="332.000000*mm" sizeY="272.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/trunk/Muon/Muon/Regions/ASide/M3ASideR2ChamPos.xml b/compact/trunk/Muon/Muon/Regions/ASide/M3ASideR2ChamPos.xml
index ae2addc0f0fdde314d6530b5672a248d715bf7be..4484de136343d9fc89e5c4f431d729b9494ecb39 100644
--- a/compact/trunk/Muon/Muon/Regions/ASide/M3ASideR2ChamPos.xml
+++ b/compact/trunk/Muon/Muon/Regions/ASide/M3ASideR2ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="660.000000*mm" sizeY="272.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
 
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="660.000000*mm" sizeY="272.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
 
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="660.000000*mm" sizeY="272.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
 
@@ -114,21 +114,21 @@
       </physvol>
       </logvol>
 
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
          <box name="Copper30mic" sizeX="660.000000*mm" sizeY="272.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
 
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="660.000000*mm" sizeY="272.800000*mm" sizeZ="1.600000*mm"/>
       </logvol>
 
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="660.000000*mm" sizeY="272.800000*mm" sizeZ="2.900000*mm"/>
       </logvol>
 
 
 
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="742.000000*mm" sizeY="355.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="660.000000*mm" sizeY="272.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/trunk/Muon/Muon/Regions/ASide/M3ASideR3ChamPos.xml b/compact/trunk/Muon/Muon/Regions/ASide/M3ASideR3ChamPos.xml
index e454c7fd5c2bcefc329625c9e1e17770580ca462..d20e9dc4928eee13905c3159adafc5a6848b8b8b 100644
--- a/compact/trunk/Muon/Muon/Regions/ASide/M3ASideR3ChamPos.xml
+++ b/compact/trunk/Muon/Muon/Regions/ASide/M3ASideR3ChamPos.xml
@@ -61,7 +61,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
 
@@ -74,7 +74,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
 
@@ -87,7 +87,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
 
@@ -115,21 +115,21 @@
       </physvol>
       </logvol>
 
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
          <box name="Copper30mic" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
 
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="0.800000*mm"/>
       </logvol>
 
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="3.700000*mm"/>
       </logvol>
 
 
 
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="1402.000000*mm" sizeY="355.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/trunk/Muon/Muon/Regions/ASide/M3ASideR4ChamPos.xml b/compact/trunk/Muon/Muon/Regions/ASide/M3ASideR4ChamPos.xml
index e5d756f6cf83b4810d01015cf4e22b1064b54728..6239c432e8bde2fe9e3dc70b99d9aea80940dcac 100644
--- a/compact/trunk/Muon/Muon/Regions/ASide/M3ASideR4ChamPos.xml
+++ b/compact/trunk/Muon/Muon/Regions/ASide/M3ASideR4ChamPos.xml
@@ -62,7 +62,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
 
@@ -75,7 +75,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
 
@@ -88,7 +88,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
 
@@ -116,21 +116,21 @@
       </physvol>
       </logvol>
 
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
          <box name="Copper30mic" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
 
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="0.800000*mm"/>
       </logvol>
 
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="3.700000*mm"/>
       </logvol>
 
 
 
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="1402.000000*mm" sizeY="355.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/trunk/Muon/Muon/Regions/ASide/M4ASideR1ChamPos.xml b/compact/trunk/Muon/Muon/Regions/ASide/M4ASideR1ChamPos.xml
index 73cb0a9584db893f2fc208896228bac973aab010..a061d194085e961a11519b29d83b50d5cd4c70e1 100644
--- a/compact/trunk/Muon/Muon/Regions/ASide/M4ASideR1ChamPos.xml
+++ b/compact/trunk/Muon/Muon/Regions/ASide/M4ASideR1ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="356.000000*mm" sizeY="292.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
 
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="356.000000*mm" sizeY="292.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
 
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="356.000000*mm" sizeY="292.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
 
@@ -114,21 +114,21 @@
       </physvol>
       </logvol>
 
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
          <box name="Copper30mic" sizeX="356.000000*mm" sizeY="292.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
 
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="356.000000*mm" sizeY="292.800000*mm" sizeZ="1.600000*mm"/>
       </logvol>
 
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="356.000000*mm" sizeY="292.800000*mm" sizeZ="2.900000*mm"/>
       </logvol>
 
 
 
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="438.000000*mm" sizeY="375.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="356.000000*mm" sizeY="292.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/trunk/Muon/Muon/Regions/ASide/M4ASideR2ChamPos.xml b/compact/trunk/Muon/Muon/Regions/ASide/M4ASideR2ChamPos.xml
index 71433ad10e7e4074bcb5007ee931b2a99f32073d..585aacfa1d39ff8f8050dbd33a2d4a8f5b60e01d 100644
--- a/compact/trunk/Muon/Muon/Regions/ASide/M4ASideR2ChamPos.xml
+++ b/compact/trunk/Muon/Muon/Regions/ASide/M4ASideR2ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="708.000000*mm" sizeY="292.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
 
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="708.000000*mm" sizeY="292.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
 
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="708.000000*mm" sizeY="292.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
 
@@ -114,21 +114,21 @@
       </physvol>
       </logvol>
 
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
          <box name="Copper30mic" sizeX="708.000000*mm" sizeY="292.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
 
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="708.000000*mm" sizeY="292.800000*mm" sizeZ="1.600000*mm"/>
       </logvol>
 
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="708.000000*mm" sizeY="292.800000*mm" sizeZ="2.900000*mm"/>
       </logvol>
 
 
 
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="790.000000*mm" sizeY="375.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="708.000000*mm" sizeY="292.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/trunk/Muon/Muon/Regions/ASide/M4ASideR3ChamPos.xml b/compact/trunk/Muon/Muon/Regions/ASide/M4ASideR3ChamPos.xml
index 08b3f9337ff07dce6919f06435eff81c1d64c720..162c8fcfeb5e7738859e494d3d8aa465c66f6be9 100644
--- a/compact/trunk/Muon/Muon/Regions/ASide/M4ASideR3ChamPos.xml
+++ b/compact/trunk/Muon/Muon/Regions/ASide/M4ASideR3ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
 
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
 
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
 
@@ -114,21 +114,21 @@
       </physvol>
       </logvol>
 
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
          <box name="Copper30mic" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
 
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="0.800000*mm"/>
       </logvol>
 
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="3.700000*mm"/>
       </logvol>
 
 
 
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="1498.000000*mm" sizeY="375.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/trunk/Muon/Muon/Regions/ASide/M4ASideR4ChamPos.xml b/compact/trunk/Muon/Muon/Regions/ASide/M4ASideR4ChamPos.xml
index 6d832505e56907dd8dd0211a034ee92a0484a39a..f3480b326d8fd72f4f6ff8e776392abcbcc50748 100644
--- a/compact/trunk/Muon/Muon/Regions/ASide/M4ASideR4ChamPos.xml
+++ b/compact/trunk/Muon/Muon/Regions/ASide/M4ASideR4ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
       
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
 
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
       
@@ -114,21 +114,21 @@
 	</physvol>
       </logvol>
       
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
         <box name="Copper30mic" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
       
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="0.800000*mm"/>
       </logvol>
       
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="3.700000*mm"/>
       </logvol>
       
 
       
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="1498.000000*mm" sizeY="375.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/trunk/Muon/Muon/Regions/ASide/M5ASideR1ChamPos.xml b/compact/trunk/Muon/Muon/Regions/ASide/M5ASideR1ChamPos.xml
index da26633373cfa1a92ffd3bb94940a49d8630f401..f76d4694ce4c3be3c9107248cab1576ba567e093 100644
--- a/compact/trunk/Muon/Muon/Regions/ASide/M5ASideR1ChamPos.xml
+++ b/compact/trunk/Muon/Muon/Regions/ASide/M5ASideR1ChamPos.xml
@@ -61,7 +61,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="380.000000*mm" sizeY="312.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
 
@@ -74,7 +74,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="380.000000*mm" sizeY="312.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
 
@@ -87,7 +87,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="380.000000*mm" sizeY="312.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
 
@@ -115,21 +115,21 @@
       </physvol>
       </logvol>
 
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
          <box name="Copper30mic" sizeX="380.000000*mm" sizeY="312.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
 
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="380.000000*mm" sizeY="312.800000*mm" sizeZ="1.600000*mm"/>
       </logvol>
 
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="380.000000*mm" sizeY="312.800000*mm" sizeZ="2.900000*mm"/>
       </logvol>
 
 
 
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="462.000000*mm" sizeY="395.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="380.000000*mm" sizeY="312.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/trunk/Muon/Muon/Regions/ASide/M5ASideR2ChamPos.xml b/compact/trunk/Muon/Muon/Regions/ASide/M5ASideR2ChamPos.xml
index 978f531624ec8a8a73636b23589e2de775568c61..0df79315555bedff43f46bd5dd47af03f6ff4473 100644
--- a/compact/trunk/Muon/Muon/Regions/ASide/M5ASideR2ChamPos.xml
+++ b/compact/trunk/Muon/Muon/Regions/ASide/M5ASideR2ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="756.000000*mm" sizeY="312.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
 
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="756.000000*mm" sizeY="312.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
 
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="756.000000*mm" sizeY="312.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
 
@@ -114,21 +114,21 @@
       </physvol>
       </logvol>
 
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
          <box name="Copper30mic" sizeX="756.000000*mm" sizeY="312.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
 
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="756.000000*mm" sizeY="312.800000*mm" sizeZ="1.600000*mm"/>
       </logvol>
 
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="756.000000*mm" sizeY="312.800000*mm" sizeZ="2.900000*mm"/>
       </logvol>
 
 
 
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="838.000000*mm" sizeY="395.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="756.000000*mm" sizeY="312.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/trunk/Muon/Muon/Regions/ASide/M5ASideR3ChamPos.xml b/compact/trunk/Muon/Muon/Regions/ASide/M5ASideR3ChamPos.xml
index 901581786996409cdfc3053da02158d44aaf492e..e15084fe2c458ea96600d793b08303f67a98473c 100644
--- a/compact/trunk/Muon/Muon/Regions/ASide/M5ASideR3ChamPos.xml
+++ b/compact/trunk/Muon/Muon/Regions/ASide/M5ASideR3ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
 
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
 
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
 
@@ -114,21 +114,21 @@
       </physvol>
       </logvol>
 
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
          <box name="Copper30mic" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
 
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="0.800000*mm"/>
       </logvol>
 
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="3.700000*mm"/>
       </logvol>
 
 
 
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="1594.000000*mm" sizeY="395.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/trunk/Muon/Muon/Regions/ASide/M5ASideR4ChamPos.xml b/compact/trunk/Muon/Muon/Regions/ASide/M5ASideR4ChamPos.xml
index a786c5193717e110a3f700a6b935a0e23652b98d..c633b51ce336c1a15551503261f8db2df07a89cb 100644
--- a/compact/trunk/Muon/Muon/Regions/ASide/M5ASideR4ChamPos.xml
+++ b/compact/trunk/Muon/Muon/Regions/ASide/M5ASideR4ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
 
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
 
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
 
@@ -114,21 +114,21 @@
       </physvol>
       </logvol>
 
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
          <box name="Copper30mic" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
 
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="0.800000*mm"/>
       </logvol>
 
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="3.700000*mm"/>
       </logvol>
 
 
 
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="1594.000000*mm" sizeY="395.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/trunk/Muon/Muon/Regions/CSide/M2CSideR1ChamPos.xml b/compact/trunk/Muon/Muon/Regions/CSide/M2CSideR1ChamPos.xml
index ecc0cbae38473a7a393224c9c1752a404bdd0f61..6634be45a92aa4a97efdee5276bb41f18a636b3e 100644
--- a/compact/trunk/Muon/Muon/Regions/CSide/M2CSideR1ChamPos.xml
+++ b/compact/trunk/Muon/Muon/Regions/CSide/M2CSideR1ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="308.000000*mm" sizeY="252.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
 
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="308.000000*mm" sizeY="252.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
 
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="308.000000*mm" sizeY="252.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
       
@@ -114,21 +114,21 @@
 	</physvol>
       </logvol>
       
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
         <box name="Copper30mic" sizeX="308.000000*mm" sizeY="252.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
       
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="308.000000*mm" sizeY="252.800000*mm" sizeZ="1.600000*mm"/>
       </logvol>
       
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="308.000000*mm" sizeY="252.800000*mm" sizeZ="2.900000*mm"/>
       </logvol>
       
       
 
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="390.000000*mm" sizeY="335.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="308.000000*mm" sizeY="252.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/trunk/Muon/Muon/Regions/CSide/M2CSideR2ChamPos.xml b/compact/trunk/Muon/Muon/Regions/CSide/M2CSideR2ChamPos.xml
index 0e1d3726498fd333ab9fee57bc503d9e2c1c399a..ad2c2ec6bdb6d88740752ab68bd5d302bd5ab43d 100644
--- a/compact/trunk/Muon/Muon/Regions/CSide/M2CSideR2ChamPos.xml
+++ b/compact/trunk/Muon/Muon/Regions/CSide/M2CSideR2ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="612.000000*mm" sizeY="252.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
       
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="612.000000*mm" sizeY="252.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
 
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="612.000000*mm" sizeY="252.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
 
@@ -114,21 +114,21 @@
 	</physvol>
       </logvol>
       
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
         <box name="Copper30mic" sizeX="612.000000*mm" sizeY="252.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
 
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="612.000000*mm" sizeY="252.800000*mm" sizeZ="1.600000*mm"/>
       </logvol>
 
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="612.000000*mm" sizeY="252.800000*mm" sizeZ="2.900000*mm"/>
       </logvol>
 
 
 
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="694.000000*mm" sizeY="335.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="612.000000*mm" sizeY="252.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/trunk/Muon/Muon/Regions/CSide/M2CSideR3ChamPos.xml b/compact/trunk/Muon/Muon/Regions/CSide/M2CSideR3ChamPos.xml
index 11ca298e5064dfc3367cd05328789fd6c3d41d94..428eee9b4a0df2f921dde6c2257a2bc602d19147 100644
--- a/compact/trunk/Muon/Muon/Regions/CSide/M2CSideR3ChamPos.xml
+++ b/compact/trunk/Muon/Muon/Regions/CSide/M2CSideR3ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
       
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
 
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
 
@@ -114,21 +114,21 @@
 	</physvol>
       </logvol>
       
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
         <box name="Copper30mic" sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
 
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="0.800000*mm"/>
       </logvol>
 
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="3.700000*mm"/>
       </logvol>
 
 
 
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="1306.000000*mm" sizeY="335.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/trunk/Muon/Muon/Regions/CSide/M2CSideR4ChamPos.xml b/compact/trunk/Muon/Muon/Regions/CSide/M2CSideR4ChamPos.xml
index 4cc3fc22e415664bdeea784e090bf9a698317584..957f2576530131e9bd59f8dc1b3eb26e823807a7 100644
--- a/compact/trunk/Muon/Muon/Regions/CSide/M2CSideR4ChamPos.xml
+++ b/compact/trunk/Muon/Muon/Regions/CSide/M2CSideR4ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
 
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
       
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
       
@@ -114,21 +114,21 @@
 	</physvol>
       </logvol>
       
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
         <box name="Copper30mic" sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
       
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="0.800000*mm"/>
       </logvol>
       
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="3.700000*mm"/>
       </logvol>
       
       
       
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="1306.000000*mm" sizeY="335.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="1224.000000*mm" sizeY="252.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/trunk/Muon/Muon/Regions/CSide/M3CSideR1ChamPos.xml b/compact/trunk/Muon/Muon/Regions/CSide/M3CSideR1ChamPos.xml
index a5006edec45f25e4706a0049a243111dc8dfc094..7a33e8949fb6a8b8358fb69afeb7c7a2de3de70b 100644
--- a/compact/trunk/Muon/Muon/Regions/CSide/M3CSideR1ChamPos.xml
+++ b/compact/trunk/Muon/Muon/Regions/CSide/M3CSideR1ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="332.000000*mm" sizeY="272.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
       
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="332.000000*mm" sizeY="272.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
       
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="332.000000*mm" sizeY="272.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
       
@@ -114,21 +114,21 @@
 	</physvol>
       </logvol>
       
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
         <box name="Copper30mic" sizeX="332.000000*mm" sizeY="272.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
       
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="332.000000*mm" sizeY="272.800000*mm" sizeZ="1.600000*mm"/>
       </logvol>
       
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="332.000000*mm" sizeY="272.800000*mm" sizeZ="2.900000*mm"/>
       </logvol>
       
       
       
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="414.000000*mm" sizeY="355.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="332.000000*mm" sizeY="272.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/trunk/Muon/Muon/Regions/CSide/M3CSideR2ChamPos.xml b/compact/trunk/Muon/Muon/Regions/CSide/M3CSideR2ChamPos.xml
index b4902140297be941d4d659c268eb355485505eab..64d6f73c91a4be25c8b15b410a44ea7c6271a6f6 100644
--- a/compact/trunk/Muon/Muon/Regions/CSide/M3CSideR2ChamPos.xml
+++ b/compact/trunk/Muon/Muon/Regions/CSide/M3CSideR2ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="660.000000*mm" sizeY="272.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
       
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="660.000000*mm" sizeY="272.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
       
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="660.000000*mm" sizeY="272.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
       
@@ -114,21 +114,21 @@
 	</physvol>
       </logvol>
       
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
         <box name="Copper30mic" sizeX="660.000000*mm" sizeY="272.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
       
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="660.000000*mm" sizeY="272.800000*mm" sizeZ="1.600000*mm"/>
       </logvol>
       
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="660.000000*mm" sizeY="272.800000*mm" sizeZ="2.900000*mm"/>
       </logvol>
       
       
       
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="742.000000*mm" sizeY="355.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="660.000000*mm" sizeY="272.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/trunk/Muon/Muon/Regions/CSide/M3CSideR3ChamPos.xml b/compact/trunk/Muon/Muon/Regions/CSide/M3CSideR3ChamPos.xml
index a757ca330675ca8c5a5ba6e36fabfb7962618e0a..b838af6dcd36efdebe42e02ba07e7192641913ed 100644
--- a/compact/trunk/Muon/Muon/Regions/CSide/M3CSideR3ChamPos.xml
+++ b/compact/trunk/Muon/Muon/Regions/CSide/M3CSideR3ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
       
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
       
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
       
@@ -114,21 +114,21 @@
 	</physvol>
       </logvol>
       
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
         <box name="Copper30mic" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
       
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="0.800000*mm"/>
       </logvol>
       
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="3.700000*mm"/>
       </logvol>
       
 
       
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="1402.000000*mm" sizeY="355.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/trunk/Muon/Muon/Regions/CSide/M3CSideR4ChamPos.xml b/compact/trunk/Muon/Muon/Regions/CSide/M3CSideR4ChamPos.xml
index dbe10f3b7534523eb8a87f7f9e6aa348d3a8f711..e95ef0600013344033f318b00e6c9a3c888a3f33 100644
--- a/compact/trunk/Muon/Muon/Regions/CSide/M3CSideR4ChamPos.xml
+++ b/compact/trunk/Muon/Muon/Regions/CSide/M3CSideR4ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
       
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
       
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
       
@@ -114,21 +114,21 @@
 	</physvol>
       </logvol>
       
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
         <box name="Copper30mic" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
       
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="0.800000*mm"/>
       </logvol>
       
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="3.700000*mm"/>
       </logvol>
       
 
       
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="1402.000000*mm" sizeY="355.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="1320.000000*mm" sizeY="272.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/trunk/Muon/Muon/Regions/CSide/M4CSideR1ChamPos.xml b/compact/trunk/Muon/Muon/Regions/CSide/M4CSideR1ChamPos.xml
index 3fa9055222fa8aa7e4716cc579415534ff213145..0b7bdef38da88aff9e6c149cca17743914696bc2 100644
--- a/compact/trunk/Muon/Muon/Regions/CSide/M4CSideR1ChamPos.xml
+++ b/compact/trunk/Muon/Muon/Regions/CSide/M4CSideR1ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="356.000000*mm" sizeY="292.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
       
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="356.000000*mm" sizeY="292.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
       
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="356.000000*mm" sizeY="292.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
       
@@ -114,21 +114,21 @@
 	</physvol>
       </logvol>
       
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
         <box name="Copper30mic" sizeX="356.000000*mm" sizeY="292.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
       
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="356.000000*mm" sizeY="292.800000*mm" sizeZ="1.600000*mm"/>
       </logvol>
 
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="356.000000*mm" sizeY="292.800000*mm" sizeZ="2.900000*mm"/>
       </logvol>
       
       
 
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="438.000000*mm" sizeY="375.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="356.000000*mm" sizeY="292.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/trunk/Muon/Muon/Regions/CSide/M4CSideR2ChamPos.xml b/compact/trunk/Muon/Muon/Regions/CSide/M4CSideR2ChamPos.xml
index 71cb82aa75bf58bd0c6efa5030e243c9ceb5a898..57507410b906b6d66dfb96761d48ba355d2d1154 100644
--- a/compact/trunk/Muon/Muon/Regions/CSide/M4CSideR2ChamPos.xml
+++ b/compact/trunk/Muon/Muon/Regions/CSide/M4CSideR2ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="708.000000*mm" sizeY="292.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
 
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="708.000000*mm" sizeY="292.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
       
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="708.000000*mm" sizeY="292.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
       
@@ -114,21 +114,21 @@
 	</physvol>
       </logvol>
       
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
         <box name="Copper30mic" sizeX="708.000000*mm" sizeY="292.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
       
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="708.000000*mm" sizeY="292.800000*mm" sizeZ="1.600000*mm"/>
       </logvol>
       
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="708.000000*mm" sizeY="292.800000*mm" sizeZ="2.900000*mm"/>
       </logvol>
 
       
 
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="790.000000*mm" sizeY="375.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="708.000000*mm" sizeY="292.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/trunk/Muon/Muon/Regions/CSide/M4CSideR3ChamPos.xml b/compact/trunk/Muon/Muon/Regions/CSide/M4CSideR3ChamPos.xml
index f1349787b98a92c1b7b33a485dbf0ee20d05db77..78c36a1166cd13da7c530b1d5be7f6e8469f572d 100644
--- a/compact/trunk/Muon/Muon/Regions/CSide/M4CSideR3ChamPos.xml
+++ b/compact/trunk/Muon/Muon/Regions/CSide/M4CSideR3ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
       
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
 
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
 
@@ -114,21 +114,21 @@
 	</physvol>
       </logvol>
       
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
         <box name="Copper30mic" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
       
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="0.800000*mm"/>
       </logvol>
 
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="3.700000*mm"/>
       </logvol>
 
 
 
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="1498.000000*mm" sizeY="375.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/trunk/Muon/Muon/Regions/CSide/M4CSideR4ChamPos.xml b/compact/trunk/Muon/Muon/Regions/CSide/M4CSideR4ChamPos.xml
index d30cf2f556fa911af664086b2790993467a0ea4f..86934a91bb94a38572c6812ec0d073b11fac9313 100644
--- a/compact/trunk/Muon/Muon/Regions/CSide/M4CSideR4ChamPos.xml
+++ b/compact/trunk/Muon/Muon/Regions/CSide/M4CSideR4ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
       
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
       
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
       
@@ -114,21 +114,21 @@
 	</physvol>
       </logvol>
       
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
         <box name="Copper30mic" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
       
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="0.800000*mm"/>
       </logvol>
       
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="3.700000*mm"/>
       </logvol>
       
       
       
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="1498.000000*mm" sizeY="375.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="1416.000000*mm" sizeY="292.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/trunk/Muon/Muon/Regions/CSide/M5CSideR1ChamPos.xml b/compact/trunk/Muon/Muon/Regions/CSide/M5CSideR1ChamPos.xml
index 5520460afc0c85963cc0324aa900f29fa8b985fd..8fc169f5a30c4c8630f2d7a2d6c380b90157c832 100644
--- a/compact/trunk/Muon/Muon/Regions/CSide/M5CSideR1ChamPos.xml
+++ b/compact/trunk/Muon/Muon/Regions/CSide/M5CSideR1ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="380.000000*mm" sizeY="312.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
       
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="380.000000*mm" sizeY="312.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
       
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="380.000000*mm" sizeY="312.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
       
@@ -114,21 +114,21 @@
 	</physvol>
       </logvol>
       
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
         <box name="Copper30mic" sizeX="380.000000*mm" sizeY="312.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
       
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="380.000000*mm" sizeY="312.800000*mm" sizeZ="1.600000*mm"/>
       </logvol>
       
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="380.000000*mm" sizeY="312.800000*mm" sizeZ="2.900000*mm"/>
       </logvol>
       
 
       
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="462.000000*mm" sizeY="395.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="380.000000*mm" sizeY="312.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/trunk/Muon/Muon/Regions/CSide/M5CSideR2ChamPos.xml b/compact/trunk/Muon/Muon/Regions/CSide/M5CSideR2ChamPos.xml
index 163d0d7ac00465038fd5a35e1bf2b6489f6c1549..995ee16838e73c687e3ceefed9dd4f01b1249ad4 100644
--- a/compact/trunk/Muon/Muon/Regions/CSide/M5CSideR2ChamPos.xml
+++ b/compact/trunk/Muon/Muon/Regions/CSide/M5CSideR2ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="756.000000*mm" sizeY="312.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
       
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="756.000000*mm" sizeY="312.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
       
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="756.000000*mm" sizeY="312.800000*mm" sizeZ="2.90000*mm" />
       </logvol>
       
@@ -114,21 +114,21 @@
 	</physvol>
       </logvol>
       
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
         <box name="Copper30mic" sizeX="756.000000*mm" sizeY="312.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
 
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="756.000000*mm" sizeY="312.800000*mm" sizeZ="1.600000*mm"/>
       </logvol>
       
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="756.000000*mm" sizeY="312.800000*mm" sizeZ="2.900000*mm"/>
       </logvol>
 
       
 
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="838.000000*mm" sizeY="395.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="756.000000*mm" sizeY="312.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/trunk/Muon/Muon/Regions/CSide/M5CSideR3ChamPos.xml b/compact/trunk/Muon/Muon/Regions/CSide/M5CSideR3ChamPos.xml
index 9cf204abe30821dbeee9660b3633868fe3995d63..c5c74fe8a7aa2fe24b12323db8c3ae68f4fd5e22 100644
--- a/compact/trunk/Muon/Muon/Regions/CSide/M5CSideR3ChamPos.xml
+++ b/compact/trunk/Muon/Muon/Regions/CSide/M5CSideR3ChamPos.xml
@@ -16,7 +16,7 @@
     <detector name="M5R3CSide" type="Muon_Region_v1_0" id="533" parent="M5CSide" vis="Muon:M5R3RegionVis" readout="Region">
 
       <!-- Chamber's parameters -->
-      <logvol name="lvM5R3Cham" material="Air">
+      <logvol name="lvM5R3Cham" material="Muon">
         <box name="ChamberBox" sizeX="1594.000000*mm" sizeY="395.000000*mm" sizeZ="67.000000*mm" />
         <physvol name="pvGap1" logvol="/dd/Geometry/DownstreamRegion/Muon/M5R3Cham/lvGasGap">
           <posXYZ x="0*mm" y="0*mm" z="21.090000*mm"/>
@@ -41,7 +41,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGap" material="Air">
+      <logvol name="lvGasGap" material="Muon">
         <box name="GasGapBox" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="14.06*mm" />
         <physvol name="pvGapLayer1" logvol="/dd/Geometry/DownstreamRegion/Muon/M5R3Cham/lvGasGapLayer1">
           <posXYZ x="0*mm" y="0*mm" z="5.180000*mm"/>
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
       
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
       
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
       
@@ -114,21 +114,21 @@
 	</physvol>
       </logvol>
       
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
         <box name="Copper30mic" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
       
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="0.800000*mm"/>
       </logvol>
       
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="3.700000*mm"/>
       </logvol>
       
 
 
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="1594.000000*mm" sizeY="395.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/trunk/Muon/Muon/Regions/CSide/M5CSideR4ChamPos.xml b/compact/trunk/Muon/Muon/Regions/CSide/M5CSideR4ChamPos.xml
index 86c0991260e573a6dc2511b1f308a9259625a3cc..4bd8acb3fb761755c062825f6333bce971eeac49 100644
--- a/compact/trunk/Muon/Muon/Regions/CSide/M5CSideR4ChamPos.xml
+++ b/compact/trunk/Muon/Muon/Regions/CSide/M5CSideR4ChamPos.xml
@@ -60,7 +60,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer1" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer1" material="Muon:Polyurethane">
         <box name="GasGapLayer1" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
       
@@ -73,7 +73,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer5" material="Muon/S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
+      <logvol name="lvGasGapLayer5" material="Muon:S_CPC_gas" sensdet="GiGaSensDetTracker/MuonSDet">
         <box name="GasGapLayer5" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="5.000000*mm" />
       </logvol>
       
@@ -86,7 +86,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvGasGapLayer9" material="Muon/MuonPolyurethane">
+      <logvol name="lvGasGapLayer9" material="Muon:Polyurethane">
         <box name="GasGapLayer9" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="3.70000*mm" />
       </logvol>
       
@@ -114,21 +114,21 @@
 	</physvol>
       </logvol>
       
-      <logvol name="lvCopper30mic" material="Muon/MuonCopper">
+      <logvol name="lvCopper30mic" material="Copper">
         <box name="Copper30mic" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="0.030000*mm"/>
       </logvol>
       
-      <logvol name="lvG10Gap" material="Muon/G10">
+      <logvol name="lvG10Gap" material="Muon:G10">
         <box name="G10Gap" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="0.800000*mm"/>
       </logvol>
       
-      <logvol name="lvPolyGap" material="Muon/MuonPolyurethane">
+      <logvol name="lvPolyGap" material="Muon:Polyurethane">
         <box name="PolyGap" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="3.700000*mm"/>
       </logvol>
       
 
       
-      <logvol name="lvChamFrame" material="Muon/G10Air">
+      <logvol name="lvChamFrame" material="Muon:G10Air">
         <subtraction name="ChamberFrame">
           <box name="OuterFrame" sizeX="1594.000000*mm" sizeY="395.000000*mm" sizeZ="67.000000*mm" />
           <box name="InnerFrame" sizeX="1512.000000*mm" sizeY="312.800000*mm" sizeZ="67.000000*mm" />
diff --git a/compact/trunk/Muon/Muon/Supports/M2ASideSupports.xml b/compact/trunk/Muon/Muon/Supports/M2ASideSupports.xml
index 6eb4371a8c31ac6a5e7147939372ab481f04b586..92ce8b9cdeaa941c4084da711e105be6ce52fb85 100644
--- a/compact/trunk/Muon/Muon/Supports/M2ASideSupports.xml
+++ b/compact/trunk/Muon/Muon/Supports/M2ASideSupports.xml
@@ -32,7 +32,7 @@
         </physvol>
       </logvol>
       
-      <logvol name="lvM2SupportPanel" material="Aluminium">
+      <logvol name="lvM2SupportPanel" material="Aluminum">
         <subtraction name="M2Panel">
           <box name="M2PanelOuter"  sizeX="M2SideXOuterSize"      sizeY="M2SideYOuterSize" sizeZ="1.5*mm"/>
           <box name="M2PanelInner"  sizeX="M2SideXInnerSize+2*mm" sizeY="M2SideYInnerSize" sizeZ="2*mm" />
diff --git a/compact/trunk/Muon/Muon/Supports/M2CSideSupports.xml b/compact/trunk/Muon/Muon/Supports/M2CSideSupports.xml
index b66a69650ed8a779fd6770cae296837552559865..b1c42f9d5bc3483d88f372d76b991c6be7164bdc 100644
--- a/compact/trunk/Muon/Muon/Supports/M2CSideSupports.xml
+++ b/compact/trunk/Muon/Muon/Supports/M2CSideSupports.xml
@@ -33,7 +33,7 @@
         </physvol>
       </logvol>
 
-      <logvol name="lvM2SupportPanel" material="Aluminium">
+      <logvol name="lvM2SupportPanel" material="Aluminum">
         <subtraction name="M2Panel">
           <box name="M2PanelOuter" sizeX="M2SideXOuterSize"      sizeY="M2SideYOuterSize" sizeZ="1.5*mm"/>
           <box name="M2PanelInner" sizeX="M2SideXInnerSize+2*mm" sizeY="M2SideYInnerSize" sizeZ="2*mm" />
diff --git a/compact/trunk/Muon/Muon/Supports/M3ASideSupports.xml b/compact/trunk/Muon/Muon/Supports/M3ASideSupports.xml
index 1d1102793635eed9bba4af149542de849c0b1090..f90c8522feeb89b38dfa5b388291367359a8cf11 100644
--- a/compact/trunk/Muon/Muon/Supports/M3ASideSupports.xml
+++ b/compact/trunk/Muon/Muon/Supports/M3ASideSupports.xml
@@ -32,7 +32,7 @@
 	</physvol>
       </logvol>
 
-      <logvol name="lvM3SupportPanel" material="Aluminium">
+      <logvol name="lvM3SupportPanel" material="Aluminum">
 	<subtraction name="M3Panel">
 	  <box name="M3PanelOuter"  sizeX="M3SideXOuterSize" sizeY="M3SideYOuterSize" sizeZ="1.5*mm"/>
 	  <box name="M3PanelInner"  sizeX="M3SideXInnerSize" sizeY="M3SideYInnerSize" sizeZ="2*mm" />
diff --git a/compact/trunk/Muon/Muon/Supports/M3CSideSupports.xml b/compact/trunk/Muon/Muon/Supports/M3CSideSupports.xml
index 5b6390b5636942394cce35e4c0dc40783984a42c..508300659888c916cd27a12adf5feead32dc1266 100644
--- a/compact/trunk/Muon/Muon/Supports/M3CSideSupports.xml
+++ b/compact/trunk/Muon/Muon/Supports/M3CSideSupports.xml
@@ -33,7 +33,7 @@
 	</physvol>
       </logvol>
 
-      <logvol name="lvM3SupportPanel" material="Aluminium">
+      <logvol name="lvM3SupportPanel" material="Aluminum">
 	<subtraction name="M3Panel">
 	  <box name="M3PanelOuter"  sizeX="M3SideXOuterSize" sizeY="M3SideYOuterSize" sizeZ="1.5*mm"/>
 	  <box name="M3PanelInner"  sizeX="M3SideXInnerSize" sizeY="M3SideYInnerSize" sizeZ="2*mm" />
diff --git a/compact/trunk/Muon/Muon/Supports/M4ASideSupports.xml b/compact/trunk/Muon/Muon/Supports/M4ASideSupports.xml
index ba754a29db9fd652bb551b6026d9ee5204d67c37..b706932d8729e40a2994570d5c2a102dff6948b7 100644
--- a/compact/trunk/Muon/Muon/Supports/M4ASideSupports.xml
+++ b/compact/trunk/Muon/Muon/Supports/M4ASideSupports.xml
@@ -32,7 +32,7 @@
 	</physvol>
       </logvol>
 
-      <logvol name="lvM4SupportPanel" material="Aluminium">
+      <logvol name="lvM4SupportPanel" material="Aluminum">
 	<subtraction name="M4Panel">
 	  <box name="M4PanelOuter"  sizeX="M4SideXOuterSize" sizeY="M4SideYOuterSize" sizeZ="1.5*mm"/>
 	  <box name="M4PanelInner"  sizeX="M4SideXInnerSize" sizeY="M4SideYInnerSize" sizeZ="2*mm" />
diff --git a/compact/trunk/Muon/Muon/Supports/M4CSideSupports.xml b/compact/trunk/Muon/Muon/Supports/M4CSideSupports.xml
index 2d8588174f26bcd8d3c9427e5852aada42a40369..f704c545c00c9c9b5b8ebc8ad91a93ec73a5b648 100644
--- a/compact/trunk/Muon/Muon/Supports/M4CSideSupports.xml
+++ b/compact/trunk/Muon/Muon/Supports/M4CSideSupports.xml
@@ -33,7 +33,7 @@
 	</physvol>
       </logvol>
 
-      <logvol name="lvM4SupportPanel" material="Aluminium">
+      <logvol name="lvM4SupportPanel" material="Aluminum">
 	<subtraction name="M4Panel">
 	  <box name="M4PanelOuter"  sizeX="M4SideXOuterSize" sizeY="M4SideYOuterSize" sizeZ="1.5*mm"/>
 	  <box name="M4PanelInner"  sizeX="M4SideXInnerSize" sizeY="M4SideYInnerSize" sizeZ="2*mm" />
diff --git a/compact/trunk/Muon/Muon/Supports/M5ASideSupports.xml b/compact/trunk/Muon/Muon/Supports/M5ASideSupports.xml
index 3c32ce64d54402d03e79229716a500adacd2be56..70ff1e273c71206e993551f24ffc0cc102165165 100644
--- a/compact/trunk/Muon/Muon/Supports/M5ASideSupports.xml
+++ b/compact/trunk/Muon/Muon/Supports/M5ASideSupports.xml
@@ -32,7 +32,7 @@
 	</physvol>
       </logvol>
 
-      <logvol name="lvM5SupportPanel" material="Aluminium">
+      <logvol name="lvM5SupportPanel" material="Aluminum">
 	<subtraction name="M5Panel">
 	  <box name="M5PanelOuter"  sizeX="M5SideXOuterSize" sizeY="M5SideYOuterSize" sizeZ="1.5*mm"/>
 	  <box name="M5PanelInner"  sizeX="M5SideXInnerSize" sizeY="M5SideYInnerSize" sizeZ="2*mm" />
diff --git a/compact/trunk/Muon/Muon/Supports/M5CSideSupports.xml b/compact/trunk/Muon/Muon/Supports/M5CSideSupports.xml
index ae0d5f6b39cee66ff45c34c0bb7977873f3f0962..203f4089f4410af8e47cd8ad33a4c92a321bdbfe 100644
--- a/compact/trunk/Muon/Muon/Supports/M5CSideSupports.xml
+++ b/compact/trunk/Muon/Muon/Supports/M5CSideSupports.xml
@@ -33,7 +33,7 @@
 	</physvol>
       </logvol>
 
-      <logvol name="lvM5SupportPanel" material="Aluminium">
+      <logvol name="lvM5SupportPanel" material="Aluminum">
 	<subtraction name="M5Panel">
 	  <box name="M5PanelOuter"  sizeX="M5SideXOuterSize" sizeY="M5SideYOuterSize" sizeZ="1.5*mm"/>
 	  <box name="M5PanelInner"  sizeX="M5SideXInnerSize" sizeY="M5SideYInnerSize" sizeZ="2*mm" />
diff --git a/compact/trunk/Muon/detector.xml b/compact/trunk/Muon/detector.xml
index 7ebc5626660a0b27218fc9ad85be460bc67680ed..d86bb6bd7ac3ef217ec7d9aaeb1f959a37327667 100644
--- a/compact/trunk/Muon/detector.xml
+++ b/compact/trunk/Muon/detector.xml
@@ -19,7 +19,8 @@
 
 
   <includes>
-    <gdmlFile ref="Muon/Materials/Elements.xml"/>
+    <gdmlFile ref="../DDDetectors/compact/materials.xml"/>
+    <gdmlFile ref="../DDDetectors/compact/elements.xml"/>
     <gdmlFile ref="Muon/Materials/MuonMaterials.xml"/>
     <gdmlFile ref="MuonParameters.xml"/>
     <gdmlFile ref="VisAttributes.xml"/>
diff --git a/compact/trunk/Muon/fakematerials.xml b/compact/trunk/Muon/fakematerials.xml
deleted file mode 100644
index 3767cad4bb32c99bbc902286d72f444714ecd282..0000000000000000000000000000000000000000
--- a/compact/trunk/Muon/fakematerials.xml
+++ /dev/null
@@ -1,473 +0,0 @@
-<materials>
-<!--
-    (c) Copyright 2020 CERN for the benefit of the LHCb Collaboration
-
-    This software is distributed under the terms of the GNU General Public
-    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
-
-    In applying this licence, CERN does not waive the privileges and immunities
-    granted to it by virtue of its status as an Intergovernmental Organization
-    or submit itself to any jurisdiction.
--->
-
-<!-- nonsensical test materials -->
-
-    <material density="2.5*g/cm3" name="Concrete" state="solid">
-      <component fractionmass="0.520" name="Oxygen"  />
-      <component fractionmass="0.325" name="Silicon"  />
-      <component fractionmass="0.060" name="Calcium"  />
-      <component fractionmass="0.015" name="Sodium"  />
-      <component fractionmass="0.020" name="Iron"  />
-      <component fractionmass="0.040" name="Aluminium"  />
-    </material>
-
-    <material density="7.8*g/cm3" name="Steel" state="solid">
-      <component fractionmass="0.7" name="Iron"  />
-      <component fractionmass="0.1" name="Carbon"/>
-      <component fractionmass="0.2" name="Copper"/>
-    </material>
-
-    <material name="MuonFilterIron" state="solid">
-      <component fractionmass="0.9851" name="Iron"/>
-      <component fractionmass="0.005" name="Carbon"/>
-      <component fractionmass="0.009" name="Manganese"/>
-      <component fractionmass="0.0004" name="Phosphor"/>
-      <component fractionmass="0.0005" name="Sulfur"/>
-      <D unit="g/cm3" value="7.5"/>
-    </material>
-
-    <material name="MuonCopper" state="solid">
-      <component fractionmass="1.0" name="Copper"/>
-      <D unit="g/cm3" value="8.96"/>
-      <fraction n="1.0" ref="Copper"/>
-    </material>
-
-
-    <material name="G10" state="solid">
-      <component fractionmass="1.0" name="Copper"/>
-      <D unit="g/cm3" value="8.96"/>
-      <fraction n="1.0" ref="Copper"/>
-    </material>
-
-    <material name="MuonPolyurethane" state="solid">
-      <component fractionmass="1.0" name="Copper"/>
-      <D unit="g/cm3" value="8.96"/>
-      <fraction n="1.0" ref="Copper"/>
-    </material>
-
-    <material name="G10Air" state="solid">
-      <component fractionmass="1.0" name="Copper"/>
-      <D unit="g/cm3" value="8.96"/>
-      <fraction n="1.0" ref="Copper"/>
-    </material>
-
-    <material name="S_CPC_gas" state="gas">
-      <D unit="g/cm3" value="0.00120479"/>
-      <fraction n="1" ref="N"/>
-    </material>
-
-    
-    <material name="G4_AIR" state="gas">
-      <MEE unit="eV" value="85.7"/>
-      <D unit="g/cm3" value="0.00120479"/>
-      <fraction n="0.000124000124000124" ref="C"/>
-      <fraction n="0.755267755267755" ref="N"/>
-      <fraction n="0.231781231781232" ref="O"/>
-      <fraction n="0.0128270128270128" ref="Ar"/>
-    </material>
-
-    <material name="Vacuum" state="gas">
-      <D unit="g/cm3" value="0.00000000001"/>
-      <fraction n="1" ref="G4_AIR"/>
-    </material>
-
-
-
-
-
-    <material name="G4_KAPTON" state="solid">
-      <MEE unit="eV" value="79.6"/>
-      <D unit="g/cm3" value="1.42"/>
-      <fraction n="0.026362" ref="H"/>
-      <fraction n="0.691133" ref="C"/>
-      <fraction n="0.07327" ref="N"/>
-      <fraction n="0.209235" ref="O"/>
-    </material>
-    <isotope N="28" Z="14" name="Si28">
-      <atom unit="g/mole" value="27.9769"/>
-    </isotope>
-    <isotope N="29" Z="14" name="Si29">
-      <atom unit="g/mole" value="28.9765"/>
-    </isotope>
-    <isotope N="30" Z="14" name="Si30">
-      <atom unit="g/mole" value="29.9738"/>
-    </isotope>
-    <element name="Si">
-      <fraction n="0.922296077703922" ref="Si28"/>
-      <fraction n="0.0468319531680468" ref="Si29"/>
-      <fraction n="0.0308719691280309" ref="Si30"/>
-    </element>
-    <material name="SiC_foam" state="solid">
-      <MEE unit="eV" value="137.77733431141"/>
-      <D unit="g/cm3" value="0.19"/>
-      <fraction n="0.299548759813591" ref="C"/>
-      <fraction n="0.700451240186409" ref="Si"/>
-    </material>
-    <material Z="13" name="G4_Al" state="solid">
-      <MEE unit="eV" value="166"/>
-      <D unit="g/cm3" value="2.699"/>
-      <atom unit="g/mole" value="26.9815"/>
-      <fraction n="1" ref="Al"/>
-    </material>
-    <material name="G4_Si" state="solid">
-      <MEE unit="eV" value="173"/>
-      <D unit="g/cm3" value="2.33"/>
-      <fraction n="1" ref="Si"/>
-    </material>
-    <isotope N="63" Z="29" name="Cu63">
-      <atom unit="g/mole" value="62.9296"/>
-    </isotope>
-    <isotope N="65" Z="29" name="Cu65">
-      <atom unit="g/mole" value="64.9278"/>
-    </isotope>
-    <element name="Cu">
-      <fraction n="0.6917" ref="Cu63"/>
-      <fraction n="0.3083" ref="Cu65"/>
-    </element>
-    <material name="G4_Cu" state="solid">
-      <MEE unit="eV" value="322"/>
-      <D unit="g/cm3" value="8.96"/>
-      <fraction n="1" ref="Cu"/>
-    </material>
-    <material Z="4" name="G4_Be" state="solid">
-      <MEE unit="eV" value="63.7"/>
-      <D unit="g/cm3" value="1.848"/>
-      <atom unit="g/mole" value="9.01218"/>
-      <fraction n="1" ref="Be"/>
-    </material>
-    <material name="G4_Ti" state="solid">
-      <MEE unit="eV" value="233"/>
-      <D unit="g/cm3" value="4.54"/>
-      <fraction n="1" ref="Ti"/>
-    </material>
-    <material name="styropor" state="solid">
-      <MEE unit="eV" value="65.9436601819466"/>
-      <D unit="g/cm3" value="0.025"/>
-      <fraction n="0.922577329294378" ref="C"/>
-      <fraction n="0.0774226707056217" ref="H"/>
-    </material>
-    <material name="GroundOrHVMix" state="solid">
-      <MEE unit="eV" value="259.806022507979"/>
-      <D unit="g/cm3" value="5.19"/>
-      <fraction n="0.00360636223506744" ref="H"/>
-      <fraction n="0.0945480597302505" ref="C"/>
-      <fraction n="0.0100234489402697" ref="N"/>
-      <fraction n="0.0286236705202312" ref="O"/>
-      <fraction n="0.863198458574181" ref="Cu"/>
-    </material>
-    <isotope N="35" Z="17" name="Cl35">
-      <atom unit="g/mole" value="34.9689"/>
-    </isotope>
-    <isotope N="37" Z="17" name="Cl37">
-      <atom unit="g/mole" value="36.9659"/>
-    </isotope>
-    <element name="Cl">
-      <fraction n="0.7578" ref="Cl35"/>
-      <fraction n="0.2422" ref="Cl37"/>
-    </element>
-    <material name="siPCBMix" state="solid">
-      <MEE unit="eV" value="262.475002085268"/>
-      <D unit="g/cm3" value="5.05076923076923"/>
-      <fraction n="0.014498933901919" ref="Cl"/>
-      <fraction n="0.083477099995865" ref="O"/>
-      <fraction n="0.0654857498400853" ref="Si"/>
-      <fraction n="0.00351122019083304" ref="H"/>
-      <fraction n="0.0142636698452849" ref="C"/>
-      <fraction n="0.818763326226013" ref="Cu"/>
-    </material>
-    <isotope N="36" Z="18" name="Ar36">
-      <atom unit="g/mole" value="35.9675"/>
-    </isotope>
-    <isotope N="38" Z="18" name="Ar38">
-      <atom unit="g/mole" value="37.9627"/>
-    </isotope>
-    <isotope N="40" Z="18" name="Ar40">
-      <atom unit="g/mole" value="39.9624"/>
-    </isotope>
-    <element name="Ar">
-      <fraction n="0.003365" ref="Ar36"/>
-      <fraction n="0.000632" ref="Ar38"/>
-      <fraction n="0.996003" ref="Ar40"/>
-    </element>
-    <material name="G4_AIR" state="gas">
-      <MEE unit="eV" value="85.7"/>
-      <D unit="g/cm3" value="0.00120479"/>
-      <fraction n="0.000124000124000124" ref="C"/>
-      <fraction n="0.755267755267755" ref="N"/>
-      <fraction n="0.231781231781232" ref="O"/>
-      <fraction n="0.0128270128270128" ref="Ar"/>
-    </material>
-    <material name="Vacuum" state="gas">
-      <D unit="g/cm3" value="0.00000000001"/>
-      <fraction n="1" ref="G4_AIR"/>
-    </material>
-    <material name="Air" state="gas">
-      <D unit="g/cm3" value="0.00120479"/>
-      <fraction n="1" ref="G4_AIR"/>
-    </material>
-    <isotope N="180" Z="74" name="W180">
-      <atom unit="g/mole" value="179.947"/>
-    </isotope>
-    <isotope N="182" Z="74" name="W182">
-      <atom unit="g/mole" value="181.948"/>
-    </isotope>
-    <isotope N="183" Z="74" name="W183">
-      <atom unit="g/mole" value="182.95"/>
-    </isotope>
-    <isotope N="184" Z="74" name="W184">
-      <atom unit="g/mole" value="183.951"/>
-    </isotope>
-    <isotope N="186" Z="74" name="W186">
-      <atom unit="g/mole" value="185.954"/>
-    </isotope>
-    <element name="W">
-      <fraction n="0.0012" ref="W180"/>
-      <fraction n="0.265" ref="W182"/>
-      <fraction n="0.1431" ref="W183"/>
-      <fraction n="0.3064" ref="W184"/>
-      <fraction n="0.2843" ref="W186"/>
-    </element>
-    <material name="G4_W" state="solid">
-      <MEE unit="eV" value="727"/>
-      <D unit="g/cm3" value="19.3"/>
-      <fraction n="1" ref="W"/>
-    </material>
-    <material name="g10" state="solid">
-      <MEE unit="eV" value="114.378463512112"/>
-      <D unit="g/cm3" value="1.7"/>
-      <fraction n="0.08" ref="Cl"/>
-      <fraction n="0.460597175271302" ref="O"/>
-      <fraction n="0.361327255" ref="Si"/>
-      <fraction n="0.0193736737588317" ref="H"/>
-      <fraction n="0.078701895969866" ref="C"/>
-    </material>
-    <isotope N="54" Z="26" name="Fe54">
-      <atom unit="g/mole" value="53.9396"/>
-    </isotope>
-    <isotope N="56" Z="26" name="Fe56">
-      <atom unit="g/mole" value="55.9349"/>
-    </isotope>
-    <isotope N="57" Z="26" name="Fe57">
-      <atom unit="g/mole" value="56.9354"/>
-    </isotope>
-    <isotope N="58" Z="26" name="Fe58">
-      <atom unit="g/mole" value="57.9333"/>
-    </isotope>
-    <element name="Fe">
-      <fraction n="0.05845" ref="Fe54"/>
-      <fraction n="0.91754" ref="Fe56"/>
-      <fraction n="0.02119" ref="Fe57"/>
-      <fraction n="0.00282" ref="Fe58"/>
-    </element>
-    <isotope N="50" Z="24" name="Cr50">
-      <atom unit="g/mole" value="49.946"/>
-    </isotope>
-    <isotope N="52" Z="24" name="Cr52">
-      <atom unit="g/mole" value="51.9405"/>
-    </isotope>
-    <isotope N="53" Z="24" name="Cr53">
-      <atom unit="g/mole" value="52.9407"/>
-    </isotope>
-    <isotope N="54" Z="24" name="Cr54">
-      <atom unit="g/mole" value="53.9389"/>
-    </isotope>
-    <element name="Cr">
-      <fraction n="0.04345" ref="Cr50"/>
-      <fraction n="0.83789" ref="Cr52"/>
-      <fraction n="0.09501" ref="Cr53"/>
-      <fraction n="0.02365" ref="Cr54"/>
-    </element>
-    <isotope N="58" Z="28" name="Ni58">
-      <atom unit="g/mole" value="57.9353"/>
-    </isotope>
-    <isotope N="60" Z="28" name="Ni60">
-      <atom unit="g/mole" value="59.9308"/>
-    </isotope>
-    <isotope N="61" Z="28" name="Ni61">
-      <atom unit="g/mole" value="60.9311"/>
-    </isotope>
-    <isotope N="62" Z="28" name="Ni62">
-      <atom unit="g/mole" value="61.9283"/>
-    </isotope>
-    <isotope N="64" Z="28" name="Ni64">
-      <atom unit="g/mole" value="63.928"/>
-    </isotope>
-    <element name="Ni">
-      <fraction n="0.680769" ref="Ni58"/>
-      <fraction n="0.262231" ref="Ni60"/>
-      <fraction n="0.011399" ref="Ni61"/>
-      <fraction n="0.036345" ref="Ni62"/>
-      <fraction n="0.009256" ref="Ni64"/>
-    </element>
-    <material name="stainless_steel" state="solid">
-      <MEE unit="eV" value="282.929693036223"/>
-      <D unit="g/cm3" value="7.87"/>
-      <fraction n="0.70611" ref="Fe"/>
-      <fraction n="0.18784" ref="Cr"/>
-      <fraction n="0.10605" ref="Ni"/>
-    </material>
-    <material name="fanele2" state="solid">
-      <MEE unit="eV" value="75.3984269235952"/>
-      <D unit="g/cm3" value="2.04"/>
-      <fraction n="0.0814736540216391" ref="H"/>
-      <fraction n="0.543350389498575" ref="C"/>
-      <fraction n="0.257623229207059" ref="O"/>
-      <fraction n="0.0266436363636364" ref="N"/>
-      <fraction n="0.0909090909090909" ref="Cu"/>
-    </material>
-    <material name="fanele1" state="solid">
-      <MEE unit="eV" value="83.6887639821308"/>
-      <D unit="g/cm3" value="2.61666666666667"/>
-      <fraction n="0.0746841828531692" ref="H"/>
-      <fraction n="0.498071190373694" ref="C"/>
-      <fraction n="0.236154626773137" ref="O"/>
-      <fraction n="0.0244233333333333" ref="N"/>
-      <fraction n="0.166666666666667" ref="Cu"/>
-    </material>
-    <material name="G4_POLYSTYRENE" state="solid">
-      <MEE unit="eV" value="68.7"/>
-      <D unit="g/cm3" value="1.06"/>
-      <fraction n="0.077418" ref="H"/>
-      <fraction n="0.922582" ref="C"/>
-    </material>
-    <isotope N="79" Z="35" name="Br79">
-      <atom unit="g/mole" value="78.9183"/>
-    </isotope>
-    <isotope N="81" Z="35" name="Br81">
-      <atom unit="g/mole" value="80.9163"/>
-    </isotope>
-    <element name="Br">
-      <fraction n="0.5069" ref="Br79"/>
-      <fraction n="0.4931" ref="Br81"/>
-    </element>
-    <material name="PCB" state="solid">
-      <MEE unit="eV" value="88.255598548367"/>
-      <D unit="g/cm3" value="1.7"/>
-      <fraction n="0.180774" ref="Si"/>
-      <fraction n="0.405633" ref="O"/>
-      <fraction n="0.278042" ref="C"/>
-      <fraction n="0.0684428" ref="H"/>
-      <fraction n="0.0671091" ref="Br"/>
-    </material>
-    <material name="G4_Fe" state="solid">
-      <MEE unit="eV" value="286"/>
-      <D unit="g/cm3" value="7.874"/>
-      <fraction n="1" ref="Fe"/>
-    </material>
-    <material name="beam" state="gas">
-      <P unit="pascal" value="6.25e-06"/>
-      <MEE unit="eV" value="38.5760755714278"/>
-      <D unit="g/cm3" value="1.7e-14"/>
-      <fraction n="0.36264" ref="H"/>
-      <fraction n="0.36276" ref="N"/>
-      <fraction n="0.117748421296248" ref="C"/>
-      <fraction n="0.156851578703752" ref="O"/>
-    </material>
-    <material name="TDR_gas" state="gas">
-      <MEE unit="eV" value="177.374841770826"/>
-      <D unit="g/cm3" value="0.001731"/>
-      <fraction n="0.95667" ref="Ar"/>
-      <fraction n="0.00519198196" ref="H"/>
-      <fraction n="0.02165502376" ref="C"/>
-      <fraction n="0.01648299428" ref="O"/>
-    </material>
-    <material name="epoxy" state="solid">
-      <MEE unit="eV" value="60.8292941662115"/>
-      <D unit="g/cm3" value="1.3"/>
-      <fraction n="0.131793699039672" ref="H"/>
-      <fraction n="0.535387047414054" ref="C"/>
-      <fraction n="0.332819253546274" ref="O"/>
-    </material>
-    <material name="G4_C" state="solid">
-      <MEE unit="eV" value="81"/>
-      <D unit="g/cm3" value="2"/>
-      <fraction n="1" ref="C"/>
-    </material>
-    <isotope N="27" Z="13" name="Al27">
-      <atom unit="g/mole" value="26.9815"/>
-    </isotope>
-    <element name="Al">
-      <fraction n="1" ref="Al27"/>
-    </element>
-    <material name="TPC_endplate_mix" state="solid">
-      <MEE unit="eV" value="97.0754229107761"/>
-      <D unit="g/cm3" value="0.5827515446"/>
-      <fraction n="0.00953598760814401" ref="C"/>
-      <fraction n="0.558898138898139" ref="N"/>
-      <fraction n="0.226789772550668" ref="O"/>
-      <fraction n="0.00949198949198949" ref="Ar"/>
-      <fraction n="0.14" ref="Al"/>
-      <fraction n="0.0096" ref="Cl"/>
-      <fraction n="0.0433592706" ref="Si"/>
-      <fraction n="0.00232484085105981" ref="H"/>
-    </material>
-    <material name="CarbonFiber" state="solid">
-      <MEE unit="eV" value="70.7270877537631"/>
-      <D unit="g/cm3" value="1.46666666666667"/> 
-      <!-- debug <D unit="g/cm3" value="1.4*1.46666666666667"/> -->
-      <fraction n="0.794091986922138" ref="C"/>
-      <fraction n="0.058408571165309" ref="H"/>
-      <fraction n="0.147499441912553" ref="O"/>
-    </material>
-    <material name="G4_GRAPHITE" state="solid">
-      <MEE unit="eV" value="78"/>
-      <D unit="g/cm3" value="2.21"/>
-      <fraction n="1" ref="C"/>
-    </material>
-    <material name="diamond" state="solid">
-      <MEE unit="eV" value="81"/>
-      <D unit="g/cm3" value="3.51"/>
-      <fraction n="1" ref="C"/>
-    </material>
-    <material Z="79" name="G4_Au" state="solid">
-      <MEE unit="eV" value="790"/>
-      <D unit="g/cm3" value="19.32"/>
-      <atom unit="g/mole" value="196.967"/>
-    </material>
-    <material name="G4_POLYETHYLENE" state="solid">
-      <MEE unit="eV" value="57.4"/>
-      <D unit="g/cm3" value="0.94"/>
-      <fraction n="0.143711" ref="H"/>
-      <fraction n="0.856289" ref="C"/>
-    </material>
-    <isotope N="55" Z="25" name="Mn55">
-      <atom unit="g/mole" value="54.938"/>
-    </isotope>
-    <element name="Mn">
-      <fraction n="1" ref="Mn55"/>
-    </element>
-    <material name="Steel235" state="solid">
-      <MEE unit="eV" value="285.146562707739"/>
-      <D unit="g/cm3" value="7.87"/>
-      <fraction n="0.9843" ref="Fe"/>
-      <fraction n="0.0017" ref="C"/>
-      <fraction n="0.014" ref="Mn"/>
-    </material>
-
-    <comment> materials introduced for the BeamCal</comment>
-    <material name="TungstenDens24">
-      <D value="17.8" unit="g/cm3"/>
-      <fraction n="0.93" ref="W"/>
-      <fraction n="0.061" ref="Ni"/>
-      <fraction n="0.009" ref="Fe"/>
-    </material>
-
-    <material name="Kapton">
-      <D value="1.43" unit="g/cm3" />
-      <composite n="22" ref="C"/>
-      <composite n="10" ref="H" />
-      <composite n="2" ref="N" />
-      <composite n="5" ref="O" />
-    </material>
-
-  </materials>
diff --git a/compact/trunk/Muon/materials.xml b/compact/trunk/Muon/materials.xml
deleted file mode 100644
index 77499dcd060f3b1f5676bdbae32b7426e20aa479..0000000000000000000000000000000000000000
--- a/compact/trunk/Muon/materials.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-    (c) Copyright 2021 CERN for the benefit of the LHCb Collaboration
-
-    This software is distributed under the terms of the GNU General Public
-    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
-
-    In applying this licence, CERN does not waive the privileges and immunities
-    granted to it by virtue of its status as an Intergovernmental Organization
-    or submit itself to any jurisdiction.
--->
-<materials>
-
-  <catalog name="Muon">
-    <!-- %%%%%%         epoxy           %%%%%%%% -->
-    <material density="1.3*g/cm3" name="Epoxy" state="solid">
-      <component name="Carbon" natoms="15"/>
-      <component name="Hydrogen" natoms="44"/>
-      <component name="Oxygen" natoms="7"/>
-    </material>
-    <!-- %%%%%%         G10             %%%%%%%% -->
-    <material density="1.7*g/cm3" name="G10" state="solid">
-      <component name="SiO2" natoms="0.853"/>
-      <component name="Muon/Epoxy" natoms="0.147"/>
-    </material>
-    <!-- %%%%%% G10 0.8mm planels with 50micron Cu cladding
-                total thickness is 0.9 mm %%%%%%%% -->
-    <material density="1.7*g/cm3" name="G10CuClad" state="solid">
-      <component name="Muon/G10" fractionmass="0.60"/>
-      <component name="Copper" fractionmass="0.40"/>
-    </material>
-    <!-- %%%%%% G10/Air mix for chamber surrounds %%%%%%%% -->
-    <material density="0.76*g/cm3" name="G10Air" state="solid">
-      <component name="Muon/G10" natoms="0.55"/>
-      <component name="Air" natoms="0.45"/>
-    </material>
-    <!-- %%%%%%              Honeycomb                 %%%%%% -->
-    <material density="0.00628*g/cm3" name="Honeycomb" state="solid">
-      <component name="Air" natoms="0.97"/>
-      <component name="Muon/G10" natoms="0.03"/>
-    </material>
-    <!-- %%%%%%         Polystyrene_Foam                   %%%%%% -->
-    <material density="0.00350*g/cm3" name="Polystyrene_Foam"
-      state="solid">
-      <component name="Hydrogen" natoms="1"/>
-      <component name="Carbon" natoms="1"/>
-    </material>
-    <!-- %%%%%%              S_CPC_gas    %%%%%% -->
-    <material density="0.002054*g/cm3" name="S_CPC_gas" state="gas">
-      <component name="ArgonGas" fractionmass="0.6"/>
-      <component name="CF4"      fractionmass="0.1"/>
-      <component name="CO2"      fractionmass="0.3"/>
-    </material>
-    <!-- %%%%%%             C2_H2_F4    %%%%%% -->
-    <material name="C2_H2_F4" state="gas">
-      <component name="Carbon" natoms="2"/>
-      <component name="Hydrogen" natoms="2"/>
-      <component name="Fluorine" natoms="4"/>
-    </material>
-    <!-- %%%%%%            SF6    %%%%%% -->
-    <material name="SF6" state="gas">
-      <component name="Sulfur" natoms="1"/>
-      <component name="Fluorine" natoms="6"/>
-    </material>
-    <!-- %%%%%%            C4_H10    %%%%%% -->
-    <material name="C4_H10" state="gas">
-      <component name="Carbon" natoms="4"/>
-      <component name="Hydrogen" natoms="10"/>
-    </material>
-    <!-- %%%%%%              S_MRPC_gas    %%%%%% -->
-    <material density="0.004514*g/cm3" name="S_MRPC_gas" state="gas">
-      <component name="Muon/C2_H2_F4" natoms="0.96"/>
-      <component name="Muon/C4_H10" natoms="0.03"/>
-      <component name="Muon/SF6" natoms="0.01"/>
-    </material>
-    <!-- %%%%%%              Phenolic    %%%%%% -->
-    <material name="Phenolic" density="1.25*g/cm3" state="solid">
-      <component fractionmass="0.05744" name="Hydrogen"/>
-      <component fractionmass="0.77459" name="Carbon"/>
-      <component fractionmass="0.16797" name="Muon/SF6"/>
-    </material>
-    <!-- %%%%%%              Muon Filter Iron  %%%%%%%% -->
-    <material density="7.5*g/cm3" name="MuonFilterIron" state="solid">
-      <component fractionmass="0.9851" name="Iron"/>
-      <component fractionmass="0.005" name="Carbon"/>
-      <component fractionmass="0.009" name="Manganese"/>
-      <component fractionmass="0.0004" name="Phosphor"/>
-      <component fractionmass="0.0005" name="Sulfur"/>
-    </material>
-
-
-    <!--steel -->
-    <material density="7.8*g/cm3" name="Steel" state="solid">
-      <component fractionmass="0.7" name="Iron"  />
-      <component fractionmass="0.1" name="Carbon"/>
-      <component fractionmass="0.2" name="Copper"/>
-    </material>
-
-
-<!--Concrete-->
-    <material density="2.5*g/cm3" name="Concrete" state="solid">
-      <component fractionmass="0.520" name="Oxygen"  />
-      <component fractionmass="0.325" name="Silicon"  />
-      <component fractionmass="0.060" name="Calcium"  />
-      <component fractionmass="0.015" name="Sodium"  />
-      <component fractionmass="0.020" name="Iron"  />
-      <component fractionmass="0.040" name="Aluminium"  />
-     </material>
-
-    <material density="8.96*g/cm3" name="MuonCopper" state="solid">
-      <component fractionmass="1.0" name="Copper"  />
-    </material>
-
-    <material density="0.5*g/cm3" name="MuonPolyurethane" state="solid">
-      <component fractionmass="0.0264" name="Hydrogen"/>
-      <component fractionmass="0.6911" name="Carbon"/>
-      <component fractionmass="0.0733" name="Nitrogen"/>
-      <component fractionmass="0.2092" name="Oxygen"/>
-    </material>
-
-    <material density="1.42*g/cm3" name="Kapton" state="solid">
-      <component fractionmass="0.0264" name="Hydrogen"/>
-      <component fractionmass="0.6911" name="Carbon"/>
-      <component fractionmass="0.0733" name="Nitrogen"/>
-      <component fractionmass="0.2092" name="Oxygen"/>
-    </material>
-  </catalog>
-</materials>
-
diff --git a/compact/trunk/UT/UTBox.xml b/compact/trunk/UT/UTBox.xml
index f1c47bea414a5f82cf2624a88ed18ce82e347111..05712d669389c0dfa4c381d24f84876d43d148ee 100644
--- a/compact/trunk/UT/UTBox.xml
+++ b/compact/trunk/UT/UTBox.xml
@@ -72,13 +72,13 @@
 		</physvol>
 	</volume>
 	<!-- End of Stave (EOS) volumes -->
-	<volume material="Steel" name="lvUTaEOS" vis="UT:EOS">
+	<volume material="UT:Steel" name="lvUTaEOS" vis="UT:EOS">
 		<shape dx="(UTEOSWideUTa/2)/2" dy="UTEOSLong/2" dz="UTEOSThick/2" name="utUTaEOS" type="Box" />
 	</volume>
 	<volume material="UT:EOSPigtail" name="lvUTaEOSPigtail" vis="UT:EOS">
 		<shape dx="(UTEOSWideUTa/2)/2" dy="UTEOSPigtailLong/2" dz="UTEOSPigtailThick/2" name="utUTaEOSPigtail" type="Box" />
 	</volume>
-	<volume material="Steel" name="lvUTbEOS" vis="UT:EOS">
+	<volume material="UT:Steel" name="lvUTbEOS" vis="UT:EOS">
 		<shape dx="(UTEOSWideUTb/2)/2" dy="UTEOSLong/2" dz="UTEOSThick/2" name="utUTbEOS" type="Box" />
 	</volume>
 	<volume material="UT:EOSPigtail" name="lvUTbEOSPigtail" vis="UT:EOS">
diff --git a/compact/trunk/UT/parameters.xml b/compact/trunk/UT/parameters.xml
index 98155e56429caf64e8b683ba052650d0b2b5f7d8..0397294678ebf1ab50eebead5567afeaa8f3d397 100644
--- a/compact/trunk/UT/parameters.xml
+++ b/compact/trunk/UT/parameters.xml
@@ -405,7 +405,7 @@
 	</define>
 	<materials>
 		<!-- Elements (temporary) -->
-		<element Z="13" formula="Al" name="Aluminium">
+		<element Z="13" formula="Al" name="UT:Aluminium">
 			<!-- <D type="density" value="2.7" unit="g/cm3" /> -->
 			<atom type="A" unit="g/mol" value="26.98" />
 		</element>
@@ -420,15 +420,15 @@
 		</material>
 		<material name="UT:Aluminium">
 			<D type="density" value="2.7" unit="g/cm3" />
-			<fraction n="1.000" ref="Aluminium" />
+			<fraction n="1.000" ref="UT:Aluminium" />
 		</material>
-		<material name="Steel">
+		<material name="UT:Steel">
 			<!-- Hangyi -->
 			<D type="density" unit="g/cm3" value="7.8" />
 			<fraction n="0.7" ref="Iron" />
 			<fraction n="0.1" ref="Carbon" />
 			<fraction n="0.2" ref="Copper" />
-		</material>
+		</material> 
 		<material name="UT:Airex">
 			<D type="density" value="0.06" unit="g/cm3" />
 			<composite n="37" ref="Carbon" />
@@ -608,7 +608,7 @@
 		</material>
 		<material name="UT:EOSPigtail">
 			<D type="density" value="4.279" unit="g/cm3" />
-			<fraction n="0.9282" ref="Steel" />
+			<fraction n="0.9282" ref="UT:Steel" />
 			<fraction n="0.0718" ref="UT:HybridFlex8" />
 		</material>
 		<material name="UT:BoxWall">
diff --git a/compact/trunk/checksums b/compact/trunk/checksums
index ecb646f0d9dffc63cec52f507ed3f19090ff0f5f..1826084669f3940e95191341fda1cca38aeee6fe 100644
--- a/compact/trunk/checksums
+++ b/compact/trunk/checksums
@@ -1,4 +1,4 @@
-/world_volume: 4201229060
+/world_volume: 1993062560
 /world_volume/lvAfterMagnetRegion_3: 1963271528
 /world_volume/lvAfterMagnetRegion_3/lvRich2Master_1: 187033957
 /world_volume/lvAfterMagnetRegion_3/lvRich2Master_1/pvRich2EntryWinTubeLock: 1979723490
@@ -48,12 +48,12 @@
 /world_volume/lvAfterMagnetRegion_3/lvUX85BakeoutAfterMagnet_2: 2588750996
 /world_volume/lvAfterMagnetRegion_3/lvUX85SupportsAfterMagnet_4: 2302184141
 /world_volume/lvAfterMagnetRegion_3/lvUX85SupportsAfterMagnet_4/pvUX853AfterMagnetCollar: 2052547805
-/world_volume/lvBeforeMagnetRegion_1: 3989968787
-/world_volume/lvBeforeMagnetRegion_1/lvBeforeVelo_0: 2262287830
-/world_volume/lvBeforeMagnetRegion_1/lvBeforeVelo_0/lvBcmUp_3: 708727183
+/world_volume/lvBeforeMagnetRegion_1: 3029560657
+/world_volume/lvBeforeMagnetRegion_1/lvBeforeVelo_0: 2472087751
+/world_volume/lvBeforeMagnetRegion_1/lvBeforeVelo_0/lvBcmUp_3: 2661979061
 /world_volume/lvBeforeMagnetRegion_1/lvBeforeVelo_0/lvBlockWallBefMag_0: 2623562443
 /world_volume/lvBeforeMagnetRegion_1/lvBeforeVelo_0/lvBls_2: 496682128
-/world_volume/lvBeforeMagnetRegion_1/lvBeforeVelo_0/lvGValve_1: 2014493631
+/world_volume/lvBeforeMagnetRegion_1/lvBeforeVelo_0/lvGValve_1: 1419795104
 /world_volume/lvBeforeMagnetRegion_1/lvBeforeVelo_0/lvPipeSupBefVelo_5: 950918190
 /world_volume/lvBeforeMagnetRegion_1/lvBeforeVelo_0/lvUX84BeforeVelo_4: 3588858010
 /world_volume/lvBeforeMagnetRegion_1/lvPipeBeforeVelo_4: 1907476790
@@ -64,11 +64,11 @@
 /world_volume/lvBeforeMagnetRegion_1/lvRich1Master_1/pvRich1SubMaster: 657361690
 /world_volume/lvBeforeMagnetRegion_1/lvRich1Master_1/pvUX851InRich1AfterSubM: 1874884759
 /world_volume/lvBeforeMagnetRegion_1/lvRich1Master_1/pvUX851InRich1BeforeSubM: 3776943454
-/world_volume/lvBeforeMagnetRegion_1/lvUT_3: 840556288
-/world_volume/lvBeforeMagnetRegion_1/lvUT_3/lvUTA_4: 530402798
+/world_volume/lvBeforeMagnetRegion_1/lvUT_3: 2794542772
+/world_volume/lvBeforeMagnetRegion_1/lvUT_3/lvUTA_4: 2305672042
 /world_volume/lvBeforeMagnetRegion_1/lvUT_3/lvUTBoxPlug_2: 2982282835
 /world_volume/lvBeforeMagnetRegion_1/lvUT_3/lvUTBox_1: 2557552759
-/world_volume/lvBeforeMagnetRegion_1/lvUT_3/lvUTC_3: 552650408
+/world_volume/lvBeforeMagnetRegion_1/lvUT_3/lvUTC_3: 950851269
 /world_volume/lvBeforeMagnetRegion_1/lvUT_3/lvUTFrame_0: 1312950758
 /world_volume/lvBeforeMagnetRegion_1/lvUT_3/lvUTJacket_5: 2262956715
 /world_volume/lvBeforeMagnetRegion_1/lvUT_3/lvUX851InUT_6: 2312201870
@@ -80,9 +80,9 @@
 /world_volume/lvBeforeMagnetRegion_1/lvVP_2/pvVPMotionLeft: 2198385948
 /world_volume/lvBeforeMagnetRegion_1/lvVP_2/pvVPMotionRight: 1630601369
 /world_volume/lvBeforeMagnetRegion_1/lvVP_2/pvVacTank: 4180183569
-/world_volume/lvDownstreamRegion_4: 3121702174
-/world_volume/lvDownstreamRegion_4/lvAfterMuon_0: 1763508463
-/world_volume/lvDownstreamRegion_4/lvAfterMuon_0/lvBcmDown_0: 3353991402
+/world_volume/lvDownstreamRegion_4: 1387158287
+/world_volume/lvDownstreamRegion_4/lvAfterMuon_0: 957808461
+/world_volume/lvDownstreamRegion_4/lvAfterMuon_0/lvBcmDown_0: 3159929950
 /world_volume/lvDownstreamRegion_4/lvAfterMuon_0/lvMBXWDown_1: 3528288914
 /world_volume/lvDownstreamRegion_4/lvAfterMuon_0/lvPipeAfterMuon_2: 620416237
 /world_volume/lvDownstreamRegion_4/lvEcal_2: 105418779
@@ -91,23 +91,23 @@
 /world_volume/lvDownstreamRegion_4/lvHcal_3: 1966937768
 /world_volume/lvDownstreamRegion_4/lvHcal_3/pvHcalLeft: 4095643253
 /world_volume/lvDownstreamRegion_4/lvHcal_3/pvHcalright: 4217369814
-/world_volume/lvDownstreamRegion_4/lvMuon_1: 3348715730
-/world_volume/lvDownstreamRegion_4/lvMuon_1/lvM2ASideBeamPlug_4: 113116384
-/world_volume/lvDownstreamRegion_4/lvMuon_1/lvM2CSideBeamPlug_5: 521075949
-/world_volume/lvDownstreamRegion_4/lvMuon_1/lvM3ASideBeamPlug_6: 2176621055
-/world_volume/lvDownstreamRegion_4/lvMuon_1/lvM3CSideBeamPlug_7: 1872974569
-/world_volume/lvDownstreamRegion_4/lvMuon_1/lvM4ASideBeamPlug_8: 609448574
-/world_volume/lvDownstreamRegion_4/lvMuon_1/lvM4CSideBeamPlug_9: 1038322291
-/world_volume/lvDownstreamRegion_4/lvMuon_1/lvM5ASideBeamPlug_10: 3206437030
-/world_volume/lvDownstreamRegion_4/lvMuon_1/lvM5CSideBeamPlug_11: 2796462251
-/world_volume/lvDownstreamRegion_4/lvMuon_1/lvMuonFilter_0: 3893711741
-/world_volume/lvDownstreamRegion_4/lvMuon_1/lvMuonFilter_1: 2041008963
-/world_volume/lvDownstreamRegion_4/lvMuon_1/lvMuonFilter_2: 3746874083
-/world_volume/lvDownstreamRegion_4/lvMuon_1/lvMuonFilter_3: 3514794691
-/world_volume/lvDownstreamRegion_4/lvMuon_1/lvStation_12: 29260199
-/world_volume/lvDownstreamRegion_4/lvMuon_1/lvStation_13: 1774741901
-/world_volume/lvDownstreamRegion_4/lvMuon_1/lvStation_14: 982459314
-/world_volume/lvDownstreamRegion_4/lvMuon_1/lvStation_15: 643493299
+/world_volume/lvDownstreamRegion_4/lvMuon_1: 3132273891
+/world_volume/lvDownstreamRegion_4/lvMuon_1/lvM2ASideBeamPlug_4: 753303553
+/world_volume/lvDownstreamRegion_4/lvMuon_1/lvM2CSideBeamPlug_5: 1869197234
+/world_volume/lvDownstreamRegion_4/lvMuon_1/lvM3ASideBeamPlug_6: 3877088785
+/world_volume/lvDownstreamRegion_4/lvMuon_1/lvM3CSideBeamPlug_7: 2458686571
+/world_volume/lvDownstreamRegion_4/lvMuon_1/lvM4ASideBeamPlug_8: 3833609470
+/world_volume/lvDownstreamRegion_4/lvMuon_1/lvM4CSideBeamPlug_9: 2802783053
+/world_volume/lvDownstreamRegion_4/lvMuon_1/lvM5ASideBeamPlug_10: 1087319583
+/world_volume/lvDownstreamRegion_4/lvMuon_1/lvM5CSideBeamPlug_11: 54526380
+/world_volume/lvDownstreamRegion_4/lvMuon_1/lvMuonFilter_0: 861223391
+/world_volume/lvDownstreamRegion_4/lvMuon_1/lvMuonFilter_1: 2519227302
+/world_volume/lvDownstreamRegion_4/lvMuon_1/lvMuonFilter_2: 819710470
+/world_volume/lvDownstreamRegion_4/lvMuon_1/lvMuonFilter_3: 207202214
+/world_volume/lvDownstreamRegion_4/lvMuon_1/lvStation_12: 2843222722
+/world_volume/lvDownstreamRegion_4/lvMuon_1/lvStation_13: 3703153972
+/world_volume/lvDownstreamRegion_4/lvMuon_1/lvStation_14: 2415849227
+/world_volume/lvDownstreamRegion_4/lvMuon_1/lvStation_15: 2469077258
 /world_volume/lvDownstreamRegion_4/lvUX85BakeoutDownstream_5: 3711578364
 /world_volume/lvDownstreamRegion_4/lvUX85BakeoutDownstream_5/pvUX854Bakeout: 3145125225
 /world_volume/lvDownstreamRegion_4/lvUX85BakeoutDownstream_5/pvUX854Win05BakeoutMain: 734953025
@@ -122,14 +122,14 @@
 /world_volume/lvDownstreamRegion_4/lvUX85SupportsDownstream_6/pvUX853CableDownstream04: 144779018
 /world_volume/lvDownstreamRegion_4/lvUX85SupportsDownstream_6/pvUX853DownstreamCollar: 954691355
 /world_volume/lvDownstreamRegion_4/lvUX85SupportsDownstream_6/pvUX854SlSup: 4271947702
-/world_volume/lvMagnetRegion_2: 2704364922
-/world_volume/lvMagnetRegion_2/MagnetEnvelope_0: 3580343570
-/world_volume/lvMagnetRegion_2/MagnetEnvelope_0/Left_Vertical_Part: 2986457058
-/world_volume/lvMagnetRegion_2/MagnetEnvelope_0/LowerCoil: 4083587425
-/world_volume/lvMagnetRegion_2/MagnetEnvelope_0/Lower_Horizontal_Part: 564565888
-/world_volume/lvMagnetRegion_2/MagnetEnvelope_0/Right_Vertical_Part: 3879949041
-/world_volume/lvMagnetRegion_2/MagnetEnvelope_0/UpperCoil: 3758427760
-/world_volume/lvMagnetRegion_2/MagnetEnvelope_0/Upper_Horizontal_Part: 1438513822
+/world_volume/lvMagnetRegion_2: 15806978
+/world_volume/lvMagnetRegion_2/MagnetEnvelope_0: 3963018011
+/world_volume/lvMagnetRegion_2/MagnetEnvelope_0/Left_Vertical_Part: 1575235178
+/world_volume/lvMagnetRegion_2/MagnetEnvelope_0/LowerCoil: 3675638069
+/world_volume/lvMagnetRegion_2/MagnetEnvelope_0/Lower_Horizontal_Part: 2375575099
+/world_volume/lvMagnetRegion_2/MagnetEnvelope_0/Right_Vertical_Part: 145148793
+/world_volume/lvMagnetRegion_2/MagnetEnvelope_0/UpperCoil: 3363200548
+/world_volume/lvMagnetRegion_2/MagnetEnvelope_0/Upper_Horizontal_Part: 4186114853
 /world_volume/lvMagnetRegion_2/lvUX85InMagnet_1: 1241159052
 /world_volume/lvMagnetRegion_2/lvUX85InMagnet_1/pvUX851InMagnet: 3851464078
 /world_volume/lvMagnetRegion_2/lvUX85InMagnet_1/pvUX852: 3945720903
diff --git a/compact/trunk/debug/Muon_debug.xml b/compact/trunk/debug/Muon_debug.xml
index 0bdbd3f697315b4a47afa394623072d5eb11af35..379fa58ea5eb93f97bfb6332155849b07bcc05c8 100644
--- a/compact/trunk/debug/Muon_debug.xml
+++ b/compact/trunk/debug/Muon_debug.xml
@@ -17,6 +17,11 @@
   </info>
   <!-- geometry open="true" close="false"/ -->
 
+  <includes>
+    <gdmlFile  ref="../DDDetectors/compact/elements.xml"/>
+    <gdmlFile  ref="../DDDetectors/compact/materials.xml"/>
+  </includes>
+
   <define>
 
     <constant name="world_side" value="50000*m" />
@@ -33,8 +38,6 @@
   </define>
 
   <includes>
-    <gdmlFile ref="../defaults.xml"/>
-    <gdmlFile ref="../Muon/Muon/Materials/Elements.xml"/>
     <gdmlFile ref="../Muon/Muon/Materials/MuonMaterials.xml"/>
     <gdmlFile ref="../Muon/MuonParameters.xml"/>
     <gdmlFile ref="../Muon/VisAttributes.xml"/>
@@ -50,6 +53,7 @@
     <constant name="DownstreamRegion:ignore"   value="0"/>
   </define>
 
+  <include ref="../Regions/parameters.xml"/>
   <include ref="../Regions/detector.xml"/>
 
   <include ref="../Muon/Muon/detector.xml"/>
diff --git a/compact/trunk/defaults.xml b/compact/trunk/defaults.xml
index 316d35b1f5740ef06eda95a3105b00cec050cfe1..6b15d34cd4cd7a031db225d54f51bea7cd220a15 100644
--- a/compact/trunk/defaults.xml
+++ b/compact/trunk/defaults.xml
@@ -13,64 +13,9 @@
   <!-- Have the materials    -->
   <includes>
     <gdmlFile ref="DDDetectors/compact/elements.xml"/>
+    <gdmlFile ref="DDDetectors/compact/materials.xml"/>
   </includes>
 
-  <materials>
-    <element Z="7" formula="N" name="N" >
-      <atom type="A" unit="g/mol" value="14.0068" />
-    </element>
-    <material formula="N" name="Nitrogen" state="gas" >
-      <RL type="X0" unit="cm" value="32602.2" />
-      <NIL type="lambda" unit="cm" value="72430.3" />
-      <D type="density" unit="g/cm3" value="0.0011652" />
-      <composite n="1" ref="N" />
-    </material>
-
-    <element Z="8" formula="O" name="O" >
-      <atom type="A" unit="g/mol" value="15.9994" />
-    </element>
-    <material formula="O" name="Oxygen" state="gas" >
-      <RL type="X0" unit="cm" value="25713.8" />
-      <NIL type="lambda" unit="cm" value="66233.9" />
-      <D type="density" unit="g/cm3" value="0.00133151" />
-      <composite n="1" ref="O" />
-    </material>
-
-    <element Z="18" formula="Ar" name="Ar" >
-      <atom type="A" unit="g/mol" value="39.9477" />
-    </element>
-
-    <material formula="Ar" name="Argon" state="gas" >
-      <RL type="X0" unit="cm" value="11762.1" />
-      <NIL type="lambda" unit="cm" value="71926" />
-      <D type="density" unit="g/cm3" value="0.00166201" />
-      <composite n="1" ref="Ar" />
-    </material>
-
-    <material name="Air">
-      <D type="density" unit="g/cm3" value="0.0012"/>
-      <fraction n="0.754" ref="N"/>
-      <fraction n="0.234" ref="O"/>
-      <fraction n="0.012" ref="Ar"/>
-    </material>
-
-    <!-- We just model Vacuum as very thin air.... -->
-    <material name="Vacuum">  
-      <D type="density" unit="g/cm3" value="0.0000000001" />
-      <fraction n="0.754" ref="N"/>
-      <fraction n="0.234" ref="O"/>
-      <fraction n="0.012" ref="Ar"/>
-    </material>
-
-    <material name="Water">
-      <D type="density" unit="g/cm3" value="1.0"/>
-      <composite ref="H" n="2"/>
-      <composite ref="O" n="1"/>
-    </material>
-
-
-  </materials>
-
   <comment>Blobal definitions and parameters</comment>
   <define>
     <!--  Define the world box  -->