diff --git a/src/components/Onboarding/steps/GenuineCheck/GenuineCheckUnavailable.js b/src/components/Onboarding/steps/GenuineCheck/GenuineCheckUnavailable.js
index 3ae20b72..3e620983 100644
--- a/src/components/Onboarding/steps/GenuineCheck/GenuineCheckUnavailable.js
+++ b/src/components/Onboarding/steps/GenuineCheck/GenuineCheckUnavailable.js
@@ -33,7 +33,7 @@ export function GenuineCheckUnavailableFooter({
         <Button
           padded
           disabled={false}
-          event="Skip Genuine Check Onboarding"
+          event="Onboarding Skip Genuine Check"
           onClick={() => nextStep()}
           mx={2}
         >
@@ -64,7 +64,7 @@ export function GenuineCheckUnavailableMessage({
         underline
         onClick={() => {
           handleOpenGenuineCheckModal()
-          track('Genuine Check Unavailable Retry', {
+          track('Genuine Check Retry', {
             flowType: onboarding.flowType,
             deviceType: onboarding.isLedgerNano ? 'Nano S' : 'Blue',
           })
diff --git a/src/components/Onboarding/steps/SetPassword.js b/src/components/Onboarding/steps/SetPassword.js
index 34157cc0..3c1a52eb 100644
--- a/src/components/Onboarding/steps/SetPassword.js
+++ b/src/components/Onboarding/steps/SetPassword.js
@@ -137,7 +137,7 @@ class SetPassword extends PureComponent<StepProps, State> {
           <Box horizontal ml="auto">
             <Button
               padded
-              event="Skip Password Onboarding"
+              event="Onboarding Skip Password"
               onClick={() => nextStep()}
               disabled={false}
               mx={2}