diff --git a/native/avatars/edit-avatar.react.js b/native/avatars/edit-thread-avatar.react.js
rename from native/avatars/edit-avatar.react.js
rename to native/avatars/edit-thread-avatar.react.js
--- a/native/avatars/edit-avatar.react.js
+++ b/native/avatars/edit-thread-avatar.react.js
@@ -28,7 +28,7 @@
   +onPressEmojiAvatarFlow: () => mixed,
   +disabled?: boolean,
 };
-function EditAvatar(props: Props): React.Node {
+function EditThreadAvatar(props: Props): React.Node {
   const { onPressEmojiAvatarFlow, children, disabled } = props;
   const { showActionSheetWithOptions } = useActionSheet();
 
@@ -231,4 +231,4 @@
   },
 };
 
-export default EditAvatar;
+export default EditThreadAvatar;
diff --git a/native/avatars/edit-avatar.react.js b/native/avatars/edit-user-avatar.react.js
rename from native/avatars/edit-avatar.react.js
rename to native/avatars/edit-user-avatar.react.js
--- a/native/avatars/edit-avatar.react.js
+++ b/native/avatars/edit-user-avatar.react.js
@@ -28,7 +28,7 @@
   +onPressEmojiAvatarFlow: () => mixed,
   +disabled?: boolean,
 };
-function EditAvatar(props: Props): React.Node {
+function EditUserAvatar(props: Props): React.Node {
   const { onPressEmojiAvatarFlow, children, disabled } = props;
   const { showActionSheetWithOptions } = useActionSheet();
 
@@ -231,4 +231,4 @@
   },
 };
 
-export default EditAvatar;
+export default EditUserAvatar;
diff --git a/native/chat/settings/thread-settings-avatar.react.js b/native/chat/settings/thread-settings-avatar.react.js
--- a/native/chat/settings/thread-settings-avatar.react.js
+++ b/native/chat/settings/thread-settings-avatar.react.js
@@ -6,7 +6,7 @@
 
 import { type ResolvedThreadInfo } from 'lib/types/thread-types.js';
 
-import EditAvatar from '../../avatars/edit-avatar.react.js';
+import EditThreadAvatar from '../../avatars/edit-thread-avatar.react.js';
 import ThreadAvatar from '../../avatars/thread-avatar.react.js';
 import { EmojiAvatarCreationRouteName } from '../../navigation/route-names.js';
 import { useStyles } from '../../themes/colors.js';
@@ -34,12 +34,12 @@
 
   return (
     <View style={styles.container}>
-      <EditAvatar
+      <EditThreadAvatar
         onPressEmojiAvatarFlow={onPressEmojiAvatarFlow}
         disabled={!canChangeSettings}
       >
         <ThreadAvatar size="profile" threadInfo={threadInfo} />
-      </EditAvatar>
+      </EditThreadAvatar>
     </View>
   );
 }
diff --git a/native/profile/profile-screen.react.js b/native/profile/profile-screen.react.js
--- a/native/profile/profile-screen.react.js
+++ b/native/profile/profile-screen.react.js
@@ -19,7 +19,7 @@
 
 import type { ProfileNavigationProp } from './profile.react.js';
 import { deleteNativeCredentialsFor } from '../account/native-credentials.js';
-import EditAvatar from '../avatars/edit-avatar.react.js';
+import EditUserAvatar from '../avatars/edit-user-avatar.react.js';
 import UserAvatar from '../avatars/user-avatar.react.js';
 import Action from '../components/action-row.react.js';
 import Button from '../components/button.react.js';
@@ -131,12 +131,14 @@
           <View
             style={[this.props.styles.section, this.props.styles.avatarSection]}
           >
-            <EditAvatar onPressEmojiAvatarFlow={this.onPressEmojiAvatarFlow}>
+            <EditUserAvatar
+              onPressEmojiAvatarFlow={this.onPressEmojiAvatarFlow}
+            >
               <UserAvatar
                 size="profile"
                 userID={this.props.currentUserInfo?.id}
               />
-            </EditAvatar>
+            </EditUserAvatar>
           </View>
         </>
       );