diff --git a/private_message.module b/private_message.module
index 3b31fdc..12bf48e 100644
--- a/private_message.module
+++ b/private_message.module
@@ -21,7 +21,7 @@ use Drupal\private_message\Entity\PrivateMessage;
  */
 function private_message_entity_extra_field_info() {
 
-  $private_message_thread_bundles = \Drupal::entityManager()->getBundleInfo('private_message_thread');
+  $private_message_thread_bundles = \Drupal::service('entity_type.bundle.info')->getBundleInfo('private_message_thread');
   foreach (array_keys($private_message_thread_bundles) as $bundle) {
     $fields['private_message_thread'][$bundle]['display']['last_message'] = [
       'label' => t('Last Message'),
@@ -45,7 +45,7 @@ function private_message_entity_extra_field_info() {
     ];
   }
 
-  $private_message_bundles = \Drupal::entityManager()->getBundleInfo('private_message');
+  $private_message_bundles = \Drupal::service('entity_type.bundle.info')->getBundleInfo('private_message');
   foreach (array_keys($private_message_bundles) as $bundle) {
     $fields['private_message'][$bundle]['form']['members'] = [
       'label' => t('Members'),
@@ -55,7 +55,7 @@ function private_message_entity_extra_field_info() {
     ];
   }
 
-  $user_bundles = \Drupal::entityManager()->getBundleInfo('user');
+  $user_bundles = \Drupal::service('entity_type.bundle.info')->getBundleInfo('user');
   foreach (array_keys($user_bundles) as $bundle) {
     $fields['user'][$bundle]['display']['linked_username'] = [
       'label' => t('Username (linked if viewer has permission)'),
@@ -79,7 +79,7 @@ function private_message_entity_extra_field_info() {
     ];
   }
 
-  $node_bundles = \Drupal::entityManager()->getBundleInfo('node');
+  $node_bundles = \Drupal::service('entity_type.bundle.info')->getBundleInfo('node');
   foreach (array_keys($node_bundles) as $bundle) {
     $fields['node'][$bundle]['display']['private_message_link'] = [
       'label' => t('Private message thread link'),
@@ -89,7 +89,7 @@ function private_message_entity_extra_field_info() {
     ];
   }
 
-  $node_bundles = \Drupal::entityManager()->getBundleInfo('comment');
+  $node_bundles = \Drupal::service('entity_type.bundle.info')->getBundleInfo('comment');
   foreach (array_keys($node_bundles) as $bundle) {
     $fields['comment'][$bundle]['display']['private_message_link'] = [
       'label' => t('Private message thread link'),
@@ -112,7 +112,7 @@ function private_message_private_message_thread_view(array &$build, EntityInterf
     $messages = $entity->getMessages();
     if ($messages) {
       $last_message = array_pop($messages);
-      $view_builder = \Drupal::entityManager()->getViewBuilder('private_message');
+      $view_builder = \Drupal::service('entity_type.manager')->getViewBuilder('private_message');
       $build['last_message'] = $view_builder->view($last_message, 'inbox');
     }
   }
@@ -517,7 +517,7 @@ function template_preprocess_private_message_thread(array &$variables) {
   // Provide a distinct $teaser boolean.
   $variables['private_message_thread'] = $variables['elements']['#private_message_thread'];
   $private_message_thread = $variables['private_message_thread'];
-  $variables['last_update'] = drupal_render($variables['elements']['updated']);
+  $variables['last_update'] = \Drupal::service('renderer')->render($variables['elements']['updated']);
 
   $variables['url'] = $private_message_thread->url('canonical', [
     'language' => $private_message_thread->language(),
diff --git a/private_message.tokens.inc b/private_message.tokens.inc
index 31032eb..2f1b18b 100644
--- a/private_message.tokens.inc
+++ b/private_message.tokens.inc
@@ -130,7 +130,7 @@ function private_message_tokens($type, $tokens, array $data, array $options, Bub
         case 'created':
           $date_format = DateFormat::load('medium');
           $bubbleable_metadata->addCacheableDependency($date_format);
-          $replacements[$original] = format_date($private_message->getCreatedTime(), 'medium', '', NULL, $langcode);
+          $replacements[$original] = \Drupal::service('date.formatter')->format($private_message->getCreatedTime(), 'medium', '', NULL, $langcode);
           break;
       }
     }
@@ -157,7 +157,7 @@ function private_message_tokens($type, $tokens, array $data, array $options, Bub
         case 'updated':
           $date_format = DateFormat::load('medium');
           $bubbleable_metadata->addCacheableDependency($date_format);
-          $replacements[$original] = format_date($private_message_thread->getUpdatedTime(), 'medium', '', NULL, $langcode);
+          $replacements[$original] = \Drupal::service('date.formatter')->format($private_message_thread->getUpdatedTime(), 'medium', '', NULL, $langcode);
           break;
       }
     }
diff --git a/src/Form/AdminUninstallForm.php b/src/Form/AdminUninstallForm.php
index 0fcb0db..7b244a0 100644
--- a/src/Form/AdminUninstallForm.php
+++ b/src/Form/AdminUninstallForm.php
@@ -78,7 +78,7 @@ class AdminUninstallForm extends ConfirmFormBase {
     ];
     batch_set($batch);
 
-    drupal_set_message($this->t('Private message data has been deleted.'));
+    $this->messenger()->addStatus($this->t('Private message data has been deleted.'));
   }
 
   /**
@@ -86,7 +86,7 @@ class AdminUninstallForm extends ConfirmFormBase {
    */
   public static function deletePrivateMessageAccessTimes(&$context) {
     $access_time_ids = \Drupal::entityQuery('pm_thread_access_time')->range(0, 100)->execute();
-    $storage = \Drupal::entityManager()->getStorage('pm_thread_access_time');
+    $storage = \Drupal::service('entity_type.manager')->getStorage('pm_thread_access_time');
     if ($access_times = $storage->loadMultiple($access_time_ids)) {
       $storage->delete($access_times);
     }
@@ -98,7 +98,7 @@ class AdminUninstallForm extends ConfirmFormBase {
    */
   public static function deletePrivateMessageDeleteTimes(&$context) {
     $delete_time_ids = \Drupal::entityQuery('pm_thread_delete_time')->range(0, 100)->execute();
-    $storage = \Drupal::entityManager()->getStorage('pm_thread_delete_time');
+    $storage = \Drupal::service('entity_type.manager')->getStorage('pm_thread_delete_time');
     if ($delete_times = $storage->loadMultiple($delete_time_ids)) {
       $storage->delete($delete_times);
     }
@@ -110,7 +110,7 @@ class AdminUninstallForm extends ConfirmFormBase {
    */
   public static function deletePrivateMessageMessages(&$context) {
     $private_message_ids = \Drupal::entityQuery('private_message')->range(0, 100)->execute();
-    $storage = \Drupal::entityManager()->getStorage('private_message');
+    $storage = \Drupal::service('entity_type.manager')->getStorage('private_message');
     if ($private_messages = $storage->loadMultiple($private_message_ids)) {
       $storage->delete($private_messages);
     }
@@ -122,7 +122,7 @@ class AdminUninstallForm extends ConfirmFormBase {
    */
   public static function deletePrivateMessageThreads(&$context) {
     $private_message_thread_ids = \Drupal::entityQuery('private_message_thread')->range(0, 100)->execute();
-    $storage = \Drupal::entityManager()->getStorage('private_message_thread');
+    $storage = \Drupal::service('entity_type.manager')->getStorage('private_message_thread');
     if ($private_message_threads = $storage->loadMultiple($private_message_thread_ids)) {
       $storage->delete($private_message_threads);
     }
diff --git a/src/Plugin/Field/FieldWidget/PrivateMessageThreadMemberWidget.php b/src/Plugin/Field/FieldWidget/PrivateMessageThreadMemberWidget.php
index 68e9c0d..f412c2e 100644
--- a/src/Plugin/Field/FieldWidget/PrivateMessageThreadMemberWidget.php
+++ b/src/Plugin/Field/FieldWidget/PrivateMessageThreadMemberWidget.php
@@ -161,7 +161,7 @@ class PrivateMessageThreadMemberWidget extends EntityReferenceAutocompleteWidget
     if ($this->currentUser->hasPermission('access user profiles')) {
       $recipient_id = $this->requestStack->getCurrentRequest()->get('recipient');
       if ($recipient_id) {
-        $recipient = user_load($recipient_id);
+        $recipient = \Drupal::service('entity_type.manager')->getStorage('user')->load($recipient_id);
         if ($recipient) {
           $element['target_id']['#default_value'] = $recipient;
         }