diff --git a/AtlasTest/DatabaseTest/AthenaPoolDataModelTest/doc/packagedoc.h b/AtlasTest/DatabaseTest/AthenaPoolDataModelTest/doc/packagedoc.h
index 183bc09b8e4d267d996e28942afc16159689c997..afca61b198f5c42af5d17854538fe1ddbbec6b8c 100644
--- a/AtlasTest/DatabaseTest/AthenaPoolDataModelTest/doc/packagedoc.h
+++ b/AtlasTest/DatabaseTest/AthenaPoolDataModelTest/doc/packagedoc.h
@@ -3,7 +3,7 @@
 */
 
 /**
-@mainpage The AthenaPoolDataModelTest package
+@page AthenaPoolDataModelTest_page AthenaPoolDataModelTest package
  *
 @section AthenaPoolDataModelTest_@section purpose Purpose: Test ESD / AOD readability
  *
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/doc/packagedoc.h b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/doc/packagedoc.h
index 1cc01855d8655708e65e8e410b771f009a0b10f6..66fdba3351a1ff25403aafbf78930d7d13122e51 100644
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/doc/packagedoc.h
+++ b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/doc/packagedoc.h
@@ -3,7 +3,7 @@
 */
 
 /**
-@mainpage The AthenaPoolMultiTest package
+@page AthenaPoolMultiTest_page AthenaPoolMultiTest package
  *
  * @date 26 May 2009
  * @author J. Cranshaw
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTestAthenaPool/doc/packagedoc.h b/AtlasTest/DatabaseTest/AthenaPoolTestAthenaPool/doc/packagedoc.h
index bb343aba6c85039ced1793c858b29fb393f4c2f8..40e709cb28989e020c3498e0ea1c6399a7e77832 100644
--- a/AtlasTest/DatabaseTest/AthenaPoolTestAthenaPool/doc/packagedoc.h
+++ b/AtlasTest/DatabaseTest/AthenaPoolTestAthenaPool/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
  *
-@mainpage The AthenaPoolTestAthenaPool package
+@page AthenaPoolTestAthenaPool_page AthenaPoolTestAthenaPool package
  *
 @section AthenaPoolTestAthenaPool_@section purpose Purpose: POOL CONVERTERS
  * 
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTestData/doc/packagedoc.h b/AtlasTest/DatabaseTest/AthenaPoolTestData/doc/packagedoc.h
index 9dd6493700d2a8d3f857c7fb952323a38e59a926..c541bb64ffb153c27987b33415e8711f7648ad54 100644
--- a/AtlasTest/DatabaseTest/AthenaPoolTestData/doc/packagedoc.h
+++ b/AtlasTest/DatabaseTest/AthenaPoolTestData/doc/packagedoc.h
@@ -3,7 +3,7 @@
 */
 
 /**
-@mainpage The AthenaPoolTestData package
+@page AthenaPoolTestData_page AthenaPoolTestData package
  *
 @section AthenaPoolTestData_@section purpose Purpose: DATA DEFINITION
  *
diff --git a/Event/xAOD/xAODMissingET/doc/packagedoc.h b/Event/xAOD/xAODMissingET/doc/packagedoc.h
index cea439cc68ded4a8907fabcd45b94696509bfb5b..309609b9307d5d5f24e50a621b476247e4a28781 100644
--- a/Event/xAOD/xAODMissingET/doc/packagedoc.h
+++ b/Event/xAOD/xAODMissingET/doc/packagedoc.h
@@ -3,8 +3,8 @@
 /*
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
-
-@page xAODMissingET_page @mainpage Data objects for Missing Transverse Momentum reconstruction
+/**
+@page xAODMissingET_page Data objects for Missing Transverse Momentum reconstruction
  *
  *  @tableofcontents
  *
diff --git a/Generators/Prophecy4fControl/bin/LHEF.h b/Generators/Prophecy4fControl/bin/LHEF.h
index a65a9e667630734a3f8e313785162773e4208bc1..ddca237524b5d1bd8e2909444f73598ba1b71cc4 100644
--- a/Generators/Prophecy4fControl/bin/LHEF.h
+++ b/Generators/Prophecy4fControl/bin/LHEF.h
@@ -2884,7 +2884,7 @@ private:
     to try it on.
 */
 
