diff --git a/tutorials/cont/TListAndSTL.C b/tutorials/cont/TListAndSTL.C
index 2144f56fc43605e3b44b5ce77181e3845cd30bd6..88c12e613ef0f47939e79d8479565e15e8c6b0ee 100644
--- a/tutorials/cont/TListAndSTL.C
+++ b/tutorials/cont/TListAndSTL.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup cont
+/// \ingroup tutorial_cont
 /// This is an example of using TList with STL algoritms in CINT.
 ///
 /// #### Output produced by `.x TListAndSTL.C`
diff --git a/tutorials/eve/MultiView.C b/tutorials/eve/MultiView.C
index 5ec7e8671d363a99aeb170227c52535cae23fe23..2aab5e4e81e4b0fcbccef00f44e3552a7a04ca04 100644
--- a/tutorials/eve/MultiView.C
+++ b/tutorials/eve/MultiView.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup eve
+/// \ingroup tutorial_eve
 /// Multi-view (3d, rphi, rhoz) service class using EVE Window Manager.
 ///
 /// \macro_code
diff --git a/tutorials/eve/SplitGLView.C b/tutorials/eve/SplitGLView.C
index d759b1a7baca6838b9153be1919774eeb6c4e334..101b1f0f4a42f8e159001dfc4363dbba1f326bf9 100644
--- a/tutorials/eve/SplitGLView.C
+++ b/tutorials/eve/SplitGLView.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup eve
+/// \ingroup tutorial_eve
 /// Helper classes for the alice_esd_split.C demo.
 ///
 /// \macro_code
diff --git a/tutorials/eve/alice_esd.C b/tutorials/eve/alice_esd.C
index ed5cf063fecaec8f0a120c9ac4cec57f4beec5ab..3f42be2ad869e85a2c4166b528e55e01c500cb76 100644
--- a/tutorials/eve/alice_esd.C
+++ b/tutorials/eve/alice_esd.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup eve
+/// \ingroup tutorial_eve
 /// Complex example showing ALICE ESD track visualization.
 ///
 ///  alice_esd.C - a simple event-display for ALICE ESD tracks and clusters
diff --git a/tutorials/eve/alice_esd_html_summary.C b/tutorials/eve/alice_esd_html_summary.C
index 6d9c4cdb1bc1d8d6b158e4a2484ffd8d76424ed3..52c534de9477aefcec939df71bd3e185c8602a36 100644
--- a/tutorials/eve/alice_esd_html_summary.C
+++ b/tutorials/eve/alice_esd_html_summary.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup eve
+/// \ingroup tutorial_eve
 /// Html table and event summary for alice_esd.C
 ///
 /// \macro_code
diff --git a/tutorials/eve/alice_esd_split.C b/tutorials/eve/alice_esd_split.C
index 0238dae81ff63626901bfb4313da2b6c283acfed..3c7088044b093e34fd9c2841fe6746040963bc2f 100644
--- a/tutorials/eve/alice_esd_split.C
+++ b/tutorials/eve/alice_esd_split.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup eve
+/// \ingroup tutorial_eve
 /// Complex example showing ALICE ESD visualization in several views.
 ///   alice_esd_split.C - a simple event-display for ALICE ESD tracks and clusters
 ///                       version with several windows in the same workspace
diff --git a/tutorials/eve/alice_vsd.C b/tutorials/eve/alice_vsd.C
index 2af541e2bfbb91fa16ca4e6c341914900992dff0..03c0123d09757b5d1d0ee1a638f846a0e0e9f98c 100644
--- a/tutorials/eve/alice_vsd.C
+++ b/tutorials/eve/alice_vsd.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup eve
+/// \ingroup tutorial_eve
 /// Complex example showing ALICE VSD visualization.
 ///
 ///  alice_vsd.C - a simple event-display for ALICE
diff --git a/tutorials/eve/annotation.C b/tutorials/eve/annotation.C
index e4aef78fe335fc9c4011d5342e932f2d1756e005..9c493b66981ec6caea7cdeb22240439a7df2b76b 100644
--- a/tutorials/eve/annotation.C
+++ b/tutorials/eve/annotation.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup eve
+/// \ingroup tutorial_eve
 /// Demonstrates usage of TGLAnnotation class.
 ///
 /// \image html eve_annotation.png
diff --git a/tutorials/eve/arrow.C b/tutorials/eve/arrow.C
index 606f642b10549bee31f531f6ca943075f0465fba..91092894ebfd402f79c72560783bf0819af2d8ee 100644
--- a/tutorials/eve/arrow.C
+++ b/tutorials/eve/arrow.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup eve
+/// \ingroup tutorial_eve
 /// Demonstrates usage of TEveArrow class.
 ///
 /// \image html eve_arrow.png
diff --git a/tutorials/eve/arrow_standalone.C b/tutorials/eve/arrow_standalone.C
index 5ed7e1381cf3d5919a3789b39ae6a59a8c1013d0..75e5ad68290c3ea2ae093a3933d19106cf9eaf87 100644
--- a/tutorials/eve/arrow_standalone.C
+++ b/tutorials/eve/arrow_standalone.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup eve
+/// \ingroup tutorial_eve
 /// How to use EVE without the standard window.
 /// Type
 ///   `gEve->GetBrowser()->MapWindow()`
diff --git a/tutorials/eve/assembly.C b/tutorials/eve/assembly.C
index c1f1115264eaa4625263c9f91bf97034174b5cb5..724ab073f474e5d54f93a55f1e71be036085609a 100644
--- a/tutorials/eve/assembly.C
+++ b/tutorials/eve/assembly.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup eve
+/// \ingroup tutorial_eve
 /// Geometry detector assembly example
 /// Author: Andrei Gheata
 ///
diff --git a/tutorials/eve/box.C b/tutorials/eve/box.C
index afa08fb2d63086b8253fb4883575b4bc96a606b3..60409ac9d66ada544f75e514618334f65c5b55dc 100644
--- a/tutorials/eve/box.C
+++ b/tutorials/eve/box.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup eve
+/// \ingroup tutorial_eve
 /// Demonstrates usage of TEveBox class.
 ///
 /// \image html eve_box.png
diff --git a/tutorials/eve/boxset.C b/tutorials/eve/boxset.C
index ebf2b5f76ef54f74be6b4df48dd4bd0d8a4543f6..4f790c16ac31e52aa65cd92087e345b02ee75510 100644
--- a/tutorials/eve/boxset.C
+++ b/tutorials/eve/boxset.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup eve
+/// \ingroup tutorial_eve
 /// Demonstrates usage of TEveBoxSet class.
 ///
 /// \image html eve_boxset.png
diff --git a/tutorials/eve/boxset_cones.C b/tutorials/eve/boxset_cones.C
index f64448c809b8e9299514830f2b1ae4ae5d446110..9dad6c5926e1f879550b8f78cfeec09d603aba88 100644
--- a/tutorials/eve/boxset_cones.C
+++ b/tutorials/eve/boxset_cones.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup eve
+/// \ingroup tutorial_eve
 /// Demonstrates usage of 'cone' mode in TEveBoxSet class.
 ///
 /// \image html eve_boxset_cones.png
diff --git a/tutorials/eve/calo_detail.C b/tutorials/eve/calo_detail.C
index 8a65a57c44ad38d3c2e4d03923805bbd9fdfbd5f..dce8d7c1d50093aba6c02beeeae041783853722a 100644
--- a/tutorials/eve/calo_detail.C
+++ b/tutorials/eve/calo_detail.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup eve
+/// \ingroup tutorial_eve
 /// Calorimeter detailed view by using TEveCaloDataVec as data-source.
 /// Demonstrates how to plot calorimeter data with irregular bins.
 ///
diff --git a/tutorials/eve/calorimeters.C b/tutorials/eve/calorimeters.C
index 6b8effd86562e1ef0913a1a6a7505fc187ffc768..b0fc511c32ebd5407a2f227b7f00e18dd78fe5c4 100644
--- a/tutorials/eve/calorimeters.C
+++ b/tutorials/eve/calorimeters.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup eve
+/// \ingroup tutorial_eve
 /// Demonstrates usage of EVE calorimetry classes.
 ///
 /// \image html eve_calorimeters.png
diff --git a/tutorials/eve/camera_restore.C b/tutorials/eve/camera_restore.C
index 3513f7a5550bb7056e265b28af605dfcba3bb7fe..c5648e92e941c95a97893b8938bbfe94dd3f187f 100644
--- a/tutorials/eve/camera_restore.C
+++ b/tutorials/eve/camera_restore.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup eve
+/// \ingroup tutorial_eve
 ///
 /// \macro_code
 ///
diff --git a/tutorials/eve/compound.C b/tutorials/eve/compound.C
index d66ba4032a03289a2292173e667366165c196361..229f0b069f114a055a846ae0c8eca6a2c644f0ae 100644
--- a/tutorials/eve/compound.C
+++ b/tutorials/eve/compound.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup eve
+/// \ingroup tutorial_eve
 /// Demonstrates usage of EVE compound objects - class TEveCompound.
 ///
 /// \image html eve_compound.png
diff --git a/tutorials/eve/csgdemo.C b/tutorials/eve/csgdemo.C
index f61486f15cf2182112b19dcdb6d3ba69fa0b20ad..88941e750c532aa25a6d2f990862f58ded032e87 100644
--- a/tutorials/eve/csgdemo.C
+++ b/tutorials/eve/csgdemo.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup eve
+/// \ingroup tutorial_eve
 /// Combinatorial Solid Geometry example
 ///
 /// Stripped down to demonstrate EVE shape-extracts.
diff --git a/tutorials/eve/geom_alias.C b/tutorials/eve/geom_alias.C
index 255046f093554666b47bb138d051fa840b471f58..89385980d0f5e27489b8b2f8099bc51c11f99bed 100644
--- a/tutorials/eve/geom_alias.C
+++ b/tutorials/eve/geom_alias.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup eve
+/// \ingroup tutorial_eve
 /// Demonstates usage of geometry aliases - merge ALICE ITS with ATLAS MUON.
 ///
 /// \image html eve_geom_alias.png
diff --git a/tutorials/eve/geom_alice_its.C b/tutorials/eve/geom_alice_its.C
index 3365e83ed437504228e7495e92e448c46b0d0de0..5722744821edf04f3986f8d8387cf8c128d67f3b 100644
--- a/tutorials/eve/geom_alice_its.C
+++ b/tutorials/eve/geom_alice_its.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup eve
+/// \ingroup tutorial_eve
 /// Shows geometry of ALICE ITS.
 ///
 /// \image html eve_geom_alice_its.png
diff --git a/tutorials/eve/geom_alice_tpc.C b/tutorials/eve/geom_alice_tpc.C
index b481e66a7110c6368b713213186f4adb32e049d8..d5da1a6b69fdefad23dbad8472b5c6fd0ce4f37c 100644
--- a/tutorials/eve/geom_alice_tpc.C
+++ b/tutorials/eve/geom_alice_tpc.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup eve
+/// \ingroup tutorial_eve
 /// Shows geometry of ALICE TPC.
 ///
 /// \image html eve_geom_alice_tpc.png
diff --git a/tutorials/eve/geom_atlas.C b/tutorials/eve/geom_atlas.C
index decbdf1c3ade74eb334aff2c94a3769bdf306db2..2d75f1c9e7a22d38240244e7cfb8e97bc99f27e7 100644
--- a/tutorials/eve/geom_atlas.C
+++ b/tutorials/eve/geom_atlas.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup eve
+/// \ingroup tutorial_eve
 /// Shows ATLAS geometry.
 ///
 /// \image html eve_geom_atlas.png
diff --git a/tutorials/eve/geom_atlas_playback.C b/tutorials/eve/geom_atlas_playback.C
index 2cabcc9f671ea1ded6e6606dab397834db00be70..eccfda0d42ac6e0734a23a7e634c75785d6a0a99 100644
--- a/tutorials/eve/geom_atlas_playback.C
+++ b/tutorials/eve/geom_atlas_playback.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup eve
+/// \ingroup tutorial_eve
 /// Plays back event-recording of a root session running geom_atlas.C tutorial.
 /// [ Recorded using "new TGRecorder" command. ]
 ///
