diff --git a/optimizer/Util/SDDSParser.cpp b/optimizer/Util/SDDSParser.cpp
index e1cef724d78de3189169eaf6247987f206715c8c..571fd22f86919fb8e221ffe427ff9f2ab52355a1 100644
--- a/optimizer/Util/SDDSParser.cpp
+++ b/optimizer/Util/SDDSParser.cpp
@@ -2,7 +2,7 @@
 // Class SDDSParser
 //   This class writes column entries of SDDS files.
 //
-// Copyright (c) 2017, Christof Metzger-Kraus, Open Sourcerer
+// Copyright (c) 2015, Christof Metzger-Kraus, Helmholtz-Zentrum Berlin
 // All rights reserved
 //
 // This file is part of OPAL.
diff --git a/optimizer/Util/SDDSParser.h b/optimizer/Util/SDDSParser.h
index 38b5ce28d943636c572ecdeca23e55a7614aad2a..eef6609b3cf77ba16c61a95b79d9828ad3d69683 100644
--- a/optimizer/Util/SDDSParser.h
+++ b/optimizer/Util/SDDSParser.h
@@ -2,7 +2,7 @@
 // Class SDDSParser
 //   This class writes column entries of SDDS files.
 //
-// Copyright (c) 2017, Christof Metzger-Kraus, Open Sourcerer
+// Copyright (c) 2015, Christof Metzger-Kraus, Helmholtz-Zentrum Berlin
 // All rights reserved
 //
 // This file is part of OPAL.
diff --git a/optimizer/Util/SDDSParser/array.cpp b/optimizer/Util/SDDSParser/array.cpp
index 87e1600cfdcd2c540919372e1aa37a58d174fdd8..ef911238f47d48963799cef69f0ffbfa1f0e810a 100644
--- a/optimizer/Util/SDDSParser/array.cpp
+++ b/optimizer/Util/SDDSParser/array.cpp
@@ -1,7 +1,7 @@
 //
 // Struct array
 //
-// Copyright (c) 2017, Christof Metzger-Kraus, Open Sourcerer
+// Copyright (c) 2015, Christof Metzger-Kraus, Helmholtz-Zentrum Berlin
 // All rights reserved
 //
 // This file is part of OPAL.
diff --git a/optimizer/Util/SDDSParser/array.hpp b/optimizer/Util/SDDSParser/array.hpp
index 79a386545f76793cc3289db68df3b140788c9880..baaae4bb377ea1dfb74a6a96c5b4fb7ea59d3035 100644
--- a/optimizer/Util/SDDSParser/array.hpp
+++ b/optimizer/Util/SDDSParser/array.hpp
@@ -1,7 +1,7 @@
 //
 // Struct array
 //
-// Copyright (c) 2017, Christof Metzger-Kraus, Open Sourcerer
+// Copyright (c) 2015, Christof Metzger-Kraus, Helmholtz-Zentrum Berlin
 // All rights reserved
 //
 // This file is part of OPAL.
diff --git a/optimizer/Util/SDDSParser/array_def.hpp b/optimizer/Util/SDDSParser/array_def.hpp
index ab75e648f6229178b4ba65479bf3c88c6f028932..3bf586e992ada591d81b0b0aabb55436da1cb91a 100644
--- a/optimizer/Util/SDDSParser/array_def.hpp
+++ b/optimizer/Util/SDDSParser/array_def.hpp
@@ -1,7 +1,7 @@
 //
 // Struct array
 //
-// Copyright (c) 2017, Christof Metzger-Kraus, Open Sourcerer
+// Copyright (c) 2015, Christof Metzger-Kraus, Helmholtz-Zentrum Berlin
 // All rights reserved
 //
 // This file is part of OPAL.
diff --git a/optimizer/Util/SDDSParser/associate.cpp b/optimizer/Util/SDDSParser/associate.cpp
index 6a660751454f18e8bb96a09fdf9b9fbfb93b1a54..1e6530b9dad721e5963df8021e66021339a69b11 100644
--- a/optimizer/Util/SDDSParser/associate.cpp
+++ b/optimizer/Util/SDDSParser/associate.cpp
@@ -1,7 +1,7 @@
 //
 // Struct associate
 //
