diff --git a/lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php b/lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php
index 2060d1527..1ae64fde6 100644
--- a/lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php
+++ b/lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php
@@ -20,7 +20,7 @@ App::uses('Cache', 'Cache');
 App::uses('MemcacheEngine', 'Cache/Engine');
 
 /**
- * Class TestMemcacheEngine
+ * TestMemcacheEngine
  *
  * @package       Cake.Test.Case.Cache.Engine
  */
diff --git a/lib/Cake/Test/Case/Cache/Engine/MemcachedEngineTest.php b/lib/Cake/Test/Case/Cache/Engine/MemcachedEngineTest.php
index babdf9779..9bce33ea4 100644
--- a/lib/Cake/Test/Case/Cache/Engine/MemcachedEngineTest.php
+++ b/lib/Cake/Test/Case/Cache/Engine/MemcachedEngineTest.php
@@ -22,7 +22,7 @@ App::uses('Cache', 'Cache');
 App::uses('MemcachedEngine', 'Cache/Engine');
 
 /**
- * Class TestMemcachedEngine
+ * TestMemcachedEngine
  *
  * @package       Cake.Test.Case.Cache.Engine
  */
diff --git a/lib/Cake/Test/Case/Configure/IniReaderTest.php b/lib/Cake/Test/Case/Configure/IniReaderTest.php
index ed7129eba..b53d56cf2 100644
--- a/lib/Cake/Test/Case/Configure/IniReaderTest.php
+++ b/lib/Cake/Test/Case/Configure/IniReaderTest.php
@@ -19,7 +19,7 @@
 App::uses('IniReader', 'Configure');
 
 /**
- * Class IniReaderTest
+ * IniReaderTest
  *
  * @package       Cake.Test.Case.Configure
  */
diff --git a/lib/Cake/Test/Case/Configure/PhpReaderTest.php b/lib/Cake/Test/Case/Configure/PhpReaderTest.php
index 6d108c5ed..1dea44b73 100644
--- a/lib/Cake/Test/Case/Configure/PhpReaderTest.php
+++ b/lib/Cake/Test/Case/Configure/PhpReaderTest.php
@@ -19,7 +19,7 @@
 App::uses('PhpReader', 'Configure');
 
 /**
- * Class PhpReaderTest
+ * PhpReaderTest
  *
  * @package       Cake.Test.Case.Configure
  */
diff --git a/lib/Cake/Test/Case/Console/Command/CommandListShellTest.php b/lib/Cake/Test/Case/Console/Command/CommandListShellTest.php
index db0389617..7f2fda731 100644
--- a/lib/Cake/Test/Case/Console/Command/CommandListShellTest.php
+++ b/lib/Cake/Test/Case/Console/Command/CommandListShellTest.php
@@ -23,7 +23,7 @@ App::uses('Shell', 'Console');
 App::uses('CommandTask', 'Console/Command/Task');
 
 /**
- * Class TestStringOutput
+ * TestStringOutput
  *
  * @package       Cake.Test.Case.Console.Command
  */
@@ -38,7 +38,7 @@ class TestStringOutput extends ConsoleOutput {
 }
 
 /**
- * Class CommandListShellTest
+ * CommandListShellTest
  *
  * @package       Cake.Test.Case.Console.Command
  */
diff --git a/lib/Cake/Test/Case/Console/Command/CompletionShellTest.php b/lib/Cake/Test/Case/Console/Command/CompletionShellTest.php
index b28db0c65..aeb85606e 100644
--- a/lib/Cake/Test/Case/Console/Command/CompletionShellTest.php
+++ b/lib/Cake/Test/Case/Console/Command/CompletionShellTest.php
@@ -25,7 +25,7 @@ App::uses('Shell', 'Console');
 App::uses('CommandTask', 'Console/Command/Task');
 
 /**
- * Class TestCompletionStringOutput
+ * TestCompletionStringOutput
  *
  * @package       Cake.Test.Case.Console.Command
  */
@@ -40,7 +40,7 @@ class TestCompletionStringOutput extends ConsoleOutput {
 }
 
 /**
- * Class CompletionShellTest
+ * CompletionShellTest
  *
  * @package       Cake.Test.Case.Console.Command
  */
