diff --git a/AtlasTest/PyAthenaTests/share/pyevtinfo_jobOptions.py b/AtlasTest/PyAthenaTests/share/pyevtinfo_jobOptions.py
index cab229359b2f4b6ff76c125660218ebf8f7e5424..528426b21572561eca17728948b4f6549038e8df 100644
--- a/AtlasTest/PyAthenaTests/share/pyevtinfo_jobOptions.py
+++ b/AtlasTest/PyAthenaTests/share/pyevtinfo_jobOptions.py
@@ -1,5 +1,5 @@
 ## @file PyAthenaTests/share/pyevtinfo_jobOptions.py
-## @purpose read a POOL file and dump/print out run and event numbers
+## @brief read a POOL file and dump/print out run and event numbers
 
 ###########################
 if not 'EVTMAX' in dir():
diff --git a/AtlasTest/PyAthenaTests/share/pyfilter_stream_jobOptions.py b/AtlasTest/PyAthenaTests/share/pyfilter_stream_jobOptions.py
index 0445f01ddce08210139e2dd32ac92ae362fc6b8c..f5cb23509122052da600e0ede7f6a34697e1ebf2 100644
--- a/AtlasTest/PyAthenaTests/share/pyfilter_stream_jobOptions.py
+++ b/AtlasTest/PyAthenaTests/share/pyfilter_stream_jobOptions.py
@@ -1,5 +1,5 @@
 ## @file PyAthenaTests/share/pyfilter_stream_jobOptions.py
-## @purpose read a POOL file and dump/print out run and event numbers and filter
+## @brief read a POOL file and dump/print out run and event numbers and filter
 ##          out one event out of 2
 
 ###########################
diff --git a/AtlasTest/PyAthenaTests/share/pythin_basic_jobOptions.py b/AtlasTest/PyAthenaTests/share/pythin_basic_jobOptions.py
index 284171126883f1af81253d7a89d6af6383a7a56f..a94453578238f50a75b1d3b88c63207f6ae56e12 100644
--- a/AtlasTest/PyAthenaTests/share/pythin_basic_jobOptions.py
+++ b/AtlasTest/PyAthenaTests/share/pythin_basic_jobOptions.py
@@ -1,5 +1,5 @@
 ## @file PyAthenaTests/share/pythin_basic_jobOptions.py
-## @purpose read a POOL file and thin out some elements
+## @brief read a POOL file and thin out some elements
 
 ###############################################
 if not 'EVTMAX' in dir():
diff --git a/AtlasTest/PyAthenaTests/share/pythin_jobOptions.py b/AtlasTest/PyAthenaTests/share/pythin_jobOptions.py
index 1bf111cbcc39194dfc8c0b8a7fcc6b8e0929f3bd..7aace9036124abbd621348b1c177d731349978a1 100644
--- a/AtlasTest/PyAthenaTests/share/pythin_jobOptions.py
+++ b/AtlasTest/PyAthenaTests/share/pythin_jobOptions.py
@@ -1,5 +1,5 @@
 ## @file PyAthenaTests/share/pythin_jobOptions.py
-## @purpose read an AOD POOL file and thin out some elements
+## @brief read an AOD POOL file and thin out some elements
 
 if not 'EVTMAX' in dir():
     EVTMAX=-1
diff --git a/AtlasTest/PyAthenaTests/share/pythin_mctruth_jobOptions.py b/AtlasTest/PyAthenaTests/share/pythin_mctruth_jobOptions.py
index 465624c65b22bd4a9ca098a266caa27dc38bec0a..27da11948df88f5fef3c85330ae486bf94fa7915 100644
--- a/AtlasTest/PyAthenaTests/share/pythin_mctruth_jobOptions.py
+++ b/AtlasTest/PyAthenaTests/share/pythin_mctruth_jobOptions.py
@@ -1,5 +1,5 @@
 ## @file PyAthenaTests/share/pythin_mctruth_jobOptions.py
-## @purpose read an AOD POOL file and slim the truth
+## @brief read an AOD POOL file and slim the truth
 
 ###################################
 if not 'EVTMAX' in dir():
diff --git a/AtlasTest/PyAthenaTests/share/pythin_multistream_checker_jobOptions.py b/AtlasTest/PyAthenaTests/share/pythin_multistream_checker_jobOptions.py
index 09cbf29ed3dc605dd3e71c87d9c8758b8109a784..98198e4b52c2270c16180c38c1263c39f3870e13 100644
--- a/AtlasTest/PyAthenaTests/share/pythin_multistream_checker_jobOptions.py
+++ b/AtlasTest/PyAthenaTests/share/pythin_multistream_checker_jobOptions.py
@@ -1,5 +1,5 @@
 ## @file PyAthenaTests/share/pythin_multistream_checker_jobOptions.py
-## @purpose read a POOL file and inspect possibly thinned containers
+## @brief read a POOL file and inspect possibly thinned containers
 
 ###############################################
 if not 'EVTMAX' in dir():
