diff --git a/src/pages/ValidatorOnboarding/KeyGeneration/KeyGeneration.tsx b/src/pages/ValidatorOnboarding/KeyGeneration/KeyGeneration.tsx
index 8ecf8033..94ec1d5c 100644
--- a/src/pages/ValidatorOnboarding/KeyGeneration/KeyGeneration.tsx
+++ b/src/pages/ValidatorOnboarding/KeyGeneration/KeyGeneration.tsx
@@ -5,13 +5,13 @@ import { Text } from '@status-im/components'
 import KeyFiles from './KeyFiles'
 import { useState } from 'react'
 import RecoveryPhrase from './RecoveryPhrase'
-import { KEY_FILES, RECOVERY_PHRASE } from '../../../constants'
+import { BOTH_KEY_AND_RECOVERY, KEY_FILES, RECOVERY_PHRASE } from '../../../constants'
 
 const KeyGeneration = () => {
-  const [selectedRecoveryMechanism, setSelectedRecoveryMechanism] = useState(KEY_FILES)
+  const [recoveryMechanism, setRecoveryMechanism] = useState(KEY_FILES)
 
-  const handleRecoveryMechanismChange = (value: string) => {
-    setSelectedRecoveryMechanism(value)
+  const handleRecMechanismChange = (value: string) => {
+    setRecoveryMechanism(value)
   }
 
   const isKeyFiles = recoveryMechanism === KEY_FILES || recoveryMechanism === BOTH_KEY_AND_RECOVERY
@@ -23,8 +23,8 @@ const KeyGeneration = () => {
     <YStack space={'$2'} style={{ width: '100%', padding: '16px 32px', alignItems: 'start' }}>
       <KeyGenerationHeader />
       <RecoveryMechanism
-        selectedRecoveryMechanism={selectedRecoveryMechanism}
-        handleRecoveryMechanismChange={handleRecoveryMechanismChange}
+        recoveryMechanism={recoveryMechanism}
+        handleRecMechanismChange={handleRecMechanismChange}
       />
       <Text size={27} weight={'semibold'}>
         4 Validators
diff --git a/src/pages/ValidatorOnboarding/KeyGeneration/RecoveryMechanism.stories.ts b/src/pages/ValidatorOnboarding/KeyGeneration/RecoveryMechanism.stories.ts
index 02ad657a..7ebf70bc 100644
--- a/src/pages/ValidatorOnboarding/KeyGeneration/RecoveryMechanism.stories.ts
+++ b/src/pages/ValidatorOnboarding/KeyGeneration/RecoveryMechanism.stories.ts
@@ -18,7 +18,7 @@ type Story = StoryObj<typeof meta>
 
 export const Page: Story = {
   args: {
-    selectedRecoveryMechanism: KEY_FILES,
-    handleRecoveryMechanismChange: () => {},
+    recoveryMechanism: KEY_FILES,
+    handleRecMechanismChange: () => {},
   },
 }
diff --git a/src/pages/ValidatorOnboarding/KeyGeneration/RecoveryMechanism.tsx b/src/pages/ValidatorOnboarding/KeyGeneration/RecoveryMechanism.tsx
index baaadc68..eeae39cd 100644
--- a/src/pages/ValidatorOnboarding/KeyGeneration/RecoveryMechanism.tsx
+++ b/src/pages/ValidatorOnboarding/KeyGeneration/RecoveryMechanism.tsx
@@ -4,13 +4,13 @@ import RecoveryMechanismCard from './RecoveryMechanismCard'
 import { BOTH_KEY_AND_RECOVERY, KEY_FILES, RECOVERY_PHRASE } from '../../../constants'
 
 type RecoveryMechanismProps = {
-  selectedRecoveryMechanism: string
-  handleRecoveryMechanismChange: (value: string) => void
+  recoveryMechanism: string
+  handleRecMechanismChange: (value: string) => void
 }
 
 const RecoveryMechanism = ({
-  selectedRecoveryMechanism,
-  handleRecoveryMechanismChange,
+  recoveryMechanism,
+  handleRecMechanismChange,
 }: RecoveryMechanismProps) => {
   return (
     <YStack style={{ width: '100%' }}>
@@ -20,18 +20,18 @@ const RecoveryMechanism = ({
       <XStack space={'$4'} style={{ justifyContent: 'space-between', marginTop: '40px' }}>
         <RecoveryMechanismCard
           value={KEY_FILES}
-          selectedRecoveryMechanism={selectedRecoveryMechanism}
-          handleRecoveryMechanismChange={handleRecoveryMechanismChange}
+          recoveryMechanism={recoveryMechanism}
+          handleRecMechanismChange={handleRecMechanismChange}
         />
         <RecoveryMechanismCard
           value={RECOVERY_PHRASE}
-          selectedRecoveryMechanism={selectedRecoveryMechanism}
-          handleRecoveryMechanismChange={handleRecoveryMechanismChange}
+          recoveryMechanism={recoveryMechanism}
+          handleRecMechanismChange={handleRecMechanismChange}
         />
         <RecoveryMechanismCard
           value={BOTH_KEY_AND_RECOVERY}
-          selectedRecoveryMechanism={selectedRecoveryMechanism}
-          handleRecoveryMechanismChange={handleRecoveryMechanismChange}
+          recoveryMechanism={recoveryMechanism}
+          handleRecMechanismChange={handleRecMechanismChange}
         />
       </XStack>
     </YStack>
diff --git a/src/pages/ValidatorOnboarding/KeyGeneration/RecoveryMechanismCard.stories.ts b/src/pages/ValidatorOnboarding/KeyGeneration/RecoveryMechanismCard.stories.ts
index 8f3192b0..912b5fb1 100644
--- a/src/pages/ValidatorOnboarding/KeyGeneration/RecoveryMechanismCard.stories.ts
+++ b/src/pages/ValidatorOnboarding/KeyGeneration/RecoveryMechanismCard.stories.ts
@@ -19,7 +19,7 @@ type Story = StoryObj<typeof meta>
 export const Page: Story = {
   args: {
     value: KEY_FILES,
-    selectedRecoveryMechanism: KEY_FILES,
-    handleRecoveryMechanismChange: () => {},
+    recoveryMechanism: KEY_FILES,
+    handleRecMechanismChange: () => {},
   },
 }
diff --git a/src/pages/ValidatorOnboarding/KeyGeneration/RecoveryMechanismCard.tsx b/src/pages/ValidatorOnboarding/KeyGeneration/RecoveryMechanismCard.tsx
index df689616..4b5098bd 100644
--- a/src/pages/ValidatorOnboarding/KeyGeneration/RecoveryMechanismCard.tsx
+++ b/src/pages/ValidatorOnboarding/KeyGeneration/RecoveryMechanismCard.tsx
@@ -2,27 +2,27 @@ import { Text } from '@status-im/components'
 
 type RecoveryMechanismProps = {
   value: string
-  selectedRecoveryMechanism: string
-  handleRecoveryMechanismChange: (value: string) => void
+  recoveryMechanism: string
+  handleRecMechanismChange: (value: string) => void
 }
 
 const RecoveryMechanismCard = ({
   value,
-  selectedRecoveryMechanism,
-  handleRecoveryMechanismChange,
+  recoveryMechanism,
+  handleRecMechanismChange,
 }: RecoveryMechanismProps) => {
   return (
     <div
       style={{
-        border: `1px solid ${selectedRecoveryMechanism === value ? '#2A4AF566' : '#DCE0E5'}`,
+        border: `1px solid ${recoveryMechanism === value ? '#2A4AF566' : '#DCE0E5'}`,
         borderRadius: '16px',
         padding: '12px 16px',
         cursor: 'pointer',
-        backgroundColor: selectedRecoveryMechanism === value ? '#f4f6fe' : '#fff',
+        backgroundColor: recoveryMechanism === value ? '#f4f6fe' : '#fff',
         width: '100%',
         height: '140px',
       }}
-      onClick={() => handleRecoveryMechanismChange(value)}
+      onClick={() => handleRecMechanismChange(value)}
     >
       <Text size={15} weight={'semibold'}>
         {value}