diff --git a/modules/hs_taxonomy.module b/modules/hs_taxonomy.module
index 2fc3fb4..a26caa9 100644
--- a/modules/hs_taxonomy.module
+++ b/modules/hs_taxonomy.module
@@ -441,8 +441,9 @@ function hs_taxonomy_field_formatter_view($entity_type, $entity, $field, $instan
         $element[$l]['#theme'] = 'hs_taxonomy_formatter_lineage';
         for ($level = 0; $level < count($lineages[$l]); $level++) {
           $term = $lineages[$l][$level];
+          $entity = taxonomy_term_load($term->tid);
           $element[$l]['#lineage'][$level] = array(
-            '#markup' => $term->name,
+            '#markup' => entity_label('taxonomy_term', $entity),
           );
         }
       }
@@ -453,10 +454,11 @@ function hs_taxonomy_field_formatter_view($entity_type, $entity, $field, $instan
         $element[$l]['#theme'] = 'hs_taxonomy_formatter_lineage';
         for ($level = 0; $level < count($lineages[$l]); $level++) {
           $term = $lineages[$l][$level];
+          $entity = taxonomy_term_load($term->tid);
           $uri = entity_uri('taxonomy_term', $term);
           $element[$l]['#lineage'][$level] = array(
             '#type'    => 'link',
-            '#title'   => $term->name,
+            '#title'   => entity_label('taxonomy_term', $entity),
             '#href'    => $uri['path'],
             '#options' => $uri['options'],
           );
@@ -469,10 +471,11 @@ function hs_taxonomy_field_formatter_view($entity_type, $entity, $field, $instan
         $element[$l]['#theme'] = 'hs_taxonomy_formatter_lineage';
         for ($level = 0; $level < count($lineages[$l]) - 1; $level++) {
           $term = $lineages[$l][$level];
+          $entity = taxonomy_term_load($term->tid);
           $uri = entity_uri('taxonomy_term', $term);
           $element[$l]['#lineage'][$level] = array(
             '#type'    => 'link',
-            '#title'   => $term->name,
+            '#title'   => entity_label('taxonomy_term', $entity),
             '#href'    => $uri['path'],
             '#options' => $uri['options'],
           );
@@ -480,8 +483,9 @@ function hs_taxonomy_field_formatter_view($entity_type, $entity, $field, $instan
         if (count($lineages[$l]) > 0) {
           $level = count($lineages[$l]) - 1;
           $term = $lineages[$l][$level];
+          $entity = taxonomy_term_load($term->tid);
           $element[$l]['#lineage'][$level] = array(
-            '#markup' => $term->name,
+            '#markup' => entity_label('taxonomy_term', $entity),
           );
         }
       }
@@ -492,17 +496,19 @@ function hs_taxonomy_field_formatter_view($entity_type, $entity, $field, $instan
         $element[$l]['#theme'] = 'hs_taxonomy_formatter_lineage';
         for ($level = 0; $level < count($lineages[$l]) - 1; $level++) {
           $term = $lineages[$l][$level];
+          $entity = taxonomy_term_load($term->tid);
           $element[$l]['#lineage'][$level] = array(
-            '#markup' => $term->name,
+            '#markup' => entity_label('taxonomy_term', $entity),
           );
         }
         if (count($lineages[$l]) > 0) {
           $level = count($lineages[$l]) - 1;
           $term = $lineages[$l][$level];
+          $entity = taxonomy_term_load($term->tid);
           $uri = entity_uri('taxonomy_term', $term);
           $element[$l]['#lineage'][$level] = array(
             '#type'    => 'link',
-            '#title'   => $term->name,
+            '#title'   => entity_label('taxonomy_term', $entity),
             '#href'    => $uri['path'],
             '#options' => $uri['options'],
           );
@@ -516,8 +522,9 @@ function hs_taxonomy_field_formatter_view($entity_type, $entity, $field, $instan
         if (count($lineages[$l]) > 0) {
           $level = count($lineages[$l]) - 1;
           $term = $lineages[$l][$level];
+          $entity = taxonomy_term_load($term->tid);
           $element[$l]['#lineage'][0] = array(
-            '#markup' => $term->name,
+            '#markup' => entity_label('taxonomy_term', $entity),
           );
         }
       }
@@ -529,10 +536,11 @@ function hs_taxonomy_field_formatter_view($entity_type, $entity, $field, $instan
         if (count($lineages[$l]) > 0) {
           $level = count($lineages[$l]) - 1;
           $term = $lineages[$l][$level];
+          $entity = taxonomy_term_load($term->tid);
           $uri = entity_uri('taxonomy_term', $term);
           $element[$l]['#lineage'][0] = array(
             '#type'    => 'link',
-            '#title'   => $term->name,
+            '#title'   => entity_label('taxonomy_term', $entity),
             '#href'    => $uri['path'],
             '#options' => $uri['options'],
           );
@@ -708,11 +716,12 @@ function hs_taxonomy_hierarchical_select_item_get_label($item, $params) {
     }
 
     // Use the translated term when available!
-    if (module_exists('i18ntaxonomy') && i18ntaxonomy_vocabulary($term->vid) == I18N_TAXONOMY_LOCALIZE) {
+    if (module_exists('i18n_taxonomy') && i18ntaxonomy_vocabulary($term->vid) == I18N_TAXONOMY_LOCALIZE) {
       $labels[$item] = i18n_taxonomy_term_name($term);
     }
     else {
-      $labels[$item] = t($term->name);
+      $entity = taxonomy_term_load($term->tid);
+      $labels[$item] = entity_label('taxonomy_term', $entity);
     }
   }
 
@@ -1081,7 +1090,13 @@ function _hs_taxonomy_hierarchical_select_terms_to_options($terms) {
   $use_i18n = module_exists('i18n_taxonomy');
   foreach ($terms as $key => $term) {
     // Use the translated term when available!
-    $options[$term->tid] = $use_i18n && isset($term->vid) ? i18n_taxonomy_term_name($term) : t($term->name);
+    if ($use_i18n && isset($term->vid)) {
+      $options[$term->tid] = i18n_taxonomy_term_name($term);
+    }
+    else {
+      $entity = taxonomy_term_load($term->tid);
+      $options[$term->tid] = entity_label('taxonomy_term', $entity);
+    }
   }
   return $options;
 }