diff --git a/PWGJE/DataModel/JetSubstructure.h b/PWGJE/DataModel/JetSubstructure.h
index 7de1c175c12..8ea838bda5a 100644
--- a/PWGJE/DataModel/JetSubstructure.h
+++ b/PWGJE/DataModel/JetSubstructure.h
@@ -72,14 +72,14 @@ DECLARE_SOA_COLUMN(JetNConstituents, jetNConstituents, int); //!
                                                                                                                                                                                                                                                                                                                                                                                               \
   namespace _name_##jetoutput                                                                                                                                                                                                                                                                                                                                                                 \
   {                                                                                                                                                                                                                                                                                                                                                                                           \
-    DECLARE_SOA_INDEX_COLUMN_CUSTOM(_jet_type_##CO, collision, _jet_description_ "CO");                                                                                                                                                                                                                                                                                                       \
-    DECLARE_SOA_INDEX_COLUMN_FULL_CUSTOM(Candidate, candidate, int, _cand_type_, _cand_description_, "_0");                                                                                                                                                                                                                                                                                   \
+    DECLARE_SOA_INDEX_COLUMN_CUSTOM(_jet_type_##CO, collision, _jet_description_ "COS");                                                                                                                                                                                                                                                                                                      \
+    DECLARE_SOA_INDEX_COLUMN_FULL_CUSTOM(Candidate, candidate, int, _cand_type_, _cand_description_ "S", "_0");                                                                                                                                                                                                                                                                               \
   }                                                                                                                                                                                                                                                                                                                                                                                           \
   DECLARE_SOA_TABLE(_jet_type_##Os, "AOD", _jet_description_ "O", _name_##jetoutput::_jet_type_##COId, _name_##jetoutput::CandidateId, jetoutput::JetPt, jetoutput::JetPhi, jetoutput::JetEta, jetoutput::JetY, jetoutput::JetR, jetoutput::JetNConstituents);                                                                                                                                \
   using _jet_type_##O = _jet_type_##Os::iterator;                                                                                                                                                                                                                                                                                                                                             \
   namespace _name_##substructure                                                                                                                                                                                                                                                                                                                                                              \
   {                                                                                                                                                                                                                                                                                                                                                                                           \
-    DECLARE_SOA_INDEX_COLUMN_CUSTOM(_jet_type_##O, outputTable, _jet_description_ "O");                                                                                                                                                                                                                                                                                                       \
+    DECLARE_SOA_INDEX_COLUMN_CUSTOM(_jet_type_##O, outputTable, _jet_description_ "OS");                                                                                                                                                                                                                                                                                                      \
     DECLARE_SOA_DYNAMIC_COLUMN(Dummy##_jet_type_, dummy##_jet_type_, []() -> int { return 0; });                                                                                                                                                                                                                                                                                              \
   }                                                                                                                                                                                                                                                                                                                                                                                           \
                                                                                                                                                                                                                                                                                                                                                                                               \
@@ -93,17 +93,17 @@ DECLARE_SOA_COLUMN(JetNConstituents, jetNConstituents, int); //!
 #define JETMATCHING_TABLE_DEF(_jet_type_, _matched_jet_type_, _matched_jet_description_, _name_, _description_)                                                                                                                                \
   namespace _name_##geomatched                                                                                                                                                                                                                 \
   {                                                                                                                                                                                                                                            \
-    DECLARE_SOA_ARRAY_INDEX_COLUMN_FULL_CUSTOM(_matched_jet_type_, matchedJetGeo, int32_t, _matched_jet_type_##Os, _matched_jet_description_ "O", "_geo");                                                                                     \
+    DECLARE_SOA_ARRAY_INDEX_COLUMN_FULL_CUSTOM(_matched_jet_type_, matchedJetGeo, int32_t, _matched_jet_type_##Os, _matched_jet_description_ "OS", "_geo");                                                                                    \
   }                                                                                                                                                                                                                                            \
                                                                                                                                                                                                                                                \
   namespace _name_##ptmatched                                                                                                                                                                                                                  \
   {                                                                                                                                                                                                                                            \
-    DECLARE_SOA_ARRAY_INDEX_COLUMN_FULL_CUSTOM(_matched_jet_type_, matchedJetPt, int32_t, _matched_jet_type_##Os, _matched_jet_description_ "O", "_pt");                                                                                       \
+    DECLARE_SOA_ARRAY_INDEX_COLUMN_FULL_CUSTOM(_matched_jet_type_, matchedJetPt, int32_t, _matched_jet_type_##Os, _matched_jet_description_ "OS", "_pt");                                                                                      \
   }                                                                                                                                                                                                                                            \
                                                                                                                                                                                                                                                \
   namespace _name_##candmatched                                                                                                                                                                                                                \
   {                                                                                                                                                                                                                                            \
-    DECLARE_SOA_ARRAY_INDEX_COLUMN_FULL_CUSTOM(_matched_jet_type_, matchedJetCand, int32_t, _matched_jet_type_##Os, _matched_jet_description_ "O", "_hf");                                                                                     \
+    DECLARE_SOA_ARRAY_INDEX_COLUMN_FULL_CUSTOM(_matched_jet_type_, matchedJetCand, int32_t, _matched_jet_type_##Os, _matched_jet_description_ "OS", "_hf");                                                                                    \
   }                                                                                                                                                                                                                                            \
   DECLARE_SOA_TABLE(_jet_type_##MOs, "AOD", _description_ "MO", _name_##substructure::_jet_type_##OId, _name_##geomatched::_matched_jet_type_##Ids, _name_##ptmatched::_matched_jet_type_##Ids, _name_##candmatched::_matched_jet_type_##Ids); \
   using _jet_type_##MO = _jet_type_##MOs::iterator;