diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/Allwmake b/applications/utilities/postProcessing/graphics/PV4Readers/Allwmake
index 6f6e56b9d8..135dd56a18 100755
--- a/applications/utilities/postProcessing/graphics/PV4Readers/Allwmake
+++ b/applications/utilities/postProcessing/graphics/PV4Readers/Allwmake
@@ -3,7 +3,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 #set -x
 
 case "$ParaView_VERSION" in
-4*)
+4* | 5*)
     if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ]
     then
         [ -n "$PV_PLUGIN_PATH" ] || {
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/CMakeLists.txt b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/CMakeLists.txt
index 96ed7021fe..d5a6c168b3 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/CMakeLists.txt
+++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/CMakeLists.txt
@@ -53,8 +53,8 @@ ADD_PARAVIEW_OBJECT_PANEL(IFACES IFACE_SRCS
 
 IF("${PARAVIEW_VERSION_MINOR}" EQUAL 0)
     ADD_PARAVIEW_PLUGIN(
-        PV4FoamReader_SM "1.0"
-        SERVER_MANAGER_XML PV4FoamReader_SM.xml
+        PVFoamReader_SM "1.0"
+        SERVER_MANAGER_XML PVFoamReader_SM.xml
         SERVER_MANAGER_SOURCES vtkPV4FoamReader.cxx
         GUI_INTERFACES ${IFACES}
         GUI_SOURCES pqPV4FoamReaderPanel.cxx
@@ -63,8 +63,8 @@ IF("${PARAVIEW_VERSION_MINOR}" EQUAL 0)
     )
 ELSE("${PARAVIEW_VERSION_MINOR}" EQUAL 0)
     ADD_PARAVIEW_PLUGIN(
-        PV4FoamReader_SM "1.0"
-        SERVER_MANAGER_XML PV4FoamReader_SM.xml
+        PVFoamReader_SM "1.0"
+        SERVER_MANAGER_XML PVFoamReader_SM.xml
         SERVER_MANAGER_SOURCES vtkPV4FoamReader.cxx
         GUI_INTERFACES ${IFACES}
         GUI_SOURCES pqPV4FoamReaderPanel.cxx
@@ -73,7 +73,7 @@ ELSE("${PARAVIEW_VERSION_MINOR}" EQUAL 0)
 ENDIF("${PARAVIEW_VERSION_MINOR}" EQUAL 0)
 
 TARGET_LINK_LIBRARIES(
-    PV4FoamReader_SM
+    PVFoamReader_SM
     LINK_PUBLIC
     OpenFOAM
     finiteVolume
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/PV4FoamReader_SM.xml b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/PVFoamReader_SM.xml
similarity index 100%
rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/PV4FoamReader_SM.xml
rename to applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/PVFoamReader_SM.xml
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/Make/options b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/Make/options
index 1ed6a9e569..648b1d5d3f 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/Make/options
+++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/Make/options
@@ -7,6 +7,7 @@ EXE_INC = \
     -I../../vtkPV4Readers/lnInclude \
     -I../PV4FoamReader \
     -I$(ParaView_INCLUDE_DIR) \
+    -I$(ParaView_INCLUDE_DIR)/vtkkwiml \
     $(shell \
         test -f $(ParaView_INCLUDE_DIR)/vtkPolyhedron.h && \
         echo "-DHAS_VTK_POLYHEDRON" || echo "-UHAS_VTK_POLYHEDRON" \
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/CMakeLists.txt b/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/CMakeLists.txt
index e15613a51f..246a336fd2 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/CMakeLists.txt
+++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/CMakeLists.txt
@@ -52,8 +52,8 @@ ADD_PARAVIEW_OBJECT_PANEL(IFACES IFACE_SRCS
 
 IF("${PARAVIEW_VERSION_MINOR}" EQUAL 0)
         ADD_PARAVIEW_PLUGIN(
-            PV4blockMeshReader_SM "1.0"
-        SERVER_MANAGER_XML PV4blockMeshReader_SM.xml
+            PVblockMeshReader_SM "1.0"
+        SERVER_MANAGER_XML PVblockMeshReader_SM.xml
         SERVER_MANAGER_SOURCES  vtkPV4blockMeshReader.cxx
         GUI_INTERFACES ${IFACES}
         GUI_SOURCES pqPV4blockMeshReaderPanel.cxx
@@ -62,8 +62,8 @@ IF("${PARAVIEW_VERSION_MINOR}" EQUAL 0)
     )
 ELSE("${PARAVIEW_VERSION_MINOR}" EQUAL 0)
         ADD_PARAVIEW_PLUGIN(
-            PV4blockMeshReader_SM "1.0"
-        SERVER_MANAGER_XML PV4blockMeshReader_SM.xml
+            PVblockMeshReader_SM "1.0"
+        SERVER_MANAGER_XML PVblockMeshReader_SM.xml
         SERVER_MANAGER_SOURCES  vtkPV4blockMeshReader.cxx
         GUI_INTERFACES ${IFACES}
         GUI_SOURCES pqPV4blockMeshReaderPanel.cxx
@@ -74,7 +74,7 @@ ENDIF("${PARAVIEW_VERSION_MINOR}" EQUAL 0)
 # Build the client-side plugin
 
 TARGET_LINK_LIBRARIES(
-    PV4blockMeshReader_SM
+    PVblockMeshReader_SM
     LINK_PUBLIC
     OpenFOAM
     blockMesh
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/PV4blockMeshReader_SM.xml b/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/PVblockMeshReader_SM.xml
similarity index 100%
rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/PV4blockMeshReader_SM.xml
rename to applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/PVblockMeshReader_SM.xml
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/vtkPV4blockMesh/Make/options b/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/vtkPV4blockMesh/Make/options
index b1c25d894d..88fb00d0fb 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/vtkPV4blockMesh/Make/options
+++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/vtkPV4blockMesh/Make/options
@@ -2,6 +2,7 @@ EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/mesh/blockMesh/lnInclude \
     -I$(ParaView_INCLUDE_DIR) \
+    -I$(ParaView_INCLUDE_DIR)/vtkkwiml \
     -I../../vtkPV4Readers/lnInclude \
     -I../PV4blockMeshReader
 
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/vtkPV4Readers/Make/options b/applications/utilities/postProcessing/graphics/PV4Readers/vtkPV4Readers/Make/options
index 11c006c3be..8a80ee1497 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/vtkPV4Readers/Make/options
+++ b/applications/utilities/postProcessing/graphics/PV4Readers/vtkPV4Readers/Make/options
@@ -1,5 +1,6 @@
 EXE_INC = \
-    -I$(ParaView_INCLUDE_DIR)
+    -I$(ParaView_INCLUDE_DIR) \
+    -I$(ParaView_INCLUDE_DIR)/vtkkwiml
 
 LIB_LIBS = \
     $(GLIBS)
diff --git a/bin/paraFoam b/bin/paraFoam
index b032fc6ce8..0a6c152e64 100755
--- a/bin/paraFoam
+++ b/bin/paraFoam
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -125,7 +125,7 @@ done
 version=`echo $ParaView_VERSION | sed -e 's/^\([0-9][0-9]*\).*$/\1/'`
 
 # Check that reader module has been built
-if [ $requirePV -eq 1 -a ! -f $PV_PLUGIN_PATH/libPV${version}FoamReader_SM.so ]
+if [ $requirePV -eq 1 -a ! -f $PV_PLUGIN_PATH/libPVFoamReader_SM.so ]
 then
     cat<< BUILDREADER