diff --git a/applications/test/CompactIOList/Make/files b/applications/test/CompactIOList/Make/files
index 7e2cf985bfc104dd5eb03b4addf9063d9ae946c7..c5513ed5c1620b5e6b72be7957b7fbe5b8531c81 100644
--- a/applications/test/CompactIOList/Make/files
+++ b/applications/test/CompactIOList/Make/files
@@ -1,4 +1,3 @@
+Test-CompactIOList.C
 
-testCompactIOList.C
-
-EXE = $(FOAM_APPBIN)/CompactIOList
+EXE = $(FOAM_USER_APPBIN)/Test-CompactIOList
diff --git a/applications/test/CompactIOList/testCompactIOList.C b/applications/test/CompactIOList/Test-CompactIOList.C
similarity index 100%
rename from applications/test/CompactIOList/testCompactIOList.C
rename to applications/test/CompactIOList/Test-CompactIOList.C
diff --git a/applications/test/CompactListList/Make/files b/applications/test/CompactListList/Make/files
index 12178dd469dc74e29e6e6314e142ba5fdc664f74..7b7e043c6ecb85d6044606a28637ee106c268b11 100644
--- a/applications/test/CompactListList/Make/files
+++ b/applications/test/CompactListList/Make/files
@@ -1,3 +1,3 @@
-CompactListListTest.C
+Test-CompactListList.C
 
-EXE = $(FOAM_USER_APPBIN)/CompactListListTest
+EXE = $(FOAM_USER_APPBIN)/Test-CompactListList
diff --git a/applications/test/CompactListList/CompactListListTest.C b/applications/test/CompactListList/Test-CompactListList.C
similarity index 100%
rename from applications/test/CompactListList/CompactListListTest.C
rename to applications/test/CompactListList/Test-CompactListList.C
diff --git a/applications/test/DLList/Make/files b/applications/test/DLList/Make/files
index c2641f6e2f77bab1c85f7fe6167fc1dcd4d14dd5..01ae37f02e27ad40700f243a940015d514e0cbb3 100644
--- a/applications/test/DLList/Make/files
+++ b/applications/test/DLList/Make/files
@@ -1,3 +1,3 @@
-DLListTest.C
+Test-DLList.C
 
-EXE = $(FOAM_USER_APPBIN)/DLListTest
+EXE = $(FOAM_USER_APPBIN)/Test-DLList
diff --git a/applications/test/DLList/DLListTest.C b/applications/test/DLList/Test-DLList.C
similarity index 100%
rename from applications/test/DLList/DLListTest.C
rename to applications/test/DLList/Test-DLList.C
diff --git a/applications/test/Dictionary/Make/files b/applications/test/Dictionary/Make/files
index ab30b8bb5d40fd3326822e988aa485cad1f5666b..7545aeb55f93ab56e6fe8760b84aa54791b4706f 100644
--- a/applications/test/Dictionary/Make/files
+++ b/applications/test/Dictionary/Make/files
@@ -1,3 +1,3 @@
-DictionaryTest.C
+Test-Dictionary.C
 
-EXE = $(FOAM_USER_APPBIN)/DictionaryTest
+EXE = $(FOAM_USER_APPBIN)/Test-Dictionary
diff --git a/applications/test/Dictionary/DictionaryTest.C b/applications/test/Dictionary/Test-Dictionary.C
similarity index 100%
rename from applications/test/Dictionary/DictionaryTest.C
rename to applications/test/Dictionary/Test-Dictionary.C
diff --git a/applications/test/DynamicField/Make/files b/applications/test/DynamicField/Make/files
index bcf6af7eceec7845507b794f6183bc83694839b6..da939626599c62c2b9aab7db49057d8f7889ff89 100644
--- a/applications/test/DynamicField/Make/files
+++ b/applications/test/DynamicField/Make/files
@@ -1,3 +1,3 @@
-DynamicFieldTest.C
+Test-DynamicField.C
 
-EXE = $(FOAM_USER_APPBIN)/DynamicFieldTest
+EXE = $(FOAM_USER_APPBIN)/Test-DynamicField
diff --git a/applications/test/DynamicField/DynamicFieldTest.C b/applications/test/DynamicField/Test-DynamicField.C
similarity index 100%
rename from applications/test/DynamicField/DynamicFieldTest.C
rename to applications/test/DynamicField/Test-DynamicField.C
diff --git a/applications/test/DynamicList/Make/files b/applications/test/DynamicList/Make/files
index 561605b6a7a7f46add7df1a28ef8ab8d4d284796..b496842582c7553b2de334117e812adf4e13fc6c 100644
--- a/applications/test/DynamicList/Make/files
+++ b/applications/test/DynamicList/Make/files
@@ -1,4 +1,3 @@
+Test-DynamicList.C
 
-DynamicListTest.C
-
-EXE = $(FOAM_USER_APPBIN)/DynamicListTest
+EXE = $(FOAM_USER_APPBIN)/Test-DynamicList
diff --git a/applications/test/DynamicList/DynamicListTest.C b/applications/test/DynamicList/Test-DynamicList.C
similarity index 100%
rename from applications/test/DynamicList/DynamicListTest.C
rename to applications/test/DynamicList/Test-DynamicList.C
diff --git a/applications/test/Field/Make/files b/applications/test/Field/Make/files
index 56e8f0ffa7818de2a9435f8cfe2987ebec64f3a7..f8f0bb64df86a9a9b3046fe13eb7359d827096cc 100644
--- a/applications/test/Field/Make/files
+++ b/applications/test/Field/Make/files
@@ -1,3 +1,3 @@
-FieldTest.C
+Test-Field.C
 
-SEXE = $(FOAM_USER_APPBIN)/FieldTest
+EXE = $(FOAM_USER_APPBIN)/Test-Field
diff --git a/applications/test/Field/FieldTest.C b/applications/test/Field/Test-Field.C
similarity index 82%
rename from applications/test/Field/FieldTest.C
rename to applications/test/Field/Test-Field.C
index 42c01a053ef32da0aed9bed5396790ca057d1c14..2e037f6a34b607546c8f525e89664d1fac084178 100644
--- a/applications/test/Field/FieldTest.C
+++ b/applications/test/Field/Test-Field.C
@@ -1,4 +1,4 @@
-#include "testField.H"
+#include "Test-Field.H"
 
 int main()
 {
diff --git a/applications/test/Field/testField.H b/applications/test/Field/Test-Field.H
similarity index 99%
rename from applications/test/Field/testField.H
rename to applications/test/Field/Test-Field.H
index 530b66252584c4ec19cd1b98460e1e18a341111f..bd6929f838ea4bea957f3fdff28abf6463b4c3fa 100644
--- a/applications/test/Field/testField.H
+++ b/applications/test/Field/Test-Field.H
@@ -56,4 +56,3 @@ inline Vector<C> operator+(const Vector<C>& v1, const Vector<C>& v2)
 {
     return Vector<C>(v1.X+v2.X, v1.Y+v2.Y);
 }
-
diff --git a/applications/test/FixedList/Make/files b/applications/test/FixedList/Make/files
index 0728e72bc1dd837f2b78d48f5a1ee95f301bed82..dcfee8af1336cc99e79854ade7681f5e876d0788 100644
--- a/applications/test/FixedList/Make/files
+++ b/applications/test/FixedList/Make/files
@@ -1,3 +1,3 @@
-FixedListTest.C
+Test-FixedList.C
 
-EXE = $(FOAM_USER_APPBIN)/FixedListTest
+EXE = $(FOAM_USER_APPBIN)/Test-FixedList
diff --git a/applications/test/FixedList/FixedListTest.C b/applications/test/FixedList/Test-FixedList.C
similarity index 100%
rename from applications/test/FixedList/FixedListTest.C
rename to applications/test/FixedList/Test-FixedList.C
diff --git a/applications/test/HashPtrTable/Make/files b/applications/test/HashPtrTable/Make/files
index b4b57ffc76ac40e9ae0be14cd189ce878c3be3f1..239bab4cd72a083f3d192dd49b91c88eb0138d51 100644
--- a/applications/test/HashPtrTable/Make/files
+++ b/applications/test/HashPtrTable/Make/files
@@ -1,3 +1,3 @@
-hashPtrTableTest.C
+Test-hashPtrTable.C
 
-EXE = $(FOAM_USER_APPBIN)/hashPtrTableTest
+EXE = $(FOAM_USER_APPBIN)/Test-hashPtrTable
diff --git a/applications/test/HashPtrTable/hashPtrTableTest.C b/applications/test/HashPtrTable/Test-hashPtrTable.C
similarity index 100%
rename from applications/test/HashPtrTable/hashPtrTableTest.C
rename to applications/test/HashPtrTable/Test-hashPtrTable.C
diff --git a/applications/test/HashSet/Make/files b/applications/test/HashSet/Make/files
index 4c846a2c332bb2a4a62183a5f6f0251b699ce3df..4b90d400c6451dd2c6c6266cde3a559d1c202ec9 100644
--- a/applications/test/HashSet/Make/files
+++ b/applications/test/HashSet/Make/files
@@ -1,3 +1,3 @@
-hashSetTest.C
+Test-hashSet.C
 
-EXE = $(FOAM_USER_APPBIN)/hashSetTest
+EXE = $(FOAM_USER_APPBIN)/Test-hashSet
diff --git a/applications/test/HashSet/hashSetTest.C b/applications/test/HashSet/Test-hashSet.C
similarity index 100%
rename from applications/test/HashSet/hashSetTest.C
rename to applications/test/HashSet/Test-hashSet.C
diff --git a/applications/test/HashTable/Make/files b/applications/test/HashTable/Make/files
index 13884d64f438c210a613541ce691be143336d73f..53d1e076991e7cfe348e80242dea3d87a9a30c98 100644
--- a/applications/test/HashTable/Make/files
+++ b/applications/test/HashTable/Make/files
@@ -1,3 +1,3 @@
-hashTableTest.C
+Test-hashTable.C
 
-EXE = $(FOAM_USER_APPBIN)/hashTableTest
+EXE = $(FOAM_USER_APPBIN)/Test-hashTable
diff --git a/applications/test/HashTable/hashTableTest.C b/applications/test/HashTable/Test-hashTable.C
similarity index 100%
rename from applications/test/HashTable/hashTableTest.C
rename to applications/test/HashTable/Test-hashTable.C
diff --git a/applications/test/Hashing/Make/files b/applications/test/Hashing/Make/files
index a5f108772805150ed435a64fa06702b89ec858ad..fd270ac21768b0bdfa43381ae8ff82b99464bc1c 100644
--- a/applications/test/Hashing/Make/files
+++ b/applications/test/Hashing/Make/files
@@ -1,3 +1,3 @@
-testHashing.C
+Test-Hashing.C
 
-EXE = $(FOAM_USER_APPBIN)/testHashing
+EXE = $(FOAM_USER_APPBIN)/Test-Hashing
diff --git a/applications/test/Hashing/testHashing.C b/applications/test/Hashing/Test-Hashing.C
similarity index 100%
rename from applications/test/Hashing/testHashing.C
rename to applications/test/Hashing/Test-Hashing.C
diff --git a/applications/test/HashingSpeed/Make/files b/applications/test/HashingSpeed/Make/files
index 2d0e54d6e37226edece68a6766848add7bff2b4b..599e2ad9bfdbadb8bfd715b36b6a5cc2eb12575e 100644
--- a/applications/test/HashingSpeed/Make/files
+++ b/applications/test/HashingSpeed/Make/files
@@ -1,3 +1,3 @@
-testHashingSpeed.C
+Test-HashingSpeed.C
 
-EXE = $(FOAM_USER_APPBIN)/testHashingSpeed
+EXE = $(FOAM_USER_APPBIN)/Test-HashingSpeed
diff --git a/applications/test/HashingSpeed/testHashingSpeed.C b/applications/test/HashingSpeed/Test-HashingSpeed.C
similarity index 100%
rename from applications/test/HashingSpeed/testHashingSpeed.C
rename to applications/test/HashingSpeed/Test-HashingSpeed.C
diff --git a/applications/test/ISLList/Make/files b/applications/test/ISLList/Make/files
index 9b5b00ccc107f1f98227ded251cadb83f9925a5a..ceb5fc148f6cf1a6723e283a212cb7a0313d55a7 100644
--- a/applications/test/ISLList/Make/files
+++ b/applications/test/ISLList/Make/files
@@ -1,3 +1,3 @@
-ISLListTest.C
+Test-ISLList.C
 
-EXE = $(FOAM_USER_APPBIN)/ISLListTest
+EXE = $(FOAM_USER_APPBIN)/Test-ISLList
diff --git a/applications/test/ISLList/ISLListTest.C b/applications/test/ISLList/Test-ISLList.C
similarity index 100%
rename from applications/test/ISLList/ISLListTest.C
rename to applications/test/ISLList/Test-ISLList.C
diff --git a/applications/test/IStringStream/Make/files b/applications/test/IStringStream/Make/files
index e88d4acec815a5043d6330f58a582537d3d07382..2f212b00429623e9d14edb9bdc3c1068e2370ba0 100644
--- a/applications/test/IStringStream/Make/files
+++ b/applications/test/IStringStream/Make/files
@@ -1,3 +1,3 @@
-IStringStreamTest.C
+Test-IStringStream.C
 
-EXE = $(FOAM_USER_APPBIN)/IStringStreamTest
+EXE = $(FOAM_USER_APPBIN)/Test-IStringStream
diff --git a/applications/test/IStringStream/IStringStreamTest.C b/applications/test/IStringStream/Test-IStringStream.C
similarity index 100%
rename from applications/test/IStringStream/IStringStreamTest.C
rename to applications/test/IStringStream/Test-IStringStream.C
diff --git a/applications/test/IndirectList/Make/files b/applications/test/IndirectList/Make/files
index ac59789e886e6c8ac6de1e1161aff31e4bd5584a..397e90c6d0d410934feeae26ad07798c864a9861 100644
--- a/applications/test/IndirectList/Make/files
+++ b/applications/test/IndirectList/Make/files
@@ -1,4 +1,3 @@
+Test-IndirectList.C
 
-IndirectListTest.C
-
-EXE = $(FOAM_USER_APPBIN)/IndirectListTest
+EXE = $(FOAM_USER_APPBIN)/Test-IndirectList
diff --git a/applications/test/IndirectList/IndirectListTest.C b/applications/test/IndirectList/Test-IndirectList.C
similarity index 100%
rename from applications/test/IndirectList/IndirectListTest.C
rename to applications/test/IndirectList/Test-IndirectList.C
diff --git a/applications/test/LduMatrix/Make/files b/applications/test/LduMatrix/Make/files
deleted file mode 100644
index 99fa29929c824855b4a012d1174bc0a46b8e64f6..0000000000000000000000000000000000000000
--- a/applications/test/LduMatrix/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-LduMatrixTest3.C
-
-EXE = $(FOAM_USER_APPBIN)/LduMatrixTest
diff --git a/applications/test/List/ListLoop.C b/applications/test/List/ListLoop.C
deleted file mode 100644
index 8695836db1d19a81f333611b8ef0dcad1fdbab7f..0000000000000000000000000000000000000000
--- a/applications/test/List/ListLoop.C
+++ /dev/null
@@ -1,18 +0,0 @@
-#include "List.H"
-#include "scalar.H"
-
-using namespace Foam;
-
-void func
-(
-    List<scalar>& l1,
-    const List<scalar>& l2,
-    const List<label>& a1,
-    const List<label>& a2
-)
-{
-    forAll(l1, i)
-    {
-        l1[a1[i]] -= l2[a2[i]];
-    }
-}
diff --git a/applications/test/List/Make/files b/applications/test/List/Make/files
index f6ed74ee6cd9b6a7e00d6a2c270ae4aa0f520e3f..35935365d6ce51a23fdc323baa35cbead14f5e43 100644
--- a/applications/test/List/Make/files
+++ b/applications/test/List/Make/files
@@ -1,4 +1,3 @@
-ListTest.C
-ListLoop.C
+Test-List.C
 
-EXE = $(FOAM_USER_APPBIN)/ListTest
+EXE = $(FOAM_USER_APPBIN)/Test-List
diff --git a/applications/test/List/ListTest.C b/applications/test/List/Test-List.C
similarity index 100%
rename from applications/test/List/ListTest.C
rename to applications/test/List/Test-List.C
diff --git a/applications/test/Map/Make/files b/applications/test/Map/Make/files
index 7d6fd21419114a0e186e15793a44412e92b24cfc..61590a85e6cbc9d782df179bf9afe90bdee25bdc 100644
--- a/applications/test/Map/Make/files
+++ b/applications/test/Map/Make/files
@@ -1,4 +1,3 @@
+Test-Map.C
 
-MapTest.C
-
-EXE = $(FOAM_USER_APPBIN)/MapTest
+EXE = $(FOAM_USER_APPBIN)/Test-Map
diff --git a/applications/test/Map/MapTest.C b/applications/test/Map/Test-Map.C
similarity index 100%
rename from applications/test/Map/MapTest.C
rename to applications/test/Map/Test-Map.C
diff --git a/applications/test/Matrix/Make/files b/applications/test/Matrix/Make/files
index b5e2f3c68548f0761926f3712ef4103ba6b40457..e167e86cdc38ca5c1b88cae9f59ac83fc13c7171 100644
--- a/applications/test/Matrix/Make/files
+++ b/applications/test/Matrix/Make/files
@@ -1,3 +1,3 @@
-MatrixTest.C
+Test-Matrix.C
 
-EXE = $(FOAM_USER_APPBIN)/MatrixTest
+EXE = $(FOAM_USER_APPBIN)/Test-Matrix
diff --git a/applications/test/Matrix/MatrixTest.C b/applications/test/Matrix/Test-Matrix.C
similarity index 100%
rename from applications/test/Matrix/MatrixTest.C
rename to applications/test/Matrix/Test-Matrix.C
diff --git a/applications/test/NamedEnum/Make/files b/applications/test/NamedEnum/Make/files
index a6601226facc6495efcb7f0c1db09e18346489e6..e861aaa1b29ea96f18a320b75aa25b5a2a8f65b0 100644
--- a/applications/test/NamedEnum/Make/files
+++ b/applications/test/NamedEnum/Make/files
@@ -1,3 +1,3 @@
-namedEnumTest.C
+Test-namedEnum.C
 
 EXE = $(FOAM_USER_APPBIN)/NamedEnum
diff --git a/applications/test/NamedEnum/namedEnumTest.C b/applications/test/NamedEnum/Test-namedEnum.C
similarity index 100%
rename from applications/test/NamedEnum/namedEnumTest.C
rename to applications/test/NamedEnum/Test-namedEnum.C
diff --git a/applications/test/ODE/Make/files b/applications/test/ODE/Make/files
new file mode 100644
index 0000000000000000000000000000000000000000..dcf13f548bd66476a1119441bbe1cee9bd7d7ffb
--- /dev/null
+++ b/applications/test/ODE/Make/files
@@ -0,0 +1,3 @@
+Test-ODE.C
+
+EXE = $(FOAM_USER_APPBIN)/Test-ODE
diff --git a/applications/test/ODETest/Make/options b/applications/test/ODE/Make/options
similarity index 98%
rename from applications/test/ODETest/Make/options
rename to applications/test/ODE/Make/options
index e678a1c0e0be6cd5d40409f8ffc8c29af33ebbd3..6a97b686ac6283055ce29c5069b1af9dc855c050 100644
--- a/applications/test/ODETest/Make/options
+++ b/applications/test/ODE/Make/options
@@ -1,3 +1,2 @@
 EXE_INC = -I$(LIB_SRC)/ODE/lnInclude
 EXE_LIBS = -lODE
-
diff --git a/applications/test/ODETest/ODETest.C b/applications/test/ODE/Test-ODE.C
similarity index 100%
rename from applications/test/ODETest/ODETest.C
rename to applications/test/ODE/Test-ODE.C
diff --git a/applications/test/ODETest/Make/files b/applications/test/ODETest/Make/files
deleted file mode 100644
index 0550b66617f992e625237f68f1984317d6070324..0000000000000000000000000000000000000000
--- a/applications/test/ODETest/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-ODETest.C
-
-EXE = $(FOAM_USER_APPBIN)/ODETest
diff --git a/applications/test/OStringStream/Make/files b/applications/test/OStringStream/Make/files
index 8c96d099c1041d7c4f1d444cb000aa2018166c23..364cbc91b707ad7894f22fad007f564218d2fcd8 100644
--- a/applications/test/OStringStream/Make/files
+++ b/applications/test/OStringStream/Make/files
@@ -1,3 +1,3 @@
-OStringStreamTest.C
+Test-OStringStream.C
 
-EXE = $(FOAM_USER_APPBIN)/OStringStreamTest
+EXE = $(FOAM_USER_APPBIN)/Test-OStringStream
diff --git a/applications/test/OStringStream/OStringStreamTest.C b/applications/test/OStringStream/Test-OStringStream.C
similarity index 100%
rename from applications/test/OStringStream/OStringStreamTest.C
rename to applications/test/OStringStream/Test-OStringStream.C
diff --git a/applications/test/POSIX/Make/files b/applications/test/POSIX/Make/files
index f2f2540e6a8b248b8f80199a293419ec1afec79b..491f2572f33d3be4790c4d4cdb38aabb7558d669 100644
--- a/applications/test/POSIX/Make/files
+++ b/applications/test/POSIX/Make/files
@@ -1,2 +1,2 @@
-POSIXTest.C
-EXE = $(FOAM_USER_APPBIN)/POSIXTest
+Test-POSIX.C
+EXE = $(FOAM_USER_APPBIN)/Test-POSIX
diff --git a/applications/test/POSIX/POSIXTest.C b/applications/test/POSIX/Test-POSIX.C
similarity index 100%
rename from applications/test/POSIX/POSIXTest.C
rename to applications/test/POSIX/Test-POSIX.C
diff --git a/applications/test/PackedList/Make/files b/applications/test/PackedList/Make/files
index e06685c8b384dc32a4f6c0f645129282f18c6320..93a37615fc5a009a09d322bec73341ac3bd67bec 100644
--- a/applications/test/PackedList/Make/files
+++ b/applications/test/PackedList/Make/files
@@ -1,3 +1,3 @@
-PackedListTest.C
+Test-PackedList.C
 
-EXE = $(FOAM_USER_APPBIN)/PackedListTest
+EXE = $(FOAM_USER_APPBIN)/Test-PackedList
diff --git a/applications/test/PackedList/PackedListTest.C b/applications/test/PackedList/Test-PackedList.C
similarity index 91%
rename from applications/test/PackedList/PackedListTest.C
rename to applications/test/PackedList/Test-PackedList.C
index 7d47532f1bae230ed6395c532c6f3803db1e7929..2357969e13201e711e7dda5f7e72aecccb88bb52 100644
--- a/applications/test/PackedList/PackedListTest.C
+++ b/applications/test/PackedList/Test-PackedList.C
@@ -114,21 +114,6 @@ int main(int argc, char *argv[])
         reportInfo<14>();
         reportInfo<15>();
         reportInfo<16>();
-        reportInfo<17>();
-        reportInfo<18>();
-        reportInfo<19>();
-        reportInfo<20>();
-        reportInfo<21>();
-        reportInfo<22>();
-        reportInfo<23>();
-        reportInfo<24>();
-        reportInfo<25>();
-        reportInfo<26>();
-        reportInfo<27>();
-        reportInfo<28>();
-        reportInfo<29>();
-        reportInfo<30>();
-        reportInfo<31>();
 
         return 0;
     }
