diff --git a/etc/codeTemplates/dynamicCode/codedFunction1Template.H b/etc/codeTemplates/dynamicCode/codedFunction1Template.H
index f2ff14e7e5..699897f9f2 100644
--- a/etc/codeTemplates/dynamicCode/codedFunction1Template.H
+++ b/etc/codeTemplates/dynamicCode/codedFunction1Template.H
@@ -27,7 +27,7 @@ Description
     - without state
 
 SourceFiles
-    Function1Template.C
+    codedFunction1Template.C
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/etc/codeTemplates/dynamicCode/Function2Template.C b/etc/codeTemplates/dynamicCode/codedFunction2Template.C
similarity index 98%
rename from etc/codeTemplates/dynamicCode/Function2Template.C
rename to etc/codeTemplates/dynamicCode/codedFunction2Template.C
index ecdf3897db..4f83b63179 100644
--- a/etc/codeTemplates/dynamicCode/Function2Template.C
+++ b/etc/codeTemplates/dynamicCode/codedFunction2Template.C
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "Function2Template.H"
+#include "codedFunction2Template.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
diff --git a/etc/codeTemplates/dynamicCode/Function2Template.H b/etc/codeTemplates/dynamicCode/codedFunction2Template.H
similarity index 96%
rename from etc/codeTemplates/dynamicCode/Function2Template.H
rename to etc/codeTemplates/dynamicCode/codedFunction2Template.H
index df346b6be2..b27ee93c19 100644
--- a/etc/codeTemplates/dynamicCode/Function2Template.H
+++ b/etc/codeTemplates/dynamicCode/codedFunction2Template.H
@@ -27,14 +27,15 @@ Description
     - without state
 
 SourceFiles
-    Function2Template.C
+    codedFunction2Template.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef Function2Template_H
-#define Function2Template_H
+#ifndef codedFunction2Template_H
+#define codedFunction2Template_H
 
 #include "Function2.H"
+#include "fieldTypes.H"
 
 //{{{ begin codeInclude
 ${codeInclude}
diff --git a/src/OpenFOAM/db/dynamicLibrary/codedBase/codedBase.C b/src/OpenFOAM/db/dynamicLibrary/codedBase/codedBase.C
index 60eecf2ff6..25e0ea3193 100644
--- a/src/OpenFOAM/db/dynamicLibrary/codedBase/codedBase.C
+++ b/src/OpenFOAM/db/dynamicLibrary/codedBase/codedBase.C
@@ -367,7 +367,7 @@ Foam::codedBase::codedBase()
 
 Foam::codedBase::codedBase(const word& name, const dictionary& dict)
 :
-    codeName_(name),
+    codeName_(word(name).replaceAll("-", "_")),
     dict_(dict)
 {}