-// Copyright (c) 2017, Christof Metzger-Kraus, Open Sourcerer
+// Copyright (c) 2015, Christof Metzger-Kraus, Helmholtz-Zentrum Berlin
 // All rights reserved
 //
 // This file is part of OPAL.
diff --git a/optimizer/Util/SDDSParser/associate.hpp b/optimizer/Util/SDDSParser/associate.hpp
index 82c24ae56dcaa53d61b1f2ee9fe68863b10827b5..1cd05f1829a4272aa2e75c7737f050225e3fbcb5 100644
--- a/optimizer/Util/SDDSParser/associate.hpp
+++ b/optimizer/Util/SDDSParser/associate.hpp
@@ -1,7 +1,7 @@
 //
 // Struct associate
 //
-// Copyright (c) 2017, Christof Metzger-Kraus, Open Sourcerer
+// Copyright (c) 2015, Christof Metzger-Kraus, Helmholtz-Zentrum Berlin
 // All rights reserved
 //
 // This file is part of OPAL.
diff --git a/optimizer/Util/SDDSParser/associate_def.hpp b/optimizer/Util/SDDSParser/associate_def.hpp
index 9158bbdc9e49353c751fc9ecfc55dc391128cecc..6ce7d39896764e4debe227449cae18f5491b1941 100644
--- a/optimizer/Util/SDDSParser/associate_def.hpp
+++ b/optimizer/Util/SDDSParser/associate_def.hpp
@@ -1,7 +1,7 @@
 //
 // Struct associate
 //
-// Copyright (c) 2017, Christof Metzger-Kraus, Open Sourcerer
+// Copyright (c) 2015, Christof Metzger-Kraus, Helmholtz-Zentrum Berlin
 // All rights reserved
 //
 // This file is part of OPAL.
diff --git a/optimizer/Util/SDDSParser/ast.cpp b/optimizer/Util/SDDSParser/ast.cpp
index 0c2a208124ac10fbe27e6d862c953ef6c89fb145..c0449a669a3afdebaaf95a9aa1cec3c7faa0cdb2 100644
--- a/optimizer/Util/SDDSParser/ast.cpp
+++ b/optimizer/Util/SDDSParser/ast.cpp
@@ -1,7 +1,7 @@
 //
 // Namespace ast
 //
-// Copyright (c) 2017, Christof Metzger-Kraus, Open Sourcerer
+// Copyright (c) 2015, Christof Metzger-Kraus, Helmholtz-Zentrum Berlin
 // All rights reserved
 //
 // This file is part of OPAL.
diff --git a/optimizer/Util/SDDSParser/ast.hpp b/optimizer/Util/SDDSParser/ast.hpp
index 915b98431d1a3c33a510a95ea0633fa2131180f9..4a75f840d37f19db571918b376b9d7dab96300d5 100644
--- a/optimizer/Util/SDDSParser/ast.hpp
+++ b/optimizer/Util/SDDSParser/ast.hpp
@@ -1,7 +1,7 @@
 //
 // Namespace ast
 //
-// Copyright (c) 2017, Christof Metzger-Kraus, Open Sourcerer
+// Copyright (c) 2015, Christof Metzger-Kraus, Helmholtz-Zentrum Berlin
 // All rights reserved
 //
 // This file is part of OPAL.
diff --git a/optimizer/Util/SDDSParser/ast_def.hpp b/optimizer/Util/SDDSParser/ast_def.hpp
index dacfd936c10db90a3c60bf9e0f1ddd344519d9cb..3431b8fb51e32be710050f3943843deee76efe92 100644
--- a/optimizer/Util/SDDSParser/ast_def.hpp
+++ b/optimizer/Util/SDDSParser/ast_def.hpp
@@ -1,7 +1,7 @@
 //
 // Namespace ast
 //
-// Copyright (c) 2017, Christof Metzger-Kraus, Open Sourcerer
+// Copyright (c) 2015, Christof Metzger-Kraus, Helmholtz-Zentrum Berlin
 // All rights reserved
 //
 // This file is part of OPAL.
