diff --git a/modules/ercore_core/pages/ercore-admin-guide.inc b/modules/ercore_core/pages/ercore-admin-guide.inc
index 610fc4b..5bbaded 100644
--- a/modules/ercore_core/pages/ercore-admin-guide.inc
+++ b/modules/ercore_core/pages/ercore-admin-guide.inc
@@ -12,13 +12,13 @@ use Drupal\Core\Url;
  * Constructs the epscor admin guide.
  */
 function ercore_core_admin_guide() {
-  $user_guide = link::createFromRoute(
+  $user_guide = Link::createFromRoute(
     t('User Guide'),
     'ercore_core.ug1',
     array(),
     array())
     ->toString();
-  $admin_config = link::createFromRoute(
+  $admin_config = Link::createFromRoute(
     'administrative configuration page',
     'ercore_core.admin_settings_form',
     array(),
diff --git a/modules/ercore_core/pages/ercore-user-nsf.inc b/modules/ercore_core/pages/ercore-user-nsf.inc
index a09e64f..032b59f 100644
--- a/modules/ercore_core/pages/ercore-user-nsf.inc
+++ b/modules/ercore_core/pages/ercore-user-nsf.inc
@@ -14,7 +14,7 @@ use Drupal\Core\Url;
  * Our menu maps this function to the path 'ercore/guides/reporting'.
  */
 function ercore_user_nsf() {
-  $admin_config = link::createFromRoute(
+  $admin_config = Link::createFromRoute(
     'ERCore Reporting Module Settings',
     'ercore_core.admin_settings_form',
     array(),
diff --git a/modules/ercore_core/src/Form/ERCoreAccomplishments.php b/modules/ercore_core/src/Form/ERCoreAccomplishments.php
index 30de19e..c121680 100644
--- a/modules/ercore_core/src/Form/ERCoreAccomplishments.php
+++ b/modules/ercore_core/src/Form/ERCoreAccomplishments.php
@@ -170,7 +170,7 @@ class ERCoreAccomplishments extends FormBase {
       ->condition('type', 'ercore_j_highlight')
       ->condition('status', 1);
     $ids = $query->execute();
-    $node_storage = \Drupal::entityManager()->getStorage('node');
+    $node_storage = \Drupal::service('entity_type.manager')->getStorage('node');
     foreach ($ids as $id) {
       $node = $node_storage->load($id);
       $date = ErcoreStartDate::dateArgumentToUnix($node->get('field_ercore_hi_date')->value);
@@ -200,7 +200,7 @@ class ERCoreAccomplishments extends FormBase {
       ->condition('type', 'ercore_j_honor')
       ->condition('status', 1);
     $ids = $query->execute();
-    $node_storage = \Drupal::entityManager()->getStorage('node');
+    $node_storage = \Drupal::service('entity_type.manager')->getStorage('node');
     foreach ($ids as $id) {
       $node = $node_storage->load($id);
       $date = ErcoreStartDate::dateArgumentToUnix($node->get('field_ercore_hn_date')->value);
@@ -231,7 +231,7 @@ class ERCoreAccomplishments extends FormBase {
       ->condition('type', 'ercore_other_product')
       ->condition('status', 1);
     $ids = $query->execute();
-    $node_storage = \Drupal::entityManager()->getStorage('node');
+    $node_storage = \Drupal::service('entity_type.manager')->getStorage('node');
     foreach ($ids as $id) {
       $node = $node_storage->load($id);
       $date = ErcoreStartDate::dateArgumentToUnix($node->get('field_ercore_op_date')->value);
diff --git a/modules/ercore_core/src/Form/ERCoreAdmin.php b/modules/ercore_core/src/Form/ERCoreAdmin.php
index 68566c2..5be3fca 100644
--- a/modules/ercore_core/src/Form/ERCoreAdmin.php
+++ b/modules/ercore_core/src/Form/ERCoreAdmin.php
@@ -215,7 +215,7 @@ class ERCoreAdmin extends ConfigFormBase {
     $filter->set('ercore_chosen_range', 0);
     $filter->set('ercore_filter_start', ErcoreStartDate::startString());
     $filter->set('ercore_filter_end', ErcoreStartDate::endString());
-    drupal_set_message('Filters have been reset after base date update.');
+    $this->messenger()->addStatus('Filters have been reset after base date update.');
   }
 
 }
diff --git a/modules/ercore_core/src/Form/ERCoreDateFilter.php b/modules/ercore_core/src/Form/ERCoreDateFilter.php
index 3d48c42..50a6e16 100644
--- a/modules/ercore_core/src/Form/ERCoreDateFilter.php
+++ b/modules/ercore_core/src/Form/ERCoreDateFilter.php
@@ -191,7 +191,7 @@ class ERCoreDateFilter extends FormBase {
       $this->temp->set('ercore_filter_start', $string_array[$date_key]['start']);
       $this->temp->set('ercore_filter_end', $string_array[$date_key]['end']);
     }
-    drupal_set_message('Filter saved.');
+    $this->messenger()->addStatus('Filter saved.');
   }
 
   /**
@@ -215,7 +215,7 @@ class ERCoreDateFilter extends FormBase {
     $this->temp->set('ercore_filter_end', ErcoreStartDate::endString());
     $this->temp->set('ercore_value_start', ErcoreStartDate::startUnix());
     $this->temp->set('ercore_value_end', ErcoreStartDate::endUnix());
-    drupal_set_message('Filters have been reset.');
+    $this->messenger()->addStatus('Filters have been reset.');
   }
 
 }