=== modified file 'uc_attribute/uc_attribute.module'
--- uc_attribute/uc_attribute.module	2009-05-06 18:27:07 +0000
+++ uc_attribute/uc_attribute.module	2009-05-07 13:19:32 +0000
@@ -25,23 +25,23 @@
 function uc_attribute_help($path, $arg) {
   switch ($path) {
     // Help messages for the attributes overview on products and classes.
-    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 '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 '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/uc-attributes/add':
+    case 'node/%/edit/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/uc-options':
+    case 'node/%/edit/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/uc-adjustments':
+    case 'node/%/edit/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.');
   }
 }
@@ -158,7 +158,7 @@
   );
 
   // Insert subitems into the edit node page for product types.
-  $items['node/%node/edit/uc-attributes'] = array(
+  $items['node/%node/edit/attributes'] = array(
     'title' => 'Attributes',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('uc_object_attributes_form', 1, 'product', 'overview'),
@@ -168,7 +168,7 @@
     'weight' => 1,
     'file' => 'uc_attribute.admin.inc',
   );
-  $items['node/%node/edit/uc-attributes/add'] = array(
+  $items['node/%node/edit/attributes/add'] = array(
     'title' => 'Attributes',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('uc_object_attributes_form', 1, 'product', 'add'),
@@ -178,7 +178,7 @@
     'weight' => 1,
     'file' => 'uc_attribute.admin.inc',
   );
-  $items['node/%node/edit/uc-options'] = array(
+  $items['node/%node/edit/options'] = array(
     'title' => 'Options',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('uc_object_options_form', 1, 'product'),
@@ -188,7 +188,7 @@
     'weight' => 2,
     'file' => 'uc_attribute.admin.inc',
   );
-  $items['node/%node/edit/uc-adjustments'] = array(
+  $items['node/%node/edit/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	2009-05-07 13:24:26 +0000
+++ uc_file/uc_file.module	2009-05-07 13:24:54 +0000
@@ -29,7 +29,7 @@
  * Implementation of hook_help().
  */
 function uc_file_help($path, $arg) {
-  if ($path == 'node/%/edit/uc-features' && $arg[4] == 'file') {
+  if ($path == 'node/%/edit/features' && $arg[4] == 'file') {
     return t('Add file downloads through this page and then use the <a href="!url">conditional actions interface</a> to limit which orders they are applied to. Most important is the order status on which file download access will be triggered.', array('!url' => url(CA_UI_PATH)));
   }
 }
@@ -64,7 +64,7 @@
     'type' => MENU_NORMAL_ITEM,
     'file' => 'uc_file.admin.inc',
   );
-  $items['user/%user/uc-files'] = array(
+  $items['user/%user/purchased-files'] = array(
     'title' => 'Files',
     'description' => 'View your purchased files.',
     'page callback' => 'uc_file_user_downloads',
@@ -386,7 +386,7 @@
 
       'user_items' => array(
         '#type' => 'user_profile_item',
-        '#value' => l(t('Click here to view your file downloads.'), 'user/'. $account->uid .'/uc-files'),
+        '#value' => l(t('Click here to view your file downloads.'), 'user/'. $account->uid .'/purchased-files'),
       ),
   );
 
@@ -712,7 +712,7 @@
     $form['file']['file_message'] = array(
       '#value' => t(
         'You must add files at the !url in order to attach them to a model.',
-        array('!url' => l(t('Ubercart file download administration page'), 'admin/store/products/files', array('query' => 'destination=node/'. $node->nid .'/edit/uc-features/file/add')))
+        array('!url' => l(t('Ubercart file download administration page'), 'admin/store/products/files', array('query' => 'destination=node/'. $node->nid .'/edit/features/file/add')))
       ),
     );
     return $form;
@@ -791,7 +791,7 @@
 
   $form['uc_file_limits'] = array(
     '#type' => 'fieldset',
-    '#description' => t('Use these options to override any global download limits set at the !url.', array('!url' => l(t('Ubercart product settings page'), 'admin/store/settings/products/edit/features', array('query' => 'destination=node/'. $node->nid .'/edit/uc-features/file/add')))),
+    '#description' => t('Use these options to override any global download limits set at the !url.', array('!url' => l(t('Ubercart product settings page'), 'admin/store/settings/products/edit/features', array('query' => 'destination=node/'. $node->nid .'/edit/features/file/add')))),
     '#collapsed' => FALSE,
     '#collapsible' => FALSE,
     '#title' => t('File limitations'),

=== modified file 'uc_file/uc_file.pages.inc'
--- uc_file/uc_file.pages.inc	2009-04-01 15:17:04 +0000
+++ uc_file/uc_file.pages.inc	2009-05-07 13:19:32 +0000
@@ -347,7 +347,7 @@
   }
   // Redirect users back to their file page.
   else {
-    drupal_goto('user/'. $uid .'/uc-files');
+    drupal_goto('user/'. $uid .'/purchased-files');
   }
 }
 

=== modified file 'uc_order/uc_order.admin.inc'
--- uc_order/uc_order.admin.inc	2009-04-24 03:30:04 +0000
+++ uc_order/uc_order.admin.inc	2009-05-07 13:19:32 +0000
@@ -986,7 +986,7 @@
 function uc_order_view($order, $view = 'view') {
   if ($view == 'customer') {
     $breadcrumb = drupal_get_breadcrumb();
-    $breadcrumb[2] = l(t('Order history'), 'user/'. arg(1) .'/uc-orders');
+    $breadcrumb[2] = l(t('Order history'), 'user/'. arg(1) .'/orders');
     drupal_set_breadcrumb($breadcrumb);
   }
 

=== modified file 'uc_order/uc_order.module'
--- uc_order/uc_order.module	2009-05-06 18:27:07 +0000
+++ uc_order/uc_order.module	2009-05-07 13:19:32 +0000
@@ -157,7 +157,7 @@
     'type' => MENU_CALLBACK,
     'file' => 'uc_order.admin.inc',
   );
-  $items['user/%user/uc-orders'] = array(
+  $items['user/%user/orders'] = array(
     'title' => 'Orders',
     'description' => 'View your order history.',
     'page callback' => 'uc_order_history',
@@ -496,7 +496,7 @@
           '#title' => t('Orders'),
           'link' => array(
             '#type' => 'user_profile_item',
-            '#value' => l(t('Click here to view your order history.'), 'user/'. $account->uid .'/uc-orders'),
+            '#value' => l(t('Click here to view your order history.'), 'user/'. $account->uid .'/orders'),
           ),
         );
       }

=== modified file 'uc_product/uc_product.admin.inc'
--- uc_product/uc_product.admin.inc	2009-04-01 15:17:04 +0000
+++ uc_product/uc_product.admin.inc	2009-05-07 13:19:32 +0000
@@ -381,18 +381,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/uc-features');
+          drupal_goto('node/'. arg(1) .'/edit/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/uc-features', $description, t('Delete'), t('Cancel'), 'pf_delete');
+        return drupal_get_form('confirm_form', $question, 'node/'. arg(1) .'/edit/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/uc-features');
+        drupal_goto('node/'. arg(1) .'/edit/features');
       }
     }
 
@@ -411,12 +411,12 @@
     }
     else {
       drupal_set_message(t('Error: Attempted to add a non-existent product feature type.'), 'error');
-      drupal_goto('node/'. $node->nid .'/edit/uc-features');
+      drupal_goto('node/'. $node->nid .'/edit/features');
     }
 
     if (empty($output)) {
       drupal_set_message(t('Error: No form data was returned for that operation.'), 'error');
-      drupal_goto('node/'. $node->nid .'/edit/uc-features');
+      drupal_goto('node/'. $node->nid .'/edit/features');
     }
 
     return $output;
@@ -427,8 +427,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/uc-features/'. $feature->fid .'/'. $feature->pfid),
-      l(t('delete'), 'node/'. $node->nid .'/edit/uc-features/'. $feature->fid .'/'. $feature->pfid .'/delete'),
+      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'),
     );
     $rows[] = array(
       'data' => array(
@@ -490,7 +490,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/uc-features/'. $form_state['values']['feature'] .'/add';
+  $form_state['redirect'] = 'node/'. arg(1) .'/edit/features/'. $form_state['values']['feature'] .'/add';
 }
 
 /**

=== modified file 'uc_product/uc_product.module'
--- uc_product/uc_product.module	2009-05-06 18:27:07 +0000
+++ uc_product/uc_product.module	2009-05-07 13:19:32 +0000
@@ -104,7 +104,7 @@
   );
   $features = module_invoke_all('product_feature');
   if (!empty($features)) {
-    $items['node/%node/edit/uc-features'] = array(
+    $items['node/%node/edit/features'] = array(
       'title' => 'Features',
       'page callback' => 'uc_product_features',
       'page arguments' => array(1),
@@ -225,7 +225,7 @@
 }
 
 /**
- * Menu access callback for 'node/%node/edit/uc-features'.
+ * Menu access callback for 'node/%node/edit/features'.
  */
 function uc_product_feature_access($node) {
   return uc_product_is_product($node) && user_access('administer product features');
@@ -1761,7 +1761,7 @@
     '#value' => t('Save feature'),
   );
   $form['cancel'] = array(
-    '#value' => l(t('Cancel'), 'node/'. intval(arg(1)) .'/edit/uc-features'),
+    '#value' => l(t('Cancel'), 'node/'. intval(arg(1)) .'/edit/features'),
   );
 
   return $form;
@@ -1800,7 +1800,7 @@
     drupal_set_message(t('The product feature has been updated.'));
   }
 
-  return 'node/'. $data['nid'] .'/edit/uc-features';
+  return 'node/'. $data['nid'] .'/edit/features';
 }
 
 function uc_product_add_default_image_field($type = NULL) {

=== modified file 'uc_roles/uc_roles.module'
--- uc_roles/uc_roles.module	2009-04-18 01:44:31 +0000
+++ uc_roles/uc_roles.module	2009-05-07 13:19:32 +0000
@@ -23,7 +23,7 @@
  * Implementation of hook_help().
  */
 function uc_roles_help($path, $arg) {
-  if ($path == 'node/%/edit/uc-features' && $arg[4] == 'role') {
+  if ($path == 'node/%/edit/features' && $arg[4] == 'role') {
     return t('Add roles through this page and then use the <a href="!url">conditional actions interface</a> to limit which orders they are applied to. Most important is the order status on which role granting will be triggered.', array('!url' => url(CA_UI_PATH)));
   }
   switch ($path) {

=== modified file 'uc_stock/uc_stock.admin.inc'
--- uc_stock/uc_stock.admin.inc	2009-02-13 19:02:28 +0000
+++ uc_stock/uc_stock.admin.inc	2009-05-07 13:19:32 +0000
@@ -67,7 +67,7 @@
   while ($stock = db_fetch_object($result)) {
     $op = array();
     if (user_access('administer products')) {
-      $op[] = l(t('edit'), 'node/'. $stock->nid .'/edit/uc-stock', $options = array('query' => 'destination=admin/store/reports/stock'));
+      $op[] = l(t('edit'), 'node/'. $stock->nid .'/edit/stock', $options = array('query' => 'destination=admin/store/reports/stock'));
     }
 
     // Add the data to a table row for display.

=== modified file 'uc_stock/uc_stock.module'
--- uc_stock/uc_stock.module	2009-05-06 20:54:03 +0000
+++ uc_stock/uc_stock.module	2009-05-07 13:19:32 +0000
@@ -25,7 +25,7 @@
  */
 function uc_stock_help($path, $arg) {
   switch ($path) {
-    case 'node/%/edit/uc-stock':
+    case 'node/%/edit/stock':
       return t('To keep track of stock for a particular product SKU, make sure it is marked as active and enter a stock value. When the stock level drops below the threshold value, you can be notified based on your stock settings.');
     case 'admin/store/reports/stock':
     case 'admin/store/reports/stock/threshold':
@@ -56,7 +56,7 @@
     'type' => MENU_NORMAL_ITEM,
     'file' => 'uc_stock.admin.inc',
   );
-  $items['node/%node/edit/uc-stock'] = array(
+  $items['node/%node/edit/stock'] = array(
     'title' => 'Stock',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('uc_stock_edit_form', 1),