-/**\mainpage Les Houches Event File
+/** \page LHEF_page Les Houches Event File
 
 Here are some example classes for reading and writing Les Houches
 Event Files according to the
diff --git a/LArCalorimeter/LArG4/LArG4FastSimSvc/doc/mainpage.h b/LArCalorimeter/LArG4/LArG4FastSimSvc/doc/mainpage.h
index 762d49811186a72be9cd47e405c1a3a8011bac8a..5d6ea59078c27b81e873c59c6a0c6b3e282df1a0 100644
--- a/LArCalorimeter/LArG4/LArG4FastSimSvc/doc/mainpage.h
+++ b/LArCalorimeter/LArG4/LArG4FastSimSvc/doc/mainpage.h
@@ -1,5 +1,5 @@
 /**
-@mainpage  LArG4FastSimSvc
+@page  LArG4FastSimSvc_page LArG4FastSimSvc
 @author Zach Marshall (zmarshal@caltech.edu)
 
 @section LArG4FastSimSvcIntro Introduction
diff --git a/LArCalorimeter/LArG4/LArG4H8SD/doc/MainPage.h b/LArCalorimeter/LArG4/LArG4H8SD/doc/MainPage.h
index 1a732116f3974be6f8044f6b805cca81be9d51a3..5b2f6906f75f4b693f286a2980682f396761c20c 100644
--- a/LArCalorimeter/LArG4/LArG4H8SD/doc/MainPage.h
+++ b/LArCalorimeter/LArG4/LArG4H8SD/doc/MainPage.h
@@ -5,7 +5,7 @@
 /**
 
 
-@mainpage
+@page H8TestBeamSimulation_page H8 Test Beam simulation
 
 This package contains various classes for H8 Test Beam simulation:
 
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonShowerShapeFudgeTool/ElectronPhotonShowerShapeFudgeTool/TElectronMCShifterTool.h b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonShowerShapeFudgeTool/ElectronPhotonShowerShapeFudgeTool/TElectronMCShifterTool.h
index fb019ae561db0f73aabf1dd86b99b045f60c4112..a8806611a644c1542d47d8869062c2b9483656ac 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonShowerShapeFudgeTool/ElectronPhotonShowerShapeFudgeTool/TElectronMCShifterTool.h
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonShowerShapeFudgeTool/ElectronPhotonShowerShapeFudgeTool/TElectronMCShifterTool.h
@@ -9,7 +9,7 @@
     @version 0.1
 */
 
