diff --git a/core/modules/taxonomy/src/TermForm.php b/core/modules/taxonomy/src/TermForm.php
index 2001c33..252fa7c 100644
--- a/core/modules/taxonomy/src/TermForm.php
+++ b/core/modules/taxonomy/src/TermForm.php
@@ -16,7 +16,7 @@ class TermForm extends ContentEntityForm {
   public function form(array $form, FormStateInterface $form_state) {
     $term = $this->entity;
     if (!$term->isNew()) {
-      $form['#title'] = $this->t('Edit ' . $term->label());
+      $form['#title'] = $this->t('Edit @name', array('@name' =>  $term->label()));
     }
 
     $vocab_storage = $this->entityManager->getStorage('taxonomy_vocabulary');
diff --git a/core/modules/taxonomy/src/VocabularyForm.php b/core/modules/taxonomy/src/VocabularyForm.php
index 21838d4..dcab503 100644
--- a/core/modules/taxonomy/src/VocabularyForm.php
+++ b/core/modules/taxonomy/src/VocabularyForm.php
@@ -49,7 +49,7 @@ public function form(array $form, FormStateInterface $form_state) {
       $form['#title'] = $this->t('Add vocabulary');
     }
     else {
-      $form['#title'] = $this->t('Edit ' . $vocabulary->label());
+      $form['#title'] = $this->t('Edit @name', array('@name' => $vocabulary->label()));
     }
 
     $form['name'] = array(