diff --git a/applications/test/PackedList1/Make/files b/applications/test/PackedList1/Make/files
index 3d39328952633cebf5127dbc6ec662f19b831923..76843f21f9f5ea23ed72461fc9f2f3ab64634670 100644
--- a/applications/test/PackedList1/Make/files
+++ b/applications/test/PackedList1/Make/files
@@ -1,3 +1,3 @@
-PackedListTest1.C
+Test-PackedList1.C
 
-EXE = $(FOAM_USER_APPBIN)/PackedListTest1
+EXE = $(FOAM_USER_APPBIN)/Test-PackedList1
diff --git a/applications/test/PackedList1/PackedListTest1.C b/applications/test/PackedList1/Test-PackedList1.C
similarity index 100%
rename from applications/test/PackedList1/PackedListTest1.C
rename to applications/test/PackedList1/Test-PackedList1.C
diff --git a/applications/test/PackedList2/Make/files b/applications/test/PackedList2/Make/files
index bb1f3085fadb26a1f3d158d599b523f9b7be10e6..ce31f2fa8ddc928fc143ce6e268b983b432cc510 100644
--- a/applications/test/PackedList2/Make/files
+++ b/applications/test/PackedList2/Make/files
@@ -1,3 +1,3 @@
-PackedListTest2.C
+Test-PackedList2.C
 
-EXE = $(FOAM_USER_APPBIN)/PackedListTest2
+EXE = $(FOAM_USER_APPBIN)/Test-PackedList2
diff --git a/applications/test/PackedList2/PackedListTest2.C b/applications/test/PackedList2/Test-PackedList2.C
similarity index 100%
rename from applications/test/PackedList2/PackedListTest2.C
rename to applications/test/PackedList2/Test-PackedList2.C
diff --git a/applications/test/PackedList3/Make/files b/applications/test/PackedList3/Make/files
index 0e119bc4f3607667e19f34ff2eac8556ae18c7ee..3291f428b58586af26cb6a8d71a9c0fd45947e86 100644
--- a/applications/test/PackedList3/Make/files
+++ b/applications/test/PackedList3/Make/files
@@ -1,3 +1,3 @@
-PackedListTest3.C
+Test-PackedList3.C
 
-EXE = $(FOAM_USER_APPBIN)/PackedListTest3
+EXE = $(FOAM_USER_APPBIN)/Test-PackedList3
diff --git a/applications/test/PackedList3/PackedListTest3.C b/applications/test/PackedList3/Test-PackedList3.C
similarity index 100%
rename from applications/test/PackedList3/PackedListTest3.C
rename to applications/test/PackedList3/Test-PackedList3.C
diff --git a/applications/test/PackedList4/Make/files b/applications/test/PackedList4/Make/files
index 0704f9b826eb283cb3c734dc0cd290154e10d9aa..6ff803f098d37068a4dc58c98dc75c24799682bb 100644
--- a/applications/test/PackedList4/Make/files
+++ b/applications/test/PackedList4/Make/files
@@ -1,3 +1,3 @@
-PackedListTest4.C
+Test-PackedList4.C
 
-EXE = $(FOAM_USER_APPBIN)/PackedListTest4
+EXE = $(FOAM_USER_APPBIN)/Test-PackedList4
diff --git a/applications/test/PackedList4/PackedListTest4.C b/applications/test/PackedList4/Test-PackedList4.C
similarity index 100%
rename from applications/test/PackedList4/PackedListTest4.C
rename to applications/test/PackedList4/Test-PackedList4.C
diff --git a/applications/test/PointEdgeWave/Make/files b/applications/test/PointEdgeWave/Make/files
new file mode 100644
index 0000000000000000000000000000000000000000..3621add307dcf2eac11487c720bfbef8daaec2b6
--- /dev/null
+++ b/applications/test/PointEdgeWave/Make/files
@@ -0,0 +1,3 @@
+Test-PointEdgeWave.C
+
+EXE = $(FOAM_USER_APPBIN)/Test-PointEdgeWave
diff --git a/applications/test/testPointEdgeWave/Make/options b/applications/test/PointEdgeWave/Make/options
similarity index 98%
rename from applications/test/testPointEdgeWave/Make/options
rename to applications/test/PointEdgeWave/Make/options
index 8940e1ec4f6d43e2c77da03bada4e3337d0248e8..54c035b8f55d183c1ad02bc372398feceaf31718 100644
--- a/applications/test/testPointEdgeWave/Make/options
+++ b/applications/test/PointEdgeWave/Make/options
@@ -3,4 +3,3 @@ EXE_INC = \
 
 EXE_LIBS = \
     -lmeshTools
-
diff --git a/applications/test/testPointEdgeWave/testPointEdgeWave.C b/applications/test/PointEdgeWave/Test-PointEdgeWave.C
similarity index 100%
rename from applications/test/testPointEdgeWave/testPointEdgeWave.C
rename to applications/test/PointEdgeWave/Test-PointEdgeWave.C
diff --git a/applications/test/Polynomial/Make/files b/applications/test/Polynomial/Make/files
index 598fccfecfa73a3dceee6885e9e3d5230af38a97..10afa7540e76b89e0882bc41c1afeb52761fba2e 100644
--- a/applications/test/Polynomial/Make/files
+++ b/applications/test/Polynomial/Make/files
@@ -1,3 +1,3 @@
-PolynomialTest.C
+Test-Polynomial.C
 
-EXE = $(FOAM_USER_APPBIN)/PolynomialTest
+EXE = $(FOAM_USER_APPBIN)/Test-Polynomial
diff --git a/applications/test/Polynomial/PolynomialTest.C b/applications/test/Polynomial/Test-Polynomial.C
similarity index 100%
rename from applications/test/Polynomial/PolynomialTest.C
rename to applications/test/Polynomial/Test-Polynomial.C
diff --git a/applications/test/PtrList/Make/files b/applications/test/PtrList/Make/files
index 4bfd49bde04e8d290f2aa7041966dfc8b3dc6c04..e3e9b2724a68b71eff354e271afe6110acd6d0bf 100644
--- a/applications/test/PtrList/Make/files
+++ b/applications/test/PtrList/Make/files
@@ -1,3 +1,3 @@
-PtrListTest.C
+Test-PtrList.C
 
-EXE = $(FOAM_USER_APPBIN)/PtrListTest
+EXE = $(FOAM_USER_APPBIN)/Test-PtrList
diff --git a/applications/test/PtrList/PtrListTest.C b/applications/test/PtrList/Test-PtrList.C
similarity index 100%
rename from applications/test/PtrList/PtrListTest.C
rename to applications/test/PtrList/Test-PtrList.C
diff --git a/applications/test/SLList/Make/files b/applications/test/SLList/Make/files
index b046754ac13ae3bcab2225d03d31ccb030a5060d..0246338b4965084579fd409da740bad62129c26d 100644
--- a/applications/test/SLList/Make/files
+++ b/applications/test/SLList/Make/files
@@ -1,3 +1,3 @@
-SLListTest.C
+Test-SLList.C
 
-EXE = $(FOAM_USER_APPBIN)/SLListTest
+EXE = $(FOAM_USER_APPBIN)/Test-SLList
diff --git a/applications/test/SLList/SLListTest.C b/applications/test/SLList/Test-SLList.C
similarity index 100%
rename from applications/test/SLList/SLListTest.C
rename to applications/test/SLList/Test-SLList.C
diff --git a/applications/test/StaticHashTable/Make/files b/applications/test/StaticHashTable/Make/files
index 4100a2d4fe218137fb33ce7a332d666e6c28dad3..e8d76bddc0c9d5bd67784f8e48813eb60364e3a0 100644
--- a/applications/test/StaticHashTable/Make/files
+++ b/applications/test/StaticHashTable/Make/files
@@ -1,3 +1,3 @@
-staticHashTableTest.C
+Test-staticHashTable.C
 
-EXE = $(FOAM_APPBIN)/staticHashTableTest
+EXE = $(FOAM_USER_APPBIN)/Test-staticHashTable
diff --git a/applications/test/StaticHashTable/staticHashTableTest.C b/applications/test/StaticHashTable/Test-staticHashTable.C
similarity index 100%
rename from applications/test/StaticHashTable/staticHashTableTest.C
rename to applications/test/StaticHashTable/Test-staticHashTable.C
diff --git a/applications/test/Tuple2/Make/files b/applications/test/Tuple2/Make/files
index bac600a9cd3a050c80c3df9c458c200c4a47cd36..be0026f0cdf85e21a0302cdf3fc8711657cc30b5 100644
--- a/applications/test/Tuple2/Make/files
+++ b/applications/test/Tuple2/Make/files
@@ -1,3 +1,3 @@
-Tuple2Test.C
+Test-Tuple2.C
 
-EXE = $(FOAM_USER_APPBIN)/Tuple2Test
+EXE = $(FOAM_USER_APPBIN)/Test-Tuple2
diff --git a/applications/test/Tuple2/Tuple2Test.C b/applications/test/Tuple2/Test-Tuple2.C
similarity index 100%
rename from applications/test/Tuple2/Tuple2Test.C
rename to applications/test/Tuple2/Test-Tuple2.C
diff --git a/applications/test/UDictionary/Make/files b/applications/test/UDictionary/Make/files
index c3feead38e01c61db74fd02c3b98672de84fc7ed..b4b931202dfc2fab175083f57ecad4c1475a2e88 100644
--- a/applications/test/UDictionary/Make/files
+++ b/applications/test/UDictionary/Make/files
@@ -1,3 +1,3 @@
-UDictionaryTest.C
+Test-UDictionary.C
 
-EXE = $(FOAM_USER_APPBIN)/UDictionaryTest
+EXE = $(FOAM_USER_APPBIN)/Test-UDictionary
diff --git a/applications/test/UDictionary/UDictionaryTest.C b/applications/test/UDictionary/Test-UDictionary.C
similarity index 100%
rename from applications/test/UDictionary/UDictionaryTest.C
rename to applications/test/UDictionary/Test-UDictionary.C
diff --git a/applications/test/UIndirectList/Make/files b/applications/test/UIndirectList/Make/files
new file mode 100644
index 0000000000000000000000000000000000000000..8f705219896249f533919b8eb2ca3ec6ab6bd855
--- /dev/null
+++ b/applications/test/UIndirectList/Make/files
@@ -0,0 +1,3 @@
+Test-UIndirectList.C
+
+EXE = $(FOAM_USER_APPBIN)/Test-UIndirectList
diff --git a/applications/test/UIndirectListTest/Make/options b/applications/test/UIndirectList/Make/options
similarity index 100%
rename from applications/test/UIndirectListTest/Make/options
rename to applications/test/UIndirectList/Make/options
diff --git a/applications/test/UIndirectListTest/UIndirectListTest.C b/applications/test/UIndirectList/Test-UIndirectList.C
similarity index 100%
rename from applications/test/UIndirectListTest/UIndirectListTest.C
rename to applications/test/UIndirectList/Test-UIndirectList.C
diff --git a/applications/test/UIndirectListTest/Make/files b/applications/test/UIndirectListTest/Make/files
deleted file mode 100644
index 8b43119aef9a4c4a13ceb37367ebdcf8202f907f..0000000000000000000000000000000000000000
--- a/applications/test/UIndirectListTest/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-UIndirectListTest.C
-
-EXE = $(FOAM_USER_APPBIN)/UIndirectListTest
diff --git a/applications/test/alloc/Make/files b/applications/test/alloc/Make/files
index e036a10532ec053f8f30db9365676685cc12a504..5b51a06854ebf152c54ba25e237c0e175a66c99a 100644
--- a/applications/test/alloc/Make/files
+++ b/applications/test/alloc/Make/files
@@ -1,8 +1,8 @@
-allocTest.C
+Test-alloc.C
 /*
-newTest.C
-mallocTest.C
-test.C
+Test-new.C
+Test-malloc.C
+Test.C
 */
 
-SEXE = $(FOAM_USER_APPBIN)/allocTest
+EXE = $(FOAM_USER_APPBIN)/Test-alloc
diff --git a/applications/test/alloc/allocTest.C b/applications/test/alloc/Test-alloc.C
similarity index 100%
rename from applications/test/alloc/allocTest.C
rename to applications/test/alloc/Test-alloc.C
diff --git a/applications/test/alloc/mallocTest.C b/applications/test/alloc/Test-malloc.C
similarity index 100%
rename from applications/test/alloc/mallocTest.C
rename to applications/test/alloc/Test-malloc.C
diff --git a/applications/test/alloc/newTest.C b/applications/test/alloc/Test-new.C
similarity index 100%
rename from applications/test/alloc/newTest.C
rename to applications/test/alloc/Test-new.C
diff --git a/applications/test/alloc/test.C b/applications/test/alloc/Test.C
similarity index 100%
rename from applications/test/alloc/test.C
rename to applications/test/alloc/Test.C
diff --git a/applications/test/callback/Make/files b/applications/test/callback/Make/files
index bd1eab1e8ab1fbd14f99a331a83c9362fdb5d9a8..bfc8ff6b929185195211173cd7f01ff4a394b392 100644
--- a/applications/test/callback/Make/files
+++ b/applications/test/callback/Make/files
@@ -1,3 +1,3 @@
-callbackTest.C
+Test-callback.C
 
-EXE = $(FOAM_USER_APPBIN)/callbackTest
+EXE = $(FOAM_USER_APPBIN)/Test-callback
diff --git a/applications/test/callback/callbackTest.C b/applications/test/callback/Test-callback.C
similarity index 100%
rename from applications/test/callback/callbackTest.C
rename to applications/test/callback/Test-callback.C
diff --git a/applications/test/cyclic/Make/files b/applications/test/cyclic/Make/files
index f373d8da3501bf62fdf037e799f8a8d6a7415840..54f2090fa1bb2e6a725161bfff5647a3df2e08b5 100644
--- a/applications/test/cyclic/Make/files
+++ b/applications/test/cyclic/Make/files
@@ -1,3 +1,3 @@
-cyclicTest.C
+Test-cyclic.C
 
-EXE = $(FOAM_USER_APPBIN)/cyclicTest
+EXE = $(FOAM_USER_APPBIN)/Test-cyclic
diff --git a/applications/test/cyclic/cyclicTest.C b/applications/test/cyclic/Test-cyclic.C
similarity index 99%
rename from applications/test/cyclic/cyclicTest.C
rename to applications/test/cyclic/Test-cyclic.C
index f503f61b099a637d916eb5c46a107737ec934201..491dc947064cbad5153b952a95ce6e70c720a284 100644
--- a/applications/test/cyclic/cyclicTest.C
+++ b/applications/test/cyclic/Test-cyclic.C
@@ -60,4 +60,3 @@ int main(int argc, char *argv[])
 
 
 // ************************************************************************* //
-
diff --git a/applications/test/dataEntry/Make/files b/applications/test/dataEntry/Make/files
index b32b5bd950a51cac38293e25b1349978d5371d2e..c514002f99e31cf9c1bad83a287c8b4e75ec16a1 100644
--- a/applications/test/dataEntry/Make/files
+++ b/applications/test/dataEntry/Make/files
@@ -1,3 +1,3 @@
-testDataEntry.C
+Test-DataEntry.C
 
-EXE = $(FOAM_USER_APPBIN)/testDataEntry
+EXE = $(FOAM_USER_APPBIN)/Test-DataEntry
diff --git a/applications/test/dataEntry/Make/options b/applications/test/dataEntry/Make/options
index cde1970d78033669fdb627e71774abd710b10ee7..79fef3bb9383878d9e71090a3c4aae90be08af52 100644
--- a/applications/test/dataEntry/Make/options
+++ b/applications/test/dataEntry/Make/options
@@ -8,4 +8,4 @@ EXE_LIBS = \
     -lfiniteVolume \
     -llagrangianIntermediate \
     -lradiation \
-    -lthermophysicalFunctions
\ No newline at end of file
+    -lthermophysicalFunctions
diff --git a/applications/test/dataEntry/testDataEntry.C b/applications/test/dataEntry/Test-DataEntry.C
similarity index 100%
rename from applications/test/dataEntry/testDataEntry.C
rename to applications/test/dataEntry/Test-DataEntry.C
diff --git a/applications/test/dataEntry/files b/applications/test/dataEntry/files
deleted file mode 100644
index c7e4dc9043431b845de8439dd72117b11799cd1a..0000000000000000000000000000000000000000
--- a/applications/test/dataEntry/files
+++ /dev/null
@@ -1,4 +0,0 @@
-testTable.C
-
-EXE=$(FOAM_USER_APPBIN)/testTable
-
diff --git a/applications/test/delete/Make/files b/applications/test/delete/Make/files
index 89e563518a41e9a9529935c5e64ef1e5b5c54983..c2f7d8f6fefd831e30dc61b236d71243255701cd 100644
--- a/applications/test/delete/Make/files
+++ b/applications/test/delete/Make/files
@@ -1,3 +1,3 @@
-deleteTest.C
+Test-delete.C
 
-EXE = $(FOAM_USER_APPBIN)/deleteTest
+EXE = $(FOAM_USER_APPBIN)/Test-delete
diff --git a/applications/test/delete/deleteTest.C b/applications/test/delete/Test-delete.C
similarity index 99%
rename from applications/test/delete/deleteTest.C
rename to applications/test/delete/Test-delete.C
index f8bf00e24b86cfc83626667f12751f15a3587f6f..14b33c1cc7161a77d4a87c6d41baece16e0a8b53 100644
--- a/applications/test/delete/deleteTest.C
+++ b/applications/test/delete/Test-delete.C
@@ -61,4 +61,3 @@ int main()
 
 
 // ************************************************************************* //
-
diff --git a/applications/test/dictionary/Make/files b/applications/test/dictionary/Make/files
index b9363efb23b13e6012274d16c0a250cdf9d2ca39..ae255d44747ae65b63ba0923a7ae76927b6f445d 100644
--- a/applications/test/dictionary/Make/files
+++ b/applications/test/dictionary/Make/files
@@ -1,3 +1,3 @@
-dictionaryTest.C
+Test-dictionary.C
 
-EXE = $(FOAM_USER_APPBIN)/dictionaryTest
+EXE = $(FOAM_USER_APPBIN)/Test-dictionary
diff --git a/applications/test/dictionary/dictionaryTest.C b/applications/test/dictionary/Test-dictionary.C
similarity index 100%
rename from applications/test/dictionary/dictionaryTest.C
rename to applications/test/dictionary/Test-dictionary.C
diff --git a/applications/test/dimensionedType/Make/files b/applications/test/dimensionedType/Make/files
index fcffbec3d3de4698785783e2cff986675821fc69..36a682e2812e3d9646538e670018fbb89f822072 100644
--- a/applications/test/dimensionedType/Make/files
+++ b/applications/test/dimensionedType/Make/files
@@ -1,4 +1,3 @@
-
-dimensionedTypeTest.C
+Test-dimensionedType.C
 
 EXE = $(FOAM_USER_APPBIN)/dimensionedType
diff --git a/applications/test/dimensionedType/dimensionedTypeTest.C b/applications/test/dimensionedType/Test-dimensionedType.C
similarity index 100%
rename from applications/test/dimensionedType/dimensionedTypeTest.C
rename to applications/test/dimensionedType/Test-dimensionedType.C
diff --git a/applications/test/directMappedPatch/Make/files b/applications/test/directMappedPatch/Make/files
index 65f39a47b8e09776cb7c8259d27f73a15663e335..d33cd29958b1665588ed14d23682d2b88410d4ef 100644
--- a/applications/test/directMappedPatch/Make/files
+++ b/applications/test/directMappedPatch/Make/files
@@ -1,4 +1,3 @@
+Test-DirectMappedPatch.C
 
