diff --git a/etc/codeTemplates/dynamicCode/mixedFvPatchFieldTemplate.C b/etc/codeTemplates/dynamicCode/mixedFvPatchFieldTemplate.C
index ded11e8929d19d9f81edb0aa61b327bcd568d146..ab2f100f3e462c9c30a9f8419179e30be61f40ea 100644
--- a/etc/codeTemplates/dynamicCode/mixedFvPatchFieldTemplate.C
+++ b/etc/codeTemplates/dynamicCode/mixedFvPatchFieldTemplate.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -73,18 +73,18 @@ extern "C"
 makeRemovablePatchTypeField
 (
     fvPatch${FieldType},
-    ${typeName}FixedValueFvPatch${FieldType}
+    ${typeName}MixedValueFvPatch${FieldType}
 );
 
 
-const char* const ${typeName}FixedValueFvPatch${FieldType}::SHA1sum =
+const char* const ${typeName}MixedValueFvPatch${FieldType}::SHA1sum =
     "${SHA1sum}";
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-${typeName}FixedValueFvPatch${FieldType}::
-${typeName}FixedValueFvPatch${FieldType}
+${typeName}MixedValueFvPatch${FieldType}::
+${typeName}MixedValueFvPatch${FieldType}
 (
     const fvPatch& p,
     const DimensionedField<${TemplateType}, volMesh>& iF
@@ -100,10 +100,10 @@ ${typeName}FixedValueFvPatch${FieldType}
 }
 
 
-${typeName}FixedValueFvPatch${FieldType}::
-${typeName}FixedValueFvPatch${FieldType}
+${typeName}MixedValueFvPatch${FieldType}::
+${typeName}MixedValueFvPatch${FieldType}
 (
-    const ${typeName}FixedValueFvPatch${FieldType}& ptf,
+    const ${typeName}MixedValueFvPatch${FieldType}& ptf,
     const fvPatch& p,
     const DimensionedField<${TemplateType}, volMesh>& iF,
     const fvPatchFieldMapper& mapper
@@ -119,8 +119,8 @@ ${typeName}FixedValueFvPatch${FieldType}
 }
 
 
-${typeName}FixedValueFvPatch${FieldType}::
-${typeName}FixedValueFvPatch${FieldType}
+${typeName}MixedValueFvPatch${FieldType}::
+${typeName}MixedValueFvPatch${FieldType}
 (
     const fvPatch& p,
     const DimensionedField<${TemplateType}, volMesh>& iF,
@@ -137,10 +137,10 @@ ${typeName}FixedValueFvPatch${FieldType}
 }
 
 
-${typeName}FixedValueFvPatch${FieldType}::
-${typeName}FixedValueFvPatch${FieldType}
+${typeName}MixedValueFvPatch${FieldType}::
+${typeName}MixedValueFvPatch${FieldType}
 (
-    const ${typeName}FixedValueFvPatch${FieldType}& ptf
+    const ${typeName}MixedValueFvPatch${FieldType}& ptf
 )
 :
     mixedFvPatchField<${TemplateType}>(ptf)
@@ -153,10 +153,10 @@ ${typeName}FixedValueFvPatch${FieldType}
 }
 
 
-${typeName}FixedValueFvPatch${FieldType}::
-${typeName}FixedValueFvPatch${FieldType}
+${typeName}MixedValueFvPatch${FieldType}::
+${typeName}MixedValueFvPatch${FieldType}
 (
-    const ${typeName}FixedValueFvPatch${FieldType}& ptf,
+    const ${typeName}MixedValueFvPatch${FieldType}& ptf,
     const DimensionedField<${TemplateType}, volMesh>& iF
 )
 :
