diff --git a/password_reset_tabs.module b/password_reset_tabs.module
index 3347749..29ec756 100644
--- a/password_reset_tabs.module
+++ b/password_reset_tabs.module
@@ -5,13 +5,15 @@
  * Module file for Password Reset Tab.
  */
 
+use Drupal\Core\Url;
+
 /**
  * Implements hook_help().
  */
 function password_reset_tabs_help($route_name) {
   switch ($route_name) {
     case "help.page.password_reset_tabs":
-      return '<p>' . t('Password reset tabs module provides a simple UI to change password.You can access this UI <a href="@pass_reset">here</a>', array('@pass_reset' => \Drupal::url('password_reset_tabs.provide_tabs'))) . '</p>';
+      return '<p>' . t('Password reset tabs module provides a simple UI to change password.You can access this UI <a href="@pass_reset">here</a>', array('@pass_reset' => Url::fromRoute('password_reset_tabs.provide_tabs'))) . '</p>';
   }
 }
 
diff --git a/src/Controller/IndexController.php b/src/Controller/IndexController.php
index 3684ab7..7b97d74 100644
--- a/src/Controller/IndexController.php
+++ b/src/Controller/IndexController.php
@@ -39,7 +39,7 @@ class IndexController extends UserController {
       return $element;
     }
     else {
-      return new RedirectResponse(\Drupal::url('password_reset_tabs.provide_tabs'));
+      return new RedirectResponse(Url::fromRoute('password_reset_tabs.provide_tabs'));
 
     }
   }
@@ -54,7 +54,7 @@ class IndexController extends UserController {
       return \Drupal::service('entity.form_builder')->getForm($user, 'default');
     }
     else {
-      return new RedirectResponse(\Drupal::url('password_reset_tabs.provide_tabs'));
+      return new RedirectResponse(Url::fromRoute('password_reset_tabs.provide_tabs'));
     }
   }
   /**
@@ -69,7 +69,7 @@ class IndexController extends UserController {
       $element = array(
         '#markup' => 'Your password changed successfully. ' .
         t('Click <a href="@login">here</a> to login.',
-        array('@login' => \Drupal::url('user.login'))) . '</p>',
+        array('@login' => Url::fromRoute('user.login'))) . '</p>',
         '#attached' => array(
           'library' => array('password_reset_tabs/tabs-js'),
         ),
@@ -77,7 +77,7 @@ class IndexController extends UserController {
       return $element;
     }
     else {
-      return new RedirectResponse(\Drupal::url('password_reset_tabs.provide_tabs'));
+      return new RedirectResponse(Url::fromRoute('password_reset_tabs.provide_tabs'));
     }
   }
 
@@ -107,7 +107,7 @@ class IndexController extends UserController {
           drupal_set_message($this->t('Another user (%other_user) is already logged into the site on this computer, but you tried to use a one-time link for user %resetting_user. Please <a href="@logout">logout</a> and try using the link again.', array(
             '%other_user' => $account->getUsername(),
             '%resetting_user' => $reset_link_user->getUsername(),
-            '@logout' => $this->url('user.logout'),
+            '@logout' => $this->getUrlGenerator()->generateFromRoute('user.logout'),
           )), 'warning');
         }
         else {