-testDirectMappedPatch.C
-
-EXE = $(FOAM_USER_APPBIN)/testDirectMappedPatch
+EXE = $(FOAM_USER_APPBIN)/Test-DirectMappedPatch
diff --git a/applications/test/directMappedPatch/testDirectMappedPatch.C b/applications/test/directMappedPatch/Test-DirectMappedPatch.C
similarity index 99%
rename from applications/test/directMappedPatch/testDirectMappedPatch.C
rename to applications/test/directMappedPatch/Test-DirectMappedPatch.C
index a052e1b5eb19a769f8b41fd6ae0f6dcd13f02531..77222bef7eb4f85b93e52c2e421196b78c9920d0 100644
--- a/applications/test/directMappedPatch/testDirectMappedPatch.C
+++ b/applications/test/directMappedPatch/Test-DirectMappedPatch.C
@@ -84,7 +84,7 @@ int main(int argc, char *argv[])
         dimensionedVector("zero", dimLength, vector::zero),
         patchFieldTypes
     );
-    
+
     cc.internalField() = mesh.C().internalField();
     cc.boundaryField().updateCoeffs();
 
diff --git a/applications/test/error/Make/files b/applications/test/error/Make/files
index 51380f63b5d98c9713e6af44a8e4ecbd0d7c98ea..092748d0ef833297d172b17eafbf138178eb29cc 100644
--- a/applications/test/error/Make/files
+++ b/applications/test/error/Make/files
@@ -1,3 +1,3 @@
-errorTest.C
+Test-error.C
 
-EXE = $(FOAM_USER_APPBIN)/errorTest
+EXE = $(FOAM_USER_APPBIN)/Test-error
diff --git a/applications/test/error/errorTest.C b/applications/test/error/Test-error.C
similarity index 100%
rename from applications/test/error/errorTest.C
rename to applications/test/error/Test-error.C
diff --git a/applications/test/extendedStencil/Make/files b/applications/test/extendedStencil/Make/files
index 236668cde8f9c8da6ac1f75d1e0d9de0f36ad04f..7498657dfc52d771cf973f5c2d696cbacdca672b 100644
--- a/applications/test/extendedStencil/Make/files
+++ b/applications/test/extendedStencil/Make/files
@@ -1,4 +1,3 @@
+Test-ExtendedStencil.C
 
-testExtendedStencil.C
-
-EXE = $(FOAM_USER_APPBIN)/testExtendedStencil
+EXE = $(FOAM_USER_APPBIN)/Test-ExtendedStencil
diff --git a/applications/test/extendedStencil/testExtendedStencil.C b/applications/test/extendedStencil/Test-ExtendedStencil.C
similarity index 100%
rename from applications/test/extendedStencil/testExtendedStencil.C
rename to applications/test/extendedStencil/Test-ExtendedStencil.C
diff --git a/applications/test/fieldDependency/Make/files b/applications/test/fieldDependency/Make/files
index 98fd335a17af51235e92f8cfcd0511bf1e1b31a9..dc11b03c86688b0696bd796901d54655c3cc638d 100644
--- a/applications/test/fieldDependency/Make/files
+++ b/applications/test/fieldDependency/Make/files
@@ -1,3 +1,3 @@
-fieldDependency.C
+Test-fieldDependency.C
 
-EXE = $(FOAM_USER_APPBIN)/fieldDependency
+EXE = $(FOAM_USER_APPBIN)/Test-fieldDependency
diff --git a/applications/test/fieldDependency/fieldDependency.C b/applications/test/fieldDependency/Test-fieldDependency.C
similarity index 100%
rename from applications/test/fieldDependency/fieldDependency.C
rename to applications/test/fieldDependency/Test-fieldDependency.C
diff --git a/applications/test/fileName/Make/files b/applications/test/fileName/Make/files
index 4b7575a038d2fc4ef1b884c1a609ccb30f286ce4..19131960ba103610cc48c9c85086da62b5a32603 100644
--- a/applications/test/fileName/Make/files
+++ b/applications/test/fileName/Make/files
@@ -1,3 +1,3 @@
-fileNameTest.C
+Test-fileName.C
 
-EXE = $(FOAM_USER_APPBIN)/fileNameTest
+EXE = $(FOAM_USER_APPBIN)/Test-fileName
diff --git a/applications/test/fileName/fileNameTest.C b/applications/test/fileName/Test-fileName.C
similarity index 100%
rename from applications/test/fileName/fileNameTest.C
rename to applications/test/fileName/Test-fileName.C
diff --git a/applications/test/fileNameClean/Make/files b/applications/test/fileNameClean/Make/files
index 8363e079a201fdccb4dfe708a75b6b7d44136d20..0554a4eadf771aefea10799c42ca1cadcbede20a 100644
--- a/applications/test/fileNameClean/Make/files
+++ b/applications/test/fileNameClean/Make/files
@@ -1,3 +1,3 @@
-fileNameCleanTest.C
+Test-fileNameClean.C
 
-EXE = $(FOAM_USER_APPBIN)/fileNameCleanTest
+EXE = $(FOAM_USER_APPBIN)/Test-fileNameClean
diff --git a/applications/test/fileNameClean/fileNameCleanTest.C b/applications/test/fileNameClean/Test-fileNameClean.C
similarity index 100%
rename from applications/test/fileNameClean/fileNameCleanTest.C
rename to applications/test/fileNameClean/Test-fileNameClean.C
diff --git a/applications/test/findCell-octree/Make/files b/applications/test/findCell-octree/Make/files
index 809cf2db153baabf38c34a8db0aed5f83203c6d3..e44d4c539479e062b245c5c59e7cb249181ea090 100644
--- a/applications/test/findCell-octree/Make/files
+++ b/applications/test/findCell-octree/Make/files
@@ -1,3 +1,3 @@
-findCell-octree.C
+Test-findCell-octree.C
 
-EXE = $(FOAM_USER_APPBIN)/findCell-octree
+EXE = $(FOAM_USER_APPBIN)/Test-findCell-octree
diff --git a/applications/test/findCell-octree/findCell-octree.C b/applications/test/findCell-octree/Test-findCell-octree.C
similarity index 100%
rename from applications/test/findCell-octree/findCell-octree.C
rename to applications/test/findCell-octree/Test-findCell-octree.C
diff --git a/applications/test/findTimes/Make/files b/applications/test/findTimes/Make/files
index fcfbd3e92f156963526552619a4c4158ea47d728..281d03f0efdfcd9754c00e43a4cce8f7def5b22b 100644
--- a/applications/test/findTimes/Make/files
+++ b/applications/test/findTimes/Make/files
@@ -1,3 +1,3 @@
-findTimes.C
+Test-findTimes.C
 
-EXE = $(FOAM_USER_APPBIN)/findTimes
+EXE = $(FOAM_USER_APPBIN)/Test-findTimes
diff --git a/applications/test/findTimes/findTimes.C b/applications/test/findTimes/Test-findTimes.C
similarity index 100%
rename from applications/test/findTimes/findTimes.C
rename to applications/test/findTimes/Test-findTimes.C
diff --git a/applications/test/foamVersion/Make/files b/applications/test/foamVersion/Make/files
index eb39f3ac8845936a24857035d294fc21e716381d..52262afb8e80b696c8b01e78ffdba11a49a3c0c1 100644
--- a/applications/test/foamVersion/Make/files
+++ b/applications/test/foamVersion/Make/files
@@ -1,3 +1,3 @@
-foamVersionString.C
+Test-foamVersionString.C
 
-EXE = $(FOAM_USER_APPBIN)/foamVersionString
+EXE = $(FOAM_USER_APPBIN)/Test-foamVersionString
diff --git a/applications/test/foamVersion/foamVersionString.C b/applications/test/foamVersion/Test-foamVersionString.C
similarity index 100%
rename from applications/test/foamVersion/foamVersionString.C
rename to applications/test/foamVersion/Test-foamVersionString.C
diff --git a/applications/test/fvSolutionCombine/Make/files b/applications/test/fvSolutionCombine/Make/files
index e16d69f14db9c3529db2933ea97ced072b0d95b5..db4b17b98c05220539f5ed4b5e7953d31828ee9e 100644
--- a/applications/test/fvSolutionCombine/Make/files
+++ b/applications/test/fvSolutionCombine/Make/files
@@ -1,3 +1,3 @@
-fvSolutionCombine.C
+Test-fvSolutionCombine.C
 
-EXE = $(FOAM_USER_APPBIN)/fvSolutionCombine
+EXE = $(FOAM_USER_APPBIN)/Test-fvSolutionCombine
diff --git a/applications/test/fvSolutionCombine/fvSolutionCombine.C b/applications/test/fvSolutionCombine/Test-fvSolutionCombine.C
similarity index 100%
rename from applications/test/fvSolutionCombine/fvSolutionCombine.C
rename to applications/test/fvSolutionCombine/Test-fvSolutionCombine.C
diff --git a/applications/test/fvc/Make/files b/applications/test/fvc/Make/files
index 08c41f8db934961b8d7e2eda63a71e93d3522c99..f8f795b787c76365bcd9e87ba22613af19c81fe2 100644
--- a/applications/test/fvc/Make/files
+++ b/applications/test/fvc/Make/files
@@ -1,3 +1,3 @@
-fvcTest.C
+Test-fvc.C
 
-EXE = $(FOAM_USER_APPBIN)/fvcTest
+EXE = $(FOAM_USER_APPBIN)/Test-fvc
diff --git a/applications/test/fvc/fvcTest.C b/applications/test/fvc/Test-fvc.C
similarity index 100%
rename from applications/test/fvc/fvcTest.C
rename to applications/test/fvc/Test-fvc.C
diff --git a/applications/test/globalIndex/Make/files b/applications/test/globalIndex/Make/files
index cb25b3090f6d515f2c70cc068439c2a3c0b32ca8..ba9900cd8289c155d5e7eea8ede420edb8d72a93 100644
--- a/applications/test/globalIndex/Make/files
+++ b/applications/test/globalIndex/Make/files
@@ -1,3 +1,3 @@
-globalIndexTest.C
+Test-globalIndex.C
 
-EXE = $(FOAM_USER_APPBIN)/globalIndexTest
+EXE = $(FOAM_USER_APPBIN)/Test-globalIndex
diff --git a/applications/test/globalIndex/globalIndexTest.C b/applications/test/globalIndex/Test-globalIndex.C
similarity index 99%
rename from applications/test/globalIndex/globalIndexTest.C
rename to applications/test/globalIndex/Test-globalIndex.C
index e3998a4a04e1b026904fc33a8f721a0968dfb024..5a6d5d97035c6b32540e91df17a7ba0e348c81d2 100644
--- a/applications/test/globalIndex/globalIndexTest.C
+++ b/applications/test/globalIndex/Test-globalIndex.C
@@ -92,7 +92,7 @@ int main(int argc, char *argv[])
 
 
     // Try whichProcID on a few borderline cases.
-    
+
     if (mesh.nCells() < 1)
     {
         FatalErrorIn(args.executable())
diff --git a/applications/test/globalMeshData/Make/files b/applications/test/globalMeshData/Make/files
index dc5877e38355722c4836cf2f346bc877c33d04d4..80e30e0d4a5e9d3d0fc57b598badcad46e36fc3e 100644
--- a/applications/test/globalMeshData/Make/files
+++ b/applications/test/globalMeshData/Make/files
@@ -1,3 +1,3 @@
-globalMeshDataTest.C
+Test-globalMeshData.C
 
-EXE = $(FOAM_USER_APPBIN)/globalMeshDataTest
+EXE = $(FOAM_USER_APPBIN)/Test-globalMeshData
diff --git a/applications/test/globalMeshData/globalMeshDataTest.C b/applications/test/globalMeshData/Test-globalMeshData.C
similarity index 100%
rename from applications/test/globalMeshData/globalMeshDataTest.C
rename to applications/test/globalMeshData/Test-globalMeshData.C
diff --git a/applications/test/graph/Make/files b/applications/test/graph/Make/files
index 1c69ce1c7006b315dc3cf3db8c00dafc111f7cd6..337a894c045f1b728b3f0ea7adaee39cad346b6f 100644
--- a/applications/test/graph/Make/files
+++ b/applications/test/graph/Make/files
@@ -1,3 +1,3 @@
-graphTest.C
+Test-graph.C
 
-EXE = $(FOAM_USER_APPBIN)/graphTest
+EXE = $(FOAM_USER_APPBIN)/Test-graph
diff --git a/applications/test/graph/graphTest.C b/applications/test/graph/Test-graph.C
similarity index 99%
rename from applications/test/graph/graphTest.C
rename to applications/test/graph/Test-graph.C
index 88c51d18f1d8df035e7fc6fb70b757d4be5d15f0..2ee857cb037c077b06cfacc47debffa6624f77e7 100644
--- a/applications/test/graph/graphTest.C
+++ b/applications/test/graph/Test-graph.C
@@ -68,4 +68,3 @@ int main()
 
 
 // ************************************************************************* //
-
diff --git a/applications/test/graphXi/Make/files b/applications/test/graphXi/Make/files
index 408fe21b8fb44c045ffa8c52cdeed1b639f973f1..344e4ddc20a3d455325ddf23a1f9b14b87e9680d 100644
--- a/applications/test/graphXi/Make/files
+++ b/applications/test/graphXi/Make/files
@@ -1,3 +1,3 @@
-graphXi.C
+Test-graphXi.C
 
-EXE = $(FOAM_USER_APPBIN)/graphXi
+EXE = $(FOAM_USER_APPBIN)/Test-graphXi
diff --git a/applications/test/graphXi/graphXi.C b/applications/test/graphXi/Test-graphXi.C
similarity index 100%
rename from applications/test/graphXi/graphXi.C
rename to applications/test/graphXi/Test-graphXi.C
diff --git a/applications/test/io/Make/files b/applications/test/io/Make/files
index 1f7ba5ca5ee26d7ed914f41bfca3e895d90f8d1d..3e2bc861e773f739bc7ab26169d59e2e2c8713ef 100644
--- a/applications/test/io/Make/files
+++ b/applications/test/io/Make/files
@@ -1,3 +1,3 @@
-ioTest.C
+Test-io.C
 
-EXE = $(FOAM_USER_APPBIN)/ioTest
+EXE = $(FOAM_USER_APPBIN)/Test-io
diff --git a/applications/test/io/ioTest.C b/applications/test/io/Test-io.C
similarity index 99%
rename from applications/test/io/ioTest.C
rename to applications/test/io/Test-io.C
index 6d39ae027ff7c0856c4875e3fc61c52a3b3ca705..bc4c435bf6630462ebd8f2173993621e3c6f7cb0 100644
--- a/applications/test/io/ioTest.C
+++ b/applications/test/io/Test-io.C
@@ -54,4 +54,3 @@ int main(void)
 }
 
 // ************************************************************************* //
-
diff --git a/applications/test/lduMatrix/Make/files b/applications/test/lduMatrix/Make/files
new file mode 100644
index 0000000000000000000000000000000000000000..69b87cfc1eb9d5d0362da3deed7ac8f851cbc0b2
--- /dev/null
+++ b/applications/test/lduMatrix/Make/files
@@ -0,0 +1,3 @@
+Test-lduMatrix3.C
+
+EXE = $(FOAM_USER_APPBIN)/Test-lduMatrix
diff --git a/applications/test/LduMatrix/Make/options b/applications/test/lduMatrix/Make/options
similarity index 100%
rename from applications/test/LduMatrix/Make/options
rename to applications/test/lduMatrix/Make/options
diff --git a/applications/test/LduMatrix/LduMatrixTest.C b/applications/test/lduMatrix/Test-lduMatrix.C
similarity index 100%
rename from applications/test/LduMatrix/LduMatrixTest.C
rename to applications/test/lduMatrix/Test-lduMatrix.C
diff --git a/applications/test/LduMatrix/LduMatrixTest2.C b/applications/test/lduMatrix/Test-lduMatrix2.C
similarity index 100%
rename from applications/test/LduMatrix/LduMatrixTest2.C
rename to applications/test/lduMatrix/Test-lduMatrix2.C
diff --git a/applications/test/LduMatrix/LduMatrixTest3.C b/applications/test/lduMatrix/Test-lduMatrix3.C
similarity index 98%
rename from applications/test/LduMatrix/LduMatrixTest3.C
rename to applications/test/lduMatrix/Test-lduMatrix3.C
index 35e8a4ab852485bef4bd9dd6f47c576359374c8d..175cf949e9b96eef4d1a5109ee0614654d4438d7 100644
--- a/applications/test/LduMatrix/LduMatrixTest3.C
+++ b/applications/test/lduMatrix/Test-lduMatrix3.C
@@ -105,7 +105,7 @@ int main(int argc, char *argv[])
             volScalarField rAU = 1.0/UEqn.A();
 
             U = rAU*UEqn.H();
-            phi = (fvc::interpolate(U) & mesh.Sf()) 
+            phi = (fvc::interpolate(U) & mesh.Sf())
                 + fvc::ddtPhiCorr(rAU, U, phi);
 
             adjustPhi(phi, U, p);
diff --git a/applications/test/LduMatrix/createFields.H b/applications/test/lduMatrix/createFields.H
similarity index 100%
rename from applications/test/LduMatrix/createFields.H
rename to applications/test/lduMatrix/createFields.H
diff --git a/applications/test/liquid/Make/files b/applications/test/liquid/Make/files
index de4f827ffe1d5cf04778ae42f205b65adcc9a1b5..0800b4db3b6e6a7e9af033905e385a0d96bd263c 100644
--- a/applications/test/liquid/Make/files
+++ b/applications/test/liquid/Make/files
@@ -1,3 +1,3 @@
-liquidTest.C
+Test-liquid.C
 
-EXE = $(FOAM_USER_APPBIN)/liquidTest
+EXE = $(FOAM_USER_APPBIN)/Test-liquid
diff --git a/applications/test/liquid/liquidTest.C b/applications/test/liquid/Test-liquid.C
similarity index 100%
rename from applications/test/liquid/liquidTest.C
rename to applications/test/liquid/Test-liquid.C
diff --git a/applications/test/maxMem/Make/files b/applications/test/maxMem/Make/files
index 3190556e21d1421c49d5fb77ff5ea7623fe5442a..f7e2a956a1b6f9fa709fdb52724a29ac65c62b12 100644
--- a/applications/test/maxMem/Make/files
+++ b/applications/test/maxMem/Make/files
@@ -1,2 +1,2 @@
-maxMem.C
-SEXE = $(FOAM_USER_APPBIN)/maxMem
+Test-maxMem.C
+EXE = $(FOAM_USER_APPBIN)/Test-maxMem
diff --git a/applications/test/maxMem/maxMem.C b/applications/test/maxMem/Test-maxMem.C
similarity index 100%
rename from applications/test/maxMem/maxMem.C
rename to applications/test/maxMem/Test-maxMem.C
diff --git a/applications/test/memInfo/Make/files b/applications/test/memInfo/Make/files
index c42564e8fc69cca6781dae6ff6b15ff0d28197e2..1c9d3fff8edb3f71cc38eae558d2d55266d7e5fe 100644
--- a/applications/test/memInfo/Make/files
+++ b/applications/test/memInfo/Make/files
@@ -1,3 +1,3 @@
-memInfo.C
+Test-memInfo.C
 
-EXE = $(FOAM_USER_APPBIN)/memInfo
+EXE = $(FOAM_USER_APPBIN)/Test-memInfo
diff --git a/src/surfaceFilmModels/derivedFvPatchFields/directMappedNamedFixedValue/directMappedNamedFixedValueFvPatchFieldsFwd.H b/applications/test/memInfo/Test-memInfo.C
similarity index 70%
rename from src/surfaceFilmModels/derivedFvPatchFields/directMappedNamedFixedValue/directMappedNamedFixedValueFvPatchFieldsFwd.H
rename to applications/test/memInfo/Test-memInfo.C
index c7d6e5c11cf3b35d584ada9fc5b3b36ffe14bcc4..0eb32803c846e94052c52a15a547c1c2f15b58d9 100644
--- a/src/surfaceFilmModels/derivedFvPatchFields/directMappedNamedFixedValue/directMappedNamedFixedValueFvPatchFieldsFwd.H
+++ b/applications/test/memInfo/Test-memInfo.C
@@ -21,30 +21,41 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
+Application
+
+Description
+
 \*---------------------------------------------------------------------------*/
 
-#ifndef directMappedNamedFixedValueFvPatchFieldsFwd_H
-#define directMappedNamedFixedValueFvPatchFieldsFwd_H
+#include "memInfo.H"
+#include "IOstreams.H"
+#include "List.H"
+#include "vector.H"
 
-#include "fieldTypes.H"
+using namespace Foam;
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+//  Main program:
 
-namespace Foam
+int main(int argc, char *argv[])
 {
+    const int n = 10000000;
+    const char* const memTags = "peak/size/rss mem: ";
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class directMappedNamedFixedValueFvPatchField;
+    memInfo mem;
 
-makePatchTypeFieldTypedefs(directMappedNamedFixedValue)
+    Info<< memTags << mem << endl;
+    List<vector> lst(n, vector::one);
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+    Info<< "allocate " << n << " vectors" << nl
+        << memTags << mem.update() << endl;
 
-} // End namespace Foam
+    lst.clear();
+    Info<< "clear" << nl
+        << memTags << mem.update() << endl;
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+    return 0;
+}
 
-#endif
 
 // ************************************************************************* //