diff --git a/AtlasTest/PyAthenaTests/share/pythin_multistream_jobOptions.py b/AtlasTest/PyAthenaTests/share/pythin_multistream_jobOptions.py
index 4b361bbba68c317d9709a24e1165d90b926fc33c..ef7612b239b9a060b323faaf52e0fa3f75f4ea77 100644
--- a/AtlasTest/PyAthenaTests/share/pythin_multistream_jobOptions.py
+++ b/AtlasTest/PyAthenaTests/share/pythin_multistream_jobOptions.py
@@ -1,5 +1,5 @@
 ## @file PyAthenaTests/share/pythin_multistream_jobOptions.py
-## @purpose read a POOL file and thin out some elements
+## @brief read a POOL file and thin out some elements
 
 ###############################################
 if not 'EVTMAX' in dir():
diff --git a/Control/AthenaCommon/python/AthenaCommonFlags.py b/Control/AthenaCommon/python/AthenaCommonFlags.py
index 95d73b58dfa7cac9891999e1305a4c3288132b34..f7fd798b37de0475266cd3611df68194f95a7c11 100755
--- a/Control/AthenaCommon/python/AthenaCommonFlags.py
+++ b/Control/AthenaCommon/python/AthenaCommonFlags.py
@@ -2,7 +2,7 @@
 
 ##
 ## @file AthenaCommon/python/AthenaCommonFlags.py
-## @purpose Python module to hold common flags to configure JobOptions
+## @brief Python module to hold common flags to configure JobOptions
 ##
 
 """ AthenaCommonFlags
diff --git a/Control/AthenaCommon/python/GlobalFlags.py b/Control/AthenaCommon/python/GlobalFlags.py
index 22d8e6066a455c7ed8f96b0626fecffe794840e1..01e89dee556f7a08f7a42fc7e26e8357de3af104 100755
--- a/Control/AthenaCommon/python/GlobalFlags.py
+++ b/Control/AthenaCommon/python/GlobalFlags.py
@@ -3,7 +3,7 @@
 ###############################################################################
 ##
 ## @file AthenaCommon/python/GlobalFlags.py
-## @purpose Python module to hold common flags to configure JobOptions
+## @brief Python module to hold common flags to configure JobOptions
 ##
 
 """ GlobalFlags
diff --git a/Control/AthenaCommon/python/PoolInputFileListBase.py b/Control/AthenaCommon/python/PoolInputFileListBase.py
index e212a5ad63f9564de90f32cef25a828143614145..b0de7815ea172b9198c10b8eba2a018d4c25f6fb 100644
--- a/Control/AthenaCommon/python/PoolInputFileListBase.py
+++ b/Control/AthenaCommon/python/PoolInputFileListBase.py
@@ -2,7 +2,7 @@
 
 ##
 ## @file AthenaCommon/python/PoolInputFileListBase.py
-## @purpose base class for POOL input file list properties
+## @brief base class for POOL input file list properties
 ##
 from JobProperties import JobProperty
 class PoolInputFileListBase(JobProperty):
diff --git a/DataQuality/dqm_algorithms/dqm_algorithms/GrubbsOutlierTest.h b/DataQuality/dqm_algorithms/dqm_algorithms/GrubbsOutlierTest.h
index fc166236cbf68a4e6dfada22e352fa66c4cc92e9..e1c7e1473b9b08cc8f913c6c7a998a7bde4cfa0f 100644
--- a/DataQuality/dqm_algorithms/dqm_algorithms/GrubbsOutlierTest.h
+++ b/DataQuality/dqm_algorithms/dqm_algorithms/GrubbsOutlierTest.h
@@ -4,7 +4,7 @@
 
 /*! \file GrubbsOutlierTest.h
  *  \author Venkatesh Kaushik <venkat.kaushik@cern.ch>
- *  \identify outlier-bins in 1d histogram
+ *  @brief outlier-bins in 1d histogram
 */
 
 #ifndef DQM_ALGORITHMS_GRUBBSOUTLIERTEST_H
diff --git a/DataQuality/dqm_algorithms/src/Chi2Test_2D.cxx b/DataQuality/dqm_algorithms/src/Chi2Test_2D.cxx
index 3ff8c0920fdd7606eb01638f98264e8af38f2311..f046b4aea7d48a00a927cf9107e874fd76936cce 100644
--- a/DataQuality/dqm_algorithms/src/Chi2Test_2D.cxx
+++ b/DataQuality/dqm_algorithms/src/Chi2Test_2D.cxx
@@ -4,7 +4,7 @@
 
 /*! \file Chi2Test_2D.cxx does Chi2Test on a 2D histogram, and also returns the positions of the highest outlying bins; returns dqm_core::Result
  //result is based on the number of outlying bins above NSigma, not on the chisq/ndf value
- \Written by Ian Moult
+ @author Ian Moult
  */
 
 #include <dqm_core/AlgorithmConfig.h>
