diff --git a/src/Allwmake b/src/Allwmake
index 37313b73df..2013e4b0de 100755
--- a/src/Allwmake
+++ b/src/Allwmake
@@ -1,6 +1,6 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
-[ $# -ge 1 ] && makeOption=$1 || makeOption=libso
+makeType=${1:-libso}
 
 wmakeCheckPwd "$WM_PROJECT_DIR/src" || {
     echo "Error: Current directory is not \$WM_PROJECT_DIR/src"
@@ -25,49 +25,49 @@ wmakeLnInclude OSspecific/${WM_OSTYPE:-POSIX}
 Pstream/Allwmake $*
 
 OSspecific/${WM_OSTYPE:-POSIX}/Allwmake
-wmake $makeOption OpenFOAM
+wmake $makeType OpenFOAM
 
-wmake $makeOption fileFormats
-wmake $makeOption triSurface
-wmake $makeOption meshTools
-wmake $makeOption edgeMesh
-wmake $makeOption surfMesh
+wmake $makeType fileFormats
+wmake $makeType triSurface
+wmake $makeType meshTools
+wmake $makeType edgeMesh
+wmake $makeType surfMesh
 
 # Decomposition methods needed by dummyThirdParty
 parallel/decompose/AllwmakeLnInclude
 # dummyThirdParty (dummy metisDecomp, scotchDecomp etc) needed by e.g. meshTools
 dummyThirdParty/Allwmake $*
 
-wmake $makeOption finiteVolume
-wmake $makeOption lagrangian/basic
-wmake $makeOption lagrangian/distributionModels
-wmake $makeOption genericPatchFields
+wmake $makeType finiteVolume
+wmake $makeType lagrangian/basic
+wmake $makeType lagrangian/distributionModels
+wmake $makeType genericPatchFields
 
 # Build the proper scotchDecomp, metisDecomp etc.
 parallel/Allwmake $*
 
-wmake $makeOption conversion
+wmake $makeType conversion
 
-wmake $makeOption sampling
+wmake $makeType sampling
 
-wmake $makeOption dynamicMesh
-wmake $makeOption dynamicFvMesh
-wmake $makeOption topoChangerFvMesh
+wmake $makeType dynamicMesh
+wmake $makeType dynamicFvMesh
+wmake $makeType topoChangerFvMesh
 
-wmake $makeOption ODE
-wmake $makeOption randomProcesses
+wmake $makeType ODE
+wmake $makeType randomProcesses
 
 thermophysicalModels/Allwmake $*
 transportModels/Allwmake $*
 turbulenceModels/Allwmake $*
-wmake $makeOption surfaceFilmModels
+wmake $makeType surfaceFilmModels
 lagrangian/Allwmake $*
 postProcessing/Allwmake $*
 mesh/Allwmake $*
 
 fvAgglomerationMethods/Allwmake $*
 
-wmake $makeOption fvMotionSolver
-wmake $makeOption engine
+wmake $makeType fvMotionSolver
+wmake $makeType engine
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/src/Pstream/Allwmake b/src/Pstream/Allwmake
index 742d3d4478..613263d7bc 100755
--- a/src/Pstream/Allwmake
+++ b/src/Pstream/Allwmake
@@ -1,9 +1,9 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
-[ $# -ge 1 ] && makeOption=$1 || makeOption=libso
+makeType=${1:-libso}
 set -x
 
-wmake $makeOption dummy
+wmake $makeType dummy
 
 case "$WM_MPLIB" in
 *MPI*)
@@ -13,11 +13,11 @@ case "$WM_MPLIB" in
     echo
     set -x
     # force compilation into qualified directory
-    WM_OPTIONS=${WM_OPTIONS}$WM_MPLIB  wmake $makeOption mpi
+    WM_OPTIONS=${WM_OPTIONS}$WM_MPLIB  wmake $makeType mpi
     ;;
 
 #GAMMA)
-#    wmake $makeOption gamma
+#    wmake $makeType gamma
 #    ;;
 esac
 
diff --git a/src/conversion/Allwmake b/src/conversion/Allwmake
index 444d3f6549..014885de47 100755
--- a/src/conversion/Allwmake
+++ b/src/conversion/Allwmake
@@ -1,8 +1,8 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
-[ $# -ge 1 ] && makeOption=$1 || makeOption=libso
+makeType=${1:-libso}
 set -x
 
-wmake $makeOption
+wmake $makeType
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/src/dummyThirdParty/Allwmake b/src/dummyThirdParty/Allwmake
index 5076d8d2b7..d747a472db 100755
--- a/src/dummyThirdParty/Allwmake
+++ b/src/dummyThirdParty/Allwmake
@@ -1,12 +1,12 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
-[ $# -ge 1 ] && makeOption=$1 || makeOption=libso
+makeType=${1:-libso}
 set -x
 
-wmake $makeOption scotchDecomp
-wmake $makeOption ptscotchDecomp
-wmake $makeOption metisDecomp
-wmake $makeOption MGridGen
+wmake $makeType scotchDecomp
+wmake $makeType ptscotchDecomp
+wmake $makeType metisDecomp
+wmake $makeType MGridGen
 
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/src/fvAgglomerationMethods/Allwmake b/src/fvAgglomerationMethods/Allwmake
index 8328d915fc..c4313c1a47 100755
--- a/src/fvAgglomerationMethods/Allwmake
+++ b/src/fvAgglomerationMethods/Allwmake
@@ -1,13 +1,13 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
-[ $# -ge 1 ] && makeOption=$1 || makeOption=libso
+makeType=${1:-libso}
 set -x
 
 export ParMGridGen=$WM_THIRD_PARTY_DIR/ParMGridGen-1.0
 
 if [ -d "$ParMGridGen/MGridGen/Lib" ]
 then
-    wmake $makeOption MGridGenGamgAgglomeration
+    wmake $makeType MGridGenGamgAgglomeration
 fi
 
 wmake libso pairPatchAgglomeration
diff --git a/src/lagrangian/Allwmake b/src/lagrangian/Allwmake
index 908338e62f..b8774ae594 100755
--- a/src/lagrangian/Allwmake
+++ b/src/lagrangian/Allwmake
@@ -1,15 +1,15 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
-[ $# -ge 1 ] && makeOption=$1 || makeOption=libso
+makeType=${1:-libso}
 set -x
 
-wmake $makeOption distributionModels
-wmake $makeOption basic
-wmake $makeOption solidParticle
-wmake $makeOption intermediate
-wmake $makeOption dieselSpray
-wmake $makeOption dsmc
-wmake $makeOption coalCombustion
+wmake $makeType distributionModels
+wmake $makeType basic
+wmake $makeType solidParticle
+wmake $makeType intermediate
+wmake $makeType dieselSpray
+wmake $makeType dsmc
+wmake $makeType coalCombustion
 
 molecularDynamics/Allwmake $*
 
diff --git a/src/lagrangian/molecularDynamics/Allwmake b/src/lagrangian/molecularDynamics/Allwmake
index 60b24dea4d..7c17819ad5 100755
--- a/src/lagrangian/molecularDynamics/Allwmake
+++ b/src/lagrangian/molecularDynamics/Allwmake
@@ -1,10 +1,10 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
-[ $# -ge 1 ] && makeOption=$1 || makeOption=libso
+makeType=${1:-libso}
 set -x
 
-wmake $makeOption potential
-wmake $makeOption molecularMeasurements
-wmake $makeOption molecule
+wmake $makeType potential
+wmake $makeType molecularMeasurements
+wmake $makeType molecule
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/src/mesh/Allwmake b/src/mesh/Allwmake
index f980e0e73f..712094055c 100755
--- a/src/mesh/Allwmake
+++ b/src/mesh/Allwmake
@@ -1,9 +1,9 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
-[ $# -ge 1 ] && makeOption=$1 || makeOption=libso
+makeType=${1:-libso}
 set -x
 
-wmake $makeOption autoMesh
-wmake $makeOption blockMesh
+wmake $makeType autoMesh
+wmake $makeType blockMesh
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/src/parallel/Allwmake b/src/parallel/Allwmake
index d3600e13b1..ab84e5b749 100755
--- a/src/parallel/Allwmake
+++ b/src/parallel/Allwmake
@@ -1,11 +1,11 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
-[ $# -ge 1 ] && makeOption=$1 || makeOption=libso
+makeType=${1:-libso}
 set -x
 
 decompose/Allwmake $*
 reconstruct/Allwmake $*
-wmake $makeOption distributed
+wmake $makeType distributed
 
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/src/parallel/decompose/Allwmake b/src/parallel/decompose/Allwmake
index 3848e66478..38898b1ea3 100755
--- a/src/parallel/decompose/Allwmake
+++ b/src/parallel/decompose/Allwmake
@@ -1,6 +1,6 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
-[ $# -ge 1 ] && makeOption=$1 || makeOption=libso
+makeType=${1:-libso}
 
 # get SCOTCH_VERSION, SCOTCH_ARCH_PATH
 settings=`$WM_PROJECT_DIR/bin/foamEtcFile apps/scotch/bashrc`
@@ -17,17 +17,17 @@ set -x
 
 wmakeLnInclude decompositionMethods
 
-wmake $makeOption scotchDecomp
+wmake $makeType scotchDecomp
 
 if [ -d "$FOAM_LIBBIN/$FOAM_MPI" ]
 then
 (
     WM_OPTIONS=${WM_OPTIONS}$WM_MPLIB
-    wmake $makeOption ptscotchDecomp
+    wmake $makeType ptscotchDecomp
 )
 fi
 
-wmake $makeOption decompositionMethods
+wmake $makeType decompositionMethods
 
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/src/parallel/reconstruct/Allwmake b/src/parallel/reconstruct/Allwmake
index 3d651d5a00..85e8e9723a 100755
--- a/src/parallel/reconstruct/Allwmake
+++ b/src/parallel/reconstruct/Allwmake
@@ -1,8 +1,8 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
-[ $# -ge 1 ] && makeOption=$1 || makeOption=libso
+makeType=${1:-libso}
 set -x
 
-wmake $makeOption reconstruct
+wmake $makeType reconstruct
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/src/postProcessing/Allwmake b/src/postProcessing/Allwmake
index 5a1caf1660..24b764c420 100755
--- a/src/postProcessing/Allwmake
+++ b/src/postProcessing/Allwmake
@@ -1,10 +1,10 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
-[ $# -ge 1 ] && makeOption=$1 || makeOption=libso
+makeType=${1:-libso}
 set -x
 
 wmake libo postCalc
-wmake $makeOption foamCalcFunctions
+wmake $makeType foamCalcFunctions
 
 functionObjects/Allwmake $*
 
diff --git a/src/postProcessing/functionObjects/Allwmake b/src/postProcessing/functionObjects/Allwmake
index 9ae9bd3dca..e62cdf86c7 100755
--- a/src/postProcessing/functionObjects/Allwmake
+++ b/src/postProcessing/functionObjects/Allwmake
@@ -1,13 +1,13 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
-[ $# -ge 1 ] && makeOption=$1 || makeOption=libso
+makeType=${1:-libso}
 set -x
 
-wmake $makeOption field
-wmake $makeOption forces
-wmake $makeOption IO
-wmake $makeOption utilities
-wmake $makeOption jobControl
-wmake $makeOption systemCall
+wmake $makeType field
+wmake $makeType forces
+wmake $makeType IO
+wmake $makeType utilities
+wmake $makeType jobControl
+wmake $makeType systemCall
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/src/thermophysicalModels/Allwmake b/src/thermophysicalModels/Allwmake
index 939464ceb7..07d4cbf033 100755
--- a/src/thermophysicalModels/Allwmake
+++ b/src/thermophysicalModels/Allwmake
@@ -1,24 +1,24 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
-[ $# -ge 1 ] && makeOption=$1 || makeOption=libso
+makeType=${1:-libso}
 set -x
 
-wmake $makeOption specie
-wmake $makeOption solid
-wmake $makeOption thermophysicalFunctions
+wmake $makeType specie
+wmake $makeType solid
+wmake $makeType thermophysicalFunctions
 ./properties/Allwmake $*
 
-wmake $makeOption basic
-wmake $makeOption reactionThermo
-wmake $makeOption laminarFlameSpeed
-wmake $makeOption chemistryModel
-wmake $makeOption barotropicCompressibilityModel
-wmake $makeOption thermalPorousZone
-wmake $makeOption SLGThermo
+wmake $makeType basic
+wmake $makeType reactionThermo
+wmake $makeType laminarFlameSpeed
+wmake $makeType chemistryModel
+wmake $makeType barotropicCompressibilityModel
+wmake $makeType thermalPorousZone
+wmake $makeType SLGThermo
 
 # Should be combined with solids&solidMixture
-wmake $makeOption basicSolidThermo
+wmake $makeType basicSolidThermo
 
-wmake $makeOption radiationModels
+wmake $makeType radiationModels
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/src/thermophysicalModels/properties/Allwmake b/src/thermophysicalModels/properties/Allwmake
index da66ba8d47..f088d140d5 100755
--- a/src/thermophysicalModels/properties/Allwmake
+++ b/src/thermophysicalModels/properties/Allwmake
@@ -1,12 +1,12 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
-[ $# -ge 1 ] && makeOption=$1 || makeOption=libso
+makeType=${1:-libso}
 set -x
 
-wmake $makeOption liquidProperties
-wmake $makeOption liquidMixtureProperties
-wmake $makeOption solidProperties
-wmake $makeOption solidMixtureProperties
+wmake $makeType liquidProperties
+wmake $makeType liquidMixtureProperties
+wmake $makeType solidProperties
+wmake $makeType solidMixtureProperties
 
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/src/transportModels/Allwmake b/src/transportModels/Allwmake
index f0eba94263..21078c07fd 100755
--- a/src/transportModels/Allwmake
+++ b/src/transportModels/Allwmake
@@ -1,11 +1,11 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
-[ $# -ge 1 ] && makeOption=$1 || makeOption=libso
+makeType=${1:-libso}
 set -x
 
-wmake $makeOption incompressible
-wmake $makeOption interfaceProperties
-wmake $makeOption twoPhaseInterfaceProperties
-# wmake $makeOption compressible
+wmake $makeType incompressible
+wmake $makeType interfaceProperties
+wmake $makeType twoPhaseInterfaceProperties
+# wmake $makeType compressible
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/src/turbulenceModels/LES/Allwmake b/src/turbulenceModels/LES/Allwmake
index d24309692e..6ee54e6c27 100755
--- a/src/turbulenceModels/LES/Allwmake
+++ b/src/turbulenceModels/LES/Allwmake
@@ -1,11 +1,11 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
-[ $# -ge 1 ] && makeOption=$1 || makeOption=libso
+makeType=${1:-libso}
 set -x
 
 wmakeLnInclude ../incompressible/LES
 
-wmake $makeOption LESfilters
-wmake $makeOption LESdeltas
+wmake $makeType LESfilters
+wmake $makeType LESdeltas
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/src/turbulenceModels/compressible/Allwmake b/src/turbulenceModels/compressible/Allwmake
index 60605f926d..6e230c01ff 100755
--- a/src/turbulenceModels/compressible/Allwmake
+++ b/src/turbulenceModels/compressible/Allwmake
@@ -1,10 +1,10 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
-[ $# -ge 1 ] && makeOption=$1 || makeOption=libso
+makeType=${1:-libso}
 set -x
 
-wmake $makeOption turbulenceModel
-wmake $makeOption RAS
-wmake $makeOption LES
+wmake $makeType turbulenceModel
+wmake $makeType RAS
+wmake $makeType LES
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/src/turbulenceModels/incompressible/Allwmake b/src/turbulenceModels/incompressible/Allwmake
index 60605f926d..6e230c01ff 100755
--- a/src/turbulenceModels/incompressible/Allwmake
+++ b/src/turbulenceModels/incompressible/Allwmake
@@ -1,10 +1,10 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
-[ $# -ge 1 ] && makeOption=$1 || makeOption=libso
+makeType=${1:-libso}
 set -x
 
-wmake $makeOption turbulenceModel
-wmake $makeOption RAS
-wmake $makeOption LES
+wmake $makeType turbulenceModel
+wmake $makeType RAS
+wmake $makeType LES
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/wmake/wclean b/wmake/wclean
index dd54ae2b60..12b720fcf6 100755
--- a/wmake/wclean
+++ b/wmake/wclean
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -63,10 +63,10 @@ fi
 
 
 #------------------------------------------------------------------------------
-# check arguments and change to the directory in which to run wmake
+# check arguments and change to the directory in which to run wclean
 #------------------------------------------------------------------------------
 
-unset dir makeOption
+unset dir makeType
 MakeDir=Make
 
 if [ $# -ge 1 ]
@@ -76,7 +76,7 @@ then
     then
         dir=$1
     else
-        makeOption=$1
+        makeType=$1
     fi
 
     # specified directory name:
@@ -101,7 +101,7 @@ fi
 # Recurse the directories tree
 #------------------------------------------------------------------------------
 
-if [ "$makeOption" = all ]
+if [ "$makeType" = all ]
 then
     if [ -e Allwclean ]       # consistent with Allwmake
     then
@@ -121,8 +121,8 @@ then
     fi
 fi
 
-# makeOption is not needed beyond this point
-unset makeOption
+# makeType is not needed beyond this point
+unset makeType
 
 
 #------------------------------------------------------------------------------
diff --git a/wmake/wmake b/wmake/wmake
index 37a17eca79..2dc93001c1 100755
--- a/wmake/wmake
+++ b/wmake/wmake
@@ -122,7 +122,7 @@ fi
 # check arguments and change to the directory in which to run wmake
 #------------------------------------------------------------------------------
 
-unset dir makeOption
+unset dir makeType
 MakeDir=Make
 
 if [ $# -ge 1 ]
@@ -131,7 +131,7 @@ then
     then
         dir=$1
     else
-        makeOption=$1
+        makeType=$1
     fi
 
     # specified directory name:
@@ -154,7 +154,7 @@ fi
 # Recurse the application directories tree
 #------------------------------------------------------------------------------
 
-if [ "$makeOption" = all ]
+if [ "$makeType" = all ]
 then
     if [ -e Allwmake ]
     then
@@ -187,12 +187,12 @@ fi
 
 # transform "all" option to "libso" if that looks appropriate or remove it
 # so that the call to make builds the application
-if [ "$makeOption" = all ]
+if [ "$makeType" = all ]
 then
-    unset makeOption
+    unset makeType
     if grep -e '^ *LIB *=' "$MakeDir/files" >/dev/null 2>&1
     then
-        makeOption=libso
+        makeType=libso
     fi
 fi
 
@@ -226,7 +226,7 @@ OBJECTS_DIR=$MakeDir/$WM_OPTIONS
 
 touch $OBJECTS_DIR/dontIncludeDeps
 
-case "$makeOption" in
+case "$makeType" in
 lib | libo | libso )
     $make -s -f $WM_DIR/Makefile MAKE_DIR=$MakeDir INCLUDE_DEPS=$OBJECTS_DIR/dontIncludeDeps lnInclude/uptodate
     ;;
@@ -241,7 +241,7 @@ rc=$?
 # make the object files and link
 #------------------------------------------------------------------------------
 
-cmd="$make -f $WM_DIR/Makefile MAKE_DIR=$MakeDir INCLUDE_DEPS=$OBJECTS_DIR/includeDeps $makeOption"
+cmd="$make -f $WM_DIR/Makefile MAKE_DIR=$MakeDir INCLUDE_DEPS=$OBJECTS_DIR/includeDeps $makeType"
 # echo "cmd=$cmd"
 exec $cmd