diff --git a/packages/api/src/web5.ts b/packages/api/src/web5.ts
index 334da01d7..0ad69b0af 100644
--- a/packages/api/src/web5.ts
+++ b/packages/api/src/web5.ts
@@ -26,16 +26,16 @@ export type TechPreviewOptions = {
  */
 export type Web5ConnectOptions = {
   /**
-   * Provide a {@link @web5/agent#Web5Agent} implementation. Defaults to creating a local
-   * {@link @web5/user-agent#Web5UserAgent} if one isn't provided
+   * Provide a {@link Web5Agent} implementation. Defaults to creating a local
+   * {@link Web5UserAgent} if one isn't provided
    **/
   agent?: Web5Agent;
 
   /**
-   * Provide an instance of a {@link @web5/agent#AppDataStore} implementation. Defaults to
+   * Provide an instance of a {@link AppDataStore} implementation. Defaults to
    * a LevelDB-backed store with an insecure, static unlock passphrase if one
    * isn't provided. To allow the app user to enter a secure passphrase of
-   * their choosing, provide an initialized {@link @web5/agent#AppDataStore} instance.
+   * their choosing, provide an initialized {@link AppDataStore} instance.
    **/
   appData?: AppDataStore;
 
@@ -98,7 +98,7 @@ export class Web5 {
   }
 
   /**
-   * Connects to a {@link @web5/agent#Web5Agent}. Defaults to creating a local {@link @web5/user-agent#Web5UserAgent}
+   * Connects to a {@link Web5Agent}. Defaults to creating a local {@link Web5UserAgent}
    * if one isn't provided.
    *
    * @param options - optional overrides
diff --git a/packages/crypto-aws-kms/src/ecdsa.ts b/packages/crypto-aws-kms/src/ecdsa.ts
index 055545911..843d691f2 100644
--- a/packages/crypto-aws-kms/src/ecdsa.ts
+++ b/packages/crypto-aws-kms/src/ecdsa.ts
@@ -162,8 +162,8 @@ export class EcdsaAlgorithm implements
    *
    * Note: The signature returned is normalized to low-S to prevent signature malleability. This
    * ensures that the signature can be verified by other libraries that enforce strict verification.
-   * More information on signature malleability can be found
-   * {@link @web5/crypto#Secp256k1.adjustSignatureToLowS | here}.
+   * More information on signature malleability can be found on
+   * {@link Secp256k1.adjustSignatureToLowS | here}.
    *
    * @example
    * ```ts
diff --git a/packages/dids/src/methods/did-dht.ts b/packages/dids/src/methods/did-dht.ts
index aaa17335a..fc3a6c0fd 100644
--- a/packages/dids/src/methods/did-dht.ts
+++ b/packages/dids/src/methods/did-dht.ts
@@ -564,7 +564,7 @@ export class DidDht extends DidMethod {
    * @param params - The parameters for the `fromKeys` operation.
    * @param params.keyManager - Optionally specify an external Key Management System (KMS) used to
    *                            generate keys and sign data. If not given, a new
-   *                            {@link @web5/crypto#LocalKeyManager} instance will be created and used.
+   *                            {@link LocalKeyManager} instance will be created and used.
    * @returns A Promise resolving to a `BearerDid` object representing the DID formed from the provided keys.
    * @throws An error if the `verificationMethods` array does not contain any keys, lacks an
    *         Identity Key, or any verification method is missing a public or private key.
diff --git a/packages/dids/src/methods/did-jwk.ts b/packages/dids/src/methods/did-jwk.ts
index 70d9e0a6c..f02fc2fbf 100644
--- a/packages/dids/src/methods/did-jwk.ts
+++ b/packages/dids/src/methods/did-jwk.ts
@@ -224,7 +224,7 @@ export class DidJwk extends DidMethod {
    * @param params - The parameters for the `fromKeys` operation.
    * @param params.keyManager - Optionally specify an external Key Management System (KMS) used to
    *                            generate keys and sign data. If not given, a new
-   *                            {@link @web5/crypto#LocalKeyManager} instance will be created and used.
+   *                            {@link LocalKeyManager} instance will be created and used.
    * @returns A Promise resolving to a `BearerDid` object representing the DID formed from the provided keys.
    * @throws An error if the `verificationMethods` array does not contain exactly one entry.
    */
diff --git a/packages/dids/src/methods/did-key.ts b/packages/dids/src/methods/did-key.ts
index 5180bddbf..e116860a0 100644
--- a/packages/dids/src/methods/did-key.ts
+++ b/packages/dids/src/methods/did-key.ts
@@ -393,7 +393,7 @@ export class DidKey extends DidMethod {
    * @param params - The parameters for the `fromKeys` operation.
    * @param params.keyManager - Optionally specify an external Key Management System (KMS) used to
    *                            generate keys and sign data. If not given, a new
-   *                            {@link @web5/crypto#LocalKeyManager} instance will be created and used.
+   *                            {@link LocalKeyManager} instance will be created and used.
    * @returns A Promise resolving to a `BearerDid` object representing the DID formed from the provided keys.
    * @throws An error if the `verificationMethods` array does not contain exactly one entry.
    */
diff --git a/packages/dids/src/methods/did-method.ts b/packages/dids/src/methods/did-method.ts
index 08a884626..50fed3809 100644
--- a/packages/dids/src/methods/did-method.ts
+++ b/packages/dids/src/methods/did-method.ts
@@ -30,7 +30,7 @@ export interface BearerDid {
   didDocument: DidDocument;
 
   /**
-   * Returns a {@link @web5/crypto#Signer} that can be used to sign messages, credentials, or
+   * Returns a {@link Signer} that can be used to sign messages, credentials, or
    * arbitrary data.
    *
    * If given, the `keyUri` parameter is used to select a key from the verification methods present