diff --git a/applications/test/memInfo/memInfo.C b/applications/test/memInfo/memInfo.C
deleted file mode 100644
index fb20be6d8d8adb10e13b0e5701fa056042db22d8..0000000000000000000000000000000000000000
--- a/applications/test/memInfo/memInfo.C
+++ /dev/null
@@ -1,19 +0,0 @@
-#include "memInfo.H"
-#include "IOstreams.H"
-#include "List.H"
-#include "vector.H"
-
-using namespace Foam;
-
-int main()
-{
-    memInfo m;
-
-    Info<< m << endl;
-
-    List<vector> l(10000000, vector::one);
-
-    Info<< m.update() << endl;
-
-    return 0;
-}
diff --git a/applications/test/mesh/Make/files b/applications/test/mesh/Make/files
index 2ba7eeb62b68ce01d28b7d74eef6d7e970fe767a..b3c5699667d3249f1c1cdcc537ddd420d9fa3f1e 100644
--- a/applications/test/mesh/Make/files
+++ b/applications/test/mesh/Make/files
@@ -1,3 +1,3 @@
-meshTest.C
+Test-mesh.C
 
-EXE = $(FOAM_USER_APPBIN)/meshTest
+EXE = $(FOAM_USER_APPBIN)/Test-mesh
diff --git a/applications/test/mesh/meshTest.C b/applications/test/mesh/Test-mesh.C
similarity index 100%
rename from applications/test/mesh/meshTest.C
rename to applications/test/mesh/Test-mesh.C
diff --git a/applications/test/mkdir/Make/files b/applications/test/mkdir/Make/files
index 6d2483b76c9d2f48a4b0e756081f5a34ef585c45..7e509e344cdde920a7dc8cfd0526dbbaab75d19d 100644
--- a/applications/test/mkdir/Make/files
+++ b/applications/test/mkdir/Make/files
@@ -1,4 +1,3 @@
+Test-mkdir.C
 
-mkdirTest.C
-
-EXE = $(FOAM_USER_APPBIN)/mkdirTest
+EXE = $(FOAM_USER_APPBIN)/Test-mkdir
diff --git a/applications/test/mkdir/mkdirTest.C b/applications/test/mkdir/Test-mkdir.C
similarity index 100%
rename from applications/test/mkdir/mkdirTest.C
rename to applications/test/mkdir/Test-mkdir.C
diff --git a/applications/test/momentOfInertia/Make/files b/applications/test/momentOfInertia/Make/files
index 89848e34fb5a5634c3e240da3200e132db8d5551..0fbfa5cdf2814bc22cc87b7268d9be03fd59a3f1 100644
--- a/applications/test/momentOfInertia/Make/files
+++ b/applications/test/momentOfInertia/Make/files
@@ -1,3 +1,3 @@
-momentOfInertiaTest.C
+Test-momentOfInertia.C
 
-EXE = $(FOAM_USER_APPBIN)/momentOfInertiaTest
+EXE = $(FOAM_USER_APPBIN)/Test-momentOfInertia
diff --git a/applications/test/momentOfInertia/momentOfInertiaTest.C b/applications/test/momentOfInertia/Test-momentOfInertia.C
similarity index 100%
rename from applications/test/momentOfInertia/momentOfInertiaTest.C
rename to applications/test/momentOfInertia/Test-momentOfInertia.C
diff --git a/applications/test/mvBak/Make/files b/applications/test/mvBak/Make/files
index 6cf0b98c5b5bfe7cbf88eb5f6be564f3287d5eec..a8a5bf97589525d6fcb64dade6ec94ded87c69fc 100644
--- a/applications/test/mvBak/Make/files
+++ b/applications/test/mvBak/Make/files
@@ -1,3 +1,3 @@
-mvBakTest.C
+Test-mvBak.C
 
-EXE = $(FOAM_USER_APPBIN)/mvBakTest
+EXE = $(FOAM_USER_APPBIN)/Test-mvBak
diff --git a/applications/test/mvBak/mvBakTest.C b/applications/test/mvBak/Test-mvBak.C
similarity index 100%
rename from applications/test/mvBak/mvBakTest.C
rename to applications/test/mvBak/Test-mvBak.C
diff --git a/applications/test/nearWallDist-wave/Make/files b/applications/test/nearWallDist-wave/Make/files
index d8829db8cb312b4eb81f9a2294447ab623597f5d..e3298a3c68a49e3e1f88282e2e735597d055974b 100644
--- a/applications/test/nearWallDist-wave/Make/files
+++ b/applications/test/nearWallDist-wave/Make/files
@@ -1,3 +1,3 @@
-testWallDist.C
+Test-WallDist.C
 
-EXE = $(FOAM_USER_APPBIN)/testWallDist
+EXE = $(FOAM_USER_APPBIN)/Test-WallDist
diff --git a/applications/test/nearWallDist-wave/README b/applications/test/nearWallDist-wave/README
index 5beac181d8d0b216008c308d855a06ce0c777186..5fb7864f1cd67f2581f8ec3363c08e8fb77b1582 100644
--- a/applications/test/nearWallDist-wave/README
+++ b/applications/test/nearWallDist-wave/README
@@ -1,5 +1,7 @@
-testWallDist.C: calculate distance to wall and reflection vectors.
+Test-WallDist.C:
+    calculate distance to wall and reflection vectors.
 
-testWallDist2.C: for debugging: same but do explicit iterations and dump every
-timestep.
+Test-WallDist2.C:
+    for debugging: same but do explicit iterations and dump every
+    timestep.
 
diff --git a/applications/test/nearWallDist-wave/testWallDist.C b/applications/test/nearWallDist-wave/Test-WallDist.C
similarity index 99%
rename from applications/test/nearWallDist-wave/testWallDist.C
rename to applications/test/nearWallDist-wave/Test-WallDist.C
index d351141bdc226131849b43a83617ed7759d717aa..bbe9e3411b4ba9fea8fa74a2298d68e7535b5201 100644
--- a/applications/test/nearWallDist-wave/testWallDist.C
+++ b/applications/test/nearWallDist-wave/Test-WallDist.C
@@ -89,14 +89,11 @@ int main(int argc, char *argv[])
     y.correct();
 
     y.write();
-    
+
 
     Info<< "End\n" << endl;
 
     return 0;
-
-
-
 }
 
 
diff --git a/applications/test/nearWallDist-wave/testWallDist2.C b/applications/test/nearWallDist-wave/Test-WallDist2.C
similarity index 100%
rename from applications/test/nearWallDist-wave/testWallDist2.C
rename to applications/test/nearWallDist-wave/Test-WallDist2.C
diff --git a/applications/test/nearWallDist-wave/testWallDistData.C b/applications/test/nearWallDist-wave/Test-WallDistData.C
similarity index 99%
rename from applications/test/nearWallDist-wave/testWallDistData.C
rename to applications/test/nearWallDist-wave/Test-WallDistData.C
index 8f37e90b6a1cb8ae6c5f8d3db024986f12625f5d..94b92f08cb2371d71e5a71dfb04232f7bc2c6fc9 100644
--- a/applications/test/nearWallDist-wave/testWallDistData.C
+++ b/applications/test/nearWallDist-wave/Test-WallDistData.C
@@ -121,7 +121,7 @@ int main(int argc, char *argv[])
 
     y.write();
     y.data().write();
-    
+
 
     Info<< "End\n" << endl;
 
diff --git a/applications/test/nearWallDist-wave/testYPlus.C b/applications/test/nearWallDist-wave/Test-YPlus.C
similarity index 100%
rename from applications/test/nearWallDist-wave/testYPlus.C
rename to applications/test/nearWallDist-wave/Test-YPlus.C
diff --git a/applications/test/pTraits/Make/files b/applications/test/pTraits/Make/files
index 430cd299df69a5fa274cb548da2f6e84f680d390..7cebcf09d9b0378495196ec2e41902aeb857e635 100644
--- a/applications/test/pTraits/Make/files
+++ b/applications/test/pTraits/Make/files
@@ -1,2 +1,2 @@
-pTraitsTest.C
+Test-pTraits.C
 EXE = $(FOAM_USER_APPBIN)/pTraits
diff --git a/applications/test/pTraits/pTraitsTest.C b/applications/test/pTraits/Test-pTraits.C
similarity index 100%
rename from applications/test/pTraits/pTraitsTest.C
rename to applications/test/pTraits/Test-pTraits.C
diff --git a/applications/test/parallel/Make/files b/applications/test/parallel/Make/files
index 8abb292dd0563d4db5d4bb8e55c670d2a52a7f5e..f5dfb2e4ac6c5320ab4a066c385061a77ee8027f 100644
--- a/applications/test/parallel/Make/files
+++ b/applications/test/parallel/Make/files
@@ -1,3 +1,3 @@
-parallelTest.C  
+Test-parallel.C
 
-EXE = $(FOAM_USER_APPBIN)/parallelTest
+EXE = $(FOAM_USER_APPBIN)/Test-parallel
diff --git a/applications/test/parallel/parallelTest.C b/applications/test/parallel/Test-parallel.C
similarity index 100%
rename from applications/test/parallel/parallelTest.C
rename to applications/test/parallel/Test-parallel.C
diff --git a/applications/test/passiveParticle/Make/files b/applications/test/passiveParticle/Make/files
index 1a93cde7a33102e063006fafb51cdf51757ef47e..43afc0805510a1e6ae9c2d45bac3360eeb957bfe 100644
--- a/applications/test/passiveParticle/Make/files
+++ b/applications/test/passiveParticle/Make/files
@@ -1,4 +1,3 @@
+Test-passiveParticle.C
 
-passiveParticleTest.C
-
-EXE = $(FOAM_USER_APPBIN)/passiveParticleTest
+EXE = $(FOAM_USER_APPBIN)/Test-passiveParticle
diff --git a/applications/test/passiveParticle/Make/options b/applications/test/passiveParticle/Make/options
index ca034169554b9f83b8defb8c62f85d1df0068be6..74e2ec1cfa89ed58f22f3549a7dd3266abcc927d 100644
--- a/applications/test/passiveParticle/Make/options
+++ b/applications/test/passiveParticle/Make/options
@@ -1,4 +1,5 @@
 EXE_INC = \
+    -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude
 
diff --git a/applications/test/passiveParticle/passiveParticleTest.C b/applications/test/passiveParticle/Test-passiveParticle.C
similarity index 100%
rename from applications/test/passiveParticle/passiveParticleTest.C
rename to applications/test/passiveParticle/Test-passiveParticle.C
diff --git a/applications/test/pointField/Make/files b/applications/test/pointField/Make/files
index 29c2ead604d5db4643a4bdf4098d6d062d8d1aa6..7411537dca68f63c9ff96def182be631436c3e6d 100644
--- a/applications/test/pointField/Make/files
+++ b/applications/test/pointField/Make/files
@@ -1,4 +1,3 @@
+Test-PointField.C
 
-testPointField.C
-
-EXE = $(FOAM_USER_APPBIN)/pointField
+EXE = $(FOAM_USER_APPBIN)/Test-pointField
diff --git a/applications/test/pointField/testPointField.C b/applications/test/pointField/Test-PointField.C
similarity index 100%
rename from applications/test/pointField/testPointField.C
rename to applications/test/pointField/Test-PointField.C
diff --git a/applications/test/prefixOSstream/Make/files b/applications/test/prefixOSstream/Make/files
index 576d23c827b49d4ad69a611f5a34a6e8a51d3c3f..89b935d16d975eeef9617f6060fe0c53d1cabf3e 100644
--- a/applications/test/prefixOSstream/Make/files
+++ b/applications/test/prefixOSstream/Make/files
@@ -1,3 +1,3 @@
-prefixOSstreamTest.C
+Test-prefixOSstream.C
 
-EXE = $(FOAM_USER_APPBIN)/prefixOSstreamTest
+EXE = $(FOAM_USER_APPBIN)/Test-prefixOSstream
diff --git a/applications/test/prefixOSstream/prefixOSstreamTest.C b/applications/test/prefixOSstream/Test-prefixOSstream.C
similarity index 100%
rename from applications/test/prefixOSstream/prefixOSstreamTest.C
rename to applications/test/prefixOSstream/Test-prefixOSstream.C
diff --git a/applications/test/primitivePatch/Make/files b/applications/test/primitivePatch/Make/files
index 9b7ce02abfbb5096f86946b23a68c2cbf45f0714..448f29c5ffa3cdafe34f209e28375e6575e0f347 100644
--- a/applications/test/primitivePatch/Make/files
+++ b/applications/test/primitivePatch/Make/files
@@ -1,3 +1,3 @@
-testPrimitivePatch.C
+Test-PrimitivePatch.C
 
-EXE = $(FOAM_USER_APPBIN)/testPrimitivePatch
+EXE = $(FOAM_USER_APPBIN)/Test-PrimitivePatch
diff --git a/applications/test/primitivePatch/testPrimitivePatch.C b/applications/test/primitivePatch/Test-PrimitivePatch.C
similarity index 100%
rename from applications/test/primitivePatch/testPrimitivePatch.C
rename to applications/test/primitivePatch/Test-PrimitivePatch.C
diff --git a/applications/test/quaternion/Make/files b/applications/test/quaternion/Make/files
index a6d9519c2c50935cb33ed6425551e04221db2806..a12813a90714d920bde1688e3f4c192e03d78293 100644
--- a/applications/test/quaternion/Make/files
+++ b/applications/test/quaternion/Make/files
@@ -1,3 +1,3 @@
-quaternionTest.C
+Test-quaternion.C
 
-EXE = $(FOAM_USER_APPBIN)/quaternionTest
+EXE = $(FOAM_USER_APPBIN)/Test-quaternion
diff --git a/applications/test/quaternion/quaternionTest.C b/applications/test/quaternion/Test-quaternion.C
similarity index 100%
rename from applications/test/quaternion/quaternionTest.C
rename to applications/test/quaternion/Test-quaternion.C
diff --git a/applications/test/readCHEMKINIII/Make/files b/applications/test/readCHEMKINIII/Make/files
index a65451170711228a76627f66156e84e841a4f785..d20b7df0ddb42121d8462f912678664176507d99 100644
--- a/applications/test/readCHEMKINIII/Make/files
+++ b/applications/test/readCHEMKINIII/Make/files
@@ -1,3 +1,3 @@
-readCHEMKINIII.C
+Test-readCHEMKINIII.C
 
-EXE = $(FOAM_USER_APPBIN)/readCHEMKINIII
+EXE = $(FOAM_USER_APPBIN)/Test-readCHEMKINIII
diff --git a/applications/test/readCHEMKINIII/readCHEMKINIII.C b/applications/test/readCHEMKINIII/Test-readCHEMKINIII.C
similarity index 100%
rename from applications/test/readCHEMKINIII/readCHEMKINIII.C
rename to applications/test/readCHEMKINIII/Test-readCHEMKINIII.C
diff --git a/applications/test/regex/Make/files b/applications/test/regex/Make/files
index 901da54f0744fcd30dc7985f398d8831fb6e750f..28fa008d1fc27f9de562ea53d43c31496c673fe0 100644
--- a/applications/test/regex/Make/files
+++ b/applications/test/regex/Make/files
@@ -1,3 +1,3 @@
-regexTest.C
+Test-regex.C
 
-EXE = $(FOAM_USER_APPBIN)/regexTest
+EXE = $(FOAM_USER_APPBIN)/Test-regex
diff --git a/applications/test/regex/regexTest.C b/applications/test/regex/Test-regex.C
similarity index 100%
rename from applications/test/regex/regexTest.C
rename to applications/test/regex/Test-regex.C
diff --git a/applications/test/router/Make/files b/applications/test/router/Make/files
index 8a484c171d86f79e35c12ede65c894c227bdbbe1..80ac68cc2a462464640b9225e44ab6677688a8fd 100644
--- a/applications/test/router/Make/files
+++ b/applications/test/router/Make/files
@@ -1,4 +1,4 @@
 router.C
-processorRouter.C
+Test-processorRouter.C
 
-EXE = $(FOAM_USER_APPBIN)/processorRouter
+EXE = $(FOAM_USER_APPBIN)/Test-processorRouter
diff --git a/applications/test/router/processorRouter.C b/applications/test/router/Test-processorRouter.C
similarity index 100%
rename from applications/test/router/processorRouter.C
rename to applications/test/router/Test-processorRouter.C
diff --git a/applications/test/sha1/Make/files b/applications/test/sha1/Make/files
index 2da85a30dd748d9320273e20d5e8d596c1296d71..c46836443a7ae9a9a5e804118c9738c4b2ca2204 100644
--- a/applications/test/sha1/Make/files
+++ b/applications/test/sha1/Make/files
@@ -1,3 +1,3 @@
-testSHA1.C
+Test-SHA1.C
 
-EXE = $(FOAM_USER_APPBIN)/testSHA1
+EXE = $(FOAM_USER_APPBIN)/Test-SHA1
diff --git a/applications/test/sha1/testSHA1.C b/applications/test/sha1/Test-SHA1.C
similarity index 100%
rename from applications/test/sha1/testSHA1.C
rename to applications/test/sha1/Test-SHA1.C
diff --git a/applications/test/simpleMatrix/Make/files b/applications/test/simpleMatrix/Make/files
index 58409540622c4f1d05f03273a9a186ed7bdbbf81..2b80bbe4f7fbfb775cd6c5b2cda26ae02cd7eee3 100644
--- a/applications/test/simpleMatrix/Make/files
+++ b/applications/test/simpleMatrix/Make/files
@@ -1,3 +1,3 @@
-simpleMatrixTest.C
+Test-simpleMatrix.C
 
 EXE = $(FOAM_USER_APPBIN)/simpleMatrix
diff --git a/applications/test/simpleMatrix/simpleMatrixTest.C b/applications/test/simpleMatrix/Test-simpleMatrix.C
similarity index 100%
rename from applications/test/simpleMatrix/simpleMatrixTest.C
rename to applications/test/simpleMatrix/Test-simpleMatrix.C
diff --git a/applications/test/sizeof/Make/files b/applications/test/sizeof/Make/files
index c0a650baca65dd55c5da7ea3880d9f70b3712ce0..e490d043f98f662abb29fbf6e49d22378a6f7bcd 100644
--- a/applications/test/sizeof/Make/files
+++ b/applications/test/sizeof/Make/files
@@ -1,3 +1,3 @@
-sizeofTest.C
+Test-sizeof.C
 
-EXE = $(FOAM_USER_APPBIN)/sizeofTest
+EXE = $(FOAM_USER_APPBIN)/Test-sizeof
diff --git a/applications/test/sizeof/sizeofTest.C b/applications/test/sizeof/Test-sizeof.C
similarity index 100%
rename from applications/test/sizeof/sizeofTest.C
rename to applications/test/sizeof/Test-sizeof.C
diff --git a/applications/test/slicedField/Make/files b/applications/test/slicedField/Make/files
index e2072db0606d02a95aa5f938e737414f329d677f..e9a7766f8f91422af3676e39a89222d8ab815235 100644
--- a/applications/test/slicedField/Make/files
+++ b/applications/test/slicedField/Make/files
@@ -1,3 +1,3 @@
-slicedFieldTest.C  
+Test-slicedField.C
 
-EXE = $(FOAM_USER_APPBIN)/slicedFieldTest
+EXE = $(FOAM_USER_APPBIN)/Test-slicedField
diff --git a/applications/test/slicedField/slicedFieldTest.C b/applications/test/slicedField/Test-slicedField.C
similarity index 100%
rename from applications/test/slicedField/slicedFieldTest.C
rename to applications/test/slicedField/Test-slicedField.C
diff --git a/applications/test/sort/Make/files b/applications/test/sort/Make/files
index 8440d05c1d1d56e114e0e5a1850903dcdae7ffdc..cbd72e0260b297a69487c8ba937c2db534b8dd6f 100644
--- a/applications/test/sort/Make/files
+++ b/applications/test/sort/Make/files
@@ -1,3 +1,3 @@
-sortListTest.C
+Test-sortList.C
 
