diff --git a/bulk_export/bulk_export.info b/bulk_export/bulk_export.info
index 2740a3b..8e4fc47 100644
--- a/bulk_export/bulk_export.info
+++ b/bulk_export/bulk_export.info
@@ -1,7 +1,7 @@
 name = Bulk Export
-description = Performs bulk exporting of data objects known about by Chaos tools.
+description = Performs bulk exporting of data objects known about by Chaos Tools.
 core = 7.x
 dependencies[] = ctools
-package = Chaos tool suite
+package = Chaos Tools Suite
 version = CTOOLS_MODULE_VERSION
 
diff --git a/bulk_export/bulk_export.module b/bulk_export/bulk_export.module
index afb15b9..0d55348 100644
--- a/bulk_export/bulk_export.module
+++ b/bulk_export/bulk_export.module
@@ -168,7 +168,7 @@ function bulk_export_export($cli = FALSE, $options = array()) {
       foreach ($dependencies as $module => $junk) {
         $info .= "dependencies[] = $module\n";
       }
-      $info .= "package = Chaos tool suite\n";
+      $info .= "package = Chaos Tools Suite\n";
       $info .= "core = 7.x\n";
       if ($cli) {
         $file_data[$module_name . '.info'] = $info;
diff --git a/ctools.api.php b/ctools.api.php
index a7ab783..15d5db6 100644
--- a/ctools.api.php
+++ b/ctools.api.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Hooks provided by the Chaos Tool Suite.
+ * Hooks provided by the Chaos Tools Suite.
  *
  * This file is divided into static hooks (hooks with string literal names) and
  * dynamic hooks (hooks with pattern-derived string names).
diff --git a/ctools.info b/ctools.info
index 11590ba..3e65cf5 100644
--- a/ctools.info
+++ b/ctools.info
@@ -1,7 +1,7 @@
-name = Chaos tools
+name = Chaos Tools (CTools)
 description = A library of helpful tools by Merlin of Chaos.
 core = 7.x
-package = Chaos tool suite
+package = Chaos Tools Suite
 version = CTOOLS_MODULE_VERSION
 files[] = includes/context.inc
 files[] = includes/css-cache.inc
diff --git a/ctools.module b/ctools.module
index bd29548..8c1dd6f 100644
--- a/ctools.module
+++ b/ctools.module
@@ -57,7 +57,7 @@ define('CTOOLS_MODULE_VERSION', '7.x-1.8-dev');
  *   $requirements = array();
  *   if (!module_invoke('ctools', 'api_version', MODULENAME_MINIMUM_CTOOLS_API_VERSION, MODULENAME_MAXIMUM_CTOOLS_API_VERSION)) {
  *      $requirements['MODULENAME_ctools'] = array(
- *        'title' => $t('MODULENAME required Chaos Tool Suite (CTools) API Version'),
+ *        'title' => $t('MODULENAME required Chaos Tools Suite (CTools) API Version'),
  *        'value' => t('Between @a and @b', array('@a' => MODULENAME_MINIMUM_CTOOLS_API_VERSION, '@b' => MODULENAME_MAXIMUM_CTOOLS_API_VERSION)),
  *        'severity' => REQUIREMENT_ERROR,
  *      );
diff --git a/ctools_access_ruleset/ctools_access_ruleset.info b/ctools_access_ruleset/ctools_access_ruleset.info
index ae34d62..0672396 100644
--- a/ctools_access_ruleset/ctools_access_ruleset.info
+++ b/ctools_access_ruleset/ctools_access_ruleset.info
@@ -1,6 +1,6 @@
 name = Custom rulesets
 description = Create custom, exportable, reusable access rulesets for applications like Panels.
 core = 7.x
-package = Chaos tool suite
+package = Chaos Tools Suite
 version = CTOOLS_MODULE_VERSION
 dependencies[] = ctools
diff --git a/ctools_ajax_sample/ctools_ajax_sample.info b/ctools_ajax_sample/ctools_ajax_sample.info
index e905691..cf9059c 100644
--- a/ctools_ajax_sample/ctools_ajax_sample.info
+++ b/ctools_ajax_sample/ctools_ajax_sample.info
@@ -1,6 +1,6 @@
 name = Chaos Tools (CTools) AJAX Example
 description = Shows how to use the power of Chaos AJAX.
-package = Chaos tool suite
+package = Chaos Tools Suite
 version = CTOOLS_MODULE_VERSION
 dependencies[] = ctools
 core = 7.x
diff --git a/ctools_custom_content/ctools_custom_content.info b/ctools_custom_content/ctools_custom_content.info
index 27ac400..8dad512 100644
--- a/ctools_custom_content/ctools_custom_content.info
+++ b/ctools_custom_content/ctools_custom_content.info
@@ -1,6 +1,6 @@
 name = Custom content panes
 description = Create custom, exportable, reusable content panes for applications like Panels.
 core = 7.x
-package = Chaos tool suite
+package = Chaos Tools Suite
 version = CTOOLS_MODULE_VERSION
 dependencies[] = ctools
diff --git a/ctools_plugin_example/ctools_plugin_example.info b/ctools_plugin_example/ctools_plugin_example.info
index 7584d4c..4e92203 100644
--- a/ctools_plugin_example/ctools_plugin_example.info
+++ b/ctools_plugin_example/ctools_plugin_example.info
@@ -1,6 +1,6 @@
 name = Chaos Tools (CTools) Plugin Example
 description = Shows how an external module can provide ctools plugins (for Panels, etc.).
-package = Chaos tool suite
+package = Chaos Tools Suite
 version = CTOOLS_MODULE_VERSION
 dependencies[] = ctools
 dependencies[] = panels
diff --git a/help/about.html b/help/about.html
index 30b64c2..24693b3 100644
--- a/help/about.html
+++ b/help/about.html
@@ -1,4 +1,4 @@
-<p>The Chaos Tool Suite is a series of tools for developers to make code that I've found to be very useful to Views and Panels more readily available. Certain methods of doing things, particularly with AJAX, exportable objects and a plugin system, are proving to be ideas that are useful outside of just Views and Panels. This module does not offer much directly to the end user, but instead, creates a library for other modules to use. If you are an end user and some module asked you to install the CTools suite, then this is far as you really need to go. If you're a developer and are interested in these tools, read on!</p>
+<p>The Chaos Tools Suite is a series of tools for developers to make code that I've found to be very useful to Views and Panels more readily available. Certain methods of doing things, particularly with AJAX, exportable objects and a plugin system, are proving to be ideas that are useful outside of just Views and Panels. This module does not offer much directly to the end user, but instead, creates a library for other modules to use. If you are an end user and some module asked you to install the CTools suite, then this is far as you really need to go. If you're a developer and are interested in these tools, read on!</p>
 
 <h2>Tools provided by CTools</h2>
 
diff --git a/help/ctools.help.ini b/help/ctools.help.ini
index fcb121b..1024afa 100644
--- a/help/ctools.help.ini
+++ b/help/ctools.help.ini
@@ -2,7 +2,7 @@
 line break = TRUE
 
 [about]
-title = About Chaos Tool Suite
+title = About Chaos Tools Suite
 weight = -100
 
 [context]
diff --git a/page_manager/page_manager.info b/page_manager/page_manager.info
index 1dd3b30..95ec0ba 100644
--- a/page_manager/page_manager.info
+++ b/page_manager/page_manager.info
@@ -2,5 +2,5 @@ name = Page manager
 description = Provides a UI and API to manage pages within the site.
 core = 7.x
 dependencies[] = ctools
-package = Chaos tool suite
+package = Chaos Tools Suite
 version = CTOOLS_MODULE_VERSION
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 c05effb..9d6122e 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/stylizer/stylizer.info b/stylizer/stylizer.info
index 94b7b95..2c3989d 100644
--- a/stylizer/stylizer.info
+++ b/stylizer/stylizer.info
@@ -1,7 +1,7 @@
 name = Stylizer
 description = Create custom styles for applications such as Panels.
 core = 7.x
-package = Chaos tool suite
+package = Chaos Tools Suite
 version = CTOOLS_MODULE_VERSION
 dependencies[] = ctools
 dependencies[] = color
diff --git a/term_depth/term_depth.info b/term_depth/term_depth.info
index b9f5f13..9b0c786 100644
--- a/term_depth/term_depth.info
+++ b/term_depth/term_depth.info
@@ -2,5 +2,5 @@ name = Term Depth access
 description = Controls access to context based upon term depth
 core = 7.x
 dependencies[] = ctools
-package = Chaos tool suite
+package = Chaos Tools Suite
 version = CTOOLS_MODULE_VERSION
diff --git a/tests/css_cache.test b/tests/css_cache.test
index e289b42..c603abf 100644
--- a/tests/css_cache.test
+++ b/tests/css_cache.test
@@ -14,7 +14,7 @@ class CtoolsObjectCache extends DrupalWebTestCase {
    */
   public static function getInfo() {
     return array(
-      'name' => 'Ctools CSS cache',
+      'name' => 'CTools CSS cache',
       'description' => 'Tests the custom CSS cache handler.',
       'group' => 'Chaos Tools Suite',
     );
diff --git a/tests/ctools_export_test/ctools_export_test.info b/tests/ctools_export_test/ctools_export_test.info
index b523797..77dacf5 100644
--- a/tests/ctools_export_test/ctools_export_test.info
+++ b/tests/ctools_export_test/ctools_export_test.info
@@ -1,7 +1,7 @@
 name = CTools export test
 description = CTools export test module
 core = 7.x
-package = Chaos tool suite
+package = Chaos Tools Suite
 version = CTOOLS_MODULE_VERSION
 dependencies[] = ctools
 hidden = TRUE
diff --git a/tests/ctools_plugin_test.info b/tests/ctools_plugin_test.info
index ca02e26..cbd6ea3 100644
--- a/tests/ctools_plugin_test.info
+++ b/tests/ctools_plugin_test.info
@@ -1,6 +1,6 @@
-name = Chaos tools plugins test
+name = Chaos Tools plugins test
 description = Provides hooks for testing ctools plugins.
-package = Chaos tool suite
+package = Chaos Tools Suite
 version = CTOOLS_MODULE_VERSION
 core = 7.x
 dependencies[] = ctools
diff --git a/tests/object_cache.test b/tests/object_cache.test
index 8791d7e..22d8062 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' => 'Chaos Tools Suite',
     );
diff --git a/views_content/views_content.info b/views_content/views_content.info
index b52f340..83bb8ea 100644
--- a/views_content/views_content.info
+++ b/views_content/views_content.info
@@ -4,7 +4,7 @@ package = Views
 dependencies[] = ctools
 dependencies[] = views
 core = 7.x
-package = Chaos tool suite
+package = Chaos Tools Suite
 version = CTOOLS_MODULE_VERSION
 files[] = plugins/views/views_content_plugin_display_ctools_context.inc
 files[] = plugins/views/views_content_plugin_display_panel_pane.inc