diff --git a/lib/Cake/Console/Command/UpgradeShell.php b/lib/Cake/Console/Command/UpgradeShell.php
index e52a521a8c3..aeafef514b6 100644
--- a/lib/Cake/Console/Command/UpgradeShell.php
+++ b/lib/Cake/Console/Command/UpgradeShell.php
@@ -374,8 +374,8 @@ protected function _processFixture($content) {
 			if (isset($data['indexes'])) {
 				foreach ($data['indexes'] as $index => $indexProps) {
 					if (isset($indexProps['column'])) {
-						$indexProps['columns'] = $indexProp['column'];
-						unset($indexProp['column']);
+						$indexProps['columns'] = $indexProps['column'];
+						unset($indexProps['column']);
 					}
 					// Move unique indexes over
 					if (!empty($indexProps['unique'])) {
@@ -383,11 +383,11 @@ protected function _processFixture($content) {
 						$constraints[$index] = ['type' => 'unique'] + $indexProps;
 						continue;
 					}
-					$out['indexes'][$index] = $indexProps;
+					$out['_indexes'][$index] = $indexProps;
 				}
 			}
 			if (count($constraints)) {
-				$out['constraints'] = $constraints;
+				$out['_constraints'] = $constraints;
 			}
 			return $matches[1] . "\n\t\t" . implode(",\n\t\t", $export($out)) . "\n\t" . $matches[3];
 		};