-EXE = $(FOAM_USER_APPBIN)/sortListTest
+EXE = $(FOAM_USER_APPBIN)/Test-sortList
diff --git a/applications/test/sort/sortListTest.C b/applications/test/sort/Test-sortList.C
similarity index 100%
rename from applications/test/sort/sortListTest.C
rename to applications/test/sort/Test-sortList.C
diff --git a/applications/test/speed/scalarSpeed/Make/files b/applications/test/speed/scalarSpeed/Make/files
new file mode 100644
index 0000000000000000000000000000000000000000..bc4e6706b52034bad893e02b88d881b0a05a36b5
--- /dev/null
+++ b/applications/test/speed/scalarSpeed/Make/files
@@ -0,0 +1,3 @@
+Test-scalarSpeed.C
+
+EXE = $(FOAM_USER_APPBIN)/Test-scalarSpeed
diff --git a/applications/test/speed/scalarSpeedTest/Make/options b/applications/test/speed/scalarSpeed/Make/options
similarity index 100%
rename from applications/test/speed/scalarSpeedTest/Make/options
rename to applications/test/speed/scalarSpeed/Make/options
diff --git a/applications/test/speed/scalarSpeedTest/scalarSpeedTest.C b/applications/test/speed/scalarSpeed/Test-scalarSpeed.C
similarity index 100%
rename from applications/test/speed/scalarSpeedTest/scalarSpeedTest.C
rename to applications/test/speed/scalarSpeed/Test-scalarSpeed.C
diff --git a/applications/test/speed/scalarSpeedTest/Make/files b/applications/test/speed/scalarSpeedTest/Make/files
deleted file mode 100644
index dae64db89f8cb8366067016721994cf8b3d09b82..0000000000000000000000000000000000000000
--- a/applications/test/speed/scalarSpeedTest/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-scalarSpeedTest.C
-
-EXE = $(FOAM_USER_APPBIN)/scalarSpeedTest
diff --git a/applications/test/speed/vectorSpeed/Make/files b/applications/test/speed/vectorSpeed/Make/files
new file mode 100644
index 0000000000000000000000000000000000000000..b2344b77602bf8c22999618683fe4f35908b6df6
--- /dev/null
+++ b/applications/test/speed/vectorSpeed/Make/files
@@ -0,0 +1,3 @@
+Test-vectorSpeed.C
+
+EXE = $(FOAM_USER_APPBIN)/Test-vectorSpeed
diff --git a/applications/test/speed/vectorSpeedTest/Make/options b/applications/test/speed/vectorSpeed/Make/options
similarity index 100%
rename from applications/test/speed/vectorSpeedTest/Make/options
rename to applications/test/speed/vectorSpeed/Make/options
diff --git a/applications/test/speed/vectorSpeedTest/vectorSpeedTest.C b/applications/test/speed/vectorSpeed/Test-vectorSpeed.C
similarity index 100%
rename from applications/test/speed/vectorSpeedTest/vectorSpeedTest.C
rename to applications/test/speed/vectorSpeed/Test-vectorSpeed.C
diff --git a/applications/test/speed/vectorSpeedTest/Make/files b/applications/test/speed/vectorSpeedTest/Make/files
deleted file mode 100644
index ccb0187615ed49e981498b9ad532c2f7b7b55326..0000000000000000000000000000000000000000
--- a/applications/test/speed/vectorSpeedTest/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-vectorSpeedTest.C
-
-EXE = $(FOAM_USER_APPBIN)/vectorSpeedTest
diff --git a/applications/test/sphericalTensorField/Make/files b/applications/test/sphericalTensorField/Make/files
index 12d2faa1bec95ed3ae243d55371e0625c4282335..93a6442d5e0408afefe686b6c56e0d8e36e422de 100644
--- a/applications/test/sphericalTensorField/Make/files
+++ b/applications/test/sphericalTensorField/Make/files
@@ -1,3 +1,3 @@
-sphericalTensorFieldTest.C
+Test-sphericalTensorField.C
 
-EXE = $(FOAM_USER_APPBIN)/sphericalTensorFieldTest
+EXE = $(FOAM_USER_APPBIN)/Test-sphericalTensorField
diff --git a/applications/test/sphericalTensorField/sphericalTensorFieldTest.C b/applications/test/sphericalTensorField/Test-sphericalTensorField.C
similarity index 100%
rename from applications/test/sphericalTensorField/sphericalTensorFieldTest.C
rename to applications/test/sphericalTensorField/Test-sphericalTensorField.C
diff --git a/applications/test/spline/Make/files b/applications/test/spline/Make/files
index 68f1cca99422ffe7cb5488a5e664692702129d1e..56acc328ec398430832f35cca9622239d4f1ccde 100644
--- a/applications/test/spline/Make/files
+++ b/applications/test/spline/Make/files
@@ -1,3 +1,3 @@
-splineTest.C
+Test-spline.C
 
-EXE = $(FOAM_USER_APPBIN)/splineTest
+EXE = $(FOAM_USER_APPBIN)/Test-spline
diff --git a/applications/test/spline/splineTest.C b/applications/test/spline/Test-spline.C
similarity index 100%
rename from applications/test/spline/splineTest.C
rename to applications/test/spline/Test-spline.C
diff --git a/applications/test/string/Make/files b/applications/test/string/Make/files
index 32363bd45a5c3814ab2d861539bc3245cee86f00..2bcadc321813039aba74c8543b0bf030cd1f7206 100644
--- a/applications/test/string/Make/files
+++ b/applications/test/string/Make/files
@@ -1,3 +1,3 @@
-stringTest.C
+Test-string.C
 
-EXE = $(FOAM_USER_APPBIN)/stringTest
+EXE = $(FOAM_USER_APPBIN)/Test-string
diff --git a/applications/test/string/stringTest.C b/applications/test/string/Test-string.C
similarity index 100%
rename from applications/test/string/stringTest.C
rename to applications/test/string/Test-string.C
diff --git a/applications/test/stringList/Make/files b/applications/test/stringList/Make/files
index a9461cc16ef00760c0d92471cc7635e51cd2cae0..bcfa35a1f00ddaff0ce9a3d2552714432d0f0835 100644
--- a/applications/test/stringList/Make/files
+++ b/applications/test/stringList/Make/files
@@ -1,3 +1,3 @@
-stringListTest.C
+Test-stringList.C
 
-EXE = $(FOAM_USER_APPBIN)/stringListTest
+EXE = $(FOAM_USER_APPBIN)/Test-stringList
diff --git a/applications/test/stringList/stringListTest.C b/applications/test/stringList/Test-stringList.C
similarity index 100%
rename from applications/test/stringList/stringListTest.C
rename to applications/test/stringList/Test-stringList.C
diff --git a/applications/test/symmTensorField/Make/files b/applications/test/symmTensorField/Make/files
index 89f301b0747dcce254a8d34c9329c9a773358dde..5759a13d3af72a77835a598e8a090f08ef161134 100644
--- a/applications/test/symmTensorField/Make/files
+++ b/applications/test/symmTensorField/Make/files
@@ -1,3 +1,3 @@
-symmTensorFieldTest.C
+Test-symmTensorField.C
 
-EXE = $(FOAM_USER_APPBIN)/symmTensorFieldTest
+EXE = $(FOAM_USER_APPBIN)/Test-symmTensorField
diff --git a/applications/test/symmTensorField/symmTensorFieldTest.C b/applications/test/symmTensorField/Test-symmTensorField.C
similarity index 100%
rename from applications/test/symmTensorField/symmTensorFieldTest.C
rename to applications/test/symmTensorField/Test-symmTensorField.C
diff --git a/applications/test/syncTools/Make/files b/applications/test/syncTools/Make/files
index 6a186ca84a47161b8b78d18cb54dd97ce62be951..a9c9a0e01367398b6e11ceb0b50793838fd5b485 100644
--- a/applications/test/syncTools/Make/files
+++ b/applications/test/syncTools/Make/files
@@ -1,3 +1,3 @@
-syncToolsTest.C
+Test-syncTools.C
 
-EXE = $(FOAM_USER_APPBIN)/syncToolsTest
+EXE = $(FOAM_USER_APPBIN)/Test-syncTools
diff --git a/applications/test/syncTools/syncToolsTest.C b/applications/test/syncTools/Test-syncTools.C
similarity index 96%
rename from applications/test/syncTools/syncToolsTest.C
rename to applications/test/syncTools/Test-syncTools.C
index fa4351326accfda29259f66f7f9b3b599de9e310..abf7e72a63e966a826b95e86fc05128309c97953 100644
--- a/applications/test/syncTools/syncToolsTest.C
+++ b/applications/test/syncTools/Test-syncTools.C
@@ -62,7 +62,7 @@ void testPackedList(const polyMesh& mesh, Random& rndGen)
         labelList maxEdgeValues(edgeValues);
 
         syncTools::syncEdgeList(mesh, bits, minEqOp<unsigned int>(), 0);
-        syncTools::syncEdgeList(mesh, edgeValues, minEqOp<label>(), 0, false);
+        syncTools::syncEdgeList(mesh, edgeValues, minEqOp<label>(), 0);
 
         syncTools::syncEdgeList(mesh, maxBits, maxEqOp<unsigned int>(), 0);
         syncTools::syncEdgeList
@@ -70,8 +70,7 @@ void testPackedList(const polyMesh& mesh, Random& rndGen)
             mesh,
             maxEdgeValues,
             maxEqOp<label>(),
-            0,
-            false
+            0
         );
 
         forAll(bits, i)
@@ -110,7 +109,7 @@ void testPackedList(const polyMesh& mesh, Random& rndGen)
         labelList maxPointValues(pointValues);
 
         syncTools::syncPointList(mesh, bits, minEqOp<unsigned int>(), 0);
-        syncTools::syncPointList(mesh, pointValues, minEqOp<label>(), 0, false);
+        syncTools::syncPointList(mesh, pointValues, minEqOp<label>(), 0);
 
         syncTools::syncPointList(mesh, maxBits, maxEqOp<unsigned int>(), 0);
         syncTools::syncPointList
@@ -118,8 +117,7 @@ void testPackedList(const polyMesh& mesh, Random& rndGen)
             mesh,
             maxPointValues,
             maxEqOp<label>(),
-            0,
-            false
+            0
         );
 
         forAll(bits, i)
@@ -158,10 +156,10 @@ void testPackedList(const polyMesh& mesh, Random& rndGen)
         labelList maxFaceValues(faceValues);
 
         syncTools::syncFaceList(mesh, bits, minEqOp<unsigned int>());
-        syncTools::syncFaceList(mesh, faceValues, minEqOp<label>(), false);
+        syncTools::syncFaceList(mesh, faceValues, minEqOp<label>());
 
         syncTools::syncFaceList(mesh, maxBits, maxEqOp<unsigned int>());
-        syncTools::syncFaceList(mesh, maxFaceValues, maxEqOp<label>(), false);
+        syncTools::syncFaceList(mesh, maxFaceValues, maxEqOp<label>());
 
         forAll(bits, faceI)
         {
@@ -225,16 +223,16 @@ void testSparseData(const polyMesh& mesh, Random& rndGen)
         (
             mesh,
             sparseData,
-            minEqOp<vector>(),
-            true                    // apply separation
+            minEqOp<vector>()
+            // true                    // apply separation
         );
         syncTools::syncPointList
         (
             mesh,
             fullData,
             minEqOp<vector>(),
-            point::max,
-            true                    // apply separation
+            point::max
+            // true                    // apply separation
         );
 
         // Compare.
@@ -310,16 +308,14 @@ void testSparseData(const polyMesh& mesh, Random& rndGen)
         (
             mesh,
             sparseData,
-            minEqOp<vector>(),
-            true
+            minEqOp<vector>()
         );
         syncTools::syncEdgeList
         (
             mesh,
             fullData,
             minEqOp<vector>(),
-            point::max,
-            true
+            point::max
         );
 
         // Compare.
@@ -388,8 +384,7 @@ void testPointSync(const polyMesh& mesh, Random& rndGen)
             mesh,
             syncedPoints,
             minEqOp<point>(),
-            point::max,
-            true
+            point::max
         );
 
         forAll(syncedPoints, pointI)
@@ -425,8 +420,7 @@ void testPointSync(const polyMesh& mesh, Random& rndGen)
             mesh,
             nMasters,
             plusEqOp<label>(),
-            0,
-            false
+            0
         );
 
         forAll(nMasters, pointI)
@@ -470,8 +464,7 @@ void testEdgeSync(const polyMesh& mesh, Random& rndGen)
             mesh,
             syncedMids,
             minEqOp<point>(),
-            point::max,
-            true
+            point::max
         );
 
         forAll(syncedMids, edgeI)
@@ -509,8 +502,7 @@ void testEdgeSync(const polyMesh& mesh, Random& rndGen)
             mesh,
             nMasters,
             plusEqOp<label>(),
-            0,
-            false
+            0
         );
 
         forAll(nMasters, edgeI)
@@ -544,8 +536,7 @@ void testFaceSync(const polyMesh& mesh, Random& rndGen)
         (
             mesh,
             syncedFc,
-            maxEqOp<point>(),
-            true
+            maxEqOp<point>()
         );
 
         forAll(syncedFc, faceI)
@@ -580,8 +571,7 @@ void testFaceSync(const polyMesh& mesh, Random& rndGen)
         (
             mesh,
             nMasters,
-            plusEqOp<label>(),
-            false
+            plusEqOp<label>()
         );
 
         forAll(nMasters, faceI)
diff --git a/applications/test/tensor/Make/files b/applications/test/tensor/Make/files
index d772d61629c129a170ccf351ae7eaac9d485dc21..34d6a3cdac831555f1ba7a2bef1cd85911f9eee3 100644
--- a/applications/test/tensor/Make/files
+++ b/applications/test/tensor/Make/files
@@ -1,3 +1,3 @@
-tensorTest.C
+Test-tensor.C
 
-EXE = $(FOAM_USER_APPBIN)/tensorTest
+EXE = $(FOAM_USER_APPBIN)/Test-tensor
diff --git a/applications/test/tensor/tensorTest.C b/applications/test/tensor/Test-tensor.C
similarity index 100%
rename from applications/test/tensor/tensorTest.C
rename to applications/test/tensor/Test-tensor.C
diff --git a/applications/test/testPointEdgeWave/Make/files b/applications/test/testPointEdgeWave/Make/files
deleted file mode 100644
index 7f30bf0c2341e60838a79e44985e3af0cd02f099..0000000000000000000000000000000000000000
--- a/applications/test/testPointEdgeWave/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-testPointEdgeWave.C
-
-EXE = $(FOAM_USER_APPBIN)/testPointEdgeWave
diff --git a/applications/test/tmpField/Make/files b/applications/test/tmpField/Make/files
index b7dfa692c2d91b9c4c865c96ad636f31c946199d..c3dd60a71d4341fca31f7d0844d45ae9ea806cab 100644
--- a/applications/test/tmpField/Make/files
+++ b/applications/test/tmpField/Make/files
@@ -1,3 +1,3 @@
-tmpFieldTest.C
+Test-tmpField.C
 
-EXE = $(FOAM_USER_APPBIN)/tmpFieldTest
+EXE = $(FOAM_USER_APPBIN)/Test-tmpField
diff --git a/applications/test/tmpField/tmpFieldTest.C b/applications/test/tmpField/Test-tmpField.C
similarity index 99%
rename from applications/test/tmpField/tmpFieldTest.C
rename to applications/test/tmpField/Test-tmpField.C
index 63484dea1f049a13ad21e2ebc0163e182c50595a..96e730b409a943a85d4bc1e9669a2279b4e8cd51 100644
--- a/applications/test/tmpField/tmpFieldTest.C
+++ b/applications/test/tmpField/Test-tmpField.C
@@ -50,4 +50,3 @@ int main()
 
 
 // ************************************************************************* //
-
diff --git a/applications/test/tokenize/Make/files b/applications/test/tokenize/Make/files
new file mode 100644
index 0000000000000000000000000000000000000000..b4ce91199e0a0c643edb33deecb48f14a7a9dc3d
--- /dev/null
+++ b/applications/test/tokenize/Make/files
@@ -0,0 +1,3 @@
+Test-tokenize.C
+
+EXE = $(FOAM_USER_APPBIN)/Test-tokenize
diff --git a/applications/test/tokenizeTest/Make/options b/applications/test/tokenize/Make/options
similarity index 99%
rename from applications/test/tokenizeTest/Make/options
rename to applications/test/tokenize/Make/options
index 42da6e3418f64171b60f83c5767d23ecbcd81fb6..971e4950d93f72f25fe4c1856321e4cf13277417 100644
--- a/applications/test/tokenizeTest/Make/options
+++ b/applications/test/tokenize/Make/options
@@ -4,4 +4,3 @@
 
 EXE_INC = \
     -DFULLDEBUG -g -O0
-
diff --git a/applications/test/tokenizeTest/tokenizeTest.C b/applications/test/tokenize/Test-tokenize.C
similarity index 100%
rename from applications/test/tokenizeTest/tokenizeTest.C
rename to applications/test/tokenize/Test-tokenize.C
diff --git a/applications/test/tokenizeTest/Make/files b/applications/test/tokenizeTest/Make/files
deleted file mode 100644
index c2db390007cb8246862d367596c52c55e9793b00..0000000000000000000000000000000000000000
--- a/applications/test/tokenizeTest/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-tokenizeTest.C
-
-EXE = $(FOAM_USER_APPBIN)/tokenizeTest
diff --git a/applications/test/triTet/Make/files b/applications/test/triTet/Make/files
index d1e128ece96dcec9d04a84ad46fdbbd77df0dff4..c00f7ea53f1a1f9f115cf531c29970d1459b2213 100644
--- a/applications/test/triTet/Make/files
+++ b/applications/test/triTet/Make/files
@@ -1,3 +1,3 @@
-triTet.C
+Test-triTet.C
 
-EXE = $(FOAM_USER_APPBIN)/triTet
\ No newline at end of file
+EXE = $(FOAM_USER_APPBIN)/Test-triTet
diff --git a/applications/test/triTet/triTet.C b/applications/test/triTet/Test-triTet.C
similarity index 100%
rename from applications/test/triTet/triTet.C
rename to applications/test/triTet/Test-triTet.C
diff --git a/applications/test/vector/Make/files b/applications/test/vector/Make/files
index 95cdf62b07c80f042a2be714db53d2a8e5982026..62f06825eaea118c5850244641d6f8c1fcbaa81b 100644
--- a/applications/test/vector/Make/files
+++ b/applications/test/vector/Make/files
@@ -1,3 +1,3 @@
-vectorTest.C
+Test-vector.C
 
-EXE = $(FOAM_USER_APPBIN)/vectorTest
+EXE = $(FOAM_USER_APPBIN)/Test-vector
diff --git a/applications/test/vector/vectorTest.C b/applications/test/vector/Test-vector.C
similarity index 100%
rename from applications/test/vector/vectorTest.C
rename to applications/test/vector/Test-vector.C
diff --git a/applications/test/volField/Make/files b/applications/test/volField/Make/files
index 5b609d3ed056cacd71c3c0f9f89728585862adba..e442aa0a7cbb9b360c8e6fedbed771f106188303 100644
--- a/applications/test/volField/Make/files
+++ b/applications/test/volField/Make/files
@@ -1,3 +1,3 @@
-volFieldTest.C  
+Test-volField.C
 
-EXE = $(FOAM_USER_APPBIN)/volFieldTest
+EXE = $(FOAM_USER_APPBIN)/Test-volField
diff --git a/applications/test/volField/volFieldTest.C b/applications/test/volField/Test-volField.C
similarity index 100%
rename from applications/test/volField/volFieldTest.C
rename to applications/test/volField/Test-volField.C
diff --git a/applications/test/volPointInterpolation/Make/files b/applications/test/volPointInterpolation/Make/files
index 7dbcacf32df754ac4e5cf6e36005d1835dbb0b7f..3d6449e0164d7878587731c2d0029513a3e2f7ff 100644
--- a/applications/test/volPointInterpolation/Make/files
+++ b/applications/test/volPointInterpolation/Make/files
@@ -1,3 +1,3 @@
-volPointInterpolationTest.C
+Test-volPointInterpolation.C
 
-EXE = $(FOAM_USER_APPBIN)/volPointInterpolationTest
+EXE = $(FOAM_USER_APPBIN)/Test-volPointInterpolation
diff --git a/applications/test/volPointInterpolation/volPointInterpolationTest.C b/applications/test/volPointInterpolation/Test-volPointInterpolation.C
similarity index 100%
rename from applications/test/volPointInterpolation/volPointInterpolationTest.C
rename to applications/test/volPointInterpolation/Test-volPointInterpolation.C
diff --git a/applications/test/wordRe/Make/files b/applications/test/wordRe/Make/files
index 1cb69f314c01a13d96f92e27f14c1c9ccde1b47b..b22ac6da4cfee1e0cff2eec83ce1102cd5102aa0 100644
--- a/applications/test/wordRe/Make/files
+++ b/applications/test/wordRe/Make/files
@@ -1,3 +1,3 @@
-wordReTest.C
+Test-wordRe.C
 
-EXE = $(FOAM_USER_APPBIN)/wordReTest
+EXE = $(FOAM_USER_APPBIN)/Test-wordRe
diff --git a/applications/test/wordRe/wordReTest.C b/applications/test/wordRe/Test-wordRe.C
similarity index 100%
rename from applications/test/wordRe/wordReTest.C
rename to applications/test/wordRe/Test-wordRe.C
diff --git a/applications/test/xfer/Make/files b/applications/test/xfer/Make/files
index d3c1cd8ac2d9e9ca3068acd88f5d079a2bcd82ac..bbe20a4c7ef003a845f11774d089102f5f3dbf43 100644
--- a/applications/test/xfer/Make/files
+++ b/applications/test/xfer/Make/files
@@ -1,3 +1,3 @@
-xferListTest.C
+Test-xferList.C
 
-EXE = $(FOAM_USER_APPBIN)/xferListTest
+EXE = $(FOAM_USER_APPBIN)/Test-xferList
diff --git a/applications/test/xfer/xferListTest.C b/applications/test/xfer/Test-xferList.C
similarity index 100%
rename from applications/test/xfer/xferListTest.C
rename to applications/test/xfer/Test-xferList.C
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMesh.C b/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMesh.C
index f64f43b5420fb257a2203861e55fa7a4462c4d8f..da1573bf77c57cc97633b08b012e85693042d98e 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMesh.C
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMesh.C
@@ -148,6 +148,8 @@ Foam::vtkPV3blockMesh::vtkPV3blockMesh
     reader_(reader),
     dbPtr_(NULL),
     meshPtr_(NULL),
+    meshRegion_(polyMesh::defaultRegion),
+    meshDir_(polyMesh::meshSubDir),
     arrayRangeBlocks_("block"),
     arrayRangeEdges_("edges"),
     arrayRangeCorners_("corners")
@@ -188,6 +190,28 @@ Foam::vtkPV3blockMesh::vtkPV3blockMesh
     // could be stringent and insist the prefix match the directory name...
     // Note: cannot use fileName::name() due to the embedded '{}'
     string caseName(fileName(FileName).lessExt());
