diff --git a/src/components/Organizations/Card.tsx b/src/components/Accounts/Card.tsx
similarity index 79%
rename from src/components/Organizations/Card.tsx
rename to src/components/Accounts/Card.tsx
index f2a09139..9e75d955 100644
--- a/src/components/Organizations/Card.tsx
+++ b/src/components/Accounts/Card.tsx
@@ -7,7 +7,7 @@ import { ReducedTextAndCopy } from '~components/Layout/CopyButton'
 import { FallbackAccountImg, RoutePath } from '~constants'
 import LinkCard from '~components/Layout/LinkCard'
 
-type IOrganizationCardProps = {
+type IAccountCardProps = {
   id?: string
   electionCount?: number
 } & CardProps
@@ -19,17 +19,17 @@ type IOrganizationCardProps = {
  * @param rest chakra CardProps
  * @constructor
  */
-export const OrganizationCard = ({ id, ...rest }: IOrganizationCardProps) => {
-  if (!id) return <OrganizationCardSkeleton {...rest} />
+export const AccountCard = ({ id, ...rest }: IAccountCardProps) => {
+  if (!id) return <AccountCardSkeleton {...rest} />
 
   return (
     <OrganizationProvider id={id}>
-      <OrganizationCardSkeleton id={id} {...rest} />
+      <AccountCardSkeleton id={id} {...rest} />
     </OrganizationProvider>
   )
 }
 
-const OrganizationCardSkeleton = ({ electionCount: ec, ...rest }: IOrganizationCardProps) => {
+const AccountCardSkeleton = ({ electionCount: ec, ...rest }: IAccountCardProps) => {
   const { organization, loading } = useOrganization()
   const { t } = useTranslation()
 
@@ -40,7 +40,7 @@ const OrganizationCardSkeleton = ({ electionCount: ec, ...rest }: IOrganizationC
 
   return (
     <LinkCard
-      to={generatePath(RoutePath.Organization, { pid, tab: null, page: null })}
+      to={generatePath(RoutePath.Account, { pid, tab: null, page: null })}
       direction={'row'}
       alignItems='center'
       pl={4}
@@ -50,7 +50,7 @@ const OrganizationCardSkeleton = ({ electionCount: ec, ...rest }: IOrganizationC
         <Avatar
           mx='auto'
           fallbackSrc={FallbackAccountImg}
-          alt={t('organization.avatar_alt', {
+          alt={t('account.avatar_alt', {
             name: organization?.account.name.default || organization?.address,
           }).toString()}
         />
@@ -68,7 +68,7 @@ const OrganizationCardSkeleton = ({ electionCount: ec, ...rest }: IOrganizationC
         </ReducedTextAndCopy>
         {electionCount && (
           <Text fontSize={'sm'}>
-            <Trans i18nKey={'organization.process_count'} count={electionCount}>
+            <Trans i18nKey={'account.process_count'} count={electionCount}>
               <strong>Process:</strong> {{ count: electionCount }}
             </Trans>
           </Text>
@@ -78,12 +78,12 @@ const OrganizationCardSkeleton = ({ electionCount: ec, ...rest }: IOrganizationC
   )
 }
 
-export const SmallOrganizationCard = ({ id, flex, avatar }: { id: string; flex?: FlexProps; avatar?: BoxProps }) => {
+export const SmallAccountCard = ({ id, flex, avatar }: { id: string; flex?: FlexProps; avatar?: BoxProps }) => {
   const { organization } = useOrganization()
   const { t } = useTranslation()
 
   const orgName = organization?.account.name.default
-  const orgLink = generatePath(RoutePath.Organization, { pid: id, tab: null, page: null })
+  const orgLink = generatePath(RoutePath.Account, { pid: id, tab: null, page: null })
 
   return (
     <Flex direction={'row'} alignItems={'center'} gap={2} {...flex}>
@@ -91,7 +91,7 @@ export const SmallOrganizationCard = ({ id, flex, avatar }: { id: string; flex?:
         <Avatar
           mx='auto'
           fallbackSrc={'/images/fallback-account-dark.png'}
-          alt={t('organization.avatar_alt', {
+          alt={t('account.avatar_alt', {
             name: orgName || organization?.address,
           }).toString()}
         />
diff --git a/src/components/Organizations/Detail.tsx b/src/components/Accounts/Detail.tsx
similarity index 74%
rename from src/components/Organizations/Detail.tsx
rename to src/components/Accounts/Detail.tsx
index fc356f56..037b048e 100644
--- a/src/components/Organizations/Detail.tsx
+++ b/src/components/Accounts/Detail.tsx
@@ -7,13 +7,13 @@ import { HeroHeaderLayout } from '~components/Layout/HeroHeaderLayout'
 import { RouteParamsTabs } from '~components/Layout/RouteParamsTabs'
 import { RawContentBox } from '~components/Layout/ShowRawButton'
 import { FallbackHeaderImg, RoutePath } from '~constants'
-import AccountTransfers from '~components/Organizations/Details/Transfers'
-import OrganizationElections from './Details/Elections'
-import OrgDetails from './Details/OrgDetails'
-import AccountFees from '~components/Organizations/Details/Fees'
+import AccountTransfers from '~components/Accounts/Details/Transfers'
+import AccountElections from './Details/Elections'
+import AccountDetails from './Details/AccountDetails'
+import AccountFees from '~components/Accounts/Details/Fees'
 import TextAndTag from '~components/Layout/TextAndTag'
 
-const OrganizationDetail = () => {
+const AccountDetail = () => {
   const { organization } = useOrganization()
 
   const { t } = useTranslation()
@@ -35,28 +35,25 @@ const OrganizationDetail = () => {
           </ReducedTextAndCopy>
         </VStack>
       </HeroHeaderLayout>
-      <RouteParamsTabs path={RoutePath.Organization} isLazy>
+      <RouteParamsTabs path={RoutePath.Account} isLazy>
         <TabList display='flex' flexWrap='wrap'>
           <Tab>
             <Trans i18nKey={'process.tab_details'}>Details</Trans>
           </Tab>
           <Tab>
             <TextAndTag
-              text={t('organization.elections_count', { defaultValue: 'Elections' })}
+              text={t('account.elections_count', { defaultValue: 'Elections' })}
               tagLabel={organization.electionIndex.toString()}
             />
           </Tab>
           <Tab>
             <TextAndTag
-              text={t('organization.transfers_count', { defaultValue: 'Transfers' })}
+              text={t('account.transfers_count', { defaultValue: 'Transfers' })}
               tagLabel={transfersCount?.toString() ?? '0'}
             />
           </Tab>
           <Tab>
-            <TextAndTag
-              text={t('organization.fees', { defaultValue: 'Fees' })}
-              tagLabel={feesCount?.toString() ?? '0'}
-            />
+            <TextAndTag text={t('account.fees', { defaultValue: 'Fees' })} tagLabel={feesCount?.toString() ?? '0'} />
           </Tab>
           <Tab>
             <Trans i18nKey={'raw'}>Raw</Trans>
@@ -64,10 +61,10 @@ const OrganizationDetail = () => {
         </TabList>
         <TabPanels>
           <TabPanel>
-            <OrgDetails org={organization} />
+            <AccountDetails org={organization} />
           </TabPanel>
           <TabPanel>
-            <OrganizationElections org={organization} />
+            <AccountElections org={organization} />
           </TabPanel>
           <TabPanel>
             <AccountTransfers org={organization} txCount={transfersCount} />
@@ -84,4 +81,4 @@ const OrganizationDetail = () => {
   )
 }
 
-export default OrganizationDetail
+export default AccountDetail
diff --git a/src/components/Organizations/Details/OrgDetails.tsx b/src/components/Accounts/Details/AccountDetails.tsx
similarity index 67%
rename from src/components/Organizations/Details/OrgDetails.tsx
rename to src/components/Accounts/Details/AccountDetails.tsx
index 244ddc4c..8702a873 100644
--- a/src/components/Organizations/Details/OrgDetails.tsx
+++ b/src/components/Accounts/Details/AccountDetails.tsx
@@ -6,35 +6,35 @@ import { FaUserAlt } from 'react-icons/fa'
 import { DetailsGrid, GridItemProps } from '~components/Layout/DetailsGrid'
 import { AppBaseURL } from '~constants'
 
-const OrgDetails = ({ org }: { org: AccountData }) => {
+const AccountDetails = ({ org }: { org: AccountData }) => {
   const { t } = useTranslation()
 
   const details: GridItemProps[] = [
     {
-      label: t('organization.nonce', { defaultValue: 'Nonce' }),
+      label: t('account.nonce', { defaultValue: 'Nonce' }),
       children: org.nonce,
     },
     {
-      label: t('organization.balance', { defaultValue: 'Balance' }),
+      label: t('account.balance', { defaultValue: 'Balance' }),
       children: org.balance,
     },
     {
-      label: t('organization.election_count', { defaultValue: 'Elections' }),
+      label: t('account.election_count', { defaultValue: 'Elections' }),
       children: org.electionIndex,
     },
     {
-      label: t('organization.profile', { defaultValue: 'Profile' }),
+      label: t('account.profile', { defaultValue: 'Profile' }),
       children: (
         <Link target='blank' href={`${AppBaseURL}/organization/${ensure0x(org.address)}`}>
           <Icon as={FaUserAlt} boxSize={3} mr={2} />
-          <Trans i18nKey={'organization.view_profile'}></Trans>
+          <Trans i18nKey={'account.view_profile'}></Trans>
         </Link>
       ),
     },
     ...(org.account.description.default
       ? [
           {
-            label: t('organization.description', { defaultValue: 'Description' }),
+            label: t('account.description', { defaultValue: 'Description' }),
             children: <OrganizationDescription />,
           },
         ]
@@ -47,4 +47,4 @@ const OrgDetails = ({ org }: { org: AccountData }) => {
   )
 }
 
-export default OrgDetails
+export default AccountDetails
diff --git a/src/components/Organizations/Details/Elections.tsx b/src/components/Accounts/Details/Elections.tsx
similarity index 76%
rename from src/components/Organizations/Details/Elections.tsx
rename to src/components/Accounts/Details/Elections.tsx
index 60a2b6b9..f77382ce 100644
--- a/src/components/Organizations/Details/Elections.tsx
+++ b/src/components/Accounts/Details/Elections.tsx
@@ -6,30 +6,30 @@ import { RoutedPagination } from '~components/Pagination/Pagination'
 import { RoutedPaginationProvider, useRoutedPagination } from '~components/Pagination/PaginationProvider'
 import { ElectionCard } from '~components/Process/Card'
 import { RoutePath } from '~constants'
-import { useOrganizationElections } from '~queries/organizations'
+import { useOrganizationElections } from '~queries/accounts'
 import { ContentError, NoResultsError } from '~components/Layout/ContentError'
 
 interface OrgComponentProps {
   org: AccountData
 }
 
-const OrganizationElections = ({ org }: OrgComponentProps) => {
+const AccountElections = ({ org }: OrgComponentProps) => {
   if (org.electionIndex === 0) {
     return (
       <Text>
-        <Trans i18nKey={'organization.no_elections'}>No elections yet!</Trans>
+        <Trans i18nKey={'account.no_elections'}>No elections yet!</Trans>
       </Text>
     )
   }
 
   return (
-    <RoutedPaginationProvider path={RoutePath.Organization}>
-      <OrganizationElectionsList org={org} />
+    <RoutedPaginationProvider path={RoutePath.Account}>
+      <AccountElectionsList org={org} />
     </RoutedPaginationProvider>
   )
 }
 
-const OrganizationElectionsList = ({ org }: OrgComponentProps) => {
+const AccountElectionsList = ({ org }: OrgComponentProps) => {
   const { page }: { page?: number } = useRoutedPagination()
 
   const { data, isLoading, isError, error } = useOrganizationElections({
@@ -62,4 +62,4 @@ const OrganizationElectionsList = ({ org }: OrgComponentProps) => {
   )
 }
 
-export default OrganizationElections
+export default AccountElections
diff --git a/src/components/Organizations/Details/Fees.tsx b/src/components/Accounts/Details/Fees.tsx
similarity index 88%
rename from src/components/Organizations/Details/Fees.tsx
rename to src/components/Accounts/Details/Fees.tsx
index 9fef0c0a..d375248f 100644
--- a/src/components/Organizations/Details/Fees.tsx
+++ b/src/components/Accounts/Details/Fees.tsx
@@ -5,7 +5,7 @@ import { useDateFns } from '~i18n/use-date-fns'
 import { AccountData, TransactionType } from '@vocdoni/sdk'
 import { PaginationProvider, usePagination } from '~components/Pagination/PaginationProvider'
 import { Pagination } from '~components/Pagination/Pagination'
-import { useAccountFees } from '~queries/organizations'
+import { useAccountFees } from '~queries/accounts'
 import { TransactionTypeBadge } from '~components/Transactions/TransactionCard'
 import { generatePath, Link as RouterLink } from 'react-router-dom'
 import { RoutePath } from '~constants'
@@ -45,7 +45,7 @@ const AccountFeesTable = ({ org }: { org: AccountData }) => {
   if (!data.fees.length) {
     return (
       <Text>
-        <Trans i18nKey={'organization.fees.no_fees'}>No fees yet!</Trans>
+        <Trans i18nKey={'account.fees.no_fees'}>No fees yet!</Trans>
       </Text>
     )
   }
@@ -58,13 +58,13 @@ const AccountFeesTable = ({ org }: { org: AccountData }) => {
             <Thead>
               <Tr>
                 <Th>
-                  <Trans i18nKey={'organization.fees.tx_type'}>Tx Type</Trans>
+                  <Trans i18nKey={'account.fees.tx_type'}>Tx Type</Trans>
                 </Th>
                 <Th>
-                  <Trans i18nKey={'organization.transfers.block'}>Block</Trans>
+                  <Trans i18nKey={'account.transfers.block'}>Block</Trans>
                 </Th>
                 <Th>
-                  <Trans i18nKey={'organization.fees.cost'}>Cost</Trans>
+                  <Trans i18nKey={'account.fees.cost'}>Cost</Trans>
                 </Th>
               </Tr>
             </Thead>
diff --git a/src/components/Organizations/Details/Transfers.tsx b/src/components/Accounts/Details/Transfers.tsx
similarity index 87%
rename from src/components/Organizations/Details/Transfers.tsx
rename to src/components/Accounts/Details/Transfers.tsx
index 53b6dfe0..ba890cef 100644
--- a/src/components/Organizations/Details/Transfers.tsx
+++ b/src/components/Accounts/Details/Transfers.tsx
@@ -19,7 +19,7 @@ import { generatePath, Link as RouterLink } from 'react-router-dom'
 import { ReducedTextAndCopy } from '~components/Layout/CopyButton'
 import { LoadingCards } from '~components/Layout/Loading'
 import { RoutePath } from '~constants'
-import { useAccountTransfers } from '~queries/organizations'
+import { useAccountTransfers } from '~queries/accounts'
 import { useDateFns } from '~i18n/use-date-fns'
 import { BiLogInCircle, BiLogOutCircle } from 'react-icons/bi'
 import { AccountData } from '@vocdoni/sdk'
@@ -32,11 +32,11 @@ const FromToIcon = ({ isIncoming, ...rest }: { isIncoming: boolean } & IconProps
 
   let icon = BiLogOutCircle
   let color = 'textAccent2B'
-  let tooltip = t('organization.transfers.outgoing_tx', { defaultValue: 'Outgoing tx' })
+  let tooltip = t('account.transfers.outgoing_tx', { defaultValue: 'Outgoing tx' })
   if (isIncoming) {
     icon = BiLogInCircle
     color = 'accent1C'
-    tooltip = t('organization.transfers.incoming_tx', { defaultValue: 'Incoming tx' })
+    tooltip = t('account.transfers.incoming_tx', { defaultValue: 'Incoming tx' })
   }
 
   return (
@@ -76,7 +76,7 @@ const AccountTransfersTable = ({ txCount, org }: AccountTransfersProps) => {
   if (txCount && !(txCount > 0)) {
     return (
       <Text>
-        <Trans i18nKey={'organization.transfers.no_transfers'}>No transfers yet!</Trans>
+        <Trans i18nKey={'account.transfers.no_transfers'}>No transfers yet!</Trans>
       </Text>
     )
   }
@@ -101,16 +101,16 @@ const AccountTransfersTable = ({ txCount, org }: AccountTransfersProps) => {
             <Thead>
               <Tr>
                 <Th>
-                  <Trans i18nKey={'organization.transfers.tx_hash'}>Tx Hash</Trans>
+                  <Trans i18nKey={'account.transfers.tx_hash'}>Tx Hash</Trans>
                 </Th>
                 <Th>
-                  <Trans i18nKey={'organization.transfers.block'}>Block</Trans>
+                  <Trans i18nKey={'account.transfers.block'}>Block</Trans>
                 </Th>
                 <Th>
-                  <Trans i18nKey={'organization.transfers.from_to'}>From/To</Trans>
+                  <Trans i18nKey={'account.transfers.from_to'}>From/To</Trans>
                 </Th>
                 <Th>
-                  <Trans i18nKey={'organization.transfers.amount'}>Amount</Trans>
+                  <Trans i18nKey={'account.transfers.amount'}>Amount</Trans>
                 </Th>
               </Tr>
             </Thead>
@@ -163,7 +163,7 @@ const AccountTransfersTable = ({ txCount, org }: AccountTransfersProps) => {
                           fontSize={'md'}
                           p={1}
                           h={8}
-                          to={generatePath(RoutePath.Organization, {
+                          to={generatePath(RoutePath.Account, {
                             pid: fromToAddress,
                             tab: null,
                             page: null,
diff --git a/src/components/Organizations/List.tsx b/src/components/Accounts/List.tsx
similarity index 76%
rename from src/components/Organizations/List.tsx
rename to src/components/Accounts/List.tsx
index aa03bc06..f1e99473 100644
--- a/src/components/Organizations/List.tsx
+++ b/src/components/Accounts/List.tsx
@@ -3,14 +3,14 @@ import { useTranslation } from 'react-i18next'
 import { generatePath, useNavigate, useParams } from 'react-router-dom'
 import { InputSearch } from '~components/Layout/Inputs'
 import { LoadingCards } from '~components/Layout/Loading'
-import { OrganizationCard } from '~components/Organizations/Card'
+import { AccountCard } from '~components/Accounts/Card'
 import { RoutedPaginationProvider, useRoutedPagination } from '~components/Pagination/PaginationProvider'
 import { RoutedPagination } from '~components/Pagination/RoutedPagination'
 import { RoutePath } from '~constants'
-import { useOrganizationCount, useOrganizationList } from '~queries/organizations'
+import { useOrganizationCount, useOrganizationList } from '~queries/accounts'
 import { ContentError, NoResultsError } from '~components/Layout/ContentError'
 
-export const OrganizationsFilter = () => {
+export const AccountsFilter = () => {
   const { t } = useTranslation()
   const navigate = useNavigate()
   const { query } = useParams<{ query?: string }>()
@@ -18,9 +18,9 @@ export const OrganizationsFilter = () => {
   return (
     <InputSearch
       maxW={'300px'}
-      placeholder={t('organizations.search_by_org_id')}
+      placeholder={t('accounts.search_by_org_id')}
       onChange={(value: string) => {
-        navigate(generatePath(RoutePath.OrganizationsList, { page: '0', query: value as string }))
+        navigate(generatePath(RoutePath.AccountsList, { page: '0', query: value as string }))
       }}
       debounceTime={500}
       initialValue={query}
@@ -28,15 +28,15 @@ export const OrganizationsFilter = () => {
   )
 }
 
-export const PaginatedOrganizationsList = () => {
+export const PaginatedAccountsList = () => {
   return (
-    <RoutedPaginationProvider path={RoutePath.OrganizationsList}>
-      <OrganizationsList />
+    <RoutedPaginationProvider path={RoutePath.AccountsList}>
+      <AccountsList />
     </RoutedPaginationProvider>
   )
 }
 
-export const OrganizationsList = () => {
+export const AccountsList = () => {
   const { page }: { page?: number } = useRoutedPagination()
   const { query }: { query?: string } = useParams()
   const { data: count, isLoading: isLoadingCount } = useOrganizationCount()
@@ -72,7 +72,7 @@ export const OrganizationsList = () => {
   return (
     <>
       {orgs?.organizations.map((org) => (
-        <OrganizationCard key={org.organizationID} id={org.organizationID} electionCount={org.electionCount} />
+        <AccountCard key={org.organizationID} id={org.organizationID} electionCount={org.electionCount} />
       ))}
       <RoutedPagination pagination={orgs.pagination} />
     </>
diff --git a/src/components/Organizations/StatusBadge.tsx b/src/components/Accounts/StatusBadge.tsx
similarity index 100%
rename from src/components/Organizations/StatusBadge.tsx
rename to src/components/Accounts/StatusBadge.tsx
diff --git a/src/components/Layout/TopBar.tsx b/src/components/Layout/TopBar.tsx
index d91f7e1e..177cf26c 100644
--- a/src/components/Layout/TopBar.tsx
+++ b/src/components/Layout/TopBar.tsx
@@ -48,8 +48,8 @@ export const TopBar = () => {
 
   const links: HeaderLink[] = [
     {
-      name: t('links.organizations', { defaultValue: 'Organizations' }),
-      url: generatePath(RoutePath.OrganizationsList, { page: null, query: null }),
+      name: t('links.accounts', { defaultValue: 'Accounts' }),
+      url: generatePath(RoutePath.AccountsList, { page: null, query: null }),
     },
     {
       name: t('links.processes', { defaultValue: 'Processes' }),
diff --git a/src/components/Process/Card.tsx b/src/components/Process/Card.tsx
index 96c99a9b..0fa5bdf3 100644
--- a/src/components/Process/Card.tsx
+++ b/src/components/Process/Card.tsx
@@ -3,10 +3,10 @@ import { ElectionSchedule, ElectionTitle } from '@vocdoni/chakra-components'
 import { ElectionProvider, OrganizationProvider, useElection } from '@vocdoni/react-providers'
 import { ArchivedElection, InvalidElection as InvalidElectionType, PublishedElection } from '@vocdoni/sdk'
 import { generatePath } from 'react-router-dom'
-import { ElectionStatusBadge } from '~components/Organizations/StatusBadge'
+import { ElectionStatusBadge } from '~components/Accounts/StatusBadge'
 import InvalidElection from '~components/Process/InvalidElection'
 import { RoutePath } from '~constants'
-import { SmallOrganizationCard } from '~components/Organizations/Card'
+import { SmallAccountCard } from '~components/Accounts/Card'
 import LinkCard from '~components/Layout/LinkCard'
 
 export type ElectionCardProps = {
@@ -62,7 +62,7 @@ const ElectionCardSkeleton = (rest: CardProps) => {
           <ElectionTitle textAlign={'start'} fontWeight={'bold'} wordBreak='break-all' fontSize='lg' />
         </Flex>
         <OrganizationProvider id={election.organizationId}>
-          <SmallOrganizationCard id={election.organizationId} />
+          <SmallAccountCard id={election.organizationId} />
         </OrganizationProvider>
       </CardBody>
     </LinkCard>
diff --git a/src/components/Process/Detail.tsx b/src/components/Process/Detail.tsx
index a69b1770..12ee43d8 100644
--- a/src/components/Process/Detail.tsx
+++ b/src/components/Process/Detail.tsx
@@ -41,8 +41,8 @@ import { ReducedTextAndCopy } from '~components/Layout/CopyButton'
 import { HeroHeaderLayout } from '~components/Layout/HeroHeaderLayout'
 import { LoadingCards } from '~components/Layout/Loading'
 import { RawContentBox } from '~components/Layout/ShowRawButton'
-import { OrganizationCard } from '~components/Organizations/Card'
-import { ElectionStatusBadge } from '~components/Organizations/StatusBadge'
+import { AccountCard } from '~components/Accounts/Card'
+import { ElectionStatusBadge } from '~components/Accounts/StatusBadge'
 import { Pagination } from '~components/Pagination/Pagination'
 import { PaginationProvider, usePagination } from '~components/Pagination/PaginationProvider'
 import InvalidElection from '~components/Process/InvalidElection'
@@ -124,7 +124,7 @@ const Detail = () => {
       {/*Organization card and other cards*/}
       <Grid templateColumns={{ base: 'repeat(2, 1fr)', lg: 'repeat(4, 1fr)' }} gap={4}>
         <GridItem colSpan={2}>
-          <OrganizationCard h={'full'} />
+          <AccountCard h={'full'} />
         </GridItem>
         <GridItem colSpan={1}>
           <InfoCard title={t('processes.envelope_recount')}>{election.voteCount}</InfoCard>
diff --git a/src/components/Stats/ChainDetails/StatsCards.tsx b/src/components/Stats/ChainDetails/StatsCards.tsx
index b688277a..aa068b6a 100644
--- a/src/components/Stats/ChainDetails/StatsCards.tsx
+++ b/src/components/Stats/ChainDetails/StatsCards.tsx
@@ -134,7 +134,7 @@ export const StatsCards = () => {
 
   const incrementalStats: IncrementalStatProps[] = [
     {
-      label: t('stats.organizations', { defaultValue: 'Organizations' }),
+      label: t('stats.accounts_name', { defaultValue: 'Accounts' }),
       value: stats.organizationCount,
     },
     {
diff --git a/src/components/Transactions/TxDetails/SpecificTxDetails.tsx b/src/components/Transactions/TxDetails/SpecificTxDetails.tsx
index 288829d1..9ba8b2f2 100644
--- a/src/components/Transactions/TxDetails/SpecificTxDetails.tsx
+++ b/src/components/Transactions/TxDetails/SpecificTxDetails.tsx
@@ -16,7 +16,7 @@ import { BiTransferAlt } from 'react-icons/bi'
 import { generatePath } from 'react-router-dom'
 import { ReducedTextAndCopy } from '~components/Layout/CopyButton'
 import { DetailsGrid, GridItemProps } from '~components/Layout/DetailsGrid'
-import { SmallOrganizationCard } from '~components/Organizations/Card'
+import { SmallAccountCard } from '~components/Accounts/Card'
 import { RoutePath } from '~constants'
 import { b64ToHex } from '~utils/objects'
 import { VotePackage } from '~components/Envelope/Detail'
@@ -45,7 +45,7 @@ const OrganizationCard = ({ orgId }: { orgId: string }) => (
   <OrganizationProvider id={orgId}>
     {/*This box is fixing the alignment with the grid label*/}
     <Box display={'flex'} alignItems={'last baseline'}>
-      <SmallOrganizationCard id={orgId} avatar={{ w: '20px', minW: '20px' }} />
+      <SmallAccountCard id={orgId} avatar={{ w: '20px', minW: '20px' }} />
     </Box>
   </OrganizationProvider>
 )
@@ -53,7 +53,7 @@ const OrganizationCard = ({ orgId }: { orgId: string }) => (
 const organizationIdGridItem = (orgId: string, t: TFunction): GridItemProps => {
   const _orgId = ensure0x(orgId)
   return {
-    label: t('transactions.belong_to_organization', { defaultValue: 'Belongs to organization' }),
+    label: t('transactions.belong_to_accounts', { defaultValue: 'Belongs to organization' }),
     children: <OrganizationCard orgId={_orgId} />,
   }
 }
diff --git a/src/components/Validators/Detail.tsx b/src/components/Validators/Detail.tsx
index 4ca7bad5..152d90d6 100644
--- a/src/components/Validators/Detail.tsx
+++ b/src/components/Validators/Detail.tsx
@@ -44,7 +44,7 @@ const DetailsTab = ({ validator }: { validator: IChainValidator }) => {
           fontWeight={'normal'}
           h={0}
           fontSize={'md'}
-          to={generatePath(RoutePath.Organization, { pid: address, tab: null, page: null })}
+          to={generatePath(RoutePath.Account, { pid: address, tab: null, page: null })}
         >
           {address}
         </ReducedTextAndCopy>
diff --git a/src/constants.ts b/src/constants.ts
index f83bece6..18fd800a 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -23,8 +23,8 @@ export enum RoutePath {
   Block = '/block/:height/:tab?/:page?',
   BlocksList = '/blocks/:page?',
   Envelope = '/envelope/:verifier/:tab?',
-  Organization = '/organization/:pid/:tab?/:page?',
-  OrganizationsList = '/organizations/:page?/:query?',
+  Account = '/account/:pid/:tab?/:page?',
+  AccountsList = '/accounts/:page?/:query?',
   Process = '/process/:pid/:tab?',
   ProcessesList = '/processes/:page?',
   Transaction = '/transactions/:block/:index/:tab?',
@@ -44,6 +44,8 @@ export enum OldRoutePath {
   TransactionDetails = '/transactions/show/#/',
   Verify = '/verify',
   Stats = '/stats',
+  OrganizationsList = '/organizations',
+  Organization = '/organization',
 }
 
 // Used to test if a string is base64 encoded. Used by b64ToHex
diff --git a/src/i18n/locales/ca.json b/src/i18n/locales/ca.json
index e763d9f3..ca15f138 100644
--- a/src/i18n/locales/ca.json
+++ b/src/i18n/locales/ca.json
@@ -69,7 +69,7 @@
     "blog": "Blog",
     "docs": "Docs",
     "help": "Ajuda",
-    "organizations": "Organitzacions",
+    "accounts": "Comptes",
     "processes": "Processos",
     "support": "Suport",
     "transactions": "Transaccions",
@@ -80,7 +80,7 @@
   "menu": {
     "burger_aria_label": "Menú"
   },
-  "organization": {
+  "account": {
     "avatar_alt": "Avatar",
     "description": "Descripció",
     "elections_list": "Eleccions",
@@ -90,12 +90,12 @@
     "process_count_other": "<0>Processos:</0> {{count}}",
     "view_profile": "Veure perfil"
   },
-  "organizations": {
-    "organizations_count_one": "Total {{ count }} organització",
-    "organizations_count_many": "",
-    "organizations_count_other": "Total {{ count }} organitzacions",
-    "organizations_list": "Organitzacions",
-    "search_by_org_id": "Cercar per identificador d'organització"
+  "accounts": {
+    "accounts_count_one": "Total {{ count }} compte",
+    "accounts_count_many": "",
+    "accounts_count_other": "Total {{ count }} comptes",
+    "accounts_list": "Comptes",
+    "search_by_org_id": "Cercar per identificador de compte"
   },
   "process": {
     "badge": {
@@ -113,7 +113,7 @@
     "process_count_other": "Total {{count}} processos",
     "process_details": "Detalls del procés",
     "process_list": "Processos",
-    "search_by": "Cercar per procés o organització",
+    "search_by": "Cercar per procés o compte",
     "show_with_results": "Mostrar només processos amb resultats",
     "tab_description": "Descripció",
     "tab_details": "Detalls",
@@ -149,16 +149,16 @@
     "latest_blocks": "Últims blocs",
     "network_id": "Identificador de xarxa",
     "nr_of_validators": "Nombre de validadors",
-    "organizations_one": "{{ count }} organització",
-    "organizations_many": "",
-    "organizations_other": "{{ count }} organitzacions",
+    "accounts_one": "{{ count }} compte",
+    "accounts_many": "",
+    "accounts_other": "{{ count }} comptes",
     "seconds_one": "{{ count }} segon",
     "seconds_many": "",
     "seconds_other": "{{ count }} segons",
     "sync_status": "Estat de sincronització",
     "syncing": "Sincronitzant",
     "total_elections": "Total de processos",
-    "total_organizations": "Total d'organitzacions",
+    "total_accounts": "Total de comptes",
     "total_votes": "Total de vots",
     "view_all_blocks": "Veure tots els blocs",
     "votes_one": "{{ count }} vot",
@@ -166,7 +166,7 @@
     "votes_other": "{{ count }} vots"
   },
   "transactions": {
-    "belong_to_organization": "Pertany a l'organització",
+    "belong_to_accounts": "Pertany a el compte",
     "belongs_to_process": "Pertany al procés",
     "block": "Bloc",
     "created_on": "Creat {{createdOn}}",
diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json
index 4ae6f377..1f5809c8 100644
--- a/src/i18n/locales/en.json
+++ b/src/i18n/locales/en.json
@@ -68,7 +68,7 @@
     "blog": "Blog",
     "docs": "Docs",
     "help": "Help",
-    "organizations": "Organizations",
+    "accounts": "Accounts",
     "processes": "Processes",
     "support": "Support",
     "transactions": "Transactions",
@@ -79,7 +79,7 @@
   "menu": {
     "burger_aria_label": "Menu"
   },
-  "organization": {
+  "account": {
     "avatar_alt": "Avatar",
     "description": "Description",
     "elections_list": "Elections",
@@ -88,11 +88,11 @@
     "process_count_other": "<0>Process:</0> {{count}}",
     "view_profile": "View profile"
   },
-  "organizations": {
-    "organizations_count_one": "Total {{ count }} organization",
-    "organizations_count_other": "Total {{ count }} organizations",
-    "organizations_list": "Organizations",
-    "search_by_org_id": "Search by organization id"
+  "accounts": {
+    "accounts_count_one": "Total {{ count }} account",
+    "accounts_count_other": "Total {{ count }} accounts",
+    "accounts_list": "Accounts",
+    "search_by_org_id": "Search by account id"
   },
   "process": {
     "badge": {
@@ -109,7 +109,7 @@
     "process_count_other": "Total {{count}} processes",
     "process_details": "Process details",
     "process_list": "Processes",
-    "search_by": "Search by process or organization",
+    "search_by": "Search by process or account",
     "show_with_results": "Show only processes with results",
     "tab_description": "Description",
     "tab_details": "Details",
@@ -144,21 +144,21 @@
     "latest_blocks": "Latest blocks",
     "network_id": "Network id",
     "nr_of_validators": "Nr of validators",
-    "organizations_one": "{{ count }} organization",
-    "organizations_other": "{{ count }} organizations",
+    "accounts_one": "{{ count }} account",
+    "accounts_other": "{{ count }} accounts",
     "seconds_one": "{{ count }} second",
     "seconds_other": "{{ count }} seconds",
     "sync_status": "Sync status",
     "syncing": "Syncing",
     "total_elections": "Total processes",
-    "total_organizations": "Total organizations",
+    "total_accounts": "Total accounts",
     "total_votes": "Total votes",
     "view_all_blocks": "View all blocks",
     "votes_one": "{{ count }} vote",
     "votes_other": "{{ count }} votes"
   },
   "transactions": {
-    "belong_to_organization": "Belongs to organization",
+    "belong_to_accounts": "Belongs to account",
     "belongs_to_process": "Belongs to process",
     "block": "Block",
     "created_on": "Created {{createdOn}}",
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
index 8b80bc0f..638813be 100644
--- a/src/i18n/locales/es.json
+++ b/src/i18n/locales/es.json
@@ -69,7 +69,7 @@
     "blog": "Blog",
     "docs": "Documentación",
     "help": "Ayuda",
-    "organizations": "Organizaciones",
+    "accounts": "Cuentas",
     "processes": "Procesos",
     "support": "Soporte",
     "transactions": "Transacciones",
@@ -80,7 +80,7 @@
   "menu": {
     "burger_aria_label": "Menú"
   },
-  "organization": {
+  "account": {
     "avatar_alt": "Avatar",
     "description": "Descripción",
     "elections_list": "Elecciones",
@@ -90,12 +90,12 @@
     "process_count_other": "<0>Proceso:</0> {{count}}",
     "view_profile": "Ver perfil"
   },
-  "organizations": {
-    "organizations_count_one": "Total {{ count }} organización",
-    "organizations_count_many": "",
-    "organizations_count_other": "Total {{ count }} organizaciones",
-    "organizations_list": "Organizaciones",
-    "search_by_org_id": "Buscar por id de organización"
+  "accounts": {
+    "accounts_count_one": "Total {{ count }} cuenta",
+    "accounts_count_many": "",
+    "accounts_count_other": "Total {{ count }} Cuentas",
+    "accounts_list": "Cuentas",
+    "search_by_org_id": "Buscar por id de cuenta"
   },
   "process": {
     "badge": {
@@ -113,7 +113,7 @@
     "process_count_other": "Total {{count}} procesos",
     "process_details": "Detalles del proceso",
     "process_list": "Procesos",
-    "search_by": "Buscar por proceso u organización",
+    "search_by": "Buscar por proceso u cuenta",
     "show_with_results": "Mostrar solo procesos con resultados",
     "tab_description": "Descripción",
     "tab_details": "Detalles",
@@ -149,16 +149,16 @@
     "latest_blocks": "Últimos bloques",
     "network_id": "ID de red",
     "nr_of_validators": "Número de validadores",
-    "organizations_one": "{{ count }} organización",
-    "organizations_many": "",
-    "organizations_other": "{{ count }} organizaciones",
+    "accounts_one": "{{ count }} cuenta",
+    "accounts_many": "",
+    "accounts_other": "{{ count }} Cuentas",
     "seconds_one": "{{ count }} segundo",
     "seconds_many": "",
     "seconds_other": "{{ count }} segundos",
     "sync_status": "Estado de sincronización",
     "syncing": "Sincronizando",
     "total_elections": "Total de procesos",
-    "total_organizations": "Total de organizaciones",
+    "total_accounts": "Total de Cuentas",
     "total_votes": "Total de votos",
     "view_all_blocks": "Ver todos los bloques",
     "votes_one": "{{ count }} voto",
@@ -166,7 +166,7 @@
     "votes_other": "{{ count }} votos"
   },
   "transactions": {
-    "belong_to_organization": "Pertenece a la organización",
+    "belong_to_accounts": "Pertenece a la cuenta",
     "belongs_to_process": "Pertenece al proceso",
     "block": "Bloque",
     "created_on": "Creado el {{createdOn}}",
diff --git a/src/pages/organization.tsx b/src/pages/account.tsx
similarity index 65%
rename from src/pages/organization.tsx
rename to src/pages/account.tsx
index 026ed1ee..99ed7e05 100644
--- a/src/pages/organization.tsx
+++ b/src/pages/account.tsx
@@ -1,16 +1,16 @@
 import { OrganizationProvider } from '@vocdoni/react-providers'
 import { AccountData } from '@vocdoni/sdk'
 import { useLoaderData } from 'react-router-dom'
-import OrganizationDetail from '~components/Organizations/Detail'
+import AccountDetail from '~components/Accounts/Detail'
 
-const Organization = () => {
+const Account = () => {
   const org = useLoaderData() as AccountData
 
   return (
     <OrganizationProvider organization={org}>
-      <OrganizationDetail />
+      <AccountDetail />
     </OrganizationProvider>
   )
 }
 
-export default Organization
+export default Account
diff --git a/src/pages/accounts.tsx b/src/pages/accounts.tsx
new file mode 100644
index 00000000..1af1d9de
--- /dev/null
+++ b/src/pages/accounts.tsx
@@ -0,0 +1,22 @@
+import { AccountsFilter, PaginatedAccountsList } from '~components/Accounts/List'
+import ListPageLayout from '~components/Layout/ListPageLayout'
+import { useOrganizationCount } from '~queries/accounts'
+import { useTranslation } from 'react-i18next'
+import { RefreshIntervalPagination } from '~constants'
+
+const OrganizationList = () => {
+  const { t } = useTranslation()
+  const { data: orgsCount, isLoading } = useOrganizationCount({
+    refetchInterval: RefreshIntervalPagination,
+  })
+
+  const subtitle = !isLoading ? t('accounts.accounts_count', { count: orgsCount || 0 }) : ''
+
+  return (
+    <ListPageLayout title={t('accounts.accounts_list')} subtitle={subtitle} rightComponent={<AccountsFilter />}>
+      <PaginatedAccountsList />
+    </ListPageLayout>
+  )
+}
+
+export default OrganizationList
diff --git a/src/pages/organizations.tsx b/src/pages/organizations.tsx
deleted file mode 100644
index 01c2df3a..00000000
--- a/src/pages/organizations.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import { OrganizationsFilter, PaginatedOrganizationsList } from '~components/Organizations/List'
-import ListPageLayout from '~components/Layout/ListPageLayout'
-import { useOrganizationCount } from '~queries/organizations'
-import { useTranslation } from 'react-i18next'
-import { RefreshIntervalPagination } from '~constants'
-
-const OrganizationList = () => {
-  const { t } = useTranslation()
-  const { data: orgsCount, isLoading } = useOrganizationCount({
-    refetchInterval: RefreshIntervalPagination,
-  })
-
-  const subtitle = !isLoading ? t('organizations.organizations_count', { count: orgsCount || 0 }) : ''
-
-  return (
-    <ListPageLayout
-      title={t('organizations.organizations_list')}
-      subtitle={subtitle}
-      rightComponent={<OrganizationsFilter />}
-    >
-      <PaginatedOrganizationsList />
-    </ListPageLayout>
-  )
-}
-
-export default OrganizationList
diff --git a/src/queries/organizations.ts b/src/queries/accounts.ts
similarity index 100%
rename from src/queries/organizations.ts
rename to src/queries/accounts.ts
diff --git a/src/router/RouteRedirector.tsx b/src/router/RouteRedirector.tsx
index eee92331..68e0d0ef 100644
--- a/src/router/RouteRedirector.tsx
+++ b/src/router/RouteRedirector.tsx
@@ -6,7 +6,9 @@ const mapOldRouteToNewRoute = (route: string): string => {
   const routeMappings: { [key: string]: string } = {
     [OldRoutePath.BlockDetails]: RoutePath.Block,
     [OldRoutePath.EnvelopeDetails]: RoutePath.Envelope,
-    [OldRoutePath.OrganizationDetails]: RoutePath.Organization,
+    [OldRoutePath.OrganizationDetails]: RoutePath.Account,
+    [OldRoutePath.OrganizationsList]: RoutePath.AccountsList,
+    [OldRoutePath.Organization]: RoutePath.Account,
     [OldRoutePath.ProcessDetails]: RoutePath.Process,
     [OldRoutePath.TransactionDetails]: RoutePath.Transaction,
     [OldRoutePath.Verify]: RoutePath.Verify,
diff --git a/src/router/index.tsx b/src/router/index.tsx
index d941b9c2..582b77f0 100644
--- a/src/router/index.tsx
+++ b/src/router/index.tsx
@@ -16,8 +16,8 @@ const Home = lazy(() => import('~pages/Home'))
 const Block = lazy(() => import('~pages/block'))
 const BlocksList = lazy(() => import('~pages/blocks'))
 const Envelope = lazy(() => import('~pages/envelope'))
-const Organization = lazy(() => import('~pages/organization'))
-const OrganizationsList = lazy(() => import('~pages/organizations'))
+const Organization = lazy(() => import('~pages/account'))
+const OrganizationsList = lazy(() => import('~pages/accounts'))
 const ProcessList = lazy(() => import('~pages/processes'))
 const Process = lazy(() => import('~pages/process'))
 const Transaction = lazy(() => import('~pages/transaction'))
@@ -65,7 +65,7 @@ export const RoutesProvider = () => {
               ),
             },
             {
-              path: RoutePath.Organization,
+              path: RoutePath.Account,
               element: (
                 <SuspenseLoader>
                   <Organization />
@@ -83,7 +83,7 @@ export const RoutesProvider = () => {
               loader: async ({ params }) => await client.voteInfo(params.verifier as string),
             },
             {
-              path: RoutePath.OrganizationsList,
+              path: RoutePath.AccountsList,
               element: (
                 <SuspenseLoader>
                   <OrganizationsList />