diff --git a/currency.info.yml b/currency.info.yml
index a1efc35..9c7cd80 100755
--- a/currency.info.yml
+++ b/currency.info.yml
@@ -1,5 +1,5 @@
 name: Currency
 description: Provides currency metadata and exchange rates, and amount formatting.
 core: 8.x
-configure: currency.currency.list
+configure: entity.currency.collection
 type: module
diff --git a/currency.links.action.yml b/currency.links.action.yml
index 69a6d83..293715e 100644
--- a/currency.links.action.yml
+++ b/currency.links.action.yml
@@ -2,23 +2,23 @@ currency.currency.add:
   route_name: currency.currency.add
   title: 'Add a custom currency'
   appears_on:
-    - currency.currency.list
+    - entity.currency.collection
 currency.currency.import:
   route_name: currency.currency.import
   title: 'Import a currency'
   appears_on:
-    - currency.currency.list
+    - entity.currency.collection
   weight: -1
 currency.currency_locale.add:
   route_name: currency.currency_locale.add
   title: 'Add a currency locale'
   appears_on:
-    - currency.currency_locale.list
+    - entity.currency_locale.collection
 currency.currency_locale.import:
   route_name: currency.currency_locale.import
   title: 'Import a currency locale'
   appears_on:
-    - currency.currency_locale.list
+    - entity.currency_locale.collection
   weight: -1
 currency.exchange_rate_provider.fixed_rates.add:
   route_name: currency.exchange_rate_provider.fixed_rates.add
diff --git a/currency.links.menu.yml b/currency.links.menu.yml
index 73650b0..23a5c5b 100644
--- a/currency.links.menu.yml
+++ b/currency.links.menu.yml
@@ -1,7 +1,7 @@
-currency.currency.list:
+entity.currency.collection:
   title: Currencies
   parent: system.admin_config_regional
-  route_name: currency.currency.list
+  route_name: entity.currency.collection
 currency.amount_formatting:
   title: Currency amount formatting
   description: Configure amount formatting for different locales.
diff --git a/currency.links.task.yml b/currency.links.task.yml
index 311d9da..c18a4cd 100644
--- a/currency.links.task.yml
+++ b/currency.links.task.yml
@@ -3,7 +3,7 @@ currency.amount_formatting:
   route_name: currency.amount_formatting
   title: Formatting
 
-currency.currency_locale.list:
-  base_route: currency.amount_formatting
-  route_name: currency.currency_locale.list
+entity.currency_locale.collection:
+  base_route: entity.amount_formatting
+  route_name: entity.currency_locale.collection
   title: Locales
diff --git a/currency.routing.yml b/currency.routing.yml
index f087806..5065fd2 100644
--- a/currency.routing.yml
+++ b/currency.routing.yml
@@ -32,7 +32,7 @@ currency.exchange_rate_provider.fixed_rates.edit:
     _permission: 'currency.exchange_rate_provider.fixed_rates.administer'
 
 # Currency entities.
-currency.currency.list:
+entity.currency.collection:
   path: '/admin/config/regional/currency'
   defaults:
     _entity_list: 'currency'
@@ -57,6 +57,14 @@ currency.currency.import:
   requirements:
     _entity_create_access: 'currency'
 
+entity.currency.canonical:
+  path: '/admin/config/regional/currency/{currency}'
+  defaults:
+    _entity_form: 'currency.default'
+    _title_callback: \Drupal\currency\Controller\EditCurrency::title
+  requirements:
+    _entity_access: 'currency.update'
+
 entity.currency.edit_form:
   path: '/admin/config/regional/currency/{currency}'
   defaults:
@@ -87,7 +95,7 @@ entity.currency.disable:
     _entity_access: 'currency.disable'
 
 # Currency currency locale entities.
-currency.currency_locale.list:
+entity.currency_locale.collection:
   path: '/admin/config/regional/currency-formatting/locale'
   defaults:
     _entity_list: 'currency_locale'
@@ -111,6 +119,14 @@ currency.currency_locale.import:
   requirements:
     _entity_create_access: 'currency_locale'
 
+entity.currency_locale.canonical:
+  path: '/admin/config/regional/currency-formatting/locale/{currency_locale}'
+  defaults:
+    _entity_form: 'currency_locale.default'
+    _title_callback: \Drupal\currency\Controller\EditCurrencyLocale::title
+  requirements:
+    _entity_access: 'currency_locale.update'
+
 entity.currency_locale.edit_form:
   path: '/admin/config/regional/currency-formatting/locale/{currency_locale}'
   defaults:
diff --git a/src/Entity/Currency.php b/src/Entity/Currency.php
index a885bfc..dd0fa9b 100644
--- a/src/Entity/Currency.php
+++ b/src/Entity/Currency.php
@@ -35,10 +35,10 @@ use Drupal\currency\Usage;
  *   id = "currency",
  *   label = @Translation("Currency"),
  *   links = {
- *     "canonical" = "currency.currency.edit",
- *     "create-form" = "currency.currency.add",
- *     "edit-form" = "currency.currency.edit",
- *     "delete-form" = "currency.currency.delete"
+ *     "canonical" = "/admin/config/regional/currency/{currency}",
+ *     "create-form" = "/admin/config/regional/currency/add",
+ *     "edit-form" = "/admin/config/regional/currency/{currency}",
+ *     "delete-form" = "/admin/config/regional/currency/{currency}/delete"
  *   }
  * )
  */
diff --git a/src/Entity/CurrencyLocale.php b/src/Entity/CurrencyLocale.php
index e640ded..111aaf1 100644
--- a/src/Entity/CurrencyLocale.php
+++ b/src/Entity/CurrencyLocale.php
@@ -34,10 +34,10 @@ use Drupal\Core\StringTranslation\StringTranslationTrait;
  *   id = "currency_locale",
  *   label = @Translation("Currency currency locale"),
  *   links = {
- *     "canonical" = "currency.currency_locale.edit",
- *     "create-form" = "currency.currency_locale.add",
- *     "edit-form" = "currency.currency_locale.edit",
- *     "delete-form" = "currency.currency_locale.delete"
+ *     "canonical" = "/admin/config/regional/currency-formatting/locale/{currency_locale}",
+ *     "create-form" = "/admin/config/regional/currency-formatting/locale/add",
+ *     "edit-form" = "/admin/config/regional/currency-formatting/locale/{currency_locale}",
+ *     "delete-form" = "/admin/config/regional/currency-formatting/locale/{currency_locale}/delete"
  *   }
  * )
  */