diff --git a/applications/test/CompactIOList/Make/files b/applications/test/CompactIOList/Make/files
index 7e2cf985bf..c5513ed5c1 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 12178dd469..7b7e043c6e 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 c2641f6e2f..01ae37f02e 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 ab30b8bb5d..7545aeb55f 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 bcf6af7ece..da93962659 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 561605b6a7..b496842582 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 56e8f0ffa7..f8f0bb64df 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 42c01a053e..2e037f6a34 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 530b662525..bd6929f838 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 0728e72bc1..dcfee8af13 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 b4b57ffc76..239bab4cd7 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 4c846a2c33..4b90d400c6 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 13884d64f4..53d1e07699 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 a5f1087728..fd270ac217 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 2d0e54d6e3..599e2ad9bf 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 9b5b00ccc1..ceb5fc148f 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 e88d4acec8..2f212b0042 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 ac59789e88..397e90c6d0 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 99fa29929c..0000000000
--- 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 8695836db1..0000000000
--- 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 f6ed74ee6c..35935365d6 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 7d6fd21419..61590a85e6 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 b5e2f3c685..e167e86cdc 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 a6601226fa..e861aaa1b2 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 0000000000..dcf13f548b
--- /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 e678a1c0e0..6a97b686ac 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 0550b66617..0000000000
--- 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 8c96d099c1..364cbc91b7 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 f2f2540e6a..491f2572f3 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 e06685c8b3..93a37615fc 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 7d47532f1b..2357969e13 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 3d39328952..76843f21f9 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 bb1f3085fa..ce31f2fa8d 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 0e119bc4f3..3291f428b5 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 0704f9b826..6ff803f098 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 0000000000..3621add307
--- /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 8940e1ec4f..54c035b8f5 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 598fccfecf..10afa7540e 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 4bfd49bde0..e3e9b2724a 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 b046754ac1..0246338b49 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 4100a2d4fe..e8d76bddc0 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 bac600a9cd..be0026f0cd 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 c3feead38e..b4b931202d 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 0000000000..8f70521989
--- /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 8b43119aef..0000000000
--- 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 e036a10532..5b51a06854 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 bd1eab1e8a..bfc8ff6b92 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 f373d8da35..54f2090fa1 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 f503f61b09..491dc94706 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 b32b5bd950..c514002f99 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 cde1970d78..79fef3bb93 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 c7e4dc9043..0000000000
--- 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 89e563518a..c2f7d8f6fe 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 f8bf00e24b..14b33c1cc7 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 b9363efb23..ae255d4474 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 fcffbec3d3..36a682e281 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 65f39a47b8..d33cd29958 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 a052e1b5eb..77222bef7e 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 51380f63b5..092748d0ef 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 236668cde8..7498657dfc 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 98fd335a17..dc11b03c86 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 4b7575a038..19131960ba 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 8363e079a2..0554a4eadf 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 809cf2db15..e44d4c5394 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 fcfbd3e92f..281d03f0ef 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 eb39f3ac88..52262afb8e 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 e16d69f14d..db4b17b98c 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 08c41f8db9..f8f795b787 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 cb25b3090f..ba9900cd82 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 e3998a4a04..5a6d5d9703 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 dc5877e383..80e30e0d4a 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 1c69ce1c70..337a894c04 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 88c51d18f1..2ee857cb03 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 408fe21b8f..344e4ddc20 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 1f7ba5ca5e..3e2bc861e7 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 6d39ae027f..bc4c435bf6 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 0000000000..69b87cfc1e
--- /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 35e8a4ab85..175cf949e9 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 de4f827ffe..0800b4db3b 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 3190556e21..f7e2a956a1 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/mesh/Make/files b/applications/test/mesh/Make/files
index 2ba7eeb62b..b3c5699667 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 6d2483b76c..7e509e344c 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 89848e34fb..0fbfa5cdf2 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 6cf0b98c5b..a8a5bf9758 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 d8829db8cb..e3298a3c68 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 5beac181d8..5fb7864f1c 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 d351141bdc..bbe9e3411b 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 8f37e90b6a..94b92f08cb 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 430cd299df..7cebcf09d9 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 8abb292dd0..f5dfb2e4ac 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 1a93cde7a3..43afc08055 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 ca03416955..74e2ec1cfa 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 29c2ead604..7411537dca 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 576d23c827..89b935d16d 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 9b7ce02abf..448f29c5ff 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 a6d9519c2c..a12813a907 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 a654511707..d20b7df0dd 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 901da54f07..28fa008d1f 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 8a484c171d..80ac68cc2a 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 2da85a30dd..c46836443a 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 5840954062..2b80bbe4f7 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 c0a650baca..e490d043f9 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 e2072db060..e9a7766f8f 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 8440d05c1d..cbd72e0260 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 0000000000..bc4e6706b5
--- /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 dae64db89f..0000000000
--- 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 0000000000..b2344b7760
--- /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 ccb0187615..0000000000
--- 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 12d2faa1be..93a6442d5e 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 68f1cca994..56acc328ec 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 32363bd45a..2bcadc3218 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 a9461cc16e..bcfa35a1f0 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 89f301b074..5759a13d3a 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/tensor/Make/files b/applications/test/tensor/Make/files
index d772d61629..34d6a3cdac 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 7f30bf0c23..0000000000
--- 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 b7dfa692c2..c3dd60a71d 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 63484dea1f..96e730b409 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 0000000000..b4ce91199e
--- /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 42da6e3418..971e4950d9 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 c2db390007..0000000000
--- 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 d1e128ece9..c00f7ea53f 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 95cdf62b07..62f06825ea 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 5b609d3ed0..e442aa0a7c 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 7dbcacf32d..3d6449e016 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 1cb69f314c..b22ac6da4c 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 d3c1cd8ac2..bbe20a4c7e 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