diff --git a/MC/config/PWGHF/ini/GeneratorHF_D2H_ccbar_and_bbbar_gap2_SCCR_OO.ini b/MC/config/PWGHF/ini/GeneratorHF_D2H_ccbar_and_bbbar_gap2_QCDCR_OO.ini
similarity index 88%
rename from MC/config/PWGHF/ini/GeneratorHF_D2H_ccbar_and_bbbar_gap2_SCCR_OO.ini
rename to MC/config/PWGHF/ini/GeneratorHF_D2H_ccbar_and_bbbar_gap2_QCDCR_OO.ini
index 1c74bb53d..0af7a2d72 100755
--- a/MC/config/PWGHF/ini/GeneratorHF_D2H_ccbar_and_bbbar_gap2_SCCR_OO.ini
+++ b/MC/config/PWGHF/ini/GeneratorHF_D2H_ccbar_and_bbbar_gap2_QCDCR_OO.ini
@@ -5,5 +5,5 @@ fileName=${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGHF/external/generator/generator_py
 funcName=GeneratorPythia8GapTriggeredCharmAndBeauty(2, -1.5, 1.5)
 
 [GeneratorPythia8]
-config=${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGHF/pythia8/generator/pythia8_charmhadronic_with_decays_SCCR_OO.cfg
+config=${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGHF/pythia8/generator/pythia8_charmhadronic_with_decays_QCDCR_OO.cfg
 includePartonEvent=true
\ No newline at end of file
diff --git a/MC/config/PWGHF/ini/GeneratorHF_D2H_ccbar_and_bbbar_gap2_SCCR_pO.ini b/MC/config/PWGHF/ini/GeneratorHF_D2H_ccbar_and_bbbar_gap2_QCDCR_pO.ini
similarity index 86%
rename from MC/config/PWGHF/ini/GeneratorHF_D2H_ccbar_and_bbbar_gap2_SCCR_pO.ini
rename to MC/config/PWGHF/ini/GeneratorHF_D2H_ccbar_and_bbbar_gap2_QCDCR_pO.ini
index 80e2bc876..aea1d2d26 100755
--- a/MC/config/PWGHF/ini/GeneratorHF_D2H_ccbar_and_bbbar_gap2_SCCR_pO.ini
+++ b/MC/config/PWGHF/ini/GeneratorHF_D2H_ccbar_and_bbbar_gap2_QCDCR_pO.ini
@@ -4,5 +4,5 @@ fileName=${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGHF/external/generator/generator_py
 funcName=GeneratorPythia8GapTriggeredCharmAndBeauty(2, -1.5, 1.5)
 
 [GeneratorPythia8]
-config=${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGHF/pythia8/generator/pythia8_charmhadronic_with_decays_SCCR_pO.cfg
+config=${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGHF/pythia8/generator/pythia8_charmhadronic_with_decays_QCDCR_pO.cfg
 includePartonEvent=true
\ No newline at end of file
diff --git a/MC/config/PWGHF/ini/tests/GeneratorHF_D2H_ccbar_and_bbbar_gap2_SCCR_OO.C b/MC/config/PWGHF/ini/tests/GeneratorHF_D2H_ccbar_and_bbbar_gap2_QCDCR_OO.C
similarity index 100%
rename from MC/config/PWGHF/ini/tests/GeneratorHF_D2H_ccbar_and_bbbar_gap2_SCCR_OO.C
rename to MC/config/PWGHF/ini/tests/GeneratorHF_D2H_ccbar_and_bbbar_gap2_QCDCR_OO.C
diff --git a/MC/config/PWGHF/ini/tests/GeneratorHF_D2H_ccbar_and_bbbar_gap2_SCCR_pO.C b/MC/config/PWGHF/ini/tests/GeneratorHF_D2H_ccbar_and_bbbar_gap2_QCDCR_pO.C
similarity index 100%
rename from MC/config/PWGHF/ini/tests/GeneratorHF_D2H_ccbar_and_bbbar_gap2_SCCR_pO.C
rename to MC/config/PWGHF/ini/tests/GeneratorHF_D2H_ccbar_and_bbbar_gap2_QCDCR_pO.C
diff --git a/MC/config/PWGHF/pythia8/generator/pythia8_charmhadronic_with_decays_SCCR_OO.cfg b/MC/config/PWGHF/pythia8/generator/pythia8_charmhadronic_with_decays_QCDCR_OO.cfg
similarity index 95%
rename from MC/config/PWGHF/pythia8/generator/pythia8_charmhadronic_with_decays_SCCR_OO.cfg
rename to MC/config/PWGHF/pythia8/generator/pythia8_charmhadronic_with_decays_QCDCR_OO.cfg
index ab5e02f46..255cdfbd4 100644
--- a/MC/config/PWGHF/pythia8/generator/pythia8_charmhadronic_with_decays_SCCR_OO.cfg
+++ b/MC/config/PWGHF/pythia8/generator/pythia8_charmhadronic_with_decays_QCDCR_OO.cfg
@@ -20,27 +20,27 @@ HeavyIon:SigFitDefPar 2.15,18.42,0.33
     
 Random:setSeed on
 
-### switching on spatially constrained QCD colour reconnection (SC-CR) mode
-ColourReconnection:mode = 1
-ColourReconnection:timeDilationMode = 0
-ColourReconnection:allowDoubleJunRem = off
-ColourReconnection:m0 = 1.05
-ColourReconnection:allowJunctions = on
-ColourReconnection:lambdaForm = 1
-ColourReconnection:mPseudo = 1.05
-ColourReconnection:junctionCorrection = 1.37
-ColourReconnection:dipoleMaxDist = 0.5
+### switching on QCD colour reconnection mode
 StringPT:sigma = 0.335
 StringZ:aLund = 0.36
 StringZ:bLund = 0.56
 StringFlav:probQQtoQ = 0.078
-StringFlav:ProbStoUD = 0.4
-StringFlav:probQQ1toQQ0join = 0.5,0.7,0.9,1.0
-MultiPartonInteractions:pT0Ref = 2.37
+StringFlav:ProbStoUD = 0.2
+StringFlav:probQQ1toQQ0join = 0.0275,0.0275,0.0275,0.0275
 BeamRemnants:remnantMode = 1
 BeamRemnants:saturation = 5
-BeamRemnants:beamJunction = on
-ColourReconnection:heavyLambdaForm = 1
+ColourReconnection:mode = 1
+ColourReconnection:allowDoubleJunRem = off
+ColourReconnection:allowJunctions = on
+ColourReconnection:timeDilationMode = 0
+ColourReconnection:reconnect = on
+ColourReconnection:forceHadronLevelCR = off
+MultiPartonInteractions:pT0Ref = 2.12
+ColourReconnection:m0 = 2.9
+ColourReconnection:junctionCorrection = 1.43
+HIMultipartonInteractions:pT0Ref = 2.12
+BeamRemnants:beamJunction = off
+HIBeamRemnants:beamJunction = off
 
 # Correct decay lengths (wrong in PYTHIA8 decay table)
 # Lb
diff --git a/MC/config/PWGHF/pythia8/generator/pythia8_charmhadronic_with_decays_SCCR_pO.cfg b/MC/config/PWGHF/pythia8/generator/pythia8_charmhadronic_with_decays_QCDCR_pO.cfg
similarity index 95%
rename from MC/config/PWGHF/pythia8/generator/pythia8_charmhadronic_with_decays_SCCR_pO.cfg
rename to MC/config/PWGHF/pythia8/generator/pythia8_charmhadronic_with_decays_QCDCR_pO.cfg
index e59c79da7..89c1c5d9e 100644
--- a/MC/config/PWGHF/pythia8/generator/pythia8_charmhadronic_with_decays_SCCR_pO.cfg
+++ b/MC/config/PWGHF/pythia8/generator/pythia8_charmhadronic_with_decays_QCDCR_pO.cfg
@@ -21,27 +21,27 @@ HeavyIon:SigFitDefPar 2.15,18.42,0.33
     
 Random:setSeed on
 
-### switching on spatially constrained QCD colour reconnection (SC-CR) mode
-ColourReconnection:mode = 1
-ColourReconnection:timeDilationMode = 0
-ColourReconnection:allowDoubleJunRem = off
-ColourReconnection:m0 = 1.05
-ColourReconnection:allowJunctions = on
-ColourReconnection:lambdaForm = 1
-ColourReconnection:mPseudo = 1.05
-ColourReconnection:junctionCorrection = 1.37
-ColourReconnection:dipoleMaxDist = 0.5
+### switching on QCD colour reconnection mode
 StringPT:sigma = 0.335
 StringZ:aLund = 0.36
 StringZ:bLund = 0.56
 StringFlav:probQQtoQ = 0.078
-StringFlav:ProbStoUD = 0.4
-StringFlav:probQQ1toQQ0join = 0.5,0.7,0.9,1.0
-MultiPartonInteractions:pT0Ref = 2.37
+StringFlav:ProbStoUD = 0.2
+StringFlav:probQQ1toQQ0join = 0.0275,0.0275,0.0275,0.0275
 BeamRemnants:remnantMode = 1
 BeamRemnants:saturation = 5
-BeamRemnants:beamJunction = on
-ColourReconnection:heavyLambdaForm = 1
+ColourReconnection:mode = 1
+ColourReconnection:allowDoubleJunRem = off
+ColourReconnection:allowJunctions = on
+ColourReconnection:timeDilationMode = 0
+ColourReconnection:reconnect = on
+ColourReconnection:forceHadronLevelCR = off
+MultiPartonInteractions:pT0Ref = 2.12
+ColourReconnection:m0 = 2.9
+ColourReconnection:junctionCorrection = 1.43
+HIMultipartonInteractions:pT0Ref = 2.12
+BeamRemnants:beamJunction = off
+HIBeamRemnants:beamJunction = off
 
 # Correct decay lengths (wrong in PYTHIA8 decay table)
 # Lb