diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/PPCG/PPCG.C b/src/OpenFOAM/matrices/lduMatrix/solvers/PPCG/PPCG.C
index a78bfa3c7e39ee1e3d92442e4b577546b1fcad40..0f9a0ad748c2f914008553cb0f62aa1e5c09138f 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/PPCG/PPCG.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/PPCG/PPCG.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019-2020 M. Janssens
+    Copyright (C) 2019-2020 Mattijs Janssens
     Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/PPCG/PPCG.H b/src/OpenFOAM/matrices/lduMatrix/solvers/PPCG/PPCG.H
index da34eb2a7dd945d433c6aa10205d0638deb433a4..5a8926a7c40e6b592aff61647afa9ccb3580268a 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/PPCG/PPCG.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/PPCG/PPCG.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019-2020 M. Janssens
+    Copyright (C) 2019-2020 Mattijs Janssens
     Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
@@ -80,11 +80,11 @@ class PPCG
             const label comm
         ) const;
 
-        //- Disallow default bitwise copy construct
-        PPCG(const PPCG&);
+        //- No copy construct
+        PPCG(const PPCG&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const PPCG&);
+        //- No copy assignment
+        void operator=(const PPCG&) = delete;
 
 
 protected:
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/PPCR/PPCR.C b/src/OpenFOAM/matrices/lduMatrix/solvers/PPCR/PPCR.C
index b9875cbf1153506baaa8b7d9c244f2efa93f5d95..fc858032f06ed97518a322d98b054ce9c57c7e89 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/PPCR/PPCR.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/PPCR/PPCR.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019-2020 M. Janssens
+    Copyright (C) 2019-2020 Mattijs Janssens
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/PPCR/PPCR.H b/src/OpenFOAM/matrices/lduMatrix/solvers/PPCR/PPCR.H
index d8f4a28650a8399e6a37d052525063fb4700d76f..addadc212f959735d6e3c715dc150231e4242a04 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/PPCR/PPCR.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/PPCR/PPCR.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019-2020 M. Janssens
+    Copyright (C) 2019-2020 Mattijs Janssens
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -70,11 +70,11 @@ class PPCR
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        PPCR(const PPCR&);
+        //- No copy construct
+        PPCR(const PPCR&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const PPCR&);
+        //- No copy assignment
+        void operator=(const PPCR&) = delete;
 
 
 public:
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.H b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.H
index 04c938120664013da5f467dc014cca27bd01fe22..1988d591b92a475827fda8a1b3211712e34cdf9c 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2015 OpenFOAM Foundation
-    Copyright (C) 2016 OpenCFD ltd.
+    Copyright (C) 2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.H b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.H
index b2f2c0fff4cde5babe0eb0033691ea0207a2cd33..96f0f5c1d76534ac2528cfc2d98d778f48da8926 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2015 OpenFOAM Foundation
-    Copyright (C) 2016 OpenCFD ltd.
+    Copyright (C) 2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/maxDeltaxyzCubeRootLESDelta/maxDeltaxyzCubeRootLESDelta.C b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/maxDeltaxyzCubeRootLESDelta/maxDeltaxyzCubeRootLESDelta.C
index 62499bcfc5ac35381a981892ed831d466f01d1f0..1ef74e6251d2cc9356533aaaa8087ad6f6016072 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/maxDeltaxyzCubeRootLESDelta/maxDeltaxyzCubeRootLESDelta.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/maxDeltaxyzCubeRootLESDelta/maxDeltaxyzCubeRootLESDelta.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2016 OpenCFD ltd.
+    Copyright (C) 2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/maxDeltaxyzCubeRootLESDelta/maxDeltaxyzCubeRootLESDelta.H b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/maxDeltaxyzCubeRootLESDelta/maxDeltaxyzCubeRootLESDelta.H
index 0e948bd2fe20bbfc53cc04d432af681d29b4d712..ab575566e5c4f10565d8782943fb51eaac07e478 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/maxDeltaxyzCubeRootLESDelta/maxDeltaxyzCubeRootLESDelta.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/maxDeltaxyzCubeRootLESDelta/maxDeltaxyzCubeRootLESDelta.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2016 OpenCFD ltd.
+    Copyright (C) 2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtSchemeBase.C b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtSchemeBase.C
index db747cf7ede98d260ac4c45e683a6c3fc82c2a9c..d4b9237de2067b09bed4d4da320ceeb101647f85 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtSchemeBase.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtSchemeBase.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018 OPenCFD Ltd.
+    Copyright (C) 2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
diff --git a/src/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.H b/src/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.H
index dd742b736930cdaed5ee1ee16e93e2ea951845e0..0145952ddab04e1b7508cd2df9e67d34def85799 100644
--- a/src/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.H
+++ b/src/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2016 OpenFOAM Foundation
-    Copyright (C) 2015-2016, OpenCFD Ltd.
+    Copyright (C) 2015-2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
diff --git a/src/functionObjects/utilities/runTimeControl/runTimeCondition/averageCondition/averageConditionTemplates.C b/src/functionObjects/utilities/runTimeControl/runTimeCondition/averageCondition/averageConditionTemplates.C
index dfcb7a143b13c04320180c34275ea31167e83c05..0197f0b08ba1d2f6e505e47d4be2d981936395c1 100644
--- a/src/functionObjects/utilities/runTimeControl/runTimeCondition/averageCondition/averageConditionTemplates.C
+++ b/src/functionObjects/utilities/runTimeControl/runTimeCondition/averageCondition/averageConditionTemplates.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2015 OpenFOAM Foundation
-    Copyright (C) 2015-2016, OpenCFD Ltd.
+    Copyright (C) 2015-2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
diff --git a/src/functionObjects/utilities/thermoCoupleProbes/thermoCoupleProbes.H b/src/functionObjects/utilities/thermoCoupleProbes/thermoCoupleProbes.H
index d7a4e5b9e714d6fecdd1ab5cc958589583eca96a..7bc0f8d09978fd62c1ea1583be135ce8feff5e2c 100644
--- a/src/functionObjects/utilities/thermoCoupleProbes/thermoCoupleProbes.H
+++ b/src/functionObjects/utilities/thermoCoupleProbes/thermoCoupleProbes.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2016 OpenCFD.Ltd
+    Copyright (C) 2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
diff --git a/src/functionObjects/utilities/thermoCoupleProbes/thermoCoupleProbesTemplates.C b/src/functionObjects/utilities/thermoCoupleProbes/thermoCoupleProbesTemplates.C
index b8484179f78982286eb94059550f63271dc3d3b2..dee96c90dfbaab0ef753acad321b94ea5e78fef4 100644
--- a/src/functionObjects/utilities/thermoCoupleProbes/thermoCoupleProbesTemplates.C
+++ b/src/functionObjects/utilities/thermoCoupleProbes/thermoCoupleProbesTemplates.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2016 OpenCFD.Ltd
+    Copyright (C) 2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
diff --git a/src/meshTools/processorLOD/box/box.H b/src/meshTools/processorLOD/box/box.H
index 848c310d030579e4ccaaee067a75a6e706cc9c7c..32375dac935e4889f4b618282b51b33e1909bd45 100644
--- a/src/meshTools/processorLOD/box/box.H
+++ b/src/meshTools/processorLOD/box/box.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017 OpeCFD Ltd.
+    Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
diff --git a/src/meshTools/processorLOD/cellBox/cellBox.H b/src/meshTools/processorLOD/cellBox/cellBox.H
index 355cbf4e2d24a2c2c392719c461274df9e827210..df5766d83f95eef4036596e7a9c80d1fe043aa3f 100644
--- a/src/meshTools/processorLOD/cellBox/cellBox.H
+++ b/src/meshTools/processorLOD/cellBox/cellBox.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017 OpeCFD Ltd.
+    Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
diff --git a/src/meshTools/processorLOD/faceBox/faceBox.H b/src/meshTools/processorLOD/faceBox/faceBox.H
index c1e293ada352cbee69d9d49a7c4810ace6004100..2b6b8acc4a1623b57d766ed3be6f54784847db58 100644
--- a/src/meshTools/processorLOD/faceBox/faceBox.H
+++ b/src/meshTools/processorLOD/faceBox/faceBox.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017 OpeCFD Ltd.
+    Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
diff --git a/src/rigidBodyDynamics/restraints/prescribedRotation/prescribedRotation.C b/src/rigidBodyDynamics/restraints/prescribedRotation/prescribedRotation.C
index 197f15f43dc57d07643aef896dd5c9f358e78266..4275e7a7221a899246fa7d275f0d781f9bf010b2 100644
--- a/src/rigidBodyDynamics/restraints/prescribedRotation/prescribedRotation.C
+++ b/src/rigidBodyDynamics/restraints/prescribedRotation/prescribedRotation.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018 OpenCFD ltd.
+    Copyright (C) 2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
diff --git a/src/thermophysicalModels/basic/heThermo/heThermo.C b/src/thermophysicalModels/basic/heThermo/heThermo.C
index 40dfdd228a31a3faee13caf5eb70995db2dd893a..d967280551237405e76de7960d0ae02560d6e583 100644
--- a/src/thermophysicalModels/basic/heThermo/heThermo.C
+++ b/src/thermophysicalModels/basic/heThermo/heThermo.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2015-2017, OpenCFD Ltd.
+    Copyright (C) 2015-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.