+    string::size_type beg = caseName.find_last_of("/{");
+    string::size_type end = caseName.find('}', beg);
+
+    if
+    (
+        beg != string::npos && caseName[beg] == '{'
+     && end != string::npos && end == caseName.size()-1
+    )
+    {
+        meshRegion_ = caseName.substr(beg+1, end-beg-1);
+
+        // some safety
+        if (meshRegion_.empty())
+        {
+            meshRegion_ = polyMesh::defaultRegion;
+        }
+
+        if (meshRegion_ != polyMesh::defaultRegion)
+        {
+            meshDir_ = meshRegion_/polyMesh::meshSubDir;
+        }
+    }
 
     if (debug)
     {
@@ -313,7 +337,7 @@ void Foam::vtkPV3blockMesh::updateFoamMesh()
             (
                 "blockMeshDict",
                 dbPtr_().constant(),
-                polyMesh::meshSubDir,
+                meshDir_,
                 dbPtr_(),
                 IOobject::MUST_READ_IF_MODIFIED,
                 IOobject::NO_WRITE,
@@ -321,7 +345,7 @@ void Foam::vtkPV3blockMesh::updateFoamMesh()
             )
         );
 
-        meshPtr_ = new blockMesh(meshDict, polyMesh::defaultRegion);
+        meshPtr_ = new blockMesh(meshDict, meshRegion_);
     }
 
 
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMesh.H b/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMesh.H
index 33ed976bb81cce16a8c2cdd4aff82720182ab35d..cdbf4ad434a7d55d870f4830aab87f7210456aa7 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMesh.H
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMesh.H
@@ -173,6 +173,12 @@ class vtkPV3blockMesh
         //- OpenFOAM mesh
         blockMesh* meshPtr_;
 
+        //- The mesh region
+        word meshRegion_;
+
+        //- The mesh directory for the region
+        fileName meshDir_;
+
         //- Selected geometrical parts
         boolList blockStatus_;
 
diff --git a/src/OSspecific/POSIX/memInfo/memInfo.C b/src/OSspecific/POSIX/memInfo/memInfo.C
index ef76fe004ffc158d8ad5a9487c50ba2787a1be2e..0d593ee4dfe19281b9c1988428b8f2cdfb71c32f 100644
--- a/src/OSspecific/POSIX/memInfo/memInfo.C
+++ b/src/OSspecific/POSIX/memInfo/memInfo.C
@@ -47,6 +47,8 @@ Foam::memInfo::~memInfo()
 
 const Foam::memInfo& Foam::memInfo::update()
 {
+    // reset to invalid values first
+    peak_ = size_ = rss_ = -1;
     IFstream is("/proc/" + name(pid()) + "/status");
 
     while (is.good())
diff --git a/src/OSspecific/POSIX/memInfo/memInfo.H b/src/OSspecific/POSIX/memInfo/memInfo.H
index 73f614fea73168b9614286df4681f874088b3352..25f29b0164e684ba0885693ec1ec8cd6108c9644 100644
--- a/src/OSspecific/POSIX/memInfo/memInfo.H
+++ b/src/OSspecific/POSIX/memInfo/memInfo.H
@@ -27,6 +27,9 @@ Class
 Description
     Memory usage information for the process running this object.
 
+Note
+    Uses the information from /proc/\<pid\>/status
+
 SourceFiles
     memInfo.C
 
@@ -52,13 +55,13 @@ class memInfo
 {
     // Private data
 
-        //- Peak memory used by the process (VmPeak in /proc/<pid>/status)
+        //- Peak memory used by the process (VmPeak in /proc/\<pid\>/status)
         int peak_;
 
-        //- Memory used by the process (VmSize in /proc/<pid>/status)
+        //- Memory used by the process (VmSize in /proc/\<pid\>/status)
         int size_;
 
-        //- Resident set size of the process (VmRSS in /proc/<pid>/status)
+        //- Resident set size of the process (VmRSS in /proc/\<pid\>/status)
         int rss_;
 
 
@@ -76,24 +79,27 @@ public:
 
     // Member Functions
 
-        //- Parse /proc/<pid>/status
+        //- Parse /proc/\<pid\>/status
         const memInfo& update();
 
         // Access
 
-            //- Access the stored peak memory
+            //- Access the stored peak memory (VmPeak in /proc/\<pid\>/status)
+            //  The value is stored from the previous update()
             int peak() const
             {
                 return peak_;
             }
 
-            //- Access the stored memory size
+            //- Access the stored memory size (VmSize in /proc/\<pid\>/status)
+            //  The value is stored from the previous update()
             int size() const
             {
                 return size_;
             }
 
-            //- Access the stored rss value
+            //- Access the stored rss value (VmRSS in /proc/\<pid\>/status)
+            //  The value is stored from the previous update()
             int rss() const
             {
                 return rss_;
@@ -102,7 +108,10 @@ public:
 
     // IOstream Operators
 
+        //- Read peak/size/rss from stream
         friend Istream& operator>>(Istream&, memInfo&);
+
+        //- Write peak/size/rss to stream
         friend Ostream& operator<<(Ostream&, const memInfo&);
 };
 
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H
index e7838876858cd4e13b9e9d084a8e19524a1a6380..0df1ce848414e83f3398634f742651aad6c62c3c 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H
@@ -319,6 +319,62 @@ public:
                 }
             }
 
+            //- Reverse distribute data using default commsType.
+            //  Since constructSize might be larger than supplied size supply
+            //  a nullValue
+            template<class T>
+            void reverseDistribute
+            (
+                const label constructSize,
+                const T& nullValue,
+                List<T>& fld
+            )
+            const
+            {
+                if (Pstream::defaultCommsType == Pstream::nonBlocking)
+                {
+                    distribute
+                    (
+                        Pstream::nonBlocking,
+                        List<labelPair>(),
+                        constructSize,
+                        constructMap_,
+                        subMap_,
+                        fld,
+                        eqOp<T>(),
+                        nullValue
+                    );
+                }
+                else if (Pstream::defaultCommsType == Pstream::scheduled)
+                {
+                    distribute
+                    (
+                        Pstream::scheduled,
+                        schedule(),
+                        constructSize,
+                        constructMap_,
+                        subMap_,
+                        fld,
+                        eqOp<T>(),
+                        nullValue
+                    );
+                }
+                else
+                {
+                    distribute
+                    (
+                        Pstream::blocking,
+                        List<labelPair>(),
+                        constructSize,
+                        constructMap_,
+                        subMap_,
+                        fld,
+                        eqOp<T>(),
+                        nullValue
+                    );
+                }
+            }
+
             //- Do all sends using PstreamBuffers
             template<class T>
             void send(PstreamBuffers&, const List<T>&) const;
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C
index 443dbf502d984595664981ccffde17f85657efde..ef6c78299ea65e1985665aa241a364d2db84697d 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C
@@ -446,10 +446,11 @@ void Foam::mapDistribute::distribute
         const labelList& map = constructMap[Pstream::myProcNo()];
 
         field.setSize(constructSize);
+        field = nullValue;
 
         forAll(map, i)
         {
-            field[map[i]] = subField[i];
+            cop(field[map[i]], subField[i]);
         }
         return;
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedValue/directMappedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedValue/directMappedFixedValueFvPatchField.C
index 4dd232091d1897f3a5efdc64698173f630125a6f..0fb5b64b7806d332d0f54647e4311b75289aa93e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedValue/directMappedFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedValue/directMappedFixedValueFvPatchField.C
@@ -26,6 +26,7 @@ License
 #include "directMappedFixedValueFvPatchField.H"
 #include "directMappedPatchBase.H"
 #include "volFields.H"
+#include "interpolationCell.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -42,8 +43,10 @@ directMappedFixedValueFvPatchField<Type>::directMappedFixedValueFvPatchField
 )
 :
     fixedValueFvPatchField<Type>(p, iF),
+    fieldName_(iF.name()),
     setAverage_(false),
-    average_(pTraits<Type>::zero)
+    average_(pTraits<Type>::zero),
+    interpolationScheme_(interpolationCell<Type>::typeName)
 {}
 
 
@@ -57,8 +60,10 @@ directMappedFixedValueFvPatchField<Type>::directMappedFixedValueFvPatchField
 )
 :
     fixedValueFvPatchField<Type>(ptf, p, iF, mapper),
+    fieldName_(ptf.fieldName_),
     setAverage_(ptf.setAverage_),
-    average_(ptf.average_)
+    average_(ptf.average_),
+    interpolationScheme_(ptf.interpolationScheme_)
 {
     if (!isA<directMappedPatchBase>(this->patch().patch()))
     {
@@ -91,8 +96,10 @@ directMappedFixedValueFvPatchField<Type>::directMappedFixedValueFvPatchField
 )
 :
     fixedValueFvPatchField<Type>(p, iF, dict),
+    fieldName_(dict.lookupOrDefault<word>("fieldName", iF.name())),
     setAverage_(readBool(dict.lookup("setAverage"))),
-    average_(pTraits<Type>(dict.lookup("average")))
+    average_(pTraits<Type>(dict.lookup("average"))),
+    interpolationScheme_(interpolationCell<Type>::typeName)
 {
     if (!isA<directMappedPatchBase>(this->patch().patch()))
     {
@@ -112,6 +119,15 @@ directMappedFixedValueFvPatchField<Type>::directMappedFixedValueFvPatchField
             << " in file " << this->dimensionedInternalField().objectPath()
             << exit(FatalError);
     }
+
+    const directMappedPatchBase& mpp = refCast<const directMappedPatchBase>
+    (
+        directMappedFixedValueFvPatchField<Type>::patch().patch()
+    );
+    if (mpp.mode() == directMappedPatchBase::NEARESTCELL)
+    {
+        dict.lookup("interpolationScheme") >> interpolationScheme_;
+    }
 }
 
 
@@ -122,8 +138,10 @@ directMappedFixedValueFvPatchField<Type>::directMappedFixedValueFvPatchField
 )
 :
     fixedValueFvPatchField<Type>(ptf),
+    fieldName_(ptf.fieldName_),
     setAverage_(ptf.setAverage_),
-    average_(ptf.average_)
+    average_(ptf.average_),
+    interpolationScheme_(ptf.interpolationScheme_)
 {}
 
 
@@ -135,13 +153,67 @@ directMappedFixedValueFvPatchField<Type>::directMappedFixedValueFvPatchField
 )
 :
     fixedValueFvPatchField<Type>(ptf, iF),
+    fieldName_(ptf.fieldName_),
     setAverage_(ptf.setAverage_),
-    average_(ptf.average_)
+    average_(ptf.average_),
+    interpolationScheme_(ptf.interpolationScheme_)
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+template<class Type>
+const GeometricField<Type, fvPatchField, volMesh>&
+directMappedFixedValueFvPatchField<Type>::sampleField() const
+{
+    typedef GeometricField<Type, fvPatchField, volMesh> fieldType;
+
+    const directMappedPatchBase& mpp = refCast<const directMappedPatchBase>
+    (
+        directMappedFixedValueFvPatchField<Type>::patch().patch()
+    );
+    const fvMesh& nbrMesh = refCast<const fvMesh>(mpp.sampleMesh());
+
+    if (mpp.sameRegion())
+    {
+        if (fieldName_ == this->dimensionedInternalField().name())
+        {
+            // Optimisation: bypass field lookup
+            return
+                dynamic_cast<const fieldType&>
+                (
+                    this->dimensionedInternalField()
+                );
+        }
+        else
+        {
+            const fvMesh& thisMesh = this->patch().boundaryMesh().mesh();
+            return thisMesh.lookupObject<fieldType>(fieldName_);
+        }
+    }
+    else
+    {
+        return nbrMesh.lookupObject<fieldType>(fieldName_);
+    }
+}
+
+
+template<class Type>
+const interpolation<Type>&
+directMappedFixedValueFvPatchField<Type>::interpolator() const
+{
+    if (!interpolator_.valid())
+    {
+        interpolator_ = interpolation<Type>::New
+        (
+            interpolationScheme_,
+            sampleField()
+        );
+    }
+    return interpolator_();
+}
+
+
 template<class Type>
 void directMappedFixedValueFvPatchField<Type>::updateCoeffs()
 {
@@ -159,11 +231,8 @@ void directMappedFixedValueFvPatchField<Type>::updateCoeffs()
     );
     const mapDistribute& distMap = mpp.map();
 
-    // Force recalculation of schedule
-    (void)distMap.schedule();
-
+    const fvMesh& thisMesh = this->patch().boundaryMesh().mesh();
     const fvMesh& nbrMesh = refCast<const fvMesh>(mpp.sampleMesh());
-    const word& fldName = this->dimensionedInternalField().name();
 
     // Result of obtaining remote values
     Field<Type> newValues;
