diff --git a/src/TaxonomyManagerHelper.php b/src/TaxonomyManagerHelper.php
index 48f8976..aa8006c 100644
--- a/src/TaxonomyManagerHelper.php
+++ b/src/TaxonomyManagerHelper.php
@@ -163,4 +163,17 @@ class TaxonomyManagerHelper {
     '</span>';
   }
 
+  /**
+   * @return array
+   *   List of available languages.
+   */
+  public static function languageList() {
+    $language_array = [];
+    $languages = \Drupal::languageManager()->getLanguages();
+    $language_ids = array_keys($languages);
+    foreach($language_ids as $language_id) {
+      $language_array[$languages[$language_id]->getId()] = $languages[$language_id]->getName();
+    }
+    return $language_array;
+  }
 }
diff --git a/taxonomy_manager.admin.inc b/taxonomy_manager.admin.inc
index c31fcb3..ea6728b 100644
--- a/taxonomy_manager.admin.inc
+++ b/taxonomy_manager.admin.inc
@@ -10,7 +10,7 @@
  */
 
 include_once DRUPAL_ROOT . "/modules/taxonomy/taxonomy.admin.inc";
-
+use Drupal\taxonomy_manager\TaxonomyManagerHelper;
 
 /**
  * list of vocabularies, which link to Taxonomy Manager interface
@@ -132,7 +132,7 @@ function taxonomy_manager_form($form, &$form_state, $voc, $tid = 0, $filter = NU
         '#type' => 'select',
         '#title' => t('Language'),
         '#default_value' => $language,
-        '#options' => array('' => t('All'), 'no language' => t('no language')) + locale_language_list('name'),
+        '#options' => array('' => t('All'), 'no language' => t('no language')) + TaxonomyManagerHelper::languageList(),
         '#attributes' => array('class' => array('language-selector')),
       );
     }
@@ -263,7 +263,7 @@ function taxonomy_manager_double_tree_form($form, &$form_state, $voc1, $voc2, $t
         '#type' => 'select',
         '#title' => t('Language'),
         '#default_value' => $language,
-        '#options' => array('' => t('All'), 'no language' => t('no language')) + locale_language_list('name'),
+        '#options' => array('' => t('All'), 'no language' => t('no language')) + TaxonomyManagerHelper::languageList(),
         '#attributes' => array('class' => array('language-selector')),
       );
     }
@@ -923,7 +923,7 @@ function taxonomy_manager_term_data_form(&$form, &$form_state, $tid = 0, $vid1,
           '#title' => t('Language'),
           '#description' => t('This term belongs to a multilingual vocabulary. You can set a language for it.'),
           '#default_value' => $term->language,
-          '#options' => locale_language_list('name'),
+          '#options' => TaxonomyManagerHelper::languageList(),
         );
       }
     }
@@ -1048,7 +1048,7 @@ function _taxonomy_manager_form_term_data_parents($term) {
  */
 function _taxonomy_manager_form_term_data_translations($term) {
   $module_path = drupal_get_path('module', 'taxonomy_manager') . '/';
-  $languages = locale_language_list('name');
+  $languages = TaxonomyManagerHelper::languageList();
 
   $form['#tree'] = TRUE;
   $form['#theme'] = 'taxonomy_manager_term_data_extra';
@@ -1141,8 +1141,10 @@ function taxonomy_manager_term_data_form_entity_translation(&$form, $term) {
     entity_translation_enabled('taxonomy_term', $term) &&
     title_field_replacement_enabled('taxonomy_term', $term->vocabulary_machine_name, 'name') &&
     !empty($term->name_field)) {
-
-    $languages = language_list();
+    debug($term, '$term');
+    $languageManager = \Drupal::languageManager();
+    $languages = $languageManager->getLanguages();
+    $language_ids = array_keys($languages);
     $source_language = $term->translations->original;
 
     // Disable the original name_field forms.
@@ -1152,8 +1154,8 @@ function taxonomy_manager_term_data_form_entity_translation(&$form, $term) {
       '#tree' => TRUE,
       '#weight' => -100,
     );
-    foreach ($languages as $language) {
-      $translation = isset($term->translations->data[$language->language]) ? $term->translations->data[$language->language] : FALSE;
+    foreach ($language_ids as $language_id) {
+      $translation = isset($term->translations->data[$languages[$language_id]->getId()]) ? $term->translations->data[$languages[$language_id]->getId()] : FALSE;
 
       // Determine the access for each translation.
       if ($translation) {
@@ -1162,22 +1164,22 @@ function taxonomy_manager_term_data_form_entity_translation(&$form, $term) {
       else {
         $access = (user_access('translate any entity') || user_access('translate taxonomy_term entities'));
       }
-      if (entity_translation_workflow_enabled() && $source_language == $language->language) {
+      if (entity_translation_workflow_enabled() && $source_language == $languages[$language_id]->getId()) {
         $access = user_access('edit original values');
       }
 
-      $default_value = isset($term->name_field[$language->language][0]['value']) ? $term->name_field[$language->language][0]['value'] : '';
-      $name_field_form['name'][$language->language] = array(
+      $default_value = isset($term->name_field[$languages[$language_id]->getId()][0]['value']) ? $term->name_field[$languages[$language_id]->getId()][0]['value'] : '';
+      $name_field_form['name'][$languages[$language_id]->getId()] = array(
         '#type' => 'textfield',
         '#default_value' => !empty($default_value) ? $default_value : '',
-        '#title' => t('Name (@language)', array('@language' => $language->name)),
+        '#title' => t('Name (@language)', array('@language' => $languages[$language_id]->getName())),
         '#required' => !empty($translation) ? TRUE : FALSE,
         '#access' => $access,
       );
 
-      if ($source_language == $language->language) {
-        $name_field_form['name'][$language->language]['#title'] .= ' - ' . t('Source language');
-        $name_field_form['name'][$language->language]['#weight'] = -1;
+      if ($source_language == $languages[$language_id]->getId()) {
+        $name_field_form['name'][$languages[$language_id]->getId()]['#title'] .= ' - ' . t('Source language');
+        $name_field_form['name'][$languages[$language_id]->getId()]['#weight'] = -1;
       }
       if (module_exists('pathauto')) {
         // Option to generate path aliases.