diff --git a/GUI/coregui/Models/BeamAngleItems.cpp b/GUI/coregui/Models/BeamAngleItems.cpp
index 220f833979d6ffc0dbb7f16d46e937fac476e574..26936f33c1409bffc75cf345aea5d62eba8900e8 100644
--- a/GUI/coregui/Models/BeamAngleItems.cpp
+++ b/GUI/coregui/Models/BeamAngleItems.cpp
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/BeamWavelengthItem.cpp
-//! @brief     Implements class BeamWavelengthItem
+//! @file      coregui/Models/BeamAngleItems.cpp
+//! @brief     Implements class BeamAngleItems
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/coregui/Models/BeamAngleItems.h b/GUI/coregui/Models/BeamAngleItems.h
index f2364e21289f5d665d3c15e6252b1c2879a6bfe5..326aee022657c8bbd9d5d128fb45b5a05e90b043 100644
--- a/GUI/coregui/Models/BeamAngleItems.h
+++ b/GUI/coregui/Models/BeamAngleItems.h
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/BeamAngleItem.h
-//! @brief     Defines class BeamAngleItem
+//! @file      coregui/Models/BeamAngleItems.h
+//! @brief     Defines class BeamAngleItems
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/coregui/Models/DetectorItems.cpp b/GUI/coregui/Models/DetectorItems.cpp
index 05de82aa2d31055801345a09c682ab52e08b01d0..1ca8b14207f5269ecdc65c01eef32b067f9ec894 100644
--- a/GUI/coregui/Models/DetectorItems.cpp
+++ b/GUI/coregui/Models/DetectorItems.cpp
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/DetectorItem.cpp
-//! @brief     Implements class DetectorItem
+//! @file      coregui/Models/DetectorItems.cpp
+//! @brief     Implements classes DetectorItems
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/coregui/Models/DetectorItems.h b/GUI/coregui/Models/DetectorItems.h
index 3473e8b5140459fcc0fa3108198b0f0f453c57db..3944cf5b2b6e849ac0b2f600ccfc6c0d5aeb759b 100644
--- a/GUI/coregui/Models/DetectorItems.h
+++ b/GUI/coregui/Models/DetectorItems.h
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/DetectorItem.h
-//! @brief     Defines class DetectorItem
+//! @file      coregui/Models/DetectorItems.h
+//! @brief     Defines classes DetectorItems
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/coregui/Models/FitModel.cpp b/GUI/coregui/Models/FitModel.cpp
index 4518bd31db03ea6fa449446e6eb0acbe4345f3fe..baa7421e34db471e81dbc089669c7d04cda522e6 100644
--- a/GUI/coregui/Models/FitModel.cpp
+++ b/GUI/coregui/Models/FitModel.cpp
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/NJobModel.cpp
-//! @brief     Implements class NJobModel
+//! @file      coregui/Models/FitModel.cpp
+//! @brief     Implements class FitModel
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/coregui/Models/FitModel.h b/GUI/coregui/Models/FitModel.h
index d06e87d6fd6877c791fe8259d393014df1ac4102..9097a3689369d9dfb5150bafdcd6b0ffd3a5acac 100644
--- a/GUI/coregui/Models/FitModel.h
+++ b/GUI/coregui/Models/FitModel.h
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/NJobModel.h
-//! @brief     Defines class NJobModel
+//! @file      coregui/Models/FitModel.h
+//! @brief     Defines class FitModel
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/coregui/Models/FitParameterItems.cpp b/GUI/coregui/Models/FitParameterItems.cpp
index 0cce33bcccf0bd20ccb259df61ff12d95952243c..e319cd655b82afae66bb9c11c425f095981d6c43 100644
--- a/GUI/coregui/Models/FitParameterItems.cpp
+++ b/GUI/coregui/Models/FitParameterItems.cpp
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/NJobModel.cpp
-//! @brief     Implements class NJobModel
+//! @file      coregui/Models/FitParameterItems.cpp
+//! @brief     Implements class FitParameterItems
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/coregui/Models/FitParameterItems.h b/GUI/coregui/Models/FitParameterItems.h
index 76111cdc887a7b8aa5b9756616be859c289f7a74..61271856746d387744c69d4c22d01bf874c07e4a 100644
--- a/GUI/coregui/Models/FitParameterItems.h
+++ b/GUI/coregui/Models/FitParameterItems.h
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/NJobModel.h
-//! @brief     Defines class NJobModel
+//! @file      coregui/Models/FitParameterItems.h
+//! @brief     Defines class FitParameterItems
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/coregui/Models/FitParameterModel.cpp b/GUI/coregui/Models/FitParameterModel.cpp
index ffc7d2d4c2460c453504b6ec66b8109436709885..29bd6a13109a4866419b9cbbf958a7c4fd328d78 100644
--- a/GUI/coregui/Models/FitParameterModel.cpp
+++ b/GUI/coregui/Models/FitParameterModel.cpp
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/FitModel.cpp
-//! @brief     Implements class FitModel
+//! @file      coregui/Models/FitParameterModel.cpp
+//! @brief     Implements class FitParameterModel
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/coregui/Models/FitParameterModel.h b/GUI/coregui/Models/FitParameterModel.h
index 587cd9cda16385dfd5e3c47d1bfbdd7ebe32d628..8e02a9e4d6bf8f771c27c853520f856c59562b95 100644
--- a/GUI/coregui/Models/FitParameterModel.h
+++ b/GUI/coregui/Models/FitParameterModel.h
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/FitModel.h
-//! @brief     Defines class FitModel
+//! @file      coregui/Models/FitParameterModel.h
+//! @brief     Defines class FitParameterModel
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/coregui/Models/FitSelectorModel.cpp b/GUI/coregui/Models/FitSelectorModel.cpp
index 5c053a0be6afc8657888bf80e98578faea430738..632d3a87f375053fb111965a6ced7bf3d450d7da 100644
--- a/GUI/coregui/Models/FitSelectorModel.cpp
+++ b/GUI/coregui/Models/FitSelectorModel.cpp
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/NJobModel.cpp
-//! @brief     Implements class NJobModel
+//! @file      coregui/Models/FitSelectorModel.cpp
+//! @brief     Implements class FitSelectorModel
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/coregui/Models/FitSelectorModel.h b/GUI/coregui/Models/FitSelectorModel.h
index ebacb274f19d1e1d46168d7d22db6d523898873a..5e1e37c91ba51840af5b18f0311d7a7c19735610 100644
--- a/GUI/coregui/Models/FitSelectorModel.h
+++ b/GUI/coregui/Models/FitSelectorModel.h
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/NJobModel.h
-//! @brief     Defines class NJobModel
+//! @file      coregui/Models/FitSelectorModel.h
+//! @brief     Defines class FitSelectorModel
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/coregui/Models/GroupItem.cpp b/GUI/coregui/Models/GroupItem.cpp
index 1cbb08dcbc7127c760326a9423954202b2c58e66..31d3022dbd3bc50a70029fb0aff997ed23aa01c8 100644
--- a/GUI/coregui/Models/GroupItem.cpp
+++ b/GUI/coregui/Models/GroupItem.cpp
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/BeamItem.cpp
-//! @brief     Implements class BeamItem
+//! @file      coregui/Models/GroupItem.cpp
+//! @brief     Implements class GroupItem
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/coregui/Models/GroupItem.h b/GUI/coregui/Models/GroupItem.h
index e3dd1b8d91d861b8b9b8d26964e94024735b23fc..ef6ceab37d04b032b31635ff5c3f47632d3d9d80 100644
--- a/GUI/coregui/Models/GroupItem.h
+++ b/GUI/coregui/Models/GroupItem.h
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/BeamItem.h
-//! @brief     Defines class BeamItem
+//! @file      coregui/Models/GroupItem.h
+//! @brief     Defines class GroupItem
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/coregui/Models/IntensityDataItem.cpp b/GUI/coregui/Models/IntensityDataItem.cpp
index 96b5d9a663574e2f7863211f3bbf9f1e84b62e71..bb583aed72340294464bf2d08dcacebd67632906 100644
--- a/GUI/coregui/Models/IntensityDataItem.cpp
+++ b/GUI/coregui/Models/IntensityDataItem.cpp
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/NIntensityDataItem.cpp
-//! @brief     Implements class NIntensityDataItem
+//! @file      coregui/Models/IntensityDataItem.cpp
+//! @brief     Implements class IntensityDataItem
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/coregui/Models/IntensityDataItem.h b/GUI/coregui/Models/IntensityDataItem.h
index aad9a4ea29d864eab446eb2ef486484601771971..840f632366787f7363af1c36c1817fc0d36e98fb 100644
--- a/GUI/coregui/Models/IntensityDataItem.h
+++ b/GUI/coregui/Models/IntensityDataItem.h
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/NIntensityDataItem.h
-//! @brief     Defines class NIntensityDataItem
+//! @file      coregui/Models/IntensityDataItem.h
+//! @brief     Defines class IntensityDataItem
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/coregui/Models/JobModel.cpp b/GUI/coregui/Models/JobModel.cpp
index 9630848874d40f3ee499c094ec614d161785572c..e140d33aa8043bd6e9aa66bfda821b45d7de3fe6 100644
--- a/GUI/coregui/Models/JobModel.cpp
+++ b/GUI/coregui/Models/JobModel.cpp
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/NJobModel.cpp
-//! @brief     Implements class NJobModel
+//! @file      coregui/Models/JobModel.cpp
+//! @brief     Implements class JobModel
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/coregui/Models/JobModel.h b/GUI/coregui/Models/JobModel.h
index cb0c0740d3666aa563349e9d8e4f6282965df286..5d14e0c00ea54b03cbb9de667178b15092eb2470 100644
--- a/GUI/coregui/Models/JobModel.h
+++ b/GUI/coregui/Models/JobModel.h
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/NJobModel.h
-//! @brief     Defines class NJobModel
+//! @file      coregui/Models/JobModel.h
+//! @brief     Defines class JobModel
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/coregui/Models/MaskModel.cpp b/GUI/coregui/Models/MaskModel.cpp
index 981a428bbc86086b5399a970aab80fe1e738569c..49d160d80575991b88f6d62701ce803ff522859f 100644
--- a/GUI/coregui/Models/MaskModel.cpp
+++ b/GUI/coregui/Models/MaskModel.cpp
@@ -1,3 +1,18 @@
+// ************************************************************************** //
+//
+//  BornAgain: simulate and fit scattering at grazing incidence
+//
+//! @file      coregui/Models/MaskModel.cpp
+//! @brief     Implements MaskModel classes
+//!
+//! @homepage  http://www.bornagainproject.org
+//! @license   GNU General Public License v3 or higher (see COPYING)
+//! @copyright Forschungszentrum Jülich GmbH 2015
+//! @authors   Scientific Computing Group at MLZ Garching
+//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//
+// ************************************************************************** //
+
 #include "MaskModel.h"
 
 MaskModel::MaskModel(QObject *parent)
