diff --git a/node_accessibility.module b/node_accessibility.module
index 24ba0b9..9b93550 100644
--- a/node_accessibility.module
+++ b/node_accessibility.module
@@ -1,5 +1,11 @@
 <?php
 
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\quail_api\QuailApiSettings;
+use Drupal\node_accessibility\TypeSettingsStorage;
+use Drupal\node\Entity\Node;
+use Drupal\node_accessibility\PerformValidation;
+use Drupal\node_accessibility\ProblemsStorage;
 /**
  * @file
  * Module file for the node accessibility project.
@@ -8,11 +14,11 @@
 /**
  * Implements hook_form_FORM_ID_alter() for the node type form.
  */
-function node_accessibility_form_node_type_form_alter(array &$form, \Drupal\Core\Form\FormStateInterface $form_state, $form_id) {
-  $standards = \Drupal\quail_api\QuailApiSettings::get_standards_list();
-  $severitys = \Drupal\quail_api\QuailApiSettings::get_severity_list();
-  $methods = \Drupal\quail_api\QuailApiSettings::get_validation_methods();
-  $methods_list = \Drupal\quail_api\QuailApiSettings::get_validation_methods_list();
+function node_accessibility_form_node_type_form_alter(array &$form, FormStateInterface $form_state, $form_id) {
+  $standards = QuailApiSettings::get_standards_list();
+  $severitys = QuailApiSettings::get_severity_list();
+  $methods = QuailApiSettings::get_validation_methods();
+  $methods_list = QuailApiSettings::get_validation_methods_list();
   $filter_formats = filter_formats();
   $formats = [];
   $title_blocks = [];
@@ -46,7 +52,7 @@ function node_accessibility_form_node_type_form_alter(array &$form, \Drupal\Core
     return;
   }
 
-  $type_settings = \Drupal\node_accessibility\TypeSettingsStorage::load($node_type);
+  $type_settings = TypeSettingsStorage::load($node_type);
 
   $form['node_accessibility_validation'] = [
     '#type' => 'details',
@@ -124,30 +130,30 @@ function node_accessibility_form_node_type_form_alter(array &$form, \Drupal\Core
  * @param array $form_state
  *   A form state
  */
-function node_accessibility_node_type_form_submit(array &$form, \Drupal\Core\Form\FormStateInterface $form_state) {
+function node_accessibility_node_type_form_submit(array &$form, FormStateInterface $form_state) {
   $state_values = $form_state->getValues();
 
   if (isset($state_values['node_accessibility_validation'])) {
     $entity = $form_state->getFormObject()->getEntity();
     $state_values['node_accessibility_validation']['node_type'] = $entity->id();
-    $existing = \Drupal\node_accessibility\TypeSettingsStorage::merge($state_values['node_accessibility_validation']);
+    $existing = TypeSettingsStorage::merge($state_values['node_accessibility_validation']);
   }
 }
 
 /**
  * Implements hook_ENTITY_TYPE_insert().
  */
-function node_accessibility_node_insert(\Drupal\node\Entity\Node $node) {
+function node_accessibility_node_insert(Node $node) {
   $node_type = $node->getType();
-  $type_settings = \Drupal\node_accessibility\TypeSettingsStorage::loadAsArray($node_type);
-  $quail_methods = \Drupal\quail_api\QuailApiSettings::get_validation_methods();
+  $type_settings = TypeSettingsStorage::loadAsArray($node_type);
+  $quail_methods = QuailApiSettings::get_validation_methods();
 
   if (!empty($type_settings['method']) && isset($quail_methods[$type_settings['method']])) {
     $method = $quail_methods[$type_settings['method']];
 
     // only perform automated validation if both the database is enabled and automatic is enabled.
     if (isset($method['automatic']) && $method['automatic'] && isset($method['database']) && $method['database']) {
-      \Drupal\node_accessibility\PerformValidation::nodes([$node]);
+      PerformValidation::nodes([$node]);
     }
   }
 }
@@ -155,17 +161,17 @@ function node_accessibility_node_insert(\Drupal\node\Entity\Node $node) {
 /**
  * Implements hook_ENTITY_TYPE_update().
  */
-function node_accessibility_node_update(\Drupal\node\Entity\Node $node) {
+function node_accessibility_node_update(Node $node) {
   $node_type = $node->getType();
-  $type_settings = \Drupal\node_accessibility\TypeSettingsStorage::loadAsArray($node_type);
-  $quail_methods = \Drupal\quail_api\QuailApiSettings::get_validation_methods();
+  $type_settings = TypeSettingsStorage::loadAsArray($node_type);
+  $quail_methods = QuailApiSettings::get_validation_methods();
 
   if (!empty($type_settings['method']) && isset($quail_methods[$type_settings['method']])) {
     $method = $quail_methods[$type_settings['method']];
 
     // only perform automated validation if both the database is enabled and automatic is enabled.
     if (isset($method['automatic']) && $method['automatic'] && isset($method['database']) && $method['database']) {
-      \Drupal\node_accessibility\PerformValidation::nodes([$node]);
+      PerformValidation::nodes([$node]);
     }
   }
 }
@@ -173,6 +179,6 @@ function node_accessibility_node_update(\Drupal\node\Entity\Node $node) {
 /**
  * Implements hook_ENTITY_TYPE_delete().
  */
-function node_accessibility_node_delete(\Drupal\node\Entity\Node $node) {
-  \Drupal\node_accessibility\ProblemsStorage::delete_node_problems($node->nid->value, $node->vid->value);
+function node_accessibility_node_delete(Node $node) {
+  ProblemsStorage::delete_node_problems($node->nid->value, $node->vid->value);
 }
diff --git a/src/Controller/NodeAccessibilityController.php b/src/Controller/NodeAccessibilityController.php
index 3539902..8506f37 100644
--- a/src/Controller/NodeAccessibilityController.php
+++ b/src/Controller/NodeAccessibilityController.php
@@ -2,6 +2,8 @@
 
 namespace Drupal\node_accessibility\Controller;
 
+use Drupal\node_accessibility\Access\ViewAccessCheck;
+use Drupal\Core\Link;
 use Drupal\Component\Utility\Xss;
 use Drupal\Core\Url;
 use Drupal\user\Entity\User;
@@ -48,7 +50,7 @@ class NodeAccessibilityController extends NodeController {
     $default_revision = $node->getRevisionId();
 
     foreach ($this->getRevisionIds($node, $node_storage) as $vid) {
-      $validate_permission = \Drupal\node_accessibility\Access\ViewAccessCheck::check_node_access($account, $node->id(), $vid);
+      $validate_permission = ViewAccessCheck::check_node_access($account, $node->id(), $vid);
 
       /** @var \Drupal\node\NodeInterface $revision */
       $revision = $node_storage->loadRevision($vid);
@@ -63,10 +65,14 @@ class NodeAccessibilityController extends NodeController {
         // Use revision link to link to revisions that are not active.
         $date = $this->dateFormatter->format($revision->revision_timestamp->value, 'short');
         if ($vid != $node->getRevisionId()) {
-          $link = $this->l($date, new Url('entity.node.revision', ['node' => $node->id(), 'node_revision' => $vid]));
+          // TODO: Drupal Rector Notice: Please delete the following comment after you've made any necessary changes.
+          // Please manually remove the `use LinkGeneratorTrait;` statement from this class.
+          $link = Link::fromTextAndUrl($date, new Url('entity.node.revision', ['node' => $node->id(), 'node_revision' => $vid]));
         }
         else {
-          $link = $node->link($date);
+          // TODO: Drupal Rector Notice: Please delete the following comment after you've made any necessary changes.
+          // Please confirm that `$node` is an instance of `\Drupal\Core\Entity\EntityInterface`. Only the method name and not the class name was checked for this replacement, so this may be a false positive.
+          $link = $node->toLink($date)->toString();
         }
 
         $validation_text = NULL;
diff --git a/src/Form/ValidateFormBase.php b/src/Form/ValidateFormBase.php
index 7fdd2df..3005989 100644
--- a/src/Form/ValidateFormBase.php
+++ b/src/Form/ValidateFormBase.php
@@ -87,7 +87,7 @@ abstract class ValidateFormBase extends FormBase {
         $node_object = Node::load($node);
         if (!is_null($node_revision) && $node_object->vid->value != $node_revision) {
           $entity_type = $node_object->getEntityTypeId();
-          $node_object = \Drupal::entityManager()->getStorage($entity_type)->loadRevision($node_revision);
+          $node_object = \Drupal::service('entity_type.manager')->getStorage($entity_type)->loadRevision($node_revision);
           unset($entity_type);
         }
 
diff --git a/src/PerformValidation.php b/src/PerformValidation.php
index 69baf18..2b35969 100644
--- a/src/PerformValidation.php
+++ b/src/PerformValidation.php
@@ -70,7 +70,7 @@ class PerformValidation {
 
       if (!empty($node_type_standards)) {
         $node_view = node_view($node, 'full', $language);
-        $rendered_node = drupal_render($node_view);
+        $rendered_node = \Drupal::service('renderer')->render($node_view);
         unset($node_view);
 
         foreach ($node_type_standards as $standard_name) {
@@ -156,7 +156,7 @@ class PerformValidation {
 
       if ($node->vid->value != $revision_id) {
         $entity_type = $node->getEntityTypeId();
-        $node = \Drupal::entityManager()->getStorage($entity_type)->loadRevision($revision_id);
+        $node = \Drupal::service('entity_type.manager')->getStorage($entity_type)->loadRevision($revision_id);
         unset($entity_type);
       }
 
@@ -178,7 +178,7 @@ class PerformValidation {
 
       if (!empty($node_type_standards)) {
         $node_view = node_view($node, 'full', $language);
-        $rendered_node = drupal_render($node_view);
+        $rendered_node = \Drupal::service('renderer')->render($node_view);
         unset($node_view);
 
         foreach ($node_type_standards as $standard_name) {