diff --git a/src/Artemis.UI/Screens/RootViewModel.cs b/src/Artemis.UI/Screens/RootViewModel.cs
index 42d642e08..a510aa954 100644
--- a/src/Artemis.UI/Screens/RootViewModel.cs
+++ b/src/Artemis.UI/Screens/RootViewModel.cs
@@ -10,8 +10,8 @@ using Artemis.Core.Services;
 using Artemis.UI.Events;
 using Artemis.UI.Screens.Modules;
 using Artemis.UI.Screens.Settings.Tabs.General;
-using Artemis.UI.Screens.SetupWizard;
 using Artemis.UI.Screens.Sidebar;
+using Artemis.UI.Screens.StartupWizard;
 using Artemis.UI.Services;
 using Artemis.UI.Services.Interfaces;
 using Artemis.UI.Utilities;
@@ -300,7 +300,7 @@ namespace Artemis.UI.Screens
 
         private void ShowSetupWizard()
         {
-            _windowManager.ShowDialog(_kernel.Get<SetupWizardViewModel>());
+            _windowManager.ShowDialog(_kernel.Get<StartupWizardViewModel>());
         }
 
         protected override void OnClose()
diff --git a/src/Artemis.UI/Screens/Settings/Tabs/General/GeneralSettingsTabView.xaml b/src/Artemis.UI/Screens/Settings/Tabs/General/GeneralSettingsTabView.xaml
index 2d4984145..e02dbda31 100644
--- a/src/Artemis.UI/Screens/Settings/Tabs/General/GeneralSettingsTabView.xaml
+++ b/src/Artemis.UI/Screens/Settings/Tabs/General/GeneralSettingsTabView.xaml
@@ -92,7 +92,7 @@
                         <StackPanel Grid.Column="0" VerticalAlignment="Center">
                             <TextBlock Style="{StaticResource MaterialDesignTextBlock}">Setup wizard</TextBlock>
                             <TextBlock Style="{StaticResource MaterialDesignTextBlock}" Foreground="{DynamicResource MaterialDesignNavigationItemSubheader}">
-                                Opens the setup wizard usually shown when Artemis first starts.
+                                Opens the startup wizard usually shown when Artemis first starts.
                             </TextBlock>
                         </StackPanel>
                         <StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center">
diff --git a/src/Artemis.UI/Screens/Settings/Tabs/General/GeneralSettingsTabViewModel.cs b/src/Artemis.UI/Screens/Settings/Tabs/General/GeneralSettingsTabViewModel.cs
index c19d3edf1..743ba70e4 100644
--- a/src/Artemis.UI/Screens/Settings/Tabs/General/GeneralSettingsTabViewModel.cs
+++ b/src/Artemis.UI/Screens/Settings/Tabs/General/GeneralSettingsTabViewModel.cs
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 using Artemis.Core;
 using Artemis.Core.LayerBrushes;
 using Artemis.Core.Services;
-using Artemis.UI.Screens.SetupWizard;
+using Artemis.UI.Screens.StartupWizard;
 using Artemis.UI.Services.Interfaces;
 using Artemis.UI.Shared;
 using Artemis.UI.Shared.Services;
@@ -213,7 +213,7 @@ namespace Artemis.UI.Screens.Settings.Tabs.General
 
         public void ShowSetupWizard()
         {
-            _windowManager.ShowDialog(_kernel.Get<SetupWizardViewModel>());
+            _windowManager.ShowDialog(_kernel.Get<StartupWizardViewModel>());
         }
 
         public void ShowDataFolder()
diff --git a/src/Artemis.UI/Screens/SetupWizard/SetupWizardView.xaml b/src/Artemis.UI/Screens/StartupWizard/StartupWizardView.xaml
similarity index 93%
rename from src/Artemis.UI/Screens/SetupWizard/SetupWizardView.xaml
rename to src/Artemis.UI/Screens/StartupWizard/StartupWizardView.xaml
index 2c92a59a0..7edd2f836 100644
--- a/src/Artemis.UI/Screens/SetupWizard/SetupWizardView.xaml
+++ b/src/Artemis.UI/Screens/StartupWizard/StartupWizardView.xaml
@@ -1,9 +1,8 @@
-<mde:MaterialWindow x:Class="Artemis.UI.Screens.SetupWizard.SetupWizardView"
+<mde:MaterialWindow x:Class="Artemis.UI.Screens.StartupWizard.StartupWizardView"
                     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                    xmlns:local="clr-namespace:Artemis.UI.Screens.SetupWizard"
                     xmlns:mde="https://spiegelp.github.io/MaterialDesignExtensions/winfx/xaml"
                     xmlns:s="https://github.com/canton7/Stylet"
                     mc:Ignorable="d"
