diff --git a/packages/desktop/components/AccountSwitcher.svelte b/packages/desktop/components/WalletSwitcher.svelte
similarity index 94%
rename from packages/desktop/components/AccountSwitcher.svelte
rename to packages/desktop/components/WalletSwitcher.svelte
index 0c28b0a6616..6835c7866e2 100644
--- a/packages/desktop/components/AccountSwitcher.svelte
+++ b/packages/desktop/components/WalletSwitcher.svelte
@@ -17,7 +17,7 @@
 </script>
 
 <svelte:window on:click={onOutsideClick} />
-<account-switcher>
+<wallet-switcher>
     <button type="button" on:click={onButtonClick} class="flex flex-row justify-center items-center space-x-2">
         <WalletLabel wallet={$selectedWallet} />
         <icon-container class:rotate={isModalOpened}>
@@ -25,10 +25,10 @@
         </icon-container>
     </button>
     <WalletSwitcherModal bind:modal />
-</account-switcher>
+</wallet-switcher>
 
 <style lang="scss">
-    account-switcher {
+    wallet-switcher {
         @apply block relative;
         -webkit-app-region: none;
     }
diff --git a/packages/desktop/components/index.js b/packages/desktop/components/index.js
index 9f508fe7a5e..0143a5740b5 100644
--- a/packages/desktop/components/index.js
+++ b/packages/desktop/components/index.js
@@ -7,7 +7,7 @@ export * from './popups'
 
 export { default as AccountActivity } from './AccountActivity.svelte'
 export { default as AccountSummary } from './AccountSummary.svelte'
-export { default as AccountSwitcher } from './AccountSwitcher.svelte'
+export { default as WalletSwitcher } from './WalletSwitcher.svelte'
 export { default as OnboardingLayout } from './OnboardingLayout.svelte'
 export { default as Proposals } from './Proposals.svelte'
 export { default as ProposalAnswer } from './ProposalAnswer.svelte'
diff --git a/packages/desktop/components/popups/Popup.svelte b/packages/desktop/components/popups/Popup.svelte
index 6923aed36a6..c4a13c92b98 100644
--- a/packages/desktop/components/popups/Popup.svelte
+++ b/packages/desktop/components/popups/Popup.svelte
@@ -8,7 +8,7 @@
     import { clickOutside } from '@core/utils/ui'
 
     // Popups
-    import AccountSwitcherPopup from './WalletSwitcherPopup.svelte'
+    import WalletSwitcherPopup from './WalletSwitcherPopup.svelte'
     import ActivityDetailsPopup from './ActivityDetailsPopup.svelte'
     import AddNodePopup from './AddNodePopup.svelte'
     import AddProposalPopup from './AddProposalPopup.svelte'
@@ -94,7 +94,7 @@
     let popupContent
 
     const POPUP_MAP: PopupComponentMap = {
-        [PopupId.AccountSwitcher]: AccountSwitcherPopup,
+        [PopupId.WalletSwitcher]: WalletSwitcherPopup,
         [PopupId.ActivityDetails]: ActivityDetailsPopup,
         [PopupId.AddNode]: AddNodePopup,
         [PopupId.AddProposal]: AddProposalPopup,
diff --git a/packages/desktop/views/dashboard/TopNavigation.svelte b/packages/desktop/views/dashboard/TopNavigation.svelte
index a5132dd69d1..c88fe0b1ad4 100644
--- a/packages/desktop/views/dashboard/TopNavigation.svelte
+++ b/packages/desktop/views/dashboard/TopNavigation.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
     import { Icon, Text } from '@ui'
-    import { AccountSwitcher } from '@components'
     import { PlatformOption } from '@core/app'
     import { platform } from '@core/app/stores'
     import { localize } from '@core/i18n'
@@ -62,7 +61,8 @@
         {/if}
     </div>
 
-    <AccountSwitcher />
+    <!-- TODO(2.0) We hide the WalletSwitcher for now -->
+    <!-- <WalletSwitcher /> -->
 
     <div class="right-button flex justify-end" />
 </top-navigation>
diff --git a/packages/shared/lib/auxiliary/deep-link/handlers/handleDeepLink.ts b/packages/shared/lib/auxiliary/deep-link/handlers/handleDeepLink.ts
index c0a2b9ecc49..2d97fc9f20e 100644
--- a/packages/shared/lib/auxiliary/deep-link/handlers/handleDeepLink.ts
+++ b/packages/shared/lib/auxiliary/deep-link/handlers/handleDeepLink.ts
@@ -35,7 +35,7 @@ export function handleDeepLink(input: string): void {
 
         if (get(visibleActiveWallets).length > 1) {
             openPopup({
-                id: PopupId.AccountSwitcher,
+                id: PopupId.WalletSwitcher,
                 overflow: true,
                 props: {
                     onConfirm: () => {
diff --git a/packages/shared/lib/auxiliary/popup/enums/popup-id.enum.ts b/packages/shared/lib/auxiliary/popup/enums/popup-id.enum.ts
index 49889abdbba..11da53d0e17 100644
--- a/packages/shared/lib/auxiliary/popup/enums/popup-id.enum.ts
+++ b/packages/shared/lib/auxiliary/popup/enums/popup-id.enum.ts
@@ -1,5 +1,5 @@
 export enum PopupId {
-    AccountSwitcher = 'accountSwitcher',
+    WalletSwitcher = 'WalletSwitcher',
     ActivityDetails = 'activityDetails',
     AddNode = 'addNode',
     AddProposal = 'addProposal',