diff --git a/DataQuality/dqm_algorithms/src/GrubbsOutlierTest.cxx b/DataQuality/dqm_algorithms/src/GrubbsOutlierTest.cxx
index 992a3c3fecbd1fc8428cc39bcce92d75a7c9c0ae..a8f4c434397ce4148707d4ac0f1e03aabbfaecad 100644
--- a/DataQuality/dqm_algorithms/src/GrubbsOutlierTest.cxx
+++ b/DataQuality/dqm_algorithms/src/GrubbsOutlierTest.cxx
@@ -3,7 +3,7 @@
 */
 
 /*! \file GrubbsOutlierTest.cxx
- *  \description Determine outliers at a given significance level by defining the Grubbs test
+ *               Determine outliers at a given significance level by defining the Grubbs test
  *               statistic, and finding out the probability of each bin being an outlier. The
  *               critical value is computed for each bin and the probability is estimated 
  *               using the two tailed students T distribution. If the probability for a given bin 
diff --git a/Database/EventIndex/EventIndexProducer/share/POOL2EI_joboptions.py b/Database/EventIndex/EventIndexProducer/share/POOL2EI_joboptions.py
index cca8d21443fc531b76d1ed6deff2082d53d33a7b..0c63aeb12276a8ce2f0d8b7a61ed5bcad0e9bf88 100644
--- a/Database/EventIndex/EventIndexProducer/share/POOL2EI_joboptions.py
+++ b/Database/EventIndex/EventIndexProducer/share/POOL2EI_joboptions.py
@@ -1,5 +1,5 @@
 ## @file: POOL2EI_joboptions.py
-## @purpose: simple joboptions to convert AOD to EI
+## @brief: simple joboptions to convert AOD to EI
 ## @date Feb 2014
 ## @author Javier Sanchez <Javier.Sanchez@ific.uv.es>
 
diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/python/GeoModelInit.py b/DetectorDescription/GeoModel/AtlasGeoModel/python/GeoModelInit.py
index 0c2619d703f803f89662370ddd89b10450a290cd..8b1d7599900f606c0ffe6c6e4ada56fb09461a06 100755
--- a/DetectorDescription/GeoModel/AtlasGeoModel/python/GeoModelInit.py
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/python/GeoModelInit.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
 ## @file: AtlasGeoModel/python/GeoModelInit.py
-## @purpose: encapsulate GeoModel configuration
+## @brief: Encapsulate GeoModel configuration
  
 def _setupGeoModel():
     from AthenaCommon.JobProperties import jobproperties
diff --git a/Generators/McAsciiEventSelector/python/ReadMcAscii.py b/Generators/McAsciiEventSelector/python/ReadMcAscii.py
index cd32d8b7b3be3d9efdf0e8926e887aa6c9752555..a0bcb8fc0ec2c9ea2135de720e576399e96ce2be 100644
--- a/Generators/McAsciiEventSelector/python/ReadMcAscii.py
+++ b/Generators/McAsciiEventSelector/python/ReadMcAscii.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
 ## @file McAsciiEventSelector/python/ReadMcAscii.py
-## @purpose: install the McAsciiEventSelector
+## @brief: install the McAsciiEventSelector
 
 def _loadReadMcAscii():
     import AthenaCommon.AtlasUnixStandardJob
diff --git a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/python/InDetDxAODJobProperties.py b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/python/InDetDxAODJobProperties.py
index 42382ac57603c404facbdf9d65e930c17fc1effa..f245ac52029a301357e1ba65865f845bd4e5aee0 100644
--- a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/python/InDetDxAODJobProperties.py
+++ b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/python/InDetDxAODJobProperties.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
 ## @file InDetPrepRawDataToxAOD/python/InDetDxAODJobProperties.py
-## @purpose Python module to hold common flags to configure xAOD-making jobOptions
+## @brief Python module to hold common flags to configure xAOD-making jobOptions
 ##
 
 """ InDetDxAODJobProperties
diff --git a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/python/SCTxAODJobProperties.py b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/python/SCTxAODJobProperties.py
index 880fa370370893fe8f0d0e62bf3dc35bccc5efbb..8a8733d1a6a434636979852ec633801150fef59a 100644
--- a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/python/SCTxAODJobProperties.py
+++ b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/python/SCTxAODJobProperties.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
 ## @file InDetPrepRawDataToxAOD/python/SCTxAODJobProperties.py
-## @purpose Python module to hold common flags to configure SCT AxAOD-making jobOptions
+## @brief Python module to hold common flags to configure SCT AxAOD-making jobOptions
 ##
 
 """ SCTxAODJobProperties
diff --git a/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py b/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py
index 6eb14fe90fb4975dd3c2659fae2a672ef40a3a65..a8c0ce8fa77b61e2e20dd875cd44601af6ae5453 100644
--- a/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py
+++ b/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py
@@ -4,7 +4,7 @@
 
 #
 ## @file InDetRecExample/python/InDetJobProperties.py
-## @purpose Python module to hold common flags to configure JobOptions
+## @brief Python module to hold common flags to configure JobOptions
 ##
 
 """ InDetJobProperties
diff --git a/InnerDetector/InDetExample/InDetRecExample/python/InDetKeys.py b/InnerDetector/InDetExample/InDetRecExample/python/InDetKeys.py
index 59846379260f07c7553e174bc3c17388b6ed1e23..93697c9a775c486ae0ecf054a49297ae560d0fbf 100644
--- a/InnerDetector/InDetExample/InDetRecExample/python/InDetKeys.py
+++ b/InnerDetector/InDetExample/InDetRecExample/python/InDetKeys.py
@@ -2,7 +2,7 @@
 
 ##
 ## @file InDetRecExample/python/InDetKeys.py
-## @purpose Python module to hold common flags to configure JobOptions
+## @brief Python module to hold common flags to configure JobOptions
 ##
 
 """ InDetContainerKeys
diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigFlags.py b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigFlags.py
index 567fd29925f6d8c897ed38ee498b26015a15bb4e..d24a248b45383fcabd5f35890e99e76d140de0f1 100644
--- a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigFlags.py
+++ b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigFlags.py
@@ -2,7 +2,7 @@
 
 ##
 ## @file InDetTrigRecExample/python/InDetTrigFlags.py
-## @purpose link InDetTrigFlags to InDetTRigJobProperties container
+## @brief link InDetTrigFlags to InDetTRigJobProperties container
 ##          automate adding of certain InDetJobProperties
 
 """ InDetTrigFlags
diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigJobProperties.py b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigJobProperties.py
index ca79428eeca7bc09e6d9312e7a4b261af92b6849..d5a6313a879890b69ee5d0de89a097beaaf85476 100644
--- a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigJobProperties.py
+++ b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigJobProperties.py
@@ -2,7 +2,7 @@
 
 ##
 ## @file InDetTrigRecExample/python/InDetTrigJobProperties.py
-## @purpose Python module with InDetTrigJobProperties to hold
+## @brief Python module with InDetTrigJobProperties to hold
 ##          an independent configuration of EFID
 ##          some classes need to be duplicated from InDetJobProperties 
 
diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigSliceSettings.py b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigSliceSettings.py
index 26983ce462ec581b70dc1c8c1648910f929df167..1878e0f9e44f5b4da902871edfb20613f8b3274d 100644
--- a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigSliceSettings.py
+++ b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigSliceSettings.py
@@ -2,7 +2,6 @@
 
 ##
 ## @file InDetTrigRecExample/python/InDetTrigSliceSettings.py
-## @purpose 
 ##
 ##
 
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonFlags/python/MuonDQAProperFlags.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonFlags/python/MuonDQAProperFlags.py
index b61bdd314df4751c959974022f2dbcaf6eeb8790..07bccdde4927e7cb2aecbded1a8ea0d632e5527c 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonFlags/python/MuonDQAProperFlags.py
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonFlags/python/MuonDQAProperFlags.py
@@ -2,7 +2,7 @@
 
 ##
 ## @file MuonDQAMonFlags/python/MuonDQAProperFlags.py
-## @purpose Python module to hold common flags to configure JobOptions
+## @brief Python module to hold common flags to configure JobOptions
 ##
 
 """ MuonDQAProperFlags
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/python/MuonD3PDMakerFlags.py b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/python/MuonD3PDMakerFlags.py
index 99526390656fa8110ccf4715bcfbdbc0b1c58439..0b5521b9b60cad7389b467d46ded8a363ffbfc95 100644
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/python/MuonD3PDMakerFlags.py
+++ b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/python/MuonD3PDMakerFlags.py
@@ -2,7 +2,7 @@
 
 # 
 ## @file MuonD3PDMaker/python/MuonD3PDMakerFlags.py
-## @purpose Python module to hold common flags to configure MuonD3PDMaker JobOptions
+## @brief Python module to hold common flags to configure MuonD3PDMaker JobOptions
 ##
 
 
diff --git a/PhysicsAnalysis/D3PDMaker/TrackD3PDMaker/python/TrackD3PDMakerFlags.py b/PhysicsAnalysis/D3PDMaker/TrackD3PDMaker/python/TrackD3PDMakerFlags.py
index 5c10b65e2643798a379d70baaacb71af9c439da1..04d2b3726108fd171a02e86b7ecc759937d297d6 100644
--- a/PhysicsAnalysis/D3PDMaker/TrackD3PDMaker/python/TrackD3PDMakerFlags.py
+++ b/PhysicsAnalysis/D3PDMaker/TrackD3PDMaker/python/TrackD3PDMakerFlags.py
@@ -2,7 +2,7 @@
 
 # 
 ## @file TrackD3PDMaker/python/TrackD3PDMakerFlags.py
-## @purpose Python module to hold common flags to configure TrackD3PDMaker JobOptions
+## @brief Python module to hold common flags to configure TrackD3PDMaker JobOptions
 ##
 
 
diff --git a/PhysicsAnalysis/D3PDMaker/TrackD3PDMaker/python/TrackD3PDMakerPixelFlags.py b/PhysicsAnalysis/D3PDMaker/TrackD3PDMaker/python/TrackD3PDMakerPixelFlags.py
index 411e8d04975d390df5ab7d5e330a4e6ea7df9fef..a2c7d46f02246e495f522a7f6b679c1c32bdbb1b 100644
--- a/PhysicsAnalysis/D3PDMaker/TrackD3PDMaker/python/TrackD3PDMakerPixelFlags.py
+++ b/PhysicsAnalysis/D3PDMaker/TrackD3PDMaker/python/TrackD3PDMakerPixelFlags.py
@@ -2,7 +2,7 @@
 
 # 
 ## @file TrackD3PDMaker/python/TrackD3PDMakerPixelFlags.py
-## @purpose Python module to hold common flags to configure TrackD3PDMaker PixelNtuple JobOptions
+## @brief Python module to hold common flags to configure TrackD3PDMaker PixelNtuple JobOptions
 ##
 
 
diff --git a/PhysicsAnalysis/D3PDMaker/TrackD3PDMaker/python/TrackD3PDMakerSCTFlags.py b/PhysicsAnalysis/D3PDMaker/TrackD3PDMaker/python/TrackD3PDMakerSCTFlags.py
index 17fe10deccfb5e892de1b5e58fcf165208e21b3d..4f24374f879dcd253353602d46eec0940b5b7bf3 100644
--- a/PhysicsAnalysis/D3PDMaker/TrackD3PDMaker/python/TrackD3PDMakerSCTFlags.py
+++ b/PhysicsAnalysis/D3PDMaker/TrackD3PDMaker/python/TrackD3PDMakerSCTFlags.py
@@ -2,7 +2,7 @@
 
 # 
 ## @file TrackD3PDMaker/python/TrackD3PDMakerSCTFlags.py
-## @purpose Python module to hold common flags to configure TrackD3PDMaker SCTNtuple JobOptions
+## @brief Python module to hold common flags to configure TrackD3PDMaker SCTNtuple JobOptions
 ##
 
 
diff --git a/PhysicsAnalysis/D3PDMaker/TrackD3PDMaker/src/SCTTrackParticleToMuonAssociationTool.h b/PhysicsAnalysis/D3PDMaker/TrackD3PDMaker/src/SCTTrackParticleToMuonAssociationTool.h
index 65c398cc4b64a5643907ccef670520ea6544bf98..7a2730050ce168c7801885be31e78bd115bf907d 100644
--- a/PhysicsAnalysis/D3PDMaker/TrackD3PDMaker/src/SCTTrackParticleToMuonAssociationTool.h
+++ b/PhysicsAnalysis/D3PDMaker/TrackD3PDMaker/src/SCTTrackParticleToMuonAssociationTool.h
@@ -4,7 +4,7 @@
 
 /**
  * @file D3PDMaker/TrackD3PDMaker/src/SCTTrackParticleToMuonAssociationTool.cxx
- * @contact <laura.rehnisch@cern.ch>
+ * @author <laura.rehnisch@cern.ch>
  * @date Nov, 2012
  * @brief setting up an association of trackparticles
  *        and muons.
diff --git a/PhysicsAnalysis/D3PDMaker/TrackD3PDMaker/src/TrackParticleToPixelClusterAssociationTool.h b/PhysicsAnalysis/D3PDMaker/TrackD3PDMaker/src/TrackParticleToPixelClusterAssociationTool.h
index 618498c545f826eb97f479c05fdde9d985b5b18d..4ad6c8b7f1b1301dbefbcf689842e8ba50671b99 100644
--- a/PhysicsAnalysis/D3PDMaker/TrackD3PDMaker/src/TrackParticleToPixelClusterAssociationTool.h
+++ b/PhysicsAnalysis/D3PDMaker/TrackD3PDMaker/src/TrackParticleToPixelClusterAssociationTool.h
@@ -4,7 +4,7 @@
 
 /**
 * @file D3PDMaker/TrackD3PDMaker/src/TrackParticleToPixelClusterAssociationTool.cxx
-* @contact <yuriy.pylypchenko@cern.ch>
+* @author <yuriy.pylypchenko@cern.ch>
 * @date Oct, 2010
 * @brief setting up an association of tracks to clusters
 *        represented by indices. 
diff --git a/PhysicsAnalysis/D3PDMaker/TrackD3PDMaker/src/TrackParticleToSCTClusterAssociationTool.h b/PhysicsAnalysis/D3PDMaker/TrackD3PDMaker/src/TrackParticleToSCTClusterAssociationTool.h
index acf36a476421326127d4998a02cc837065a79bff..673badee817a56367acb2f38e6217ef5a9c86d2c 100644
--- a/PhysicsAnalysis/D3PDMaker/TrackD3PDMaker/src/TrackParticleToSCTClusterAssociationTool.h
+++ b/PhysicsAnalysis/D3PDMaker/TrackD3PDMaker/src/TrackParticleToSCTClusterAssociationTool.h
@@ -4,7 +4,7 @@
 
 /**
 * @file D3PDMaker/TrackD3PDMaker/src/TrackParticleToSCTClusterAssociationTool.cxx
-* @contact <yuriy.pylypchenko@cern.ch>
+* @author <yuriy.pylypchenko@cern.ch>
 * @date Oct, 2010
 * @brief setting up an association of tracks to clusters
 *        represented by indices. 
diff --git a/PhysicsAnalysis/PanTauAnalysis/python/PanTauDPDFlags.py b/PhysicsAnalysis/PanTauAnalysis/python/PanTauDPDFlags.py
index 37805132fca38530fdc14abbb14e31c3d73ff39c..fa6c3ac3e59649461d0d42d01fc6003ec6b9a2e9 100644
--- a/PhysicsAnalysis/PanTauAnalysis/python/PanTauDPDFlags.py
+++ b/PhysicsAnalysis/PanTauAnalysis/python/PanTauDPDFlags.py
@@ -2,7 +2,7 @@
 
 ##
 ## @file PanTauAnalysis/python/PanTauDPDFlags.py
-## @purpose Python module to hold common flags to configure PanTau DPD writing
+## @brief Python module to hold common flags to configure PanTau DPD writing
 ##
 
 """ PanTauDPDFlags
diff --git a/PhysicsAnalysis/PanTauAnalysis/python/PanTauFlags.py b/PhysicsAnalysis/PanTauAnalysis/python/PanTauFlags.py
index aa73fa94b293302edb43c463ef4f46b7959bf8fc..de3612ea3c178a26b0b5b3db94c98a683adc0052 100644
--- a/PhysicsAnalysis/PanTauAnalysis/python/PanTauFlags.py
+++ b/PhysicsAnalysis/PanTauAnalysis/python/PanTauFlags.py
@@ -2,7 +2,7 @@
 
 ##
 ## @file PanTauAnalysis/python/PanTauFlags.py
-## @purpose Python module to hold common flags to configure PanTau
+## @brief Python module to hold common flags to configure PanTau
 ##
 
 """ PanTauFlags
diff --git a/PhysicsAnalysis/PanTauAnalysis/python/PanTauSeedBuilderAlg_Flags.py b/PhysicsAnalysis/PanTauAnalysis/python/PanTauSeedBuilderAlg_Flags.py
index 5bef3979aacedf3a74cb2832e8005f7b60574ddc..e1369afdeaaf3c5ea63d21791906f3f26a177a35 100644
--- a/PhysicsAnalysis/PanTauAnalysis/python/PanTauSeedBuilderAlg_Flags.py
+++ b/PhysicsAnalysis/PanTauAnalysis/python/PanTauSeedBuilderAlg_Flags.py
@@ -2,7 +2,7 @@
 
 ##
 ## @file PanTauAnalysis/python/PanTauSeedBuilderAlg_Flags.py
-## @purpose Python module to hold the flags that configure the TauSeedBuilderAlg
+## @brief Python module to hold the flags that configure the TauSeedBuilderAlg
 ##
 
 """ PanTauSeedBuilderAlg_Flags
diff --git a/PhysicsAnalysis/PanTauAnalysis/python/PanTauValidationFlags.py b/PhysicsAnalysis/PanTauAnalysis/python/PanTauValidationFlags.py
index 291b6b5150ff505da79c927989027eac582de8c6..6e9af42ee340a66d956caabae0d20bf88c99cc6b 100644
--- a/PhysicsAnalysis/PanTauAnalysis/python/PanTauValidationFlags.py
+++ b/PhysicsAnalysis/PanTauAnalysis/python/PanTauValidationFlags.py
@@ -2,7 +2,7 @@
 
 ##
 ## @file PanTauAnalysis/python/PanTauValidationFlags.py
-## @purpose Python module to hold common flags to configure PanTau validation
+## @brief Python module to hold common flags to configure PanTau validation
 ##
 
 """ PanTauValidationFlags
diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedKeys.py b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedKeys.py
index 32ab48066546372cbe8472294c99b0441e486a03..2a9e05409343ee142b799563e99cad8cd864af4f 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedKeys.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedKeys.py
@@ -2,7 +2,7 @@
 
 ##
 ## @file MuonCombinedRecExample/python/MuonCombinedKeys.py
-## @purpose Python module to hold uniform collection names for muon combined reconstruction
+## @brief Python module to hold uniform collection names for muon combined reconstruction
 ##
 
 """ MuonCombinedContainerKeys
diff --git a/Simulation/ISF/ISF_Config/python/ISF_jobProperties.py b/Simulation/ISF/ISF_Config/python/ISF_jobProperties.py
index 00c35dd789113d82fe853c72310da5190d69c3d7..114852f062059cf2ad23f435a3b4d04c626a0efd 100644
--- a/Simulation/ISF/ISF_Config/python/ISF_jobProperties.py
+++ b/Simulation/ISF/ISF_Config/python/ISF_jobProperties.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
 ## @file ISF_Config/python/ISF_jobProperties.py
-## @purpose Python module to hold common flags to configure JobOptions
+## @brief Python module to hold common flags to configure JobOptions
 ##
 
 """ ISF_jobProperties
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/python/ISF_NativeFastCaloSimJobProperties.py b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/python/ISF_NativeFastCaloSimJobProperties.py
index 27c63982094d8755852979de1bfd30d4da212cc9..0026b722c1bff8e4394d1fb6ae11f41ba6f8ff23 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/python/ISF_NativeFastCaloSimJobProperties.py
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/python/ISF_NativeFastCaloSimJobProperties.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
 ## @file ISF_NativeFastCaloSimJobProperties.py
-## @purpose Python module to hold common flags to configure JobOptions
+## @brief Python module to hold common flags to configure JobOptions
 ##
 
 """ ISF_NativeFastCaloSimJobProperties
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/python/ISF_FastCaloSimJobProperties.py b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/python/ISF_FastCaloSimJobProperties.py
index 770d62e26f929eac90f3de308773dec1c39fc3c4..e19d1e039b11b660f93536e24e9b6b7f8100867d 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/python/ISF_FastCaloSimJobProperties.py
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/python/ISF_FastCaloSimJobProperties.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
 ## @file ISF_FastCaloSimJobProperties.py
-## @purpose Python module to hold common flags to configure JobOptions
+## @brief Python module to hold common flags to configure JobOptions
 ##
 
 """ ISF_FastCaloSimJobProperties
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/ISF_FatrasJobProperties.py b/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/ISF_FatrasJobProperties.py
index 29c4c5ee8ea518c15d927d5771e2c5ddc505929b..c8a5efcaa732b6b46209368315a65c2e5afc3b41 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/ISF_FatrasJobProperties.py
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/ISF_FatrasJobProperties.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
 ## @file ISF_FatrasJobProperties.py
-## @purpose Python module to hold common flags to configure JobOptions
+## @brief Python module to hold common flags to configure JobOptions
 ##
 
 """ ISF_FatrasJobProperties
diff --git a/Simulation/ISF/ISF_ParametricSim/ISF_ParSimServices/python/ISF_ParSimJobProperties.py b/Simulation/ISF/ISF_ParametricSim/ISF_ParSimServices/python/ISF_ParSimJobProperties.py
index 01513e170c5ebc257e6b2168034f100324a8409b..3de38efd15d5ab6845fd52c0a069cfa65a9539ac 100644
--- a/Simulation/ISF/ISF_ParametricSim/ISF_ParSimServices/python/ISF_ParSimJobProperties.py
+++ b/Simulation/ISF/ISF_ParametricSim/ISF_ParSimServices/python/ISF_ParSimJobProperties.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
 ## @file ISF_ParSimJobProperties.py
-## @purpose Python module to hold common flags to configure JobOptions
+## @brief Python module to hold common flags to configure JobOptions
 ##
 
 __author__ = "Miha Muskinja"
diff --git a/Simulation/ISF/ISF_ParametricSim/ISF_ParSimServices/python/ISF_ParSimTuning.py b/Simulation/ISF/ISF_ParametricSim/ISF_ParSimServices/python/ISF_ParSimTuning.py
index eca0b82c9c04844e43ee44f503d7b7b790bafe50..9196b0f4bdc7668689dc0ff74b1376bed21bce80 100644
--- a/Simulation/ISF/ISF_ParametricSim/ISF_ParSimServices/python/ISF_ParSimTuning.py
+++ b/Simulation/ISF/ISF_ParametricSim/ISF_ParSimServices/python/ISF_ParSimTuning.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
 ## @file ISF_ParSimTuning.py
-## @purpose Python module to hold common flags to configure JobOptions
+## @brief Python module to hold common flags to configure JobOptions
 ##
 
 __author__ = "Miha Muskinja"
diff --git a/Tools/PyUtils/bin/checkPlugins.py b/Tools/PyUtils/bin/checkPlugins.py
index a11c87d91d422cc36b555a444e71ac290459b19c..516bf7714a48b01a6fdc1566a162c2bb876dde61 100755
--- a/Tools/PyUtils/bin/checkPlugins.py
+++ b/Tools/PyUtils/bin/checkPlugins.py
@@ -4,7 +4,7 @@
 
 ## @author: Sebastien Binet
 ## @file : checkPlugins.py
-## @purpose: a script to check the definitions of plugins across multiple
+## @brief: A script to check the definitions of plugins across multiple
 ##           so-called 'rootmap' files
 
 __version__ = "$Revision: 1.3 $"
diff --git a/Tools/PyUtils/bin/cmtClients.py b/Tools/PyUtils/bin/cmtClients.py
index 7145e110ab6131dfba3235e4db37f4a861e55f99..673aadafcb18e5de2ac447dcf24cb0cf7d569eeb 100755
--- a/Tools/PyUtils/bin/cmtClients.py
+++ b/Tools/PyUtils/bin/cmtClients.py
@@ -4,7 +4,7 @@
 
 ## @author: Sebastien Binet
 ## @file : cmtClients.py
-## @purpose: a little wrapper around cmt.exe show clients
+## @brief: A little wrapper around cmt.exe show clients
 
 __version__ = "$Revision: 1.4 $"
 __author__  = "Sebastien Binet"
diff --git a/Tools/PyUtils/bin/filter-and-merge-d3pd.py b/Tools/PyUtils/bin/filter-and-merge-d3pd.py
index 03dd855ecf33e35f2c31e813dd99cee0f60b1286..33d28d6120856766a16b1c937faa58d7ad902bec 100755
--- a/Tools/PyUtils/bin/filter-and-merge-d3pd.py
+++ b/Tools/PyUtils/bin/filter-and-merge-d3pd.py
@@ -751,7 +751,7 @@ Accepted command line options:
 
 ###################### xmldict #########################
 # @file PyUtils/python/xmldict.py
-# @purpose converts an XML file into a python dict, back and forth
+# @brief converts an XML file into a python dict, back and forth
 # @author http://code.activestate.com/recipes/573463
 #         slightly adapted to follow PEP8 conventions
 
diff --git a/Tools/PyUtils/bin/merge-poolfiles.py b/Tools/PyUtils/bin/merge-poolfiles.py
index 0ab80663164f6b40e7ee52720d72352f08259bed..a67fab07b6cd75bfeb7feeda03ef8bb4135e1ae7 100755
--- a/Tools/PyUtils/bin/merge-poolfiles.py
+++ b/Tools/PyUtils/bin/merge-poolfiles.py
@@ -2,7 +2,7 @@
 
 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 ## @file PyUtils/bin/merge-poolfiles.py
-## @purpose take a bunch of input pool files and produce a single one
+## @brief take a bunch of input pool files and produce a single one
 ##          autoconfiguration is (attempted to be) performed
 ## @author Sebastien Binet <binet@cern.ch>
 
diff --git a/Tracking/TrkDetDescr/TrkDetDescrSvc/python/TrkDetDescrJobProperties.py b/Tracking/TrkDetDescr/TrkDetDescrSvc/python/TrkDetDescrJobProperties.py
index 9b07943c456297cd557106670b2b0c1ad5cd7da3..ad424c733979d1d56c1f6fd2e57685324a80b847 100644
--- a/Tracking/TrkDetDescr/TrkDetDescrSvc/python/TrkDetDescrJobProperties.py
+++ b/Tracking/TrkDetDescr/TrkDetDescrSvc/python/TrkDetDescrJobProperties.py
@@ -2,7 +2,7 @@
 
 #
 ## @file TrkDetDescrSvc/python/TrkDetDescrJobProperties.py
-## @purpose Python module to hold common flags to configure JobOptions
+## @brief Python module to hold common flags to configure JobOptions
 ##
 
 """ TrkDetDescrJobProperties
diff --git a/Trigger/TrigAlgorithms/TrigMinBias/python/TrigMinBiasProperties.py b/Trigger/TrigAlgorithms/TrigMinBias/python/TrigMinBiasProperties.py
index 2c4bf8a49f4cb85276d91c408bc9beabe22bac5a..01a00dff4244fe4252122ffa616d9805352207e0 100644
--- a/Trigger/TrigAlgorithms/TrigMinBias/python/TrigMinBiasProperties.py
+++ b/Trigger/TrigAlgorithms/TrigMinBias/python/TrigMinBiasProperties.py
@@ -2,7 +2,7 @@
 
 ##
 ## @file Trigger/TrigAlgorithms/TrigMinBias/python/TrigMinBiasProperties.py
-## @purpose Python module to hold TrigHisto1D and TrigHisto2D histogram dimensions.  The dimensions are used to initialise the TrigMinBias algorithms and the associated monitoring.
+## @brief Python module to hold TrigHisto1D and TrigHisto2D histogram dimensions.  The dimensions are used to initialise the TrigMinBias algorithms and the associated monitoring.
 ##
 ## Adapted from AthenaCommonFlags.py
 ##
diff --git a/Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasProperties.py b/Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasProperties.py
index 36b80475a6f93fb76ed35700b1210f71e4caa243..706bb1496181b278ff04233ea9fc3ef659cdd6c9 100644
--- a/Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasProperties.py
+++ b/Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasProperties.py
@@ -2,7 +2,7 @@
 
 ##
 ## @file Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasProperties.py
-## @purpose Python module to hold TrigHisto1D and TrigHisto2D histogram dimensions.  The dimensions are used to initialise the TrigT2MinBias algorithms and the associated monitoring.
+## @brief Python module to hold TrigHisto1D and TrigHisto2D histogram dimensions.  The dimensions are used to initialise the TrigT2MinBias algorithms and the associated monitoring.
 ##
 ## Adapted from AthenaCommonFlags.py
 ##