diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/AlgConfigs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/AlgConfigs.py
index 042a5f7c7dbc0172784048108b00e35ea27b5ce1..ab7aa1fd9a14702a56210fa1f8ef628cb9c16c8f 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/AlgConfigs.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/AlgConfigs.py
@@ -182,7 +182,7 @@ class MHTPufitConfig(AlgConfig):
 
     def __init__(self, **recoDict):
         inputs = ["Jets", "JetDef"]
-        if "pf" in recoDict["jetDataType"]:
+        if recoDict["constitType"] == "pf":
             inputs += ["MergedPFOs"]
         else:
             inputs += ["Clusters"]
@@ -202,7 +202,7 @@ class MHTPufitConfig(AlgConfig):
             rhoKey = evtShapeAlg.EventDensityTool.OutputContainer
         else:
             rhoKey = ""
-        if "pf" in self.recoDict["jetDataType"]:
+        if recoDict["constitType"] == "pf":
             inputName = inputs["MergedPFOs"]
         else:
             inputName = inputs["Clusters"]
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/ConfigHelpers.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/ConfigHelpers.py
index 0e6b550921a79dbd812d2af9b234c9f342a1ef2d..fd9a7b1d5de6a103ed17e65824d7bf687bf22fb3 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/ConfigHelpers.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/ConfigHelpers.py
@@ -17,7 +17,7 @@ log = logging.getLogger(__name__)
 
 # The keys from the MET chain dict that directly affect reconstruction
 # The order here is important as it also controls the dict -> string conversion
-recoKeys = ["EFrecoAlg", "calib", "jetDataType", "constitmod", "jetCalib", "addInfo"]
+recoKeys = ["EFrecoAlg", "calib", "constitType", "constitmod", "jetCalib", "addInfo"]
 metFSRoIs = [caloFSRoI, trkFSRoI]
 
 def metRecoDictToString(recoDict, skipDefaults=True):
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/METRecoSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/METRecoSequences.py
index 4c3ede628db98974b7f11d3f01150e5018250e8c..20f260983b32a69d1a1b18a4c8afd10034db509f 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/METRecoSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/METRecoSequences.py
@@ -39,15 +39,17 @@ log = logging.getLogger(__name__)
 def jetRecoDictForMET(**recoDict):
     """ Get a jet reco dict that's usable for the MET slice """
     jrd = {k: recoDict.get(k, JetChainParts_Default[k]) for k in jetRecoKeys}
-    # For various reasons, we can store the constituent modifiers separately
-    # to the data type, so we have to add that back in
+    # Rename the cluster calibration
+    try:
+        jrd["clusterCalib"] = recoDict["calib"]
+    except KeyError:
+        pass
+    # Fill constitMod
     jrd["constitMod"] = recoDict.get("constitmod", "")
-    if "jetDataType" in recoDict:
-        # Allow for the renaming dataType -> jetDataType
-        jrd["constitType"] = recoDict["jetDataType"].replace(jrd["constitMod"],"") # strip constitMod from jetDataType
-        if jrd["constitType"] == "pf":
-            # We only use em calibration for PFOs
-            jrd["clusterCalib"] = "em"
+    # We only use em calibration for PFOs
+    if jrd["constitType"] == "pf":
+        jrd["clusterCalib"] = "em"
+    # Interpret jet calibration
     if jrd["jetCalib"] == "default":
         jrd["jetCalib"] = interpretJetCalibDefault(jrd)
     return jrd
@@ -98,7 +100,7 @@ class ClusterInputConfig(AlgInputConfig):
         if recoDict.get("constitmod"):
             # Force the datatype to topoclusters
             recoDict = copy.copy(recoDict)
-            recoDict["jetDataType"] = "tc"
+            recoDict["constitType"] = "tc"
             jetRecoDict = jetRecoDictForMET(**recoDict)
             constit = aliasToInputDef(
                 defineJetConstit(jetRecoDict, clustersKey=clusterName)
@@ -186,7 +188,7 @@ class PFOInputConfig(AlgInputConfig):
         # modifiers those are also applied.
         recoDict = copy.copy(recoDict)
         # Force the jet data type to the correct thing
-        recoDict["jetDataType"] = "pf"
+        recoDict["constitType"] = "pf"
         jetRecoDict = jetRecoDictForMET(trkopt="ftf", **recoDict)
         constit = aliasToInputDef(defineJetConstit(jetRecoDict, pfoPrefix=pfoPrefix))
         constit_mod_seq = getConstitModAlg(constit)
@@ -301,12 +303,12 @@ class JetInputConfig(AlgInputConfig):
         """ Whether or not this reco configuration requires tracks """
         if recoDict.get("forceTracks", False):
             return True
-        if recoDict["jetDataType"] in ["pf", "csskpf"]:
+        if recoDict["constitType"] == "pf":
             return True
-        elif recoDict["jetDataType"] in ["tc", "sktc", "cssktc"]:
+        elif recoDict["constitType"] == "tc":
             return "gsc" in recoDict["jetCalib"]
         else:
-            raise ValueError(f"Unexpected jetDataType {recoDict['jetDataType']}")
+            raise ValueError(f"Unexpected constitType {recoDict['constitType']}")
 
     def dependencies(self, recoDict):
         deps = [self._input_clusters(recoDict)]
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
index 8c551403dbe064d879492392cd973291f644b16c..24180c01e13f2237712d9c089e777ef8630d9dec 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
@@ -342,7 +342,7 @@ METChainParts = {
     'jetCalib'       : JetChainParts['jetCalib'],
     'L2recoAlg'      : [],
     'EFrecoAlg'      : ['cell', 'tc', 'tcpufit', 'mht', 'trkmht', 'pfsum', 'cvfpufit', 'pfopufit', 'mhtpufit'],
-    'jetDataType'    : ['tc','pf','sktc','cssktc','csskpf'],
+    'constitType'    : JetChainParts['constitType'],
     'L2muonCorr'     : [],
     'EFmuonCorr'     : [],
     'addInfo'        : ['FStracks'],
@@ -365,7 +365,7 @@ METChainParts_Default = {
     'L2muonCorr'     : '',
     'EFmuonCorr'     : '',
     'addInfo'        : '',
-    'jetDataType'    : 'tc',
+    'constitType'    : 'tc',
     'constitmod'     : '',
     'sigFolder'     : 'MET',
     'subSigs'       : ['MET']