diff --git a/Allwmake b/Allwmake
index ef0cf20..6546e15 100755
--- a/Allwmake
+++ b/Allwmake
@@ -107,7 +107,7 @@ echo "    $SCOTCH_ARCH_PATH"
 SCOTCH_SOURCE_DIR=$sourceBASE/$SCOTCH_VERSION
 
 # Needs generalizing, but works fairly well
-scotchMakefile=../../etc/wmakeFiles/scotch/Makefile.inc.i686_pc_linux2.shlib-OpenFOAM
+scotchMakefile=../../etc/makeFiles/scotch/Makefile.inc.i686_pc_linux2.shlib-OpenFOAM
 
 if [ -f $SCOTCH_ARCH_PATH/include/scotch.h \
   -a -r $FOAM_EXT_LIBBIN/libscotch.so \
diff --git a/etc/wmakeFiles/libccmio/files b/etc/makeFiles/libccmio/files
similarity index 86%
rename from etc/wmakeFiles/libccmio/files
rename to etc/makeFiles/libccmio/files
index 9949c76..57e04e3 100644
--- a/etc/wmakeFiles/libccmio/files
+++ b/etc/makeFiles/libccmio/files
@@ -1,4 +1,4 @@
-/* NOTE: make any changes to this file in etc/wmakeFiles/ */
+/* NOTE: make any changes to this file in etc/makeFiles/ */
 
 libadf/ADF_interface.c
 libadf/ADF_internals.c
diff --git a/etc/makeFiles/libccmio/options b/etc/makeFiles/libccmio/options
new file mode 100644
index 0000000..267c586
--- /dev/null
+++ b/etc/makeFiles/libccmio/options
@@ -0,0 +1,3 @@
+/* NOTE: make any changes to this file in etc/makeFiles/ */
+
+/* EXE_INC = */
diff --git a/etc/wmakeFiles/scotch/Makefile.inc.i686_pc_linux2.shlib-OpenFOAM b/etc/makeFiles/scotch/Makefile.inc.i686_pc_linux2.shlib-OpenFOAM
similarity index 100%
rename from etc/wmakeFiles/scotch/Makefile.inc.i686_pc_linux2.shlib-OpenFOAM
rename to etc/makeFiles/scotch/Makefile.inc.i686_pc_linux2.shlib-OpenFOAM
diff --git a/etc/tools/ThirdPartyFunctions b/etc/tools/ThirdPartyFunctions
index 6c5c6a7..788d5b7 100644
--- a/etc/tools/ThirdPartyFunctions
+++ b/etc/tools/ThirdPartyFunctions
@@ -417,7 +417,7 @@ downloadFile()
 
 
 #
-# Copy Make/{files,options} from etc/wmakeFiles/PACKAGE
+# Copy Make/{files,options} from etc/makeFiles/PACKAGE
 #
 # $1 = PACKAGE
 # $2 = TARGET DIRECTORY (optional)
@@ -432,7 +432,7 @@ cpMakeFiles()
     local dst="${2:-.}"
     echo "cpMakeFiles" $pkg $dst
 
-    wmakeFiles=$WM_THIRD_PARTY_DIR/etc/wmakeFiles/$pkg
+    wmakeFiles=$WM_THIRD_PARTY_DIR/etc/makeFiles/$pkg
 
     for i in $(cd $wmakeFiles && find . -type f)
     do
diff --git a/etc/wmakeFiles/libccmio/options b/etc/wmakeFiles/libccmio/options
deleted file mode 100644
index 5f4fb60..0000000
--- a/etc/wmakeFiles/libccmio/options
+++ /dev/null
@@ -1,3 +0,0 @@
-/* NOTE: make any changes to this file in etc/wmakeFiles/ */
-
-/* EXE_INC = */