diff --git a/optimizer/Util/SDDSParser/column.cpp b/optimizer/Util/SDDSParser/column.cpp
index c8048678ed002c8e8191979fb33b28225a665919..679ee36dd38a942dcc1aed63490af18fa7be7535 100644
--- a/optimizer/Util/SDDSParser/column.cpp
+++ b/optimizer/Util/SDDSParser/column.cpp
@@ -1,7 +1,7 @@
 //
 // Struct column
 //
-// Copyright (c) 2017, Christof Metzger-Kraus, Open Sourcerer
+// Copyright (c) 2015, Christof Metzger-Kraus, Helmholtz-Zentrum Berlin
 // All rights reserved
 //
 // This file is part of OPAL.
diff --git a/optimizer/Util/SDDSParser/column.hpp b/optimizer/Util/SDDSParser/column.hpp
index b6ddb1cec9849398bc5d56395b95762dc95dd5ff..5e05dcfb90fb47f9935a37b5a51bc9eb069666da 100644
--- a/optimizer/Util/SDDSParser/column.hpp
+++ b/optimizer/Util/SDDSParser/column.hpp
@@ -1,7 +1,7 @@
 //
 // Struct column
 //
-// Copyright (c) 2017, Christof Metzger-Kraus, Open Sourcerer
+// Copyright (c) 2015, Christof Metzger-Kraus, Helmholtz-Zentrum Berlin
 // All rights reserved
 //
 // This file is part of OPAL.
diff --git a/optimizer/Util/SDDSParser/column_def.hpp b/optimizer/Util/SDDSParser/column_def.hpp
index 6561815e93409b7c06b53800f6b8be97f4279174..d309a27d28d643a05ce33f64520890607a80a8e3 100644
--- a/optimizer/Util/SDDSParser/column_def.hpp
+++ b/optimizer/Util/SDDSParser/column_def.hpp
@@ -1,7 +1,7 @@
 //
 // Struct column
 //
-// Copyright (c) 2017, Christof Metzger-Kraus, Open Sourcerer
+// Copyright (c) 2015, Christof Metzger-Kraus, Helmholtz-Zentrum Berlin
 // All rights reserved
 //
 // This file is part of OPAL.
diff --git a/optimizer/Util/SDDSParser/data.cpp b/optimizer/Util/SDDSParser/data.cpp
index d20f37c0f1ce492c0d5a6a37ca21b110b781426c..019f198ed9adb2909374ca8bdd0efbd21fd9e529 100644
--- a/optimizer/Util/SDDSParser/data.cpp
+++ b/optimizer/Util/SDDSParser/data.cpp
@@ -1,7 +1,7 @@
 //
 // Struct data
 //
-// Copyright (c) 2017, Christof Metzger-Kraus, Open Sourcerer
+// Copyright (c) 2015, Christof Metzger-Kraus, Helmholtz-Zentrum Berlin
 // All rights reserved
 //
 // This file is part of OPAL.
diff --git a/optimizer/Util/SDDSParser/data.hpp b/optimizer/Util/SDDSParser/data.hpp
index cf3bafd6cc47f5b2e4a51353df4cd863bd871ab4..f2e07ca96dfd74038071bee7dd78000ae15e2cd3 100644
--- a/optimizer/Util/SDDSParser/data.hpp
+++ b/optimizer/Util/SDDSParser/data.hpp
@@ -1,7 +1,7 @@
 //
 // Struct data
 //
-// Copyright (c) 2017, Christof Metzger-Kraus, Open Sourcerer
+// Copyright (c) 2015, Christof Metzger-Kraus, Helmholtz-Zentrum Berlin
 // All rights reserved
 //
 // This file is part of OPAL.
diff --git a/optimizer/Util/SDDSParser/data_def.hpp b/optimizer/Util/SDDSParser/data_def.hpp
index 8b497b8afd61a677a1ae2d205db282a4d4c5b061..bb3c09da4d6c0592f8fe825ba56e96629ebfd51f 100644
--- a/optimizer/Util/SDDSParser/data_def.hpp
+++ b/optimizer/Util/SDDSParser/data_def.hpp
@@ -1,7 +1,7 @@
 //
 // Struct data
 //
-// Copyright (c) 2017, Christof Metzger-Kraus, Open Sourcerer
+// Copyright (c) 2015, Christof Metzger-Kraus, Helmholtz-Zentrum Berlin
 // All rights reserved
 //
 // This file is part of OPAL.
