diff --git a/Common/TableProducer/mcCollsExtra.cxx b/Common/TableProducer/mcCollsExtra.cxx
index b5588317894..4b7a0f8287e 100644
--- a/Common/TableProducer/mcCollsExtra.cxx
+++ b/Common/TableProducer/mcCollsExtra.cxx
@@ -50,7 +50,7 @@ struct mcCollisionExtra {
   Configurable<float> poiEtaWindow{"poiEtaWindow", 0.8, "PDG code requirement within this eta window"};
 
   // For manual sliceBy
-  Preslice<aod::McParticle> perMcCollision = aod::mcparticle::mcCollisionId;
+  Preslice<aod::McParticles> perMcCollision = aod::mcparticle::mcCollisionId;
 
   template <typename T>
   std::vector<std::size_t> sort_indices(const std::vector<T>& v)
diff --git a/Common/TableProducer/muonRealignment.cxx b/Common/TableProducer/muonRealignment.cxx
index 3fa9b462c0f..f15780546b2 100644
--- a/Common/TableProducer/muonRealignment.cxx
+++ b/Common/TableProducer/muonRealignment.cxx
@@ -104,7 +104,7 @@ struct MuonRealignment {
   TGeoManager* geoNew = nullptr;
   TGeoManager* geoRef = nullptr;
 
-  Preslice<aod::FwdTrkCl> perMuon = aod::fwdtrkcl::fwdtrackId;
+  Preslice<aod::FwdTrkCls> perMuon = aod::fwdtrkcl::fwdtrackId;
 
   int GetDetElemId(int iDetElemNumber)
   {
diff --git a/Common/Tasks/qaMuon.cxx b/Common/Tasks/qaMuon.cxx
index d96f05fc2a6..370c61f7afe 100644
--- a/Common/Tasks/qaMuon.cxx
+++ b/Common/Tasks/qaMuon.cxx
@@ -278,7 +278,7 @@ struct muonQa {
   TGeoManager* geoNew = nullptr;
   TGeoManager* geoRef = nullptr;
 
-  Preslice<aod::FwdTrkCl> perMuon = aod::fwdtrkcl::fwdtrackId;
+  Preslice<aod::FwdTrkCls> perMuon = aod::fwdtrkcl::fwdtrackId;
   Preslice<MyMuonsWithCov> fwdtracksPerCollision = aod::fwdtrack::collisionId;
   Preslice<MyMFTs> mftPerCollision = aod::fwdtrack::collisionId;
 
diff --git a/PWGDQ/Tasks/mchAlignRecord.cxx b/PWGDQ/Tasks/mchAlignRecord.cxx
index e2a9814bd20..5f610a20c98 100644
--- a/PWGDQ/Tasks/mchAlignRecord.cxx
+++ b/PWGDQ/Tasks/mchAlignRecord.cxx
@@ -113,7 +113,7 @@ struct mchAlignRecordTask {
                                               "List of param mask for d.o.f to be fixed"};
   } fFixDetElem;
 
-  Preslice<aod::FwdTrkCl> perMuon = aod::fwdtrkcl::fwdtrackId;
+  Preslice<aod::FwdTrkCls> perMuon = aod::fwdtrkcl::fwdtrackId;
 
   void init(InitContext& ic)
   {
diff --git a/PWGDQ/Tasks/muonGlobalAlignment.cxx b/PWGDQ/Tasks/muonGlobalAlignment.cxx
index 5f9dcbea5a5..9eb13445756 100644
--- a/PWGDQ/Tasks/muonGlobalAlignment.cxx
+++ b/PWGDQ/Tasks/muonGlobalAlignment.cxx
@@ -237,7 +237,7 @@ struct muonGlobalAlignment {
   };
   std::map<int, AlignmentCorrections> mMchAlignmentCorrections;
 
-  Preslice<aod::FwdTrkCl> perMuon = aod::fwdtrkcl::fwdtrackId;
+  Preslice<aod::FwdTrkCls> perMuon = aod::fwdtrkcl::fwdtrackId;
 
   o2::aod::rctsel::RCTFlagsChecker rctChecker{"CBT_muon_glo", false, false, true};
 
diff --git a/PWGJE/TableProducer/jetTrackDerived.cxx b/PWGJE/TableProducer/jetTrackDerived.cxx
index db9a7f5325b..694f2487598 100644
--- a/PWGJE/TableProducer/jetTrackDerived.cxx
+++ b/PWGJE/TableProducer/jetTrackDerived.cxx
@@ -159,7 +159,7 @@ struct jetspectraDerivedMaker {
     return true;
   }
 
-  Preslice<aod::Track> trackPerColl = aod::track::collisionId;
+  Preslice<aod::Tracks> trackPerColl = aod::track::collisionId;
   Produces<o2::aod::JeTracks> tableTrack;
   Produces<o2::aod::JeColls> tableColl;
   using CollisionCandidate = soa::Join<aod::Collisions, aod::EvSels, aod::Mults, aod::CentFT0Ms, aod::CentFT0As, aod::CentFT0Cs>;
diff --git a/PWGJE/Tasks/trackJetQA.cxx b/PWGJE/Tasks/trackJetQA.cxx
index 3b7eafded61..26668e5bf87 100644
--- a/PWGJE/Tasks/trackJetQA.cxx
+++ b/PWGJE/Tasks/trackJetQA.cxx
@@ -350,7 +350,7 @@ struct TrackJetQa {
     histos.fill(HIST("TPC/tpcChi2NCl"), track.pt(), track.sigma1Pt() * track.pt(), track.tpcChi2NCl(), collision.centFT0A(), collision.centFT0C());
   }
 
-  Preslice<aod::Track> trackPerColl = aod::track::collisionId;
+  Preslice<aod::Tracks> trackPerColl = aod::track::collisionId;
   using CollisionCandidate = soa::Join<aod::Collisions, aod::EvSels, aod::Mults, aod::CentFT0Ms, aod::CentFT0As, aod::CentFT0Cs>;
   using TrackCandidates = soa::Join<aod::FullTracks, aod::TracksDCA, aod::TrackSelection, aod::TracksCov>;
 
diff --git a/PWGLF/TableProducer/Nuspex/threebodymcfinder.cxx b/PWGLF/TableProducer/Nuspex/threebodymcfinder.cxx
index 47c8a72c420..4c2c2dc2ef3 100644
--- a/PWGLF/TableProducer/Nuspex/threebodymcfinder.cxx
+++ b/PWGLF/TableProducer/Nuspex/threebodymcfinder.cxx
@@ -59,7 +59,7 @@ struct threebodymcfinder {
 
   Configurable<bool> requireITS{"requireITS", false, "require ITS information used in tracks"};
 
-  Preslice<aod::McParticle> perMcCollision = aod::mcparticle::mcCollisionId;
+  Preslice<aod::McParticles> perMcCollision = aod::mcparticle::mcCollisionId;
 
   std::vector<int> d3bcollisionId;
   std::vector<int> d3bprong0Index;
diff --git a/PWGLF/TableProducer/Strangeness/cascademcfinder.cxx b/PWGLF/TableProducer/Strangeness/cascademcfinder.cxx
index e732b79adce..8c95a1579d4 100644
--- a/PWGLF/TableProducer/Strangeness/cascademcfinder.cxx
+++ b/PWGLF/TableProducer/Strangeness/cascademcfinder.cxx
@@ -67,7 +67,7 @@ struct cascademcfinder {
   Configurable<bool> doQA{"doQA", true, "do qa plots"};
 
   // For manual sliceBy
-  Preslice<aod::McParticle> perMcCollision = aod::mcparticle::mcCollisionId;
+  Preslice<aod::McParticles> perMcCollision = aod::mcparticle::mcCollisionId;
 
   std::vector<int> casccollisionId;
   std::vector<int> cascv0Index;