diff --git a/build-base.php b/build-base.php
index d00a62e0c1..4e0609ff07 100644
--- a/build-base.php
+++ b/build-base.php
@@ -14,24 +14,24 @@ if ($sql_fh === false) {
     exit(1);
 }
 
-$connection = mysqli_connect($config['db_host'], $config['db_user'], $config['db_pass']);
-if ($connection === false) {
-    echo 'ERROR: Cannot connect to database: '.mysqli_error($connection)."\n";
+$database_link = mysqli_connect($config['db_host'], $config['db_user'], $config['db_pass']);
+if ($database_link === false) {
+    echo 'ERROR: Cannot connect to database: '.mysqli_error($database_link)."\n";
     exit(1);
 }
 
-$select = mysqli_select_db($connection, $config['db_name']);
+$select = mysqli_select_db($database_link, $config['db_name']);
 if ($select === false) {
-    echo 'ERROR: Cannot select database: '.mysqli_error($connection)."\n";
+    echo 'ERROR: Cannot select database: '.mysqli_error($database_link)."\n";
     exit(1);
 }
 
 while (!feof($sql_fh)) {
     $line = fgetss($sql_fh);
     if (!empty($line)) {
-        $creation = mysqli_query($connection, $line);
+        $creation = mysqli_query($database_link, $line);
         if (!$creation) {
-            echo 'WARNING: Cannot execute query ('.$line.'): '.mysqli_error($connection)."\n";
+            echo 'WARNING: Cannot execute query ('.$line.'): '.mysqli_error($database_link)."\n";
         }
     }
 }
diff --git a/includes/sql-schema/update.php b/includes/sql-schema/update.php
index 46a49a8261..6497d1ca55 100644
--- a/includes/sql-schema/update.php
+++ b/includes/sql-schema/update.php
@@ -109,7 +109,7 @@ foreach ($filelist as $file) {
 
                     if ($line[0] != '#') {
                         if ($config['db']['extension'] == 'mysqli') {
-                            $update = mysqli_query($connection, $line);
+                            $update = mysqli_query($database_link, $line);
                         }
                         else {
                             $update = mysql_query($line);
@@ -118,7 +118,7 @@ foreach ($filelist as $file) {
                             $err++;
                             if ($debug) {
                                 if ($config['db']['extension'] == 'mysqli') {
-                                    echo mysqli_error($connection)."\n";
+                                    echo mysqli_error($database_link)."\n";
                                 }
                                 else {                           
                                     echo mysql_error()."\n";