diff --git a/applications/utilities/postProcessing/graphics/PV4FoamReader/PV4FoamReader/CMakeLists.txt b/applications/utilities/postProcessing/graphics/PV4FoamReader/PV4FoamReader/CMakeLists.txt
index 79a8becf3..fc2804fd5 100644
--- a/applications/utilities/postProcessing/graphics/PV4FoamReader/PV4FoamReader/CMakeLists.txt
+++ b/applications/utilities/postProcessing/graphics/PV4FoamReader/PV4FoamReader/CMakeLists.txt
@@ -21,7 +21,7 @@ LINK_DIRECTORIES(
 )
 
 INCLUDE_DIRECTORIES(
-    $ENV{WM_PROJECT_DIR}/src/OpenFOAM/lnInclude
+    $ENV{WM_PROJECT_DIR}/src/foam/lnInclude
     $ENV{WM_PROJECT_DIR}/src/finiteVolume/lnInclude
     ${PROJECT_SOURCE_DIR}/../vtkPV4Foam
 )
@@ -53,7 +53,7 @@ ADD_PARAVIEW_PLUGIN(
 
 TARGET_LINK_LIBRARIES(
     PV4FoamReader_SM
-    OpenFOAM
+    foam
     finiteVolume
     vtkPV4Foam
     pqCore
diff --git a/applications/utilities/postProcessing/graphics/PV4FoamReader/vtkPV4Foam/vtkOpenFOAMTupleRemap.H b/applications/utilities/postProcessing/graphics/PV4FoamReader/vtkPV4Foam/vtkFoamTupleRemap.H
similarity index 91%
rename from applications/utilities/postProcessing/graphics/PV4FoamReader/vtkPV4Foam/vtkOpenFOAMTupleRemap.H
rename to applications/utilities/postProcessing/graphics/PV4FoamReader/vtkPV4Foam/vtkFoamTupleRemap.H
index 35b11a9ab..2671e39ca 100644
--- a/applications/utilities/postProcessing/graphics/PV4FoamReader/vtkPV4Foam/vtkOpenFOAMTupleRemap.H
+++ b/applications/utilities/postProcessing/graphics/PV4FoamReader/vtkPV4Foam/vtkFoamTupleRemap.H
@@ -26,8 +26,8 @@ InClass
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef vtkFOAMTupleRemap_H
-#define vtkFOAMTupleRemap_H
+#ifndef vtkFoamTupleRemap_H
+#define vtkFoamTupleRemap_H
 
 // FOAM includes
 #include "StaticAssert.H"
@@ -36,7 +36,7 @@ InClass
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-inline void vtkFOAMTupleRemap(float vec[]);
+inline void vtkFoamTupleRemap(float vec[]);
 
 
 // a symmTensor specialization to remap FOAM -> ParaView naming order
@@ -52,7 +52,7 @@ StaticAssert(Foam::symmTensor::nComponents == 6);
 
 // Template specialization for symmTensor
 template<>
-inline void vtkFOAMTupleRemap<Foam::symmTensor>(float vec[])
+inline void vtkFoamTupleRemap<Foam::symmTensor>(float vec[])
 {
     Foam::Swap(vec[1], vec[3]);   // swap XY <-> YY
     Foam::Swap(vec[2], vec[5]);   // swap XZ <-> ZZ
@@ -60,7 +60,7 @@ inline void vtkFOAMTupleRemap<Foam::symmTensor>(float vec[])
 
 
 template<class Type>
-inline void vtkFOAMTupleRemap(float vec[])
+inline void vtkFoamTupleRemap(float vec[])
 {}
 
 
diff --git a/applications/utilities/postProcessing/graphics/PV4FoamReader/vtkPV4Foam/vtkPV4FoamFaceField.H b/applications/utilities/postProcessing/graphics/PV4FoamReader/vtkPV4Foam/vtkPV4FoamFaceField.H
index 6ce53170f..e4f2fd481 100644
--- a/applications/utilities/postProcessing/graphics/PV4FoamReader/vtkPV4Foam/vtkPV4FoamFaceField.H
+++ b/applications/utilities/postProcessing/graphics/PV4FoamReader/vtkPV4Foam/vtkPV4FoamFaceField.H
@@ -35,7 +35,7 @@ InClass
 #include "vtkMultiBlockDataSet.h"
 #include "vtkPolyData.h"
 
-#include "vtkFOAMTupleRemap.H"
+#include "vtkFoamTupleRemap.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -104,7 +104,7 @@ void Foam::vtkPV4Foam::convertFaceField
                 vec[d] = 0;
             }
         }
-        vtkFOAMTupleRemap<Type>(vec);
+        vtkFoamTupleRemap<Type>(vec);
 
         cellData->InsertTuple(faceI, vec);
     }
@@ -186,7 +186,7 @@ void Foam::vtkPV4Foam::convertFaceField
                 vec[d] = 0;
             }
         }
-        vtkFOAMTupleRemap<Type>(vec);
+        vtkFoamTupleRemap<Type>(vec);
 
         cellData->InsertTuple(faceI, vec);
         ++faceI;
diff --git a/applications/utilities/postProcessing/graphics/PV4FoamReader/vtkPV4Foam/vtkPV4FoamLagrangianFields.H b/applications/utilities/postProcessing/graphics/PV4FoamReader/vtkPV4Foam/vtkPV4FoamLagrangianFields.H
index 0ee5de011..1dbd2e47d 100644
--- a/applications/utilities/postProcessing/graphics/PV4FoamReader/vtkPV4Foam/vtkPV4FoamLagrangianFields.H
+++ b/applications/utilities/postProcessing/graphics/PV4FoamReader/vtkPV4Foam/vtkPV4FoamLagrangianFields.H
@@ -31,7 +31,7 @@ InClass
 
 #include "Cloud.H"
 
