diff --git a/README.md b/README.md
index e38062eef..7f178f870 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ Some Handy Links
 
 [The Bakery](http://bakery.cakephp.org) - Tips, tutorials and articles
 
-[API](http://api.cakephp.org) - A reference to Cake's classes
+[API](http://api.cakephp.org) - A reference to CakePHP's classes
 
 [CakePHP TV](http://tv.cakephp.org) - Screen casts from events and video tutorials
 
diff --git a/index.php b/index.php
index 94747188f..95f389bcc 100644
--- a/index.php
+++ b/index.php
@@ -23,7 +23,7 @@
  */
 
 /**
- *  Get Cake's root directory
+ *  Get CakePHP's root directory
  */
 define('APP_DIR', 'app');
 define('DS', DIRECTORY_SEPARATOR);
diff --git a/lib/Cake/Controller/Controller.php b/lib/Cake/Controller/Controller.php
index b3982bfe4..0f36fb7f5 100644
--- a/lib/Cake/Controller/Controller.php
+++ b/lib/Cake/Controller/Controller.php
@@ -207,7 +207,7 @@ class Controller extends Object implements CakeEventListener {
 	public $View;
 
 /**
- * File extension for view templates. Defaults to Cake's conventional ".ctp".
+ * File extension for view templates. Defaults to CakePHP's conventional ".ctp".
  *
  * @var string
  */
diff --git a/lib/Cake/Routing/Dispatcher.php b/lib/Cake/Routing/Dispatcher.php
index aed253a88..2ad4efa53 100644
--- a/lib/Cake/Routing/Dispatcher.php
+++ b/lib/Cake/Routing/Dispatcher.php
@@ -3,7 +3,7 @@
  * Dispatcher takes the URL information, parses it for parameters and
  * tells the involved controllers what to do.
  *
- * This is the heart of Cake's operation.
+ * This is the heart of CakePHP's operation.
  *
  * PHP 5
  *
diff --git a/lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php b/lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php
index 57a390069..dc0e44b6e 100644
--- a/lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php
+++ b/lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php
@@ -3477,7 +3477,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 					'joinTable' => 'articles_tags',
 					'foreignKey' => 'article_id',
 					'associationForeignKey' => 'tag_id',
-					// LENGHT function mysql-only, using LIKE does almost the same
+					// LENGTH function mysql-only, using LIKE does almost the same
 					'conditions' => "ShortTag.tag LIKE '???'"
 				)
 			)
diff --git a/lib/Cake/TestSuite/CakeTestLoader.php b/lib/Cake/TestSuite/CakeTestLoader.php
index fe2e324f6..431ae0ad3 100644
--- a/lib/Cake/TestSuite/CakeTestLoader.php
+++ b/lib/Cake/TestSuite/CakeTestLoader.php
@@ -42,7 +42,7 @@ class CakeTestLoader extends PHPUnit_Runner_StandardTestSuiteLoader {
 	}
 
 /**
- * Convert path fragments used by Cake's test runner to absolute paths that can be fed to PHPUnit.
+ * Convert path fragments used by CakePHP's test runner to absolute paths that can be fed to PHPUnit.
  *
  * @param string $filePath
  * @param string $params
diff --git a/lib/Cake/TestSuite/CakeTestRunner.php b/lib/Cake/TestSuite/CakeTestRunner.php
index 535f70a8d..fe64e30fe 100644
--- a/lib/Cake/TestSuite/CakeTestRunner.php
+++ b/lib/Cake/TestSuite/CakeTestRunner.php
@@ -22,14 +22,14 @@ require_once 'PHPUnit/TextUI/TestRunner.php';
 App::uses('CakeFixtureManager', 'TestSuite/Fixture');
 
 /**
- * A custom test runner for Cake's use of PHPUnit.
+ * A custom test runner for CakePHP's use of PHPUnit.
  *
  * @package       Cake.TestSuite
  */
 class CakeTestRunner extends PHPUnit_TextUI_TestRunner {
 
 /**
- * Lets us pass in some options needed for cake's webrunner.
+ * Lets us pass in some options needed for CakePHP's webrunner.
  *
  * @param mixed $loader
  * @param array $params list of options to be used for this run
diff --git a/lib/Cake/TestSuite/Fixture/CakeTestFixture.php b/lib/Cake/TestSuite/Fixture/CakeTestFixture.php
index 3fbd2ddc3..546092e4a 100644
--- a/lib/Cake/TestSuite/Fixture/CakeTestFixture.php
+++ b/lib/Cake/TestSuite/Fixture/CakeTestFixture.php
@@ -32,7 +32,7 @@ class CakeTestFixture {
 	public $name = null;
 
 /**
- * Cake's DBO driver (e.g: DboMysql).
+ * CakePHP's DBO driver (e.g: DboMysql).
  *
  * @var object
  */
diff --git a/lib/Cake/Utility/Inflector.php b/lib/Cake/Utility/Inflector.php
index 11bafbf9c..394b75257 100644
--- a/lib/Cake/Utility/Inflector.php
+++ b/lib/Cake/Utility/Inflector.php
@@ -18,7 +18,7 @@
  * Pluralize and singularize English words.
  *
  * Inflector pluralizes and singularizes English nouns.
- * Used by Cake's naming conventions throughout the framework.
+ * Used by CakePHP's naming conventions throughout the framework.
  *
  * @package       Cake.Utility
  * @link          http://book.cakephp.org/2.0/en/core-utility-libraries/inflector.html
diff --git a/lib/Cake/View/View.php b/lib/Cake/View/View.php
index 74ece6707..78a042b69 100644
--- a/lib/Cake/View/View.php
+++ b/lib/Cake/View/View.php
@@ -136,7 +136,7 @@ class View extends Object {
 	public $layoutPath = null;
 
 /**
- * Turns on or off Cake's conventional mode of applying layout files. On by default.
+ * Turns on or off CakePHP's conventional mode of applying layout files. On by default.
  * Setting to off means that layouts will not be automatically applied to rendered views.
  *
  * @var boolean
@@ -144,7 +144,7 @@ class View extends Object {
 	public $autoLayout = true;
 
 /**
- * File extension. Defaults to Cake's template ".ctp".
+ * File extension. Defaults to CakePHP's template ".ctp".
  *
  * @var string
  */