diff --git a/etc/codeTemplates/dynamicCode/codedFvOptionTemplate.C b/etc/codeTemplates/dynamicCode/codedFvOptionTemplate.C
index 046412bd6..9e66fe1be 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 29e97e3a2..314ce4dd4 100644
--- a/etc/codeTemplates/dynamicCode/codedFvOptionTemplate.H
+++ b/etc/codeTemplates/dynamicCode/codedFvOptionTemplate.H
@@ -36,9 +36,9 @@ Description
         const label fieldi
     )
 
-    setValue
+    constrain
     (
-         fvMatrix<Type}>& eqn,
+        fvMatrix<Type}>& eqn,
         const label fieldi
     )
 
@@ -172,7 +172,7 @@ public:
             );
 
             //- Set value
-            virtual void setValue
+            virtual void constrain
             (
                 fvMatrix<${TemplateType}>& eqn,
                 const label fieldi