diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc
index 455d7dc..50b2bc0 100644
--- a/core/includes/bootstrap.inc
+++ b/core/includes/bootstrap.inc
@@ -13,6 +13,7 @@
 use Drupal\Core\DrupalKernel;
 use Drupal\Core\Extension\ExtensionDiscovery;
 use Drupal\Core\Logger\RfcLogLevel;
+use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Site\Settings;
 use Drupal\Core\Utility\Error;
 use Symfony\Component\ClassLoader\ApcClassLoader;
@@ -57,17 +58,19 @@
  * Role ID for anonymous users; should match what's in the "role" table.
  *
  * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
- *   Use ANONYMOUS_ID instead.
+ *   Use Drupal\Core\Session\AccountInterface::ANONYMOUS_ID or
+ *   \Drupal\user\RoleInterface::ANONYMOUS_ID instead.
  */
-const DRUPAL_ANONYMOUS_RID = 'anonymous';
+const DRUPAL_ANONYMOUS_RID = AccountInterface::ANONYMOUS_ID;
 
 /**
  * Role ID for authenticated users; should match what's in the "role" table.
  *
  * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
- *   Use AUTHENTICATED_ID instead.
+ *   Use Drupal\Core\Session\AccountInterface::AUTHENTICATED_ID or
+ *   \Drupal\user\RoleInterface::AUTHENTICATED_ID instead.
  */
-const DRUPAL_AUTHENTICATED_RID = 'authenticated';
+const DRUPAL_AUTHENTICATED_RID = AccountInterface::AUTHENTICATED_ID;
 
 /**
  * The maximum number of characters in a module or theme name.