diff --git a/cake/libs/view/helpers/form.php b/cake/libs/view/helpers/form.php
index d82549d0f..6a451f917 100644
--- a/cake/libs/view/helpers/form.php
+++ b/cake/libs/view/helpers/form.php
@@ -200,7 +200,7 @@ class FormHelper extends Helper {
 		$htmlAttributes = $htmlOptions;
 		$htmlAttributes['size'] = $size;
 		$str = $this->Html->input($tagName, $htmlAttributes);
-		$strLabel = $this->labelTag($tagName, $prompt);
+		$strLabel = $this->label($tagName, $prompt);
 		$divClass = "optional";
 		if ($required) {
 			$divClass = "required";
@@ -228,7 +228,7 @@ class FormHelper extends Helper {
 		$htmlOptions['class'] = "inputCheckbox";
 		$htmlOptions['id'] = strtolower(str_replace('/', '_', $tagName));
 		$str = $this->Html->checkbox($tagName, null, $htmlOptions);
-		$strLabel = $this->labelTag($tagName, $prompt);
+		$strLabel = $this->label($tagName, $prompt);
 		$divClass = "optional";
 		if ($required) {
 			$divClass = "required";
@@ -257,7 +257,7 @@ class FormHelper extends Helper {
 	function generateDate($tagName, $prompt, $required = false, $errorMsg = null, $size = 20, $htmlOptions = null, $selected = null) {
 		$htmlOptions['id']=strtolower(str_replace('/', '_', $tagName));
 		$str = $this->Html->dateTimeOptionTag($tagName, 'MDY', 'NONE', $selected, $htmlOptions);
-		$strLabel = $this->labelTag($tagName, $prompt);
+		$strLabel = $this->label($tagName, $prompt);
 		$divClass = "optional";
 		if ($required) {
 			$divClass = "required";
@@ -288,7 +288,7 @@ class FormHelper extends Helper {
 	function generateDateTime($tagName, $prompt, $required = false, $errorMsg = null, $size = 20, $htmlOptions = null, $selected = null) {
 		$htmlOptions['id']=strtolower(str_replace('/', '_', $tagName));
 		$str = $this->Html->dateTimeOptionTag($tagName, 'MDY', '12', $selected, $htmlOptions);
-		$strLabel = $this->labelTag($tagName, $prompt);
+		$strLabel = $this->label($tagName, $prompt);
 		$divClass = "optional";
 		if ($required) {
 			$divClass = "required";
@@ -321,7 +321,7 @@ class FormHelper extends Helper {
 		$htmlAttributes['cols'] = $cols;
 		$htmlAttributes['rows'] = $rows;
 		$str = $this->Html->textarea($tagName, $htmlAttributes);
-		$strLabel = $this->labelTag($tagName, $prompt);
+		$strLabel = $this->label($tagName, $prompt);
 		$divClass = "optional";
 
 		if ($required) {
@@ -352,7 +352,7 @@ class FormHelper extends Helper {
 	function generateSelectDiv($tagName, $prompt, $options, $selected = null, $selectAttr = null, $optionAttr = null, $required = false, $errorMsg = null) {
 		$selectAttr['id'] = strtolower(str_replace('/', '_', $tagName));
 		$str = $this->Html->selectTag($tagName, $options, $selected, $selectAttr, $optionAttr);
-		$strLabel = $this->labelTag($tagName, $prompt);
+		$strLabel = $this->label($tagName, $prompt);
 		$divClass = "optional";
 
 		if ($required) {
diff --git a/cake/scripts/bake.php b/cake/scripts/bake.php
index a9bae9639..858994545 100644
--- a/cake/scripts/bake.php
+++ b/cake/scripts/bake.php
@@ -704,7 +704,7 @@ class Bake {
 				$relations = array_merge($objModel->hasMany, $objModel->hasAndBelongsToMany);
 
 				foreach($relations as $association => $relation) {
-					$model = $relation['className'];  
+					$model = $relation['className'];
 					$associationModel = new $model();
 					$count = 0;
 					$otherModelName = $inflect->singularize($model);
@@ -994,7 +994,7 @@ class Bake {
 			$actions .= "\t\t}\n";
 			$actions .= "\t}\n";
 			$actions .= "\n";
-			$actions .= "\tfunction view(\$id) {\n";  
+			$actions .= "\tfunction view(\$id) {\n";
 			$actions .= "\t\t\$this->set('{$this->lowCtrl}', \$this->{$controllerModel}->read(null, \$id));\n";
 			$actions .= "\t}\n";
 			$actions .= "\n";
@@ -1501,7 +1501,7 @@ class Bake {
 				}
 
 				switch( $field['type'] ) {
-					case "input" : 
+					case "input" :
 						if(!isset( $field['size'])) {
 							$field['size'] = 60;
 						}