diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/analytics/NaviPayAnalytics.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/analytics/NaviPayAnalytics.kt
index 836467f0a4..45cdcf7846 100644
--- a/android/navi-pay/src/main/kotlin/com/navi/pay/analytics/NaviPayAnalytics.kt
+++ b/android/navi-pay/src/main/kotlin/com/navi/pay/analytics/NaviPayAnalytics.kt
@@ -778,7 +778,7 @@ class NaviPayAnalytics private constructor() {
         }
     }
 
-    inner class NaviPayConnectedAccountsV2 {
+    inner class NaviPayConnectedAccounts {
         fun onNaviPayConnectedAccountsLanded(accountType: String, numberOfAccounts: Int) {
             NaviTrackEvent.trackEventOnClickStream(
                 eventName = "NaviPay_ConnectedAccounts_Landed",
diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/onboarding/account/linked/ui/LinkedAccountsScreen.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/onboarding/account/linked/ui/LinkedAccountsScreen.kt
index 4b7b3c6b3d..6840d35213 100644
--- a/android/navi-pay/src/main/kotlin/com/navi/pay/onboarding/account/linked/ui/LinkedAccountsScreen.kt
+++ b/android/navi-pay/src/main/kotlin/com/navi/pay/onboarding/account/linked/ui/LinkedAccountsScreen.kt
@@ -114,8 +114,8 @@ fun LinkedAccountsScreen(
     shouldNavigateUp: Boolean = false,
     isFromAddBankAccount: Boolean = false,
     linkedAccountsViewModel: LinkedAccountsViewModel = hiltViewModel(),
-    naviPayAnalytics: NaviPayAnalytics.NaviPayConnectedAccountsV2 =
-        NaviPayAnalytics.INSTANCE.NaviPayConnectedAccountsV2(),
+    naviPayAnalytics: NaviPayAnalytics.NaviPayConnectedAccounts =
+        NaviPayAnalytics.INSTANCE.NaviPayConnectedAccounts(),
     upiNumberAnalytics: NaviPayAnalytics.NaviPayUpiNumber =
         NaviPayAnalytics.INSTANCE.NaviPayUpiNumber(),
     linkedAccountsScreenSourceFromNavigation: LinkedAccountsScreenSource? = null
@@ -265,7 +265,7 @@ fun LinkedAccountsScreen(
                 }
             )
         is LinkedAccountsScreenUiState.LinkedAccountsScreen ->
-            RenderLinkedAccountsScreenV2(
+            RenderLinkedAccountsScreen(
                 navigator = navigator,
                 bottomSheetState = bottomSheetState,
                 bottomSheetUIState = bottomSheetStateHolder.bottomSheetUIState,
@@ -380,7 +380,7 @@ fun LinkedAccountsScreen(
 }
 
 @Composable
-fun RenderLinkedAccountsScreenV2(
+fun RenderLinkedAccountsScreen(
     navigator: DestinationsNavigator,
     bottomSheetState: ModalBottomSheetState,
     bottomSheetUIState: LinkedAccountsScreenBottomSheetUIState,
@@ -395,11 +395,11 @@ fun RenderLinkedAccountsScreenV2(
     filteredLinkedAccounts: List<LinkedAccountEntity>,
     showButtonLoader: Boolean,
     lastClickedCardId: String,
-    naviPayAnalytics: NaviPayAnalytics.NaviPayConnectedAccountsV2
+    naviPayAnalytics: NaviPayAnalytics.NaviPayConnectedAccounts
 ) {
     NaviPayModalBottomSheetLayout(
         sheetContent = {
-            RenderLinkedAccountsScreenBottomSheetV2(
+            RenderLinkedAccountsScreenBottomSheet(
                 bottomSheetUIState = bottomSheetUIState,
                 linkedAccountsViewModel = linkedAccountsViewModel,
                 navigator = navigator,
@@ -499,7 +499,7 @@ fun RenderLinkedAccountsScreenV2(
                             Spacer(modifier = Modifier.height(24.dp))
 
                             repeat(times = filteredLinkedAccounts.size) {
-                                LinkedAccountCardItemV2(
+                                LinkedAccountCardItem(
                                     modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp),
                                     linkedAccountEntity = filteredLinkedAccounts[it],
                                     onLinkedAccountCardItemClicked = onLinkedAccountCardItemClicked,
@@ -562,7 +562,7 @@ fun RenderLinkedAccountsScreenV2(
 }
 
 @Composable
-fun LinkedAccountCardItemV2(
+fun LinkedAccountCardItem(
     modifier: Modifier,
     linkedAccountEntity: LinkedAccountEntity,
     onLinkedAccountCardItemClicked: (LinkedAccountEntity) -> Unit,
@@ -698,14 +698,14 @@ fun LinkedAccountCardItemV2(
             }
 
             if (!linkedAccountEntity.isMPinSet) {
-                SetPinInfoTagV2()
+                SetPinInfoTag()
             }
         }
     }
 }
 
 @Composable
-fun SetPinInfoTagV2() {
+fun SetPinInfoTag() {
     Row(
         modifier =
             Modifier.fillMaxWidth()
@@ -732,7 +732,7 @@ fun SetPinInfoTagV2() {
 }
 
 @Composable
-fun RenderLinkedAccountsScreenBottomSheetV2(
+fun RenderLinkedAccountsScreenBottomSheet(
     bottomSheetUIState: LinkedAccountsScreenBottomSheetUIState,
     linkedAccountsViewModel: LinkedAccountsViewModel,
     navigator: DestinationsNavigator,
diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/onboarding/account/linked/ui/NoLinkedAccountScreen.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/onboarding/account/linked/ui/NoLinkedAccountScreen.kt
index 57b21ef960..fc68eb6f2f 100644
--- a/android/navi-pay/src/main/kotlin/com/navi/pay/onboarding/account/linked/ui/NoLinkedAccountScreen.kt
+++ b/android/navi-pay/src/main/kotlin/com/navi/pay/onboarding/account/linked/ui/NoLinkedAccountScreen.kt
@@ -46,7 +46,7 @@ fun NoLinkedAccountScreen(
     handleSdkAction: () -> Unit,
     setActionBeforeOnboardingSdk: (LinkedAccountClickedAction) -> Unit,
     setUserOnboardedFromNoAccountsLinkedScreen: (Boolean) -> Unit,
-    naviPayAnalytics: NaviPayAnalytics.NaviPayConnectedAccountsV2,
+    naviPayAnalytics: NaviPayAnalytics.NaviPayConnectedAccounts,
     naviPayCustomerStatus: NaviPayCustomerStatus
 ) {
     val noLinkedAccountsScreenDetails = remember {
diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/onboarding/account/linked/viewmodel/LinkedAccountsViewModel.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/onboarding/account/linked/viewmodel/LinkedAccountsViewModel.kt
index 6d7268e870..77412bcced 100644
--- a/android/navi-pay/src/main/kotlin/com/navi/pay/onboarding/account/linked/viewmodel/LinkedAccountsViewModel.kt
+++ b/android/navi-pay/src/main/kotlin/com/navi/pay/onboarding/account/linked/viewmodel/LinkedAccountsViewModel.kt
@@ -116,8 +116,8 @@ constructor(
     savedStateHandle: SavedStateHandle
 ) : NaviPayBaseVM() {
 
-    private val naviPayAnalytics: NaviPayAnalytics.NaviPayConnectedAccountsV2 =
-        NaviPayAnalytics.INSTANCE.NaviPayConnectedAccountsV2()
+    private val naviPayAnalytics: NaviPayAnalytics.NaviPayConnectedAccounts =
+        NaviPayAnalytics.INSTANCE.NaviPayConnectedAccounts()
 
     private val _linkedAccounts = MutableStateFlow<List<LinkedAccountEntity>>(emptyList())
     val linkedAccounts = _linkedAccounts.asStateFlow()
diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/details/ui/bbps/BbpsShareImageUtils.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/details/ui/bbps/BbpsShareImageUtils.kt
index a1514dbeb5..38bcfe0f8c 100644
--- a/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/details/ui/bbps/BbpsShareImageUtils.kt
+++ b/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/details/ui/bbps/BbpsShareImageUtils.kt
@@ -34,7 +34,7 @@ import kotlinx.coroutines.launch
 private const val IMAGE_QUALITY = 20
 
 class BbpsShareImageUtils @Inject constructor() {
-    fun shareReceiptV2(
+    fun shareReceipt(
         scope: CoroutineScope,
         activity: Activity,
         receiptDetailsEntity: BbpsReceiptDetailsEntity
diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/details/ui/common/OrderDetailsScreen.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/details/ui/common/OrderDetailsScreen.kt
index fc891b8f06..02e9bb37be 100644
--- a/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/details/ui/common/OrderDetailsScreen.kt
+++ b/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/details/ui/common/OrderDetailsScreen.kt
@@ -64,7 +64,7 @@ fun OrderDetailsScreen(
             when (it) {
                 is SharableReceipt.BbpsSharableReceipt -> {
                     BbpsShareImageUtils()
-                        .shareReceiptV2(
+                        .shareReceipt(
                             scope = coroutineScope,
                             activity = naviPayActivity,
                             receiptDetailsEntity = it.bbpsReceiptDetailsEntity