diff --git a/tutorials/eve/geom_cms.C b/tutorials/eve/geom_cms.C
index 4c28618cafcbe5902c4ed7958bc8386538fa4798..ff5b07369665ceee8b63ecd4194077d46ca939c2 100644
--- a/tutorials/eve/geom_cms.C
+++ b/tutorials/eve/geom_cms.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup eve
+/// \ingroup tutorial_eve
 /// Shows CMS geometry.
 ///
 /// \image html eve_geom_cms.png
diff --git a/tutorials/eve/geom_cms_playback.C b/tutorials/eve/geom_cms_playback.C
index 4a77cc4ebc872ac34192900f87f2df7b35684196..bf772af87226bed898cb3a2705f6b9d456f86a9f 100644
--- a/tutorials/eve/geom_cms_playback.C
+++ b/tutorials/eve/geom_cms_playback.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup eve
+/// \ingroup tutorial_eve
 /// Plays back event-recording of a root session running geom_cms.C tutorial.
 /// [ Recorded using "new TGRecorder" command. ]
 ///
diff --git a/tutorials/eve/geom_cms_stereo.C b/tutorials/eve/geom_cms_stereo.C
index c175ab2c3562e83cf16c59e3e063579eba4f3ec7..808a595202248eeb02cb9cfdbd6ee716746786b8 100644
--- a/tutorials/eve/geom_cms_stereo.C
+++ b/tutorials/eve/geom_cms_stereo.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup eve
+/// \ingroup tutorial_eve
 /// Shows CMS geometry in stereo mode.
 /// This requires quad-buffer support in the OpenGL hardware / driver,
 /// otheriwse a fatal error occurs.
diff --git a/tutorials/eve/geom_default.C b/tutorials/eve/geom_default.C
index b08e29afcddf790907e12f59d255f470cd88fd6f..5ee3489b3f69dd4cca556605adc6a33f38ab5b59 100644
--- a/tutorials/eve/geom_default.C
+++ b/tutorials/eve/geom_default.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup eve
+/// \ingroup tutorial_eve
 /// Demonstrates usage of "Default" geometry alias.
 ///
 /// \image html eve_geom_default.png
diff --git a/tutorials/eve/geom_lhcb.C b/tutorials/eve/geom_lhcb.C
index 1238f7e9c3ee00195566cc0d56e68773c9fcc831..52235df471c24dfff86fe47cb1d56c990affc7f0 100644
--- a/tutorials/eve/geom_lhcb.C
+++ b/tutorials/eve/geom_lhcb.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup eve
+/// \ingroup tutorial_eve
 /// Shows CMS geometry.
 ///
 /// \image html eve_geom_lhcb.png
diff --git a/tutorials/eve/glplot.C b/tutorials/eve/glplot.C
index 5d08afc85e7bc5aacaafada34da2b97b2bd1a8fa..d03bd75a79d49aad09e07c3c6987e910a5705867 100644
--- a/tutorials/eve/glplot.C
+++ b/tutorials/eve/glplot.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup eve
+/// \ingroup tutorial_eve
 /// Preliminary demo for showing Timur's GL plots in EVE.
 /// Author: Matevz Tadel, July 2009
 ///
diff --git a/tutorials/eve/glplot_geom.C b/tutorials/eve/glplot_geom.C
index e67a855b11ce6cb52bba7b0170dd64f87555e615..9123ee673d9dfe2a3b475f6c2b418849031d4c45 100644
--- a/tutorials/eve/glplot_geom.C
+++ b/tutorials/eve/glplot_geom.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup eve
+/// \ingroup tutorial_eve
 /// Demonstrates how to combine Timur's GL plots with other scene elements.
 /// Author: Matevz Tadel, Sept 2009
 ///
diff --git a/tutorials/eve/hierarchical_scene.C b/tutorials/eve/hierarchical_scene.C
index bdf3b4abfd3d26aa85fd3a4e2b05fac630ac92f4..ab14d5f08895467c7b213d7175bc2bd0ca5050ab 100644
--- a/tutorials/eve/hierarchical_scene.C
+++ b/tutorials/eve/hierarchical_scene.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup eve
+/// \ingroup tutorial_eve
 ///
 /// \image html eve_hierarchical_scene.png
 /// \macro_code
diff --git a/tutorials/eve/histobrowser.C b/tutorials/eve/histobrowser.C
index 4e7fcb5e2a59a6553e2b59f40036ed096a7df243..038dda3614b50fefde230df67a937c16ec091347 100644
--- a/tutorials/eve/histobrowser.C
+++ b/tutorials/eve/histobrowser.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup eve
+/// \ingroup tutorial_eve
 /// Demonstates how to use EVE as a histogram browser.
 ///
 /// \image html eve_histobrowser.png
diff --git a/tutorials/eve/jetcone.C b/tutorials/eve/jetcone.C
index db5458c0e91f470e50d9b5c965be539a2f1746d5..ee7c3652c916dc459b618ad701168e8f9dc11edf 100644
--- a/tutorials/eve/jetcone.C
+++ b/tutorials/eve/jetcone.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup eve
+/// \ingroup tutorial_eve
 /// Demonstrates usage of TEveJetCone class.
 ///
 /// \image html eve_jetcone.png
diff --git a/tutorials/eve/lineset.C b/tutorials/eve/lineset.C
index a03b5d3abc55211da89aa4e04dd65568d48468f5..6d71a34faf9af12982c25c7370e32ac42aac0260 100644
--- a/tutorials/eve/lineset.C
+++ b/tutorials/eve/lineset.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup eve
+/// \ingroup tutorial_eve
 /// Demonstrates usage of class TEveStraightLineSet.
 ///
 /// \image html eve_lineset.png
diff --git a/tutorials/eve/overlay_palette.C b/tutorials/eve/overlay_palette.C
index 253a407826bdebbd865311051dd309d6198f3dac..0737a7cb93d4e77657d0ccae0d3a36f9d638a6d8 100644
--- a/tutorials/eve/overlay_palette.C
+++ b/tutorials/eve/overlay_palette.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup eve
+/// \ingroup tutorial_eve
 ///
 /// \macro_code
 ///
diff --git a/tutorials/eve/pack.C b/tutorials/eve/pack.C
index 500eee03a01532ec0677a4036cc61cb534c01e09..42af31630a5ef6aecd8bb073c4ebcff8c75374ad 100644
--- a/tutorials/eve/pack.C
+++ b/tutorials/eve/pack.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup eve
+/// \ingroup tutorial_eve
 /// Demonstrates usage of class TGPack.
 ///
 /// \image html eve_pack.png
diff --git a/tutorials/eve/paramlist.C b/tutorials/eve/paramlist.C
index ee321a97ff3bbe992c997de33a90b9ae09a01b87..ed4094721ca687475683e8265c7e48043fd976c2 100644
--- a/tutorials/eve/paramlist.C
+++ b/tutorials/eve/paramlist.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup eve
+/// \ingroup tutorial_eve
 /// Demonstrates usage of simple configuration via TEveParamList class.
 ///
 /// \macro_code
diff --git a/tutorials/eve/pointset.C b/tutorials/eve/pointset.C
index feed4682f702842b374d975299d3551eed9b0c1a..754a079801d1704dde8b9f587222ce994f42b5a3 100644
--- a/tutorials/eve/pointset.C
+++ b/tutorials/eve/pointset.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup eve
+/// \ingroup tutorial_eve
 /// Demonstrates usage of class TEvePointSet.
 ///
 /// \image html eve_pointset.png
diff --git a/tutorials/eve/projection.C b/tutorials/eve/projection.C
index 7f94c5b0d0837c2a8ebe6a4b90702a9e13d556a1..3c273c1b9af876876732390ff36572eca48b4964 100644
--- a/tutorials/eve/projection.C
+++ b/tutorials/eve/projection.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup eve
+/// \ingroup tutorial_eve
 /// Demonstates usage of automatic 2D projections - class TEveProjectionManager.
 ///
 /// \image html eve_projection.png
diff --git a/tutorials/eve/projection_prescale.C b/tutorials/eve/projection_prescale.C
index 9d37770abb01a3e66f5828d56b2b32f1edf94f7e..553a322e24a0bf4d9e92f69e609667023b1237dd 100644
--- a/tutorials/eve/projection_prescale.C
+++ b/tutorials/eve/projection_prescale.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup eve
+/// \ingroup tutorial_eve
 /// Demonstates usage pre-scaling for automatic 2D projections.
 ///
 /// \image html eve_projection_prescale.png
diff --git a/tutorials/eve/pythia_display.C b/tutorials/eve/pythia_display.C
index 1919b963d0969350f414b2a3a938a4e65d454d23..ea789ba57e13c2a7df022077a4eba15adb7b103f 100644
--- a/tutorials/eve/pythia_display.C
+++ b/tutorials/eve/pythia_display.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup eve
+/// \ingroup tutorial_eve
 /// Demo showing H -> ZZ -> 4 mu generated by Pythia.
 /// Requires libPythia6.
 ///
diff --git a/tutorials/eve/quadset.C b/tutorials/eve/quadset.C
index 137d7dde56e77d3a743698733a2f2f8fec5d154d..f592a946d849ca1da71b9fe3f71a33f63ba8b882 100644
--- a/tutorials/eve/quadset.C
+++ b/tutorials/eve/quadset.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup eve
+/// \ingroup tutorial_eve
 /// Demonstates usage of 2D digit class TEveQuadSet.
 ///
 /// \image html eve_quadset.png
diff --git a/tutorials/eve/selection_sigs.C b/tutorials/eve/selection_sigs.C
index d26a9e82c669d72e274cbd09f3327909b93cbf77..abcd04fc0f3ce0146dae9052e84376720f8bdf98 100644
--- a/tutorials/eve/selection_sigs.C
+++ b/tutorials/eve/selection_sigs.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup eve
+/// \ingroup tutorial_eve
 /// Test signals from TEveSelection class.
 ///
 /// \macro_code
diff --git a/tutorials/eve/show_extract.C b/tutorials/eve/show_extract.C
index 0e4d7dcb3d8a19dc6497f625569c1fe40f14b67d..a8c4909313271266b45abb377b1ee94757ea76a1 100644
--- a/tutorials/eve/show_extract.C
+++ b/tutorials/eve/show_extract.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup eve
+/// \ingroup tutorial_eve
 /// Helper script for showing of extracted / simplified geometries.
 /// By default shows a simplified ALICE geometry.
 ///
diff --git a/tutorials/eve/text.C b/tutorials/eve/text.C
index b8dde16cbd1b7f9a7f6e22cd7fb0b7d8e6232744..ea4ecc271ea3de24d0bf01cd14ee0f61b26246c9 100644
--- a/tutorials/eve/text.C
+++ b/tutorials/eve/text.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup eve
+/// \ingroup tutorial_eve
 /// Demonstrates usage of class TEveText - 2D & 3D text in GL.
 ///
 /// \image html eve_text.png
diff --git a/tutorials/eve/track.C b/tutorials/eve/track.C
index 9330502345f5f5debdb631d9d4c7a7be97fc1087..e5c17da3e98a78473b4ae1bdee02f61622fc1f1e 100644
--- a/tutorials/eve/track.C
+++ b/tutorials/eve/track.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup eve
+/// \ingroup tutorial_eve
 /// Demonstrates usage of TEveTrackPRopagator with different magnetic
 /// field configurations.
 /// Needs to be run in compiled mode.
diff --git a/tutorials/eve/triangleset.C b/tutorials/eve/triangleset.C
index 2f6d37461f3922104c46d80e1a30590af635efd3..6054c347cb9c7271ba4a98b40cf2742bed7160f3 100644
--- a/tutorials/eve/triangleset.C
+++ b/tutorials/eve/triangleset.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup eve
+/// \ingroup tutorial_eve
 /// Demonstrates usage of class TEveTriangleSet.
 ///
 /// \image html eve_triangleset.png
diff --git a/tutorials/eve/view3ds.C b/tutorials/eve/view3ds.C
index 093a8228e7c43fe5cde98d9059ebde0c9dd399de..59dca56527a00c7298c763c1f08410c94e50da02 100644
--- a/tutorials/eve/view3ds.C
+++ b/tutorials/eve/view3ds.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup eve
+/// \ingroup tutorial_eve
 /// Loading and display of basic 3DS models.
 ///
 /// \image html eve_view3ds.png
