diff --git a/mespronos.module b/mespronos.module
index db41724..6138913 100644
--- a/mespronos.module
+++ b/mespronos.module
@@ -1,5 +1,8 @@
 <?php
 
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\user\Entity\User;
+use Drupal\mespronos\Entity\RankingGeneral;
 /**
  * @file
  * Contains mespronos.module.
@@ -214,7 +217,7 @@ function mespronos_theme() {
 /**
  * Implements hook_form_alter().
  */
-function mespronos_form_views_exposed_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $form_state, $form_id) {
+function mespronos_form_views_exposed_form_alter(&$form, FormStateInterface $form_state, $form_id) {
   if($form['#id'] == 'views-exposed-form-admin-game-admin-games') {
     $input = $form_state->getUserInput();
     $leagues = League::loadMultiple();
@@ -249,7 +252,7 @@ function mespronos_form_views_exposed_form_alter(&$form, \Drupal\Core\Form\FormS
   }
 }
 
-function _mespronos_games_form_ajax_callback($form, \Drupal\Core\Form\FormStateInterface $form_state) {
+function _mespronos_games_form_ajax_callback($form, FormStateInterface $form_state) {
   return $form;
 }
 
@@ -318,7 +321,7 @@ function mespronos_entity_extra_field_info() {
   return $extra;
 }
 
-function mespronos_user_view(array &$build, Drupal\user\Entity\User $entity, EntityViewDisplay $display, $view_mode) {
+function mespronos_user_view(array &$build, User $entity, EntityViewDisplay $display, $view_mode) {
   if($view_mode == 'full') {
     $block_manager = \Drupal::service('plugin.manager.block');
     if ($display->getComponent('hall_of_flame')) {
@@ -332,7 +335,7 @@ function mespronos_user_view(array &$build, Drupal\user\Entity\User $entity, Ent
     }
     if ($display->getComponent('last_results')) {
       $lastBetController = new LastBetsController();
-      $user = \Drupal\user\Entity\User::load($entity->id());
+      $user = User::load($entity->id());
       $build['last_results'] = $lastBetController->lastBets(NULL,50,'BLOCK', $user,TRUE, TRUE);
     }
     if ($display->getComponent('last_bets')) {
@@ -348,7 +351,7 @@ function mespronos_user_view(array &$build, Drupal\user\Entity\User $entity, Ent
 
 function mespronos_preprocess_user(&$variables) {
   $user = $variables['user'];
-  $ranking = \Drupal\mespronos\Entity\RankingGeneral::getRankingForBetter($user);
+  $ranking = RankingGeneral::getRankingForBetter($user);
   $variables['position'] = $ranking ? $ranking->getPosition() : '-';
   $variables['points'] = $ranking ? $ranking->getPoints() : '-';
   $variables['bets'] = $ranking ? $ranking->getGameBetted() : '-';
@@ -358,13 +361,13 @@ function mespronos_preprocess_user(&$variables) {
 /**
  * Implements hook_user_update().
  */
-function mespronos_user_update(\Drupal\user\Entity\User $user) {
+function mespronos_user_update(User $user) {
   $query = \Drupal::entityQuery('day');
   $ids = $query->execute();
   $days = \Drupal::entityTypeManager()->getStorage("day")->loadMultiple($ids);
 
   $trans = \Drupal::service('transliteration');
-  $alias_manager = \Drupal::service('path.alias_manager');
+  $alias_manager = \Drupal::service('path_alias.manager');
   $alias_storage = \Drupal::service('path.alias_storage');
 
   foreach ($days as $day) {
@@ -379,13 +382,13 @@ function mespronos_user_update(\Drupal\user\Entity\User $user) {
 }
 
 
-function mespronos_form_user_register_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $form_state, $form_id) {
+function mespronos_form_user_register_form_alter(&$form, FormStateInterface $form_state, $form_id) {
   if(!\Drupal::moduleHandler()->moduleExists('mespronos_group')) {
     $form['bet_private']['#access'] = FALSE;
   }
 }
 
-function mespronos_form_user_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $form_state, $form_id) {
+function mespronos_form_user_form_alter(&$form, FormStateInterface $form_state, $form_id) {
   if(!\Drupal::moduleHandler()->moduleExists('mespronos_group') || \count(\Drupal::service('mespronos.user_manager')->getUserGroups()) == 0) {
     $form['bet_private']['#access'] = FALSE;
   }
diff --git a/mespronos.tokens.inc b/mespronos.tokens.inc
index 44237b6..179466f 100755
--- a/mespronos.tokens.inc
+++ b/mespronos.tokens.inc
@@ -1,5 +1,6 @@
 <?php
 
+use Drupal\mespronos\Entity\Team;
 /**
  * @file
  * Builds placeholder replacement tokens for node-related data.
@@ -214,7 +215,7 @@ function _mespronos_tokens_day($tokens, Day $day, &$replacements) {
   }
 }
 
-function _mespronos_tokens_team($tokens, \Drupal\mespronos\Entity\Team $team, &$replacements) {
+function _mespronos_tokens_team($tokens, Team $team, &$replacements) {
   foreach ($tokens as $name => $original) {
     switch ($name) {
       case 'id':
@@ -226,4 +227,4 @@ function _mespronos_tokens_team($tokens, \Drupal\mespronos\Entity\Team $team, &$
         break;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/mespronos_group/mespronos_group.install b/mespronos_group/mespronos_group.install
index 4a115ac..3164183 100644
--- a/mespronos_group/mespronos_group.install
+++ b/mespronos_group/mespronos_group.install
@@ -40,7 +40,9 @@ function mespronos_group_update_8004() {
  * User - create property bet_private
  */
 function mespronos_group_update_8005() {
-  $entity_manager = \Drupal::entityManager();
+  // TODO: Drupal Rector Notice: Please delete the following comment after you've made any necessary changes.
+  // We are assuming that we want to use the `entity_type.manager` service since no method was called here directly. Please confirm this is the case. See https://www.drupal.org/node/2549139 for more information.
+  $entity_manager = \Drupal::service('entity_type.manager');
   $definition = $entity_manager->getFieldStorageDefinitions('user')['bet_private'];
   $entity_manager->onFieldStorageDefinitionCreate($definition);
 }
\ No newline at end of file
diff --git a/mespronos_group/mespronos_group.module b/mespronos_group/mespronos_group.module
index 3f38385..dc4ae31 100644
--- a/mespronos_group/mespronos_group.module
+++ b/mespronos_group/mespronos_group.module
@@ -1,4 +1,7 @@
 <?php
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\Core\Field\BaseFieldDefinition;
 use Drupal\mespronos_group\Entity\Group;
 use Drupal\Core\Entity\Entity\EntityViewDisplay;
 use Drupal\Core\Cache\Cache;
@@ -92,7 +95,7 @@ function mespronos_group_group_view(array &$build, Group $entity, EntityViewDisp
   }
 }
 
-function mespronos_group_form_user_register_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $form_state, $form_id) {
+function mespronos_group_form_user_register_form_alter(&$form, FormStateInterface $form_state, $form_id) {
   $form['group_info'] = [
     '#type' => 'fieldset',
     '#title' => t('Optional : join a group'),
@@ -112,7 +115,7 @@ function mespronos_group_form_user_register_form_alter(&$form, \Drupal\Core\Form
   $form['#validate'][] = 'mespronos_group_form_user_register_form_validate';
 }
 
-function mespronos_group_form_user_register_form_validate(&$form, \Drupal\Core\Form\FormStateInterface $form_state) {
+function mespronos_group_form_user_register_form_validate(&$form, FormStateInterface $form_state) {
   $code = $form_state->getValue('group_access_code');
   if ($code != NULL) {
     $group = Group::loadByCode($code);
@@ -124,18 +127,18 @@ function mespronos_group_form_user_register_form_validate(&$form, \Drupal\Core\F
       $user = $formO->getEntity();
       $user->set('field_group', $group->id());
       if ($form['group_info']['group_access_code']['#type'] !== 'value') {
-        drupal_set_message(t('You are now part of the group %group_name', ['%group_name' => $group->label()]));
+        \Drupal::messenger()->addStatus(t('You are now part of the group %group_name', ['%group_name' => $group->label()]));
       }
       Cache::invalidateTags(array('groups', 'ranking'));
     }
   }
 }
 
-function mespronos_group_entity_base_field_info(\Drupal\Core\Entity\EntityTypeInterface $entity_type) {
+function mespronos_group_entity_base_field_info(EntityTypeInterface $entity_type) {
   if ($entity_type->id() === 'user') {
     $fields = [];
 
-    $fields['bet_private'] = \Drupal\Core\Field\BaseFieldDefinition::create('boolean')
+    $fields['bet_private'] = BaseFieldDefinition::create('boolean')
       ->setLabel(t('Hide my account on main website'))
       ->setDescription(t('Your ranking will only be visible on your group page, and will be hidden in the general ranking.'))
       ->setDefaultValue(0)
@@ -144,4 +147,4 @@ function mespronos_group_entity_base_field_info(\Drupal\Core\Entity\EntityTypeIn
 
     return $fields;
   }
-}
\ No newline at end of file
+}
diff --git a/mespronos_group/mespronos_group.tokens.inc b/mespronos_group/mespronos_group.tokens.inc
index 181047e..f8df9ec 100755
--- a/mespronos_group/mespronos_group.tokens.inc
+++ b/mespronos_group/mespronos_group.tokens.inc
@@ -1,5 +1,6 @@
 <?php
 
+use Drupal\mespronos_group\Entity\Group;
 /**
  * @file
  * Builds placeholder replacement tokens for node-related data.
@@ -45,7 +46,7 @@ function mespronos_group_tokens($type, $tokens, array $data) {
   return $replacements;
 }
 
-function _mespronos_group_tokens_group($tokens, Drupal\mespronos_group\Entity\Group $group, &$replacements) {
+function _mespronos_group_tokens_group($tokens, Group $group, &$replacements) {
   foreach ($tokens as $name => $original) {
     switch ($name) {
       case 'gid':
@@ -56,4 +57,4 @@ function _mespronos_group_tokens_group($tokens, Drupal\mespronos_group\Entity\Gr
         break;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/mespronos_group/src/EventSubscriber/MespronosGroupSubscriber.php b/mespronos_group/src/EventSubscriber/MespronosGroupSubscriber.php
index 7c97579..9452a3e 100644
--- a/mespronos_group/src/EventSubscriber/MespronosGroupSubscriber.php
+++ b/mespronos_group/src/EventSubscriber/MespronosGroupSubscriber.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\mespronos_group\EventSubscriber;
 
+use Drupal\Core\Url;
 use Drupal\Core\Routing\CurrentRouteMatch;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
@@ -54,9 +55,9 @@ class MespronosGroupSubscriber implements EventSubscriberInterface {
     if ($this->route_match->getRouteName() != 'entity.group.canonical') {
       return;
     }
-    drupal_set_message(t('You are not a member of this group'), 'warning');
+    \Drupal::messenger()->addWarning(t('You are not a member of this group'));
     $group = $this->route_match->getParameter('group');
-    $response = new RedirectResponse(\Drupal::url('mespronos_group.group.join', ['group'=>$group->id()]));
+    $response = new RedirectResponse(Url::fromRoute('mespronos_group.group.join', ['group'=>$group->id()])->toString());
     $event->setResponse($response);
   }
 
diff --git a/mespronos_group/src/Form/GroupDeleteForm.php b/mespronos_group/src/Form/GroupDeleteForm.php
index f5ada6c..8284969 100644
--- a/mespronos_group/src/Form/GroupDeleteForm.php
+++ b/mespronos_group/src/Form/GroupDeleteForm.php
@@ -24,7 +24,9 @@ class GroupDeleteForm extends ContentEntityDeleteForm {
   public function getCancelUrl() {
     /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
     $entity = $this->getEntity();
-    return $entity->urlInfo('canonical');
+    // TODO: Drupal Rector Notice: Please delete the following comment after you've made any necessary changes.
+    // Please confirm that `$entity` 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.
+    return $entity->toUrl('canonical');
   }
 
   /**
diff --git a/mespronos_group/src/Form/GroupForm.php b/mespronos_group/src/Form/GroupForm.php
index 51b5558..48023f5 100644
--- a/mespronos_group/src/Form/GroupForm.php
+++ b/mespronos_group/src/Form/GroupForm.php
@@ -116,7 +116,7 @@ class GroupForm extends ContentEntityForm {
           $user->set("field_group", $usergroups);
           $user->save();
         }
-        drupal_set_message($this->t('You\'ve just created the %label Group.', [
+        $this->messenger()->addStatus($this->t('You\'ve just created the %label Group.', [
           '%label' => $entity->label(),
         ]));
 
@@ -126,7 +126,7 @@ class GroupForm extends ContentEntityForm {
         break;
 
       default:
-        drupal_set_message($this->t('Saved the %label Group.', [
+        $this->messenger()->addStatus($this->t('Saved the %label Group.', [
           '%label' => $entity->label(),
         ]));
     }
diff --git a/mespronos_group/src/Form/GroupJoiningForm.php b/mespronos_group/src/Form/GroupJoiningForm.php
index c75227b..8e4b9e5 100644
--- a/mespronos_group/src/Form/GroupJoiningForm.php
+++ b/mespronos_group/src/Form/GroupJoiningForm.php
@@ -33,8 +33,8 @@ class GroupJoiningForm extends FormBase {
     $user = \Drupal::currentUser();
     $user = User::load($user->id());
     if ($group->isMemberOf($user)) {
-      drupal_set_message(t('You are already part of %group_name group', ['%group_name'=>$group->label()]));
-      return new RedirectResponse(\Drupal::url('entity.group.canonical', ['group'=>$group->id()]));
+      $this->messenger()->addStatus(t('You are already part of %group_name group', ['%group_name'=>$group->label()]));
+      return new RedirectResponse(Url::fromRoute('entity.group.canonical', ['group'=>$group->id()])->toString());
     }
 
     $form['wrapper'] = [
@@ -82,7 +82,7 @@ class GroupJoiningForm extends FormBase {
     $user->set("field_group", $usergroups);
     $user->save();
     Cache::invalidateTags(array('group:'.$group->id(), 'groups', 'ranking'));
-    drupal_set_message(t('You are now part of the group %group_name', ['%group_name'=>$group->label()]));
+    $this->messenger()->addStatus(t('You are now part of the group %group_name', ['%group_name'=>$group->label()]));
     $url = new Url('entity.group.canonical', ['group'=>$group->id()]);
     $form_state->setRedirectUrl($url);
   }
diff --git a/mespronos_group/src/Form/GroupLeavingForm.php b/mespronos_group/src/Form/GroupLeavingForm.php
index 63ca011..a30ab21 100644
--- a/mespronos_group/src/Form/GroupLeavingForm.php
+++ b/mespronos_group/src/Form/GroupLeavingForm.php
@@ -53,7 +53,7 @@ class GroupLeavingForm extends ConfirmFormBase {
     $user = \Drupal::currentUser();
     $user = User::load($user->id());
     if (!$group->isMemberOf($user)) {
-      drupal_set_message(t('You are not a member of of %group_name group', ['%group_name'=>$group->label()]));
+      $this->messenger()->addStatus(t('You are not a member of of %group_name group', ['%group_name'=>$group->label()]));
       return new RedirectResponse($this->getCancelUrl());
     }
     return parent::buildForm($form, $form_state);
diff --git a/mespronos_group/src/GroupListBuilder.php b/mespronos_group/src/GroupListBuilder.php
index ff1b5fc..5c2560e 100644
--- a/mespronos_group/src/GroupListBuilder.php
+++ b/mespronos_group/src/GroupListBuilder.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\mespronos_group;
 
+use Drupal\Core\Link;
 use Drupal\Core\Entity\Entity;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityListBuilder;
@@ -45,14 +46,13 @@ class GroupListBuilder extends EntityListBuilder {
     $row['id'] = $entity->id();
     $logo = $render_controller->view($entity, 'logo');
     $row['logo'] = render($logo);
-    $row['name'] = $this->l(
-      $entity->label(),
-      new Url(
-        'entity.group.canonical', array(
-          'group' => $entity->id(),
-        )
+    // 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.
+    $row['name'] = Link::fromTextAndUrl($entity->label(), new Url(
+      'entity.group.canonical', array(
+        'group' => $entity->id(),
       )
-    );
+    ));
     $row['code'] = $entity->getCode();
     $row['members'] = $entity->getMemberNumber();
     $status = ['#markup' => $entity->isPublishedAsVisual()];
diff --git a/src/Controller/AdministrationController.php b/src/Controller/AdministrationController.php
index a6e0cd8..493320e 100644
--- a/src/Controller/AdministrationController.php
+++ b/src/Controller/AdministrationController.php
@@ -27,7 +27,7 @@ class AdministrationController extends ControllerBase {
   public function setMarks() {
     $games = \Drupal::service('mespronos.game_manager')->getGamesToSetMarks();
     if (count($games) == 0) {
-      drupal_set_message($this->t('There\'s no game for which mark is not set'));
+      $this->messenger()->addStatus($this->t('There\'s no game for which mark is not set'));
     }
     $form = \Drupal::formBuilder()->getForm('Drupal\mespronos\Form\GamesMarks', $games);
     return $form;
diff --git a/src/Controller/BetController.php b/src/Controller/BetController.php
index 35dca0b..de0e78e 100644
--- a/src/Controller/BetController.php
+++ b/src/Controller/BetController.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\mespronos\Controller;
 
+use Drupal\Core\Url;
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\mespronos\Entity\Bet;
 use Drupal\mespronos\Entity\Day;
@@ -66,7 +67,7 @@ class BetController extends ControllerBase {
     foreach ($games as $game) {
       self::updateBetsFromGame($game);
     }
-    drupal_set_message(t('Points updated for @nb games', ['@nb' => \count($games)]));
+    $this->messenger()->addStatus(t('Points updated for @nb games', ['@nb' => \count($games)]));
     $response = RankingController::recalculateDay($day);
     return $response;
   }
@@ -96,7 +97,7 @@ class BetController extends ControllerBase {
     $batch['operations'][] = ['\Drupal\mespronos\Entity\RankingLeague::createRanking', [$league]];
     $batch['operations'][] = ['\Drupal\mespronos\Entity\RankingGeneral::createRanking', []];
     batch_set($batch);
-    return batch_process(\Drupal::url('entity.league.collection'));
+    return batch_process(Url::fromRoute('entity.league.collection')->toString());
   }
 
   public static function updateBetsForLeagueOver($success, $results, $operations) {
@@ -105,9 +106,9 @@ class BetController extends ControllerBase {
     } else {
       $message = t('Finished with an error.');
     }
-    drupal_set_message($message);
+    $this->messenger()->addStatus($message);
     Cache::invalidateTags(array('ranking'));
-    return new RedirectResponse(\Drupal::url('entity.league.collection'));
+    return new RedirectResponse(Url::fromRoute('entity.league.collection')->toString());
   }
 
   public static function getLastUserBetsTable(User $user, $nb_bets = 20, Day $day = NULL) {
@@ -146,7 +147,7 @@ class BetController extends ControllerBase {
    * @param \Drupal\mespronos\Entity\Day $day
    * @return integer number of game left to bet
    */
-  public static function betsLeft(\Drupal\user\Entity\User $user, Day $day) {
+  public static function betsLeft(User $user, Day $day) {
     $now_date = new \DateTime();
     $now_date->setTimezone(new \DateTimeZone('GMT'));
 
diff --git a/src/Controller/BettingController.php b/src/Controller/BettingController.php
index f2902a6..89b4ad7 100644
--- a/src/Controller/BettingController.php
+++ b/src/Controller/BettingController.php
@@ -23,7 +23,7 @@ class BettingController extends ControllerBase {
     $user = \Drupal::currentUser();
     $user = User::load($user->id());
     if ($day === NULL) {
-      drupal_set_message($this->t('This day doesn\'t exist.'), 'error');
+      $this->messenger()->addError($this->t('This day doesn\'t exist.'));
       throw new AccessDeniedHttpException();
     }
     $form = \Drupal::formBuilder()->getForm('Drupal\mespronos\Form\GamesBetting', $day, $user);
diff --git a/src/Controller/ImporterController.php b/src/Controller/ImporterController.php
index cd7e05e..9f1338c 100644
--- a/src/Controller/ImporterController.php
+++ b/src/Controller/ImporterController.php
@@ -110,7 +110,7 @@ class ImporterController extends ControllerBase {
       ));
       $sport->save();
     } else {
-      $sport = entity_load('sport', array_pop($id));
+      $sport = \Drupal::service('entity_type.manager')->getStorage('sport')->load(array_pop($id));
     }
     return $sport;
   }
@@ -130,10 +130,10 @@ class ImporterController extends ControllerBase {
         'status' => $_league['status'],
       ));
       $league->save();
-      drupal_set_message(t('The league @league_name of @sport_name has been created', array('@league_name'=> $_league['name'], '@sport_name'=>$sport->get('name')->value)));
+      $this->messenger()->addStatus(t('The league @league_name of @sport_name has been created', array('@league_name'=> $_league['name'], '@sport_name'=>$sport->get('name')->value)));
     }
     else {
-      $league = entity_load('league', array_pop($id));
+      $league = \Drupal::service('entity_type.manager')->getStorage('league')->load(array_pop($id));
     }
     return $league;
   }
@@ -150,10 +150,10 @@ class ImporterController extends ControllerBase {
         'name' => isset($day['name']) ? $day['name'] : t('Journée @nb', array('@nb'=>$day['number'])),
       ));
       $day->save();
-      drupal_set_message(t('The day @number of @league_name has been created', array('@league_name'=> $league->get('name')->value, '@number'=>$day->get('number')->value)));
+      $this->messenger()->addStatus(t('The day @number of @league_name has been created', array('@league_name'=> $league->get('name')->value, '@number'=>$day->get('number')->value)));
     }
     else {
-      $day = entity_load('day', array_pop($id));
+      $day = \Drupal::service('entity_type.manager')->getStorage('day')->load(array_pop($id));
     }
     return $day;
   }
@@ -166,10 +166,10 @@ class ImporterController extends ControllerBase {
         'name' => $team_name,
       ));
       $team->save();
-      drupal_set_message(t('The team @team has been created', array('@team'=> $team_name)));
+      $this->messenger()->addStatus(t('The team @team has been created', array('@team'=> $team_name)));
     }
     else {
-      $team = entity_load('team', array_pop($id));
+      $team = \Drupal::service('entity_type.manager')->getStorage('team')->load(array_pop($id));
     }
     return $team;
   }
@@ -196,7 +196,7 @@ class ImporterController extends ControllerBase {
         $game->setScore($score_team_1, $score_team_2);
       }
       $game->save();
-      drupal_set_message(t('The game @team1 - @team2 has been created', array('@team1'=> $team_1->get('name')->value, '@team2'=> $team_2->get('name')->value)));
+      $this->messenger()->addStatus(t('The game @team1 - @team2 has been created', array('@team1'=> $team_1->get('name')->value, '@team2'=> $team_2->get('name')->value)));
       return 'CREATED';
     } else {
       $game = Game::load(array_pop($id));
diff --git a/src/Controller/LastBetsController.php b/src/Controller/LastBetsController.php
index b2cd745..63e00ab 100644
--- a/src/Controller/LastBetsController.php
+++ b/src/Controller/LastBetsController.php
@@ -37,7 +37,7 @@ class LastBetsController extends ControllerBase {
     if(\count($days) === 0) {
 
       $url = Url::fromRoute('mespronos.leagues.list');
-      return ['#markup' => '<div class="columns small-12">Aucun résultat pour l\'instant, retrouvez les compétions archivées sur la page ' . \Drupal::l('Compétitions', $url) . '.</div>'];
+      return ['#markup' => '<div class="columns small-12">Aucun résultat pour l\'instant, retrouvez les compétions archivées sur la page ' . Link::fromTextAndUrl('Compétitions', $url) . '.</div>'];
     }
     $build = [
       '#cache' => [
diff --git a/src/Controller/RankingController.php b/src/Controller/RankingController.php
index 3eca083..a32a24b 100644
--- a/src/Controller/RankingController.php
+++ b/src/Controller/RankingController.php
@@ -1,6 +1,7 @@
 <?php
 namespace Drupal\mespronos\Controller;
 
+use Drupal\user\Entity\User;
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\mespronos\Entity\League;
 use Drupal\mespronos\Entity\Base\RankingBase;
@@ -41,9 +42,9 @@ class RankingController extends ControllerBase {
     $nb_updates = RankingDay::createRanking($day);
     RankingLeague::createRanking($day->getLeague());
     RankingGeneral::createRanking();
-    drupal_set_message(t('Ranking updated for @nb betters', array('@nb' => $nb_updates)));
+    $this->messenger()->addStatus(t('Ranking updated for @nb betters', array('@nb' => $nb_updates)));
     Cache::invalidateTags(array('ranking'));
-    return new RedirectResponse(\Drupal::url('entity.day.collection'));
+    return new RedirectResponse(Url::fromRoute('entity.day.collection')->toString());
   }
 
   public static function sortRankingDataAndDefinedPosition(&$data) {
@@ -130,7 +131,7 @@ class RankingController extends ControllerBase {
         $current_rank = $next_rank;
       }
 
-      $better = \Drupal\user\Entity\User::load($ranking->getOwner()->id());
+      $better = User::load($ranking->getOwner()->id());
       $better_renderable = UserController::getRenderableUser($better);
 
       $position = [
@@ -183,7 +184,7 @@ class RankingController extends ControllerBase {
    * @param \Drupal\user\Entity\User $user
    * @return array
    */
-  public static function getPalmares(\Drupal\user\Entity\User $user) {
+  public static function getPalmares(User $user) {
     $data = self::getPalmaresData($user);
     $items = [];
     foreach ($data as $item) {
@@ -203,7 +204,7 @@ class RankingController extends ControllerBase {
     return $items;
   }
 
-  private static function getPalmaresData(\Drupal\user\Entity\User $user) {
+  private static function getPalmaresData(User $user) {
 
     $injected_database = Database::getConnection();
     $query = $injected_database->select('mespronos__league', 'l');
diff --git a/src/Entity/Controller/BetListController.php b/src/Entity/Controller/BetListController.php
index 6ec7472..dd74a12 100644
--- a/src/Entity/Controller/BetListController.php
+++ b/src/Entity/Controller/BetListController.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\mespronos\Entity\Controller;
 
+use Drupal\Core\Link;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityListBuilder;
 use Drupal\Core\Url;
@@ -34,14 +35,11 @@ class BetListController extends EntityListBuilder {
     /* @var $entity \Drupal\mespronos\Entity\Bet */
     $row = [];
     $row['id'] = $entity->id();
-    $row['name'] = \Drupal::l(
-      $this->getLabel($entity),
-      new Url(
-        'entity.bet.edit_form', array(
-          'bet' => $entity->id(),
-        )
+    $row['name'] = Link::fromTextAndUrl($this->getLabel($entity), new Url(
+      'entity.bet.edit_form', array(
+        'bet' => $entity->id(),
       )
-    );
+    ));
     return $row + parent::buildRow($entity);
   }
 
diff --git a/src/Entity/Controller/DayListController.php b/src/Entity/Controller/DayListController.php
index 35bf753..2e54d4e 100644
--- a/src/Entity/Controller/DayListController.php
+++ b/src/Entity/Controller/DayListController.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\mespronos\Entity\Controller;
 
+use Drupal\Core\Link;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityListBuilder;
 use Drupal\Core\Url;
@@ -40,14 +41,11 @@ class DayListController extends EntityListBuilder
     $row = [];
     $row['id'] = $entity->id();
     $row['league'] = $league->label();
-    $row['name'] = \Drupal::l(
-        $this->getLabel($entity),
-        new Url(
-          'entity.day.edit_form', array(
-            'day' => $entity->id(),
-        )
-      )
-    );
+    $row['name'] = Link::fromTextAndUrl($this->getLabel($entity), new Url(
+      'entity.day.edit_form', array(
+        'day' => $entity->id(),
+    )
+  ));
     $row['nb_game'] = $entity->getNbGame();
     return $row + parent::buildRow($entity);
   }
diff --git a/src/Entity/Controller/GameListController.php b/src/Entity/Controller/GameListController.php
index c7bdeba..7764b7e 100644
--- a/src/Entity/Controller/GameListController.php
+++ b/src/Entity/Controller/GameListController.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\mespronos\Entity\Controller;
 
+use Drupal\Core\Link;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityListBuilder;
 use Drupal\Core\Url;
@@ -43,15 +44,12 @@ class GameListController extends EntityListBuilder {
     $row['id'] = $entity->id();
     $row['league'] = $league->label();
     $row['day'] = $day->label();
-    $row['game_date'] = format_date($date->format('U'), 'short');
-    $row['name'] = \Drupal::l(
-      $this->getLabel($entity),
-      new Url(
-        'entity.game.edit_form', array(
-          'game' => $entity->id(),
-        )
+    $row['game_date'] = \Drupal::service('date.formatter')->format($date->format('U'), 'short');
+    $row['name'] = Link::fromTextAndUrl($this->getLabel($entity), new Url(
+      'entity.game.edit_form', array(
+        'game' => $entity->id(),
       )
-    );
+    ));
     $row['score'] = $entity->get('score_team_1')->value.' - '.$entity->get('score_team_2')->value;
     return $row + parent::buildRow($entity);
   }
diff --git a/src/Entity/Controller/LeagueListController.php b/src/Entity/Controller/LeagueListController.php
index fb96532..3c425f0 100644
--- a/src/Entity/Controller/LeagueListController.php
+++ b/src/Entity/Controller/LeagueListController.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\mespronos\Entity\Controller;
 
+use Drupal\Core\Link;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityListBuilder;
 use Drupal\Core\Url;
@@ -40,14 +41,11 @@ class LeagueListController extends EntityListBuilder {
     $sport = $entity->getSport();
     $row['id'] = $entity->id();
     $row['sport'] = $sport->label();
-    $row['name'] = \Drupal::l(
-      $this->getLabel($entity),
-      new Url(
-        'entity.league.edit_form', array(
-          'league' => $entity->id(),
-        )
+    $row['name'] = Link::fromTextAndUrl($this->getLabel($entity), new Url(
+      'entity.league.edit_form', array(
+        'league' => $entity->id(),
       )
-    );
+    ));
     $row['status'] = $entity->getStatus(false);
     $row['betting_type'] = $entity->getBettingType(false);
     $row['classement'] = $entity->hasClassement() ? '✓' : '✗';
diff --git a/src/Entity/Controller/RankingDayListController.php b/src/Entity/Controller/RankingDayListController.php
index 936c1be..07ad0de 100644
--- a/src/Entity/Controller/RankingDayListController.php
+++ b/src/Entity/Controller/RankingDayListController.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\mespronos\Entity\Controller;
 
+use Drupal\Core\Link;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityListBuilder;
 use Drupal\Core\Url;
@@ -34,14 +35,11 @@ class RankingDayListController extends EntityListBuilder {
     /* @var $entity \Drupal\mespronos\Entity\RankingDay */
     $row = [];
     $row['id'] = $entity->id();
-    $row['name'] = \Drupal::l(
-      $this->getLabel($entity),
-      new Url(
-        'entity.ranking_day.edit_form', array(
-          'ranking_day' => $entity->id(),
-        )
+    $row['name'] = Link::fromTextAndUrl($this->getLabel($entity), new Url(
+      'entity.ranking_day.edit_form', array(
+        'ranking_day' => $entity->id(),
       )
-    );
+    ));
     return $row + parent::buildRow($entity);
   }
 
diff --git a/src/Entity/Controller/RankingGeneralListController.php b/src/Entity/Controller/RankingGeneralListController.php
index 7acea03..85f36be 100644
--- a/src/Entity/Controller/RankingGeneralListController.php
+++ b/src/Entity/Controller/RankingGeneralListController.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\mespronos\Entity\Controller;
 
+use Drupal\Core\Link;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityListBuilder;
 use Drupal\Core\Url;
@@ -34,14 +35,11 @@ class RankingGeneralListController extends EntityListBuilder {
     /* @var $entity \Drupal\mespronos\Entity\RankingGeneral */
     $row = [];
     $row['id'] = $entity->id();
-    $row['name'] = \Drupal::l(
-      $this->getLabel($entity),
-      new Url(
-        'entity.ranking_general.edit_form', array(
-          'ranking_league' => $entity->id(),
-        )
+    $row['name'] = Link::fromTextAndUrl($this->getLabel($entity), new Url(
+      'entity.ranking_general.edit_form', array(
+        'ranking_league' => $entity->id(),
       )
-    );
+    ));
     return $row + parent::buildRow($entity);
   }
 
diff --git a/src/Entity/Controller/RankingLeagueListController.php b/src/Entity/Controller/RankingLeagueListController.php
index a8f912f..9d5ef75 100644
--- a/src/Entity/Controller/RankingLeagueListController.php
+++ b/src/Entity/Controller/RankingLeagueListController.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\mespronos\Entity\Controller;
 
+use Drupal\Core\Link;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityListBuilder;
 use Drupal\Core\Url;
@@ -34,14 +35,11 @@ class RankingLeagueListController extends EntityListBuilder {
     /* @var $entity \Drupal\mespronos\Entity\RankingLeague */
     $row = [];
     $row['id'] = $entity->id();
-    $row['name'] = \Drupal::l(
-      $this->getLabel($entity),
-      new Url(
-        'entity.ranking_league.edit_form', array(
-          'ranking_league' => $entity->id(),
-        )
+    $row['name'] = Link::fromTextAndUrl($this->getLabel($entity), new Url(
+      'entity.ranking_league.edit_form', array(
+        'ranking_league' => $entity->id(),
       )
-    );
+    ));
     return $row + parent::buildRow($entity);
   }
 
diff --git a/src/Entity/Controller/SportListController.php b/src/Entity/Controller/SportListController.php
index 4c45e23..005763a 100644
--- a/src/Entity/Controller/SportListController.php
+++ b/src/Entity/Controller/SportListController.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\mespronos\Entity\Controller;
 
+use Drupal\Core\Link;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityListBuilder;
 use Drupal\Core\Url;
@@ -34,14 +35,11 @@ class SportListController extends EntityListBuilder {
     /* @var $entity \Drupal\mespronos\Entity\Sport */
     $row = [];
     $row['id'] = $entity->id();
-    $row['name'] = \Drupal::l(
-      $this->getLabel($entity),
-      new Url(
-        'entity.sport.edit_form', array(
-          'sport' => $entity->id(),
-        )
+    $row['name'] = Link::fromTextAndUrl($this->getLabel($entity), new Url(
+      'entity.sport.edit_form', array(
+        'sport' => $entity->id(),
       )
-    );
+    ));
     return $row + parent::buildRow($entity);
   }
 
diff --git a/src/Entity/Controller/TeamListController.php b/src/Entity/Controller/TeamListController.php
index 950b9ca..cc31b81 100644
--- a/src/Entity/Controller/TeamListController.php
+++ b/src/Entity/Controller/TeamListController.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\mespronos\Entity\Controller;
 
+use Drupal\Core\Link;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityListBuilder;
 use Drupal\Core\Url;
@@ -34,14 +35,11 @@ class TeamListController extends EntityListBuilder {
     /* @var $entity \Drupal\mespronos\Entity\Team */
     $row = [];
     $row['id'] = $entity->id();
-    $row['name'] = \Drupal::l(
-      $this->getLabel($entity),
-      new Url(
-        'entity.team.edit_form', array(
-          'team' => $entity->id(),
-        )
+    $row['name'] = Link::fromTextAndUrl($this->getLabel($entity), new Url(
+      'entity.team.edit_form', array(
+        'team' => $entity->id(),
       )
-    );
+    ));
     return $row + parent::buildRow($entity);
   }
 
diff --git a/src/Entity/Form/BetForm.php b/src/Entity/Form/BetForm.php
index 1a7109b..60a9a2d 100644
--- a/src/Entity/Form/BetForm.php
+++ b/src/Entity/Form/BetForm.php
@@ -25,11 +25,11 @@ class BetForm extends ContentEntityForm {
     $status = $entity->save();
 
     if ($status) {
-      drupal_set_message($this->t('Saved the %label Bet.', array(
+      $this->messenger()->addStatus($this->t('Saved the %label Bet.', array(
         '%label' => $entity->label(),
       )));
     } else {
-      drupal_set_message($this->t('The %label Bet was not saved.', array(
+      $this->messenger()->addStatus($this->t('The %label Bet was not saved.', array(
         '%label' => $entity->label(),
       )));
     }
diff --git a/src/Entity/Form/DayForm.php b/src/Entity/Form/DayForm.php
index bb262b7..e454f2d 100644
--- a/src/Entity/Form/DayForm.php
+++ b/src/Entity/Form/DayForm.php
@@ -34,11 +34,11 @@ class DayForm extends ContentEntityForm {
     $status = $entity->save();
 
     if ($status) {
-      drupal_set_message($this->t('Saved the %label Day.', array(
+      $this->messenger()->addStatus($this->t('Saved the %label Day.', array(
         '%label' => $entity->label(),
       )));
     } else {
-      drupal_set_message($this->t('The %label Day was not saved.', array(
+      $this->messenger()->addStatus($this->t('The %label Day was not saved.', array(
         '%label' => $entity->label(),
       )));
     }
diff --git a/src/Entity/Form/GameForm.php b/src/Entity/Form/GameForm.php
index 52015e3..91cc8ba 100644
--- a/src/Entity/Form/GameForm.php
+++ b/src/Entity/Form/GameForm.php
@@ -33,11 +33,11 @@ class GameForm extends ContentEntityForm {
     $status = $entity->save();
 
     if ($status) {
-      drupal_set_message($this->t('Saved the %label Game.', array(
+      $this->messenger()->addStatus($this->t('Saved the %label Game.', array(
         '%label' => $entity->label(),
       )));
     } else {
-      drupal_set_message($this->t('The %label Game was not saved.', array(
+      $this->messenger()->addStatus($this->t('The %label Game was not saved.', array(
         '%label' => $entity->label(),
       )));
     }
diff --git a/src/Entity/Form/LeagueArchiveForm.php b/src/Entity/Form/LeagueArchiveForm.php
index 8f063f8..20bb0df 100644
--- a/src/Entity/Form/LeagueArchiveForm.php
+++ b/src/Entity/Form/LeagueArchiveForm.php
@@ -44,9 +44,7 @@ class LeagueArchiveForm extends ContentEntityConfirmFormBase {
   public function submitForm(array &$form, FormStateInterface $form_state) {
     $this->entity->close();
 
-    drupal_set_message(
-      $this->t('League %name has been archived', ['%name' => $this->entity->label()])
-    );
+    $this->messenger()->addStatus($this->t('League %name has been archived', ['%name' => $this->entity->label()]));
 
     $form_state->setRedirectUrl($this->getCancelUrl());
   }
diff --git a/src/Entity/Form/MPNEntityDeleteForm.php b/src/Entity/Form/MPNEntityDeleteForm.php
index 95ce0e2..fff2344 100644
--- a/src/Entity/Form/MPNEntityDeleteForm.php
+++ b/src/Entity/Form/MPNEntityDeleteForm.php
@@ -44,14 +44,12 @@ class MPNEntityDeleteForm extends ContentEntityConfirmFormBase {
   public function submitForm(array &$form, FormStateInterface $form_state) {
     $this->entity->delete();
 
-    drupal_set_message(
-      $this->t('content @type: deleted @label.',
-        [
-          '@type' => $this->entity->bundle(),
-          '@label' => $this->entity->label()
-        ]
-        )
-    );
+    $this->messenger()->addStatus($this->t('content @type: deleted @label.',
+      [
+        '@type' => $this->entity->bundle(),
+        '@label' => $this->entity->label()
+      ]
+      ));
 
     $form_state->setRedirectUrl($this->getCancelUrl());
   }
diff --git a/src/Entity/Form/TeamForm.php b/src/Entity/Form/TeamForm.php
index fc92ee0..64576c0 100644
--- a/src/Entity/Form/TeamForm.php
+++ b/src/Entity/Form/TeamForm.php
@@ -34,11 +34,11 @@ class TeamForm extends ContentEntityForm {
     $status = $entity->save();
 
     if ($status) {
-      drupal_set_message($this->t('Saved the %label Team.', array(
+      $this->messenger()->addStatus($this->t('Saved the %label Team.', array(
         '%label' => $entity->label(),
       )));
     } else {
-      drupal_set_message($this->t('The %label Team was not saved.', array(
+      $this->messenger()->addStatus($this->t('The %label Team was not saved.', array(
         '%label' => $entity->label(),
       )));
     }
diff --git a/src/Entity/League.php b/src/Entity/League.php
index 4ef10e8..3c42b2f 100644
--- a/src/Entity/League.php
+++ b/src/Entity/League.php
@@ -135,7 +135,7 @@ class League extends MPNContentEntityBase implements MPNEntityInterface {
       throw new \Exception(t('The sport for the league should be set'));
     }
     else {
-      $sport = entity_load('sport', $values['sport']);
+      $sport = \Drupal::service('entity_type.manager')->getStorage('sport')->load($values['sport']);
       if (!$sport) {
         throw new \Exception(t('The sport for the league is not valid'));
       }
diff --git a/src/Entity/RankingDay.php b/src/Entity/RankingDay.php
index 86547a3..0c385fd 100644
--- a/src/Entity/RankingDay.php
+++ b/src/Entity/RankingDay.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\mespronos\Entity;
 
+use Drupal\user\Entity\User;
 use Drupal\Core\Field\BaseFieldDefinition;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\mespronos\Controller\RankingController;
@@ -96,7 +97,7 @@ class RankingDay extends RankingBase {
   /**
    * @return integer
    */
-  public static function createRanking(\Drupal\mespronos\Entity\Day $day) {
+  public static function createRanking(Day $day) {
     self::removeRanking($day);
     $data = self::getData($day);
     RankingController::sortRankingDataAndDefinedPosition($data);
@@ -129,7 +130,7 @@ class RankingDay extends RankingBase {
     return $results;
   }
 
-  public static function removeRanking(\Drupal\mespronos\Entity\Day $day) {
+  public static function removeRanking(Day $day) {
 
     $storage = \Drupal::entityTypeManager()->getStorage('ranking_day');
     $query = \Drupal::entityQuery('ranking_day');
@@ -182,7 +183,7 @@ class RankingDay extends RankingBase {
    * @param String $storage_name
    * @return \Drupal\mespronos\Entity\RankingDay
    */
-  public static function getRankingForBetter(\Drupal\user\Entity\User $better, $day = null, $entity_name = 'day', $storage_name = 'ranking_day') {
+  public static function getRankingForBetter(User $better, $day = null, $entity_name = 'day', $storage_name = 'ranking_day') {
     return parent::getRankingForBetter($better, $day, $entity_name, $storage_name);
   }
 
diff --git a/src/Entity/RankingGeneral.php b/src/Entity/RankingGeneral.php
index 4d70fad..9da4eb8 100644
--- a/src/Entity/RankingGeneral.php
+++ b/src/Entity/RankingGeneral.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\mespronos\Entity;
 
+use Drupal\user\Entity\User;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\mespronos\Controller\RankingController;
 use Drupal\Core\Database\Database;
@@ -97,12 +98,16 @@ class RankingGeneral extends RankingBase {
 
   public function getPosition() {
     if(\Drupal::moduleHandler()->moduleExists('domain')) {
-      $results = db_query('SELECT count(*) +1 as position from {mespronos__ranking_general} rg join {users_field_data} ufd  on ufd.uid = rg.better and ufd.status = 1 and ufd.bet_private = 0 WHERE points > :points', [
+      // TODO: Drupal Rector Notice: Please delete the following comment after you've made any necessary changes.
+      // You will need to use `\Drupal\core\Database\Database::getConnection()` if you do not yet have access to the container here.
+      $results = \Drupal::database()->query('SELECT count(*) +1 as position from {mespronos__ranking_general} rg join {users_field_data} ufd  on ufd.uid = rg.better and ufd.status = 1 and ufd.bet_private = 0 WHERE points > :points', [
         ':points'=> $this->getPoints(),
       ]);
     }
     else {
-      $results = db_query('SELECT count(*) +1 as position from {mespronos__ranking_general} rg join {users_field_data} ufd  on ufd.uid = rg.better and ufd.status = 1 WHERE points > :points', [
+      // TODO: Drupal Rector Notice: Please delete the following comment after you've made any necessary changes.
+      // You will need to use `\Drupal\core\Database\Database::getConnection()` if you do not yet have access to the container here.
+      $results = \Drupal::database()->query('SELECT count(*) +1 as position from {mespronos__ranking_general} rg join {users_field_data} ufd  on ufd.uid = rg.better and ufd.status = 1 WHERE points > :points', [
         ':points'=> $this->getPoints(),
       ]);
     }
@@ -136,7 +141,7 @@ class RankingGeneral extends RankingBase {
    * @param string $storage_name
    * @return \Drupal\mespronos\Entity\RankingGeneral
    */
-  public static function getRankingForBetter(\Drupal\user\Entity\User $better, $entity = null, $entity_name = null, $storage_name = null) {
+  public static function getRankingForBetter(User $better, $entity = null, $entity_name = null, $storage_name = null) {
     return parent::getRankingForBetter($better, null, null, 'ranking_general');
   }
 
diff --git a/src/Entity/Sport.php b/src/Entity/Sport.php
index 2ae3535..431e604 100644
--- a/src/Entity/Sport.php
+++ b/src/Entity/Sport.php
@@ -74,7 +74,7 @@ class Sport extends MPNContentEntityBase implements MPNEntityInterface {
     if (count($id) == 0) {
       return parent::create($values); // TODO: Change the autogenerated stub
     } else {
-      $sport = entity_load('sport', array_pop($id));
+      $sport = \Drupal::service('entity_type.manager')->getStorage('sport')->load(array_pop($id));
       return $sport;
     }
   }
diff --git a/src/Form/GamesBetting.php b/src/Form/GamesBetting.php
index 2fbcb67..7a82146 100644
--- a/src/Form/GamesBetting.php
+++ b/src/Form/GamesBetting.php
@@ -220,10 +220,10 @@ class GamesBetting extends FormBase {
       }
     }
     if ($i > 0) {
-      drupal_set_message($this->t('@nb_mark bets saved/updated', array('@nb_mark'=>$i)));
+      $this->messenger()->addStatus($this->t('@nb_mark bets saved/updated', array('@nb_mark'=>$i)));
     }
     if ($j > 0) {
-      drupal_set_message($this->t('@nb_mark bet couldn\'t be saved or updated', array('@nb_mark'=>$j)), 'warning');
+      $this->messenger()->addWarning($this->t('@nb_mark bet couldn\'t be saved or updated', array('@nb_mark'=>$j)));
     }
 
     $event = new UserBetEvent($user, $day);
diff --git a/src/Form/GamesMarks.php b/src/Form/GamesMarks.php
index dc23b24..0730c2f 100644
--- a/src/Form/GamesMarks.php
+++ b/src/Form/GamesMarks.php
@@ -104,7 +104,7 @@ class GamesMarks extends FormBase {
         $gamesUpdated[] = $game;
       }
     }
-    drupal_set_message($this->t('@nb_mark games updated', ['@nb_mark' => $i]));
+    $this->messenger()->addStatus($this->t('@nb_mark games updated', ['@nb_mark' => $i]));
     $i = 0;
     $leagues = [];
     foreach ($days_to_update as $day_id) {
@@ -117,7 +117,7 @@ class GamesMarks extends FormBase {
       RankingLeague::createRanking($league);
     }
     RankingGeneral::createRanking();
-    drupal_set_message($this->t('Ranking updated for @nb_ranking days and @nb_leagues leagues', [
+    $this->messenger()->addStatus($this->t('Ranking updated for @nb_ranking days and @nb_leagues leagues', [
       '@nb_ranking'=> \count($days_to_update),
       '@nb_leagues'=> \count($leagues),
     ]));
diff --git a/src/Form/RemoveDataForm.php b/src/Form/RemoveDataForm.php
index 95c0465..42988d4 100644
--- a/src/Form/RemoveDataForm.php
+++ b/src/Form/RemoveDataForm.php
@@ -62,7 +62,7 @@ class RemoveDataForm extends ConfirmFormBase {
       $controller->delete($entities);
     }
 
-    drupal_set_message('All MesPronos related datas has been removed');
+    $this->messenger()->addStatus('All MesPronos related datas has been removed');
     $form_state->setRedirectUrl($this->getCancelUrl());
   }
 
diff --git a/src/Service/BetManager.php b/src/Service/BetManager.php
index 7b4dd3f..ea2931c 100644
--- a/src/Service/BetManager.php
+++ b/src/Service/BetManager.php
@@ -64,7 +64,9 @@ class BetManager {
   public function getRecentBetsForUser($user, $nb, $includeGameNotOver = FALSE) {
 
     $now = new \DateTime(null, new \DateTimeZone("UTC"));
-    $query = db_select('mespronos__bet', 'b');
+    // TODO: Drupal Rector Notice: Please delete the following comment after you've made any necessary changes.
+    // You will need to use `\Drupal\core\Database\Database::getConnection()` if you do not yet have access to the container here.
+    $query = \Drupal::database()->select('mespronos__bet', 'b');
     $query->condition('b.better', $user->id());
     $query->join('mespronos__game', 'g', 'g.id = b.game');
     if ($includeGameNotOver) {