diff --git a/Phys/ParticleCombiners/include/CombKernel/ThOrCombiner.h b/Phys/ParticleCombiners/include/CombKernel/ThOrCombiner.h
index 99cedce6301941b062a852676f1b888df0c9b621..c9ffcd5eba30448050ac54b9dba5b18e996f5a73 100644
--- a/Phys/ParticleCombiners/include/CombKernel/ThOrCombiner.h
+++ b/Phys/ParticleCombiners/include/CombKernel/ThOrCombiner.h
@@ -31,7 +31,7 @@ namespace ThOr::detail::Combiner {
   template <SIMDWrapper::InstructionSet Backend>
   using mask_b_v = typename SIMDWrapper::type_map_t<Backend>::mask_v;
 
-  using Output_t = LHCb::v2::Composites;
+  using Output_t = LHCb::Event::Composites;
 
   // Shorthand for below.
   template <typename... Ts>
@@ -83,7 +83,7 @@ namespace ThOr::detail::Combiner {
     template <LHCb::Pr::ProxyBehaviour Behaviour>
     struct get_proxy {
       template <typename T>
-      using fn = LHCb::v2::Event::ZipCompat::proxy_t<Backend, Behaviour, T>;
+      using fn = LHCb::Event::ZipCompat::proxy_t<Backend, Behaviour, T>;
     };
     template <typename T>
     using unwrap_if_single = std::conditional_t<boost::mp11::mp_size<T>::value == 1, boost::mp11::mp_front<T>, T>;
@@ -123,7 +123,7 @@ namespace ThOr::detail::Combiner {
 
   template <SIMDWrapper::InstructionSet Backend = SIMDWrapper::Scalar>
   struct CompositeCut {
-    using particle_t = LHCb::v2::Event::ZipCompat::proxy_t<Backend, LHCb::Pr::ProxyBehaviour::Contiguous, Output_t>;
+    using particle_t = LHCb::Event::ZipCompat::proxy_t<Backend, LHCb::Pr::ProxyBehaviour::Contiguous, Output_t>;
     using Signature  = mask_b_v<Backend>( Functors::mask_arg_t, mask_b_v<Backend> const&, particle_t const& );
     constexpr static bool is_simd = Backend != SIMDWrapper::Scalar;
     constexpr static auto Compilation =
@@ -497,7 +497,7 @@ namespace ThOr {
       // Get an iterable version of the input if need be -- this should be a noop if the input is already a zip
       // If some of the inputs are variants, map those onto new variants (of zips)
       std::tuple const in{detail::Combiner::invoke_or_visit_returning_variant(
-          []( auto const& raw ) { return LHCb::v2::Event::ZipCompat::make_zip<Backend>( raw ); }, raw_in )...};
+          []( auto const& raw ) { return LHCb::Event::ZipCompat::make_zip<Backend>( raw ); }, raw_in )...};
 
       // Prepare the output storage
       auto const memResource = LHCb::getMemResource( evtCtx );
@@ -657,7 +657,7 @@ namespace ThOr {
       // cut is applied to a 2-track combination and so on.
       std::tuple<std::array<std::array<int, buffer_depth>, ICombinationCuts + 2>...> combination_indices{};
 
-      auto tmp_storage_view = LHCb::v2::Event::make_zip<Backend>( tmp_storage );
+      auto tmp_storage_view = LHCb::Event::make_zip<Backend>( tmp_storage );
       // Lambda that handles N-body combinations once we've got that far
       // `mask`: validity of the following arguments
       // `indices`: indices into the input containers of the members of this
diff --git a/Phys/ParticleCombiners/src/Dumper.cpp b/Phys/ParticleCombiners/src/Dumper.cpp
index f1c19f08c92d7464d38cf25c8369ab66ee29ddb6..373cd2df37beb3b57b94c636c84df7a536087c4d 100644
--- a/Phys/ParticleCombiners/src/Dumper.cpp
+++ b/Phys/ParticleCombiners/src/Dumper.cpp
@@ -23,6 +23,6 @@ namespace Dumping::details {
 } // namespace Dumping::details
 
 using LegacyParticlePropertyDumper = Dumping::DumpContainer<std::vector<LHCb::Particle>, true>;
-DECLARE_COMPONENT_WITH_ID( Dumping::DumpContainer<LHCb::v2::Composites>, "CompositePropertyDumper" )
-DECLARE_COMPONENT_WITH_ID( Dumping::DumpContainer<LHCb::v2::ChargedBasics>, "BasicsPropertyDumper" )
+DECLARE_COMPONENT_WITH_ID( Dumping::DumpContainer<LHCb::Event::Composites>, "CompositePropertyDumper" )
+DECLARE_COMPONENT_WITH_ID( Dumping::DumpContainer<LHCb::Event::ChargedBasics>, "BasicsPropertyDumper" )
 DECLARE_COMPONENT_WITH_ID( LegacyParticlePropertyDumper, "LegacyParticlePropertyDumper" )
diff --git a/Phys/ParticleCombiners/src/Filter.cpp b/Phys/ParticleCombiners/src/Filter.cpp
index c3ace70b4d0078282a5df5b3db828682745e38c1..970305a831ef7abc5d774bee511927402ba00bde 100644
--- a/Phys/ParticleCombiners/src/Filter.cpp
+++ b/Phys/ParticleCombiners/src/Filter.cpp
@@ -30,6 +30,6 @@ namespace LHCb {
   };
 } // namespace LHCb
 
-DECLARE_COMPONENT_WITH_ID( Pr::Filter<LHCb::v2::ChargedBasics>, "ChargedBasicsFilter" )
+DECLARE_COMPONENT_WITH_ID( Pr::Filter<LHCb::Event::ChargedBasics>, "ChargedBasicsFilter" )
 
 DECLARE_COMPONENT_WITH_ID( Pr::Filter<LHCb::Particle::Range>, "ParticleRangeFilter" )
diff --git a/Phys/ParticleCombiners/src/ThOrCombiner_ChargedBasics.cpp b/Phys/ParticleCombiners/src/ThOrCombiner_ChargedBasics.cpp
index ee8752d1b5293071794b40c569a7deb2b30d6144..2ca1b57d333909fa5c22523df2276318ad787432 100644
--- a/Phys/ParticleCombiners/src/ThOrCombiner_ChargedBasics.cpp
+++ b/Phys/ParticleCombiners/src/ThOrCombiner_ChargedBasics.cpp
@@ -12,11 +12,11 @@
 
 #include "Event/Particle_v2.h"
 
-using ThOrCombiner__2ChargedBasics = ThOr::CombinerBest<LHCb::v2::ChargedBasics, LHCb::v2::ChargedBasics>;
+using ThOrCombiner__2ChargedBasics = ThOr::CombinerBest<LHCb::Event::ChargedBasics, LHCb::Event::ChargedBasics>;
 using ThOrCombiner__3ChargedBasics =
-    ThOr::CombinerBest<LHCb::v2::ChargedBasics, LHCb::v2::ChargedBasics, LHCb::v2::ChargedBasics>;
-using ThOrCombiner__4ChargedBasics = ThOr::CombinerBest<LHCb::v2::ChargedBasics, LHCb::v2::ChargedBasics,
-                                                        LHCb::v2::ChargedBasics, LHCb::v2::ChargedBasics>;
+    ThOr::CombinerBest<LHCb::Event::ChargedBasics, LHCb::Event::ChargedBasics, LHCb::Event::ChargedBasics>;
+using ThOrCombiner__4ChargedBasics = ThOr::CombinerBest<LHCb::Event::ChargedBasics, LHCb::Event::ChargedBasics,
+                                                        LHCb::Event::ChargedBasics, LHCb::Event::ChargedBasics>;
 
 DECLARE_COMPONENT_WITH_ID( ThOrCombiner__2ChargedBasics, "ThOrCombiner__2ChargedBasics" )
 DECLARE_COMPONENT_WITH_ID( ThOrCombiner__3ChargedBasics, "ThOrCombiner__3ChargedBasics" )
diff --git a/Phys/ParticleCombiners/src/ThOrCombiner_Composites.cpp b/Phys/ParticleCombiners/src/ThOrCombiner_Composites.cpp
index 4978d44bea470e23bce17bea7b73750e9b4f160d..b90e62625d7ec637faf684497e096c43d9fd3448 100644
--- a/Phys/ParticleCombiners/src/ThOrCombiner_Composites.cpp
+++ b/Phys/ParticleCombiners/src/ThOrCombiner_Composites.cpp
@@ -12,11 +12,12 @@
 
 #include "Event/Particle_v2.h"
 
-using ThOrCombiner__CompositesChargedBasics = ThOr::CombinerBest<LHCb::v2::Composites, LHCb::v2::ChargedBasics>;
+using ThOrCombiner__CompositesChargedBasics = ThOr::CombinerBest<LHCb::Event::Composites, LHCb::Event::ChargedBasics>;
 using ThOrCombiner__Composites2ChargedBasics =
-    ThOr::CombinerBest<LHCb::v2::Composites, LHCb::v2::ChargedBasics, LHCb::v2::ChargedBasics>;
+    ThOr::CombinerBest<LHCb::Event::Composites, LHCb::Event::ChargedBasics, LHCb::Event::ChargedBasics>;
 using ThOrCombiner__Composites3ChargedBasics =
-    ThOr::CombinerBest<LHCb::v2::Composites, LHCb::v2::ChargedBasics, LHCb::v2::ChargedBasics, LHCb::v2::ChargedBasics>;
+    ThOr::CombinerBest<LHCb::Event::Composites, LHCb::Event::ChargedBasics, LHCb::Event::ChargedBasics,
+                       LHCb::Event::ChargedBasics>;
 
 DECLARE_COMPONENT_WITH_ID( ThOrCombiner__CompositesChargedBasics, "ThOrCombiner__CompositesChargedBasics" )
 DECLARE_COMPONENT_WITH_ID( ThOrCombiner__Composites2ChargedBasics, "ThOrCombiner__Composites2ChargedBasics" )
diff --git a/Phys/ParticleCombiners/src/ThOrCombiner_Particles.cpp b/Phys/ParticleCombiners/src/ThOrCombiner_Particles.cpp
index 74167f4d5679103d66d0df3aa0117bdd450e4e50..c7fcbc4fbdeec2d05244b00b38ecf04abb1cd3a7 100644
--- a/Phys/ParticleCombiners/src/ThOrCombiner_Particles.cpp
+++ b/Phys/ParticleCombiners/src/ThOrCombiner_Particles.cpp
@@ -14,7 +14,8 @@
 
 template <std::size_t N>
 using ThOrCombiner__NParticle =
-    boost::mp11::mp_apply<ThOr::CombinerBest, boost::mp11::mp_repeat_c<boost::mp11::mp_list<LHCb::v2::Particles>, N>>;
+    boost::mp11::mp_apply<ThOr::CombinerBest,
+                          boost::mp11::mp_repeat_c<boost::mp11::mp_list<LHCb::Event::Particles>, N>>;
 
 DECLARE_COMPONENT_WITH_ID( ThOrCombiner__NParticle<2>, "ThOrCombiner__2Particle" )
 DECLARE_COMPONENT_WITH_ID( ThOrCombiner__NParticle<3>, "ThOrCombiner__3Particle" )
diff --git a/Phys/ParticleCombiners/src/ThOrCombiner_SSE_ChargedBasics.cpp b/Phys/ParticleCombiners/src/ThOrCombiner_SSE_ChargedBasics.cpp
index 9e743e771767392039241c687629748201a4c874..f809955c9be8a1569c04262f840ccc748488e5c9 100644
--- a/Phys/ParticleCombiners/src/ThOrCombiner_SSE_ChargedBasics.cpp
+++ b/Phys/ParticleCombiners/src/ThOrCombiner_SSE_ChargedBasics.cpp
@@ -12,11 +12,11 @@
 
 #include "Event/Particle_v2.h"
 
-using ThOrCombinerSSE__2ChargedBasics = ThOr::CombinerSSE<LHCb::v2::ChargedBasics, LHCb::v2::ChargedBasics>;
+using ThOrCombinerSSE__2ChargedBasics = ThOr::CombinerSSE<LHCb::Event::ChargedBasics, LHCb::Event::ChargedBasics>;
 using ThOrCombinerSSE__3ChargedBasics =
-    ThOr::CombinerSSE<LHCb::v2::ChargedBasics, LHCb::v2::ChargedBasics, LHCb::v2::ChargedBasics>;
-using ThOrCombinerSSE__4ChargedBasics = ThOr::CombinerSSE<LHCb::v2::ChargedBasics, LHCb::v2::ChargedBasics,
-                                                          LHCb::v2::ChargedBasics, LHCb::v2::ChargedBasics>;
+    ThOr::CombinerSSE<LHCb::Event::ChargedBasics, LHCb::Event::ChargedBasics, LHCb::Event::ChargedBasics>;
+using ThOrCombinerSSE__4ChargedBasics = ThOr::CombinerSSE<LHCb::Event::ChargedBasics, LHCb::Event::ChargedBasics,
+                                                          LHCb::Event::ChargedBasics, LHCb::Event::ChargedBasics>;
 
 DECLARE_COMPONENT_WITH_ID( ThOrCombinerSSE__2ChargedBasics, "ThOrCombinerSSE__2ChargedBasics" )
 DECLARE_COMPONENT_WITH_ID( ThOrCombinerSSE__3ChargedBasics, "ThOrCombinerSSE__3ChargedBasics" )
diff --git a/Phys/ParticleCombiners/src/ThOrCombiner_SSE_Composites.cpp b/Phys/ParticleCombiners/src/ThOrCombiner_SSE_Composites.cpp
index 1bce66ce8b515993f18efe0793fe358bcaa92083..44a09374084784203a8aca661f2e2e71655d26f0 100644
--- a/Phys/ParticleCombiners/src/ThOrCombiner_SSE_Composites.cpp
+++ b/Phys/ParticleCombiners/src/ThOrCombiner_SSE_Composites.cpp
@@ -12,11 +12,12 @@
 
 #include "Event/Particle_v2.h"
 
-using ThOrCombinerSSE__CompositesChargedBasics = ThOr::CombinerSSE<LHCb::v2::Composites, LHCb::v2::ChargedBasics>;
+using ThOrCombinerSSE__CompositesChargedBasics = ThOr::CombinerSSE<LHCb::Event::Composites, LHCb::Event::ChargedBasics>;
 using ThOrCombinerSSE__Composites2ChargedBasics =
-    ThOr::CombinerSSE<LHCb::v2::Composites, LHCb::v2::ChargedBasics, LHCb::v2::ChargedBasics>;
+    ThOr::CombinerSSE<LHCb::Event::Composites, LHCb::Event::ChargedBasics, LHCb::Event::ChargedBasics>;
 using ThOrCombinerSSE__Composites3ChargedBasics =
-    ThOr::CombinerSSE<LHCb::v2::Composites, LHCb::v2::ChargedBasics, LHCb::v2::ChargedBasics, LHCb::v2::ChargedBasics>;
+    ThOr::CombinerSSE<LHCb::Event::Composites, LHCb::Event::ChargedBasics, LHCb::Event::ChargedBasics,
+                      LHCb::Event::ChargedBasics>;
 
 DECLARE_COMPONENT_WITH_ID( ThOrCombinerSSE__CompositesChargedBasics, "ThOrCombinerSSE__CompositesChargedBasics" )
 DECLARE_COMPONENT_WITH_ID( ThOrCombinerSSE__Composites2ChargedBasics, "ThOrCombinerSSE__Composites2ChargedBasics" )
diff --git a/Phys/ParticleCombiners/src/ThOrCombiner_Scalar_ChargedBasics.cpp b/Phys/ParticleCombiners/src/ThOrCombiner_Scalar_ChargedBasics.cpp
index 1a4100af104b7792c45caaf03ccebe714f4e938d..a1b021e9b2dc9ff9b86dae193ec68ed9f522010c 100644
--- a/Phys/ParticleCombiners/src/ThOrCombiner_Scalar_ChargedBasics.cpp
+++ b/Phys/ParticleCombiners/src/ThOrCombiner_Scalar_ChargedBasics.cpp
@@ -12,11 +12,11 @@
 
 #include "Event/Particle_v2.h"
 
-using ThOrCombinerScalar__2ChargedBasics = ThOr::CombinerScalar<LHCb::v2::ChargedBasics, LHCb::v2::ChargedBasics>;
+using ThOrCombinerScalar__2ChargedBasics = ThOr::CombinerScalar<LHCb::Event::ChargedBasics, LHCb::Event::ChargedBasics>;
 using ThOrCombinerScalar__3ChargedBasics =
-    ThOr::CombinerScalar<LHCb::v2::ChargedBasics, LHCb::v2::ChargedBasics, LHCb::v2::ChargedBasics>;
-using ThOrCombinerScalar__4ChargedBasics = ThOr::CombinerScalar<LHCb::v2::ChargedBasics, LHCb::v2::ChargedBasics,
-                                                                LHCb::v2::ChargedBasics, LHCb::v2::ChargedBasics>;
+    ThOr::CombinerScalar<LHCb::Event::ChargedBasics, LHCb::Event::ChargedBasics, LHCb::Event::ChargedBasics>;
+using ThOrCombinerScalar__4ChargedBasics = ThOr::CombinerScalar<LHCb::Event::ChargedBasics, LHCb::Event::ChargedBasics,
+                                                                LHCb::Event::ChargedBasics, LHCb::Event::ChargedBasics>;
 
 DECLARE_COMPONENT_WITH_ID( ThOrCombinerScalar__2ChargedBasics, "ThOrCombinerScalar__2ChargedBasics" )
 DECLARE_COMPONENT_WITH_ID( ThOrCombinerScalar__3ChargedBasics, "ThOrCombinerScalar__3ChargedBasics" )
diff --git a/Phys/ParticleCombiners/src/ThOrCombiner_Scalar_Composites.cpp b/Phys/ParticleCombiners/src/ThOrCombiner_Scalar_Composites.cpp
index c16ee1cc0dda17a31e1b7dd199fada60bca94d13..471d3fc7a5db3f6a8600371db3223514b71c2b98 100644
--- a/Phys/ParticleCombiners/src/ThOrCombiner_Scalar_Composites.cpp
+++ b/Phys/ParticleCombiners/src/ThOrCombiner_Scalar_Composites.cpp
@@ -12,12 +12,13 @@
 
 #include "Event/Particle_v2.h"
 
-using ThOrCombinerScalar__CompositesChargedBasics = ThOr::CombinerScalar<LHCb::v2::Composites, LHCb::v2::ChargedBasics>;
+using ThOrCombinerScalar__CompositesChargedBasics =
+    ThOr::CombinerScalar<LHCb::Event::Composites, LHCb::Event::ChargedBasics>;
 using ThOrCombinerScalar__Composites2ChargedBasics =
-    ThOr::CombinerScalar<LHCb::v2::Composites, LHCb::v2::ChargedBasics, LHCb::v2::ChargedBasics>;
+    ThOr::CombinerScalar<LHCb::Event::Composites, LHCb::Event::ChargedBasics, LHCb::Event::ChargedBasics>;
 using ThOrCombinerScalar__Composites3ChargedBasics =
-    ThOr::CombinerScalar<LHCb::v2::Composites, LHCb::v2::ChargedBasics, LHCb::v2::ChargedBasics,
-                         LHCb::v2::ChargedBasics>;
+    ThOr::CombinerScalar<LHCb::Event::Composites, LHCb::Event::ChargedBasics, LHCb::Event::ChargedBasics,
+                         LHCb::Event::ChargedBasics>;
 
 DECLARE_COMPONENT_WITH_ID( ThOrCombinerScalar__CompositesChargedBasics, "ThOrCombinerScalar__CompositesChargedBasics" )
 DECLARE_COMPONENT_WITH_ID( ThOrCombinerScalar__Composites2ChargedBasics,
diff --git a/Phys/ParticleCombiners/tests/src/test_thor_combiner.cpp b/Phys/ParticleCombiners/tests/src/test_thor_combiner.cpp
index d8d186bf10a5aa5a4b428a743a0a5880aa5c637d..dee0f5b3e6977397d4d8c24d575a6bd62ddd06f2 100644
--- a/Phys/ParticleCombiners/tests/src/test_thor_combiner.cpp
+++ b/Phys/ParticleCombiners/tests/src/test_thor_combiner.cpp
@@ -38,13 +38,13 @@ struct is_tracklike : std::false_type {};
 template <SIMDWrapper::InstructionSet Arch, LHCb::Pr::ProxyBehaviour Behaviour, class... T>
 struct is_tracklike<LHCb::Pr::detail::proxy_type<Arch, Behaviour, T...>>
     : std::conditional_t<
-          Sel::Utils::details::contains<std::decay_t<LHCb::v2::Event::Tracks>, std::decay_t<T>...>::value,
+          Sel::Utils::details::contains<std::decay_t<LHCb::Event::v3::Tracks>, std::decay_t<T>...>::value,
           std::true_type, std::false_type> {};
 
 template <SIMDWrapper::InstructionSet Arch, class... T>
 struct is_tracklike<LHCb::Pr::Zip<Arch, T...>>
     : std::conditional_t<
-          Sel::Utils::details::contains<std::decay_t<LHCb::v2::Event::Tracks>, std::decay_t<T>...>::value,
+          Sel::Utils::details::contains<std::decay_t<LHCb::Event::v3::Tracks>, std::decay_t<T>...>::value,
           std::true_type, std::false_type> {};
 
 template <typename T>
@@ -75,8 +75,8 @@ std::size_t num_unique_ids( [[maybe_unused]] T const& arg ) {
     return 1;
   } else {
     // TODO: somehow implement and use is_proxy?
-    if constexpr ( LHCb::v2::Event::is_zip_v<T> ) {
-      return arg.template get<LHCb::v2::Composites>().numDescendants();
+    if constexpr ( LHCb::Event::is_zip_v<T> ) {
+      return arg.template get<LHCb::Event::Composites>().numDescendants();
     } else
       return arg.numDescendants();
   }
@@ -320,12 +320,12 @@ auto make_combination_accessors( Zip&... zip ) {
   return combination_accessors<Zip...>( zip... );
 }
 
-// Fill a LHCb::v2::Composites object from a set of zip containers
+// Fill a LHCb::Event::Composites object from a set of zip containers
 template <std::size_t I, std::size_t Stop>
 struct make_composites_t {
 
   template <class... P, class... Z>
-  void operator()( LHCb::v2::Composites& result, proxy_pack<P...> const& proxies,
+  void operator()( LHCb::Event::Composites& result, proxy_pack<P...> const& proxies,
                    combination_accessors<Z...>&& accessors ) const {
 
     using accessor_type =
@@ -362,7 +362,7 @@ template <std::size_t I>
 struct make_composites_t<I, I> {
 
   template <class... P, class... Z>
-  void operator()( LHCb::v2::Composites& result, proxy_pack<P...> const& proxies,
+  void operator()( LHCb::Event::Composites& result, proxy_pack<P...> const& proxies,
                    combination_accessors<Z...>&& ) const {
 
     result.emplace_back( LHCb::LinAlg::Vec<float_v, 3>{},                             // position
@@ -382,9 +382,9 @@ struct make_composites_t<I, I> {
 
 // Create composites from zip containers representing particle objects
 template <class... Z>
-std::enable_if_t<( sizeof...( Z ) > 1 ), LHCb::v2::Composites>
+std::enable_if_t<( sizeof...( Z ) > 1 ), LHCb::Event::Composites>
 make_composites( LHCb::UniqueIDGenerator const& unique_id_gen, Z const&... z ) {
-  LHCb::v2::Composites result( sizeof...( Z ), ( num_unique_ids( z ) + ... ), unique_id_gen );
+  LHCb::Event::Composites result( sizeof...( Z ), ( num_unique_ids( z ) + ... ), unique_id_gen );
   make_composites_t<0, sizeof...( Z )>{}( result, proxy_pack<>{}, make_combination_accessors( z... ) );
   return result;
 }
@@ -401,16 +401,16 @@ auto generate_particles( std::size_t n_elements, LHCb::UniqueIDGenerator const&
   auto zn = Zipping::generateZipIdentifier();
 
   auto tracks =
-      std::make_unique<LHCb::v2::Event::Tracks>( LHCb::v2::Event::generate_tracks( n_elements, unique_id_gen, 1, zn ) );
-  auto rich_pids = std::make_unique<LHCb::v2::RichPIDs>( zn );
+      std::make_unique<LHCb::Event::v3::Tracks>( LHCb::Event::v3::generate_tracks( n_elements, unique_id_gen, 1, zn ) );
+  auto rich_pids = std::make_unique<LHCb::Event::v2::RichPIDs>( zn );
   rich_pids->reserve( n_elements );
   auto muon_pids = std::make_unique<LHCb::Pr::Muon::PIDs>( zn );
   muon_pids->reserve( n_elements );
-  auto masses = std::make_unique<LHCb::v2::AssignedMasses>( zn );
+  auto masses = std::make_unique<LHCb::Event::AssignedMasses>( zn );
   masses->reserve( n_elements );
-  auto particle_ids = std::make_unique<LHCb::v2::ParticleIDs>( zn );
+  auto particle_ids = std::make_unique<LHCb::Event::ParticleIDs>( zn );
   particle_ids->reserve( n_elements );
-  auto combdlls = std::make_unique<LHCb::v2::CombDLLs>( zn );
+  auto combdlls = std::make_unique<LHCb::Event::CombDLLs>( zn );
   combdlls->reserve( n_elements );
 
   for ( auto i = 0u; i < n_elements; ++i ) {
@@ -479,13 +479,13 @@ BOOST_AUTO_TEST_CASE( test_thor_combiner ) {
   auto C2p = make_composites( unique_id_gen, particles, particles );
   std::cout << "descendants 2: " << C2p.numDescendants() << std::endl;
   test_case( "[p, p]", C2p.size(), combinations( particles.size(), 2 ) );
-  auto zC2p = LHCb::v2::Event::make_zip<SIMDWrapper::InstructionSet::Scalar>( C2p );
+  auto zC2p = LHCb::Event::make_zip<SIMDWrapper::InstructionSet::Scalar>( C2p );
 
   // [p, p, p]
   auto C3p = make_composites( unique_id_gen, particles, particles, particles );
   std::cout << "descendants 3: " << C3p.numDescendants() << std::endl;
   test_case( "[p, p, p]", C3p.size(), combinations( particles.size(), 3 ) );
-  auto zC3p = LHCb::v2::Event::make_zip<SIMDWrapper::InstructionSet::Scalar>( C3p );
+  auto zC3p = LHCb::Event::make_zip<SIMDWrapper::InstructionSet::Scalar>( C3p );
 
   // [C(2p), p]
   auto C2p_p = make_composites( unique_id_gen, zC2p, particles );
@@ -508,7 +508,7 @@ BOOST_AUTO_TEST_CASE( test_thor_combiner ) {
   // [C(2p), C(2p), p]
   auto C2p_C2p_p = make_composites( unique_id_gen, zC2p, zC2p, particles );
   test_case( "[C(2p), C(2p), p]", C2p_C2p_p.size(), C2p_C2p.size() * ( particles.size() - 4 ) );
-  auto zC2p_C2p_p = LHCb::v2::Event::make_zip<SIMDWrapper::InstructionSet::Scalar>( C2p_C2p_p );
+  auto zC2p_C2p_p = LHCb::Event::make_zip<SIMDWrapper::InstructionSet::Scalar>( C2p_C2p_p );
 
   /* TODO:
      Is there any formula to determine the hardcoded numbers? So far they
diff --git a/Phys/ParticleConverters/src/Particle_to_Particle_v2.cpp b/Phys/ParticleConverters/src/Particle_to_Particle_v2.cpp
index 2f1a2cfa2ef32b177b9255c7a9dbba8fe0068b07..42eb98f18b4c127e443fd0f1592a59efb7be0cff 100644
--- a/Phys/ParticleConverters/src/Particle_to_Particle_v2.cpp
+++ b/Phys/ParticleConverters/src/Particle_to_Particle_v2.cpp
@@ -15,9 +15,9 @@
 #include "Event/Particle_v2.h"
 #include "Event/ProtoParticle.h"
 #include "Event/SOATrackConversion.h"
-#include "Event/Track_SOA.h"
 #include "Event/Track_v1.h"
 #include "Event/Track_v2.h"
+#include "Event/Track_v3.h"
 #include "Event/UniqueIDGenerator.h"
 #include "Event/ZipUtils.h"
 #include "Kernel/IParticle2State.h"
@@ -26,14 +26,12 @@
 #include "Kernel/ParticleProperty.h"
 #include "TrackInterfaces/ITrackSelector.h"
 
-using namespace LHCb::v2;
+namespace MuonTag = LHCb::Pr::Muon::Tag;
 
-namespace TrackTag = LHCb::v2::Event::Tag;
-namespace MuonTag  = LHCb::Pr::Muon::Tag;
-
-using output_t = std::tuple<ChargedBasics, std::unique_ptr<AssignedMasses>, std::unique_ptr<RichPIDs>,
-                            std::unique_ptr<LHCb::Pr::Muon::PIDs>, std::unique_ptr<ParticleIDs>,
-                            std::unique_ptr<LHCb::v2::Event::Tracks>, std::unique_ptr<CombDLLs>>;
+using output_t = std::tuple<LHCb::Event::ChargedBasics, std::unique_ptr<LHCb::Event::AssignedMasses>,
+                            std::unique_ptr<LHCb::Event::v2::RichPIDs>, std::unique_ptr<LHCb::Pr::Muon::PIDs>,
+                            std::unique_ptr<LHCb::Event::ParticleIDs>, std::unique_ptr<LHCb::Event::v3::Tracks>,
+                            std::unique_ptr<LHCb::Event::CombDLLs>>;
 
 class Proto2ChargedBasic : public Gaudi::Functional::MultiTransformer<output_t( LHCb::ProtoParticles const&,
                                                                                 LHCb::UniqueIDGenerator const& )> {
@@ -74,13 +72,13 @@ public:
   output_t operator()( LHCb::ProtoParticles const&    protos,
                        LHCb::UniqueIDGenerator const& unique_id_gen ) const override {
     auto zn           = Zipping::generateZipIdentifier();
-    auto masses       = std::make_unique<AssignedMasses>( zn );
-    auto rich_pids    = std::make_unique<RichPIDs>( zn );
+    auto masses       = std::make_unique<LHCb::Event::AssignedMasses>( zn );
+    auto rich_pids    = std::make_unique<LHCb::Event::v2::RichPIDs>( zn );
     auto muon_pids    = std::make_unique<LHCb::Pr::Muon::PIDs>( zn );
-    auto particle_ids = std::make_unique<ParticleIDs>( zn );
+    auto particle_ids = std::make_unique<LHCb::Event::ParticleIDs>( zn );
     auto tracks =
-        std::make_unique<LHCb::v2::Event::Tracks>( LHCb::v2::Event::TrackType::Long, unique_id_gen, zn, nullptr );
-    auto combdlls       = std::make_unique<CombDLLs>( zn );
+        std::make_unique<LHCb::Event::v3::Tracks>( LHCb::Event::v3::TrackType::Long, unique_id_gen, zn, nullptr );
+    auto combdlls       = std::make_unique<LHCb::Event::CombDLLs>( zn );
     int  nparticles     = 0;
     int  nantiparticles = 0;
 
@@ -138,8 +136,7 @@ public:
         { // tracks
           auto const* track    = proto->track();
           auto        outTrack = tracks->emplace_back<SIMDWrapper::InstructionSet::Scalar>();
-          LHCb::v2::Event::conversion::convert_track( LHCb::v2::Event::TrackType::Long, outTrack, track,
-                                                      unique_id_gen );
+          LHCb::Event::conversion::convert_track( LHCb::Event::v3::TrackType::Long, outTrack, track, unique_id_gen );
         }
 
         // combdlls
diff --git a/Phys/VertexFit/include/VertexFit/ParticleVertexFitter.h b/Phys/VertexFit/include/VertexFit/ParticleVertexFitter.h
index e6c0d6ea03e3ccd58a1b772875bc8f9a0de14e24..08f7e5633ba81cfd4532408aebdc89d71dd8576c 100644
--- a/Phys/VertexFit/include/VertexFit/ParticleVertexFitter.h
+++ b/Phys/VertexFit/include/VertexFit/ParticleVertexFitter.h
@@ -15,7 +15,7 @@
 #include "SelTools/Utilities.h"
 
 #include "Event/Particle_v2.h"
-#include "Event/Track_SOA.h"
+#include "Event/Track_v3.h"
 #include "Event/UniqueIDGenerator.h"
 #include "Kernel/IParticlePropertySvc.h"
 #include "LHCbMath/MatVec.h"
@@ -31,7 +31,6 @@ namespace Sel::Fitters {
    *  3 event model types.
    *  See: https://surfdrive.surf.nl/files/index.php/s/Z0mVdKL9PFfnXnR
    */
-  using LHCb::v2::Event::StateLocation;
   using Sel::Utils::has_tracklike_API;
   struct ParticleVertex {
     ParticleVertex( Gaudi::Algorithm* owning_algorithm )
@@ -40,7 +39,7 @@ namespace Sel::Fitters {
     /** Interface for use by particle combiner algorithms.
      */
     template <typename mask_v, typename int_v, typename... child_ts>
-    mask_v fitComposite( LHCb::v2::Composites& storage, mask_v const& mask, int_v const& new_particle_ids,
+    mask_v fitComposite( LHCb::Event::Composites& storage, mask_v const& mask, int_v const& new_particle_ids,
                          Sel::ParticleCombination<child_ts...> children ) const {
       return fitComposite( storage, mask, new_particle_ids, children, std::index_sequence_for<child_ts...>{} );
     }
@@ -452,7 +451,7 @@ namespace Sel::Fitters {
         assert( type == ChildType::TrackWithVelo || type == ChildType::TrackWithoutVelo );
         using VertexTrack =
             VertexTraj<child_t, false /* flag this represents a track not a weakly-decaying composite */>;
-        return VertexTrack{child, child.state( StateLocation::ClosestToBeam )};
+        return VertexTrack{child, child.state( child_t::StateLocation::ClosestToBeam )};
       }
     };
 
@@ -669,9 +668,11 @@ namespace Sel::Fitters {
                   using child_t = std::decay_t<decltype( child )>;
                   if ( types[i] == ChildType::TrackWithVelo ) {
                     if constexpr ( Sel::Utils::has_tracklike_API<child_t> ) {
-                      velotrajs[nvelotrajs++] = StateVector4<float_v>{child.state( StateLocation::ClosestToBeam )};
+                      velotrajs[nvelotrajs++] =
+                          StateVector4<float_v>{child.state( child_t::StateLocation::ClosestToBeam )};
                     } else {
-                      throw exception( "TrackWithVelo type didn't have a state(StateLocation::ClosestToBeam)" );
+                      throw exception(
+                          "TrackWithVelo type didn't have a state( child_t::StateLocation::ClosestToBeam)" );
                     }
                   } else if ( types[i] == ChildType::Composite ) {
                     if constexpr ( Sel::type_traits::has_endVertex_v<child_t> &&
@@ -722,7 +723,7 @@ namespace Sel::Fitters {
      *  @todo Consider whether we should emplace to `storage` if all fits fail
      */
     template <typename mask_v, typename int_v, typename... child_ts, std::size_t... IChild>
-    mask_v fitComposite( LHCb::v2::Composites& storage, mask_v const& mask, int_v const& new_particle_ids,
+    mask_v fitComposite( LHCb::Event::Composites& storage, mask_v const& mask, int_v const& new_particle_ids,
                          Sel::ParticleCombination<child_ts...> children, std::index_sequence<IChild...> ) const {
       // Some boilerplate/sanity checking
       using simd_ts = boost::mp11::mp_unique<boost::mp11::mp_transform<