diff --git a/tutorials/eve/window_manager.C b/tutorials/eve/window_manager.C
index f499055763dbaa54602e3dbdbb0cc8391d1a78ec..45b25a84a7d25e9ca136a0972ee0004e9fbd18de 100644
--- a/tutorials/eve/window_manager.C
+++ b/tutorials/eve/window_manager.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup eve
+/// \ingroup tutorial_eve
 /// Demonstrates usage of EVE window-manager.
 ///
 /// \image html eve_window_manager.png
diff --git a/tutorials/graphics/analyze.C b/tutorials/graphics/analyze.C
index 46da3856ea7bbe7fccd795baeb21f97c1f8a1645..8848b458b34205d99a1cd94ac781aa128853da20 100644
--- a/tutorials/graphics/analyze.C
+++ b/tutorials/graphics/analyze.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphics
+/// \ingroup tutorial_graphics
 /// This macro produces the flowchart of TFormula::Analyze.
 ///
 /// \macro_image
diff --git a/tutorials/graphics/anim.C b/tutorials/graphics/anim.C
index 86d964ed944b271498177e6fc50381458e4e9930..efdaaedb81b449b6412ec8888e159ffc2b8779d7 100644
--- a/tutorials/graphics/anim.C
+++ b/tutorials/graphics/anim.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphics
+/// \ingroup tutorial_graphics
 /// Macro illustrating how to animate a picture using a Timer.
 ///
 /// \macro_code
diff --git a/tutorials/graphics/archi.C b/tutorials/graphics/archi.C
index 63cc59d94410c4db9373c254390575c961bcdf44..a60a764056a67593220a9116f2ce29795e323af5 100644
--- a/tutorials/graphics/archi.C
+++ b/tutorials/graphics/archi.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphics
+/// \ingroup tutorial_graphics
 /// This macro displays the ROOT architecture.
 ///
 /// \macro_image
diff --git a/tutorials/graphics/arrow.C b/tutorials/graphics/arrow.C
index 114372c9cadb6137d33eaedc9de2a005a6915e39..d9158323b9246cdf805fdebccabd6ad00ccbec63 100644
--- a/tutorials/graphics/arrow.C
+++ b/tutorials/graphics/arrow.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphics
+/// \ingroup tutorial_graphics
 /// Draw arrows.
 ///
 /// \macro_image
diff --git a/tutorials/graphics/basic3d.C b/tutorials/graphics/basic3d.C
index f194ceabee3a687f477238b7d2171cf9b1286283..1365082d6baa89d9a4b2121b8d1e0cc4386592dc 100644
--- a/tutorials/graphics/basic3d.C
+++ b/tutorials/graphics/basic3d.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphics
+/// \ingroup tutorial_graphics
 /// Show 3-D polylines and markers.
 ///
 /// \macro_image
diff --git a/tutorials/graphics/canvas.C b/tutorials/graphics/canvas.C
index 99cf6f25d81b39be06c513432e768131a3a5be6f..3e47a437165d3625f01e1c2ce284854e47f44650 100644
--- a/tutorials/graphics/canvas.C
+++ b/tutorials/graphics/canvas.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphics
+/// \ingroup tutorial_graphics
 /// Example of primitives in a canvas.
 /// One of the first actions in a ROOT session is the creation of a Canvas.
 /// Here we create a Canvas named "c1".
diff --git a/tutorials/graphics/canvas2.C b/tutorials/graphics/canvas2.C
index db100bfc65006ac213cdf77e4158ed99e6b4de30..af2c9d3e7c328d01144523bfd4705580d63a570e 100644
--- a/tutorials/graphics/canvas2.C
+++ b/tutorials/graphics/canvas2.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphics
+/// \ingroup tutorial_graphics
 /// Example of canvas partitioning.
 /// Sometimes the Divide() method is not appropriate to divide a Canvas.
 /// Because of the left and right margins, all the pads do not have the
diff --git a/tutorials/graphics/compile.C b/tutorials/graphics/compile.C
index 1e7792a84fe8e1a6af36b59cad3c687498576707..3dd946007be649777b0725abcc42d72cf2fef8f6 100644
--- a/tutorials/graphics/compile.C
+++ b/tutorials/graphics/compile.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphics
+/// \ingroup tutorial_graphics
 /// This macro produces the flowchart of TFormula::Compile
 ///
 /// \macro_image
diff --git a/tutorials/graphics/crown.C b/tutorials/graphics/crown.C
index 749b5a1dff3bff8bddb5c4be8f704d24edc20b06..864848674bc34d2f63275d476333447854f351fd 100644
--- a/tutorials/graphics/crown.C
+++ b/tutorials/graphics/crown.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphics
+/// \ingroup tutorial_graphics
 /// Draw crowns.
 ///
 /// \macro_image
diff --git a/tutorials/graphics/diamond.C b/tutorials/graphics/diamond.C
index a123b12289042dae4cfd51333a85344009bf29ba..6f0d52c383a8489095bf5f7757355f14f0f7c867 100644
--- a/tutorials/graphics/diamond.C
+++ b/tutorials/graphics/diamond.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphics
+/// \ingroup tutorial_graphics
 /// Draw a diamond.
 ///
 /// \macro_image
diff --git a/tutorials/graphics/earth.C b/tutorials/graphics/earth.C
index e7bbed403c44cd95dec27e2933a8d86edb24006b..85bb127bac39a35438d4da71ca58a4d00fd8565c 100644
--- a/tutorials/graphics/earth.C
+++ b/tutorials/graphics/earth.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphics
+/// \ingroup tutorial_graphics
 /// This tutorial illustrates the special contour options.
 ///
 ///   - "AITOFF"     : Draw a contour via an AITOFF projection
diff --git a/tutorials/graphics/ellipse.C b/tutorials/graphics/ellipse.C
index c455f63ef92d8d960e2d8ed5a7a2f33804379454..d389827b5e15a5e09e8fcfbb662b5ccd33e018f6 100644
--- a/tutorials/graphics/ellipse.C
+++ b/tutorials/graphics/ellipse.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphics
+/// \ingroup tutorial_graphics
 /// Draw ellipses.
 ///
 /// \macro_image
diff --git a/tutorials/graphics/eval.C b/tutorials/graphics/eval.C
index f920d7f7ad489cc6c283911046c07e869052e84e..60bd99c2d2303ae56b61eb9f99d5abeb15ac0e52 100644
--- a/tutorials/graphics/eval.C
+++ b/tutorials/graphics/eval.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphics
+/// \ingroup tutorial_graphics
 /// This macro produces the flowchart of TFormula::Eval.
 ///
 /// \macro_image
diff --git a/tutorials/graphics/event.C b/tutorials/graphics/event.C
index c5ca02067b04f031d02603e2544984f3c3e0f95c..a664eedf004e6e74e1f8e8aeedcd2a28e4c5d0e3 100644
--- a/tutorials/graphics/event.C
+++ b/tutorials/graphics/event.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphics
+/// \ingroup tutorial_graphics
 /// Illustrate some basic primitives.
 ///
 /// \macro_image
diff --git a/tutorials/graphics/feynman.C b/tutorials/graphics/feynman.C
index 778d7c939b89899d3fd7d67e7e0741b5a6657bd3..f6f1eabb44de3d6ef8bd08e50f5bd7b184706ed2 100644
--- a/tutorials/graphics/feynman.C
+++ b/tutorials/graphics/feynman.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphics
+/// \ingroup tutorial_graphics
 /// Draw Feynman diagrams.
 ///
 /// \macro_image
diff --git a/tutorials/graphics/first.C b/tutorials/graphics/first.C
index 9493038befc72def4c34d5109cc4135bb02ecf58..ba6ebf1beb524bd1d1372e047da9af60e801d242 100644
--- a/tutorials/graphics/first.C
+++ b/tutorials/graphics/first.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphics
+/// \ingroup tutorial_graphics
 /// Show some basic primitives.
 ///
 /// \macro_image
diff --git a/tutorials/graphics/formula1.C b/tutorials/graphics/formula1.C
index 395ba07c16ebc3facd5dfad246784547087c8cb8..99ee3204f111ad9056f90fb632358fd82cc6fe82 100644
--- a/tutorials/graphics/formula1.C
+++ b/tutorials/graphics/formula1.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphics
+/// \ingroup tutorial_graphics
 /// Display interpreted functions.
 ///
 /// \macro_image
diff --git a/tutorials/graphics/framework.C b/tutorials/graphics/framework.C
index d23ce97d40cc5fc914fa7759ac263a53801c3548..c1dae482ce4e47f47ba4a76676fe051c5ba62df9 100644
--- a/tutorials/graphics/framework.C
+++ b/tutorials/graphics/framework.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphics
+/// \ingroup tutorial_graphics
 /// An example with basic graphics illustrating the Object Oriented User Interface of ROOT.
 ///
 /// \macro_image
diff --git a/tutorials/graphics/gaxis.C b/tutorials/graphics/gaxis.C
index fc9a63e118839907c0ef3b647ce764d548ed51f3..1b685f08d5210008b2a2a9f13971b2b3459e8e56 100644
--- a/tutorials/graphics/gaxis.C
+++ b/tutorials/graphics/gaxis.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphics
+/// \ingroup tutorial_graphics
 /// Simple example illustrating how to draw TGaxis objects in various formats.
 ///
 /// \macro_image
diff --git a/tutorials/graphics/gaxis2.C b/tutorials/graphics/gaxis2.C
index 264d6951052bed6f2515e88c082f62398bcad89b..1698596122bf98b0cca8b1ab9e2a5e93a46954a4 100644
--- a/tutorials/graphics/gaxis2.C
+++ b/tutorials/graphics/gaxis2.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphics
+/// \ingroup tutorial_graphics
 /// Example illustrating how to draw TGaxis with labels defined by a function.
 ///
 /// \macro_image
diff --git a/tutorials/graphics/graph_edit_playback.C b/tutorials/graphics/graph_edit_playback.C
index 0ef84391e367845bc337965ab9817808a006b38a..e3dad9a516c6fe93dcc2ffd1fc8de8d0b66e31da 100644
--- a/tutorials/graphics/graph_edit_playback.C
+++ b/tutorials/graphics/graph_edit_playback.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphics
+/// \ingroup tutorial_graphics
 /// This macro plays a recorded ROOT session showing how to perform various
 /// interactive graphical editing operations. The initial graphics setup
 /// was created using the following root commands:
diff --git a/tutorials/graphics/gtime.C b/tutorials/graphics/gtime.C
index 3c460b33bd72d575d646064cb9bef8a049e63241..4e880992875cc552870e39d672b1bd6a3c7ef2e4 100644
--- a/tutorials/graphics/gtime.C
+++ b/tutorials/graphics/gtime.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphics
+/// \ingroup tutorial_graphics
 /// Example of a graph of data moving in time.
 /// Use the canvas "File/Quit" to exit from this example
 ///
diff --git a/tutorials/graphics/index.md b/tutorials/graphics/index.md
index 48dc45f8dbec57add51928cc0e0fa62e19f7d17d..bc7e9ca3682e7631db5056481b5f0a6cf61ae457 100644
--- a/tutorials/graphics/index.md
+++ b/tutorials/graphics/index.md
@@ -1,2 +1,3 @@
-\defgroup graphics Graphics tutorials
+\defgroup tutorial_graphics Graphics tutorials
+\ingroup Tutorials
 \brief Various examples showing the basic ROOT graphics.
diff --git a/tutorials/graphics/latex.C b/tutorials/graphics/latex.C
index 3549543582e378f32874920d96f62aa752864b88..3e9cbdc489bae54e6c1eaa921bbcc46164facecc 100644
--- a/tutorials/graphics/latex.C
+++ b/tutorials/graphics/latex.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphics
+/// \ingroup tutorial_graphics
 /// This macro draws 5 Latex-style formula in a canvas and prints the canvas as a Postscript file.
 ///
 /// \macro_image
diff --git a/tutorials/graphics/latex2.C b/tutorials/graphics/latex2.C
index f6e991e3654a72f4bb9ca17ff70ab39dc272bda1..9b15900da6170f291d7fef3299ed4dba01e1443e 100644
--- a/tutorials/graphics/latex2.C
+++ b/tutorials/graphics/latex2.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphics
+/// \ingroup tutorial_graphics
 /// This macro draws 4 Latex-style formula in a canvas and prints the canvas as a Postscript file.
 ///
 /// \macro_image