diff --git a/optimizer/Util/SDDSParser/description.cpp b/optimizer/Util/SDDSParser/description.cpp
index 0437b95986371fb49279391958ef53ad5e322119..9fd3e29a69b831e2413a7e6add02ffddeaccb917 100644
--- a/optimizer/Util/SDDSParser/description.cpp
+++ b/optimizer/Util/SDDSParser/description.cpp
@@ -1,7 +1,7 @@
 //
 // Struct description
 //
-// Copyright (c) 2017, Christof Metzger-Kraus, Open Sourcerer
+// Copyright (c) 2015, Christof Metzger-Kraus, Helmholtz-Zentrum Berlin
 // All rights reserved
 //
 // This file is part of OPAL.
diff --git a/optimizer/Util/SDDSParser/description.hpp b/optimizer/Util/SDDSParser/description.hpp
index d4dd8ee9deee56c8b849a2cc310eb2e87038e429..b6b82cb66c2f02b02717e4f524a5f74ff0646bd2 100644
--- a/optimizer/Util/SDDSParser/description.hpp
+++ b/optimizer/Util/SDDSParser/description.hpp
@@ -1,7 +1,7 @@
 //
 // Struct description
 //
-// Copyright (c) 2017, Christof Metzger-Kraus, Open Sourcerer
+// Copyright (c) 2015, Christof Metzger-Kraus, Helmholtz-Zentrum Berlin
 // All rights reserved
 //
 // This file is part of OPAL.
diff --git a/optimizer/Util/SDDSParser/description_def.hpp b/optimizer/Util/SDDSParser/description_def.hpp
index 03659bebbafff86eb5c941d2a7e7d5b4a2419f57..68e1e7dca4f2adab81eaa006af671dd0733a252e 100644
--- a/optimizer/Util/SDDSParser/description_def.hpp
+++ b/optimizer/Util/SDDSParser/description_def.hpp
@@ -1,7 +1,7 @@
 //
 // Struct description
 //
-// Copyright (c) 2017, Christof Metzger-Kraus, Open Sourcerer
+// Copyright (c) 2015, Christof Metzger-Kraus, Helmholtz-Zentrum Berlin
 // All rights reserved
 //
 // This file is part of OPAL.
diff --git a/optimizer/Util/SDDSParser/error_handler.hpp b/optimizer/Util/SDDSParser/error_handler.hpp
index e5fe9a68b55c0ada7b3e7cc01d5645e6ca5bebe1..79cc5e6dc2292113d99abc29a1663412d26301e5 100644
--- a/optimizer/Util/SDDSParser/error_handler.hpp
+++ b/optimizer/Util/SDDSParser/error_handler.hpp
@@ -1,7 +1,7 @@
 //
 // Struct error_handler
 //
-// Copyright (c) 2017, Christof Metzger-Kraus, Open Sourcerer
+// Copyright (c) 2015, Christof Metzger-Kraus, Helmholtz-Zentrum Berlin
 // All rights reserved
 //
 // This file is part of OPAL.
diff --git a/optimizer/Util/SDDSParser/file.cpp b/optimizer/Util/SDDSParser/file.cpp
index 41267c21e00b97b9bb576d1e2b912319a9412b39..f71127a943dc0742413828622fccaab4621fe8dd 100644
--- a/optimizer/Util/SDDSParser/file.cpp
+++ b/optimizer/Util/SDDSParser/file.cpp
@@ -1,7 +1,7 @@
 //
 // Struct file
 //
-// Copyright (c) 2017, Christof Metzger-Kraus, Open Sourcerer
+// Copyright (c) 2015, Christof Metzger-Kraus, Helmholtz-Zentrum Berlin
 // All rights reserved
 //
 // This file is part of OPAL.
diff --git a/optimizer/Util/SDDSParser/file.hpp b/optimizer/Util/SDDSParser/file.hpp
index 14d482e31cb9eb0060963357f3f42ff6159823b7..644a3bda5685ee92e8ceaa6f77d1a8bb5e152940 100644
--- a/optimizer/Util/SDDSParser/file.hpp
+++ b/optimizer/Util/SDDSParser/file.hpp
@@ -1,7 +1,7 @@
 //
 // Struct file
 //