-/*! \mainpage Instructions for the MC Shifting Tool.
+/*! \page MCShiftingToolInstructions_page Instructions for the MC Shifting Tool.
 
     This tool is used to shift Monte Carlo distributions to correct against some
     of the known problems in the simulation. These distributions are shifted by
diff --git a/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonEfficiencyCorrections/MuonEfficiencyCorrections/IMuonEfficiencyScaleFactors.h b/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonEfficiencyCorrections/MuonEfficiencyCorrections/IMuonEfficiencyScaleFactors.h
index 8b5d24a4a678664859f384dd073dc51cd165c0c6..dd37ac1fda4d33706a33fb31e88ca47ff5fb55b8 100644
--- a/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonEfficiencyCorrections/MuonEfficiencyCorrections/IMuonEfficiencyScaleFactors.h
+++ b/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonEfficiencyCorrections/MuonEfficiencyCorrections/IMuonEfficiencyScaleFactors.h
@@ -29,7 +29,7 @@
 #include <map>
 
 /**
- * @mainpage MuonEfficiencyCorrections
+ * @page MuonEfficiencyCorrections_page MuonEfficiencyCorrections
  *
  * This package provides information about the muon efficiency and the corresponding scale factors.
  *
diff --git a/PhysicsAnalysis/TauID/TauTrackEvent/doc/packagedoc.h b/PhysicsAnalysis/TauID/TauTrackEvent/doc/packagedoc.h
index cde95f123d5ffe7bf437f6bf932d0f1f7b69b5f4..ccd11381c0574f5bdf9d43a39bce8fe7ddf3f373 100644
--- a/PhysicsAnalysis/TauID/TauTrackEvent/doc/packagedoc.h
+++ b/PhysicsAnalysis/TauID/TauTrackEvent/doc/packagedoc.h
@@ -3,7 +3,7 @@
 */
 
 /**
-@mainpage The TauTrackEvent package
+@page TauTrackEvent_page TauTrackEvent package
  * The EDM class package for TauTrackTools.
  *
  * @author Sebastian.Fleischmann@cern.ch
diff --git a/Reconstruction/HeavyIonRec/HIJetRec/doc/packagedoc.h b/Reconstruction/HeavyIonRec/HIJetRec/doc/packagedoc.h
index 7780b2c2000edb50674f4568cc69a3d300f7e2ca..bb84f72eeeeceba9a8292505a1574468dfadac45 100644
--- a/Reconstruction/HeavyIonRec/HIJetRec/doc/packagedoc.h
+++ b/Reconstruction/HeavyIonRec/HIJetRec/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 ///
-@page HIJetRec_page \mainpage HIJetRec package
+@page HIJetRec_page HIJetRec package
 ///
 /// \author Aaron Angerami <angerami@cern.ch>
 /// \date Jan, 2015
diff --git a/Reconstruction/Jet/JetUtils/doc/mainpage b/Reconstruction/Jet/JetUtils/doc/mainpage
deleted file mode 100644
index 511ec1ce0b21a091e5773d355cb3f1f0d1ef50b6..0000000000000000000000000000000000000000
--- a/Reconstruction/Jet/JetUtils/doc/mainpage
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
-
-@mainpage JetUtils
-
-@author P.A. Delsart (delsart at lapp.in2p3 dot fr)
-
-@section Content
-
-JetUtils contain utilities and helper related to jets : managing JetCollections, kinematic functions, etc..
-
-
-See also JetRec package
-
-@htmlinclude used_packages.html
-
-@include requirements
-
-*/
diff --git a/Reconstruction/Jet/KtJet/src/packagedoc.h b/Reconstruction/Jet/KtJet/src/packagedoc.h
index c935c496ae76f1187e6f46ff427605801ff4313e..539d0b3963c95478683585deb57f2d17b6006a28 100644
--- a/Reconstruction/Jet/KtJet/src/packagedoc.h
+++ b/Reconstruction/Jet/KtJet/src/packagedoc.h
@@ -3,8 +3,8 @@
 */
 
 // Mainpage for doxygen documentation
