diff --git a/etc/config.csh/mpi b/etc/config.csh/mpi
index 8ab7f866ac..78b14e4742 100644
--- a/etc/config.csh/mpi
+++ b/etc/config.csh/mpi
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     | Website:  https://openfoam.org
-#   \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -142,7 +142,7 @@ case MPICH-GM:
     _foamAddLib     $GM_LIB_PATH
     breaksw
 
-case MVAPICH2:
+case MV2MPI:
     setenv FOAM_MPI mvapich2
     set libDir=`mpicc -show -cc= | sed -e 's/.*-L\([^ ]*\).*/\1/'`
     setenv MPI_ARCH_PATH "${libDir:h}"
diff --git a/etc/config.sh/mpi b/etc/config.sh/mpi
index 8752c0026a..4c08ed05b9 100644
--- a/etc/config.sh/mpi
+++ b/etc/config.sh/mpi
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     | Website:  https://openfoam.org
-#   \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -149,7 +149,7 @@ MPICH-GM)
     _foamAddLib     $GM_LIB_PATH
     ;;
 
-MVAPICH2)
+MV2MPI)
     export FOAM_MPI=mvapich2
     libDir=`mpicc -show -cc= | sed -e 's/.*-L\([^ ]*\).*/\1/'`
     export MPI_ARCH_PATH="${libDir%/*}"
diff --git a/wmake/rules/General/mplibMVAPICH2 b/wmake/rules/General/mplibMV2MPI
similarity index 100%
rename from wmake/rules/General/mplibMVAPICH2
rename to wmake/rules/General/mplibMV2MPI