diff --git a/assets/js/src/webpack_admin_index.jsx b/assets/js/src/webpack_admin_index.jsx
index 66283a8996..19f04b4f9c 100644
--- a/assets/js/src/webpack_admin_index.jsx
+++ b/assets/js/src/webpack_admin_index.jsx
@@ -16,4 +16,4 @@ import 'poll.jsx'; // side effect - assigns to MailPoet.Poll
 import 'settings/reinstall_from_scratch.js'; // side effect - adds event handler to document
 import 'subscribers/importExport/import.jsx'; // side effect - executes on doc ready, adds events
 import 'subscribers/importExport/export.js'; // side effect - executes on doc ready
-import 'welcome_wizard/wizard.jsx'; // side effect - renders ReactDOM to document
+import 'wizard/wizard.jsx'; // side effect - renders ReactDOM to document
diff --git a/assets/js/src/welcome_wizard/create_sender_settings.jsx b/assets/js/src/wizard/create_sender_settings.jsx
similarity index 100%
rename from assets/js/src/welcome_wizard/create_sender_settings.jsx
rename to assets/js/src/wizard/create_sender_settings.jsx
diff --git a/assets/js/src/welcome_wizard/steps/email_course_step.jsx b/assets/js/src/wizard/steps/email_course_step.jsx
similarity index 100%
rename from assets/js/src/welcome_wizard/steps/email_course_step.jsx
rename to assets/js/src/wizard/steps/email_course_step.jsx
diff --git a/assets/js/src/welcome_wizard/steps/migrated_user_step.jsx b/assets/js/src/wizard/steps/migrated_user_step.jsx
similarity index 100%
rename from assets/js/src/welcome_wizard/steps/migrated_user_step.jsx
rename to assets/js/src/wizard/steps/migrated_user_step.jsx
diff --git a/assets/js/src/welcome_wizard/steps/sender_step.jsx b/assets/js/src/wizard/steps/sender_step.jsx
similarity index 100%
rename from assets/js/src/welcome_wizard/steps/sender_step.jsx
rename to assets/js/src/wizard/steps/sender_step.jsx
diff --git a/assets/js/src/welcome_wizard/steps/step_layout.jsx b/assets/js/src/wizard/steps/step_layout.jsx
similarity index 100%
rename from assets/js/src/welcome_wizard/steps/step_layout.jsx
rename to assets/js/src/wizard/steps/step_layout.jsx
diff --git a/assets/js/src/welcome_wizard/steps/usage_tracking_step.jsx b/assets/js/src/wizard/steps/usage_tracking_step.jsx
similarity index 100%
rename from assets/js/src/welcome_wizard/steps/usage_tracking_step.jsx
rename to assets/js/src/wizard/steps/usage_tracking_step.jsx
diff --git a/assets/js/src/welcome_wizard/steps/woo_commerce_step.jsx b/assets/js/src/wizard/steps/woo_commerce_step.jsx
similarity index 100%
rename from assets/js/src/welcome_wizard/steps/woo_commerce_step.jsx
rename to assets/js/src/wizard/steps/woo_commerce_step.jsx
diff --git a/assets/js/src/welcome_wizard/steps_controller.jsx b/assets/js/src/wizard/welcome_wizard_controller.jsx
similarity index 100%
rename from assets/js/src/welcome_wizard/steps_controller.jsx
rename to assets/js/src/wizard/welcome_wizard_controller.jsx
diff --git a/assets/js/src/welcome_wizard/wizard.jsx b/assets/js/src/wizard/wizard.jsx
similarity index 72%
rename from assets/js/src/welcome_wizard/wizard.jsx
rename to assets/js/src/wizard/wizard.jsx
index bc89b0d9d9..987db90185 100644
--- a/assets/js/src/welcome_wizard/wizard.jsx
+++ b/assets/js/src/wizard/wizard.jsx
@@ -1,9 +1,9 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { Route, HashRouter, Redirect } from 'react-router-dom';
-import WelcomeWizardStepsController from './steps_controller.jsx';
+import WelcomeWizardStepsController from './welcome_wizard_controller.jsx';
 
-const container = document.getElementById('welcome_wizard_container');
+const container = document.getElementById('mailpoet_wizard_container');
 
 if (container) {
   ReactDOM.render((
diff --git a/views/welcome_wizard.html b/views/welcome_wizard.html
index 1e163e05a5..22148e816f 100644
--- a/views/welcome_wizard.html
+++ b/views/welcome_wizard.html
@@ -15,7 +15,7 @@
   var admin_email = <%= json_encode(admin_email) %>;
 </script>
 
-<div id="welcome_wizard_container"></div>
+<div id="mailpoet_wizard_container"></div>
 
 <div class="welcome_wizard_video">
     <iframe width="1" height="1" src="https://player.vimeo.com/video/279123953" frameborder="0"></iframe>