diff --git a/lib/Cake/Core/CakePlugin.php b/lib/Cake/Core/CakePlugin.php
index 4e2c5ab81..22d8161a0 100644
--- a/lib/Cake/Core/CakePlugin.php
+++ b/lib/Cake/Core/CakePlugin.php
@@ -50,11 +50,18 @@ class CakePlugin {
 			return;
 		}
 		$config += array('bootstrap' => false, 'routes' => false);
-		$underscored = Inflector::underscore($plugin);
 		if (empty($config['path'])) {
 			foreach (App::path('plugins') as $path) {
+				if (is_dir($path . $plugin)) {
+					self::$_plugins[$plugin] = $config + array('path' => $path . $plugin . DS);
+					break;
+				}
+
+				//Backwards compatibility to make easier to migrate to 2.0
+				$underscored = Inflector::underscore($plugin);
 				if (is_dir($path . $underscored)) {
 					self::$_plugins[$plugin] = $config + array('path' => $path . $underscored . DS);
+					break;
 				}
 			}
 		} else {
diff --git a/lib/Cake/tests/Case/Core/CakePluginTest.php b/lib/Cake/tests/Case/Core/CakePluginTest.php
index 753ac481e..779e006a7 100644
--- a/lib/Cake/tests/Case/Core/CakePluginTest.php
+++ b/lib/Cake/tests/Case/Core/CakePluginTest.php
@@ -181,10 +181,10 @@ class CakePluginTest extends CakeTestCase {
  */
 	public function testPath() {
 		CakePlugin::load(array('TestPlugin', 'TestPluginTwo'));
-		$expected = CAKE_TESTS . 'test_app' . DS . 'plugins' . DS . 'test_plugin' . DS;
+		$expected = CAKE_TESTS . 'test_app' . DS . 'plugins' . DS . 'TestPlugin' . DS;
 		$this->assertEquals(CakePlugin::path('TestPlugin'), $expected);
 
-		$expected = CAKE_TESTS . 'test_app' . DS . 'plugins' . DS . 'test_plugin_two' . DS;
+		$expected = CAKE_TESTS . 'test_app' . DS . 'plugins' . DS . 'TestPluginTwo' . DS;
 		$this->assertEquals(CakePlugin::path('TestPluginTwo'), $expected);
 	}
 
diff --git a/lib/Cake/tests/test_app/plugins/plugin_js/webroot/js/one/plugin_one.js b/lib/Cake/tests/test_app/plugins/PluginJs/webroot/js/one/plugin_one.js
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/plugin_js/webroot/js/one/plugin_one.js
rename to lib/Cake/tests/test_app/plugins/PluginJs/webroot/js/one/plugin_one.js
diff --git a/lib/Cake/tests/test_app/plugins/plugin_js/webroot/js/plugin_js.js b/lib/Cake/tests/test_app/plugins/PluginJs/webroot/js/plugin_js.js
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/plugin_js/webroot/js/plugin_js.js
rename to lib/Cake/tests/test_app/plugins/PluginJs/webroot/js/plugin_js.js
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Console/Command/Task/empty b/lib/Cake/tests/test_app/plugins/TestPlugin/Console/Command/Task/empty
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Console/Command/Task/empty
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Console/Command/Task/empty
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Console/Command/Task/other_task.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Console/Command/Task/other_task.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Console/Command/Task/other_task.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Console/Command/Task/other_task.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Console/Command/example.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Console/Command/example.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Console/Command/example.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Console/Command/example.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Console/templates/empty b/lib/Cake/tests/test_app/plugins/TestPlugin/Console/templates/empty
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Console/templates/empty
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Console/templates/empty
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Controller/Component/other_component.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Controller/Component/other_component.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Controller/Component/other_component.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Controller/Component/other_component.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Controller/Component/plugins_component.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Controller/Component/plugins_component.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Controller/Component/plugins_component.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Controller/Component/plugins_component.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Controller/Component/test_plugin_component.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Controller/Component/test_plugin_component.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Controller/Component/test_plugin_component.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Controller/Component/test_plugin_component.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Controller/Component/test_plugin_other_component.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Controller/Component/test_plugin_other_component.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Controller/Component/test_plugin_other_component.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Controller/Component/test_plugin_other_component.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Controller/test_plugin_app_controller.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Controller/test_plugin_app_controller.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Controller/test_plugin_app_controller.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Controller/test_plugin_app_controller.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Controller/test_plugin_controller.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Controller/test_plugin_controller.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Controller/test_plugin_controller.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Controller/test_plugin_controller.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Controller/tests_controller.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Controller/tests_controller.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Controller/tests_controller.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Controller/tests_controller.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Lib/Cache/Engine/TestPluginCacheEngine.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Lib/Cache/Engine/TestPluginCacheEngine.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Lib/Cache/Engine/TestPluginCacheEngine.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Lib/Cache/Engine/TestPluginCacheEngine.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Lib/Custom/Package/CustomLibClass.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Lib/Custom/Package/CustomLibClass.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Lib/Custom/Package/CustomLibClass.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Lib/Custom/Package/CustomLibClass.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Lib/Log/Engine/TestPluginLog.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Lib/Log/Engine/TestPluginLog.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Lib/Log/Engine/TestPluginLog.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Lib/Log/Engine/TestPluginLog.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Lib/test_plugin_library.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Lib/test_plugin_library.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Lib/test_plugin_library.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Lib/test_plugin_library.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Model/Behavior/test_plugin_persister_one.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Model/Behavior/test_plugin_persister_one.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Model/Behavior/test_plugin_persister_one.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Model/Behavior/test_plugin_persister_one.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Model/Behavior/test_plugin_persister_two.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Model/Behavior/test_plugin_persister_two.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Model/Behavior/test_plugin_persister_two.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Model/Behavior/test_plugin_persister_two.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Model/Datasource/Database/DboDummy.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Model/Datasource/Database/DboDummy.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Model/Datasource/Database/DboDummy.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Model/Datasource/Database/DboDummy.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Model/Datasource/Database/TestDriver.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Model/Datasource/Database/TestDriver.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Model/Datasource/Database/TestDriver.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Model/Datasource/Database/TestDriver.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Model/Datasource/Session/TestPluginSession.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Model/Datasource/Session/TestPluginSession.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Model/Datasource/Session/TestPluginSession.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Model/Datasource/Session/TestPluginSession.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Model/Datasource/TestSource.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Model/Datasource/TestSource.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Model/Datasource/TestSource.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Model/Datasource/TestSource.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Model/Datasource/test_other_source.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Model/Datasource/test_other_source.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Model/Datasource/test_other_source.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Model/Datasource/test_other_source.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Model/test_plugin_app_model.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Model/test_plugin_app_model.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Model/test_plugin_app_model.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Model/test_plugin_app_model.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Model/test_plugin_auth_user.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Model/test_plugin_auth_user.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Model/test_plugin_auth_user.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Model/test_plugin_auth_user.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Model/test_plugin_authors.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Model/test_plugin_authors.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Model/test_plugin_authors.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Model/test_plugin_authors.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Model/test_plugin_comment.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Model/test_plugin_comment.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Model/test_plugin_comment.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Model/test_plugin_comment.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Model/test_plugin_post.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Model/test_plugin_post.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Model/test_plugin_post.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Model/test_plugin_post.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/OtherHelperHelper.php b/lib/Cake/tests/test_app/plugins/TestPlugin/View/Helper/OtherHelperHelper.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/OtherHelperHelper.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/View/Helper/OtherHelperHelper.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/plugged_helper.php b/lib/Cake/tests/test_app/plugins/TestPlugin/View/Helper/plugged_helper.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/plugged_helper.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/View/Helper/plugged_helper.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/test_plugin_app.php b/lib/Cake/tests/test_app/plugins/TestPlugin/View/Helper/test_plugin_app.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/test_plugin_app.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/View/Helper/test_plugin_app.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/View/elements/plugin_element.ctp b/lib/Cake/tests/test_app/plugins/TestPlugin/View/elements/plugin_element.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/View/elements/plugin_element.ctp
rename to lib/Cake/tests/test_app/plugins/TestPlugin/View/elements/plugin_element.ctp
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/View/elements/test_plugin_element.ctp b/lib/Cake/tests/test_app/plugins/TestPlugin/View/elements/test_plugin_element.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/View/elements/test_plugin_element.ctp
rename to lib/Cake/tests/test_app/plugins/TestPlugin/View/elements/test_plugin_element.ctp
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/View/layouts/default.ctp b/lib/Cake/tests/test_app/plugins/TestPlugin/View/layouts/default.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/View/layouts/default.ctp
rename to lib/Cake/tests/test_app/plugins/TestPlugin/View/layouts/default.ctp
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/View/tests/index.ctp b/lib/Cake/tests/test_app/plugins/TestPlugin/View/tests/index.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/View/tests/index.ctp
rename to lib/Cake/tests/test_app/plugins/TestPlugin/View/tests/index.ctp
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/View/tests/scaffold.form.ctp b/lib/Cake/tests/test_app/plugins/TestPlugin/View/tests/scaffold.form.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/View/tests/scaffold.form.ctp
rename to lib/Cake/tests/test_app/plugins/TestPlugin/View/tests/scaffold.form.ctp
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/config/bootstrap.php b/lib/Cake/tests/test_app/plugins/TestPlugin/config/bootstrap.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/config/bootstrap.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/config/bootstrap.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/config/custom_config.php b/lib/Cake/tests/test_app/plugins/TestPlugin/config/custom_config.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/config/custom_config.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/config/custom_config.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/config/load.php b/lib/Cake/tests/test_app/plugins/TestPlugin/config/load.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/config/load.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/config/load.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/config/more.load.php b/lib/Cake/tests/test_app/plugins/TestPlugin/config/more.load.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/config/more.load.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/config/more.load.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/config/routes.php b/lib/Cake/tests/test_app/plugins/TestPlugin/config/routes.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/config/routes.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/config/routes.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/config/schema/schema.php b/lib/Cake/tests/test_app/plugins/TestPlugin/config/schema/schema.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/config/schema/schema.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/config/schema/schema.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/locale/po/LC_MESSAGES/test_plugin.po b/lib/Cake/tests/test_app/plugins/TestPlugin/locale/po/LC_MESSAGES/test_plugin.po
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/locale/po/LC_MESSAGES/test_plugin.po
rename to lib/Cake/tests/test_app/plugins/TestPlugin/locale/po/LC_MESSAGES/test_plugin.po
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/locale/po/LC_MONETARY/test_plugin.po b/lib/Cake/tests/test_app/plugins/TestPlugin/locale/po/LC_MONETARY/test_plugin.po
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/locale/po/LC_MONETARY/test_plugin.po
rename to lib/Cake/tests/test_app/plugins/TestPlugin/locale/po/LC_MONETARY/test_plugin.po
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php b/lib/Cake/tests/test_app/plugins/TestPlugin/vendors/sample/sample_plugin.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/vendors/sample/sample_plugin.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/vendors/welcome.php b/lib/Cake/tests/test_app/plugins/TestPlugin/vendors/welcome.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/vendors/welcome.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/vendors/welcome.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/webroot/css/test_plugin_asset.css b/lib/Cake/tests/test_app/plugins/TestPlugin/webroot/css/test_plugin_asset.css
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/webroot/css/test_plugin_asset.css
rename to lib/Cake/tests/test_app/plugins/TestPlugin/webroot/css/test_plugin_asset.css
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/webroot/css/theme_one.htc b/lib/Cake/tests/test_app/plugins/TestPlugin/webroot/css/theme_one.htc
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/webroot/css/theme_one.htc
rename to lib/Cake/tests/test_app/plugins/TestPlugin/webroot/css/theme_one.htc
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/webroot/css/unknown.extension b/lib/Cake/tests/test_app/plugins/TestPlugin/webroot/css/unknown.extension
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/webroot/css/unknown.extension
rename to lib/Cake/tests/test_app/plugins/TestPlugin/webroot/css/unknown.extension
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/webroot/flash/plugin_test.swf b/lib/Cake/tests/test_app/plugins/TestPlugin/webroot/flash/plugin_test.swf
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/webroot/flash/plugin_test.swf
rename to lib/Cake/tests/test_app/plugins/TestPlugin/webroot/flash/plugin_test.swf
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/webroot/img/cake.icon.gif b/lib/Cake/tests/test_app/plugins/TestPlugin/webroot/img/cake.icon.gif
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/webroot/img/cake.icon.gif
rename to lib/Cake/tests/test_app/plugins/TestPlugin/webroot/img/cake.icon.gif
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/webroot/js/test_plugin/test.js b/lib/Cake/tests/test_app/plugins/TestPlugin/webroot/js/test_plugin/test.js
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/webroot/js/test_plugin/test.js
rename to lib/Cake/tests/test_app/plugins/TestPlugin/webroot/js/test_plugin/test.js
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/webroot/pdfs/plugin_test.pdf b/lib/Cake/tests/test_app/plugins/TestPlugin/webroot/pdfs/plugin_test.pdf
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/webroot/pdfs/plugin_test.pdf
rename to lib/Cake/tests/test_app/plugins/TestPlugin/webroot/pdfs/plugin_test.pdf
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/webroot/root.js b/lib/Cake/tests/test_app/plugins/TestPlugin/webroot/root.js
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/webroot/root.js
rename to lib/Cake/tests/test_app/plugins/TestPlugin/webroot/root.js
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin_two/Console/Command/Task/empty b/lib/Cake/tests/test_app/plugins/TestPluginTwo/Console/Command/Task/empty
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin_two/Console/Command/Task/empty
rename to lib/Cake/tests/test_app/plugins/TestPluginTwo/Console/Command/Task/empty
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin_two/Console/Command/example.php b/lib/Cake/tests/test_app/plugins/TestPluginTwo/Console/Command/example.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin_two/Console/Command/example.php
rename to lib/Cake/tests/test_app/plugins/TestPluginTwo/Console/Command/example.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin_two/Console/Command/welcome.php b/lib/Cake/tests/test_app/plugins/TestPluginTwo/Console/Command/welcome.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin_two/Console/Command/welcome.php
rename to lib/Cake/tests/test_app/plugins/TestPluginTwo/Console/Command/welcome.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin_two/Console/templates/empty b/lib/Cake/tests/test_app/plugins/TestPluginTwo/Console/templates/empty
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin_two/Console/templates/empty
rename to lib/Cake/tests/test_app/plugins/TestPluginTwo/Console/templates/empty
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin_two/config/bootstrap.php b/lib/Cake/tests/test_app/plugins/TestPluginTwo/config/bootstrap.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin_two/config/bootstrap.php
rename to lib/Cake/tests/test_app/plugins/TestPluginTwo/config/bootstrap.php