diff --git a/setup/inc/upgrade-attachments.inc.php b/setup/inc/upgrade-attachments.inc.php
index 1e7a50a9ea9f5fea6fbac41d88066acab2c460fe..c8155d32c672e358cb068d79720a076327a88706 100644
--- a/setup/inc/upgrade-attachments.inc.php
+++ b/setup/inc/upgrade-attachments.inc.php
@@ -1,6 +1,6 @@
 <?php
 if(!defined('SETUPINC')) die('Kwaheri!');
-$msg = $_SESSION['_upgrader']['msg'];
+$msg = $_SESSION['ost_upgrader']['msg'];
 ?>    
 <div id="main">
     <h1>Attachments Migration</h1>
diff --git a/setup/install.php b/setup/install.php
index aa38ee3a7c749facecfd21e0e0e60147448dc285..27b1388933d03ef9c0db5690dd147213848d750f 100644
--- a/setup/install.php
+++ b/setup/install.php
@@ -29,11 +29,11 @@ $wizard['menu']=array('Installation Guide'=>'http://osticket.com/wiki/Installati
 
 if($_POST && $_POST['s']) {
     $errors = array();
-    $_SESSION['_installer']['s']=$_POST['s'];
+    $_SESSION['ost_installer']['s']=$_POST['s'];
     switch(strtolower($_POST['s'])) {
         case 'prereq':
             if($installer->check_prereq())
-                $_SESSION['_installer']['s']='config';
+                $_SESSION['ost_installer']['s']='config';
             else
                 $errors['prereq']='Minimum requirements not met!';
             break;
@@ -43,7 +43,7 @@ if($_POST && $_POST['s']) {
             elseif(!$installer->config_writable())
                 $errors['err']='Write access required to continue';
             else
-                $_SESSION['_installer']['s']='install';
+                $_SESSION['ost_installer']['s']='install';
             break;
         case 'install':
             if($installer->install($_POST)) {
@@ -51,7 +51,7 @@ if($_POST && $_POST['s']) {
                                         'email' =>$_POST['admin_email'],
                                         'URL'=>URL);
                 //TODO: Go to subscribe step.
-                $_SESSION['_installer']['s']='done';
+                $_SESSION['ost_installer']['s']='done';
             } elseif(!($errors=$installer->getErrors()) || !$errors['err']) {
                 $errors['err']='Error installing osTicket - correct the errors below and try again.';
             }
@@ -69,16 +69,16 @@ if($_POST && $_POST['s']) {
                 $errors['notify'] = 'Check one or more';
 
             if(!$errors)
-                $_SESSION['_installer']['s'] = 'done';
+                $_SESSION['ost_installer']['s'] = 'done';
             break;
     }
 
-}elseif($_GET['s'] && $_GET['s']=='ns' && $_SESSION['_installer']['s']=='subscribe') {
-    $_SESSION['_installer']['s']='done';
+}elseif($_GET['s'] && $_GET['s']=='ns' && $_SESSION['ost_installer']['s']=='subscribe') {
+    $_SESSION['ost_installer']['s']='done';
 }
 
 
-switch(strtolower($_SESSION['_installer']['s'])) {
+switch(strtolower($_SESSION['ost_installer']['s'])) {
     case 'config':
     case 'install':
         if(!$installer->config_exists()) {