diff --git a/cake/console/libs/tasks/controller.php b/cake/console/libs/tasks/controller.php
index 1784a40af..3a2d69509 100644
--- a/cake/console/libs/tasks/controller.php
+++ b/cake/console/libs/tasks/controller.php
@@ -469,7 +469,7 @@ class ControllerTask extends Shell {
 		$out .= "\n?>";
 
 		$path = CONTROLLER_TESTS;
-		$filename = $this->_pluralName($className).'_controller.test.php';
+		$filename = Inflector::underscore($className).'_controller.test.php';
 
 		$this->out("Baking unit test for $className...");
 		$Folder =& new Folder($path, true);
diff --git a/cake/console/libs/tasks/model.php b/cake/console/libs/tasks/model.php
index 294b2fda4..4617c77a8 100644
--- a/cake/console/libs/tasks/model.php
+++ b/cake/console/libs/tasks/model.php
@@ -588,7 +588,7 @@ class ModelTask extends Shell {
 		$out .= "\n?>";
 
 		$path = MODEL_TESTS;
-		$filename = $this->_singularName($className).'.test.php';
+		$filename = Inflector::underscore($className).'.test.php';
 
 		$this->out("Baking unit test for $className...");
 		$Folder =& new Folder($path, true);