diff --git a/etc/codeTemplates/dynamicCode/functionObjectTemplate.H b/etc/codeTemplates/dynamicCode/functionObjectTemplate.H
index 0bc6fa5bd5..bac449d0f4 100644
--- a/etc/codeTemplates/dynamicCode/functionObjectTemplate.H
+++ b/etc/codeTemplates/dynamicCode/functionObjectTemplate.H
@@ -44,7 +44,7 @@ ${codeInclude}
 namespace Foam
 {
 
-// Forward declaration of classes
+// Forward declarations
 class fvMesh;
 
 /*---------------------------------------------------------------------------*\
@@ -66,11 +66,11 @@ class ${typeName}FunctionObject
 
         const fvMesh& mesh() const;
 
-        //- Disallow default bitwise copy construct
-        ${typeName}FunctionObject(const ${typeName}FunctionObject&);
+        //- No copy construct
+        ${typeName}FunctionObject(const ${typeName}FunctionObject&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const ${typeName}FunctionObject&);
+        //- No copy assignment
+        void operator=(const ${typeName}FunctionObject&) = delete;
 
 
 public:
@@ -97,7 +97,7 @@ public:
     // Member Functions
 
         //- Read the system calls
-        virtual bool read(const dictionary&);
+        virtual bool read(const dictionary& dict);
 
         //- Execute the "executeCalls" at each time-step
         virtual bool execute();
diff --git a/etc/codeTemplates/functionObject/FUNCTIONOBJECT.H b/etc/codeTemplates/functionObject/FUNCTIONOBJECT.H
index 0cd4d7b8cd..94cdba33b2 100644
--- a/etc/codeTemplates/functionObject/FUNCTIONOBJECT.H
+++ b/etc/codeTemplates/functionObject/FUNCTIONOBJECT.H
@@ -91,10 +91,10 @@ class FUNCTIONOBJECT
     // Private Member Functions
 
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         FUNCTIONOBJECT(const FUNCTIONOBJECT&);
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const FUNCTIONOBJECT&);
 
 
@@ -122,7 +122,7 @@ public:
     // Member Functions
 
         //- Read the FUNCTIONOBJECT data
-        virtual bool read(const dictionary&);
+        virtual bool read(const dictionary& dict);
 
         //- Execute, currently does nothing
         virtual bool execute();
diff --git a/etc/codeTemplates/source/_Template.H b/etc/codeTemplates/source/_Template.H
index ade3d6f0f1..7f5f9c4f53 100644
--- a/etc/codeTemplates/source/_Template.H
+++ b/etc/codeTemplates/source/_Template.H
@@ -43,11 +43,10 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of classes
+// Forward declarations
 class Istream;
 class Ostream;
 
-// Forward declaration of friend functions and operators
 class CLASSNAME;
 Istream& operator>>(Istream&, CLASSNAME&);
 Ostream& operator<<(Ostream&, const CLASSNAME&);
@@ -69,11 +68,11 @@ class CLASSNAME
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        CLASSNAME(const CLASSNAME&);
+        //- No copy construct
+        CLASSNAME(const CLASSNAME&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const CLASSNAME&);
+        //- No copy assignment
+        void operator=(const CLASSNAME&) = delete;
 
 
 public:
@@ -93,7 +92,7 @@ public:
         CLASSNAME(const dataType& data);
 
         //- Construct from Istream
-        CLASSNAME(Istream&);
+        CLASSNAME(Istream& is);
 
         //- Construct as copy
         CLASSNAME(const CLASSNAME&);
diff --git a/etc/codeTemplates/template/_TemplateTemplate.H b/etc/codeTemplates/template/_TemplateTemplate.H
index bdc0903c2d..f80db5cc5d 100644
--- a/etc/codeTemplates/template/_TemplateTemplate.H
+++ b/etc/codeTemplates/template/_TemplateTemplate.H
@@ -43,12 +43,9 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of classes
+// Forward declarations
 class someClass;
 
-
-// Forward declaration of friend functions and operators
-
 template<TemplateClassArgument>
 class CLASSNAME;
 
@@ -75,11 +72,11 @@ class CLASSNAME
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        CLASSNAME(const CLASSNAME<TemplateArgument>&);
+        //- No copy construct
+        CLASSNAME(const CLASSNAME<TemplateArgument>&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const CLASSNAME<TemplateArgument>&);
+        //- No copy assignment
+        void operator=(const CLASSNAME<TemplateArgument>&) = delete;
 
 
 public:
@@ -99,7 +96,7 @@ public:
         CLASSNAME(const dataType& data);
 
         //- Construct from Istream
-        CLASSNAME(Istream&);
+        CLASSNAME(Istream& is);
 
         //- Construct as copy
         CLASSNAME(const CLASSNAME<TemplateArgument>&);