diff --git a/core/lib/Drupal/Core/Entity/EntityType.php b/core/lib/Drupal/Core/Entity/EntityType.php
index e121d75..41598fb 100644
--- a/core/lib/Drupal/Core/Entity/EntityType.php
+++ b/core/lib/Drupal/Core/Entity/EntityType.php
@@ -112,6 +112,8 @@ class EntityType implements EntityTypeInterface {
    * The name of a callback that returns the label of the entity.
    *
    * @var string|null
+   *
+   * @deprecated in Drupal 8.0.x-dev and will be removed before Drupal 9.0.0.
    */
   protected $label_callback = NULL;
 
@@ -588,6 +590,8 @@ public function setLinkTemplate($key, $path) {
 
   /**
    * {@inheritdoc}
+   *
+   * @deprecated in Drupal 8.0.x-dev and will be removed before Drupal 9.0.0.
    */
   public function getLabelCallback() {
     return $this->label_callback;
@@ -595,6 +599,8 @@ public function getLabelCallback() {
 
   /**
    * {@inheritdoc}
+   *
+   * @deprecated in Drupal 8.0.x-dev and will be removed before Drupal 9.0.0.
    */
   public function setLabelCallback($callback) {
     $this->label_callback = $callback;
@@ -603,6 +609,8 @@ public function setLabelCallback($callback) {
 
   /**
    * {@inheritdoc}
+   *
+   * @deprecated in Drupal 8.0.x-dev and will be removed before Drupal 9.0.0.
    */
   public function hasLabelCallback() {
     return isset($this->label_callback);
diff --git a/core/lib/Drupal/Core/Entity/EntityTypeInterface.php b/core/lib/Drupal/Core/Entity/EntityTypeInterface.php
index 46c2058..b83c04f 100644
--- a/core/lib/Drupal/Core/Entity/EntityTypeInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityTypeInterface.php
@@ -109,7 +109,9 @@ public function getOriginalClass();
    *     label. For example, if the entity's label is located in
    *     $entity->subject, then 'subject' should be specified here. If complex
    *     logic is required to build the label, a 'label_callback' should be
-   *     defined instead (see the $label_callback block above for details).
+   *     defined instead (see the $label_callback block above for details) that
+   *     has been deprecated. It will be removed when an alternative solution
+   *     has been implemented.
    *   - langcode: (optional) The name of the property that contains the
    *     language code. For instance, if the entity's language is located in
    *     $entity->langcode, then 'langcode' should be specified here.
@@ -502,6 +504,10 @@ public function setLinkTemplate($key, $path);
    *
    * @return callable|null
    *   The callback, or NULL if none exists.
+   *
+   * @deprecated in Drupal 8.0.x-dev and will be removed before Drupal 9.0.0.
+   *
+   * @todo Remove usages of label_callback https://www.drupal.org/node/2450793.
    */
   public function getLabelCallback();
 
@@ -512,6 +518,8 @@ public function getLabelCallback();
    *   A callable that returns the label of the entity.
    *
    * @return $this
+   *
+   * @deprecated in Drupal 8.0.x-dev and will be removed before Drupal 9.0.0.
    */
   public function setLabelCallback($callback);
 
@@ -519,6 +527,8 @@ public function setLabelCallback($callback);
    * Indicates if a label callback exists.
    *
    * @return bool
+   *
+   * @deprecated in Drupal 8.0.x-dev and will be removed before Drupal 9.0.0.
    */
   public function hasLabelCallback();
 
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index b157f1f..1f5df64 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -401,8 +401,10 @@ function user_preprocess_block(&$variables) {
  *   this result must ensure that \Drupal\Component\Utility\SafeMarkup::checkPlain()
  *   is called on it before it is printed to the page.
  *
- * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
- *   Use \Drupal\Core\Session\Interface::getUsername().
+ * @deprecated in Drupal 8.0.x-dev, will be removed before Drupal 9.0.0.
+ *   Use \Drupal\Core\Session\AccountInterface::getUsername().
+ *
+ * @todo Remove usage in https://www.drupal.org/node/2311219.
  */
 function user_format_name(AccountInterface $account) {
   return $account->getUsername();