diff --git a/configs/V29/object_performance/jets_trigger_fwd.yaml b/configs/V29/object_performance/jets_trigger_fwd.yaml
index b1818c46..5533a9ba 100644
--- a/configs/V29/object_performance/jets_trigger_fwd.yaml
+++ b/configs/V29/object_performance/jets_trigger_fwd.yaml
@@ -12,8 +12,8 @@ JetTurnonFwd_3p7to7:
       object:
         - "abs({eta}) < 7"
   test_objects:
-    phase1PuppiJet:default: "Pt"
-    seededConePuppiJet:default: "Pt"
+    phase1PuppiJet:default:forward: "Pt"
+    seededConePuppiJet:default:forward: "Pt"
   thresholds: [50,100]
   scalings:
     method: "naive"
diff --git a/configs/V29/object_performance/muon_trigger.yaml b/configs/V29/object_performance/muon_trigger.yaml
index 232b3ceb..e111b854 100644
--- a/configs/V29/object_performance/muon_trigger.yaml
+++ b/configs/V29/object_performance/muon_trigger.yaml
@@ -12,8 +12,8 @@ MuonsTrigger_Barrel:
       object:
         - "abs({eta}) < 0.83"
   test_objects:
-    gmtMuon:barrel: "Pt"
-    gmtTkMuon:barrel: "Pt"
+    gmtMuon:default:barrel: "Pt"
+    gmtTkMuon:default:barrel: "Pt"
   xlabel: "Gen. pT (GeV)"
   ylabel: "Trigger Efficiency (barrel, L1 $p_T > 20$ GeV)"
   thresholds: [20, 25]
@@ -40,8 +40,8 @@ MuonsTrigger_Overlap:
         - "abs({eta}) > 0.83"
         - "abs({eta}) < 1.24"
   test_objects:
-    gmtMuon:overlap: "Pt"
-    gmtTkMuon:overlap: "Pt"
+    gmtMuon:default:overlap: "Pt"
+    gmtTkMuon:default:overlap: "Pt"
   xlabel: "Gen. pT (GeV)"
   ylabel: "Trigger Efficiency (overlap, L1 $p_T > 20$ GeV)"
   thresholds: [20, 25]
@@ -67,8 +67,8 @@ MuonsTrigger_Endcap:
       object:
         - "abs({eta}) > 1.24"
   test_objects:
-    gmtMuon:endcap: "Pt"
-    gmtTkMuon:endcap: "Pt"
+    gmtMuon:default:endcap: "Pt"
+    gmtTkMuon:default:endcap: "Pt"
   xlabel: "Gen. pT (GeV)"
   ylabel: "Trigger Efficiency (endcap, L1 $p_T > 20$ GeV)"
   thresholds: [20, 25]
diff --git a/configs/V29/object_performance/photon_iso.yaml b/configs/V29/object_performance/photon_iso.yaml
index f4170ed2..e4e9e1bd 100644
--- a/configs/V29/object_performance/photon_iso.yaml
+++ b/configs/V29/object_performance/photon_iso.yaml
@@ -14,7 +14,7 @@ PhotonIsolation_Barrel:
       object:
         - "abs({eta}) < 1.479"
   test_objects:
-    tkPhoton:barrel: "trkiso"
+    tkPhoton:NoIso:barrel: "trkiso"
   xlabel: "Isolation"
   ylabel: "Efficiency (Barrel)"
   binning:
@@ -39,7 +39,7 @@ PhotonIsolation_Endcap:
       object:
         - "abs({eta}) > 1.479"
   test_objects:
-    tkPhoton:endcap: "trkiso"
+    tkPhoton:NoIso:endcap: "trkiso"
   xlabel: "Isolation"
   ylabel: "Efficiency (Endcap)"
   binning:
diff --git a/configs/V29/object_performance/photons_trigger.yaml b/configs/V29/object_performance/photons_trigger.yaml
index 13467506..93f3acca 100644
--- a/configs/V29/object_performance/photons_trigger.yaml
+++ b/configs/V29/object_performance/photons_trigger.yaml
@@ -13,9 +13,9 @@ PhotonsTrigger_Barrel:
       object:
         - "abs({eta}) < 2.4"
   test_objects:
-    EG:default: "Pt"
-    tkPhoton:NoIso: "Pt"
-    tkPhoton:Iso: "Pt"
+    EG:default:barrel: "Pt"
+    tkPhoton:NoIso:barrel: "Pt"
+    tkPhoton:Iso:barrel: "Pt"
   thresholds: [10, 20, 30, 40]
   scalings:
     method: "naive"
@@ -42,9 +42,9 @@ PhotonsTrigger_Endcap:
       object:
         - "abs({eta}) < 2.4"
   test_objects:
-    EG:eleid: "Pt"
-    tkPhoton:NoIso: "Pt"
-    tkPhoton:Iso: "Pt"
+    EG:eleid:endcap: "Pt"
+    tkPhoton:NoIso:endcap: "Pt"
+    tkPhoton:Iso:endcap: "Pt"
   thresholds: [10, 20, 30, 40]
   scalings:
     method: "naive"
diff --git a/configs/V29/object_performance/tau_trigger.yaml b/configs/V29/object_performance/tau_trigger.yaml
index 72fe096f..084cdd11 100644
--- a/configs/V29/object_performance/tau_trigger.yaml
+++ b/configs/V29/object_performance/tau_trigger.yaml
@@ -13,8 +13,8 @@ TauTriggerBarrel_90perc:
       object:
         - "abs({eta}) < 2.4"
   test_objects:
