diff --git a/src/finiteArea/finiteArea/fac/facDiv.C b/src/finiteArea/finiteArea/fac/facDiv.C
index a0fb7122c8122bada67b419710632f62d8497bc1..6daa9f83e6f231f109f7b0ba550c4813c1d6a234 100644
--- a/src/finiteArea/finiteArea/fac/facDiv.C
+++ b/src/finiteArea/finiteArea/fac/facDiv.C
@@ -73,9 +73,9 @@ div
     const tmp<GeometricField<Type, faePatchField, edgeMesh>>& tssf
 )
 {
-    tmp<GeometricField<Type, faPatchField, areaMesh>> Div(fac::div(tssf()));
+    tmp<GeometricField<Type, faPatchField, areaMesh>> tDiv(fac::div(tssf()));
     tssf.clear();
-    return Div;
+    return tDiv;
 }
 
 
@@ -141,12 +141,12 @@ div
 )
 {
     typedef typename innerProduct<vector, Type>::type DivType;
-    tmp<GeometricField<DivType, faPatchField, areaMesh>> Div
+    tmp<GeometricField<DivType, faPatchField, areaMesh>> tDiv
     (
         fac::div(tvvf(), name)
     );
     tvvf.clear();
-    return Div;
+    return tDiv;
 }
 
 template<class Type>
@@ -180,13 +180,13 @@ div
 )
 {
     typedef typename innerProduct<vector, Type>::type DivType;
-    tmp<GeometricField<DivType, faPatchField, areaMesh>> Div
+    tmp<GeometricField<DivType, faPatchField, areaMesh>> tDiv
     (
         fac::div(tvvf())
     );
 
     tvvf.clear();
-    return Div;
+    return tDiv;
 }
 
 
@@ -212,7 +212,7 @@ div
     );
     GeometricField<Type, faPatchField, areaMesh>& Div = tDiv.ref();
 
-    Div.internalField() = transform(tensor::I - sqr(n), Div.internalField());
+    Div.primitiveFieldRef() = transform(tensor::I - sqr(n), Div.internalField());
     Div.correctBoundaryConditions();
 
     return tDiv;
@@ -229,12 +229,12 @@ div
     const word& name
 )
 {
-    tmp<GeometricField<Type, faPatchField, areaMesh>> Div
+    tmp<GeometricField<Type, faPatchField, areaMesh>> tDiv
     (
         fac::div(tflux(), vf, name)
     );
     tflux.clear();
-    return Div;
+    return tDiv;
 }
 
 
@@ -247,12 +247,12 @@ div
     const word& name
 )
 {
-    tmp<GeometricField<Type, faPatchField, areaMesh>> Div
+    tmp<GeometricField<Type, faPatchField, areaMesh>> tDiv
     (
         fac::div(flux, tvf(), name)
     );
     tvf.clear();
-    return Div;
+    return tDiv;
 }
 
 
@@ -265,13 +265,13 @@ div
     const word& name
 )
 {
-    tmp<GeometricField<Type, faPatchField, areaMesh>> Div
+    tmp<GeometricField<Type, faPatchField, areaMesh>> tDiv
     (
         fac::div(tflux(), tvf(), name)
     );
     tflux.clear();
     tvf.clear();
-    return Div;
+    return tDiv;
 }
 
 
@@ -298,12 +298,12 @@ div
     const GeometricField<Type, faPatchField, areaMesh>& vf
 )
 {
-    tmp<GeometricField<Type, faPatchField, areaMesh>> Div
+    tmp<GeometricField<Type, faPatchField, areaMesh>> tDiv
     (
         fac::div(tflux(), vf)
     );
     tflux.clear();
-    return Div;
+    return tDiv;
 }
 
 
@@ -315,12 +315,12 @@ div
     const tmp<GeometricField<Type, faPatchField, areaMesh>>& tvf
 )
 {
-    tmp<GeometricField<Type, faPatchField, areaMesh>> Div
+    tmp<GeometricField<Type, faPatchField, areaMesh>> tDiv
     (
         fac::div(flux, tvf())
     );
     tvf.clear();
-    return Div;
+    return tDiv;
 }
 
 
@@ -332,13 +332,13 @@ div
     const tmp<GeometricField<Type, faPatchField, areaMesh>>& tvf
 )
 {
-    tmp<GeometricField<Type, faPatchField, areaMesh>> Div
+    tmp<GeometricField<Type, faPatchField, areaMesh>> tDiv
     (
         fac::div(tflux(), tvf())
     );
     tflux.clear();
     tvf.clear();
-    return Div;
+    return tDiv;
 }
 
 
diff --git a/src/finiteArea/finiteArea/fac/facNDiv.C b/src/finiteArea/finiteArea/fac/facNDiv.C
index e1975c886bc83e995699a1d50326ee127b77f2ba..001e0791e59d4eb28b99a5fecab1b66bdd4174ee 100644
--- a/src/finiteArea/finiteArea/fac/facNDiv.C
+++ b/src/finiteArea/finiteArea/fac/facNDiv.C
@@ -58,7 +58,7 @@ ndiv
 
     GeometricField<Type, faPatchField, areaMesh>& v = tv.ref();
 
-    v.internalField() = n*(n & v.internalField());
+    v.primitiveFieldRef() = n*(n & v.internalField());
     v.correctBoundaryConditions();
 
     return v;
@@ -103,7 +103,7 @@ ndiv
     );
     GeometricField<Type, faPatchField, areaMesh>& Div = tDiv.ref();
 
-    Div.internalField() = n*(n & Div.internalField());
+    Div.primitiveFieldRef() = n*(n & Div.internalField());
     Div.correctBoundaryConditions();
 
     return tDiv;
@@ -198,7 +198,7 @@ ndiv
 
     GeometricField<Type, faPatchField, areaMesh>& Div = tDiv.ref();
 
-    Div.internalField() = n*(n &Div.internalField());
+    Div.primitiveFieldRef() = n*(n & Div.internalField());
     Div.correctBoundaryConditions();
 
     return tDiv;