diff --git a/GUI/coregui/Models/MaskModel.h b/GUI/coregui/Models/MaskModel.h
index 8ea55edaa07f5c7f971affac8f6e81eaa13a03a1..f77af0288bfb1cad5590da84783aaf0b64482924 100644
--- a/GUI/coregui/Models/MaskModel.h
+++ b/GUI/coregui/Models/MaskModel.h
@@ -1,3 +1,18 @@
+// ************************************************************************** //
+//
+//  BornAgain: simulate and fit scattering at grazing incidence
+//
+//! @file      coregui/Models/MaskModel.h
+//! @brief     Defines MaskModel classes
+//!
+//! @homepage  http://www.bornagainproject.org
+//! @license   GNU General Public License v3 or higher (see COPYING)
+//! @copyright Forschungszentrum Jülich GmbH 2015
+//! @authors   Scientific Computing Group at MLZ Garching
+//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//
+// ************************************************************************** //
+
 #ifndef MASKMODEL_H
 #define MASKMODEL_H
 
diff --git a/GUI/coregui/Models/ModelMapper.cpp b/GUI/coregui/Models/ModelMapper.cpp
index 3ae037a1342d37b8c050f3828c2fc7bc2987819a..964e2487d4f89a278a2fcca7922f0faf5d93aee3 100644
--- a/GUI/coregui/Models/ModelMapper.cpp
+++ b/GUI/coregui/Models/ModelMapper.cpp
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/TestItem.cpp
-//! @brief     Implements class TestItem
+//! @file      coregui/Models/ModelMapper.cpp
+//! @brief     Implements class ModelMapper
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/coregui/Models/ModelMapper.h b/GUI/coregui/Models/ModelMapper.h
index b48a1510e2c0e6614b63380174196a4de4f02d06..bcf620f6eca52ce1f301327cf931bd9c92fd3c45 100644
--- a/GUI/coregui/Models/ModelMapper.h
+++ b/GUI/coregui/Models/ModelMapper.h
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/TestItem.h
-//! @brief     Defines class TestItem
+//! @file      coregui/Models/ModelMapper.h
+//! @brief     Defines class ModelMapper
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/coregui/Models/ModelPath.cpp b/GUI/coregui/Models/ModelPath.cpp
index 1b966d0fca0515a2765d6487cbe817f1e6a40dfa..69b6d7de04dec443027f7507d8e97184823ad9bf 100644
--- a/GUI/coregui/Models/ModelPath.cpp
+++ b/GUI/coregui/Models/ModelPath.cpp
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/TestItem.cpp
-//! @brief     Implements class TestItem
+//! @file      coregui/Models/ModelPath.cpp
+//! @brief     Implements class ModelPath
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/coregui/Models/ModelPath.h b/GUI/coregui/Models/ModelPath.h
index 76a31957fc7d5669cb41a7a651ade34c0b834559..022a3cd1bfaa56dc29c9f876267e8ca29b1b6f03 100644
--- a/GUI/coregui/Models/ModelPath.h
+++ b/GUI/coregui/Models/ModelPath.h
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/TestItem.h
-//! @brief     Defines class TestItem
+//! @file      coregui/Models/ModelPath.h
+//! @brief     Defines class ModelPath
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/coregui/Models/PropertyItem.cpp b/GUI/coregui/Models/PropertyItem.cpp
index e9e339a1841d5c9e0f3d4e11e7585108b092d612..03e1a929f2bcd40242e1805ccf576a2293c66098 100644
--- a/GUI/coregui/Models/PropertyItem.cpp
+++ b/GUI/coregui/Models/PropertyItem.cpp
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/BeamItem.cpp
-//! @brief     Implements class BeamItem
+//! @file      coregui/Models/PropertyItem.cpp
+//! @brief     Implements class PropertyItem
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/coregui/Models/PropertyItem.h b/GUI/coregui/Models/PropertyItem.h
index 48e8116fd74436b7c547d7b160078bb6720bffae..aa307d445bc3a854f859289bba65aafada3414b7 100644
--- a/GUI/coregui/Models/PropertyItem.h
+++ b/GUI/coregui/Models/PropertyItem.h
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/BeamItem.h
-//! @brief     Defines class BeamItem
+//! @file      coregui/Models/PropertyItem.h
+//! @brief     Defines class PropertyItem
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/coregui/Models/SampleViewProxyModel.cpp b/GUI/coregui/Models/SampleViewProxyModel.cpp
index a07343bd36664f89c31cab01b10bdfd53032d7c6..67cbb0c3f00a32006941b131c22b91ccc4758cda 100644
--- a/GUI/coregui/Models/SampleViewProxyModel.cpp
+++ b/GUI/coregui/Models/SampleViewProxyModel.cpp
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/NJobModel.cpp
-//! @brief     Implements class NJobModel
+//! @file      coregui/Models/SampleViewProxyModel.cpp
+//! @brief     Implements class SampleViewProxyModel
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/coregui/Models/SampleViewProxyModel.h b/GUI/coregui/Models/SampleViewProxyModel.h
index 5b393e918b7eb95d96fb5ca3aa2e241f8acf1868..21ce83a7231791493c26ffe37b1dd39cac30a32e 100644
--- a/GUI/coregui/Models/SampleViewProxyModel.h
+++ b/GUI/coregui/Models/SampleViewProxyModel.h
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/NJobModel.h
-//! @brief     Defines class NJobModel
+//! @file      coregui/Models/SampleViewProxyModel.h
+//! @brief     Defines class SampleViewProxyModel
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/coregui/Models/SessionItem.cpp b/GUI/coregui/Models/SessionItem.cpp
index ae102bab7c3eb828d33dc0b76e9eb787c3c28453..3c7b98e5a639d6c9bcd4690773b649644f0c87f2 100644
--- a/GUI/coregui/Models/SessionItem.cpp
+++ b/GUI/coregui/Models/SessionItem.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/ParameterizedItem.cpp
+//! @file      coregui/Models/SessionItem.cpp
 //! @brief     Implements class SessionItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/SessionItem.h b/GUI/coregui/Models/SessionItem.h
