diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauSelectionCuts.cxx b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauSelectionCuts.cxx
index 1a87cbb25f601bd32088f7d8e91f6b3bc6b5dd66..3c3568c7014462b6c8a19f2b639ef1b5a57e8edf 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauSelectionCuts.cxx
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauSelectionCuts.cxx
@@ -326,7 +326,7 @@ TauSelectionCutJetIDWP::TauSelectionCutJetIDWP(TauSelectionTool* tTST)
 //______________________________________________________________________________
 void TauSelectionCutJetIDWP::fillHistogram(const xAOD::TauJet& xTau, TH1F& hHist) const
 {
-  // FIXME: should this be extended to deepset ID?
+  // FIXME: should this be extended to gntau ID?
   hHist.Fill(xTau.isTau(xAOD::TauJetParameters::JetRNNSigVeryLoose)); 
   hHist.Fill(xTau.isTau(xAOD::TauJetParameters::JetRNNSigLoose)+2);
   hHist.Fill(xTau.isTau(xAOD::TauJetParameters::JetRNNSigMedium)+4);
@@ -365,25 +365,25 @@ bool TauSelectionCutJetIDWP::accept(const xAOD::TauJet& xTau,
   case JETIDRNNTIGHT:
     if (xTau.isTau(xAOD::TauJetParameters::JetRNNSigTight)) bPass = true;
     break;
-  case JETIDDEEPSETVERYLOOSE:
-    static const SG::AuxElement::ConstAccessor<char> acc_deepSetVeryLoose("JetDeepSetVeryLoose");
-    if (!acc_deepSetVeryLoose.isAvailable(xTau)) m_tTST->msg() << MSG::WARNING << "DeepSet VeryLoose WP not available" << endmsg;
-    else bPass = acc_deepSetVeryLoose(xTau);
+  case JETIDGNTAUVERYLOOSE:
+    static const SG::AuxElement::ConstAccessor<char> acc_gnTauVeryLoose("GNTauVL_v0");
+    if (!acc_gnTauVeryLoose.isAvailable(xTau)) m_tTST->msg() << MSG::WARNING << "GnTau VeryLoose WP not available" << endmsg;
+    else bPass = acc_gnTauVeryLoose(xTau);
     break;
-  case JETIDDEEPSETLOOSE:
-    static const SG::AuxElement::ConstAccessor<char> acc_deepSetLoose("JetDeepSetLoose");
-    if (!acc_deepSetLoose.isAvailable(xTau)) m_tTST->msg() << MSG::WARNING << "DeepSet Loose WP not available" << endmsg;
-    else bPass = acc_deepSetLoose(xTau);
+  case JETIDGNTAULOOSE:
+    static const SG::AuxElement::ConstAccessor<char> acc_gnTauLoose("GNTauL_v0");
+    if (!acc_gnTauLoose.isAvailable(xTau)) m_tTST->msg() << MSG::WARNING << "GnTau Loose WP not available" << endmsg;
+    else bPass = acc_gnTauLoose(xTau);
     break;
-  case JETIDDEEPSETMEDIUM:
-    static const SG::AuxElement::ConstAccessor<char> acc_deepSetMedium("JetDeepSetMedium");
-    if (!acc_deepSetMedium.isAvailable(xTau)) m_tTST->msg() << MSG::WARNING << "DeepSet Medium WP not available" << endmsg;
-    else bPass = acc_deepSetMedium(xTau);
+  case JETIDGNTAUMEDIUM:
+    static const SG::AuxElement::ConstAccessor<char> acc_gnTauMedium("GNTauM_v0");
+    if (!acc_gnTauMedium.isAvailable(xTau)) m_tTST->msg() << MSG::WARNING << "GnTau Medium WP not available" << endmsg;
+    else bPass = acc_gnTauMedium(xTau);
     break;
-  case JETIDDEEPSETTIGHT:
-    static const SG::AuxElement::ConstAccessor<char> acc_deepSetTight("JetDeepSetTight");
-    if (!acc_deepSetTight.isAvailable(xTau)) m_tTST->msg() << MSG::WARNING << "DeepSet Tight WP not available" << endmsg;
-    else bPass = acc_deepSetTight(xTau);
+  case JETIDGNTAUTIGHT:
+    static const SG::AuxElement::ConstAccessor<char> acc_gnTauTight("GNTauT_v0");
+    if (!acc_gnTauTight.isAvailable(xTau)) m_tTST->msg() << MSG::WARNING << "GnTau Tight WP not available" << endmsg;
+    else bPass = acc_gnTauTight(xTau);
     break;
   default:
     m_tTST->msg() << MSG::WARNING << "The jet ID working point with the enum " << m_tTST->m_iJetIDWP << " is not available" << endmsg;
diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauSelectionTool.cxx b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauSelectionTool.cxx
index 9fe1727dbb166cf3cd6d6fe3bca5fbcb1746907b..a3d39e64e88f61dbaaf61ca5bca110977cbfdcc1 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauSelectionTool.cxx
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauSelectionTool.cxx
@@ -539,10 +539,10 @@ int TauSelectionTool::convertStrToJetIDWP(const std::string& sJetIDWP) const
   else if (sJetIDWP == "JETIDRNNLOOSE")     return int(JETIDRNNLOOSE);
   else if (sJetIDWP == "JETIDRNNMEDIUM")    return int(JETIDRNNMEDIUM);
   else if (sJetIDWP == "JETIDRNNTIGHT")     return int(JETIDRNNTIGHT);
-  else if (sJetIDWP == "JETIDDEEPSETVERYLOOSE") return int(JETIDDEEPSETVERYLOOSE);
-  else if (sJetIDWP == "JETIDDEEPSETLOOSE")     return int(JETIDDEEPSETLOOSE);
-  else if (sJetIDWP == "JETIDDEEPSETMEDIUM")    return int(JETIDDEEPSETMEDIUM);
-  else if (sJetIDWP == "JETIDDEEPSETTIGHT")     return int(JETIDDEEPSETTIGHT);
+  else if (sJetIDWP == "JETIDGNTAUVERYLOOSE") return int(JETIDGNTAUVERYLOOSE);
+  else if (sJetIDWP == "JETIDGNTAULOOSE")     return int(JETIDGNTAULOOSE);
+  else if (sJetIDWP == "JETIDGNTAUMEDIUM")    return int(JETIDGNTAUMEDIUM);
+  else if (sJetIDWP == "JETIDGNTAUTIGHT")     return int(JETIDGNTAUTIGHT);
 
   ATH_MSG_ERROR( "jet ID working point "<<sJetIDWP<<" is unknown, the JetIDWP cut will not accept any tau!" );
   return -1;
@@ -577,14 +577,14 @@ std::string TauSelectionTool::convertJetIDWPToStr(int iJetIDWP) const
     return "JETIDRNNMEDIUM";
   case JETIDRNNTIGHT:
     return "JETIDRNNTIGHT";
-  case JETIDDEEPSETVERYLOOSE:
-    return "JETIDDEEPSETVERYLOOSE";
-  case JETIDDEEPSETLOOSE:
-    return "JETIDDEEPSETLOOSE";
-  case JETIDDEEPSETMEDIUM:
-    return "JETIDDEEPSETMEDIUM";
-  case JETIDDEEPSETTIGHT:
-    return "JETIDDEEPSETTIGHT";
+  case JETIDGNTAUVERYLOOSE:
+    return "JETIDGNTAUVERYLOOSE";
+  case JETIDGNTAULOOSE:
+    return "JETIDGNTAULOOSE";
+  case JETIDGNTAUMEDIUM:
+    return "JETIDGNTAUMEDIUM";
+  case JETIDGNTAUTIGHT:
+    return "JETIDGNTAUTIGHT";
 
   default:
     ATH_MSG_WARNING( "JetID working point with enum " << iJetIDWP << " is unknown, the JetIDWP cut will not accept any tau!" );
diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/Enums.h b/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/Enums.h
index ab1503cdee720482469971d261eb14212ca78e11..256f8069268230137820521c86294bb5221bd5f2 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/Enums.h
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/Enums.h
@@ -20,10 +20,10 @@ namespace TauAnalysisTools
     JETIDRNNLOOSE          = 7,
     JETIDRNNMEDIUM         = 8,
     JETIDRNNTIGHT          = 9,
-    JETIDDEEPSETVERYLOOSE  = 10,
-    JETIDDEEPSETLOOSE      = 11,
-    JETIDDEEPSETMEDIUM     = 12,
-    JETIDDEEPSETTIGHT      = 13,
+    JETIDGNTAUVERYLOOSE    = 10,
+    JETIDGNTAULOOSE        = 11,
+    JETIDGNTAUMEDIUM       = 12,
+    JETIDGNTAUTIGHT        = 13,
   };
 
   enum EleID