@@ -172,8 +172,8 @@ ${typeName}FixedValueFvPatch${FieldType}
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-${typeName}FixedValueFvPatch${FieldType}::
-~${typeName}FixedValueFvPatch${FieldType}()
+${typeName}MixedValueFvPatch${FieldType}::
+~${typeName}MixedValueFvPatch${FieldType}()
 {
     if (${verbose:-false})
     {
@@ -184,7 +184,7 @@ ${typeName}FixedValueFvPatch${FieldType}::
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void ${typeName}FixedValueFvPatch${FieldType}::updateCoeffs()
+void ${typeName}MixedValueFvPatch${FieldType}::updateCoeffs()
 {
     if (this->updated())
     {
diff --git a/etc/codeTemplates/dynamicCode/mixedFvPatchFieldTemplate.H b/etc/codeTemplates/dynamicCode/mixedFvPatchFieldTemplate.H
index 7c0b654618214891d4a1d5489b01bba3ef809d7a..06e1c9887c5a31cc40d57d5eaa4a8260b04e0f4a 100644
--- a/etc/codeTemplates/dynamicCode/mixedFvPatchFieldTemplate.H
+++ b/etc/codeTemplates/dynamicCode/mixedFvPatchFieldTemplate.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,10 +43,10 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                         A templated FixedValueFvPatch
+                     A templated MixedValueFvPatchField
 \*---------------------------------------------------------------------------*/
 
-class ${typeName}FixedValueFvPatch${FieldType}
+class ${typeName}MixedValueFvPatch${FieldType}
 :
     public mixedFvPatchField<${TemplateType}>
 {
@@ -62,14 +62,14 @@ public:
     // Constructors
 
         //- Construct from patch and internal field
-        ${typeName}FixedValueFvPatch${FieldType}
+        ${typeName}MixedValueFvPatch${FieldType}
         (
             const fvPatch&,
             const DimensionedField<${TemplateType}, volMesh>&
         );
 
         //- Construct from patch, internal field and dictionary
-        ${typeName}FixedValueFvPatch${FieldType}
+        ${typeName}MixedValueFvPatch${FieldType}
         (
             const fvPatch&,
             const DimensionedField<${TemplateType}, volMesh>&,
@@ -77,18 +77,18 @@ public:
         );
 
         //- Construct by mapping a copy onto a new patch
-        ${typeName}FixedValueFvPatch${FieldType}
+        ${typeName}MixedValueFvPatch${FieldType}
         (
-            const ${typeName}FixedValueFvPatch${FieldType}&,
+            const ${typeName}MixedValueFvPatch${FieldType}&,
             const fvPatch&,
             const DimensionedField<${TemplateType}, volMesh>&,
             const fvPatchFieldMapper&
         );
 
         //- Construct as copy
-        ${typeName}FixedValueFvPatch${FieldType}
+        ${typeName}MixedValueFvPatch${FieldType}
         (
-            const ${typeName}FixedValueFvPatch${FieldType}&
+            const ${typeName}MixedValueFvPatch${FieldType}&
         );
 
         //- Construct and return a clone
@@ -96,14 +96,14 @@ public:
         {
             return tmp< fvPatch${FieldType} >
             (
-                new ${typeName}FixedValueFvPatch${FieldType}(*this)
+                new ${typeName}MixedValueFvPatch${FieldType}(*this)
             );
         }
 
         //- Construct as copy setting internal field reference
-        ${typeName}FixedValueFvPatch${FieldType}
+        ${typeName}MixedValueFvPatch${FieldType}
         (
-            const ${typeName}FixedValueFvPatch${FieldType}&,
+            const ${typeName}MixedValueFvPatch${FieldType}&,
             const DimensionedField<${TemplateType}, volMesh>&
         );
 
@@ -115,13 +115,13 @@ public:
         {
             return tmp< fvPatch${FieldType} >
             (
-                new ${typeName}FixedValueFvPatch${FieldType}(*this, iF)
+                new ${typeName}MixedValueFvPatch${FieldType}(*this, iF)
             );
         }
 
 
     //- Destructor
-    virtual ~${typeName}FixedValueFvPatch${FieldType}();
+    virtual ~${typeName}MixedValueFvPatch${FieldType}();
 
 
     // Member functions