diff --git a/applications/test/Distribution/Make/files b/applications/test/Distribution/Make/files
index 3585a60fc1..3b3486c124 100644
--- a/applications/test/Distribution/Make/files
+++ b/applications/test/Distribution/Make/files
@@ -1,3 +1,3 @@
-DistributionTest.C
+Test-Distribution.C
 
 EXE = $(FOAM_USER_APPBIN)/Test-DistributionTest
diff --git a/applications/test/Distribution/DistributionTest.C b/applications/test/Distribution/Test-Distribution.C
similarity index 99%
rename from applications/test/Distribution/DistributionTest.C
rename to applications/test/Distribution/Test-Distribution.C
index f6da957fb9..8f84237019 100644
--- a/applications/test/Distribution/DistributionTest.C
+++ b/applications/test/Distribution/Test-Distribution.C
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Application
-    DistributionTest
+    Test-Distribution
 
 Description
     Test the Distribution class
diff --git a/applications/test/HashTable2/Make/files b/applications/test/HashTable2/Make/files
index 2bf9c9217d..e5bc377b8b 100644
--- a/applications/test/HashTable2/Make/files
+++ b/applications/test/HashTable2/Make/files
@@ -1,3 +1,3 @@
-hashTableTest2.C
+Test-HashTable2.C
 
-EXE = $(FOAM_USER_APPBIN)/hashTableTest2
+EXE = $(FOAM_USER_APPBIN)/Test-HashTable2
diff --git a/applications/test/HashTable2/hashTableTest2.C b/applications/test/HashTable2/Test-HashTable2.C
similarity index 95%
rename from applications/test/HashTable2/hashTableTest2.C
rename to applications/test/HashTable2/Test-HashTable2.C
index f1bfd70c04..468c3960a0 100644
--- a/applications/test/HashTable2/hashTableTest2.C
+++ b/applications/test/HashTable2/Test-HashTable2.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,6 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Description
+    Miscellaneous tests for HashTable
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/applications/test/HashTable3/Make/files b/applications/test/HashTable3/Make/files
index e8ec193ffa..67aef16a29 100644
--- a/applications/test/HashTable3/Make/files
+++ b/applications/test/HashTable3/Make/files
@@ -1,3 +1,3 @@
-hashTableTest3.C
+Test-HashTable3.C
 
-EXE = $(FOAM_USER_APPBIN)/hashTableTest3
+EXE = $(FOAM_USER_APPBIN)/Test-HashTable3
diff --git a/applications/test/HashTable3/hashTableTest3.C b/applications/test/HashTable3/Test-HashTable3.C
similarity index 97%
rename from applications/test/HashTable3/hashTableTest3.C
rename to applications/test/HashTable3/Test-HashTable3.C
index e295b861da..8931084ef2 100644
--- a/applications/test/HashTable3/hashTableTest3.C
+++ b/applications/test/HashTable3/Test-HashTable3.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,7 +22,6 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Description
-
     Test speeds for some HashTable operations
 
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/NamedEnum/Make/files b/applications/test/NamedEnum/Make/files
index e861aaa1b2..755b72ba5e 100644
--- a/applications/test/NamedEnum/Make/files
+++ b/applications/test/NamedEnum/Make/files
@@ -1,3 +1,3 @@
 Test-namedEnum.C
 
-EXE = $(FOAM_USER_APPBIN)/NamedEnum
+EXE = $(FOAM_USER_APPBIN)/Test-NamedEnum
diff --git a/applications/test/dimensionedType/Make/files b/applications/test/dimensionedType/Make/files
index 36a682e281..38f7d4ee8d 100644
--- a/applications/test/dimensionedType/Make/files
+++ b/applications/test/dimensionedType/Make/files
@@ -1,3 +1,3 @@
 Test-dimensionedType.C
 
-EXE = $(FOAM_USER_APPBIN)/dimensionedType
+EXE = $(FOAM_USER_APPBIN)/Test-dimensionedType
diff --git a/applications/test/pTraits/Make/files b/applications/test/pTraits/Make/files
index 7cebcf09d9..268e879af2 100644
--- a/applications/test/pTraits/Make/files
+++ b/applications/test/pTraits/Make/files
@@ -1,2 +1,2 @@
 Test-pTraits.C
-EXE = $(FOAM_USER_APPBIN)/pTraits
+EXE = $(FOAM_USER_APPBIN)/Test-pTraits
diff --git a/applications/test/simpleMatrix/Make/files b/applications/test/simpleMatrix/Make/files
index 2b80bbe4f7..804d3ecefe 100644
--- a/applications/test/simpleMatrix/Make/files
+++ b/applications/test/simpleMatrix/Make/files
@@ -1,3 +1,3 @@
 Test-simpleMatrix.C
 
-EXE = $(FOAM_USER_APPBIN)/simpleMatrix
+EXE = $(FOAM_USER_APPBIN)/Test-simpleMatrix