diff --git README.txt README.txt
index 8d30f99..72b7ab4 100644
--- README.txt
+++ README.txt
@@ -113,7 +113,7 @@ Advanced theming
 ----------------
 If you're creating or modifying your own theme, you can integrate Nice menus more deeply by making use of these functions:
 theme_nice_menus() -- themes any menu tree as a Nice menu.
-theme_nice_menus_primary_links() -- themes your primary links as a Nice menu.
-theme_nice_menus_secondary_links() -- themes your secondary links as a Nice menu.
+theme_nice_menus_main_menu() -- themes your primary links as a Nice menu.
+theme_nice_menus_secondary_menu() -- themes your secondary menu as a Nice menu.
 
-If you really know what you're doing, you can probably even customize the menu tree in creative ways, as those functions allow you to pass in a custom menu tree.
\ No newline at end of file
+If you really know what you're doing, you can probably even customize the menu tree in creative ways, as those functions allow you to pass in a custom menu tree.
diff --git nice_menus.module nice_menus.module
index 033835c..4c68320 100644
--- nice_menus.module
+++ nice_menus.module
@@ -279,10 +279,10 @@ function nice_menus_theme() {
     'nice_menus' => array(
       'variables' => array('id' => NULL, 'menu_name' => NULL, 'mlid' => NULL, 'direction' => 'right', 'depth' => -1, 'menu' => NULL),
     ),
-    'nice_menus_primary_links' => array(
+    'nice_menus_main_menu' => array(
       'variables' => array('direction' => 'down', 'depth' => -1, 'menu' => NULL),
     ),
-    'nice_menus_secondary_links' => array(
+    'nice_menus_secondary_menu' => array(
       'variables' => array('direction' => 'down', 'depth' => -1, 'menu' => NULL),
     ),
     'nice_menus_menu_item_link' => array(
@@ -330,7 +330,7 @@ function nice_menus_build_page_trail($page_menu) {
  *
  * @param $menu_name
  *   The top-level menu name that contains the menu to use (e.g. navigation
- *   or primary-links) for Drupal menus. For custom $menus this is just the
+ *   or main-menu) for Drupal menus. For custom $menus this is just the
  *   name for menu display.
  * @param $mlid
  *   The menu ID from which to start building the items, i.e. the parent
@@ -530,7 +530,7 @@ function theme_nice_menus($variables) {
 }
 
 /**
- * Theme primary links as Nice menus.
+ * Theme the main menu as a Nice menu.
  *
  * @param $direction
  *   Optional. The direction the menu expands. Default is 'down'.
@@ -542,19 +542,19 @@ function theme_nice_menus($variables) {
  *   it should have the same structure as that returned
  *   by menu_tree_all_data(). Default is the standard menu tree.
  * @return
- *   An HTML string of Nice menu primary links.
+ *   An HTML string of Nice main menu links.
  */
-function theme_nice_menus_primary_links($variables) {
+function theme_nice_menus_main_menu($variables) {
   $direction = $variables['direction'];
   $depth = $variables['depth'];
   $menu = $variables['menu'];
-  $menu_name = variable_get('menu_primary_links_source', 'primary-links');
+  $menu_name = variable_get('menu_main_links_source', 'main_menu');
   $output = theme('nice_menus', array('id' => 0, 'menu_name' => $menu_name, 'mlid' => 0, 'direction' => $direction, 'depth' => $depth, 'menu' => $menu));
   return $output['content'];
 }
 
 /**
- * Theme secondary links as nice menus.
+ * Theme the secondary menu as a Nice menu.
  *
  * @param $direction
  *   Optional. The direction the menu expands. Default is 'down'.
@@ -566,19 +566,17 @@ function theme_nice_menus_primary_links($variables) {
  *   it should have the same structure as that returned
  *   by menu_tree_all_data(). Default is the standard menu tree.
  * @return
- *   An HTML string of nice menu secondary links.
+ *   An HTML string of Nice secondary menu links.
  */
-function theme_nice_menus_secondary_links($variables) {
+function theme_nice_menus_secondary_menu($variables) {
   $direction = $variables['direction'];
   $depth = $variables['depth'];
   $menu = $variables['menu'];
-  $menu_name = variable_get('menu_secondary_links_source', 'secondary-links');
+  $menu_name = variable_get('menu_secondary_links_source', 'secondary-menu');
   $output = theme('nice_menus', array('id' => 0, 'menu_name' => $menu_name, 'mlid' => 0, 'direction' => $direction, 'depth' => $depth, 'menu' => $menu));
   return $output['content'];
 }
 
-
-
 /**
  * Generate the HTML output for a single menu link.
  *
@@ -589,4 +587,4 @@ function theme_nice_menus_menu_item_link($variables) {
     $variables['element']['#localized_options'] = array();
   }
   return l($variables['element']['#title'], $variables['element']['#href'], $variables['element']['#localized_options']);
-}
\ No newline at end of file
+}