diff --git a/src/analytics/metrics/types.ts b/src/analytics/metrics/types.ts
index d4b87eda2e..5157c66e30 100644
--- a/src/analytics/metrics/types.ts
+++ b/src/analytics/metrics/types.ts
@@ -1179,24 +1179,24 @@ export type Events = {
   'post:photoEmbed:impression': {
     layout: 'single' | 'grid' | 'carousel'
     totalImages: number
-    uri: string
-    authorDid: string
+    postUri: string
+    postAuthorDid: string
     feedDescriptor?: string
   }
   'post:photoEmbed:open': {
     layout: 'single' | 'grid' | 'carousel'
     fromImage: number
     totalImages: number
-    uri: string
-    authorDid: string
+    postUri: string
+    postAuthorDid: string
     feedDescriptor?: string
   }
   'post:photoEmbed:carouselSwipe': {
     fromImage: number
     toImage: number
     totalImages: number
-    uri: string
-    authorDid: string
+    postUri: string
+    postAuthorDid: string
     feedDescriptor?: string
   }
   'post:photoEmbed:lightboxSwipe': {
@@ -1204,8 +1204,8 @@ export type Events = {
     fromImage: number
     toImage: number
     totalImages: number
-    uri: string
-    authorDid: string
+    postUri: string
+    postAuthorDid: string
     feedDescriptor?: string
   }
 }
diff --git a/src/components/Lightbox/pager/ImagePager.tsx b/src/components/Lightbox/pager/ImagePager.tsx
index 1e3ef670d0..43942b0f37 100644
--- a/src/components/Lightbox/pager/ImagePager.tsx
+++ b/src/components/Lightbox/pager/ImagePager.tsx
@@ -387,8 +387,8 @@ function ImageView({
                 fromImage: prev + 1,
                 toImage: next + 1,
                 totalImages: images.length,
-                uri: metricsContext.uri,
-                authorDid: metricsContext.authorDid,
+                postUri: metricsContext.postUri,
+                postAuthorDid: metricsContext.postAuthorDid,
                 feedDescriptor: metricsContext.feedDescriptor,
               })
             }
diff --git a/src/components/Lightbox/state.tsx b/src/components/Lightbox/state.tsx
index 355e9e77df..6a8fdbe0b7 100644
--- a/src/components/Lightbox/state.tsx
+++ b/src/components/Lightbox/state.tsx
@@ -13,8 +13,8 @@ import {type ImageSource} from '#/components/Lightbox/types'
 
 export type LightboxMetricsContext = {
   layout: 'single' | 'grid' | 'carousel'
-  uri: string
-  authorDid: string
+  postUri: string
+  postAuthorDid: string
   feedDescriptor?: string
 }
 
diff --git a/src/components/Post/Embed/ImageEmbed.tsx b/src/components/Post/Embed/ImageEmbed.tsx
index 207105b31a..9d47302063 100644
--- a/src/components/Post/Embed/ImageEmbed.tsx
+++ b/src/components/Post/Embed/ImageEmbed.tsx
@@ -48,8 +48,8 @@ export function ImageEmbed({
 
   const postContext = rest.post
     ? {
-        uri: rest.post.uri,
-        authorDid: rest.post.author.did,
+        postUri: rest.post.uri,
+        postAuthorDid: rest.post.author.did,
         feedDescriptor: rest.feedDescriptor,
       }
     : undefined
diff --git a/src/components/images/Gallery/index.tsx b/src/components/images/Gallery/index.tsx
index 027d2b19d2..1b4e1d6239 100644
--- a/src/components/images/Gallery/index.tsx
+++ b/src/components/images/Gallery/index.tsx
@@ -58,8 +58,8 @@ interface GalleryProps {
   // Post context for the in-feed carousel swipe metric. Omit for non-post
   // contexts (no event will be emitted).
   metricsPostContext?: {
-    uri: string
-    authorDid: string
+    postUri: string
+    postAuthorDid: string
     feedDescriptor?: string
   }
 }
@@ -182,8 +182,8 @@ export function Gallery({
           fromImage: fromIndex + 1, // convert to 1-based index for easier analysis
           toImage: toIndex + 1, // convert to 1-based index for easier analysis
           totalImages: images.length,
-          uri: metricsPostContext.uri,
-          authorDid: metricsPostContext.authorDid,
+          postUri: metricsPostContext.postUri,
+          postAuthorDid: metricsPostContext.postAuthorDid,
           feedDescriptor: metricsPostContext.feedDescriptor,
         })
       }, 200),
diff --git a/src/view/com/posts/PostFeed.tsx b/src/view/com/posts/PostFeed.tsx
index 227fddde74..20c6a31a3a 100644
--- a/src/view/com/posts/PostFeed.tsx
+++ b/src/view/com/posts/PostFeed.tsx
@@ -979,8 +979,8 @@ let PostFeed = ({
           ax.metric('post:photoEmbed:impression', {
             layout,
             totalImages,
-            uri: post.uri,
-            authorDid: post.author.did,
+            postUri: post.uri,
+            postAuthorDid: post.author.did,
             feedDescriptor: feedFeedback.feedDescriptor || feed,
           })
         }