@@ -172,17 +241,37 @@ void directMappedFixedValueFvPatchField<Type>::updateCoeffs()
     {
         case directMappedPatchBase::NEARESTCELL:
         {
-            if (mpp.sameRegion())
+            if (interpolationScheme_ != interpolationCell<Type>::typeName)
             {
-                newValues = this->internalField();
+                // Send back sample points to the processor that holds the cell
+                vectorField samples(mpp.samplePoints());
+                distMap.reverseDistribute
+                (
+                    (mpp.sameRegion() ? thisMesh.nCells() : nbrMesh.nCells()),
+                    point::max,
+                    samples
+                );
+
+                const interpolation<Type>& interp = interpolator();
+
+                newValues.setSize(samples.size(), pTraits<Type>::max);
+                forAll(samples, cellI)
+                {
+                    if (samples[cellI] != point::max)
+                    {
+                        newValues[cellI] = interp.interpolate
+                        (
+                            samples[cellI],
+                            cellI
+                        );
+                    }
+                }
             }
             else
             {
-                newValues = nbrMesh.lookupObject<fieldType>
-                (
-                    fldName
-                ).internalField();
+                newValues = sampleField();
             }
+
             mapDistribute::distribute
             (
                 Pstream::defaultCommsType,
@@ -213,10 +302,8 @@ void directMappedFixedValueFvPatchField<Type>::updateCoeffs()
                  << abort(FatalError);
             }
 
-            const fieldType& nbrField = nbrMesh.lookupObject<fieldType>
-            (
-                fldName
-            );
+            const fieldType& nbrField = sampleField();
+
             newValues = nbrField.boundaryField()[nbrPatchID];
             mapDistribute::distribute
             (
@@ -234,10 +321,8 @@ void directMappedFixedValueFvPatchField<Type>::updateCoeffs()
         {
             Field<Type> allValues(nbrMesh.nFaces(), pTraits<Type>::zero);
 
-            const fieldType& nbrField = nbrMesh.lookupObject<fieldType>
-            (
-                fldName
-            );
+            const fieldType& nbrField = sampleField();
+
             forAll(nbrField.boundaryField(), patchI)
             {
                 const fvPatchField<Type>& pf =
@@ -294,7 +379,8 @@ void directMappedFixedValueFvPatchField<Type>::updateCoeffs()
 
     if (debug)
     {
-        Info<< "directMapped on field:" << fldName
+        Info<< "directMapped on field:"
+            << this->dimensionedInternalField().name()
             << " patch:" << this->patch().name()
             << "  avg:" << gAverage(*this)
             << "  min:" << gMin(*this)
@@ -310,8 +396,11 @@ template<class Type>
 void directMappedFixedValueFvPatchField<Type>::write(Ostream& os) const
 {
     fvPatchField<Type>::write(os);
+    os.writeKeyword("fieldName") << fieldName_ << token::END_STATEMENT << nl;
     os.writeKeyword("setAverage") << setAverage_ << token::END_STATEMENT << nl;
     os.writeKeyword("average") << average_ << token::END_STATEMENT << nl;
+    os.writeKeyword("interpolationScheme") << interpolationScheme_
+        << token::END_STATEMENT << nl;
     this->writeEntry("value", os);
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedValue/directMappedFixedValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedValue/directMappedFixedValueFvPatchField.H
index 8d6038913ed91c94241e90f1ca7e6818dc223cf0..07960cd0e5e39e567218fdcc538a76e616257403 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedValue/directMappedFixedValueFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedValue/directMappedFixedValueFvPatchField.H
@@ -33,6 +33,17 @@ Description
     mode = NEARESTFACE : sample nearest face on any patch. Note: does not
                          warn if nearest actually is on internal face!
 
+    For NEARESTCELL you have to provide an 'interpolationScheme' entry
+    which can be any one of the interpolation schemes (cell, cellPoint, etc.)
+    In case of interpolation (so scheme != cell) the limitation is that
+    there is only one value per cell. So e.g. if you have a cell with two
+    boundary faces and both faces sample into the cell both faces will get
+    the same value.
+
+    See directMappedPatchBase for options on sampling.
+
+    Optional 'fieldName' entry to supply a different filename
+
 SourceFiles
     directMappedFixedValueFvPatchField.C
 
@@ -43,6 +54,7 @@ SourceFiles
 
 #include "fixedValueFvPatchFields.H"
 #include "directMappedFvPatch.H"
+#include "interpolation.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -60,12 +72,29 @@ class directMappedFixedValueFvPatchField
 {
     // Private data
 
+        //- Name of field to sample - defaults to field associated with this
+        //  patchField if not specified
+        word fieldName_;
+
         //- If true adjust the mapped field to maintain average value average_
-        bool setAverage_;
+        const bool setAverage_;
 
         //- Average value the mapped field is adjusted to maintain if
         //  setAverage_ is set true
-        Type average_;
+        const Type average_;
+
+        //- Interpolation scheme to use for nearestcell mode
+        word interpolationScheme_;
+
+        mutable autoPtr<interpolation<Type> > interpolator_;
+
+    // Private Member Functions
+
+        //- Field to sample. Either on my or nbr mesh
+        const GeometricField<Type, fvPatchField, volMesh>& sampleField() const;
+
+        //- Access the interpolation method
+        const interpolation<Type>& interpolator() const;
 
 public:
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/directMappedVelocityFluxFixedValue/directMappedVelocityFluxFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/directMappedVelocityFluxFixedValue/directMappedVelocityFluxFixedValueFvPatchField.C
index 36821fe72f01f0f76bce8f0acaf5dc7d50ebad1e..8f64aedc7eb165bd0539f1c3a36218a412da2303 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/directMappedVelocityFluxFixedValue/directMappedVelocityFluxFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/directMappedVelocityFluxFixedValue/directMappedVelocityFluxFixedValueFvPatchField.C
@@ -112,6 +112,29 @@ directMappedVelocityFluxFixedValueFvPatchField
             << " in file " << dimensionedInternalField().objectPath()
             << exit(FatalError);
     }
+
+    const directMappedPatchBase& mpp = refCast<const directMappedPatchBase>
+    (
+        this->patch().patch()
+    );
+    if (mpp.mode() == directMappedPolyPatch::NEARESTCELL)
+    {
+        FatalErrorIn
+        (
+            "directMappedVelocityFluxFixedValueFvPatchField::"
+            "directMappedVelocityFluxFixedValueFvPatchField"
+            "("
+                "const fvPatch&, "
+                "const DimensionedField<vector, volMesh>&, "
+                "const dictionary&"
+            ")"
+        )   << "Patch " << p.name()
+            << " of type '" << p.type()
+            << "' can not be used in 'nearestCell' mode"
+            << " of field " << dimensionedInternalField().name()
+            << " in file " << dimensionedInternalField().objectPath()
+            << exit(FatalError);
+    }
 }
 
 
diff --git a/src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.C b/src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.C
index f3b679154c182ded48ef7b6a45e7559dcd598999..957fd0281bc5b7ab13624aa1e678c5cea981dc01 100644
--- a/src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.C
+++ b/src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.C
@@ -54,6 +54,18 @@ namespace Foam
         directMappedPatchBase::sampleModeNames_;
 
 
+    template<>
+    const char* NamedEnum<directMappedPatchBase::offsetMode, 3>::names[] =
+    {
+        "uniform",
+        "nonuniform",
+        "normal"
+    };
+
+    const NamedEnum<directMappedPatchBase::offsetMode, 3>
+        directMappedPatchBase::offsetModeNames_;
+
+
     //- Private class for finding nearest
     //  - point+local index
     //  - sqr(distance)
@@ -100,7 +112,7 @@ void Foam::directMappedPatchBase::collectSamples
     labelListList globalFaces(Pstream::nProcs());
 
     globalFc[Pstream::myProcNo()] = patch_.faceCentres();
-    globalSamples[Pstream::myProcNo()] = globalFc[Pstream::myProcNo()]+offsets_;
+    globalSamples[Pstream::myProcNo()] = samplePoints();
     globalFaces[Pstream::myProcNo()] = identity(patch_.size());
 
     // Distribute to all processors
@@ -393,19 +405,34 @@ void Foam::directMappedPatchBase::calcMapping() const
             << "Mapping already calculated" << exit(FatalError);
     }
 
-    if
+    // Do a sanity check
+    // Am I sampling my own patch? This only makes sense for a non-zero
+    // offset.
+    bool sampleMyself =
     (
-        gAverage(mag(offsets_)) <= ROOTVSMALL
-     && mode_ == NEARESTPATCHFACE
+        mode_ == NEARESTPATCHFACE
      && sampleRegion_ == patch_.boundaryMesh().mesh().name()
      && samplePatch_ == patch_.name()
-    )
+    );
+
+    // Check offset
+    vectorField d(samplePoints()-patch_.faceCentres());
+    if (sampleMyself && gAverage(mag(d)) <= ROOTVSMALL)
     {
-        WarningIn("directMappedPatchBase::calcMapping() const")
-            << "Invalid offset " << offsets_ << endl
+        WarningIn
+        (
+            "directMappedPatchBase::directMappedPatchBase\n"
+            "(\n"
+            "    const polyPatch& pp,\n"
+            "    const word& sampleRegion,\n"
+            "    const sampleMode mode,\n"
+            "    const word& samplePatch,\n"
+            "    const vector& offset\n"
+            ")\n"
+        )   << "Invalid offset " << d << endl
             << "Offset is the vector added to the patch face centres to"
             << " find the patch face supplying the data." << endl
-            << "Setting it to " << offsets_
+            << "Setting it to " << d
             << " on the same patch, on the same region"
             << " will find the faces themselves which does not make sense"
             << " for anything but testing." << endl
@@ -413,10 +440,11 @@ void Foam::directMappedPatchBase::calcMapping() const
             << "sampleRegion_:" << sampleRegion_ << endl
             << "mode_:" << sampleModeNames_[mode_] << endl
             << "samplePatch_:" << samplePatch_ << endl
-            << "offsets_:" << offsets_ << endl;
+            << "offsetMode_:" << offsetModeNames_[offsetMode_] << endl;
     }
 
 
+
     // Get global list of all samples and the processor and face they come from.
     pointField samples;
     labelList patchFaceProcs;
@@ -477,40 +505,6 @@ void Foam::directMappedPatchBase::calcMapping() const
     }
 
 
-    //// Check that actual offset vector (sampleLocations - patchFc) is more or
-    //// less constant.
-    //if (Pstream::master())
-    //{
-    //    const scalarField magOffset(mag(sampleLocations - patchFc));
-    //    const scalar avgOffset(average(magOffset));
-    //
-    //    forAll(magOffset, sampleI)
-    //    {
-    //        if
-    //        (
-    //            mag(magOffset[sampleI]-avgOffset)
-    //          > max(SMALL, 0.001*avgOffset)
-    //        )
-    //        {
-    //            WarningIn("directMappedPatchBase::calcMapping() const")
-    //                << "The actual cell/face centres picked up using offset "
-    //                << offsets_ << " are not" << endl
-    //                << "    on a single plane."
-    //                << " This might give numerical problems." << endl
-    //                << "    At patchface " << patchFc[sampleI]
-    //                << " the sampled cell/face " << sampleLocations[sampleI]
-    //                << endl
-    //                << "    is not on a plane " << avgOffset
-    //                << " offset from the patch." << endl
-    //                << "    You might want to shift your plane offset."
-    //                << " Set the debug flag to get a dump of sampled cells."
-    //                << endl;
-    //            break;
-    //        }
-    //    }
-    //}
-
-
     // Determine schedule.
     mapPtr_.reset(new mapDistribute(sampleProcs, patchFaceProcs));
 
@@ -597,9 +591,10 @@ Foam::directMappedPatchBase::directMappedPatchBase
     sampleRegion_(patch_.boundaryMesh().mesh().name()),
     mode_(NEARESTPATCHFACE),
     samplePatch_("none"),
-    uniformOffset_(true),
+    offsetMode_(UNIFORM),
     offset_(vector::zero),
     offsets_(pp.size(), offset_),
+    distance_(0),
     sameRegion_(sampleRegion_ == patch_.boundaryMesh().mesh().name()),
     mapPtr_(NULL)
 {}
@@ -618,8 +613,10 @@ Foam::directMappedPatchBase::directMappedPatchBase
     sampleRegion_(sampleRegion),
     mode_(mode),
     samplePatch_(samplePatch),
-    uniformOffset_(false),
+    offsetMode_(NONUNIFORM),
+    offset_(vector::zero),
     offsets_(offsets),
+    distance_(0),
     sameRegion_(sampleRegion_ == patch_.boundaryMesh().mesh().name()),
     mapPtr_(NULL)
 {}
@@ -638,9 +635,10 @@ Foam::directMappedPatchBase::directMappedPatchBase
     sampleRegion_(sampleRegion),
     mode_(mode),
     samplePatch_(samplePatch),
-    uniformOffset_(true),
+    offsetMode_(UNIFORM),
     offset_(offset),
-    offsets_(pp.size(), offset_),
+    offsets_(0),
+    distance_(0),
     sameRegion_(sampleRegion_ == patch_.boundaryMesh().mesh().name()),
     mapPtr_(NULL)
 {}
@@ -663,22 +661,62 @@ Foam::directMappedPatchBase::directMappedPatchBase
     ),
     mode_(sampleModeNames_.read(dict.lookup("sampleMode"))),
     samplePatch_(dict.lookup("samplePatch")),
-    uniformOffset_(dict.found("offset")),
-    offset_
-    (
-        uniformOffset_
-      ? point(dict.lookup("offset"))
-      : vector::zero
-    ),
-    offsets_
-    (
-        uniformOffset_
-      ? pointField(pp.size(), offset_)
-      : dict.lookup("offsets")
-    ),
+    offsetMode_(UNIFORM),
+    offset_(vector::zero),
+    offsets_(0),
+    distance_(0.0),
     sameRegion_(sampleRegion_ == patch_.boundaryMesh().mesh().name()),
     mapPtr_(NULL)
-{}
+{
+    if (dict.found("offsetMode"))
+    {
+        offsetMode_ = offsetModeNames_.read(dict.lookup("offsetMode"));
+
+        switch(offsetMode_)
+        {
+            case UNIFORM:
+            {
+                offset_ = point(dict.lookup("offset"));
+            }
+            break;
+
+            case NONUNIFORM:
+            {
+                offsets_ = pointField(dict.lookup("offsets"));
+            }
+            break;
+
+            case NORMAL:
+            {
+                distance_ = readScalar(dict.lookup("distance"));
+            }
+            break;
+        }
+    }
+    else if (dict.found("offset"))
+    {
+        offsetMode_ = UNIFORM;
+        offset_ = point(dict.lookup("offset"));
+    }
+    else if (dict.found("offsets"))
+    {
+        offsetMode_ = NONUNIFORM;
+        offsets_ = pointField(dict.lookup("offsets"));
+    }
+    else
+    {
+        FatalErrorIn
+        (
+            "directMappedPatchBase::directMappedPatchBase\n"
+            "(\n"
+            "    const polyPatch& pp,\n"
+            "    const dictionary& dict\n"
+            ")\n"
+        )   << "Please supply the offsetMode as one of "
+            << NamedEnum<offsetMode, 3>::words()
+            << exit(FatalError);
+    }
+}
 
 
 Foam::directMappedPatchBase::directMappedPatchBase
@@ -691,9 +729,10 @@ Foam::directMappedPatchBase::directMappedPatchBase
     sampleRegion_(dmp.sampleRegion_),
     mode_(dmp.mode_),
     samplePatch_(dmp.samplePatch_),
-    uniformOffset_(dmp.uniformOffset_),
+    offsetMode_(dmp.offsetMode_),
     offset_(dmp.offset_),
     offsets_(dmp.offsets_),
+    distance_(dmp.distance_),
     sameRegion_(dmp.sameRegion_),
     mapPtr_(NULL)
 {}
@@ -710,9 +749,10 @@ Foam::directMappedPatchBase::directMappedPatchBase
     sampleRegion_(dmp.sampleRegion_),
     mode_(dmp.mode_),
     samplePatch_(dmp.samplePatch_),
-    uniformOffset_(dmp.uniformOffset_),
+    offsetMode_(dmp.offsetMode_),
     offset_(dmp.offset_),
     offsets_(dmp.offsets_, mapAddressing),
+    distance_(dmp.distance_),
     sameRegion_(dmp.sameRegion_),
     mapPtr_(NULL)
 {}
@@ -762,6 +802,40 @@ const Foam::polyPatch& Foam::directMappedPatchBase::samplePolyPatch() const
 }
 
 
+Foam::tmp<Foam::pointField> Foam::directMappedPatchBase::samplePoints() const
+{
+    tmp<pointField> tfld(new pointField(patch_.faceCentres()));
+    pointField& fld = tfld();
+
+    switch(offsetMode_)
+    {
+        case UNIFORM:
+        {
+            fld += offset_;
+        }
+        break;
+
+        case NONUNIFORM:
+        {
+            fld += offsets_;
+        }
+        break;
+
+        case NORMAL:
+        {
+            // Get outwards pointing normal
+            vectorField n(patch_.faceAreas());
+            n /= mag(n);
+
+            fld += distance_*n;
+        }
+        break;
+    }
+
+    return tfld;
+}
+
+
 void Foam::directMappedPatchBase::write(Ostream& os) const
 {
     os.writeKeyword("sampleMode") << sampleModeNames_[mode_]
@@ -770,13 +844,31 @@ void Foam::directMappedPatchBase::write(Ostream& os) const
         << token::END_STATEMENT << nl;
     os.writeKeyword("samplePatch") << samplePatch_
         << token::END_STATEMENT << nl;
-    if (uniformOffset_)
-    {
-        os.writeKeyword("offset") << offset_ << token::END_STATEMENT << nl;
-    }
-    else
+
+    os.writeKeyword("offsetMode") << offsetModeNames_[offsetMode_]
+        << token::END_STATEMENT << nl;
+
+    switch(offsetMode_)
     {
-        os.writeKeyword("offsets") << offsets_ << token::END_STATEMENT << nl;
+        case UNIFORM:
+        {
+            os.writeKeyword("offset") << offset_ << token::END_STATEMENT << nl;
+        }
+        break;
+
+        case NONUNIFORM:
+        {
+            os.writeKeyword("offsets") << offsets_ << token::END_STATEMENT
+                << nl;
+        }
+        break;
+
+        case NORMAL:
+        {
+            os.writeKeyword("distance") << distance_ << token::END_STATEMENT
+                << nl;
+        }
+        break;
     }
 }
 
diff --git a/src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.H b/src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.H
index 281e24ec6e916842f6590e302bb29e38b69b9ee0..96ac05bf7c26bfae4bbe0ad8d0a8006842179559 100644
--- a/src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.H
+++ b/src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.H
@@ -28,6 +28,33 @@ Description
     Determines a mapping between patch face centres and mesh cell or face
     centres and processors they're on.
 
+    If constructed from dictionary:
+        // Region to sample (default is region0)
+        sampleRegion region0;
+
+        // What to sample:
+        // - nearestCell : sample nearest cell
+        // - nearestPatchFace : nearest face on selected patch
+        // - nearestFace : nearest boundary face on any patch
+        sampleMode nearestCell;
+
+        // If sampleMod is nearestPatchFace : patch to find faces of
+        samplePatch movingWall;
+
+        // How to supply offset (w.r.t. my patch face centres):
+        // - uniform : single offset vector
+        // - nonuniform : per-face offset vector
+        // - normal : using supplied distance and face normal
+        offsetMode uniform;
+
+        // According to offsetMode (see above) supply one of
+        // offset, offsets or distance
+        offset  (1 0 0);
+
+    Note: if offsetMode is 'normal' it uses outwards pointing normals. So
+    supply a negative distance if sampling inside the domain.
+
+
 Note
     Storage is not optimal. It temporary collects all (patch)face centres
     on all processors to keep the addressing calculation simple.
@@ -71,12 +98,22 @@ public:
             NEARESTFACE         // nearest face
         };
 
+        //- How to project face centres
+        enum offsetMode
+        {
+            UNIFORM,            // single offset vector
+            NONUNIFORM,         // per-face offset vector
+            NORMAL              // use face normal + distance
+        };
+
 private:
 
     // Private data
 
         static const NamedEnum<sampleMode, 3> sampleModeNames_;
 
+        static const NamedEnum<offsetMode, 3> offsetModeNames_;
+
         //- Patch to sample
         const polyPatch& patch_;
 
@@ -89,14 +126,17 @@ private:
         //- Patch (only if NEARESTPATCHFACE)
         const word samplePatch_;
 
-        //- For backwards compatibility : reading/writing of uniform offset.
-        const bool uniformOffset_;
+        //- How to obtain samples
+        offsetMode offsetMode_;
 
         //- Offset vector (uniform)
-        const vector offset_;
+        vector offset_;
 
-        //- Offset vector
-        const vectorField offsets_;
+        //- Offset vector (nonuniform)
+        vectorField offsets_;
+
+        //- Offset distance (normal)
+        scalar distance_;
 
         //- Same region
         const bool sameRegion_;
@@ -146,17 +186,17 @@ public:
         //- Construct from patch
         directMappedPatchBase(const polyPatch&);
 
-        //- Construct from components
+        //- Construct with offsetMode=non-uniform
         directMappedPatchBase
         (
             const polyPatch& pp,
             const word& sampleRegion,
             const sampleMode sampleMode,
             const word& samplePatch,
-            const vectorField& offset
+            const vectorField& offsets
         );
 
-        //- Construct from components
+        //- Construct from offsetMode=uniform
         directMappedPatchBase
         (
             const polyPatch& pp,
@@ -166,6 +206,16 @@ public:
             const vector& offset
         );
 
+        ////- Construct from normal and distance
+        //directMappedPatchBase
+        //(
+        //    const polyPatch& pp,
+        //    const word& sampleRegion,
+        //    const word& samplePatch,
+        //    const sampleMode sampleMode,
+        //    const vector& offset
+        //);
+
         //- Construct from dictionary
         directMappedPatchBase(const polyPatch&, const dictionary&);
 
@@ -241,6 +291,9 @@ public:
         //- Get the patch on the region
         const polyPatch& samplePolyPatch() const;
 
+        //- Get the sample points
+        tmp<pointField> samplePoints() const;
+
         //- Write as a dictionary
         virtual void write(Ostream&) const;
 };
diff --git a/src/sampling/sampledSurface/distanceSurface/distanceSurface.C b/src/sampling/sampledSurface/distanceSurface/distanceSurface.C
index 450384506a79664ba333bbc5f1450d4f95c40787..3a6562b897616404b8056da0a6b4f083f4d8d88c 100644
--- a/src/sampling/sampledSurface/distanceSurface/distanceSurface.C
+++ b/src/sampling/sampledSurface/distanceSurface/distanceSurface.C
@@ -50,6 +50,9 @@ void Foam::distanceSurface::createGeometry()
     // Clear any stored topologies
     facesPtr_.clear();
 
+    // Clear derived data
+    clearGeom();
+
     const fvMesh& fvm = static_cast<const fvMesh&>(mesh());
 
     // Distance to cell centres
@@ -361,6 +364,9 @@ bool Foam::distanceSurface::expire()
     // Clear any stored topologies
     facesPtr_.clear();
 
