diff --git a/src/screens/PostThread/components/ThreadPost.tsx b/src/screens/PostThread/components/ThreadItemPost.tsx
similarity index 97%
rename from src/screens/PostThread/components/ThreadPost.tsx
rename to src/screens/PostThread/components/ThreadItemPost.tsx
index 4cd45deeaa..282bdae9b6 100644
--- a/src/screens/PostThread/components/ThreadPost.tsx
+++ b/src/screens/PostThread/components/ThreadItemPost.tsx
@@ -56,7 +56,7 @@ export type ThreadItemPostProps = {
   threadgateRecord?: AppBskyFeedThreadgate.Record
 }
 
-export function ThreadPost({
+export function ThreadItemPost({
   item,
   overrides,
   onPostSuccess,
@@ -65,13 +65,11 @@ export function ThreadPost({
   const postShadow = usePostShadow(item.value.post)
 
   if (postShadow === POST_TOMBSTONE) {
-    return <PostThreadItemDeleted item={item} overrides={overrides} />
+    return <ThreadItemPostDeleted item={item} overrides={overrides} />
   }
 
   return (
-    <ThreadPostInner
-      // Safeguard from clobbering per-post state below:
-      key={postShadow.uri}
+    <ThreadItemPostInner
       item={item}
       postShadow={postShadow}
       threadgateRecord={threadgateRecord}
@@ -81,7 +79,7 @@ export function ThreadPost({
   )
 }
 
-function PostThreadItemDeleted({
+function ThreadItemPostDeleted({
   item,
   overrides,
 }: Pick<ThreadItemPostProps, 'item' | 'overrides'>) {
@@ -180,7 +178,7 @@ const ThreadItemPostParentReplyLine = memo(
   },
 )
 
-const ThreadPostInner = memo(function ThreadPostInner({
+const ThreadItemPostInner = memo(function ThreadItemPostInner({
   item,
   postShadow,
   overrides,
@@ -366,7 +364,7 @@ function SubtleHover({children}: {children: React.ReactNode}) {
   )
 }
 
-export function ThreadPostSkeleton() {
+export function ThreadItemPostSkeleton() {
   const t = useTheme()
   return (
     <View
diff --git a/src/screens/PostThread/index.tsx b/src/screens/PostThread/index.tsx
index 723a9d59bb..e17d9e0047 100644
--- a/src/screens/PostThread/index.tsx
+++ b/src/screens/PostThread/index.tsx
@@ -19,11 +19,11 @@ import {
   ThreadAnchor,
   ThreadAnchorSkeleton,
 } from '#/screens/PostThread/components/ThreadAnchor'
-import {ThreadItemTreePost} from '#/screens/PostThread/components/ThreadItemTreePost'
 import {
-  ThreadPost,
-  ThreadPostSkeleton,
-} from '#/screens/PostThread/components/ThreadPost'
+  ThreadItemPost,
+  ThreadItemPostSkeleton,
+} from '#/screens/PostThread/components/ThreadItemPost'
+import {ThreadItemTreePost} from '#/screens/PostThread/components/ThreadItemTreePost'
 import {atoms as a, useBreakpoints, useTheme, web} from '#/alf'
 import * as Layout from '#/components/Layout'
 import {ListFooter} from '#/components/Lists'
@@ -210,7 +210,7 @@ export function Inner({uri}: {uri: string | undefined}) {
       if (item.depth < 0) {
         if (deferParents) return null
         return (
-          <ThreadPost
+          <ThreadItemPost
             item={item}
             threadgateRecord={thread.data.threadgate?.record ?? undefined}
             overrides={{
@@ -246,7 +246,7 @@ export function Inner({uri}: {uri: string | undefined}) {
           )
         } else {
           return (
-            <ThreadPost
+            <ThreadItemPost
               item={item}
               threadgateRecord={thread.data.threadgate?.record ?? undefined}
               overrides={{
@@ -321,7 +321,7 @@ export function Inner({uri}: {uri: string | undefined}) {
       if (item.item === 'anchor') {
         return <ThreadAnchorSkeleton />
       } else if (item.item === 'reply') {
-        return <ThreadPostSkeleton />
+        return <ThreadItemPostSkeleton />
       }
     }
     return null