diff --git a/core/modules/block/js/block.js b/core/modules/block/js/block.js
index 302c315..3affe12 100644
--- a/core/modules/block/js/block.js
+++ b/core/modules/block/js/block.js
@@ -26,10 +26,10 @@ function checkboxesSummary(context) {
         return vals.join(', ');
       }
 
-      $('#edit-visibility-node-type, #edit-visibility-language, #edit-visibility-role').drupalSetSummary(checkboxesSummary);
+      $('#edit-settings-visibility-node-type, #edit-settings-visibility-language, #edit-settings-visibility-user-role').drupalSetSummary(checkboxesSummary);
 
-      $('#edit-visibility-path').drupalSetSummary(function (context) {
-        var $pages = $(context).find('textarea[name="visibility[path][pages]"]');
+      $('#edit-settings-visibility-request-path').drupalSetSummary(function (context) {
+        var $pages = $(context).find('textarea[name="settings[visibility][request_path][pages]"]');
         if (!$pages.val()) {
           return Drupal.t('Not restricted');
         }
diff --git a/core/modules/block/src/BlockBase.php b/core/modules/block/src/BlockBase.php
index e6c0240..b9b5616 100644
--- a/core/modules/block/src/BlockBase.php
+++ b/core/modules/block/src/BlockBase.php
@@ -291,6 +291,11 @@ public function buildConfigurationForm(array $form, array &$form_state) {
       '#type' => 'vertical_tabs',
       '#title' => $this->t('Visibility'),
       '#parents' => array('visibility_tabs'),
+      '#attached' => array(
+        'library' => array(
+          'block/drupal.block',
+        ),
+      ),
     );
     foreach ($this->getVisibilityConditions() as $condition_id => $condition) {
       $condition_form = $condition->buildConfigurationForm(array(), $form_state);
@@ -299,6 +304,18 @@ public function buildConfigurationForm(array $form, array &$form_state) {
       $condition_form['#group'] = 'visibility_tabs';
       $form['visibility'][$condition_id] = $condition_form;
     }
+
+    // @todo Determine if there is a better way to rename the conditions.
+    if (isset($form['visibility']['node_type'])) {
+      $form['visibility']['node_type']['#title'] = $this->t('Content types');
+    }
+    if (isset($form['visibility']['user_role'])) {
+      $form['visibility']['user_role']['#title'] = $this->t('Roles');
+    }
+    if (isset($form['visibility']['request_path'])) {
+      $form['visibility']['request_path']['#title'] = $this->t('Pages');
+    }
+
     // Add plugin-specific settings for this block type.
     $form += $this->blockForm($form, $form_state);
     return $form;