-
-@page KtJet_page @mainpage package KtJet
+/**
+@page KtJet_page KtJet package
  *
  * @author  <a href="http://www.hep.ucl.ac.uk/~jmb">J.Butterworth</a>,&nbsp;  
  *          <a href="http://www.hep.ucl.ac.uk/~jpc">J.Couchman</a>,&nbsp;
diff --git a/Reconstruction/PanTau/PanTauEvent/doc/packagedoc.h b/Reconstruction/PanTau/PanTauEvent/doc/packagedoc.h
index dcaf1d85494e17d85c33242f730c80844478746c..02c77e79c6cb9bb16bd28a405316ea885bb8de8e 100644
--- a/Reconstruction/PanTau/PanTauEvent/doc/packagedoc.h
+++ b/Reconstruction/PanTau/PanTauEvent/doc/packagedoc.h
@@ -3,7 +3,7 @@
 */
 
 /**
-@mainpage The PanTauEvent package
+@page PanTauEvent_page PanTauEvent package
  * The EDM class package for PanTau.
  *
  * @author Sebastian.Fleischmann@cern.ch
diff --git a/Reconstruction/PanTau/PanTauInterfaces/doc/packagedoc.h b/Reconstruction/PanTau/PanTauInterfaces/doc/packagedoc.h
index f68afaf6ab94b1725f9f599183032344c216b9a9..49e0081bac843b52b035ef6aefd667db9541c1b0 100644
--- a/Reconstruction/PanTau/PanTauInterfaces/doc/packagedoc.h
+++ b/Reconstruction/PanTau/PanTauInterfaces/doc/packagedoc.h
@@ -3,7 +3,7 @@
 */
 
 /**
-@mainpage The PanTauInterfaces package
+@page PanTauInterfaces_page PanTauInterfaces package
  * The interface package for PanTau.
  *
  * @author Sebastian.Fleischmann@cern.ch
diff --git a/Reconstruction/PanTau/PanTauUtils/doc/packagedoc.h b/Reconstruction/PanTau/PanTauUtils/doc/packagedoc.h
index 147cd2438637c9dfd3a13881768db1a2ef97915b..f2192fd13aa1a6111a16666a0cd80e7cf5250ffb 100644
--- a/Reconstruction/PanTau/PanTauUtils/doc/packagedoc.h
+++ b/Reconstruction/PanTau/PanTauUtils/doc/packagedoc.h
@@ -3,7 +3,7 @@
 */
 
 /**
-@mainpage The PanTauUtils package
+@page PanTauUtils_page PanTauUtils package
  * The utils package for PanTau.
  *
  * @author Sebastian.Fleischmann@cern.ch
diff --git a/Tools/AlgorithmToolSetup/src/mainpage.templ b/Tools/AlgorithmToolSetup/src/mainpage.templ
index 60137ffd20ced0203f9dc10b34c12e777182d0b8..b388313a8152338cb42f2a164c83560126beaa68 100755
--- a/Tools/AlgorithmToolSetup/src/mainpage.templ
+++ b/Tools/AlgorithmToolSetup/src/mainpage.templ
@@ -1,5 +1,5 @@
 /**
-@mainpage @packageName@ Package
+@page PackageName_page PackageName (package)
 
 >> Please enter an overview of the created package here: What does it contain?
 
diff --git a/Tools/CoolDozer/doc/Mainpage.h b/Tools/CoolDozer/doc/Mainpage.h
index 21ada7ce05f05aa45e2a0a2bc103f541728dca3f..791f493a2ec90ce3242a73c306fe4684f3e6f142 100644
--- a/Tools/CoolDozer/doc/Mainpage.h
+++ b/Tools/CoolDozer/doc/Mainpage.h
@@ -3,7 +3,7 @@
 */
 
 /** 
- @mainpage CoolDozer
+ @page CoolDozer_page CoolDozer
  @author Krzysztof Daniel Ciba (Krzysztof.Ciba@NOSPAMagh.edu.pl)
  @brief Long term monitoring API for various test frameworks in the Atlas experiment. 
 
diff --git a/Trigger/TrigFTK/TrigFTKSim/doc/mainpage.dox b/Trigger/TrigFTK/TrigFTKSim/doc/mainpage.dox
index 4906788991e0f3138f23b1ac0e7629d66cf52285..ae8b6ee4b4a92e922fc844897520243f5814f7eb 100644
--- a/Trigger/TrigFTK/TrigFTKSim/doc/mainpage.dox
+++ b/Trigger/TrigFTK/TrigFTKSim/doc/mainpage.dox
@@ -1,5 +1,5 @@
 /**
-\mainpage TrigFTKSim documentation. 
+\page TrigFTKSim_page TrigFTKSim documentation. 
 
 \section sec_intro Introduction