diff --git a/tutorials/graphics/latex3.C b/tutorials/graphics/latex3.C
index f8abe6113f1e7a093028d9d4d308b16e01f5ef7a..a7632bd81f52e90e2d9c1fde2145624952190753 100644
--- a/tutorials/graphics/latex3.C
+++ b/tutorials/graphics/latex3.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphics
+/// \ingroup tutorial_graphics
 /// Example illustrating a TPaveText with Latex inside.
 ///
 /// \macro_image
diff --git a/tutorials/graphics/latex4.C b/tutorials/graphics/latex4.C
index acf30cdca6f9f23b5b9e9a3f79b6506fbc635bd6..5e200252ee4702e990ff3d23ea8bfc2f4bf1e0a4 100644
--- a/tutorials/graphics/latex4.C
+++ b/tutorials/graphics/latex4.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphics
+/// \ingroup tutorial_graphics
 /// Draw the Greek letters as a table and save the result as GIF, PS, PDF
 /// and SVG files.
 /// Lowercase Greek letters are obtained by adding a # to the name of the letter.
diff --git a/tutorials/graphics/latex5.C b/tutorials/graphics/latex5.C
index b0350deeded6dd1fbb7d5362a76d49789040057c..f00e1fd0e931306bdaa48f417ac6296bba3ee20f 100644
--- a/tutorials/graphics/latex5.C
+++ b/tutorials/graphics/latex5.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphics
+/// \ingroup tutorial_graphics
 /// This draws the Mathematical Symbols letters as a table and save the result
 /// as GIF, PS, PDF and SVG files.
 ///
diff --git a/tutorials/graphics/mandelbrot.C b/tutorials/graphics/mandelbrot.C
index 0ecf97fbde58c75e300e4ac6358300987ef9070c..288505c2437902e8ce36c1c6177773f50f30aa5e 100644
--- a/tutorials/graphics/mandelbrot.C
+++ b/tutorials/graphics/mandelbrot.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphics
+/// \ingroup tutorial_graphics
 /// Using TExec to handle keyboard events and TComplex to draw the Mandelbrot set.
 ///
 /// Pressing the keys 'z' and 'u' will zoom and unzoom the picture
diff --git a/tutorials/graphics/manyaxis.C b/tutorials/graphics/manyaxis.C
index b43add4b748f2ba39c0e72449f78cc34f850c203..1ffebf7dab93adb420990001ba13e67e15ff33c3 100644
--- a/tutorials/graphics/manyaxis.C
+++ b/tutorials/graphics/manyaxis.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphics
+/// \ingroup tutorial_graphics
 /// Show several TGaxis formats.
 ///
 /// \macro_image
diff --git a/tutorials/graphics/markerwarning.C b/tutorials/graphics/markerwarning.C
index 17af082846cdc5938fba05da7272a840ccc0b8c8..e56cfce00922adc890e74e992a9cc1505cdd60db 100644
--- a/tutorials/graphics/markerwarning.C
+++ b/tutorials/graphics/markerwarning.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphics
+/// \ingroup tutorial_graphics
 /// This script illustrates the danger of using asymmetric symbols.
 ///
 /// \macro_image
diff --git a/tutorials/graphics/mass_spectrum.C b/tutorials/graphics/mass_spectrum.C
index 9b15fde76b77e1d58a3b29b2ecf7c46bf5e59771..14938fef34eba61d5714979078d181026ff4449c 100644
--- a/tutorials/graphics/mass_spectrum.C
+++ b/tutorials/graphics/mass_spectrum.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphics
+/// \ingroup tutorial_graphics
 /// This macro makes use of some basic graphics primitives such as line, arrow
 /// and text. It as been written using the TCanvas ToolBar to produce a first
 /// draft and was then modified for fine adjustments. Note also the use
diff --git a/tutorials/graphics/palettes.C b/tutorials/graphics/palettes.C
index 5cee66791cbddfa12ffa9534795b07dfa6d66f85..890b4afcea2f41b6ef5f0b7ee285b9d4f757204b 100644
--- a/tutorials/graphics/palettes.C
+++ b/tutorials/graphics/palettes.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphics
+/// \ingroup tutorial_graphics
 /// This macro draws all the high definition palettes available in ROOT.
 /// It generates a png file for each palette and one pdf file, with a table of
 /// content, containing all the palettes
diff --git a/tutorials/graphics/pavetext.C b/tutorials/graphics/pavetext.C
index 8dfa51e6024f53e9188fbed0654e282a5fdcffd7..3d8517ee9194e69cfcf52488c6fa17d485613e58 100644
--- a/tutorials/graphics/pavetext.C
+++ b/tutorials/graphics/pavetext.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphics
+/// \ingroup tutorial_graphics
 /// Draw a pave text.
 ///
 /// \macro_image
diff --git a/tutorials/graphics/piechart.C b/tutorials/graphics/piechart.C
index 8a9d983a8c4db4a60188eab82a5236ba3ae2f853..a0296d47893b7fd507db17f57599a1728e4ea70c 100644
--- a/tutorials/graphics/piechart.C
+++ b/tutorials/graphics/piechart.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphics
+/// \ingroup tutorial_graphics
 /// Pie chart example.
 ///
 /// \macro_image
diff --git a/tutorials/graphics/polytest1.C b/tutorials/graphics/polytest1.C
index 8d5e7df299a78f430c5b4c7b95d78e00b122f783..f6bf2b4506b6bc6e5b830529198522bf1312fe1a 100644
--- a/tutorials/graphics/polytest1.C
+++ b/tutorials/graphics/polytest1.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphics
+/// \ingroup tutorial_graphics
 /// This macro is testing the "compacting" algorithm in TPadPainter.
 /// It reduces the number of polygon's vertices using actual pixel coordinates.
 ///
diff --git a/tutorials/graphics/polytest2.C b/tutorials/graphics/polytest2.C
index 0010bc026387262d96d8be63d87d790ac003c8ed..3f03e84b062ca4b5987643287370b2d362245983 100644
--- a/tutorials/graphics/polytest2.C
+++ b/tutorials/graphics/polytest2.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphics
+/// \ingroup tutorial_graphics
 /// This macro is testing the "compacting" algorithm in TPadPainter.
 /// It reduces the number of polygon's vertices using actual pixel coordinates.
 ///
diff --git a/tutorials/graphics/pstable.C b/tutorials/graphics/pstable.C
index 6c4d53feb3f8745e7ad35e649756a92d7ee76e98..09a0805cb2852e458df5842dd49003c1bbe8e362 100644
--- a/tutorials/graphics/pstable.C
+++ b/tutorials/graphics/pstable.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphics
+/// \ingroup tutorial_graphics
 /// Display all possible types of ROOT/Postscript characters.
 ///
 /// \macro_code
diff --git a/tutorials/graphics/psview.C b/tutorials/graphics/psview.C
index 927d0a0a4f7227320985e70b710f0b76c020cb50..3cd25dd1250538d7d44c16d46e8e1533276297ef 100644
--- a/tutorials/graphics/psview.C
+++ b/tutorials/graphics/psview.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphics
+/// \ingroup tutorial_graphics
 /// An example how to display PS, EPS, PDF files in canvas.
 /// To load a PS file in a TCanvas, the ghostscript program needs to be install.
 /// - On most unix systems it is installed by default.
diff --git a/tutorials/graphics/quarks.C b/tutorials/graphics/quarks.C
index bd6845c23e271a4fd9d49c6a7851a6174da1df7b..36bba58b1029d1ccbb80c94863099eb45f668b7f 100644
--- a/tutorials/graphics/quarks.C
+++ b/tutorials/graphics/quarks.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphics
+/// \ingroup tutorial_graphics
 /// Example illustrating divided pads and Latex.
 ///
 /// \macro_image
diff --git a/tutorials/graphics/tmathtext.C b/tutorials/graphics/tmathtext.C
index 0e884db2c0835cb71079da50118bf8b8133bfb1b..029f681815f4e82a1462fff3a445a025ae3ef663 100644
--- a/tutorials/graphics/tmathtext.C
+++ b/tutorials/graphics/tmathtext.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphics
+/// \ingroup tutorial_graphics
 /// This macro draws various formula in a canvas.
 /// It also prints the canvas as a Postscript file using TMathText.
 ///
diff --git a/tutorials/graphics/tmathtext2.C b/tutorials/graphics/tmathtext2.C
index 00ec63569e1727c36935dff00699a7663c1e40e8..539f384ce44ad27ed3c31dd5407127758cc6dc8d 100644
--- a/tutorials/graphics/tmathtext2.C
+++ b/tutorials/graphics/tmathtext2.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphics
+/// \ingroup tutorial_graphics
 /// This macro draw all possible symbols provided by TMathtext.
 /// \macro_image
 /// \author Olivier Couet
diff --git a/tutorials/graphics/tornado.C b/tutorials/graphics/tornado.C
index 98e1f2efdaee6d362e06e89fed8eed61a2fdb928..43eb53dcf3d37caa8d4c14f32cb81671235dd7b5 100644
--- a/tutorials/graphics/tornado.C
+++ b/tutorials/graphics/tornado.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphics
+/// \ingroup tutorial_graphics
 /// Show 3-d polymarker.
 ///
 /// \macro_image
diff --git a/tutorials/graphics/triangles.C b/tutorials/graphics/triangles.C
index b83f4743abf6ad07a4223579343d9f4c41d08a20..06b91975aa23a9a48be6a5aa2e3ae301ba7494dd 100644
--- a/tutorials/graphics/triangles.C
+++ b/tutorials/graphics/triangles.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphics
+/// \ingroup tutorial_graphics
 /// Generate small triangles randomly in the canvas.
 /// Each triangle has a unique id and a random color in the color palette
 ///
diff --git a/tutorials/graphs/approx.C b/tutorials/graphs/approx.C
index bbc7905ed7db0fd19468547c121b4d17ca6d8e14..b426e4e2b5baf2984c5358cf941c0e7cba94a18d 100644
--- a/tutorials/graphs/approx.C
+++ b/tutorials/graphs/approx.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphs
+/// \ingroup tutorial_graphs
 /// Macro to test interpolation function Approx
 ///
 /// \macro_image
diff --git a/tutorials/graphs/bent.C b/tutorials/graphs/bent.C
index c45188fc2054f91ecb417d71294787557178676c..cd750e82250f1ce5067cf0ac641e66b51d0c3480 100644
--- a/tutorials/graphs/bent.C
+++ b/tutorials/graphs/bent.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphs
+/// \ingroup tutorial_graphs
 /// Bent error bars
 ///
 /// \macro_image
diff --git a/tutorials/graphs/exclusiongraph.C b/tutorials/graphs/exclusiongraph.C
index 917ef1626c26e930344807847be15dd7ab0fbf32..156c1d1aca0d713d0325dacd6d88da24c743c77c 100644
--- a/tutorials/graphs/exclusiongraph.C
+++ b/tutorials/graphs/exclusiongraph.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphs
+/// \ingroup tutorial_graphs
 /// Draw three graphs with an exclusion zone.
 ///
 /// \macro_image
diff --git a/tutorials/graphs/exclusiongraph2.C b/tutorials/graphs/exclusiongraph2.C
index 98f51953a3713aee776dea5ca8536202aad8a3c0..4774bc340653cef70e7a158c1344e9a49ea885b7 100644
--- a/tutorials/graphs/exclusiongraph2.C
+++ b/tutorials/graphs/exclusiongraph2.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphs
+/// \ingroup tutorial_graphs
 /// Draw several graphs with an exclusion zones.
 ///
 /// \macro_image
diff --git a/tutorials/graphs/gerrors.C b/tutorials/graphs/gerrors.C
index 99e7d2d8346468695e499ffa80d59c3668b3b7c1..e513c4cb857a253c5b7062fac2f04e8606129fe0 100644
--- a/tutorials/graphs/gerrors.C
+++ b/tutorials/graphs/gerrors.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphs
+/// \ingroup tutorial_graphs
 /// Draw a graph with error bars
 ///
 /// \macro_image
diff --git a/tutorials/graphs/gerrors2.C b/tutorials/graphs/gerrors2.C
index a4ed27165c64bb6f4951730bd81da73f877a94fc..36c5446aee8aa35b1a18fbaa50524201120f3465 100644
--- a/tutorials/graphs/gerrors2.C
+++ b/tutorials/graphs/gerrors2.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphs
+/// \ingroup tutorial_graphs
 /// Draw two graphs with error bars
 ///
 /// \macro_image