+    // Clear derived data
+    clearGeom();
+
     // already marked as expired
     if (needsUpdate_)
     {
diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C
index b70461cef3fda1e5a510d6637635b53835a0f925..46d6f108ccfe4e9f6a766f9b213d956768e29840 100644
--- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C
+++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C
@@ -333,6 +333,9 @@ bool Foam::sampledIsoSurface::updateGeometry() const
     surfPtr_.clear();
     facesPtr_.clear();
 
+    // Clear derived data
+    clearGeom();
+
     if (subMeshPtr_.valid())
     {
         surfPtr_.reset
@@ -471,6 +474,9 @@ bool Foam::sampledIsoSurface::expire()
     facesPtr_.clear();
     subMeshPtr_.clear();
 
+    // Clear derived data
+    clearGeom();
+
     // already marked as expired
     if (prevTimeIndex_ == -1)
     {
diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.C b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.C
index 155e12bbd225213dc706d71acaa1d423b8da2d60..7d1b138f5ef8880e84e8a4edf675571a54585cbc 100644
--- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.C
+++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.C
@@ -62,6 +62,9 @@ bool Foam::sampledIsoSurfaceCell::updateGeometry() const
     // Clear any stored topo
     facesPtr_.clear();
 
+    // Clear derived data
+    sampledSurface::clearGeom();
+
     // Optionally read volScalarField
     autoPtr<volScalarField> readFieldPtr_;
 
@@ -240,6 +243,9 @@ bool Foam::sampledIsoSurfaceCell::expire()
 {
     facesPtr_.clear();
 
+    // Clear derived data
+    sampledSurface::clearGeom();
+
     // already marked as expired
     if (prevTimeIndex_ == -1)
     {
diff --git a/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.C b/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.C
index bfbb5293f781dabec8173a4bb8313ac0a92e80b8..3c88d38d6f5e762b5515d35de040180aa39ece3b 100644
--- a/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.C
+++ b/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.C
@@ -60,6 +60,8 @@ void Foam::sampledCuttingPlane::createGeometry()
     pointDistance_.clear();
     cellDistancePtr_.clear();
 
+    // Clear derived data
+    clearGeom();
 
     // Get any subMesh
     if (zoneID_.index() != -1 && !subMeshPtr_.valid())
@@ -321,6 +323,9 @@ bool Foam::sampledCuttingPlane::expire()
     // Clear any stored topologies
     facesPtr_.clear();
 
+    // Clear derived data
+    clearGeom();
+
     // already marked as expired
     if (needsUpdate_)
     {
diff --git a/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.C b/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.C
index 0d9e1312ab7fdd1cec1ccffd92b5130e2dd83c4a..c8a3291ede24f685ca09219c1fdf934be5f86f0d 100644
--- a/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.C
+++ b/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.C
@@ -124,6 +124,8 @@ bool Foam::sampledThresholdCellFaces::updateGeometry() const
     ).MeshedSurface<face>::transfer(surf);
     meshCells_.transfer(surf.meshCells());
 
+    // clear derived data
+    sampledSurface::clearGeom();
 
     if (debug)
     {
diff --git a/src/surfaceFilmModels/Make/files b/src/surfaceFilmModels/Make/files
index 8b84a94e1464ad74bf65266acf2a74ca16d5fee0..3f2aaef30153c5b6480af09d899887c3037364ff 100644
--- a/src/surfaceFilmModels/Make/files
+++ b/src/surfaceFilmModels/Make/files
@@ -26,7 +26,6 @@ submodels/thermo/heatTransferModel/mappedConvectiveHeatTransfer/mappedConvective
 
 /* Boundary conditions */
 derivedFvPatchFields/directMappedFixedInternalValue/directMappedFixedInternalValueFvPatchFields.C
-derivedFvPatchFields/directMappedNamedFixedValue/directMappedNamedFixedValueFvPatchFields.C
 derivedFvPatchFields/directMappedFixedPushedInternalValue/directMappedFixedPushedInternalValueFvPatchFields.C
 derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.C
 derivedFvPatchFields/htcConv/htcConvFvPatchScalarField.C
diff --git a/src/surfaceFilmModels/derivedFvPatchFields/directMappedNamedFixedValue/directMappedNamedFixedValueFvPatchField.C b/src/surfaceFilmModels/derivedFvPatchFields/directMappedNamedFixedValue/directMappedNamedFixedValueFvPatchField.C
deleted file mode 100644
index c9e799e08ac27dcaf8efe2e10c0a7ef09f574fa8..0000000000000000000000000000000000000000
--- a/src/surfaceFilmModels/derivedFvPatchFields/directMappedNamedFixedValue/directMappedNamedFixedValueFvPatchField.C
+++ /dev/null
@@ -1,334 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "directMappedNamedFixedValueFvPatchField.H"
-#include "directMappedPatchBase.H"
-#include "volFields.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-template<class Type>
-directMappedNamedFixedValueFvPatchField<Type>::
-directMappedNamedFixedValueFvPatchField
-(
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF
-)
-:
-    fixedValueFvPatchField<Type>(p, iF),
-    fieldName_(iF.name()),
-    setAverage_(false),
-    average_(pTraits<Type>::zero)
-{}
-
-
-template<class Type>
-directMappedNamedFixedValueFvPatchField<Type>::
-directMappedNamedFixedValueFvPatchField
-(
-    const directMappedNamedFixedValueFvPatchField<Type>& ptf,
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    fixedValueFvPatchField<Type>(ptf, p, iF, mapper),
-    fieldName_(ptf.fieldName_),
-    setAverage_(ptf.setAverage_),
-    average_(ptf.average_)
-{
-    if (!isA<directMappedPatchBase>(this->patch().patch()))
-    {
-        FatalErrorIn
-        (
-            "directMappedNamedFixedValueFvPatchField<Type>::"
-            "directMappedNamedFixedValueFvPatchField\n"
-            "("
-                "const directMappedNamedFixedValueFvPatchField<Type>&, "
-                "const fvPatch&, "
-                "const Field<Type>&, "
-                "const fvPatchFieldMapper& "
-            ")"
-        )   << "    patch type '" << p.type()
-            << "' not type '" << directMappedPatchBase::typeName << "'"
-            << "\n    for patch " << p.name()
-            << " of field " << this->dimensionedInternalField().name()
-            << " in file " << this->dimensionedInternalField().objectPath()
-            << exit(FatalError);
-    }
-}
-
-
-template<class Type>
-directMappedNamedFixedValueFvPatchField<Type>::
-directMappedNamedFixedValueFvPatchField
-(
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    fixedValueFvPatchField<Type>(p, iF, dict),
-    fieldName_(dict.lookupOrDefault<word>("fieldName", iF.name())),
-    setAverage_(readBool(dict.lookup("setAverage"))),
-    average_(pTraits<Type>(dict.lookup("average")))
-{
-    if (!isA<directMappedPatchBase>(this->patch().patch()))
-    {
-        FatalErrorIn
-        (
-            "directMappedNamedFixedValueFvPatchField<Type>::"
-            "directMappedNamedFixedValueFvPatchField"
-            "("
-                "const fvPatch&, "
-                "const DimensionedField<Type, volMesh>& iF, "
-                "const dictionary&"
-            ")"
-        )   << "    patch type '" << p.type()
-            << "' not type '" << directMappedPatchBase::typeName << "'"
-            << "\n    for patch " << p.name()
-            << " of field " << fieldName_
-            << " in file " << this->dimensionedInternalField().objectPath()
-            << exit(FatalError);
-    }
-
-    //// Force calculation of schedule (uses parallel comms)
-    //const directMappedPatchBase& mpp = refCast<const directMappedPatchBase>
-    //(
-    //    this->patch().patch()
-    //);
-    //(void)mpp.map().schedule();
-}
-
-
-template<class Type>
-directMappedNamedFixedValueFvPatchField<Type>::
-directMappedNamedFixedValueFvPatchField
-(
-    const directMappedNamedFixedValueFvPatchField<Type>& ptf
-)
-:
-    fixedValueFvPatchField<Type>(ptf),
-    fieldName_(ptf.fieldName_),
-    setAverage_(ptf.setAverage_),
-    average_(ptf.average_)
-{}
-
-
-template<class Type>
-directMappedNamedFixedValueFvPatchField<Type>::
-directMappedNamedFixedValueFvPatchField
-(
-    const directMappedNamedFixedValueFvPatchField<Type>& ptf,
-    const DimensionedField<Type, volMesh>& iF
-)
-:
-    fixedValueFvPatchField<Type>(ptf, iF),
-    fieldName_(ptf.fieldName_),
-    setAverage_(ptf.setAverage_),
-    average_(ptf.average_)
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<class Type>
-void directMappedNamedFixedValueFvPatchField<Type>::updateCoeffs()
-{
-    if (this->updated())
-    {
-        return;
-    }
-
-    typedef GeometricField<Type, fvPatchField, volMesh> fieldType;
-
-    // Get the scheduling information from the directMappedPatchBase
-    const directMappedPatchBase& mpp = refCast<const directMappedPatchBase>
-    (
-        directMappedNamedFixedValueFvPatchField<Type>::patch().patch()
-    );
-    const mapDistribute& distMap = mpp.map();
-
-    // Force recalculation of schedule
-    (void)distMap.schedule();
-
-    const fvMesh& nbrMesh = refCast<const fvMesh>(mpp.sampleMesh());
-
-    // Result of obtaining remote values
-    Field<Type> newValues;
-
-    switch (mpp.mode())
-    {
-        case directMappedPatchBase::NEARESTCELL:
-        {
-            if (mpp.sameRegion())
-            {
-                newValues = this->internalField();
-            }
-            else
-            {
-                newValues = nbrMesh.lookupObject<fieldType>
-                (
-                    fieldName_
-                ).internalField();
-            }
-            mapDistribute::distribute
-            (
-                Pstream::defaultCommsType,
-                distMap.schedule(),
-                distMap.constructSize(),
-                distMap.subMap(),
-                distMap.constructMap(),
-                newValues
-            );
-
-            break;
-        }
-        case directMappedPatchBase::NEARESTPATCHFACE:
-        {
-            const label nbrPatchID =
-                nbrMesh.boundaryMesh().findPatchID(mpp.samplePatch());
-            if (nbrPatchID < 0)
-            {
-                FatalErrorIn
-                (
-                    "void directMappedNamedFixedValueFvPatchField<Type>::"
-                    "updateCoeffs()"
-                )<< "Unable to find sample patch " << mpp.samplePatch()
-                 << " in region " << mpp.sampleRegion()
-                 << " for patch " << this->patch().name() << nl
-                 << abort(FatalError);
-            }
-
-            const fieldType& nbrField =
-                nbrMesh.lookupObject<fieldType>(fieldName_);
-            newValues = nbrField.boundaryField()[nbrPatchID];
-            mapDistribute::distribute
-            (
-                Pstream::defaultCommsType,
-                distMap.schedule(),
-                distMap.constructSize(),
-                distMap.subMap(),
-                distMap.constructMap(),
-                newValues
-            );
-
-            break;
-        }
-        case directMappedPatchBase::NEARESTFACE:
-        {
-            Field<Type> allValues(nbrMesh.nFaces(), pTraits<Type>::zero);
-
-            const fieldType& nbrField =
-                nbrMesh.lookupObject<fieldType>(fieldName_);
-            forAll(nbrField.boundaryField(), patchI)
-            {
-                const fvPatchField<Type>& pf =
-                    nbrField.boundaryField()[patchI];
-                label faceStart = pf.patch().patch().start();
-
-                forAll(pf, faceI)
-                {
-                    allValues[faceStart++] = pf[faceI];
-                }
-            }
-
-            mapDistribute::distribute
-            (
-                Pstream::defaultCommsType,
-                distMap.schedule(),
-                distMap.constructSize(),
-                distMap.subMap(),
-                distMap.constructMap(),
-                allValues
-            );
-
-            newValues = this->patch().patchSlice(allValues);
-
-            break;
-        }
-        default:
-        {
-            FatalErrorIn
-            (
-                "directMappedNamedFixedValueFvPatchField<Type>::updateCoeffs()"
-            )<< "Unknown sampling mode: " << mpp.mode()
-             << nl << abort(FatalError);
-        }
-    }
-
-    if (setAverage_)
-    {
-        Type averagePsi =
-            gSum(this->patch().magSf()*newValues)
-           /gSum(this->patch().magSf());
-
-        if (mag(averagePsi)/mag(average_) > 0.5)
-        {
-            newValues *= mag(average_)/mag(averagePsi);
-        }
-        else
-        {
-            newValues += (average_ - averagePsi);
-        }
-    }
-
-    this->operator==(newValues);
-
-    if (debug)
-    {
-        Info<< "directMapped on field:" << fieldName_
-            << " patch:" << this->patch().name()
-            << "  avg:" << gAverage(*this)
-            << "  min:" << gMin(*this)
-            << "  max:" << gMax(*this)
-            << endl;
-    }
-
-    fixedValueFvPatchField<Type>::updateCoeffs();
-}
-
-
-template<class Type>
-void directMappedNamedFixedValueFvPatchField<Type>::write(Ostream& os) const
-{
-    fvPatchField<Type>::write(os);
-    os.writeKeyword("fieldName") << fieldName_ << token::END_STATEMENT << nl;
-    os.writeKeyword("setAverage") << setAverage_ << token::END_STATEMENT << nl;
-    os.writeKeyword("average") << average_ << token::END_STATEMENT << nl;
-    this->writeEntry("value", os);
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/surfaceFilmModels/derivedFvPatchFields/directMappedNamedFixedValue/directMappedNamedFixedValueFvPatchField.H b/src/surfaceFilmModels/derivedFvPatchFields/directMappedNamedFixedValue/directMappedNamedFixedValueFvPatchField.H
deleted file mode 100644
index 711ed1ec98ee832deb1d963137606187d2d6e687..0000000000000000000000000000000000000000
--- a/src/surfaceFilmModels/derivedFvPatchFields/directMappedNamedFixedValue/directMappedNamedFixedValueFvPatchField.H
+++ /dev/null
@@ -1,164 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::directMappedNamedFixedValueFvPatchField
-
-Description
-    Variant of directMappedFixedValueFvPatch where the name of the field to
-    map is input.
-
-SourceFiles
-    directMappedNamedFixedValueFvPatchField.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef directMappedNamedFixedValueFvPatchField_H
-#define directMappedNamedFixedValueFvPatchField_H
-
-#include "fixedValueFvPatchField.H"
-#include "directMappedFvPatch.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-          Class directMappedNamesFixedValueFvPatchField Declaration
-\*---------------------------------------------------------------------------*/
-
-template<class Type>
-class directMappedNamedFixedValueFvPatchField
-:
-    public fixedValueFvPatchField<Type>
-{
-    // Private data
-
-        //- Name of field to sample - defaults to field associated with this
-        //  patch if not specified
-        word fieldName_;
-
-        //- If true adjust the mapped field to maintain average value average_
-        bool setAverage_;
-
-        //- Average value the mapped field is adjusted to maintain if
-        //  setAverage_ is set true
-        Type average_;
-
-
-public:
-
-    //- Runtime type information
-    TypeName("directMappedNamedFixedValue");
-
-
-    // Constructors
-
-        //- Construct from patch and internal field
-        directMappedNamedFixedValueFvPatchField
-        (
-            const fvPatch&,
-            const DimensionedField<Type, volMesh>&
-        );
-
-        //- Construct from patch, internal field and dictionary
-        directMappedNamedFixedValueFvPatchField
-        (
-            const fvPatch&,
-            const DimensionedField<Type, volMesh>&,
-            const dictionary&
-        );
-
-        //- Construct by mapping given directMappedNamedFixedValueFvPatchField
-        //  onto a new patch
-        directMappedNamedFixedValueFvPatchField
-        (
-            const directMappedNamedFixedValueFvPatchField<Type>&,
-            const fvPatch&,
-            const DimensionedField<Type, volMesh>&,
-            const fvPatchFieldMapper&
-        );
-
-        //- Construct as copy
-        directMappedNamedFixedValueFvPatchField
-        (
-            const directMappedNamedFixedValueFvPatchField<Type>&
-        );
-
-        //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
-        {
-            return tmp<fvPatchField<Type> >
-            (
-                new directMappedNamedFixedValueFvPatchField<Type>(*this)
-            );
-        }
-
-        //- Construct as copy setting internal field reference
-        directMappedNamedFixedValueFvPatchField
-        (
-            const directMappedNamedFixedValueFvPatchField<Type>&,
-            const DimensionedField<Type, volMesh>&
-        );
-
-        //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
-        (
-            const DimensionedField<Type, volMesh>& iF
-        ) const
-        {
-            return tmp<fvPatchField<Type> >
-            (
-                new directMappedNamedFixedValueFvPatchField<Type>(*this, iF)
-            );
-        }
-
-
-    // Member functions
-
-        // Evaluation functions
-
-            //- Update the coefficients associated with the patch field
-            virtual void updateCoeffs();
-
-        //- Write
-        virtual void write(Ostream&) const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#ifdef NoRepository
-#   include "directMappedNamedFixedValueFvPatchField.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/surfaceFilmModels/derivedFvPatchFields/directMappedNamedFixedValue/directMappedNamedFixedValueFvPatchFields.C b/src/surfaceFilmModels/derivedFvPatchFields/directMappedNamedFixedValue/directMappedNamedFixedValueFvPatchFields.C
deleted file mode 100644
index 849cc558259738807831cb259c05796943f0830e..0000000000000000000000000000000000000000
--- a/src/surfaceFilmModels/derivedFvPatchFields/directMappedNamedFixedValue/directMappedNamedFixedValueFvPatchFields.C
+++ /dev/null
@@ -1,43 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "directMappedNamedFixedValueFvPatchFields.H"
-#include "volMesh.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-makePatchFields(directMappedNamedFixedValue);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/surfaceFilmModels/derivedFvPatchFields/directMappedNamedFixedValue/directMappedNamedFixedValueFvPatchFields.H b/src/surfaceFilmModels/derivedFvPatchFields/directMappedNamedFixedValue/directMappedNamedFixedValueFvPatchFields.H
deleted file mode 100644
index 2f815fb81aa1bb821f74378a8aac00f44452b63f..0000000000000000000000000000000000000000
--- a/src/surfaceFilmModels/derivedFvPatchFields/directMappedNamedFixedValue/directMappedNamedFixedValueFvPatchFields.H
+++ /dev/null
@@ -1,49 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef directMappedNamedFixedValueFvPatchFields_H
-#define directMappedNamedFixedValueFvPatchFields_H
-
-#include "directMappedNamedFixedValueFvPatchField.H"
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makePatchTypeFieldTypedefs(directMappedNamedFixedValue)
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/surfaceFilmModels/derivedFvPatchFields/directMappedNamedFixedValue/directMappedNamesFixedValueFvPatchFieldsFwd.H b/src/surfaceFilmModels/derivedFvPatchFields/directMappedNamedFixedValue/directMappedNamesFixedValueFvPatchFieldsFwd.H
deleted file mode 100644
index c7d6e5c11cf3b35d584ada9fc5b3b36ffe14bcc4..0000000000000000000000000000000000000000
--- a/src/surfaceFilmModels/derivedFvPatchFields/directMappedNamedFixedValue/directMappedNamesFixedValueFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,50 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef directMappedNamedFixedValueFvPatchFieldsFwd_H
-#define directMappedNamedFixedValueFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class directMappedNamedFixedValueFvPatchField;
-
-makePatchTypeFieldTypedefs(directMappedNamedFixedValue)
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/makeMesh b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/makeMesh
index 91a75f1c48d48c5e478102002e4bfe6800858999..937900177cf8dd32580188517f1288f2f7a37eda 100755
--- a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/makeMesh
+++ b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/makeMesh
@@ -2,4 +2,4 @@
 set -x
 
 m4 < constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
-blockMesh >& log.blockMesh
+blockMesh > log.blockMesh 2>&1
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/0.org/T b/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/0.org/T
index f34ddb4387f97c4256def6743a1c80fde4e38819..877f52af235de5beb9ace7ac5ea806bf5b4cfa52 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/0.org/T
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/0.org/T
@@ -28,7 +28,7 @@ boundaryField
     }
     region0_to_wallFilmRegion_wallFilmFaces
     {
-        type            directMappedNamedFixedValue;
+        type            directMapped;
         fieldName       Tsf;
         average         300;
         setAverage      no;
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/0.org/U b/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/0.org/U
index 4622cf8a48ed8e035cee8af6c8180fb5838a013b..d3def72f0c77f77bb12e551a03326c955f5b9a6f 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/0.org/U
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/0.org/U
@@ -28,7 +28,7 @@ boundaryField
     }
     region0_to_wallFilmRegion_wallFilmFaces
     {
-        type            directMappedNamedFixedValue;
+        type            directMapped;
         fieldName       Usf;
         average         ( 0 0 0 );
         setAverage      no;
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/0/T b/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/0/T
index f34ddb4387f97c4256def6743a1c80fde4e38819..877f52af235de5beb9ace7ac5ea806bf5b4cfa52 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/0/T
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/0/T
@@ -28,7 +28,7 @@ boundaryField
     }
     region0_to_wallFilmRegion_wallFilmFaces
     {
-        type            directMappedNamedFixedValue;
+        type            directMapped;
         fieldName       Tsf;
         average         300;
         setAverage      no;
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/0/U b/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/0/U
index 4622cf8a48ed8e035cee8af6c8180fb5838a013b..d3def72f0c77f77bb12e551a03326c955f5b9a6f 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/0/U
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/0/U
@@ -28,7 +28,7 @@ boundaryField
     }
     region0_to_wallFilmRegion_wallFilmFaces
     {
-        type            directMappedNamedFixedValue;
+        type            directMapped;
         fieldName       Usf;
         average         ( 0 0 0 );
         setAverage      no;
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/T b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/T
index 21a4eadb2c029ea7afe02cdc1bbf7ae819b3115f..082d4cb3bcf90bba88b1844fb43060902fda15b2 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/T
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/T
@@ -29,7 +29,7 @@ boundaryField
     wallFilm
     {
         type            zeroGradient;
-//        type            directMappedNamedFixedValue;
+//        type            directMapped;
 //        fieldName       Tsf;
 //        average         300;
 //        setAverage      no;
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/U b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/U
index d114c24c03042a3d87243dd6b2e3d23a71fe256b..946484784013c71aa8da7e33a42474bbd8b043f4 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/U
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/U
@@ -30,7 +30,7 @@ boundaryField
     {
         type            fixedValue;
         value           uniform (0 0 0);
-//        type            directMappedNamedFixedValue;
+//        type            directMapped;
 //        fieldName       Usf;
 //        average         (0 0 0);
 //        setAverage      no;
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/T b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/T
index 21a4eadb2c029ea7afe02cdc1bbf7ae819b3115f..082d4cb3bcf90bba88b1844fb43060902fda15b2 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/T
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/T
@@ -29,7 +29,7 @@ boundaryField
     wallFilm
     {
         type            zeroGradient;
-//        type            directMappedNamedFixedValue;
+//        type            directMapped;
 //        fieldName       Tsf;
 //        average         300;
 //        setAverage      no;
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/U b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/U
index d114c24c03042a3d87243dd6b2e3d23a71fe256b..946484784013c71aa8da7e33a42474bbd8b043f4 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/U
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/U
@@ -30,7 +30,7 @@ boundaryField
     {
         type            fixedValue;
         value           uniform (0 0 0);
-//        type            directMappedNamedFixedValue;
+//        type            directMapped;
 //        fieldName       Usf;
 //        average         (0 0 0);
 //        setAverage      no;
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun-parallel b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun-parallel
index 680b728393eca29f35afa17cd79294892a106d36..818c810f17fb8a5243ba72d6d9fc7a937ee08996 100755
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun-parallel
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun-parallel
@@ -7,11 +7,11 @@ cd ${0%/*} || exit 1    # run from this directory
 
 ./Allrun.pre
 
-decomposePar -region wallFilmRegion >& log.decomposePar.wallFilmRegion
-decomposePar >& log.decomposePar.primaryRegion
+decomposePar -region wallFilmRegion > log.decomposePar.wallFilmRegion 2>&1
+decomposePar > log.decomposePar.primaryRegion 2>&1
 
 runParallel reactingParcelFilmFoam 4
 
-reconstructPar -region wallFilmRegion >& log.reconstructPar.wallFilmRegion
-reconstructPar >& log.reconstructPar.primaryRegion
+reconstructPar -region wallFilmRegion > log.reconstructPar.wallFilmRegion 2>&1
+reconstructPar > log.reconstructPar.primaryRegion 2>&1
 
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun.pre b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun.pre
index c2d435dfee3a16e8efe8d4ca62df613df243c664..8ea2458c6acd6d30be94ae09fab4ce85e9b78ad7 100755
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun.pre
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun.pre
@@ -14,7 +14,7 @@ runApplication subsetMesh c0 -patch wallFilm -overwrite
 
 # split the obstacle patches into cube[1-6]_patch[1-6]
 echo "running patchifyObstacles"
-./patchifyObstacles >& log.patchifyObstacles
+./patchifyObstacles > log.patchifyObstacles 2>&1
 
 # Create the wall film region via extrusion
 runApplication extrudeToRegionMesh \
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/changeDictionaryDict b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/changeDictionaryDict
index 055c1549d075d99025082e6271ca5d7f751dc47c..e8bc6994f0515fd824ad2499fdb862edb61cdea9 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/changeDictionaryDict
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/changeDictionaryDict
@@ -22,7 +22,7 @@ dictionaryReplacement
         {
             wallFilm
             {
-                type            directMappedNamedFixedValue;
+                type            directMapped;
                 fieldName       Tsf;
                 average         300;
                 setAverage      no;
@@ -37,7 +37,7 @@ dictionaryReplacement
         {
             wallFilm
             {
-                type            directMappedNamedFixedValue;
+                type            directMapped;
                 fieldName       Usf;
                 average         (0 0 0);
                 setAverage      no;
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/Allrun-parallel b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/Allrun-parallel
index 53395bfc446e662bdc4ef07ed140b787b7209171..c88abfd1afe35cbf007fd91967f353729c2688dd 100755
--- a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/Allrun-parallel
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/Allrun-parallel
@@ -4,11 +4,11 @@
 
 ./Allrun.pre
 
-decomposePar -region wallFilmRegion >& log.decomposePar.wallFilmRegion
-decomposePar >& log.decomposePar.primaryRegion
+decomposePar -region wallFilmRegion > log.decomposePar.wallFilmRegion 2>&1
+decomposePar > log.decomposePar.primaryRegion 2>&1
 
 runParallel reactingParcelFilmFoam 4
 
-reconstructPar -region wallFilmRegion >& log.reconstructPar.wallFilmRegion
-reconstructPar >& log.reconstructPar.primaryRegion
+reconstructPar -region wallFilmRegion > log.reconstructPar.wallFilmRegion 2>&1
+reconstructPar > log.reconstructPar.primaryRegion 2>&1
 
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/Allrun.pre b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/Allrun.pre
index 9df92d95a15e783f9f2aa0e34877378f9d09020c..9752b347677e0f34fdac4fbd88869bf866c2d80f 100755
--- a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/Allrun.pre
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/Allrun.pre
@@ -14,7 +14,7 @@ runApplication subsetMesh c0 -patch wallFilm -overwrite
 
 # split the obstacle patches into cube[1-6]_patch[1-6]
 echo "running patchifyObstacles"
-./patchifyObstacles >& log.patchifyObstacles
+./patchifyObstacles > log.patchifyObstacles 2>&1
 
 # Create the wall film region via extrusion
 runApplication extrudeToRegionMesh \
diff --git a/wmake/wmakeLnInclude b/wmake/wmakeLnInclude
index b4a59d3dec48f09219a91a8b21c83bda7b7868a5..c43363339c2e29f54673ceb7eb0bf34e73470c88 100755
--- a/wmake/wmakeLnInclude
+++ b/wmake/wmakeLnInclude
@@ -28,7 +28,7 @@
 # Description
 #     Link all the source files in the <dir> directory into <dir>/lnInclude
 #
-#     Usage: wmakeLnInclude [-f] <dir> [-lnOption]
+#     Usage: wmakeLnInclude [-f] <dir>
 #
 #     The desired source files:
 #         *.C *.H *.h *.cpp *.cxx *.hpp *.hxx
@@ -43,13 +43,13 @@ usage() {
     while [ "$#" -ge 1 ]; do echo "$1"; shift; done
     cat<<USAGE
 
-usage: $Script [-f] <dir> [-lnOption]
+usage: $Script [-f] <dir>
 
     Link all the source files in the <dir> into <dir>/lnInclude
 
 Note
     The '-f' option forces an update when the lnInclude directory already exists
-    and also changes the default linking from 'ln -s' to 'ln -sf'.
+    and changes the default linking from 'ln -s' to 'ln -sf'.
 
 USAGE
     exit 1
@@ -89,10 +89,6 @@ done
 if [ $# -eq 1 ]
 then
     baseDir=$1
-elif [ $# -eq 2 ]
-then
-    baseDir=$1
-    lnOpt="$2"
 else
     usage "ERROR: incorrect number of arguments"
 fi