diff --git a/src/Plugin/Field/FieldFormatter/FormfieldDefaultFormatter.php b/src/Plugin/Field/FieldFormatter/FormfieldDefaultFormatter.php
index 7d7e943..2da3ae5 100644
--- a/src/Plugin/Field/FieldFormatter/FormfieldDefaultFormatter.php
+++ b/src/Plugin/Field/FieldFormatter/FormfieldDefaultFormatter.php
@@ -40,17 +40,17 @@ class FormfieldDefaultFormatter extends FormatterBase {
    */
   public function viewElements(FieldItemListInterface $items, $langcode) {
     $elements        = array();
-    $available_forms = \Drupal::entityManager()
+    $available_forms = \Drupal::service('entity_type.manager')
                               ->getStorage('contact_form')
                               ->loadMultiple();
     foreach ($items as $delta => $item) {
       if (isset($available_forms[$item->value])) {
         // Load the form with a specific $form_name.
         // Create the view for the form.
-        $entity  = \Drupal::entityManager()
+        $entity  = \Drupal::service('entity_type.manager')
                           ->getStorage('contact_form')
                           ->load($item->value);
-        $message = \Drupal::entityManager()
+        $message = \Drupal::service('entity_type.manager')
                           ->getStorage('contact_message')
                           ->create(array('contact_form' => $entity->id()));
         // Get the form based on the view defined above.
diff --git a/src/Plugin/Field/FieldWidget/FormfieldDefaultWidget.php b/src/Plugin/Field/FieldWidget/FormfieldDefaultWidget.php
index 3474b1f..a3ac781 100644
--- a/src/Plugin/Field/FieldWidget/FormfieldDefaultWidget.php
+++ b/src/Plugin/Field/FieldWidget/FormfieldDefaultWidget.php
@@ -87,7 +87,7 @@ class FormfieldDefaultWidget extends WidgetBase {
    * @see hook_field_widget_WIDGET_TYPE_form_alter()
    */
   public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) {
-    $available_forms    = \Drupal::entityManager()
+    $available_forms    = \Drupal::service('entity_type.manager')
                                  ->getStorage('contact_form')
                                  ->loadMultiple();
     $options         = array();