diff --git a/ChangeLog b/ChangeLog
index 8c7ee54cf..7a63a2ba6 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,8 @@ $Source$
     * libraries/config.default.php, libraries/display_export.lib.php,
       libraries/export/*: Convert export to plugin architecture, so that
       plugins are independant piece of code (RFE #1325937).
+    * db_operations.php, tbl_properties_operations.php,
+      libraries/Table.class.php: Adapt to changes in export.
 
 2006-04-26 Sebastian Mendel <cybot_tm@users.sourceforge.net>
     * themes/*:
diff --git a/db_operations.php b/db_operations.php
index 30168deec..04c373281 100644
--- a/db_operations.php
+++ b/db_operations.php
@@ -264,7 +264,7 @@ if (!$is_information_schema) {
             id="checkbox_auto_increment" style="vertical-align: middle" />
         <label for="checkbox_auto_increment">
             <?php echo $strAddAutoIncrement; ?></label><br />
-        <input type="checkbox" name="constraints" value="1"
+        <input type="checkbox" name="sql_constraints" value="1"
             id="checkbox_constraints" style="vertical-align: middle" />
         <label for="checkbox_constraints">
             <?php echo $strAddConstraints; ?></label><br />
diff --git a/libraries/Table.class.php b/libraries/Table.class.php
index 686db7221..6ef013c40 100644
--- a/libraries/Table.class.php
+++ b/libraries/Table.class.php
@@ -512,7 +512,7 @@ class PMA_Table {
         }
 
         // set export settings we need
-        $GLOBALS['use_backquotes'] = 1;
+        $GLOBALS['sql_use_backquotes'] = 1;
         $GLOBALS['asfile']         = 1;
 
         // Ensure the target is valid
diff --git a/tbl_properties_operations.php b/tbl_properties_operations.php
index 325f30b00..4b59dfd0b 100644
--- a/tbl_properties_operations.php
+++ b/tbl_properties_operations.php
@@ -364,7 +364,7 @@ foreach ($dblist as $each_db) {
         // foreign keys
         if (PMA_getForeigners($GLOBALS['db'], $GLOBALS['table'], '', 'innodb')) {
         ?>
-    <input type="checkbox" name="constraints" value="1" id="checkbox_constraints" />
+    <input type="checkbox" name="sql_constraints" value="1" id="checkbox_constraints" />
     <label for="checkbox_constraints"><?php echo $strAddConstraints; ?></label><br />
         <?php
         } // endif