diff --git a/PWGCF/TwoParticleCorrelations/DataModel/LongRangeDerived.h b/PWGCF/TwoParticleCorrelations/DataModel/LongRangeDerived.h
index f9b79242ac0..8dd31e82aa1 100644
--- a/PWGCF/TwoParticleCorrelations/DataModel/LongRangeDerived.h
+++ b/PWGCF/TwoParticleCorrelations/DataModel/LongRangeDerived.h
@@ -34,16 +34,16 @@ DECLARE_SOA_COLUMN(TotalFV0AmplitudeA, totalFV0AmplitudeA, float); //! sum of am
 DECLARE_SOA_COLUMN(GapSide, gapSide, uint8_t);                     // 0 for side A, 1 for side C, 2 for both sides
 } // namespace lrcorrcolltable
 
-DECLARE_SOA_TABLE(CollLRTables, "AOD", "COLLLRTABLE",
+DECLARE_SOA_TABLE(LRCollisions, "AOD", "LRCOLLISION",
                   o2::soa::Index<>,
                   bc::RunNumber,
                   lrcorrcolltable::Zvtx,
                   lrcorrcolltable::Multiplicity,
                   lrcorrcolltable::Centrality,
                   timestamp::Timestamp);
-using CollLRTable = CollLRTables::iterator;
+using LRCollision = LRCollisions::iterator;
 
-DECLARE_SOA_TABLE(UpcCollLRTables, "AOD", "UPCCOLLLRTABLE",
+DECLARE_SOA_TABLE(UpcLRCollisions, "AOD", "UPCLRCOLLISION",
                   o2::soa::Index<>,
                   bc::GlobalBC,
                   bc::RunNumber,
@@ -52,30 +52,30 @@ DECLARE_SOA_TABLE(UpcCollLRTables, "AOD", "UPCCOLLLRTABLE",
                   lrcorrcolltable::TotalFT0AmplitudeA,
                   lrcorrcolltable::TotalFT0AmplitudeC,
                   lrcorrcolltable::TotalFV0AmplitudeA);
-using UpcCollLRTable = UpcCollLRTables::iterator;
+using UpcLRCollision = UpcLRCollisions::iterator;
 
-DECLARE_SOA_TABLE(UpcSgCollLRTables, "AOD", "UPCSGCOLLLRTABLE",
+DECLARE_SOA_TABLE(UpcSgLRCollisions, "AOD", "UPCSGLRCOLLISION",
                   lrcorrcolltable::GapSide);
-using UpcSgCollLRTable = UpcSgCollLRTables::iterator;
+using UpcSgLRCollision = UpcSgLRCollisions::iterator;
 
 namespace lrcorrzdctable
 {
-DECLARE_SOA_INDEX_COLUMN(UpcCollLRTable, upcCollLRTable);
+DECLARE_SOA_INDEX_COLUMN(UpcLRCollision, upcLRCollision);
 DECLARE_SOA_COLUMN(EnergyCommonZNA, energyCommonZNA, float);
 DECLARE_SOA_COLUMN(EnergyCommonZNC, energyCommonZNC, float);
 } // namespace lrcorrzdctable
 
-DECLARE_SOA_TABLE(ZdcLRTables, "AOD", "ZDCLRTABLE",
+DECLARE_SOA_TABLE(LRZdcs, "AOD", "LRZDC",
                   o2::soa::Index<>,
-                  lrcorrzdctable::UpcCollLRTableId,
+                  lrcorrzdctable::UpcLRCollisionId,
                   lrcorrzdctable::EnergyCommonZNA,
                   lrcorrzdctable::EnergyCommonZNC);
-using ZdcLRTable = ZdcLRTables::iterator;
+using LRZdc = LRZdcs::iterator;
 
 namespace lrcorrtrktable
 {
-DECLARE_SOA_INDEX_COLUMN(CollLRTable, collLRTable);
-DECLARE_SOA_INDEX_COLUMN(UpcCollLRTable, upcCollLRTable);
+DECLARE_SOA_INDEX_COLUMN(LRCollision, lrCollision);
+DECLARE_SOA_INDEX_COLUMN(UpcLRCollision, upcLRCollision);
 DECLARE_SOA_COLUMN(Pt, pt, float);
 DECLARE_SOA_COLUMN(Eta, eta, float);
 DECLARE_SOA_COLUMN(Phi, phi, float);
@@ -99,36 +99,36 @@ enum V0TrackPid {
 };
 } // namespace lrcorrtrktable
 
-DECLARE_SOA_TABLE(TrkLRTables, "AOD", "TRKLRTABLE",
+DECLARE_SOA_TABLE(LRMidTracks, "AOD", "LRMIDTRACK",
                   o2::soa::Index<>,
-                  lrcorrtrktable::CollLRTableId,
+                  lrcorrtrktable::LRCollisionId,
                   lrcorrtrktable::Pt,
                   lrcorrtrktable::Eta,
                   lrcorrtrktable::Phi,
                   lrcorrtrktable::TrackType);
-using TrkLRTable = TrkLRTables::iterator;
+using LRMidTrack = LRMidTracks::iterator;
 
-DECLARE_SOA_TABLE(Ft0aLRTables, "AOD", "FT0ALRTABLE",
+DECLARE_SOA_TABLE(LRFt0aTracks, "AOD", "LRFT0ATRACK",
                   o2::soa::Index<>,
-                  lrcorrtrktable::CollLRTableId,
+                  lrcorrtrktable::LRCollisionId,
                   lrcorrtrktable::ChannelID,
                   lrcorrtrktable::Amplitude,
                   lrcorrtrktable::Eta,
                   lrcorrtrktable::Phi);
-using Ft0aLRTable = Ft0aLRTables::iterator;
+using LRFt0aTrack = LRFt0aTracks::iterator;
 
-DECLARE_SOA_TABLE(Ft0cLRTables, "AOD", "FT0CLRTABLE",
+DECLARE_SOA_TABLE(LRFt0cTracks, "AOD", "LRFT0CTRACK",
                   o2::soa::Index<>,
-                  lrcorrtrktable::CollLRTableId,
+                  lrcorrtrktable::LRCollisionId,
                   lrcorrtrktable::ChannelID,
                   lrcorrtrktable::Amplitude,
                   lrcorrtrktable::Eta,
                   lrcorrtrktable::Phi);
-using Ft0cLRTable = Ft0cLRTables::iterator;
+using LRFt0cTrack = LRFt0cTracks::iterator;
 
-DECLARE_SOA_TABLE(V0TrkLRTables, "AOD", "V0TRKLRTABLE",
+DECLARE_SOA_TABLE(LRV0Tracks, "AOD", "LRV0TRACK",
                   o2::soa::Index<>,
-                  lrcorrtrktable::CollLRTableId,
+                  lrcorrtrktable::LRCollisionId,
                   lrcorrtrktable::IdPos,
                   lrcorrtrktable::IdNeg,
                   lrcorrtrktable::Pt,
@@ -136,54 +136,54 @@ DECLARE_SOA_TABLE(V0TrkLRTables, "AOD", "V0TRKLRTABLE",
                   lrcorrtrktable::Phi,
                   lrcorrtrktable::InvMass,
                   lrcorrtrktable::V0Type);
-using V0TrkLRTable = V0TrkLRTables::iterator;
+using LRV0Track = LRV0Tracks::iterator;
 
-DECLARE_SOA_TABLE(MftTrkLRTables, "AOD", "MFTTRKLRTABLE",
+DECLARE_SOA_TABLE(LRMftTracks, "AOD", "LRMFTTRACK",
                   o2::soa::Index<>,
-                  lrcorrtrktable::CollLRTableId,
+                  lrcorrtrktable::LRCollisionId,
                   lrcorrtrktable::Pt,
                   lrcorrtrktable::Eta,
                   lrcorrtrktable::Phi);
-using MftTrkLRTable = MftTrkLRTables::iterator;
+using LRMftTrack = LRMftTracks::iterator;
 
-DECLARE_SOA_TABLE(MftBestTrkLRTables, "AOD", "MFTBESTTRKLRTABLE",
+DECLARE_SOA_TABLE(LRMftBestTracks, "AOD", "LRMFTBESTTRACK",
                   o2::soa::Index<>,
-                  lrcorrtrktable::CollLRTableId,
+                  lrcorrtrktable::LRCollisionId,
                   lrcorrtrktable::Pt,
                   lrcorrtrktable::Eta,
                   lrcorrtrktable::Phi);
-using MftBestTrkLRTable = MftBestTrkLRTables::iterator;
+using LRMftBestTrack = LRMftBestTracks::iterator;
 
-DECLARE_SOA_TABLE(TrkLRUpcTables, "AOD", "TRKLRUPCTABLE",
+DECLARE_SOA_TABLE(UpcLRMidTracks, "AOD", "UPCLRMIDTRACK",
                   o2::soa::Index<>,
-                  lrcorrtrktable::UpcCollLRTableId,
+                  lrcorrtrktable::UpcLRCollisionId,
                   lrcorrtrktable::Pt,
                   lrcorrtrktable::Eta,
                   lrcorrtrktable::Phi,
                   lrcorrtrktable::TrackType);
-using TrkLRUpcTable = TrkLRUpcTables::iterator;
+using UpcLRMidTrack = UpcLRMidTracks::iterator;
 
-DECLARE_SOA_TABLE(Ft0aLRUpcTables, "AOD", "FT0ALRUpcTABLE",
+DECLARE_SOA_TABLE(UpcLRFt0aTracks, "AOD", "UPCLRFT0ATRACK",
                   o2::soa::Index<>,
-                  lrcorrtrktable::UpcCollLRTableId,
+                  lrcorrtrktable::UpcLRCollisionId,
                   lrcorrtrktable::ChannelID,
                   lrcorrtrktable::Amplitude,
                   lrcorrtrktable::Eta,
                   lrcorrtrktable::Phi);
-using Ft0aLRUpcTable = Ft0aLRUpcTables::iterator;
+using UpcLRFt0aTrack = UpcLRFt0aTracks::iterator;
 
-DECLARE_SOA_TABLE(Ft0cLRUpcTables, "AOD", "FT0CLRUpcTABLE",
+DECLARE_SOA_TABLE(UpcLRFt0cTracks, "AOD", "UPCLRFT0CTRACK",
                   o2::soa::Index<>,
-                  lrcorrtrktable::UpcCollLRTableId,
+                  lrcorrtrktable::UpcLRCollisionId,
                   lrcorrtrktable::ChannelID,
                   lrcorrtrktable::Amplitude,
                   lrcorrtrktable::Eta,
                   lrcorrtrktable::Phi);
-using Ft0cLRUpcTable = Ft0cLRUpcTables::iterator;
+using UpcLRFt0cTrack = UpcLRFt0cTracks::iterator;
 
-DECLARE_SOA_TABLE(V0TrkLRUpcTables, "AOD", "V0TRKLRUPCTABLE",
+DECLARE_SOA_TABLE(UpcLRV0Tracks, "AOD", "UPCLRV0TRACK",
                   o2::soa::Index<>,
-                  lrcorrtrktable::UpcCollLRTableId,
+                  lrcorrtrktable::UpcLRCollisionId,
                   lrcorrtrktable::IdPos,
                   lrcorrtrktable::IdNeg,
                   lrcorrtrktable::Pt,
@@ -191,23 +191,23 @@ DECLARE_SOA_TABLE(V0TrkLRUpcTables, "AOD", "V0TRKLRUPCTABLE",
                   lrcorrtrktable::Phi,
                   lrcorrtrktable::InvMass,
                   lrcorrtrktable::V0Type);
-using V0TrkLRUpcTable = V0TrkLRUpcTables::iterator;
+using UpcLRV0Track = UpcLRV0Tracks::iterator;
 
-DECLARE_SOA_TABLE(MftTrkLRUpcTables, "AOD", "MFTTRKLRUPCTABLE",
+DECLARE_SOA_TABLE(UpcLRMftTracks, "AOD", "UPCLRMFTTRACK",
                   o2::soa::Index<>,
-                  lrcorrtrktable::UpcCollLRTableId,
+                  lrcorrtrktable::UpcLRCollisionId,
                   lrcorrtrktable::Pt,
                   lrcorrtrktable::Eta,
                   lrcorrtrktable::Phi);
-using MftTrkLRUpcTable = MftTrkLRUpcTables::iterator;
+using UpcLRMftTrack = UpcLRMftTracks::iterator;
 
-DECLARE_SOA_TABLE(MftBestTrkLRUpcTables, "AOD", "MFTBESTTRKLRUPCTABLE",
+DECLARE_SOA_TABLE(UpcLRMftBestTracks, "AOD", "UPCLRMFTBESTTRACK",
                   o2::soa::Index<>,
-                  lrcorrtrktable::UpcCollLRTableId,
+                  lrcorrtrktable::UpcLRCollisionId,
                   lrcorrtrktable::Pt,
                   lrcorrtrktable::Eta,
                   lrcorrtrktable::Phi);
-using MftBestTrkLRUpcTable = MftBestTrkLRUpcTables::iterator;
+using UpcLRMftBestTrack = UpcLRMftBestTracks::iterator;
 
 } // namespace o2::aod
 
diff --git a/PWGCF/TwoParticleCorrelations/TableProducer/longrangeMaker.cxx b/PWGCF/TwoParticleCorrelations/TableProducer/longrangeMaker.cxx
index a7d90746265..816eb4da038 100644
--- a/PWGCF/TwoParticleCorrelations/TableProducer/longrangeMaker.cxx
+++ b/PWGCF/TwoParticleCorrelations/TableProducer/longrangeMaker.cxx
@@ -233,24 +233,24 @@ struct LongrangeMaker {
     cfgSgCuts = (SGCutParHolder)sgCuts;
   }
 
-  Produces<aod::CollLRTables> collisionLRTable;
-  Produces<aod::TrkLRTables> tracksLRTable;
-  Produces<aod::Ft0aLRTables> ft0aLRTable;
-  Produces<aod::Ft0cLRTables> ft0cLRTable;
-  Produces<aod::MftTrkLRTables> mftLRTable;
-  Produces<aod::MftBestTrkLRTables> mftbestLRTable;
-  Produces<aod::V0TrkLRTables> v0LRTable;
-
-  Produces<aod::UpcCollLRTables> outupccol;
-  Produces<aod::UpcSgCollLRTables> outsgupccol;
-  Produces<aod::ZdcLRTables> outzdctable;
-
-  Produces<aod::TrkLRUpcTables> tracksLRUpcTable;
-  Produces<aod::Ft0aLRUpcTables> ft0aLRUpcTable;
-  Produces<aod::Ft0cLRUpcTables> ft0cLRUpcTable;
-  Produces<aod::MftTrkLRUpcTables> mftLRUpcTable;
-  Produces<aod::MftBestTrkLRUpcTables> mftbestLRUpcTable;
-  Produces<aod::V0TrkLRUpcTables> v0LRUpcTable;
+  Produces<aod::LRCollisions> lrcollision;
+  Produces<aod::LRMidTracks> lrmidtracks;
+  Produces<aod::LRFt0aTracks> lrft0atracks;
+  Produces<aod::LRFt0cTracks> lrft0ctracks;
+  Produces<aod::LRMftTracks> lrmfttracks;
+  Produces<aod::LRMftBestTracks> lrmftbesttracks;
+  Produces<aod::LRV0Tracks> lrv0tracks;
+
+  Produces<aod::UpcLRCollisions> upclrcollision;
+  Produces<aod::UpcSgLRCollisions> upcsglrcollision;
+  Produces<aod::LRZdcs> lrzdcs;
+
+  Produces<aod::UpcLRMidTracks> upclrmidtracks;
+  Produces<aod::UpcLRFt0aTracks> upclrft0atracks;
+  Produces<aod::UpcLRFt0cTracks> upclrft0ctracks;
+  Produces<aod::UpcLRMftTracks> upclrmfttracks;
+  Produces<aod::UpcLRMftBestTracks> upclrmftbesttracks;
+  Produces<aod::UpcLRV0Tracks> upclrv0tracks;
 
   Filter fTracksEta = nabs(aod::track::eta) < cfgtrksel.cfgEtaCut;
   Filter fTracksPt = (aod::track::pt > cfgtrksel.cfgPtCutMin) && (aod::track::pt < cfgtrksel.cfgPtCutMax);
@@ -273,7 +273,7 @@ struct LongrangeMaker {
     auto centrality = selColCent(col);
     auto bc = col.bc_as<aod::BCsWithTimestamps>();
 
-    collisionLRTable(bc.runNumber(), col.posZ(), multiplicity, centrality, bc.timestamp());
+    lrcollision(bc.runNumber(), col.posZ(), multiplicity, centrality, bc.timestamp());
 
     // track loop
     for (const auto& track : tracks) {
@@ -281,13 +281,13 @@ struct LongrangeMaker {
         continue;
       if (!myTrackFilter.IsSelected(track))
         continue;
-      tracksLRTable(collisionLRTable.lastIndex(), track.pt(), track.eta(), track.phi(), aod::lrcorrtrktable::kSpCharge);
+      lrmidtracks(lrcollision.lastIndex(), track.pt(), track.eta(), track.phi(), aod::lrcorrtrktable::kSpCharge);
       if (getTrackPID(track) == PionTrackN)
-        tracksLRTable(collisionLRTable.lastIndex(), track.pt(), track.eta(), track.phi(), aod::lrcorrtrktable::kSpPion);
+        lrmidtracks(lrcollision.lastIndex(), track.pt(), track.eta(), track.phi(), aod::lrcorrtrktable::kSpPion);
       if (getTrackPID(track) == KaonTrackN)
-        tracksLRTable(collisionLRTable.lastIndex(), track.pt(), track.eta(), track.phi(), aod::lrcorrtrktable::kSpKaon);
+        lrmidtracks(lrcollision.lastIndex(), track.pt(), track.eta(), track.phi(), aod::lrcorrtrktable::kSpKaon);
       if (getTrackPID(track) == ProtonTrackN)
-        tracksLRTable(collisionLRTable.lastIndex(), track.pt(), track.eta(), track.phi(), aod::lrcorrtrktable::kSpProton);
+        lrmidtracks(lrcollision.lastIndex(), track.pt(), track.eta(), track.phi(), aod::lrcorrtrktable::kSpProton);
     }
 
     // ft0 loop
@@ -298,14 +298,14 @@ struct LongrangeMaker {
         float ampl = ft0.amplitudeA()[iCh];
         auto phi = getPhiFT0(chanelid, 0);
         auto eta = getEtaFT0(chanelid, 0);
-        ft0aLRTable(collisionLRTable.lastIndex(), chanelid, ampl, eta, phi);
+        lrft0atracks(lrcollision.lastIndex(), chanelid, ampl, eta, phi);
       }
       for (std::size_t iCh = 0; iCh < ft0.channelC().size(); iCh++) {
         auto chanelid = ft0.channelC()[iCh];
         float ampl = ft0.amplitudeC()[iCh];
         auto phi = getPhiFT0(chanelid, 1);
         auto eta = getEtaFT0(chanelid, 1);
-        ft0cLRTable(collisionLRTable.lastIndex(), chanelid, ampl, eta, phi);
+        lrft0ctracks(lrcollision.lastIndex(), chanelid, ampl, eta, phi);
       }
     }
 
@@ -315,7 +315,7 @@ struct LongrangeMaker {
         continue;
       auto phi = track.phi();
       o2::math_utils::bringTo02Pi(phi);
-      mftLRTable(collisionLRTable.lastIndex(), track.pt(), track.eta(), phi);
+      lrmfttracks(lrcollision.lastIndex(), track.pt(), track.eta(), phi);
     }
 
     if (retracks.size() > 0) {
@@ -329,7 +329,7 @@ struct LongrangeMaker {
         }
         auto phi = track.phi();
         o2::math_utils::bringTo02Pi(phi);
-        mftbestLRTable(collisionLRTable.lastIndex(), track.pt(), track.eta(), phi);
+        lrmftbesttracks(lrcollision.lastIndex(), track.pt(), track.eta(), phi);
       }
     }
 
@@ -344,8 +344,8 @@ struct LongrangeMaker {
 
       // K0short
       if (isSelectK0s(col, v0)) { // candidate is K0s
-        v0LRTable(collisionLRTable.lastIndex(), posTrack.globalIndex(), negTrack.globalIndex(),
-                  v0.pt(), v0.eta(), v0.phi(), v0.mK0Short(), aod::lrcorrtrktable::kSpK0short);
+        lrv0tracks(lrcollision.lastIndex(), posTrack.globalIndex(), negTrack.globalIndex(),
+                   v0.pt(), v0.eta(), v0.phi(), v0.mK0Short(), aod::lrcorrtrktable::kSpK0short);
       }
 
       // Lambda and Anti-Lambda
@@ -355,13 +355,13 @@ struct LongrangeMaker {
       // Note: candidate compatible with Lambda and Anti-Lambda hypothesis are counted twice (once for each hypothesis)
       if (lambdaTag) { // candidate is Lambda
         massV0 = v0.mLambda();
-        v0LRTable(collisionLRTable.lastIndex(), posTrack.globalIndex(), negTrack.globalIndex(),
-                  v0.pt(), v0.eta(), v0.phi(), massV0, aod::lrcorrtrktable::kSpLambda);
+        lrv0tracks(lrcollision.lastIndex(), posTrack.globalIndex(), negTrack.globalIndex(),
+                   v0.pt(), v0.eta(), v0.phi(), massV0, aod::lrcorrtrktable::kSpLambda);
       }
       if (antilambdaTag) { // candidate is Anti-lambda
         massV0 = v0.mAntiLambda();
-        v0LRTable(collisionLRTable.lastIndex(), posTrack.globalIndex(), negTrack.globalIndex(),
-                  v0.pt(), v0.eta(), v0.phi(), massV0, aod::lrcorrtrktable::kSpALambda);
+        lrv0tracks(lrcollision.lastIndex(), posTrack.globalIndex(), negTrack.globalIndex(),
+                   v0.pt(), v0.eta(), v0.phi(), massV0, aod::lrcorrtrktable::kSpALambda);
       } // end of Lambda and Anti-Lambda processing
     }
   } // process function
@@ -398,13 +398,13 @@ struct LongrangeMaker {
       upchelpers::FITInfo fitInfo{};
       udhelpers::getFITinfo(fitInfo, newbc, bcs, ft0s, fv0as, fdds);
       auto multiplicity = countNTracks(tracks);
-      outupccol(bc.globalBC(), bc.runNumber(), col.posZ(), multiplicity, fitInfo.ampFT0A, fitInfo.ampFT0C, fitInfo.timeFV0A);
-      outsgupccol(issgevent);
+      upclrcollision(bc.globalBC(), bc.runNumber(), col.posZ(), multiplicity, fitInfo.ampFT0A, fitInfo.ampFT0C, fitInfo.timeFV0A);
+      upcsglrcollision(issgevent);
       if (newbc.has_zdc()) {
         auto zdc = newbc.zdc();
-        outzdctable(outupccol.lastIndex(), zdc.energyCommonZNA(), zdc.energyCommonZNC());
+        lrzdcs(upclrcollision.lastIndex(), zdc.energyCommonZNA(), zdc.energyCommonZNC());
       } else {
-        outzdctable(outupccol.lastIndex(), -999, -999);
+        lrzdcs(upclrcollision.lastIndex(), -999, -999);
       }
 
       // track loop
@@ -413,13 +413,13 @@ struct LongrangeMaker {
           continue;
         if (!myTrackFilter.IsSelected(track))
           continue;
-        tracksLRUpcTable(outupccol.lastIndex(), track.pt(), track.eta(), track.phi(), aod::lrcorrtrktable::kSpCharge);
+        upclrmidtracks(upclrcollision.lastIndex(), track.pt(), track.eta(), track.phi(), aod::lrcorrtrktable::kSpCharge);
         if (getTrackPID(track) == PionTrackN)
-          tracksLRUpcTable(outupccol.lastIndex(), track.pt(), track.eta(), track.phi(), aod::lrcorrtrktable::kSpPion);
+          upclrmidtracks(upclrcollision.lastIndex(), track.pt(), track.eta(), track.phi(), aod::lrcorrtrktable::kSpPion);
         if (getTrackPID(track) == KaonTrackN)
-          tracksLRUpcTable(outupccol.lastIndex(), track.pt(), track.eta(), track.phi(), aod::lrcorrtrktable::kSpKaon);
+          upclrmidtracks(upclrcollision.lastIndex(), track.pt(), track.eta(), track.phi(), aod::lrcorrtrktable::kSpKaon);
         if (getTrackPID(track) == ProtonTrackN)
-          tracksLRUpcTable(outupccol.lastIndex(), track.pt(), track.eta(), track.phi(), aod::lrcorrtrktable::kSpProton);
+          upclrmidtracks(upclrcollision.lastIndex(), track.pt(), track.eta(), track.phi(), aod::lrcorrtrktable::kSpProton);
       }
 
       // ft0 loop
@@ -430,14 +430,14 @@ struct LongrangeMaker {
           float ampl = ft0.amplitudeA()[iCh];
           auto phi = getPhiFT0(chanelid, 0);
           auto eta = getEtaFT0(chanelid, 0);
-          ft0aLRUpcTable(outupccol.lastIndex(), chanelid, ampl, eta, phi);
+          upclrft0atracks(upclrcollision.lastIndex(), chanelid, ampl, eta, phi);
         }
         for (std::size_t iCh = 0; iCh < ft0.channelC().size(); iCh++) {
           auto chanelid = ft0.channelC()[iCh];
           float ampl = ft0.amplitudeC()[iCh];
           auto phi = getPhiFT0(chanelid, 1);
           auto eta = getEtaFT0(chanelid, 1);
-          ft0cLRUpcTable(outupccol.lastIndex(), chanelid, ampl, eta, phi);
+          upclrft0ctracks(upclrcollision.lastIndex(), chanelid, ampl, eta, phi);
         }
       }
 
@@ -447,7 +447,7 @@ struct LongrangeMaker {
           continue;
         auto phi = track.phi();
         o2::math_utils::bringTo02Pi(phi);
-        mftLRUpcTable(outupccol.lastIndex(), track.pt(), track.eta(), phi);
+        upclrmfttracks(upclrcollision.lastIndex(), track.pt(), track.eta(), phi);
       }
 
       if (retracks.size() > 0) {
@@ -461,7 +461,7 @@ struct LongrangeMaker {
           }
           auto phi = track.phi();
           o2::math_utils::bringTo02Pi(phi);
-          mftbestLRUpcTable(outupccol.lastIndex(), track.pt(), track.eta(), phi);
+          upclrmftbesttracks(upclrcollision.lastIndex(), track.pt(), track.eta(), phi);
         }
       }
 
@@ -476,8 +476,8 @@ struct LongrangeMaker {
 
         // K0short
         if (isSelectK0s(col, v0)) { // candidate is K0s
-          v0LRUpcTable(outupccol.lastIndex(), posTrack.globalIndex(), negTrack.globalIndex(),
-                       v0.pt(), v0.eta(), v0.phi(), v0.mK0Short(), aod::lrcorrtrktable::kSpK0short);
+          upclrv0tracks(upclrcollision.lastIndex(), posTrack.globalIndex(), negTrack.globalIndex(),
+                        v0.pt(), v0.eta(), v0.phi(), v0.mK0Short(), aod::lrcorrtrktable::kSpK0short);
         }
 
         // Lambda and Anti-Lambda
@@ -487,13 +487,13 @@ struct LongrangeMaker {
         // Note: candidate compatible with Lambda and Anti-Lambda hypothesis are counted twice (once for each hypothesis)
         if (lambdaTag) { // candidate is Lambda
           massV0 = v0.mLambda();
-          v0LRUpcTable(outupccol.lastIndex(), posTrack.globalIndex(), negTrack.globalIndex(),
-                       v0.pt(), v0.eta(), v0.phi(), massV0, aod::lrcorrtrktable::kSpLambda);
+          upclrv0tracks(upclrcollision.lastIndex(), posTrack.globalIndex(), negTrack.globalIndex(),
+                        v0.pt(), v0.eta(), v0.phi(), massV0, aod::lrcorrtrktable::kSpLambda);
         }
         if (antilambdaTag) { // candidate is Anti-lambda
           massV0 = v0.mAntiLambda();
-          v0LRUpcTable(outupccol.lastIndex(), posTrack.globalIndex(), negTrack.globalIndex(),
-                       v0.pt(), v0.eta(), v0.phi(), massV0, aod::lrcorrtrktable::kSpALambda);
+          upclrv0tracks(upclrcollision.lastIndex(), posTrack.globalIndex(), negTrack.globalIndex(),
+                        v0.pt(), v0.eta(), v0.phi(), massV0, aod::lrcorrtrktable::kSpALambda);
         } // end of Lambda and Anti-Lambda processing
       }
     } // SG events
diff --git a/PWGCF/TwoParticleCorrelations/Tasks/longrangecorrDerived.cxx b/PWGCF/TwoParticleCorrelations/Tasks/longrangecorrDerived.cxx
index 977f534729a..9d759b1695a 100644
--- a/PWGCF/TwoParticleCorrelations/Tasks/longrangecorrDerived.cxx
+++ b/PWGCF/TwoParticleCorrelations/Tasks/longrangecorrDerived.cxx
@@ -117,35 +117,35 @@ struct LongrangecorrDerived {
   OutputObj<CorrelationContainer> same{"sameEvent"};
   OutputObj<CorrelationContainer> mixed{"mixedEvent"};
 
-  using CollsTable = aod::CollLRTables;
-  using TrksTable = aod::TrkLRTables;
-  using MftTrksTable = aod::MftTrkLRTables;
-  using Ft0aTrksTable = aod::Ft0aLRTables;
-  using Ft0cTrksTable = aod::Ft0cLRTables;
-  using MftbestTrksTable = aod::MftBestTrkLRTables;
-  using V0TrksTable = aod::V0TrkLRTables;
-
-  using UpcCollsTable = soa::Join<aod::UpcCollLRTables, aod::UpcSgCollLRTables, aod::ZdcLRTables>;
-  using TrksUpcTable = aod::TrkLRUpcTables;
-  using MftTrksUpcTable = aod::MftTrkLRUpcTables;
-  using Ft0aTrksUpcTable = aod::Ft0aLRUpcTables;
-  using Ft0cTrksUpcTable = aod::Ft0cLRUpcTables;
-  using MftbestTrksUpcTable = aod::MftBestTrkLRUpcTables;
-  using V0TrksUpcTable = aod::V0TrkLRUpcTables;
-
-  Preslice<TrksTable> perColTpc = aod::lrcorrtrktable::collLRTableId;
-  Preslice<MftTrksTable> perColMft = aod::lrcorrtrktable::collLRTableId;
-  Preslice<MftbestTrksTable> perColMftbest = aod::lrcorrtrktable::collLRTableId;
-  Preslice<Ft0aTrksTable> perColFt0a = aod::lrcorrtrktable::collLRTableId;
-  Preslice<Ft0cTrksTable> perColFt0c = aod::lrcorrtrktable::collLRTableId;
-  Preslice<V0TrksTable> perColV0 = aod::lrcorrtrktable::collLRTableId;
-
-  Preslice<TrksUpcTable> perUpcColTpc = aod::lrcorrtrktable::upcCollLRTableId;
-  Preslice<MftTrksUpcTable> perUpcColMft = aod::lrcorrtrktable::upcCollLRTableId;
-  Preslice<MftbestTrksUpcTable> perUpcColMftbest = aod::lrcorrtrktable::upcCollLRTableId;
-  Preslice<Ft0aTrksUpcTable> perUpcColFt0a = aod::lrcorrtrktable::upcCollLRTableId;
-  Preslice<Ft0cTrksUpcTable> perUpcColFt0c = aod::lrcorrtrktable::upcCollLRTableId;
-  Preslice<V0TrksUpcTable> perUpcColV0 = aod::lrcorrtrktable::upcCollLRTableId;
+  using CollsTable = aod::LRCollisions;
+  using TrksTable = aod::LRMidTracks;
+  using MftTrksTable = aod::LRMftTracks;
+  using Ft0aTrksTable = aod::LRFt0aTracks;
+  using Ft0cTrksTable = aod::LRFt0cTracks;
+  using MftbestTrksTable = aod::LRMftBestTracks;
+  using V0TrksTable = aod::LRV0Tracks;
+
+  using UpcCollsTable = soa::Join<aod::UpcLRCollisions, aod::UpcSgLRCollisions, aod::LRZdcs>;
+  using TrksUpcTable = aod::UpcLRMidTracks;
+  using MftTrksUpcTable = aod::UpcLRMftTracks;
+  using Ft0aTrksUpcTable = aod::UpcLRFt0aTracks;
+  using Ft0cTrksUpcTable = aod::UpcLRFt0cTracks;
+  using MftbestTrksUpcTable = aod::UpcLRMftBestTracks;
+  using V0TrksUpcTable = aod::UpcLRV0Tracks;
+
+  Preslice<TrksTable> perColTpc = aod::lrcorrtrktable::lrCollisionId;
+  Preslice<MftTrksTable> perColMft = aod::lrcorrtrktable::lrCollisionId;
+  Preslice<MftbestTrksTable> perColMftbest = aod::lrcorrtrktable::lrCollisionId;
+  Preslice<Ft0aTrksTable> perColFt0a = aod::lrcorrtrktable::lrCollisionId;
+  Preslice<Ft0cTrksTable> perColFt0c = aod::lrcorrtrktable::lrCollisionId;
+  Preslice<V0TrksTable> perColV0 = aod::lrcorrtrktable::lrCollisionId;
+
+  Preslice<TrksUpcTable> perUpcColTpc = aod::lrcorrtrktable::upcLRCollisionId;
+  Preslice<MftTrksUpcTable> perUpcColMft = aod::lrcorrtrktable::upcLRCollisionId;
+  Preslice<MftbestTrksUpcTable> perUpcColMftbest = aod::lrcorrtrktable::upcLRCollisionId;
+  Preslice<Ft0aTrksUpcTable> perUpcColFt0a = aod::lrcorrtrktable::upcLRCollisionId;
+  Preslice<Ft0cTrksUpcTable> perUpcColFt0c = aod::lrcorrtrktable::upcLRCollisionId;
+  Preslice<V0TrksUpcTable> perUpcColV0 = aod::lrcorrtrktable::upcLRCollisionId;
 
   void init(InitContext const&)
   {