diff --git a/app/components/Onboarding/Onboarding.js b/app/components/Onboarding/Onboarding.js
index 2808ac69f5b..7f426f8b3f6 100644
--- a/app/components/Onboarding/Onboarding.js
+++ b/app/components/Onboarding/Onboarding.js
@@ -5,13 +5,13 @@ import { FormattedMessage } from 'react-intl'
 import { Flex, Box } from 'rebass'
 import { Panel, Wizard } from 'components/UI'
 import {
-  Alias,
   Autopilot,
   BtcPayServer,
   ConnectionType,
   ConnectionDetails,
   ConnectionConfirm,
   Login,
+  Name,
   Password,
   Recover,
   SeedConfirm,
@@ -24,8 +24,8 @@ import messages from './messages'
 class Onboarding extends React.Component {
   static propTypes = {
     // STATE
-    alias: PropTypes.string,
     autopilot: PropTypes.bool,
+    name: PropTypes.string,
     connectionType: PropTypes.string,
     connectionHost: PropTypes.string,
     connectionCert: PropTypes.string,
@@ -44,13 +44,13 @@ class Onboarding extends React.Component {
     fetchSeed: PropTypes.func.isRequired,
     recoverOldWallet: PropTypes.func.isRequired,
     resetOnboarding: PropTypes.func.isRequired,
-    setAlias: PropTypes.func.isRequired,
     setAutopilot: PropTypes.func.isRequired,
     setConnectionType: PropTypes.func.isRequired,
     setConnectionHost: PropTypes.func.isRequired,
     setConnectionCert: PropTypes.func.isRequired,
     setConnectionMacaroon: PropTypes.func.isRequired,
     setConnectionString: PropTypes.func.isRequired,
+    setName: PropTypes.func.isRequired,
     setPassword: PropTypes.func.isRequired,
     startLnd: PropTypes.func.isRequired,
     stopLnd: PropTypes.func.isRequired
@@ -68,8 +68,8 @@ class Onboarding extends React.Component {
   getSteps = () => {
     const {
       // STATE
-      alias,
       autopilot,
+      name,
       connectionType,
       connectionHost,
       connectionCert,
@@ -84,13 +84,13 @@ class Onboarding extends React.Component {
       unlockWalletError,
       fetchingSeed,
       // DISPATCH
-      setAlias,
       setAutopilot,
       setConnectionType,
       setConnectionHost,
       setConnectionCert,
       setConnectionMacaroon,
       setConnectionString,
+      setName,
       setUnlockWalletError,
       setPassword,
       startLnd,
@@ -120,7 +120,7 @@ class Onboarding extends React.Component {
           />,
           <Wizard.Step key="SeedConfirm" component={SeedConfirm} {...{ seed }} />,
           <Wizard.Step key="Password" component={Password} {...{ setPassword }} />,
-          <Wizard.Step key="Alias" component={Alias} {...{ alias, setAlias }} />,
+          <Wizard.Step key="Name" component={Name} {...{ name, setName }} />,
           <Wizard.Step key="Autopilot" component={Autopilot} {...{ autopilot, setAutopilot }} />,
           <Wizard.Step key="WalletCreate" component={WalletCreate} {...{ createNewWallet }} />
         ]
@@ -134,7 +134,7 @@ class Onboarding extends React.Component {
           ...formSteps,
           <Wizard.Step key="Recover" component={Recover} {...{ seed }} />,
           <Wizard.Step key="Password" component={Password} {...{ setPassword }} />,
-          <Wizard.Step key="Alias" component={Alias} {...{ alias, setAlias }} />,
+          <Wizard.Step key="Name" component={Name} {...{ name, setName }} />,
           <Wizard.Step key="Autopilot" component={Autopilot} {...{ autopilot, setAutopilot }} />,
           <Wizard.Step key="WalletRecover" component={WalletRecover} {...{ recoverOldWallet }} />
         ]
diff --git a/app/components/Onboarding/Steps/Name.js b/app/components/Onboarding/Steps/Name.js
new file mode 100644
index 00000000000..b43ecc2b246
--- /dev/null
+++ b/app/components/Onboarding/Steps/Name.js
@@ -0,0 +1,84 @@
+import React from 'react'
+import PropTypes from 'prop-types'
+import { FormattedMessage, injectIntl } from 'react-intl'
+import { Box } from 'rebass'
+import { Bar, Form, Header, Input } from 'components/UI'
+import messages from './messages'
+
+class Name extends React.Component {
+  static propTypes = {
+    wizardApi: PropTypes.object,
+    wizardState: PropTypes.object,
+    name: PropTypes.string,
+    setName: PropTypes.func.isRequired
+  }
+
+  static defaultProps = {
+    wizardApi: {},
+    wizardState: {},
+    name: ''
+  }
+
+  setFormApi = formApi => {
+    this.formApi = formApi
+  }
+
+  handleSubmit = values => {
+    const { setName } = this.props
+    setName(values.name)
+  }
+
+  render() {
+    const { wizardApi, wizardState, name, setName, intl, ...rest } = this.props
+    const { getApi, onChange, preSubmit, onSubmit, onSubmitFailure } = wizardApi
+    const { currentItem } = wizardState
+
+    return (
+      <Form
+        {...rest}
+        getApi={formApi => {
+          this.setFormApi(formApi)
+          if (getApi) {
+            getApi(formApi)
+          }
+        }}
+        onChange={onChange && (formState => onChange(formState, currentItem))}
+        preSubmit={preSubmit}
+        onSubmit={values => {
+          this.handleSubmit(values)
+          if (onSubmit) {
+            onSubmit(values)
+          }
+        }}
+        onSubmitFailure={onSubmitFailure}
+      >
+        {({ formState }) => {
+          const shouldValidateInline = formState.submits > 0
+          return (
+            <>
+              <Header
+                title={<FormattedMessage {...messages.wallet_name_title} />}
+                subtitle={<FormattedMessage {...messages.wallet_name_description} />}
+                align="left"
+              />
+              <Bar my={4} />
+              <Box>
+                <Input
+                  autoFocus
+                  field="name"
+                  name="name"
+                  label={<FormattedMessage {...messages.wallet_name_label} />}
+                  initialValue={name}
+                  validateOnBlur={shouldValidateInline}
+                  validateOnChange={shouldValidateInline}
+                />
+              </Box>
+            </>
+          )
+        }}
+      </Form>
+    )
+  }
+}
+
+export default injectIntl(Name)
diff --git a/app/components/Onboarding/Steps/index.js b/app/components/Onboarding/Steps/index.js
index f7722f0bb51..fb6cb6eb3f9 100644
--- a/app/components/Onboarding/Steps/index.js
+++ b/app/components/Onboarding/Steps/index.js
@@ -5,6 +5,7 @@ export ConnectionConfirm from './ConnectionConfirm'
 export ConnectionDetails from './ConnectionDetails'
 export ConnectionType from './ConnectionType'
 export Login from './Login'
+export Name from './Name'
 export Password from './Password'
 export Recover from './Recover'
 export SeedConfirm from './SeedConfirm'
diff --git a/app/components/Onboarding/Steps/messages.js b/app/components/Onboarding/Steps/messages.js
index 4b69c919c44..a58471caa95 100644
--- a/app/components/Onboarding/Steps/messages.js
+++ b/app/components/Onboarding/Steps/messages.js
@@ -47,7 +47,6 @@ export default defineMessages({
   login_title: 'Welcome back!',
   macaroon_description: 'Path to the lnd macaroon file. Example: /path/to/admin.macaroon',
   next: 'Next',
-  nickname: 'Nickname',
   only: 'only',
   password_confirm_placeholder: 'Confirm Password',
   password_error_length: 'Password must be at least {passwordMinLength} characters long',
@@ -70,6 +69,10 @@ export default defineMessages({
   unlocking: 'Unlocking',
   verify_host_description: 'Please check the hostname carefully.',
   verify_host_title: 'Are you sure you want to connect to',
+  wallet_name_description:
+    'Set a name for your wallet to help you identify it in Zap. This is for internal purposes only and will not be broadcast on the Lightning Network.',
+  wallet_name_title: 'What do you want to call this wallet?',
+  wallet_name_label: 'Wallet Name',
   word_placeholder: 'word',
   generating_seed: 'Generating Seed...'
 })
diff --git a/app/containers/Onboarding.js b/app/containers/Onboarding.js
index ffec7b7e33e..8ca844b23bb 100644
--- a/app/containers/Onboarding.js
+++ b/app/containers/Onboarding.js
@@ -8,6 +8,7 @@ import {
   setConnectionCert,
   setConnectionMacaroon,
   setConnectionString,
+  setName,
   setPassword,
   validateHost,
   validateCert,
@@ -26,6 +27,7 @@ import {
 
 const mapStateToProps = state => ({
   alias: state.onboarding.alias,
+  name: state.onboarding.name,
   autopilot: state.onboarding.autopilot,
   connectionType: state.onboarding.connectionType,
   connectionHost: state.onboarding.connectionHost,
@@ -51,6 +53,7 @@ const mapDispatchToProps = {
   setConnectionCert,
   setConnectionMacaroon,
   setConnectionString,
+  setName,
   setPassword,
   setUnlockWalletError,
   startLnd,
diff --git a/app/lib/zap/controller.js b/app/lib/zap/controller.js
index a549f4578a0..df641761002 100644
--- a/app/lib/zap/controller.js
+++ b/app/lib/zap/controller.js
@@ -19,7 +19,8 @@ type onboardingOptions = {
   cert?: string,
   macaroon?: string,
   alias?: string,
-  autopilot?: boolean
+  autopilot?: boolean,
+  name?: string
 }
 
 const grpcSslCipherSuites = connectionType =>
diff --git a/app/reducers/lnd.js b/app/reducers/lnd.js
index 60f195ab408..fb9bd1b2039 100644
--- a/app/reducers/lnd.js
+++ b/app/reducers/lnd.js
@@ -287,10 +287,9 @@ export const createNewWallet = () => async (dispatch, getState) => {
     type: 'local',
     chain: 'bitcoin',
     network: 'testnet',
-    settings: {
-      autopilot: onboardingState.autopilot,
-      alias: onboardingState.alias
-    }
+    autopilot: onboardingState.autopilot,
+    alias: onboardingState.alias,
+    name: onboardingState.name
   }
 
   // Save the wallet config.
@@ -301,12 +300,17 @@ export const createNewWallet = () => async (dispatch, getState) => {
   await dispatch(startLnd(wallet))
 }
 
-export const recoverOldWallet = () => async dispatch => {
+export const recoverOldWallet = () => async (dispatch, getState) => {
+  const onboardingState = getState().onboarding
+
   // Define the wallet config.
   let wallet = {
     type: 'local',
     chain: 'bitcoin',
-    network: 'testnet'
+    network: 'testnet',
+    autopilot: onboardingState.autopilot,
+    alias: onboardingState.alias,
+    name: onboardingState.name
   }
 
   // Save the wallet config.
diff --git a/app/reducers/onboarding.js b/app/reducers/onboarding.js
index 604b4132be2..d15e5e7c529 100644
--- a/app/reducers/onboarding.js
+++ b/app/reducers/onboarding.js
@@ -14,6 +14,7 @@ export const SET_CONNECTION_HOST = 'SET_CONNECTION_HOST'
 export const SET_CONNECTION_CERT = 'SET_CONNECTION_CERT'
 export const SET_CONNECTION_MACAROON = 'SET_CONNECTION_MACAROON'
 export const SET_ALIAS = 'SET_ALIAS'
+export const SET_NAME = 'SET_NAME'
 export const SET_AUTOPILOT = 'SET_AUTOPILOT'
 export const SET_PASSWORD = 'SET_PASSWORD'
 export const SET_SEED = 'SET_SEED'
@@ -99,6 +100,13 @@ export function setAlias(alias) {
   }
 }
 
+export function setName(name) {
+  return {
+    type: SET_NAME,
+    name
+  }
+}
+
 export function setAutopilot(autopilot) {
   return {
     type: SET_AUTOPILOT,
@@ -176,6 +184,7 @@ const ACTION_HANDLERS = {
   [SET_CONNECTION_CERT]: (state, { connectionCert }) => ({ ...state, connectionCert }),
   [SET_CONNECTION_MACAROON]: (state, { connectionMacaroon }) => ({ ...state, connectionMacaroon }),
   [SET_ALIAS]: (state, { alias }) => ({ ...state, alias }),
+  [SET_NAME]: (state, { name }) => ({ ...state, name }),
   [SET_AUTOPILOT]: (state, { autopilot }) => ({ ...state, autopilot }),
   [SET_SEED]: (state, { seed }) => ({ ...state, seed, fetchingSeed: false }),
   [SET_PASSWORD]: (state, { password }) => ({ ...state, password }),
@@ -228,6 +237,7 @@ const initialState = {
   connectionCert: '',
   connectionMacaroon: '',
   alias: '',
+  name: '',
   password: '',
   seed: []
 }
diff --git a/app/translations/af-ZA.json b/app/translations/af-ZA.json
index ba2e2f9f9df..6411db35ae6 100644
--- a/app/translations/af-ZA.json
+++ b/app/translations/af-ZA.json
@@ -133,7 +133,6 @@
   "components.Onboarding.Steps.login_title": "",
   "components.Onboarding.Steps.macaroon_description": "",
   "components.Onboarding.Steps.next": "",
-  "components.Onboarding.Steps.nickname": "",
   "components.Onboarding.Steps.only": "",
   "components.Onboarding.Steps.password_confirm_placeholder": "",
   "components.Onboarding.Steps.password_description": "",
@@ -153,6 +152,9 @@
   "components.Onboarding.Steps.unlocking": "",
   "components.Onboarding.Steps.verify_host_description": "",
   "components.Onboarding.Steps.verify_host_title": "",
+  "components.Onboarding.Steps.wallet_name_description": "",
+  "components.Onboarding.Steps.wallet_name_label": "",
+  "components.Onboarding.Steps.wallet_name_title": "",
   "components.Onboarding.Steps.word_placeholder": "",
   "components.Onboarding.next": "",
   "components.Onboarding.previous": "",
diff --git a/app/translations/ar-SA.json b/app/translations/ar-SA.json
index 58ce8327023..1afb56be98f 100644
--- a/app/translations/ar-SA.json
+++ b/app/translations/ar-SA.json
@@ -133,7 +133,6 @@
   "components.Onboarding.Steps.login_title": "",
   "components.Onboarding.Steps.macaroon_description": "",
   "components.Onboarding.Steps.next": "",
-  "components.Onboarding.Steps.nickname": "",
   "components.Onboarding.Steps.only": "",
   "components.Onboarding.Steps.password_confirm_placeholder": "",
   "components.Onboarding.Steps.password_description": "",
@@ -153,6 +152,9 @@
   "components.Onboarding.Steps.unlocking": "",
   "components.Onboarding.Steps.verify_host_description": "",
   "components.Onboarding.Steps.verify_host_title": "",
+  "components.Onboarding.Steps.wallet_name_description": "",
+  "components.Onboarding.Steps.wallet_name_label": "",
+  "components.Onboarding.Steps.wallet_name_title": "",
   "components.Onboarding.Steps.word_placeholder": "",
   "components.Onboarding.next": "",
   "components.Onboarding.previous": "",
diff --git a/app/translations/bg-BG.json b/app/translations/bg-BG.json
index 1382e7afc33..d4f444f13c5 100644
--- a/app/translations/bg-BG.json
+++ b/app/translations/bg-BG.json
@@ -133,7 +133,6 @@
   "components.Onboarding.Steps.login_title": "",
   "components.Onboarding.Steps.macaroon_description": "Път до lnd macaroon файла. Пример: /path/to/admin.macaroon",
   "components.Onboarding.Steps.next": "Напред",
-  "components.Onboarding.Steps.nickname": "",
   "components.Onboarding.Steps.only": "само",
   "components.Onboarding.Steps.password_confirm_placeholder": "Потвърди паролата",
   "components.Onboarding.Steps.password_description": "",
@@ -153,6 +152,9 @@
   "components.Onboarding.Steps.unlocking": "",
   "components.Onboarding.Steps.verify_host_description": "Моля, проверете името на хоста внимателно.",
   "components.Onboarding.Steps.verify_host_title": "Сигурни ли сте, че искате да се свържете към",
+  "components.Onboarding.Steps.wallet_name_description": "",
+  "components.Onboarding.Steps.wallet_name_label": "",
+  "components.Onboarding.Steps.wallet_name_title": "",
   "components.Onboarding.Steps.word_placeholder": "дума",
   "components.Onboarding.next": "",
   "components.Onboarding.previous": "",
diff --git a/app/translations/ca-ES.json b/app/translations/ca-ES.json
index ba2e2f9f9df..6411db35ae6 100644
--- a/app/translations/ca-ES.json
+++ b/app/translations/ca-ES.json
@@ -133,7 +133,6 @@
   "components.Onboarding.Steps.login_title": "",
   "components.Onboarding.Steps.macaroon_description": "",
   "components.Onboarding.Steps.next": "",
-  "components.Onboarding.Steps.nickname": "",
   "components.Onboarding.Steps.only": "",
   "components.Onboarding.Steps.password_confirm_placeholder": "",
   "components.Onboarding.Steps.password_description": "",
@@ -153,6 +152,9 @@
   "components.Onboarding.Steps.unlocking": "",
   "components.Onboarding.Steps.verify_host_description": "",
   "components.Onboarding.Steps.verify_host_title": "",
+  "components.Onboarding.Steps.wallet_name_description": "",
+  "components.Onboarding.Steps.wallet_name_label": "",
+  "components.Onboarding.Steps.wallet_name_title": "",
   "components.Onboarding.Steps.word_placeholder": "",
   "components.Onboarding.next": "",
   "components.Onboarding.previous": "",
diff --git a/app/translations/cs-CZ.json b/app/translations/cs-CZ.json
index e3a3a9667a3..a6fff3b9f90 100644
--- a/app/translations/cs-CZ.json
+++ b/app/translations/cs-CZ.json
@@ -133,7 +133,6 @@
   "components.Onboarding.Steps.login_title": "",
   "components.Onboarding.Steps.macaroon_description": "Cesta k souboru lnd macaroon. Příklad: /path/to/admin.macaroon",
   "components.Onboarding.Steps.next": "Další",
-  "components.Onboarding.Steps.nickname": "",
   "components.Onboarding.Steps.only": "",
   "components.Onboarding.Steps.password_confirm_placeholder": "",
   "components.Onboarding.Steps.password_description": "",
@@ -153,6 +152,9 @@
   "components.Onboarding.Steps.unlocking": "",
   "components.Onboarding.Steps.verify_host_description": "Prosím, pečlivě zkontrolujte název hositele.",
   "components.Onboarding.Steps.verify_host_title": "Jste si jistí, že chcete připojit k",
+  "components.Onboarding.Steps.wallet_name_description": "",
+  "components.Onboarding.Steps.wallet_name_label": "",
+  "components.Onboarding.Steps.wallet_name_title": "",
   "components.Onboarding.Steps.word_placeholder": "slovo",
   "components.Onboarding.next": "",
   "components.Onboarding.previous": "",
diff --git a/app/translations/da-DK.json b/app/translations/da-DK.json
index 7d41911578c..7b74c2251e6 100644
--- a/app/translations/da-DK.json
+++ b/app/translations/da-DK.json
@@ -133,7 +133,6 @@
   "components.Onboarding.Steps.login_title": "",
   "components.Onboarding.Steps.macaroon_description": "",
   "components.Onboarding.Steps.next": "Næste",
-  "components.Onboarding.Steps.nickname": "",
   "components.Onboarding.Steps.only": "",
   "components.Onboarding.Steps.password_confirm_placeholder": "",
   "components.Onboarding.Steps.password_description": "",
@@ -153,6 +152,9 @@
   "components.Onboarding.Steps.unlocking": "",
   "components.Onboarding.Steps.verify_host_description": "",
   "components.Onboarding.Steps.verify_host_title": "",
+  "components.Onboarding.Steps.wallet_name_description": "",
+  "components.Onboarding.Steps.wallet_name_label": "",
+  "components.Onboarding.Steps.wallet_name_title": "",
   "components.Onboarding.Steps.word_placeholder": "",
   "components.Onboarding.next": "",
   "components.Onboarding.previous": "",
diff --git a/app/translations/de-DE.json b/app/translations/de-DE.json
index e3be8d4c4ca..b0a0d99ae24 100644
--- a/app/translations/de-DE.json
+++ b/app/translations/de-DE.json
@@ -133,7 +133,6 @@
   "components.Onboarding.Steps.login_title": "",
   "components.Onboarding.Steps.macaroon_description": "Pfad zur lnd macaroon Datei. Beispiel: /path/to/admin.macaroon",
   "components.Onboarding.Steps.next": "Weiter",
-  "components.Onboarding.Steps.nickname": "",
   "components.Onboarding.Steps.only": "nur",
   "components.Onboarding.Steps.password_confirm_placeholder": "Passwort bestätigen",
   "components.Onboarding.Steps.password_description": "",
@@ -153,6 +152,9 @@
   "components.Onboarding.Steps.unlocking": "",
   "components.Onboarding.Steps.verify_host_description": "Bitte überprüfe den Hostnamen sorgfältig.",
   "components.Onboarding.Steps.verify_host_title": "Willst du wirklich eine Verbindung zu .............. herstellen",
+  "components.Onboarding.Steps.wallet_name_description": "",
+  "components.Onboarding.Steps.wallet_name_label": "",
+  "components.Onboarding.Steps.wallet_name_title": "",
   "components.Onboarding.Steps.word_placeholder": "wort",
   "components.Onboarding.next": "",
   "components.Onboarding.previous": "",
diff --git a/app/translations/el-GR.json b/app/translations/el-GR.json
index ef5295511c3..56a2c2d2974 100644
--- a/app/translations/el-GR.json
+++ b/app/translations/el-GR.json
@@ -133,7 +133,6 @@
   "components.Onboarding.Steps.login_title": "",
   "components.Onboarding.Steps.macaroon_description": "Διαδρομή προς το αρχείο macaroon. Παράδειγμα: /path/to/admin.macaroon",
   "components.Onboarding.Steps.next": "Επόμενη",
-  "components.Onboarding.Steps.nickname": "",
   "components.Onboarding.Steps.only": "",
   "components.Onboarding.Steps.password_confirm_placeholder": "",
   "components.Onboarding.Steps.password_description": "",
@@ -153,6 +152,9 @@
   "components.Onboarding.Steps.unlocking": "",
   "components.Onboarding.Steps.verify_host_description": "Ελέγξτε προσεκτικά το όνομα του κεντρικού υπολογιστή.",
   "components.Onboarding.Steps.verify_host_title": "Είστε βέβαιοι ότι θέλετε να συνδεθείτε προς",
+  "components.Onboarding.Steps.wallet_name_description": "",
+  "components.Onboarding.Steps.wallet_name_label": "",
+  "components.Onboarding.Steps.wallet_name_title": "",
   "components.Onboarding.Steps.word_placeholder": "λέξη",
   "components.Onboarding.next": "",
   "components.Onboarding.previous": "",
diff --git a/app/translations/en.json b/app/translations/en.json
index b07dc95d73e..c0d397ab512 100644
--- a/app/translations/en.json
+++ b/app/translations/en.json
@@ -133,7 +133,6 @@
   "components.Onboarding.Steps.login_title": "Welcome back!",
   "components.Onboarding.Steps.macaroon_description": "Path to the lnd macaroon file. Example: /path/to/admin.macaroon",
   "components.Onboarding.Steps.next": "Next",
-  "components.Onboarding.Steps.nickname": "Nickname",
   "components.Onboarding.Steps.only": "only",
   "components.Onboarding.Steps.password_confirm_placeholder": "Confirm Password",
   "components.Onboarding.Steps.password_description": "You would have set your password when first creating your walet. This is separate from your 24 word seed.",
@@ -153,6 +152,9 @@
   "components.Onboarding.Steps.unlocking": "Unlocking",
   "components.Onboarding.Steps.verify_host_description": "Please check the hostname carefully.",
   "components.Onboarding.Steps.verify_host_title": "Are you sure you want to connect to",
+  "components.Onboarding.Steps.wallet_name_description": "Set a name for your wallet to help you identify it in Zap. This is for internal purposes only and will not be broadcast on the Lightning Network.",
+  "components.Onboarding.Steps.wallet_name_label": "Wallet Name",
+  "components.Onboarding.Steps.wallet_name_title": "What do you want to call this wallet?",
   "components.Onboarding.Steps.word_placeholder": "word",
   "components.Onboarding.next": "Next",
   "components.Onboarding.previous": "Back",
diff --git a/app/translations/es-ES.json b/app/translations/es-ES.json
index 49bd5948d21..34aee035070 100644
--- a/app/translations/es-ES.json
+++ b/app/translations/es-ES.json
@@ -133,7 +133,6 @@
   "components.Onboarding.Steps.login_title": "",
   "components.Onboarding.Steps.macaroon_description": "Ruta al archivo lnd macaroon. Ejemplo: /path/to/admin.macaroon",
   "components.Onboarding.Steps.next": "Siguiente",
-  "components.Onboarding.Steps.nickname": "",
   "components.Onboarding.Steps.only": "",
   "components.Onboarding.Steps.password_confirm_placeholder": "",
   "components.Onboarding.Steps.password_description": "",
@@ -153,6 +152,9 @@
   "components.Onboarding.Steps.unlocking": "",
   "components.Onboarding.Steps.verify_host_description": "Por favor chequee el hostname cuidadosamente.",
   "components.Onboarding.Steps.verify_host_title": "¿Está seguro que quiere conectar con",
+  "components.Onboarding.Steps.wallet_name_description": "",
+  "components.Onboarding.Steps.wallet_name_label": "",
+  "components.Onboarding.Steps.wallet_name_title": "",
   "components.Onboarding.Steps.word_placeholder": "palabra",
   "components.Onboarding.next": "",
   "components.Onboarding.previous": "",
diff --git a/app/translations/fi-FI.json b/app/translations/fi-FI.json
index ba2e2f9f9df..6411db35ae6 100644
--- a/app/translations/fi-FI.json
+++ b/app/translations/fi-FI.json
@@ -133,7 +133,6 @@
   "components.Onboarding.Steps.login_title": "",
   "components.Onboarding.Steps.macaroon_description": "",
   "components.Onboarding.Steps.next": "",
-  "components.Onboarding.Steps.nickname": "",
   "components.Onboarding.Steps.only": "",
   "components.Onboarding.Steps.password_confirm_placeholder": "",
   "components.Onboarding.Steps.password_description": "",
@@ -153,6 +152,9 @@
   "components.Onboarding.Steps.unlocking": "",
   "components.Onboarding.Steps.verify_host_description": "",
   "components.Onboarding.Steps.verify_host_title": "",
+  "components.Onboarding.Steps.wallet_name_description": "",
+  "components.Onboarding.Steps.wallet_name_label": "",
+  "components.Onboarding.Steps.wallet_name_title": "",
   "components.Onboarding.Steps.word_placeholder": "",
   "components.Onboarding.next": "",
   "components.Onboarding.previous": "",
diff --git a/app/translations/fr-FR.json b/app/translations/fr-FR.json
index 7b4465a1cee..3ad14dec253 100644
--- a/app/translations/fr-FR.json
+++ b/app/translations/fr-FR.json
@@ -133,7 +133,6 @@
   "components.Onboarding.Steps.login_title": "",
   "components.Onboarding.Steps.macaroon_description": "Le chemin vers le fichier macaroon lnd. Exemple : /path/to/admin.macaroon",
   "components.Onboarding.Steps.next": "Suivant",
-  "components.Onboarding.Steps.nickname": "",
   "components.Onboarding.Steps.only": "",
   "components.Onboarding.Steps.password_confirm_placeholder": "",
   "components.Onboarding.Steps.password_description": "",
@@ -153,6 +152,9 @@
   "components.Onboarding.Steps.unlocking": "",
   "components.Onboarding.Steps.verify_host_description": "Veuillez vérifier soigneusement le nom d’hôte.",
   "components.Onboarding.Steps.verify_host_title": "Êtes-vous sûr de vouloir vous connecter à",
+  "components.Onboarding.Steps.wallet_name_description": "",
+  "components.Onboarding.Steps.wallet_name_label": "",
+  "components.Onboarding.Steps.wallet_name_title": "",
   "components.Onboarding.Steps.word_placeholder": "mot",
   "components.Onboarding.next": "",
   "components.Onboarding.previous": "",
diff --git a/app/translations/ga-IE.json b/app/translations/ga-IE.json
index dbfa7037cd1..897172689a2 100644
--- a/app/translations/ga-IE.json
+++ b/app/translations/ga-IE.json
@@ -133,7 +133,6 @@
   "components.Onboarding.Steps.login_title": "",
   "components.Onboarding.Steps.macaroon_description": "Cosán go dtí an comhad lnd macaroon. Mar shampla: /path/to/admin.macaroon",
   "components.Onboarding.Steps.next": "Ar Aghaidh",
-  "components.Onboarding.Steps.nickname": "",
   "components.Onboarding.Steps.only": "ach amháin",
   "components.Onboarding.Steps.password_confirm_placeholder": "Deimhnigh Pasfhocal",
   "components.Onboarding.Steps.password_description": "",
@@ -153,6 +152,9 @@
   "components.Onboarding.Steps.unlocking": "",
   "components.Onboarding.Steps.verify_host_description": "Le do thoil seiceáil an ainm óstach go cúramach.",
   "components.Onboarding.Steps.verify_host_title": "An bhfuil tú cinnte gur mhaith leat ceangal a dhéanamh le",
+  "components.Onboarding.Steps.wallet_name_description": "",
+  "components.Onboarding.Steps.wallet_name_label": "",
+  "components.Onboarding.Steps.wallet_name_title": "",
   "components.Onboarding.Steps.word_placeholder": "focal",
   "components.Onboarding.next": "",
   "components.Onboarding.previous": "",
diff --git a/app/translations/he-IL.json b/app/translations/he-IL.json
index 842135d2d4a..92af1200fd5 100644
--- a/app/translations/he-IL.json
+++ b/app/translations/he-IL.json
@@ -133,7 +133,6 @@
   "components.Onboarding.Steps.login_title": "",
   "components.Onboarding.Steps.macaroon_description": "",
   "components.Onboarding.Steps.next": "הבא",
-  "components.Onboarding.Steps.nickname": "",
   "components.Onboarding.Steps.only": "",
   "components.Onboarding.Steps.password_confirm_placeholder": "",
   "components.Onboarding.Steps.password_description": "",
@@ -153,6 +152,9 @@
   "components.Onboarding.Steps.unlocking": "",
   "components.Onboarding.Steps.verify_host_description": "",
   "components.Onboarding.Steps.verify_host_title": "",
+  "components.Onboarding.Steps.wallet_name_description": "",
+  "components.Onboarding.Steps.wallet_name_label": "",
+  "components.Onboarding.Steps.wallet_name_title": "",
   "components.Onboarding.Steps.word_placeholder": "",
   "components.Onboarding.next": "",
   "components.Onboarding.previous": "",
diff --git a/app/translations/hi-IN.json b/app/translations/hi-IN.json
index fb34b217bbd..de7ef1ff757 100644
--- a/app/translations/hi-IN.json
+++ b/app/translations/hi-IN.json
@@ -133,7 +133,6 @@
   "components.Onboarding.Steps.login_title": "",
   "components.Onboarding.Steps.macaroon_description": "",
   "components.Onboarding.Steps.next": "",
-  "components.Onboarding.Steps.nickname": "",
   "components.Onboarding.Steps.only": "केवल",
   "components.Onboarding.Steps.password_confirm_placeholder": "",
   "components.Onboarding.Steps.password_description": "",
@@ -153,6 +152,9 @@
   "components.Onboarding.Steps.unlocking": "",
   "components.Onboarding.Steps.verify_host_description": "",
   "components.Onboarding.Steps.verify_host_title": "",
+  "components.Onboarding.Steps.wallet_name_description": "",
+  "components.Onboarding.Steps.wallet_name_label": "",
+  "components.Onboarding.Steps.wallet_name_title": "",
   "components.Onboarding.Steps.word_placeholder": "",
   "components.Onboarding.next": "",
   "components.Onboarding.previous": "",
diff --git a/app/translations/hr-HR.json b/app/translations/hr-HR.json
index 5a6bd1d5a9b..bf95382b443 100644
--- a/app/translations/hr-HR.json
+++ b/app/translations/hr-HR.json
@@ -133,7 +133,6 @@
   "components.Onboarding.Steps.login_title": "",
   "components.Onboarding.Steps.macaroon_description": "Put do Lnd makaron datoteke. Primjer: /path/to/admin.macaroon",
   "components.Onboarding.Steps.next": "Slijedeće",
-  "components.Onboarding.Steps.nickname": "",
   "components.Onboarding.Steps.only": "samo",
   "components.Onboarding.Steps.password_confirm_placeholder": "Potvrdi Lozinku",
   "components.Onboarding.Steps.password_description": "",
@@ -153,6 +152,9 @@
   "components.Onboarding.Steps.unlocking": "Otključavanje",
   "components.Onboarding.Steps.verify_host_description": "Pažljivo provjerite ime hosta.",
   "components.Onboarding.Steps.verify_host_title": "Jeste li sigurni da se želite povezati sa",
+  "components.Onboarding.Steps.wallet_name_description": "",
+  "components.Onboarding.Steps.wallet_name_label": "",
+  "components.Onboarding.Steps.wallet_name_title": "",
   "components.Onboarding.Steps.word_placeholder": "riječ",
   "components.Onboarding.next": "",
   "components.Onboarding.previous": "",
diff --git a/app/translations/hu-HU.json b/app/translations/hu-HU.json
index ba2e2f9f9df..6411db35ae6 100644
--- a/app/translations/hu-HU.json
+++ b/app/translations/hu-HU.json
@@ -133,7 +133,6 @@
   "components.Onboarding.Steps.login_title": "",
   "components.Onboarding.Steps.macaroon_description": "",
   "components.Onboarding.Steps.next": "",
-  "components.Onboarding.Steps.nickname": "",
   "components.Onboarding.Steps.only": "",
   "components.Onboarding.Steps.password_confirm_placeholder": "",
   "components.Onboarding.Steps.password_description": "",
@@ -153,6 +152,9 @@
   "components.Onboarding.Steps.unlocking": "",
   "components.Onboarding.Steps.verify_host_description": "",
   "components.Onboarding.Steps.verify_host_title": "",
+  "components.Onboarding.Steps.wallet_name_description": "",
+  "components.Onboarding.Steps.wallet_name_label": "",
+  "components.Onboarding.Steps.wallet_name_title": "",
   "components.Onboarding.Steps.word_placeholder": "",
   "components.Onboarding.next": "",
   "components.Onboarding.previous": "",
diff --git a/app/translations/it-IT.json b/app/translations/it-IT.json
index ad69b1b5806..8718c254897 100644
--- a/app/translations/it-IT.json
+++ b/app/translations/it-IT.json
@@ -133,7 +133,6 @@
   "components.Onboarding.Steps.login_title": "",
   "components.Onboarding.Steps.macaroon_description": "",
   "components.Onboarding.Steps.next": "",
-  "components.Onboarding.Steps.nickname": "",
   "components.Onboarding.Steps.only": "",
   "components.Onboarding.Steps.password_confirm_placeholder": "",
   "components.Onboarding.Steps.password_description": "",
@@ -153,6 +152,9 @@
   "components.Onboarding.Steps.unlocking": "",
   "components.Onboarding.Steps.verify_host_description": "",
   "components.Onboarding.Steps.verify_host_title": "",
+  "components.Onboarding.Steps.wallet_name_description": "",
+  "components.Onboarding.Steps.wallet_name_label": "",
+  "components.Onboarding.Steps.wallet_name_title": "",
   "components.Onboarding.Steps.word_placeholder": "",
   "components.Onboarding.next": "",
   "components.Onboarding.previous": "",
diff --git a/app/translations/ja-JP.json b/app/translations/ja-JP.json
index 691b830f660..d32e4e51d4b 100644
--- a/app/translations/ja-JP.json
+++ b/app/translations/ja-JP.json
@@ -133,7 +133,6 @@
   "components.Onboarding.Steps.login_title": "",
   "components.Onboarding.Steps.macaroon_description": "Lndマカロン ファイルへのパス。例:/path/to/admin.macaroon",
   "components.Onboarding.Steps.next": "次へ",
-  "components.Onboarding.Steps.nickname": "",
   "components.Onboarding.Steps.only": "",
   "components.Onboarding.Steps.password_confirm_placeholder": "",
   "components.Onboarding.Steps.password_description": "",
@@ -153,6 +152,9 @@
   "components.Onboarding.Steps.unlocking": "",
   "components.Onboarding.Steps.verify_host_description": "ホスト名を慎重に確認してください。",
   "components.Onboarding.Steps.verify_host_title": "本当に接続したいのですか",
+  "components.Onboarding.Steps.wallet_name_description": "",
+  "components.Onboarding.Steps.wallet_name_label": "",
+  "components.Onboarding.Steps.wallet_name_title": "",
   "components.Onboarding.Steps.word_placeholder": "単語",
   "components.Onboarding.next": "",
   "components.Onboarding.previous": "",
diff --git a/app/translations/ko-KR.json b/app/translations/ko-KR.json
index ba2e2f9f9df..6411db35ae6 100644
--- a/app/translations/ko-KR.json
+++ b/app/translations/ko-KR.json
@@ -133,7 +133,6 @@
   "components.Onboarding.Steps.login_title": "",
   "components.Onboarding.Steps.macaroon_description": "",
   "components.Onboarding.Steps.next": "",
-  "components.Onboarding.Steps.nickname": "",
   "components.Onboarding.Steps.only": "",
   "components.Onboarding.Steps.password_confirm_placeholder": "",
   "components.Onboarding.Steps.password_description": "",
@@ -153,6 +152,9 @@
   "components.Onboarding.Steps.unlocking": "",
   "components.Onboarding.Steps.verify_host_description": "",
   "components.Onboarding.Steps.verify_host_title": "",
+  "components.Onboarding.Steps.wallet_name_description": "",
+  "components.Onboarding.Steps.wallet_name_label": "",
+  "components.Onboarding.Steps.wallet_name_title": "",
   "components.Onboarding.Steps.word_placeholder": "",
   "components.Onboarding.next": "",
   "components.Onboarding.previous": "",
diff --git a/app/translations/nl-NL.json b/app/translations/nl-NL.json
index 92a3c5236ce..16de2773864 100644
--- a/app/translations/nl-NL.json
+++ b/app/translations/nl-NL.json
@@ -133,7 +133,6 @@
   "components.Onboarding.Steps.login_title": "",
   "components.Onboarding.Steps.macaroon_description": "Pad naar het bestand lnd macaroon. Voorbeeld: /path/to/admin.macaroon",
   "components.Onboarding.Steps.next": "Volgende",
-  "components.Onboarding.Steps.nickname": "",
   "components.Onboarding.Steps.only": "",
   "components.Onboarding.Steps.password_confirm_placeholder": "",
   "components.Onboarding.Steps.password_description": "",
@@ -153,6 +152,9 @@
   "components.Onboarding.Steps.unlocking": "",
   "components.Onboarding.Steps.verify_host_description": "Controleer zorgvuldig de hostnaam.",
   "components.Onboarding.Steps.verify_host_title": "Weet je zeker dat je verbinding wil maken met",
+  "components.Onboarding.Steps.wallet_name_description": "",
+  "components.Onboarding.Steps.wallet_name_label": "",
+  "components.Onboarding.Steps.wallet_name_title": "",
   "components.Onboarding.Steps.word_placeholder": "woord",
   "components.Onboarding.next": "",
   "components.Onboarding.previous": "",
diff --git a/app/translations/no-NO.json b/app/translations/no-NO.json
index ba2e2f9f9df..6411db35ae6 100644
--- a/app/translations/no-NO.json
+++ b/app/translations/no-NO.json
@@ -133,7 +133,6 @@
   "components.Onboarding.Steps.login_title": "",
   "components.Onboarding.Steps.macaroon_description": "",
   "components.Onboarding.Steps.next": "",
-  "components.Onboarding.Steps.nickname": "",
   "components.Onboarding.Steps.only": "",
   "components.Onboarding.Steps.password_confirm_placeholder": "",
   "components.Onboarding.Steps.password_description": "",
@@ -153,6 +152,9 @@
   "components.Onboarding.Steps.unlocking": "",
   "components.Onboarding.Steps.verify_host_description": "",
   "components.Onboarding.Steps.verify_host_title": "",
+  "components.Onboarding.Steps.wallet_name_description": "",
+  "components.Onboarding.Steps.wallet_name_label": "",
+  "components.Onboarding.Steps.wallet_name_title": "",
   "components.Onboarding.Steps.word_placeholder": "",
   "components.Onboarding.next": "",
   "components.Onboarding.previous": "",
diff --git a/app/translations/pl-PL.json b/app/translations/pl-PL.json
index 076d9c34f99..00bd9e0d659 100644
--- a/app/translations/pl-PL.json
+++ b/app/translations/pl-PL.json
@@ -133,7 +133,6 @@
   "components.Onboarding.Steps.login_title": "",
   "components.Onboarding.Steps.macaroon_description": "",
   "components.Onboarding.Steps.next": "Dalej",
-  "components.Onboarding.Steps.nickname": "",
   "components.Onboarding.Steps.only": "",
   "components.Onboarding.Steps.password_confirm_placeholder": "",
   "components.Onboarding.Steps.password_description": "",
@@ -153,6 +152,9 @@
   "components.Onboarding.Steps.unlocking": "",
   "components.Onboarding.Steps.verify_host_description": "",
   "components.Onboarding.Steps.verify_host_title": "",
+  "components.Onboarding.Steps.wallet_name_description": "",
+  "components.Onboarding.Steps.wallet_name_label": "",
+  "components.Onboarding.Steps.wallet_name_title": "",
   "components.Onboarding.Steps.word_placeholder": "",
   "components.Onboarding.next": "",
   "components.Onboarding.previous": "",
diff --git a/app/translations/pt-BR.json b/app/translations/pt-BR.json
index 67d555e2163..de316c554e8 100644
--- a/app/translations/pt-BR.json
+++ b/app/translations/pt-BR.json
@@ -133,7 +133,6 @@
   "components.Onboarding.Steps.login_title": "",
   "components.Onboarding.Steps.macaroon_description": "Path to the lnd macaroon file. Exemplo: /path/to/admin.macaroon",
   "components.Onboarding.Steps.next": "Seguinte",
-  "components.Onboarding.Steps.nickname": "",
   "components.Onboarding.Steps.only": "",
   "components.Onboarding.Steps.password_confirm_placeholder": "",
   "components.Onboarding.Steps.password_description": "",
@@ -153,6 +152,9 @@
   "components.Onboarding.Steps.unlocking": "",
   "components.Onboarding.Steps.verify_host_description": "Por favor, verifique o nome do host com cuidado.",
   "components.Onboarding.Steps.verify_host_title": "Tem certeza de que você deseja se conectar ao",
+  "components.Onboarding.Steps.wallet_name_description": "",
+  "components.Onboarding.Steps.wallet_name_label": "",
+  "components.Onboarding.Steps.wallet_name_title": "",
   "components.Onboarding.Steps.word_placeholder": "palavra",
   "components.Onboarding.next": "",
   "components.Onboarding.previous": "",
diff --git a/app/translations/pt-PT.json b/app/translations/pt-PT.json
index fea44aa08b7..3b6e210e04e 100644
--- a/app/translations/pt-PT.json
+++ b/app/translations/pt-PT.json
@@ -133,7 +133,6 @@
   "components.Onboarding.Steps.login_title": "",
   "components.Onboarding.Steps.macaroon_description": "",
   "components.Onboarding.Steps.next": "",
-  "components.Onboarding.Steps.nickname": "",
   "components.Onboarding.Steps.only": "",
   "components.Onboarding.Steps.password_confirm_placeholder": "",
   "components.Onboarding.Steps.password_description": "",
@@ -153,6 +152,9 @@
   "components.Onboarding.Steps.unlocking": "",
   "components.Onboarding.Steps.verify_host_description": "",
   "components.Onboarding.Steps.verify_host_title": "",
+  "components.Onboarding.Steps.wallet_name_description": "",
+  "components.Onboarding.Steps.wallet_name_label": "",
+  "components.Onboarding.Steps.wallet_name_title": "",
   "components.Onboarding.Steps.word_placeholder": "",
   "components.Onboarding.next": "",
   "components.Onboarding.previous": "",
diff --git a/app/translations/ro-RO.json b/app/translations/ro-RO.json
index 402014845c9..2f847ffacd5 100644
--- a/app/translations/ro-RO.json
+++ b/app/translations/ro-RO.json
@@ -133,7 +133,6 @@
   "components.Onboarding.Steps.login_title": "",
   "components.Onboarding.Steps.macaroon_description": "Calea către fişierul de macaron lnd. Exemplu: /path/to/admin.macaroon",
   "components.Onboarding.Steps.next": "Următoarea",
-  "components.Onboarding.Steps.nickname": "",
   "components.Onboarding.Steps.only": "",
   "components.Onboarding.Steps.password_confirm_placeholder": "",
   "components.Onboarding.Steps.password_description": "",
@@ -153,6 +152,9 @@
   "components.Onboarding.Steps.unlocking": "",
   "components.Onboarding.Steps.verify_host_description": "Vă rugăm să verificaţi hostname-ul cu atenţie.",
   "components.Onboarding.Steps.verify_host_title": "Sunteţi sigur că doriţi să vă conectaţi la",
+  "components.Onboarding.Steps.wallet_name_description": "",
+  "components.Onboarding.Steps.wallet_name_label": "",
+  "components.Onboarding.Steps.wallet_name_title": "",
   "components.Onboarding.Steps.word_placeholder": "cuvânt",
   "components.Onboarding.next": "",
   "components.Onboarding.previous": "",
diff --git a/app/translations/ru-RU.json b/app/translations/ru-RU.json
index a37c835ff0e..ef4ef06bdbc 100644
--- a/app/translations/ru-RU.json
+++ b/app/translations/ru-RU.json
@@ -133,7 +133,6 @@
   "components.Onboarding.Steps.login_title": "",
   "components.Onboarding.Steps.macaroon_description": "Путь до файла lnd. Пример: /path/to/admin.macaroon",
   "components.Onboarding.Steps.next": "Следующее",
-  "components.Onboarding.Steps.nickname": "",
   "components.Onboarding.Steps.only": "",
   "components.Onboarding.Steps.password_confirm_placeholder": "",
   "components.Onboarding.Steps.password_description": "",
@@ -153,6 +152,9 @@
   "components.Onboarding.Steps.unlocking": "",
   "components.Onboarding.Steps.verify_host_description": "Пожалуйста, внимательно проверьте имя хоста (hostname).",
   "components.Onboarding.Steps.verify_host_title": "Уверены, что хотите подключиться (к)",
+  "components.Onboarding.Steps.wallet_name_description": "",
+  "components.Onboarding.Steps.wallet_name_label": "",
+  "components.Onboarding.Steps.wallet_name_title": "",
   "components.Onboarding.Steps.word_placeholder": "слово",
   "components.Onboarding.next": "",
   "components.Onboarding.previous": "",
diff --git a/app/translations/sr-SP.json b/app/translations/sr-SP.json
index ba2e2f9f9df..6411db35ae6 100644
--- a/app/translations/sr-SP.json
+++ b/app/translations/sr-SP.json
@@ -133,7 +133,6 @@
   "components.Onboarding.Steps.login_title": "",
   "components.Onboarding.Steps.macaroon_description": "",
   "components.Onboarding.Steps.next": "",
-  "components.Onboarding.Steps.nickname": "",
   "components.Onboarding.Steps.only": "",
   "components.Onboarding.Steps.password_confirm_placeholder": "",
   "components.Onboarding.Steps.password_description": "",
@@ -153,6 +152,9 @@
   "components.Onboarding.Steps.unlocking": "",
   "components.Onboarding.Steps.verify_host_description": "",
   "components.Onboarding.Steps.verify_host_title": "",
+  "components.Onboarding.Steps.wallet_name_description": "",
+  "components.Onboarding.Steps.wallet_name_label": "",
+  "components.Onboarding.Steps.wallet_name_title": "",
   "components.Onboarding.Steps.word_placeholder": "",
   "components.Onboarding.next": "",
   "components.Onboarding.previous": "",
diff --git a/app/translations/sv-SE.json b/app/translations/sv-SE.json
index cf48139e637..9e316acf84b 100644
--- a/app/translations/sv-SE.json
+++ b/app/translations/sv-SE.json
@@ -133,7 +133,6 @@
   "components.Onboarding.Steps.login_title": "",
   "components.Onboarding.Steps.macaroon_description": "Sökvägen till lnd macaroon filen. Exempel: /path/to/admin.macaroon",
   "components.Onboarding.Steps.next": "Nästa",
-  "components.Onboarding.Steps.nickname": "",
   "components.Onboarding.Steps.only": "",
   "components.Onboarding.Steps.password_confirm_placeholder": "",
   "components.Onboarding.Steps.password_description": "",
@@ -153,6 +152,9 @@
   "components.Onboarding.Steps.unlocking": "",
   "components.Onboarding.Steps.verify_host_description": "Vänligen kontrollera hostname noggrant.",
   "components.Onboarding.Steps.verify_host_title": "Är du säker på att du vill ansluta till",
+  "components.Onboarding.Steps.wallet_name_description": "",
+  "components.Onboarding.Steps.wallet_name_label": "",
+  "components.Onboarding.Steps.wallet_name_title": "",
   "components.Onboarding.Steps.word_placeholder": "ord",
   "components.Onboarding.next": "",
   "components.Onboarding.previous": "",
diff --git a/app/translations/tr-TR.json b/app/translations/tr-TR.json
index d82e23a84eb..67c9a4c6a59 100644
--- a/app/translations/tr-TR.json
+++ b/app/translations/tr-TR.json
@@ -133,7 +133,6 @@
   "components.Onboarding.Steps.login_title": "",
   "components.Onboarding.Steps.macaroon_description": "Lnd macaroon dosyasının konumu. Örnek: /path/to/admin.macaroon",
   "components.Onboarding.Steps.next": "Sonraki",
-  "components.Onboarding.Steps.nickname": "",
   "components.Onboarding.Steps.only": "",
   "components.Onboarding.Steps.password_confirm_placeholder": "",
   "components.Onboarding.Steps.password_description": "",
@@ -153,6 +152,9 @@
   "components.Onboarding.Steps.unlocking": "",
   "components.Onboarding.Steps.verify_host_description": "Lütfen ana bilgisayar adını dikkatlice kontrol edin.",
   "components.Onboarding.Steps.verify_host_title": "Bağlanmak istediğine emin misin",
+  "components.Onboarding.Steps.wallet_name_description": "",
+  "components.Onboarding.Steps.wallet_name_label": "",
+  "components.Onboarding.Steps.wallet_name_title": "",
   "components.Onboarding.Steps.word_placeholder": "kelime",
   "components.Onboarding.next": "",
   "components.Onboarding.previous": "",
diff --git a/app/translations/uk-UA.json b/app/translations/uk-UA.json
index 5867b3d8e8c..555d0ae37fc 100644
--- a/app/translations/uk-UA.json
+++ b/app/translations/uk-UA.json
@@ -133,7 +133,6 @@
   "components.Onboarding.Steps.login_title": "",
   "components.Onboarding.Steps.macaroon_description": "Шлях до файлу lnd macaroon. Приклад: /path/to/admin.macaroon",
   "components.Onboarding.Steps.next": "Наступний",
-  "components.Onboarding.Steps.nickname": "",
   "components.Onboarding.Steps.only": "",
   "components.Onboarding.Steps.password_confirm_placeholder": "",
   "components.Onboarding.Steps.password_description": "",
@@ -153,6 +152,9 @@
   "components.Onboarding.Steps.unlocking": "",
   "components.Onboarding.Steps.verify_host_description": "Перевірте ім'я хоста.",
   "components.Onboarding.Steps.verify_host_title": "Ви дійсно бажаєте підключитися до",
+  "components.Onboarding.Steps.wallet_name_description": "",
+  "components.Onboarding.Steps.wallet_name_label": "",
+  "components.Onboarding.Steps.wallet_name_title": "",
   "components.Onboarding.Steps.word_placeholder": "слово",
   "components.Onboarding.next": "",
   "components.Onboarding.previous": "",
diff --git a/app/translations/vi-VN.json b/app/translations/vi-VN.json
index ba2e2f9f9df..6411db35ae6 100644
--- a/app/translations/vi-VN.json
+++ b/app/translations/vi-VN.json
@@ -133,7 +133,6 @@
   "components.Onboarding.Steps.login_title": "",
   "components.Onboarding.Steps.macaroon_description": "",
   "components.Onboarding.Steps.next": "",
-  "components.Onboarding.Steps.nickname": "",
   "components.Onboarding.Steps.only": "",
   "components.Onboarding.Steps.password_confirm_placeholder": "",
   "components.Onboarding.Steps.password_description": "",
@@ -153,6 +152,9 @@
   "components.Onboarding.Steps.unlocking": "",
   "components.Onboarding.Steps.verify_host_description": "",
   "components.Onboarding.Steps.verify_host_title": "",
+  "components.Onboarding.Steps.wallet_name_description": "",
+  "components.Onboarding.Steps.wallet_name_label": "",
+  "components.Onboarding.Steps.wallet_name_title": "",
   "components.Onboarding.Steps.word_placeholder": "",
   "components.Onboarding.next": "",
   "components.Onboarding.previous": "",
diff --git a/app/translations/zh-CN.json b/app/translations/zh-CN.json
index 9ced19bfd31..5b64148da56 100644
--- a/app/translations/zh-CN.json
+++ b/app/translations/zh-CN.json
@@ -133,7 +133,6 @@
   "components.Onboarding.Steps.login_title": "",
   "components.Onboarding.Steps.macaroon_description": "lnd macaroon 文件的路径。示例:/path/to/admin.macaroon",
   "components.Onboarding.Steps.next": "下一个",
-  "components.Onboarding.Steps.nickname": "",
   "components.Onboarding.Steps.only": "",
   "components.Onboarding.Steps.password_confirm_placeholder": "",
   "components.Onboarding.Steps.password_description": "",
@@ -153,6 +152,9 @@
   "components.Onboarding.Steps.unlocking": "",
   "components.Onboarding.Steps.verify_host_description": "请仔细检查主机名。",
   "components.Onboarding.Steps.verify_host_title": "确认要连接到",
+  "components.Onboarding.Steps.wallet_name_description": "",
+  "components.Onboarding.Steps.wallet_name_label": "",
+  "components.Onboarding.Steps.wallet_name_title": "",
   "components.Onboarding.Steps.word_placeholder": "助记词",
   "components.Onboarding.next": "",
   "components.Onboarding.previous": "",
diff --git a/app/translations/zh-TW.json b/app/translations/zh-TW.json
index d512c5c5ae3..2c11ce849b7 100644
--- a/app/translations/zh-TW.json
+++ b/app/translations/zh-TW.json
@@ -133,7 +133,6 @@
   "components.Onboarding.Steps.login_title": "",
   "components.Onboarding.Steps.macaroon_description": "lnd macaroon 文件的路径。示例:/path/to/admin.macaroon",
   "components.Onboarding.Steps.next": "下一个",
-  "components.Onboarding.Steps.nickname": "",
   "components.Onboarding.Steps.only": "",
   "components.Onboarding.Steps.password_confirm_placeholder": "",
   "components.Onboarding.Steps.password_description": "",
@@ -153,6 +152,9 @@
   "components.Onboarding.Steps.unlocking": "",
   "components.Onboarding.Steps.verify_host_description": "请仔细检查主机名。",
   "components.Onboarding.Steps.verify_host_title": "确认要连接到",
+  "components.Onboarding.Steps.wallet_name_description": "",
+  "components.Onboarding.Steps.wallet_name_label": "",
+  "components.Onboarding.Steps.wallet_name_title": "",
   "components.Onboarding.Steps.word_placeholder": "",
   "components.Onboarding.next": "",
   "components.Onboarding.previous": "",
diff --git a/stories/containers/onboarding.stories.js b/stories/containers/onboarding.stories.js
index 3a269d5a0de..d1ab38665e5 100644
--- a/stories/containers/onboarding.stories.js
+++ b/stories/containers/onboarding.stories.js
@@ -9,7 +9,7 @@ import { Onboarding } from 'components/Onboarding'
 const delay = time => new Promise(resolve => setTimeout(() => resolve(), time))
 
 const initialValues = {
-  alias: '',
+  name: '',
   connectionType: 'local',
   connectionHost: '',
   connectionCert: '',
@@ -42,7 +42,7 @@ const setConnectionHost = connectionHost => store.set({ connectionHost })
 const setConnectionCert = connectionCert => store.set({ connectionCert })
 const setConnectionMacaroon = connectionMacaroon => store.set({ connectionMacaroon })
 const setConnectionString = connectionString => store.set({ connectionString })
-const setAlias = alias => store.set({ alias })
+const setName = name => store.set({ name })
 const setAutopilot = autopilot => store.set({ autopilot })
 const setPassword = password => store.set({ password })
 
@@ -135,7 +135,7 @@ storiesOf('Containers.Onboarding', module)
         <Onboarding
           // DISPATCH
           resetOnboarding={resetOnboarding}
-          setAlias={setAlias}
+          setName={setName}
           setAutopilot={setAutopilot}
           setConnectionType={setConnectionType}
           setConnectionHost={setConnectionHost}
diff --git a/stories/containers/onboarding/onboarding.component.stories.js b/stories/containers/onboarding/onboarding.component.stories.js
index d7e351f7993..85682e5a266 100644
--- a/stories/containers/onboarding/onboarding.component.stories.js
+++ b/stories/containers/onboarding/onboarding.component.stories.js
@@ -8,6 +8,7 @@ import {
   ConnectionDetails,
   ConnectionConfirm,
   Login,
+  Name,
   Password,
   Recover,
   SeedConfirm,
@@ -37,6 +38,7 @@ storiesOf('Containers.Onboarding.Forms', module)
   .add('Password', () => <Password />)
   .add('Recover', () => <Recover seed={[]} />)
   .add('Alias', () => <Alias />)
+  .add('Name', () => <Name />)
   .add('Autopilot', () => <Autopilot />)
   .add('SeedConfirm', () => (
     <SeedConfirm