diff --git a/plist b/plist
index 360d32dde..d20f9d579 100644
--- a/plist
+++ b/plist
@@ -920,7 +920,7 @@
 /usr/local/sbin/ppp-uptime.sh
 /usr/local/sbin/prefixes.php
 /usr/local/wizard/openvpn.xml
-/usr/local/wizard/setup.xml
+/usr/local/wizard/system.xml
 /usr/local/www/carp_status.php
 /usr/local/www/crash_reporter.php
 /usr/local/www/csrf.inc
diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
index bed42d823..3ce67f5db 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
@@ -71,8 +71,8 @@
             </Tunables>
         </Settings>
         <LogFile order="150" VisibleName="Log File" url="/diag_logs.php" cssClass="fa fa-eye fa-fw"/>
-        <Wizard order="140" url="/wizard.php?xml=setup" cssClass="fa fa-magic fa-fw">
-            <Step url="/wizard.php?xml=setup*" visibility="hidden"/>
+        <Wizard order="140" url="/wizard.php?xml=system" cssClass="fa fa-magic fa-fw">
+            <Step url="/wizard.php?xml=system*" visibility="hidden"/>
         </Wizard>
         <Access order="10" cssClass="fa fa-users fa-fw">
             <Users order="10" url="/system_usermanager.php">
diff --git a/src/opnsense/mvc/app/models/OPNsense/Core/ACL/ACL.xml b/src/opnsense/mvc/app/models/OPNsense/Core/ACL/ACL.xml
index cdf4ccd56..05c4a742d 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Core/ACL/ACL.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Core/ACL/ACL.xml
@@ -449,12 +449,12 @@
             <pattern>interfaces_wireless.php*</pattern>
         </patterns>
     </page-interfaces-wireless>
-    <page-wizard-general>
-        <name>General Setup Wizard</name>
+    <page-wizard-system>
+        <name>System Setup Wizard</name>
         <patterns>
-            <pattern>wizard.php?xml=general*</pattern>
+            <pattern>wizard.php?xml=system*</pattern>
         </patterns>
-    </page-wizard-general>
+    </page-wizard-system>
     <page-wizard-openvpn>
         <name>OpenVPN Server Wizard</name>
         <patterns>
diff --git a/src/wizard/setup.xml b/src/wizard/system.xml
similarity index 99%
rename from src/wizard/setup.xml
rename to src/wizard/system.xml
index ea0b5fd2e..9474adcb4 100644
--- a/src/wizard/setup.xml
+++ b/src/wizard/system.xml
@@ -631,7 +631,7 @@
 	<title>Reload in progress</title>
 	<description>
 		A reload is now in progress.  Please wait. &lt;p&gt;
-		&lt;meta http-equiv="refresh" content="5; url=wizard.php?xml=setup&amp;stepid=8" &gt;
+		&lt;meta http-equiv="refresh" content="5; url=wizard.php?xml=system&amp;stepid=8" &gt;
 		&lt;p&gt;
 		The wizard will redirect to the next step once the reload is completed.
 	</description>
diff --git a/src/www/wizard.php b/src/www/wizard.php
index b6fc6a910..1e6af5d0d 100644
--- a/src/www/wizard.php
+++ b/src/www/wizard.php
@@ -88,7 +88,7 @@ switch ($xml) {
 	case 'openvpn':
 		break;
 	default:
-		$xml = 'setup';
+		$xml = 'system';
 		break;
 }