diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index 89032d1608db48ba0ecb94cfb61bf518fc162b7e..f3849e0be26957918e4ee71375e0c702e61a2489 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -1338,7 +1338,7 @@ function template_preprocess_node(&$variables) {
$uri = $node->uri();
$variables['node_url'] = url($uri['path'], $uri['options']);
- $variables['title'] = check_plain($node->title);
+ $variables['label'] = check_plain($node->label());
$variables['page'] = $variables['view_mode'] == 'full' && node_is_page($node);
// Flatten the node entity's member fields.
diff --git a/core/modules/node/node.tpl.php b/core/modules/node/node.tpl.php
index 624ac7d966533fe95cf5b228bbb7a900a1415fe0..e24ba408d2bbc5681a82f351c029ffdde7a035b7 100644
--- a/core/modules/node/node.tpl.php
+++ b/core/modules/node/node.tpl.php
@@ -5,7 +5,7 @@
* Default theme implementation to display a node.
*
* Available variables:
- * - $title: the (sanitized) title of the node.
+ * - $label: the (sanitized) title of the node.
* - $content: An array of node items. Use render($content) to print them all,
* or print a subset such as render($content['field_example']). Use
* hide($content['field_example']) to temporarily suppress the printing of a
@@ -82,7 +82,7 @@
-
>
+ >
diff --git a/core/modules/taxonomy/taxonomy-term.tpl.php b/core/modules/taxonomy/taxonomy-term.tpl.php
index 96ed8fcf3c7783dfa8801e4f22f147b60edd7d51..07e1e472fd91de64e0d49c0ff516edba9aa1b627 100644
--- a/core/modules/taxonomy/taxonomy-term.tpl.php
+++ b/core/modules/taxonomy/taxonomy-term.tpl.php
@@ -11,8 +11,8 @@
* such as render($content['field_example']). Use
* hide($content['field_example']) to temporarily suppress the printing of a
* given element.
- * - $term_url: Direct url of the current term.
- * - $term_name: Name of the current term.
+ * - $url: Direct url of the current term.
+ * - $label: Name of the current term.
* - $attributes: An instance of Attributes class that can be manipulated as an
* array and printed as a string.
* It includes the 'class' information, which includes:
@@ -41,7 +41,7 @@
>
-
+
diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module
index a772e0259be4a3d410a46958bc178e9694f1ae49..4894cf133a5a59c5161e636ee7e932e9ad6daed5 100644
--- a/core/modules/taxonomy/taxonomy.module
+++ b/core/modules/taxonomy/taxonomy.module
@@ -630,8 +630,8 @@ function template_preprocess_taxonomy_term(&$variables) {
$term = $variables['term'];
$uri = $term->uri();
- $variables['term_url'] = url($uri['path'], $uri['options']);
- $variables['term_name'] = check_plain($term->name);
+ $variables['url'] = url($uri['path'], $uri['options']);
+ $variables['label'] = check_plain($term->label());
$variables['page'] = $variables['view_mode'] == 'full' && taxonomy_term_is_page($term);
// Flatten the term object's member fields.