diff --git a/core/includes/file.inc b/core/includes/file.inc
index 133d64f..ff0251b 100644
--- a/core/includes/file.inc
+++ b/core/includes/file.inc
@@ -2101,12 +2101,12 @@ function file_upload_max_size() {
  */
 function file_get_mimetype($uri, $mapping = NULL) {
   if ($wrapper = file_stream_wrapper_get_instance_by_uri($uri)) {
-    return $wrapper->getMimeType($uri, $mapping);
+    return $wrapper->getMIMEType($uri, $mapping);
   }
   else {
-    // getMimeType() is not implementation specific, so we can directly
+    // getMIMEType() is not implementation specific, so we can directly
     // call it without an instance.
-    return LocalStream::getMimeType($uri, $mapping);
+    return LocalStream::getMIMEType($uri, $mapping);
   }
 }
 
diff --git a/core/includes/mail.inc b/core/includes/mail.inc
index f58a76e..9b05795 100644
--- a/core/includes/mail.inc
+++ b/core/includes/mail.inc
@@ -201,14 +201,14 @@ function drupal_mail($module, $key, $to, $language, $params = array(), $from = N
  * - format: Allows to preprocess, format, and postprocess a mail
  *   message before it is passed to the sending system. By default, all messages
  *   may contain HTML and are converted to plain-text by the
- *   Drupal\Core\Mail\PhpMail implementation. For example, an alternative
+ *   Drupal\Core\Mail\PHPMail implementation. For example, an alternative
  *   implementation could override the default implementation and additionally
  *   sanitize the HTML for usage in a MIME-encoded e-mail, but still invoking
- *   the Drupal\Core\Mail\PhpMail implementation to generate an alternate
+ *   the Drupal\Core\Mail\PHPMail implementation to generate an alternate
  *   plain-text version for sending.
  * - mail: Sends a message through a custom mail sending engine.
  *   By default, all messages are sent via PHP's mail() function by the
- *   Drupal\Core\Mail\PhpMail implementation.
+ *   Drupal\Core\Mail\PHPMail implementation.
  *
  * The selection of a particular implementation is controlled via the variable
  * 'mail_system', which is a keyed array.  The default implementation
@@ -225,7 +225,7 @@ function drupal_mail($module, $key, $to, $language, $params = array(), $from = N
  *
  * @code
  * array(
- *   'default-system' => 'Drupal\Core\Mail\PhpMail',
+ *   'default-system' => 'Drupal\Core\Mail\PHPMail',
  *   'user' => 'DevelMailLog',
  * );
  * @endcode
@@ -235,7 +235,7 @@ function drupal_mail($module, $key, $to, $language, $params = array(), $from = N
  *
  * @code
  * array(
- *   'default-system' => 'Drupal\Core\Mail\PhpMail',
+ *   'default-system' => 'Drupal\Core\Mail\PHPMail',
  *   'user' => 'DevelMailLog',
  *   'contact_page_autoreply' => 'DrupalDevNullMailSend',
  * );
@@ -260,7 +260,7 @@ function drupal_mail_system($module, $key) {
 
   $id = $module . '_' . $key;
 
-  $configuration = variable_get('mail_system', array('default-system' => 'Drupal\Core\Mail\PhpMail'));
+  $configuration = variable_get('mail_system', array('default-system' => 'Drupal\Core\Mail\PHPMail'));
 
   // Look for overrides for the default class, starting from the most specific
   // id, and falling back to the module name.
diff --git a/core/lib/Drupal/Component/Uuid/Pecl.php b/core/lib/Drupal/Component/Uuid/PECL.php
similarity index 76%
rename from core/lib/Drupal/Component/Uuid/Pecl.php
rename to core/lib/Drupal/Component/Uuid/PECL.php
index 3d4cb27..a82dc06 100644
--- a/core/lib/Drupal/Component/Uuid/Pecl.php
+++ b/core/lib/Drupal/Component/Uuid/PECL.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Component\Uuid\Pecl.
+ * Definition of Drupal\Component\Uuid\PECL.
  */
 
 namespace Drupal\Component\Uuid;
@@ -10,7 +10,7 @@ namespace Drupal\Component\Uuid;
 /**
  * UUID implementation using the PECL extension.
  */
-class Pecl implements UuidInterface {
+class PECL implements UuidInterface {
 
   /**
    * Implements Drupal\Component\Uuid\UuidInterface::generate().
diff --git a/core/lib/Drupal/Component/Uuid/Php.php b/core/lib/Drupal/Component/Uuid/PHP.php
similarity index 93%
rename from core/lib/Drupal/Component/Uuid/Php.php
rename to core/lib/Drupal/Component/Uuid/PHP.php
index 49c7df6..3483908 100644
--- a/core/lib/Drupal/Component/Uuid/Php.php
+++ b/core/lib/Drupal/Component/Uuid/PHP.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Component\Uuid\Php.
+ * Definition of Drupal\Component\Uuid\PHP.
  */
 
 namespace Drupal\Component\Uuid;
@@ -14,7 +14,7 @@ namespace Drupal\Component\Uuid;
  *
  * @see http://uuidtools.rubyforge.org/api/classes/UUIDTools/UUID.html
  */
-class Php implements UuidInterface {
+class PHP implements UuidInterface {
 
   /**
    * Implements Drupal\Component\Uuid\UuidInterface::generate().
diff --git a/core/lib/Drupal/Component/Uuid/Uuid.php b/core/lib/Drupal/Component/Uuid/Uuid.php
index 68a73d1..54df0a0 100644
--- a/core/lib/Drupal/Component/Uuid/Uuid.php
+++ b/core/lib/Drupal/Component/Uuid/Uuid.php
@@ -70,13 +70,13 @@ class Uuid {
       return $plugin;
     }
 
-    $plugin = 'Drupal\Component\Uuid\Php';
+    $plugin = 'Drupal\Component\Uuid\PHP';
 
     // Debian/Ubuntu uses the (broken) OSSP extension as their UUID
     // implementation. The OSSP implementation is not compatible with the
     // PECL functions.
     if (function_exists('uuid_create') && !function_exists('uuid_make')) {
-      $plugin = 'Drupal\Component\Uuid\Pecl';
+      $plugin = 'Drupal\Component\Uuid\PECL';
     }
     // Try to use the COM implementation for Windows users.
     elseif (function_exists('com_create_guid')) {
diff --git a/core/lib/Drupal/Core/Mail/PhpMail.php b/core/lib/Drupal/Core/Mail/PHPMail.php
similarity index 97%
rename from core/lib/Drupal/Core/Mail/PhpMail.php
rename to core/lib/Drupal/Core/Mail/PHPMail.php
index 668cc51..58bcfb7 100644
--- a/core/lib/Drupal/Core/Mail/PhpMail.php
+++ b/core/lib/Drupal/Core/Mail/PHPMail.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Mail\PhpMail.
+ * Definition of Drupal\Core\Mail\PHPMail.
  */
 
 namespace Drupal\Core\Mail;
@@ -10,7 +10,7 @@ namespace Drupal\Core\Mail;
 /**
  * The default Drupal mail backend using PHP's mail function.
  */
-class PhpMail implements MailInterface {
+class PHPMail implements MailInterface {
 
   /**
    * Concatenates and wrap the e-mail body for plain-text mails.
diff --git a/core/lib/Drupal/Core/Mail/VariableLog.php b/core/lib/Drupal/Core/Mail/VariableLog.php
index 3dfe5b6..c1afabe 100644
--- a/core/lib/Drupal/Core/Mail/VariableLog.php
+++ b/core/lib/Drupal/Core/Mail/VariableLog.php
@@ -13,10 +13,10 @@ namespace Drupal\Core\Mail;
  *
  * This class is for running tests or for development.
  */
-class VariableLog extends PhpMail implements MailInterface {
+class VariableLog extends PHPMail implements MailInterface {
 
   /**
-   * Overrides Drupal\Core\Mail\PhpMail::mail().
+   * Overrides Drupal\Core\Mail\PHPMail::mail().
    *
    * Accepts an e-mail message and store it in a variable.
    */
diff --git a/core/lib/Drupal/Core/StreamWrapper/LocalStream.php b/core/lib/Drupal/Core/StreamWrapper/LocalStream.php
index b6e1dd1..1186945 100644
--- a/core/lib/Drupal/Core/StreamWrapper/LocalStream.php
+++ b/core/lib/Drupal/Core/StreamWrapper/LocalStream.php
@@ -94,9 +94,9 @@ abstract class LocalStream implements StreamWrapperInterface {
   }
 
   /**
-   * Implements Drupal\Core\StreamWrapper\StreamWrapperInterface::getMimeType().
+   * Implements Drupal\Core\StreamWrapper\StreamWrapperInterface::getMIMEType().
    */
-  static function getMimeType($uri, $mapping = NULL) {
+  static function getMIMEType($uri, $mapping = NULL) {
     if (!isset($mapping)) {
       // The default file map, defined in file.mimetypes.inc is quite big.
       // We only load it when necessary.
diff --git a/core/lib/Drupal/Core/StreamWrapper/PhpStreamWrapperInterface.php b/core/lib/Drupal/Core/StreamWrapper/PHPStreamWrapperInterface.php
similarity index 90%
rename from core/lib/Drupal/Core/StreamWrapper/PhpStreamWrapperInterface.php
rename to core/lib/Drupal/Core/StreamWrapper/PHPStreamWrapperInterface.php
index fad393f..2c50cec 100644
--- a/core/lib/Drupal/Core/StreamWrapper/PhpStreamWrapperInterface.php
+++ b/core/lib/Drupal/Core/StreamWrapper/PHPStreamWrapperInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\StreamWrapper\PhpStreamWrapperInterface.
+ * Definition of Drupal\Core\StreamWrapper\PHPStreamWrapperInterface.
  */
 
 namespace Drupal\Core\StreamWrapper;
@@ -12,7 +12,7 @@ namespace Drupal\Core\StreamWrapper;
  *
  * @see http://www.php.net/manual/class.streamwrapper.php
  */
-interface PhpStreamWrapperInterface {
+interface PHPStreamWrapperInterface {
   public function stream_open($uri, $mode, $options, &$opened_url);
   public function stream_close();
   public function stream_lock($operation);
diff --git a/core/lib/Drupal/Core/StreamWrapper/StreamWrapperInterface.php b/core/lib/Drupal/Core/StreamWrapper/StreamWrapperInterface.php
index 15ba2cf..710a59e 100644
--- a/core/lib/Drupal/Core/StreamWrapper/StreamWrapperInterface.php
+++ b/core/lib/Drupal/Core/StreamWrapper/StreamWrapperInterface.php
@@ -27,7 +27,7 @@ namespace Drupal\Core\StreamWrapper;
  * Extends the StreamWrapperInterface with methods expected by Drupal stream
  * wrapper classes.
  */
-interface StreamWrapperInterface extends PhpStreamWrapperInterface {
+interface StreamWrapperInterface extends PHPStreamWrapperInterface {
 
   /**
    * Sets the absolute stream resource URI.
@@ -75,7 +75,7 @@ interface StreamWrapperInterface extends PhpStreamWrapperInterface {
    * @return string
    *   Returns a string containing the MIME type of the resource.
    */
-  public static function getMimeType($uri, $mapping = NULL);
+  public static function getMIMEType($uri, $mapping = NULL);
 
   /**
    * Changes permissions of the resource.
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorTestBase.php b/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorTestBase.php
index 9483170..449a0e3 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorTestBase.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorTestBase.php
@@ -202,7 +202,7 @@ class AggregatorTestBase extends WebTestBase {
    * @return
    *   Path to valid OPML file.
    */
-  function getValidOpml($feeds) {
+  function getValidOPML($feeds) {
     // Properly escape URLs so that XML parsers don't choke on them.
     foreach ($feeds as &$feed) {
       $feed['url'] = htmlspecialchars($feed['url']);
@@ -241,7 +241,7 @@ EOF;
    * @return
    *   Path to invalid OPML file.
    */
-  function getInvalidOpml() {
+  function getInvalidOPML() {
     $opml = <<<EOF
 <opml>
   <invalid>
@@ -258,7 +258,7 @@ EOF;
    * @return
    *   Path to empty OPML file.
    */
-  function getEmptyOpml() {
+  function getEmptyOPML() {
     $opml = <<<EOF
 <?xml version="1.0" encoding="utf-8"?>
 <opml version="1.0">
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/ImportOpmlTest.php b/core/modules/aggregator/lib/Drupal/aggregator/Tests/ImportOPMLTest.php
similarity index 93%
rename from core/modules/aggregator/lib/Drupal/aggregator/Tests/ImportOpmlTest.php
rename to core/modules/aggregator/lib/Drupal/aggregator/Tests/ImportOPMLTest.php
index fa79f1c..9dbad94 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Tests/ImportOpmlTest.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Tests/ImportOPMLTest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Definition of Drupal\aggregator\Tests\ImportOpmlTest.
+ * Definition of Drupal\aggregator\Tests\ImportOPMLTest.
  */
 
 namespace Drupal\aggregator\Tests;
 
-class ImportOpmlTest extends AggregatorTestBase {
+class ImportOPMLTest extends AggregatorTestBase {
   public static function getInfo() {
     return array(
       'name' => 'Import feeds from OPML functionality',
@@ -48,7 +48,7 @@ class ImportOpmlTest extends AggregatorTestBase {
     $this->drupalPost('admin/config/services/aggregator/add/opml', $edit, t('Import'));
     $this->assertRaw(t('You must <em>either</em> upload a file or enter a URL.'), t('Error if no fields are filled.'));
 
-    $path = $this->getEmptyOpml();
+    $path = $this->getEmptyOPML();
     $edit = array(
       'files[upload]' => $path,
       'remote' => file_create_url($path),
@@ -70,11 +70,11 @@ class ImportOpmlTest extends AggregatorTestBase {
   function submitImportForm() {
     $before = db_query('SELECT COUNT(*) FROM {aggregator_feed}')->fetchField();
 
-    $form['files[upload]'] = $this->getInvalidOpml();
+    $form['files[upload]'] = $this->getInvalidOPML();
     $this->drupalPost('admin/config/services/aggregator/add/opml', $form, t('Import'));
     $this->assertText(t('No new feed has been added.'), t('Attempting to upload invalid XML.'));
 
-    $edit = array('remote' => file_create_url($this->getEmptyOpml()));
+    $edit = array('remote' => file_create_url($this->getEmptyOPML()));
     $this->drupalPost('admin/config/services/aggregator/add/opml', $edit, t('Import'));
     $this->assertText(t('No new feed has been added.'), t('Attempting to load empty OPML from remote URL.'));
 
@@ -98,7 +98,7 @@ class ImportOpmlTest extends AggregatorTestBase {
     $feeds[1] = $this->getFeedEditArray();
     $feeds[2] = $this->getFeedEditArray();
     $edit = array(
-      'files[upload]' => $this->getValidOpml($feeds),
+      'files[upload]' => $this->getValidOPML($feeds),
       'refresh'       => '900',
       'category[1]'   => $category,
     );
@@ -124,7 +124,7 @@ class ImportOpmlTest extends AggregatorTestBase {
     $this->assertTrue($category, t('Categories are correct.'));
   }
 
-  function testOpmlImport() {
+  function testOPMLImport() {
     $this->openImportForm();
     $this->validateImportFormFields();
     $this->submitImportForm();
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentRssTest.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentRSSTest.php
similarity index 88%
rename from core/modules/comment/lib/Drupal/comment/Tests/CommentRssTest.php
rename to core/modules/comment/lib/Drupal/comment/Tests/CommentRSSTest.php
index 3c9559f..c021fe3 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/CommentRssTest.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentRSSTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\comment\Tests\CommentRssTest.
+ * Definition of Drupal\comment\Tests\CommentRSSTest.
  */
 
 namespace Drupal\comment\Tests;
@@ -10,7 +10,7 @@ namespace Drupal\comment\Tests;
 /**
  * Tests for Comment module integration with RSS feeds.
  */
-class CommentRssTest extends CommentTestBase {
+class CommentRSSTest extends CommentTestBase {
   public static function getInfo() {
     return array(
       'name' => 'Comment RSS',
@@ -22,7 +22,7 @@ class CommentRssTest extends CommentTestBase {
   /**
    * Tests comments as part of an RSS feed.
    */
-  function testCommentRss() {
+  function testCommentRSS() {
     // Find comment in RSS feed.
     $this->drupalLogin($this->web_user);
     $comment = $this->postComment($this->node, $this->randomName(), $this->randomName());
diff --git a/core/modules/entity/lib/Drupal/entity/Tests/EntityApiInfoTest.php b/core/modules/entity/lib/Drupal/entity/Tests/EntityAPIInfoTest.php
similarity index 94%
rename from core/modules/entity/lib/Drupal/entity/Tests/EntityApiInfoTest.php
rename to core/modules/entity/lib/Drupal/entity/Tests/EntityAPIInfoTest.php
index 0c02276..bc9a291 100644
--- a/core/modules/entity/lib/Drupal/entity/Tests/EntityApiInfoTest.php
+++ b/core/modules/entity/lib/Drupal/entity/Tests/EntityAPIInfoTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\entity\Tests\EntityApiInfoTest.
+ * Definition of Drupal\entity\Tests\EntityAPIInfoTest.
  */
 
 namespace Drupal\entity\Tests;
@@ -12,7 +12,7 @@ use Drupal\simpletest\WebTestBase;
 /**
  * Tests Entity API base functionality.
  */
-class EntityApiInfoTest extends WebTestBase  {
+class EntityAPIInfoTest extends WebTestBase  {
 
   public static function getInfo() {
     return array(
diff --git a/core/modules/entity/lib/Drupal/entity/Tests/EntityApiTest.php b/core/modules/entity/lib/Drupal/entity/Tests/EntityAPITest.php
similarity index 97%
rename from core/modules/entity/lib/Drupal/entity/Tests/EntityApiTest.php
rename to core/modules/entity/lib/Drupal/entity/Tests/EntityAPITest.php
index 5eb245f..860d8ce 100644
--- a/core/modules/entity/lib/Drupal/entity/Tests/EntityApiTest.php
+++ b/core/modules/entity/lib/Drupal/entity/Tests/EntityAPITest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\entity\Tests\EntityApiTest.
+ * Definition of Drupal\entity\Tests\EntityAPITest.
  */
 
 namespace Drupal\entity\Tests;
@@ -12,7 +12,7 @@ use Drupal\simpletest\WebTestBase;
 /**
  * Tests the basic Entity API.
  */
-class EntityApiTest extends WebTestBase {
+class EntityAPITest extends WebTestBase {
 
   public static function getInfo() {
     return array(
diff --git a/core/modules/entity/lib/Drupal/entity/Tests/EntityCrudHookTest.php b/core/modules/entity/lib/Drupal/entity/Tests/EntityCRUDHookTest.php
similarity index 99%
rename from core/modules/entity/lib/Drupal/entity/Tests/EntityCrudHookTest.php
rename to core/modules/entity/lib/Drupal/entity/Tests/EntityCRUDHookTest.php
index dffa6fd..de75cb8 100644
--- a/core/modules/entity/lib/Drupal/entity/Tests/EntityCrudHookTest.php
+++ b/core/modules/entity/lib/Drupal/entity/Tests/EntityCRUDHookTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\entity\Tests\EntityCrudHookTest.
+ * Definition of Drupal\entity\Tests\EntityCRUDHookTest.
  */
 
 namespace Drupal\entity\Tests;
@@ -21,7 +21,7 @@ use Drupal\simpletest\WebTestBase;
  * As well as all type-specific hooks, like hook_node_insert(),
  * hook_comment_update(), etc.
  */
-class EntityCrudHookTest extends WebTestBase {
+class EntityCRUDHookTest extends WebTestBase {
 
   protected $ids = array();
 
diff --git a/core/modules/field/lib/Drupal/field/Tests/BulkDeleteTest.php b/core/modules/field/lib/Drupal/field/Tests/BulkDeleteTest.php
index 347f55c..6cb43eb 100644
--- a/core/modules/field/lib/Drupal/field/Tests/BulkDeleteTest.php
+++ b/core/modules/field/lib/Drupal/field/Tests/BulkDeleteTest.php
@@ -142,7 +142,7 @@ class BulkDeleteTest extends FieldTestBase {
    * operate on the deleted data and instance.
    *
    * This tests how EntityFieldQuery interacts with
-   * field_delete_instance() and could be moved to FieldCrudTestCase,
+   * field_delete_instance() and could be moved to FieldCRUDTestCase,
    * but depends on this class's setUp().
    */
   function testDeleteFieldInstance() {
diff --git a/core/modules/field/lib/Drupal/field/Tests/CrudTest.php b/core/modules/field/lib/Drupal/field/Tests/CRUDTest.php
similarity index 99%
rename from core/modules/field/lib/Drupal/field/Tests/CrudTest.php
rename to core/modules/field/lib/Drupal/field/Tests/CRUDTest.php
index be93f80..4e060a5 100644
--- a/core/modules/field/lib/Drupal/field/Tests/CrudTest.php
+++ b/core/modules/field/lib/Drupal/field/Tests/CRUDTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\field\Tests\CrudTest.
+ * Definition of Drupal\field\Tests\CRUDTest.
  */
 
 namespace Drupal\field\Tests;
@@ -10,7 +10,7 @@ namespace Drupal\field\Tests;
 use Drupal\field\FieldException;
 use Exception;
 
-class CrudTest extends FieldTestBase {
+class CRUDTest extends FieldTestBase {
   public static function getInfo() {
     return array(
       'name' => 'Field CRUD tests',
diff --git a/core/modules/field/lib/Drupal/field/Tests/DisplayApiTest.php b/core/modules/field/lib/Drupal/field/Tests/DisplayAPITest.php
similarity index 98%
rename from core/modules/field/lib/Drupal/field/Tests/DisplayApiTest.php
rename to core/modules/field/lib/Drupal/field/Tests/DisplayAPITest.php
index f848367..a5afc24 100644
--- a/core/modules/field/lib/Drupal/field/Tests/DisplayApiTest.php
+++ b/core/modules/field/lib/Drupal/field/Tests/DisplayAPITest.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Definition of Drupal\field\Tests\DisplayApiTest.
+ * Definition of Drupal\field\Tests\DisplayAPITest.
  */
 
 namespace Drupal\field\Tests;
 
-class DisplayApiTest extends FieldTestBase {
+class DisplayAPITest extends FieldTestBase {
   public static function getInfo() {
     return array(
       'name' => 'Field Display API tests',
diff --git a/core/modules/field/lib/Drupal/field/Tests/FieldInstanceCrudTest.php b/core/modules/field/lib/Drupal/field/Tests/FieldInstanceCRUDTest.php
similarity index 99%
rename from core/modules/field/lib/Drupal/field/Tests/FieldInstanceCrudTest.php
rename to core/modules/field/lib/Drupal/field/Tests/FieldInstanceCRUDTest.php
index 7d1e667..c091eeb 100644
--- a/core/modules/field/lib/Drupal/field/Tests/FieldInstanceCrudTest.php
+++ b/core/modules/field/lib/Drupal/field/Tests/FieldInstanceCRUDTest.php
@@ -2,14 +2,14 @@
 
 /**
  * @file
- * Definition of Drupal\field\Tests\FieldInstanceCrudTest.
+ * Definition of Drupal\field\Tests\FieldInstanceCRUDTest.
  */
 
 namespace Drupal\field\Tests;
 
 use Drupal\field\FieldException;
 
-class FieldInstanceCrudTest extends FieldTestBase {
+class FieldInstanceCRUDTest extends FieldTestBase {
   protected $field;
 
   public static function getInfo() {
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Tests/FieldUiTestBase.php b/core/modules/field_ui/lib/Drupal/field_ui/Tests/FieldUITestBase.php
similarity index 98%
rename from core/modules/field_ui/lib/Drupal/field_ui/Tests/FieldUiTestBase.php
rename to core/modules/field_ui/lib/Drupal/field_ui/Tests/FieldUITestBase.php
index cc0f45d..c6937a1 100644
--- a/core/modules/field_ui/lib/Drupal/field_ui/Tests/FieldUiTestBase.php
+++ b/core/modules/field_ui/lib/Drupal/field_ui/Tests/FieldUITestBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\field_ui\Tests\FieldUiTestBase.
+ * Definition of Drupal\field_ui\Tests\FieldUITestBase.
  */
 
 namespace Drupal\field_ui\Tests;
@@ -12,7 +12,7 @@ use Drupal\simpletest\WebTestBase;
 /**
  * Provides common functionality for the Field UI test classes.
  */
-class FieldUiTestBase extends WebTestBase {
+class FieldUITestBase extends WebTestBase {
 
   function setUp() {
     // Since this is a base class for many test cases, support the same
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageDisplayTest.php b/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageDisplayTest.php
index 06ea02a..50bbf61 100644
--- a/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageDisplayTest.php
+++ b/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageDisplayTest.php
@@ -12,7 +12,7 @@ use Drupal\node\Node;
 /**
  * Tests the functionality of the 'Manage display' screens.
  */
-class ManageDisplayTest extends FieldUiTestBase {
+class ManageDisplayTest extends FieldUITestBase {
   public static function getInfo() {
     return array(
       'name' => 'Manage display',
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageFieldsTest.php b/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageFieldsTest.php
index af40230..0a8fff3 100644
--- a/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageFieldsTest.php
+++ b/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageFieldsTest.php
@@ -10,7 +10,7 @@ namespace Drupal\field_ui\Tests;
 /**
  * Tests the functionality of the 'Manage fields' screen.
  */
-class ManageFieldsTest extends FieldUiTestBase {
+class ManageFieldsTest extends FieldUITestBase {
   public static function getInfo() {
     return array(
       'name' => 'Manage fields',
diff --git a/core/modules/filter/lib/Drupal/filter/Tests/FilterCrudTest.php b/core/modules/filter/lib/Drupal/filter/Tests/FilterCRUDTest.php
similarity index 98%
rename from core/modules/filter/lib/Drupal/filter/Tests/FilterCrudTest.php
rename to core/modules/filter/lib/Drupal/filter/Tests/FilterCRUDTest.php
index 32c706b..0f31ed7 100644
--- a/core/modules/filter/lib/Drupal/filter/Tests/FilterCrudTest.php
+++ b/core/modules/filter/lib/Drupal/filter/Tests/FilterCRUDTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\filter\Tests\FilterCrudTest.
+ * Definition of Drupal\filter\Tests\FilterCRUDTest.
  */
 
 namespace Drupal\filter\Tests;
@@ -13,7 +13,7 @@ use stdClass;
 /**
  * Tests for text format and filter CRUD operations.
  */
-class FilterCrudTest extends WebTestBase {
+class FilterCRUDTest extends WebTestBase {
   public static function getInfo() {
     return array(
       'name' => 'Filter CRUD operations',
@@ -29,7 +29,7 @@ class FilterCrudTest extends WebTestBase {
   /**
    * Test CRUD operations for text formats and filters.
    */
-  function testTextFormatCrud() {
+  function testTextFormatCRUD() {
     // Add a text format with minimum data only.
     $format = new stdClass();
     $format->format = 'empty_format';
diff --git a/core/modules/path/lib/Drupal/path/Tests/PathLanguageUiTest.php b/core/modules/path/lib/Drupal/path/Tests/PathLanguageUITest.php
similarity index 95%
rename from core/modules/path/lib/Drupal/path/Tests/PathLanguageUiTest.php
rename to core/modules/path/lib/Drupal/path/Tests/PathLanguageUITest.php
index f1f56d6..c44b35a 100644
--- a/core/modules/path/lib/Drupal/path/Tests/PathLanguageUiTest.php
+++ b/core/modules/path/lib/Drupal/path/Tests/PathLanguageUITest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\path\Tests\PathLanguageUiTest.
+ * Definition of Drupal\path\Tests\PathLanguageUITest.
  */
 
 namespace Drupal\path\Tests;
@@ -10,7 +10,7 @@ namespace Drupal\path\Tests;
 /**
  * Tests the user interface for creating path aliases, with languages.
  */
-class PathLanguageUiTest extends PathTestBase {
+class PathLanguageUITest extends PathTestBase {
   public static function getInfo() {
     return array(
       'name' => 'Path aliases with languages',
diff --git a/core/modules/php/lib/Drupal/php/Tests/PhpAccessTest.php b/core/modules/php/lib/Drupal/php/Tests/PHPAccessTest.php
similarity index 92%
rename from core/modules/php/lib/Drupal/php/Tests/PhpAccessTest.php
rename to core/modules/php/lib/Drupal/php/Tests/PHPAccessTest.php
index ec7f740..1e5483d 100644
--- a/core/modules/php/lib/Drupal/php/Tests/PhpAccessTest.php
+++ b/core/modules/php/lib/Drupal/php/Tests/PHPAccessTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\php\Tests\PhpAccessTest.
+ * Definition of Drupal\php\Tests\PHPAccessTest.
  */
 
 namespace Drupal\php\Tests;
@@ -10,7 +10,7 @@ namespace Drupal\php\Tests;
 /**
  * Tests to make sure access to the PHP filter is properly restricted.
  */
-class PhpAccessTest extends PhpTestBase {
+class PHPAccessTest extends PHPTestBase {
   public static function getInfo() {
     return array(
       'name' => 'PHP filter access check',
diff --git a/core/modules/php/lib/Drupal/php/Tests/PhpFilterTest.php b/core/modules/php/lib/Drupal/php/Tests/PHPFilterTest.php
similarity index 93%
rename from core/modules/php/lib/Drupal/php/Tests/PhpFilterTest.php
rename to core/modules/php/lib/Drupal/php/Tests/PHPFilterTest.php
index 71ee5be..8d98fc7 100644
--- a/core/modules/php/lib/Drupal/php/Tests/PhpFilterTest.php
+++ b/core/modules/php/lib/Drupal/php/Tests/PHPFilterTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\php\Tests\PhpFilterTest.
+ * Definition of Drupal\php\Tests\PHPFilterTest.
  */
 
 namespace Drupal\php\Tests;
@@ -10,7 +10,7 @@ namespace Drupal\php\Tests;
 /**
  * Tests to make sure the PHP filter actually evaluates PHP code when used.
  */
-class PhpFilterTest extends PhpTestBase {
+class PHPFilterTest extends PHPTestBase {
   public static function getInfo() {
     return array(
       'name' => 'PHP filter functionality',
@@ -22,7 +22,7 @@ class PhpFilterTest extends PhpTestBase {
   /**
    * Makes sure that the PHP filter evaluates PHP code when used.
    */
-  function testPhpFilter() {
+  function testPHPFilter() {
     // Log in as a user with permission to use the PHP code text format.
     $php_code_permission = filter_permission_name(filter_format_load('php_code'));
     $web_user = $this->drupalCreateUser(array('access content', 'create page content', 'edit own page content', $php_code_permission));
diff --git a/core/modules/php/lib/Drupal/php/Tests/PhpTestBase.php b/core/modules/php/lib/Drupal/php/Tests/PHPTestBase.php
similarity index 95%
rename from core/modules/php/lib/Drupal/php/Tests/PhpTestBase.php
rename to core/modules/php/lib/Drupal/php/Tests/PHPTestBase.php
index 2af8c8b..9bc93b3 100644
--- a/core/modules/php/lib/Drupal/php/Tests/PhpTestBase.php
+++ b/core/modules/php/lib/Drupal/php/Tests/PHPTestBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\php\Tests\PhpTestBase.
+ * Definition of Drupal\php\Tests\PHPTestBase.
  */
 
 namespace Drupal\php\Tests;
@@ -12,7 +12,7 @@ use Drupal\simpletest\WebTestBase;
 /**
  * Defines a base PHP test case class.
  */
-class PhpTestBase extends WebTestBase {
+class PHPTestBase extends WebTestBase {
   protected $php_code_format;
 
   function setUp() {
diff --git a/core/modules/poll/lib/Drupal/poll/Tests/PollJsAddChoiceTest.php b/core/modules/poll/lib/Drupal/poll/Tests/PollJSAddChoiceTest.php
similarity index 93%
rename from core/modules/poll/lib/Drupal/poll/Tests/PollJsAddChoiceTest.php
rename to core/modules/poll/lib/Drupal/poll/Tests/PollJSAddChoiceTest.php
index 7410958..c3389cc 100644
--- a/core/modules/poll/lib/Drupal/poll/Tests/PollJsAddChoiceTest.php
+++ b/core/modules/poll/lib/Drupal/poll/Tests/PollJSAddChoiceTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\poll\Tests\PollJsAddChoiceTest.
+ * Definition of Drupal\poll\Tests\PollJSAddChoiceTest.
  */
 
 namespace Drupal\poll\Tests;
@@ -12,7 +12,7 @@ use Drupal\simpletest\WebTestBase;
 /**
  * Test adding new choices.
  */
-class PollJsAddChoiceTest extends WebTestBase {
+class PollJSAddChoiceTest extends WebTestBase {
 
   public static function getInfo() {
     return array(
diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/CrudTest.php b/core/modules/rdf/lib/Drupal/rdf/Tests/CRUDTest.php
similarity index 97%
rename from core/modules/rdf/lib/Drupal/rdf/Tests/CrudTest.php
rename to core/modules/rdf/lib/Drupal/rdf/Tests/CRUDTest.php
index e6752a0..dc27ddd 100644
--- a/core/modules/rdf/lib/Drupal/rdf/Tests/CrudTest.php
+++ b/core/modules/rdf/lib/Drupal/rdf/Tests/CRUDTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\rdf\Tests\CrudTest.
+ * Definition of Drupal\rdf\Tests\CRUDTest.
  */
 
 namespace Drupal\rdf\Tests;
@@ -12,7 +12,7 @@ use Drupal\simpletest\WebTestBase;
 /**
  * Tests the RDF mapping CRUD functions.
  */
-class CrudTest extends WebTestBase {
+class CRUDTest extends WebTestBase {
   public static function getInfo() {
     return array(
       'name' => 'RDF mapping CRUD functions',
diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/CommentAttributesTest.php b/core/modules/rdf/lib/Drupal/rdf/Tests/CommentAttributesTest.php
index cd22150..13a0654 100644
--- a/core/modules/rdf/lib/Drupal/rdf/Tests/CommentAttributesTest.php
+++ b/core/modules/rdf/lib/Drupal/rdf/Tests/CommentAttributesTest.php
@@ -51,7 +51,7 @@ class CommentAttributesTest extends CommentTestBase {
   /**
    * Tests the presence of the RDFa markup for the number of comments.
    */
-  public function testNumberOfCommentsRdfaMarkup() {
+  public function testNumberOfCommentsRDFaMarkup() {
     // Posts 2 comments as a registered user.
     $this->drupalLogin($this->web_user);
     $this->postComment($this->node1, $this->randomName(), $this->randomName());
@@ -75,7 +75,7 @@ class CommentAttributesTest extends CommentTestBase {
    * Tests the presence of the RDFa markup for the title, date and author and
    * homepage on registered users and anonymous comments.
    */
-  public function testCommentRdfaMarkup() {
+  public function testCommentRDFaMarkup() {
 
     // Posts comment #1 as a registered user.
     $this->drupalLogin($this->web_user);
@@ -85,12 +85,12 @@ class CommentAttributesTest extends CommentTestBase {
 
     // Tests comment #1 with access to the user profile.
     $this->drupalGet('node/' . $this->node1->nid);
-    $this->_testBasicCommentRdfaMarkup($comment1);
+    $this->_testBasicCommentRDFaMarkup($comment1);
 
     // Tests comment #1 with no access to the user profile (as anonymous user).
     $this->drupalLogout();
     $this->drupalGet('node/' . $this->node1->nid);
-    $this->_testBasicCommentRdfaMarkup($comment1);
+    $this->_testBasicCommentRDFaMarkup($comment1);
 
     // Posts comment #2 as anonymous user.
     $comment2_subject = $this->randomName();
@@ -103,7 +103,7 @@ class CommentAttributesTest extends CommentTestBase {
     $this->drupalGet('node/' . $this->node2->nid);
 
     // Tests comment #2 as anonymous user.
-    $this->_testBasicCommentRdfaMarkup($comment2, $anonymous_user);
+    $this->_testBasicCommentRDFaMarkup($comment2, $anonymous_user);
     // Tests the RDFa markup for the homepage (specific to anonymous comments).
     $comment_homepage = $this->xpath('//div[contains(@class, "comment") and contains(@typeof, "sioct:Comment")]//span[@rel="sioc:has_creator"]/a[contains(@class, "username") and @typeof="sioc:UserAccount" and @property="foaf:name" and @href="http://example.org/" and contains(@rel, "foaf:page")]');
     $this->assertTrue(!empty($comment_homepage), t('RDFa markup for the homepage of anonymous user found.'));
@@ -114,7 +114,7 @@ class CommentAttributesTest extends CommentTestBase {
     // Tests comment #2 as logged in user.
     $this->drupalLogin($this->web_user);
     $this->drupalGet('node/' . $this->node2->nid);
-    $this->_testBasicCommentRdfaMarkup($comment2, $anonymous_user);
+    $this->_testBasicCommentRDFaMarkup($comment2, $anonymous_user);
     // Tests the RDFa markup for the homepage (specific to anonymous comments).
     $comment_homepage = $this->xpath('//div[contains(@class, "comment") and contains(@typeof, "sioct:Comment")]//span[@rel="sioc:has_creator"]/a[contains(@class, "username") and @typeof="sioc:UserAccount" and @property="foaf:name" and @href="http://example.org/" and contains(@rel, "foaf:page")]');
     $this->assertTrue(!empty($comment_homepage), t("RDFa markup for the homepage of anonymous user found."));
@@ -126,7 +126,7 @@ class CommentAttributesTest extends CommentTestBase {
   /**
    * Test RDF comment replies.
    */
-  public function testCommentReplyOfRdfaMarkup() {
+  public function testCommentReplyOfRDFaMarkup() {
     // Posts comment #1 as a registered user.
     $this->drupalLogin($this->web_user);
     $comments[] = $this->postComment($this->node1, $this->randomName(), $this->randomName());
@@ -150,7 +150,7 @@ class CommentAttributesTest extends CommentTestBase {
   }
 
   /**
-   * Helper function for testCommentRdfaMarkup().
+   * Helper function for testCommentRDFaMarkup().
    *
    * Tests the current page for basic comment RDFa markup.
    *
@@ -159,7 +159,7 @@ class CommentAttributesTest extends CommentTestBase {
    * @param $account
    *   An array containing information about an anonymous user.
    */
-  function _testBasicCommentRdfaMarkup($comment, $account = array()) {
+  function _testBasicCommentRDFaMarkup($comment, $account = array()) {
     $comment_container = $this->xpath('//div[contains(@class, "comment") and contains(@typeof, "sioct:Comment")]');
     $this->assertTrue(!empty($comment_container), t("Comment RDF type for comment found."));
     $comment_title = $this->xpath('//div[contains(@class, "comment") and contains(@typeof, "sioct:Comment")]//h3[@property="dc:title"]');
diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/GetNamespacesTest.php b/core/modules/rdf/lib/Drupal/rdf/Tests/GetNamespacesTest.php
index 973d13d..9d0e244 100644
--- a/core/modules/rdf/lib/Drupal/rdf/Tests/GetNamespacesTest.php
+++ b/core/modules/rdf/lib/Drupal/rdf/Tests/GetNamespacesTest.php
@@ -28,7 +28,7 @@ class GetNamespacesTest extends WebTestBase {
   /**
    * Test RDF namespaces.
    */
-  function testGetRdfNamespaces() {
+  function testGetRDFNamespaces() {
     // Fetches the front page and extracts RDFa 1.1 prefixes.
     $this->drupalGet('');
 
diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/GetRdfNamespacesTest.php b/core/modules/rdf/lib/Drupal/rdf/Tests/GetRDFNamespacesTest.php
similarity index 88%
rename from core/modules/rdf/lib/Drupal/rdf/Tests/GetRdfNamespacesTest.php
rename to core/modules/rdf/lib/Drupal/rdf/Tests/GetRDFNamespacesTest.php
index a6a20e4..cee3eaf 100644
--- a/core/modules/rdf/lib/Drupal/rdf/Tests/GetRdfNamespacesTest.php
+++ b/core/modules/rdf/lib/Drupal/rdf/Tests/GetRDFNamespacesTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\rdf\Tests\GetRdfNamespacesTest.
+ * Definition of Drupal\rdf\Tests\GetRDFNamespacesTest.
  */
 
 namespace Drupal\rdf\Tests;
@@ -12,7 +12,7 @@ use Drupal\simpletest\WebTestBase;
 /**
  * Tests for RDF namespaces declaration with hook_rdf_namespaces().
  */
-class GetRdfNamespacesTest extends WebTestBase {
+class GetRDFNamespacesTest extends WebTestBase {
   public static function getInfo() {
     return array(
       'name' => 'RDF namespaces',
@@ -28,7 +28,7 @@ class GetRdfNamespacesTest extends WebTestBase {
   /**
    * Test getting RDF namesapces.
    */
-  function testGetRdfNamespaces() {
+  function testGetRDFNamespaces() {
     // Get all RDF namespaces.
     $ns = rdf_get_namespaces();
 
diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/MappingDefinitionTest.php b/core/modules/rdf/lib/Drupal/rdf/Tests/MappingDefinitionTest.php
index 98a36d5..33b1548 100644
--- a/core/modules/rdf/lib/Drupal/rdf/Tests/MappingDefinitionTest.php
+++ b/core/modules/rdf/lib/Drupal/rdf/Tests/MappingDefinitionTest.php
@@ -131,7 +131,7 @@ class MappingDefinitionTest extends TaxonomyTestBase {
   /**
    * Creates a random term and ensures the right RDFa markup is used.
    */
-  function testTaxonomyTermRdfaAttributes() {
+  function testTaxonomyTermRDFaAttributes() {
     $vocabulary = $this->createVocabulary();
     $term = $this->createTerm($vocabulary);
 
diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/RdfaMarkupTest.php b/core/modules/rdf/lib/Drupal/rdf/Tests/RDFaMarkupTest.php
similarity index 98%
rename from core/modules/rdf/lib/Drupal/rdf/Tests/RdfaMarkupTest.php
rename to core/modules/rdf/lib/Drupal/rdf/Tests/RDFaMarkupTest.php
index 96d2553..fa637bf 100644
--- a/core/modules/rdf/lib/Drupal/rdf/Tests/RdfaMarkupTest.php
+++ b/core/modules/rdf/lib/Drupal/rdf/Tests/RDFaMarkupTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\rdf\Tests\RdfaMarkupTest.
+ * Definition of Drupal\rdf\Tests\RDFaMarkupTest.
  */
 
 namespace Drupal\rdf\Tests;
@@ -12,7 +12,7 @@ use Drupal\simpletest\WebTestBase;
 /**
  * Tests RDFa markup generation.
  */
-class RdfaMarkupTest extends WebTestBase {
+class RDFaMarkupTest extends WebTestBase {
   protected $profile = 'standard';
 
   public static function getInfo() {
@@ -30,7 +30,7 @@ class RdfaMarkupTest extends WebTestBase {
   /**
    * Test rdf_rdfa_attributes().
    */
-  function testDrupalRdfaAttributes() {
+  function testDrupalRDFaAttributes() {
     // Same value as the one in the HTML tag (no callback function).
     $expected_attributes = array(
       'property' => array('dc:title'),
diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/TrackerAttributesTest.php b/core/modules/rdf/lib/Drupal/rdf/Tests/TrackerAttributesTest.php
index fdac254..fac3eb9 100644
--- a/core/modules/rdf/lib/Drupal/rdf/Tests/TrackerAttributesTest.php
+++ b/core/modules/rdf/lib/Drupal/rdf/Tests/TrackerAttributesTest.php
@@ -47,8 +47,8 @@ class TrackerAttributesTest extends WebTestBase {
 
     // Pass both the anonymously posted node and the administrator posted node
     // through to test for the RDF attributes.
-    $this->_testBasicTrackerRdfaMarkup($node_anon);
-    $this->_testBasicTrackerRdfaMarkup($node_admin);
+    $this->_testBasicTrackerRDFaMarkup($node_anon);
+    $this->_testBasicTrackerRDFaMarkup($node_admin);
 
   }
 
@@ -60,7 +60,7 @@ class TrackerAttributesTest extends WebTestBase {
    * @param Node $node
    * The node just created.
    */
-  function _testBasicTrackerRdfaMarkup(Node $node) {
+  function _testBasicTrackerRDFaMarkup(Node $node) {
     $url = url('node/' . $node->nid);
 
     $user = ($node->uid == 0) ? 'Anonymous user' : 'Registered user';
diff --git a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/IpAddressTest.php b/core/modules/system/lib/Drupal/system/Tests/Bootstrap/IPAddressTest.php
similarity index 97%
rename from core/modules/system/lib/Drupal/system/Tests/Bootstrap/IpAddressTest.php
rename to core/modules/system/lib/Drupal/system/Tests/Bootstrap/IPAddressTest.php
index b4d77c4..b6437f7 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/IpAddressTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Bootstrap/IPAddressTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Bootstrap\IpAddressTest.
+ * Definition of Drupal\system\Tests\Bootstrap\IPAddressTest.
  */
 
 namespace Drupal\system\Tests\Bootstrap;
@@ -12,7 +12,7 @@ use Drupal\simpletest\WebTestBase;
 /**
  * Tests getting IP addresses and hostname validation.
  */
-class IpAddressTest extends WebTestBase {
+class IPAddressTest extends WebTestBase {
 
   public static function getInfo() {
     return array(
diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/JsonUnitTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/JSONUnitTest.php
similarity index 96%
rename from core/modules/system/lib/Drupal/system/Tests/Common/JsonUnitTest.php
rename to core/modules/system/lib/Drupal/system/Tests/Common/JSONUnitTest.php
index 9deb56b..b71cb3f 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Common/JsonUnitTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Common/JSONUnitTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Common\JsonUnitTest.
+ * Definition of Drupal\system\Tests\Common\JSONUnitTest.
  */
 
 namespace Drupal\system\Tests\Common;
@@ -12,7 +12,7 @@ use Drupal\simpletest\UnitTestBase;
 /**
  * Tests the drupal_json_encode() and drupal_json_decode() functions.
  */
-class JsonUnitTest extends UnitTestBase {
+class JSONUnitTest extends UnitTestBase {
   public static function getInfo() {
     return array(
       'name' => 'JSON',
diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/JavaScriptTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/JavaScriptTest.php
index ea1a749..6b9dd70 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Common/JavaScriptTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Common/JavaScriptTest.php
@@ -493,7 +493,7 @@ class JavaScriptTest extends WebTestBase {
    * Tests that the query string remains intact when adding JavaScript files
    *  that have query string parameters.
    */
-  function testAddJsFileWithQueryString() {
+  function testAddJSFileWithQueryString() {
     $this->drupalGet('common-test/query-string');
     $query_string = variable_get('css_js_query_string', '0');
     $this->assertRaw(drupal_get_path('module', 'node') . '/node.js?' . $query_string, t('Query string was appended correctly to js.'));
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/InsertLobTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/InsertLOBTest.php
similarity index 92%
rename from core/modules/system/lib/Drupal/system/Tests/Database/InsertLobTest.php
rename to core/modules/system/lib/Drupal/system/Tests/Database/InsertLOBTest.php
index 96b98ee..a3a27ff 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/InsertLobTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/InsertLOBTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Database\InsertLobTest.
+ * Definition of Drupal\system\Tests\Database\InsertLOBTest.
  */
 
 namespace Drupal\system\Tests\Database;
@@ -10,7 +10,7 @@ namespace Drupal\system\Tests\Database;
 /**
  * Insert tests using LOB fields, which are weird on some databases.
  */
-class InsertLobTest extends DatabaseTestBase {
+class InsertLOBTest extends DatabaseTestBase {
 
   public static function getInfo() {
     return array(
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/UpdateLobTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/UpdateLOBTest.php
similarity index 93%
rename from core/modules/system/lib/Drupal/system/Tests/Database/UpdateLobTest.php
rename to core/modules/system/lib/Drupal/system/Tests/Database/UpdateLOBTest.php
index 4d0b0c6..22b142d 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/UpdateLobTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/UpdateLOBTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Database\UpdateLobTest.
+ * Definition of Drupal\system\Tests\Database\UpdateLOBTest.
  */
 
 namespace Drupal\system\Tests\Database;
@@ -10,7 +10,7 @@ namespace Drupal\system\Tests\Database;
 /**
  * Test update queries involving LOB values.
  */
-class UpdateLobTest extends DatabaseTestBase {
+class UpdateLOBTest extends DatabaseTestBase {
 
   public static function getInfo() {
     return array(
diff --git a/core/modules/system/lib/Drupal/system/Tests/File/MimeTypeTest.php b/core/modules/system/lib/Drupal/system/Tests/File/MIMETypeTest.php
similarity index 95%
rename from core/modules/system/lib/Drupal/system/Tests/File/MimeTypeTest.php
rename to core/modules/system/lib/Drupal/system/Tests/File/MIMETypeTest.php
index cb90b85..97d41a6 100644
--- a/core/modules/system/lib/Drupal/system/Tests/File/MimeTypeTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/File/MIMETypeTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\File\MimeTypeTest.
+ * Definition of Drupal\system\Tests\File\MIMETypeTest.
  */
 
 namespace Drupal\system\Tests\File;
@@ -12,7 +12,7 @@ use Drupal\simpletest\WebTestBase;
 /**
  * Tests for file_get_mimetype().
  */
-class MimeTypeTest extends WebTestBase {
+class MIMETypeTest extends WebTestBase {
   function setUp() {
     parent::setUp('file_test');
   }
@@ -28,7 +28,7 @@ class MimeTypeTest extends WebTestBase {
   /**
    * Test mapping of mimetypes from filenames.
    */
-  public function testFileMimeTypeDetection() {
+  public function testFileMIMETypeDetection() {
     $prefix = 'public://';
 
     $test_case = array(
diff --git a/core/modules/system/lib/Drupal/system/Tests/Image/ToolkitGdTest.php b/core/modules/system/lib/Drupal/system/Tests/Image/ToolkitGDTest.php
similarity index 98%
rename from core/modules/system/lib/Drupal/system/Tests/Image/ToolkitGdTest.php
rename to core/modules/system/lib/Drupal/system/Tests/Image/ToolkitGDTest.php
index 611126d..13e3179 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Image/ToolkitGdTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Image/ToolkitGDTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Image\ToolkitGdTest.
+ * Definition of Drupal\system\Tests\Image\ToolkitGDTest.
  */
 
 namespace Drupal\system\Tests\Image;
@@ -12,7 +12,7 @@ use Drupal\simpletest\WebTestBase;
 /**
  * Test the core GD image manipulation functions.
  */
-class ToolkitGdTest extends WebTestBase {
+class ToolkitGDTest extends WebTestBase {
   // Colors that are used in testing.
   protected $black       = array(0, 0, 0, 0);
   protected $red         = array(255, 0, 0, 0);
diff --git a/core/modules/system/lib/Drupal/system/Tests/Mail/MailTest.php b/core/modules/system/lib/Drupal/system/Tests/Mail/MailTest.php
index d4eceba..807f946 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Mail/MailTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Mail/MailTest.php
@@ -71,7 +71,7 @@ class MailTest extends WebTestBase implements MailInterface {
   /**
    * Concatenate and wrap the e-mail body for plain-text mails.
    *
-   * @see Drupal\Core\Mail\PhpMail
+   * @see Drupal\Core\Mail\PHPMail
    */
   public function format(array $message) {
     // Join the body array into one string.
diff --git a/core/modules/system/lib/Drupal/system/Tests/Module/ModuleApiTest.php b/core/modules/system/lib/Drupal/system/Tests/Module/ModuleAPITest.php
similarity index 99%
rename from core/modules/system/lib/Drupal/system/Tests/Module/ModuleApiTest.php
rename to core/modules/system/lib/Drupal/system/Tests/Module/ModuleAPITest.php
index 796ddcb..f40b513 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Module/ModuleApiTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Module/ModuleAPITest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Module\ModuleApiTest.
+ * Definition of Drupal\system\Tests\Module\ModuleAPITest.
  */
 
 namespace Drupal\system\Tests\Module;
@@ -12,7 +12,7 @@ use Drupal\simpletest\WebTestBase;
 /**
  * Unit tests for the module API.
  */
-class ModuleApiTest extends WebTestBase {
+class ModuleAPITest extends WebTestBase {
   // Requires Standard profile modules/dependencies.
   protected $profile = 'standard';
 
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/IpAddressBlockingTest.php b/core/modules/system/lib/Drupal/system/Tests/System/IPAddressBlockingTest.php
similarity index 96%
rename from core/modules/system/lib/Drupal/system/Tests/System/IpAddressBlockingTest.php
rename to core/modules/system/lib/Drupal/system/Tests/System/IPAddressBlockingTest.php
index 6d752a2..c5dfb4b 100644
--- a/core/modules/system/lib/Drupal/system/Tests/System/IpAddressBlockingTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/System/IPAddressBlockingTest.php
@@ -2,14 +2,14 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\System\IpAddressBlockingTest.
+ * Definition of Drupal\system\Tests\System\IPAddressBlockingTest.
  */
 
 namespace Drupal\system\Tests\System;
 
 use Drupal\simpletest\WebTestBase;
 
-class IpAddressBlockingTest extends WebTestBase {
+class IPAddressBlockingTest extends WebTestBase {
   protected $blocking_user;
 
   /**
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/IndexPhpTest.php b/core/modules/system/lib/Drupal/system/Tests/System/IndexPHPTest.php
similarity index 85%
rename from core/modules/system/lib/Drupal/system/Tests/System/IndexPhpTest.php
rename to core/modules/system/lib/Drupal/system/Tests/System/IndexPHPTest.php
index 0ab7ddf..ae53b14 100644
--- a/core/modules/system/lib/Drupal/system/Tests/System/IndexPhpTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/System/IndexPHPTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\System\IndexPhpTest.
+ * Definition of Drupal\system\Tests\System\IndexPHPTest.
  */
 
 namespace Drupal\system\Tests\System;
@@ -12,7 +12,7 @@ use Drupal\simpletest\WebTestBase;
 /**
  * Test the handling of requests containing 'index.php'.
  */
-class IndexPhpTest extends WebTestBase {
+class IndexPHPTest extends WebTestBase {
   public static function getInfo() {
     return array(
       'name' => 'Index.php handling',
@@ -28,7 +28,7 @@ class IndexPhpTest extends WebTestBase {
   /**
    * Test index.php handling.
    */
-  function testIndexPhpHandling() {
+  function testIndexPHPHandling() {
     $index_php = $GLOBALS['base_url'] . '/index.php';
 
     $this->drupalGet($index_php, array('external' => TRUE));
diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/HtmlTplPhpAttributesTest.php b/core/modules/system/lib/Drupal/system/Tests/Theme/HtmlTplPHPAttributesTest.php
similarity index 86%
rename from core/modules/system/lib/Drupal/system/Tests/Theme/HtmlTplPhpAttributesTest.php
rename to core/modules/system/lib/Drupal/system/Tests/Theme/HtmlTplPHPAttributesTest.php
index 82dd7c9..79f6bfe 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Theme/HtmlTplPhpAttributesTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Theme/HtmlTplPHPAttributesTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Theme\HtmlTplPhpAttributesTest.
+ * Definition of Drupal\system\Tests\Theme\HtmlTplPHPAttributesTest.
  */
 
 namespace Drupal\system\Tests\Theme;
@@ -12,7 +12,7 @@ use Drupal\simpletest\WebTestBase;
 /**
  * Functional test for attributes of html.tpl.php.
  */
-class HtmlTplPhpAttributesTest extends WebTestBase {
+class HtmlTplPHPAttributesTest extends WebTestBase {
   public static function getInfo() {
     return array(
       'name' => 'html.tpl.php html and body attributes',
@@ -28,7 +28,7 @@ class HtmlTplPhpAttributesTest extends WebTestBase {
   /**
    * Tests that modules and themes can alter variables in html.tpl.php.
    */
-  function testThemeHtmlTplPhpAttributes() {
+  function testThemeHtmlTplPHPAttributes() {
     $this->drupalGet('');
     $attributes = $this->xpath('/html[@theme_test_html_attribute="theme test html attribute value"]');
     $this->assertTrue(count($attributes) == 1, 'Attribute set in the html element via hook_preprocess_HOOK() for html.tpl.php found.');
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/EfqTest.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/EFQTest.php
similarity index 93%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Tests/EfqTest.php
rename to core/modules/taxonomy/lib/Drupal/taxonomy/Tests/EFQTest.php
index 32e3f04..af1227c 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/EfqTest.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/EFQTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\taxonomy\Tests\EfqTest.
+ * Definition of Drupal\taxonomy\Tests\EFQTest.
  */
 
 namespace Drupal\taxonomy\Tests;
@@ -12,7 +12,7 @@ use Drupal\entity\EntityFieldQuery;
 /**
  * Tests the functionality of EntityFieldQuery for taxonomy entities.
  */
-class EfqTest extends TaxonomyTestBase {
+class EFQTest extends TaxonomyTestBase {
   public static function getInfo() {
     return array(
       'name' => 'Taxonomy EntityFieldQuery',
@@ -31,7 +31,7 @@ class EfqTest extends TaxonomyTestBase {
   /**
    * Tests that a basic taxonomy EntityFieldQuery works.
    */
-  function testTaxonomyEfq() {
+  function testTaxonomyEFQ() {
     $terms = array();
     for ($i = 0; $i < 5; $i++) {
       $term = $this->createTerm($this->vocabulary);
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/RssTest.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/RSSTest.php
similarity index 96%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Tests/RssTest.php
rename to core/modules/taxonomy/lib/Drupal/taxonomy/Tests/RSSTest.php
index b44f456..67d50c0 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/RssTest.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/RSSTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\taxonomy\Tests\RssTest.
+ * Definition of Drupal\taxonomy\Tests\RSSTest.
  */
 
 namespace Drupal\taxonomy\Tests;
@@ -10,7 +10,7 @@ namespace Drupal\taxonomy\Tests;
 /**
  * Tests the rendering of term reference fields in RSS feeds.
  */
-class RssTest extends TaxonomyTestBase {
+class RSSTest extends TaxonomyTestBase {
 
   public static function getInfo() {
     return array(
@@ -62,7 +62,7 @@ class RssTest extends TaxonomyTestBase {
    *
    * Create a node and assert that taxonomy terms appear in rss.xml.
    */
-  function testTaxonomyRss() {
+  function testTaxonomyRSS() {
     // Create two taxonomy terms.
     $term1 = $this->createTerm($this->vocabulary);
 
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserCancelTest.php b/core/modules/user/lib/Drupal/user/Tests/UserCancelTest.php
index 4e6a0d5..8ed25b5 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserCancelTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserCancelTest.php
@@ -64,7 +64,7 @@ class UserCancelTest extends WebTestBase {
    * This should never be possible, or the site owner would become unable to
    * administer the site.
    */
-  function testUserCancelUid1() {
+  function testUserCancelUserId1() {
     // Update uid 1's name and password to we know it.
     $password = user_password();
     require_once DRUPAL_ROOT . '/' . variable_get('password_inc', 'core/includes/password.inc');
diff --git a/core/modules/xmlrpc/lib/Drupal/xmlrpc/Tests/XmlRpcBasicTest.php b/core/modules/xmlrpc/lib/Drupal/xmlrpc/Tests/XMLRPCBasicTest.php
similarity index 96%
rename from core/modules/xmlrpc/lib/Drupal/xmlrpc/Tests/XmlRpcBasicTest.php
rename to core/modules/xmlrpc/lib/Drupal/xmlrpc/Tests/XMLRPCBasicTest.php
index 7e94985..1a150e4 100644
--- a/core/modules/xmlrpc/lib/Drupal/xmlrpc/Tests/XmlRpcBasicTest.php
+++ b/core/modules/xmlrpc/lib/Drupal/xmlrpc/Tests/XMLRPCBasicTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\xmlrpc\Tests\XmlRpcBasicTest.
+ * Definition of Drupal\xmlrpc\Tests\XMLRPCBasicTest.
  */
 
 namespace Drupal\xmlrpc\Tests;
@@ -12,7 +12,7 @@ use Drupal\simpletest\WebTestBase;
 /**
  * Perform basic XML-RPC tests that do not require addition callbacks.
  */
-class XmlRpcBasicTest extends WebTestBase {
+class XMLRPCBasicTest extends WebTestBase {
 
   public static function getInfo() {
     return array(
diff --git a/core/modules/xmlrpc/lib/Drupal/xmlrpc/Tests/XmlRpcMessagesTest.php b/core/modules/xmlrpc/lib/Drupal/xmlrpc/Tests/XMLRPCMessagesTest.php
similarity index 94%
rename from core/modules/xmlrpc/lib/Drupal/xmlrpc/Tests/XmlRpcMessagesTest.php
rename to core/modules/xmlrpc/lib/Drupal/xmlrpc/Tests/XMLRPCMessagesTest.php
index f4823c4..c20d570 100644
--- a/core/modules/xmlrpc/lib/Drupal/xmlrpc/Tests/XmlRpcMessagesTest.php
+++ b/core/modules/xmlrpc/lib/Drupal/xmlrpc/Tests/XMLRPCMessagesTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\xmlrpc\Tests\XmlRpcMessagesTest.
+ * Definition of Drupal\xmlrpc\Tests\XMLRPCMessagesTest.
  */
 
 namespace Drupal\xmlrpc\Tests;
@@ -12,7 +12,7 @@ use Drupal\simpletest\WebTestBase;
 /**
  * XML-RPC message and alteration tests.
  */
-class XmlRpcMessagesTest extends WebTestBase {
+class XMLRPCMessagesTest extends WebTestBase {
   public static function getInfo() {
     return array(
       'name'  => 'XML-RPC message and alteration',
diff --git a/core/modules/xmlrpc/lib/Drupal/xmlrpc/Tests/XmlRpcValidatorTest.php b/core/modules/xmlrpc/lib/Drupal/xmlrpc/Tests/XMLRPCValidatorTest.php
similarity index 97%
rename from core/modules/xmlrpc/lib/Drupal/xmlrpc/Tests/XmlRpcValidatorTest.php
rename to core/modules/xmlrpc/lib/Drupal/xmlrpc/Tests/XMLRPCValidatorTest.php
index f482328..53d3526 100644
--- a/core/modules/xmlrpc/lib/Drupal/xmlrpc/Tests/XmlRpcValidatorTest.php
+++ b/core/modules/xmlrpc/lib/Drupal/xmlrpc/Tests/XMLRPCValidatorTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\xmlrpc\Tests\XmlRpcValidatorTest.
+ * Definition of Drupal\xmlrpc\Tests\XMLRPCValidatorTest.
  */
 
 namespace Drupal\xmlrpc\Tests;
@@ -12,7 +12,7 @@ use Drupal\simpletest\WebTestBase;
 /**
  * XML-RPC validator1 specification.
  */
-class XmlRpcValidatorTest extends WebTestBase {
+class XMLRPCValidatorTest extends WebTestBase {
   public static function getInfo() {
     return array(
       'name' => 'XML-RPC validator',