diff --git a/core/themes/seven/seven.theme b/core/themes/seven/seven.theme
index 8563c87..d2a3992 100644
--- a/core/themes/seven/seven.theme
+++ b/core/themes/seven/seven.theme
@@ -127,18 +127,18 @@ function seven_preprocess_node_add_list(&$variables) {
 }
 
 /**
- * Implements hook_preprocess_HOOK() for custom block add list templates.
+ * Implements hook_preprocess_HOOK() for block content add list templates.
  *
  * Displays the list of available custom block types for creation, adding
  * separate variables for the label, description, and url.
  */
-function seven_preprocess_custom_block_add_list(&$variables) {
+function seven_preprocess_block_content_add_list(&$variables) {
   if (!empty($variables['content'])) {
     foreach ($variables['content'] as $type) {
       $variables['types'][$type->id()]['label'] = String::checkPlain($type->label());
       $variables['types'][$type->id()]['description'] = Xss::filterAdmin($type->description);
       $options = array('query' => \Drupal::request()->query->all());
-      $variables['types'][$type->id()]['url'] = \Drupal::url('custom_block.add_form', array('custom_block_type' => $type->id()), $options);
+      $variables['types'][$type->id()]['url'] = \Drupal::url('block_content.add_form', array('block_content_type' => $type->id()), $options);
     }
   }
 }
diff --git a/core/themes/seven/templates/custom-block-add-list.html.twig b/core/themes/seven/templates/block-content-add-list.html.twig
similarity index 87%
rename from core/themes/seven/templates/custom-block-add-list.html.twig
rename to core/themes/seven/templates/block-content-add-list.html.twig
index 5d615dd..0c0c496 100644
--- a/core/themes/seven/templates/custom-block-add-list.html.twig
+++ b/core/themes/seven/templates/block-content-add-list.html.twig
@@ -13,8 +13,8 @@
  *   - label: The title of the custom block type.
  *   - path: A path for the link to add a block of this type.
  *
- * @see template_preprocess_custom_block_add_list()
- * @see seven_preprocess_custom_block_add_list()
+ * @see template_preprocess_block_content_add_list()
+ * @see seven_preprocess_block_content_add_list()
  */
  #}
 <ul class="admin-list">