=== modified file 'ca/ca.install'
--- ca/ca.install	2008-10-24 20:48:02 +0000
+++ ca/ca.install	2009-03-12 15:43:12 +0000
@@ -94,3 +94,22 @@
 function ca_uninstall() {
   drupal_uninstall_schema('ca');
 }
+
+function ca_update_6001() {
+  $ret = array();
+
+  $result = db_query("SELECT pid, conditions, actions FROM {ca_predicates}");
+  while ($predicate = db_fetch_array($result)) {
+    foreach (array('conditions', 'actions') as $section) {
+      $data = $predicate[$section];
+      $data = str_replace('s:5:"order";s:8:"uc_order";', 's:5:"order";s:5:"order";', $data);
+      $data = str_replace('s:4:"user";', 's:7:"account";', $data);
+      $predicate[$section] = $data;
+    }
+    db_query("UPDATE {ca_predicates} SET conditions = '%s', actions = '%s' WHERE pid = '%s'", $predicate['conditions'], $predicate['actions'], $predicate['pid']);
+  }
+
+  $ret[] = array('success' => TRUE, 'query' => 'Updated argument IDs in saved predicates.');
+
+  return $ret;
+}

=== modified file 'uc_roles/uc_roles.ca.inc'
--- uc_roles/uc_roles.ca.inc	2009-01-30 21:29:16 +0000
+++ uc_roles/uc_roles.ca.inc	2009-03-12 15:18:57 +0000
@@ -73,7 +73,7 @@
   );
 
   $user_args = array(
-    'user' => 'user',
+    'account' => 'account',
     'expiration' => 'expiration',
   );
 
@@ -213,7 +213,7 @@
     '#category' => t('Notification'),
     '#callback' => 'uc_roles_action_user_email',
     '#arguments' => array(
-      'user' => array(
+      'account' => array(
         '#entity' => 'user',
         '#title' => t('User'),
       ),
@@ -258,7 +258,7 @@
     '#title' => t('E-mail for revoked roles'),
     '#category' => t('Notification'),
     '#arguments' => array(
-      'user' => $account,
+      'account' => $account,
       'expiration' => $expiration,
     ),
   );
@@ -276,7 +276,7 @@
     '#title' => t('E-mail for role expiration reminders'),
     '#category' => t('Notification'),
     '#arguments' => array(
-      'user' => $account,
+      'account' => $account,
       'expiration' => $expiration,
     ),
   );

=== modified file 'uc_taxes/uc_taxes.ca.inc'
--- uc_taxes/uc_taxes.ca.inc	2009-03-08 04:51:08 +0000
+++ uc_taxes/uc_taxes.ca.inc	2009-03-12 15:18:53 +0000
@@ -36,7 +36,7 @@
     '#arguments' => array(
       'order' => array('#entity' => 'uc_order', '#title' => t('Order')),
       'tax' => array('#entity' => 'tax', '#title' => t('Tax rule')),
-      'user' => array('#entity' => 'user', '#title' => t('User account')),
+      'account' => array('#entity' => 'user', '#title' => t('User account')),
     ),
   );
 
@@ -99,7 +99,7 @@
           '#name' => 'uc_taxes_action_apply_tax_'. $rate->id,
           '#title' => t('Apply !name', array('!name' => $rate->name)),
           '#argument_map' => array(
-            'order' => 'uc_order',
+            'order' => 'order',
             'tax' => 'tax',
           ),
         ),