diff --git a/app/Config/database.php.default b/app/Config/database.php.default
index 684fecdf9..47613acf1 100644
--- a/app/Config/database.php.default
+++ b/app/Config/database.php.default
@@ -2,7 +2,7 @@
 /**
  * This is core configuration file.
  *
- * Use it to configure core behaviour of Cake.
+ * Use it to configure core behaviour of CakePHP.
  *
  * PHP 5
  *
diff --git a/app/Config/email.php.default b/app/Config/email.php.default
index a2d355e47..717a45860 100644
--- a/app/Config/email.php.default
+++ b/app/Config/email.php.default
@@ -2,7 +2,7 @@
 /**
  * This is email configuration file.
  *
- * Use it to configure email transports of Cake.
+ * Use it to configure email transports of CakePHP.
  *
  * PHP 5
  *
diff --git a/app/Model/AppModel.php b/app/Model/AppModel.php
index c47d72922..5b79d2a04 100644
--- a/app/Model/AppModel.php
+++ b/app/Model/AppModel.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Application model for Cake.
+ * Application model for CakePHP.
  *
  * This file is application-wide model file. You can put all
  * application-wide model-related methods here.
diff --git a/lib/Cake/Console/ShellDispatcher.php b/lib/Cake/Console/ShellDispatcher.php
index 157b2ab1d..b9841744d 100644
--- a/lib/Cake/Console/ShellDispatcher.php
+++ b/lib/Cake/Console/ShellDispatcher.php
@@ -114,7 +114,7 @@ class ShellDispatcher {
 	}
 
 /**
- * Initializes the environment and loads the Cake core.
+ * Initializes the environment and loads the CakePHP core.
  *
  * @return boolean Success.
  */
diff --git a/lib/Cake/Model/Datasource/CakeSession.php b/lib/Cake/Model/Datasource/CakeSession.php
index 04d1dc9f5..6ce55ff47 100644
--- a/lib/Cake/Model/Datasource/CakeSession.php
+++ b/lib/Cake/Model/Datasource/CakeSession.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * Session class for Cake.
+ * Session class for CakePHP.
  *
- * Cake abstracts the handling of sessions.
+ * CakePHP abstracts the handling of sessions.
  * There are several convenient methods to access session information.
  * This class is the implementation of those methods.
  * They are mostly used by the Session Component.
@@ -27,9 +27,9 @@ App::uses('Hash', 'Utility');
 App::uses('Security', 'Utility');
 
 /**
- * Session class for Cake.
+ * Session class for CakePHP.
  *
- * Cake abstracts the handling of sessions. There are several convenient methods to access session information.
+ * CakePHP abstracts the handling of sessions. There are several convenient methods to access session information.
  * This class is the implementation of those methods. They are mostly used by the Session Component.
  *
  * @package       Cake.Model.Datasource
@@ -444,7 +444,7 @@ class CakeSession {
 	}
 
 /**
- * Helper method to initialize a session, based on Cake core settings.
+ * Helper method to initialize a session, based on CakePHP core settings.
  *
  * Sessions can be configured with a few shortcut names as well as have any number of ini settings declared.
  *
diff --git a/lib/Cake/Utility/Xml.php b/lib/Cake/Utility/Xml.php
index eccfb1190..d4fae2225 100644
--- a/lib/Cake/Utility/Xml.php
+++ b/lib/Cake/Utility/Xml.php
@@ -23,7 +23,7 @@
 App::uses('HttpSocket', 'Network/Http');
 
 /**
- * XML handling for Cake.
+ * XML handling for CakePHP.
  *
  * The methods in these classes enable the datasources that use XML to work.
  *
diff --git a/lib/Cake/bootstrap.php b/lib/Cake/bootstrap.php
index a2c058248..9b7feca3b 100644
--- a/lib/Cake/bootstrap.php
+++ b/lib/Cake/bootstrap.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Basic Cake functionality.
+ * Basic CakePHP functionality.
  *
  * Handles loading of core files needed on every request
  *