diff --git a/plugins/access/compare_users.inc b/plugins/access/compare_users.inc
index c271ff4..a8c44f4 100644
--- a/plugins/access/compare_users.inc
+++ b/plugins/access/compare_users.inc
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Ctools access plugin to provide access/visiblity if two user contexts are equal.
+ * CTools access plugin to provide access/visiblity if two user contexts are equal.
  */
 
 /**
diff --git a/plugins/content_types/comment/comment_reply_form.inc b/plugins/content_types/comment/comment_reply_form.inc
index bccba9a..11e48b2 100644
--- a/plugins/content_types/comment/comment_reply_form.inc
+++ b/plugins/content_types/comment/comment_reply_form.inc
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Ctools content-type plugin to provide a comment-reply form (replying either
+ * CTools content-type plugin to provide a comment-reply form (replying either
  * to a node or to another comment).
  */
 
diff --git a/tests/css_cache.test b/tests/css_cache.test
index 26ae68e..774d3dc 100644
--- a/tests/css_cache.test
+++ b/tests/css_cache.test
@@ -10,7 +10,7 @@ class CtoolsCSSObjectCache extends DrupalWebTestCase {
    */
   public static function getInfo() {
     return array(
-      'name' => 'Ctools CSS cache',
+      'name' => 'CTools CSS cache',
       'description' => 'Tests the custom CSS cache handler.',
       'group' => 'ctools',
     );
diff --git a/tests/object_cache.test b/tests/object_cache.test
index a699e1d..473df80 100644
--- a/tests/object_cache.test
+++ b/tests/object_cache.test
@@ -10,7 +10,7 @@ class CtoolsObjectCache extends DrupalWebTestCase {
    */
   public static function getInfo() {
     return array(
-      'name' => 'Ctools object cache storage',
+      'name' => 'CTools object cache storage',
       'description' => 'Verify that objects are written, readable and lockable.',
       'group' => 'ctools',
     );
diff --git a/tests/object_cache_unit.test b/tests/object_cache_unit.test
index 1bb4af0..e1339d2 100644
--- a/tests/object_cache_unit.test
+++ b/tests/object_cache_unit.test
@@ -10,7 +10,7 @@ class CtoolsUnitObjectCachePlugins extends DrupalUnitTestCase {
    */
   public static function getInfo() {
     return array(
-      'name' => 'Ctools Unit object cache storage',
+      'name' => 'CTools Unit object cache storage',
       'description' => 'Verify that objects are written, readable and lockable.',
       'group' => 'ctools',
     );
diff --git a/tests/page_tokens.test b/tests/page_tokens.test
index eca1aaf..92f4607 100644
--- a/tests/page_tokens.test
+++ b/tests/page_tokens.test
@@ -16,7 +16,7 @@ class CtoolsPageTokens extends DrupalWebTestCase {
    */
   public static function getInfo() {
     return array(
-      'name' => 'Ctools Unit page token processing',
+      'name' => 'CTools Unit page token processing',
       'description' => 'Verify that page tokens can be set and read.',
       'group' => 'ctools',
     );
diff --git a/tests/uuid_with_uuid.test b/tests/uuid_with_uuid.test
index 13c669e..0453436 100644
--- a/tests/uuid_with_uuid.test
+++ b/tests/uuid_with_uuid.test
@@ -1,9 +1,9 @@
 <?php
 
 /**
- * Test ctools_cache_find_plugin and the structure of the default cache plugins.
+ * Test the UUID handling when the UUID module is present.
  */
-class CtoolsWebUUIDWithUUIDtests extends DrupalWebTestCase {
+class CtoolsUUIDWithUUID extends DrupalWebTestCase {
 
   /**
    * {@inheritDoc}
@@ -33,7 +33,7 @@ function setUp(array $modules = array()) {
    * NB: This test will use one (and only one) of the mechanisms available
    * from pear,
    */
-  public function testMakeNewUUIDmodule() {
+  public function testMakeNewUUID() {
     // drupal_get_filename will report even if the module is disabled.
     if (drupal_get_filename('module', 'uuid') && !module_exists('uuid')) {
       module_enable(array('uuid'));
diff --git a/tests/uuid_without_uuid.test b/tests/uuid_without_uuid.test
index c6c1dba..1bd3c0c 100644
--- a/tests/uuid_without_uuid.test
+++ b/tests/uuid_without_uuid.test
@@ -3,7 +3,7 @@
 /**
  * Test the UUID handling without the UUID module being present.
  */
-class CtoolsWebUUIDWithoutUUIDtests extends DrupalWebTestCase {
+class CtoolsUUIDWithoutUUID extends DrupalWebTestCase {
 
   /**
    * {@inheritDoc}
@@ -39,7 +39,7 @@ public function testHaveUUIDpattern() {
    * NB: This test will use one (and only one) of the mechanisms available
    * from pear,
    */
-  public function testMakeNewUUIDctoolsphp() {
+  public function testMakeNewUUIDRaw() {
     // drupal_get_filename will report even if the module is disabled.
     if (drupal_get_filename('module', 'uuid') && module_exists('uuid')) {
       module_disable(array('uuid'));
@@ -56,7 +56,7 @@ public function testMakeNewUUIDctoolsphp() {
    * NB: This test will use one (and only one) of the mechanisms available
    * from pear,
    */
-  public function testMakeNewUUIDnomodule() {
+  public function testMakeNewUUIDWrapper() {
     // drupal_get_filename will report even if the module is disabled.
     if (drupal_get_filename('module', 'uuid') && module_exists('uuid')) {
       module_disable(array('uuid'));