diff --git a/packages/legacy/core/App/components/listItems/ContactListItem.tsx b/packages/legacy/core/App/components/listItems/ContactListItem.tsx
index 4e6216d452..d385be4492 100644
--- a/packages/legacy/core/App/components/listItems/ContactListItem.tsx
+++ b/packages/legacy/core/App/components/listItems/ContactListItem.tsx
@@ -11,6 +11,7 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { View, StyleSheet, TouchableOpacity, Image, Text } from 'react-native'
 
+import { useStore } from '../../contexts/store'
 import { useTheme } from '../../contexts/theme'
 import { useCredentialsByConnectionId } from '../../hooks/credentials'
 import { useProofsByConnectionId } from '../../hooks/proofs'
@@ -18,6 +19,7 @@ import { Role } from '../../types/chat'
 import { ContactStackParams, Screens, Stacks } from '../../types/navigators'
 import {
   formatTime,
+  getConnectionName,
   getCredentialEventLabel,
   getCredentialEventRole,
   getProofEventLabel,
@@ -41,6 +43,7 @@ const ContactListItem: React.FC<Props> = ({ contact, navigation }) => {
   const credentials = useCredentialsByConnectionId(contact.id)
   const proofs = useProofsByConnectionId(contact.id)
   const [message, setMessage] = useState<CondensedMessage>({ text: '', createdAt: contact.createdAt })
+  const [store] = useStore()
 
   const styles = StyleSheet.create({
     container: {
@@ -132,8 +135,14 @@ const ContactListItem: React.FC<Props> = ({ contact, navigation }) => {
       ?.navigate(Stacks.ContactStack, { screen: Screens.Chat, params: { connectionId: contact.id } })
   }, [contact])
 
-  const contactLabel = useMemo(() => contact.alias || contact.theirLabel, [contact])
-  const contactLabelAbbr = useMemo(() => contactLabel?.charAt(0).toUpperCase(), [contact])
+  const contactLabel = useMemo(
+    () => getConnectionName(contact, store.preferences.alternateContactNames),
+    [contact, store.preferences.alternateContactNames]
+  )
+  const contactLabelAbbr = useMemo(
+    () => contactLabel?.charAt(0).toUpperCase(),
+    [contact, store.preferences.alternateContactNames]
+  )
 
   return (
     <TouchableOpacity
diff --git a/packages/legacy/core/App/components/listItems/NotificationListItem.tsx b/packages/legacy/core/App/components/listItems/NotificationListItem.tsx
index 1994714016..7a0341b1db 100644
--- a/packages/legacy/core/App/components/listItems/NotificationListItem.tsx
+++ b/packages/legacy/core/App/components/listItems/NotificationListItem.tsx
@@ -25,7 +25,7 @@ import { GenericFn } from '../../types/fn'
 import { BasicMessageMetadata, basicMessageCustomMetadata } from '../../types/metadata'
 import { HomeStackParams, Screens, Stacks } from '../../types/navigators'
 import { ModalUsage } from '../../types/remove'
-import { parsedSchema } from '../../utils/helpers'
+import { getConnectionName, parsedSchema } from '../../utils/helpers'
 import { testIdWithKey } from '../../utils/testable'
 import Button, { ButtonType } from '../buttons/Button'
 import { InfoBoxType } from '../misc/InfoBox'
@@ -71,7 +71,7 @@ const markMessageAsSeen = async (agent: Agent, record: BasicMessageRecord) => {
 const NotificationListItem: React.FC<NotificationListItemProps> = ({ notificationType, notification }) => {
   const navigation = useNavigation<StackNavigationProp<HomeStackParams>>()
   const { customNotification } = useConfiguration()
-  const [, dispatch] = useStore()
+  const [store, dispatch] = useStore()
   const { t } = useTranslation()
   const { ColorPallet, TextTheme } = useTheme()
   const { agent } = useAgent()
@@ -224,14 +224,14 @@ const NotificationListItem: React.FC<NotificationListItemProps> = ({ notificatio
 
   const detailsForNotificationType = async (notificationType: NotificationType): Promise<DisplayDetails> => {
     return new Promise((resolve) => {
+      const theirLabel = getConnectionName(connection, store.preferences.alternateContactNames)
+
       switch (notificationType) {
         case NotificationType.BasicMessage:
           resolve({
             type: InfoBoxType.Info,
             title: t('Home.NewMessage'),
-            body: connection?.theirLabel
-              ? `${connection.theirLabel} ${t('Home.SentMessage')}`
-              : t('Home.ReceivedMessage'),
+            body: theirLabel ? `${theirLabel} ${t('Home.SentMessage')}` : t('Home.ReceivedMessage'),
             buttonTitle: t('Home.ViewMessage'),
           })
           break
diff --git a/packages/legacy/core/App/contexts/reducers/store.ts b/packages/legacy/core/App/contexts/reducers/store.ts
index 7169232b9b..a36f6c2466 100644
--- a/packages/legacy/core/App/contexts/reducers/store.ts
+++ b/packages/legacy/core/App/contexts/reducers/store.ts
@@ -46,6 +46,7 @@ enum PreferencesDispatchAction {
   ACCEPT_DEV_CREDENTIALS = 'preferences/acceptDevCredentials',
   USE_DATA_RETENTION = 'preferences/useDataRetention',
   PREVENT_AUTO_LOCK = 'preferences/preventAutoLock',
+  UPDATE_ALTERNATE_CONTACT_NAMES = 'preferences/updateAlternateContactNames',
 }
 
 enum ToursDispatchAction {
@@ -212,6 +213,10 @@ export const reducer = <S extends State>(state: S, action: ReducerAction<Dispatc
         preferences.useDataRetention = true
       }
 
+      if (!preferences.alternateContactNames) {
+        preferences.alternateContactNames = {}
+      }
+
       return {
         ...state,
         preferences,
@@ -255,6 +260,24 @@ export const reducer = <S extends State>(state: S, action: ReducerAction<Dispatc
         preferences,
       }
     }
+    case PreferencesDispatchAction.UPDATE_ALTERNATE_CONTACT_NAMES: {
+      const idNamePair = (action?.payload ?? []).pop() ?? {}
+      const preferences = {
+        ...state.preferences,
+        alternateContactNames: {
+          ...state.preferences.alternateContactNames,
+          ...idNamePair,
+        },
+      }
+      const newState = {
+        ...state,
+        preferences,
+      }
+
+      AsyncStorage.setItem(LocalStorageKeys.Preferences, JSON.stringify(preferences))
+
+      return newState
+    }
     case ToursDispatchAction.UPDATE_SEEN_TOUR_PROMPT: {
       const seenToursPrompt: ToursState = (action?.payload ?? []).pop() ?? false
       const tours = {
diff --git a/packages/legacy/core/App/contexts/store.tsx b/packages/legacy/core/App/contexts/store.tsx
index 43e7fe35a8..02748ab6f9 100644
--- a/packages/legacy/core/App/contexts/store.tsx
+++ b/packages/legacy/core/App/contexts/store.tsx
@@ -47,6 +47,7 @@ export const defaultState: State = {
     enableWalletNaming: false,
     walletName: generateRandomWalletName(),
     preventAutoLock: false,
+    alternateContactNames: {},
   },
   tours: {
     seenToursPrompt: false,
diff --git a/packages/legacy/core/App/localization/en/index.ts b/packages/legacy/core/App/localization/en/index.ts
index f4375359bd..675ccad6a5 100644
--- a/packages/legacy/core/App/localization/en/index.ts
+++ b/packages/legacy/core/App/localization/en/index.ts
@@ -538,6 +538,7 @@ const translation = {
     "CustomNotification": 'Custom Notification',
     "ProofRequesting": 'Proof Requesting',
     "NameWallet": "Name your wallet",
+    "RenameContact": "Edit Contact Name",
   },
   "Loading": {
     "TakingTooLong": "This is taking longer than usual. You can return to home or continue waiting.",
@@ -554,6 +555,14 @@ const translation = {
     "EmptyNameTitle": "Wallet name can't be empty",
     "EmptyNameDescription": "This is the name people see when connecting with you.\n\nPlease enter a wallet name.",
   },
+  "RenameContact": {
+    "ThisContactName": "This contact name is only displayed in your Contacts List.",
+    "ContactName": "Contact name",
+    "CharCountTitle": "Character count exceeded",
+    "CharCountDescription": "You've exceeded the maximum character count of 50 characters. Please reduce your character count.",
+    "EmptyNameTitle": "Contact name can't be empty",
+    "EmptyNameDescription": "This is the name you will see for this Contact in your Contacts list.\n\nPlease enter a contact name.",
+  },
   "NetInfo": {
     "NoInternetConnectionTitle": "No internet connection",
     "NoInternetConnectionMessage": "You're unable to access services using Bifold or receive credentials until you're back online.\n\nPlease check your internet connection.",
diff --git a/packages/legacy/core/App/localization/fr/index.ts b/packages/legacy/core/App/localization/fr/index.ts
index 9856c149eb..91a4582810 100644
--- a/packages/legacy/core/App/localization/fr/index.ts
+++ b/packages/legacy/core/App/localization/fr/index.ts
@@ -524,7 +524,8 @@ const translation = {
         "UseBiometry": 'Utiliser la biométrie',
         "CustomNotification": 'Notification personnalisée',
         "ProofRequesting": 'Demande de preuve',
-        "NameWallet": "Name your wallet (FR)"
+        "NameWallet": "Name your wallet (FR)",
+        "RenameContact": "Edit Contact Name (FR)",
     },
     "Loading": {
         "TakingTooLong": "Cela prend plus de temps que d'habitude. Vous pouvez retourner à l'accueil ou continuer à attendre.",
@@ -541,6 +542,10 @@ const translation = {
         "EmptyNameTitle": "Wallet name can't be empty (FR)",
         "EmptyNameDescription": "This is the name people see when connecting with you.\n\nPlease enter a wallet name. (FR)",
     },
+    "RenameContact": {
+        "ThisContactName": "This contact name is only displayed in your Contacts List. (FR)",
+        "ContactName": "Contact name (FR)",
+    },
     "NetInfo": {
         "NoInternetConnectionTitle": "Aucune connexion Internet",
         "NoInternetConnectionMessage": "Vous ne pouvez pas accéder aux services à l'aide de Bifold ou recevoir des informations d'identification tant que vous n'êtes pas de nouveau en ligne.\n\nS'il vous plait, vérifiez votre connexion internet.",
diff --git a/packages/legacy/core/App/localization/pt-br/index.ts b/packages/legacy/core/App/localization/pt-br/index.ts
index 101ee0c24b..57a39a35ab 100644
--- a/packages/legacy/core/App/localization/pt-br/index.ts
+++ b/packages/legacy/core/App/localization/pt-br/index.ts
@@ -501,6 +501,7 @@ const translation = {
     "ProofRequestUsageHistory": "Histórico de uso",
     "CreateConnectionInvitation": "Criar um convite de conexão",
     "NameWallet": "Nomear sua carteira",
+    "RenameContact": "Edit Contact Name (PT-BR)",
   },
   "Loading": {
     "TakingTooLong": "Isso esta demorando mais que o normal. Você pode voltar para a home ou continuar esperando.",
@@ -517,6 +518,10 @@ const translation = {
     "EmptyNameTitle": "O nome de sua carteira não pode ser vazio",
     "EmptyNameDescription": "Este é o nome que as pessoas verão quando se conerctar a você. Por favor, digite o nome da carteira.",
   },
+  "RenameContact": {
+    "ThisContactName": "This contact name is only displayed in your Contacts List. (PT-BR)",
+    "ContactName": "Contact name (PT-BR)",
+  },
   "NetInfo": {
     "NoInternetConnectionTitle": "Sem conexão com a internet",
     "NoInternetConnectionMessage": "Não é possivel acessar serviços utilizando a Bifold ou receber credenciais até você voltar a estar online.\n\nFavor checkar sua conexão com a internet.",
diff --git a/packages/legacy/core/App/navigators/ContactStack.tsx b/packages/legacy/core/App/navigators/ContactStack.tsx
index ce522837de..a0e98e8b52 100644
--- a/packages/legacy/core/App/navigators/ContactStack.tsx
+++ b/packages/legacy/core/App/navigators/ContactStack.tsx
@@ -11,6 +11,7 @@ import CredentialOffer from '../screens/CredentialOffer'
 import ListContacts from '../screens/ListContacts'
 import ProofDetails from '../screens/ProofDetails'
 import ProofRequest from '../screens/ProofRequest'
+import RenameContact from '../screens/RenameContact'
 import WhatAreContacts from '../screens/WhatAreContacts'
 import { ContactStackParams, Screens } from '../types/navigators'
 
@@ -32,6 +33,11 @@ const ContactStack: React.FC = () => {
           title: t('Screens.ContactDetails'),
         }}
       />
+      <Stack.Screen
+        name={Screens.RenameContact}
+        component={RenameContact}
+        options={{ title: t('Screens.RenameContact') }}
+      />
       <Stack.Screen name={Screens.Chat} component={Chat} />
       <Stack.Screen name={Screens.WhatAreContacts} component={WhatAreContacts} options={{ title: '' }} />
       <Stack.Screen
diff --git a/packages/legacy/core/App/screens/Chat.tsx b/packages/legacy/core/App/screens/Chat.tsx
index 58ca9a6b0f..d140a465b7 100644
--- a/packages/legacy/core/App/screens/Chat.tsx
+++ b/packages/legacy/core/App/screens/Chat.tsx
@@ -7,7 +7,7 @@ import {
   ProofState,
 } from '@aries-framework/core'
 import { useAgent, useBasicMessagesByConnectionId, useConnectionById } from '@aries-framework/react-hooks'
-import { useNavigation } from '@react-navigation/core'
+import { useIsFocused, useNavigation } from '@react-navigation/core'
 import { StackNavigationProp, StackScreenProps } from '@react-navigation/stack'
 import React, { useCallback, useEffect, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
@@ -31,6 +31,7 @@ import { Role } from '../types/chat'
 import { BasicMessageMetadata, basicMessageCustomMetadata } from '../types/metadata'
 import { RootStackParams, ContactStackParams, Screens, Stacks } from '../types/navigators'
 import {
+  getConnectionName,
   getCredentialEventLabel,
   getCredentialEventRole,
   getMessageEventRole,
@@ -54,12 +55,18 @@ const Chat: React.FC<ChatProps> = ({ route }) => {
   const basicMessages = useBasicMessagesByConnectionId(connectionId)
   const credentials = useCredentialsByConnectionId(connectionId)
   const proofs = useProofsByConnectionId(connectionId)
-  const theirLabel = useMemo(() => connection?.theirLabel || connection?.id || '', [connection])
+  const isFocused = useIsFocused()
   const { assertConnectedNetwork, silentAssertConnectedNetwork } = useNetwork()
   const [messages, setMessages] = useState<Array<ExtendedChatMessage>>([])
   const [showActionSlider, setShowActionSlider] = useState(false)
   const { ChatTheme: theme, Assets } = useTheme()
   const { ColorPallet } = useTheme()
+  const [theirLabel, setTheirLabel] = useState(getConnectionName(connection, store.preferences.alternateContactNames))
+
+  // This useEffect is for properly rendering changes to the alt contact name, useMemo did not pick them up
+  useEffect(() => {
+    setTheirLabel(getConnectionName(connection, store.preferences.alternateContactNames))
+  }, [isFocused, connection, store.preferences.alternateContactNames])
 
   useMemo(() => {
     assertConnectedNetwork()
@@ -70,7 +77,7 @@ const Chat: React.FC<ChatProps> = ({ route }) => {
       title: theirLabel,
       headerRight: () => <InfoIcon connectionId={connection?.id as string} />,
     })
-  }, [connection])
+  }, [connection, theirLabel])
 
   // when chat is open, mark messages as seen
   useEffect(() => {
@@ -259,7 +266,7 @@ const Chat: React.FC<ChatProps> = ({ route }) => {
         ? [...transformedMessages.sort((a: any, b: any) => b.createdAt - a.createdAt), connectedMessage]
         : transformedMessages.sort((a: any, b: any) => b.createdAt - a.createdAt)
     )
-  }, [basicMessages, credentials, proofs])
+  }, [basicMessages, credentials, proofs, theirLabel])
 
   const onSend = useCallback(
     async (messages: IMessage[]) => {
diff --git a/packages/legacy/core/App/screens/ContactDetails.tsx b/packages/legacy/core/App/screens/ContactDetails.tsx
index b40fd869d4..b58848b6dc 100644
--- a/packages/legacy/core/App/screens/ContactDetails.tsx
+++ b/packages/legacy/core/App/screens/ContactDetails.tsx
@@ -1,23 +1,23 @@
 import { CredentialState } from '@aries-framework/core'
 import { useAgent, useConnectionById, useCredentialByState } from '@aries-framework/react-hooks'
-import { Attribute } from '@hyperledger/aries-oca/build/legacy'
 import { useNavigation } from '@react-navigation/core'
 import { StackNavigationProp, StackScreenProps } from '@react-navigation/stack'
-import React, { useCallback, useState } from 'react'
+import React, { useCallback, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { DeviceEventEmitter } from 'react-native'
+import { DeviceEventEmitter, View, Text, TouchableOpacity, StyleSheet } from 'react-native'
 import { SafeAreaView } from 'react-native-safe-area-context'
 import Toast from 'react-native-toast-message'
 
 import CommonRemoveModal from '../components/modals/CommonRemoveModal'
-import RecordRemove from '../components/record/RecordRemove'
 import { ToastType } from '../components/toast/BaseToast'
 import { EventTypes } from '../constants'
-import { useConfiguration } from '../contexts/configuration'
+import { useStore } from '../contexts/store'
+import { useTheme } from '../contexts/theme'
 import { BifoldError } from '../types/error'
 import { ContactStackParams, Screens, TabStacks } from '../types/navigators'
 import { ModalUsage } from '../types/remove'
-import { formatTime } from '../utils/helpers'
+import { formatTime, getConnectionName } from '../utils/helpers'
+import { testIdWithKey } from '../utils/testable'
 
 type ContactDetailsProps = StackScreenProps<ContactStackParams, Screens.ContactDetails>
 
@@ -34,7 +34,15 @@ const ContactDetails: React.FC<ContactDetailsProps> = ({ route }) => {
     ...useCredentialByState(CredentialState.CredentialReceived),
     ...useCredentialByState(CredentialState.Done),
   ].filter((credential) => credential.connectionId === connection?.id)
-  const { record } = useConfiguration()
+  const { ColorPallet, TextTheme } = useTheme()
+  const [store] = useStore()
+
+  const styles = StyleSheet.create({
+    contentContainer: {
+      padding: 20,
+      backgroundColor: ColorPallet.brand.secondaryBackground,
+    },
+  })
 
   const handleOnRemove = () => {
     if (connectionCredentials?.length) {
@@ -79,25 +87,52 @@ const ContactDetails: React.FC<ContactDetailsProps> = ({ route }) => {
     setIsCredentialsRemoveModalDisplayed(false)
   }
 
+  const handleGoToRename = () => {
+    navigation.navigate(Screens.RenameContact, { connectionId })
+  }
+
+  const callGoToRename = useCallback(() => handleGoToRename(), [])
   const callOnRemove = useCallback(() => handleOnRemove(), [])
   const callSubmitRemove = useCallback(() => handleSubmitRemove(), [])
   const callCancelRemove = useCallback(() => handleCancelRemove(), [])
   const callGoToCredentials = useCallback(() => handleGoToCredentials(), [])
   const callCancelUnableToRemove = useCallback(() => handleCancelUnableRemove(), [])
 
+  const contactLabel = useMemo(
+    () => getConnectionName(connection, store.preferences.alternateContactNames),
+    [connection, store.preferences.alternateContactNames]
+  )
+
   return (
     <SafeAreaView style={{ flexGrow: 1 }} edges={['bottom', 'left', 'right']}>
-      {record({
-        fields: [
-          {
-            name: connection?.alias || connection?.theirLabel,
-            value: t('ContactDetails.DateOfConnection', {
-              date: connection?.createdAt ? formatTime(connection.createdAt, { includeHour: true }) : '',
-            }),
-          },
-        ] as Attribute[],
-        footer: () => <RecordRemove onRemove={callOnRemove} />,
-      })}
+      <View style={styles.contentContainer}>
+        <Text style={{ ...TextTheme.headingThree }}>{contactLabel}</Text>
+        <Text style={{ ...TextTheme.normal, marginTop: 20 }}>
+          {t('ContactDetails.DateOfConnection', {
+            date: connection?.createdAt ? formatTime(connection.createdAt, { includeHour: true }) : '',
+          })}
+        </Text>
+      </View>
+      <TouchableOpacity
+        onPress={callGoToRename}
+        accessibilityLabel={t('Screens.RenameContact')}
+        accessibilityRole={'button'}
+        testID={testIdWithKey('RenameContact')}
+        style={[styles.contentContainer, { marginTop: 10 }]}
+      >
+        <Text style={{ ...TextTheme.normal }}>{t('Screens.RenameContact')}</Text>
+      </TouchableOpacity>
+      <TouchableOpacity
+        onPress={callOnRemove}
+        accessibilityLabel={t('ContactDetails.RemoveContact')}
+        accessibilityRole={'button'}
+        testID={testIdWithKey('RemoveFromWallet')}
+        style={[styles.contentContainer, { marginTop: 10 }]}
+      >
+        <Text style={{ ...TextTheme.normal, color: ColorPallet.semantic.error }}>
+          {t('ContactDetails.RemoveContact')}
+        </Text>
+      </TouchableOpacity>
       <CommonRemoveModal
         usage={ModalUsage.ContactRemove}
         visible={isRemoveModalDisplayed}
diff --git a/packages/legacy/core/App/screens/ProofDetails.tsx b/packages/legacy/core/App/screens/ProofDetails.tsx
index d2109cbeb3..50455e8f4e 100644
--- a/packages/legacy/core/App/screens/ProofDetails.tsx
+++ b/packages/legacy/core/App/screens/ProofDetails.tsx
@@ -17,6 +17,7 @@ import SharedProofData from '../components/misc/SharedProofData'
 import { useStore } from '../contexts/store'
 import { useTheme } from '../contexts/theme'
 import { ProofRequestsStackParams, Screens } from '../types/navigators'
+import { getConnectionName } from '../utils/helpers'
 import { testIdWithKey } from '../utils/testable'
 
 type ProofDetailsProps = StackScreenProps<ProofRequestsStackParams, Screens.ProofDetails>
@@ -41,6 +42,7 @@ const VerifiedProof: React.FC<VerifiedProofProps> = ({
 }: VerifiedProofProps) => {
   const { t } = useTranslation()
   const { ColorPallet, TextTheme } = useTheme()
+  const [store] = useStore()
 
   const styles = StyleSheet.create({
     container: {
@@ -98,8 +100,11 @@ const VerifiedProof: React.FC<VerifiedProofProps> = ({
 
   const connection = useConnectionById(record.connectionId || '')
   const connectionLabel = useMemo(
-    () => (connection ? connection?.alias || connection?.theirLabel : t('Verifier.ConnectionLessLabel')),
-    [connection]
+    () =>
+      connection
+        ? getConnectionName(connection, store.preferences.alternateContactNames)
+        : t('Verifier.ConnectionLessLabel'),
+    [connection, store.preferences.alternateContactNames]
   )
 
   const [sharedProofDataItems, setSharedProofDataItems] = useState<GroupedSharedProofDataItem[]>([])
diff --git a/packages/legacy/core/App/screens/ProofRequest.tsx b/packages/legacy/core/App/screens/ProofRequest.tsx
index 3d37a8625c..d2601a309c 100644
--- a/packages/legacy/core/App/screens/ProofRequest.tsx
+++ b/packages/legacy/core/App/screens/ProofRequest.tsx
@@ -43,7 +43,12 @@ import { ModalUsage } from '../types/remove'
 import { TourID } from '../types/tour'
 import { useAppAgent } from '../utils/agent'
 import { getCredentialIdentifiers } from '../utils/credential'
-import { mergeAttributesAndPredicates, processProofAttributes, processProofPredicates } from '../utils/helpers'
+import {
+  getConnectionName,
+  mergeAttributesAndPredicates,
+  processProofAttributes,
+  processProofPredicates,
+} from '../utils/helpers'
 import { testIdWithKey } from '../utils/testable'
 
 import ProofRequestAccept from './ProofRequestAccept'
@@ -63,7 +68,6 @@ const ProofRequest: React.FC<ProofRequestProps> = ({ navigation, route }) => {
   const fullCredentials = useCredentials().records
   const proof = useProofById(proofId)
   const connection = proof?.connectionId ? useConnectionById(proof.connectionId) : undefined
-  const proofConnectionLabel = connection?.theirLabel ?? proof?.connectionId ?? ''
   const [pendingModalVisible, setPendingModalVisible] = useState(false)
   const [revocationOffense, setRevocationOffense] = useState(false)
   const [retrievedCredentials, setRetrievedCredentials] = useState<AnonCredsCredentialsForProofRequest>()
@@ -76,6 +80,10 @@ const ProofRequest: React.FC<ProofRequestProps> = ({ navigation, route }) => {
   const { enableTours: enableToursConfig, OCABundleResolver } = useConfiguration()
   const [containsPI, setContainsPI] = useState(false)
   const [store, dispatch] = useStore()
+  const proofConnectionLabel = useMemo(
+    () => getConnectionName(connection, store.preferences.alternateContactNames),
+    [connection, store.preferences.alternateContactNames]
+  )
   const { start } = useTour()
   const screenIsFocused = useIsFocused()
 
diff --git a/packages/legacy/core/App/screens/ProofRequestUsageHistory.tsx b/packages/legacy/core/App/screens/ProofRequestUsageHistory.tsx
index e55bc55313..1fe39f4e7a 100644
--- a/packages/legacy/core/App/screens/ProofRequestUsageHistory.tsx
+++ b/packages/legacy/core/App/screens/ProofRequestUsageHistory.tsx
@@ -9,9 +9,10 @@ import Icon from 'react-native-vector-icons/MaterialIcons'
 
 import { useProofsByTemplateId, isPresentationReceived } from '../../verifier'
 import EmptyList from '../components/misc/EmptyList'
+import { useStore } from '../contexts/store'
 import { useTheme } from '../contexts/theme'
 import { ProofRequestsStackParams, Screens } from '../types/navigators'
-import { formatTime } from '../utils/helpers'
+import { formatTime, getConnectionName } from '../utils/helpers'
 import { testIdWithKey } from '../utils/testable'
 
 type ProofRequestUsageHistoryProps = StackScreenProps<ProofRequestsStackParams, Screens.ProofRequestUsageHistory>
@@ -40,8 +41,12 @@ const getPresentationStateLabel = (record: ProofExchangeRecord) => {
 const ProofRequestUsageHistoryRecord: React.FC<ProofRequestUsageHistoryRecordProps> = ({ record, navigation }) => {
   const { t } = useTranslation()
   const { ListItems, ColorPallet } = useTheme()
-
+  const [store] = useStore()
   const connection = record.connectionId ? useConnectionById(record.connectionId) : undefined
+  const theirLabel = useMemo(
+    () => getConnectionName(connection, store.preferences.alternateContactNames),
+    [connection, store.preferences.alternateContactNames]
+  )
 
   const style = StyleSheet.create({
     card: {
@@ -101,7 +106,7 @@ const ProofRequestUsageHistoryRecord: React.FC<ProofRequestUsageHistoryRecordPro
       <View style={style.leftContainer}>
         <View style={style.cardRow}>
           <Text style={style.valueLabel}>{t('Verifier.PresentationFrom')}:</Text>
-          <Text style={style.valueText}>{connection?.theirLabel || t('Verifier.ConnectionlessPresentation')}</Text>
+          <Text style={style.valueText}>{theirLabel || t('Verifier.ConnectionlessPresentation')}</Text>
         </View>
         <View style={style.cardRow}>
           <Text style={style.valueLabel}>{t('Verifier.PresentationState')}:</Text>
diff --git a/packages/legacy/core/App/screens/RenameContact.tsx b/packages/legacy/core/App/screens/RenameContact.tsx
new file mode 100644
index 0000000000..3f6793996d
--- /dev/null
+++ b/packages/legacy/core/App/screens/RenameContact.tsx
@@ -0,0 +1,156 @@
+import { useConnectionById } from '@aries-framework/react-hooks'
+import { useNavigation } from '@react-navigation/core'
+import { StackScreenProps } from '@react-navigation/stack'
+import React, { useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { StyleSheet, Text, View } from 'react-native'
+
+import ButtonLoading from '../components/animated/ButtonLoading'
+import Button, { ButtonType } from '../components/buttons/Button'
+import LimitedTextInput from '../components/inputs/LimitedTextInput'
+import { InfoBoxType } from '../components/misc/InfoBox'
+import PopupModal from '../components/modals/PopupModal'
+import KeyboardView from '../components/views/KeyboardView'
+import { DispatchAction } from '../contexts/reducers/store'
+import { useStore } from '../contexts/store'
+import { useTheme } from '../contexts/theme'
+import { ContactStackParams, Screens } from '../types/navigators'
+import { getConnectionName } from '../utils/helpers'
+import { testIdWithKey } from '../utils/testable'
+
+type ErrorState = {
+  visible: boolean
+  title: string
+  description: string
+}
+
+type RenameContactProps = StackScreenProps<ContactStackParams, Screens.RenameContact>
+
+const RenameContact: React.FC<RenameContactProps> = ({ route }) => {
+  const { connectionId } = route.params
+  const connection = useConnectionById(connectionId)
+  const { t } = useTranslation()
+  const { ColorPallet, TextTheme } = useTheme()
+  const navigation = useNavigation()
+  const [store, dispatch] = useStore()
+  const [contactName, setContactName] = useState(getConnectionName(connection, store.preferences.alternateContactNames))
+  const [loading, setLoading] = useState(false)
+  const [errorState, setErrorState] = useState<ErrorState>({
+    visible: false,
+    title: '',
+    description: '',
+  })
+
+  const styles = StyleSheet.create({
+    screenContainer: {
+      height: '100%',
+      backgroundColor: ColorPallet.brand.primaryBackground,
+      padding: 20,
+      justifyContent: 'space-between',
+    },
+
+    contentContainer: {
+      justifyContent: 'center',
+      alignItems: 'center',
+      width: '100%',
+    },
+    // below used as helpful label for view, no properties needed atp
+    controlsContainer: {},
+
+    buttonContainer: {
+      width: '100%',
+    },
+  })
+
+  const handleChangeText = (text: string) => {
+    setContactName(text)
+  }
+
+  const handleCancelPressed = () => {
+    navigation.goBack()
+  }
+
+  const handleContinuePressed = () => {
+    if (contactName.length < 1) {
+      setErrorState({
+        title: t('RenameContact.EmptyNameTitle'),
+        description: t('RenameContact.EmptyNameDescription'),
+        visible: true,
+      })
+    } else if (contactName.length > 50) {
+      setErrorState({
+        title: t('RenameContact.CharCountTitle'),
+        description: t('RenameContact.CharCountDescription'),
+        visible: true,
+      })
+    } else {
+      setLoading(true)
+      dispatch({
+        type: DispatchAction.UPDATE_ALTERNATE_CONTACT_NAMES,
+        payload: [{ [connectionId]: contactName }],
+      })
+      setLoading(false)
+      navigation.goBack()
+    }
+  }
+
+  const handleDismissError = () => {
+    setErrorState((prev) => ({ ...prev, visible: false }))
+  }
+
+  return (
+    <KeyboardView>
+      <View style={styles.screenContainer}>
+        <View style={styles.contentContainer}>
+          <Text style={[TextTheme.normal, { width: '100%', marginBottom: 16 }]}>
+            {t('RenameContact.ThisContactName')}
+          </Text>
+          <View style={{ width: '100%' }}>
+            <LimitedTextInput
+              defaultValue={contactName}
+              label={t('RenameContact.ContactName')}
+              limit={50}
+              handleChangeText={handleChangeText}
+              accessibilityLabel={t('RenameContact.ContactName')}
+              testID={testIdWithKey('NameInput')}
+            />
+          </View>
+        </View>
+        <View style={styles.controlsContainer}>
+          <View style={styles.buttonContainer}>
+            <Button
+              title={t('Global.Save')}
+              buttonType={ButtonType.Primary}
+              testID={testIdWithKey('Save')}
+              accessibilityLabel={t('Global.Save')}
+              onPress={handleContinuePressed}
+              disabled={loading}
+            >
+              {loading && <ButtonLoading />}
+            </Button>
+            <View style={{ marginTop: 15 }}>
+              <Button
+                title={t('Global.Cancel')}
+                buttonType={ButtonType.Secondary}
+                testID={testIdWithKey('Cancel')}
+                accessibilityLabel={t('Global.Cancel')}
+                onPress={handleCancelPressed}
+              />
+            </View>
+          </View>
+        </View>
+      </View>
+      {errorState.visible && (
+        <PopupModal
+          notificationType={InfoBoxType.Info}
+          onCallToActionLabel={t('Global.Okay')}
+          onCallToActionPressed={handleDismissError}
+          title={errorState.title}
+          description={errorState.description}
+        />
+      )}
+    </KeyboardView>
+  )
+}
+
+export default RenameContact
diff --git a/packages/legacy/core/App/types/navigators.ts b/packages/legacy/core/App/types/navigators.ts
index c07889eb83..d9e97164a1 100644
--- a/packages/legacy/core/App/types/navigators.ts
+++ b/packages/legacy/core/App/types/navigators.ts
@@ -34,6 +34,7 @@ export enum Screens {
   ProofRequesting = 'Proof Requesting',
   ProofDetails = 'Proof Details',
   NameWallet = 'Name Wallet',
+  RenameContact = 'Rename Contact',
 }
 
 export enum Stacks {
@@ -90,6 +91,7 @@ export type ContactStackParams = {
   [Screens.Contacts]: undefined
   [Screens.Chat]: { connectionId: string }
   [Screens.ContactDetails]: { connectionId: string }
+  [Screens.RenameContact]: { connectionId: string }
   [Screens.WhatAreContacts]: undefined
   [Screens.CredentialDetails]: { credentialId: string }
   [Screens.CredentialOffer]: { credentialId: string }
diff --git a/packages/legacy/core/App/types/state.ts b/packages/legacy/core/App/types/state.ts
index 7173723243..ffa1e01683 100644
--- a/packages/legacy/core/App/types/state.ts
+++ b/packages/legacy/core/App/types/state.ts
@@ -22,6 +22,7 @@ export interface Preferences {
   acceptDevCredentials: boolean
   useDataRetention: boolean
   preventAutoLock: boolean
+  alternateContactNames: Record<string, string>
 }
 
 export interface Tours {
diff --git a/packages/legacy/core/App/utils/helpers.ts b/packages/legacy/core/App/utils/helpers.ts
index 0998641126..c18465f962 100644
--- a/packages/legacy/core/App/utils/helpers.ts
+++ b/packages/legacy/core/App/utils/helpers.ts
@@ -235,14 +235,17 @@ export function connectionRecordFromId(connectionId?: string): ConnectionRecord
   }
 }
 
-/**
- * @deprecated The function should not be used
- */
-export function getConnectionName(connection: ConnectionRecord | void): string | void {
-  if (!connection) {
-    return
-  }
-  return connection?.alias || connection?.theirLabel
+export function getConnectionName(
+  connection: ConnectionRecord | undefined,
+  alternateContactNames: Record<string, string>
+): string {
+  return (
+    (connection?.id && alternateContactNames[connection?.id]) ||
+    connection?.theirLabel ||
+    connection?.alias ||
+    connection?.id ||
+    ''
+  )
 }
 
 export function getCredentialConnectionLabel(credential?: CredentialExchangeRecord) {
diff --git a/packages/legacy/core/__tests__/reducers/store.test.ts b/packages/legacy/core/__tests__/reducers/store.test.ts
index 13f3559053..77b038dd1c 100644
--- a/packages/legacy/core/__tests__/reducers/store.test.ts
+++ b/packages/legacy/core/__tests__/reducers/store.test.ts
@@ -94,4 +94,12 @@ describe('Store reducer', () => {
     const returnedState = storeReducer(defaultState, { type: DispatchAction.PREVENT_AUTO_LOCK, payload: [false] })
     expect(returnedState.preferences.preventAutoLock).toBe(false)
   })
+
+  test('UPDATE_ALTERNATE_CONTACT_NAMES adds an id-name pair', () => {
+    const returnedState = storeReducer(defaultState, {
+      type: DispatchAction.UPDATE_ALTERNATE_CONTACT_NAMES,
+      payload: [{ '123': 'My Alt Name' }],
+    })
+    expect(returnedState.preferences.alternateContactNames).toEqual({ '123': 'My Alt Name' })
+  })
 })
diff --git a/packages/legacy/core/__tests__/screens/ContactDetails.test.tsx b/packages/legacy/core/__tests__/screens/ContactDetails.test.tsx
new file mode 100644
index 0000000000..d721394b15
--- /dev/null
+++ b/packages/legacy/core/__tests__/screens/ContactDetails.test.tsx
@@ -0,0 +1,107 @@
+import { useConnectionById } from '@aries-framework/react-hooks'
+import { useNavigation } from '@react-navigation/core'
+import { StackNavigationProp } from '@react-navigation/stack'
+import { act, fireEvent, render } from '@testing-library/react-native'
+import fs from 'fs'
+import path from 'path'
+import React from 'react'
+
+import { StoreContext } from '../../App'
+import ContactDetails from '../../App/screens/ContactDetails'
+import { ContactStackParams, Screens } from '../../App/types/navigators'
+import { testIdWithKey } from '../../App/utils/testable'
+import { testDefaultState } from '../contexts/store'
+
+jest.mock('@react-navigation/core', () => {
+  return require('../../__mocks__/custom/@react-navigation/core')
+})
+jest.mock('@react-navigation/native', () => {
+  return require('../../__mocks__/custom/@react-navigation/native')
+})
+jest.mock('react-native-fs', () => ({}))
+jest.mock('@hyperledger/anoncreds-react-native', () => ({}))
+jest.mock('@hyperledger/aries-askar-react-native', () => ({}))
+jest.mock('@hyperledger/indy-vdr-react-native', () => ({}))
+jest.mock('react-native-permissions', () => require('react-native-permissions/mock'))
+jest.mock('react-native-device-info', () => {
+  return {
+    getVersion: () => 1,
+    getBuildNumber: () => 1,
+  }
+})
+
+const connectionPath = path.join(__dirname, '../fixtures/connection-v1.json')
+const connection = JSON.parse(fs.readFileSync(connectionPath, 'utf8'))
+connection.createdAt = new Date('20230303')
+
+describe('Contact Details Screen', () => {
+  beforeEach(() => {
+    jest.clearAllMocks()
+    // @ts-ignore-next-line
+    useConnectionById.mockReturnValue(connection)
+  })
+
+  test('Renders correctly', async () => {
+    const tree = render(
+      <StoreContext.Provider
+        value={[
+          testDefaultState,
+          () => {
+            return
+          },
+        ]}
+      >
+        <ContactDetails navigation={useNavigation()} route={{ params: { connectionId: connection.id } } as any} />
+      </StoreContext.Provider>
+    )
+    expect(tree).toMatchSnapshot()
+  })
+
+  test('Renders correctly with alt contact name', async () => {
+    const customState = {
+      ...testDefaultState,
+      preferences: {
+        ...testDefaultState.preferences,
+        alternateContactNames: {
+          [connection.id]: 'Alt Name',
+        },
+      },
+    }
+
+    const tree = render(
+      <StoreContext.Provider
+        value={[
+          customState,
+          () => {
+            return
+          },
+        ]}
+      >
+        <ContactDetails navigation={useNavigation()} route={{ params: { connectionId: connection.id } } as any} />
+      </StoreContext.Provider>
+    )
+    expect(tree).toMatchSnapshot()
+  })
+
+  test('Edit contact name button navigates', async () => {
+    const navigation = useNavigation<StackNavigationProp<ContactStackParams, Screens.ContactDetails>>()
+
+    const { getByTestId } = render(
+      <StoreContext.Provider
+        value={[
+          testDefaultState,
+          () => {
+            return
+          },
+        ]}
+      >
+        <ContactDetails navigation={navigation} route={{ params: { connectionId: connection.id } } as any} />
+      </StoreContext.Provider>
+    )
+    const editButton = getByTestId(testIdWithKey('RenameContact'))
+    await act(async () => {
+      fireEvent(editButton, 'press')
+      expect(navigation.navigate).toHaveBeenCalledTimes(1)
+    })
+  })
+})
diff --git a/packages/legacy/core/__tests__/screens/RenameContact.test.tsx b/packages/legacy/core/__tests__/screens/RenameContact.test.tsx
new file mode 100644
index 0000000000..98914a13ed
--- /dev/null
+++ b/packages/legacy/core/__tests__/screens/RenameContact.test.tsx
@@ -0,0 +1,47 @@
+import { useConnectionById } from '@aries-framework/react-hooks'
+import { useNavigation } from '@react-navigation/core'
+import { render } from '@testing-library/react-native'
+import fs from 'fs'
+import path from 'path'
+import React from 'react'
+
+import RenameContact from '../../App/screens/RenameContact'
+import { testIdWithKey } from '../../App/utils/testable'
+
+jest.mock('@react-navigation/core', () => {
+  return require('../../__mocks__/custom/@react-navigation/core')
+})
+jest.mock('@react-navigation/native', () => {
+  return require('../../__mocks__/custom/@react-navigation/native')
+})
+jest.mock('react-native-fs', () => ({}))
+jest.mock('@hyperledger/anoncreds-react-native', () => ({}))
+jest.mock('@hyperledger/aries-askar-react-native', () => ({}))
+jest.mock('@hyperledger/indy-vdr-react-native', () => ({}))
+jest.mock('react-native-permissions', () => require('react-native-permissions/mock'))
+jest.mock('react-native-device-info', () => {
+  return {
+    getVersion: () => 1,
+    getBuildNumber: () => 1,
+  }
+})
+const connectionPath = path.join(__dirname, '../fixtures/connection-v1.json')
+const connection = JSON.parse(fs.readFileSync(connectionPath, 'utf8'))
+// @ts-ignore-next-line
+useConnectionById.mockReturnValue(connection)
+
+describe('RenameContact Screen', () => {
+  test('LimitedInput, continue button, and cancel button are present', async () => {
+    const tree = render(
+      <RenameContact navigation={useNavigation()} route={{ params: { connectionId: connection.id } } as any} />
+    )
+
+    const ContactNameInput = await tree.getByTestId(testIdWithKey('NameInput'))
+    const SaveButton = await tree.getByTestId(testIdWithKey('Save'))
+    const CancelButton = await tree.getByTestId(testIdWithKey('Cancel'))
+
+    expect(ContactNameInput).not.toBeNull()
+    expect(SaveButton).not.toBeNull()
+    expect(CancelButton).not.toBeNull()
+  })
+})
diff --git a/packages/legacy/core/__tests__/screens/__snapshots__/ContactDetails.test.tsx.snap b/packages/legacy/core/__tests__/screens/__snapshots__/ContactDetails.test.tsx.snap
new file mode 100644
index 0000000000..612c068336
--- /dev/null
+++ b/packages/legacy/core/__tests__/screens/__snapshots__/ContactDetails.test.tsx.snap
@@ -0,0 +1,333 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Contact Details Screen Renders correctly 1`] = `
+<RNCSafeAreaView
+  edges={
+    Array [
+      "bottom",
+      "left",
+      "right",
+    ]
+  }
+  style={
+    Object {
+      "flexGrow": 1,
+    }
+  }
+>
+  <View
+    style={
+      Object {
+        "backgroundColor": "#313132",
+        "padding": 20,
+      }
+    }
+  >
+    <Text
+      style={
+        Object {
+          "color": "#FFFFFF",
+          "fontSize": 26,
+          "fontWeight": "bold",
+        }
+      }
+    >
+      BestBC College
+    </Text>
+    <Text
+      style={
+        Object {
+          "color": "#FFFFFF",
+          "fontSize": 18,
+          "fontWeight": "normal",
+          "marginTop": 20,
+        }
+      }
+    >
+      ContactDetails.DateOfConnection
+    </Text>
+  </View>
+  <View
+    accessibilityLabel="Screens.RenameContact"
+    accessibilityRole="button"
+    accessibilityState={
+      Object {
+        "busy": undefined,
+        "checked": undefined,
+        "disabled": undefined,
+        "expanded": undefined,
+        "selected": undefined,
+      }
+    }
+    accessibilityValue={
+      Object {
+        "max": undefined,
+        "min": undefined,
+        "now": undefined,
+        "text": undefined,
+      }
+    }
+    accessible={true}
+    collapsable={false}
+    focusable={true}
+    onClick={[Function]}
+    onResponderGrant={[Function]}
+    onResponderMove={[Function]}
+    onResponderRelease={[Function]}
+    onResponderTerminate={[Function]}
+    onResponderTerminationRequest={[Function]}
+    onStartShouldSetResponder={[Function]}
+    style={
+      Object {
+        "backgroundColor": "#313132",
+        "marginTop": 10,
+        "opacity": 1,
+        "padding": 20,
+      }
+    }
+    testID="com.ariesbifold:id/RenameContact"
+  >
+    <Text
+      style={
+        Object {
+          "color": "#FFFFFF",
+          "fontSize": 18,
+          "fontWeight": "normal",
+        }
+      }
+    >
+      Screens.RenameContact
+    </Text>
+  </View>
+  <View
+    accessibilityLabel="ContactDetails.RemoveContact"
+    accessibilityRole="button"
+    accessibilityState={
+      Object {
+        "busy": undefined,
+        "checked": undefined,
+        "disabled": undefined,
+        "expanded": undefined,
+        "selected": undefined,
+      }
+    }
+    accessibilityValue={
+      Object {
+        "max": undefined,
+        "min": undefined,
+        "now": undefined,
+        "text": undefined,
+      }
+    }
+    accessible={true}
+    collapsable={false}
+    focusable={true}
+    onClick={[Function]}
+    onResponderGrant={[Function]}
+    onResponderMove={[Function]}
+    onResponderRelease={[Function]}
+    onResponderTerminate={[Function]}
+    onResponderTerminationRequest={[Function]}
+    onStartShouldSetResponder={[Function]}
+    style={
+      Object {
+        "backgroundColor": "#313132",
+        "marginTop": 10,
+        "opacity": 1,
+        "padding": 20,
+      }
+    }
+    testID="com.ariesbifold:id/RemoveFromWallet"
+  >
+    <Text
+      style={
+        Object {
+          "color": "#D8292F",
+          "fontSize": 18,
+          "fontWeight": "normal",
+        }
+      }
+    >
+      ContactDetails.RemoveContact
+    </Text>
+  </View>
+  <Modal
+    animationType="slide"
+    hardwareAccelerated={false}
+    transparent={true}
+    visible={false}
+  />
+  <Modal
+    animationType="slide"
+    hardwareAccelerated={false}
+    transparent={true}
+    visible={false}
+  />
+</RNCSafeAreaView>
+`;
+
+exports[`Contact Details Screen Renders correctly with alt contact name 1`] = `
+<RNCSafeAreaView
+  edges={
+    Array [
+      "bottom",
+      "left",
+      "right",
+    ]
+  }
+  style={
+    Object {
+      "flexGrow": 1,
+    }
+  }
+>
+  <View
+    style={
+      Object {
+        "backgroundColor": "#313132",
+        "padding": 20,
+      }
+    }
+  >
+    <Text
+      style={
+        Object {
+          "color": "#FFFFFF",
+          "fontSize": 26,
+          "fontWeight": "bold",
+        }
+      }
+    >
+      Alt Name
+    </Text>
+    <Text
+      style={
+        Object {
+          "color": "#FFFFFF",
+          "fontSize": 18,
+          "fontWeight": "normal",
+          "marginTop": 20,
+        }
+      }
+    >
+      ContactDetails.DateOfConnection
+    </Text>
+  </View>
+  <View
+    accessibilityLabel="Screens.RenameContact"
+    accessibilityRole="button"
+    accessibilityState={
+      Object {
+        "busy": undefined,
+        "checked": undefined,
+        "disabled": undefined,
+        "expanded": undefined,
+        "selected": undefined,
+      }
+    }
+    accessibilityValue={
+      Object {
+        "max": undefined,
+        "min": undefined,
+        "now": undefined,
+        "text": undefined,
+      }
+    }
+    accessible={true}
+    collapsable={false}
+    focusable={true}
+    onClick={[Function]}
+    onResponderGrant={[Function]}
+    onResponderMove={[Function]}
+    onResponderRelease={[Function]}
+    onResponderTerminate={[Function]}
+    onResponderTerminationRequest={[Function]}
+    onStartShouldSetResponder={[Function]}
+    style={
+      Object {
+        "backgroundColor": "#313132",
+        "marginTop": 10,
+        "opacity": 1,
+        "padding": 20,
+      }
+    }
+    testID="com.ariesbifold:id/RenameContact"
+  >
+    <Text
+      style={
+        Object {
+          "color": "#FFFFFF",
+          "fontSize": 18,
+          "fontWeight": "normal",
+        }
+      }
+    >
+      Screens.RenameContact
+    </Text>
+  </View>
+  <View
+    accessibilityLabel="ContactDetails.RemoveContact"
+    accessibilityRole="button"
+    accessibilityState={
+      Object {
+        "busy": undefined,
+        "checked": undefined,
+        "disabled": undefined,
+        "expanded": undefined,
+        "selected": undefined,
+      }
+    }
+    accessibilityValue={
+      Object {
+        "max": undefined,
+        "min": undefined,
+        "now": undefined,
+        "text": undefined,
+      }
+    }
+    accessible={true}
+    collapsable={false}
+    focusable={true}
+    onClick={[Function]}
+    onResponderGrant={[Function]}
+    onResponderMove={[Function]}
+    onResponderRelease={[Function]}
+    onResponderTerminate={[Function]}
+    onResponderTerminationRequest={[Function]}
+    onStartShouldSetResponder={[Function]}
+    style={
+      Object {
+        "backgroundColor": "#313132",
+        "marginTop": 10,
+        "opacity": 1,
+        "padding": 20,
+      }
+    }
+    testID="com.ariesbifold:id/RemoveFromWallet"
+  >
+    <Text
+      style={
+        Object {
+          "color": "#D8292F",
+          "fontSize": 18,
+          "fontWeight": "normal",
+        }
+      }
+    >
+      ContactDetails.RemoveContact
+    </Text>
+  </View>
+  <Modal
+    animationType="slide"
+    hardwareAccelerated={false}
+    transparent={true}
+    visible={false}
+  />
+  <Modal
+    animationType="slide"
+    hardwareAccelerated={false}
+    transparent={true}
+    visible={false}
+  />
+</RNCSafeAreaView>
+`;
diff --git a/packages/legacy/core/__tests__/utils/helpers.test.ts b/packages/legacy/core/__tests__/utils/helpers.test.ts
index 6038331fa3..c63b1f8e72 100644
--- a/packages/legacy/core/__tests__/utils/helpers.test.ts
+++ b/packages/legacy/core/__tests__/utils/helpers.test.ts
@@ -1,3 +1,4 @@
+import { ConnectionRecord } from '@aries-framework/core'
 import { useAgent } from '@aries-framework/react-hooks'
 import fs from 'fs'
 import path from 'path'
@@ -10,6 +11,7 @@ import {
   credentialSortFn,
   formatIfDate,
   formatTime,
+  getConnectionName,
 } from '../../App/utils/helpers'
 
 const proofCredentialPath = path.join(__dirname, '../fixtures/proof-credential.json')
@@ -155,3 +157,41 @@ describe('createConnectionInvitation', () => {
     await expect(createConnectionInvitation(agent, 'aries.foo')).rejects.toThrow()
   })
 })
+
+describe('getConnectionName', () => {
+  test('With all properties and alternate name', async () => {
+    const connection = { id: '1', theirLabel: 'Mike', alias: 'Mikey' }
+    const alternateContactNames = { '1': 'Mikeroni' }
+
+    const result = getConnectionName(connection as ConnectionRecord, alternateContactNames)
+    expect(result).toBe('Mikeroni')
+  })
+  test('With all properties and no alternate name', async () => {
+    const connection = { id: '1', theirLabel: 'Mike', alias: 'Mikey' }
+    const alternateContactNames = {}
+
+    const result = getConnectionName(connection as ConnectionRecord, alternateContactNames)
+    expect(result).toBe('Mike')
+  })
+  test('With no theirLabel but an alias', async () => {
+    const connection = { id: '1', alias: 'Mikey' }
+    const alternateContactNames = {}
+
+    const result = getConnectionName(connection as ConnectionRecord, alternateContactNames)
+    expect(result).toBe('Mikey')
+  })
+  test('With no theirLabel or alias', async () => {
+    const connection = { id: '1' }
+    const alternateContactNames = {}
+
+    const result = getConnectionName(connection as ConnectionRecord, alternateContactNames)
+    expect(result).toBe('1')
+  })
+  test('With undefined connection', async () => {
+    const connection = undefined
+    const alternateContactNames = {}
+
+    const result = getConnectionName(connection as unknown as ConnectionRecord, alternateContactNames)
+    expect(result).toBe('')
+  })
+})