=== modified file 'uc_attribute/uc_attribute.admin.inc'
--- uc_attribute/uc_attribute.admin.inc	2008-12-26 18:11:58 +0000
+++ uc_attribute/uc_attribute.admin.inc	2008-12-26 19:17:45 +0000
@@ -515,7 +515,7 @@
     $form['add'] = array(
       '#type' => 'submit',
       '#value' => t('Add attributes'),
-      '#suffix' => l(t('Cancel'), $type == 'product' ? 'node/'. $id .'/edit/attributes' : 'admin/store/products/classes/'. $class->pcid .'/attributes'),
+      '#suffix' => l(t('Cancel'), $type == 'product' ? 'node/'. $id .'/edit/uc-attributes' : 'admin/store/products/classes/'. $class->pcid .'/attributes'),
       '#weight' => 0,
     );
   }
@@ -644,7 +644,7 @@
   }
 
   if ($form_state['values']['type'] == 'product') {
-    $form_state['redirect'] = 'node/'. $form_state['values']['id'] .'/edit/attributes';
+    $form_state['redirect'] = 'node/'. $form_state['values']['id'] .'/edit/uc-attributes';
   }
   else {
     $form_state['redirect'] = 'admin/store/products/classes/'. $form_state['values']['id'] .'/attributes';

=== modified file 'uc_attribute/uc_attribute.module'
--- uc_attribute/uc_attribute.module	2008-12-17 22:37:57 +0000
+++ uc_attribute/uc_attribute.module	2008-12-26 19:19:23 +0000
@@ -23,23 +23,23 @@
 function uc_attribute_help($path, $arg) {
   switch ($path) {
     // Help messages for the attributes overview on products and classes.
-    case 'node/%/edit/attributes':
-      return t('Add attributes to this product using the <a href="!url">add attributes form</a>. You may then adjust the settings for these attributes on this page and go on to configure their options in the <em>Options</em> tab.', array('!url' => url('node/'. $arg[1] .'/edit/attributes/add')));
+    case 'node/%/edit/uc-attributes':
+      return t('Add attributes to this product using the <a href="!url">add attributes form</a>. You may then adjust the settings for these attributes on this page and go on to configure their options in the <em>Options</em> tab.', array('!url' => url('node/'. $arg[1] .'/edit/uc-attributes/add')));
     case 'admin/store/products/classes/%/attributes':
       return t('Add attributes to the product class using the <a href="!url">add attributes form</a>. You may then adjust the settings for these attributes on this page and go on to configure their options in the <em>Options</em> tab.', array('!url' => url('admin/store/products/classes/'. $arg[4] .'/attributes/add')));
 
     // Help message for adding an attribute to a product or class.
-    case 'node/%/edit/attributes/add':
+    case 'node/%/edit/uc-attributes/add':
     case 'admin/store/products/classes/%/attributes/add':
       return t('Select the attributes you want to add and submit the form.');
 
     // Help message for adjusting the options on a product or class.
-    case 'node/%/edit/options':
+    case 'node/%/edit/uc-options':
     case 'admin/store/products/classes/%/options':
       return t('Use the checkboxes to enable options for attributes and the radio buttons to specify defaults for the enabled options. Use the other fields to override the default settings for each option. Attributes with no enabled options will be displayed as text fields.');
 
     // Help message for the product Adjustments tab.
-    case 'node/%/edit/adjustments':
+    case 'node/%/edit/uc-adjustments':
       return t('Enter an alternate SKU to be used when the specified set of options are chosen and the product is added to the cart. <b>Warning:</b> Adding or removing attributes from this product will reset all the SKUs on this page to the default product SKU.');
   }
 }
@@ -156,7 +156,7 @@
   );
 
   // Insert subitems into the edit node page for product types.
