diff --git a/core/lib/Drupal/Component/Attribute/composer.json b/core/lib/Drupal/Component/Attribute/composer.json
index 80dcdf4..37f594e 100644
--- a/core/lib/Drupal/Component/Attribute/composer.json
+++ b/core/lib/Drupal/Component/Attribute/composer.json
@@ -6,8 +6,8 @@
     "license": "GPL-2.0+",
     "require": {
         "php": ">=5.5.9",
-        "drupal/core-render": "~8.1",
-        "drupal/core-utility": "~8.1"
+        "drupal/core-render": "~8.2",
+        "drupal/core-utility": "~8.2"
     },
     "autoload": {
         "psr-4": {
diff --git a/core/lib/Drupal/Core/Template/Attribute.php b/core/lib/Drupal/Core/Template/Attribute.php
index a05f8ff..23f63d6 100644
--- a/core/lib/Drupal/Core/Template/Attribute.php
+++ b/core/lib/Drupal/Core/Template/Attribute.php
@@ -7,10 +7,10 @@
 
 namespace Drupal\Core\Template;
 
-use Drupal\Component\Attribute\Attribute as AttributeAttribute;
+use Drupal\Component\Attribute\Attribute as ComponentAttribute;
 
 /**
- * @deprecated in Drupal 8.1.0, will be removed before Drupal 9.0.0.
- *   Use \Drupal\Component\Attribute\Attribute
+ * @deprecated in Drupal 8.2.0, will be removed before Drupal 9.0.0.
+ *   Use \Drupal\Component\Attribute\Attribute.
  */
-class Attribute extends AttributeAttribute { }
+class Attribute extends ComponentAttribute { }
diff --git a/core/lib/Drupal/Core/Template/AttributeArray.php b/core/lib/Drupal/Core/Template/AttributeArray.php
index 8d28bc1..9af0058 100644
--- a/core/lib/Drupal/Core/Template/AttributeArray.php
+++ b/core/lib/Drupal/Core/Template/AttributeArray.php
@@ -7,10 +7,10 @@
 
 namespace Drupal\Core\Template;
 
-use Drupal\Component\Attribute\AttributeArray as AttributeAttributeArray;
+use Drupal\Component\Attribute\AttributeArray as ComponentAttributeArray;
 
 /**
- * @deprecated in Drupal 8.1.0, will be removed before Drupal 9.0.0.
- *   Use \Drupal\Component\Attribute\AttributeArray
+ * @deprecated in Drupal 8.2.0, will be removed before Drupal 9.0.0.
+ *   Use \Drupal\Component\Attribute\AttributeArray.
  */
-class AttributeArray extends AttributeAttributeArray { }
+class AttributeArray extends ComponentAttributeArray { }
diff --git a/core/lib/Drupal/Core/Template/AttributeBoolean.php b/core/lib/Drupal/Core/Template/AttributeBoolean.php
index af99a98..e7993e9 100644
--- a/core/lib/Drupal/Core/Template/AttributeBoolean.php
+++ b/core/lib/Drupal/Core/Template/AttributeBoolean.php
@@ -7,10 +7,10 @@
 
 namespace Drupal\Core\Template;
 
-use Drupal\Component\Attribute\AttributeBoolean as AttributeAttributeBoolean;
+use Drupal\Component\Attribute\AttributeBoolean as ComponentAttributeBoolean;
 
 /**
- * @deprecated in Drupal 8.1.0, will be removed before Drupal 9.0.0.
- *   Use \Drupal\Component\Attribute\AttributeBoolean
+ * @deprecated in Drupal 8.2.0, will be removed before Drupal 9.0.0.
+ *   Use \Drupal\Component\Attribute\AttributeBoolean.
  */
-class AttributeBoolean extends AttributeAttributeBoolean { }
+class AttributeBoolean extends ComponentAttributeBoolean { }
diff --git a/core/lib/Drupal/Core/Template/AttributeString.php b/core/lib/Drupal/Core/Template/AttributeString.php
index b92800f..c5bdedc 100644
--- a/core/lib/Drupal/Core/Template/AttributeString.php
+++ b/core/lib/Drupal/Core/Template/AttributeString.php
@@ -7,10 +7,10 @@
 
 namespace Drupal\Core\Template;
 
-use Drupal\Component\Attribute\AttributeString as AttributeAttributeString;
+use Drupal\Component\Attribute\AttributeString as ComponentAttributeString;
 
 /**
- * @deprecated in Drupal 8.1.0, will be removed before Drupal 9.0.0.
- *   Use \Drupal\Component\Attribute\AttributeString
+ * @deprecated in Drupal 8.2.0, will be removed before Drupal 9.0.0.
+ *   Use \Drupal\Component\Attribute\AttributeString.
  */
-class AttributeString extends AttributeAttributeString { }
+class AttributeString extends ComponentAttributeString { }
diff --git a/core/lib/Drupal/Core/Template/AttributeValueBase.php b/core/lib/Drupal/Core/Template/AttributeValueBase.php
index 5fed4eb..50407b7 100644
--- a/core/lib/Drupal/Core/Template/AttributeValueBase.php
+++ b/core/lib/Drupal/Core/Template/AttributeValueBase.php
@@ -7,10 +7,10 @@
 
 namespace Drupal\Core\Template;
 
-use Drupal\Component\Attribute\AttributeValueBase as AttributeAttributeValueBase;
+use Drupal\Component\Attribute\AttributeValueBase as ComponentAttributeValueBase;
 
 /**
- * @deprecated in Drupal 8.1.0, will be removed before Drupal 9.0.0.
- *   Use \Drupal\Component\Attribute\AttributeValueBase
+ * @deprecated in Drupal 8.2.0, will be removed before Drupal 9.0.0.
+ *   Use \Drupal\Component\Attribute\AttributeValueBase.
  */
-abstract class AttributeValueBase extends AttributeAttributeValueBase { }
+abstract class AttributeValueBase extends ComponentAttributeValueBase { }