diff --git a/faqpanels/plugins/tasks/faq_term.inc b/faqpanels/plugins/tasks/faq_term.inc
index 1248387..47f7951 100644
--- a/faqpanels/plugins/tasks/faq_term.inc
+++ b/faqpanels/plugins/tasks/faq_term.inc
@@ -19,9 +19,9 @@ function faqpanels_faq_term_page_manager_tasks() {
     'task type' => 'page',
     'title' => t('FAQ Page'),
     'admin title' => t('FAQ Page with categories'),
-    'admin description' => t('when enabled, this overrides the default Drupal behavior of the FAQ page at <em>faq/%tid/%faq_display</em>'),
-    'admin path' => 'faq/%tid/%faq_display',
-    // Menu hooks so that we can alter the faq/%tid/%faq_display menu entry to point to us.
+    'admin description' => t('when enabled, this overrides the default Drupal behavior of the FAQ page at <em>faq-page/%tid/%faq_display</em>'),
+    'admin path' => 'faq-page/%tid/%faq_display',
+    // Menu hooks so that we can alter the faq-page/%tid/%faq_display menu entry to point to us.
     'hook menu' => 'faqpanels_faq_term_menu',
     'hook menu alter' => 'faqpanels_faq_term_menu_alter',
     // This is task uses 'context' handlers and must implement these to give the
@@ -40,19 +40,19 @@ function faqpanels_faq_term_page_manager_tasks() {
  *
  * Alter the FAQ page with terms so that the FAQ page comes to us rather than the
  * normal FAQ process.
- * Menus to be altered are only the list faq display (faq,faq/%,faq/%/list,faq/list).
+ * Menus to be altered are only the list faq display (faq-page,faq-page/%,faq-page/%/list,faq-page/list).
  */
 function faqpanels_faq_term_menu_alter(&$items, $task) {
   if (variable_get('faqpanels_faq_term_disabled', TRUE)) {
     return;
   }
-
-  $callback = $items['faq']['page callback'];
+  
+  $callback = $items['faq-page']['page callback'];
   // Override the faq term handler for our purpose.
   if ($callback == 'faq_page' || variable_get('page_manager_override_anyway', FALSE)) {
-    $items['faq']['page callback'] = 'faqpanels_faq_term';
-    $items['faq']['file path'] = $task['path'];
-    $items['faq']['file'] = $task['file'];
+    $items['faq-page']['page callback'] = 'faqpanels_faq_term';
+    $items['faq-page']['file path'] = $task['path'];
+    $items['faq-page']['file'] = $task['file'];
   }
   else {
     variable_set('faqpanels_faq_term_disabled', TRUE);
@@ -62,47 +62,47 @@ function faqpanels_faq_term_menu_alter(&$items, $task) {
 
   }
 
-  $callback = $items['faq/%']['page callback'];
+  $callback = $items['faq-page/%']['page callback'];
   // Override the faq term handler for our purpose.
   if ($callback == 'faq_page' || variable_get('page_manager_override_anyway', FALSE)) {
-    $items['faq/%']['page callback'] = 'faqpanels_faq_term';
-    $items['faq/%']['file path'] = $task['path'];
-    $items['faq/%']['file'] = $task['file'];
+    $items['faq-page/%']['page callback'] = 'faqpanels_faq_term';
+    $items['faq-page/%']['file path'] = $task['path'];
+    $items['faq-page/%']['file'] = $task['file'];
   }
   else {
     variable_set('faqpanels_faq_term_disabled', TRUE);
     if (!empty($GLOBALS['faqpanels_enabling_faq_term'])) {
-      drupal_set_message(t('Page manager module is unable to enable faq/%tid/%faq_display because some other module already has overridden with %callback.', array('%callback' => $callback)), 'warning');
+      drupal_set_message(t('Page manager module is unable to enable faq-page/%tid/%faq_display because some other module already has overridden with %callback.', array('%callback' => $callback)), 'warning');
     }
 
   }
 
-  $callback = $items['faq/%/list']['page callback'];
+  $callback = $items['faq-page/%/list']['page callback'];
   // Override the faq term handler for our purpose.
   if ($callback == 'faq_page' || variable_get('page_manager_override_anyway', FALSE)) {
-    $items['faq/%/list']['page callback'] = 'faqpanels_faq_term';
-    $items['faq/%/list']['file path'] = $task['path'];
-    $items['faq/%/list']['file'] = $task['file'];
+    $items['faq-page/%/list']['page callback'] = 'faqpanels_faq_term';
+    $items['faq-page/%/list']['file path'] = $task['path'];
+    $items['faq-page/%/list']['file'] = $task['file'];
   }
   else {
     variable_set('faqpanels_faq_term_disabled', TRUE);
     if (!empty($GLOBALS['faqpanels_enabling_faq_term'])) {
-      drupal_set_message(t('Page manager module is unable to enable faq/%tid/%faq_display because some other module already has overridden with %callback.', array('%callback' => $callback)), 'warning');
+      drupal_set_message(t('Page manager module is unable to enable faq-page/%tid/%faq_display because some other module already has overridden with %callback.', array('%callback' => $callback)), 'warning');
     }
 
   }
 
-  $callback = $items['faq/list']['page callback'];
+  $callback = $items['faq-page/list']['page callback'];
   // Override the faq term handler for our purpose.
   if ($callback == 'faq_page' || variable_get('page_manager_override_anyway', FALSE)) {
-    $items['faq/list']['page callback'] = 'faqpanels_faq_term';
-    $items['faq/list']['file path'] = $task['path'];
-    $items['faq/list']['file'] = $task['file'];
+    $items['faq-page/list']['page callback'] = 'faqpanels_faq_term';
+    $items['faq-page/list']['file path'] = $task['path'];
+    $items['faq-page/list']['file'] = $task['file'];
   }
   else {
     variable_set('faqpanels_faq_term_disabled', TRUE);
     if (!empty($GLOBALS['faqpanels_enabling_faq_term'])) {
-      drupal_set_message(t('Page manager module is unable to enable faq/%tid/%faq_display because some other module already has overridden with %callback.', array('%callback' => $callback)), 'warning');
+      drupal_set_message(t('Page manager module is unable to enable faq-page/%tid/%faq_display because some other module already has overridden with %callback.', array('%callback' => $callback)), 'warning');
     }
 
   }