diff --git a/lib/shared/avatar-utils.js b/lib/shared/avatar-utils.js
--- a/lib/shared/avatar-utils.js
+++ b/lib/shared/avatar-utils.js
@@ -314,7 +314,7 @@
   return getDefaultAvatar(thread.id, thread.color);
 }
 
-function useENSResolvedAvatar(
+function useResolvedAvatar(
   avatarInfo: ClientAvatar,
   userInfo: ?GenericUserInfoWithAvatar,
 ): ResolvedClientAvatar {
@@ -351,5 +351,5 @@
   getAvatarForUser,
   getUserAvatarForThread,
   getAvatarForThread,
-  useENSResolvedAvatar,
+  useResolvedAvatar,
 };
diff --git a/native/avatars/thread-avatar.react.js b/native/avatars/thread-avatar.react.js
--- a/native/avatars/thread-avatar.react.js
+++ b/native/avatars/thread-avatar.react.js
@@ -3,7 +3,7 @@
 import * as React from 'react';
 
 import { useAvatarForThread } from 'lib/hooks/avatar-hooks.js';
-import { useENSResolvedAvatar } from 'lib/shared/avatar-utils.js';
+import { useResolvedAvatar } from 'lib/shared/avatar-utils.js';
 import { getSingleOtherUser } from 'lib/shared/thread-utils.js';
 import type { AvatarSize } from 'lib/types/avatar-types.js';
 import type {
@@ -43,7 +43,7 @@
       : null,
   );
 
-  const resolvedThreadAvatar = useENSResolvedAvatar(avatarInfo, displayUser);
+  const resolvedThreadAvatar = useResolvedAvatar(avatarInfo, displayUser);
 
   return <Avatar size={size} avatarInfo={resolvedThreadAvatar} />;
 }
diff --git a/native/avatars/user-avatar.react.js b/native/avatars/user-avatar.react.js
--- a/native/avatars/user-avatar.react.js
+++ b/native/avatars/user-avatar.react.js
@@ -4,7 +4,7 @@
 
 import {
   getAvatarForUser,
-  useENSResolvedAvatar,
+  useResolvedAvatar,
 } from 'lib/shared/avatar-utils.js';
 import type {
   GenericUserInfoWithAvatar,
@@ -32,7 +32,7 @@
 
   const avatarInfo = getAvatarForUser(userInfo);
 
-  const resolvedUserAvatar = useENSResolvedAvatar(avatarInfo, userInfo);
+  const resolvedUserAvatar = useResolvedAvatar(avatarInfo, userInfo);
 
   return <Avatar size={size} avatarInfo={resolvedUserAvatar} />;
 }
diff --git a/web/avatars/thread-avatar.react.js b/web/avatars/thread-avatar.react.js
--- a/web/avatars/thread-avatar.react.js
+++ b/web/avatars/thread-avatar.react.js
@@ -3,7 +3,7 @@
 import * as React from 'react';
 
 import { useAvatarForThread } from 'lib/hooks/avatar-hooks.js';
-import { useENSResolvedAvatar } from 'lib/shared/avatar-utils.js';
+import { useResolvedAvatar } from 'lib/shared/avatar-utils.js';
 import { getSingleOtherUser } from 'lib/shared/thread-utils.js';
 import type { AvatarSize } from 'lib/types/avatar-types.js';
 import type {
@@ -43,7 +43,7 @@
       : null,
   );
 
-  const resolvedThreadAvatar = useENSResolvedAvatar(avatarInfo, displayUser);
+  const resolvedThreadAvatar = useResolvedAvatar(avatarInfo, displayUser);
 
   return (
     <Avatar
diff --git a/web/avatars/user-avatar.react.js b/web/avatars/user-avatar.react.js
--- a/web/avatars/user-avatar.react.js
+++ b/web/avatars/user-avatar.react.js
@@ -4,7 +4,7 @@
 
 import {
   getAvatarForUser,
-  useENSResolvedAvatar,
+  useResolvedAvatar,
 } from 'lib/shared/avatar-utils.js';
 import type { AvatarSize } from 'lib/types/avatar-types.js';
 
@@ -25,7 +25,7 @@
   );
   const avatarInfo = getAvatarForUser(userInfo);
 
-  const resolvedUserAvatar = useENSResolvedAvatar(avatarInfo, userInfo);
+  const resolvedUserAvatar = useResolvedAvatar(avatarInfo, userInfo);
 
   return (
     <Avatar