diff --git a/src/applications/repository/storage/PhabricatorRepository.php b/src/applications/repository/storage/PhabricatorRepository.php
index f8ea5a4e93..b5be702783 100644
--- a/src/applications/repository/storage/PhabricatorRepository.php
+++ b/src/applications/repository/storage/PhabricatorRepository.php
@@ -446,10 +446,11 @@ final class PhabricatorRepository extends PhabricatorRepositoryDAO {
 
   /**
    * Get a parsed object representation of the repository's remote URI. This
-   * may be a normal URI (returned as a @{class:PhutilURI}) or a git URI
-   * (returned as a @{class:PhutilGitURI}).
+   * may be a normal URI (returned as a @{class@libphutil:PhutilURI}) or a git
+   * URI (returned as a @{class@libphutil:PhutilGitURI}).
    *
-   * @return wild A @{class:PhutilURI} or @{class:PhutilGitURI}.
+   * @return wild A @{class@libphutil:PhutilURI} or
+   *              @{class@libphutil:PhutilGitURI}.
    * @task uri
    */
   private function getRemoteURIObject() {
diff --git a/src/docs/userguide/events.diviner b/src/docs/userguide/events.diviner
index 2dfe023dac..7792c0a97c 100644
--- a/src/docs/userguide/events.diviner
+++ b/src/docs/userguide/events.diviner
@@ -17,7 +17,7 @@ powerful way to respond to events.
 
 To install event listeners, follow these steps:
 
-  - Write a listener class which extends @{class:PhutilEventListener}.
+  - Write a listener class which extends @{class@libphutil:PhutilEventListener}.
   - Add it to a libphutil library, or create a new library (for instructions,
     see @{article:libphutil Libraries User Guide}.
   - Configure Phabricator to load the library by adding it to `load-libraries`
@@ -165,7 +165,7 @@ Data available on this event:
     with a different result, replace this with the correct PHID in your event
     listener.
 
-Using @{class:PhutilEmailAddress} may be helpful in parsing the query.
+Using @{class@libphutil:PhutilEmailAddress} may be helpful in parsing the query.
 
 == Edge: Will Edit Edges ==