index c533013832e5c332f543563559a052514b013293..58e51f64c735ffa3e6d63582a4d2c7d4f03e514c 100644
--- a/GUI/coregui/Models/SessionItem.h
+++ b/GUI/coregui/Models/SessionItem.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/ParameterizedItem.h
+//! @file      coregui/Models/SessionItem.h
 //! @brief     Defines class SessionItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/SessionXML.cpp b/GUI/coregui/Models/SessionXML.cpp
index bc844364ad764b427b90d81d7856576105fe2f8a..b5aaccf817503344edd649b0158cabd905e95679 100644
--- a/GUI/coregui/Models/SessionXML.cpp
+++ b/GUI/coregui/Models/SessionXML.cpp
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/SessionModel.cpp
-//! @brief     Implements class SessionModel
+//! @file      coregui/Models/SessionXML.cpp
+//! @brief     Implements reader and writer classes for SessionModel
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/coregui/Models/SessionXML.h b/GUI/coregui/Models/SessionXML.h
index 28f4566b6ac256f793819675689e67ecab3583b2..e1340e44c226b084397e1ea8f91dfd50e65438d3 100644
--- a/GUI/coregui/Models/SessionXML.h
+++ b/GUI/coregui/Models/SessionXML.h
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/SessionModel.h
-//! @brief     Defines class SessionModel
+//! @file      coregui/Models/SessionXML.h
+//! @brief     Defines reader and writer classes for SessionModel
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/coregui/Views/AccordionWidget/AccordionWidget.cpp b/GUI/coregui/Views/AccordionWidget/AccordionWidget.cpp
index da0d77ee10c1bdce7efdeba719f4fbef9ae1e1b6..5cac00e17c612c7b443a0685d2ea3e1b84024201 100644
--- a/GUI/coregui/Views/AccordionWidget/AccordionWidget.cpp
+++ b/GUI/coregui/Views/AccordionWidget/AccordionWidget.cpp
@@ -1,3 +1,18 @@
+// ************************************************************************** //
+//
+//  BornAgain: simulate and fit scattering at grazing incidence
+//
+//! @file      coregui/Views/AccordionWidget/AccordionWidget.h
+//! @brief     Implements AccordionWidget class
+//!
+//! @homepage  http://www.bornagainproject.org
+//! @license   GNU General Public License v3 or higher (see COPYING)
+//! @copyright Forschungszentrum Jülich GmbH 2015
+//! @authors   Scientific Computing Group at MLZ Garching
+//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//
+// ************************************************************************** //
+
 // This file is part of qAccordion. An Accordion widget for Qt
 // Copyright © 2015 Christian Rapp <0x2a at posteo dot org>
 //
