diff --git a/cake/libs/folder.php b/cake/libs/folder.php
index 886fe9574..c122bacac 100644
--- a/cake/libs/folder.php
+++ b/cake/libs/folder.php
@@ -627,7 +627,7 @@ class Folder extends Object {
 		}
 
 		if (!is_dir($toDir)) {
-			$this->mkdir($toDir, $mode);
+			$this->create($toDir, $mode);
 		}
 
 		if (!is_writable($toDir)) {
diff --git a/cake/tests/cases/libs/folder.test.php b/cake/tests/cases/libs/folder.test.php
index c38691afb..8d0837e10 100644
--- a/cake/tests/cases/libs/folder.test.php
+++ b/cake/tests/cases/libs/folder.test.php
@@ -110,7 +110,7 @@ class FolderTest extends CakeTestCase {
 		$this->assertTrue($result);
 
 		$copy = TMP . 'test_folder_copy';
-		$result = $Folder->cp($copy);
+		$result = $Folder->copy($copy);
 		$this->assertTrue($result);
 
 		$copy = TMP . 'test_folder_copy';
@@ -125,7 +125,7 @@ class FolderTest extends CakeTestCase {
 		$this->assertTrue($result);
 
 		$mv = TMP . 'test_folder_mv_2';
-		$result = $Folder->mv($mv);
+		$result = $Folder->move($mv);
 		$this->assertTrue($result);
 
 		$result = $Folder->delete($new);
@@ -134,7 +134,7 @@ class FolderTest extends CakeTestCase {
 		$result = $Folder->delete($mv);
 		$this->assertTrue($result);
 
-		$result = $Folder->rm($mv);
+		$result = $Folder->delete($mv);
 		$this->assertTrue($result);
 
 		$new = APP . 'index.php';
@@ -452,7 +452,7 @@ class FolderTest extends CakeTestCase {
 
 		$Folder->cd(TMP);
 		$file = new File($Folder->pwd() . DS . 'paths.php', true);
-		$Folder->mkdir($Folder->pwd() . DS . 'testme');
+		$Folder->create($Folder->pwd() . DS . 'testme');
 		$Folder->cd('testme');
 		$result = $Folder->find('paths\.php');
 		$expected = array();
@@ -493,7 +493,7 @@ class FolderTest extends CakeTestCase {
 		$this->assertIdentical($result, $expected);
 
 		$Folder->cd(TMP);
-		$Folder->mkdir($Folder->pwd() . DS . 'testme');
+		$Folder->create($Folder->pwd() . DS . 'testme');
 		$Folder->cd('testme');
 		$File =& new File($Folder->pwd() . DS . 'paths.php');
 		$File->create();