@@ -11,7 +10,7 @@
                     Height="600"
                     ResizeMode="NoResize"
                     Icon="/Resources/Images/Logo/logo-512.png"
-                    Title="Artemis setup wizard"
+                    Title="Artemis startup wizard"
                     TitleBarIcon="{StaticResource BowIcon}"
                     Foreground="{DynamicResource MaterialDesignBody}"
                     Background="{DynamicResource MaterialDesignPaper}"
diff --git a/src/Artemis.UI/Screens/SetupWizard/SetupWizardViewModel.cs b/src/Artemis.UI/Screens/StartupWizard/StartupWizardViewModel.cs
similarity index 81%
rename from src/Artemis.UI/Screens/SetupWizard/SetupWizardViewModel.cs
rename to src/Artemis.UI/Screens/StartupWizard/StartupWizardViewModel.cs
index 47cfb3bac..73d244cf1 100644
--- a/src/Artemis.UI/Screens/SetupWizard/SetupWizardViewModel.cs
+++ b/src/Artemis.UI/Screens/StartupWizard/StartupWizardViewModel.cs
@@ -1,22 +1,19 @@
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
+using System.Linq;
 using Artemis.Core;
 using Artemis.Core.Services;
-using Artemis.UI.Screens.SetupWizard.Steps;
+using Artemis.UI.Screens.StartupWizard.Steps;
 using MaterialDesignExtensions.Controllers;
 using MaterialDesignExtensions.Controls;
-using MaterialDesignExtensions.Model;
 using Stylet;
 
