diff --git a/Hlt/Hlt2Conf/options/FlavourTagging/hlt2_flavour_taggers_on_example_b2jpsik_lines.py b/Hlt/Hlt2Conf/options/FlavourTagging/hlt2_flavour_taggers_on_example_b2jpsik_lines.py
index ed8c9c66bf133577e6af906bad435fcb149e675d..be56851f9e99ce9c4aba2664685e5ed1ebb36082 100644
--- a/Hlt/Hlt2Conf/options/FlavourTagging/hlt2_flavour_taggers_on_example_b2jpsik_lines.py
+++ b/Hlt/Hlt2Conf/options/FlavourTagging/hlt2_flavour_taggers_on_example_b2jpsik_lines.py
@@ -36,10 +36,10 @@ from Hlt2Conf.flavourTagging import (
     make_oppositeside_tagging_electrons,
     make_oppositeside_tagging_muons)
 
-from PyConf.Algorithms import (
-    FunctionalSSPionTagger, FunctionalSSProtonTagger, FunctionalOSKaonTagger,
-    FunctionalOSElectronTagger, FunctionalOSMuonTagger,
-    FunctionalOSVertexChargeTagger, FlavourTagsMerger)
+from PyConf.Algorithms import (Run2SSPionTagger, Run2SSProtonTagger,
+                               Run2OSKaonTagger, Run2OSElectronTagger,
+                               Run2OSMuonTagger, Run2OSVertexChargeTagger,
+                               FlavourTagsMerger)
 
 default_ft_decoding_version.global_bind(value=6)
 
@@ -126,29 +126,29 @@ def b2jpsik_with_flavourtagging(b2jpsik, name):
 
     ssPions = noUT_sameside_tagging_pions()
     # ssPions = make_sameside_tagging_pions()
