diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index cf30ef8f9cc0206c5dde6dcf312025574e6656ec..00a02e9669709385c52f943a5c23af4017ff68fd 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -891,7 +891,7 @@ function drupal_find_base_themes($themes, $key, $used_keys = array()) {
  *   created in this function are derived from ones created by
  *   template_preprocess(), but potentially altered by the other preprocess
  *   functions listed above. For example, any preprocess function can add to or
- *   modify the $variables['attributes_array'] variable, and after all of them
+ *   modify the $variables['attributes'] variable, and after all of them
  *   have finished executing, template_process() flattens it into a
  *   $variables['attributes'] string for convenient use by templates.
  * - template_process_HOOK(&$variables): Should be implemented by the module
diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockTemplateSuggestionsUnitTest.php b/core/modules/block/lib/Drupal/block/Tests/BlockTemplateSuggestionsUnitTest.php
index 9f3ffe12d853b865c940032455f6931892336a80..51630baf5bc72cf7b99290eb2f36837c2eb25885 100644
--- a/core/modules/block/lib/Drupal/block/Tests/BlockTemplateSuggestionsUnitTest.php
+++ b/core/modules/block/lib/Drupal/block/Tests/BlockTemplateSuggestionsUnitTest.php
@@ -52,7 +52,7 @@ function testBlockThemeHookSuggestions() {
     $variables['content_attributes']['class'][] = 'test-class';
     template_preprocess_block($variables);
     $this->assertEqual($variables['theme_hook_suggestions'], array('block__system', 'block__system_menu_block', 'block__system_menu_block__menu_admin', 'block__machinename'));
-    $this->assertEqual($variables['content_attributes']['class'], array('test-class', 'content'), 'Default .content class added to block content_attributes_array');
+    $this->assertEqual($variables['content_attributes']['class'], array('test-class', 'content'), 'Default .content class added to block content_attributes');
   }
 
 }
diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/AttributesUnitTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/AttributesUnitTest.php
index 6910f7ad61f6fe3653e85207ca271625ffed3390..7b5305de4e1e14e12d1b2796e8e9970c7fe5cff8 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Common/AttributesUnitTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Common/AttributesUnitTest.php
@@ -48,8 +48,7 @@ function testDrupalAttributes() {
     // Verify empty attributes array is rendered.
     $this->assertIdentical((string) new Attribute(array()), '', 'Empty attributes array.');
 
-    $attributes_array = array('key1' => 'value1');
-    $attribute = new Attribute($attributes_array);
+    $attribute = new Attribute(array('key1' => 'value1'));
     foreach($attribute as $value) {
       $this->assertIdentical((string) $value, 'value1', 'Iterate over attribute.');
     }