diff --git a/internal_packages/onboarding/lib/decorators/create-page-for-form.jsx b/internal_packages/onboarding/lib/decorators/create-page-for-form.jsx
index 5b8404769..98f177409 100644
--- a/internal_packages/onboarding/lib/decorators/create-page-for-form.jsx
+++ b/internal_packages/onboarding/lib/decorators/create-page-for-form.jsx
@@ -4,7 +4,7 @@ import {RetinaImg} from 'nylas-component-kit';
 import {Actions} from 'nylas-exports';
 
 import OnboardingActions from '../onboarding-actions';
-import {runAuthRequest} from '../account-helpers';
+import {runAuthRequest} from '../onboarding-helpers';
 import FormErrorMessage from '../form-error-message';
 import AccountTypes from '../account-types'
 
diff --git a/internal_packages/onboarding/lib/account-helpers.es6 b/internal_packages/onboarding/lib/onboarding-helpers.es6
similarity index 100%
rename from internal_packages/onboarding/lib/account-helpers.es6
rename to internal_packages/onboarding/lib/onboarding-helpers.es6
diff --git a/internal_packages/onboarding/lib/onboarding-store.es6 b/internal_packages/onboarding/lib/onboarding-store.es6
index 4b18e0ffb..e285d0901 100644
--- a/internal_packages/onboarding/lib/onboarding-store.es6
+++ b/internal_packages/onboarding/lib/onboarding-store.es6
@@ -3,7 +3,7 @@ import {AccountStore, Actions, NylasAPI} from 'nylas-exports';
 import {shell, ipcRenderer} from 'electron';
 import NylasStore from 'nylas-store';
 import AccountTypes from './account-types';
-import {buildWelcomeURL} from './account-helpers';
+import {buildWelcomeURL} from './onboarding-helpers';
 
 class OnboardingStore extends NylasStore {
   constructor() {
diff --git a/internal_packages/onboarding/lib/page-account-settings-exchange.jsx b/internal_packages/onboarding/lib/page-account-settings-exchange.jsx
index 15613082c..5a02d2780 100644
--- a/internal_packages/onboarding/lib/page-account-settings-exchange.jsx
+++ b/internal_packages/onboarding/lib/page-account-settings-exchange.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import {RegExpUtils} from 'nylas-exports';
-import {isValidHost} from './account-helpers';
+import {isValidHost} from './onboarding-helpers';
 import CreatePageForForm from './decorators/create-page-for-form';
 import FormField from './form-field';
 
diff --git a/internal_packages/onboarding/lib/page-account-settings-gmail.jsx b/internal_packages/onboarding/lib/page-account-settings-gmail.jsx
index c7152b576..dbcea43a7 100644
--- a/internal_packages/onboarding/lib/page-account-settings-gmail.jsx
+++ b/internal_packages/onboarding/lib/page-account-settings-gmail.jsx
@@ -6,7 +6,7 @@ import {
   pollForGmailAccount,
   buildGmailSessionKey,
   buildGmailAuthURL,
-} from './account-helpers';
+} from './onboarding-helpers';
 
 import OnboardingActions from './onboarding-actions';
 import AccountTypes from './account-types';
diff --git a/internal_packages/onboarding/lib/page-account-settings-imap.jsx b/internal_packages/onboarding/lib/page-account-settings-imap.jsx
index fcc816a4b..6d32b95c7 100644
--- a/internal_packages/onboarding/lib/page-account-settings-imap.jsx
+++ b/internal_packages/onboarding/lib/page-account-settings-imap.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import {isValidHost} from './account-helpers';
+import {isValidHost} from './onboarding-helpers';
 import CreatePageForForm from './decorators/create-page-for-form';
 import FormField from './form-field';
 
diff --git a/internal_packages/onboarding/lib/page-account-settings.jsx b/internal_packages/onboarding/lib/page-account-settings.jsx
index c93339e8a..7caabac54 100644
--- a/internal_packages/onboarding/lib/page-account-settings.jsx
+++ b/internal_packages/onboarding/lib/page-account-settings.jsx
@@ -3,7 +3,7 @@ import {RegExpUtils} from 'nylas-exports';
 
 import OnboardingActions from './onboarding-actions';
 import CreatePageForForm from './decorators/create-page-for-form';
-import {accountInfoWithIMAPAutocompletions} from './account-helpers';
+import {accountInfoWithIMAPAutocompletions} from './onboarding-helpers';
 import FormField from './form-field';
 
 class AccountBasicSettingsForm extends React.Component {