Renaming constants and fixing the last error related to folder renaming

lib/Cake/bootstrap.php

@@ -51,37 +51,37 @@
 /**
  * Path to the application's models directory.
  */
-	define('MODELS', APP.'models'.DS);
+	define('MODELS', APP.'Model'.DS);
 
 /**
  * Path to model behaviors directory.
  */
-	define('BEHAVIORS', MODELS.'behaviors'.DS);
+	define('BEHAVIORS', MODELS.'Behavior'.DS);
 
 /**
  * Path to the application's controllers directory.
  */
-	define('CONTROLLERS', APP.'controllers'.DS);
+	define('CONTROLLERS', APP.'Controller'.DS);
 
 /**
  * Path to the application's components directory.
  */
-	define('COMPONENTS', CONTROLLERS.'components'.DS);
+	define('COMPONENTS', CONTROLLERS.'Component'.DS);
 
 /**
  * Path to the application's libs directory.
  */
-	define('APPLIBS', APP.'libs'.DS);
+	define('APPLIBS', APP.'Lib'.DS);
 
 /**
  * Path to the application's views directory.
  */
-	define('VIEWS', APP.'views'.DS);
+	define('VIEWS', APP.'View'.DS);
 
 /**
  * Path to the application's helpers directory.
  */
-	define('HELPERS', VIEWS.'helpers'.DS);
+	define('HELPERS', VIEWS.'Helper'.DS);
 
 /**
  * Path to the application's view's layouts directory.

lib/Cake/tests/cases/libs/cache.test.php

@@ -89,7 +89,7 @@ function testNonFatalErrorsWithCachedisable() {
  */
 	function testConfigWithLibAndPluginEngines() {
 		App::build(array(
-			'Lib' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'libs' . DS),
+			'Lib' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Lib' . DS),
 			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
 		), true);