diff --git a/lib/actions/upload-actions.js b/lib/actions/upload-actions.js
--- a/lib/actions/upload-actions.js
+++ b/lib/actions/upload-actions.js
@@ -14,7 +14,7 @@
 
 export type DeleteUploadInput = {
   +id: string,
-  +keyserverOrThreadID: string,
+  +keyserverOrThreadIDForMetadata: string,
 };
 
 const updateMultimediaMessageMediaActionType =
@@ -46,7 +46,7 @@
 export type BlobServiceUploadAction = (input: {
   +uploadInput: BlobServiceUploadInput,
   // use `null` to skip metadata upload to keyserver
-  +keyserverOrThreadID: ?string,
+  +keyserverOrThreadIDForMetadata: ?string,
   +callbacks?: MultimediaUploadCallbacks,
 }) => Promise<BlobServiceUploadResult>;
 
@@ -62,7 +62,7 @@
 
 export type MediaMetadataReassignmentAction = (input: {
   +mediaMetadataInput: ThickThreadMediaMetadataInput,
-  +keyserverOrThreadID: string,
+  +keyserverOrThreadIDForMetadata: string,
 }) => Promise<UploadMultimediaResult>;
 
 export { updateMultimediaMessageMediaActionType };
diff --git a/lib/hooks/upload-hooks.js b/lib/hooks/upload-hooks.js
--- a/lib/hooks/upload-hooks.js
+++ b/lib/hooks/upload-hooks.js
@@ -44,10 +44,10 @@
     callKeyserverEndpoint: CallKeyserverEndpoint,
   ): ((input: DeleteUploadInput) => Promise<void>) =>
   async input => {
-    const { id, keyserverOrThreadID } = input;
+    const { id, keyserverOrThreadIDForMetadata } = input;
     const keyserverID: string =
-      extractKeyserverIDFromIDOptional(keyserverOrThreadID) ??
-      keyserverOrThreadID;
+      extractKeyserverIDFromIDOptional(keyserverOrThreadIDForMetadata) ??
+      keyserverOrThreadIDForMetadata;
     const requests = { [keyserverID]: { id } };
     await callKeyserverEndpoint('delete_upload', requests);
   };