-// Copyright (c) 2017, Christof Metzger-Kraus, Open Sourcerer
+// Copyright (c) 2015, Christof Metzger-Kraus, Helmholtz-Zentrum Berlin
 // All rights reserved
 //
 // This file is part of OPAL.
diff --git a/optimizer/Util/SDDSParser/file_def.hpp b/optimizer/Util/SDDSParser/file_def.hpp
index 96734b21ac0ed9e71e10c83cd64c0ca374331902..d18482961b66b75f8682f975df92ce7a78133e5c 100644
--- a/optimizer/Util/SDDSParser/file_def.hpp
+++ b/optimizer/Util/SDDSParser/file_def.hpp
@@ -1,7 +1,7 @@
 //
 // Struct file
 //
-// Copyright (c) 2017, Christof Metzger-Kraus, Open Sourcerer
+// Copyright (c) 2015, Christof Metzger-Kraus, Helmholtz-Zentrum Berlin
 // All rights reserved
 //
 // This file is part of OPAL.
diff --git a/optimizer/Util/SDDSParser/include.cpp b/optimizer/Util/SDDSParser/include.cpp
index 80d8ca346dc9cde2c888465dbdd0ce677ac7dcc4..11df00c760fe6a1d8fa59d4bb313b6878ceb6051 100644
--- a/optimizer/Util/SDDSParser/include.cpp
+++ b/optimizer/Util/SDDSParser/include.cpp
@@ -1,7 +1,7 @@
 //
 // Struct include
 //
-// Copyright (c) 2017, Christof Metzger-Kraus, Open Sourcerer
+// Copyright (c) 2015, Christof Metzger-Kraus, Helmholtz-Zentrum Berlin
 // All rights reserved
 //
 // This file is part of OPAL.
diff --git a/optimizer/Util/SDDSParser/include.hpp b/optimizer/Util/SDDSParser/include.hpp
index 06d8becd9c439cfa6e8b62e65786e5fa4129b027..1350f0372ba4abc63e9d90ee33d2c62ef02a3dea 100644
--- a/optimizer/Util/SDDSParser/include.hpp
+++ b/optimizer/Util/SDDSParser/include.hpp
@@ -1,7 +1,7 @@
 //
 // Struct include
 //
-// Copyright (c) 2017, Christof Metzger-Kraus, Open Sourcerer
+// Copyright (c) 2015, Christof Metzger-Kraus, Helmholtz-Zentrum Berlin
 // All rights reserved
 //
 // This file is part of OPAL.
diff --git a/optimizer/Util/SDDSParser/include_def.hpp b/optimizer/Util/SDDSParser/include_def.hpp
index 31daf4360a5181bc2a10604c9b5eb5b83785c063..287fcabe4fd61c631e8b47e4131a7e2051b6a67a 100644
--- a/optimizer/Util/SDDSParser/include_def.hpp
+++ b/optimizer/Util/SDDSParser/include_def.hpp
@@ -1,7 +1,7 @@
 //
 // Struct include
 //
-// Copyright (c) 2017, Christof Metzger-Kraus, Open Sourcerer
+// Copyright (c) 2015, Christof Metzger-Kraus, Helmholtz-Zentrum Berlin
 // All rights reserved
 //
 // This file is part of OPAL.
diff --git a/optimizer/Util/SDDSParser/parameter.cpp b/optimizer/Util/SDDSParser/parameter.cpp
index 56fd1ecf8b0087b8889aa4f66fccb5b02c9a8eab..90a1a646e7196aafa20b1034b45d601140fffd24 100644
--- a/optimizer/Util/SDDSParser/parameter.cpp
+++ b/optimizer/Util/SDDSParser/parameter.cpp
@@ -1,7 +1,7 @@
 //
 // Struct parameter
 //
-// Copyright (c) 2017, Christof Metzger-Kraus, Open Sourcerer
+// Copyright (c) 2015, Christof Metzger-Kraus, Helmholtz-Zentrum Berlin
 // All rights reserved
 //
 // This file is part of OPAL.
