diff --git a/optimizer/Comm/CommSplitter.h b/optimizer/Comm/CommSplitter.h
index 4e891598e6a8f3de0ef3999163ff3c397080294d..23871717ec9dd9a6e3dc97b61796786025b84e02 100644
--- a/optimizer/Comm/CommSplitter.h
+++ b/optimizer/Comm/CommSplitter.h
@@ -19,7 +19,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Comm/MasterGraph/NDimMesh.h b/optimizer/Comm/MasterGraph/NDimMesh.h
index 3bcb2b19e28e0de6f0f259b71e761df2f5673795..abd3e269e62572b25aa515f683e1334ae272f992 100644
--- a/optimizer/Comm/MasterGraph/NDimMesh.h
+++ b/optimizer/Comm/MasterGraph/NDimMesh.h
@@ -5,7 +5,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Comm/MasterGraph/NoMasterGraph.h b/optimizer/Comm/MasterGraph/NoMasterGraph.h
index 9a6a235da8c7158f8cb306b23258e5417191dd39..9a6cab50975567a2f4e0f8ed7830941b2775e193 100644
--- a/optimizer/Comm/MasterGraph/NoMasterGraph.h
+++ b/optimizer/Comm/MasterGraph/NoMasterGraph.h
@@ -6,7 +6,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Comm/MasterGraph/SocialNetworkGraph.h b/optimizer/Comm/MasterGraph/SocialNetworkGraph.h
index 3294190d1f44c0a1e9e53cbc6f0af52289fb3ccd..c63f7855b27dd32b1c31ed2eebfa6ec4c940c0c8 100644
--- a/optimizer/Comm/MasterGraph/SocialNetworkGraph.h
+++ b/optimizer/Comm/MasterGraph/SocialNetworkGraph.h
@@ -22,7 +22,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Comm/MasterNode.h b/optimizer/Comm/MasterNode.h
index bdbff0cedb0c727ab3b2d171c935380c32561475..a883c6b310fcb345252ebf9cf76becf006acf18e 100644
--- a/optimizer/Comm/MasterNode.h
+++ b/optimizer/Comm/MasterNode.h
@@ -15,7 +15,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Comm/types.h b/optimizer/Comm/types.h
index 64b6f5e518211114736184455bf41dca92b50829..259fb38f3ffbe8f411fc2c28d56c21bfb6b151c8 100644
--- a/optimizer/Comm/types.h
+++ b/optimizer/Comm/types.h
@@ -5,7 +5,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Expression/Expression.h b/optimizer/Expression/Expression.h
index 90ca052acc0128a5349a4879383dfd7858bb573c..c7c09168b183d5f3454aecd64600974c5d2c078a 100644
--- a/optimizer/Expression/Expression.h
+++ b/optimizer/Expression/Expression.h
@@ -14,7 +14,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Expression/FromFile.cpp b/optimizer/Expression/FromFile.cpp
index fc5f4fc8dbad84975a5971a2df2591f0be3db09d..3c05cec1ace55fff1b95aa0268199113a14a9a66 100644
--- a/optimizer/Expression/FromFile.cpp
+++ b/optimizer/Expression/FromFile.cpp
@@ -10,7 +10,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Expression/FromFile.h b/optimizer/Expression/FromFile.h
index 0f8f67a988b8101bcd34ba735b36f1e1a292372a..b1c4950e9f788fda56f6984d177e4d0cfd309d1c 100644
--- a/optimizer/Expression/FromFile.h
+++ b/optimizer/Expression/FromFile.h
@@ -10,7 +10,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Expression/GlobalFunctions.h b/optimizer/Expression/GlobalFunctions.h
index b8d50bafb890e13f6b23a3482487e8ea1a6f01b4..ca3c2aa55e75b6f74dee88603ea1f29092bacf73 100644
--- a/optimizer/Expression/GlobalFunctions.h
+++ b/optimizer/Expression/GlobalFunctions.h
@@ -7,7 +7,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Expression/ProbeVariable.h b/optimizer/Expression/ProbeVariable.h
index 853c903cd6d2ba1bda5c6b05c5ff0256513010c7..2aecfb9ffa31623e632d1a7d5e227003f5655e70 100644
--- a/optimizer/Expression/ProbeVariable.h
+++ b/optimizer/Expression/ProbeVariable.h
@@ -5,7 +5,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Expression/PythonExpr.h b/optimizer/Expression/PythonExpr.h
index 40225967ca0b24e6b9ef9927d4e9adeac412415c..625f91f182a9a23d380bb4b1f0a7ecb385352edc 100644
--- a/optimizer/Expression/PythonExpr.h
+++ b/optimizer/Expression/PythonExpr.h
@@ -19,7 +19,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Expression/SDDSVariable.h b/optimizer/Expression/SDDSVariable.h
index 12ad779eeec17010b576753216fd98a89b7a9654..4d494d7bc9b1a41b003b2f49fdd7dfd7701d0b68 100644
--- a/optimizer/Expression/SDDSVariable.h
+++ b/optimizer/Expression/SDDSVariable.h
@@ -11,7 +11,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Expression/SumErrSq.h b/optimizer/Expression/SumErrSq.h
index fc18bf83e10aea4322ac471c09772b83726082d3..e326d49ecac305fcc180f75844e1e83046c2cba9 100644
--- a/optimizer/Expression/SumErrSq.h
+++ b/optimizer/Expression/SumErrSq.h
@@ -11,7 +11,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Optimizer/EA/BlendCrossover.h b/optimizer/Optimizer/EA/BlendCrossover.h
index ebb19b66828660f345ab8363aa31eb906ab85d63..c9c417b2e289e1eb96c6ac7ba837afda293baf4f 100644
--- a/optimizer/Optimizer/EA/BlendCrossover.h
+++ b/optimizer/Optimizer/EA/BlendCrossover.h
@@ -13,7 +13,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Optimizer/EA/FixedPisaNsga2.h b/optimizer/Optimizer/EA/FixedPisaNsga2.h
index a26731c624fc5269549a6d1fd8141e79c0ddeb3e..818f005644d4e04e907ba9dfa0f8155fdbbfb46d 100644
--- a/optimizer/Optimizer/EA/FixedPisaNsga2.h
+++ b/optimizer/Optimizer/EA/FixedPisaNsga2.h
@@ -17,7 +17,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Optimizer/EA/FixedPisaNsga2.tcc b/optimizer/Optimizer/EA/FixedPisaNsga2.tcc
index d0f3be0e3ff416ee9d9a92393386fd23e56fd7c5..77c9a8cf9a2f41b1b8b08b635545a6bd7f743104 100644
--- a/optimizer/Optimizer/EA/FixedPisaNsga2.tcc
+++ b/optimizer/Optimizer/EA/FixedPisaNsga2.tcc
@@ -17,7 +17,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Optimizer/EA/IndependentBitMutation.h b/optimizer/Optimizer/EA/IndependentBitMutation.h
index ff40bbf251b830e2ca19d6a2c9f1b46fce0d297b..c9e2850425d3484bb1e808b9180bc0e6cbe6ad44 100644
--- a/optimizer/Optimizer/EA/IndependentBitMutation.h
+++ b/optimizer/Optimizer/EA/IndependentBitMutation.h
@@ -6,7 +6,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Optimizer/EA/Individual.h b/optimizer/Optimizer/EA/Individual.h
index f5ea39138bc71512801d9ef77c2a2acd55962bb5..bc2cc9dc457b3ec77f872a304a3475b93d6734b7 100644
--- a/optimizer/Optimizer/EA/Individual.h
+++ b/optimizer/Optimizer/EA/Individual.h
@@ -9,7 +9,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Optimizer/EA/NaiveOnePointCrossover.h b/optimizer/Optimizer/EA/NaiveOnePointCrossover.h
index acedd85afff5543a72934f8f88c7f702c7e15ae3..a5a719bbd3e11c5edbbf3f25deaa44cae211020f 100644
--- a/optimizer/Optimizer/EA/NaiveOnePointCrossover.h
+++ b/optimizer/Optimizer/EA/NaiveOnePointCrossover.h
@@ -5,7 +5,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Optimizer/EA/NaiveUniformCrossover.h b/optimizer/Optimizer/EA/NaiveUniformCrossover.h
index 08af2096a2833cb3495f019334c10051c70812eb..ea00cbc1ae2b7e674167fb254241cb14ad9ca817 100644
--- a/optimizer/Optimizer/EA/NaiveUniformCrossover.h
+++ b/optimizer/Optimizer/EA/NaiveUniformCrossover.h
@@ -6,7 +6,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Optimizer/EA/OneBitMutation.h b/optimizer/Optimizer/EA/OneBitMutation.h
index 2f3055b91f7e1f9466de5e25d20a2a72dfee2593..3977060fcef3216aacb183d9128117e607d7960f 100644
--- a/optimizer/Optimizer/EA/OneBitMutation.h
+++ b/optimizer/Optimizer/EA/OneBitMutation.h
@@ -6,7 +6,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Optimizer/EA/Population.h b/optimizer/Optimizer/EA/Population.h
index e9d6ab611423f574b2563a149459fca152f83042..397a0984ff6518e4a92539de55165843b1161c9b 100644
--- a/optimizer/Optimizer/EA/Population.h
+++ b/optimizer/Optimizer/EA/Population.h
@@ -11,7 +11,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Optimizer/EA/SimulatedBinaryCrossover.h b/optimizer/Optimizer/EA/SimulatedBinaryCrossover.h
index d72def5f5878c885178e6554b923971f7c474a8e..2d3696adf50caffb6d05e273966e2586c2ebf1a4 100644
--- a/optimizer/Optimizer/EA/SimulatedBinaryCrossover.h
+++ b/optimizer/Optimizer/EA/SimulatedBinaryCrossover.h
@@ -8,7 +8,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Optimizer/EA/Variator.h b/optimizer/Optimizer/EA/Variator.h
index ee4c048593c6a8c8f906b26ea9e05a517b1cefc9..2fa721a72e1b46248fffb4671801adfd60c6931a 100644
--- a/optimizer/Optimizer/EA/Variator.h
+++ b/optimizer/Optimizer/EA/Variator.h
@@ -5,7 +5,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Optimizer/Optimizer.h b/optimizer/Optimizer/Optimizer.h
index e77caf099bfe4ccc8b389b6d13baf8c4d0c2492a..ad76c9c8ab5f1b6a4f77063843aaa4c321b782d5 100644
--- a/optimizer/Optimizer/Optimizer.h
+++ b/optimizer/Optimizer/Optimizer.h
@@ -7,7 +7,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Pilot/Pilot.h b/optimizer/Pilot/Pilot.h
index 6f32d3e8c5fe9fe6f5dab86bc542b48a973078cb..ab22f22d5f10af2a776951fffe75eacc8551f6d6 100644
--- a/optimizer/Pilot/Pilot.h
+++ b/optimizer/Pilot/Pilot.h
@@ -23,7 +23,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Pilot/Poller.h b/optimizer/Pilot/Poller.h
index 672e090f8c4ed0bb96c3ccff992425d6aff2fab9..717c3d4f7c77e006c9d2fb653727153ca6a5d70a 100644
--- a/optimizer/Pilot/Poller.h
+++ b/optimizer/Pilot/Poller.h
@@ -12,7 +12,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Pilot/Worker.h b/optimizer/Pilot/Worker.h
index ce5bf1276fdd31aa8868473e1bb6e331fd1b5969..fd9876e0e0d0c11bc0ccb7a657ceeceabbe42e35 100644
--- a/optimizer/Pilot/Worker.h
+++ b/optimizer/Pilot/Worker.h
@@ -14,7 +14,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Simulation/GenerateOpalSimulation.h b/optimizer/Simulation/GenerateOpalSimulation.h
index 9d5b770d696846031d0805c1d25a10da9c3a6f01..d8460fe3632b16153a0df31af143d19509419208 100644
--- a/optimizer/Simulation/GenerateOpalSimulation.h
+++ b/optimizer/Simulation/GenerateOpalSimulation.h
@@ -17,7 +17,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Simulation/Simulation.h b/optimizer/Simulation/Simulation.h
index 1629bbf65347775be552f5e22dbeb5261ee256a0..8db40a91b3f48719a6ff186d310f1499c37c7b6b 100644
--- a/optimizer/Simulation/Simulation.h
+++ b/optimizer/Simulation/Simulation.h
@@ -15,7 +15,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Tests/CmdArgumentsTest.cpp b/optimizer/Tests/CmdArgumentsTest.cpp
index a940ab338ef806782a0452d080b025ad10cda9ec..04f2183e1883b63a683fc20eceb6e8f5f79cc7ed 100644
--- a/optimizer/Tests/CmdArgumentsTest.cpp
+++ b/optimizer/Tests/CmdArgumentsTest.cpp
@@ -5,7 +5,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Tests/ExpressionTest.cpp b/optimizer/Tests/ExpressionTest.cpp
index d3dda9fc844a2c7b31e98b16e1daa488adfc7972..3e98942cf05d1cefd658786f2ae1de4a199b231e 100644
--- a/optimizer/Tests/ExpressionTest.cpp
+++ b/optimizer/Tests/ExpressionTest.cpp
@@ -5,7 +5,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Tests/FromFileExpressionTest.cpp b/optimizer/Tests/FromFileExpressionTest.cpp
index 33a44c69bbcae4b1bb0f859903b5ec32490eefb4..98bb59d14c4a6d17538332223c72099ce5083819 100644
--- a/optimizer/Tests/FromFileExpressionTest.cpp
+++ b/optimizer/Tests/FromFileExpressionTest.cpp
@@ -5,7 +5,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Tests/HashNameGeneratorTest.cpp b/optimizer/Tests/HashNameGeneratorTest.cpp
index f3fa95948886883574574798409abd7a223f3208..9aa4b756a6a9b66d5f2f723b3f4a023020ee8a51 100644
--- a/optimizer/Tests/HashNameGeneratorTest.cpp
+++ b/optimizer/Tests/HashNameGeneratorTest.cpp
@@ -5,7 +5,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Tests/IndividualTest.cpp b/optimizer/Tests/IndividualTest.cpp
index abb62243005d3eb96e246c04dc1385928a4ef523..be7a39dba2f3c5ef009c3fcb1fc3138562372806 100644
--- a/optimizer/Tests/IndividualTest.cpp
+++ b/optimizer/Tests/IndividualTest.cpp
@@ -5,7 +5,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Tests/MPIHelperTest.cpp b/optimizer/Tests/MPIHelperTest.cpp
index 745d37582a36934fec5e41870935e0918c7282e8..80c019943c8f4ba5fce438c61824302f0e06adca 100644
--- a/optimizer/Tests/MPIHelperTest.cpp
+++ b/optimizer/Tests/MPIHelperTest.cpp
@@ -5,7 +5,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Tests/ManagedIDsTest.cpp b/optimizer/Tests/ManagedIDsTest.cpp
index 2b899bd03ccf088a8100ec4195e79f9523cf097a..00d9fdbde3c6e603b38c0b8b98e9f58277507505 100644
--- a/optimizer/Tests/ManagedIDsTest.cpp
+++ b/optimizer/Tests/ManagedIDsTest.cpp
@@ -5,7 +5,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Tests/PopulationTest.cpp b/optimizer/Tests/PopulationTest.cpp
index 2ea29fd85d6be3cb32c15ff188c8a4b7217f8548..f5e1ccfe5f1081e892cb9b0cb78409e81c4a8dfa 100644
--- a/optimizer/Tests/PopulationTest.cpp
+++ b/optimizer/Tests/PopulationTest.cpp
@@ -5,7 +5,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Tests/PythonExprTest.cpp b/optimizer/Tests/PythonExprTest.cpp
index 8c67e96440c0e91c47a8ea384b812bdcc85976e0..10d6cdfa253e6dfc810c22f099131eac7df785fb 100644
--- a/optimizer/Tests/PythonExprTest.cpp
+++ b/optimizer/Tests/PythonExprTest.cpp
@@ -5,7 +5,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Tests/SDDSParserTest.cpp b/optimizer/Tests/SDDSParserTest.cpp
index 182f751b3bcfd57d4bc5cad3dcbead2c78460197..1284b24ef30961736649c59caa2aabbfb6398f88 100644
--- a/optimizer/Tests/SDDSParserTest.cpp
+++ b/optimizer/Tests/SDDSParserTest.cpp
@@ -5,7 +5,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Tests/SumErrSqExpressionTest.cpp b/optimizer/Tests/SumErrSqExpressionTest.cpp
index 6396cfd10a46178e4456990ef33a58cc89ec5c9a..382fe4d9466c13b0eae8be550800e5708e1d37a0 100644
--- a/optimizer/Tests/SumErrSqExpressionTest.cpp
+++ b/optimizer/Tests/SumErrSqExpressionTest.cpp
@@ -5,7 +5,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Util/AsyncSendBuffers.h b/optimizer/Util/AsyncSendBuffers.h
index 4541e94c9f124fd3ffd5e395ef8de1eb7d74d716..68e001de341566b594cef893772b4f6f5302a11a 100644
--- a/optimizer/Util/AsyncSendBuffers.h
+++ b/optimizer/Util/AsyncSendBuffers.h
@@ -5,7 +5,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Util/CmdArguments.cpp b/optimizer/Util/CmdArguments.cpp
index 14a2e1b1d11706b7493db1f2818ea46fa800a37b..f247e56404d5098b5b83c389988539017b4b0ca1 100644
--- a/optimizer/Util/CmdArguments.cpp
+++ b/optimizer/Util/CmdArguments.cpp
@@ -12,7 +12,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Util/CmdArguments.h b/optimizer/Util/CmdArguments.h
index e90f58896b0f89eb70fe636d04606aaba447679c..bff896739fbd47e5002b65b2dc80d93e32db9cb0 100644
--- a/optimizer/Util/CmdArguments.h
+++ b/optimizer/Util/CmdArguments.h
@@ -12,7 +12,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Util/MPIHelper.cpp b/optimizer/Util/MPIHelper.cpp
index 4199d7c8985730bf7e8a71ecddba505ea7b37f7b..be01293828bde017343cf43e8685d4657fe2f9a9 100644
--- a/optimizer/Util/MPIHelper.cpp
+++ b/optimizer/Util/MPIHelper.cpp
@@ -5,7 +5,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Util/MPIHelper.h b/optimizer/Util/MPIHelper.h
index 79d8e4c2fb9426fd84e5d78a12453c50782f0fb5..42905229729d2fb62eb828be6c25a8250bdb5ffc 100644
--- a/optimizer/Util/MPIHelper.h
+++ b/optimizer/Util/MPIHelper.h
@@ -5,7 +5,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Util/ManagedIDs.h b/optimizer/Util/ManagedIDs.h
index 4c5494ef742371c005e88ef345cba0c5d14b0ff3..1ca5c47abf6fd39c3e7f2c8c2507f3a4c04eb763 100644
--- a/optimizer/Util/ManagedIDs.h
+++ b/optimizer/Util/ManagedIDs.h
@@ -8,7 +8,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Util/NativeHashGenerator.h b/optimizer/Util/NativeHashGenerator.h
index 91b196d370e38d69573c5cc2edb25bd8918b2c1a..403f8fb1afd7fef7c06fc2e7aec1aee6bc8bd4e4 100644
--- a/optimizer/Util/NativeHashGenerator.h
+++ b/optimizer/Util/NativeHashGenerator.h
@@ -7,7 +7,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Util/OptPilotException.h b/optimizer/Util/OptPilotException.h
index 3c14b83ba91f6a299221440b63b02db7e538115e..2e70eb87ebca0cff8dae6c7bbdfb5a8344569ea9 100644
--- a/optimizer/Util/OptPilotException.h
+++ b/optimizer/Util/OptPilotException.h
@@ -5,7 +5,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Util/ProbeReader.cpp b/optimizer/Util/ProbeReader.cpp
index b211e147a173e08c019dd9e8524e54b69c3d0319..59aff0258067cf23457562f2b82db22c222a737f 100644
--- a/optimizer/Util/ProbeReader.cpp
+++ b/optimizer/Util/ProbeReader.cpp
@@ -6,7 +6,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Util/ProbeReader.h b/optimizer/Util/ProbeReader.h
index 84d631cae67928ea5979fc0ae0efb1120264e1b9..171e42e230c0c133c4dadaa770acb07f51d3d2cd 100644
--- a/optimizer/Util/ProbeReader.h
+++ b/optimizer/Util/ProbeReader.h
@@ -6,7 +6,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Util/Statistics.h b/optimizer/Util/Statistics.h
index bf2001e142ff6dee3396cfa0f4386b8093a406a3..79a2a7df64a895ff5c46c7bda84928ec8f804476 100644
--- a/optimizer/Util/Statistics.h
+++ b/optimizer/Util/Statistics.h
@@ -5,7 +5,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Util/Trace/CoutSink.h b/optimizer/Util/Trace/CoutSink.h
index 746511e922533a7179abeed70db106414b1701fe..2a6323f271f7e1011443db36ec4f0764c9ff5be3 100644
--- a/optimizer/Util/Trace/CoutSink.h
+++ b/optimizer/Util/Trace/CoutSink.h
@@ -5,7 +5,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Util/Trace/FileSink.h b/optimizer/Util/Trace/FileSink.h
index d844a54285bb905e3e536b982ab9589864833b95..780b25c74b5f67aa28417813bcca50bd2a391eb0 100644
--- a/optimizer/Util/Trace/FileSink.h
+++ b/optimizer/Util/Trace/FileSink.h
@@ -5,7 +5,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Util/Trace/MyPid.h b/optimizer/Util/Trace/MyPid.h
index 70931647a907a279313aeb0eeb0eb8939c10085f..dbcbc0554d45e577340c561bb988c6ef79732219 100644
--- a/optimizer/Util/Trace/MyPid.h
+++ b/optimizer/Util/Trace/MyPid.h
@@ -5,7 +5,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Util/Trace/Timestamp.h b/optimizer/Util/Trace/Timestamp.h
index 4a0d4c7e7c8a306cfcbc63d7fa6b2204c1d21e86..b7c88e3217fc70c2d32fe4f3f37c0346c1d40dfc 100644
--- a/optimizer/Util/Trace/Timestamp.h
+++ b/optimizer/Util/Trace/Timestamp.h
@@ -5,7 +5,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Util/Trace/Trace.h b/optimizer/Util/Trace/Trace.h
index 8286fbb1a60545beca4c243f1fa14c3c9acd4e8b..3f3e24c745359df3316458e522cb3f4280e1cbd3 100644
--- a/optimizer/Util/Trace/Trace.h
+++ b/optimizer/Util/Trace/Trace.h
@@ -5,7 +5,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Util/Trace/TraceComponent.h b/optimizer/Util/Trace/TraceComponent.h
index cd1c8bef27cd069c5760e2894d546c610072c25a..61d9099dad939d0d2b260a51fd5dc35735e5f0af 100644
--- a/optimizer/Util/Trace/TraceComponent.h
+++ b/optimizer/Util/Trace/TraceComponent.h
@@ -5,7 +5,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.
diff --git a/optimizer/Util/Types.h b/optimizer/Util/Types.h
index a972d57656ba610010bc583eaaf785ed935ade5c..cff85c900cb725346a49217c1e575976a68e8ce4 100644
--- a/optimizer/Util/Types.h
+++ b/optimizer/Util/Types.h
@@ -5,7 +5,7 @@
 // All rights reserved
 //
 // Implemented as part of the PhD thesis
-// "Toward massively parallel multi-objective optimization withapplication to
+// "Toward massively parallel multi-objective optimization with application to
 // particle accelerators" (https://doi.org/10.3929/ethz-a-009792359)
 //
 // This file is part of OPAL.