diff --git a/core/modules/book/src/Tests/BookTest.php b/core/modules/book/src/Tests/BookTest.php
index dd7e373..f418f5e 100644
--- a/core/modules/book/src/Tests/BookTest.php
+++ b/core/modules/book/src/Tests/BookTest.php
@@ -465,7 +465,7 @@ function testBookNodeTypeChange() {
       'name' => 'Bar',
       'type' => 'bar',
     );
-    $this->drupalPostForm('admin/structure/types/manage/book', $edit, t('Save content type'));
+    $this->drupalPostForm('admin/structure/content-types/manage/book', $edit, t('Save content type'));
 
     // Ensure that the config book.settings:allowed_types has been updated with
     // the new machine and the old one has been removed.
@@ -477,7 +477,7 @@ function testBookNodeTypeChange() {
       'title_label' => 'Title for basic page',
       'type' => 'page',
     );
-    $this->drupalPostForm('admin/structure/types/add', $edit, t('Save content type'));
+    $this->drupalPostForm('admin/structure/content-types/add', $edit, t('Save content type'));
 
     // Add page to the allowed node types.
     $edit = array(
@@ -509,7 +509,7 @@ function testBookNodeTypeChange() {
       'name' => 'Zebra book',
       'type' => 'zebra',
     );
-    $this->drupalPostForm('admin/structure/types/manage/bar', $edit, t('Save content type'));
+    $this->drupalPostForm('admin/structure/content-types/manage/bar', $edit, t('Save content type'));
     $this->assertTrue(book_type_is_allowed('zebra'), 'Config book.settings:allowed_types contains the zebra node type.');
     $this->assertTrue(book_type_is_allowed('page'), 'Config book.settings:allowed_types contains the page node type.');
 
@@ -529,7 +529,7 @@ function testBookNodeTypeChange() {
       'name' => 'Animal book',
       'type' => 'zebra',
     );
-    $this->drupalPostForm('admin/structure/types/manage/zebra', $edit, t('Save content type'));
+    $this->drupalPostForm('admin/structure/content-types/manage/zebra', $edit, t('Save content type'));
 
     // Test the order of the book.settings::allowed_types configuration is as
     // expected. The order should be:
diff --git a/core/modules/comment/comment.routing.yml b/core/modules/comment/comment.routing.yml
index 967cb3f..61809d9 100644
--- a/core/modules/comment/comment.routing.yml
+++ b/core/modules/comment/comment.routing.yml
@@ -79,7 +79,7 @@ comment.node_redirect:
     _module_dependencies: 'node'
 
 entity.comment_type.collection:
-  path: '/admin/structure/comment'
+  path: '/admin/structure/comment-types'
   defaults:
     _entity_list: 'comment_type'
     _title: 'Comment types'
@@ -89,7 +89,7 @@ entity.comment_type.collection:
     _admin_route: TRUE
 
 entity.comment_type.delete_form:
-  path: '/admin/structure/comment/manage/{comment_type}/delete'
+  path: '/admin/structure/comment-types/manage/{comment_type}/delete'
   defaults:
     _entity_form: 'comment_type.delete'
     _title: 'Delete'
@@ -99,7 +99,7 @@ entity.comment_type.delete_form:
     _admin_route: TRUE
 
 entity.comment_type.add_form:
-  path: '/admin/structure/comment/types/add'
+  path: '/admin/structure/comment-types/add'
   defaults:
     _entity_form: 'comment_type.add'
     _title: 'Add comment type'
@@ -109,7 +109,7 @@ entity.comment_type.add_form:
     _admin_route: TRUE
 
 entity.comment_type.edit_form:
-  path: '/admin/structure/comment/manage/{comment_type}'
+  path: '/admin/structure/comment-types/manage/{comment_type}'
   defaults:
     _entity_form: 'comment_type.edit'
     _title: 'Edit'
diff --git a/core/modules/comment/src/Entity/CommentType.php b/core/modules/comment/src/Entity/CommentType.php
index 94fd193..b8868f0 100644
--- a/core/modules/comment/src/Entity/CommentType.php
+++ b/core/modules/comment/src/Entity/CommentType.php
@@ -34,10 +34,10 @@
  *     "label" = "label"
  *   },
  *   links = {
- *     "delete-form" = "/admin/structure/comment/manage/{comment_type}/delete",
- *     "edit-form" = "/admin/structure/comment/manage/{comment_type}",
- *     "add-form" = "/admin/structure/comment/types/add",
- *     "collection" = "/admin/structure/comment/types",
+ *     "delete-form" = "/admin/structure/comment-types/manage/{comment_type}/delete",
+ *     "edit-form" = "/admin/structure/comment-types/manage/{comment_type}",
+ *     "add-form" = "/admin/structure/comment-types/add",
+ *     "collection" = "/admin/structure/comment-types/types",
  *   },
  *   config_export = {
  *     "id",
diff --git a/core/modules/comment/src/Tests/CommentAdminTest.php b/core/modules/comment/src/Tests/CommentAdminTest.php
index ee03405..4d6c205 100644
--- a/core/modules/comment/src/Tests/CommentAdminTest.php
+++ b/core/modules/comment/src/Tests/CommentAdminTest.php
@@ -155,7 +155,7 @@ public function testCommentAdmin() {
     // Login.
     $this->drupalLogin($this->adminUser);
     // Browse to comment bundle overview.
-    $this->drupalGet('admin/structure/comment');
+    $this->drupalGet('admin/structure/comment-types');
     $this->assertResponse(200);
     // Make sure titles visible.
     $this->assertText('Comment type');
diff --git a/core/modules/comment/src/Tests/CommentLanguageTest.php b/core/modules/comment/src/Tests/CommentLanguageTest.php
index 883eb17..e658cfb 100644
--- a/core/modules/comment/src/Tests/CommentLanguageTest.php
+++ b/core/modules/comment/src/Tests/CommentLanguageTest.php
@@ -47,7 +47,7 @@ protected function setUp() {
 
     // Set "Article" content type to use multilingual support.
     $edit = array('language_configuration[language_alterable]' => TRUE);
-    $this->drupalPostForm('admin/structure/types/manage/article', $edit, t('Save content type'));
+    $this->drupalPostForm('admin/structure/content-types/manage/article', $edit, t('Save content type'));
 
     // Enable content language negotiation UI.
     \Drupal::state()->set('language_test.content_language_type', TRUE);
diff --git a/core/modules/comment/src/Tests/CommentPagerTest.php b/core/modules/comment/src/Tests/CommentPagerTest.php
index 92fc9ff..cb36af6 100644
--- a/core/modules/comment/src/Tests/CommentPagerTest.php
+++ b/core/modules/comment/src/Tests/CommentPagerTest.php
@@ -295,7 +295,7 @@ function testTwoPagers() {
     // Make sure pager appears in formatter summary and settings form.
     $account = $this->drupalCreateUser(array('administer node display'));
     $this->drupalLogin($account);
-    $this->drupalGet('admin/structure/types/manage/article/display');
+    $this->drupalGet('admin/structure/content-types/manage/article/display');
     $this->assertNoText(t('Pager ID: @id', array('@id' => 0)), 'No summary for standard pager');
     $this->assertText(t('Pager ID: @id', array('@id' => 1)));
     $this->drupalPostAjaxForm(NULL, array(), 'comment_settings_edit');
diff --git a/core/modules/comment/src/Tests/CommentTypeTest.php b/core/modules/comment/src/Tests/CommentTypeTest.php
index 6efc6b6..f36e278 100644
--- a/core/modules/comment/src/Tests/CommentTypeTest.php
+++ b/core/modules/comment/src/Tests/CommentTypeTest.php
@@ -59,7 +59,7 @@ public function testCommentTypeCreation() {
     // Login a test user.
     $this->drupalLogin($this->adminUser);
 
-    $this->drupalGet('admin/structure/comment/manage/' . $type->id());
+    $this->drupalGet('admin/structure/comment-types/manage/' . $type->id());
     $this->assertResponse(200, 'The new comment type can be accessed at the edit form.');
 
     // Create a comment type via the user interface.
@@ -69,7 +69,7 @@ public function testCommentTypeCreation() {
       'description' => '',
       'target_entity_type_id' => 'node',
     );
-    $this->drupalPostForm('admin/structure/comment/types/add', $edit, t('Save'));
+    $this->drupalPostForm('admin/structure/comment-types/add', $edit, t('Save'));
     $comment_type = CommentType::load('foo');
     $this->assertTrue($comment_type, 'The new comment type has been created.');
 
@@ -78,7 +78,7 @@ public function testCommentTypeCreation() {
     $this->assertEqual($comment_type->language()->getId(), $default_langcode);
 
     // Edit the comment-type and ensure that we cannot change the entity-type.
-    $this->drupalGet('admin/structure/comment/manage/foo');
+    $this->drupalGet('admin/structure/comment-types/manage/foo');
     $this->assertNoField('target_entity_type_id', 'Entity type file not present');
     $this->assertText(t('Target entity type'));
     // Save the form and ensure the entity-type value is preserved even though
@@ -99,24 +99,24 @@ public function testCommentTypeEditing() {
     $this->assertEqual($field->getLabel(), 'Comment', 'Comment body field was found.');
 
     // Change the comment type name.
-    $this->drupalGet('admin/structure/comment');
+    $this->drupalGet('admin/structure/comment-types');
     $edit = array(
       'label' => 'Bar',
     );
-    $this->drupalPostForm('admin/structure/comment/manage/comment', $edit, t('Save'));
+    $this->drupalPostForm('admin/structure/comment-types/manage/comment', $edit, t('Save'));
 
-    $this->drupalGet('admin/structure/comment');
+    $this->drupalGet('admin/structure/comment-types');
     $this->assertRaw('Bar', 'New name was displayed.');
     $this->clickLink('Manage fields');
     $this->assertUrl(\Drupal::url('entity.comment.field_ui_fields', ['comment_type' => 'comment'], ['absolute' => TRUE]), [], 'Original machine name was used in URL.');
     $this->assertTrue($this->cssSelect('tr#comment-body'), 'Body field exists.');
 
     // Remove the body field.
-    $this->drupalPostForm('admin/structure/comment/manage/comment/fields/comment.comment.comment_body/delete', array(), t('Delete'));
+    $this->drupalPostForm('admin/structure/comment-types/manage/comment/fields/comment.comment.comment_body/delete', array(), t('Delete'));
     // Resave the settings for this type.
-    $this->drupalPostForm('admin/structure/comment/manage/comment', array(), t('Save'));
+    $this->drupalPostForm('admin/structure/comment-types/manage/comment', array(), t('Save'));
     // Check that the body field doesn't exist.
-    $this->drupalGet('admin/structure/comment/manage/comment/fields');
+    $this->drupalGet('admin/structure/comment-types/manage/comment/fields');
     $this->assertFalse($this->cssSelect('tr#comment-body'), 'Body field does not exist.');
   }
 
@@ -149,7 +149,7 @@ public function testCommentTypeDeletion() {
     $comment->save();
 
     // Attempt to delete the comment type, which should not be allowed.
-    $this->drupalGet('admin/structure/comment/manage/' . $type->id() . '/delete');
+    $this->drupalGet('admin/structure/comment-types/manage/' . $type->id() . '/delete');
     $this->assertRaw(
       t('%label is used by 1 comment on your site. You can not remove this comment type until you have removed all of the %label comments.', array('%label' => $type->label())),
       'The comment type will not be deleted until all comments of that type are removed.'
@@ -167,7 +167,7 @@ public function testCommentTypeDeletion() {
     $comment->delete();
     $field_storage->delete();
     // Attempt to delete the comment type, which should now be allowed.
-    $this->drupalGet('admin/structure/comment/manage/' . $type->id() . '/delete');
+    $this->drupalGet('admin/structure/comment-types/manage/' . $type->id() . '/delete');
     $this->assertRaw(
       t('Are you sure you want to delete the comment type %type?', array('%type' => $type->id())),
       'The comment type is available for deletion.'
@@ -184,7 +184,7 @@ public function testCommentTypeDeletion() {
     }
 
     // Delete the comment type.
-    $this->drupalPostForm('admin/structure/comment/manage/' . $type->id() . '/delete', array(), t('Delete'));
+    $this->drupalPostForm('admin/structure/comment-types/manage/' . $type->id() . '/delete', array(), t('Delete'));
     $this->assertNull(CommentType::load($type->id()), 'Comment type deleted.');
     $this->assertRaw(t('The comment type %label has been deleted.', array('%label' => $type->label())));
   }
diff --git a/core/modules/config_translation/src/Tests/ConfigTranslationListUiTest.php b/core/modules/config_translation/src/Tests/ConfigTranslationListUiTest.php
index 4ceec20..a65d05c 100644
--- a/core/modules/config_translation/src/Tests/ConfigTranslationListUiTest.php
+++ b/core/modules/config_translation/src/Tests/ConfigTranslationListUiTest.php
@@ -239,9 +239,9 @@ public function doContentTypeListTest() {
     ));
 
     // Get the content type listing.
-    $this->drupalGet('admin/structure/types');
+    $this->drupalGet('admin/structure/content-types');
 
-    $translate_link = 'admin/structure/types/manage/' . $content_type->id() . '/translate';
+    $translate_link = 'admin/structure/content-types/manage/' . $content_type->id() . '/translate';
     // Test if the link to translate the content type is on the page.
     $this->assertLinkByHref($translate_link);
 
@@ -409,7 +409,7 @@ public function doFieldListTest() {
     // Look at a few fields on a few entity types.
     $pages = array(
       array(
-        'list' => 'admin/structure/types/manage/' . $content_type->id() . '/fields',
+        'list' => 'admin/structure/content-types/manage/' . $content_type->id() . '/fields',
         'field' => 'node.' . $content_type->id() . '.body',
       ),
       array(
diff --git a/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php b/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php
index 00b36c5..4883f63 100644
--- a/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php
+++ b/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php
@@ -396,7 +396,7 @@ public function testNodeTypeTranslation() {
     $edit = array(
       "translation[config_names][node.type.$type][name]" => $translated_name,
     );
-    $this->drupalPostForm("admin/structure/types/manage/$type/translate/$langcode/add", $edit, t('Save translation'));
+    $this->drupalPostForm("admin/structure/content-types/manage/$type/translate/$langcode/add", $edit, t('Save translation'));
 
     // Check the name is translated without admin theme for editing.
     $this->drupalPostForm('admin/appearance', array('use_admin_theme' => '0'), t('Save configuration'));
diff --git a/core/modules/content_translation/src/Tests/ContentTranslationEntityBundleUITest.php b/core/modules/content_translation/src/Tests/ContentTranslationEntityBundleUITest.php
index 2c432c4..fce84b1 100644
--- a/core/modules/content_translation/src/Tests/ContentTranslationEntityBundleUITest.php
+++ b/core/modules/content_translation/src/Tests/ContentTranslationEntityBundleUITest.php
@@ -32,11 +32,11 @@ public function testContentTypeUI() {
     $this->drupalCreateContentType(array('type' => 'article'));
     // Enable content translation.
     $edit = array('language_configuration[content_translation]' => TRUE);
-    $this->drupalPostForm('admin/structure/types/manage/article', $edit, 'Save content type');
+    $this->drupalPostForm('admin/structure/content-types/manage/article', $edit, 'Save content type');
 
     // Make sure add page does not inherit translation configuration from first
     // content type.
-    $this->drupalGet('admin/structure/types/add');
+    $this->drupalGet('admin/structure/content-types/add');
     $this->assertNoFieldChecked('edit-language-configuration-content-translation');
 
     // Create second content type and set content translation.
@@ -45,10 +45,10 @@ public function testContentTypeUI() {
       'type' => 'page',
       'language_configuration[content_translation]' => TRUE,
     );
-    $this->drupalPostForm('admin/structure/types/add', $edit, 'Save and manage fields');
+    $this->drupalPostForm('admin/structure/content-types/add', $edit, 'Save and manage fields');
 
     // Make sure the settings are saved when creating the content type.
-    $this->drupalGet('admin/structure/types/manage/page');
+    $this->drupalGet('admin/structure/content-types/manage/page');
     $this->assertFieldChecked('edit-language-configuration-content-translation');
 
   }
diff --git a/core/modules/content_translation/src/Tests/ContentTranslationSettingsTest.php b/core/modules/content_translation/src/Tests/ContentTranslationSettingsTest.php
index c979c5b..fb74436 100644
--- a/core/modules/content_translation/src/Tests/ContentTranslationSettingsTest.php
+++ b/core/modules/content_translation/src/Tests/ContentTranslationSettingsTest.php
@@ -137,7 +137,7 @@ function testSettingsUI() {
     $this->assertTrue($language_configuration->isLanguageAlterable(), 'The language selector for article comments is shown.');
 
     // Verify language widget appears on comment type form.
-    $this->drupalGet('admin/structure/comment/manage/comment_article');
+    $this->drupalGet('admin/structure/comment-types/manage/comment_article');
     $this->assertField('language_configuration[content_translation]');
     $this->assertFieldChecked('edit-language-configuration-content-translation');
 
@@ -146,11 +146,11 @@ function testSettingsUI() {
       'language_configuration[content_translation]' => TRUE,
     );
     // Make sure the checkbox is available and not checked by default.
-    $this->drupalGet('admin/structure/types/manage/article');
+    $this->drupalGet('admin/structure/content-types/manage/article');
     $this->assertField('language_configuration[content_translation]');
     $this->assertNoFieldChecked('edit-language-configuration-content-translation');
-    $this->drupalPostForm('admin/structure/types/manage/article', $edit, t('Save content type'));
-    $this->drupalGet('admin/structure/types/manage/article');
+    $this->drupalPostForm('admin/structure/content-types/manage/article', $edit, t('Save content type'));
+    $this->drupalGet('admin/structure/content-types/manage/article');
     $this->assertFieldChecked('edit-language-configuration-content-translation');
 
     // Test that the title field of nodes is available in the settings form.
@@ -175,7 +175,7 @@ function testSettingsUI() {
       // Test that also the Field UI form behaves correctly.
       $translatable = !$translatable;
       $edit = array('translatable' => $translatable);
-      $this->drupalPostForm('admin/structure/types/manage/article/fields/node.article.body', $edit, t('Save settings'));
+      $this->drupalPostForm('admin/structure/content-types/manage/article/fields/node.article.body', $edit, t('Save settings'));
       \Drupal::entityManager()->clearCachedFieldDefinitions();
       $field = FieldConfig::loadByName('node', 'article', 'body');
       $definitions = \Drupal::entityManager()->getFieldDefinitions('node', 'article');
@@ -254,11 +254,11 @@ function testFieldTranslatableSettingsUI() {
       'label' => 'Test',
       'field_name' => 'article_text',
     );
-    $this->drupalPostForm('admin/structure/types/manage/article/fields/add-field', $edit, 'Save and continue');
+    $this->drupalPostForm('admin/structure/content-types/manage/article/fields/add-field', $edit, 'Save and continue');
 
     // Tests that field doesn't have translatable setting if bundle is not
     // translatable.
-    $path = 'admin/structure/types/manage/article/fields/node.article.field_article_text';
+    $path = 'admin/structure/content-types/manage/article/fields/node.article.field_article_text';
     $this->drupalGet($path);
     $this->assertFieldByXPath('//input[@id="edit-translatable" and @disabled="disabled"]');
     $this->assertText('To configure translation for this field, enable language support for this type.', 'No translatable setting for field.');
diff --git a/core/modules/datetime/src/Tests/DateTimeFieldTest.php b/core/modules/datetime/src/Tests/DateTimeFieldTest.php
index f3fcae1..a779fa0 100644
--- a/core/modules/datetime/src/Tests/DateTimeFieldTest.php
+++ b/core/modules/datetime/src/Tests/DateTimeFieldTest.php
@@ -312,10 +312,10 @@ function testDefaultValue() {
     $field_edit = array(
       'default_value_input[default_date_type]' => 'now',
     );
-    $this->drupalPostForm('admin/structure/types/manage/date_content/fields/node.date_content.' . $field_name, $field_edit, t('Save settings'));
+    $this->drupalPostForm('admin/structure/content-types/manage/date_content/fields/node.date_content.' . $field_name, $field_edit, t('Save settings'));
 
     // Check that default value is selected in default value form.
-    $this->drupalGet('admin/structure/types/manage/date_content/fields/node.date_content.' . $field_name);
+    $this->drupalGet('admin/structure/content-types/manage/date_content/fields/node.date_content.' . $field_name);
     $this->assertOptionSelected('edit-default-value-input-default-date-type', 'now', 'The default value is selected in instance settings page');
     $this->assertFieldByName('default_value_input[default_date]', '', 'The relative default value is empty in instance settings page');
 
@@ -336,7 +336,7 @@ function testDefaultValue() {
       'default_value_input[default_date_type]' => 'relative',
       'default_value_input[default_date]' => 'invalid date',
     );
-    $this->drupalPostForm('admin/structure/types/manage/date_content/fields/node.date_content.' . $field_name, $field_edit, t('Save settings'));
+    $this->drupalPostForm('admin/structure/content-types/manage/date_content/fields/node.date_content.' . $field_name, $field_edit, t('Save settings'));
 
     $this->assertText('The relative date value entered is invalid.');
 
@@ -345,10 +345,10 @@ function testDefaultValue() {
       'default_value_input[default_date_type]' => 'relative',
       'default_value_input[default_date]' => '+90 days',
     );
-    $this->drupalPostForm('admin/structure/types/manage/date_content/fields/node.date_content.' . $field_name, $field_edit, t('Save settings'));
+    $this->drupalPostForm('admin/structure/content-types/manage/date_content/fields/node.date_content.' . $field_name, $field_edit, t('Save settings'));
 
     // Check that default value is selected in default value form.
-    $this->drupalGet('admin/structure/types/manage/date_content/fields/node.date_content.' . $field_name);
+    $this->drupalGet('admin/structure/content-types/manage/date_content/fields/node.date_content.' . $field_name);
     $this->assertOptionSelected('edit-default-value-input-default-date-type', 'relative', 'The default value is selected in instance settings page');
     $this->assertFieldByName('default_value_input[default_date]', '+90 days', 'The relative default value is displayed in instance settings page');
 
@@ -368,10 +368,10 @@ function testDefaultValue() {
     $field_edit = array(
       'default_value_input[default_date_type]' => '',
     );
-    $this->drupalPostForm('admin/structure/types/manage/date_content/fields/node.date_content.' . $field_name, $field_edit, t('Save settings'));
+    $this->drupalPostForm('admin/structure/content-types/manage/date_content/fields/node.date_content.' . $field_name, $field_edit, t('Save settings'));
 
     // Check that default value is selected in default value form.
-    $this->drupalGet('admin/structure/types/manage/date_content/fields/node.date_content.' . $field_name);
+    $this->drupalGet('admin/structure/content-types/manage/date_content/fields/node.date_content.' . $field_name);
     $this->assertOptionSelected('edit-default-value-input-default-date-type', '', 'The default value is selected in instance settings page');
     $this->assertFieldByName('default_value_input[default_date]', '', 'The relative default value is empty in instance settings page');
 
diff --git a/core/modules/entity_reference/src/Tests/EntityReferenceAdminTest.php b/core/modules/entity_reference/src/Tests/EntityReferenceAdminTest.php
index 6c72d49..cffb7e6 100644
--- a/core/modules/entity_reference/src/Tests/EntityReferenceAdminTest.php
+++ b/core/modules/entity_reference/src/Tests/EntityReferenceAdminTest.php
@@ -59,7 +59,7 @@ protected function setUp() {
    * Tests the Entity Reference Admin UI.
    */
   public function testFieldAdminHandler() {
-    $bundle_path = 'admin/structure/types/manage/' . $this->type;
+    $bundle_path = 'admin/structure/content-types/manage/' . $this->type;
 
     // First step: 'Add new field' on the 'Manage fields' page.
     $this->drupalGet($bundle_path . '/fields/add-field');
@@ -217,7 +217,7 @@ public function testAvailableFormatters() {
     $date_format_field_name = $this->createEntityReferenceField('date_format');
 
     // Display all newly created Entity Reference configuration.
-    $this->drupalGet('admin/structure/types/manage/' . $this->type . '/display');
+    $this->drupalGet('admin/structure/content-types/manage/' . $this->type . '/display');
 
     // Check for Taxonomy Term select box values.
     // Test if Taxonomy Term Entity Reference Field has the correct formatters.
@@ -272,7 +272,7 @@ public function testAvailableFormatters() {
    */
   public function createEntityReferenceField($target_type, $bundle = NULL) {
     // Generates a bundle path for the newly created content type.
-    $bundle_path = 'admin/structure/types/manage/' . $this->type;
+    $bundle_path = 'admin/structure/content-types/manage/' . $this->type;
 
     // Generate a random field name, must be only lowercase characters.
     $field_name = strtolower($this->randomMachineName());
diff --git a/core/modules/entity_reference/src/Tests/EntityReferenceFieldDefaultValueTest.php b/core/modules/entity_reference/src/Tests/EntityReferenceFieldDefaultValueTest.php
index c2ceed9..79a3a1f 100644
--- a/core/modules/entity_reference/src/Tests/EntityReferenceFieldDefaultValueTest.php
+++ b/core/modules/entity_reference/src/Tests/EntityReferenceFieldDefaultValueTest.php
@@ -78,10 +78,10 @@ function testEntityReferenceDefaultValue() {
     $field_edit = array(
       'default_value_input[' . $field_name . '][0][target_id]' => $referenced_node->getTitle() . ' (' .$referenced_node->id() . ')',
     );
-    $this->drupalPostForm('admin/structure/types/manage/reference_content/fields/node.reference_content.' . $field_name, $field_edit, t('Save settings'));
+    $this->drupalPostForm('admin/structure/content-types/manage/reference_content/fields/node.reference_content.' . $field_name, $field_edit, t('Save settings'));
 
     // Check that default value is selected in default value form.
-    $this->drupalGet('admin/structure/types/manage/reference_content/fields/node.reference_content.' . $field_name);
+    $this->drupalGet('admin/structure/content-types/manage/reference_content/fields/node.reference_content.' . $field_name);
     $this->assertRaw('name="default_value_input[' . $field_name . '][0][target_id]" value="' . $referenced_node->getTitle() .' (' .$referenced_node->id() . ')', 'The default value is selected in instance settings page');
 
     // Check if the ID has been converted to UUID in config entity.
@@ -142,7 +142,7 @@ function testEntityReferenceDefaultConfigValue() {
       'default_value_input[' . $field_name . '][0][target_id]' => $referenced_node_type->label() . ' (' .$referenced_node_type->id() . ')',
       'default_value_input[' . $field_name . '][1][target_id]' => $referenced_node_type2->label() . ' (' .$referenced_node_type2->id() . ')',
     );
-    $this->drupalPostForm('admin/structure/types/manage/reference_content/fields/node.reference_content.' . $field_name, $field_edit, t('Save settings'));
+    $this->drupalPostForm('admin/structure/content-types/manage/reference_content/fields/node.reference_content.' . $field_name, $field_edit, t('Save settings'));
 
     // Check that the field has a dependency on the default value.
     $config_entity = $this->config('field.field.node.reference_content.' . $field_name)->get();
diff --git a/core/modules/field/src/Tests/Boolean/BooleanFormatterSettingsTest.php b/core/modules/field/src/Tests/Boolean/BooleanFormatterSettingsTest.php
index e9b693d..903c201 100644
--- a/core/modules/field/src/Tests/Boolean/BooleanFormatterSettingsTest.php
+++ b/core/modules/field/src/Tests/Boolean/BooleanFormatterSettingsTest.php
@@ -111,14 +111,14 @@ function testBooleanFormatterSettings() {
 
     foreach ($settings as $values) {
       // Set up the field settings.
-      $this->drupalGet('admin/structure/types/manage/' . $this->bundle . '/fields/node.' . $this->bundle . '.' . $this->fieldName);
+      $this->drupalGet('admin/structure/content-types/manage/' . $this->bundle . '/fields/node.' . $this->bundle . '.' . $this->fieldName);
       $this->drupalPostForm(NULL, array(
         'settings[on_label]' => $values[0],
         'settings[off_label]' => $values[1],
       ), 'Save settings');
 
       // Open the Manage Display page and trigger the field settings form.
-      $this->drupalGet('admin/structure/types/manage/' . $this->bundle . '/display');
+      $this->drupalGet('admin/structure/content-types/manage/' . $this->bundle . '/display');
       $this->drupalPostAjaxForm(NULL, array(), $this->fieldName . '_settings_edit');
 
       // Test that the settings options are present in the correct format.
diff --git a/core/modules/field/src/Tests/Number/NumberFieldTest.php b/core/modules/field/src/Tests/Number/NumberFieldTest.php
index 0a22b74..ff2c808 100644
--- a/core/modules/field/src/Tests/Number/NumberFieldTest.php
+++ b/core/modules/field/src/Tests/Number/NumberFieldTest.php
@@ -410,7 +410,7 @@ function testNumberFormatter() {
     $node->save();
 
     // Go to manage display page.
-    $this->drupalGet("admin/structure/types/manage/$type/display");
+    $this->drupalGet("admin/structure/content-types/manage/$type/display");
 
     // Configure number_decimal formatter for the 'float' field type.
     $thousand_separator = $thousand_separators[array_rand($thousand_separators)];
@@ -439,7 +439,7 @@ function testNumberFormatter() {
         'type' => 'number_integer',
       ))
       ->save();
-    $this->drupalGet("admin/structure/types/manage/$type/display");
+    $this->drupalGet("admin/structure/content-types/manage/$type/display");
 
     $thousand_separator = $thousand_separators[array_rand($thousand_separators)];
 
diff --git a/core/modules/field_ui/src/Tests/ManageDisplayTest.php b/core/modules/field_ui/src/Tests/ManageDisplayTest.php
index 25294c4..576d418 100644
--- a/core/modules/field_ui/src/Tests/ManageDisplayTest.php
+++ b/core/modules/field_ui/src/Tests/ManageDisplayTest.php
@@ -64,7 +64,7 @@ protected function setUp() {
    * Tests formatter settings.
    */
   function testFormatterUI() {
-    $manage_fields = 'admin/structure/types/manage/' . $this->type;
+    $manage_fields = 'admin/structure/content-types/manage/' . $this->type;
     $manage_display = $manage_fields . '/display';
 
     // Create a field, and a node with some data for the field.
@@ -176,7 +176,7 @@ function testFormatterUI() {
    */
   public function testWidgetUI() {
     // Admin Manage Fields page.
-    $manage_fields = 'admin/structure/types/manage/' . $this->type;
+    $manage_fields = 'admin/structure/content-types/manage/' . $this->type;
     // Admin Manage Display page.
     $manage_display = $manage_fields . '/form-display';
 
@@ -271,7 +271,7 @@ public function testWidgetUI() {
    */
   function testViewModeCustom() {
     // Create a field, and a node with some data for the field.
-    $this->fieldUIAddNewField('admin/structure/types/manage/' . $this->type, 'test', 'Test field');
+    $this->fieldUIAddNewField('admin/structure/content-types/manage/' . $this->type, 'test', 'Test field');
     \Drupal::entityManager()->clearCachedFieldDefinitions();
     // For this test, use a formatter setting value that is an integer unlikely
     // to appear in a rendered node other than as part of the field being tested
@@ -302,14 +302,14 @@ function testViewModeCustom() {
     $edit = array(
       'fields[field_test][type]' => 'field_test_with_prepare_view',
     );
-    $this->drupalPostForm('admin/structure/types/manage/' . $this->type . '/display', $edit, t('Save'));
+    $this->drupalPostForm('admin/structure/content-types/manage/' . $this->type . '/display', $edit, t('Save'));
     $this->assertNodeViewText($node, 'rss', $output['field_test_with_prepare_view'], "The field is displayed as expected in view modes that use 'default' settings.");
 
     // Specialize the 'rss' mode, check that the field is displayed the same.
     $edit = array(
       "display_modes_custom[rss]" => TRUE,
     );
-    $this->drupalPostForm('admin/structure/types/manage/' . $this->type . '/display', $edit, t('Save'));
+    $this->drupalPostForm('admin/structure/content-types/manage/' . $this->type . '/display', $edit, t('Save'));
     $this->assertNodeViewText($node, 'rss', $output['field_test_with_prepare_view'], "The field is displayed as expected in newly specialized 'rss' mode.");
 
     // Set the field to 'hidden' in the view mode, check that the field is
@@ -317,7 +317,7 @@ function testViewModeCustom() {
     $edit = array(
       'fields[field_test][type]' => 'hidden',
     );
-    $this->drupalPostForm('admin/structure/types/manage/' . $this->type . '/display/rss', $edit, t('Save'));
+    $this->drupalPostForm('admin/structure/content-types/manage/' . $this->type . '/display/rss', $edit, t('Save'));
     $this->assertNodeViewNoText($node, 'rss', $value, "The field is hidden in 'rss' mode.");
 
     // Set the view mode back to 'default', check that the field is displayed
@@ -325,14 +325,14 @@ function testViewModeCustom() {
     $edit = array(
       "display_modes_custom[rss]" => FALSE,
     );
-    $this->drupalPostForm('admin/structure/types/manage/' . $this->type . '/display', $edit, t('Save'));
+    $this->drupalPostForm('admin/structure/content-types/manage/' . $this->type . '/display', $edit, t('Save'));
     $this->assertNodeViewText($node, 'rss', $output['field_test_with_prepare_view'], "The field is displayed as expected when 'rss' mode is set back to 'default' settings.");
 
     // Specialize the view mode again.
     $edit = array(
       "display_modes_custom[rss]" => TRUE,
     );
-    $this->drupalPostForm('admin/structure/types/manage/' . $this->type . '/display', $edit, t('Save'));
+    $this->drupalPostForm('admin/structure/content-types/manage/' . $this->type . '/display', $edit, t('Save'));
     // Check that the previous settings for the view mode have been kept.
     $this->assertNodeViewNoText($node, 'rss', $value, "The previous settings are kept when 'rss' mode is specialized again.");
   }
@@ -341,7 +341,7 @@ function testViewModeCustom() {
    * Tests the local tasks are displayed correctly for view modes.
    */
   public function testViewModeLocalTasks() {
-    $manage_display = 'admin/structure/types/manage/' . $this->type . '/display';
+    $manage_display = 'admin/structure/content-types/manage/' . $this->type . '/display';
     $this->drupalGet($manage_display);
     $this->assertNoLink('Full content');
     $this->drupalGet($manage_display . '/teaser');
@@ -353,11 +353,11 @@ public function testViewModeLocalTasks() {
    */
   function testNonInitializedFields() {
     // Create a test field.
-    $this->fieldUIAddNewField('admin/structure/types/manage/' . $this->type, 'test', 'Test');
+    $this->fieldUIAddNewField('admin/structure/content-types/manage/' . $this->type, 'test', 'Test');
 
     // Check that the field appears as 'hidden' on the 'Manage display' page
     // for the 'teaser' mode.
-    $this->drupalGet('admin/structure/types/manage/' . $this->type . '/display/teaser');
+    $this->drupalGet('admin/structure/content-types/manage/' . $this->type . '/display/teaser');
     $this->assertFieldByName('fields[field_test][type]', 'hidden', 'The field is displayed as \'hidden \'.');
   }
 
@@ -382,7 +382,7 @@ function testNoFieldsDisplayOverview() {
       'name' => 'No fields',
     ))->save();
 
-    $this->drupalGet('admin/structure/types/manage/no_fields/display');
+    $this->drupalGet('admin/structure/content-types/manage/no_fields/display');
     $this->assertRaw(t('There are no fields yet added. You can add new fields on the <a href="@link">Manage fields</a> page.', array('@link' => \Drupal::url('entity.node.field_ui_fields', array('node_type' => 'no_fields')))));
   }
 
diff --git a/core/modules/field_ui/src/Tests/ManageFieldsTest.php b/core/modules/field_ui/src/Tests/ManageFieldsTest.php
index 3b90bff..15b3459 100644
--- a/core/modules/field_ui/src/Tests/ManageFieldsTest.php
+++ b/core/modules/field_ui/src/Tests/ManageFieldsTest.php
@@ -131,7 +131,7 @@ function testCRUDFields() {
    */
   function manageFieldsPage($type = '') {
     $type = empty($type) ? $this->contentType : $type;
-    $this->drupalGet('admin/structure/types/manage/' . $type . '/fields');
+    $this->drupalGet('admin/structure/content-types/manage/' . $type . '/fields');
     // Check all table columns.
     $table_headers = array(
       t('Label'),
@@ -151,7 +151,7 @@ function manageFieldsPage($type = '') {
     $number_of_links = 3;
     $number_of_links_found = 0;
     $operation_links = $this->xpath('//ul[@class = "dropbutton"]/li/a');
-    $url = base_path() . "admin/structure/types/manage/$type/fields/node.$type.body";
+    $url = base_path() . "admin/structure/content-types/manage/$type/fields/node.$type.body";
 
     foreach ($operation_links as $link) {
       switch ($link['title']) {
@@ -181,7 +181,7 @@ function manageFieldsPage($type = '') {
    */
   function createField() {
     // Create a test field.
-    $this->fieldUIAddNewField('admin/structure/types/manage/' . $this->contentType, $this->fieldNameInput, $this->fieldLabel);
+    $this->fieldUIAddNewField('admin/structure/content-types/manage/' . $this->contentType, $this->fieldNameInput, $this->fieldLabel);
   }
 
   /**
@@ -190,7 +190,7 @@ function createField() {
   function updateField() {
     $field_id = 'node.' . $this->contentType . '.' . $this->fieldName;
     // Go to the field edit page.
-    $this->drupalGet('admin/structure/types/manage/' . $this->contentType . '/fields/' . $field_id . '/storage');
+    $this->drupalGet('admin/structure/content-types/manage/' . $this->contentType . '/fields/' . $field_id . '/storage');
 
     // Populate the field settings with new settings.
     $string = 'updated dummy test string';
@@ -200,7 +200,7 @@ function updateField() {
     $this->drupalPostForm(NULL, $edit, t('Save field settings'));
 
     // Go to the field edit page.
-    $this->drupalGet('admin/structure/types/manage/' . $this->contentType . '/fields/' . $field_id);
+    $this->drupalGet('admin/structure/content-types/manage/' . $this->contentType . '/fields/' . $field_id);
     $edit = array(
       'settings[test_field_setting]' => $string,
     );
@@ -211,7 +211,7 @@ function updateField() {
     $this->assertFieldSettings($this->contentType, $this->fieldName, $string);
 
     // Assert redirection back to the "manage fields" page.
-    $this->assertUrl('admin/structure/types/manage/' . $this->contentType . '/fields');
+    $this->assertUrl('admin/structure/content-types/manage/' . $this->contentType . '/fields');
   }
 
   /**
@@ -219,7 +219,7 @@ function updateField() {
    */
   function addExistingField() {
     // Check "Re-use existing field" appears.
-    $this->drupalGet('admin/structure/types/manage/page/fields/add-field');
+    $this->drupalGet('admin/structure/content-types/manage/page/fields/add-field');
     $this->assertRaw(t('Re-use an existing field'), '"Re-use existing field" was found.');
 
     // Check that fields of other entity types (here, the 'comment_body' field)
@@ -229,7 +229,7 @@ function addExistingField() {
     $this->assertTrue($this->xpath('//select[@id="edit-existing-storage-name"]//option[@value=:field_name]', array(':field_name' => $this->fieldName)), 'The list of options shows a valid option.');
 
     // Add a new field based on an existing field.
-    $this->fieldUIAddExistingField("admin/structure/types/manage/page", $this->fieldName, $this->fieldLabel . '_2');
+    $this->fieldUIAddExistingField("admin/structure/content-types/manage/page", $this->fieldName, $this->fieldLabel . '_2');
   }
 
   /**
@@ -239,7 +239,7 @@ function addExistingField() {
    * numeric value. That is tested already in FormTest::testNumber().
    */
   function cardinalitySettings() {
-    $field_edit_path = 'admin/structure/types/manage/article/fields/node.article.body/storage';
+    $field_edit_path = 'admin/structure/content-types/manage/article/fields/node.article.body/storage';
 
     // Assert the cardinality other field cannot be empty when cardinality is
     // set to 'number'.
@@ -263,7 +263,7 @@ function cardinalitySettings() {
 
     // Check that tabs displayed.
     $this->assertLink(t('Edit'));
-    $this->assertLinkByHref('admin/structure/types/manage/article/fields/node.article.body');
+    $this->assertLinkByHref('admin/structure/content-types/manage/article/fields/node.article.body');
     $this->assertLink(t('Field settings'));
     $this->assertLinkByHref($field_edit_path);
 
@@ -284,7 +284,7 @@ function cardinalitySettings() {
   protected function deleteField() {
     // Delete the field.
     $field_id = 'node.' . $this->contentType . '.' . $this->fieldName;
-    $this->drupalGet('admin/structure/types/manage/' . $this->contentType . '/fields/' . $field_id);
+    $this->drupalGet('admin/structure/content-types/manage/' . $this->contentType . '/fields/' . $field_id);
     $this->clickLink(t('Delete'));
     $this->assertResponse(200);
   }
@@ -299,18 +299,18 @@ protected function addPersistentFieldStorage() {
     // Delete all instances of the field.
     foreach ($field_storage->getBundles() as $node_type) {
       // Delete all the body field instances.
-      $this->drupalGet('admin/structure/types/manage/' . $node_type . '/fields/node.' . $node_type . '.' . $this->fieldName);
+      $this->drupalGet('admin/structure/content-types/manage/' . $node_type . '/fields/node.' . $node_type . '.' . $this->fieldName);
       $this->clickLink(t('Delete'));
       $this->drupalPostForm(NULL, array(), t('Delete'));
     }
     // Check "Re-use existing field" appears.
-    $this->drupalGet('admin/structure/types/manage/page/fields/add-field');
+    $this->drupalGet('admin/structure/content-types/manage/page/fields/add-field');
     $this->assertRaw(t('Re-use an existing field'), '"Re-use existing field" was found.');
 
     // Ensure that we test with a label that contains HTML.
     $label = $this->randomString(4) . '<br/>' . $this->randomString(4);
     // Add a new field for the orphaned storage.
-    $this->fieldUIAddExistingField("admin/structure/types/manage/page", $this->fieldName, $label);
+    $this->fieldUIAddExistingField("admin/structure/content-types/manage/page", $this->fieldName, $label);
   }
 
   /**
@@ -352,12 +352,12 @@ function testFieldPrefix() {
       'label' => $field_exceed_max_length_label,
       'field_name' => $field_exceed_max_length_input,
     );
-    $this->drupalPostForm('admin/structure/types/manage/' . $this->contentType . '/fields/add-field', $edit, t('Save and continue'));
+    $this->drupalPostForm('admin/structure/content-types/manage/' . $this->contentType . '/fields/add-field', $edit, t('Save and continue'));
     $this->assertText('Machine-readable name cannot be longer than 22 characters but is currently 23 characters long.');
 
     // Create a valid field.
-    $this->fieldUIAddNewField('admin/structure/types/manage/' . $this->contentType, $this->fieldNameInput, $this->fieldLabel);
-    $this->drupalGet('admin/structure/types/manage/' . $this->contentType . '/fields/node.' . $this->contentType . '.' . $field_prefix . $this->fieldNameInput);
+    $this->fieldUIAddNewField('admin/structure/content-types/manage/' . $this->contentType, $this->fieldNameInput, $this->fieldLabel);
+    $this->drupalGet('admin/structure/content-types/manage/' . $this->contentType . '/fields/node.' . $this->contentType . '.' . $field_prefix . $this->fieldNameInput);
     $this->assertText(format_string('@label settings for @type', array('@label' => $this->fieldLabel, '@type' => $this->contentType)));
   }
 
@@ -383,7 +383,7 @@ function testDefaultValue() {
       ->setComponent($field_name)
       ->save();
 
-    $admin_path = 'admin/structure/types/manage/' . $this->contentType . '/fields/' . $field->id();
+    $admin_path = 'admin/structure/content-types/manage/' . $this->contentType . '/fields/' . $field->id();
     $element_id = "edit-default-value-input-$field_name-0-value";
     $element_name = "default_value_input[{$field_name}][0][value]";
     $this->drupalGet($admin_path);
@@ -442,7 +442,7 @@ function testDefaultValue() {
    */
   function testDeleteField() {
     // Create a new field.
-    $bundle_path1 = 'admin/structure/types/manage/' . $this->contentType;
+    $bundle_path1 = 'admin/structure/content-types/manage/' . $this->contentType;
     $this->fieldUIAddNewField($bundle_path1, $this->fieldNameInput, $this->fieldLabel);
 
     // Create an additional node type.
@@ -451,7 +451,7 @@ function testDeleteField() {
     $type_name2 = $type2->id();
 
     // Add a field to the second node type.
-    $bundle_path2 = 'admin/structure/types/manage/' . $type_name2;
+    $bundle_path2 = 'admin/structure/content-types/manage/' . $type_name2;
     $this->fieldUIAddExistingField($bundle_path2, $this->fieldName, $this->fieldLabel);
 
     // Delete the first field.
@@ -486,13 +486,13 @@ function testDisallowedFieldNames() {
 
     // Try with an entity key.
     $edit['field_name'] = 'title';
-    $bundle_path = 'admin/structure/types/manage/' . $this->contentType;
+    $bundle_path = 'admin/structure/content-types/manage/' . $this->contentType;
     $this->drupalPostForm("$bundle_path/fields/add-field",  $edit, t('Save and continue'));
     $this->assertText(t('The machine-readable name is already in use. It must be unique.'));
 
     // Try with a base field.
     $edit['field_name'] = 'sticky';
-    $bundle_path = 'admin/structure/types/manage/' . $this->contentType;
+    $bundle_path = 'admin/structure/content-types/manage/' . $this->contentType;
     $this->drupalPostForm("$bundle_path/fields/add-field",  $edit, t('Save and continue'));
     $this->assertText(t('The machine-readable name is already in use. It must be unique.'));
   }
@@ -523,14 +523,14 @@ function testLockedField() {
       ->save();
 
     // Check that the links for edit and delete are not present.
-    $this->drupalGet('admin/structure/types/manage/' . $this->contentType . '/fields');
+    $this->drupalGet('admin/structure/content-types/manage/' . $this->contentType . '/fields');
     $locked = $this->xpath('//tr[@id=:field_name]/td[4]', array(':field_name' => $field_name));
     $this->assertTrue(in_array('Locked', $locked), 'Field is marked as Locked in the UI');
     $edit_link = $this->xpath('//tr[@id=:field_name]/td[4]', array(':field_name' => $field_name));
     $this->assertFalse(in_array('edit', $edit_link), 'Edit option for locked field is not present the UI');
     $delete_link = $this->xpath('//tr[@id=:field_name]/td[4]', array(':field_name' => $field_name));
     $this->assertFalse(in_array('delete', $delete_link), 'Delete option for locked field is not present the UI');
-    $this->drupalGet('admin/structure/types/manage/' . $this->contentType . '/fields/node.' . $this->contentType . '.' . $field_name . '/delete');
+    $this->drupalGet('admin/structure/content-types/manage/' . $this->contentType . '/fields/node.' . $this->contentType . '.' . $field_name . '/delete');
     $this->assertResponse(403);
   }
 
@@ -539,7 +539,7 @@ function testLockedField() {
    */
   function testHiddenFields() {
     // Check that the field type is not available in the 'add new field' row.
-    $this->drupalGet('admin/structure/types/manage/' . $this->contentType . '/fields/add-field');
+    $this->drupalGet('admin/structure/content-types/manage/' . $this->contentType . '/fields/add-field');
     $this->assertFalse($this->xpath('//select[@id="edit-new-storage-type"]//option[@value="hidden_test_field"]'), "The 'add new field' select respects field types 'no_ui' property.");
     $this->assertTrue($this->xpath('//select[@id="edit-new-storage-type"]//option[@value="shape"]'), "The 'add new field' select shows a valid option.");
 
@@ -564,12 +564,12 @@ function testHiddenFields() {
 
     // Check that the newly added field appears on the 'Manage Fields'
     // screen.
-    $this->drupalGet('admin/structure/types/manage/' . $this->contentType . '/fields');
+    $this->drupalGet('admin/structure/content-types/manage/' . $this->contentType . '/fields');
     $this->assertFieldByXPath('//table[@id="field-overview"]//tr[@id="hidden-test-field"]//td[1]', $field['label'], 'Field was created and appears in the overview page.');
 
     // Check that the field does not appear in the 're-use existing field' row
     // on other bundles.
-    $this->drupalGet('admin/structure/types/manage/page/fields/add-field');
+    $this->drupalGet('admin/structure/content-types/manage/page/fields/add-field');
     $this->assertFalse($this->xpath('//select[@id="edit-existing-storage-name"]//option[@value=:field_name]', array(':field_name' => $field_name)), "The 're-use existing field' select respects field types 'no_ui' property.");
     $this->assertTrue($this->xpath('//select[@id="edit-existing-storage-name"]//option[@value=:field_name]', array(':field_name' => 'field_tags')), "The 're-use existing field' select shows a valid option.");
 
@@ -594,7 +594,7 @@ function testRenameBundle() {
     $options = array(
       'type' => $type2,
     );
-    $this->drupalPostForm('admin/structure/types/manage/' . $this->contentType, $options, t('Save content type'));
+    $this->drupalPostForm('admin/structure/content-types/manage/' . $this->contentType, $options, t('Save content type'));
     $this->manageFieldsPage($type2);
   }
 
@@ -609,7 +609,7 @@ function testDuplicateFieldName() {
       'label' => $this->randomMachineName(),
       'new_storage_type' => 'entity_reference',
     );
-    $url = 'admin/structure/types/manage/' . $this->contentType . '/fields/add-field';
+    $url = 'admin/structure/content-types/manage/' . $this->contentType . '/fields/add-field';
     $this->drupalPostForm($url, $edit, t('Save and continue'));
 
     $this->assertText(t('The machine-readable name is already in use. It must be unique.'));
@@ -657,17 +657,17 @@ function testHelpDescriptions() {
     $edit = array(
       'description' => '<strong>Test with an upload field.',
     );
-    $this->drupalPostForm('admin/structure/types/manage/article/fields/node.article.field_image', $edit, t('Save settings'));
+    $this->drupalPostForm('admin/structure/content-types/manage/article/fields/node.article.field_image', $edit, t('Save settings'));
 
     // Check that hook_field_widget_form_alter() does believe this is the
     // default value form.
-    $this->drupalGet('admin/structure/types/manage/article/fields/node.article.field_tags');
+    $this->drupalGet('admin/structure/content-types/manage/article/fields/node.article.field_tags');
     $this->assertText('From hook_field_widget_form_alter(): Default form is true.', 'Default value form in hook_field_widget_form_alter().');
 
     $edit = array(
       'description' => '<em>Test with a non upload field.',
     );
-    $this->drupalPostForm('admin/structure/types/manage/article/fields/node.article.field_tags', $edit, t('Save settings'));
+    $this->drupalPostForm('admin/structure/content-types/manage/article/fields/node.article.field_tags', $edit, t('Save settings'));
 
     $this->drupalGet('node/add/article');
     $this->assertRaw('<strong>Test with an upload field.</strong>');
@@ -680,7 +680,7 @@ function testHelpDescriptions() {
   function fieldListAdminPage() {
     $this->drupalGet('admin/reports/fields');
     $this->assertText($this->fieldName, 'Field name is displayed in field list.');
-    $this->assertTrue($this->assertLinkByHref('admin/structure/types/manage/' . $this->contentType . '/fields'), 'Link to content type using field is displayed in field list.');
+    $this->assertTrue($this->assertLinkByHref('admin/structure/content-types/manage/' . $this->contentType . '/fields'), 'Link to content type using field is displayed in field list.');
   }
 
   /**
@@ -689,7 +689,7 @@ function fieldListAdminPage() {
    * @see \Drupal\Core\Field\PreconfiguredFieldUiOptionsInterface
    */
   public function testPreconfiguredFields() {
-    $this->drupalGet('admin/structure/types/manage/article/fields/add-field');
+    $this->drupalGet('admin/structure/content-types/manage/article/fields/add-field');
 
     // Check that the preconfigured field option exist alongside the regular
     // field type option.
diff --git a/core/modules/file/src/Tests/FileFieldDisplayTest.php b/core/modules/file/src/Tests/FileFieldDisplayTest.php
index f1a3f8a..67b5ae3 100644
--- a/core/modules/file/src/Tests/FileFieldDisplayTest.php
+++ b/core/modules/file/src/Tests/FileFieldDisplayTest.php
@@ -43,7 +43,7 @@ function testNodeDisplay() {
       $edit = array(
         "fields[$field_name][type]" => $formatter,
       );
-      $this->drupalPostForm("admin/structure/types/manage/$type_name/display", $edit, t('Save'));
+      $this->drupalPostForm("admin/structure/content-types/manage/$type_name/display", $edit, t('Save'));
       $this->drupalGet('node/' . $node->id());
       $this->assertNoText($field_name, format_string('Field label is hidden when no file attached for formatter %formatter', array('%formatter' => $formatter)));
     }
diff --git a/core/modules/file/src/Tests/FileFieldRSSContentTest.php b/core/modules/file/src/Tests/FileFieldRSSContentTest.php
index 56400a8..c2f8b2a 100644
--- a/core/modules/file/src/Tests/FileFieldRSSContentTest.php
+++ b/core/modules/file/src/Tests/FileFieldRSSContentTest.php
@@ -41,14 +41,14 @@ function testFileFieldRSSContent() {
     $this->createFileField($field_name, 'node', $type_name, $field_settings, $field_settings, $widget_settings);
 
     // RSS display must be added manually.
-    $this->drupalGet("admin/structure/types/manage/$type_name/display");
+    $this->drupalGet("admin/structure/content-types/manage/$type_name/display");
     $edit = array(
       "display_modes_custom[rss]" => '1',
     );
     $this->drupalPostForm(NULL, $edit, t('Save'));
 
     // Change the format to 'RSS enclosure'.
-    $this->drupalGet("admin/structure/types/manage/$type_name/display/rss");
+    $this->drupalGet("admin/structure/content-types/manage/$type_name/display/rss");
     $edit = array("fields[$field_name][type]" => 'file_rss_enclosure');
     $this->drupalPostForm(NULL, $edit, t('Save'));
 
diff --git a/core/modules/file/src/Tests/FileFieldWidgetTest.php b/core/modules/file/src/Tests/FileFieldWidgetTest.php
index ec02bb4..c764fdc 100644
--- a/core/modules/file/src/Tests/FileFieldWidgetTest.php
+++ b/core/modules/file/src/Tests/FileFieldWidgetTest.php
@@ -234,7 +234,7 @@ function testPrivateFileSetting() {
 
     // Change the field setting to make its files private, and upload a file.
     $edit = array('settings[uri_scheme]' => 'private');
-    $this->drupalPostForm("admin/structure/types/manage/$type_name/fields/$field_id/storage", $edit, t('Save field settings'));
+    $this->drupalPostForm("admin/structure/content-types/manage/$type_name/fields/$field_id/storage", $edit, t('Save field settings'));
     $nid = $this->uploadNodeFile($test_file, $field_name, $type_name);
     $node_storage->resetCache(array($nid));
     $node = $node_storage->load($nid);
@@ -247,12 +247,12 @@ function testPrivateFileSetting() {
 
     // Ensure we can't change 'uri_scheme' field settings while there are some
     // entities with uploaded files.
-    $this->drupalGet("admin/structure/types/manage/$type_name/fields/$field_id/storage");
+    $this->drupalGet("admin/structure/content-types/manage/$type_name/fields/$field_id/storage");
     $this->assertFieldByXpath('//input[@id="edit-settings-uri-scheme-public" and @disabled="disabled"]', 'public', 'Upload destination setting disabled.');
 
     // Delete node and confirm that setting could be changed.
     $node->delete();
-    $this->drupalGet("admin/structure/types/manage/$type_name/fields/$field_id/storage");
+    $this->drupalGet("admin/structure/content-types/manage/$type_name/fields/$field_id/storage");
     $this->assertFieldByXpath('//input[@id="edit-settings-uri-scheme-public" and not(@disabled)]', 'public', 'Upload destination setting enabled.');
   }
 
@@ -277,7 +277,7 @@ function testPrivateFileComment() {
     $name = strtolower($this->randomMachineName());
     $label = $this->randomMachineName();
     $storage_edit = array('settings[uri_scheme]' => 'private');
-    $this->fieldUIAddNewField('admin/structure/comment/manage/comment', $name, $label, 'file', $storage_edit);
+    $this->fieldUIAddNewField('admin/structure/comment-types/manage/comment', $name, $label, 'file', $storage_edit);
 
     // Manually clear cache on the tester side.
     \Drupal::entityManager()->clearCachedFieldDefinitions();
diff --git a/core/modules/forum/src/Tests/ForumTest.php b/core/modules/forum/src/Tests/ForumTest.php
index 9440179..6d56e16 100644
--- a/core/modules/forum/src/Tests/ForumTest.php
+++ b/core/modules/forum/src/Tests/ForumTest.php
@@ -213,7 +213,7 @@ function testForum() {
 
     // Test loading multiple forum nodes on the front page.
     $this->drupalLogin($this->drupalCreateUser(array('administer content types', 'create forum content', 'post comments')));
-    $this->drupalPostForm('admin/structure/types/manage/forum', array('options[promote]' => 'promote'), t('Save content type'));
+    $this->drupalPostForm('admin/structure/content-types/manage/forum', array('options[promote]' => 'promote'), t('Save content type'));
     $this->createForumTopic($this->forum, FALSE);
     $this->createForumTopic($this->forum, FALSE);
     $this->drupalGet('node');
diff --git a/core/modules/forum/src/Tests/ForumUninstallTest.php b/core/modules/forum/src/Tests/ForumUninstallTest.php
index a0270ca..911f5a1 100644
--- a/core/modules/forum/src/Tests/ForumUninstallTest.php
+++ b/core/modules/forum/src/Tests/ForumUninstallTest.php
@@ -95,7 +95,7 @@ public function testForumUninstallWithField() {
     }
 
     // Ensure that the forum node type can not be deleted.
-    $this->drupalGet('admin/structure/types/manage/forum');
+    $this->drupalGet('admin/structure/content-types/manage/forum');
     $this->assertNoLink(t('Delete'));
 
     // Now attempt to uninstall forum.
@@ -120,9 +120,9 @@ public function testForumUninstallWithField() {
       'title_label' => 'title for forum',
       'type' => 'forum',
     );
-    $this->drupalPostForm('admin/structure/types/add', $edit, t('Save content type'));
+    $this->drupalPostForm('admin/structure/content-types/add', $edit, t('Save content type'));
     $this->assertTrue((bool) NodeType::load('forum'), 'Node type with machine forum created.');
-    $this->drupalGet('admin/structure/types/manage/forum');
+    $this->drupalGet('admin/structure/content-types/manage/forum');
     $this->clickLink(t('Delete'));
     $this->drupalPostForm(NULL, array(), t('Delete'));
     $this->assertResponse(200);
diff --git a/core/modules/image/src/Tests/ImageFieldDefaultImagesTest.php b/core/modules/image/src/Tests/ImageFieldDefaultImagesTest.php
index 39e0d50..204a31b 100644
--- a/core/modules/image/src/Tests/ImageFieldDefaultImagesTest.php
+++ b/core/modules/image/src/Tests/ImageFieldDefaultImagesTest.php
@@ -108,7 +108,7 @@ public function testDefaultImages() {
 
     // Confirm the defaults are present on the article field settings form.
     $field_id = $field->id();
-    $this->drupalGet("admin/structure/types/manage/article/fields/$field_id/storage");
+    $this->drupalGet("admin/structure/content-types/manage/article/fields/$field_id/storage");
     $this->assertFieldByXpath(
       '//input[@name="settings[default_image][uuid][fids]"]',
       $default_images['field']->id(),
@@ -118,7 +118,7 @@ public function testDefaultImages() {
       )
     );
     // Confirm the defaults are present on the article field edit form.
-    $this->drupalGet("admin/structure/types/manage/article/fields/$field_id");
+    $this->drupalGet("admin/structure/content-types/manage/article/fields/$field_id");
     $this->assertFieldByXpath(
       '//input[@name="settings[default_image][uuid][fids]"]',
       $default_images['field']->id(),
@@ -129,7 +129,7 @@ public function testDefaultImages() {
     );
 
     // Confirm the defaults are present on the page field settings form.
-    $this->drupalGet("admin/structure/types/manage/page/fields/$field_id/storage");
+    $this->drupalGet("admin/structure/content-types/manage/page/fields/$field_id/storage");
     $this->assertFieldByXpath(
       '//input[@name="settings[default_image][uuid][fids]"]',
       $default_images['field']->id(),
@@ -140,7 +140,7 @@ public function testDefaultImages() {
     );
     // Confirm the defaults are present on the page field edit form.
     $field2_id = $field2->id();
-    $this->drupalGet("admin/structure/types/manage/page/fields/$field2_id");
+    $this->drupalGet("admin/structure/content-types/manage/page/fields/$field2_id");
     $this->assertFieldByXpath(
       '//input[@name="settings[default_image][uuid][fids]"]',
       $default_images['field2']->id(),
@@ -181,7 +181,7 @@ public function testDefaultImages() {
     $field_storage->save();
 
     // Confirm that the new default is used on the article field settings form.
-    $this->drupalGet("admin/structure/types/manage/article/fields/$field_id/storage");
+    $this->drupalGet("admin/structure/content-types/manage/article/fields/$field_id/storage");
     $this->assertFieldByXpath(
       '//input[@name="settings[default_image][uuid][fids]"]',
       $default_images['field_new']->id(),
@@ -220,7 +220,7 @@ public function testDefaultImages() {
 
     // Confirm the new field field default is used on the article field
     // admin form.
-    $this->drupalGet("admin/structure/types/manage/article/fields/$field_id");
+    $this->drupalGet("admin/structure/content-types/manage/article/fields/$field_id");
     $this->assertFieldByXpath(
       '//input[@name="settings[default_image][uuid][fids]"]',
       $default_images['field_new']->id(),
@@ -266,7 +266,7 @@ public function testDefaultImages() {
     $field->save();
 
     // Confirm the article field field default has been removed.
-    $this->drupalGet("admin/structure/types/manage/article/fields/$field_id");
+    $this->drupalGet("admin/structure/content-types/manage/article/fields/$field_id");
     $this->assertFieldByXpath(
       '//input[@name="settings[default_image][uuid][fids]"]',
       '',
diff --git a/core/modules/image/src/Tests/ImageFieldDisplayTest.php b/core/modules/image/src/Tests/ImageFieldDisplayTest.php
index 875a2a2..41da9fb 100644
--- a/core/modules/image/src/Tests/ImageFieldDisplayTest.php
+++ b/core/modules/image/src/Tests/ImageFieldDisplayTest.php
@@ -54,7 +54,7 @@ function _testImageFieldFormatters($scheme) {
     $instance = $this->createImageField($field_name, 'article', array('uri_scheme' => $scheme), $field_settings);
 
     // Go to manage display page.
-    $this->drupalGet("admin/structure/types/manage/article/display");
+    $this->drupalGet("admin/structure/content-types/manage/article/display");
 
     // Test for existence of link to image styles configuration.
     $this->drupalPostAjaxForm(NULL, array(), "{$field_name}_settings_edit");
@@ -65,7 +65,7 @@ function _testImageFieldFormatters($scheme) {
     user_role_change_permissions(reset($admin_user_roles), array('administer image styles' => FALSE));
 
     // Go to manage display page again.
-    $this->drupalGet("admin/structure/types/manage/article/display");
+    $this->drupalGet("admin/structure/content-types/manage/article/display");
 
     // Test for absence of link to image styles configuration.
     $this->drupalPostAjaxForm(NULL, array(), "{$field_name}_settings_edit");
@@ -225,7 +225,7 @@ function testImageFieldSettings() {
 
     // Verify that the min/max resolution set on the field are properly
     // extracted, and displayed, on the image field's configuration form.
-    $this->drupalGet('admin/structure/types/manage/article/fields/' . $field->id());
+    $this->drupalGet('admin/structure/content-types/manage/article/fields/' . $field->id());
     $this->assertFieldByName('settings[max_resolution][x]', '100', 'Expected max resolution X value of 100.');
     $this->assertFieldByName('settings[max_resolution][y]', '100', 'Expected max resolution Y value of 100.');
     $this->assertFieldByName('settings[min_resolution][x]', '10', 'Expected min resolution X value of 10.');
@@ -302,7 +302,7 @@ function testImageFieldSettings() {
     // 1, so we need to make sure the file widget prevents these notices by
     // providing all settings, even if they are not used.
     // @see FileWidget::formMultipleElements().
-    $this->drupalPostForm('admin/structure/types/manage/article/fields/node.article.' . $field_name . '/storage', array('cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED), t('Save field settings'));
+    $this->drupalPostForm('admin/structure/content-types/manage/article/fields/node.article.' . $field_name . '/storage', array('cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED), t('Save field settings'));
     $edit = array(
       'files[' . $field_name . '_1][]' => drupal_realpath($test_image->uri),
     );
@@ -349,7 +349,7 @@ function testImageFieldDefaultImage() {
       'settings[default_image][alt]' => $alt,
       'settings[default_image][title]' => $title,
     );
-    $this->drupalPostForm("admin/structure/types/manage/article/fields/node.article.$field_name/storage", $edit, t('Save field settings'));
+    $this->drupalPostForm("admin/structure/content-types/manage/article/fields/node.article.$field_name/storage", $edit, t('Save field settings'));
     // Clear field definition cache so the new default image is detected.
     \Drupal::entityManager()->clearCachedFieldDefinitions();
     $field_storage = FieldStorageConfig::loadByName('node', $field_name);
@@ -400,7 +400,7 @@ function testImageFieldDefaultImage() {
     $edit = array(
       'settings[default_image][uuid][fids]' => 0,
     );
-    $this->drupalPostForm("admin/structure/types/manage/article/fields/node.article.$field_name/storage", $edit, t('Save field settings'));
+    $this->drupalPostForm("admin/structure/content-types/manage/article/fields/node.article.$field_name/storage", $edit, t('Save field settings'));
     // Clear field definition cache so the new default image is detected.
     \Drupal::entityManager()->clearCachedFieldDefinitions();
     $field_storage = FieldStorageConfig::loadByName('node', $field_name);
@@ -416,7 +416,7 @@ function testImageFieldDefaultImage() {
       'settings[default_image][alt]' => $alt,
       'settings[default_image][title]' => $title,
     );
-    $this->drupalPostForm('admin/structure/types/manage/article/fields/node.article.' . $private_field_name . '/storage', $edit, t('Save field settings'));
+    $this->drupalPostForm('admin/structure/content-types/manage/article/fields/node.article.' . $private_field_name . '/storage', $edit, t('Save field settings'));
     // Clear field definition cache so the new default image is detected.
     \Drupal::entityManager()->clearCachedFieldDefinitions();
 
diff --git a/core/modules/language/src/Tests/LanguageConfigurationElementTest.php b/core/modules/language/src/Tests/LanguageConfigurationElementTest.php
index 1d4ee27..632d217 100644
--- a/core/modules/language/src/Tests/LanguageConfigurationElementTest.php
+++ b/core/modules/language/src/Tests/LanguageConfigurationElementTest.php
@@ -70,10 +70,10 @@ public function testLanguageConfigurationElement() {
       'language_configuration[langcode]' => 'authors_default',
       'language_configuration[language_alterable]' => TRUE,
     );
-    $this->drupalPostForm('admin/structure/types/add', $edit, 'Save and manage fields');
+    $this->drupalPostForm('admin/structure/content-types/add', $edit, 'Save and manage fields');
 
     // Make sure the settings are saved when creating the content type.
-    $this->drupalGet('admin/structure/types/manage/page');
+    $this->drupalGet('admin/structure/content-types/manage/page');
     $this->assertOptionSelected('edit-language-configuration-langcode', 'authors_default');
     $this->assertFieldChecked('edit-language-configuration-language-alterable');
 
@@ -166,7 +166,7 @@ public function testNodeTypeUpdate() {
       'language_configuration[langcode]' => 'current_interface',
       'language_configuration[language_alterable]' => TRUE,
     );
-    $this->drupalPostForm('admin/structure/types/manage/article', $edit, t('Save content type'));
+    $this->drupalPostForm('admin/structure/content-types/manage/article', $edit, t('Save content type'));
     // Check the language default configuration for the articles.
     $configuration = ContentLanguageSettings::loadByEntityTypeBundle('node', 'article');
     $uuid = $configuration->uuid();
@@ -176,7 +176,7 @@ public function testNodeTypeUpdate() {
     $edit = array(
       'type' => 'article_2'
     );
-    $this->drupalPostForm('admin/structure/types/manage/article', $edit, t('Save content type'));
+    $this->drupalPostForm('admin/structure/content-types/manage/article', $edit, t('Save content type'));
     // Check that we still have the settings for the new node type.
     $configuration = ContentLanguageSettings::loadByEntityTypeBundle('node', 'article_2');
     $this->assertEqual($configuration->getDefaultLangcode(), 'current_interface', 'The default language configuration has been kept on the new Article content type.');
@@ -204,14 +204,14 @@ public function testNodeTypeDelete() {
       'language_configuration[langcode]' => 'authors_default',
       'language_configuration[language_alterable]' => TRUE,
     );
-    $this->drupalPostForm('admin/structure/types/manage/article', $edit, t('Save content type'));
+    $this->drupalPostForm('admin/structure/content-types/manage/article', $edit, t('Save content type'));
 
     // Check the language default configuration for articles is present.
     $configuration = \Drupal::entityManager()->getStorage('language_content_settings')->load('node.article');
     $this->assertTrue($configuration, 'The language configuration is present.');
 
     // Delete 'article' bundle.
-    $this->drupalPostForm('admin/structure/types/manage/article/delete', array(), t('Delete'));
+    $this->drupalPostForm('admin/structure/content-types/manage/article/delete', array(), t('Delete'));
 
     // Check that the language configuration has been deleted.
     \Drupal::entityManager()->getStorage('language_content_settings')->resetCache();
diff --git a/core/modules/link/src/Tests/LinkFieldUITest.php b/core/modules/link/src/Tests/LinkFieldUITest.php
index d9531ce..fd78021 100644
--- a/core/modules/link/src/Tests/LinkFieldUITest.php
+++ b/core/modules/link/src/Tests/LinkFieldUITest.php
@@ -52,7 +52,7 @@ protected function setUp() {
   function testFieldUI() {
     // Add a content type.
     $type = $this->drupalCreateContentType();
-    $type_path = 'admin/structure/types/manage/' . $type->id();
+    $type_path = 'admin/structure/content-types/manage/' . $type->id();
     $add_path = 'node/add/' . $type->id();
 
     // Add a link field to the newly-created type. It defaults to allowing both
@@ -78,7 +78,7 @@ function testFieldUI() {
 
     // Add a different content type.
     $type = $this->drupalCreateContentType();
-    $type_path = 'admin/structure/types/manage/' . $type->id();
+    $type_path = 'admin/structure/content-types/manage/' . $type->id();
     $add_path = 'node/add/' . $type->id();
 
     // Add a link field to the newly-created type. Specify it must allow
diff --git a/core/modules/locale/src/Tests/LocaleContentTest.php b/core/modules/locale/src/Tests/LocaleContentTest.php
index 93a5e77..49d97c1 100644
--- a/core/modules/locale/src/Tests/LocaleContentTest.php
+++ b/core/modules/locale/src/Tests/LocaleContentTest.php
@@ -36,7 +36,7 @@ public function testMachineNameLTR() {
     $this->drupalLogin($admin_user);
 
     // Verify that the machine name field is LTR for a new content type.
-    $this->drupalGet('admin/structure/types/add');
+    $this->drupalGet('admin/structure/content-types/add');
     $this->assertFieldByXpath('//input[@name="type" and @dir="ltr"]', NULL, 'The machine name field is LTR when no additional language is configured.');
 
     // Install the Arabic language (which is RTL) and configure as the default.
@@ -50,7 +50,7 @@ public function testMachineNameLTR() {
     $this->drupalPostForm('admin/config/regional/language', $edit, t('Save configuration'));
 
     // Verify that the machine name field is still LTR for a new content type.
-    $this->drupalGet('admin/structure/types/add');
+    $this->drupalGet('admin/structure/content-types/add');
     $this->assertFieldByXpath('//input[@name="type" and @dir="ltr"]', NULL, 'The machine name field is LTR when the default language is RTL.');
   }
 
@@ -81,12 +81,12 @@ public function testContentTypeLanguageConfiguration() {
     $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add custom language'));
 
     // Set the content type to use multilingual support.
-    $this->drupalGet("admin/structure/types/manage/{$type2->id()}");
+    $this->drupalGet("admin/structure/content-types/manage/{$type2->id()}");
     $this->assertText(t('Language settings'), 'Multilingual support widget present on content type configuration form.');
     $edit = array(
       'language_configuration[language_alterable]' => TRUE,
     );
-    $this->drupalPostForm("admin/structure/types/manage/{$type2->id()}", $edit, t('Save content type'));
+    $this->drupalPostForm("admin/structure/content-types/manage/{$type2->id()}", $edit, t('Save content type'));
     $this->assertRaw(t('The content type %type has been updated.', array('%type' => $type2->label())));
     $this->drupalLogout();
     \Drupal::languageManager()->reset();
@@ -154,11 +154,11 @@ public function testContentTypeDirLang() {
     \Drupal::languageManager()->reset();
 
     // Set the content type to use multilingual support.
-    $this->drupalGet("admin/structure/types/manage/{$type->id()}");
+    $this->drupalGet("admin/structure/content-types/manage/{$type->id()}");
     $edit = array(
       'language_configuration[language_alterable]' => TRUE,
     );
-    $this->drupalPostForm("admin/structure/types/manage/{$type->id()}", $edit, t('Save content type'));
+    $this->drupalPostForm("admin/structure/content-types/manage/{$type->id()}", $edit, t('Save content type'));
     $this->assertRaw(t('The content type %type has been updated.', array('%type' => $type->label())));
     $this->drupalLogout();
 
diff --git a/core/modules/menu_ui/src/Tests/MenuNodeTest.php b/core/modules/menu_ui/src/Tests/MenuNodeTest.php
index 2647bc8..9e502ff 100644
--- a/core/modules/menu_ui/src/Tests/MenuNodeTest.php
+++ b/core/modules/menu_ui/src/Tests/MenuNodeTest.php
@@ -57,14 +57,14 @@ function testMenuNodeFormWidget() {
     // access checking that is performed when determining the "default parent
     // item" options in menu_ui_form_node_type_form_alter(). The "log out" link
     // adds the "user.roles:authenticated" cache context.
-    $this->drupalGet('admin/structure/types/manage/page');
+    $this->drupalGet('admin/structure/content-types/manage/page');
     $this->assertCacheContext('user.roles:authenticated');
 
     // Disable the default main menu, so that no menus are enabled.
     $edit = array(
       'menu_options[main]' => FALSE,
     );
-    $this->drupalPostForm('admin/structure/types/manage/page', $edit, t('Save content type'));
+    $this->drupalPostForm('admin/structure/content-types/manage/page', $edit, t('Save content type'));
 
     // Verify that no menu settings are displayed and nodes can be created.
     $this->drupalGet('node/add/page');
@@ -85,7 +85,7 @@ function testMenuNodeFormWidget() {
       'menu_options[tools]' => 1,
       'menu_parent' => 'main:',
     );
-    $this->drupalPostForm('admin/structure/types/manage/page', $edit, t('Save content type'));
+    $this->drupalPostForm('admin/structure/content-types/manage/page', $edit, t('Save content type'));
     $this->assertText(t('The selected menu item is not under one of the selected menus.'));
     $this->assertNoRaw(t('The content type %name has been updated.', array('%name' => 'Basic page')));
 
@@ -95,7 +95,7 @@ function testMenuNodeFormWidget() {
       'menu_options[tools]' => 1,
       'menu_parent' => 'main:',
     );
-    $this->drupalPostForm('admin/structure/types/manage/page', $edit, t('Save content type'));
+    $this->drupalPostForm('admin/structure/content-types/manage/page', $edit, t('Save content type'));
     $this->assertRaw(t('The content type %name has been updated.', array('%name' => 'Basic page')));
 
     // Test that we can preview a node that will create a menu item.
diff --git a/core/modules/node/node.routing.yml b/core/modules/node/node.routing.yml
index 9f3af90..b099535 100644
--- a/core/modules/node/node.routing.yml
+++ b/core/modules/node/node.routing.yml
@@ -79,7 +79,7 @@ node.revision_delete_confirm:
     _node_operation_route: TRUE
 
 entity.node_type.collection:
-  path: '/admin/structure/types'
+  path: '/admin/structure/content-types'
   defaults:
     _controller: '\Drupal\Core\Entity\Controller\EntityListController::listing'
     entity_type: 'node_type'
@@ -88,7 +88,7 @@ entity.node_type.collection:
     _permission: 'administer content types'
 
 node.type_add:
-  path: '/admin/structure/types/add'
+  path: '/admin/structure/content-types/add'
   defaults:
     _entity_form: 'node_type.add'
     _title: 'Add content type'
@@ -96,14 +96,14 @@ node.type_add:
     _permission: 'administer content types'
 
 entity.node_type.edit_form:
-  path: '/admin/structure/types/manage/{node_type}'
+  path: '/admin/structure/content-types/manage/{node_type}'
   defaults:
     _entity_form: 'node_type.edit'
   requirements:
     _permission: 'administer content types'
 
 entity.node_type.delete_form:
-  path: '/admin/structure/types/manage/{node_type}/delete'
+  path: '/admin/structure/content-types/manage/{node_type}/delete'
   defaults:
     _entity_form: 'node_type.delete'
     _title: 'Delete'
diff --git a/core/modules/node/src/Entity/NodeType.php b/core/modules/node/src/Entity/NodeType.php
index 2867e53..abac826 100644
--- a/core/modules/node/src/Entity/NodeType.php
+++ b/core/modules/node/src/Entity/NodeType.php
@@ -34,9 +34,9 @@
  *     "label" = "name"
  *   },
  *   links = {
- *     "edit-form" = "/admin/structure/types/manage/{node_type}",
- *     "delete-form" = "/admin/structure/types/manage/{node_type}/delete",
- *     "collection" = "/admin/structure/types",
+ *     "edit-form" = "/admin/structure/content-types/manage/{node_type}",
+ *     "delete-form" = "/admin/structure/content-types/manage/{node_type}/delete",
+ *     "collection" = "/admin/structure/content-types",
  *   },
  *   config_export = {
  *     "name",
diff --git a/core/modules/node/src/Tests/NodeAccessFieldTest.php b/core/modules/node/src/Tests/NodeAccessFieldTest.php
index 7d3f647..d8403ce 100644
--- a/core/modules/node/src/Tests/NodeAccessFieldTest.php
+++ b/core/modules/node/src/Tests/NodeAccessFieldTest.php
@@ -96,7 +96,7 @@ function testNodeAccessAdministerField() {
     $default = 'Sometimes words have two meanings';
     $edit["default_value_input[{$this->fieldName}][0][value]"] = $default;
     $this->drupalPostForm(
-      "admin/structure/types/manage/page/fields/node.page.{$this->fieldName}",
+      "admin/structure/content-types/manage/page/fields/node.page.{$this->fieldName}",
       $edit,
       t('Save settings')
     );
diff --git a/core/modules/node/src/Tests/NodeCreationTest.php b/core/modules/node/src/Tests/NodeCreationTest.php
index 7af3769..74f8664 100644
--- a/core/modules/node/src/Tests/NodeCreationTest.php
+++ b/core/modules/node/src/Tests/NodeCreationTest.php
@@ -171,7 +171,7 @@ public function testAuthorAutocomplete() {
   function testNodeAddWithoutContentTypes () {
     $this->drupalGet('node/add');
     $this->assertResponse(200);
-    $this->assertNoLinkByHref('/admin/structure/types/add');
+    $this->assertNoLinkByHref('/admin/structure/content-types/add');
 
     // Test /node/add page without content types.
     foreach (\Drupal::entityManager()->getStorage('node_type')->loadMultiple() as $entity ) {
@@ -186,7 +186,7 @@ function testNodeAddWithoutContentTypes () {
 
     $this->drupalGet('node/add');
 
-    $this->assertLinkByHref('/admin/structure/types/add');
+    $this->assertLinkByHref('/admin/structure/content-types/add');
   }
 
   /**
diff --git a/core/modules/node/src/Tests/NodeFieldMultilingualTest.php b/core/modules/node/src/Tests/NodeFieldMultilingualTest.php
index dd8aec2..080175a 100644
--- a/core/modules/node/src/Tests/NodeFieldMultilingualTest.php
+++ b/core/modules/node/src/Tests/NodeFieldMultilingualTest.php
@@ -48,7 +48,7 @@ protected function setUp() {
     $edit = array(
       'language_configuration[language_alterable]' => TRUE,
     );
-    $this->drupalPostForm('admin/structure/types/manage/page', $edit, t('Save content type'));
+    $this->drupalPostForm('admin/structure/content-types/manage/page', $edit, t('Save content type'));
     $this->assertRaw(t('The content type %type has been updated.', array('%type' => 'Basic page')), 'Basic page content type has been updated.');
 
     // Make node body translatable.
diff --git a/core/modules/node/src/Tests/NodePostSettingsTest.php b/core/modules/node/src/Tests/NodePostSettingsTest.php
index 0acee50..8b15d71 100644
--- a/core/modules/node/src/Tests/NodePostSettingsTest.php
+++ b/core/modules/node/src/Tests/NodePostSettingsTest.php
@@ -30,7 +30,7 @@ function testPagePostInfo() {
     // Set "Basic page" content type to display post information.
     $edit = array();
     $edit['display_submitted'] = TRUE;
-    $this->drupalPostForm('admin/structure/types/manage/page', $edit, t('Save content type'));
+    $this->drupalPostForm('admin/structure/content-types/manage/page', $edit, t('Save content type'));
 
     // Create a node.
     $edit = array();
@@ -47,7 +47,7 @@ function testPagePostInfo() {
     // Set "Basic page" content type to display post information.
     $edit = array();
     $edit['display_submitted'] = FALSE;
-    $this->drupalPostForm('admin/structure/types/manage/page', $edit, t('Save content type'));
+    $this->drupalPostForm('admin/structure/content-types/manage/page', $edit, t('Save content type'));
 
     // Create a node.
     $edit = array();
diff --git a/core/modules/node/src/Tests/NodeTranslationUITest.php b/core/modules/node/src/Tests/NodeTranslationUITest.php
index 55214c2..97c979e 100644
--- a/core/modules/node/src/Tests/NodeTranslationUITest.php
+++ b/core/modules/node/src/Tests/NodeTranslationUITest.php
@@ -45,7 +45,7 @@ protected function setUp() {
     // Display the language selector.
     $this->drupalLogin($this->administrator);
     $edit = array('language_configuration[language_alterable]' => TRUE);
-    $this->drupalPostForm('admin/structure/types/manage/article', $edit, t('Save content type'));
+    $this->drupalPostForm('admin/structure/content-types/manage/article', $edit, t('Save content type'));
     $this->drupalLogin($this->translator);
   }
 
diff --git a/core/modules/node/src/Tests/NodeTypeInitialLanguageTest.php b/core/modules/node/src/Tests/NodeTypeInitialLanguageTest.php
index 1e05e8e..dd650c9 100644
--- a/core/modules/node/src/Tests/NodeTypeInitialLanguageTest.php
+++ b/core/modules/node/src/Tests/NodeTypeInitialLanguageTest.php
@@ -37,12 +37,12 @@ protected function setUp() {
    * locked option must be on.
    */
   function testNodeTypeInitialLanguageDefaults() {
-    $this->drupalGet('admin/structure/types/manage/article');
+    $this->drupalGet('admin/structure/content-types/manage/article');
     $this->assertOptionSelected('edit-language-configuration-langcode', LanguageInterface::LANGCODE_SITE_DEFAULT, 'The default initial language is the site default.');
     $this->assertNoFieldChecked('edit-language-configuration-language-alterable', 'Language selector is hidden by default.');
 
     // Tests if the language field cannot be rearranged on the manage fields tab.
-    $this->drupalGet('admin/structure/types/manage/article/fields');
+    $this->drupalGet('admin/structure/content-types/manage/article/fields');
     $language_field = $this->xpath('//*[@id="field-overview"]/*[@id="language"]');
     $this->assert(empty($language_field), 'Language field is not visible on manage fields tab.');
 
@@ -64,19 +64,19 @@ function testNodeTypeInitialLanguageDefaults() {
     $edit = array(
       'language_configuration[language_alterable]' => TRUE,
     );
-    $this->drupalPostForm('admin/structure/types/manage/article', $edit, t('Save content type'));
+    $this->drupalPostForm('admin/structure/content-types/manage/article', $edit, t('Save content type'));
     $this->drupalGet('node/add/article');
     $this->assertField('langcode[0][value]', 'Language is selectable on node add/edit page when language not hidden.');
     $this->assertOptionSelected('edit-langcode-0-value', 'hu', 'The initial language is the site default on the node add page after the site default language is changed.');
 
     // Tests if the language field can be rearranged on the manage form display
     // tab.
-    $this->drupalGet('admin/structure/types/manage/article/form-display');
+    $this->drupalGet('admin/structure/content-types/manage/article/form-display');
     $language_field = $this->xpath('//*[@id="langcode"]');
     $this->assert(!empty($language_field), 'Language field is visible on manage form display tab.');
 
     // Tests if the language field can be rearranged on the manage display tab.
-    $this->drupalGet('admin/structure/types/manage/article/display');
+    $this->drupalGet('admin/structure/content-types/manage/article/display');
     $language_display = $this->xpath('//*[@id="langcode"]');
     $this->assert(!empty($language_display), 'Language field is visible on manage display tab.');
     // Tests if the language field is hidden by default.
@@ -86,7 +86,7 @@ function testNodeTypeInitialLanguageDefaults() {
     $edit = array(
       'language_configuration[langcode]' => 'en',
     );
-    $this->drupalPostForm('admin/structure/types/manage/article', $edit, t('Save content type'));
+    $this->drupalPostForm('admin/structure/content-types/manage/article', $edit, t('Save content type'));
     $this->drupalGet('node/add/article');
     $this->assertOptionSelected('edit-langcode-0-value', 'en', 'The initial language is the defined language.');
   }
@@ -115,8 +115,8 @@ function testLanguageFieldVisibility() {
     $edit = array(
       'fields[langcode][type]' => 'language',
     );
-    $this->drupalPostForm('admin/structure/types/manage/article/display', $edit, t('Save'));
-    $this->drupalGet('admin/structure/types/manage/article/display');
+    $this->drupalPostForm('admin/structure/content-types/manage/article/display', $edit, t('Save'));
+    $this->drupalGet('admin/structure/content-types/manage/article/display');
     $this->assertOptionSelected('edit-fields-langcode-type', 'language', 'Language field has been set to visible.');
 
     // Loads node page and check if Language field is shown.
diff --git a/core/modules/node/src/Tests/NodeTypeTest.php b/core/modules/node/src/Tests/NodeTypeTest.php
index 05e93d0..078b613 100644
--- a/core/modules/node/src/Tests/NodeTypeTest.php
+++ b/core/modules/node/src/Tests/NodeTypeTest.php
@@ -69,7 +69,7 @@ function testNodeTypeCreation() {
       'title_label' => 'title for foo',
       'type' => 'foo',
     );
-    $this->drupalPostForm('admin/structure/types/add', $edit, t('Save and manage fields'));
+    $this->drupalPostForm('admin/structure/content-types/add', $edit, t('Save and manage fields'));
     $type_exists = (bool) NodeType::load('foo');
     $this->assertTrue($type_exists, 'The new content type has been created in the database.');
   }
@@ -93,7 +93,7 @@ function testNodeTypeEditing() {
     $edit = array(
       'title_label' => 'Foo',
     );
-    $this->drupalPostForm('admin/structure/types/manage/page', $edit, t('Save content type'));
+    $this->drupalPostForm('admin/structure/content-types/manage/page', $edit, t('Save content type'));
 
     $this->drupalGet('node/add/page');
     $this->assertRaw('Foo', 'New title label was displayed.');
@@ -105,7 +105,7 @@ function testNodeTypeEditing() {
       'type' => 'bar',
       'description' => 'Lorem ipsum.',
     );
-    $this->drupalPostForm('admin/structure/types/manage/page', $edit, t('Save content type'));
+    $this->drupalPostForm('admin/structure/content-types/manage/page', $edit, t('Save content type'));
 
     $this->drupalGet('node/add');
     $this->assertRaw('Bar', 'New name was displayed.');
@@ -116,9 +116,9 @@ function testNodeTypeEditing() {
     $this->assertRaw('Body', 'Body field was found.');
 
     // Remove the body field.
-    $this->drupalPostForm('admin/structure/types/manage/bar/fields/node.bar.body/delete', array(), t('Delete'));
+    $this->drupalPostForm('admin/structure/content-types/manage/bar/fields/node.bar.body/delete', array(), t('Delete'));
     // Resave the settings for this type.
-    $this->drupalPostForm('admin/structure/types/manage/bar', array(), t('Save content type'));
+    $this->drupalPostForm('admin/structure/content-types/manage/bar', array(), t('Save content type'));
     // Check that the body field doesn't exist.
     $this->drupalGet('node/add/bar');
     $this->assertNoRaw('Body', 'Body field was not found.');
@@ -141,7 +141,7 @@ function testNodeTypeDeletion() {
     // Add a new node of this type.
     $node = $this->drupalCreateNode(array('type' => $type->id()));
     // Attempt to delete the content type, which should not be allowed.
-    $this->drupalGet('admin/structure/types/manage/' . $type->label() . '/delete');
+    $this->drupalGet('admin/structure/content-types/manage/' . $type->label() . '/delete');
     $this->assertRaw(
       t('%type is used by 1 piece of content on your site. You can not remove this content type until you have removed all of the %type content.', array('%type' => $type->label())),
       'The content type will not be deleted until all nodes of that type are removed.'
@@ -151,7 +151,7 @@ function testNodeTypeDeletion() {
     // Delete the node.
     $node->delete();
     // Attempt to delete the content type, which should now be allowed.
-    $this->drupalGet('admin/structure/types/manage/' . $type->label() . '/delete');
+    $this->drupalGet('admin/structure/content-types/manage/' . $type->label() . '/delete');
     $this->assertRaw(
       t('Are you sure you want to delete the content type %type?', array('%type' => $type->label())),
       'The content type is available for deletion.'
@@ -167,15 +167,15 @@ function testNodeTypeDeletion() {
     // Call to flush all caches after installing the forum module in the same
     // way installing a module through the UI does.
     $this->resetAll();
-    $this->drupalGet('admin/structure/types/manage/default');
+    $this->drupalGet('admin/structure/content-types/manage/default');
     $this->assertNoLink(t('Delete'));
-    $this->drupalGet('admin/structure/types/manage/default/delete');
+    $this->drupalGet('admin/structure/content-types/manage/default/delete');
     $this->assertResponse(403);
     $this->container->get('module_installer')->uninstall(array('node_test_config'));
     $this->container = \Drupal::getContainer();
     unset($locked['default']);
     \Drupal::state()->set('node.type.locked', $locked);
-    $this->drupalGet('admin/structure/types/manage/default');
+    $this->drupalGet('admin/structure/content-types/manage/default');
     $this->clickLink(t('Delete'));
     $this->assertResponse(200);
     $this->drupalPostForm(NULL, array(), t('Delete'));
@@ -191,18 +191,18 @@ public function testNodeTypeFieldUiPermissions() {
     $this->drupalLogin($admin_user_1);
 
     // Test that the user only sees the actions available to him.
-    $this->drupalGet('admin/structure/types');
-    $this->assertLinkByHref('admin/structure/types/manage/article/fields');
-    $this->assertNoLinkByHref('admin/structure/types/manage/article/display');
+    $this->drupalGet('admin/structure/content-types');
+    $this->assertLinkByHref('admin/structure/content-types/manage/article/fields');
+    $this->assertNoLinkByHref('admin/structure/content-types/manage/article/display');
 
     // Create another admin user who can manage node fields display.
     $admin_user_2 = $this->drupalCreateUser(array('administer content types', 'administer node display'));
     $this->drupalLogin($admin_user_2);
 
     // Test that the user only sees the actions available to him.
-    $this->drupalGet('admin/structure/types');
-    $this->assertNoLinkByHref('admin/structure/types/manage/article/fields');
-    $this->assertLinkByHref('admin/structure/types/manage/article/display');
+    $this->drupalGet('admin/structure/content-types');
+    $this->assertNoLinkByHref('admin/structure/content-types/manage/article/fields');
+    $this->assertLinkByHref('admin/structure/content-types/manage/article/display');
   }
 
   /**
@@ -213,12 +213,12 @@ public function testNodeTypeNoContentType() {
     $this->drupalLogin($web_user);
 
     // Delete 'article' bundle.
-    $this->drupalPostForm('admin/structure/types/manage/article/delete', [], t('Delete'));
+    $this->drupalPostForm('admin/structure/content-types/manage/article/delete', [], t('Delete'));
     // Delete 'page' bundle.
-    $this->drupalPostForm('admin/structure/types/manage/page/delete', [], t('Delete'));
+    $this->drupalPostForm('admin/structure/content-types/manage/page/delete', [], t('Delete'));
 
     // Navigate to content type administration screen
-    $this->drupalGet('admin/structure/types');
+    $this->drupalGet('admin/structure/content-types');
     $this->assertRaw(t('No content types available. <a href="@link">Add content type</a>.', [
         '@link' => Url::fromRoute('node.type_add')->toString()
       ]), 'Empty text when there are no content types in the system is correct.');
diff --git a/core/modules/options/src/Tests/OptionsFieldUITest.php b/core/modules/options/src/Tests/OptionsFieldUITest.php
index c0ab0df..754ab9f 100644
--- a/core/modules/options/src/Tests/OptionsFieldUITest.php
+++ b/core/modules/options/src/Tests/OptionsFieldUITest.php
@@ -280,7 +280,7 @@ protected function createOptionsField($type) {
 
     entity_get_form_display('node', $this->type, 'default')->setComponent($this->fieldName)->save();
 
-    $this->adminPath = 'admin/structure/types/manage/' . $this->type . '/fields/node.' . $this->type . '.' . $this->fieldName . '/storage';
+    $this->adminPath = 'admin/structure/content-types/manage/' . $this->type . '/fields/node.' . $this->type . '.' . $this->fieldName . '/storage';
   }
 
   /**
@@ -340,7 +340,7 @@ function testNodeDisplay() {
       $edit = array(
         "fields[$this->fieldName][type]" => $formatter,
       );
-      $this->drupalPostForm('admin/structure/types/manage/' . $this->typeName . '/display', $edit, t('Save'));
+      $this->drupalPostForm('admin/structure/content-types/manage/' . $this->typeName . '/display', $edit, t('Save'));
       $this->drupalGet('node/' . $node->id());
 
       if ($formatter == 'list_default') {
diff --git a/core/modules/options/src/Tests/OptionsFloatFieldImportTest.php b/core/modules/options/src/Tests/OptionsFloatFieldImportTest.php
index 5be5840..990b7dc 100644
--- a/core/modules/options/src/Tests/OptionsFloatFieldImportTest.php
+++ b/core/modules/options/src/Tests/OptionsFloatFieldImportTest.php
@@ -46,7 +46,7 @@ public function testImport() {
     $field_storage = FieldStorageConfig::loadByName('node', $field_name);
     $this->assertIdentical($field_storage->getSetting('allowed_values'), $array = array('0' => 'Zero', '0.5' => 'Point five'));
 
-    $admin_path = 'admin/structure/types/manage/' . $type . '/fields/node.' . $type . '.' . $field_name . '/storage';
+    $admin_path = 'admin/structure/content-types/manage/' . $type . '/fields/node.' . $type . '.' . $field_name . '/storage';
 
     // Export active config to staging
     $this->copyConfig($this->container->get('config.storage'), $this->container->get('config.storage.staging'));
diff --git a/core/modules/responsive_image/src/Tests/ResponsiveImageFieldUiTest.php b/core/modules/responsive_image/src/Tests/ResponsiveImageFieldUiTest.php
index af5a955..30804c3 100644
--- a/core/modules/responsive_image/src/Tests/ResponsiveImageFieldUiTest.php
+++ b/core/modules/responsive_image/src/Tests/ResponsiveImageFieldUiTest.php
@@ -47,7 +47,7 @@ protected function setUp() {
    * Tests formatter settings.
    */
   function testResponsiveImageFormatterUI() {
-    $manage_fields = 'admin/structure/types/manage/' . $this->type;
+    $manage_fields = 'admin/structure/content-types/manage/' . $this->type;
     $manage_display = $manage_fields . '/display';
 
     // Create a field, and a node with some data for the field.
diff --git a/core/modules/system/src/SystemManager.php b/core/modules/system/src/SystemManager.php
index 33d6de5..c9a7d94 100644
--- a/core/modules/system/src/SystemManager.php
+++ b/core/modules/system/src/SystemManager.php
@@ -153,7 +153,7 @@ public function getMaxSeverity(&$requirements) {
    * Loads the contents of a menu block.
    *
    * This function is often a destination for these blocks.
-   * For example, 'admin/structure/types' needs to have a destination to be
+   * For example, 'admin/structure/content-types' needs to have a destination to be
    * valid in the Drupal menu system, but too much information there might be
    * hidden, so we supply the contents of the block.
    *
diff --git a/core/modules/system/src/Tests/Entity/EntityTranslationFormTest.php b/core/modules/system/src/Tests/Entity/EntityTranslationFormTest.php
index 933f8dd..ed591c7 100644
--- a/core/modules/system/src/Tests/Entity/EntityTranslationFormTest.php
+++ b/core/modules/system/src/Tests/Entity/EntityTranslationFormTest.php
@@ -79,9 +79,9 @@ function testEntityFormLanguage() {
     $this->assertTrue($langcode == $form_langcode, 'Form language is the same as the language parameter.');
 
     // Enable language selector.
-    $this->drupalGet('admin/structure/types/manage/page');
+    $this->drupalGet('admin/structure/content-types/manage/page');
     $edit = array('language_configuration[language_alterable]' => TRUE, 'language_configuration[langcode]' => LanguageInterface::LANGCODE_NOT_SPECIFIED);
-    $this->drupalPostForm('admin/structure/types/manage/page', $edit, t('Save content type'));
+    $this->drupalPostForm('admin/structure/content-types/manage/page', $edit, t('Save content type'));
     $this->assertRaw(t('The content type %type has been updated.', array('%type' => 'Basic page')), 'Basic page content type has been updated.');
 
     // Create a node with language.
diff --git a/core/modules/system/src/Tests/Menu/BreadcrumbTest.php b/core/modules/system/src/Tests/Menu/BreadcrumbTest.php
index 456ff5e..99b3bbc 100644
--- a/core/modules/system/src/Tests/Menu/BreadcrumbTest.php
+++ b/core/modules/system/src/Tests/Menu/BreadcrumbTest.php
@@ -106,24 +106,24 @@ function testBreadCrumbs() {
     // Verify Node administration breadcrumbs.
     $trail = $admin + array(
       'admin/structure' => t('Structure'),
-      'admin/structure/types' => t('Content types'),
+      'admin/structure/content-types' => t('Content types'),
     );
-    $this->assertBreadcrumb('admin/structure/types/add', $trail);
-    $this->assertBreadcrumb("admin/structure/types/manage/$type", $trail);
+    $this->assertBreadcrumb('admin/structure/content-types/add', $trail);
+    $this->assertBreadcrumb("admin/structure/content-types/manage/$type", $trail);
     $trail += array(
-      "admin/structure/types/manage/$type" => t('Article'),
+      "admin/structure/content-types/manage/$type" => t('Article'),
     );
-    $this->assertBreadcrumb("admin/structure/types/manage/$type/fields", $trail);
-    $this->assertBreadcrumb("admin/structure/types/manage/$type/display", $trail);
+    $this->assertBreadcrumb("admin/structure/content-types/manage/$type/fields", $trail);
+    $this->assertBreadcrumb("admin/structure/content-types/manage/$type/display", $trail);
     $trail_teaser = $trail + array(
-      "admin/structure/types/manage/$type/display" => t('Manage display'),
+      "admin/structure/content-types/manage/$type/display" => t('Manage display'),
     );
-    $this->assertBreadcrumb("admin/structure/types/manage/$type/display/teaser", $trail_teaser);
-    $this->assertBreadcrumb("admin/structure/types/manage/$type/delete", $trail);
+    $this->assertBreadcrumb("admin/structure/content-types/manage/$type/display/teaser", $trail_teaser);
+    $this->assertBreadcrumb("admin/structure/content-types/manage/$type/delete", $trail);
     $trail += array(
-      "admin/structure/types/manage/$type/fields" => t('Manage fields'),
+      "admin/structure/content-types/manage/$type/fields" => t('Manage fields'),
     );
-    $this->assertBreadcrumb("admin/structure/types/manage/$type/fields/node.$type.body", $trail);
+    $this->assertBreadcrumb("admin/structure/content-types/manage/$type/fields/node.$type.body", $trail);
 
     // Verify Filter text format administration breadcrumbs.
     $filter_formats = filter_formats();
diff --git a/core/modules/taxonomy/src/Tests/RssTest.php b/core/modules/taxonomy/src/Tests/RssTest.php
index 5889176..d5372ae 100644
--- a/core/modules/taxonomy/src/Tests/RssTest.php
+++ b/core/modules/taxonomy/src/Tests/RssTest.php
@@ -76,14 +76,14 @@ function testTaxonomyRss() {
     $term1 = $this->createTerm($this->vocabulary);
 
     // RSS display must be added manually.
-    $this->drupalGet("admin/structure/types/manage/article/display");
+    $this->drupalGet("admin/structure/content-types/manage/article/display");
     $edit = array(
       "display_modes_custom[rss]" => '1',
     );
     $this->drupalPostForm(NULL, $edit, t('Save'));
 
     // Change the format to 'RSS category'.
-    $this->drupalGet("admin/structure/types/manage/article/display/rss");
+    $this->drupalGet("admin/structure/content-types/manage/article/display/rss");
     $edit = array(
       "fields[taxonomy_" . $this->vocabulary->id() . "][type]" => 'entity_reference_rss_category',
     );
diff --git a/core/modules/views/src/Plugin/views/argument_default/Raw.php b/core/modules/views/src/Plugin/views/argument_default/Raw.php
index 40bddf3..2b9b3fb 100644
--- a/core/modules/views/src/Plugin/views/argument_default/Raw.php
+++ b/core/modules/views/src/Plugin/views/argument_default/Raw.php
@@ -92,7 +92,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
       // - keys that count from 0 to match PHP array keys from explode().
       // - values that count from 1 for display to humans.
       '#options' => range(1, 10),
-      '#description' => $this->t('The numbering starts from 1, e.g. on the page admin/structure/types, the 3rd path component is "types".'),
+      '#description' => $this->t('The numbering starts from 1, e.g. on the page admin/structure/content-types, the 3rd path component is "types".'),
     );
     $form['use_alias'] = array(
       '#type' => 'checkbox',
diff --git a/core/modules/views/src/Tests/SearchMultilingualTest.php b/core/modules/views/src/Tests/SearchMultilingualTest.php
index 4fb6b54..2bf2aeb 100644
--- a/core/modules/views/src/Tests/SearchMultilingualTest.php
+++ b/core/modules/views/src/Tests/SearchMultilingualTest.php
@@ -47,7 +47,7 @@ public function testMultilingualSearchFilter() {
     $edit = array(
       'language_configuration[language_alterable]' => TRUE,
     );
-    $this->drupalPostForm('admin/structure/types/manage/' . $type->id(), $edit, t('Save content type'));
+    $this->drupalPostForm('admin/structure/content-types/manage/' . $type->id(), $edit, t('Save content type'));
     $edit = array(
       'entity_types[node]' => TRUE,
       'settings[node][' . $type->id() . '][translatable]' => TRUE,
