diff --git a/core/modules/forum/forum.admin.inc b/core/modules/forum/forum.admin.inc
index 559749b..541b04d 100644
--- a/core/modules/forum/forum.admin.inc
+++ b/core/modules/forum/forum.admin.inc
@@ -296,7 +296,7 @@ function _forum_parent_select($tid, $title, $child_type) {
   if ($tree) {
     foreach ($tree as $term) {
       if (!in_array($term->id(), $exclude)) {
-        $options[$term->id()] = str_repeat(' -- ', $term->depth) . $term->label();
+        $options[$term->id()] = str_repeat(' -- ', $term->depth->value) . $term->label();
       }
     }
   }
diff --git a/core/modules/forum/templates/forum-list.tpl.php b/core/modules/forum/templates/forum-list.tpl.php
index da8a12d..6359a18 100644
--- a/core/modules/forum/templates/forum-list.tpl.php
+++ b/core/modules/forum/templates/forum-list.tpl.php
@@ -50,7 +50,7 @@
                * depth this forum resides at. This will allow us to use CSS
                * left-margin for indenting.
                */ ?>
-        <?php print str_repeat('<div class="indent">', $forum->depth); ?>
+        <?php print str_repeat('<div class="indent">', $forum->depth->value); ?>
           <div class="icon forum-status-<?php print $forum->icon_class; ?>" title="<?php print $forum->icon_title; ?>">
             <span class="element-invisible"><?php print $forum->icon_title; ?></span>
           </div>
@@ -58,7 +58,7 @@
           <?php if ($forum->description->value): ?>
             <div class="description"><?php print $forum->description->value; ?></div>
           <?php endif; ?>
-        <?php print str_repeat('</div>', $forum->depth); ?>
+        <?php print str_repeat('</div>', $forum->depth->value); ?>
       </td>
       <?php if (!$forum->is_container): ?>
         <td class="topics">
diff --git a/core/modules/options/options.api.php b/core/modules/options/options.api.php
index f3d0f7d..42ee1fa 100644
--- a/core/modules/options/options.api.php
+++ b/core/modules/options/options.api.php
@@ -61,7 +61,7 @@ function hook_options_list($field, $instance, $entity) {
     $terms = taxonomy_get_tree($tree['vid'], $tree['parent'], NULL, TRUE);
     if ($terms) {
       foreach ($terms as $term) {
-        $options[$term->id()] = str_repeat('-', $term->depth) . $term->label();
+        $options[$term->id()] = str_repeat('-', $term->depth->value) . $term->label();
       }
     }
   }
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/entity_reference/selection/TermSelection.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/entity_reference/selection/TermSelection.php
index e49f31e..64e6acf 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/entity_reference/selection/TermSelection.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/entity_reference/selection/TermSelection.php
@@ -67,7 +67,7 @@ public function getReferencableEntities($match = NULL, $match_operator = 'CONTAI
       if ($vocabulary = entity_load('taxonomy_vocabulary', $bundle)) {
         if ($terms = taxonomy_get_tree($vocabulary->id(), 0)) {
           foreach ($terms as $term) {
-            $options[$vocabulary->id()][$term->id()] = str_repeat('-', $term->depth) . check_plain($term->name);
+            $options[$vocabulary->id()][$term->id()] = str_repeat('-', $term->depth->value) . check_plain($term->label());
           }
         }
       }
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php
index f485ac6..ec7bb2b 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php
@@ -137,7 +137,7 @@ function value_form(&$form, &$form_state) {
         if ($tree) {
           foreach ($tree as $term) {
             $choice = new stdClass();
-            $choice->option = array($term->tid => str_repeat('-', $term->depth) . $term->name);
+            $choice->option = array($term->id() => str_repeat('-', $term->depth->value) . $term->label());
             $options[] = $choice;
           }
         }
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/TermFormController.php b/core/modules/taxonomy/lib/Drupal/taxonomy/TermFormController.php
index 167befa..ced2587 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/TermFormController.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/TermFormController.php
@@ -78,7 +78,7 @@ public function form(array $form, array &$form_state, EntityInterface $term) {
       }
       foreach ($tree as $item) {
         if (!in_array($item->tid, $exclude)) {
-          $options[$item->tid] = str_repeat('-', $item->depth) . $item->name;
+          $options[$item->tid] = str_repeat('-', $item->depth->value) . $item->label();
         }
       }
 
diff --git a/core/modules/taxonomy/taxonomy.admin.inc b/core/modules/taxonomy/taxonomy.admin.inc
index 929543d..79e098c 100644
--- a/core/modules/taxonomy/taxonomy.admin.inc
+++ b/core/modules/taxonomy/taxonomy.admin.inc
@@ -164,12 +164,12 @@ function taxonomy_overview_terms($form, &$form_state, Vocabulary $vocabulary) {
     }
 
     // Do not let a term start the page that is not at the root.
-    if (isset($term->depth) && ($term->depth > 0) && !isset($back_step)) {
+    if (isset($term->depth->value) && ($term->depth->value > 0) && !isset($back_step)) {
       $back_step = 0;
       while ($pterm = prev($tree)) {
         $before_entries--;
         $back_step++;
-        if ($pterm->depth == 0) {
+        if ($pterm->depth->value == 0) {
           prev($tree);
           continue 2; // Jump back to the start of the root level parent.
        }
@@ -178,7 +178,7 @@ function taxonomy_overview_terms($form, &$form_state, Vocabulary $vocabulary) {
     $back_step = isset($back_step) ? $back_step : 0;
 
     // Continue rendering the tree until we reach the a new root item.
-    if ($page_entries >= $page_increment + $back_step + 1 && $term->depth == 0 && $root_entries > 1) {
+    if ($page_entries >= $page_increment + $back_step + 1 && $term->depth->value == 0 && $root_entries > 1) {
       $complete_tree = TRUE;
       // This new item at the root level is the first item on the next page.
       $after_entries++;
@@ -219,7 +219,7 @@ function taxonomy_overview_terms($form, &$form_state, Vocabulary $vocabulary) {
       // Verify this is a term for the current page and set at the current
       // depth.
       if (is_array($form_state['input']['terms'][$key]) && is_numeric($form_state['input']['terms'][$key]['term']['tid'])) {
-        $current_page[$key]->depth = $form_state['input']['terms'][$key]['term']['depth'];
+        $current_page[$key]->depth->value = $form_state['input']['terms'][$key]['term']['depth'];
       }
       else {
         unset($current_page[$key]);
@@ -269,7 +269,7 @@ function taxonomy_overview_terms($form, &$form_state, Vocabulary $vocabulary) {
         '#type' => 'hidden',
         // Same as above, the depth is modified by javascript, so it's a
         // default_value.
-        '#default_value' => $term->depth,
+        '#default_value' => $term->depth->value,
         '#attributes' => array(
           'class' => array('term-depth'),
         ),
diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module
index e10e9ea..86e5d30 100644
--- a/core/modules/taxonomy/taxonomy.module
+++ b/core/modules/taxonomy/taxonomy.module
@@ -786,9 +786,16 @@ function taxonomy_get_tree($vid, $parent = 0, $max_depth = NULL, $load_entities
           // in the event of multiple parents.
           $term = clone $term;
         }
-        $term->depth = $depth;
+        // @todo Clean-up once EntityNG all over.
+        if ($load_entities) {
+          $term->depth->value = $depth;
+        }
+        else {
+          $term->depth = $depth;
+        }
         unset($term->parent);
         $tid = $load_entities ? $term->id() : $term->tid;
+        // @todo Clean-up once EntityNG all over.
         $term->parents = $parents[$vid][$tid];
         $tree[] = $term;
         if (!empty($children[$vid][$tid])) {
@@ -1097,7 +1104,7 @@ function taxonomy_allowed_values($field, $instance, EntityInterface $entity) {
     if ($vocabulary = taxonomy_vocabulary_load($tree['vocabulary'])) {
       if ($terms = taxonomy_get_tree($vocabulary->id(), $tree['parent'], NULL, TRUE)) {
         foreach ($terms as $term) {
-          $options[$term->id()] = str_repeat('-', $term->depth) . $term->label();
+          $options[$term->id()] = str_repeat('-', $term->depth->value) . $term->label();
         }
       }
     }