diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/python/chainDict2jetLabel.py b/Trigger/TrigHypothesis/TrigHLTJetHypo/python/chainDict2jetLabel.py
index ac097f0f7b9cff65cf7240edee45dc39c3117f31..40b8b31d12e93338082661a28e074732581045e1 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/python/chainDict2jetLabel.py
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/python/chainDict2jetLabel.py
@@ -60,6 +60,25 @@ def _make_simple_label(chain_parts, leg_label):
 
         raise NotImplementedError(msg)
 
+    # Enforce explicit etaRange in chainPartName for each chain part if:
+    # - More than one chain part AND
+    # - At least one chain part does not use default etaRange AND
+    # - At least one chain part use default etaRange
+    # Abort in such a case if chain part using default etaRange does not have etaRange in chainPartName
+    if len(chain_parts) > 1: # mora than one chain part
+        from TriggerMenuMT.HLTMenuConfig.Menu.SignatureDicts import JetChainParts_Default
+        useNonDefault         = 0
+        useNonExplicitDefault = 0
+        chainPartNames2print = [] # collect chain part names which do not follow the naming convention
+        for cp in chain_parts: # loop over chain parts
+            if cp['etaRange'] != JetChainParts_Default['etaRange']: # using non-default etaRange
+                useNonDefault += 1
+            else: # using default etaRange
+                if cp['etaRange'] not in cp['chainPartName']: # etaRange for this chain part not present in chain name
+                    useNonExplicitDefault += 1
+                    chainPartNames2print.append(cp['chainPartName'])
+        assert not (useNonDefault > 0 and useNonExplicitDefault > 0), 'Default etaRange should be explicit in the following chain part(s): %s' % ([n for n in chainPartNames2print])
+
     chainpartind = 0
     label = 'root([]'
     for cp in chain_parts:
@@ -70,9 +89,6 @@ def _make_simple_label(chain_parts, leg_label):
             smcstr = ''
         for i in range(int(cp['multiplicity'])):
             label += 'simple(['
-            # condition_str = '(%set,%s,%s)' % (str(cp['threshold']),
-            #                                  str(cp['etaRange']),
-            #                                  smcstr,)
             condition_str = '(%set,%s' % (str(cp['threshold']),
                                               str(cp['etaRange']),)
             if smcstr: # Run 2 chains have "INF" in the SMC substring
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
index 60c5e29bbb0d84e8bb1205d0db707ced3db9592a..25284f93ac2bf04aaa927683d5b50e3675968cbf 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
@@ -2542,7 +2542,7 @@ HLT_j60_j0_fbdjshared_L1J20:
     0: 7
   stepFeatures:
     0: 388
-HLT_j70_j50_0eta490_j0_dijetSEP70j12etSEP1000djmassSEP20djdphiSEP40djdeta__L1MJJ-500-NFF:
+HLT_j70_0eta320_j50_0eta490_j0_dijetSEP70j12etSEP1000djmassSEP20djdphiSEP40djdeta__L1MJJ-500-NFF:
   eventCount: 0
 HLT_j75_320eta490_LArPEBHLT_L1J30_31ETA49:
   eventCount: 0
diff --git a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
index 7c71ac2a2c484a32bf66341e1e57a81203a70637..3192b4cc3cb967081db0bf4995282681ab06c832 100644
--- a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
@@ -1406,7 +1406,7 @@ HLT_j60_j0_fbdjshared_L1J20:
     0: 1
   stepFeatures:
     0: 23
-HLT_j70_j50_0eta490_j0_dijetSEP70j12etSEP1000djmassSEP20djdphiSEP40djdeta__L1MJJ-500-NFF:
+HLT_j70_0eta320_j50_0eta490_j0_dijetSEP70j12etSEP1000djmassSEP20djdphiSEP40djdeta__L1MJJ-500-NFF:
   eventCount: 0
 HLT_j75_320eta490_LArPEBHLT_L1J30_31ETA49:
   eventCount: 1
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
index f6c302b54e78e14442b98f6062648cd72f5cd623..5d755cebc5a4510a1999a8fce390c8ce3e1dcc21 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
@@ -429,7 +429,7 @@ def setupMenu():
         ChainProp(name='HLT_j360_a10t_lcw_jes_60smcINF_j360_a10t_lcw_jes_L1SC111-CJ15', l1SeedThresholds=['FSNOSEED']*2, groups=MultiJetGroup),
         ChainProp(name='HLT_j370_a10t_lcw_jes_35smcINF_j370_a10t_lcw_jes_L1SC111-CJ15', l1SeedThresholds=['FSNOSEED']*2, groups=MultiJetGroup),
         # Jet-only VBF chain
-        ChainProp(name='HLT_j70_j50_0eta490_j0_dijetSEP70j12etSEP1000djmassSEP20djdphiSEP40djdeta__L1MJJ-500-NFF', l1SeedThresholds=['FSNOSEED']*3,groups=MultiJetGroup) # previously HLT_j70_j50_0eta490_invm1000j70_dphi20_deta40_L1MJJ-500-NFF
+        ChainProp(name='HLT_j70_0eta320_j50_0eta490_j0_dijetSEP70j12etSEP1000djmassSEP20djdphiSEP40djdeta__L1MJJ-500-NFF', l1SeedThresholds=['FSNOSEED']*3,groups=MultiJetGroup) # previously HLT_j70_j50_0eta490_invm1000j70_dphi20_deta40_L1MJJ-500-NFF
     ]
 
     TriggerFlags.BjetSlice.signatures = TriggerFlags.BjetSlice.signatures() + [