diff --git a/src/pages/DeviceSyncStatus/DeviceSyncStatus.tsx b/src/pages/DeviceSyncStatus/DeviceSyncStatus.tsx
index 7498601a..ba10522c 100644
--- a/src/pages/DeviceSyncStatus/DeviceSyncStatus.tsx
+++ b/src/pages/DeviceSyncStatus/DeviceSyncStatus.tsx
@@ -7,7 +7,7 @@ import NimbusLogo from '../../components/Logos/NimbusLogo'
 import PageWrapperShadow from '../../components/PageWrappers/PageWrapperShadow'
 import SyncStatusCardConsensus from './SyncStatusCardConsensus'
 import SyncStatusCardExecution from './SyncStatusCardExecution'
-import { setPinnedMessage } from '../../redux/PinnedMessage/slice'
+import { setPinnedMessage } from '../../redux/pinnedMessage/slice'
 import { useDispatch } from 'react-redux'
 import { useEffect } from 'react'
 
diff --git a/src/pages/ValidatorOnboarding/KeyGeneration/ConfirmRecoveryPhrase/AutocompleteInput.tsx b/src/pages/ValidatorOnboarding/KeyGeneration/ConfirmRecoveryPhrase/AutocompleteInput.tsx
index d655b6dc..1d4c98fc 100644
--- a/src/pages/ValidatorOnboarding/KeyGeneration/ConfirmRecoveryPhrase/AutocompleteInput.tsx
+++ b/src/pages/ValidatorOnboarding/KeyGeneration/ConfirmRecoveryPhrase/AutocompleteInput.tsx
@@ -8,7 +8,7 @@ import {
   setMnemonic,
   setValidWords,
   setWord,
-} from '../../../../redux/ValidatorOnboarding/KeyGeneration/slice'
+} from '../../../../redux/validatorOnboarding/keyGeneration/slice'
 import styles from './AutocompleteInput.module.css'
 
 type AutocompleteInputProps = {
diff --git a/src/pages/ValidatorOnboarding/ValidatorOnboarding.tsx b/src/pages/ValidatorOnboarding/ValidatorOnboarding.tsx
index 547e1a3c..7f213f5a 100644
--- a/src/pages/ValidatorOnboarding/ValidatorOnboarding.tsx
+++ b/src/pages/ValidatorOnboarding/ValidatorOnboarding.tsx
@@ -4,6 +4,11 @@ import { useState } from 'react'
 import { useDispatch, useSelector } from 'react-redux'
 import wordlist from 'web-bip39/wordlists/english'
 
+import { RootState } from '../../redux/store'
+import {
+  setIsCopyPastedPhrase,
+  setValidWords,
+} from '../../redux/validatorOnboarding/keyGeneration/slice'
 import FormStepper from './FormStepper/FormStepper'
 import Titles from '../../components/General/Titles'
 import Overview from './Overview/Overview'
@@ -16,14 +21,9 @@ import Advisories from './Advisories/Advisories'
 import ValidatorSetup from './ValidatorSetup/ValidatorSetup/ValidatorSetup'
 import ValidatorSetupInstall from './ValidatorSetup/ValidatorInstalling/ValidatorInstall'
 import ContinueButton from './ContinueButton'
-import {
-  setIsCopyPastedPhrase,
-  setValidWords,
-} from '../../redux/ValidatorOnboarding/KeyGeneration/slice'
-import { RootState } from '../../redux/store'
 import ActivationValidatorSetup from './ValidatorSetup/ValidatorActivation/ActivationValidatorSetup'
-import './layoutGradient.css'
 import Deposit from './Deposit/Deposit'
+import './layoutGradient.css'
 
 const ValidatorOnboarding = () => {
   const [activeStep, setActiveStep] = useState(0)
diff --git a/src/pages/ValidatorOnboarding/ValidatorSetup/ValidatorSetup/ExecClientCard.tsx b/src/pages/ValidatorOnboarding/ValidatorSetup/ValidatorSetup/ExecClientCard.tsx
index 0238c616..f030317c 100644
--- a/src/pages/ValidatorOnboarding/ValidatorSetup/ValidatorSetup/ExecClientCard.tsx
+++ b/src/pages/ValidatorOnboarding/ValidatorSetup/ValidatorSetup/ExecClientCard.tsx
@@ -3,7 +3,7 @@ import { Text } from '@status-im/components'
 import { useDispatch, useSelector } from 'react-redux'
 
 import Icon from '../../../../components/General/Icon'
-import { selectClient } from '../../../../redux/ValidatorOnboarding/ValidatorSetup/slice'
+import { selectClient } from '../../../../redux/validatorOnboarding/validatorSetup/slice'
 import { RootState } from '../../../../redux/store'
 
 type ExecClientCardProps = {
@@ -24,8 +24,8 @@ const ExecClientCard = ({ name, icon, isComingSoon }: ExecClientCardProps) => {
         border: isComingSoon
           ? '1px solid #F5F6F8'
           : isSelected
-            ? '1px solid #2A4AF5'
-            : '1px solid #DCE0E5',
+          ? '1px solid #2A4AF5'
+          : '1px solid #DCE0E5',
         borderRadius: '16px',
         padding: '12px 16px',
         width: '19%',
diff --git a/src/redux/store.ts b/src/redux/store.ts
index 06218390..603cdc21 100644
--- a/src/redux/store.ts
+++ b/src/redux/store.ts
@@ -2,10 +2,10 @@ import { configureStore } from '@reduxjs/toolkit'
 
 import themeReducer from './theme/slice'
 import deviceHealthReducer from './deviceHealthCheck/slice'
-import pinnedMessageReducer from './PinnedMessage/slice'
-import execClientReducer from './ValidatorOnboarding/ValidatorSetup/slice'
-import keyGenerationReducer from './ValidatorOnboarding/KeyGeneration/slice'
-import depositReducer from './ValidatorOnboarding/Deposit/slice'
+import pinnedMessageReducer from './pinnedMessage/slice'
+import execClientReducer from './validatorOnboarding/validatorSetup/slice'
+import keyGenerationReducer from './validatorOnboarding/keyGeneration/slice'
+import depositReducer from './validatorOnboarding/deposit/slice'
 
 const store = configureStore({
   reducer: {