diff --git a/core/core.api.php b/core/core.api.php
index 6a34823abdb1fe40b1573f097b2c164eee81b438..7b90ae21f7bb0b5b0d077100b556fba5be5d5c93 100644
--- a/core/core.api.php
+++ b/core/core.api.php
@@ -2047,7 +2047,7 @@ function hook_mail_alter(&$message) {
  *   An array of parameters supplied by the caller of
  *   MailManagerInterface->mail().
  *
- * @see \Drupal\Core\Mail\MailManagerInterface->mail()
+ * @see \Drupal\Core\Mail\MailManagerInterface::mail()
  */
 function hook_mail($key, &$message, $params) {
   $account = $params['account'];
diff --git a/core/includes/update.inc b/core/includes/update.inc
index 213d15d2fef9ef225ad866651a9d0cb5a1cd3b17..a9b5de92320d869b8bc4b227cb5390fba520596e 100644
--- a/core/includes/update.inc
+++ b/core/includes/update.inc
@@ -596,7 +596,7 @@ function update_already_performed($module, $number) {
  *   An array of return values obtained by merging the results of the
  *   hook_update_dependencies() implementations in all installed modules.
  *
- * @see \Drupal::moduleHandler()->invokeAll()
+ * @see \Drupal\Core\Extension\ModuleHandlerInterface::invokeAll()
  * @see hook_update_dependencies()
  */
 function update_retrieve_dependencies() {
diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php
index c0775c914aff89fdcf6198e0c02c83db2faeedb2..72f35da8db612eb982fc86b8042fec2241a18b1b 100644
--- a/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php
+++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php
@@ -23,7 +23,7 @@ class Schema extends DatabaseSchema {
    * This is collected by DatabaseConnection_pgsql->queryTableInformation(),
    * by introspecting the database.
    *
-   * @see DatabaseConnection_pgsql->queryTableInformation()
+   * @see \Drupal\Core\Database\Driver\pgsql\Schema::queryTableInformation()
    * @var array
    */
   protected $tableInformation = array();
diff --git a/core/lib/Drupal/Core/Utility/ProjectInfo.php b/core/lib/Drupal/Core/Utility/ProjectInfo.php
index 1eed1fe9ace79580a4033294b5bd684a183e9c14..24043d3b438d6be5e6e84e5a19b8fe554258fb86 100644
--- a/core/lib/Drupal/Core/Utility/ProjectInfo.php
+++ b/core/lib/Drupal/Core/Utility/ProjectInfo.php
@@ -172,7 +172,7 @@ function getProjectName(Extension $file) {
    * @return
    *   Array of .info.yml file data we need for the update manager.
    *
-   * @see \Drupal\Core\Utility\ProjectInfo->processInfoList()
+   * @see \Drupal\Core\Utility\ProjectInfo::processInfoList()
    */
   function filterProjectInfo($info, $additional_whitelist = array()) {
     $whitelist = array(
diff --git a/core/modules/simpletest/simpletest.api.php b/core/modules/simpletest/simpletest.api.php
index e5251b78bc9f6135c07f5da481e1484e4eb3bd2e..d1b5f442c779b49586d38be0a2729bad184c1006 100644
--- a/core/modules/simpletest/simpletest.api.php
+++ b/core/modules/simpletest/simpletest.api.php
@@ -50,7 +50,7 @@ function hook_test_group_finished() {
  *   $results The results of the test as gathered by
  *   \Drupal\simpletest\WebTestBase.
  *
- * @see \Drupal\simpletest\WebTestBase->results()
+ * @see \Drupal\simpletest\WebTestBase::results()
  */
 function hook_test_finished($results) {
 }
diff --git a/core/modules/update/update.api.php b/core/modules/update/update.api.php
index 362c1a228312c6da6a74f1e251c2225f6070b0cc..37ef66a47439e3c0626146ec5432671ba8388649 100644
--- a/core/modules/update/update.api.php
+++ b/core/modules/update/update.api.php
@@ -32,7 +32,7 @@
  *   examples of how to populate the array with real values.
  *
  * @see \Drupal\Update\UpdateManager::getProjects()
- * @see \Drupal\Core\Utility\ProjectInfo->processInfoList()
+ * @see \Drupal\Core\Utility\ProjectInfo::processInfoList()
  */
 function hook_update_projects_alter(&$projects) {
   // Hide a site-specific module from the list.
diff --git a/core/modules/user/user.api.php b/core/modules/user/user.api.php
index 6700727ee7eac7dc4baa66d36780e3ccd7d06dd5..d4a093e362216ca626601814355f34884a8a9c43 100644
--- a/core/modules/user/user.api.php
+++ b/core/modules/user/user.api.php
@@ -115,7 +115,7 @@ function hook_user_cancel_methods_alter(&$methods) {
  * @param $account
  *   The account object the name belongs to.
  *
- * @see \Drupal\Core\Session\AccountInterface->getDisplayName()
+ * @see \Drupal\Core\Session\AccountInterface::getDisplayName()
  */
 function hook_user_format_name_alter(&$name, $account) {
   // Display the user's uid instead of name.