diff --git a/tutorials/graphs/graph.C b/tutorials/graphs/graph.C
index 188ea37441705931e9fe0943bd621c721b8cffd1..cd99a6d1642dfdce37569826e23c52466adc2c44 100644
--- a/tutorials/graphs/graph.C
+++ b/tutorials/graphs/graph.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphs
+/// \ingroup tutorial_graphs
 /// Draw a simple graph.
 ///
 /// \macro_image
diff --git a/tutorials/graphs/graph2derrorsfit.C b/tutorials/graphs/graph2derrorsfit.C
index 3719c4f00a9365d40de9760e96692d6dccd4591a..a3eb34df797a7b865903b30bb8870ff0ef811ed5 100644
--- a/tutorials/graphs/graph2derrorsfit.C
+++ b/tutorials/graphs/graph2derrorsfit.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphs
+/// \ingroup tutorial_graphs
 /// Draw and fit a TGraph2DErrors
 ///
 /// \macro_image
diff --git a/tutorials/graphs/graphApply.C b/tutorials/graphs/graphApply.C
index c819c123dda07fe1294bf84979b9a0620890fd8d..d0418bbc1a515ec3fb24cf8676898a716bc32127 100644
--- a/tutorials/graphs/graphApply.C
+++ b/tutorials/graphs/graphApply.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphs
+/// \ingroup tutorial_graphs
 /// A macro to demonstrate the functionality of TGraph::Apply() method.
 /// TGraph::Apply applies a function `f` to all the data TGraph points.
 /// `f` may be a 1-D function TF1 or 2-d function TF2.
diff --git a/tutorials/graphs/graphShade.C b/tutorials/graphs/graphShade.C
index 85df9049b835898c95d0381868c27f6df19c8e67..086bd824ff7c0eada545194f82fc1fed20a9273f 100644
--- a/tutorials/graphs/graphShade.C
+++ b/tutorials/graphs/graphShade.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphs
+/// \ingroup tutorial_graphs
 /// Show how to shade an area between two graphs
 ///
 /// \macro_image
diff --git a/tutorials/graphs/graphpolar.C b/tutorials/graphs/graphpolar.C
index 98b88c90fdbb22d47c5ce4d3c0ad9b6cda3d7b62..d7eea83b67a270268da2445f25b996f0c097dd6c 100644
--- a/tutorials/graphs/graphpolar.C
+++ b/tutorials/graphs/graphpolar.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphs
+/// \ingroup tutorial_graphs
 /// Create and draw a polar graph.
 /// \macro_image
 /// \macro_code
diff --git a/tutorials/graphs/graphpolar2.C b/tutorials/graphs/graphpolar2.C
index c9c11e5919ccb766ed5f48457809953d713c197b..993ca8853fdffecbeca97c5f34829f4457b5247b 100644
--- a/tutorials/graphs/graphpolar2.C
+++ b/tutorials/graphs/graphpolar2.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphs
+/// \ingroup tutorial_graphs
 /// Create and draw a polar graph with PI axis
 ///
 /// \macro_image
diff --git a/tutorials/graphs/graphpolar3.C b/tutorials/graphs/graphpolar3.C
index 7e0fe4879bf98fd949c55d0dc16f4547692415fa..27c919747b0e7896f78bfc1f3f0218c96a89bb4c 100644
--- a/tutorials/graphs/graphpolar3.C
+++ b/tutorials/graphs/graphpolar3.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphs
+/// \ingroup tutorial_graphs
 /// Create and draw a polar graph with PI axis using a TF1.
 ///
 /// \macro_image
diff --git a/tutorials/graphs/graphstruct.C b/tutorials/graphs/graphstruct.C
index 0ea3f2e7e1486b04e9a59fbc71409604e1a0b2d9..999dc948df170d9974fb1fe4689e9024e145235f 100644
--- a/tutorials/graphs/graphstruct.C
+++ b/tutorials/graphs/graphstruct.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphs
+/// \ingroup tutorial_graphs
 /// Draw a simple graph structure.
 /// The graph layout is made using graphviz. This macro creates some
 /// nodes and edges and change a few graphical attributes on some of them.
diff --git a/tutorials/graphs/graphtext.C b/tutorials/graphs/graphtext.C
index ec6c1eab1db89e6c31dc8afeede998bbd79cf49f..74fe39436f1e2d64bb438837d43d3c095fcb3d07 100644
--- a/tutorials/graphs/graphtext.C
+++ b/tutorials/graphs/graphtext.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphs
+/// \ingroup tutorial_graphs
 /// Draw a graph with text attached to each point.
 /// The text is drawn in a TExec function attached to the TGraph,
 /// therefore if the text is
diff --git a/tutorials/graphs/gtime.C b/tutorials/graphs/gtime.C
index 2290080428e1e51e70a12e35f9cc2dc00690f031..26f3f3b5e077da2ead28e5552e7474e64c8c51cc 100644
--- a/tutorials/graphs/gtime.C
+++ b/tutorials/graphs/gtime.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphs
+/// \ingroup tutorial_graphs
 /// Example of TGraphTime.
 ///
 /// \macro_image
diff --git a/tutorials/graphs/gtime2.C b/tutorials/graphs/gtime2.C
index 61f639fb83d9bfcdaa99f7ee40bcbbee3cf308be..371181b058029122743f9e294adfb285303d2616 100644
--- a/tutorials/graphs/gtime2.C
+++ b/tutorials/graphs/gtime2.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphs
+/// \ingroup tutorial_graphs
 /// Example of TGraphTime showing how the class could be used to visualize
 /// a set of particles with their time stamp in a MonteCarlo program.
 ///
diff --git a/tutorials/graphs/index.md b/tutorials/graphs/index.md
index 840727745e2c37b0ebb4426f469f938ea3127c6d..7fce9f10c3d8cc2e8854616ee11313c3001911e2 100644
--- a/tutorials/graphs/index.md
+++ b/tutorials/graphs/index.md
@@ -1,2 +1,3 @@
-\defgroup graphs Graphs tutorials
+\defgroup tutorial_graphs Graphs tutorials
+\ingroup Tutorials
 \brief Examples showing the "graphs classes" usage..
diff --git a/tutorials/graphs/labels1.C b/tutorials/graphs/labels1.C
index da6d97e16c05310f86c898bb65e4667dd5bfbeb8..f19fea3593dce7620313d2e26be327b46361929d 100644
--- a/tutorials/graphs/labels1.C
+++ b/tutorials/graphs/labels1.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphs
+/// \ingroup tutorial_graphs
 /// Setting alphanumeric labels in a 1-d histogram.
 ///
 /// \macro_image
diff --git a/tutorials/graphs/labels2.C b/tutorials/graphs/labels2.C
index 176d03b6c7e8b4aaa545edf1e6d861225d726659..0c42074a66071402ea944c4c980f06d78caf4b66 100644
--- a/tutorials/graphs/labels2.C
+++ b/tutorials/graphs/labels2.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphs
+/// \ingroup tutorial_graphs
 /// Setting alphanumeric labels.
 ///
 /// \macro_image
diff --git a/tutorials/graphs/motorcycle.C b/tutorials/graphs/motorcycle.C
index 7f8a0ada1d65ae1788d29b8a98d693076aec5e04..d7e6d76fc6539fbc5211af33de9f2463ffc5605a 100644
--- a/tutorials/graphs/motorcycle.C
+++ b/tutorials/graphs/motorcycle.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphs
+/// \ingroup tutorial_graphs
 /// Macro to test scatterplot smoothers: ksmooth, lowess, supsmu
 /// as described in:
 ///
diff --git a/tutorials/graphs/multigraph.C b/tutorials/graphs/multigraph.C
index 1f568fbec0a6bb9cd6cb4461e7f18eba99d2347b..8b94e9a29542872767c87caf6ad3e651ad851e0c 100644
--- a/tutorials/graphs/multigraph.C
+++ b/tutorials/graphs/multigraph.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphs
+/// \ingroup tutorial_graphs
 /// Create and Draw a TMultiGraph.
 ///
 /// \macro_image
diff --git a/tutorials/graphs/multipalette.C b/tutorials/graphs/multipalette.C
index a66197382a68e2862600fcf88fe8e98e489938dc..726b2ab1ea95da0c05084c567c50905433d5a619 100644
--- a/tutorials/graphs/multipalette.C
+++ b/tutorials/graphs/multipalette.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphs
+/// \ingroup tutorial_graphs
 /// Draw color plots using different color palettes.
 ///
 /// \macro_image
diff --git a/tutorials/graphs/seism.C b/tutorials/graphs/seism.C
index 0c4aa0a8ddc505d3a3fb18272e54bad4a939b56e..8a78df13c2ab56a3810054111d50510e78b83e0e 100644
--- a/tutorials/graphs/seism.C
+++ b/tutorials/graphs/seism.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphs
+/// \ingroup tutorial_graphs
 /// Strip chart example.
 ///
 /// \macro_image
diff --git a/tutorials/graphs/splines_test.C b/tutorials/graphs/splines_test.C
index e7bcc19ae470953dcfde4a28396d7db6b4b4e51c..1a26e12f43508db358c4119e449ec615b07a25a4 100644
--- a/tutorials/graphs/splines_test.C
+++ b/tutorials/graphs/splines_test.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphs
+/// \ingroup tutorial_graphs
 /// Examples of use of the spline classes.
 ///
 /// \macro_image
diff --git a/tutorials/graphs/surfaces.C b/tutorials/graphs/surfaces.C
index 458a327dfe1616623c5d1458e8a8d647c210bdfe..4442eacab505f6353ca636ef3294a6e20d242e94 100644
--- a/tutorials/graphs/surfaces.C
+++ b/tutorials/graphs/surfaces.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphs
+/// \ingroup tutorial_graphs
 /// Draw 2-Dim functions.
 /// \macro_image
 /// \macro_code
diff --git a/tutorials/graphs/timeonaxis.C b/tutorials/graphs/timeonaxis.C
index c458c82985ddd8565c270108276bdf50c5ab99a8..dc88cc5165a9ea53f80a28ae808850c5790b3ab7 100644
--- a/tutorials/graphs/timeonaxis.C
+++ b/tutorials/graphs/timeonaxis.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphs
+/// \ingroup tutorial_graphs
 /// This macro illustrates the use of the time mode on the axis
 /// with different time intervals and time formats.
 /// Through all this script, the time is expressed in UTC. some
diff --git a/tutorials/graphs/timeonaxis2.C b/tutorials/graphs/timeonaxis2.C
index 6f04988d86165fd4aea1fa0981925eaf587bad84..2c9934019423a12aac41e204a80fc38319bf06f3 100644
--- a/tutorials/graphs/timeonaxis2.C
+++ b/tutorials/graphs/timeonaxis2.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphs
+/// \ingroup tutorial_graphs
 /// Define the time offset as 2003, January 1st.
 ///
 /// \macro_image
diff --git a/tutorials/graphs/timeonaxis3.C b/tutorials/graphs/timeonaxis3.C
index 36e82057168280b141b47abdf09e6639886646b3..30aa8fe63bcf08be1d593fef541f1ba7f0a30653 100644
--- a/tutorials/graphs/timeonaxis3.C
+++ b/tutorials/graphs/timeonaxis3.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphs
+/// \ingroup tutorial_graphs
 /// This example compares what the system time function gmtime and localtime give
 /// with what gives TGaxis. It can be used as referenced test to check if TGaxis
 /// is working properly.
diff --git a/tutorials/graphs/waves.C b/tutorials/graphs/waves.C
index af8a2fca9da952c6905ef4a3833a1430909ba2c2..05602ee73d7ffe651b7061087f5fbd92d71213f6 100644
--- a/tutorials/graphs/waves.C
+++ b/tutorials/graphs/waves.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphs
+/// \ingroup tutorial_graphs
 ///
 /// Hint: Spherical waves
 ///