diff --git a/optimizer/Util/SDDSParser/parameter.hpp b/optimizer/Util/SDDSParser/parameter.hpp
index 969a99d6887cf4dd0cf447895b026a8bd13b3d5d..b488b6bbc1d9f349994eef1583dd483fff3fc5a2 100644
--- a/optimizer/Util/SDDSParser/parameter.hpp
+++ b/optimizer/Util/SDDSParser/parameter.hpp
@@ -1,7 +1,7 @@
 //
 // Struct parameter
 //
-// Copyright (c) 2017, Christof Metzger-Kraus, Open Sourcerer
+// Copyright (c) 2015, Christof Metzger-Kraus, Helmholtz-Zentrum Berlin
 // All rights reserved
 //
 // This file is part of OPAL.
diff --git a/optimizer/Util/SDDSParser/parameter_def.hpp b/optimizer/Util/SDDSParser/parameter_def.hpp
index cbad87aa56f6593afdced50d6bde90d3fcbc43a1..70caf5944778a45c99984c44f725b8c625a4cba5 100644
--- a/optimizer/Util/SDDSParser/parameter_def.hpp
+++ b/optimizer/Util/SDDSParser/parameter_def.hpp
@@ -1,7 +1,7 @@
 //
 // Struct parameter
 //
-// Copyright (c) 2017, Christof Metzger-Kraus, Open Sourcerer
+// Copyright (c) 2015, Christof Metzger-Kraus, Helmholtz-Zentrum Berlin
 // All rights reserved
 //
 // This file is part of OPAL.
diff --git a/optimizer/Util/SDDSParser/skipper.hpp b/optimizer/Util/SDDSParser/skipper.hpp
index a73b256f6b0dbcb951a697bea8713a3a172d2f03..dd8ce536c0159c256bd386b745a6bb5aa998b9fd 100644
--- a/optimizer/Util/SDDSParser/skipper.hpp
+++ b/optimizer/Util/SDDSParser/skipper.hpp
@@ -1,7 +1,7 @@
 //
 // Struct skipper
 //
-// Copyright (c) 2017, Christof Metzger-Kraus, Open Sourcerer
+// Copyright (c) 2015, Christof Metzger-Kraus, Helmholtz-Zentrum Berlin
 // All rights reserved
 //
 // This file is part of OPAL.
diff --git a/optimizer/Util/SDDSParser/version.cpp b/optimizer/Util/SDDSParser/version.cpp
index 850aff1963ece87e33681a7bc930274320297291..985eeda64a89f1be06bd8f16c64987a3c4d35849 100644
--- a/optimizer/Util/SDDSParser/version.cpp
+++ b/optimizer/Util/SDDSParser/version.cpp
@@ -1,7 +1,7 @@
 //
 // Struct version
 //
-// Copyright (c) 2017, Christof Metzger-Kraus, Open Sourcerer
+// Copyright (c) 2015, Christof Metzger-Kraus, Helmholtz-Zentrum Berlin
 // All rights reserved
 //
 // This file is part of OPAL.
diff --git a/optimizer/Util/SDDSParser/version.hpp b/optimizer/Util/SDDSParser/version.hpp
index 152533d176456687f753e5a478c515a05422f0b3..b15159ff0242e2620eb68f1b6784eabe8dcc2731 100644
--- a/optimizer/Util/SDDSParser/version.hpp
+++ b/optimizer/Util/SDDSParser/version.hpp
@@ -1,7 +1,7 @@
 //
 // Struct version
 //
-// Copyright (c) 2017, Christof Metzger-Kraus, Open Sourcerer
+// Copyright (c) 2015, Christof Metzger-Kraus, Helmholtz-Zentrum Berlin
 // All rights reserved
 //
 // This file is part of OPAL.
diff --git a/optimizer/Util/SDDSParser/version_def.hpp b/optimizer/Util/SDDSParser/version_def.hpp
index 43708a9a049d6bb765a56834f22600288e65e548..8a1b91079fbf6217d191bc3206925150bc946928 100644
--- a/optimizer/Util/SDDSParser/version_def.hpp
+++ b/optimizer/Util/SDDSParser/version_def.hpp
@@ -1,7 +1,7 @@
 //
 // Struct version
 //
-// Copyright (c) 2017, Christof Metzger-Kraus, Open Sourcerer
+// Copyright (c) 2015, Christof Metzger-Kraus, Helmholtz-Zentrum Berlin
 // All rights reserved
 //
 // This file is part of OPAL.