diff --git a/Analysis/Tasks/PWGLF/CMakeLists.txt b/Analysis/Tasks/PWGLF/CMakeLists.txt
index 6b1d703be7636..bc34acbfb986e 100644
--- a/Analysis/Tasks/PWGLF/CMakeLists.txt
+++ b/Analysis/Tasks/PWGLF/CMakeLists.txt
@@ -28,13 +28,13 @@ o2_add_dpl_workflow(nuclei-spectra
                     PUBLIC_LINK_LIBRARIES O2::Framework O2::DetectorsBase O2::AnalysisDataModel
                     COMPONENT_NAME Analysis)
 
-o2_add_dpl_workflow(lambdakzeroproducer
-                    SOURCES lambdakzeroproducer
+o2_add_dpl_workflow(lambdakzerobuilder
+                    SOURCES lambdakzerobuilder
                     PUBLIC_LINK_LIBRARIES O2::Framework O2::DetectorsBase O2::AnalysisDataModel O2::AnalysisCore O2::DetectorsVertexing
                     COMPONENT_NAME Analysis)
 
-o2_add_dpl_workflow(lambdakzeroconsumer
-                    SOURCES lambdakzeroconsumer
+o2_add_dpl_workflow(lambdakzeroanalysis
+                    SOURCES lambdakzeroanalysis
                     PUBLIC_LINK_LIBRARIES O2::Framework O2::DetectorsBase O2::AnalysisDataModel O2::AnalysisCore O2::DetectorsVertexing
                     COMPONENT_NAME Analysis)
 
@@ -43,13 +43,13 @@ o2_add_dpl_workflow(lambdakzerofinder
                     PUBLIC_LINK_LIBRARIES O2::Framework O2::DetectorsBase O2::AnalysisDataModel O2::AnalysisCore O2::DetectorsVertexing
                     COMPONENT_NAME Analysis)
 
-o2_add_dpl_workflow(cascadeproducer
-                    SOURCES cascadeproducer
+o2_add_dpl_workflow(cascadebuilder
+                    SOURCES cascadebuilder
                     PUBLIC_LINK_LIBRARIES O2::Framework O2::DetectorsBase O2::AnalysisDataModel O2::AnalysisCore O2::DetectorsVertexing
                     COMPONENT_NAME Analysis)
 
-o2_add_dpl_workflow(cascadeconsumer
-                    SOURCES cascadeconsumer
+o2_add_dpl_workflow(cascadeanalysis
+                    SOURCES cascadeanalysis
                     PUBLIC_LINK_LIBRARIES O2::Framework O2::DetectorsBase O2::AnalysisDataModel O2::AnalysisCore O2::DetectorsVertexing
                     COMPONENT_NAME Analysis)
 
diff --git a/Analysis/Tasks/PWGLF/cascadeconsumer.cxx b/Analysis/Tasks/PWGLF/cascadeanalysis.cxx
similarity index 95%
rename from Analysis/Tasks/PWGLF/cascadeconsumer.cxx
rename to Analysis/Tasks/PWGLF/cascadeanalysis.cxx
index a6ae55727684c..743f7b1c53a0b 100644
--- a/Analysis/Tasks/PWGLF/cascadeconsumer.cxx
+++ b/Analysis/Tasks/PWGLF/cascadeanalysis.cxx
@@ -96,7 +96,7 @@ struct cascadeQA {
   }
 };
 
-struct cascadeconsumer {
+struct cascadeanalysis {
   OutputObj<TH3F> h3dMassXiMinus{TH3F("h3dMassXiMinus", "", 20, 0, 100, 200, 0, 10, 200, 1.322 - 0.100, 1.322 + 0.100)};
   OutputObj<TH3F> h3dMassXiPlus{TH3F("h3dMassXiPlus", "", 20, 0, 100, 200, 0, 10, 200, 1.322 - 0.100, 1.322 + 0.100)};
   OutputObj<TH3F> h3dMassOmegaMinus{TH3F("h3dMassOmegaMinus", "", 20, 0, 100, 200, 0, 10, 200, 1.672 - 0.100, 1.672 + 0.100)};
@@ -155,16 +155,9 @@ struct cascadeconsumer {
   }
 };
 
-/// Extends the v0data table with expression columns
-struct cascadeinitializer {
-  Spawns<aod::CascDataExt> cascdataext;
-  void init(InitContext const&) {}
-};
-
 WorkflowSpec defineDataProcessing(ConfigContext const&)
 {
   return WorkflowSpec{
-    adaptAnalysisTask<cascadeconsumer>("lf-cascadeconsumer"),
-    adaptAnalysisTask<cascadeQA>("lf-cascadeQA"),
-    adaptAnalysisTask<cascadeinitializer>("lf-cascadeinitializer")};
+    adaptAnalysisTask<cascadeanalysis>("lf-cascadeanalysis"),
+    adaptAnalysisTask<cascadeQA>("lf-cascadeQA")};
 }
diff --git a/Analysis/Tasks/PWGLF/cascadeproducer.cxx b/Analysis/Tasks/PWGLF/cascadebuilder.cxx
similarity index 96%
rename from Analysis/Tasks/PWGLF/cascadeproducer.cxx
rename to Analysis/Tasks/PWGLF/cascadebuilder.cxx
index eee9c39beb25c..93bf865742ee6 100644
--- a/Analysis/Tasks/PWGLF/cascadeproducer.cxx
+++ b/Analysis/Tasks/PWGLF/cascadebuilder.cxx
@@ -8,7 +8,7 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 //
-// Cascade Producer task
+// Cascade builder task
 // =====================
 //
 // This task loops over an *existing* list of cascades (V0+bachelor track
@@ -17,7 +17,7 @@
 // Any analysis should loop over the "CascData"
 // table as that table contains all information
 //
-// WARNING: adding filters to the producer IS NOT
+// WARNING: adding filters to the builder IS NOT
 // equivalent to re-running the finders. This will only
 // ever produce *tighter* selection sections. It is your
 // responsibility to check if, by setting a loose filter
@@ -151,7 +151,7 @@ struct cascadeprefilterpairs {
 };
 
 /// Cascade builder task: rebuilds cascades
-struct cascadeproducer {
+struct cascadebuilder {
   Produces<aod::CascData> cascdata;
 
   OutputObj<TH1F> hEventCounter{TH1F("hEventCounter", "", 1, 0, 1)};
@@ -268,16 +268,16 @@ struct cascadeproducer {
   }
 };
 
-/// Extends the v0data table with expression columns
-struct cascprodinitializer {
-  Spawns<aod::V0DataExt> v0dataext;
+/// Extends the cascdata table with expression columns
+struct cascadeinitializer {
+  Spawns<aod::CascDataExt> cascdataext;
   void init(InitContext const&) {}
 };
 
 WorkflowSpec defineDataProcessing(ConfigContext const&)
 {
   return WorkflowSpec{
-    adaptAnalysisTask<cascprodinitializer>("lf-cascprodinitializer"),
     adaptAnalysisTask<cascadeprefilterpairs>("lf-cascadeprefilterpairs"),
-    adaptAnalysisTask<cascadeproducer>("lf-cascadeproducer")};
+    adaptAnalysisTask<cascadebuilder>("lf-cascadebuilder"),
+    adaptAnalysisTask<cascadeinitializer>("lf-cascadeinitializer")};
 }
diff --git a/Analysis/Tasks/PWGLF/cascadefinder.cxx b/Analysis/Tasks/PWGLF/cascadefinder.cxx
index 150aa0780ac0d..2e305a129ac47 100644
--- a/Analysis/Tasks/PWGLF/cascadefinder.cxx
+++ b/Analysis/Tasks/PWGLF/cascadefinder.cxx
@@ -422,7 +422,7 @@ struct cascadefinderQA {
   }
 };
 
-/// Extends the v0data table with expression columns
+/// Extends the cascdata table with expression columns
 struct cascadeinitializer {
   Spawns<aod::CascDataExt> cascdataext;
   void init(InitContext const&) {}
@@ -433,6 +433,6 @@ WorkflowSpec defineDataProcessing(ConfigContext const&)
   return WorkflowSpec{
     adaptAnalysisTask<cascadeprefilter>("lf-cascadeprefilter"),
     adaptAnalysisTask<cascadefinder>("lf-cascadefinder"),
-    adaptAnalysisTask<cascadeinitializer>("lf-cascadeinitializer"),
-    adaptAnalysisTask<cascadefinderQA>("lf-cascadefinderQA")};
+    adaptAnalysisTask<cascadefinderQA>("lf-cascadefinderQA"),
+    adaptAnalysisTask<cascadeinitializer>("lf-cascadeinitializer")};
 }
diff --git a/Analysis/Tasks/PWGLF/lambdakzeroconsumer.cxx b/Analysis/Tasks/PWGLF/lambdakzeroanalysis.cxx
similarity index 92%
rename from Analysis/Tasks/PWGLF/lambdakzeroconsumer.cxx
rename to Analysis/Tasks/PWGLF/lambdakzeroanalysis.cxx
index 35a5242b1e292..b43d76adee96a 100644
--- a/Analysis/Tasks/PWGLF/lambdakzeroconsumer.cxx
+++ b/Analysis/Tasks/PWGLF/lambdakzeroanalysis.cxx
@@ -79,7 +79,7 @@ struct lambdakzeroQA {
   }
 };
 
-struct lambdakzeroconsumer {
+struct lambdakzeroanalysis {
   OutputObj<TH3F> h3dMassK0Short{TH3F("h3dMassK0Short", "", 20, 0, 100, 200, 0, 10, 200, 0.450, 0.550)};
   OutputObj<TH3F> h3dMassLambda{TH3F("h3dMassLambda", "", 20, 0, 100, 200, 0, 10, 200, 1.115 - 0.100, 1.115 + 0.100)};
   OutputObj<TH3F> h3dMassAntiLambda{TH3F("h3dMassAntiLambda", "", 20, 0, 100, 200, 0, 10, 200, 1.115 - 0.100, 1.115 + 0.100)};
@@ -118,16 +118,9 @@ struct lambdakzeroconsumer {
   }
 };
 
-/// Extends the v0data table with expression columns
-struct lambdakzeroinitializer {
-  Spawns<aod::V0DataExt> v0dataext;
-  void init(InitContext const&) {}
-};
-
 WorkflowSpec defineDataProcessing(ConfigContext const&)
 {
   return WorkflowSpec{
-    adaptAnalysisTask<lambdakzeroconsumer>("lf-lambdakzeroconsumer"),
-    adaptAnalysisTask<lambdakzeroQA>("lf-lambdakzeroQA"),
-    adaptAnalysisTask<lambdakzeroinitializer>("lf-lambdakzeroinitializer")};
+    adaptAnalysisTask<lambdakzeroanalysis>("lf-lambdakzeroanalysis"),
+    adaptAnalysisTask<lambdakzeroQA>("lf-lambdakzeroQA")};
 }
diff --git a/Analysis/Tasks/PWGLF/lambdakzeroproducer.cxx b/Analysis/Tasks/PWGLF/lambdakzerobuilder.cxx
similarity index 95%
rename from Analysis/Tasks/PWGLF/lambdakzeroproducer.cxx
rename to Analysis/Tasks/PWGLF/lambdakzerobuilder.cxx
index 5ccbc145a4d0d..63839bcbe4fdd 100644
--- a/Analysis/Tasks/PWGLF/lambdakzeroproducer.cxx
+++ b/Analysis/Tasks/PWGLF/lambdakzerobuilder.cxx
@@ -8,7 +8,7 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 //
-// V0 Producer task
+// V0 builder task
 // ================
 //
 // This task loops over an *existing* list of V0s (neg/pos track
@@ -17,7 +17,7 @@
 // Any analysis should loop over the "V0Data"
 // table as that table contains all information
 //
-// WARNING: adding filters to the producer IS NOT
+// WARNING: adding filters to the builder IS NOT
 // equivalent to re-running the finders. This will only
 // ever produce *tighter* selection sections. It is your
 // responsibility to check if, by setting a loose filter
@@ -123,7 +123,7 @@ struct lambdakzeroprefilterpairs {
 };
 
 /// Cascade builder task: rebuilds cascades
-struct lambdakzeroproducer {
+struct lambdakzerobuilder {
 
   Produces<aod::V0Data> v0data;
 
@@ -210,9 +210,16 @@ struct lambdakzeroproducer {
   }
 };
 
+/// Extends the v0data table with expression columns
+struct lambdakzeroinitializer {
+  Spawns<aod::V0DataExt> v0dataext;
+  void init(InitContext const&) {}
+};
+
 WorkflowSpec defineDataProcessing(ConfigContext const&)
 {
   return WorkflowSpec{
     adaptAnalysisTask<lambdakzeroprefilterpairs>("lf-lambdakzeroprefilterpairs"),
-    adaptAnalysisTask<lambdakzeroproducer>("lf-lambdakzeroproducer")};
+    adaptAnalysisTask<lambdakzerobuilder>("lf-lambdakzerobuilder"),
+    adaptAnalysisTask<lambdakzeroinitializer>("lf-lambdakzeroinitializer")};
 }
diff --git a/Analysis/Tasks/PWGLF/lambdakzerofinder.cxx b/Analysis/Tasks/PWGLF/lambdakzerofinder.cxx
index f71b9347bc3b4..6f906ab1b0e1e 100644
--- a/Analysis/Tasks/PWGLF/lambdakzerofinder.cxx
+++ b/Analysis/Tasks/PWGLF/lambdakzerofinder.cxx
@@ -277,6 +277,6 @@ WorkflowSpec defineDataProcessing(ConfigContext const&)
   return WorkflowSpec{
     adaptAnalysisTask<lambdakzeroprefilter>("lf-lambdakzeroprefilter"),
     adaptAnalysisTask<lambdakzerofinder>("lf-lambdakzerofinder"),
-    adaptAnalysisTask<lambdakzeroinitializer>("lf-lambdakzeroinitializer"),
-    adaptAnalysisTask<lambdakzerofinderQA>("lf-lambdakzerofinderQA")};
+    adaptAnalysisTask<lambdakzerofinderQA>("lf-lambdakzerofinderQA"),
+    adaptAnalysisTask<lambdakzeroinitializer>("lf-lambdakzeroinitializer")};
 }