diff --git a/lib/Cake/Test/Case/Cache/Engine/MemcacheTest.php b/lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php
similarity index 100%
rename from lib/Cake/Test/Case/Cache/Engine/MemcacheTest.php
rename to lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php
diff --git a/lib/Cake/Test/Case/Cache/Engine/XcacheTest.php b/lib/Cake/Test/Case/Cache/Engine/XcacheEngineTest.php
similarity index 100%
rename from lib/Cake/Test/Case/Cache/Engine/XcacheTest.php
rename to lib/Cake/Test/Case/Cache/Engine/XcacheEngineTest.php
diff --git a/lib/Cake/Test/Case/Console/Command/CommandListShellTest.php b/lib/Cake/Test/Case/Console/Command/CommandListShellTest.php
index 47303ce7b..556a6e742 100644
--- a/lib/Cake/Test/Case/Console/Command/CommandListShellTest.php
+++ b/lib/Cake/Test/Case/Console/Command/CommandListShellTest.php
@@ -31,7 +31,7 @@ class TestStringOutput extends ConsoleOutput {
 	}
 }
 
-class CommandListTest extends CakeTestCase {
+class CommandListShellTest extends CakeTestCase {
 /**
  * setUp method
  *
diff --git a/lib/Cake/Test/Case/Controller/Component/PaginatorComponentTest.php b/lib/Cake/Test/Case/Controller/Component/PaginatorComponentTest.php
index 2b4e8778d..c299a16db 100644
--- a/lib/Cake/Test/Case/Controller/Component/PaginatorComponentTest.php
+++ b/lib/Cake/Test/Case/Controller/Component/PaginatorComponentTest.php
@@ -183,7 +183,7 @@ class PaginatorControllerComment extends CakeTestModel {
 	public $alias = 'PaginatorControllerComment';
 }
 
-class PaginatorTest extends CakeTestCase {
+class PaginatorComponentTest extends CakeTestCase {
 
 /**
  * fixtures property
@@ -743,4 +743,4 @@ class PaginatorTest extends CakeTestCase {
 		$result = $Controller->paginate('PaginatorControllerPost');
 		$this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['options']['limit'], 2000);
 	}
-}
\ No newline at end of file
+}
diff --git a/lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php b/lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
index 371b4eb7d..45acec72d 100644
--- a/lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
+++ b/lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
@@ -28,7 +28,7 @@ require_once dirname(dirname(dirname(__FILE__))) . DS . 'models.php';
  *
  * @package       Cake.Test.Case.Model.Datasource.Database
  */
-class DboMysqlTest extends CakeTestCase {
+class MysqlTest extends CakeTestCase {
 /**
  * autoFixtures property
  *
diff --git a/lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php b/lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
index 06930677f..459acfd51 100644
--- a/lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
+++ b/lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
@@ -183,11 +183,11 @@ class PostgresClientTestModel extends Model {
 }
 
 /**
- * DboPostgresTest class
+ * PostgresTest class
  *
  * @package       Cake.Test.Case.Model.Datasource.Database
  */
-class DboPostgresTest extends CakeTestCase {
+class PostgresTest extends CakeTestCase {
 
 /**
  * Do not automatically load fixtures for each test, they will be loaded manually
diff --git a/lib/Cake/Test/Case/Model/Datasource/Database/SqliteTest.php b/lib/Cake/Test/Case/Model/Datasource/Database/SqliteTest.php
index 50e33b772..5ba37a212 100644
--- a/lib/Cake/Test/Case/Model/Datasource/Database/SqliteTest.php
+++ b/lib/Cake/Test/Case/Model/Datasource/Database/SqliteTest.php
@@ -60,7 +60,7 @@ class DboSqliteTestDb extends Sqlite {
  *
  * @package       Cake.Test.Case.Model.Datasource.Database
  */
-class DboSqliteTest extends CakeTestCase {
+class SqliteTest extends CakeTestCase {
 
 /**
  * Do not automatically load fixtures for each test, they will be loaded manually using CakeTestCase::loadFixtures
diff --git a/lib/Cake/Test/Case/Network/CakeRequestTest.php b/lib/Cake/Test/Case/Network/CakeRequestTest.php
index c8b3b0e3d..05c07601b 100644
--- a/lib/Cake/Test/Case/Network/CakeRequestTest.php
+++ b/lib/Cake/Test/Case/Network/CakeRequestTest.php
@@ -21,7 +21,7 @@ App::uses('Dispatcher', 'Routing');
 App::uses('Xml', 'Utility');
 App::uses('CakeRequest', 'Network');
 
-class CakeRequestTestCase extends CakeTestCase {
+class CakeRequestTest extends CakeTestCase {
 /**
  * setup callback
  *
diff --git a/lib/Cake/Test/Case/Network/CakeResponseTest.php b/lib/Cake/Test/Case/Network/CakeResponseTest.php
index b585c0e3c..2293e2bc5 100644
--- a/lib/Cake/Test/Case/Network/CakeResponseTest.php
+++ b/lib/Cake/Test/Case/Network/CakeResponseTest.php
@@ -1,8 +1,24 @@
 <?php
-
+/**
+ * CakeResponse Test case file.
+ *
+ * PHP 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       Cake.Test.Case.Network
+ * @since         CakePHP(tm) v 2.0
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
 App::uses('CakeResponse', 'Network');
 
-class CakeResponseTestCase extends CakeTestCase {
+class CakeResponseTest extends CakeTestCase {
 
 /**
 * Tests the request object constructor
diff --git a/lib/Cake/Test/Case/Network/Http/BasicAuthenticationTest.php b/lib/Cake/Test/Case/Network/Http/BasicAuthenticationTest.php
index ff3ba5683..34e03b9c9 100644
--- a/lib/Cake/Test/Case/Network/Http/BasicAuthenticationTest.php
+++ b/lib/Cake/Test/Case/Network/Http/BasicAuthenticationTest.php
@@ -25,7 +25,7 @@ App::uses('BasicAuthentication', 'Network/Http');
  *
  * @package       Cake.Test.Case.Network.Http
  */
-class BasicMethodTest extends CakeTestCase {
+class BasicAuthenticationTest extends CakeTestCase {
 
 /**
  * testAuthentication method
@@ -61,4 +61,4 @@ class BasicMethodTest extends CakeTestCase {
 		$this->assertEqual($http->request['header']['Proxy-Authorization'], 'Basic bWFyazpzZWNyZXQ=');
 	}
 
-}
\ No newline at end of file
+}
diff --git a/lib/Cake/Test/Case/Routing/Route/CakeRouteTest.php b/lib/Cake/Test/Case/Routing/Route/CakeRouteTest.php
index e38d0188a..fc5e4371a 100644
--- a/lib/Cake/Test/Case/Routing/Route/CakeRouteTest.php
+++ b/lib/Cake/Test/Case/Routing/Route/CakeRouteTest.php
@@ -8,7 +8,7 @@ App::uses('Router', 'Routing');
  *
  * @package       Cake.Test.Case.Routing.Route
  **/
-class CakeRouteTestCase extends CakeTestCase {
+class CakeRouteTest extends CakeTestCase {
 /**
  * setUp method
  *
diff --git a/lib/Cake/Test/Case/View/Helper/MootoolsEngineHelperTest.php b/lib/Cake/Test/Case/View/Helper/MootoolsEngineHelperTest.php
index bf4307b09..3155eb96f 100644
--- a/lib/Cake/Test/Case/View/Helper/MootoolsEngineHelperTest.php
+++ b/lib/Cake/Test/Case/View/Helper/MootoolsEngineHelperTest.php
@@ -26,7 +26,7 @@ App::uses('HtmlHelper', 'View/Helper');
 App::uses('JsHelper', 'View/Helper');
 App::uses('MootoolsEngineHelper', 'View/Helper');
 
-class MooEngineHelperTest extends CakeTestCase {
+class MootoolsEngineHelperTest extends CakeTestCase {
 /**
  * setUp
  *