diff --git a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/Make/options b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/Make/options
index 9ec0ccab03..d10f04194a 100644
--- a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/Make/options
+++ b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/Make/options
@@ -1,10 +1,8 @@
-thirdParty=$(WM_PROJECT_INST_DIR)/ThirdParty
-
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(thirdParty)/libccmio \
-    -I$(thirdParty)/libccmio/lnInclude
+    -I$(THIRD_PARTY)/libccmio \
+    -I$(THIRD_PARTY)/libccmio/lnInclude
 
 EXE_LIBS = \
     -lfiniteVolume \
diff --git a/src/decompositionAgglomeration/Allwmake b/src/decompositionAgglomeration/Allwmake
index bd4828e991..62018ac3fc 100755
--- a/src/decompositionAgglomeration/Allwmake
+++ b/src/decompositionAgglomeration/Allwmake
@@ -3,12 +3,11 @@ set -x
 
 wmake libso decompositionMethods
 
-if [ -d $FOAM_MPI_LIBBIN ]
+if [ -d "$FOAM_MPI_LIBBIN" ]
 then
     wmake libso parMetisDecomp
 fi
 
-( cd MGridGenGamgAgglomeration && ./Allwmake )
-
+wmake libso MGridGenGamgAgglomeration
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/src/decompositionAgglomeration/MGridGenGamgAgglomeration/Allwmake b/src/decompositionAgglomeration/MGridGenGamgAgglomeration/Allwmake
deleted file mode 100755
index 98f16e38eb..0000000000
--- a/src/decompositionAgglomeration/MGridGenGamgAgglomeration/Allwmake
+++ /dev/null
@@ -1 +0,0 @@
-wmake libso MGridGenGAMGAgglomeration
diff --git a/src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration/MGridGenGAMGAgglomerate.C b/src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomerate.C
similarity index 100%
rename from src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration/MGridGenGAMGAgglomerate.C
rename to src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomerate.C
diff --git a/src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration/MGridGenGAMGAgglomeration.C b/src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.C
similarity index 100%
rename from src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration/MGridGenGAMGAgglomeration.C
rename to src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.C
diff --git a/src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration/MGridGenGAMGAgglomeration.H b/src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.H
similarity index 100%
rename from src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration/MGridGenGAMGAgglomeration.H
rename to src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.H
diff --git a/src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration/Make/files b/src/decompositionAgglomeration/MGridGenGamgAgglomeration/Make/files
similarity index 100%
rename from src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration/Make/files
rename to src/decompositionAgglomeration/MGridGenGamgAgglomeration/Make/files
diff --git a/src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration/Make/options b/src/decompositionAgglomeration/MGridGenGamgAgglomeration/Make/options
similarity index 79%
rename from src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration/Make/options
rename to src/decompositionAgglomeration/MGridGenGamgAgglomeration/Make/options
index 8b8d0b6913..a158e92026 100644
--- a/src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration/Make/options
+++ b/src/decompositionAgglomeration/MGridGenGamgAgglomeration/Make/options
@@ -1,4 +1,4 @@
-ParMGridGen = ${WM_PROJECT_INST_DIR}/ThirdParty/ParMGridGen-1.0
+ParMGridGen = $(THIRD_PARTY)/ParMGridGen-1.0
 
 TYPE_REAL=
 #if defined(SP)
diff --git a/src/decompositionAgglomeration/decompositionMethods/Make/options b/src/decompositionAgglomeration/decompositionMethods/Make/options
index 041b8c7180..bd781ef9ca 100644
--- a/src/decompositionAgglomeration/decompositionMethods/Make/options
+++ b/src/decompositionAgglomeration/decompositionMethods/Make/options
@@ -1,5 +1,5 @@
 EXE_INC = \
-    -I${WM_PROJECT_INST_DIR}/ThirdParty/metis-5.0pre2/include
+    -I$(THIRD_PARTY)/metis-5.0pre2/include
 
 LIB_LIBS = \
     -lmetis \
diff --git a/src/decompositionAgglomeration/parMetisDecomp/Make/options b/src/decompositionAgglomeration/parMetisDecomp/Make/options
index eb2850d9e2..be8ac3eea1 100644
--- a/src/decompositionAgglomeration/parMetisDecomp/Make/options
+++ b/src/decompositionAgglomeration/parMetisDecomp/Make/options
@@ -2,8 +2,8 @@ include $(RULES)/mplib$(WM_MPLIB)
 
 EXE_INC = \
     $(PFLAGS) $(PINC) \
-    -I${WM_PROJECT_INST_DIR}/ThirdParty/ParMetis-3.1/ParMETISLib \
-    -I${WM_PROJECT_INST_DIR}/ThirdParty/ParMetis-3.1 \
+    -I$(THIRD_PARTY)/ParMetis-3.1/ParMETISLib \
+    -I$(THIRD_PARTY)/ParMetis-3.1 \
     -I../decompositionMethods/lnInclude
 
 LIB_LIBS = \
diff --git a/wmake/Makefile b/wmake/Makefile
index 317d78e7cc..9a52485e24 100644
--- a/wmake/Makefile
+++ b/wmake/Makefile
@@ -59,6 +59,7 @@ LIB_DIR            = $(WM_PROJECT_DIR)/lib
 LIB_WM_OPTIONS_DIR = $(LIB_DIR)/$(WM_OPTIONS)
 OBJECTS_DIR        = $(MAKE_DIR)/$(WM_OPTIONS)
 CLASSES_DIR        = $(MAKE_DIR)/classes
+THIRD_PARTY        = $(WM_PROJECT_INST_DIR)/ThirdParty
 
 SYS_INC            =
 SYS_LIBS           =