-  $items['node/%node/edit/attributes'] = array(
+  $items['node/%node/edit/uc-attributes'] = array(
     'title' => 'Attributes',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('uc_object_attributes_form', 1, 'product', 'overview'),
@@ -166,7 +166,7 @@
     'weight' => 1,
     'file' => 'uc_attribute.admin.inc',
   );
-  $items['node/%node/edit/attributes/add'] = array(
+  $items['node/%node/edit/uc-attributes/add'] = array(
     'title' => 'Attributes',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('uc_object_attributes_form', 1, 'product', 'add'),
@@ -176,7 +176,7 @@
     'weight' => 1,
     'file' => 'uc_attribute.admin.inc',
   );
-  $items['node/%node/edit/options'] = array(
+  $items['node/%node/edit/uc-options'] = array(
     'title' => 'Options',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('uc_object_options_form', 1, 'product'),
@@ -186,7 +186,7 @@
     'weight' => 2,
     'file' => 'uc_attribute.admin.inc',
   );
-  $items['node/%node/edit/adjustments'] = array(
+  $items['node/%node/edit/uc-adjustments'] = array(
     'title' => 'Adjustments',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('uc_product_adjustments_form', 1),

=== modified file 'uc_file/uc_file.module'
--- uc_file/uc_file.module	2008-12-17 22:50:25 +0000
+++ uc_file/uc_file.module	2008-12-26 19:20:55 +0000
@@ -66,7 +66,7 @@
     'type' => MENU_NORMAL_ITEM,
     'file' => 'uc_file.admin.inc',
   );
-  $items['user/%user/files'] = array(
+  $items['user/%user/uc-files'] = array(
     'title' => 'Files',
     'description' => 'View your purchased files.',
     'page callback' => 'uc_file_user_downloads',
@@ -380,7 +380,7 @@
 
           'user_items' => array(
             '#type' => 'user_profile_item',
-            '#value' => l(t('Click here to view your file downloads.'), 'user/'. $account->uid .'/files'),
+            '#value' => l(t('Click here to view your file downloads.'), 'user/'. $account->uid .'/uc-files'),
           ),
       );
 

=== modified file 'uc_file/uc_file.pages.inc'
--- uc_file/uc_file.pages.inc	2008-11-10 20:57:25 +0000
+++ uc_file/uc_file.pages.inc	2008-12-26 19:21:04 +0000
@@ -353,7 +353,7 @@
   }
   // Redirect users back to their file page.
   else {
-    drupal_goto('user/'. $uid .'/files');
+    drupal_goto('user/'. $uid .'/uc-files');
   }
 }
 

=== modified file 'uc_order/uc_order.admin.inc'
--- uc_order/uc_order.admin.inc	2008-12-19 20:38:19 +0000
+++ uc_order/uc_order.admin.inc	2008-12-26 19:21:47 +0000
@@ -962,7 +962,7 @@
 function uc_order_view($order, $view = 'view') {
   if ($view == 'customer') {
     $breadcrumb = drupal_get_breadcrumb();
-    $breadcrumb[2] = l(t('Order history'), 'user/'. arg(1) .'/orders');
+    $breadcrumb[2] = l(t('Order history'), 'user/'. arg(1) .'/uc-orders');
     drupal_set_breadcrumb($breadcrumb);
   }
 

=== modified file 'uc_order/uc_order.module'
--- uc_order/uc_order.module	2008-12-15 20:48:04 +0000
+++ uc_order/uc_order.module	2008-12-26 19:22:20 +0000
@@ -147,7 +147,7 @@
     'type' => MENU_CALLBACK,
     'file' => 'uc_order.admin.inc',
   );
-  $items['user/%user/orders'] = array(
+  $items['user/%user/uc-orders'] = array(
     'title' => 'Orders',
     'description' => 'View your order history.',
     'page callback' => 'uc_order_history',
@@ -468,7 +468,7 @@
           '#title' => t('Orders'),
           'link' => array(
             '#type' => 'user_profile_item',
-            '#value' => l(t('Click here to view your order history.'), 'user/'. $account->uid .'/orders'),
+            '#value' => l(t('Click here to view your order history.'), 'user/'. $account->uid .'/uc-orders'),
           ),
         );
       }

=== modified file 'uc_product/uc_product.admin.inc'
--- uc_product/uc_product.admin.inc	2008-12-23 15:43:36 +0000
+++ uc_product/uc_product.admin.inc	2008-12-26 19:25:54 +0000
@@ -377,18 +377,18 @@
           db_query("DELETE FROM {uc_product_features} WHERE pfid = %d", intval(arg(5)));
 
           drupal_set_message(t('The product feature has been deleted.'));
-          drupal_goto('node/'. arg(1) .'/edit/features');
+          drupal_goto('node/'. arg(1) .'/edit/uc-features');
         }
 
         // Show the confirmation form for deleting this feature.
         $question = $node->title;
         $description = t('Are you sure you wish to delete this %feature?', array('%feature' => uc_product_feature_data($feature['fid'], 'title')))
                       .'<div><b>'. t('Description') .':</b><br />'. $feature['description'] .'</div><br />';
-        return drupal_get_form('confirm_form', $question, 'node/'. arg(1) .'/edit/features', $description, t('Delete'), t('Cancel'), 'pf_delete');
+        return drupal_get_form('confirm_form', $question, 'node/'. arg(1) .'/edit/uc-features', $description, t('Delete'), t('Cancel'), 'pf_delete');
       }
       else {
         drupal_set_message(t("That product feature doesn't exist."), 'error');
-        drupal_goto('node/'. arg(1) .'/edit/features');
+        drupal_goto('node/'. arg(1) .'/edit/uc-features');
       }
     }
 
