--- uc_addresses.module	2009-04-20 13:54:10.000000000 -0700
+++ uc_addressespatch.module	2009-11-29 14:10:24.000000000 -0800
@@ -1004,15 +1004,15 @@ function uc_addresses_get_address_form_s
  */
 function uc_addresses_address($items) {
   $address = uc_address_format(
-    $items->first_name,
-    $items->last_name,
-    $items->company,
-    $items->street1,
-    $items->street2,
-    $items->city,
-    $items->zone,
-    $items->postal_code,
-    $items->country
+    $items->delivery_first_name,
+    $items->delivery_last_name,
+    $items->delivery_company,
+    $items->delivery_street1,
+    $items->delivery_street2,
+    $items->delivery_city,
+    $items->delivery_zone,
+    $items->delivery_postal_code,
+    $items->delivery_country
     );
   return $address;
 }
@@ -1262,8 +1262,8 @@ function _uc_addresses_db_add_address($a
 
   // Add the address
 
-  db_query("INSERT INTO {uc_addresses} (aid, uid, first_name, last_name, "
-	   ."phone, company, street1, street2, city, zone, postal_code, country, "
+  db_query("INSERT INTO {uc_addresses} (aid, uid, delivery_first_name, delivery_last_name, "
+	   ."delivery_phone, delivery_company, delivery_street1, delivery_street2, delivery_city, delivery_zone, delivery_postal_code, delivery_country, "
 	   ."address_name, "
 	   ."created, modified) VALUES (%d, %d, "
 	   ."'%s', '%s', '%s', "
@@ -1332,16 +1332,16 @@ function _uc_addresses_db_update_address
   // We're set to go
 
   db_query("UPDATE {uc_addresses} SET "
-	   ."first_name = '%s', "
-	   ."last_name = '%s', "
-	   ."phone = '%s', "
-	   ."company = '%s', "
-	   ."street1 = '%s', "
-	   ."street2 = '%s', "
-	   ."city = '%s', "
-	   ."zone = %d, "
-	   ."postal_code = '%s', "
-	   ."country = %d, "
+	   ."delivery_first_name = '%s', "
+	   ."delivery_last_name = '%s', "
+	   ."delivery_phone = '%s', "
+	   ."delivery_company = '%s', "
+	   ."delivery_street1 = '%s', "
+	   ."delivery_street2 = '%s', "
+	   ."delivery_city = '%s', "
+	   ."delivery_zone = %d, "
+	   ."delivery_postal_code = '%s', "
+	   ."delivery_country = %d, "
 	   ."address_name = '%s', "
 	   ."modified = %d "
 	   ."WHERE aid = %d",
@@ -1385,16 +1385,16 @@ function _uc_addresses_db_check_address(
   $result =
     db_query("SELECT aid FROM {uc_addresses} WHERE "
 	     ."uid = %d AND "
-	     ."first_name = '%s' AND "
-	     ."last_name = '%s' AND "
-	     ."phone = '%s' AND "
-	     ."company = '%s' AND "
-	     ."street1 = '%s' AND "
-	     ."street2 = '%s' AND "
-	     ."city = '%s' AND "
-	     ."zone = '%s' AND "
-	     ."postal_code = '%s' AND "
-	     ."country = '%s'",
+	     ."delivery_first_name = '%s' AND "
+	     ."delivery_last_name = '%s' AND "
+	     ."delivery_phone = '%s' AND "
+	     ."delivery_company = '%s' AND "
+	     ."delivery_street1 = '%s' AND "
+	     ."delivery_street2 = '%s' AND "
+	     ."delivery_city = '%s' AND "
+	     ."delivery_zone = '%s' AND "
+	     ."delivery_postal_code = '%s' AND "
+	     ."delivery_country = '%s'",
 	     $address->uid,
 	     $address->first_name,
 	     $address->last_name,