diff --git a/ts/components/conversation/Timestamp.tsx b/ts/components/conversation/Timestamp.tsx
index e277062f8..589593340 100644
--- a/ts/components/conversation/Timestamp.tsx
+++ b/ts/components/conversation/Timestamp.tsx
@@ -13,8 +13,6 @@ type Props = {
   isConversationListItem?: boolean;
 };
 
-const UPDATE_FREQUENCY = 60 * 1000;
-
 const TimestampContainerListItem = styled.div`
   flex-shrink: 0;
   margin-inline-start: 6px;
@@ -28,6 +26,8 @@ const TimestampContainerListItem = styled.div`
   color: var(--color-text);
 `;
 
+const UPDATE_FREQUENCY = 60 * 1000;
+
 const TimestampContainerNotListItem = styled.div`
   font-size: 11px;
   line-height: 16px;
diff --git a/ts/components/leftpane/conversation-list-item/ConversationListItem.tsx b/ts/components/leftpane/conversation-list-item/ConversationListItem.tsx
index bbbd100a3..065ae17c4 100644
--- a/ts/components/leftpane/conversation-list-item/ConversationListItem.tsx
+++ b/ts/components/leftpane/conversation-list-item/ConversationListItem.tsx
@@ -19,7 +19,7 @@ import {
   useIsPrivate,
 } from '../../../hooks/useParamSelector';
 import { MemoConversationListItemContextMenu } from '../../menu/ConversationListItemContextMenu';
-import { HeaderItem } from './HeaderItem';
+import { ConversationListItemHeaderItem } from './HeaderItem';
 import { MessageItem } from './MessageItem';
 
 // tslint:disable-next-line: no-empty-interface
@@ -127,7 +127,7 @@ const ConversationListItem = (props: Props) => {
         >
           <AvatarItem />
           <div className="module-conversation-list-item__content">
-            <HeaderItem />
+            <ConversationListItemHeaderItem />
             <MessageItem isMessageRequest={Boolean(isMessageRequest)} />
           </div>
         </div>
diff --git a/ts/components/leftpane/conversation-list-item/HeaderItem.tsx b/ts/components/leftpane/conversation-list-item/HeaderItem.tsx
index c8e69fc72..a50260e5b 100644
--- a/ts/components/leftpane/conversation-list-item/HeaderItem.tsx
+++ b/ts/components/leftpane/conversation-list-item/HeaderItem.tsx
@@ -73,7 +73,7 @@ const ListItemIcons = () => {
   );
 };
 
-export const HeaderItem = () => {
+export const ConversationListItemHeaderItem = () => {
   const conversationId = useContext(ContextConversationId);
 
   const convoProps = useHeaderItemProps(conversationId);