diff --git a/src/cmap/handshake/client_metadata.ts b/src/cmap/handshake/client_metadata.ts
index 9a633a72aa..d8dbe7c7ad 100644
--- a/src/cmap/handshake/client_metadata.ts
+++ b/src/cmap/handshake/client_metadata.ts
@@ -11,6 +11,7 @@ const NODE_DRIVER_VERSION = require('../../../package.json').version;
 
 /**
  * @public
+ * @deprecated This interface will be made internal in the next major release.
  * @see https://github.com/mongodb/specifications/blob/master/source/mongodb-handshake/handshake.md#hello-command
  */
 export interface ClientMetadata {
@@ -38,7 +39,10 @@ export interface ClientMetadata {
   };
 }
 
-/** @public */
+/**
+ * @public
+ * @deprecated This interface will be made internal in the next major release.
+ */
 export interface ClientMetadataOptions {
   driverInfo?: {
     name?: string;
diff --git a/src/mongo_client.ts b/src/mongo_client.ts
index be74e3b08c..5cbf8ec66e 100644
--- a/src/mongo_client.ts
+++ b/src/mongo_client.ts
@@ -1035,6 +1035,7 @@ export interface MongoOptions
   compressors: CompressorName[];
   writeConcern: WriteConcern;
   dbName: string;
+  /** @deprecated - Will be made internal in a future major release. */
   metadata: ClientMetadata;
   /** @internal */
   extendedMetadata: Promise<Document>;
diff --git a/src/mongo_types.ts b/src/mongo_types.ts
index fda9909429..e96204931f 100644
--- a/src/mongo_types.ts
+++ b/src/mongo_types.ts
@@ -472,7 +472,10 @@ export class TypedEventEmitter<Events extends EventsDescription> extends EventEm
   }
 }
 
-/** @public */
+/**
+ * @public
+ * @deprecated Will be removed in favor of `AbortSignal` in the next major release.
+ */
 export class CancellationToken extends TypedEventEmitter<{ cancel(): void }> {
   constructor(...args: any[]) {
     super(...args);