diff --git a/src/Controller/Services.php b/src/Controller/Services.php
index 69cf6ca..855f8bb 100644
--- a/src/Controller/Services.php
+++ b/src/Controller/Services.php
@@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Serializer\SerializerInterface;
-
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 /**
  * Class Services.
  *
@@ -52,7 +52,7 @@ class Services extends ControllerBase {
    */
   public function processRequest(Request $request, RouteMatchInterface $route_match, $service_endpoint_id, $service_definition_id) {
     /** @var $service_endpoint \Drupal\services\ServiceEndpointInterface */
-    $service_endpoint = $this->entityManager()->getStorage('service_endpoint')->load($service_endpoint_id);
+    $service_endpoint = $this->entityTypeManager()->getStorage('service_endpoint')->load($service_endpoint_id);
 
     //TODO - pull in settings from service API and alter response
 
diff --git a/src/Plugin/Deriver/AliasGet.php b/src/Plugin/Deriver/AliasGet.php
index c12b1ec..8c59b14 100644
--- a/src/Plugin/Deriver/AliasGet.php
+++ b/src/Plugin/Deriver/AliasGet.php
@@ -7,10 +7,12 @@
 namespace Drupal\services\Plugin\Deriver;
 
 use Drupal\ctools\Plugin\Deriver\EntityDeriverBase;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+
 
 class AliasGet extends EntityDeriverBase {
   public function getDerivativeDefinitions($base_plugin_definition) {
-    foreach ($this->entityManager->getDefinitions() as $entity_type_id => $entity_type) {
+    foreach ($this->entityTypeManager->getDefinitions() as $entity_type_id => $entity_type) {
       if ($entity_type_id === "node") {
         $this->derivatives[$entity_type_id] = $base_plugin_definition;
         $this->derivatives[$entity_type_id]['title'] = $this->t('@label: Alias Retrieve', ['@label' => $entity_type->getLabel()]);
diff --git a/src/Plugin/Deriver/EntityDelete.php b/src/Plugin/Deriver/EntityDelete.php
index 18242f5..2c48091 100644
--- a/src/Plugin/Deriver/EntityDelete.php
+++ b/src/Plugin/Deriver/EntityDelete.php
@@ -9,10 +9,11 @@ namespace Drupal\services\Plugin\Deriver;
 
 use Drupal\Core\Plugin\Context\ContextDefinition;
 use Drupal\ctools\Plugin\Deriver\EntityDeriverBase;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 
 class EntityDelete extends EntityDeriverBase {
   public function getDerivativeDefinitions($base_plugin_definition) {
-    foreach ($this->entityManager->getDefinitions() as $entity_type_id => $entity_type) {
+    foreach ($this->entityTypeManager->getDefinitions() as $entity_type_id => $entity_type) {
       $this->derivatives[$entity_type_id] = $base_plugin_definition;
       $this->derivatives[$entity_type_id]['title'] = $this->t('@label: Delete', ['@label' => $entity_type->getLabel()]);
       $this->derivatives[$entity_type_id]['description'] = $this->t('Deletes a @entity_type_id object.', ['@entity_type_id' => $entity_type_id]);
diff --git a/src/Plugin/Deriver/EntityGet.php b/src/Plugin/Deriver/EntityGet.php
index 0dbf0b3..fbe318f 100644
--- a/src/Plugin/Deriver/EntityGet.php
+++ b/src/Plugin/Deriver/EntityGet.php
@@ -9,10 +9,11 @@ namespace Drupal\services\Plugin\Deriver;
 
 use Drupal\Core\Plugin\Context\ContextDefinition;
 use Drupal\ctools\Plugin\Deriver\EntityDeriverBase;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 
 class EntityGet extends EntityDeriverBase {
   public function getDerivativeDefinitions($base_plugin_definition) {
-    foreach ($this->entityManager->getDefinitions() as $entity_type_id => $entity_type) {
+    foreach ($this->entityTypeManager->getDefinitions() as $entity_type_id => $entity_type) {
       $this->derivatives[$entity_type_id] = $base_plugin_definition;
       $this->derivatives[$entity_type_id]['title'] = $this->t('@label: Retrieve', ['@label' => $entity_type->getLabel()]);
       $this->derivatives[$entity_type_id]['description'] = $this->t('Retrieves a @entity_type_id object and serializes it as a response to the current request.', ['@entity_type_id' => $entity_type_id]);
diff --git a/src/Plugin/Deriver/EntityIndex.php b/src/Plugin/Deriver/EntityIndex.php
index 087d31d..4a93ed1 100644
--- a/src/Plugin/Deriver/EntityIndex.php
+++ b/src/Plugin/Deriver/EntityIndex.php
@@ -8,10 +8,11 @@ namespace Drupal\services\Plugin\Deriver;
 
 
 use Drupal\ctools\Plugin\Deriver\EntityDeriverBase;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 
 class EntityIndex extends EntityDeriverBase {
   public function getDerivativeDefinitions($base_plugin_definition) {
-    foreach ($this->entityManager->getDefinitions() as $entity_type_id => $entity_type) {
+    foreach ($this->entityTypeManager->getDefinitions() as $entity_type_id => $entity_type) {
       $this->derivatives[$entity_type_id] = $base_plugin_definition;
       $this->derivatives[$entity_type_id]['title'] = $this->t('@label: Index', ['@label' => $entity_type->getLabel()]);
       $this->derivatives[$entity_type_id]['description'] = $this->t('Index of @entity_type_id objects.', ['@entity_type_id' => $entity_type_id]);
diff --git a/src/Plugin/Deriver/EntityPost.php b/src/Plugin/Deriver/EntityPost.php
index ec444a3..0aff0d7 100644
--- a/src/Plugin/Deriver/EntityPost.php
+++ b/src/Plugin/Deriver/EntityPost.php
@@ -8,10 +8,11 @@ namespace Drupal\services\Plugin\Deriver;
 
 
 use Drupal\ctools\Plugin\Deriver\EntityDeriverBase;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 
 class EntityPost extends EntityDeriverBase {
   public function getDerivativeDefinitions($base_plugin_definition) {
-    foreach ($this->entityManager->getDefinitions() as $entity_type_id => $entity_type) {
+    foreach ($this->entityTypeManager->getDefinitions() as $entity_type_id => $entity_type) {
       $this->derivatives[$entity_type_id] = $base_plugin_definition;
       $this->derivatives[$entity_type_id]['title'] = $this->t('@label: Create', ['@label' => $entity_type->getLabel()]);
       $this->derivatives[$entity_type_id]['description'] = $this->t('Creates a @entity_type_id object and returns its id.', ['@entity_type_id' => $entity_type_id]);
diff --git a/src/Plugin/Deriver/EntityPut.php b/src/Plugin/Deriver/EntityPut.php
index 9fc3bf5..d0e03d4 100644
--- a/src/Plugin/Deriver/EntityPut.php
+++ b/src/Plugin/Deriver/EntityPut.php
@@ -9,10 +9,11 @@ namespace Drupal\services\Plugin\Deriver;
 
 use Drupal\Core\Plugin\Context\ContextDefinition;
 use Drupal\ctools\Plugin\Deriver\EntityDeriverBase;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 
 class EntityPut extends EntityDeriverBase {
   public function getDerivativeDefinitions($base_plugin_definition) {
-    foreach ($this->entityManager->getDefinitions() as $entity_type_id => $entity_type) {
+    foreach ($this->entityTypeManager->getDefinitions() as $entity_type_id => $entity_type) {
       $this->derivatives[$entity_type_id] = $base_plugin_definition;
       $this->derivatives[$entity_type_id]['title'] = $this->t('@label: Update', ['@label' => $entity_type->getLabel()]);
       $this->derivatives[$entity_type_id]['description'] = $this->t('Updates a @entity_type_id object and serializes it as a response to the current request.', ['@entity_type_id' => $entity_type_id]);
diff --git a/src/Plugin/Deriver/EntityView.php b/src/Plugin/Deriver/EntityView.php
index fea95ce..4390e99 100644
--- a/src/Plugin/Deriver/EntityView.php
+++ b/src/Plugin/Deriver/EntityView.php
@@ -9,10 +9,11 @@ namespace Drupal\services\Plugin\Deriver;
 
 use Drupal\Core\Plugin\Context\ContextDefinition;
 use Drupal\ctools\Plugin\Deriver\EntityDeriverBase;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 
 class EntityView extends EntityDeriverBase {
   public function getDerivativeDefinitions($base_plugin_definition) {
-    foreach ($this->entityManager->getDefinitions() as $entity_type_id => $entity_type) {
+    foreach ($this->entityTypeManager->getDefinitions() as $entity_type_id => $entity_type) {
       if ($entity_type->hasViewBuilderClass()) {
         $this->derivatives[$entity_type_id] = $base_plugin_definition;
         $this->derivatives[$entity_type_id]['title'] = $this->t('@label: View', ['@label' => $entity_type->getLabel()]);
diff --git a/src/Plugin/ServiceDefinition/EntityView.php b/src/Plugin/ServiceDefinition/EntityView.php
index e8ed7c6..04079a5 100644
--- a/src/Plugin/ServiceDefinition/EntityView.php
+++ b/src/Plugin/ServiceDefinition/EntityView.php
@@ -73,7 +73,7 @@ class EntityView extends ServiceDefinitionBase implements ContainerFactoryPlugin
     }
     /** @var $entity \Drupal\Core\Entity\EntityInterface */
     $entity = $this->getContextValue($this->getDerivativeId());
-    $view_builder = \Drupal::entityManager()->getViewBuilder($entity->getEntityTypeId());
+    $view_builder = \Drupal::entityTypeManager()->getViewBuilder($entity->getEntityTypeId());
     $render_array = $view_builder->view($entity, $view_mode);
 
     $result = [];
diff --git a/src/Plugin/ServiceDefinition/UserLogin.php b/src/Plugin/ServiceDefinition/UserLogin.php
index b6881b7..399d6e4 100644
--- a/src/Plugin/ServiceDefinition/UserLogin.php
+++ b/src/Plugin/ServiceDefinition/UserLogin.php
@@ -8,7 +8,7 @@ namespace Drupal\services\Plugin\ServiceDefinition;
 
 
 use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Entity\EntityManagerInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Flood\FloodInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\Core\Routing\RouteMatchInterface;
@@ -46,16 +46,16 @@ class UserLogin extends ServiceDefinitionBase implements ContainerFactoryPluginI
    *   The user authentication service.
    * @param \Drupal\Core\Flood\FloodInterface $flood
    *   The flood service.
-   * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
    *   The entity manager service.
    * @param Session $session
    */
-  public function __construct($configuration, $plugin_id, $plugin_definition, ConfigFactoryInterface $config_factory, UserAuthInterface $user_auth, FloodInterface $flood, EntityManagerInterface $entity_manager, Session $session) {
+  public function __construct($configuration, $plugin_id, $plugin_definition, ConfigFactoryInterface $config_factory, UserAuthInterface $user_auth, FloodInterface $flood, EntityTypeManagerInterface $entity_type_manager, Session $session) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
     $this->configFactory = $config_factory;
     $this->userAuth = $user_auth;
     $this->flood = $flood;
-    $this->entityManager = $entity_manager;
+    $this->entityTypeManager = $entity_type_manager;
     $this->session = $session;
   }
 
@@ -106,7 +106,7 @@ class UserLogin extends ServiceDefinitionBase implements ContainerFactoryPluginI
     // in to many different user accounts.  We have a reasonably high limit
     // since there may be only one apparent IP for all users at an institution.
     if ($this->flood->isAllowed('services.failed_login_ip', $flood_config->get('ip_limit'), $flood_config->get('ip_window'))) {
-      $accounts = $this->entityManager->getStorage('user')->loadByProperties(array('name' => $username, 'status' => 1));
+      $accounts = $this->entityTypeManager->getStorage('user')->loadByProperties(array('name' => $username, 'status' => 1));
       $account = reset($accounts);
       if ($account) {
         if ($flood_config->get('uid_only')) {
diff --git a/src/Routing/ServiceEndpoint.php b/src/Routing/ServiceEndpoint.php
index f6d3a3e..5524b5e 100644
--- a/src/Routing/ServiceEndpoint.php
+++ b/src/Routing/ServiceEndpoint.php
@@ -17,7 +17,7 @@ class ServiceEndpoint {
    * @todo does this implement some interface that we're not documenting?
    */
   public function routes() {
-    $endpoints = \Drupal::entityManager()->getStorage('service_endpoint')->loadMultiple();
+    $endpoints = \Drupal::entityTypeManager()->getStorage('service_endpoint')->loadMultiple();
     /** @var $manager \Drupal\services\ServiceDefinitionPluginManager */
     $manager = \Drupal::service('plugin.manager.services.service_definition');
 
diff --git a/src/ServiceDefinitionEntityRequestContentBase.php b/src/ServiceDefinitionEntityRequestContentBase.php
index 20c34b3..0458f78 100644
--- a/src/ServiceDefinitionEntityRequestContentBase.php
+++ b/src/ServiceDefinitionEntityRequestContentBase.php
@@ -7,7 +7,7 @@
 namespace Drupal\services;
 
 
-use Drupal\Core\Entity\EntityManagerInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -17,7 +17,7 @@ use Symfony\Component\Serializer\SerializerInterface;
 class ServiceDefinitionEntityRequestContentBase extends ServiceDefinitionBase implements ContainerFactoryPluginInterface {
 
   /**
-   * @var \Drupal\Core\Entity\EntityManagerInterface
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
    */
   protected $manager;
 
@@ -32,9 +32,9 @@ class ServiceDefinitionEntityRequestContentBase extends ServiceDefinitionBase im
    * @param array $configuration
    * @param string $plugin_id
    * @param mixed $plugin_definition
-   * @param EntityManagerInterface $manager
+   * @param EntityTypeManagerInterface $manager
    */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityManagerInterface $manager) {
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityTypeManagerInterface $manager) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
     $this->manager = $manager;
   }