diff --git a/lib/Cake/Test/Case/Console/Command/Task/ControllerTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/ControllerTaskTest.php
index ded7e9596..40a843dc1 100644
--- a/lib/Cake/Test/Case/Console/Command/Task/ControllerTaskTest.php
+++ b/lib/Cake/Test/Case/Console/Command/Task/ControllerTaskTest.php
@@ -39,7 +39,7 @@ if (!$imported) {
 	define('ARTICLE_MODEL_CREATED', true);
 
 /**
- * Class BakeArticle
+ * BakeArticle
  */
 	class BakeArticle extends Model {
 
diff --git a/lib/Cake/Test/Case/Console/Command/TestShellTest.php b/lib/Cake/Test/Case/Console/Command/TestShellTest.php
index bcc100628..bde6c0d8c 100644
--- a/lib/Cake/Test/Case/Console/Command/TestShellTest.php
+++ b/lib/Cake/Test/Case/Console/Command/TestShellTest.php
@@ -20,7 +20,7 @@ App::uses('ShellDispatcher', 'Console');
 App::uses('TestShell', 'Console/Command');
 
 /**
- * Class TestTestShell
+ * TestTestShell
  *
  * @package       Cake.Test.Case.Console.Command
  */
@@ -37,7 +37,7 @@ class TestTestShell extends TestShell {
 }
 
 /**
- * Class TestShellTest
+ * TestShellTest
  *
  * @package       Cake.Test.Case.Console.Command
  */
diff --git a/lib/Cake/Test/Case/Console/ConsoleOptionParserTest.php b/lib/Cake/Test/Case/Console/ConsoleOptionParserTest.php
index 5a194db08..ecf5c0abb 100644
--- a/lib/Cake/Test/Case/Console/ConsoleOptionParserTest.php
+++ b/lib/Cake/Test/Case/Console/ConsoleOptionParserTest.php
@@ -19,7 +19,7 @@
 App::uses('ConsoleOptionParser', 'Console');
 
 /**
- * Class ConsoleOptionParserTest
+ * ConsoleOptionParserTest
  *
  * @package       Cake.Test.Case.Console
  */
diff --git a/lib/Cake/Test/Case/Console/ConsoleOutputTest.php b/lib/Cake/Test/Case/Console/ConsoleOutputTest.php
index 8925428b4..76bdee0e7 100644
--- a/lib/Cake/Test/Case/Console/ConsoleOutputTest.php
+++ b/lib/Cake/Test/Case/Console/ConsoleOutputTest.php
@@ -19,7 +19,7 @@
 App::uses('ConsoleOutput', 'Console');
 
 /**
- * Class ConsoleOutputTest
+ * ConsoleOutputTest
  *
  * @package       Cake.Test.Case.Console
  */
diff --git a/lib/Cake/Test/Case/Console/HelpFormatterTest.php b/lib/Cake/Test/Case/Console/HelpFormatterTest.php
index b364eedc0..77375f63b 100644
--- a/lib/Cake/Test/Case/Console/HelpFormatterTest.php
+++ b/lib/Cake/Test/Case/Console/HelpFormatterTest.php
@@ -20,7 +20,7 @@ App::uses('ConsoleOptionParser', 'Console');
 App::uses('HelpFormatter', 'Console');
 
 /**
- * Class HelpFormatterTest
+ * HelpFormatterTest
  *
  * @package       Cake.Test.Case.Console
  */
diff --git a/lib/Cake/Test/Case/Console/TaskCollectionTest.php b/lib/Cake/Test/Case/Console/TaskCollectionTest.php
index 4d5c0a116..55418d26b 100644
--- a/lib/Cake/Test/Case/Console/TaskCollectionTest.php
+++ b/lib/Cake/Test/Case/Console/TaskCollectionTest.php
@@ -26,7 +26,7 @@ class DbConfigAliasedTask extends Shell {
 }
 
 /**
- * Class TaskCollectionTest
+ * TaskCollectionTest
  *
  * @package       Cake.Test.Case.Console
  */
diff --git a/lib/Cake/Test/Case/Controller/Component/Auth/ActionsAuthorizeTest.php b/lib/Cake/Test/Case/Controller/Component/Auth/ActionsAuthorizeTest.php
index 25bf7b99b..6a9aa546b 100644
--- a/lib/Cake/Test/Case/Controller/Component/Auth/ActionsAuthorizeTest.php
+++ b/lib/Cake/Test/Case/Controller/Component/Auth/ActionsAuthorizeTest.php
@@ -23,7 +23,7 @@ App::uses('CakeRequest', 'Network');
 App::uses('CakeResponse', 'Network');
 
 /**
- * Class ActionsAuthorizeTest
+ * ActionsAuthorizeTest
  *
  * @package       Cake.Test.Case.Controller.Component.Auth
  */
diff --git a/lib/Cake/Test/Case/Controller/Component/Auth/ControllerAuthorizeTest.php b/lib/Cake/Test/Case/Controller/Component/Auth/ControllerAuthorizeTest.php
index 3216cdc3a..b0f554bf4 100644
--- a/lib/Cake/Test/Case/Controller/Component/Auth/ControllerAuthorizeTest.php
+++ b/lib/Cake/Test/Case/Controller/Component/Auth/ControllerAuthorizeTest.php
@@ -22,7 +22,7 @@ App::uses('CakeRequest', 'Network');
 App::uses('CakeResponse', 'Network');
 
 /**
- * Class ControllerAuthorizeTest
+ * ControllerAuthorizeTest
  *
  * @package       Cake.Test.Case.Controller.Component.Auth
  */
diff --git a/lib/Cake/Test/Case/Controller/Component/Auth/CrudAuthorizeTest.php b/lib/Cake/Test/Case/Controller/Component/Auth/CrudAuthorizeTest.php
index e87e40937..e649b1c69 100644
--- a/lib/Cake/Test/Case/Controller/Component/Auth/CrudAuthorizeTest.php
+++ b/lib/Cake/Test/Case/Controller/Component/Auth/CrudAuthorizeTest.php
@@ -23,7 +23,7 @@ App::uses('CakeRequest', 'Network');
 App::uses('CakeResponse', 'Network');
 
 /**
- * Class CrudAuthorizeTest
+ * CrudAuthorizeTest
  *
  * @package       Cake.Test.Case.Controller.Component.Auth
  */
diff --git a/lib/Cake/Test/Case/Log/Engine/ConsoleLogTest.php b/lib/Cake/Test/Case/Log/Engine/ConsoleLogTest.php
index f177488dc..4d85705aa 100644
--- a/lib/Cake/Test/Case/Log/Engine/ConsoleLogTest.php
+++ b/lib/Cake/Test/Case/Log/Engine/ConsoleLogTest.php
@@ -19,7 +19,7 @@
 App::uses('ConsoleLog', 'Log/Engine');
 
 /**
- * Class TestConsoleLog
+ * TestConsoleLog
  *
  * @package       Cake.Test.Case.Log.Engine
  */
@@ -28,7 +28,7 @@ class TestConsoleLog extends ConsoleLog {
 }
 
 /**
- * Class TestCakeLog
+ * TestCakeLog
  *
  * @package       Cake.Test.Case.Log.Engine
  */
diff --git a/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php b/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php
index bb263076d..d6cd59fa7 100644
--- a/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php
+++ b/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php
@@ -21,7 +21,7 @@ App::uses('DatabaseSession', 'Model/Datasource/Session');
 App::uses('CacheSession', 'Model/Datasource/Session');
 
 /**
- * Class TestCakeSession
+ * TestCakeSession
  *
  * @package       Cake.Test.Case.Model.Datasource
  */
@@ -38,7 +38,7 @@ class TestCakeSession extends CakeSession {
 }
 
 /**
- * Class TestCacheSession
+ * TestCacheSession
  *
  * @package       Cake.Test.Case.Model.Datasource
  */
@@ -51,7 +51,7 @@ class TestCacheSession extends CacheSession {
 }
 
 /**
- * Class TestDatabaseSession
+ * TestDatabaseSession
  *
  * @package       Cake.Test.Case.Model.Datasource
  */
diff --git a/lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php b/lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
index 8882282d4..b50ff3136 100644
--- a/lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
+++ b/lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
@@ -27,7 +27,7 @@ App::uses('MockDataSource', 'Model/Datasource');
 require_once dirname(dirname(__FILE__)) . DS . 'models.php';
 
 /**
- * Class MockPDO
+ * MockPDO
  *
  * @package       Cake.Test.Case.Model.Datasource
  */
@@ -42,7 +42,7 @@ class MockPDO extends PDO {
 }
 
 /**
- * Class MockDataSource
+ * MockDataSource
  *
  * @package       Cake.Test.Case.Model.Datasource
  */
@@ -50,7 +50,7 @@ class MockDataSource extends DataSource {
 }
 
 /**
- * Class DboTestSource
+ * DboTestSource
  *
  * @package       Cake.Test.Case.Model.Datasource
  */
@@ -81,7 +81,7 @@ class DboTestSource extends DboSource {
 }
 
 /**
- * Class DboSecondTestSource
+ * DboSecondTestSource
  *
  * @package       Cake.Test.Case.Model.Datasource
  */
diff --git a/lib/Cake/Test/Case/Model/Datasource/Session/CacheSessionTest.php b/lib/Cake/Test/Case/Model/Datasource/Session/CacheSessionTest.php
index 387c05fc1..733a24060 100644
--- a/lib/Cake/Test/Case/Model/Datasource/Session/CacheSessionTest.php
+++ b/lib/Cake/Test/Case/Model/Datasource/Session/CacheSessionTest.php
@@ -21,7 +21,7 @@ App::uses('CacheSession', 'Model/Datasource/Session');
 class_exists('CakeSession');
 
 /**
- * Class CacheSessionTest
+ * CacheSessionTest
  *
  * @package       Cake.Test.Case.Model.Datasource.Session
  */
diff --git a/lib/Cake/Test/Case/Model/Datasource/Session/DatabaseSessionTest.php b/lib/Cake/Test/Case/Model/Datasource/Session/DatabaseSessionTest.php
index fb5b0bfef..7e7e57ec5 100644
--- a/lib/Cake/Test/Case/Model/Datasource/Session/DatabaseSessionTest.php
+++ b/lib/Cake/Test/Case/Model/Datasource/Session/DatabaseSessionTest.php
@@ -22,7 +22,7 @@ App::uses('DatabaseSession', 'Model/Datasource/Session');
 class_exists('CakeSession');
 
 /**
- * Class SessionTestModel
+ * SessionTestModel
  *
  * @package       Cake.Test.Case.Model.Datasource.Session
  */
diff --git a/lib/Cake/Test/Case/Model/ModelCrossSchemaHabtmTest.php b/lib/Cake/Test/Case/Model/ModelCrossSchemaHabtmTest.php
index ed2316d6b..cae9a4c6c 100644
--- a/lib/Cake/Test/Case/Model/ModelCrossSchemaHabtmTest.php
+++ b/lib/Cake/Test/Case/Model/ModelCrossSchemaHabtmTest.php
@@ -21,7 +21,7 @@
 require_once dirname(__FILE__) . DS . 'ModelTestBase.php';
 
 /**
- * Class ModelCrossSchemaHabtmTest
+ * ModelCrossSchemaHabtmTest
  *
  * @package       Cake.Test.Case.Model
  */
diff --git a/lib/Cake/Test/Case/Network/CakeRequestTest.php b/lib/Cake/Test/Case/Network/CakeRequestTest.php
index 66bd69fc5..1472ac666 100644
--- a/lib/Cake/Test/Case/Network/CakeRequestTest.php
+++ b/lib/Cake/Test/Case/Network/CakeRequestTest.php
@@ -21,7 +21,7 @@ App::uses('Xml', 'Utility');
 App::uses('CakeRequest', 'Network');
 
 /**
- * Class TestCakeRequest
+ * TestCakeRequest
  *
  * @package       Cake.Test.Case.Network
  */
@@ -55,7 +55,7 @@ class TestCakeRequest extends CakeRequest {
 }
 
 /**
- * Class CakeRequestTest
+ * CakeRequestTest
  */
 class CakeRequestTest extends CakeTestCase {
 
diff --git a/lib/Cake/Test/Case/Network/CakeResponseTest.php b/lib/Cake/Test/Case/Network/CakeResponseTest.php
index cff657d62..66e9530a1 100644
--- a/lib/Cake/Test/Case/Network/CakeResponseTest.php
+++ b/lib/Cake/Test/Case/Network/CakeResponseTest.php
@@ -18,7 +18,7 @@ App::uses('CakeResponse', 'Network');
 App::uses('CakeRequest', 'Network');
 
 /**
- * Class CakeResponseTest
+ * CakeResponseTest
  *
  * @package       Cake.Test.Case.Network
  */
diff --git a/lib/Cake/Test/Case/Network/Http/BasicAuthenticationTest.php b/lib/Cake/Test/Case/Network/Http/BasicAuthenticationTest.php
index 7ae8349b3..fd7ec4566 100644
--- a/lib/Cake/Test/Case/Network/Http/BasicAuthenticationTest.php
+++ b/lib/Cake/Test/Case/Network/Http/BasicAuthenticationTest.php
@@ -20,7 +20,7 @@ App::uses('HttpSocket', 'Network/Http');
 App::uses('BasicAuthentication', 'Network/Http');
 
 /**
- * class TestSslHttpSocket
+ * TestSslHttpSocket
  *
  * @package       Cake.Test.Case.Network.Http
  */
diff --git a/lib/Cake/Test/Case/Network/Http/DigestAuthenticationTest.php b/lib/Cake/Test/Case/Network/Http/DigestAuthenticationTest.php
index 3610427c5..1b17c6562 100644
--- a/lib/Cake/Test/Case/Network/Http/DigestAuthenticationTest.php
+++ b/lib/Cake/Test/Case/Network/Http/DigestAuthenticationTest.php
@@ -20,7 +20,7 @@ App::uses('HttpSocket', 'Network/Http');
 App::uses('DigestAuthentication', 'Network/Http');
 
 /**
- * Class DigestHttpSocket
+ * DigestHttpSocket
  *
  * @package       Cake.Test.Case.Network.Http
  */
diff --git a/lib/Cake/Test/Case/Routing/Filter/AssetDispatcherTest.php b/lib/Cake/Test/Case/Routing/Filter/AssetDispatcherTest.php
index c67cba384..49b4c6656 100644
--- a/lib/Cake/Test/Case/Routing/Filter/AssetDispatcherTest.php
+++ b/lib/Cake/Test/Case/Routing/Filter/AssetDispatcherTest.php
@@ -19,7 +19,7 @@ App::uses('CakeEvent', 'Event');
 App::uses('CakeResponse', 'Network');
 
 /**
- * Class AssetDispatcherTest
+ * AssetDispatcherTest
  *
  * @package       Cake.Test.Case.Routing.Filter
  */
diff --git a/lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php b/lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php
index 41e158ed8..4f47c1e10 100644
--- a/lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php
+++ b/lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php
@@ -65,7 +65,7 @@ if (!class_exists('AppController', false)) {
 if (!class_exists('PostsController')) {
 
 /**
- * Class PostsController
+ * PostsController
  *
  * @package       Cake.Test.Case.TestSuite
  */
diff --git a/lib/Cake/Test/Case/TestSuite/HtmlCoverageReportTest.php b/lib/Cake/Test/Case/TestSuite/HtmlCoverageReportTest.php
index 6763d2f1f..24fe7e866 100644
--- a/lib/Cake/Test/Case/TestSuite/HtmlCoverageReportTest.php
+++ b/lib/Cake/Test/Case/TestSuite/HtmlCoverageReportTest.php
@@ -22,7 +22,7 @@ App::uses('HtmlCoverageReport', 'TestSuite/Coverage');
 App::uses('CakeBaseReporter', 'TestSuite/Reporter');
 
 /**
- * Class HtmlCoverageReportTest
+ * HtmlCoverageReportTest
  *
  * @package       Cake.Test.Case.TestSuite
  */
diff --git a/lib/Cake/Test/Case/Utility/HashTest.php b/lib/Cake/Test/Case/Utility/HashTest.php
index cb97f60e2..d92c7614f 100644
--- a/lib/Cake/Test/Case/Utility/HashTest.php
+++ b/lib/Cake/Test/Case/Utility/HashTest.php
@@ -17,7 +17,7 @@
 App::uses('Hash', 'Utility');
 
 /**
- * Class HashTest
+ * HashTest
  *
  * @package       Cake.Utility
  */
diff --git a/lib/Cake/Test/Case/View/Helper/JqueryEngineHelperTest.php b/lib/Cake/Test/Case/View/Helper/JqueryEngineHelperTest.php
index 997838c3e..1c1702d7f 100644
--- a/lib/Cake/Test/Case/View/Helper/JqueryEngineHelperTest.php
+++ b/lib/Cake/Test/Case/View/Helper/JqueryEngineHelperTest.php
@@ -21,7 +21,7 @@ App::uses('JqueryEngineHelper', 'View/Helper');
 App::uses('View', 'View');
 
 /**
- * Class JqueryEngineHelperTest
+ * JqueryEngineHelperTest
  *
  * @package       Cake.Test.Case.View.Helper
  */
diff --git a/lib/Cake/Test/Case/View/Helper/JsHelperTest.php b/lib/Cake/Test/Case/View/Helper/JsHelperTest.php
index f6f458b4b..c7daee5da 100644
--- a/lib/Cake/Test/Case/View/Helper/JsHelperTest.php
+++ b/lib/Cake/Test/Case/View/Helper/JsHelperTest.php
@@ -26,7 +26,7 @@ App::uses('View', 'View');
 App::uses('ClassRegistry', 'Utility');
 
 /**
- * Class JsEncodingObject
+ * JsEncodingObject
  *
  * @package       Cake.Test.Case.View.Helper
  */
@@ -41,7 +41,7 @@ class JsEncodingObject {
 }
 
 /**
- * Class OptionEngineHelper
+ * OptionEngineHelper
  *
  * @package       Cake.Test.Case.View.Helper
  */
diff --git a/lib/Cake/Test/Case/View/Helper/MootoolsEngineHelperTest.php b/lib/Cake/Test/Case/View/Helper/MootoolsEngineHelperTest.php
index 69d7c6244..971faa00c 100644
--- a/lib/Cake/Test/Case/View/Helper/MootoolsEngineHelperTest.php
+++ b/lib/Cake/Test/Case/View/Helper/MootoolsEngineHelperTest.php
@@ -21,7 +21,7 @@ App::uses('JsHelper', 'View/Helper');
 App::uses('MootoolsEngineHelper', 'View/Helper');
 
 /**
- * Class MootoolsEngineHelperTest
+ * MootoolsEngineHelperTest
  *
  * @package       Cake.Test.Case.View.Helper
  */
diff --git a/lib/Cake/Test/Case/View/Helper/PrototypeEngineHelperTest.php b/lib/Cake/Test/Case/View/Helper/PrototypeEngineHelperTest.php
index d60cf1041..404e4b377 100644
--- a/lib/Cake/Test/Case/View/Helper/PrototypeEngineHelperTest.php
+++ b/lib/Cake/Test/Case/View/Helper/PrototypeEngineHelperTest.php
@@ -21,7 +21,7 @@ App::uses('JsHelper', 'View/Helper');
 App::uses('PrototypeEngineHelper', 'View/Helper');
 
 /**
- * Class PrototypeEngineHelperTest
+ * PrototypeEngineHelperTest
  *
  * @package       Cake.Test.Case.View.Helper
  */
diff --git a/lib/Cake/Test/Case/View/Helper/TextHelperTest.php b/lib/Cake/Test/Case/View/Helper/TextHelperTest.php
index f38dc402a..5ea1abf14 100644
--- a/lib/Cake/Test/Case/View/Helper/TextHelperTest.php
+++ b/lib/Cake/Test/Case/View/Helper/TextHelperTest.php
@@ -20,7 +20,7 @@ App::uses('View', 'View');
 App::uses('TextHelper', 'View/Helper');
 
 /**
- * Class TextHelperTestObject
+ * TextHelperTestObject
  *
  * @package       Cake.Test.Case.View.Helper
  */
diff --git a/lib/Cake/Test/Case/View/HelperCollectionTest.php b/lib/Cake/Test/Case/View/HelperCollectionTest.php
index 179940f0e..eb2961ebf 100644
--- a/lib/Cake/Test/Case/View/HelperCollectionTest.php
+++ b/lib/Cake/Test/Case/View/HelperCollectionTest.php
@@ -27,7 +27,7 @@ class HtmlAliasHelper extends HtmlHelper {
 }
 
 /**
- * Class HelperCollectionTest
+ * HelperCollectionTest
  *
  * @package       Cake.Test.Case.View
  */
diff --git a/lib/Cake/Test/Case/View/ViewTest.php b/lib/Cake/Test/Case/View/ViewTest.php
index fc229464f..8ac8755ec 100644
--- a/lib/Cake/Test/Case/View/ViewTest.php
+++ b/lib/Cake/Test/Case/View/ViewTest.php
@@ -220,7 +220,7 @@ class TestBeforeAfterHelper extends Helper {
 }
 
 /**
- * Class TestObjectWithToString
+ * TestObjectWithToString
  *
  * An object with the magic method __toString() for testing with view blocks.
  */
@@ -233,7 +233,7 @@ class TestObjectWithToString {
 }
 
 /**
- * Class TestObjectWithoutToString
+ * TestObjectWithoutToString
  *
  * An object without the magic method __toString() for testing with view blocks.
  */
@@ -241,7 +241,7 @@ class TestObjectWithoutToString {
 }
 
 /**
- * Class TestViewEventListener
+ * TestViewEventListener
  *
  * An event listener to test cakePHP events
  */
diff --git a/lib/Cake/Test/Fixture/FilmFileFixture.php b/lib/Cake/Test/Fixture/FilmFileFixture.php
index 423850481..78bc81a16 100644
--- a/lib/Cake/Test/Fixture/FilmFileFixture.php
+++ b/lib/Cake/Test/Fixture/FilmFileFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class FilmFileFixture
+ * FilmFileFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/FruitsUuidTagFixture.php b/lib/Cake/Test/Fixture/FruitsUuidTagFixture.php
index 481550982..dcde11f26 100644
--- a/lib/Cake/Test/Fixture/FruitsUuidTagFixture.php
+++ b/lib/Cake/Test/Fixture/FruitsUuidTagFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class FruitsUuidTagFixture
+ * FruitsUuidTagFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/GroupUpdateAllFixture.php b/lib/Cake/Test/Fixture/GroupUpdateAllFixture.php
index 07471230e..a34718f79 100644
--- a/lib/Cake/Test/Fixture/GroupUpdateAllFixture.php
+++ b/lib/Cake/Test/Fixture/GroupUpdateAllFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class GroupUpdateAllFixture
+ * GroupUpdateAllFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/GuildFixture.php b/lib/Cake/Test/Fixture/GuildFixture.php
index 35ffa602b..d85b30299 100644
--- a/lib/Cake/Test/Fixture/GuildFixture.php
+++ b/lib/Cake/Test/Fixture/GuildFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class GuildFixture
+ * GuildFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/GuildsPlayerFixture.php b/lib/Cake/Test/Fixture/GuildsPlayerFixture.php
index f19ca8d06..910004d7d 100644
--- a/lib/Cake/Test/Fixture/GuildsPlayerFixture.php
+++ b/lib/Cake/Test/Fixture/GuildsPlayerFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class GuildsPlayerFixture
+ * GuildsPlayerFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/HomeFixture.php b/lib/Cake/Test/Fixture/HomeFixture.php
index 18dd3e9b4..ceda144e1 100644
--- a/lib/Cake/Test/Fixture/HomeFixture.php
+++ b/lib/Cake/Test/Fixture/HomeFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class HomeFixture
+ * HomeFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/ImageFixture.php b/lib/Cake/Test/Fixture/ImageFixture.php
index 00aff3e0e..32e130b18 100644
--- a/lib/Cake/Test/Fixture/ImageFixture.php
+++ b/lib/Cake/Test/Fixture/ImageFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class ImageFixture
+ * ImageFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/InnoFixture.php b/lib/Cake/Test/Fixture/InnoFixture.php
index 7fa883db5..a37c6498e 100644
--- a/lib/Cake/Test/Fixture/InnoFixture.php
+++ b/lib/Cake/Test/Fixture/InnoFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class InnoFixture
+ * InnoFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/ItemFixture.php b/lib/Cake/Test/Fixture/ItemFixture.php
index d3026b672..f01e54c4a 100644
--- a/lib/Cake/Test/Fixture/ItemFixture.php
+++ b/lib/Cake/Test/Fixture/ItemFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class ItemFixture
+ * ItemFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/ItemsPortfolioFixture.php b/lib/Cake/Test/Fixture/ItemsPortfolioFixture.php
index fdcad4fc3..8dc2d3931 100644
--- a/lib/Cake/Test/Fixture/ItemsPortfolioFixture.php
+++ b/lib/Cake/Test/Fixture/ItemsPortfolioFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class ItemsPortfolioFixture
+ * ItemsPortfolioFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/JoinABFixture.php b/lib/Cake/Test/Fixture/JoinABFixture.php
index 2342b840f..9fdfd9419 100644
--- a/lib/Cake/Test/Fixture/JoinABFixture.php
+++ b/lib/Cake/Test/Fixture/JoinABFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class JoinABFixture
+ * JoinABFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/JoinACFixture.php b/lib/Cake/Test/Fixture/JoinACFixture.php
index 860c8697b..8381b3725 100644
--- a/lib/Cake/Test/Fixture/JoinACFixture.php
+++ b/lib/Cake/Test/Fixture/JoinACFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class JoinACFixture
+ * JoinACFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/JoinAFixture.php b/lib/Cake/Test/Fixture/JoinAFixture.php
index 5251bb16b..21924fe88 100644
--- a/lib/Cake/Test/Fixture/JoinAFixture.php
+++ b/lib/Cake/Test/Fixture/JoinAFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class JoinAFixture
+ * JoinAFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/JoinBFixture.php b/lib/Cake/Test/Fixture/JoinBFixture.php
index 12b1acb4f..8701c095b 100644
--- a/lib/Cake/Test/Fixture/JoinBFixture.php
+++ b/lib/Cake/Test/Fixture/JoinBFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class JoinBFixture
+ * JoinBFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/JoinCFixture.php b/lib/Cake/Test/Fixture/JoinCFixture.php
index 4f792ef91..31a7abf20 100644
--- a/lib/Cake/Test/Fixture/JoinCFixture.php
+++ b/lib/Cake/Test/Fixture/JoinCFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class JoinCFixture
+ * JoinCFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/JoinThingFixture.php b/lib/Cake/Test/Fixture/JoinThingFixture.php
index 6d6fea225..081586348 100644
--- a/lib/Cake/Test/Fixture/JoinThingFixture.php
+++ b/lib/Cake/Test/Fixture/JoinThingFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class JoinThingFixture
+ * JoinThingFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/MessageFixture.php b/lib/Cake/Test/Fixture/MessageFixture.php
index ec132b6b0..188525507 100644
--- a/lib/Cake/Test/Fixture/MessageFixture.php
+++ b/lib/Cake/Test/Fixture/MessageFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class MessageFixture
+ * MessageFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/MyCategoriesMyProductsFixture.php b/lib/Cake/Test/Fixture/MyCategoriesMyProductsFixture.php
index cc345fad2..81eda980c 100644
--- a/lib/Cake/Test/Fixture/MyCategoriesMyProductsFixture.php
+++ b/lib/Cake/Test/Fixture/MyCategoriesMyProductsFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class MyCategoriesMyProductsFixture
+ * MyCategoriesMyProductsFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/MyCategoriesMyUsersFixture.php b/lib/Cake/Test/Fixture/MyCategoriesMyUsersFixture.php
index ad45f6d9a..13da6da55 100644
--- a/lib/Cake/Test/Fixture/MyCategoriesMyUsersFixture.php
+++ b/lib/Cake/Test/Fixture/MyCategoriesMyUsersFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class MyCategoriesMyUsersFixture
+ * MyCategoriesMyUsersFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/MyCategoryFixture.php b/lib/Cake/Test/Fixture/MyCategoryFixture.php
index 5a62322b5..227ba1c6f 100644
--- a/lib/Cake/Test/Fixture/MyCategoryFixture.php
+++ b/lib/Cake/Test/Fixture/MyCategoryFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class MyCategoryFixture
+ * MyCategoryFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/MyProductFixture.php b/lib/Cake/Test/Fixture/MyProductFixture.php
index 834590ecb..162dc4b29 100644
--- a/lib/Cake/Test/Fixture/MyProductFixture.php
+++ b/lib/Cake/Test/Fixture/MyProductFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class MyProductFixture
+ * MyProductFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/MyUserFixture.php b/lib/Cake/Test/Fixture/MyUserFixture.php
index 619f62c2d..87b781506 100644
--- a/lib/Cake/Test/Fixture/MyUserFixture.php
+++ b/lib/Cake/Test/Fixture/MyUserFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class MyUserFixture
+ * MyUserFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/NodeFixture.php b/lib/Cake/Test/Fixture/NodeFixture.php
index 1edc2ad75..a8289adbe 100644
--- a/lib/Cake/Test/Fixture/NodeFixture.php
+++ b/lib/Cake/Test/Fixture/NodeFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class NodeFixture
+ * NodeFixture
  *
  * @package       Cake.Test.Fixture
  * @since         CakePHP(tm) v 1.2.0.6879 //Correct version number as needed**
diff --git a/lib/Cake/Test/Fixture/NumberTreeFixture.php b/lib/Cake/Test/Fixture/NumberTreeFixture.php
index 78d34cf21..09d65aec6 100644
--- a/lib/Cake/Test/Fixture/NumberTreeFixture.php
+++ b/lib/Cake/Test/Fixture/NumberTreeFixture.php
@@ -19,7 +19,7 @@
  */
 
 /**
- * Class NumberTreeFixture
+ * NumberTreeFixture
  *
  * Generates a tree of data for use testing the tree behavior
  *
diff --git a/lib/Cake/Test/Fixture/NumberTreeTwoFixture.php b/lib/Cake/Test/Fixture/NumberTreeTwoFixture.php
index 4b0eade1f..5eba080b2 100644
--- a/lib/Cake/Test/Fixture/NumberTreeTwoFixture.php
+++ b/lib/Cake/Test/Fixture/NumberTreeTwoFixture.php
@@ -19,7 +19,7 @@
  */
 
 /**
- * Class NumberTreeTwoFixture
+ * NumberTreeTwoFixture
  *
  * Generates a tree of data for use testing the tree behavior
  *
diff --git a/lib/Cake/Test/Fixture/NumericArticleFixture.php b/lib/Cake/Test/Fixture/NumericArticleFixture.php
index cce0b131d..eb62b0c8d 100644
--- a/lib/Cake/Test/Fixture/NumericArticleFixture.php
+++ b/lib/Cake/Test/Fixture/NumericArticleFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class NumericArticleFixture
+ * NumericArticleFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/OverallFavoriteFixture.php b/lib/Cake/Test/Fixture/OverallFavoriteFixture.php
index abc651e4d..145b40455 100644
--- a/lib/Cake/Test/Fixture/OverallFavoriteFixture.php
+++ b/lib/Cake/Test/Fixture/OverallFavoriteFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class OverallFavoriteFixture
+ * OverallFavoriteFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/PersonFixture.php b/lib/Cake/Test/Fixture/PersonFixture.php
index 072f3f120..0747963b0 100644
--- a/lib/Cake/Test/Fixture/PersonFixture.php
+++ b/lib/Cake/Test/Fixture/PersonFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class PersonFixture
+ * PersonFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/PlayerFixture.php b/lib/Cake/Test/Fixture/PlayerFixture.php
index 9a05703d8..db40ca00a 100644
--- a/lib/Cake/Test/Fixture/PlayerFixture.php
+++ b/lib/Cake/Test/Fixture/PlayerFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class PlayerFixture
+ * PlayerFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/PortfolioFixture.php b/lib/Cake/Test/Fixture/PortfolioFixture.php
index 6b658589a..23c567138 100644
--- a/lib/Cake/Test/Fixture/PortfolioFixture.php
+++ b/lib/Cake/Test/Fixture/PortfolioFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class PortfolioFixture
+ * PortfolioFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/PostsTagFixture.php b/lib/Cake/Test/Fixture/PostsTagFixture.php
index a767e8225..d8af5fdb6 100644
--- a/lib/Cake/Test/Fixture/PostsTagFixture.php
+++ b/lib/Cake/Test/Fixture/PostsTagFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class PostsTagFixture
+ * PostsTagFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/PrimaryModelFixture.php b/lib/Cake/Test/Fixture/PrimaryModelFixture.php
index c2fa4ad3b..80d847b7c 100644
--- a/lib/Cake/Test/Fixture/PrimaryModelFixture.php
+++ b/lib/Cake/Test/Fixture/PrimaryModelFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class PrimaryModelFixture
+ * PrimaryModelFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/ProductFixture.php b/lib/Cake/Test/Fixture/ProductFixture.php
index 5483e19a0..c19b3b541 100644
--- a/lib/Cake/Test/Fixture/ProductFixture.php
+++ b/lib/Cake/Test/Fixture/ProductFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class ProductFixture
+ * ProductFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/ProductUpdateAllFixture.php b/lib/Cake/Test/Fixture/ProductUpdateAllFixture.php
index eedec7a41..13d707470 100644
--- a/lib/Cake/Test/Fixture/ProductUpdateAllFixture.php
+++ b/lib/Cake/Test/Fixture/ProductUpdateAllFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class ProductUpdateAllFixture
+ * ProductUpdateAllFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/ProjectFixture.php b/lib/Cake/Test/Fixture/ProjectFixture.php
index 3912aee20..b91fefdaa 100644
--- a/lib/Cake/Test/Fixture/ProjectFixture.php
+++ b/lib/Cake/Test/Fixture/ProjectFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class ProjectFixture
+ * ProjectFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/SampleFixture.php b/lib/Cake/Test/Fixture/SampleFixture.php
index 0611b0b4f..fe46a583f 100644
--- a/lib/Cake/Test/Fixture/SampleFixture.php
+++ b/lib/Cake/Test/Fixture/SampleFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class SampleFixture
+ * SampleFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/SecondaryModelFixture.php b/lib/Cake/Test/Fixture/SecondaryModelFixture.php
index 6d22aa7ba..dd03b31ad 100644
--- a/lib/Cake/Test/Fixture/SecondaryModelFixture.php
+++ b/lib/Cake/Test/Fixture/SecondaryModelFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class SecondaryModelFixture
+ * SecondaryModelFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/SessionFixture.php b/lib/Cake/Test/Fixture/SessionFixture.php
index 935ea399a..39f7e1978 100644
--- a/lib/Cake/Test/Fixture/SessionFixture.php
+++ b/lib/Cake/Test/Fixture/SessionFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class SessionFixture
+ * SessionFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/SiteFixture.php b/lib/Cake/Test/Fixture/SiteFixture.php
index c24556715..a60dddce5 100644
--- a/lib/Cake/Test/Fixture/SiteFixture.php
+++ b/lib/Cake/Test/Fixture/SiteFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class SiteFixture
+ * SiteFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/SomethingElseFixture.php b/lib/Cake/Test/Fixture/SomethingElseFixture.php
index f14fdcf94..78c6b7911 100644
--- a/lib/Cake/Test/Fixture/SomethingElseFixture.php
+++ b/lib/Cake/Test/Fixture/SomethingElseFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class SomethingElseFixture
+ * SomethingElseFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/SomethingFixture.php b/lib/Cake/Test/Fixture/SomethingFixture.php
index 9edda8eb6..bc1edd927 100644
--- a/lib/Cake/Test/Fixture/SomethingFixture.php
+++ b/lib/Cake/Test/Fixture/SomethingFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class SomethingFixture
+ * SomethingFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/StoriesTagFixture.php b/lib/Cake/Test/Fixture/StoriesTagFixture.php
index 02729143c..e2b895db2 100644
--- a/lib/Cake/Test/Fixture/StoriesTagFixture.php
+++ b/lib/Cake/Test/Fixture/StoriesTagFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class StoriesTagFixture
+ * StoriesTagFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/StoryFixture.php b/lib/Cake/Test/Fixture/StoryFixture.php
index 5eda5a2b5..954582546 100644
--- a/lib/Cake/Test/Fixture/StoryFixture.php
+++ b/lib/Cake/Test/Fixture/StoryFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class StoryFixture
+ * StoryFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/SyfileFixture.php b/lib/Cake/Test/Fixture/SyfileFixture.php
index cb7aaa1fd..4ad7bb913 100644
--- a/lib/Cake/Test/Fixture/SyfileFixture.php
+++ b/lib/Cake/Test/Fixture/SyfileFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class SyfileFixture
+ * SyfileFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/TagFixture.php b/lib/Cake/Test/Fixture/TagFixture.php
index d69825f0a..cee5cebc9 100644
--- a/lib/Cake/Test/Fixture/TagFixture.php
+++ b/lib/Cake/Test/Fixture/TagFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class TagFixture
+ * TagFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/TestPluginArticleFixture.php b/lib/Cake/Test/Fixture/TestPluginArticleFixture.php
index fd588c207..453fd469c 100644
--- a/lib/Cake/Test/Fixture/TestPluginArticleFixture.php
+++ b/lib/Cake/Test/Fixture/TestPluginArticleFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class TestPluginArticleFixture
+ * TestPluginArticleFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/TestPluginCommentFixture.php b/lib/Cake/Test/Fixture/TestPluginCommentFixture.php
index b84ca5074..7553266af 100644
--- a/lib/Cake/Test/Fixture/TestPluginCommentFixture.php
+++ b/lib/Cake/Test/Fixture/TestPluginCommentFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class TestPluginCommentFixture
+ * TestPluginCommentFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/ThePaperMonkiesFixture.php b/lib/Cake/Test/Fixture/ThePaperMonkiesFixture.php
index 37c1a5ffb..59b7df437 100644
--- a/lib/Cake/Test/Fixture/ThePaperMonkiesFixture.php
+++ b/lib/Cake/Test/Fixture/ThePaperMonkiesFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class ThePaperMonkiesFixture
+ * ThePaperMonkiesFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/ThreadFixture.php b/lib/Cake/Test/Fixture/ThreadFixture.php
index 421eb311c..18cff948a 100644
--- a/lib/Cake/Test/Fixture/ThreadFixture.php
+++ b/lib/Cake/Test/Fixture/ThreadFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class ThreadFixture
+ * ThreadFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/TranslateArticleFixture.php b/lib/Cake/Test/Fixture/TranslateArticleFixture.php
index 96483bfb0..2c51b83ea 100644
--- a/lib/Cake/Test/Fixture/TranslateArticleFixture.php
+++ b/lib/Cake/Test/Fixture/TranslateArticleFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class TranslateArticleFixture
+ * TranslateArticleFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/TranslateFixture.php b/lib/Cake/Test/Fixture/TranslateFixture.php
index bd37911d1..2207d3306 100644
--- a/lib/Cake/Test/Fixture/TranslateFixture.php
+++ b/lib/Cake/Test/Fixture/TranslateFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class TranslateFixture
+ * TranslateFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/TranslateTableFixture.php b/lib/Cake/Test/Fixture/TranslateTableFixture.php
index 351bae576..09db6ed7d 100644
--- a/lib/Cake/Test/Fixture/TranslateTableFixture.php
+++ b/lib/Cake/Test/Fixture/TranslateTableFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class TranslateTableFixture
+ * TranslateTableFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/TranslateWithPrefixFixture.php b/lib/Cake/Test/Fixture/TranslateWithPrefixFixture.php
index 9787ac85c..a78e0ff2a 100644
--- a/lib/Cake/Test/Fixture/TranslateWithPrefixFixture.php
+++ b/lib/Cake/Test/Fixture/TranslateWithPrefixFixture.php
@@ -18,7 +18,7 @@
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
 /**
- * Class TranslateWithPrefixFixture
+ * TranslateWithPrefixFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/TranslatedArticleFixture.php b/lib/Cake/Test/Fixture/TranslatedArticleFixture.php
index d972348f0..79824a757 100644
--- a/lib/Cake/Test/Fixture/TranslatedArticleFixture.php
+++ b/lib/Cake/Test/Fixture/TranslatedArticleFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class TranslatedArticleFixture
+ * TranslatedArticleFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/TranslatedItemFixture.php b/lib/Cake/Test/Fixture/TranslatedItemFixture.php
index 79d5ce62a..185f41a97 100644
--- a/lib/Cake/Test/Fixture/TranslatedItemFixture.php
+++ b/lib/Cake/Test/Fixture/TranslatedItemFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class TranslatedItemFixture
+ * TranslatedItemFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/UserFixture.php b/lib/Cake/Test/Fixture/UserFixture.php
index 044965bc7..919143c15 100644
--- a/lib/Cake/Test/Fixture/UserFixture.php
+++ b/lib/Cake/Test/Fixture/UserFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class UserFixture
+ * UserFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/UuidFixture.php b/lib/Cake/Test/Fixture/UuidFixture.php
index adf4d078a..cc356e643 100644
--- a/lib/Cake/Test/Fixture/UuidFixture.php
+++ b/lib/Cake/Test/Fixture/UuidFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class UuidFixture.
+ * UuidFixture.
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/UuidNativeFixture.php b/lib/Cake/Test/Fixture/UuidNativeFixture.php
index 0e03fbab4..55cfa5736 100644
--- a/lib/Cake/Test/Fixture/UuidNativeFixture.php
+++ b/lib/Cake/Test/Fixture/UuidNativeFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class UuidNativeFixture.
+ * UuidNativeFixture.
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/UuidNativeTagFixture.php b/lib/Cake/Test/Fixture/UuidNativeTagFixture.php
index 0956ccda1..0dc8b8dce 100644
--- a/lib/Cake/Test/Fixture/UuidNativeTagFixture.php
+++ b/lib/Cake/Test/Fixture/UuidNativeTagFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class UuidNativeTagFixture
+ * UuidNativeTagFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/UuidTagFixture.php b/lib/Cake/Test/Fixture/UuidTagFixture.php
index 18b3b1c46..e6b598da7 100644
--- a/lib/Cake/Test/Fixture/UuidTagFixture.php
+++ b/lib/Cake/Test/Fixture/UuidTagFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class UuidTagFixture
+ * UuidTagFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/UuiditemFixture.php b/lib/Cake/Test/Fixture/UuiditemFixture.php
index d548cca9a..0a594a46b 100644
--- a/lib/Cake/Test/Fixture/UuiditemFixture.php
+++ b/lib/Cake/Test/Fixture/UuiditemFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class UuiditemFixture
+ * UuiditemFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/UuiditemsUuidportfolioFixture.php b/lib/Cake/Test/Fixture/UuiditemsUuidportfolioFixture.php
index 141a418f6..2216456b5 100644
--- a/lib/Cake/Test/Fixture/UuiditemsUuidportfolioFixture.php
+++ b/lib/Cake/Test/Fixture/UuiditemsUuidportfolioFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class UuiditemsUuidportfolioFixture
+ * UuiditemsUuidportfolioFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/UuiditemsUuidportfolioNumericidFixture.php b/lib/Cake/Test/Fixture/UuiditemsUuidportfolioNumericidFixture.php
index 45815b229..44af2892e 100644
--- a/lib/Cake/Test/Fixture/UuiditemsUuidportfolioNumericidFixture.php
+++ b/lib/Cake/Test/Fixture/UuiditemsUuidportfolioNumericidFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class UuiditemsUuidportfolioNumericidFixture
+ * UuiditemsUuidportfolioNumericidFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/UuidnativeitemFixture.php b/lib/Cake/Test/Fixture/UuidnativeitemFixture.php
index e810e2af9..195c7aa00 100644
--- a/lib/Cake/Test/Fixture/UuidnativeitemFixture.php
+++ b/lib/Cake/Test/Fixture/UuidnativeitemFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class UuidnativeitemFixture
+ * UuidnativeitemFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/UuidnativeitemsUuidnativeportfolioFixture.php b/lib/Cake/Test/Fixture/UuidnativeitemsUuidnativeportfolioFixture.php
index 39d4535e2..7b3e612b0 100644
--- a/lib/Cake/Test/Fixture/UuidnativeitemsUuidnativeportfolioFixture.php
+++ b/lib/Cake/Test/Fixture/UuidnativeitemsUuidnativeportfolioFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class UuiditemsUuidportfolioFixture
+ * UuiditemsUuidportfolioFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/UuidnativeitemsUuidnativeportfolioNumericidFixture.php b/lib/Cake/Test/Fixture/UuidnativeitemsUuidnativeportfolioNumericidFixture.php
index 6c304324e..ed81f6a1b 100644
--- a/lib/Cake/Test/Fixture/UuidnativeitemsUuidnativeportfolioNumericidFixture.php
+++ b/lib/Cake/Test/Fixture/UuidnativeitemsUuidnativeportfolioNumericidFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class UuidnativeitemsUuidnativeportfolioNumericidFixture
+ * UuidnativeitemsUuidnativeportfolioNumericidFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/UuidnativeportfolioFixture.php b/lib/Cake/Test/Fixture/UuidnativeportfolioFixture.php
index 058d79af8..f99d4db96 100644
--- a/lib/Cake/Test/Fixture/UuidnativeportfolioFixture.php
+++ b/lib/Cake/Test/Fixture/UuidnativeportfolioFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class UuidnativeportfolioFixture
+ * UuidnativeportfolioFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/Fixture/UuidportfolioFixture.php b/lib/Cake/Test/Fixture/UuidportfolioFixture.php
index a5d8ad217..866b3f783 100644
--- a/lib/Cake/Test/Fixture/UuidportfolioFixture.php
+++ b/lib/Cake/Test/Fixture/UuidportfolioFixture.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class UuidportfolioFixture
+ * UuidportfolioFixture
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/lib/Cake/Test/test_app/Console/Command/SampleShell.php b/lib/Cake/Test/test_app/Console/Command/SampleShell.php
index 852164624..1e8ba0147 100644
--- a/lib/Cake/Test/test_app/Console/Command/SampleShell.php
+++ b/lib/Cake/Test/test_app/Console/Command/SampleShell.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class SampleShell
+ * SampleShell
  *
  * @package       Cake.Test.TestApp.Console.Command
  */
diff --git a/lib/Cake/Test/test_app/Controller/TestsAppsController.php b/lib/Cake/Test/test_app/Controller/TestsAppsController.php
index 35783548d..497fe4f75 100644
--- a/lib/Cake/Test/test_app/Controller/TestsAppsController.php
+++ b/lib/Cake/Test/test_app/Controller/TestsAppsController.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class TestsAppsController
+ * TestsAppsController
  *
  * @package       Cake.Test.TestApp.Controller
  */
diff --git a/lib/Cake/Test/test_app/Controller/TestsAppsPostsController.php b/lib/Cake/Test/test_app/Controller/TestsAppsPostsController.php
index 98c9107b0..06a8dac2b 100644
--- a/lib/Cake/Test/test_app/Controller/TestsAppsPostsController.php
+++ b/lib/Cake/Test/test_app/Controller/TestsAppsPostsController.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class TestsAppsPostsController
+ * TestsAppsPostsController
  *
  * @package       Cake.Test.TestApp.Controller
  */
diff --git a/lib/Cake/Test/test_app/Lib/Cache/Engine/TestAppCacheEngine.php b/lib/Cake/Test/test_app/Lib/Cache/Engine/TestAppCacheEngine.php
index 4d89deb43..8eb9745d4 100644
--- a/lib/Cake/Test/test_app/Lib/Cache/Engine/TestAppCacheEngine.php
+++ b/lib/Cake/Test/test_app/Lib/Cache/Engine/TestAppCacheEngine.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class TestAppCacheEngine
+ * TestAppCacheEngine
  *
  * @package       Cake.Test.TestApp.Lib.Cache.Engine
  */
diff --git a/lib/Cake/Test/test_app/Lib/Library.php b/lib/Cake/Test/test_app/Lib/Library.php
index 1137d7bfe..2998f6965 100644
--- a/lib/Cake/Test/test_app/Lib/Library.php
+++ b/lib/Cake/Test/test_app/Lib/Library.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class Library
+ * Library
  *
  * @package       Cake.Test.TestApp.Lib
  */
diff --git a/lib/Cake/Test/test_app/Lib/Log/Engine/TestAppLog.php b/lib/Cake/Test/test_app/Lib/Log/Engine/TestAppLog.php
index 20f9db040..53b5f5958 100644
--- a/lib/Cake/Test/test_app/Lib/Log/Engine/TestAppLog.php
+++ b/lib/Cake/Test/test_app/Lib/Log/Engine/TestAppLog.php
@@ -19,7 +19,7 @@
 App::uses('BaseLog', 'Log/Engine');
 
 /**
- * Class TestAppLog
+ * TestAppLog
  *
  * @package       Cake.Test.TestApp.Lib.Log.Engine
  */
diff --git a/lib/Cake/Test/test_app/Lib/Utility/TestUtilityClass.php b/lib/Cake/Test/test_app/Lib/Utility/TestUtilityClass.php
index b47269da6..c39099de8 100644
--- a/lib/Cake/Test/test_app/Lib/Utility/TestUtilityClass.php
+++ b/lib/Cake/Test/test_app/Lib/Utility/TestUtilityClass.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class TestUtilityClass
+ * TestUtilityClass
  *
  * @package       Cake.Test.TestApp.Lib.Utility
  */
diff --git a/lib/Cake/Test/test_app/Model/Extract.php b/lib/Cake/Test/test_app/Model/Extract.php
index 2c5469055..56738952a 100644
--- a/lib/Cake/Test/test_app/Model/Extract.php
+++ b/lib/Cake/Test/test_app/Model/Extract.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class Extract
+ * Extract
  *
  * For testing Console i18n validation message extraction with quotes
  *
diff --git a/lib/Cake/Test/test_app/Model/PersisterOne.php b/lib/Cake/Test/test_app/Model/PersisterOne.php
index e5c699945..5ecd40d7b 100644
--- a/lib/Cake/Test/test_app/Model/PersisterOne.php
+++ b/lib/Cake/Test/test_app/Model/PersisterOne.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class PersisterOne
+ * PersisterOne
  *
  * @package       Cake.Test.TestApp.Model
  */
diff --git a/lib/Cake/Test/test_app/Model/PersisterTwo.php b/lib/Cake/Test/test_app/Model/PersisterTwo.php
index a1b2d9cda..73dc218ea 100644
--- a/lib/Cake/Test/test_app/Model/PersisterTwo.php
+++ b/lib/Cake/Test/test_app/Model/PersisterTwo.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class PersisterTwo
+ * PersisterTwo
  *
  * @package       Cake.Test.TestApp.Model
  */
diff --git a/lib/Cake/Test/test_app/Model/Post.php b/lib/Cake/Test/test_app/Model/Post.php
index c11cb1b53..cde64ac13 100644
--- a/lib/Cake/Test/test_app/Model/Post.php
+++ b/lib/Cake/Test/test_app/Model/Post.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class Post
+ * Post
  *
  * @package       Cake.Test.TestApp.Model
  */
diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/Config/Schema/schema.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Config/Schema/schema.php
index cc9e9863c..689bae47b 100644
--- a/lib/Cake/Test/test_app/Plugin/TestPlugin/Config/Schema/schema.php
+++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/Config/Schema/schema.php
@@ -19,7 +19,7 @@
  */
 
 /**
- * Class TestPluginAppSchema
+ * TestPluginAppSchema
  *
  * @package       Cake.Test.TestApp.Plugin.TestPlugin.Config.Schema
  */
diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Command/ExampleShell.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Command/ExampleShell.php
index 139cacb59..8d78f4a21 100644
--- a/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Command/ExampleShell.php
+++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Command/ExampleShell.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class ExampleShell
+ * ExampleShell
  * @package       Cake.Test.TestApp.Plugin.TestPlugin.Console.Command
  */
 class ExampleShell extends Shell {
diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Command/Task/OtherTaskTask.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Command/Task/OtherTaskTask.php
index 6167a72d5..8e67aadb6 100644
--- a/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Command/Task/OtherTaskTask.php
+++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Command/Task/OtherTaskTask.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class OtherTaskTask
+ * OtherTaskTask
  *
  * @package       Cake.Test.TestApp.Plugin.TestPlugin.Console.Command.Task
  */
diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Command/TestPluginShell.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Command/TestPluginShell.php
index b756c643a..c2b365bd8 100644
--- a/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Command/TestPluginShell.php
+++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Command/TestPluginShell.php
@@ -15,7 +15,7 @@
  */
 
 /**
- * Class TestPluginShell
+ * TestPluginShell
  * @package       Cake.Test.TestApp.Plugin.TestPlugin.Console.Command
  */
 class TestPluginShell extends Shell {
diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/OtherComponent.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/OtherComponent.php
index 4f45e9db2..6c65ee49c 100644
--- a/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/OtherComponent.php
+++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/OtherComponent.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class OtherComponent
+ * OtherComponent
  *
  * @package       Cake.Test.TestApp.Plugin.TestPlugin.Controller.Component
  */
diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/PluginsComponent.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/PluginsComponent.php
index 896502960..47905947d 100644
--- a/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/PluginsComponent.php
+++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/PluginsComponent.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class PluginsComponent
+ * PluginsComponent
  *
  * @package       Cake.Test.TestApp.Plugin.TestPlugin.Controller.Component
  */
diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/TestPluginComponent.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/TestPluginComponent.php
index d83a99b60..8e6d4801a 100644
--- a/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/TestPluginComponent.php
+++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/TestPluginComponent.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class TestPluginComponent
+ * TestPluginComponent
  *
  * @package       Cake.Test.TestApp.Plugin.TestPlugin.Controller.Component
  */
diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/TestPluginOtherComponent.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/TestPluginOtherComponent.php
index 21e3368c0..cd315651c 100644
--- a/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/TestPluginOtherComponent.php
+++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/TestPluginOtherComponent.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class TestPluginOtherComponent
+ * TestPluginOtherComponent
  *
  * @package       Cake.Test.TestApp.Plugin.TestPlugin.Controller.Component
  */
diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/TestPluginAppController.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/TestPluginAppController.php
index 8681166d7..097d2968e 100644
--- a/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/TestPluginAppController.php
+++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/TestPluginAppController.php
@@ -19,7 +19,7 @@
 App::uses('AppController', 'Controller');
 
 /**
- * Class TestPluginAppController
+ * TestPluginAppController
  *
  * @package       Cake.Test.TestApp.Plugin.TestPlugin.Controller
  */
diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/TestPluginController.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/TestPluginController.php
index fb53d7aee..e18f4d56f 100644
--- a/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/TestPluginController.php
+++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/TestPluginController.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class TestPluginController
+ * TestPluginController
  *
  * @package       Cake.Test.TestApp.Plugin.TestPlugin.Controller
  */
diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/TestsController.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/TestsController.php
index bbdcb6f51..c58755ce7 100644
--- a/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/TestsController.php
+++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/TestsController.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class TestsController
+ * TestsController
  *
  * @package       Cake.Test.TestApp.Plugin.TestPlugin.Controller
  */
diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Cache/Engine/TestPluginCacheEngine.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Cache/Engine/TestPluginCacheEngine.php
index 6f2a4c792..5cbe512c7 100644
--- a/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Cache/Engine/TestPluginCacheEngine.php
+++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Cache/Engine/TestPluginCacheEngine.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class TestPluginCacheEngine
+ * TestPluginCacheEngine
  *
  * @package       Cake.Test.TestApp.Plugin.TestPlugin.Lib.Cache.Engine
  */
diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Custom/Package/CustomLibClass.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Custom/Package/CustomLibClass.php
index a96a5d531..c01d05b68 100644
--- a/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Custom/Package/CustomLibClass.php
+++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Custom/Package/CustomLibClass.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class CustomLibClass
+ * CustomLibClass
  *
  * @package       Cake.Test.TestApp.Plugin.TestPlugin.Lib.Custom.Package
  */
diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Error/TestPluginExceptionRenderer.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Error/TestPluginExceptionRenderer.php
index f8f0e8656..7975e7d3a 100644
--- a/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Error/TestPluginExceptionRenderer.php
+++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Error/TestPluginExceptionRenderer.php
@@ -22,7 +22,7 @@
 App::uses('ExceptionRenderer', 'Error');
 
 /**
- * Class TestPluginExceptionRenderer
+ * TestPluginExceptionRenderer
  *
  * @package       Cake.Test.TestApp.Plugin.TestPlugin.Lib.Error
  */
diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Log/Engine/TestPluginLog.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Log/Engine/TestPluginLog.php
index 1817e11cc..63d9a1fae 100644
--- a/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Log/Engine/TestPluginLog.php
+++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Log/Engine/TestPluginLog.php
@@ -19,7 +19,7 @@
 App::uses('CakeLogInterface', 'Log');
 
 /**
- * Class TestPluginLog
+ * TestPluginLog
  *
  * @package       Cake.Test.TestApp.Plugin.TestPlugin.Lib.Log.Engine
  */
diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Routing/Filter/Test2DispatcherFilter.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Routing/Filter/Test2DispatcherFilter.php
index 3f86bbc39..5fa3e540b 100644
--- a/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Routing/Filter/Test2DispatcherFilter.php
+++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Routing/Filter/Test2DispatcherFilter.php
@@ -17,7 +17,7 @@
 App::uses('DispatcherFilter', 'Routing');
 
 /**
- * Class Test2DispatcherFilter
+ * Test2DispatcherFilter
  *
  * @package		  Cake.Test.TestApp.Routing.Filter
  */
diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Routing/Filter/TestDispatcherFilter.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Routing/Filter/TestDispatcherFilter.php
index 708c5626c..286509bc8 100644
--- a/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Routing/Filter/TestDispatcherFilter.php
+++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Routing/Filter/TestDispatcherFilter.php
@@ -17,7 +17,7 @@
 App::uses('DispatcherFilter', 'Routing');
 
 /**
- * Class TestDispatcherFilter
+ * TestDispatcherFilter
  *
  * @package		  Cake.Test.TestApp.Routing.Filter
  */
diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/TestPluginLibrary.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/TestPluginLibrary.php
index ea8a78194..72e184048 100644
--- a/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/TestPluginLibrary.php
+++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/TestPluginLibrary.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class TestPluginLibrary
+ * TestPluginLibrary
  *
  * @package		  Cake.Test.TestApp.Plugin.TestPlugin.Lib
  */
diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/TestPluginOtherLibrary.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/TestPluginOtherLibrary.php
index 829285273..74d968521 100644
--- a/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/TestPluginOtherLibrary.php
+++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/TestPluginOtherLibrary.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class TestPluginOtherLibrary
+ * TestPluginOtherLibrary
  *
  * @package       Cake.Test.TestApp.Plugin.TestPlugin.Lib
  */
diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginAppModel.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginAppModel.php
index 118693bb9..9b32459d7 100644
--- a/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginAppModel.php
+++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginAppModel.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class TestPluginAppModel
+ * TestPluginAppModel
  *
  * @package       Cake.Test.TestApp.Plugin.TestPlugin.Model
  */
diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginAuthUser.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginAuthUser.php
index 21162cfff..4c53d7a27 100644
--- a/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginAuthUser.php
+++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginAuthUser.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class TestPluginAuthUser
+ * TestPluginAuthUser
  *
  * @package       Cake.Test.TestApp.Plugin.TestPlugin.Model
  */
diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginAuthors.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginAuthors.php
index a52c21e75..951c60079 100644
--- a/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginAuthors.php
+++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginAuthors.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class TestPluginAuthors
+ * TestPluginAuthors
  *
  * @package       Cake.Test.TestApp.Plugin.TestPlugin.Model
  */
diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginComment.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginComment.php
index 69f83bd9a..d3214ed99 100644
--- a/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginComment.php
+++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginComment.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class TestPluginComment
+ * TestPluginComment
  *
  * @package       Cake.Test.TestApp.Plugin.TestPlugin.Model
  */
diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginPost.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginPost.php
index e6f1a256c..3589eddc8 100644
--- a/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginPost.php
+++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginPost.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class TestPluginPost
+ * TestPluginPost
  *
  * @package       Cake.Test.TestApp.Plugin.TestPlugin.Model
  */
diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/Vendor/sample/sample_plugin.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Vendor/sample/sample_plugin.php
index 11a35bcd5..293e268a8 100644
--- a/lib/Cake/Test/test_app/Plugin/TestPlugin/Vendor/sample/sample_plugin.php
+++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/Vendor/sample/sample_plugin.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class SamplePluginClassTestName
+ * SamplePluginClassTestName
  *
  * @package       Cake.Test.TestApp.Plugin.TestPlugin.Vendor.sample
  */
diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/OtherHelperHelper.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/OtherHelperHelper.php
index fe1698521..303dd150b 100644
--- a/lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/OtherHelperHelper.php
+++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/OtherHelperHelper.php
@@ -19,7 +19,7 @@
 App::uses('AppHelper', 'View/Helper');
 
 /**
- * Class OtherHelperHelper
+ * OtherHelperHelper
  *
  * @package       Cake.Test.TestApp.Plugin.TestPlugin.View.Helper
  */
diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/PluggedHelperHelper.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/PluggedHelperHelper.php
index 571585461..80d19697f 100644
--- a/lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/PluggedHelperHelper.php
+++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/PluggedHelperHelper.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class PluggedHelperHelper
+ * PluggedHelperHelper
  *
  * @package       Cake.Test.TestApp.Plugin.TestPlugin.View.Helper
  */
diff --git a/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Command/ExampleShell.php b/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Command/ExampleShell.php
index bddecff72..d5acd6617 100644
--- a/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Command/ExampleShell.php
+++ b/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Command/ExampleShell.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class ExampleShell
+ * ExampleShell
  *
  * @package       Cake.Test.TestApp.Plugin.TestPluginTwo.Console.Command
  */
diff --git a/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Command/WelcomeShell.php b/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Command/WelcomeShell.php
index 2ce7d1621..4441762c3 100644
--- a/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Command/WelcomeShell.php
+++ b/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Command/WelcomeShell.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class WelcomeShell
+ * WelcomeShell
  *
  * @package       Cake.Test.TestApp.Plugin.TestPluginTwo.Console.Command
  */
diff --git a/lib/Cake/Test/test_app/Vendor/sample/configure_test_vendor_sample.php b/lib/Cake/Test/test_app/Vendor/sample/configure_test_vendor_sample.php
index b2d014ecb..e76bc174b 100644
--- a/lib/Cake/Test/test_app/Vendor/sample/configure_test_vendor_sample.php
+++ b/lib/Cake/Test/test_app/Vendor/sample/configure_test_vendor_sample.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * Class ConfigureTestVendorSample
+ * ConfigureTestVendorSample
  *
  * @package       Cake.Test.TestApp.Vendor.sample
  */