-    nnTau:default: "Pt"
-    caloTau:default: "Pt"
+    nnTau:default:barrel: "Pt"
+    caloTau:default:barrel: "Pt"
   xlabel: "Gen. pT (GeV)"
   ylabel: "Trigger Efficiency (barrel, L1 $p_T > <threshold>$ GeV)"
   thresholds: [20, 30]
@@ -41,8 +41,8 @@ TauTriggerEndcap_90perc:
       object:
         - "abs({eta}) < 2.4"
   test_objects:
-    nnTau:default: "Pt"
-    caloTau:default: "Pt"
+    nnTau:default:endcap: "Pt"
+    caloTau:default:endcap: "Pt"
   xlabel: "Gen. pT (GeV)"
   ylabel: "Trigger Efficiency (endcap, L1 $p_T > <threshold>$ GeV)"
   thresholds: [20, 30]
@@ -69,8 +69,8 @@ TauTriggerBarrel_50perc:
       object:
         - "abs({eta}) < 2.4"
   test_objects:
-    nnTau:default: "Pt"
-    caloTau:default: "Pt"
+    nnTau:default:barrel: "Pt"
+    caloTau:default:barrel: "Pt"
   xlabel: "Gen. pT (GeV)"
   ylabel: "Trigger Efficiency (barrel, L1 $p_T > <threshold>$ GeV)"
   thresholds: [20, 30]
@@ -97,8 +97,8 @@ TauTriggerEndcap_50perc:
       object:
         - "abs({eta}) < 2.4"
   test_objects:
-    nnTau:default: "Pt"
-    caloTau:default: "Pt"
+    nnTau:default:endcap: "Pt"
+    caloTau:default:endcap: "Pt"
   xlabel: "Gen. pT (GeV)"
   ylabel: "Trigger Efficiency (endcap, L1 $p_T > <threshold>$ GeV)"
   thresholds: [20, 30]
diff --git a/configs/V29/objects/muons.yaml b/configs/V29/objects/muons.yaml
index 6341785e..ce800429 100644
--- a/configs/V29/objects/muons.yaml
+++ b/configs/V29/objects/muons.yaml
@@ -3,48 +3,25 @@ gmtMuon:
   match_dR: 0.3
   eta_ranges:
     inclusive: [0, 5]
+    barrel: [0, 0.83]
+    overlap: [0.83, 1.24]
+    endcap: [1.24, 2.4]
   ids:
     default: {}
-    barrel:
-      cuts:
-        inclusive:
-          - "abs({eta}) < 0.83"
-    overlap:
-      cuts:
-        inclusive:
-          - "abs({eta}) > 0.83"
-          - "abs({eta}) < 1.24"
-    endcap:
-      cuts:
-        inclusive:
-          - "abs({eta}) > 1.24"
-          - "abs({eta}) < 2.4"
-
 
 gmtTkMuon:
   label: "GMT TkMuon"
   match_dR: 0.1
   eta_ranges:
     inclusive: [0, 5]
+    barrel: [0, 0.83]
+    overlap: [0.83, 1.24]
+    endcap: [1.24, 2.4]
   cuts:
     inclusive:
       - "{quality} > 0"
   ids:
-    default: {}
-    barrel:
-      cuts:
-        inclusive:
-          - "abs({eta}) < 0.83"
-          - "{quality} > 0"
-    overlap:
-      cuts:
-        inclusive:
-          - "abs({eta}) > 0.83"
-          - "abs({eta}) < 1.24"
-          - "{quality} > 0"
-    endcap:
+    default:
       cuts:
         inclusive:
-          - "abs({eta}) > 1.24"
-          - "abs({eta}) < 2.4"
           - "{quality} > 0"
diff --git a/configs/V29/objects/photons.yaml b/configs/V29/objects/photons.yaml
index 12df4507..91280352 100644
--- a/configs/V29/objects/photons.yaml
+++ b/configs/V29/objects/photons.yaml
@@ -25,17 +25,3 @@ tkPhoton:
         endcap:
           - "abs({trkiso}) < 0.2"
           - "{passesphoid} == 1"
-    barrel:
-      label: "TkPhoton"
-      cuts:
-        inclusive:
-          - "abs({eta}) < 1.479"
-          - "{passeseleid} == 1"
-    endcap:
-      label: "TkIsoPhoton"
-      cuts:
-        inclusive:
-          - "abs({eta}) > 1.479"
-          - "abs({eta}) < 2.4"
-          - "{passesphoid} == 1"
-
diff --git a/configs/V29/objects/taus.yaml b/configs/V29/objects/taus.yaml
index ed35cda6..b1cbfe07 100644
--- a/configs/V29/objects/taus.yaml
+++ b/configs/V29/objects/taus.yaml
@@ -2,10 +2,11 @@ nnTau:
   label: "NN Tau"
   match_dR: 0.1
   eta_ranges:
-    inclusive: [0, 5]
+    inclusive: [0, 2.4
+    barrel: [0, 1.5]
+    endcap: [1.5, 2.4]
   cuts:
     inclusive:
-      - "abs({eta}) < 2.4"
       - "{passloosenn}==1"
   ids:
     default: {}
@@ -14,9 +15,8 @@ caloTau:
   label: "Calo Tau"
   match_dR: 0.3
   eta_ranges:
-    inclusive: [0, 5]
-  cuts:
-    inclusive:
-      - "abs({eta}) < 2.4"
+    inclusive: [0, 2.4]
+    barrel: [0, 1.5]
+    endcap: [1.5, 2.4]
   ids:
     default: {}