@@ -407,12 +407,12 @@
     }
     else {
       drupal_set_message(t('Error: Attempted to add a non-existent product feature type.'), 'error');
-      drupal_goto('node/'. $node->nid .'/edit/features');
+      drupal_goto('node/'. $node->nid .'/edit/uc-features');
     }
 
     if (empty($output)) {
       drupal_set_message(t('Error: No form data was returned for that operation.'), 'error');
-      drupal_goto('node/'. $node->nid .'/edit/features');
+      drupal_goto('node/'. $node->nid .'/edit/uc-features');
     }
 
     return $output;
@@ -423,8 +423,8 @@
   $result = db_query("SELECT * FROM {uc_product_features} WHERE nid = %d ORDER BY pfid ASC", $node->nid);
   while ($feature = db_fetch_object($result)) {
     $operations = array(
-      l(t('edit'), 'node/'. $node->nid .'/edit/features/'. $feature->fid .'/'. $feature->pfid),
-      l(t('delete'), 'node/'. $node->nid .'/edit/features/'. $feature->fid .'/'. $feature->pfid .'/delete'),
+      l(t('edit'), 'node/'. $node->nid .'/edit/uc-features/'. $feature->fid .'/'. $feature->pfid),
+      l(t('delete'), 'node/'. $node->nid .'/edit/uc-features/'. $feature->fid .'/'. $feature->pfid .'/delete'),
     );
     $rows[] = array(
       'data' => array(
@@ -486,7 +486,7 @@
  * Submit handler for uc_product_feature_add_form_submit.
  */
 function uc_product_feature_add_form_submit($form, &$form_state) {
-  $form_state['redirect'] = 'node/'. arg(1) .'/edit/features/'. $form_state['values']['feature'] .'/add';
+  $form_state['redirect'] = 'node/'. arg(1) .'/edit/uc-features/'. $form_state['values']['feature'] .'/add';
 }
 
 /**

=== modified file 'uc_product/uc_product.module'
--- uc_product/uc_product.module	2008-12-23 15:43:36 +0000
+++ uc_product/uc_product.module	2008-12-26 19:26:14 +0000
@@ -114,7 +114,7 @@
   );
   $features = module_invoke_all('product_feature');
   if (!empty($features)) {
-    $items['node/%node/edit/features'] = array(
+    $items['node/%node/edit/uc-features'] = array(
       'title' => 'Features',
       'page callback' => 'uc_product_features',
       'page arguments' => array(1),
@@ -226,7 +226,7 @@
 }
 
 /**
- * Menu access callback for 'node/%node/edit/features'.
+ * Menu access callback for 'node/%node/edit/uc-features'.
  */
 function uc_product_feature_access($node) {
   return uc_product_is_product($node) && user_access('administer product features');
@@ -1677,7 +1677,7 @@
     '#value' => t('Save feature'),
   );
   $form['cancel'] = array(
-    '#value' => l(t('Cancel'), 'node/'. intval(arg(1)) .'/edit/features'),
+    '#value' => l(t('Cancel'), 'node/'. intval(arg(1)) .'/edit/uc-features'),
   );
 
   return $form;
@@ -1716,7 +1716,7 @@
     drupal_set_message(t('The product feature has been updated.'));
   }
 
-  return 'node/'. $data['nid'] .'/edit/features';
+  return 'node/'. $data['nid'] .'/edit/uc-features';
 }
 
 function uc_product_add_default_image_field($type = NULL) {

=== modified file 'uc_roles/uc_roles.admin.inc'
--- uc_roles/uc_roles.admin.inc	2008-12-19 20:57:55 +0000
+++ uc_roles/uc_roles.admin.inc	2008-12-26 19:27:42 +0000
@@ -36,7 +36,7 @@
     $form['name'][$row->uid .' '. $row->rid] = array('#value' => theme('username', $row));
     $form['role'][$row->uid .' '. $row->rid] = array('#value' => _uc_roles_get_name($row->rid));
     $form['expiration'][$row->uid .' '. $row->rid] = array('#value' => format_date($row->expiration, 'small'));
-    $form['operations'][$row->uid .' '. $row->rid] = array('#value' => l(t('delete'), 'admin/user/user/expiration/delete/'. $row->uid .'/'. $row->rid) .' '. l(t('edit'), 'user/'. $row->uid .'/edit', array('fragment' => 'role-expiration-'. $row->rid, 'query' => 'destination=admin%2Fuser%2Fuser%2Fexpiration')));
+    $form['operations'][$row->uid .' '. $row->rid] = array('#value' => l(t('delete'), 'admin/user/user/uc-roles-expiration/delete/'. $row->uid .'/'. $row->rid) .' '. l(t('edit'), 'user/'. $row->uid .'/edit', array('fragment' => 'role-expiration-'. $row->rid, 'query' => 'destination=admin/user/user/uc-roles-expiration')));
   }
 
   return $form;
@@ -88,7 +88,7 @@
 
     $form = confirm_form(
       $form, t('Delete expiration of %role_name role for the user %user_name?', array('%user_name' => $account->name, '%role_name' => $role_name)),
-      'admin/user/user/expiration',
+      'admin/user/user/uc-roles-expiration',
       t('Deleting the expiration will give %user_name privileges set by the %role_name role indefinitely unless manually removed.', array('%user_name' => $account->name, '%role_name' => $role_name)),
       t('Yes'), t('No')
     );
@@ -109,6 +109,6 @@
 function uc_roles_deletion_form_submit($form, &$form_state) {
   uc_roles_delete(user_load($form_state['values']['uid']), $form_state['values']['rid']);
 
-  drupal_goto('admin/user/user/expiration');
+  drupal_goto('admin/user/user/uc-roles-expiration');
 }
 

=== modified file 'uc_roles/uc_roles.module'
--- uc_roles/uc_roles.module	2008-12-19 21:05:00 +0000
+++ uc_roles/uc_roles.module	2008-12-26 19:27:16 +0000
@@ -24,7 +24,7 @@
  */
 function uc_roles_help($path, $arg) {
   switch ($path) {
-    case 'admin/user/user/expiration':
+    case 'admin/user/user/uc-roles-expiration':
       return t('Ubercart grants certain roles to customers when they purchase products with a role assignment feature. These can be permanent or temporary roles. Here you can view and edit when temporary roles are set to expire.');
   }
 }
@@ -80,7 +80,7 @@
  * Implementation of hook_menu().
  */
 function uc_roles_menu() {
-  $items['admin/user/user/expiration'] = array(
+  $items['admin/user/user/uc-roles-expiration'] = array(
     'title' => 'Role expiration',
     'description' => 'Edit and view role expirations set by Ubercart',
     'page callback' => 'drupal_get_form',
@@ -89,7 +89,7 @@
     'type' => MENU_LOCAL_TASK,
     'file' => 'uc_roles.admin.inc',
   );
-  $items['admin/user/user/expiration/delete/%user/%'] = array(
+  $items['admin/user/user/uc-roles-expiration/delete/%user/%'] = array(
     'title' => 'Delete role expiration',
     'description' => 'Delete a specified role expiration',
     'page callback' => 'drupal_get_form',