diff --git a/compact/tracking/definitions.xml b/compact/tracking/definitions.xml
index 26d6ca848..728359fc5 100644
--- a/compact/tracking/definitions.xml
+++ b/compact/tracking/definitions.xml
@@ -131,12 +131,6 @@
       vis="TrackerSubAssemblyVis">
       <composite name="BarrelTOF"/>
     </detector>
-    <detector id="TrackerSubAssembly_5_ID"
-        name="OuterMPGDSubAssembly"
-        type="DD4hep_SubdetectorAssembly"
-        vis="TrackerSubAssemblyVis">
-        <composite name="MPGDDIRC_0"/>
-    </detector>
     <detector id="TrackerSubAssembly_6_ID"
       name="EndcapTOFSubSubAssembly"
       type="DD4hep_SubdetectorAssembly"
diff --git a/compact/tracking/definitions_brycecanyon.xml b/compact/tracking/definitions_arches.xml
similarity index 97%
rename from compact/tracking/definitions_brycecanyon.xml
rename to compact/tracking/definitions_arches.xml
index 728359fc5..26d6ca848 100644
--- a/compact/tracking/definitions_brycecanyon.xml
+++ b/compact/tracking/definitions_arches.xml
@@ -131,6 +131,12 @@
       vis="TrackerSubAssemblyVis">
       <composite name="BarrelTOF"/>
     </detector>
+    <detector id="TrackerSubAssembly_5_ID"
+        name="OuterMPGDSubAssembly"
+        type="DD4hep_SubdetectorAssembly"
+        vis="TrackerSubAssemblyVis">
+        <composite name="MPGDDIRC_0"/>
+    </detector>
     <detector id="TrackerSubAssembly_6_ID"
       name="EndcapTOFSubSubAssembly"
       type="DD4hep_SubdetectorAssembly"
diff --git a/configurations/arches.yml b/configurations/arches.yml
index ed8709b7e..cbb543f7b 100644
--- a/configurations/arches.yml
+++ b/configurations/arches.yml
@@ -3,7 +3,7 @@ pbeam: 275
 features:
   beampipe:
   tracking:
-    definitions:
+    definitions_arches:
     vertex_barrel:
     silicon_barrel:
     mpgd_barrel:
diff --git a/configurations/arches_mrich_gdml.yml b/configurations/arches_mrich_gdml.yml
index 71324d80b..587e87a35 100644
--- a/configurations/arches_mrich_gdml.yml
+++ b/configurations/arches_mrich_gdml.yml
@@ -3,7 +3,7 @@ pbeam: 275
 features:
   beampipe:
   tracking:
-    definitions:
+    definitions_arches:
     vertex_barrel:
     silicon_barrel:
     mpgd_barrel:
diff --git a/configurations/brycecanyon.yml b/configurations/brycecanyon.yml
index 8431eadc1..2abbd6191 100644
--- a/configurations/brycecanyon.yml
+++ b/configurations/brycecanyon.yml
@@ -3,7 +3,7 @@ pbeam: 41
 features:
   beampipe:
   tracking:
-    definitions_brycecanyon:
+    definitions:
     vertex_barrel:
     silicon_barrel:
     mpgd_barrel:
diff --git a/configurations/brycecanyon_no_pfrich.yml b/configurations/brycecanyon_no_pfrich.yml
index 325d3b2f4..49603a3cd 100644
--- a/configurations/brycecanyon_no_pfrich.yml
+++ b/configurations/brycecanyon_no_pfrich.yml
@@ -3,7 +3,7 @@ pbeam: 41
 features:
   beampipe:
   tracking:
-    definitions_brycecanyon:
+    definitions:
     vertex_barrel:
     silicon_barrel:
     mpgd_barrel:
diff --git a/configurations/brycecanyon_pfrich_gdml.yml b/configurations/brycecanyon_pfrich_gdml.yml
index ae396e8f2..e1ab06362 100644
--- a/configurations/brycecanyon_pfrich_gdml.yml
+++ b/configurations/brycecanyon_pfrich_gdml.yml
@@ -3,7 +3,7 @@ pbeam: 41
 features:
   beampipe:
   tracking:
-    definitions_brycecanyon:
+    definitions:
     vertex_barrel:
     silicon_barrel:
     mpgd_barrel:
diff --git a/configurations/full.yml b/configurations/full.yml
index 9d9c50ae6..dbe3eefaf 100644
--- a/configurations/full.yml
+++ b/configurations/full.yml
@@ -12,12 +12,12 @@ features:
     tof_endcap:
   pid:
     dirc:
-    mrich:
+    pfrich:
     drich:
   ecal:
     forward_homogeneous:
     forward_insert_homogeneous:
-    barrel_sciglass:
+    barrel_interlayers:
     backward_PbWO4:
   solenoid:
   hcal:
diff --git a/configurations/imaging.yml b/configurations/imaging.yml
index 545401693..093f72e32 100644
--- a/configurations/imaging.yml
+++ b/configurations/imaging.yml
@@ -1,7 +1,7 @@
 features:
   beampipe:
   tracking:
-    definitions_brycecanyon:
+    definitions:
     vertex_barrel:
     silicon_barrel:
     mpgd_barrel: