diff --git a/etc/codeTemplates/dynamicCode/codedFvOptionTemplate.C b/etc/codeTemplates/dynamicCode/codedFvOptionTemplate.C
index 0e78abcf2a..e7c9ab22c9 100644
--- a/etc/codeTemplates/dynamicCode/codedFvOptionTemplate.C
+++ b/etc/codeTemplates/dynamicCode/codedFvOptionTemplate.C
@@ -179,7 +179,7 @@ void ${typeName}FvOption${SourceType}::addSup
 }
 
 
-void ${typeName}FvOption${SourceType}::setValue
+void ${typeName}FvOption${SourceType}::constrain
 (
     fvMatrix<${TemplateType}>& eqn,
     const label fieldi
@@ -187,7 +187,7 @@ void ${typeName}FvOption${SourceType}::setValue
 {
     if (${verbose:-false})
     {
-        Info<<"${typeName}FvOption${SourceType}::setValue()\n";
+        Info<<"${typeName}FvOption${SourceType}::constrain()\n";
     }
 
 //{{{ begin code
diff --git a/etc/codeTemplates/dynamicCode/codedFvOptionTemplate.H b/etc/codeTemplates/dynamicCode/codedFvOptionTemplate.H
index 63e30f0869..03234c2035 100644
--- a/etc/codeTemplates/dynamicCode/codedFvOptionTemplate.H
+++ b/etc/codeTemplates/dynamicCode/codedFvOptionTemplate.H
@@ -36,10 +36,10 @@ Description
         const label fieldi
     )
 
-    setValue
+    constrain
     (
-         fvMatrix<Type}>& eqn,
-         const label fieldi
+        fvMatrix<Type>& eqn,
+        const label fieldi
     )
 
     where :
@@ -172,7 +172,7 @@ public:
             );
 
             //- Set value
-            virtual void setValue
+            virtual void constrain
             (
                 fvMatrix<${TemplateType}>& eqn,
                 const label fieldi