Index: openacs-4/packages/ecommerce/tcl/ecommerce-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/tcl/ecommerce-procs.tcl	18 Jul 2001 18:19:01 -0000	1.3
+++ openacs-4/packages/ecommerce/tcl/ecommerce-procs.tcl	22 Oct 2001 06:34:04 -0000	1.4
@@ -1513,13 +1513,13 @@
 
 ad_proc ec_state_name_from_usps_abbrev {usps_abbrev} "Takes a USPS abbrevation and returns the full state name, e.g., MA in yields Massachusetts out" {
     return [db_string state_name_from_usps_abbrev {
-	select state_name from states where usps_abbrev =:usps_abbrev
+	select state_name from us_states where abbrev =:usps_abbrev
     } -default ""]
 }
 
 ad_proc ec_country_name_from_country_code {country_code} {Returns "United States" from an argument of $db and "us"} {
     return [db_string country_name_from_country_code {
-	select country_name from country_codes where iso=:country_code
+	select name from country_names where iso=:country_code
     } -default ""]    
 }
 
Index: openacs-4/packages/ecommerce/tcl/ecommerce-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-procs.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/tcl/ecommerce-procs.xql	18 Jul 2001 23:46:14 -0000	1.3
+++ openacs-4/packages/ecommerce/tcl/ecommerce-procs.xql	22 Oct 2001 06:34:04 -0000	1.4
@@ -396,7 +396,7 @@
 <fullquery name="ec_state_name_from_usps_abbrev.state_name_from_usps_abbrev">      
       <querytext>
       
-	select state_name from states where usps_abbrev =:usps_abbrev
+	select state_name from us_states where abbrev =:usps_abbrev
     
       </querytext>
 </fullquery>
@@ -405,7 +405,7 @@
 <fullquery name="ec_country_name_from_country_code.country_name_from_country_code">      
       <querytext>
       
-	select country_name from country_codes where iso=:country_code
+	select name from country_names where iso=:country_code
     
       </querytext>
 </fullquery>
Index: openacs-4/packages/ecommerce/tcl/ecommerce-widgets-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-widgets-procs.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/ecommerce/tcl/ecommerce-widgets-procs.tcl	25 Aug 2001 04:58:07 -0000	1.5
+++ openacs-4/packages/ecommerce/tcl/ecommerce-widgets-procs.tcl	22 Oct 2001 06:34:04 -0000	1.6
@@ -175,13 +175,13 @@
 ad_proc ec_multiple_state_widget { {default_list ""} {select_name "usps_abbrev"}} "Returns a state multiple selection box of size 5" {
 
     set widget_value "<select multiple name=\"$select_name\" size=5>\n"
-    set sql "select * from states order by state_name"
+    set sql "select * from us_states order by state_name"
     db_foreach get_all_states $sql {
         
         if { [lsearch $default_list $usps_abbrev] != -1 } {
-            append widget_value "<option value=\"$usps_abbrev\" SELECTED>$state_name</option>\n" 
+            append widget_value "<option value=\"$abbrev\" SELECTED>$state_name</option>\n" 
         } else {            
-            append widget_value "<option value=\"$usps_abbrev\">$state_name</option>\n"
+            append widget_value "<option value=\"$abbrev\">$state_name</option>\n"
         }
     }
     append widget_value "</select>\n"
@@ -486,13 +486,13 @@
     if { $default == "" } {
         append widget_value "<option value=\"\" SELECTED>Choose a Country</option>\n"
     }
-    set sql "select country_name, iso from country_codes order by country_name"
+    set sql "select name, iso from country_names order by name"
      db_foreach get_countries $sql {
         
         if { $default == $iso } {
-            append widget_value "<option value=\"$iso\" SELECTED>$country_name</option>\n" 
+            append widget_value "<option value=\"$iso\" SELECTED>$name</option>\n" 
         } else {            
-            append widget_value "<option value=\"$iso\">$country_name</option>\n"
+            append widget_value "<option value=\"$iso\">$name</option>\n"
         }
     }
     append widget_value "</select>\n"