diff --git a/GUI/coregui/Views/AccordionWidget/AccordionWidget.h b/GUI/coregui/Views/AccordionWidget/AccordionWidget.h
index 46a632c1e6d6d8194dd049bd9cb42f1da626843d..7ae545321b8369372d8b5cc0f9ac0bb812d4fb7d 100644
--- a/GUI/coregui/Views/AccordionWidget/AccordionWidget.h
+++ b/GUI/coregui/Views/AccordionWidget/AccordionWidget.h
@@ -1,3 +1,18 @@
+// ************************************************************************** //
+//
+//  BornAgain: simulate and fit scattering at grazing incidence
+//
+//! @file      coregui/Views/AccordionWidget/AccordionWidget.h
+//! @brief     Defines AccordionWidget class
+//!
+//! @homepage  http://www.bornagainproject.org
+//! @license   GNU General Public License v3 or higher (see COPYING)
+//! @copyright Forschungszentrum Jülich GmbH 2015
+//! @authors   Scientific Computing Group at MLZ Garching
+//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//
+// ************************************************************************** //
+
 // This file is part of qAccordion. An Accordion widget for Qt
 // Copyright © 2015 Christian Rapp <0x2a at posteo dot org>
 //
diff --git a/GUI/coregui/Views/AccordionWidget/ClickableFrame.cpp b/GUI/coregui/Views/AccordionWidget/ClickableFrame.cpp
index aae2c26caa4e253a0f50861c65d447ad916b02e1..ddfd235475b54d3b3746d2bb9a6584eee8500ede 100644
--- a/GUI/coregui/Views/AccordionWidget/ClickableFrame.cpp
+++ b/GUI/coregui/Views/AccordionWidget/ClickableFrame.cpp
@@ -1,3 +1,18 @@
+// ************************************************************************** //
+//
+//  BornAgain: simulate and fit scattering at grazing incidence
+//
+//! @file      coregui/Views/AccordionWidget/ClickableFrame.cpp
+//! @brief     Implements AccordionWidget class
+//!
+//! @homepage  http://www.bornagainproject.org
+//! @license   GNU General Public License v3 or higher (see COPYING)
+//! @copyright Forschungszentrum Jülich GmbH 2015
+//! @authors   Scientific Computing Group at MLZ Garching
+//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//
+// ************************************************************************** //
+
 // This file is part of qAccordion. An Accordion widget for Qt
 // Copyright © 2015 Christian Rapp <0x2a at posteo dot org>
 //
diff --git a/GUI/coregui/Views/AccordionWidget/ClickableFrame.h b/GUI/coregui/Views/AccordionWidget/ClickableFrame.h
index b7a0a8b4ffcc524b181689ba87dccc7e861a665f..75c24d18d174f4fe3a607597f7624297187d347e 100644
--- a/GUI/coregui/Views/AccordionWidget/ClickableFrame.h
+++ b/GUI/coregui/Views/AccordionWidget/ClickableFrame.h
@@ -1,3 +1,18 @@
+// ************************************************************************** //
+//
+//  BornAgain: simulate and fit scattering at grazing incidence
+//
+//! @file      coregui/Views/AccordionWidget/ClickableFrame.h
+//! @brief     Defines AccordionWidget class
+//!
+//! @homepage  http://www.bornagainproject.org
+//! @license   GNU General Public License v3 or higher (see COPYING)
+//! @copyright Forschungszentrum Jülich GmbH 2015
+//! @authors   Scientific Computing Group at MLZ Garching
+//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//
+// ************************************************************************** //
+
 // This file is part of qAccordion. An Accordion widget for Qt
 // Copyright © 2015 Christian Rapp <0x2a at posteo dot org>
 //
diff --git a/GUI/coregui/Views/AccordionWidget/ContentPane.cpp b/GUI/coregui/Views/AccordionWidget/ContentPane.cpp
index bb1c3bb8a6e92a6d0852f78adc3ef3f5a2291e45..4a9ce78a3294e335d10d89cbe61ac96c031f1419 100644
--- a/GUI/coregui/Views/AccordionWidget/ContentPane.cpp
+++ b/GUI/coregui/Views/AccordionWidget/ContentPane.cpp
@@ -1,3 +1,18 @@
+// ************************************************************************** //
+//
+//  BornAgain: simulate and fit scattering at grazing incidence
+//
+//! @file      coregui/Views/AccordionWidget/ContentPane.cpp
+//! @brief     Implements ContentPane class
+//!
+//! @homepage  http://www.bornagainproject.org
+//! @license   GNU General Public License v3 or higher (see COPYING)
+//! @copyright Forschungszentrum Jülich GmbH 2015
+//! @authors   Scientific Computing Group at MLZ Garching
+//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//
+// ************************************************************************** //
+
 // This file is part of qAccordion. An Accordion widget for Qt
 // Copyright © 2015 Christian Rapp <0x2a at posteo dot org>
 //
