diff --git a/taxonomy_breadcrumb.admin.inc b/taxonomy_breadcrumb.admin.inc
index f7c995a..73eedd4 100644
--- a/taxonomy_breadcrumb.admin.inc
+++ b/taxonomy_breadcrumb.admin.inc
@@ -22,13 +22,6 @@ function taxonomy_breadcrumb_admin_settings($form, &$form_state) {
     '#description' => t('Text to display at top of breadcrumb trail. Typically home or your site name. Leave blank to have no home breadcrumb.'),
   );
 
-  $form['settings']['taxonomy_breadcrumb_show_current_term'] = array(
-    '#type' => 'checkbox',
-    '#title' => t('Show current term in breadcrumb trail'),
-    '#default_value' => variable_get('taxonomy_breadcrumb_show_current_term', TRUE),
-    '#description' => t('If enabled, the lightest term associated with the node is shown as the last item in the breadcrumb trail. If disabled, the only terms shown in the breadcrumb trail are parent terms (if any parents exist). The recommended setting is enabled.'),
-  );
-
 /*
   // TODO - this functionality has been removed from DRUPAL 7.
   // TODO - is there still a way to do this?
@@ -40,11 +33,11 @@ function taxonomy_breadcrumb_admin_settings($form, &$form_state) {
   );
 */
 
-  $form['settings']['taxonomy_breadcrumb_include_node_title'] = array(
+  $form['settings']['taxonomy_breadcrumb_page_title'] = array(
     '#type' => 'checkbox',
-    '#title' => t('Show current node title in breadcrumb trail'),
-    '#default_value' => variable_get('taxonomy_breadcrumb_include_node_title', FALSE),
-    '#description' => t("If enabled and if viewing a node, the node's title will be shown as the last item in the breadcrumb trail."),
+    '#title' => t('Show current page title in breadcrumb trail'),
+    '#default_value' => variable_get('taxonomy_breadcrumb_page_title', FALSE),
+    '#description' => t("If enabled, the page title will be added as the last item in the breadcrumb trail."),
     '#weight' => 30,
   );
 
diff --git a/taxonomy_breadcrumb.inc b/taxonomy_breadcrumb.inc
index e2ace89..6878f4d 100644
--- a/taxonomy_breadcrumb.inc
+++ b/taxonomy_breadcrumb.inc
@@ -152,10 +152,11 @@ function _taxonomy_breadcrumb_generate_breadcrumb($tid, $is_term_page = FALSE) {
     }
   }
 
-  // Optionally remove the current TERM from end of breadcrumb trail.
-  if (!variable_get('taxonomy_breadcrumb_show_current_term', TRUE) && !is_null($breadcrumb)) {
+  // Remove the breadcrumb for the term currently being viewed.
+  if (!is_null($breadcrumb) && $is_term_page) {
     array_pop($breadcrumb);
   }
+
   return $breadcrumb;
 }
 
diff --git a/taxonomy_breadcrumb.install b/taxonomy_breadcrumb.install
index 5c4d962..af4a2e5 100644
--- a/taxonomy_breadcrumb.install
+++ b/taxonomy_breadcrumb.install
@@ -29,7 +29,7 @@ function taxonomy_breadcrumb_uninstall() {
 
   // Remove global variables.
   variable_del('taxonomy_breadcrumb_home');
-  variable_del('taxonomy_breadcrumb_show_current_term');
+  variable_del('taxonomy_breadcrumb_page_title');
   variable_del('taxonomy_breadcrumb_include_nodes');
   variable_del('taxonomy_breadcrumb_node_types');
 }
@@ -105,3 +105,14 @@ function taxonomy_breadcrumb_update_6100() {
     variable_set('taxonomy_breadcrumb_include_nodes', 0);
   }
 }
+
+/**
+ * Implements hook_update_N().
+ *
+ * Refactor variables.
+ */
+function taxonomy_breadcrumb_update_7100() {
+  variable_set('taxonomy_breadcrumb_page_title', variable_get('taxonomy_breadcrumb_include_node_title', FALSE));
+  variable_del('taxonomy_breadcrumb_show_current_term');
+  variable_del('taxonomy_breadcrumb_include_node_title');
+}
diff --git a/taxonomy_breadcrumb.module b/taxonomy_breadcrumb.module
index 40d83e4..ba68335 100644
--- a/taxonomy_breadcrumb.module
+++ b/taxonomy_breadcrumb.module
@@ -68,7 +68,7 @@ function taxonomy_breadcrumb_node_view($node, $view_mode = 'full') {
       // Extract lightest term from lightest vocabulary assosciated with node.
       $term = _taxonomy_breadcrumb_node_get_lightest_term($node);
       $breadcrumb = _taxonomy_breadcrumb_generate_breadcrumb($term->tid);
-      if (variable_get('taxonomy_breadcrumb_include_node_title', FALSE)) {
+      if (variable_get('taxonomy_breadcrumb_page_title', FALSE)) {
         $breadcrumb[] = check_plain($node->title);
       }
       drupal_set_breadcrumb($breadcrumb);
@@ -110,6 +110,12 @@ function taxonomy_breadcrumb_page_alter(&$page) {
   if ($page_term = menu_get_object('taxonomy_term', 2)) {
     module_load_include('inc', 'taxonomy_breadcrumb');
     $breadcrumb = _taxonomy_breadcrumb_generate_breadcrumb($page_term->tid, TRUE);
+
+    // Add the page title.
+    if (variable_get('taxonomy_breadcrumb_page_title', FALSE)) {
+      $breadcrumb[] = check_plain($page_term->name);
+    }
+
     drupal_set_breadcrumb($breadcrumb);
   }
 }