Index: cart/cart.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ecommerce/cart/cart.module,v
retrieving revision 1.83
diff -u -r1.83 cart.module
--- cart/cart.module	7 Feb 2006 05:14:02 -0000	1.83
+++ cart/cart.module	2 Mar 2006 22:36:16 -0000
@@ -619,7 +619,7 @@
     ec_checkout_delete_data();
 
     if ($edit->gross > 0) {
-      $output = module_invoke($edit->payment_method, 'paymentapi', $edit, 'payment page');
+      $output = module_invoke($edit->payment_module, 'paymentapi', $edit, 'payment page');
     }
     else {
       drupal_set_message(t('Your order has been submitted.'));
Index: payment/payment.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ecommerce/payment/payment.module,v
retrieving revision 1.42
diff -u -r1.42 payment.module
--- payment/payment.module	18 Feb 2006 00:10:57 -0000	1.42
+++ payment/payment.module	2 Mar 2006 22:36:17 -0000
@@ -66,11 +66,13 @@
       return $form;
 
     case 'validate':
-      if ($txn->gross > 0 && $txn->payment_method == '') {
-        form_set_error('payment_method', t('Please choose a payment method.'));
+      if ($txn->gross > 0 && $txn->payment_module == '') {
+        form_set_error('payment_module', t('Please choose a payment method.'));
       }
       else {
-        module_invoke($txn->payment_method, 'paymentapi', $txn, 'on checkout');
+        // Setup legacy method store
+        $txn->payment_method = module_invoke($txn->payment_module, 'paymentapi', $txn, 'display name');
+        module_invoke($txn->payment_module, 'paymentapi', $txn, 'on checkout');
       }
       break;
 
@@ -80,8 +82,7 @@
 
     case 'review':
       $box['subject'] = t('Payment details');
-      //wrap the payment_method around the payment_get_modulename to invoke the name hook
-      $box['content'] = module_invoke(payment_get_modulename($txn->payment_method), 'paymentapi', $txn, 'display name');
+      $box['content'] = module_invoke($txn->payment_module, 'paymentapi', $txn, 'display name');
       return $box;
   }
 }
@@ -504,23 +505,23 @@
   foreach((array) payment_get_methods() as $name) {
     $method_value = module_invoke($name, 'paymentapi', $edit, 'display name');
     if ($method_value) {
-      $form['payment_types'][$method_value]['title'] = array(
+      $form['payment_types'][$name]['title'] = array(
         '#value' => '<h3>'. $method_value .'</h3>'
       );
-      $form['payment_types'][$method_value]['form'] = module_invoke($name, 'paymentapi', $edit, 'form');
-      $options[$method_value] = '';
+      $form['payment_types'][$name]['form'] = module_invoke($name, 'paymentapi', $edit, 'form');
+      $options[$name] = '';
     }
   }
 
   if (count($options) > 1) {
-    $form['payment_method'] = array(
+    $form['payment_module'] = array(
       '#type' => 'radios',
       '#options' => $options
       );
   }
   else {
     $payment_types = array_keys($options);
-    $form['payment_method'] = array(
+    $form['payment_module'] = array(
       '#type' => 'hidden',
       '#value' => $payment_types[0]
       );
@@ -528,7 +529,7 @@
   return $form;
 }
 
-function theme_payment_checkout_form($form) {
+function theme_payment_checkout_form(&$form) {
   $header = array(t('Payment method'), t('Choose one'));
   $single_method = false;
   if (count(element_children($form['payment_types'])) == 1) {
@@ -542,7 +543,7 @@
     $row[] = array('data' => form_render($form['payment_types'][$key]['title']) 
         . form_render($form['payment_types'][$key]['form']));
     if (!$single_method) {
-      $row[] = array('data' => form_render($form['payment_method'][$key]));
+      $row[] = array('data' => form_render($form['payment_module'][$key]));
     }
     $rows[] = $row;
   }
Index: paypal/paypal.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ecommerce/paypal/paypal.module,v
retrieving revision 1.28
diff -u -r1.28 paypal.module
--- paypal/paypal.module	26 Dec 2005 07:31:16 -0000	1.28
+++ paypal/paypal.module	2 Mar 2006 22:36:17 -0000
@@ -74,7 +74,7 @@
  * Implementation of hook_ec_transactionapi().
  */
 function paypal_ec_transactionapi(&$txn, $op, $a3 = NULL, $a4 = NULL) {
-  if ($txn->payment_method != 'paypal') return NULL;
+  if ($txn->payment_module != 'paypal') return NULL;
   switch ($op) {
     case 'load':
       $txn->payment = db_fetch_object(db_query("SELECT * FROM {ec_paypal} WHERE txnid = %d", $txn->txnid));
@@ -241,7 +241,8 @@
 
         $data['gross']          = $payment_amount;
         $data['fee']            = $fee;
-        $data['payment_method'] = 'paypal';
+        $data['payment_method'] = paypal_paymentapi($data, 'display name');
+        $data['payment_module'] = 'paypal';
         $data['payment_status'] = payment_get_status_id($payment_status);
         $data['ppid']           = $ppid;
 
Index: store/store.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ecommerce/store/store.inc,v
retrieving revision 1.28
diff -u -r1.28 store.inc
--- store/store.inc	18 Feb 2006 00:08:46 -0000	1.28
+++ store/store.inc	2 Mar 2006 22:36:18 -0000
@@ -230,10 +230,10 @@
     '#description' => $help,
     '#extra' => $attr,
   );
-  $form['overview']['payment_method'] = array(
+  $form['overview']['payment_module'] = array(
     '#type' => 'select',
     '#title' => t('Payment method'),
-    '#default_value' => payment_get_modulename($edit->payment_method),
+    '#default_value' => $edit->payment_module,
     '#options' => payment_get_methods(),
   );
   if ($edit) {