diff --git a/storybook/pages/CollectiblesSelectionAdaptorPage.qml b/storybook/pages/CollectiblesSelectionAdaptorPage.qml
index dc16962d5f..c388c932d0 100644
--- a/storybook/pages/CollectiblesSelectionAdaptorPage.qml
+++ b/storybook/pages/CollectiblesSelectionAdaptorPage.qml
@@ -319,7 +319,7 @@ Pane {
     ColumnLayout {
         anchors.fill: parent
 
-        TokenSelectorNew {
+        TokenSelector {
             collectiblesModel: adaptor.model
         }
 
diff --git a/storybook/pages/TokenSelectorNewPage.qml b/storybook/pages/TokenSelectorPage.qml
similarity index 99%
rename from storybook/pages/TokenSelectorNewPage.qml
rename to storybook/pages/TokenSelectorPage.qml
index 5a4557455c..7a90d0c348 100644
--- a/storybook/pages/TokenSelectorNewPage.qml
+++ b/storybook/pages/TokenSelectorPage.qml
@@ -171,7 +171,7 @@ Pane {
         color: Theme.palette.baseColor3
     }
 
-    TokenSelectorNew {
+    TokenSelector {
         id: panel
 
         anchors.centerIn: parent
diff --git a/ui/app/AppLayouts/Wallet/controls/TokenSelectorNew.qml b/ui/app/AppLayouts/Wallet/controls/TokenSelector.qml
similarity index 100%
rename from ui/app/AppLayouts/Wallet/controls/TokenSelectorNew.qml
rename to ui/app/AppLayouts/Wallet/controls/TokenSelector.qml
diff --git a/ui/app/AppLayouts/Wallet/controls/qmldir b/ui/app/AppLayouts/Wallet/controls/qmldir
index 58788ac373..ddae7e4e0b 100644
--- a/ui/app/AppLayouts/Wallet/controls/qmldir
+++ b/ui/app/AppLayouts/Wallet/controls/qmldir
@@ -23,6 +23,6 @@ StatusNetworkListItemTag 1.0 StatusNetworkListItemTag.qml
 StatusTxProgressBar 1.0 StatusTxProgressBar.qml
 SwapExchangeButton 1.0 SwapExchangeButton.qml
 SwapProvidersTermsAndConditionsText 1.0 SwapProvidersTermsAndConditionsText.qml
+TokenSelector 1.0 TokenSelector.qml
 TokenSelectorButton 1.0 TokenSelectorButton.qml
 TokenSelectorCompactButton 1.0 TokenSelectorCompactButton.qml
-TokenSelectorNew 1.0 TokenSelectorNew.qml
diff --git a/ui/imports/shared/popups/send/SendModal.qml b/ui/imports/shared/popups/send/SendModal.qml
index 1b6358dac0..ded0184898 100644
--- a/ui/imports/shared/popups/send/SendModal.qml
+++ b/ui/imports/shared/popups/send/SendModal.qml
@@ -372,7 +372,7 @@ StatusDialog {
                         text: d.isBridgeTx ? qsTr("Bridge") : qsTr("Send")
                     }
 
-                    TokenSelectorNew {
+                    TokenSelector {
                         id: holdingSelector
                         objectName: "holdingSelector"