diff --git a/tutorials/graphs/zdemo.C b/tutorials/graphs/zdemo.C
index 7ca6b0ac8bfb95505a9a7e9c9e9d02c08c0a2e63..e00bd350fc8a5210bee988660120bac445b73e2b 100644
--- a/tutorials/graphs/zdemo.C
+++ b/tutorials/graphs/zdemo.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphs
+/// \ingroup tutorial_graphs
 /// This macro is an example of graphs in log scales with annotations.
 ///
 /// The presented results are predictions of invariant cross-section
diff --git a/tutorials/graphs/zones.C b/tutorials/graphs/zones.C
index 73916f11a059d8cbbce212689cea11303c34a868..b625c2e8ed51dc7323355a147b23ff8efff099c5 100644
--- a/tutorials/graphs/zones.C
+++ b/tutorials/graphs/zones.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup graphs
+/// \ingroup tutorial_graphs
 /// Example of script showing how to divide a canvas
 /// into adjacent subpads + axis labels on the top and right side
 /// of the pads.
diff --git a/tutorials/hist/ContourList.C b/tutorials/hist/ContourList.C
index 6c5f6112eee5ac38b09136df9e16a4b4484ed760..985c3f481173e2f90f81e21a3270f4e8945b1b7c 100644
--- a/tutorials/hist/ContourList.C
+++ b/tutorials/hist/ContourList.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup hist
+/// \ingroup tutorial_hist
 /// Getting Contours From TH2D.
 ///
 /// #### Image produced by `.x ContourList.C`
diff --git a/tutorials/hist/DynamicSlice.C b/tutorials/hist/DynamicSlice.C
index b4a68fa9093631deb43cf937e79cc5c38d589fef..6994a2e3f704f412f9003436ef99e1591ca031a4 100644
--- a/tutorials/hist/DynamicSlice.C
+++ b/tutorials/hist/DynamicSlice.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup hist
+/// \ingroup tutorial_hist
 /// Show the slice of a TH2 following the mouse position.
 ///
 /// \macro_image
diff --git a/tutorials/hist/FirstContour.C b/tutorials/hist/FirstContour.C
index 6a4512f06a31923814ea7e9404a92e08b95bff89..49e3ebddb209230f6a703fbac2d116b40761155b 100644
--- a/tutorials/hist/FirstContour.C
+++ b/tutorials/hist/FirstContour.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup hist
+/// \ingroup tutorial_hist
 /// Make a contour plot and get the first contour in a TPolyMarker.
 /// This macro generates a color contour plot by selecting entries
 /// from an ntuple file.
diff --git a/tutorials/hist/cumulative.C b/tutorials/hist/cumulative.C
index 09aabc1a74faa98b68c0d773b0ef1ae0f3a344d3..03a44b0d67d624a42924a214b06a5d186cae90ac 100644
--- a/tutorials/hist/cumulative.C
+++ b/tutorials/hist/cumulative.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup hist
+/// \ingroup tutorial_hist
 /// Illustrate use of the TH1::GetCumulative method.
 ///
 /// \macro_image
diff --git a/tutorials/hist/draw2dopt.C b/tutorials/hist/draw2dopt.C
index 54289858b6e6ec14cf5f33c4c1de1161ed2405e8..f5d90ec9ab678e24b4c805ba31e3fb697d425b3a 100644
--- a/tutorials/hist/draw2dopt.C
+++ b/tutorials/hist/draw2dopt.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup hist
+/// \ingroup tutorial_hist
 /// Display the various 2-d drawing options
 ///
 /// \macro_code
diff --git a/tutorials/hist/exec1.C b/tutorials/hist/exec1.C
index 576ca1d2a169ed055b3b934c60325bd4da039bc1..7446e0cbe18377494a00df954c56e706dabb318d 100644
--- a/tutorials/hist/exec1.C
+++ b/tutorials/hist/exec1.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup hist
+/// \ingroup tutorial_hist
 /// Echo object at mouse position.
 /// Example of macro called when a pad is redrawn
 /// one must create a TExec object in the following way
diff --git a/tutorials/hist/exec2.C b/tutorials/hist/exec2.C
index f90cccac7029f117b59ed5ebb27beb784531b0ee..1a54b48aa96b4465d4db1de4964ae44489e20ee7 100644
--- a/tutorials/hist/exec2.C
+++ b/tutorials/hist/exec2.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup hist
+/// \ingroup tutorial_hist
 /// Echo object at mouse position and show a graphics line.
 /// Example of macro called when a mouse event occurs in a pad.
 ///
diff --git a/tutorials/hist/fillrandom.C b/tutorials/hist/fillrandom.C
index b551effb9e4e31ac30bf1015a7ba20e9413e6769..56c2f71073ad9e21330ec062e5000682a5bed8c3 100644
--- a/tutorials/hist/fillrandom.C
+++ b/tutorials/hist/fillrandom.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup hist
+/// \ingroup tutorial_hist
 /// Fill a 1-D histogram from a parametric function.
 ///
 /// \macro_image
diff --git a/tutorials/hist/greyscale.C b/tutorials/hist/greyscale.C
index f56e6862057e9ac07f01faaabb8acef3129eb59b..d6fc8039f813b31e4671e340a962be24c19b880f 100644
--- a/tutorials/hist/greyscale.C
+++ b/tutorials/hist/greyscale.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup hist
+/// \ingroup tutorial_hist
 /// Create grey scale of `200 x 200` boxes.
 ///
 /// \macro_image
diff --git a/tutorials/hist/h1draw.C b/tutorials/hist/h1draw.C
index 5f942b9c1267bfd4e0c1d64b05889b15135ee8f2..2057792684039cfe335dffe97fb51c5e88e85169 100644
--- a/tutorials/hist/h1draw.C
+++ b/tutorials/hist/h1draw.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup hist
+/// \ingroup tutorial_hist
 /// 1-D histogram drawing options.
 /// We attach (or generate) the ROOT file in `$ROOTSYS/tutorials/hsimple.root`
 /// or `$PWD/hsimple.root`
diff --git a/tutorials/hist/hbars.C b/tutorials/hist/hbars.C
index 2e2d414ebc0ad7e53e333e82ec9aa9a9cba9862d..b3d6cc460895129b101c97261d093a47065bdb12 100644
--- a/tutorials/hist/hbars.C
+++ b/tutorials/hist/hbars.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup hist
+/// \ingroup tutorial_hist
 /// Example of bar charts with 1-d histograms.
 ///
 /// \macro_image
diff --git a/tutorials/hist/hksimple.C b/tutorials/hist/hksimple.C
index c107d6249af5d545780e283f662bf817b6a19318..137ee64bfe0cd72bf50f2856bef77aa7a2684f2c 100644
--- a/tutorials/hist/hksimple.C
+++ b/tutorials/hist/hksimple.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup hist
+/// \ingroup tutorial_hist
 /// Illustrates the advantages of a TH1K histogram
 ///
 /// \macro_image
diff --git a/tutorials/hist/hlabels1.C b/tutorials/hist/hlabels1.C
index 2a4c31f21eeaae11aa1411169a307f2d7bafaa38..83b79dbf77fe7b41f199bdc40daf5cfea0d6c809 100644
--- a/tutorials/hist/hlabels1.C
+++ b/tutorials/hist/hlabels1.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup hist
+/// \ingroup tutorial_hist
 /// 1-D histograms with alphanumeric labels
 ///
 /// \macro_image
diff --git a/tutorials/hist/hlabels2.C b/tutorials/hist/hlabels2.C
index 62191fb1527d34921b4934a397fc086c5811af9a..a972df219d4ca985fc4d30651c031f1ba215d870 100644
--- a/tutorials/hist/hlabels2.C
+++ b/tutorials/hist/hlabels2.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup hist
+/// \ingroup tutorial_hist
 /// 2-D histograms with alphanumeric labels.
 ///
 /// \macro_image
diff --git a/tutorials/hist/hstack.C b/tutorials/hist/hstack.C
index 2923f8f7da4ba82fa7fe79e41e89507e75df1303..6c5cda89a5743c487d19a2ce79dd3d4fa52a1fb6 100644
--- a/tutorials/hist/hstack.C
+++ b/tutorials/hist/hstack.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup hist
+/// \ingroup tutorial_hist
 /// Example of stacked histograms: class THStack.
 ///
 /// \macro_image
diff --git a/tutorials/hist/hsum.C b/tutorials/hist/hsum.C
index 103c79d144f1e9898143cfdff9a52ebd12fef65d..2c8419a5789fb79f3e58f94d1c5f1051ddc785f4 100644
--- a/tutorials/hist/hsum.C
+++ b/tutorials/hist/hsum.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup hist
+/// \ingroup tutorial_hist
 /// Histograms filled and drawn in a loop.
 /// Simple example illustrating how to use the C++ interpreter
 /// to fill histograms in a loop and show the graphics results
diff --git a/tutorials/hist/hsumTimer.C b/tutorials/hist/hsumTimer.C
index c7d47fcdaeacc965eefa9587a2732e7fb841e269..19cee4399de8029219165206c1521d939d0b2be6 100644
--- a/tutorials/hist/hsumTimer.C
+++ b/tutorials/hist/hsumTimer.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup hist
+/// \ingroup tutorial_hist
 /// Demo of Timers.
 ///
 /// Simple example illustrating how to use the C++ interpreter
diff --git a/tutorials/hist/logscales.C b/tutorials/hist/logscales.C
index f7009760d9032c71b248040bf8b85ad040ffd4d3..02d9b726f36786e7a7de18522aade56f5ff90659 100644
--- a/tutorials/hist/logscales.C
+++ b/tutorials/hist/logscales.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup hist
+/// \ingroup tutorial_hist
 /// Draw parametric functions with log scales.
 ///
 /// \macro_image
diff --git a/tutorials/hist/multicolor.C b/tutorials/hist/multicolor.C
index 75525738bd40a435553471a82af0b2cd080a6314..e02d6cbe2cf08fcb8047506701cd3e249f345046 100644
--- a/tutorials/hist/multicolor.C
+++ b/tutorials/hist/multicolor.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup hist
+/// \ingroup tutorial_hist
 /// Use a THStack to show a 2-D hist with cells with different colors.
 /// ~~~ {.cpp}
 ///  root > .x multicolor.C
diff --git a/tutorials/hist/ratioplot.C b/tutorials/hist/ratioplot.C
index dd5426b5945f8d433afc82f8916662fd2f7cf2d7..78589c224d8ad280f12e53b9ed71d6e3dcb58855 100644
--- a/tutorials/hist/ratioplot.C
+++ b/tutorials/hist/ratioplot.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup hist
+/// \ingroup tutorial_hist
 /// Example displaying two histograms and their ratio.
 ///
 /// \macro_image
diff --git a/tutorials/hist/rebin.C b/tutorials/hist/rebin.C
index df02f305a771b1590ca706d2abe69e5949e144ff..af31c78d3408e6e0b77f9904112add25d8f99504 100644
--- a/tutorials/hist/rebin.C
+++ b/tutorials/hist/rebin.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup hist
+/// \ingroup tutorial_hist
 /// Rebin a variable bin-width histogram.
 ///
 /// This tutorial illustrates how to:
diff --git a/tutorials/hist/reverseaxis.C b/tutorials/hist/reverseaxis.C
index da72bd56c2e566a07cc86353d7d7a45579799799..08892c1d74a08c49399807f7eaa77dd5377d86c3 100644
--- a/tutorials/hist/reverseaxis.C
+++ b/tutorials/hist/reverseaxis.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup hist
+/// \ingroup tutorial_hist
 /// Example showing an histogram with reverse axis.
 ///
 /// \macro_image
diff --git a/tutorials/hist/sparsehist.C b/tutorials/hist/sparsehist.C
index e492e3fe92cc970f216721191759a612afaee46e..3f28d8e6a265a20aa4beead4457fb9e52f2a3f89 100644
--- a/tutorials/hist/sparsehist.C
+++ b/tutorials/hist/sparsehist.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup hist
+/// \ingroup tutorial_hist
 /// Evaluate the performance of THnSparse vs TH1/2/3/nF
 /// for different numbers of dimensions and bins per dimension.
 ///
diff --git a/tutorials/hist/statsEditing.C b/tutorials/hist/statsEditing.C
index 85bc41f8aee6f37d93310ee3fe7c9400cfefdb31..8b25b58071b1f85f5e5e73620e744a9da896287d 100644
--- a/tutorials/hist/statsEditing.C
+++ b/tutorials/hist/statsEditing.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup hist
+/// \ingroup tutorial_hist
 /// Edit statistics box.
 ///
 /// This example shows:
diff --git a/tutorials/hist/testSmooth.C b/tutorials/hist/testSmooth.C
index a1459cf22973483bd79a4fe38f0b154a956d3894..106eaaecddd0326d58a1e8159599439af4a7c327 100644
--- a/tutorials/hist/testSmooth.C
+++ b/tutorials/hist/testSmooth.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup hist
+/// \ingroup tutorial_hist
 /// Histogram smoothing.
 ///
 /// \macro_image
diff --git a/tutorials/hist/th2polyBoxes.C b/tutorials/hist/th2polyBoxes.C
index 916b16af720147577c1d53aacbf2fa436a038557..487cb3731ecf9fb8f19fa4af8abb7b25d6c4b7e1 100644
--- a/tutorials/hist/th2polyBoxes.C
+++ b/tutorials/hist/th2polyBoxes.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup hist
+/// \ingroup tutorial_hist
 /// This tutorial illustrates how to create an histogram with polygonal
 /// bins (TH2Poly). The bins are boxes.
 ///
diff --git a/tutorials/hist/th2polyEurope.C b/tutorials/hist/th2polyEurope.C
index e4735b0eca25c855bed4e043fa0866590bf8dbbf..654d5040d52fcaab53390beb7757cf3a88d24e99 100644
--- a/tutorials/hist/th2polyEurope.C
+++ b/tutorials/hist/th2polyEurope.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup hist
+/// \ingroup tutorial_hist
 /// This tutorial illustrates how to create an histogram with polygonal
 /// bins (TH2Poly), fill it and draw it. The initial data are stored
 /// in TMultiGraphs. They represent the european countries.
diff --git a/tutorials/hist/th2polyHoneycomb.C b/tutorials/hist/th2polyHoneycomb.C
index f2926e43623dc78e160ebf3948fcad362f35eb72..45fc31eaa79e867813899d8dea37b9f1c5409960 100644
--- a/tutorials/hist/th2polyHoneycomb.C
+++ b/tutorials/hist/th2polyHoneycomb.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup hist
+/// \ingroup tutorial_hist
 /// This tutorial illustrates how to create an histogram with hexagonal
 /// bins (TH2Poly), fill it and draw it using GL.
 ///
diff --git a/tutorials/hist/th2polyUSA.C b/tutorials/hist/th2polyUSA.C
index 07b927819c440b90861687f622782567a6a23637..84aa00ac0baa429060bdb2ea0ca53e55d6df1062 100644
--- a/tutorials/hist/th2polyUSA.C
+++ b/tutorials/hist/th2polyUSA.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup hist
+/// \ingroup tutorial_hist
 /// This tutorial illustrates how to create an histogram with polygonal
 /// bins (TH2Poly), fill it and draw it using GL. The initial data are stored
 /// in TMultiGraphs. They represent the USA.
diff --git a/tutorials/hist/transpad.C b/tutorials/hist/transpad.C
index 7828304663b2b3daf7c7f16a44cc5e7e94e90c0c..ff5f3324a0d146e021df294539f067bd61776137 100644
--- a/tutorials/hist/transpad.C
+++ b/tutorials/hist/transpad.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup hist
+/// \ingroup tutorial_hist
 /// Example of a canvas showing two histograms with different scales.
 /// The second histogram is drawn in a transparent pad
 ///
diff --git a/tutorials/hist/twoscales.C b/tutorials/hist/twoscales.C
index 2dd294a8e1de0972d3c40ffa60f6de62afa50f06..c8960e80a973c130e1d48c23a8bd86a88350c378 100644
--- a/tutorials/hist/twoscales.C
+++ b/tutorials/hist/twoscales.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup hist
+/// \ingroup tutorial_hist
 /// Example of macro illustrating how to superimpose two histograms
 /// with different scales in the "same" pad.
 ///
diff --git a/tutorials/image/galaxy_image.C b/tutorials/image/galaxy_image.C
index 4df8b1f2caf6685ae28abea38c19ebc0efcafa0c..3bc721276bbc2892f302dbe417fa0d6f861ea868 100644
--- a/tutorials/image/galaxy_image.C
+++ b/tutorials/image/galaxy_image.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup image
+/// \ingroup tutorial_image
 /// Importing an image and manipulating it.
 ///
 /// \image html image_galaxy_image.png
diff --git a/tutorials/image/hist2image.C b/tutorials/image/hist2image.C
index c730cffb513ddd94b1060e2c43e7029af806fbb7..0965c6e992fb34284ad8298005575e23857d8c7a 100644
--- a/tutorials/image/hist2image.C
+++ b/tutorials/image/hist2image.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup image
+/// \ingroup tutorial_image
 /// Create an image from a 2-D histogram and manipulate it.
 ///
 /// \image html image_hist2image.png
diff --git a/tutorials/image/hsumanim.C b/tutorials/image/hsumanim.C
index 01431761c28f64a438349678f6ccf8c08a8494c6..9ed8a491126a6fb4ede3e2886e81d0f6798dff75 100644
--- a/tutorials/image/hsumanim.C
+++ b/tutorials/image/hsumanim.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup image
+/// \ingroup tutorial_image
 /// This script is a slightly modified version of hsum.C.
 /// When run in batch mode, it produces an animated gif file.
 ///
diff --git a/tutorials/image/image2hist.C b/tutorials/image/image2hist.C
index 4b1edf7533d2085a3ddaad2353af83c0e9f2e76c..3c4a7e0038b29cb9dbd120d78e003b51a18b3694 100644
--- a/tutorials/image/image2hist.C
+++ b/tutorials/image/image2hist.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup image
+/// \ingroup tutorial_image
 /// Create a 2-D histogram from an image.
 ///
 /// \macro_image
diff --git a/tutorials/image/img2pad.C b/tutorials/image/img2pad.C
index d211da0ad1994a06c1e1f845657d6140703480b2..a7f87afe6b1281463c9cbb085358eb4e1b418b04 100644
--- a/tutorials/image/img2pad.C
+++ b/tutorials/image/img2pad.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup image
+/// \ingroup tutorial_image
 /// Display image in canvas and pad.
 ///
 /// \macro_image
diff --git a/tutorials/image/imgconv.C b/tutorials/image/imgconv.C
index 0184436df857043a3a4c2c7eebb0458266a6aeb6..8e8796eeaa86ea3fdf60ebb2cce4497cd6c96cb7 100644
--- a/tutorials/image/imgconv.C
+++ b/tutorials/image/imgconv.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup image
+/// \ingroup tutorial_image
 /// Open rose512.jpg and save it in the following formats:
 ///  .png, .gif, .xpm and tiff.
 ///
diff --git a/tutorials/image/pad2png.C b/tutorials/image/pad2png.C
index b8931cb38a71d06b71502c8a27a1b68f6049c2d1..bf19c065f1a6ef0c8e88da2d7423605935d369c2 100644
--- a/tutorials/image/pad2png.C
+++ b/tutorials/image/pad2png.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup image
+/// \ingroup tutorial_image
 /// Create a canvas and save as png.
 ///
 /// \macro_image
diff --git a/tutorials/image/rose_image.C b/tutorials/image/rose_image.C
index 0637b0d5717788a9835ed2b53db144cb90472665..9265e3dcccfa3dc4e7e6d3ffd75edc13cb49dc5c 100644
--- a/tutorials/image/rose_image.C
+++ b/tutorials/image/rose_image.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup image
+/// \ingroup tutorial_image
 /// Display image in a new canvas and pad.
 ///
 /// \macro_image
diff --git a/tutorials/image/trans_graph.C b/tutorials/image/trans_graph.C
index d7cb9cb6809575eab1ef105fc69dd9c7e9c00a5d..1b960412e0661d03cca23b745542387f50a0ad76 100644
--- a/tutorials/image/trans_graph.C
+++ b/tutorials/image/trans_graph.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup image
+/// \ingroup tutorial_image
 /// Demonstrates how to access and manipulate ARGB pixel values of an image +...
 ///  - how to make a part of an image to be transparent.
 ///  - how to merge/alphablend an image with transparent colors
diff --git a/tutorials/multicore/mp001_fillHistos.C b/tutorials/multicore/mp001_fillHistos.C
index 2c19fbc90aebbece280d1941d1b101c953744d17..7bdab863dc1c7179eb9da1f6eeece95a818b459f 100644
--- a/tutorials/multicore/mp001_fillHistos.C
+++ b/tutorials/multicore/mp001_fillHistos.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup multicore
+/// \ingroup tutorial_multicore
 /// Fill histograms in parallel and write them on file.
 /// This example expresses the parallelism of the mt001_fillHistos.C tutorial
 /// with multiprocessing techniques.
diff --git a/tutorials/multicore/mp101_fillNtuples.C b/tutorials/multicore/mp101_fillNtuples.C
index 55484dbce8aa6db6917b9a3b841cee3cdc4a94e1..33c2bf57749c79190c0eff3ce50bdecc1a74ddc2 100644
--- a/tutorials/multicore/mp101_fillNtuples.C
+++ b/tutorials/multicore/mp101_fillNtuples.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup multicore
+/// \ingroup tutorial_multicore
 /// Fill n-tuples in distinct workers.
 /// This tutorial illustrates the basics of how it's possible with ROOT to
 /// offload heavy operations on multiple processes and how it's possible to write
diff --git a/tutorials/multicore/mp102_readNtuplesFillHistosAndFit.C b/tutorials/multicore/mp102_readNtuplesFillHistosAndFit.C
index d451ad6c6d5120c8e30666ee995ee5ae1d60fb2a..244d7ece574677858dcf5cec67cac37b58f07335 100644
--- a/tutorials/multicore/mp102_readNtuplesFillHistosAndFit.C
+++ b/tutorials/multicore/mp102_readNtuplesFillHistosAndFit.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup multicore
+/// \ingroup tutorial_multicore
 /// Read n-tuples in distinct workers, fill histograms, merge them and fit.
 /// We express parallelism with multiprocessing as it is done with multithreading
 /// in mt102_readNtuplesFillHistosAndFit.
diff --git a/tutorials/multicore/mt001_fillHistos.C b/tutorials/multicore/mt001_fillHistos.C
index 89352d4d2700b49cb1dfb3702d33c51acc8e9fbc..48cf08bde38d1ca95565d903cef5f7f4b677ad76 100644
--- a/tutorials/multicore/mt001_fillHistos.C
+++ b/tutorials/multicore/mt001_fillHistos.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup multicore
+/// \ingroup tutorial_multicore
 /// Fill histograms in parallel and write them on file.
 /// The simplest meaningful possible example which shows ROOT thread awareness.
 ///
diff --git a/tutorials/multicore/mt101_fillNtuples.C b/tutorials/multicore/mt101_fillNtuples.C
index b9b835ad15a7f6c3aa5ba7c7cb652ed841c84506..79f2ad38c7a98647de2cc4e5697ef45813dbfbff 100644
--- a/tutorials/multicore/mt101_fillNtuples.C
+++ b/tutorials/multicore/mt101_fillNtuples.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup multicore
+/// \ingroup tutorial_multicore
 /// Fill n-tuples in distinct workers.
 /// This tutorial illustrates the basics of how it's possible with ROOT to
 /// offload heavy operations on multiple threads and how it's possible to write
diff --git a/tutorials/multicore/mt102_readNtuplesFillHistosAndFit.C b/tutorials/multicore/mt102_readNtuplesFillHistosAndFit.C
index 4e565c8ffa2dd179a03e2a0e86278dfbc6a70e58..7c0aaa57018d52673f50ea0e82a45a4cfa5cb372 100644
--- a/tutorials/multicore/mt102_readNtuplesFillHistosAndFit.C
+++ b/tutorials/multicore/mt102_readNtuplesFillHistosAndFit.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup multicore
+/// \ingroup tutorial_multicore
 /// Read n-tuples in distinct workers, fill histograms, merge them and fit.
 /// Knowing that other facilities like TProcPool might be more adequate for
 /// this operation, this tutorial complements mc101, reading and merging.
diff --git a/tutorials/proof/EmptyInclude.h b/tutorials/proof/EmptyInclude.h
index 1e1d0013e36ffaf82656242684bed58ce5a081c1..1e826a39b871c01f48ea789c04378122dc9108f2 100644
--- a/tutorials/proof/EmptyInclude.h
+++ b/tutorials/proof/EmptyInclude.h
@@ -1,5 +1,5 @@
 /// \file EmptyInclude.h
