diff --git a/core/modules/block/lib/Drupal/block/Tests/Views/DisplayBlockTest.php b/core/modules/block/lib/Drupal/block/Tests/Views/DisplayBlockTest.php
index 0da28eb..ff51b5f 100644
--- a/core/modules/block/lib/Drupal/block/Tests/Views/DisplayBlockTest.php
+++ b/core/modules/block/lib/Drupal/block/Tests/Views/DisplayBlockTest.php
@@ -230,7 +230,7 @@ public function testBlockContextualLinks() {
     $block = $this->drupalPlaceBlock('views_block:test_view_block-block_1');
     $this->drupalGet('test-page');
 
-    $id = 'block:block:block=' . $block->id() . ':|views_ui:admin/structure/views/view:0=test_view_block:location=block&name=test_view_block&display_id=block_1';
+    $id = 'block:block:block=' . $block->id() . ':|views_ui:views_ui_edit:view=test_view_block:location=block&name=test_view_block&display_id=block_1';
     // @see \Drupal\contextual\Tests\ContextualDynamicContextTest:assertContextualLinkPlaceHolder()
     $this->assertRaw('<div data-contextual-id="'. $id . '"></div>', format_string('Contextual link placeholder with id @id exists.', array('@id' => $id)));
 
@@ -240,7 +240,7 @@ public function testBlockContextualLinks() {
     $response = $this->drupalPost('contextual/render', 'application/json', $post, array('query' => array('destination' => 'test-page')));
     $this->assertResponse(200);
     $json = drupal_json_decode($response);
-    $this->assertIdentical($json[$id], '<ul class="contextual-links"><li class="block-configure odd first"><a href="' . base_path() . 'admin/structure/block/manage/' . $block->id() . '?destination=test-page">Configure block</a></li><li class="views-ui-edit even last"><a href="' . base_path() . 'admin/structure/views/view/test_view_block/edit/block_1?destination=test-page">Edit view</a></li></ul>');
+    $this->assertIdentical($json[$id], '<ul class="contextual-links"><li class="block-configure odd first"><a href="' . base_path() . 'admin/structure/block/manage/' . $block->id() . '?destination=test-page">Configure block</a></li><li class="views-uiedit even last"><a href="' . base_path() . 'admin/structure/views/view/test_view_block/edit/block_1?destination=test-page">Edit view</a></li></ul>');
   }
 
 }
diff --git a/core/modules/content_translation/lib/Drupal/content_translation/Plugin/Derivative/ContentTranslationContextualLinks.php b/core/modules/content_translation/lib/Drupal/content_translation/Plugin/Derivative/ContentTranslationContextualLinks.php
index feafabc..b5d2193 100644
--- a/core/modules/content_translation/lib/Drupal/content_translation/Plugin/Derivative/ContentTranslationContextualLinks.php
+++ b/core/modules/content_translation/lib/Drupal/content_translation/Plugin/Derivative/ContentTranslationContextualLinks.php
@@ -61,4 +61,4 @@ public function getDerivativeDefinitions(array $base_plugin_definition) {
     return parent::getDerivativeDefinitions($base_plugin_definition);
   }
 
-} 
+}
diff --git a/core/modules/content_translation/lib/Drupal/content_translation/Plugin/Menu/ContextualLink/ContentTranslationContextualLinks.php b/core/modules/content_translation/lib/Drupal/content_translation/Plugin/Menu/ContextualLink/ContentTranslationContextualLinks.php
index b8e46c0..56dfe02 100644
--- a/core/modules/content_translation/lib/Drupal/content_translation/Plugin/Menu/ContextualLink/ContentTranslationContextualLinks.php
+++ b/core/modules/content_translation/lib/Drupal/content_translation/Plugin/Menu/ContextualLink/ContentTranslationContextualLinks.php
@@ -16,4 +16,4 @@
  */
 class ContentTranslationContextualLinks extends ContextualLinkDefault {
 
-} 
+}
diff --git a/core/modules/contextual/lib/Drupal/contextual/Tests/ContextualDynamicContextTest.php b/core/modules/contextual/lib/Drupal/contextual/Tests/ContextualDynamicContextTest.php
index 26ac74f..413b298 100644
--- a/core/modules/contextual/lib/Drupal/contextual/Tests/ContextualDynamicContextTest.php
+++ b/core/modules/contextual/lib/Drupal/contextual/Tests/ContextualDynamicContextTest.php
@@ -63,7 +63,7 @@ function testDifferentPermissions() {
       'node:node:node=' . $node1->id() . ':',
       'node:node:node=' . $node2->id() . ':',
       'node:node:node=' . $node3->id() . ':',
-      'views_ui:admin/structure/views/view:0=frontpage:location=page&name=frontpage&display_id=page_1',
+      'views_ui:views_ui_edit:view=frontpage:location=page&name=frontpage&display_id=page_1',
     );
 
     // Editor user: can access contextual links and can edit articles.