-namespace Artemis.UI.Screens.SetupWizard
+namespace Artemis.UI.Screens.StartupWizard
 {
-    public class SetupWizardViewModel : Conductor<Screen>.Collection.OneActive
+    public class StartupWizardViewModel : Conductor<Screen>.Collection.OneActive
     {
         private readonly ISettingsService _settingsService;
         private StepperController _stepperController;
 
-        public SetupWizardViewModel(ISettingsService settingsService,
+        public StartupWizardViewModel(ISettingsService settingsService,
             WelcomeStepViewModel welcome,
             DevicesStepViewModel devices,
             LayoutStepViewModel layout,
diff --git a/src/Artemis.UI/Screens/SetupWizard/Steps/DevicesStepView.xaml b/src/Artemis.UI/Screens/StartupWizard/Steps/DevicesStepView.xaml
similarity index 96%
rename from src/Artemis.UI/Screens/SetupWizard/Steps/DevicesStepView.xaml
rename to src/Artemis.UI/Screens/StartupWizard/Steps/DevicesStepView.xaml
index 2d01adffe..bd9c7ddc2 100644
--- a/src/Artemis.UI/Screens/SetupWizard/Steps/DevicesStepView.xaml
+++ b/src/Artemis.UI/Screens/StartupWizard/Steps/DevicesStepView.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="Artemis.UI.Screens.SetupWizard.Steps.DevicesStepView"
+<UserControl x:Class="Artemis.UI.Screens.StartupWizard.Steps.DevicesStepView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
diff --git a/src/Artemis.UI/Screens/SetupWizard/Steps/DevicesStepViewModel.cs b/src/Artemis.UI/Screens/StartupWizard/Steps/DevicesStepViewModel.cs
similarity index 96%
rename from src/Artemis.UI/Screens/SetupWizard/Steps/DevicesStepViewModel.cs
rename to src/Artemis.UI/Screens/StartupWizard/Steps/DevicesStepViewModel.cs
index afa859b2b..03f9c17d7 100644
--- a/src/Artemis.UI/Screens/SetupWizard/Steps/DevicesStepViewModel.cs
+++ b/src/Artemis.UI/Screens/StartupWizard/Steps/DevicesStepViewModel.cs
@@ -6,7 +6,7 @@ using Artemis.UI.Ninject.Factories;
 using Artemis.UI.Screens.Settings.Tabs.Plugins;
 using Stylet;
 
-namespace Artemis.UI.Screens.SetupWizard.Steps
+namespace Artemis.UI.Screens.StartupWizard.Steps
 {
     public class DevicesStepViewModel : Conductor<PluginFeatureViewModel>.Collection.AllActive
     {
diff --git a/src/Artemis.UI/Screens/SetupWizard/Steps/FinishStepView.xaml b/src/Artemis.UI/Screens/StartupWizard/Steps/FinishStepView.xaml
similarity index 95%
rename from src/Artemis.UI/Screens/SetupWizard/Steps/FinishStepView.xaml
rename to src/Artemis.UI/Screens/StartupWizard/Steps/FinishStepView.xaml
index 48a50ba42..fa5be2d9a 100644
--- a/src/Artemis.UI/Screens/SetupWizard/Steps/FinishStepView.xaml
+++ b/src/Artemis.UI/Screens/StartupWizard/Steps/FinishStepView.xaml
@@ -1,9 +1,8 @@
-<UserControl x:Class="Artemis.UI.Screens.SetupWizard.Steps.FinishStepView"
+<UserControl x:Class="Artemis.UI.Screens.StartupWizard.Steps.FinishStepView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:local="clr-namespace:Artemis.UI.Screens.SetupWizard.Steps"
              xmlns:mde="https://spiegelp.github.io/MaterialDesignExtensions/winfx/xaml"
              xmlns:s="https://github.com/canton7/Stylet"
              mc:Ignorable="d"
diff --git a/src/Artemis.UI/Screens/SetupWizard/Steps/FinishStepViewModel.cs b/src/Artemis.UI/Screens/StartupWizard/Steps/FinishStepViewModel.cs
similarity index 84%
rename from src/Artemis.UI/Screens/SetupWizard/Steps/FinishStepViewModel.cs
rename to src/Artemis.UI/Screens/StartupWizard/Steps/FinishStepViewModel.cs
index bdd3b5797..e8d014b5f 100644
--- a/src/Artemis.UI/Screens/SetupWizard/Steps/FinishStepViewModel.cs
+++ b/src/Artemis.UI/Screens/StartupWizard/Steps/FinishStepViewModel.cs
@@ -2,7 +2,7 @@
 using Artemis.Core.Services;
 using Stylet;
 
-namespace Artemis.UI.Screens.SetupWizard.Steps
+namespace Artemis.UI.Screens.StartupWizard.Steps
 {
     public class FinishStepViewModel : Screen
     {
@@ -20,7 +20,7 @@ namespace Artemis.UI.Screens.SetupWizard.Steps
 
         public void Finish()
         {
-            ((SetupWizardViewModel) Parent).SkipOrFinishWizard();
+            ((StartupWizardViewModel) Parent).SkipOrFinishWizard();
         }
 
         protected override void OnActivate()
diff --git a/src/Artemis.UI/Screens/SetupWizard/Steps/LayoutStepView.xaml b/src/Artemis.UI/Screens/StartupWizard/Steps/LayoutStepView.xaml
similarity index 96%
rename from src/Artemis.UI/Screens/SetupWizard/Steps/LayoutStepView.xaml
rename to src/Artemis.UI/Screens/StartupWizard/Steps/LayoutStepView.xaml
index 383fa1aab..d09e1f38d 100644
--- a/src/Artemis.UI/Screens/SetupWizard/Steps/LayoutStepView.xaml
+++ b/src/Artemis.UI/Screens/StartupWizard/Steps/LayoutStepView.xaml
@@ -1,9 +1,8 @@
-<UserControl x:Class="Artemis.UI.Screens.SetupWizard.Steps.LayoutStepView"
+<UserControl x:Class="Artemis.UI.Screens.StartupWizard.Steps.LayoutStepView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:local="clr-namespace:Artemis.UI.Screens.SetupWizard.Steps"
              xmlns:mde="https://spiegelp.github.io/MaterialDesignExtensions/winfx/xaml"
              xmlns:s="https://github.com/canton7/Stylet"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
diff --git a/src/Artemis.UI/Screens/SetupWizard/Steps/LayoutStepViewModel.cs b/src/Artemis.UI/Screens/StartupWizard/Steps/LayoutStepViewModel.cs
similarity index 61%
rename from src/Artemis.UI/Screens/SetupWizard/Steps/LayoutStepViewModel.cs
rename to src/Artemis.UI/Screens/StartupWizard/Steps/LayoutStepViewModel.cs
index a3a5b1217..dac1ba898 100644
--- a/src/Artemis.UI/Screens/SetupWizard/Steps/LayoutStepViewModel.cs
+++ b/src/Artemis.UI/Screens/StartupWizard/Steps/LayoutStepViewModel.cs
@@ -1,7 +1,7 @@
 using Artemis.Core.Services;
 using Stylet;
 
-namespace Artemis.UI.Screens.SetupWizard.Steps
+namespace Artemis.UI.Screens.StartupWizard.Steps
 {
     public class LayoutStepViewModel : Screen
     {
@@ -15,15 +15,15 @@ namespace Artemis.UI.Screens.SetupWizard.Steps
         public void ApplyLeftHandedPreset()
         {
             _surfaceService.AutoArrange();
-            SetupWizardViewModel setupWizardViewModel = (SetupWizardViewModel) Parent;
-            setupWizardViewModel.Continue();
+            StartupWizardViewModel startupWizardViewModel = (StartupWizardViewModel) Parent;
+            startupWizardViewModel.Continue();
         }
 
         public void ApplyRightHandedPreset()
         {
             _surfaceService.AutoArrange();
-            SetupWizardViewModel setupWizardViewModel = (SetupWizardViewModel) Parent;
-            setupWizardViewModel.Continue();
+            StartupWizardViewModel startupWizardViewModel = (StartupWizardViewModel) Parent;
+            startupWizardViewModel.Continue();
         }
     }
 }
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/SetupWizard/Steps/SettingsStepView.xaml b/src/Artemis.UI/Screens/StartupWizard/Steps/SettingsStepView.xaml
similarity index 98%
rename from src/Artemis.UI/Screens/SetupWizard/Steps/SettingsStepView.xaml
rename to src/Artemis.UI/Screens/StartupWizard/Steps/SettingsStepView.xaml
index 1385865a6..fb30d460f 100644
--- a/src/Artemis.UI/Screens/SetupWizard/Steps/SettingsStepView.xaml
+++ b/src/Artemis.UI/Screens/StartupWizard/Steps/SettingsStepView.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="Artemis.UI.Screens.SetupWizard.Steps.SettingsStepView"
+<UserControl x:Class="Artemis.UI.Screens.StartupWizard.Steps.SettingsStepView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
diff --git a/src/Artemis.UI/Screens/SetupWizard/Steps/SettingsStepViewModel.cs b/src/Artemis.UI/Screens/StartupWizard/Steps/SettingsStepViewModel.cs
similarity index 98%
rename from src/Artemis.UI/Screens/SetupWizard/Steps/SettingsStepViewModel.cs
rename to src/Artemis.UI/Screens/StartupWizard/Steps/SettingsStepViewModel.cs
index 468070145..0793e6c52 100644
--- a/src/Artemis.UI/Screens/SetupWizard/Steps/SettingsStepViewModel.cs
+++ b/src/Artemis.UI/Screens/StartupWizard/Steps/SettingsStepViewModel.cs
@@ -9,7 +9,7 @@ using Artemis.UI.Shared;
 using Artemis.UI.Shared.Services;
 using Stylet;
 
-namespace Artemis.UI.Screens.SetupWizard.Steps
+namespace Artemis.UI.Screens.StartupWizard.Steps
 {
     public class SettingsStepViewModel : Conductor<PluginFeatureViewModel>.Collection.AllActive
     {
diff --git a/src/Artemis.UI/Screens/SetupWizard/Steps/WelcomeStepView.xaml b/src/Artemis.UI/Screens/StartupWizard/Steps/WelcomeStepView.xaml
similarity index 92%
rename from src/Artemis.UI/Screens/SetupWizard/Steps/WelcomeStepView.xaml
rename to src/Artemis.UI/Screens/StartupWizard/Steps/WelcomeStepView.xaml
index 2c8dc8de4..6f446867d 100644
--- a/src/Artemis.UI/Screens/SetupWizard/Steps/WelcomeStepView.xaml
+++ b/src/Artemis.UI/Screens/StartupWizard/Steps/WelcomeStepView.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="Artemis.UI.Screens.SetupWizard.Steps.WelcomeStepView"
+<UserControl x:Class="Artemis.UI.Screens.StartupWizard.Steps.WelcomeStepView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -12,7 +12,7 @@
             <RowDefinition />
         </Grid.RowDefinitions>
         <StackPanel>
-            <TextBlock Style="{StaticResource MaterialDesignHeadline4TextBlock}">Welcome to the Artemis setup wizard!</TextBlock>
+            <TextBlock Style="{StaticResource MaterialDesignHeadline4TextBlock}">Welcome to the Artemis startup wizard!</TextBlock>
 
             <TextBlock Style="{StaticResource MaterialDesignBody1TextBlock}" TextWrapping="Wrap">
                 In this wizard we'll walk you through the initial configuration of Artemis.<LineBreak/>
diff --git a/src/Artemis.UI/Screens/SetupWizard/Steps/WelcomeStepViewModel.cs b/src/Artemis.UI/Screens/StartupWizard/Steps/WelcomeStepViewModel.cs
similarity index 54%
rename from src/Artemis.UI/Screens/SetupWizard/Steps/WelcomeStepViewModel.cs
rename to src/Artemis.UI/Screens/StartupWizard/Steps/WelcomeStepViewModel.cs
index 840471e82..f509f583d 100644
--- a/src/Artemis.UI/Screens/SetupWizard/Steps/WelcomeStepViewModel.cs
+++ b/src/Artemis.UI/Screens/StartupWizard/Steps/WelcomeStepViewModel.cs
@@ -1,8 +1,6 @@
-using System;
-using Artemis.UI.Shared;
-using Stylet;
+using Stylet;
 
-namespace Artemis.UI.Screens.SetupWizard.Steps
+namespace Artemis.UI.Screens.StartupWizard.Steps
 {
     public class WelcomeStepViewModel : Screen
     {