-    ssPionTagging = FunctionalSSPionTagger(
+    ssPionTagging = Run2SSPionTagger(
         BCandidates=b2jpsik, TaggingPions=ssPions, PrimaryVertices=pvs)
 
     ssProtons = noUT_sameside_tagging_protons()
     # ssProtons = make_sameside_tagging_protons()
-    ssProtonTagging = FunctionalSSProtonTagger(
+    ssProtonTagging = Run2SSProtonTagger(
         BCandidates=b2jpsik, TaggingProtons=ssProtons, PrimaryVertices=pvs)
 
     osKaons = make_oppositeside_tagging_kaons()
-    osKaonTagging = FunctionalOSKaonTagger(
+    osKaonTagging = Run2OSKaonTagger(
         BCandidates=b2jpsik, TaggingKaons=osKaons, PrimaryVertices=pvs)
 
     osElectrons = make_oppositeside_tagging_electrons()
-    osElectronTagging = FunctionalOSElectronTagger(
+    osElectronTagging = Run2OSElectronTagger(
         BCandidates=b2jpsik, TaggingElectrons=osElectrons, PrimaryVertices=pvs)
 
     osMuons = make_oppositeside_tagging_muons()
-    osMuonTagging = FunctionalOSMuonTagger(
+    osMuonTagging = Run2OSMuonTagger(
         BCandidates=b2jpsik, TaggingMuons=osMuons, PrimaryVertices=pvs)
 
     osVertexParticles = noUT_oppositeside_vertex_charge_tagging_particles()
     # osVertexParticles = make_oppositeside_vertex_charge_tagging_particles()
-    osVertexChargeTagging = FunctionalOSVertexChargeTagger(
+    osVertexChargeTagging = Run2OSVertexChargeTagger(
         BCandidates=b2jpsik,
         TaggingParticles=osVertexParticles,
         PrimaryVertices=pvs)
diff --git a/Hlt/Hlt2Conf/options/FlavourTagging/hlt2_sskaon_tagger_on_example_bs2jpsiphi_lines.py b/Hlt/Hlt2Conf/options/FlavourTagging/hlt2_sskaon_tagger_on_example_bs2jpsiphi_lines.py
index 5cd3794e5cdb6f5f174a6f80ce1a881b87a71be3..cb64a41af96039167139495ce5ad1fbf5f8c63bf 100644
--- a/Hlt/Hlt2Conf/options/FlavourTagging/hlt2_sskaon_tagger_on_example_bs2jpsiphi_lines.py
+++ b/Hlt/Hlt2Conf/options/FlavourTagging/hlt2_sskaon_tagger_on_example_bs2jpsiphi_lines.py
@@ -29,7 +29,7 @@ from Hlt2Conf.lines.bandq.builders import b_hadrons
 from Hlt2Conf.lines import charmonium_to_dimuon
 # from Hlt2Conf.flavourTagging import make_sameside_tagging_kaons
 
-from PyConf.Algorithms import FunctionalSSKaonTagger
+from PyConf.Algorithms import Run2SSKaonTagger
 
 default_ft_decoding_version.global_bind(value=6)
 
@@ -67,7 +67,7 @@ def default_bs2jpsiphi_line_with_flavourtagging():
 
     ssKaons = noUT_sameside_tagging_kaons()
     # ssKaons = make_sameside_tagging_kaons()
-    ssKaonTagging = FunctionalSSKaonTagger(
+    ssKaonTagging = Run2SSKaonTagger(
         BCandidates=bs2jpsiphi, TaggingKaons=ssKaons, PrimaryVertices=pvs)
 
     return Hlt2Line(
@@ -90,7 +90,7 @@ def modified_bs2jpsiphi_line_with_flavourtagging():
 
     ssKaons = noUT_sameside_tagging_kaons()
     # ssKaons = make_sameside_tagging_kaons()
-    ssKaonTagging = FunctionalSSKaonTagger(
+    ssKaonTagging = Run2SSKaonTagger(
         BCandidates=bs2jpsiphi, TaggingKaons=ssKaons, PrimaryVertices=pvs)
 
     return Hlt2Line(
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/flavour_tagging_particles.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/flavour_tagging_particles.py
index 75f6e5dd9441f305d706e10ce3338606c5c921f4..b83ff795aecf5d27c4314838e8cea1c8e67d0001 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/flavour_tagging_particles.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/flavour_tagging_particles.py
@@ -19,10 +19,10 @@ from Hlt2Conf.flavourTagging import (
     make_oppositeside_tagging_kaons,
     make_oppositeside_tagging_electrons,
     make_oppositeside_tagging_muons)
-from PyConf.Algorithms import (
-    FunctionalSSPionTagger, FunctionalSSProtonTagger, FunctionalOSKaonTagger,
-    FunctionalOSElectronTagger, FunctionalOSMuonTagger,
-    FunctionalOSVertexChargeTagger, FlavourTagsMerger)
+from PyConf.Algorithms import (Run2SSPionTagger, Run2SSProtonTagger,
+                               Run2OSKaonTagger, Run2OSElectronTagger,
+                               Run2OSMuonTagger, Run2OSVertexChargeTagger,
+                               FlavourTagsMerger)
 from RecoConf.reconstruction_objects import make_pvs
 from GaudiKernel.SystemOfUnits import GeV
 import Functors as F
@@ -103,31 +103,31 @@ def noUT_oppositeside_vertex_charge_tagging_particles(pvs=make_pvs,
 def extra_outputs_for_FlavourTagging_ForSprucing(BCandidates, pvs):
     ssPions = noUT_sameside_tagging_pions()
     # ssPions = make_sameside_tagging_pions()
-    ssPionTagging = FunctionalSSPionTagger(
+    ssPionTagging = Run2SSPionTagger(
         BCandidates=BCandidates, TaggingPions=ssPions, PrimaryVertices=pvs)
 
     ssProtons = noUT_sameside_tagging_protons()
     # ssProtons = make_sameside_tagging_protons()
-    ssProtonTagging = FunctionalSSProtonTagger(
+    ssProtonTagging = Run2SSProtonTagger(
         BCandidates=BCandidates, TaggingProtons=ssProtons, PrimaryVertices=pvs)
 
     osKaons = make_oppositeside_tagging_kaons()
-    osKaonTagging = FunctionalOSKaonTagger(
+    osKaonTagging = Run2OSKaonTagger(
         BCandidates=BCandidates, TaggingKaons=osKaons, PrimaryVertices=pvs)
 
     osElectrons = make_oppositeside_tagging_electrons()
-    osElectronTagging = FunctionalOSElectronTagger(
+    osElectronTagging = Run2OSElectronTagger(
         BCandidates=BCandidates,
         TaggingElectrons=osElectrons,
         PrimaryVertices=pvs)
 
     osMuons = make_oppositeside_tagging_muons()
-    osMuonTagging = FunctionalOSMuonTagger(
+    osMuonTagging = Run2OSMuonTagger(
         BCandidates=BCandidates, TaggingMuons=osMuons, PrimaryVertices=pvs)
 
     osVertexParticles = noUT_oppositeside_vertex_charge_tagging_particles()
     # osVertexParticles = make_oppositeside_vertex_charge_tagging_particles()
-    osVertexChargeTagging = FunctionalOSVertexChargeTagger(
+    osVertexChargeTagging = Run2OSVertexChargeTagger(
         BCandidates=BCandidates,
         TaggingParticles=osVertexParticles,
         PrimaryVertices=pvs)