diff --git a/core/modules/simpletest/tests/common.test b/core/modules/simpletest/tests/common.test
index 8936808..7daa4b1 100644
--- a/core/modules/simpletest/tests/common.test
+++ b/core/modules/simpletest/tests/common.test
@@ -8,12 +8,12 @@
 /**
  * Tests for URL generation functions.
  */
-class DrupalAlterTestCase extends DrupalWebTestCase {
+class CommonDrupalAlterTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
       'name' => 'drupal_alter() tests',
       'description' => 'Confirm that alteration of arguments passed to drupal_alter() works correctly.',
-      'group' => 'System',
+      'group' => 'Common',
     );
   }
 
@@ -73,12 +73,12 @@ class DrupalAlterTestCase extends DrupalWebTestCase {
  * url() calls module_implements(), which may issue a db query, which requires
  * inheriting from a web test case rather than a unit test case.
  */
-class CommonURLUnitTest extends DrupalWebTestCase {
+class CommonURLUnitTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
       'name' => 'URL generation tests',
       'description' => 'Confirm that url(), drupal_get_query_parameters(), drupal_http_build_query(), and l() work correctly with various input.',
-      'group' => 'System',
+      'group' => 'Common',
     );
   }
 
@@ -355,13 +355,13 @@ class CommonURLUnitTest extends DrupalWebTestCase {
 /**
  * Tests for the check_plain(), filter_xss() and format_string() functions.
  */
-class CommonXssUnitTest extends DrupalUnitTestCase {
+class CommonXssUnitTestCase extends DrupalUnitTestCase {
 
   public static function getInfo() {
     return array(
       'name' => 'String filtering tests',
       'description' => 'Confirm that check_plain(), filter_xss(), format_string() and check_url() work correctly, including invalid multi-byte sequences.',
-      'group' => 'System',
+      'group' => 'Common',
     );
   }
 
@@ -524,7 +524,7 @@ class CommonSizeTestCase extends DrupalUnitTestCase {
 /**
  * Test drupal_explode_tags() and drupal_implode_tags().
  */
-class DrupalTagsHandlingTestCase extends DrupalWebTestCase {
+class CommonDrupalTagsHandlingTestCase extends DrupalWebTestCase {
   var $validTags = array(
     'Drupal' => 'Drupal',
     'Drupal with some spaces' => 'Drupal with some spaces',
@@ -581,12 +581,12 @@ class DrupalTagsHandlingTestCase extends DrupalWebTestCase {
 /**
  * Test the Drupal CSS system.
  */
-class CascadingStylesheetsTestCase extends DrupalWebTestCase {
+class CommonCascadingStylesheetsTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
       'name' => 'Cascading stylesheets',
       'description' => 'Tests adding various cascading stylesheets to the page.',
-      'group' => 'System',
+      'group' => 'Common',
     );
   }
 
@@ -811,12 +811,12 @@ class CascadingStylesheetsTestCase extends DrupalWebTestCase {
 /**
  * Test for cleaning HTML identifiers.
  */
-class DrupalHTMLIdentifierTestCase extends DrupalUnitTestCase {
+class CommonDrupalHTMLIdentifierTestCase extends DrupalUnitTestCase {
   public static function getInfo() {
     return array(
       'name' => 'HTML identifiers',
       'description' => 'Test the functions drupal_html_class(), drupal_html_id() and drupal_clean_css_identifier() for expected behavior',
-      'group' => 'System',
+      'group' => 'Common',
     );
   }
 
@@ -871,12 +871,12 @@ class DrupalHTMLIdentifierTestCase extends DrupalUnitTestCase {
 /**
  * CSS Unit Tests.
  */
-class CascadingStylesheetsUnitTest extends DrupalUnitTestCase {
+class CommonCascadingStylesheetsUnitTestCase extends DrupalUnitTestCase {
   public static function getInfo() {
     return array(
       'name' => 'CSS Unit Tests',
       'description' => 'Unit tests on CSS functions like aggregation.',
-      'group' => 'System',
+      'group' => 'Common',
     );
   }
 
@@ -923,7 +923,7 @@ class CascadingStylesheetsUnitTest extends DrupalUnitTestCase {
 /**
  * Test drupal_http_request().
  */
-class DrupalHTTPRequestTestCase extends DrupalWebTestCase {
+class CommonDrupalHTTPRequestTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
       'name' => 'Drupal HTTP request',
@@ -1035,7 +1035,7 @@ class DrupalHTTPRequestTestCase extends DrupalWebTestCase {
 /**
  * Testing drupal_add_region_content and drupal_get_region_content.
  */
-class DrupalSetContentTestCase extends DrupalWebTestCase {
+class CommonDrupalSetContentTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
       'name' => 'Drupal set/get regions',
@@ -1081,7 +1081,7 @@ class DrupalSetContentTestCase extends DrupalWebTestCase {
 /**
  * Testing drupal_goto and hook_drupal_goto_alter().
  */
-class DrupalGotoTest extends DrupalWebTestCase {
+class CommonDrupalGotoTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
       'name' => 'Drupal goto',
@@ -1150,7 +1150,7 @@ class DrupalGotoTest extends DrupalWebTestCase {
 /**
  * Tests for the JavaScript system.
  */
-class JavaScriptTestCase extends DrupalWebTestCase {
+class CommonJavaScriptTestCase extends DrupalWebTestCase {
   /**
    * Store configured value for JavaScript preprocessing.
    */
@@ -1558,12 +1558,12 @@ class JavaScriptTestCase extends DrupalWebTestCase {
 /**
  * Tests for drupal_render().
  */
-class DrupalRenderTestCase extends DrupalWebTestCase {
+class CommonDrupalRenderTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
       'name' => 'drupal_render()',
       'description' => 'Performs functional tests on drupal_render().',
-      'group' => 'System',
+      'group' => 'Common',
     );
   }
 
@@ -1837,7 +1837,7 @@ class DrupalRenderTestCase extends DrupalWebTestCase {
 /**
  * Test for valid_url().
  */
-class ValidUrlTestCase extends DrupalUnitTestCase {
+class CommonValidUrlTestCase extends DrupalUnitTestCase {
   public static function getInfo() {
     return array(
       'name' => 'Valid Url',
@@ -1945,12 +1945,12 @@ class ValidUrlTestCase extends DrupalUnitTestCase {
 /**
  * Tests for CRUD API functions.
  */
-class DrupalDataApiTest extends DrupalWebTestCase {
+class CommonDrupalDataApiTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
       'name' => 'Data API functions',
       'description' => 'Tests the performance of CRUD APIs.',
-      'group' => 'System',
+      'group' => 'Common',
     );
   }
 
@@ -2081,7 +2081,7 @@ class DrupalDataApiTest extends DrupalWebTestCase {
 /**
  * Tests Simpletest error and exception collector.
  */
-class DrupalErrorCollectionUnitTest extends DrupalWebTestCase {
+class CommonDrupalErrorCollectionUnitTestCase extends DrupalWebTestCase {
 
   /**
    * Errors triggered during the test.
@@ -2172,12 +2172,12 @@ class DrupalErrorCollectionUnitTest extends DrupalWebTestCase {
 /**
  * Test the drupal_parse_info_file() API function.
  */
-class ParseInfoFilesTestCase extends DrupalWebTestCase {
+class CommonParseInfoFilesTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
       'name' => 'Parsing .info files',
       'description' => 'Tests parsing .info files.',
-      'group' => 'System',
+      'group' => 'Common',
     );
   }
 
@@ -2195,7 +2195,7 @@ class ParseInfoFilesTestCase extends DrupalWebTestCase {
 /**
  * Tests for the drupal_system_listing() function.
  */
-class DrupalSystemListingTestCase extends DrupalWebTestCase {
+class CommonDrupalSystemListingTestCase extends DrupalWebTestCase {
   /**
    * Use the testing profile; this is needed for testDirectoryPrecedence().
    */
@@ -2205,7 +2205,7 @@ class DrupalSystemListingTestCase extends DrupalWebTestCase {
     return array(
       'name' => 'Drupal system listing',
       'description' => 'Tests the mechanism for scanning system directories in drupal_system_listing().',
-      'group' => 'System',
+      'group' => 'Common',
     );
   }
 
@@ -2255,7 +2255,7 @@ class DrupalSystemListingTestCase extends DrupalWebTestCase {
 /**
  * Tests for the format_date() function.
  */
-class FormatDateUnitTest extends DrupalWebTestCase {
+class CommonFormatDateUnitTestCase extends DrupalWebTestCase {
 
   /**
    * Arbitrary langcode for a custom language.
@@ -2266,7 +2266,7 @@ class FormatDateUnitTest extends DrupalWebTestCase {
     return array(
       'name' => 'Format date',
       'description' => 'Test the format_date() function.',
-      'group' => 'System',
+      'group' => 'Common',
     );
   }
 
@@ -2374,12 +2374,12 @@ class FormatDateUnitTest extends DrupalWebTestCase {
 /**
  * Tests for the format_date() function.
  */
-class DrupalAttributesUnitTest extends DrupalUnitTestCase {
+class CommonDrupalAttributesUnitTestCase extends DrupalUnitTestCase {
   public static function getInfo() {
     return array(
       'name' => 'HTML Attributes',
       'description' => 'Perform unit tests on the drupal_attributes() function.',
-      'group' => 'System',
+      'group' => 'Common',
     );
   }
 
@@ -2414,12 +2414,12 @@ class DrupalAttributesUnitTest extends DrupalUnitTestCase {
 /**
  * Tests converting PHP variables to JSON strings and back.
  */
-class DrupalJSONTest extends DrupalUnitTestCase {
+class CommonDrupalJSONTestCase extends DrupalUnitTestCase {
   public static function getInfo() {
     return array(
       'name' => 'JSON',
       'description' => 'Perform unit tests on the drupal_json_encode() and drupal_json_decode() functions.',
-      'group' => 'System',
+      'group' => 'Common',
     );
   }
 
@@ -2478,12 +2478,12 @@ class DrupalJSONTest extends DrupalUnitTestCase {
 /**
  * Basic tests for drupal_add_feed().
  */
-class DrupalAddFeedTestCase extends DrupalWebTestCase {
+class CommonDrupalAddFeedTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
       'name' => 'drupal_add_feed() tests',
       'description' => 'Make sure that drupal_add_feed() works correctly with various constructs.',
-      'group' => 'System',
+      'group' => 'Common',
     );
   }