diff --git a/GUI/coregui/Views/AccordionWidget/ContentPane.h b/GUI/coregui/Views/AccordionWidget/ContentPane.h
index 9010e8cccbed15bffca3dc07d38eb83cc5f0e1fa..b0a6b63bf75f3032c4f102c328a4b13ecb3e06aa 100644
--- a/GUI/coregui/Views/AccordionWidget/ContentPane.h
+++ b/GUI/coregui/Views/AccordionWidget/ContentPane.h
@@ -1,3 +1,18 @@
+// ************************************************************************** //
+//
+//  BornAgain: simulate and fit scattering at grazing incidence
+//
+//! @file      coregui/Views/AccordionWidget/ContentPane.h
+//! @brief     Defines ContentPane class
+//!
+//! @homepage  http://www.bornagainproject.org
+//! @license   GNU General Public License v3 or higher (see COPYING)
+//! @copyright Forschungszentrum Jülich GmbH 2015
+//! @authors   Scientific Computing Group at MLZ Garching
+//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//
+// ************************************************************************** //
+
 // This file is part of qAccordion. An Accordion widget for Qt
 // Copyright © 2015 Christian Rapp <0x2a at posteo dot org>
 //
diff --git a/GUI/coregui/Views/FitWidgets/FitProgressWidget.cpp b/GUI/coregui/Views/FitWidgets/FitProgressWidget.cpp
index e3e756c492cbf2e49aaae6df3adde0501bbe2ea3..dfa18be691eaa99e37648ad94ed5012c2feffedf 100644
--- a/GUI/coregui/Views/FitWidgets/FitProgressWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitProgressWidget.cpp
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/FitWidgets/RunFitWidget.h
-//! @brief     Defines class RunFitWidget
+//! @file      coregui/Views/FitWidgets/FitProgressWidget.h
+//! @brief     Defines class FitProgressWidget
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/coregui/Views/FitWidgets/FitProgressWidget.h b/GUI/coregui/Views/FitWidgets/FitProgressWidget.h
index 1fef9e48a6221b3b74e542269087bcf0557eb14d..a2f4c2eeecfbfc171cda0669758f260e4dc1cfa9 100644
--- a/GUI/coregui/Views/FitWidgets/FitProgressWidget.h
+++ b/GUI/coregui/Views/FitWidgets/FitProgressWidget.h
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/FitWidgets/RunFitWidget.h
-//! @brief     Defines class RunFitWidget
+//! @file      coregui/Views/FitWidgets/FitProgressWidget.h
+//! @brief     Defines class FitProgressWidget
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/coregui/Views/FitWidgets/FitSettingsWidget.cpp b/GUI/coregui/Views/FitWidgets/FitSettingsWidget.cpp
index bfd29c8ba46431832b2b075c34f7ded14d6f290f..ff7f2467c6f862df8cec465a8f115740ee455c31 100644
--- a/GUI/coregui/Views/FitWidgets/FitSettingsWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitSettingsWidget.cpp
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/FitWidgets/RunFitWidget.h
-//! @brief     Defines class RunFitWidget
+//! @file      coregui/Views/FitWidgets/FitSettingsWidget.h
+//! @brief     Defines class FitSettingsWidget
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/coregui/Views/FitWidgets/FitSettingsWidget.h b/GUI/coregui/Views/FitWidgets/FitSettingsWidget.h
index 8953daa2b1e750cf4f739b8e398e14769079fb26..0dcb8cbd308e4adc49ef54d2c44f9a9f9d6a2418 100644
--- a/GUI/coregui/Views/FitWidgets/FitSettingsWidget.h
+++ b/GUI/coregui/Views/FitWidgets/FitSettingsWidget.h
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/FitWidgets/RunFitWidget.h
-//! @brief     Defines class RunFitWidget
+//! @file      coregui/Views/FitWidgets/FitSettingsWidget.h
+//! @brief     Defines class FitSettingsWidget
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/coregui/Views/FitWidgets/GUIFitObserver.cpp b/GUI/coregui/Views/FitWidgets/GUIFitObserver.cpp
index c9be9fa90d0b447469631226b99efa6e07c9346c..ccae23f461b688addc4703d01e48ce33bf19164f 100644
--- a/GUI/coregui/Views/FitWidgets/GUIFitObserver.cpp
+++ b/GUI/coregui/Views/FitWidgets/GUIFitObserver.cpp
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/FitWidgets/FittingWorker.h
-//! @brief     Implements class FittingWorker
+//! @file      coregui/Views/FitWidgets/GUIFitObserver.h
+//! @brief     Implements class GUIFitObserver
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/coregui/Views/FitWidgets/GUIFitObserver.h b/GUI/coregui/Views/FitWidgets/GUIFitObserver.h
index af35a9f357118ef3fae18cd91103ef9ad405c91b..d33c46d103748ea69b1f549333376f3b7103548d 100644
--- a/GUI/coregui/Views/FitWidgets/GUIFitObserver.h
+++ b/GUI/coregui/Views/FitWidgets/GUIFitObserver.h
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/FitWidgets/FittingWorker.h
-//! @brief     Implements class FittingWorker
+//! @file      coregui/Views/FitWidgets/GUIFitObserver.h
+//! @brief     Implements class GUIFitObserver
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/coregui/Views/FitWidgets/ImportDataWidget.cpp b/GUI/coregui/Views/FitWidgets/ImportDataWidget.cpp
index f813fc48ddc2c35fe2635fb46974c2425b11c151..3bdedcc6f6a686a7c5fc4b94e94eade79d7da03b 100644
--- a/GUI/coregui/Views/FitWidgets/ImportDataWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/ImportDataWidget.cpp
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/FitWidgets/RunFitWidget.cpp
-//! @brief     Implements class RunFitWidget
+//! @file      coregui/Views/FitWidgets/ImportDataWidget.cpp
+//! @brief     Implements class ImportDataWidget
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/coregui/Views/FitWidgets/ImportDataWidget.h b/GUI/coregui/Views/FitWidgets/ImportDataWidget.h
index a2f76aaa8abd73cf62d0b3b40d5e7ce05b038045..c8c339add2d86437e35568f9f99bca25929452a7 100644
--- a/GUI/coregui/Views/FitWidgets/ImportDataWidget.h
+++ b/GUI/coregui/Views/FitWidgets/ImportDataWidget.h
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/FitWidgets/RunFitWidget.h
-//! @brief     Defines class RunFitWidget
+//! @file      coregui/Views/FitWidgets/ImportDataWidget.h
+//! @brief     Defines class ImportDataWidget
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.cpp b/GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.cpp
index 2a88a9a2e7f74cc91b84545e2de32e20da8d2887..a07a8732bfe15775b5868ed8180b0506399c72d4 100644
--- a/GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.cpp
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/FitWidgets/FitParameterWidget.cpp
-//! @brief     Implements class FitParameterWidget
+//! @file      coregui/Views/FitWidgets/MinimizerSettingsWidget.cpp
+//! @brief     Implements class MinimizerSettingsWidget
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.h b/GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.h
index 418256e78062e8cb63ca5a770c3ffa0c6a81d893..43ac6deb31fdac10d17df4d9c6b2277a93056b71 100644
--- a/GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.h
+++ b/GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.h
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/FitWidgets/FitParameterWidget.h
-//! @brief     Defines class FitParameterWidget
+//! @file      coregui/Views/FitWidgets/MinimizerSettingsWidget.h
+//! @brief     Defines class MinimizerSettingsWidget
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/coregui/Views/InstrumentWidgets/ComponentInfoBox.cpp b/GUI/coregui/Views/InstrumentWidgets/ComponentInfoBox.cpp
index 9821bd4b8ce621d9d4454416efd05fe8d2f94ed3..5cebe6efcaabc336ca1a4353e68143b0cb487bdc 100644
--- a/GUI/coregui/Views/InstrumentWidgets/ComponentInfoBox.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/ComponentInfoBox.cpp
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/InstrumentWidgets/ComponentEditorBox.h
-//! @brief     Implements class ComponentEditorBox
+//! @file      coregui/Views/InstrumentWidgets/ComponentInfoBox.h
+//! @brief     Implements class ComponentInfoBox
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/coregui/Views/InstrumentWidgets/ComponentInfoBox.h b/GUI/coregui/Views/InstrumentWidgets/ComponentInfoBox.h
index 3203c50b173eb1538bf84580286fa7c49aedc0c6..c7d77248762693fabbcdacb18c94cf3ddb5bd140 100644
--- a/GUI/coregui/Views/InstrumentWidgets/ComponentInfoBox.h
+++ b/GUI/coregui/Views/InstrumentWidgets/ComponentInfoBox.h
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/InstrumentWidgets/ComponentEditorBox.h
-//! @brief     Defines class ComponentEditorBox
+//! @file      coregui/Views/InstrumentWidgets/ComponentInfoBox.h
+//! @brief     Defines class ComponentInfoBox
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/coregui/Views/InstrumentWidgets/columnresizer.cpp b/GUI/coregui/Views/InstrumentWidgets/columnresizer.cpp
index 6f6548d361a6b1bdf4c2f953c3340cb7731169f9..2001d8684f10cd0c73ff4b98a4ade32c3a6513cd 100644
--- a/GUI/coregui/Views/InstrumentWidgets/columnresizer.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/columnresizer.cpp
@@ -1,3 +1,18 @@
+// ************************************************************************** //
+//
+//  BornAgain: simulate and fit scattering at grazing incidence
+//
+//! @file      coregui/Views/InstrumentWidgets/ColumnResizer.cpp
+//! @brief     Implements class ColumnResizer
+//!
+//! @homepage  http://www.bornagainproject.org
+//! @license   GNU General Public License v3 or higher (see COPYING)
+//! @copyright Forschungszentrum Jülich GmbH 2015
+//! @authors   Scientific Computing Group at MLZ Garching
+//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//
+// ************************************************************************** //
+
 /*
  * Copyright 2011 Aurélien Gâteau <agateau@kde.org>
  * License: LGPL v2.1 or later (see COPYING)
diff --git a/GUI/coregui/Views/InstrumentWidgets/columnresizer.h b/GUI/coregui/Views/InstrumentWidgets/columnresizer.h
index 8688b3fae648ca0c845f6b9d230c191fe6bb91d4..8de050f970cf55e78d0c70dd5ca58a312e367a18 100644
--- a/GUI/coregui/Views/InstrumentWidgets/columnresizer.h
+++ b/GUI/coregui/Views/InstrumentWidgets/columnresizer.h
@@ -1,3 +1,18 @@
+// ************************************************************************** //
+//
+//  BornAgain: simulate and fit scattering at grazing incidence
+//
+//! @file      coregui/Views/InstrumentWidgets/ColumnResizer.h
+//! @brief     Defines class ColumnResizer
+//!
+//! @homepage  http://www.bornagainproject.org
+//! @license   GNU General Public License v3 or higher (see COPYING)
+//! @copyright Forschungszentrum Jülich GmbH 2015
+//! @authors   Scientific Computing Group at MLZ Garching
+//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//
+// ************************************************************************** //
+
 /*
  * Copyright 2011 Aurélien Gâteau <agateau@kde.org>
  * License: LGPL v2.1 or later (see COPYING)
diff --git a/GUI/coregui/Views/MaskWidgets/IntensityDataView.cpp b/GUI/coregui/Views/MaskWidgets/IntensityDataView.cpp
index 185fe3389d89025be0b041aa6ce5b116f41d681a..ed316cb2124ec4479788d366bb77e7bb2be1a0d3 100644
--- a/GUI/coregui/Views/MaskWidgets/IntensityDataView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/IntensityDataView.cpp
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaskWidgets/ClipView.cpp
-//! @brief     Implements ClipView class
+//! @file      coregui/Views/MaskWidgets/IntensityDataView.cpp
+//! @brief     Implements IntensityDataView class
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/coregui/Views/MaskWidgets/SizeHandleElement.cpp b/GUI/coregui/Views/MaskWidgets/SizeHandleElement.cpp
index 678ba06f264f20da0436ef3cc043d78822e30c42..0573bf493b6716ce2f629950c88bad3672da9a9b 100644
--- a/GUI/coregui/Views/MaskWidgets/SizeHandleElement.cpp
+++ b/GUI/coregui/Views/MaskWidgets/SizeHandleElement.cpp
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaskWidgets/PointElement.cpp
-//! @brief     Implements PointElement class
+//! @file      coregui/Views/MaskWidgets/SizeHandleElement.cpp
+//! @brief     Implements SizeHandleElement class
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.cpp b/GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.cpp
index 3f66ebb7ba794e6884f12c437aa4c97e7bdab784..28e9ad2b43ad22dc9bc5a4d1d60eae1f81d94b20 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.cpp
+++ b/GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.cpp
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaterialEditor/MaterialEditorWidget.cpp
-//! @brief     Implements class MaterialEditorWidget
+//! @file      coregui/Views/MaterialEditor/MaterialEditorDialog.cpp
+//! @brief     Implements class MaterialEditorDialog
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialSvc.cpp b/GUI/coregui/Views/MaterialEditor/MaterialSvc.cpp
index 1f1687087fb39c753f45ce7c58fc6fdf8d78a76e..7a947ba5c281c0f22b3fa0abd8f643ace31d7fb5 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialSvc.cpp
+++ b/GUI/coregui/Views/MaterialEditor/MaterialSvc.cpp
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaterialEditor/MaterialEditor.cpp
-//! @brief     Implements class MaterialEditor
+//! @file      coregui/Views/MaterialEditor/MaterialSvc.cpp
+//! @brief     Implements class MaterialSvc
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.cpp b/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.cpp
index 7b2fb6bc81d2591d4de6f3e05634109d8836024f..730d1e259ee8494ec0429414836c9b589790e075 100644
--- a/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.cpp
+++ b/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.cpp
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/InfoWidgets/PySampleWidget.cpp
-//! @brief     Implements class PySampleWidget
+//! @file      coregui/Views/InfoWidgets/PythonScriptWidget.cpp
+//! @brief     Implements class PythonScriptWidget
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/coregui/Views/TestComponentView.cpp b/GUI/coregui/Views/TestComponentView.cpp
index 4df0a4656c9c62fab47e627c1c32b72a6ae312fc..6a307be6df8be500515a5a7901784415d176ff75 100644
--- a/GUI/coregui/Views/TestComponentView.cpp
+++ b/GUI/coregui/Views/TestComponentView.cpp
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/TestView.cpp
-//! @brief     Implements class TestView
+//! @file      coregui/Views/TestComponentView.cpp
+//! @brief     Implements class TestComponentView
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/coregui/mainwindow/UpdateNotifier.cpp b/GUI/coregui/mainwindow/UpdateNotifier.cpp
index 84a13c0a593838ab7446dd80b62a1fcd03792fc2..db86dc7eb9e3941e3de3cb5e8ce3416a14b95f53 100644
--- a/GUI/coregui/mainwindow/UpdateNotifier.cpp
+++ b/GUI/coregui/mainwindow/UpdateNotifier.cpp
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/mainwindow/tooltipdatabase.cpp
-//! @brief     Implements class ToolTipDataBase
+//! @file      coregui/mainwindow/UpdateNotifier.cpp
+//! @brief     Implements class UpdateNotifier
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/coregui/mainwindow/UpdateNotifier.h b/GUI/coregui/mainwindow/UpdateNotifier.h
index fdb505ec0b254209fa854c4e8134b9f5c362b014..6d0d85e95c7afbb8afd429d5286fa7db8920da94 100644
--- a/GUI/coregui/mainwindow/UpdateNotifier.h
+++ b/GUI/coregui/mainwindow/UpdateNotifier.h
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/mainwindow/tooltipdatabase.cpp
-//! @brief     Implements class ToolTipDataBase
+//! @file      coregui/mainwindow/UpdateNotifier.cpp
+//! @brief     Implements class UpdateNotifier
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/coregui/utils/DeleteEventFilter.cpp b/GUI/coregui/utils/DeleteEventFilter.cpp
index f351c9aa06ed52c64f2ff7fcf43f2460a2cb97d0..afa5004fbd0dd64e0a0cf47b4fa37b33c96b50c7 100644
--- a/GUI/coregui/utils/DeleteEventFilter.cpp
+++ b/GUI/coregui/utils/DeleteEventFilter.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/utils/CustomEventFilters.cpp
+//! @file      coregui/utils/DeleteEventFilter.cpp
 //! @brief     Defines classes releted to event filtering
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/utils/DeleteEventFilter.h b/GUI/coregui/utils/DeleteEventFilter.h
index a2941592e5ec1ef9ffe20de4155063fc449c7310..c901be31c021153b6252f59b726fabb7b78c83cf 100644
--- a/GUI/coregui/utils/DeleteEventFilter.h
+++ b/GUI/coregui/utils/DeleteEventFilter.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/utils/CustomEventFilters.h
+//! @file      coregui/utils/DeleteEventFilter.h
 //! @brief     Defines classes releted to event filtering
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/utils/GUIFunctionalTest.cpp b/GUI/coregui/utils/GUIFunctionalTest.cpp
index 62e95a19983425de87d801d5047b5cec291c5957..f1801e015436d27c5ca1039b74b3eb312f0de698 100644
--- a/GUI/coregui/utils/GUIFunctionalTest.cpp
+++ b/GUI/coregui/utils/GUIFunctionalTest.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/GUIFunctionalTest.cpp
+//! @file      coregui/utils/GUIFunctionalTest.cpp
 //! @brief     Implements class GUIFunctionalTest
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/utils/GUIFunctionalTest.h b/GUI/coregui/utils/GUIFunctionalTest.h
index 42cb3fcd17ac35083850bbaccac42fda606f93fe..2b31375a8f74c49fcf930a734b9ba081f283691a 100644
--- a/GUI/coregui/utils/GUIFunctionalTest.h
+++ b/GUI/coregui/utils/GUIFunctionalTest.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/GUIFunctionalTest.h
+//! @file      coregui/utils/GUIFunctionalTest.h
 //! @brief     Defines class GUIFunctionalTest
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/utils/GUIFunctionalTestComponentService.cpp b/GUI/coregui/utils/GUIFunctionalTestComponentService.cpp
index 42deafd3af521ff717ae74fb57b9ffd6a6d0b0b3..8598fc25b7b4065b733fd87a68a8463d11ee1eb5 100644
--- a/GUI/coregui/utils/GUIFunctionalTestComponentService.cpp
+++ b/GUI/coregui/utils/GUIFunctionalTestComponentService.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/GUIFunctionalTestComponentService.cpp
+//! @file      coregui/utils/GUIFunctionalTestComponentService.cpp
 //! @brief     Implements class GUIFunctionalTestComponentService.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/utils/GUIFunctionalTestComponentService.h b/GUI/coregui/utils/GUIFunctionalTestComponentService.h
index 0e3525d588a6b66d7aef9a2569be45e437cdf933..8aebfcef62ae89f93b351043dc6cf6958b716ca3 100644
--- a/GUI/coregui/utils/GUIFunctionalTestComponentService.h
+++ b/GUI/coregui/utils/GUIFunctionalTestComponentService.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/GUIFunctionalTestComponentService.h
+//! @file      coregui/utils/GUIFunctionalTestComponentService.h
 //! @brief     Defines class GUIFunctionalTestComponentService.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/utils/ItemIDFactory.cpp b/GUI/coregui/utils/ItemIDFactory.cpp
index 69876db25e469beeb7a200268529b5fc3cc29407..2e83d93dcf476979f6a341136b57027bb0504948 100644
--- a/GUI/coregui/utils/ItemIDFactory.cpp
+++ b/GUI/coregui/utils/ItemIDFactory.cpp
@@ -1,3 +1,18 @@
+// ************************************************************************** //
+//
+//  BornAgain: simulate and fit scattering at grazing incidence
+//
+//! @file      coregui/Util/ItemIDFactory.cpp
+//! @brief     Implements class ItemIDFactory
+//!
+//! @homepage  http://www.bornagainproject.org
+//! @license   GNU General Public License v3 or higher (see COPYING)
+//! @copyright Forschungszentrum Jülich GmbH 2015
+//! @authors   Scientific Computing Group at MLZ Garching
+//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//
+// ************************************************************************** //
+
 #include "ItemIDFactory.h"
 
 
diff --git a/GUI/coregui/utils/ItemIDFactory.h b/GUI/coregui/utils/ItemIDFactory.h
index d106b54bf4e7e992b694af25a4ad13ce82a09e1b..8a2e836c5d30d001841044535bd6707a9c708a6e 100644
--- a/GUI/coregui/utils/ItemIDFactory.h
+++ b/GUI/coregui/utils/ItemIDFactory.h
@@ -12,6 +12,7 @@
 //! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
 //
 // ************************************************************************** //
+
 #ifndef ItemIDFactory_H
 #define ItemIDFactory_H
 
diff --git a/GUI/coregui/utils/gui_functional_tests.cpp b/GUI/coregui/utils/gui_functional_tests.cpp
index 1f319c675a511a76de3f2d0f701bd9d05fbf1030..98ab1abaa3f6bee7f530ccb4ae518b9405129158 100644
--- a/GUI/coregui/utils/gui_functional_tests.cpp
+++ b/GUI/coregui/utils/gui_functional_tests.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/gui_functional_test.h
+//! @file      coregui/utils/gui_functional_test.h
 //! @brief     Implements function to run all gui functional tests
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/utils/gui_functional_tests.h b/GUI/coregui/utils/gui_functional_tests.h
index a387d4175111583b8ccbfc1ccf7f3fb0439b542a..cb169c10e4d7196dc9f70479e187900df6d1770c 100644
--- a/GUI/coregui/utils/gui_functional_tests.h
+++ b/GUI/coregui/utils/gui_functional_tests.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/gui_functional_test.h
+//! @file      coregui/utils/gui_functional_test.h
 //! @brief     Defines function to run all core functional tests
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/main/appoptions.cpp b/GUI/main/appoptions.cpp
index 70cc19969d09f7bf3ff5b2cf15055926d0a61d1b..282ab9b91ef6a7de71a5f092a9f4936fb7428db2 100644
--- a/GUI/main/appoptions.cpp
+++ b/GUI/main/appoptions.cpp
@@ -1,10 +1,8 @@
-#include "appoptions.h"
-
 // ************************************************************************** //
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/src/ProgramOptions.cpp
+//! @file      appoptions.cpp
 //! @brief     Implements class ProgramOptions.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/main/appoptions.h b/GUI/main/appoptions.h
index 6593ae5f25b87a9d2aff3a4524ddf47e9ee41501..38a607ed59a81ef439aa2580fd47237938b4e3c8 100644
--- a/GUI/main/appoptions.h
+++ b/GUI/main/appoptions.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      options.h
+//! @file      appoptions.h
 //! @brief     Collection of utilities to parse command line options
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/dev-tools/code-tools/update_sourcecode_header.py b/dev-tools/code-tools/update_sourcecode_header.py
index ed0ac92e99a557633c7a577ff0cf143edab95abe..7ca5f7cb8e41a6fa4ab75875358911cf23f04b3c 100644
--- a/dev-tools/code-tools/update_sourcecode_header.py
+++ b/dev-tools/code-tools/update_sourcecode_header.py
@@ -124,15 +124,15 @@ def update_directory(dirname):
     """
     Updates all files recursively in given directory
     """
-    if not os.path.isdir(dirname):
-        exit("No such directory " + dirname)
-
-    list_of_files = get_files_to_update(dirname)
-
-    for filename in list_of_files:
-        update_header_in_file(filename)
-
-    # update_header_in_file("./GUI/coregui/mainwindow/aboutapplicationdialog.cpp")
+    # if not os.path.isdir(dirname):
+    #     exit("No such directory " + dirname)
+    #
+    # list_of_files = get_files_to_update(dirname)
+    #
+    # for filename in list_of_files:
+    #     update_header_in_file(filename)
+
+    update_header_in_file("./GUI/coregui/mainwindow/aboutapplicationdialog.cpp")
 
 if __name__ == '__main__':