diff --git a/core/modules/contextual/lib/Drupal/contextual/Tests/ContextualUnitTest.php b/core/modules/contextual/lib/Drupal/contextual/Tests/ContextualUnitTest.php
index 2c93f4c..eb0a1f0 100644
--- a/core/modules/contextual/lib/Drupal/contextual/Tests/ContextualUnitTest.php
+++ b/core/modules/contextual/lib/Drupal/contextual/Tests/ContextualUnitTest.php
@@ -31,12 +31,11 @@ function _contextual_links_id_testcases() {
     // - no metadata.
     $tests[] = array(
       'links' => array(
-        'node' => array(
-          'node',
-          array(
+        'node.node' => array(
+          'route_parameters' => array(
             'node' => '14031991',
           ),
-          array()
+          'metadata' => array()
         ),
       ),
       'id' => 'node:node:node=14031991:',
@@ -48,17 +47,16 @@ function _contextual_links_id_testcases() {
     // - no metadata.
     $tests[] = array(
       'links' => array(
-        'foo' => array(
-          'baz/in/ga',
-          array(
+        'foo.baz' => array(
+          'route_parameters'=> array(
             'bar',
             'key' => 'baz',
             'qux',
           ),
-          array()
+          'metadata' => array(),
         ),
       ),
-      'id' => 'foo:baz/in/ga:0=bar&key=baz&1=qux:',
+      'id' => 'foo:baz:0=bar&key=baz&1=qux:',
     );
 
     // Test branch conditions:
@@ -67,16 +65,17 @@ function _contextual_links_id_testcases() {
     // - metadata.
     $tests[] = array(
       'links' => array(
-        'views_ui' => array(
-          'admin/structure/views/view',
-          array('frontpage'),
-          array(
+        'views_ui.views_ui_edit' => array(
+          'route_parameters' => array(
+            'view' => 'frontpage'
+          ),
+          'metadata' => array(
             'location' => 'page',
             'display' => 'page_1',
-          )
+          ),
         ),
       ),
-      'id' => 'views_ui:admin/structure/views/view:0=frontpage:location=page&display=page_1',
+      'id' => 'views_ui:views_ui_edit:view=frontpage:location=page&display=page_1',
     );
 
     // Test branch conditions:
@@ -84,29 +83,26 @@ function _contextual_links_id_testcases() {
     // - multiple dynamic path arguments.
     $tests[] = array(
       'links' => array(
-        'node' => array(
-          'node',
-          array(
+        'node.node' => array(
+          'route_parameters' => array(
             'node' => '14031991',
           ),
-          array()
+          'metadata' => array(),
         ),
-        'foo' => array(
-          'baz/in/ga',
-          array(
+        'foo.baz' => array(
+          'route_parameters' => array(
             'bar',
             'key' => 'baz',
             'qux',
           ),
-          array()
+          'metadata' => array(),
         ),
-        'edge' => array(
-          'edge',
-          array('20011988'),
-          array()
+        'edge.edge' => array(
+          'route_parameters' => array('20011988'),
+          'metadata' => array(),
         ),
       ),
-      'id' => 'node:node:node=14031991:|foo:baz/in/ga:0=bar&key=baz&1=qux:|edge:edge:0=20011988:',
+      'id' => 'node:node:node=14031991:|foo:baz:0=bar&key=baz&1=qux:|edge:edge:0=20011988:',
     );
 
     return $tests;
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayTest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayTest.php
index 58d2676..a9bf1fa 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayTest.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayTest.php
@@ -219,13 +219,13 @@ public function testDisplayPluginsAlter() {
     $definitions = Views::pluginManager('display')->getDefinitions();
 
     $expected = array(
-      'parent path' => 'admin/structure/views/view',
-      'argument properties' => array('id'),
+      'route_name' => 'views_ui.edit',
+      'route_parameters_names' => array('view' => 'id'),
     );
 
     // Test the expected views_ui array exists on each definition.
     foreach ($definitions as $definition) {
-      $this->assertIdentical($definition['contextual links']['views_ui'], $expected, 'Expected views_ui array found in plugin definition.');
+      $this->assertIdentical($definition['contextual links']['views_ui.views_ui_edit'], $expected, 'Expected views_ui array found in plugin definition.');
     }
   }
 
@@ -288,7 +288,7 @@ public function testPageContextualLinks() {
     $view->enable()->save();
 
     $this->drupalGet('test-display');
-    $id = 'views_ui:admin/structure/views/view:0=test_display:location=page&name=test_display&display_id=page_1';
+    $id = 'views_ui:views_ui_edit:view=test_display:location=page&name=test_display&display_id=page_1';
     // @see \Drupal\contextual\Tests\ContextualDynamicContextTest:assertContextualLinkPlaceHolder()
     $this->assertRaw('<div data-contextual-id="'. $id . '"></div>', format_string('Contextual link placeholder with id @id exists.', array('@id' => $id)));
 
@@ -298,7 +298,7 @@ public function testPageContextualLinks() {
     $response = $this->drupalPost('contextual/render', 'application/json', $post, array('query' => array('destination' => 'test-display')));
     $this->assertResponse(200);
     $json = drupal_json_decode($response);
-    $this->assertIdentical($json[$id], '<ul class="contextual-links"><li class="views-ui-edit odd first last"><a href="' . base_path() . 'admin/structure/views/view/test_display/edit/page_1?destination=test-display">Edit view</a></li></ul>');
+    $this->assertIdentical($json[$id], '<ul class="contextual-links"><li class="views-uiedit odd first last"><a href="' . base_path() . 'admin/structure/views/view/test_display/edit/page_1?destination=test-display">Edit view</a></li></ul>');
   }
 
   /**