diff --git a/src/ConfigPagesListBuilder.php b/src/ConfigPagesListBuilder.php
index c540bab..012e44c 100644
--- a/src/ConfigPagesListBuilder.php
+++ b/src/ConfigPagesListBuilder.php
@@ -82,7 +82,7 @@ class ConfigPagesListBuilder extends EntityListBuilder implements EntityListBuil
    * {@inheritdoc}
    */
   public function buildRow(EntityInterface $entity) {
-    $row['label'] = $this->getLabel($entity);
+    $row['label'] = $entity->label();
 
     // Used context.
     $contextData = [];
@@ -105,7 +105,7 @@ class ConfigPagesListBuilder extends EntityListBuilder implements EntityListBuil
   public function getDefaultOperations(EntityInterface $entity) {
     $operations = parent::getDefaultOperations($entity);
     if (isset($operations['edit'])) {
-      $operations['edit']['query']['destination'] = $entity->url('collection');
+      $operations['edit']['query']['destination'] = $entity->toUrl('collection');
     }
     return $operations;
   }
diff --git a/src/ConfigPagesTypeListBuilder.php b/src/ConfigPagesTypeListBuilder.php
index a4cdaa9..989f511 100644
--- a/src/ConfigPagesTypeListBuilder.php
+++ b/src/ConfigPagesTypeListBuilder.php
@@ -69,7 +69,7 @@ class ConfigPagesTypeListBuilder extends ConfigEntityListBuilder {
    * {@inheritdoc}
    */
   public function buildRow(EntityInterface $entity) {
-    $row['type'] = $entity->link();
+    $row['type'] = $entity->toLink(NULL, 'edit-form');
 
     // Used context.
     $contextData = [];
diff --git a/src/Controller/ConfigPagesController.php b/src/Controller/ConfigPagesController.php
index 6c579ca..9723afa 100644
--- a/src/Controller/ConfigPagesController.php
+++ b/src/Controller/ConfigPagesController.php
@@ -5,7 +5,6 @@ namespace Drupal\config_pages\Controller;
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\config_pages\ConfigPagesTypeInterface;
-use Drupal\Core\Entity\Query\QueryFactory;
 use Drupal\Core\Extension\ThemeHandlerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Request;
diff --git a/src/Entity/ConfigPages.php b/src/Entity/ConfigPages.php
index a730df4..603b314 100644
--- a/src/Entity/ConfigPages.php
+++ b/src/Entity/ConfigPages.php
@@ -199,7 +199,7 @@ class ConfigPages extends ContentEntityBase implements ConfigPagesInterface {
   /**
    * {@inheritdoc}
    */
-  public function urlInfo($rel = 'canonical', array $options = []) {
+  public function toUrl($rel = 'canonical', array $options = []) {
     $config_pages_type = ConfigPagesType::load($this->bundle());
     $menu = $config_pages_type->get('menu');
     $path = isset($menu['path']) ? $menu['path'] : '';
diff --git a/src/Form/ConfigPagesClearConfirmationForm.php b/src/Form/ConfigPagesClearConfirmationForm.php
index bd5e4c6..7426238 100644
--- a/src/Form/ConfigPagesClearConfirmationForm.php
+++ b/src/Form/ConfigPagesClearConfirmationForm.php
@@ -33,7 +33,7 @@ class ConfigPagesClearConfirmationForm extends ConfirmFormBase {
     $entity_id = $this->id;
     $entity = ConfigPages::load($entity_id);
 
-    return $entity->urlInfo();
+    return $entity->toUrl();
   }
 
   /**
@@ -83,7 +83,7 @@ class ConfigPagesClearConfirmationForm extends ConfirmFormBase {
     }
     $entity->save();
 
-    $form_state->setRedirectUrl($entity->urlInfo());
+    $form_state->setRedirectUrl($entity->toUrl());
   }
 
 }