diff --git a/adminer/dump.inc.php b/adminer/dump.inc.php
index f62a3d76..c10b84b5 100644
--- a/adminer/dump.inc.php
+++ b/adminer/dump.inc.php
@@ -65,28 +65,28 @@ SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO';
 			
 			if ($_POST["table_style"] || $_POST["data_style"]) {
 				$views = array();
-				foreach (table_status() as $row) {
-					$table = (DB == "" || in_array($row["Name"], (array) $_POST["tables"]));
-					$data = (DB == "" || in_array($row["Name"], (array) $_POST["data"]));
+				foreach (table_status() as $table_status) {
+					$table = (DB == "" || in_array($table_status["Name"], (array) $_POST["tables"]));
+					$data = (DB == "" || in_array($table_status["Name"], (array) $_POST["data"]));
 					if ($table || $data) {
-						if (!is_view($row)) {
+						if (!is_view($table_status)) {
 							if ($ext == "tar") {
 								ob_start();
 							}
-							$adminer->dumpTable($row["Name"], ($table ? $_POST["table_style"] : ""));
+							$adminer->dumpTable($table_status["Name"], ($table ? $_POST["table_style"] : ""));
 							if ($data) {
-								$adminer->dumpData($row["Name"], $_POST["data_style"], "SELECT * FROM " . table($row["Name"]));
+								$adminer->dumpData($table_status["Name"], $_POST["data_style"], "SELECT * FROM " . table($table_status["Name"]));
 							}
-							if ($is_sql && $_POST["triggers"] && $table && ($triggers = trigger_sql($row["Name"], $_POST["table_style"]))) {
+							if ($is_sql && $_POST["triggers"] && $table && ($triggers = trigger_sql($table_status["Name"], $_POST["table_style"]))) {
 								echo "\nDELIMITER ;;\n$triggers\nDELIMITER ;\n";
 							}
 							if ($ext == "tar") {
-								echo tar_file((DB != "" ? "" : "$db/") . "$row[Name].csv", ob_get_clean());
+								echo tar_file((DB != "" ? "" : "$db/") . "$table_status[Name].csv", ob_get_clean());
 							} elseif ($is_sql) {
 								echo "\n";
 							}
 						} elseif ($is_sql) {
-							$views[] = $row["Name"];
+							$views[] = $table_status["Name"];
 						}
 					}
 				}
@@ -193,15 +193,15 @@ if (DB != "") {
 	echo "</thead>\n";
 	$views = "";
 	//! defer number of rows to JavaScript
-	foreach (table_status() as $row) {
-		$name = $row["Name"];
+	foreach (table_status() as $table_status) {
+		$name = $table_status["Name"];
 		$prefix = ereg_replace("_.*", "", $name);
 		$checked = ($TABLE == "" || $TABLE == (substr($TABLE, -1) == "%" ? "$prefix%" : $name)); //! % may be part of table name
 		$print = "<tr><td>" . checkbox("tables[]", $name, $checked, $name, "formUncheck('check-tables');");
-		if (is_view($row)) {
+		if (is_view($table_status)) {
 			$views .= "$print\n";
 		} else {
-			echo "$print<td align='right'><label>" . ($row["Engine"] == "InnoDB" && $row["Rows"] ? "~ " : "") . $row["Rows"] . checkbox("data[]", $name, $checked, "", "formUncheck('check-data');") . "</label>\n";
+			echo "$print<td align='right'><label>" . ($table_status["Engine"] == "InnoDB" && $table_status["Rows"] ? "~ " : "") . $table_status["Rows"] . checkbox("data[]", $name, $checked, "", "formUncheck('check-data');") . "</label>\n";
 		}
 		$prefixes[$prefix]++;
 	}
diff --git a/adminer/schema.inc.php b/adminer/schema.inc.php
index 61e96faa..d6f02873 100644
--- a/adminer/schema.inc.php
+++ b/adminer/schema.inc.php
@@ -16,23 +16,23 @@ $base_left = -1;
 $schema = array(); // table => array("fields" => array(name => field), "pos" => array(top, left), "references" => array(table => array(left => array(source, target))))
 $referenced = array(); // target_table => array(table => array(left => target_column))
 $lefts = array(); // float => bool
-foreach (table_status() as $row) {
-	if (!isset($row["Engine"])) { // view
+foreach (table_status() as $table_status) {
+	if (!isset($table_status["Engine"])) { // view
 		continue;
 	}
 	$pos = 0;
-	$schema[$row["Name"]]["fields"] = array();
-	foreach (fields($row["Name"]) as $name => $field) {
+	$schema[$table_status["Name"]]["fields"] = array();
+	foreach (fields($table_status["Name"]) as $name => $field) {
 		$pos += 1.25;
 		$field["pos"] = $pos;
-		$schema[$row["Name"]]["fields"][$name] = $field;
+		$schema[$table_status["Name"]]["fields"][$name] = $field;
 	}
-	$schema[$row["Name"]]["pos"] = ($table_pos[$row["Name"]] ? $table_pos[$row["Name"]] : array($top, 0));
-	foreach ($adminer->foreignKeys($row["Name"]) as $val) {
+	$schema[$table_status["Name"]]["pos"] = ($table_pos[$table_status["Name"]] ? $table_pos[$table_status["Name"]] : array($top, 0));
+	foreach ($adminer->foreignKeys($table_status["Name"]) as $val) {
 		if (!$val["db"]) {
 			$left = $base_left;
-			if ($table_pos[$row["Name"]][1] || $table_pos[$val["table"]][1]) {
-				$left = min(floatval($table_pos[$row["Name"]][1]), floatval($table_pos[$val["table"]][1])) - 1;
+			if ($table_pos[$table_status["Name"]][1] || $table_pos[$val["table"]][1]) {
+				$left = min(floatval($table_pos[$table_status["Name"]][1]), floatval($table_pos[$val["table"]][1])) - 1;
 			} else {
 				$base_left -= .1;
 			}
@@ -40,12 +40,12 @@ foreach (table_status() as $row) {
 				// find free $left
 				$left -= .0001;
 			}
-			$schema[$row["Name"]]["references"][$val["table"]][(string) $left] = array($val["source"], $val["target"]);
-			$referenced[$val["table"]][$row["Name"]][(string) $left] = $val["target"];
+			$schema[$table_status["Name"]]["references"][$val["table"]][(string) $left] = array($val["source"], $val["target"]);
+			$referenced[$val["table"]][$table_status["Name"]][(string) $left] = $val["target"];
 			$lefts[(string) $left] = true;
 		}
 	}
-	$top = max($top, $schema[$row["Name"]]["pos"][0] + 2.5 + $pos);
+	$top = max($top, $schema[$table_status["Name"]]["pos"][0] + 2.5 + $pos);
 }
 
 ?>