diff --git a/cake/console/libs/tasks/fixture.php b/cake/console/libs/tasks/fixture.php
index 8073cdfd9..57b995f27 100644
--- a/cake/console/libs/tasks/fixture.php
+++ b/cake/console/libs/tasks/fixture.php
@@ -48,7 +48,7 @@ class FixtureTask extends BakeTask {
  * @var object
  * @access protected
  */
-	var $_Schema = null;
+	protected $_Schema = null;
 
 /**
  * Override initialize
diff --git a/cake/console/libs/tasks/model.php b/cake/console/libs/tasks/model.php
index 7a8115831..921d0eb7f 100644
--- a/cake/console/libs/tasks/model.php
+++ b/cake/console/libs/tasks/model.php
@@ -58,7 +58,7 @@ class ModelTask extends BakeTask {
  * @var array
  * @access protected
  */
-	var $_tables = array();
+	protected $_tables = array();
 
 /**
  * Holds validation method map.
@@ -66,7 +66,7 @@ class ModelTask extends BakeTask {
  * @var array
  * @access protected
  */
-	var $_validations = array();
+	protected $_validations = array();
 
 /**
  * Execution method always used for tasks
diff --git a/cake/console/libs/tasks/test.php b/cake/console/libs/tasks/test.php
index ff7996cde..e29ad68c9 100644
--- a/cake/console/libs/tasks/test.php
+++ b/cake/console/libs/tasks/test.php
@@ -58,7 +58,7 @@ class TestTask extends BakeTask {
  * @var string
  * @access protected
  */
-	var $_fixtures = array();
+	protected $_fixtures = array();
 
 
 /**
diff --git a/cake/libs/cache.php b/cake/libs/cache.php
index 6335338f3..d6ea83d39 100644
--- a/cake/libs/cache.php
+++ b/cake/libs/cache.php
@@ -58,7 +58,7 @@ class Cache {
  *
  * @var array
  */
-	var $_engines = array();
+	protected $_engines = array();
 
 /**
  * Returns a singleton instance
diff --git a/cake/libs/cache/file.php b/cake/libs/cache/file.php
index 31dd70a5d..a6fc81a13 100644
--- a/cake/libs/cache/file.php
+++ b/cake/libs/cache/file.php
@@ -37,7 +37,7 @@ class FileEngine extends CacheEngine {
  * @var File
  * @access protected
  */
-	var $_File = null;
+	protected $_File = null;
 
 /**
  * Settings
@@ -59,7 +59,7 @@ class FileEngine extends CacheEngine {
  * @var boolean
  * @access protected
  */
-	var $_init = true;
+	protected $_init = true;
 
 /**
  * Initialize the Cache Engine
diff --git a/cake/libs/cake_log.php b/cake/libs/cake_log.php
index 218ce1556..767912173 100644
--- a/cake/libs/cake_log.php
+++ b/cake/libs/cake_log.php
@@ -54,7 +54,7 @@ class CakeLog {
  * @var array
  * @access protected
  */
-	var $_streams = array();
+	protected $_streams = array();
 
 /**
  * Get an instance
diff --git a/cake/libs/cake_session.php b/cake/libs/cake_session.php
index c63c6a8a3..01bfb82fb 100644
--- a/cake/libs/cake_session.php
+++ b/cake/libs/cake_session.php
@@ -56,7 +56,7 @@ class CakeSession extends Object {
  * @var string
  * @access protected
  */
-	var $_userAgent = '';
+	protected $_userAgent = '';
 
 /**
  * Path to where the session is active.
@@ -120,7 +120,7 @@ class CakeSession extends Object {
  * @var boolean
  * @access protected
  */
-	var $_started = false;
+	protected $_started = false;
 
 /**
  * Hostname
diff --git a/cake/libs/cake_socket.php b/cake/libs/cake_socket.php
index 0b9394922..38f9af250 100644
--- a/cake/libs/cake_socket.php
+++ b/cake/libs/cake_socket.php
@@ -43,7 +43,7 @@ class CakeSocket extends Object {
  * @var array
  * @access protected
  */
-	var $_baseConfig = array(
+	protected $_baseConfig = array(
 		'persistent'	=> false,
 		'host'			=> 'localhost',
 		'protocol'		=> 'tcp',
diff --git a/cake/libs/controller/component.php b/cake/libs/controller/component.php
index 89a35636a..6400fc6cb 100644
--- a/cake/libs/controller/component.php
+++ b/cake/libs/controller/component.php
@@ -40,7 +40,7 @@ class Component extends Object {
  * @var object
  * @access protected
  */
-	var $_loaded = array();
+	protected $_loaded = array();
 
 /**
  * List of components attached directly to the controller, which callbacks
@@ -49,7 +49,7 @@ class Component extends Object {
  * @var object
  * @access protected
  */
-	var $_primary = array();
+	protected $_primary = array();
 
 /**
  * Settings for loaded components.
diff --git a/cake/libs/controller/components/acl.php b/cake/libs/controller/components/acl.php
index 8b2d68c7d..d9afbd3b4 100644
--- a/cake/libs/controller/components/acl.php
+++ b/cake/libs/controller/components/acl.php
@@ -38,7 +38,7 @@ class AclComponent extends Object {
  * @var object
  * @access protected
  */
-	var $_Instance = null;
+	protected $_Instance = null;
 
 /**
  * Constructor. Will return an instance of the correct ACL class as defined in `Configure::read('Acl.classname')`
diff --git a/cake/libs/controller/components/auth.php b/cake/libs/controller/components/auth.php
index 4236f614d..92be96759 100644
--- a/cake/libs/controller/components/auth.php
+++ b/cake/libs/controller/components/auth.php
@@ -38,7 +38,7 @@ class AuthComponent extends Object {
  * @var boolean
  * @access private
  */
-	var $_loggedIn = false;
+	protected $_loggedIn = false;
 
 /**
  * Other components utilized by AuthComponent
@@ -244,7 +244,7 @@ class AuthComponent extends Object {
  * @var array
  * @access protected
  */
-	var $_methods = array();
+	protected $_methods = array();
 
 /**
  * Initializes AuthComponent for use in the controller
diff --git a/cake/libs/controller/components/email.php b/cake/libs/controller/components/email.php
index d92b082a4..e0d7d0186 100755
--- a/cake/libs/controller/components/email.php
+++ b/cake/libs/controller/components/email.php
@@ -150,7 +150,7 @@ class EmailComponent extends Object{
 /**
  * @deprecated see lineLength
  */
-	var $_lineLength = null;
+	protected $_lineLength = null;
 
 /**
  * What format should the email be sent in
diff --git a/cake/libs/controller/components/security.php b/cake/libs/controller/components/security.php
index 4c5aaeb5a..44ac7e913 100644
--- a/cake/libs/controller/components/security.php
+++ b/cake/libs/controller/components/security.php
@@ -166,7 +166,7 @@ class SecurityComponent extends Object {
  *
  * @var string
  */
-	var $_action = null;
+	protected $_action = null;
 
 /**
  * Initialize the SecurityComponent
diff --git a/cake/libs/controller/scaffold.php b/cake/libs/controller/scaffold.php
index 0c80875f9..2d5c10995 100644
--- a/cake/libs/controller/scaffold.php
+++ b/cake/libs/controller/scaffold.php
@@ -127,7 +127,7 @@ class Scaffold extends Object {
  * @var boolean
  * @access public
  */
-	var $_validSession = null;
+	protected $_validSession = null;
 
 /**
  * List of variables to collect from the associated controller
diff --git a/cake/libs/debugger.php b/cake/libs/debugger.php
index e19b5ed66..bea8f2046 100644
--- a/cake/libs/debugger.php
+++ b/cake/libs/debugger.php
@@ -67,7 +67,7 @@ class Debugger extends Object {
  * @var string
  * @access protected
  */
-	var $_outputFormat = 'js';
+	protected $_outputFormat = 'js';
 
 /**
  * Templates used when generating trace or error strings.  Can be global or indexed by the format
@@ -76,7 +76,7 @@ class Debugger extends Object {
  * @var string
  * @access protected
  */
-	var $_templates = array(
+	protected $_templates = array(
 		'log' => array(
 			'trace' => '{:reference} - {:path}, line {:line}',
 			'error' => "{:error} ({:code}): {:description} in [{:file}, line {:line}]"
@@ -111,7 +111,7 @@ class Debugger extends Object {
  * @var string
  * @access private
  */
-	var $_data = array();
+	protected $_data = array();
 
 /**
  * Constructor.
diff --git a/cake/libs/inflector.php b/cake/libs/inflector.php
index a6ba66361..1be467e95 100644
--- a/cake/libs/inflector.php
+++ b/cake/libs/inflector.php
@@ -38,7 +38,7 @@ class Inflector {
  * @var array
  * @access protected
  */
-	var $_plural = array(
+	protected $_plural = array(
 		'rules' => array(
 			'/(s)tatus$/i' => '\1\2tatuses',
 			'/(quiz)$/i' => '\1zes',
@@ -106,7 +106,7 @@ class Inflector {
  * @var array
  * @access protected
  */
-	var $_singular = array(
+	protected $_singular = array(
 		'rules' => array(
 			'/(s)tatuses$/i' => '\1\2tatus',
 			'/^(.*)(menu)s$/i' => '\1\2',
@@ -157,7 +157,7 @@ class Inflector {
  * @var array
  * @access protected
  */
-	var $_uninflected = array(
+	protected $_uninflected = array(
 		'Amoyese', 'bison', 'Borghese', 'bream', 'breeches', 'britches', 'buffalo', 'cantus',
 		'carp', 'chassis', 'clippers', 'cod', 'coitus', 'Congoese', 'contretemps', 'corps',
 		'debris', 'diabetes', 'djinn', 'eland', 'elk', 'equipment', 'Faroese', 'flounder',
@@ -178,7 +178,7 @@ class Inflector {
  * @var array
  * @access protected
  */
-	var $_transliteration = array(
+	protected $_transliteration = array(
 		'/à|á|å|â/' => 'a',
 		'/è|é|ê|ẽ|ë/' => 'e',
 		'/ì|í|î/' => 'i',
@@ -201,7 +201,7 @@ class Inflector {
  * @var array
  * @access protected
  */
-	var $_pluralized = array();
+	protected $_pluralized = array();
 
 /**
  * Cached array identity map of singularized words.
@@ -209,7 +209,7 @@ class Inflector {
  * @var array
  * @access protected
  */
-	var $_singularized = array();
+	protected $_singularized = array();
 
 /**
  * Cached Underscore Inflections
@@ -217,7 +217,7 @@ class Inflector {
  * @var array
  * @access protected
  */
-	var $_underscore = array();
+	protected $_underscore = array();
 
 /**
  * Cached Camelize Inflections
@@ -225,7 +225,7 @@ class Inflector {
  * @var array
  * @access protected
  */
-	var $_camelize = array();
+	protected $_camelize = array();
 
 /**
  * Classify cached inflecctions
@@ -233,7 +233,7 @@ class Inflector {
  * @var array
  * @access protected
  */
-	var $_classify = array();
+	protected $_classify = array();
 
 /**
  * Tablize cached inflections
@@ -241,7 +241,7 @@ class Inflector {
  * @var array
  * @access protected
  */
-	var $_tableize = array();
+	protected $_tableize = array();
 
 /**
  * Humanize cached inflections
@@ -249,7 +249,7 @@ class Inflector {
  * @var array
  * @access protected
  */
-	var $_humanize = array();
+	protected $_humanize = array();
 
 /**
  * Gets a reference to the Inflector object instance
diff --git a/cake/libs/log/file_log.php b/cake/libs/log/file_log.php
index b5d2bec1c..53cb486bc 100644
--- a/cake/libs/log/file_log.php
+++ b/cake/libs/log/file_log.php
@@ -34,7 +34,7 @@ class FileLog {
  *
  * @var string
  */
-	var $_path = null;
+	protected $_path = null;
 
 /**
  * Constructs a new File Logger.
diff --git a/cake/libs/model/behaviors/tree.php b/cake/libs/model/behaviors/tree.php
index 349dcd5eb..6c72fde0e 100644
--- a/cake/libs/model/behaviors/tree.php
+++ b/cake/libs/model/behaviors/tree.php
@@ -44,7 +44,7 @@ class TreeBehavior extends ModelBehavior {
  * @var array
  * @access protected
  */
-	var $_defaults = array(
+	protected $_defaults = array(
 		'parent' => 'parent_id', 'left' => 'lft', 'right' => 'rght',
 		'scope' => '1 = 1', 'type' => 'nested', '__parentChange' => false, 'recursive' => -1
 	);
diff --git a/cake/libs/model/connection_manager.php b/cake/libs/model/connection_manager.php
index 50cfd24da..042782279 100644
--- a/cake/libs/model/connection_manager.php
+++ b/cake/libs/model/connection_manager.php
@@ -44,7 +44,7 @@ class ConnectionManager extends Object {
  * @var array
  * @access protected
  */
-	var $_dataSources = array();
+	protected $_dataSources = array();
 
 /**
  * Contains a list of all file and class names used in Connection settings
@@ -52,7 +52,7 @@ class ConnectionManager extends Object {
  * @var array
  * @access protected
  */
-	var $_connectionsEnum = array();
+	protected $_connectionsEnum = array();
 
 /**
  * Constructor.
diff --git a/cake/libs/model/datasources/datasource.php b/cake/libs/model/datasources/datasource.php
index 74e3ffe94..c8b10a7ef 100644
--- a/cake/libs/model/datasources/datasource.php
+++ b/cake/libs/model/datasources/datasource.php
@@ -96,7 +96,7 @@ class DataSource extends Object {
  * @var array
  * @access protected
  */
-	var $_result = null;
+	protected $_result = null;
 
 /**
  * Queries count.
@@ -104,7 +104,7 @@ class DataSource extends Object {
  * @var int
  * @access protected
  */
-	var $_queriesCnt = 0;
+	protected $_queriesCnt = 0;
 
 /**
  * Total duration of all queries.
@@ -112,7 +112,7 @@ class DataSource extends Object {
  * @var unknown_type
  * @access protected
  */
-	var $_queriesTime = null;
+	protected $_queriesTime = null;
 
 /**
  * Log of queries executed by this DataSource
@@ -120,7 +120,7 @@ class DataSource extends Object {
  * @var unknown_type
  * @access protected
  */
-	var $_queriesLog = array();
+	protected $_queriesLog = array();
 
 /**
  * Maximum number of items in query log
@@ -130,7 +130,7 @@ class DataSource extends Object {
  * @var int Maximum number of queries in the queries log.
  * @access protected
  */
-	var $_queriesLogMax = 200;
+	protected $_queriesLogMax = 200;
 
 /**
  * Caches serialzed results of executed queries
@@ -138,7 +138,7 @@ class DataSource extends Object {
  * @var array Maximum number of queries in the queries log.
  * @access protected
  */
-	var $_queryCache = array();
+	protected $_queryCache = array();
 
 /**
  * The default configuration of a specific DataSource
@@ -146,7 +146,7 @@ class DataSource extends Object {
  * @var array
  * @access protected
  */
-	var $_baseConfig = array();
+	protected $_baseConfig = array();
 
 /**
  * Holds references to descriptions loaded by the DataSource
@@ -162,7 +162,7 @@ class DataSource extends Object {
  * @var array
  * @access protected
  */
-	var $_sources = null;
+	protected $_sources = null;
 
 /**
  * A reference to the physical connection of this DataSource
@@ -194,7 +194,7 @@ class DataSource extends Object {
  * @var boolean
  * @access protected
  */
-	var $_transactionStarted = false;
+	protected $_transactionStarted = false;
 
 /**
  * Whether or not source data like available tables and schema descriptions
diff --git a/cake/libs/model/datasources/dbo/dbo_mssql.php b/cake/libs/model/datasources/dbo/dbo_mssql.php
index 5efce898e..bb7d5796b 100644
--- a/cake/libs/model/datasources/dbo/dbo_mssql.php
+++ b/cake/libs/model/datasources/dbo/dbo_mssql.php
@@ -62,7 +62,7 @@ class DboMssql extends DboSource {
  *
  * @var array
  */
-	var $_baseConfig = array(
+	protected $_baseConfig = array(
 		'persistent' => true,
 		'host' => 'localhost',
 		'login' => 'root',
@@ -96,7 +96,7 @@ class DboMssql extends DboSource {
  * @var array
  * @access protected
  */
-	var $_commands = array(
+	protected $_commands = array(
 		'begin'    => 'BEGIN TRANSACTION',
 		'commit'   => 'COMMIT',
 		'rollback' => 'ROLLBACK'
diff --git a/cake/libs/model/datasources/dbo/dbo_mysql.php b/cake/libs/model/datasources/dbo/dbo_mysql.php
index d3b415dbf..7f5391b29 100644
--- a/cake/libs/model/datasources/dbo/dbo_mysql.php
+++ b/cake/libs/model/datasources/dbo/dbo_mysql.php
@@ -53,7 +53,7 @@ class DboMysqlBase extends DboSource {
  * @var boolean
  * @access protected
  */
-	var $_useAlias = true;
+	protected $_useAlias = true;
 
 /**
  * Index of basic SQL commands
@@ -61,7 +61,7 @@ class DboMysqlBase extends DboSource {
  * @var array
  * @access protected
  */
-	var $_commands = array(
+	protected $_commands = array(
 		'begin'    => 'START TRANSACTION',
 		'commit'   => 'COMMIT',
 		'rollback' => 'ROLLBACK'
@@ -518,7 +518,7 @@ class DboMysql extends DboMysqlBase {
  *
  * @var array
  */
-	var $_baseConfig = array(
+	protected $_baseConfig = array(
 		'persistent' => true,
 		'host' => 'localhost',
 		'login' => 'root',
diff --git a/cake/libs/model/datasources/dbo/dbo_mysqli.php b/cake/libs/model/datasources/dbo/dbo_mysqli.php
index 8d5609b86..8c8d53062 100644
--- a/cake/libs/model/datasources/dbo/dbo_mysqli.php
+++ b/cake/libs/model/datasources/dbo/dbo_mysqli.php
@@ -41,7 +41,7 @@ class DboMysqli extends DboMysqlBase {
  *
  * @var array
  */
-	var $_baseConfig = array(
+	protected $_baseConfig = array(
 		'persistent' => true,
 		'host' => 'localhost',
 		'login' => 'root',
diff --git a/cake/libs/model/datasources/dbo/dbo_oracle.php b/cake/libs/model/datasources/dbo/dbo_oracle.php
index 44986c0f9..e208849bf 100644
--- a/cake/libs/model/datasources/dbo/dbo_oracle.php
+++ b/cake/libs/model/datasources/dbo/dbo_oracle.php
@@ -46,7 +46,7 @@ class DboOracle extends DboSource {
 /**
  * Sequence names as introspected from the database
  */
-	var $_sequences = array();
+	protected $_sequences = array();
 
 /**
  * Transaction in progress flag
@@ -90,7 +90,7 @@ class DboOracle extends DboSource {
  * @var unknown_type
  * @access protected
  */
-	var $_limit = -1;
+	protected $_limit = -1;
 
 /**
  * Enter description here...
@@ -98,7 +98,7 @@ class DboOracle extends DboSource {
  * @var unknown_type
  * @access protected
  */
-	var $_offset = 0;
+	protected $_offset = 0;
 
 /**
  * Enter description here...
@@ -106,7 +106,7 @@ class DboOracle extends DboSource {
  * @var unknown_type
  * @access protected
  */
-	var $_map;
+	protected $_map;
 
 /**
  * Enter description here...
@@ -114,7 +114,7 @@ class DboOracle extends DboSource {
  * @var unknown_type
  * @access protected
  */
-	var $_currentRow;
+	protected $_currentRow;
 
 /**
  * Enter description here...
@@ -122,7 +122,7 @@ class DboOracle extends DboSource {
  * @var unknown_type
  * @access protected
  */
-	var $_numRows;
+	protected $_numRows;
 
 /**
  * Enter description here...
@@ -130,21 +130,21 @@ class DboOracle extends DboSource {
  * @var unknown_type
  * @access protected
  */
-	var $_results;
+	protected $_results;
 
 /**
  * Last error issued by oci extension
  *
  * @var unknown_type
  */
-	var $_error;
+	protected $_error;
 
 /**
  * Base configuration settings for MySQL driver
  *
  * @var array
  */
-	var $_baseConfig = array(
+	protected $_baseConfig = array(
 		'persistent' => true,
 		'host' => 'localhost',
 		'login' => 'system',
@@ -159,7 +159,7 @@ class DboOracle extends DboSource {
  *
  * @var unknown_type
  */
-	var $_sequenceMap = array();
+	protected $_sequenceMap = array();
 
 /**
  * Connects to the database using options in the given configuration array.
diff --git a/cake/libs/model/datasources/dbo/dbo_postgres.php b/cake/libs/model/datasources/dbo/dbo_postgres.php
index 6c0f4a3d2..cf22d069b 100644
--- a/cake/libs/model/datasources/dbo/dbo_postgres.php
+++ b/cake/libs/model/datasources/dbo/dbo_postgres.php
@@ -42,7 +42,7 @@ class DboPostgres extends DboSource {
  * @var array
  * @access protected
  */
-	var $_commands = array(
+	protected $_commands = array(
 		'begin'    => 'BEGIN',
 		'commit'   => 'COMMIT',
 		'rollback' => 'ROLLBACK'
@@ -54,7 +54,7 @@ class DboPostgres extends DboSource {
  * @var array
  * @access protected
  */
-	var $_baseConfig = array(
+	protected $_baseConfig = array(
 		'persistent' => true,
 		'host' => 'localhost',
 		'login' => 'root',
@@ -103,7 +103,7 @@ class DboPostgres extends DboSource {
  *
  * @var array
  */
-	var $_sequenceMap = array();
+	protected $_sequenceMap = array();
 
 /**
  * Connects to the database using options in the given configuration array.
diff --git a/cake/libs/model/datasources/dbo/dbo_sqlite.php b/cake/libs/model/datasources/dbo/dbo_sqlite.php
index 6d267060f..1a2850717 100644
--- a/cake/libs/model/datasources/dbo/dbo_sqlite.php
+++ b/cake/libs/model/datasources/dbo/dbo_sqlite.php
@@ -55,14 +55,14 @@ class DboSqlite extends DboSource {
  * @var array
  * @access protected
  */
-	var $_queryStats = array();
+	protected $_queryStats = array();
 
 /**
  * Base configuration settings for SQLite driver
  *
  * @var array
  */
-	var $_baseConfig = array(
+	protected $_baseConfig = array(
 		'persistent' => true,
 		'database' => null
 	);
@@ -73,7 +73,7 @@ class DboSqlite extends DboSource {
  * @var array
  * @access protected
  */
-	var $_commands = array(
+	protected $_commands = array(
 		'begin'    => 'BEGIN TRANSACTION',
 		'commit'   => 'COMMIT TRANSACTION',
 		'rollback' => 'ROLLBACK TRANSACTION'
diff --git a/cake/libs/model/datasources/dbo_source.php b/cake/libs/model/datasources/dbo_source.php
index 9ac2a85d9..f3a479595 100755
--- a/cake/libs/model/datasources/dbo_source.php
+++ b/cake/libs/model/datasources/dbo_source.php
@@ -91,7 +91,7 @@ class DboSource extends DataSource {
  * @var array
  * @access protected
  */
-	var $_commands = array(
+	protected $_commands = array(
 		'begin' => 'BEGIN',
 		'commit' => 'COMMIT',
 		'rollback' => 'ROLLBACK'
diff --git a/cake/libs/model/model.php b/cake/libs/model/model.php
index 1faa2d0ea..8968cd57b 100644
--- a/cake/libs/model/model.php
+++ b/cake/libs/model/model.php
@@ -114,7 +114,7 @@ class Model extends Overloadable {
  * @access protected
  * @link http://book.cakephp.org/view/1057/Model-Attributes#_schema-1066
  */
-	var $_schema = null;
+	protected $_schema = null;
 
 /**
  * List of validation rules. Append entries for validation as ('field_name' => '/^perl_compat_regexp$/')
@@ -363,7 +363,7 @@ class Model extends Overloadable {
  * @var array
  * @access protected
  */
-	var $_findMethods = array(
+	protected $_findMethods = array(
 		'all' => true, 'first' => true, 'count' => true,
 		'neighbors' => true, 'list' => true, 'threaded' => true
 	);
diff --git a/cake/libs/model/model_behavior.php b/cake/libs/model/model_behavior.php
index 119b3d95a..9a5dc9763 100644
--- a/cake/libs/model/model_behavior.php
+++ b/cake/libs/model/model_behavior.php
@@ -230,7 +230,7 @@ class BehaviorCollection extends Object {
  * @var array
  * @access private
  */
-	var $_attached = array();
+	protected $_attached = array();
 
 /**
  * Lists the currently-attached behavior objects which are disabled
@@ -238,7 +238,7 @@ class BehaviorCollection extends Object {
  * @var array
  * @access private
  */
-	var $_disabled = array();
+	protected $_disabled = array();
 
 /**
  * Keeps a list of all methods of attached behaviors
diff --git a/cake/libs/router.php b/cake/libs/router.php
index ee3905518..96f7fc0c9 100644
--- a/cake/libs/router.php
+++ b/cake/libs/router.php
@@ -1257,7 +1257,7 @@ class CakeRoute {
  * @var string
  * @access protected
  */
-	var $_greedy = false;
+	protected $_greedy = false;
 
 /**
  * The compiled route regular expresssion
@@ -1265,7 +1265,7 @@ class CakeRoute {
  * @var string
  * @access protected
  */
-	var $_compiledRoute = null;
+	protected $_compiledRoute = null;
 
 /**
  * HTTP header shortcut map.  Used for evaluating header-based route expressions.
diff --git a/cake/libs/view/helpers/form.php b/cake/libs/view/helpers/form.php
index 7eef71d46..61e776c0f 100755
--- a/cake/libs/view/helpers/form.php
+++ b/cake/libs/view/helpers/form.php
@@ -87,7 +87,7 @@ class FormHelper extends AppHelper {
  * @var array
  * @access protected
  */
-	var $_inputDefaults = array();
+	protected $_inputDefaults = array();
 
 /**
  * Introspects model information and extracts information related
diff --git a/cake/libs/view/helpers/html.php b/cake/libs/view/helpers/html.php
index 2dbebb7d3..870aefb79 100644
--- a/cake/libs/view/helpers/html.php
+++ b/cake/libs/view/helpers/html.php
@@ -97,7 +97,7 @@ class HtmlHelper extends AppHelper {
  * @var array
  * @access protected
  */
-	var $_crumbs = array();
+	protected $_crumbs = array();
 
 /**
  * Names of script files that have been included once
@@ -112,7 +112,7 @@ class HtmlHelper extends AppHelper {
  * @var array
  * @access protected
  */
-	var $_scriptBlockOptions = array();
+	protected $_scriptBlockOptions = array();
 /**
  * Document type definitions
  *
diff --git a/cake/libs/view/helpers/javascript.php b/cake/libs/view/helpers/javascript.php
index 4517479f3..847d6d090 100644
--- a/cake/libs/view/helpers/javascript.php
+++ b/cake/libs/view/helpers/javascript.php
@@ -73,7 +73,7 @@ class JavascriptHelper extends AppHelper {
  * @access protected
  * @see JavascriptHelper::codeBlock()
  */
-	var $_blockOptions = array();
+	protected $_blockOptions = array();
 
 /**
  * Caches events written by event() for output at the end of page execution
@@ -82,7 +82,7 @@ class JavascriptHelper extends AppHelper {
  * @access protected
  * @see JavascriptHelper::event()
  */
-	var $_cachedEvents = array();
+	protected $_cachedEvents = array();
 
 /**
  * Indicates whether generated events should be cached for later output (can be written at the
@@ -93,7 +93,7 @@ class JavascriptHelper extends AppHelper {
  * @see JavascriptHelper::event()
  * @see JavascriptHelper::writeEvents()
  */
-	var $_cacheEvents = false;
+	protected $_cacheEvents = false;
 
 /**
  * Indicates whether cached events should be written to an external file
@@ -103,7 +103,7 @@ class JavascriptHelper extends AppHelper {
  * @see JavascriptHelper::event()
  * @see JavascriptHelper::writeEvents()
  */
-	var $_cacheToFile = false;
+	protected $_cacheToFile = false;
 
 /**
  * Indicates whether *all* generated JavaScript should be cached for later output
@@ -113,7 +113,7 @@ class JavascriptHelper extends AppHelper {
  * @see JavascriptHelper::codeBlock()
  * @see JavascriptHelper::blockEnd()
  */
-	var $_cacheAll = false;
+	protected $_cacheAll = false;
 
 /**
  * Contains event rules attached with CSS selectors.  Used with the event:Selectors JavaScript
@@ -124,7 +124,7 @@ class JavascriptHelper extends AppHelper {
  * @see JavascriptHelper::event()
  * @link          http://alternateidea.com/event-selectors/
  */
-	var $_rules = array();
+	protected $_rules = array();
 
 /**
  * @var string
diff --git a/cake/libs/view/helpers/jquery_engine.php b/cake/libs/view/helpers/jquery_engine.php
index ea14fb8f1..235b0e0c5 100644
--- a/cake/libs/view/helpers/jquery_engine.php
+++ b/cake/libs/view/helpers/jquery_engine.php
@@ -31,7 +31,7 @@ class JqueryEngineHelper extends JsBaseEngineHelper {
  * @var array
  * @access protected
  */
-	var $_optionMap = array(
+	protected $_optionMap = array(
 		'request' => array(
 			'type' => 'dataType',
 			'before' => 'beforeSend',
@@ -60,7 +60,7 @@ class JqueryEngineHelper extends JsBaseEngineHelper {
  * @var string
  * @access protected
  */
-	var $_callbackArguments = array(
+	protected $_callbackArguments = array(
 		'slider' => array(
 			'start' => 'event, ui',
 			'slide' => 'event, ui',
diff --git a/cake/libs/view/helpers/js.php b/cake/libs/view/helpers/js.php
index cf6cb9947..3ec992a1f 100644
--- a/cake/libs/view/helpers/js.php
+++ b/cake/libs/view/helpers/js.php
@@ -460,7 +460,7 @@ class JsBaseEngineHelper extends AppHelper {
  * @var array
  * @access protected
  */
-	var $_optionMap = array();
+	protected $_optionMap = array();
 
 /**
  * An array of lowercase method names in the Engine that are buffered unless otherwise disabled.
@@ -477,7 +477,7 @@ class JsBaseEngineHelper extends AppHelper {
  * @var array
  * @access protected
  */
-	var $_callbackArguments = array();
+	protected $_callbackArguments = array();
 
 /**
  * Constructor.
diff --git a/cake/libs/view/helpers/mootools_engine.php b/cake/libs/view/helpers/mootools_engine.php
index 4a67cc98b..b0919f418 100644
--- a/cake/libs/view/helpers/mootools_engine.php
+++ b/cake/libs/view/helpers/mootools_engine.php
@@ -33,7 +33,7 @@ class MootoolsEngineHelper extends JsBaseEngineHelper {
  *
  * @var array
  */
-	var $_optionMap = array(
+	protected $_optionMap = array(
 		'request' => array(
 			'complete' => 'onComplete',
 			'success' => 'onSuccess',
@@ -71,7 +71,7 @@ class MootoolsEngineHelper extends JsBaseEngineHelper {
  *
  * @var array
  */
-	var $_callbackArguments = array(
+	protected $_callbackArguments = array(
 		'slider' => array(
 			'onTick' => 'position',
 			'onChange' => 'step',
diff --git a/cake/libs/view/helpers/number.php b/cake/libs/view/helpers/number.php
index 77c0277f3..6ebf5a2c2 100644
--- a/cake/libs/view/helpers/number.php
+++ b/cake/libs/view/helpers/number.php
@@ -37,7 +37,7 @@ class NumberHelper extends AppHelper {
  * @var array
  * @access protected
  */
-	var $_currencies = array(
+	protected $_currencies = array(
 		'USD' => array(
 			'before' => '$', 'after' => 'c', 'zero' => 0, 'places' => 2, 'thousands' => ',',
 			'decimals' => '.', 'negative' => '()', 'escape' => true
@@ -58,7 +58,7 @@ class NumberHelper extends AppHelper {
  * @var array
  * @access protected
  */
-	var $_currencyDefaults = array(
+	protected $_currencyDefaults = array(
 		'before'=>'', 'after' => '', 'zero' => '0', 'places' => 2, 'thousands' => ',',
 		'decimals' => '.','negative' => '()', 'escape' => true
 	);
diff --git a/cake/libs/view/helpers/paginator.php b/cake/libs/view/helpers/paginator.php
index aca981388..93c6afb05 100644
--- a/cake/libs/view/helpers/paginator.php
+++ b/cake/libs/view/helpers/paginator.php
@@ -47,7 +47,7 @@ class PaginatorHelper extends AppHelper {
  *
  * @var string
  */
-	var $_ajaxHelperClass = 'Js';
+	protected $_ajaxHelperClass = 'Js';
 
 /**
  * Holds the default options for pagination links
diff --git a/cake/libs/view/helpers/prototype_engine.php b/cake/libs/view/helpers/prototype_engine.php
index b838afaca..9031adb4a 100644
--- a/cake/libs/view/helpers/prototype_engine.php
+++ b/cake/libs/view/helpers/prototype_engine.php
@@ -28,14 +28,14 @@ class PrototypeEngineHelper extends JsBaseEngineHelper {
  *
  * @var boolean
  */
-	var $_multiple = false;
+	protected $_multiple = false;
 
 /**
  * Option mappings for Prototype
  *
  * @var array
  */
-	var $_optionMap = array(
+	protected $_optionMap = array(
 		'request' => array(
 			'async' => 'asynchronous',
 			'data' => 'parameters',
@@ -75,7 +75,7 @@ class PrototypeEngineHelper extends JsBaseEngineHelper {
  *
  * @var array
  */
-	var $_callbackArguments = array(
+	protected $_callbackArguments = array(
 		'slider' => array(
 			'onSlide' => 'value',
 			'onChange' => 'value',
diff --git a/cake/libs/view/media.php b/cake/libs/view/media.php
index 8e88fb321..ce77c4aba 100644
--- a/cake/libs/view/media.php
+++ b/cake/libs/view/media.php
@@ -88,7 +88,7 @@ class MediaView extends View {
  * @var array
  * @access protected
  */
-	var $_headers = array();
+	protected $_headers = array();
 
 /**
  * Constructor
diff --git a/cake/tests/cases/libs/controller/components/auth.test.php b/cake/tests/cases/libs/controller/components/auth.test.php
index 122db1b76..2dab41a6f 100644
--- a/cake/tests/cases/libs/controller/components/auth.test.php
+++ b/cake/tests/cases/libs/controller/components/auth.test.php
@@ -45,7 +45,7 @@ class TestAuthComponent extends AuthComponent {
  * @var bool true
  * @access protected
  */
-	var $_loggedIn = true;
+	protected $_loggedIn = true;
 
 /**
  * stop method
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
index b406448f7..8c28bc05c 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
@@ -159,7 +159,7 @@ class MssqlTestModel extends Model {
  * @var array
  * @access protected
  */
-	var $_schema = array(
+	protected $_schema = array(
 		'id'		=> array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8', 'key' => 'primary'),
 		'client_id'	=> array('type' => 'integer', 'null' => '', 'default' => '0', 'length' => '11'),
 		'name'		=> array('type' => 'string', 'null' => '', 'default' => '', 'length' => '255'),
@@ -258,7 +258,7 @@ class MssqlClientTestModel extends Model {
  * @var array
  * @access protected
  */
-	var $_schema = array(
+	protected $_schema = array(
 		'id'		=> array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8', 'key' => 'primary'),
 		'name'		=> array('type' => 'string', 'null' => '', 'default' => '', 'length' => '255'),
 		'email'		=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '155'),
diff --git a/cake/tests/cases/libs/model/datasources/dbo_source.test.php b/cake/tests/cases/libs/model/datasources/dbo_source.test.php
index 096f2eeca..f5aafa3a0 100644
--- a/cake/tests/cases/libs/model/datasources/dbo_source.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo_source.test.php
@@ -53,7 +53,7 @@ class TestModel extends CakeTestModel {
  * @var array
  * @access protected
  */
-	var $_schema = array(
+	protected $_schema = array(
 		'id' => array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8'),
 		'client_id' => array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '11'),
 		'name' => array('type' => 'string', 'null' => '', 'default' => '', 'length' => '255'),
diff --git a/cake/tests/cases/libs/model/models.php b/cake/tests/cases/libs/model/models.php
index 33b2a6720..a324d30e5 100644
--- a/cake/tests/cases/libs/model/models.php
+++ b/cake/tests/cases/libs/model/models.php
@@ -53,7 +53,7 @@ class Test extends CakeTestModel {
  * @var array
  * @access protected
  */
-	var $_schema = array(
+	protected $_schema = array(
 		'id'=> array('type' => 'integer', 'null' => '', 'default' => '1', 'length' => '8', 'key'=>'primary'),
 		'name'=> array('type' => 'string', 'null' => '', 'default' => '', 'length' => '255'),
 		'email'=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '155'),
@@ -101,7 +101,7 @@ class TestAlias extends CakeTestModel {
  * @var array
  * @access protected
  */
-	var $_schema = array(
+	protected $_schema = array(
 		'id'=> array('type' => 'integer', 'null' => '', 'default' => '1', 'length' => '8', 'key'=>'primary'),
 		'name'=> array('type' => 'string', 'null' => '', 'default' => '', 'length' => '255'),
 		'email'=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '155'),
@@ -141,7 +141,7 @@ class TestValidate extends CakeTestModel {
  * @var array
  * @access protected
  */
-	var $_schema = array(
+	protected $_schema = array(
 		'id' => array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8'),
 		'title' => array('type' => 'string', 'null' => '', 'default' => '', 'length' => '255'),
 		'body' => array('type' => 'string', 'null' => '1', 'default' => '', 'length' => ''),
@@ -2168,7 +2168,7 @@ class ValidationTest1 extends CakeTestModel {
  * @var array
  * @access protected
  */
-	var $_schema = array();
+	protected $_schema = array();
 
 /**
  * validate property
diff --git a/cake/tests/cases/libs/view/helpers/form.test.php b/cake/tests/cases/libs/view/helpers/form.test.php
index 6948e1fc8..58885fbc7 100644
--- a/cake/tests/cases/libs/view/helpers/form.test.php
+++ b/cake/tests/cases/libs/view/helpers/form.test.php
@@ -84,7 +84,7 @@ class Contact extends CakeTestModel {
  * @var array
  * @access public
  */
-	var $_schema = array(
+	protected $_schema = array(
 		'id' => array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8'),
 		'name' => array('type' => 'string', 'null' => '', 'default' => '', 'length' => '255'),
 		'email' => array('type' => 'string', 'null' => '', 'default' => '', 'length' => '255'),
@@ -161,7 +161,7 @@ class ContactTagsContact extends CakeTestModel {
  * @var array
  * @access public
  */
-	var $_schema = array(
+	protected $_schema = array(
 		'contact_id' => array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8'),
 		'contact_tag_id' => array(
 			'type' => 'integer', 'null' => '', 'default' => '', 'length' => '8'
@@ -239,7 +239,7 @@ class ContactTag extends Model {
  * @var array
  * @access protected
  */
-	var $_schema = array(
+	protected $_schema = array(
 		'id' => array('type' => 'integer', 'null' => false, 'default' => '', 'length' => '8'),
 		'name' => array('type' => 'string', 'null' => false, 'default' => '', 'length' => '255'),
 		'created' => array('type' => 'date', 'null' => true, 'default' => '', 'length' => ''),
@@ -295,7 +295,7 @@ class UserForm extends CakeTestModel {
  * @var array
  * @access protected
  */
-	var $_schema = array(
+	protected $_schema = array(
 		'id' => array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8'),
 		'published' => array('type' => 'date', 'null' => true, 'default' => null, 'length' => null),
 		'other' => array('type' => 'text', 'null' => true, 'default' => null, 'length' => null),
@@ -362,7 +362,7 @@ class OpenidUrl extends CakeTestModel {
  * @var array
  * @access protected
  */
-	var $_schema = array(
+	protected $_schema = array(
 		'id' => array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8'),
 		'user_form_id' => array(
 			'type' => 'user_form_id', 'null' => '', 'default' => '', 'length' => '8'
@@ -430,7 +430,7 @@ class ValidateUser extends CakeTestModel {
  * @var array
  * @access protected
  */
-	var $_schema = array(
+	protected $_schema = array(
 		'id' => array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8'),
 		'name' => array('type' => 'string', 'null' => '', 'default' => '', 'length' => '255'),
 		'email' => array('type' => 'string', 'null' => '', 'default' => '', 'length' => '255'),
@@ -481,7 +481,7 @@ class ValidateProfile extends CakeTestModel {
  * @var array
  * @access protected
  */
-	var $_schema = array(
+	protected $_schema = array(
 		'id' => array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8'),
 		'user_id' => array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8'),
 		'full_name' => array('type' => 'string', 'null' => '', 'default' => '', 'length' => '255'),
@@ -569,7 +569,7 @@ class ValidateItem extends CakeTestModel {
  * @var array
  * @access protected
  */
-	var $_schema = array(
+	protected $_schema = array(
 		'id' => array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8'),
 		'profile_id' => array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8'),
 		'name' => array('type' => 'text', 'null' => '', 'default' => '', 'length' => '255'),
diff --git a/cake/tests/cases/libs/view/helpers/html.test.php b/cake/tests/cases/libs/view/helpers/html.test.php
index 17011ae5c..6d5283409 100644
--- a/cake/tests/cases/libs/view/helpers/html.test.php
+++ b/cake/tests/cases/libs/view/helpers/html.test.php
@@ -81,7 +81,7 @@ class HtmlHelperTest extends CakeTestCase {
  * @var string
  * @access protected
  */
-	var $_appEncoding;
+	protected $_appEncoding;
 
 /**
  * Backup of asset configuration settings
@@ -89,7 +89,7 @@ class HtmlHelperTest extends CakeTestCase {
  * @var string
  * @access protected
  */
-	var $_asset;
+	protected $_asset;
 
 /**
  * Backup of debug configuration setting
@@ -97,7 +97,7 @@ class HtmlHelperTest extends CakeTestCase {
  * @var integer
  * @access protected
  */
-	var $_debug;
+	protected $_debug;
 
 /**
  * setUp method
diff --git a/cake/tests/cases/libs/view/helpers/js.test.php b/cake/tests/cases/libs/view/helpers/js.test.php
index 292bbb19e..ab31eab2c 100644
--- a/cake/tests/cases/libs/view/helpers/js.test.php
+++ b/cake/tests/cases/libs/view/helpers/js.test.php
@@ -26,7 +26,7 @@ Mock::generate('JsBaseEngineHelper', 'TestJsEngineHelper', array('methodOne'));
 Mock::generate('View', 'JsHelperMockView');
 
 class OptionEngineHelper extends JsBaseEngineHelper {
-	var $_optionMap = array(
+	protected $_optionMap = array(
 		'request' => array(
 			'complete' => 'success',
 			'request' => 'beforeSend',
diff --git a/cake/tests/lib/cake_test_case.php b/cake/tests/lib/cake_test_case.php
index f4ea8ed5e..e83e9f343 100644
--- a/cake/tests/lib/cake_test_case.php
+++ b/cake/tests/lib/cake_test_case.php
@@ -117,7 +117,7 @@ class CakeTestCase extends UnitTestCase {
  * @var array
  * @access protected
  */
-	var $_fixtureClassMap = array();
+	protected $_fixtureClassMap = array();
 
 /**
  * truncated property
diff --git a/cake/tests/lib/cake_test_suite_dispatcher.php b/cake/tests/lib/cake_test_suite_dispatcher.php
index 531448d7c..27cd06be3 100644
--- a/cake/tests/lib/cake_test_suite_dispatcher.php
+++ b/cake/tests/lib/cake_test_suite_dispatcher.php
@@ -46,7 +46,7 @@ class CakeTestSuiteDispatcher {
  *
  * @var string
  */
-	var $_managerClass = 'TestManager';
+	protected $_managerClass = 'TestManager';
 
 /**
  * The Instance of the Manager being used.
@@ -60,14 +60,14 @@ class CakeTestSuiteDispatcher {
  *
  * @var string
  */
-	var $_baseUrl;
+	protected $_baseUrl;
 
 /**
  * Base dir of the request.  Used for accessing assets.
  *
  * @var string
  */
-	var $_baseDir;
+	protected $_baseDir;
 
 /**
  * constructor
diff --git a/cake/tests/lib/reporter/cake_base_reporter.php b/cake/tests/lib/reporter/cake_base_reporter.php
index 0c1b12d14..cc4b2cd60 100644
--- a/cake/tests/lib/reporter/cake_base_reporter.php
+++ b/cake/tests/lib/reporter/cake_base_reporter.php
@@ -32,7 +32,7 @@ class CakeBaseReporter extends SimpleReporter {
  * @var integer
  * @access protected
  */
-	var $_timeStart = 0;
+	protected $_timeStart = 0;
 
 /**
  * Time the test runs ended
@@ -40,7 +40,7 @@ class CakeBaseReporter extends SimpleReporter {
  * @var integer
  * @access protected
  */
-	var $_timeEnd = 0;
+	protected $_timeEnd = 0;
 
 /**
  * Duration of all test methods.
@@ -48,7 +48,7 @@ class CakeBaseReporter extends SimpleReporter {
  * @var integer
  * @access protected
  */
-	var $_timeDuration = 0;
+	protected $_timeDuration = 0;
 
 /**
  * Array of request parameters.  Usually parsed GET params.
@@ -63,7 +63,7 @@ class CakeBaseReporter extends SimpleReporter {
  * @var string
  * @access protected
  */
-	var $_characterSet;
+	protected $_characterSet;
 
 /**
  * Does nothing yet. The first output will
diff --git a/cake/tests/lib/test_manager.php b/cake/tests/lib/test_manager.php
index 5bfbc6279..92e6e7850 100644
--- a/cake/tests/lib/test_manager.php
+++ b/cake/tests/lib/test_manager.php
@@ -35,14 +35,14 @@ class TestManager {
  *
  * @var string
  */
-	var $_testExtension = '.test.php';
+	protected $_testExtension = '.test.php';
 
 /**
  * Extension suffix for group test case files.
  *
  * @var string
  */
-	var $_groupExtension = '.group.php';
+	protected $_groupExtension = '.group.php';
 
 /**
  * Is this test an AppTest?