diff --git a/src/Tests/TokenUserTest.php b/src/Tests/TokenUserTest.php
index dc3d9fb..1251e5a 100644
--- a/src/Tests/TokenUserTest.php
+++ b/src/Tests/TokenUserTest.php
@@ -57,7 +57,7 @@ class TokenUserTest extends TokenTestBase {
     $edit = array('files[user_picture_0]' => drupal_realpath($image->uri));
     $this->drupalPostForm('user/' . $this->account->id() . '/edit', $edit, t('Save'));
 
-    $storage = \Drupal::entityManager()->getStorage('user');
+    $storage = \Drupal::entityTypeManager()->getStorage('user');
 
     // Load actual user data from database.
     $storage->resetCache();
@@ -118,4 +118,4 @@ class TokenUserTest extends TokenTestBase {
     $this->assertLink('Browse available tokens.');
     $this->assertLinkByHref('token/tree');
   }
-}
+}
\ No newline at end of file
diff --git a/token.install b/token.install
index 00357f7..c50ecb9 100644
--- a/token.install
+++ b/token.install
@@ -37,14 +37,14 @@ function token_requirements($phase = 'runtime') {
  */
 function token_install() {
   // Create a token view mode for each entity type.
-  $info = \Drupal::entityManager()->getDefinitions();
+  $info = \Drupal::entityTypeManager()->getDefinitions();
   foreach ($info as $entity_type => $entity_type_info) {
     // We're only interested in entity types with a view builder.
     if (!$entity_type_info->getViewBuilderClass()) {
       continue;
     }
     // Try to find a token view mode for that entity type.
-    $storage = \Drupal::entityManager()->getStorage('entity_view_mode');
+    $storage = \Drupal::entityTypeManager()->getStorage('entity_view_mode');
     // Add a token view mode if it does not already exist.
     if (!$storage->load("$entity_type.token")) {
       $storage->create(array(
@@ -309,4 +309,4 @@ function token_get_token_problems() {
   }
 
   return $token_problems;
-}
+}
\ No newline at end of file
diff --git a/token.module b/token.module
index 599ec17..2a6154b 100644
--- a/token.module
+++ b/token.module
@@ -595,7 +595,7 @@ function token_taxonomy_term_load_all_parents($tid) {
   if (!isset($cache[$tid])) {
     $cache[$tid] = array();
     /** @var \Drupal\taxonomy\TermStorageInterface $term_storage */
-    $term_storage = \Drupal::entityManager()->getStorage('taxonomy_term');
+    $term_storage = \Drupal::entityTypeManager()->getStorage('taxonomy_term');
     $parents = $term_storage->loadAllParents($tid);
     // Remove this term from the array.
     array_shift($parents);
@@ -637,4 +637,4 @@ function token_element_children(&$elements, $sort = FALSE) {
   }
 
   return array_keys($children);
-}
+}
\ No newline at end of file
diff --git a/token.tokens.inc b/token.tokens.inc
index 34e6904..6a210ac 100644
--- a/token.tokens.inc
+++ b/token.tokens.inc
@@ -60,7 +60,7 @@ function token_token_info_alter(&$info) {
   $info['tokens']['user']['url']['type'] = 'url';
 
   // Add [token:url] tokens for any URI-able entities.
-  $entities = \Drupal::entityManager()->getDefinitions();
+  $entities = \Drupal::entityTypeManager()->getDefinitions();
   foreach ($entities as $entity => $entity_info) {
     /* @var \Drupal\Core\Entity\EntityType $entity_info */
     if (!$entity_info->get('token_type')) {
@@ -96,7 +96,7 @@ function token_token_info_alter(&$info) {
 
   // Add support for custom date formats.
   // @todo Remove when http://drupal.org/node/1173706 is fixed.
-  $date_format_types = \Drupal::entityManager()->getStorage('date_format')->loadMultiple();
+  $date_format_types = \Drupal::entityTypeManager()->getStorage('date_format')->loadMultiple();
   foreach ($date_format_types as $date_format_type => $date_format_type_info) {
     /* @var \Drupal\system\Entity\DateFormat $date_format_type_info */
     if (!isset($info['tokens']['date'][$date_format_type])) {
@@ -395,7 +395,7 @@ function token_tokens($type, array $tokens, array $data = array(), array $option
     $date = !empty($data['date']) ? $data['date'] : REQUEST_TIME;
 
     // @todo Remove when http://drupal.org/node/1173706 is fixed.
-    $date_format_types = \Drupal::entityManager()->getStorage('date_format')->loadMultiple();
+    $date_format_types = \Drupal::entityTypeManager()->getStorage('date_format')->loadMultiple();
     foreach ($tokens as $name => $original) {
       if (isset($date_format_types[$name]) && _token_module('date', $name) == 'token') {
         $replacements[$original] = format_date($date, $name, '', NULL, $langcode);
@@ -432,7 +432,7 @@ function token_tokens($type, array $tokens, array $data = array(), array $option
           $replacements[$original] = (string) $node->revision_log->value;
           break;
         case 'content-type':
-          $type_name = \Drupal::entityManager()->getStorage('node_type')->load($node->getType())->label();
+          $type_name = \Drupal::entityTypeManager()->getStorage('node_type')->load($node->getType())->label();
           $replacements[$original] = $type_name;
           break;
       }
@@ -486,7 +486,7 @@ function token_tokens($type, array $tokens, array $data = array(), array $option
     $term = $data['term'];
 
     /** @var \Drupal\taxonomy\TermStorageInterface $term_storage */
-    $term_storage = \Drupal::entityManager()->getStorage('taxonomy_term');
+    $term_storage = \Drupal::entityTypeManager()->getStorage('taxonomy_term');
 
     foreach ($tokens as $name => $original) {
       switch ($name) {
@@ -1151,7 +1151,7 @@ function field_token_info_alter(&$info) {
   $type_info = \Drupal::service('plugin.manager.field.field_type')->getDefinitions();
 
   // Attach field tokens to their respecitve entity tokens.
-  foreach (\Drupal::entityManager()->getDefinitions() as $entity_type_id => $entity_type) {
+  foreach (\Drupal::entityTypeManager()->getDefinitions() as $entity_type_id => $entity_type) {
     if (!$entity_type->isSubclassOf('\Drupal\Core\Entity\ContentEntityInterface')) {
       continue;
     }
@@ -1162,7 +1162,7 @@ function field_token_info_alter(&$info) {
       continue;
     }
 
-    $fields = \Drupal::entityManager()->getFieldStorageDefinitions($entity_type_id);
+    $fields = \Drupal::entityTypeManager()->getFieldStorageDefinitions($entity_type_id);
     foreach ($fields as $field_name => $field) {
       if (!($field instanceof FieldStorageConfigInterface)) {
         continue;
@@ -1321,4 +1321,4 @@ function token_pre_render_field_token($elements) {
     }
   }
   return $elements;
-}
+}
\ No newline at end of file