diff --git a/PWGLF/DataModel/LFHypernucleiKfTables.h b/PWGLF/DataModel/LFHypernucleiKfTables.h
index ed50e56b17f..328ab07f6b3 100644
--- a/PWGLF/DataModel/LFHypernucleiKfTables.h
+++ b/PWGLF/DataModel/LFHypernucleiKfTables.h
@@ -24,17 +24,17 @@ namespace hykfmcColl
 {
 DECLARE_SOA_COLUMN(PassedEvSel, passedEvSel, bool); //!
 }
-DECLARE_SOA_TABLE(HypKfMcCollisions, "AOD", "HYPKFMCCOLL",
+DECLARE_SOA_TABLE(HypKfMcColls, "AOD", "HYPKFMCCOLL",
                   o2::soa::Index<>,
                   hykfmcColl::PassedEvSel,
                   mccollision::PosX,
                   mccollision::PosY,
                   mccollision::PosZ);
-using HypKfMcCollision = HypKfMcCollisions::iterator;
+using HypKfMcColl = HypKfMcColls::iterator;
 
 namespace hykfmc
 {
-DECLARE_SOA_INDEX_COLUMN(HypKfMcCollision, hypKfMcCollision);
+DECLARE_SOA_INDEX_COLUMN(HypKfMcColl, hypKfMcColl);
 DECLARE_SOA_COLUMN(Species, species, int8_t);                   //!
 DECLARE_SOA_COLUMN(IsPhysicalPrimary, isPhysicalPrimary, bool); //!
 DECLARE_SOA_COLUMN(Svx, svx, float);                            //!
@@ -46,9 +46,9 @@ DECLARE_SOA_DYNAMIC_COLUMN(Mass, mass, [](float E, float px, float py, float pz)
 DECLARE_SOA_DYNAMIC_COLUMN(IsMatter, isMatter, [](int pdgCode) { return pdgCode > 0; });
 } // namespace hykfmc
 
-DECLARE_SOA_TABLE(HypKfMcParticles, "AOD", "HYPKFMCPART",
+DECLARE_SOA_TABLE(HypKfMcParts, "AOD", "HYPKFMCPART",
                   o2::soa::Index<>,
-                  hykfmc::HypKfMcCollisionId,
+                  hykfmc::HypKfMcCollId,
                   hykfmc::Species,
                   mcparticle::PdgCode,
                   hykfmc::IsPhysicalPrimary,
@@ -63,23 +63,23 @@ DECLARE_SOA_TABLE(HypKfMcParticles, "AOD", "HYPKFMCPART",
                   hykfmc::Y<mcparticle::E, mcparticle::Pz>,
                   hykfmc::Mass<mcparticle::E, mcparticle::Px, mcparticle::Py, mcparticle::Pz>,
                   hykfmc::IsMatter<mcparticle::PdgCode>);
-using HypKfMcParticle = HypKfMcParticles::iterator;
+using HypKfMcPart = HypKfMcParts::iterator;
 
-DECLARE_SOA_TABLE(HypKfCollisions, "AOD", "HYPKFCOLL",
+DECLARE_SOA_TABLE(HypKfColls, "AOD", "HYPKFCOLL",
                   o2::soa::Index<>,
                   hykfmcColl::PassedEvSel,
-                  hykfmc::HypKfMcCollisionId,
+                  hykfmc::HypKfMcCollId,
                   collision::PosX,
                   collision::PosY,
                   collision::PosZ,
                   cent::CentFT0A,
                   cent::CentFT0C,
                   cent::CentFT0M);
-using HypKfCollision = HypKfCollisions::iterator;
+using HypKfColl = HypKfColls::iterator;
 
 namespace hykftrk
 {
-DECLARE_SOA_INDEX_COLUMN(HypKfCollision, hypKfCollision);
+DECLARE_SOA_INDEX_COLUMN(HypKfColl, hypKfColl);
 DECLARE_SOA_COLUMN(Rigidity, rigidity, float);              //!
 DECLARE_SOA_COLUMN(TPCnCluster, tpcNcluster, float);        //!
 DECLARE_SOA_COLUMN(TPCnSigma, tpcNsigma, float);            //!
@@ -149,12 +149,12 @@ DECLARE_SOA_TABLE(HypKfTracks, "AOD", "HYPKFTRACK",
                   hykftrk::ITSmeanClsSize<track::ITSClusterSizes>);
 using HypKfTrack = HypKfTracks::iterator;
 
-DECLARE_SOA_TABLE(HypKfSubDaughters, "AOD", "HYPKFSUBD",
+DECLARE_SOA_TABLE(HypKfSubDs, "AOD", "HYPKFSUBD",
                   o2::soa::Index<>,
                   hykftrk::SubMass);
-using HypKfSubDaughter = HypKfSubDaughters::iterator;
+using HypKfSubD = HypKfSubDs::iterator;
 
-DECLARE_SOA_TABLE(HypKfDaughterAddons, "AOD", "HYPKFDADD",
+DECLARE_SOA_TABLE(HypKfDaughtAdds, "AOD", "HYPKFDAUGHTADD",
                   o2::soa::Index<>,
                   track::X,
                   track::Y,
@@ -162,16 +162,16 @@ DECLARE_SOA_TABLE(HypKfDaughterAddons, "AOD", "HYPKFDADD",
                   mcparticle::Px,
                   mcparticle::Py,
                   mcparticle::Pz);
-using HypKfDaughterAddon = HypKfDaughterAddons::iterator;
+using HypKfDaughtAdd = HypKfDaughtAdds::iterator;
 
 namespace hykfhyp
 {
-DECLARE_SOA_INDEX_COLUMN(HypKfCollision, hypKfCollision);
-DECLARE_SOA_INDEX_COLUMN(HypKfMcParticle, hypKfMcParticle);
-DECLARE_SOA_ARRAY_INDEX_COLUMN(HypKfDaughterAddon, addons);
+DECLARE_SOA_INDEX_COLUMN(HypKfColl, hypKfColl);
+DECLARE_SOA_INDEX_COLUMN(HypKfMcPart, hypKfMcPart);
+DECLARE_SOA_ARRAY_INDEX_COLUMN(HypKfDaughtAdd, addons);
 DECLARE_SOA_ARRAY_INDEX_COLUMN(HypKfTrack, daughterTracks);
-DECLARE_SOA_SELF_INDEX_COLUMN(HypDaughter, hypDaughter);
-DECLARE_SOA_ARRAY_INDEX_COLUMN(HypKfSubDaughter, subDaughters);
+DECLARE_SOA_SELF_INDEX_COLUMN_FULL(HypDaughter, hypDaughter, int, "HypKfHypNucs");
+DECLARE_SOA_ARRAY_INDEX_COLUMN(HypKfSubD, subDaughters);
 DECLARE_SOA_COLUMN(Primary, primary, bool);        //!
 DECLARE_SOA_COLUMN(Mass, mass, float);             //!
 DECLARE_SOA_COLUMN(Px, px, float);                 //!
@@ -188,19 +188,19 @@ DECLARE_SOA_DYNAMIC_COLUMN(Eta, eta, [](float px, float py, float pz) { return R
 DECLARE_SOA_DYNAMIC_COLUMN(Phi, phi, [](float px, float py) { return RecoDecay::phi(std::array{px, py}); });
 DECLARE_SOA_DYNAMIC_COLUMN(P, p, [](float px, float py, float pz) { return RecoDecay::p(px, py, pz); }); //
 DECLARE_SOA_DYNAMIC_COLUMN(Y, y, [](float px, float py, float pz, float mass) { return RecoDecay::y(std::array{px, py, pz}, mass); });
-DECLARE_SOA_DYNAMIC_COLUMN(McTrue, mcTrue, [](int hypKfMcParticleId) { return hypKfMcParticleId > 0; });
+DECLARE_SOA_DYNAMIC_COLUMN(McTrue, mcTrue, [](int hypKfMcPartId) { return hypKfMcPartId > 0; });
 DECLARE_SOA_DYNAMIC_COLUMN(IsMatter, isMatter, [](int8_t species) { return species > 0; });
 DECLARE_SOA_DYNAMIC_COLUMN(Cascade, cascade, [](int hypDaughter) { return hypDaughter > 0; });
 } // namespace hykfhyp
 
 DECLARE_SOA_TABLE(HypKfHypNucs, "AOD", "HYPKFHYPNUC",
                   o2::soa::Index<>,
-                  hykfhyp::HypKfMcParticleId,
-                  hykfhyp::HypKfCollisionId,
+                  hykfhyp::HypKfMcPartId,
+                  hykfhyp::HypKfCollId,
                   hykfhyp::HypKfTrackIds,
-                  hykfhyp::HypKfDaughterAddonIds,
+                  hykfhyp::HypKfDaughtAddIds,
                   hykfhyp::HypDaughterId,
-                  hykfhyp::HypKfSubDaughterIds,
+                  hykfhyp::HypKfSubDIds,
                   hykfmc::Species,
                   hykfhyp::Primary,
                   hykfhyp::Mass,
@@ -221,7 +221,7 @@ DECLARE_SOA_TABLE(HypKfHypNucs, "AOD", "HYPKFHYPNUC",
                   hykfhyp::Eta<hykfhyp::Px, hykfhyp::Py, hykfhyp::Pz>,
                   hykfhyp::Phi<hykfhyp::Px, hykfhyp::Py>,
                   hykfhyp::P<hykfhyp::Px, hykfhyp::Py, hykfhyp::Pz>,
-                  hykfhyp::McTrue<hykfhyp::HypKfMcParticleId>,
+                  hykfhyp::McTrue<hykfhyp::HypKfMcPartId>,
                   hykfhyp::IsMatter<hykfmc::Species>,
                   hykfhyp::Cascade<hykfhyp::HypDaughterId>);
 using HypKfHypNuc = HypKfHypNucs::iterator;
diff --git a/PWGLF/TableProducer/Nuspex/hypKfRecoTask.cxx b/PWGLF/TableProducer/Nuspex/hypKfRecoTask.cxx
index a1c4e21a9a7..353459c835b 100644
--- a/PWGLF/TableProducer/Nuspex/hypKfRecoTask.cxx
+++ b/PWGLF/TableProducer/Nuspex/hypKfRecoTask.cxx
@@ -405,12 +405,12 @@ std::vector<std::shared_ptr<TH1>> hInvMass;
 //----------------------------------------------------------------------------------------------------------------
 struct hypKfRecoTask {
 
-  Produces<aod::HypKfMcCollisions> outputMcCollisionTable;
-  Produces<aod::HypKfMcParticles> outputMcParticleTable;
-  Produces<aod::HypKfCollisions> outputCollisionTable;
+  Produces<aod::HypKfMcColls> outputMcCollisionTable;
+  Produces<aod::HypKfMcParts> outputMcParticleTable;
+  Produces<aod::HypKfColls> outputCollisionTable;
   Produces<aod::HypKfTracks> outputTrackTable;
-  Produces<aod::HypKfDaughterAddons> outputDaughterAddonTable;
-  Produces<aod::HypKfSubDaughters> outputSubDaughterTable;
+  Produces<aod::HypKfDaughtAdds> outputDaughterAddonTable;
+  Produces<aod::HypKfSubDs> outputSubDaughterTable;
   Produces<aod::HypKfHypNucs> outputHypNucTable;
 
   Preslice<aod::TrackAssoc> perCollision = aod::track_association::collisionId;
diff --git a/PWGLF/TableProducer/Nuspex/hypKfTreeCreator.cxx b/PWGLF/TableProducer/Nuspex/hypKfTreeCreator.cxx
index 5666a06efc2..bba41fdfeac 100644
--- a/PWGLF/TableProducer/Nuspex/hypKfTreeCreator.cxx
+++ b/PWGLF/TableProducer/Nuspex/hypKfTreeCreator.cxx
@@ -329,7 +329,7 @@ struct hypKfTreeCreator {
   Produces<aod::HypKfMcCascadeTwoThreeCandidates> outputTableMcTwoThree;
   Produces<aod::HypKfCascadeThreeTwoCandidates> outputTableThreeTwo;
   Produces<aod::HypKfMcCascadeThreeTwoCandidates> outputTableMcThreeTwo;
-  PresliceUnsorted<aod::HypKfHypNucs> perMcParticle = aod::hykfhyp::hypKfMcParticleId;
+  PresliceUnsorted<aod::HypKfHypNucs> perMcParticle = aod::hykfhyp::hypKfMcPartId;
 
   Configurable<int> cfgSpecies{"cfgSpecies", 0, "Select species"};
   Configurable<int> cfgNprimDaughters{"cfgNprimDaughters", 0, "Number of primary daughters"};
@@ -354,7 +354,7 @@ struct hypKfTreeCreator {
   }
   //___________________________________________________________________________________________________________________________________________________________
 
-  void processData(aod::HypKfHypNucs const& hypNucs, aod::HypKfCollisions const& hypKfColls, aod::HypKfTracks const& hypKfTrks, aod::HypKfDaughterAddons const& hypKfDAdd, aod::HypKfSubDaughters const& hypKfDSub)
+  void processData(aod::HypKfHypNucs const& hypNucs, aod::HypKfColls const& hypKfColls, aod::HypKfTracks const& hypKfTrks, aod::HypKfDaughtAdds const& hypKfDAdd, aod::HypKfSubDs const& hypKfDSub)
   {
     for (auto& hypNuc : hypNucs) {
       if (std::abs(hypNuc.species()) != cfgSpecies)
@@ -514,12 +514,12 @@ struct hypKfTreeCreator {
   }
   //___________________________________________________________________________________________________________________________________________________________
 
-  void fillCandidate(hyperNucleus& cand, hyperNucleus& hypDaughter, aod::HypKfHypNuc const& hypNuc, aod::HypKfHypNucs const&, aod::HypKfCollisions const&, aod::HypKfTracks const&, aod::HypKfDaughterAddons const&, aod::HypKfSubDaughters const&)
+  void fillCandidate(hyperNucleus& cand, hyperNucleus& hypDaughter, aod::HypKfHypNuc const& hypNuc, aod::HypKfHypNucs const&, aod::HypKfColls const&, aod::HypKfTracks const&, aod::HypKfDaughtAdds const&, aod::HypKfSubDs const&)
   {
     cand.daughterTracks.clear();
     cand.subDaughterMassVec.clear();
-    auto coll = hypNuc.hypKfCollision();
-    auto addOns = hypNuc.addons_as<aod::HypKfDaughterAddons>();
+    auto coll = hypNuc.hypKfColl();
+    auto addOns = hypNuc.addons_as<aod::HypKfDaughtAdds>();
     auto posVec = posVector(addOns);
     cand.Species = std::abs(hypNuc.species());
     cand.IsMatter = hypNuc.isMatter();
@@ -584,20 +584,20 @@ struct hypKfTreeCreator {
       return;
 
     trackCount = 0;
-    auto subDaughters = hypNuc.subDaughters_as<aod::HypKfSubDaughters>();
+    auto subDaughters = hypNuc.subDaughters_as<aod::HypKfSubDs>();
     for (auto& subDaughter : subDaughters) {
       cand.daughterTracks.at(trackCount++).SubMass = subDaughter.subMass();
     }
   }
   //___________________________________________________________________________________________________________________________________________________________
 
-  void processMC(aod::HypKfMcParticles const& mcHypNucs, aod::HypKfHypNucs const& hypNucs, aod::HypKfMcCollisions const&, aod::HypKfCollisions const& hypKfColls, aod::HypKfTracks const& hypKfTrks, aod::HypKfDaughterAddons const& hypKfDAdd, aod::HypKfSubDaughters const& hypKfDSub)
+  void processMC(aod::HypKfMcParts const& mcHypNucs, aod::HypKfHypNucs const& hypNucs, aod::HypKfMcColls const&, aod::HypKfColls const& hypKfColls, aod::HypKfTracks const& hypKfTrks, aod::HypKfDaughtAdds const& hypKfDAdd, aod::HypKfSubDs const& hypKfDSub)
   {
     isMC = true;
     for (auto& mcHypNuc : mcHypNucs) {
       if (std::abs(mcHypNuc.species()) != cfgSpecies)
         continue;
-      auto mcColl = mcHypNuc.hypKfMcCollision();
+      auto mcColl = mcHypNuc.hypKfMcColl();
       const auto mcParticleIdx = mcHypNuc.globalIndex();
       auto hypNucsByMc = hypNucs.sliceBy(perMcParticle, mcParticleIdx);
       hyperNucleus candidate, hypDaughter, dummy;
@@ -620,8 +620,8 @@ struct hypKfTreeCreator {
       candidate.SvyGen = mcHypNuc.svy();
       candidate.SvzGen = mcHypNuc.svz();
       for (auto& hypNuc : hypNucsByMc) {
-        auto coll = hypNuc.hypKfCollision();
-        if (coll.hypKfMcCollisionId() == mcHypNuc.hypKfMcCollisionId()) {
+        auto coll = hypNuc.hypKfColl();
+        if (coll.hypKfMcCollId() == mcHypNuc.hypKfMcCollId()) {
           candidate.CollisionMcTrue = true;
         }
         candidate.IsReconstructed++;