diff --git a/lib/Cake/Test/Case/Cache/Engine/FileEngineTest.php b/lib/Cake/Test/Case/Cache/Engine/FileEngineTest.php
index b59b3029ae9..6923d7f8a9e 100644
--- a/lib/Cake/Test/Case/Cache/Engine/FileEngineTest.php
+++ b/lib/Cake/Test/Case/Cache/Engine/FileEngineTest.php
@@ -107,11 +107,11 @@ public function testConsecutiveReadWrite() {
 		$result = Cache::read('rw', 'file_test');
 
 		Cache::write('rw', 'second write', 'file_test');
-		$result2 = Cache::read('rw', 'file_test');
+		$resultB = Cache::read('rw', 'file_test');
 
 		Cache::delete('rw', 'file_test');
 		$this->assertEquals('first write', $result);
-		$this->assertEquals('second write', $result2);
+		$this->assertEquals('second write', $resultB);
 	}
 
 /**
@@ -239,9 +239,9 @@ public function testClearWithPrefixes() {
 			'duration' => DAY
 		));
 
-		$data1 = $data2 = $expected = 'content to cache';
-		$FileOne->write('prefix_one_key_one', $data1, DAY);
-		$FileTwo->write('prefix_two_key_two', $data2, DAY);
+		$dataOne = $dataTwo = $expected = 'content to cache';
+		$FileOne->write('prefix_one_key_one', $dataOne, DAY);
+		$FileTwo->write('prefix_two_key_two', $dataTwo, DAY);
 
 		$this->assertEquals($expected, $FileOne->read('prefix_one_key_one'));
 		$this->assertEquals($expected, $FileTwo->read('prefix_two_key_two'));
diff --git a/lib/Cake/View/Helper/TextHelper.php b/lib/Cake/View/Helper/TextHelper.php
index d825fc5aac3..a9699d54c92 100644
--- a/lib/Cake/View/Helper/TextHelper.php
+++ b/lib/Cake/View/Helper/TextHelper.php
@@ -139,12 +139,12 @@ protected function _insertPlaceHolder($matches) {
  */
 	protected function _linkUrls($text, $htmlOptions) {
 		$replace = array();
-		foreach ($this->_placeholders as $md5 => $url) {
+		foreach ($this->_placeholders as $hash => $url) {
 			$link = $url;
 			if (!preg_match('#^[a-z]+\://#', $url)) {
 				$url = 'http://' . $url;
 			}
-			$replace[$md5] = $this->Html->link($link, $url, $htmlOptions);
+			$replace[$hash] = $this->Html->link($link, $url, $htmlOptions);
 		}
 		return strtr($text, $replace);
 	}
@@ -159,8 +159,8 @@ protected function _linkUrls($text, $htmlOptions) {
  */
 	protected function _linkEmails($text, $options) {
 		$replace = array();
-		foreach ($this->_placeholders as $md5 => $url) {
-			$replace[$md5] = $this->Html->link($url, 'mailto:' . $url, $options);
+		foreach ($this->_placeholders as $hash => $url) {
+			$replace[$hash] = $this->Html->link($url, 'mailto:' . $url, $options);
 		}
 		return strtr($text, $replace);
 	}