diff --git a/PWGHF/HFC/Tasks/taskCorrelationD0Hadrons.cxx b/PWGHF/HFC/Tasks/taskCorrelationD0Hadrons.cxx
index f5f6b40d09d..f198af20797 100644
--- a/PWGHF/HFC/Tasks/taskCorrelationD0Hadrons.cxx
+++ b/PWGHF/HFC/Tasks/taskCorrelationD0Hadrons.cxx
@@ -30,6 +30,7 @@ using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
 using namespace o2::aod::hf_correlation_d0_hadron;
+using namespace o2::analysis::hf_correlations;
 
 namespace o2::aod
 {
@@ -268,35 +269,19 @@ struct HfTaskCorrelationD0Hadrons {
           continue;
         }
         Region region = getRegion(deltaPhi);
-        if (signalStatus == ParticleTypeData::D0Only || signalStatus == ParticleTypeData::D0D0barBoth) {
-          switch (region) {
-            case Toward:
-              registry.fill(HIST("hToward"), massD, ptD, isAutoCorrelated, efficiencyWeight);
-              break;
-            case Away:
-              registry.fill(HIST("hAway"), massD, ptD, isAutoCorrelated, efficiencyWeight);
-              break;
-            case Transverse:
-              registry.fill(HIST("hTransverse"), massD, ptD, isAutoCorrelated, efficiencyWeight);
-              break;
-            default:
-              break;
-          }
-        }
-        if (signalStatus == ParticleTypeData::D0barOnly || signalStatus == ParticleTypeData::D0D0barBoth) {
-          switch (region) {
-            case Toward:
-              registry.fill(HIST("hToward"), massD, ptD, isAutoCorrelated, efficiencyWeight);
-              break;
-            case Away:
-              registry.fill(HIST("hAway"), massD, ptD, isAutoCorrelated, efficiencyWeight);
-              break;
-            case Transverse:
-              registry.fill(HIST("hTransverse"), massD, ptD, isAutoCorrelated, efficiencyWeight);
-              break;
-            default:
-              break;
-          }
+
+        switch (region) {
+          case Toward:
+            registry.fill(HIST("hToward"), massD, ptD, isAutoCorrelated, efficiencyWeight);
+            break;
+          case Away:
+            registry.fill(HIST("hAway"), massD, ptD, isAutoCorrelated, efficiencyWeight);
+            break;
+          case Transverse:
+            registry.fill(HIST("hTransverse"), massD, ptD, isAutoCorrelated, efficiencyWeight);
+            break;
+          default:
+            break;
         }
       }
       // check if correlation entry belongs to signal region, sidebands or is outside both, and fill correlation plots
diff --git a/PWGHF/HFC/Tasks/taskCorrelationLcHadrons.cxx b/PWGHF/HFC/Tasks/taskCorrelationLcHadrons.cxx
index d0f4e5608c6..aca81b45fc1 100644
--- a/PWGHF/HFC/Tasks/taskCorrelationLcHadrons.cxx
+++ b/PWGHF/HFC/Tasks/taskCorrelationLcHadrons.cxx
@@ -27,6 +27,7 @@
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
+using namespace o2::analysis::hf_correlations;
 
 ///
 /// Returns deltaPhi value in range [-pi/2., 3.*pi/2], typically used for correlation studies
@@ -276,7 +277,7 @@ struct HfTaskCorrelationLcHadrons {
           default:
             break;
         }
-      }
+      };
 
       // fill correlation plots for signal/bagkground correlations
       if (pairEntry.signalStatus()) {