-#include "vtkFOAMTupleRemap.H"
+#include "vtkFoamTupleRemap.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -91,7 +91,7 @@ void Foam::vtkPV4Foam::convertLagrangianField
         {
             vec[d] = component(t, d);
         }
-        vtkFOAMTupleRemap<Type>(vec);
+        vtkFoamTupleRemap<Type>(vec);
 
         pointData->InsertTuple(i, vec);
     }
diff --git a/applications/utilities/postProcessing/graphics/PV4FoamReader/vtkPV4Foam/vtkPV4FoamPatchField.H b/applications/utilities/postProcessing/graphics/PV4FoamReader/vtkPV4Foam/vtkPV4FoamPatchField.H
index 4cc2cf92a..207cad1ab 100644
--- a/applications/utilities/postProcessing/graphics/PV4FoamReader/vtkPV4Foam/vtkPV4FoamPatchField.H
+++ b/applications/utilities/postProcessing/graphics/PV4FoamReader/vtkPV4Foam/vtkPV4FoamPatchField.H
@@ -36,7 +36,7 @@ InClass
 #include "vtkPointData.h"
 #include "vtkPolyData.h"
 
-#include "vtkFOAMTupleRemap.H"
+#include "vtkFoamTupleRemap.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -66,7 +66,7 @@ void Foam::vtkPV4Foam::convertPatchField
         {
             vec[d] = component(t, d);
         }
-        vtkFOAMTupleRemap<Type>(vec);
+        vtkFoamTupleRemap<Type>(vec);
 
         cellData->InsertTuple(i, vec);
     }
@@ -108,7 +108,7 @@ void Foam::vtkPV4Foam::convertPatchPointField
         {
             vec[d] = component(t, d);
         }
-        vtkFOAMTupleRemap<Type>(vec);
+        vtkFoamTupleRemap<Type>(vec);
 
         pointData->InsertTuple(i, vec);
     }
diff --git a/applications/utilities/postProcessing/graphics/PV4FoamReader/vtkPV4Foam/vtkPV4FoamPointFields.H b/applications/utilities/postProcessing/graphics/PV4FoamReader/vtkPV4Foam/vtkPV4FoamPointFields.H
index 281023fbb..cbac6a4c9 100644
--- a/applications/utilities/postProcessing/graphics/PV4FoamReader/vtkPV4Foam/vtkPV4FoamPointFields.H
+++ b/applications/utilities/postProcessing/graphics/PV4FoamReader/vtkPV4Foam/vtkPV4FoamPointFields.H
@@ -32,7 +32,7 @@ InClass
 // Foam includes
 #include "interpolatePointToCell.H"
 
-#include "vtkFOAMTupleRemap.H"
+#include "vtkFoamTupleRemap.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -215,7 +215,7 @@ void Foam::vtkPV4Foam::convertPointField
             {
                 vec[d] = component(t, d);
             }
-            vtkFOAMTupleRemap<Type>(vec);
+            vtkFoamTupleRemap<Type>(vec);
 
             pointData->InsertTuple(i, vec);
         }
@@ -229,7 +229,7 @@ void Foam::vtkPV4Foam::convertPointField
             {
                 vec[d] = component(t, d);
             }
-            vtkFOAMTupleRemap<Type>(vec);
+            vtkFoamTupleRemap<Type>(vec);
 
             pointData->InsertTuple(i, vec);
         }
@@ -247,7 +247,7 @@ void Foam::vtkPV4Foam::convertPointField
             {
                 vec[d] = component(t, d);
             }
-            vtkFOAMTupleRemap<Type>(vec);
+            vtkFoamTupleRemap<Type>(vec);
 
             pointData->InsertTuple(i++, vec);
         }
@@ -261,7 +261,7 @@ void Foam::vtkPV4Foam::convertPointField
             {
                 vec[d] = component(t, d);
             }
-            vtkFOAMTupleRemap<Type>(vec);
+            vtkFoamTupleRemap<Type>(vec);
 
             pointData->InsertTuple(i++, vec);
         }
diff --git a/applications/utilities/postProcessing/graphics/PV4FoamReader/vtkPV4Foam/vtkPV4FoamVolFields.H b/applications/utilities/postProcessing/graphics/PV4FoamReader/vtkPV4Foam/vtkPV4FoamVolFields.H
index 86be65cc2..47914bb25 100644
--- a/applications/utilities/postProcessing/graphics/PV4FoamReader/vtkPV4Foam/vtkPV4FoamVolFields.H
+++ b/applications/utilities/postProcessing/graphics/PV4FoamReader/vtkPV4Foam/vtkPV4FoamVolFields.H
@@ -38,7 +38,7 @@ InClass
 #include "vtkPV4FoamFaceField.H"
 #include "vtkPV4FoamPatchField.H"
 
-#include "vtkFOAMTupleRemap.H"
+#include "vtkFoamTupleRemap.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -355,7 +355,7 @@ void Foam::vtkPV4Foam::convertVolField
         {
             vec[d] = component(t, d);
         }
-        vtkFOAMTupleRemap<Type>(vec);
+        vtkFoamTupleRemap<Type>(vec);
 
         celldata->InsertTuple(i, vec);
     }