-/// \ingroup proof
+/// \ingroup tutorial_proof
 ///
 /// Empty file to test TProof::Load in runProof.C and StressProof.cxx in
 /// conjunction with ProcFileElements and ProofEventProc .
diff --git a/tutorials/proof/ProcFileElements.C b/tutorials/proof/ProcFileElements.C
index d03c009e5e79288f4ed655233a00239f2337b480..d846679e2329e2bb0e266e8716017ef367f2c4df 100644
--- a/tutorials/proof/ProcFileElements.C
+++ b/tutorials/proof/ProcFileElements.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup ProcFileElements
+/// \ingroup tutorial_ProcFileElements
 ///
 /// Class to hold information about the processed elements of a file
 ///
diff --git a/tutorials/proof/ProcFileElements.h b/tutorials/proof/ProcFileElements.h
index f3302b4bef5faeb5cde82bfa1bbe84611d80eb4e..84568929cc93269719a3915d03dab75c8fddfd27 100644
--- a/tutorials/proof/ProcFileElements.h
+++ b/tutorials/proof/ProcFileElements.h
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup ProcFileElements
+/// \ingroup tutorial_ProcFileElements
 ///
 /// Class to hold information about the processed elements of a file
 ///
diff --git a/tutorials/proof/ProofAux.C b/tutorials/proof/ProofAux.C
index b55459676bf95cf1054cdd26507d711f9e3d06d8..0ebe2979d0a8d83a6e985db9b02345206091e0f1 100644
--- a/tutorials/proof/ProofAux.C
+++ b/tutorials/proof/ProofAux.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup ProofAux
+/// \ingroup tutorial_ProofAux
 ///
 /// Selector used for auxiliary actions in the PROOF tutorials
 ///
diff --git a/tutorials/proof/ProofAux.h b/tutorials/proof/ProofAux.h
index 1096489df585b5f01e8c7a568be38c6cc6746d21..36f7e8f2788b52d1f084e997dd6b71569becf1bd 100644
--- a/tutorials/proof/ProofAux.h
+++ b/tutorials/proof/ProofAux.h
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup ProofAux
+/// \ingroup tutorial_ProofAux
 ///
 /// Selector used for auxiliary actions in the PROOF tutorials
 ///
diff --git a/tutorials/proof/ProofEvent.C b/tutorials/proof/ProofEvent.C
index a14d3ca2bc5b69da50d40cd9cff1c13159ab6c62..a1e79387ac9a6dd35b9383b86cf1c60b0380c881 100644
--- a/tutorials/proof/ProofEvent.C
+++ b/tutorials/proof/ProofEvent.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup ProofEvent
+/// \ingroup tutorial_ProofEvent
 ///
 /// Selector for generic processing with Event
 ///
diff --git a/tutorials/proof/ProofEvent.h b/tutorials/proof/ProofEvent.h
index 11766b4341de68dfe662365813a0b8344c647159..6fc57f80426d221b0fcb7d665b279a7b9db020d3 100644
--- a/tutorials/proof/ProofEvent.h
+++ b/tutorials/proof/ProofEvent.h
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup ProofEvent
+/// \ingroup tutorial_ProofEvent
 ///
 /// Selector for generic processing with Event
 ///
diff --git a/tutorials/proof/ProofEventProc.C b/tutorials/proof/ProofEventProc.C
index 28f979e15b738bbfd3d65bbe28acde5511a5284e..61e07c20bbad90e612e7f904fc951af01992a4ac 100644
--- a/tutorials/proof/ProofEventProc.C
+++ b/tutorials/proof/ProofEventProc.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup ProofEventProc
+/// \ingroup tutorial_ProofEventProc
 ///
 /// Selector to process trees containing Event structures
 ///
diff --git a/tutorials/proof/ProofEventProc.h b/tutorials/proof/ProofEventProc.h
index 25ede2fe5d0d518cc7b6468a66f82120e11bab07..3000dac3fcdad31243cd3d974d2c60e5a3268606 100644
--- a/tutorials/proof/ProofEventProc.h
+++ b/tutorials/proof/ProofEventProc.h
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup ProofEventProc
+/// \ingroup tutorial_ProofEventProc
 ///
 /// Selector to process trees containing Event structures
 ///
diff --git a/tutorials/proof/ProofFriends.C b/tutorials/proof/ProofFriends.C
index 3543ba4696b36673213d843001c20f8314280316..f05de2486b944af820a58a54795ac12e089832df 100644
--- a/tutorials/proof/ProofFriends.C
+++ b/tutorials/proof/ProofFriends.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup ProofFriends
+/// \ingroup tutorial_ProofFriends
 ///
 /// Selector to process tree friends
 ///
diff --git a/tutorials/proof/ProofFriends.h b/tutorials/proof/ProofFriends.h
index 94fdea414da7a48173932a92448e1fc954db93ff..71368d8b2b63520e589e237f07b19cda5160a9a9 100644
--- a/tutorials/proof/ProofFriends.h
+++ b/tutorials/proof/ProofFriends.h
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup ProofFriends
+/// \ingroup tutorial_ProofFriends
 ///
 /// Selector to process tree friends
 ///
diff --git a/tutorials/proof/ProofNtuple.C b/tutorials/proof/ProofNtuple.C
index 3ceee1cad5f5b6c1930c944b7cce48ad716dad7b..ba5c36869a824e6a0d2b574fa3a5bcb7d2b6a4ac 100644
--- a/tutorials/proof/ProofNtuple.C
+++ b/tutorials/proof/ProofNtuple.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup proofntuple
+/// \ingroup tutorial_proofntuple
 ///
 /// Selector to fill a simple ntuple
 ///
diff --git a/tutorials/proof/ProofNtuple.h b/tutorials/proof/ProofNtuple.h
index 7ac91a5b8dc482e10a1fa24e35639942cccb8e98..eef834a762cfc0e21405de2631f0e897fbee9523 100644
--- a/tutorials/proof/ProofNtuple.h
+++ b/tutorials/proof/ProofNtuple.h
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup proofntuple
+/// \ingroup tutorial_proofntuple
 ///
 /// Selector to fill a simple ntuple
 ///
diff --git a/tutorials/proof/ProofPythia.C b/tutorials/proof/ProofPythia.C
index 4c76151402c332f33693504da879f68618232ade..b247f7af68b26da6d69c00e46424891854c023ab 100644
--- a/tutorials/proof/ProofPythia.C
+++ b/tutorials/proof/ProofPythia.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup proofpythia
+/// \ingroup tutorial_proofpythia
 ///
 /// Selector to generate Monte Carlo events with Pythia8
 ///
diff --git a/tutorials/proof/ProofPythia.h b/tutorials/proof/ProofPythia.h
index 5ec6faad9f539cf4a67de39c0a3b8490c3ba3d68..003233b9317ed4cac9f2eee9323851a8da4e72ca 100644
--- a/tutorials/proof/ProofPythia.h
+++ b/tutorials/proof/ProofPythia.h
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup proofpythia
+/// \ingroup tutorial_proofpythia
 ///
 /// Selector to generate Monte Carlo events with Pythia8
 ///
diff --git a/tutorials/proof/ProofSimple.C b/tutorials/proof/ProofSimple.C
index 7bc857fd262fb112a09bc910dae3074951448e94..fa8c8abd99e414064baface509c2d2fb9d24f7d9 100644
--- a/tutorials/proof/ProofSimple.C
+++ b/tutorials/proof/ProofSimple.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup ProofSimple
+/// \ingroup tutorial_ProofSimple
 ///
 /// Selector to fill a set of histograms
 ///
diff --git a/tutorials/proof/ProofSimple.h b/tutorials/proof/ProofSimple.h
index c17501dc0d79c30b8440d19657af496d579f884f..e27651388e9b54e0182c1cd6d7c38352bb27d9d8 100644
--- a/tutorials/proof/ProofSimple.h
+++ b/tutorials/proof/ProofSimple.h
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup ProofSimple
+/// \ingroup tutorial_ProofSimple
 ///
 /// Selector to fill a set of histograms
 ///
diff --git a/tutorials/proof/ProofSimpleFile.C b/tutorials/proof/ProofSimpleFile.C
index 01c9ed3b8c8221d9d4a9ed8f8664d4ba6a3fbffa..c340077438a67592655d20240ea85dfa569ceccc 100644
--- a/tutorials/proof/ProofSimpleFile.C
+++ b/tutorials/proof/ProofSimpleFile.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup ProofSimpleFile
+/// \ingroup tutorial_ProofSimpleFile
 ///
 /// Selector to fill a set of histograms and merging via file
 ///
diff --git a/tutorials/proof/ProofSimpleFile.h b/tutorials/proof/ProofSimpleFile.h
index ad4d3b3278ffaab05f94817cea4f577bc6308ce1..e6c56cbab1151be82979d1dbf17b7e090494bd80 100644
--- a/tutorials/proof/ProofSimpleFile.h
+++ b/tutorials/proof/ProofSimpleFile.h
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup ProofSimpleFile
+/// \ingroup tutorial_ProofSimpleFile
 ///
 /// Selector to fill a set of histograms and merging via file
 ///
diff --git a/tutorials/proof/ProofStdVect.C b/tutorials/proof/ProofStdVect.C
index d4607e94d9679b98090d82d9d46f76ac69e8dec1..e8799d5ffa157b2cab88c8be9b4086f7a08574be 100644
--- a/tutorials/proof/ProofStdVect.C
+++ b/tutorials/proof/ProofStdVect.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup ProofStdVec
+/// \ingroup tutorial_ProofStdVec
 ///
 /// Selector for generic processing with stdlib collections
 ///
diff --git a/tutorials/proof/ProofStdVect.h b/tutorials/proof/ProofStdVect.h
index baa3c74f425b9a1575783ffc0c05442ddc6207e1..b82b378b8eb1c1547d12e71e4c5605fdc0ac5a9f 100644
--- a/tutorials/proof/ProofStdVect.h
+++ b/tutorials/proof/ProofStdVect.h
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup ProofStdVec
+/// \ingroup tutorial_ProofStdVec
 ///
 /// Selector for generic processing with stdlib collections
 ///
diff --git a/tutorials/proof/ProofTests.C b/tutorials/proof/ProofTests.C
index 3cad58cd68b4917f8ca7191a94c8ea484ea3da38..af95b4cffe2d8891b1f8847597abd751e2c721d9 100644
--- a/tutorials/proof/ProofTests.C
+++ b/tutorials/proof/ProofTests.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup ProofTests
+/// \ingroup tutorial_ProofTests
 ///
 /// Auxilliary selector used to test PROOF functionality
 ///
diff --git a/tutorials/proof/ProofTests.h b/tutorials/proof/ProofTests.h
index f77b0c4502fd313e38a0fa508acce2bad15dfd7e..f3d7487af9f55763674920fe17ad7de867890182 100644
--- a/tutorials/proof/ProofTests.h
+++ b/tutorials/proof/ProofTests.h
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup ProofTests
+/// \ingroup tutorial_ProofTests
 ///
 /// Auxilliary selector used to test PROOF functionality
 ///
diff --git a/tutorials/proof/finalizeProof.C b/tutorials/proof/finalizeProof.C
index e31ee5b025fd492edf7b79f0b18d0883e861dc21..5e396a312ad6daab59b70a7441010982df27b288 100644
--- a/tutorials/proof/finalizeProof.C
+++ b/tutorials/proof/finalizeProof.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup proof
+/// \ingroup tutorial_proof
 ///
 /// Macro to finalize queries run with the macro tutorials/runProof .
 /// This macro uses an existing PROOF session or starts one at the indicated URL.
diff --git a/tutorials/proof/getProof.C b/tutorials/proof/getProof.C
index bf5a259882d746a3233cf18f4be3325532913c07..37dde67c2e3033ae7c3739cc0265f25de2031aa8 100644
--- a/tutorials/proof/getProof.C
+++ b/tutorials/proof/getProof.C
@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup proof
+/// \ingroup tutorial_proof
 ///
 /// Attaches to a PROOF session, possibly at the indicated URL.
 /// If no existing PROOF session is found and no URL is given,