@@ -63,17 +63,17 @@
     authMetadata: AuthMetadata,
   ): BlobServiceUploadAction =>
   async input => {
-    const { uploadInput, callbacks, keyserverOrThreadID } = input;
+    const { uploadInput, callbacks, keyserverOrThreadIDForMetadata } = input;
     const { encryptionKey, loop, dimensions, thumbHash, blobInput } =
       uploadInput;
     const blobHash = toBase64URL(uploadInput.blobHash);
     const defaultHeaders = createDefaultHTTPRequestHeaders(authMetadata);
 
     let maybeKeyserverID;
-    if (keyserverOrThreadID) {
+    if (keyserverOrThreadIDForMetadata) {
       maybeKeyserverID =
-        extractKeyserverIDFromIDOptional(keyserverOrThreadID) ??
-        keyserverOrThreadID;
+        extractKeyserverIDFromIDOptional(keyserverOrThreadIDForMetadata) ??
+        keyserverOrThreadIDForMetadata;
     }
 
     // don't prefix keyserver-owned holders with deviceID
@@ -230,7 +230,7 @@
     authMetadata: AuthMetadata,
   ): MediaMetadataReassignmentAction =>
   async input => {
-    const { mediaMetadataInput, keyserverOrThreadID } = input;
+    const { mediaMetadataInput, keyserverOrThreadIDForMetadata } = input;
     const { encryptionKey, loop, dimensions, thumbHash, mimeType } =
       mediaMetadataInput;
     const blobHolder = generateBlobHolder();
@@ -269,7 +269,9 @@
     }
 
     // 2. Upload media metadata to keyserver
-    const keyserverID = extractKeyserverIDFromID(keyserverOrThreadID);
+    const keyserverID = extractKeyserverIDFromID(
+      keyserverOrThreadIDForMetadata,
+    );
     const requests = {
       [keyserverID]: {
         blobHash,
diff --git a/lib/shared/threads/protocols/keyserver-thread-protocol.js b/lib/shared/threads/protocols/keyserver-thread-protocol.js
--- a/lib/shared/threads/protocols/keyserver-thread-protocol.js
+++ b/lib/shared/threads/protocols/keyserver-thread-protocol.js
@@ -582,7 +582,7 @@
       media.type === 'encrypted_photo' ? 'image/jpeg' : 'video/mp4';
     const blobHash = blobHashFromBlobServiceURI(mediaURI);
     const mediaReassignmentPromise = reassignMediaMetadata({
-      keyserverOrThreadID: messageInfo.threadID,
+      keyserverOrThreadIDForMetadata: messageInfo.threadID,
       mediaMetadataInput: {
         blobHash,
         mimeType,
@@ -613,7 +613,7 @@
 
     const thumbnailBlobHash = blobHashFromBlobServiceURI(thumbnailMediaURI);
     const thumbnailReassignmentPromise = reassignMediaMetadata({
-      keyserverOrThreadID: messageInfo.threadID,
+      keyserverOrThreadIDForMetadata: messageInfo.threadID,
       mediaMetadataInput: {
         blobHash: thumbnailBlobHash,
         mimeType: 'image/jpeg',
diff --git a/native/avatars/avatar-hooks.js b/native/avatars/avatar-hooks.js
--- a/native/avatars/avatar-hooks.js
+++ b/native/avatars/avatar-hooks.js
@@ -88,7 +88,7 @@
           thumbHash,
           loop: false,
         },
-        keyserverOrThreadID:
+        keyserverOrThreadIDForMetadata:
           metadataUploadLocation === 'keyserver'
             ? authoritativeKeyserverID
             : null,
diff --git a/native/input/input-state-container.react.js b/native/input/input-state-container.react.js
--- a/native/input/input-state-container.react.js
+++ b/native/input/input-state-container.react.js
@@ -882,7 +882,9 @@
               ? processedMedia.thumbHash
               : null,
         },
-        keyserverOrThreadID: uploadMetadataToKeyserver ? threadInfo.id : null,
+        keyserverOrThreadIDForMetadata: uploadMetadataToKeyserver
+          ? threadInfo.id
+          : null,
         callbacks: {
           blobServiceUploadHandler,
           onProgress: (percent: number) => {
@@ -915,7 +917,7 @@
               dimensions: processedMedia.dimensions,
               thumbHash: processedMedia.thumbHash,
             },
-            keyserverOrThreadID: uploadMetadataToKeyserver
+            keyserverOrThreadIDForMetadata: uploadMetadataToKeyserver
               ? threadInfo.id
               : null,
             callbacks: {
diff --git a/web/avatars/avatar-hooks.react.js b/web/avatars/avatar-hooks.react.js
--- a/web/avatars/avatar-hooks.react.js
+++ b/web/avatars/avatar-hooks.react.js
@@ -60,7 +60,7 @@
           loop: false,
           thumbHash,
         },
-        keyserverOrThreadID: uploadMetadataToKeyserver
+        keyserverOrThreadIDForMetadata: uploadMetadataToKeyserver
           ? authoritativeKeyserverID
           : null,
         callbacks: {},
diff --git a/web/input/input-state-container.react.js b/web/input/input-state-container.react.js
--- a/web/input/input-state-container.react.js
+++ b/web/input/input-state-container.react.js
@@ -935,7 +935,7 @@
           loop: false,
           thumbHash,
         },
-        keyserverOrThreadID: uploadMultimediaMetadataToKeyserver
+        keyserverOrThreadIDForMetadata: uploadMultimediaMetadataToKeyserver
           ? threadID
           : null,
         callbacks,
@@ -1217,7 +1217,7 @@
           ) {
             void this.props.deleteUpload({
               id: serverID,
-              keyserverOrThreadID: threadInfo.id,
+              keyserverOrThreadIDForMetadata: threadInfo.id,
             });
           }
           if (isBlobServiceURI(pendingUpload.uri)) {