diff -uN -r ubercart/shipping/uc_quote/uc_quote.install ubercart.fixed/shipping/uc_quote/uc_quote.install
--- ubercart/shipping/uc_quote/uc_quote.install	2008-09-09 06:42:44.932824941 +1200
+++ ubercart.fixed/shipping/uc_quote/uc_quote.install	2008-09-09 06:58:53.625364443 +1200
@@ -178,7 +178,7 @@
 
   $schema['uc_order_quotes'] = array(
     'fields' => array(
-      'oid' => array(
+      'u_oid' => array(
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
@@ -208,7 +208,7 @@
       ),
     ),
     'unique keys' => array(
-      'oid_quote_method' => array('oid', 'method'),
+      'oid_quote_method' => array('u_oid', 'method'),
     ),
   );
 
@@ -344,7 +344,7 @@
   $ret = array();
   switch ($GLOBALS['db_type']) {
     case 'pgsql':
-      db_change_column($ret, 'uc_order_quotes', 'oid', 'oid', 'int_unsigned', array('not null' => true, 'default' => 0));
+      db_change_column($ret, 'uc_order_quotes', 'u_oid', 'u_oid', 'int_unsigned', array('not null' => true, 'default' => 0));
     break;
   }
   return $ret;
diff -uN -r ubercart/shipping/uc_quote/uc_quote.module ubercart.fixed/shipping/uc_quote/uc_quote.module
--- ubercart/shipping/uc_quote/uc_quote.module	2008-09-09 06:42:44.932824941 +1200
+++ ubercart.fixed/shipping/uc_quote/uc_quote.module	2008-09-09 06:58:53.925383197 +1200
@@ -525,17 +525,17 @@
       unset($_SESSION['quote']);
     break;
     case 'save':
-      db_query("DELETE FROM {uc_order_quotes} WHERE oid = %d", $arg1->order_id);
-      db_query("INSERT INTO {uc_order_quotes} (oid, method, accessorials, rate, quote_form) VALUES (%d, '%s', '%s', %f, '%s')",
+      db_query("DELETE FROM {uc_order_quotes} WHERE u_oid = %d", $arg1->order_id);
+      db_query("INSERT INTO {uc_order_quotes} (u_oid, method, accessorials, rate, quote_form) VALUES (%d, '%s', '%s', %f, '%s')",
         $arg1->order_id, $arg1->quote['method'], $arg1->quote['accessorials'], $arg1->quote['rate'], $arg1->quote['quote_form']);
     break;
     case 'load':
-      $quote = db_fetch_array(db_query("SELECT method, accessorials, rate, quote_form FROM {uc_order_quotes} WHERE oid = %d", $arg1->order_id));
+      $quote = db_fetch_array(db_query("SELECT method, accessorials, rate, quote_form FROM {uc_order_quotes} WHERE u_oid = %d", $arg1->order_id));
       $arg1->quote = $quote;
       $arg1->quote['accessorials'] = strval($quote['accessorials']);
     break;
     case 'delete':
-      db_query("DELETE FROM {uc_order_quotes} WHERE oid = %d", $arg1->order_id);
+      db_query("DELETE FROM {uc_order_quotes} WHERE u_oid = %d", $arg1->order_id);
     break;
   }
 }