diff --git a/core/install/resources/classes/install_switch.php b/core/install/resources/classes/install_switch.php
index 3467d00507..1255488575 100644
--- a/core/install/resources/classes/install_switch.php
+++ b/core/install/resources/classes/install_switch.php
@@ -52,7 +52,7 @@ include "root.php";
 			}else{
 				throw new Exception("Could not work out where to put the config.lua");
 			}
-			$this->config_lua = normalize_path_to_os($this->config_lua);
+			$this->config_lua = normalize_path($this->config_lua);
 		}
 
 		//utility Functions
@@ -244,46 +244,46 @@ include "root.php";
 				$tmp = "\n";
 				$tmp .= "--set the variables\n";
 				if (strlen($this->global_settings->switch_sounds_dir()) > 0) {
-					$tmp .= normalize_path_to_os("	sounds_dir = [[".$this->global_settings->switch_sounds_dir()."]];\n");
+					$tmp .= normalize_path("	sounds_dir = [[".$this->global_settings->switch_sounds_dir()."]];\n");
 				}
 				if (strlen($this->global_settings->switch_phrases_vdir()) > 0) {
-					$tmp .= normalize_path_to_os("	phrases_dir = [[".$this->global_settings->switch_phrases_vdir()."]];\n");
+					$tmp .= normalize_path("	phrases_dir = [[".$this->global_settings->switch_phrases_vdir()."]];\n");
 				}
 				if (strlen($this->global_settings->switch_db_dir()) > 0) {
-					$tmp .= normalize_path_to_os("	database_dir = [[".$this->global_settings->switch_db_dir()."]];\n");
+					$tmp .= normalize_path("	database_dir = [[".$this->global_settings->switch_db_dir()."]];\n");
 				}
 				if (strlen($this->global_settings->switch_recordings_dir()) > 0) {
-					$tmp .= normalize_path_to_os("	recordings_dir = [[".$this->global_settings->switch_recordings_dir()."]];\n");
+					$tmp .= normalize_path("	recordings_dir = [[".$this->global_settings->switch_recordings_dir()."]];\n");
 				}
 				if (strlen($this->global_settings->switch_storage_dir()) > 0) {
-					$tmp .= normalize_path_to_os("	storage_dir = [[".$this->global_settings->switch_storage_dir()."]];\n");
+					$tmp .= normalize_path("	storage_dir = [[".$this->global_settings->switch_storage_dir()."]];\n");
 				}
 				if (strlen($this->global_settings->switch_voicemail_vdir()) > 0) {
-					$tmp .= normalize_path_to_os("	voicemail_dir = [[".$this->global_settings->switch_voicemail_vdir()."]];\n");
+					$tmp .= normalize_path("	voicemail_dir = [[".$this->global_settings->switch_voicemail_vdir()."]];\n");
 				}
 				if (strlen($this->global_settings->switch_script_dir()) > 0) {
-					$tmp .= normalize_path_to_os("	scripts_dir = [[".$this->global_settings->switch_script_dir()."]];\n");
+					$tmp .= normalize_path("	scripts_dir = [[".$this->global_settings->switch_script_dir()."]];\n");
 				}
-				$tmp .= normalize_path_to_os("	php_dir = [[".PHP_BINDIR."]];\n");
+				$tmp .= normalize_path("	php_dir = [[".PHP_BINDIR."]];\n");
 				if (substr(strtoupper(PHP_OS), 0, 3) == "WIN") {
 					$tmp .= "	php_bin = \"php.exe\";\n";
 				}
 				else {
 					$tmp .= "	php_bin = \"php\";\n";
 				}
-				$tmp .= normalize_path_to_os("	document_root = [[".$_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."]];\n");
+				$tmp .= normalize_path("	document_root = [[".$_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."]];\n");
 				$tmp .= "\n";
 
 				if ((strlen($this->global_settings->db_type()) > 0) || (strlen($dsn_name) > 0)) {
 					$tmp .= "--database information\n";
 					$tmp .= "	database = {}\n";
-					$tmp .= "	database[\"type\"] = \"".$this->global_settings->db_type()."\";\n";
-					$tmp .= "	database[\"name\"] = \"".$this->global_settings->db_name()."\";\n";
-					$tmp .= normalize_path_to_os("	database[\"path\"] = [[".$this->global_settings->db_path()."]];\n");
+					$tmp .= "	database.type = \"".$this->global_settings->db_type()."\";\n";
+					$tmp .= "	database.name = \"".$this->global_settings->db_name()."\";\n";
+					$tmp .= normalize_path("	database.path = [[".$this->global_settings->db_path()."]];\n");
 
 					if (strlen($dsn_name) > 0) {
-						$tmp .= "	database[\"system\"] = \"odbc://".$dsn_name.":".$dsn_username.":".$dsn_password."\";\n";
-						$tmp .= "	database[\"switch\"] = \"odbc://freeswitch:".$dsn_username.":".$dsn_password."\";\n";
+						$tmp .= "	database.system = \"odbc://".$dsn_name.":".$dsn_username.":".$dsn_password."\";\n";
+						$tmp .= "	database.switch = \"odbc://freeswitch:".$dsn_username.":".$dsn_password."\";\n";
 					}
 					elseif ($this->global_settings->db_type() == "pgsql") {
 						$db_host = $this->global_settings->db_host();
@@ -294,41 +294,41 @@ include "root.php";
 						else {
 							$host_type = "host";
 						}
-						$tmp .= "	database[\"system\"] = \"pgsql://".$host_type."=".$db_host." port=".$this->global_settings->db_port()." dbname=".$this->global_settings->db_name()." user=".$this->global_settings->db_username()." password=".$this->global_settings->db_password()." options='' application_name='".$this->global_settings->db_name()."'\";\n";
-						$tmp .= "	database[\"switch\"] = \"pgsql://".$host_type."=".$db_host." port=".$this->global_settings->db_port()." dbname=freeswitch user=".$this->global_settings->db_username()." password=".$this->global_settings->db_password()." options='' application_name='freeswitch'\";\n";
+						$tmp .= "	database.system = \"pgsql://".$host_type."=".$db_host." port=".$this->global_settings->db_port()." dbname=".$this->global_settings->db_name()." user=".$this->global_settings->db_username()." password=".$this->global_settings->db_password()." options='' application_name='".$this->global_settings->db_name()."'\";\n";
+						$tmp .= "	database.switch = \"pgsql://".$host_type."=".$db_host." port=".$this->global_settings->db_port()." dbname=freeswitch user=".$this->global_settings->db_username()." password=".$this->global_settings->db_password()." options='' application_name='freeswitch'\";\n";
 					}
 					elseif ($this->global_settings->db_type() == "sqlite") {
-						$tmp .= "	database[\"system\"] = \"sqlite://".$this->global_settings->db_path()."/".$this->global_settings->db_name()."\";\n";
-						$tmp .= "	database[\"switch\"] = \"sqlite://".$_SESSION['switch']['db']['dir']."\";\n";
+						$tmp .= "	database.system = \"sqlite://".$this->global_settings->db_path()."/".$this->global_settings->db_name()."\";\n";
+						$tmp .= "	database.switch = \"sqlite://".$_SESSION['switch']['db']['dir']."\";\n";
 					}
 					elseif ($this->global_settings->db_type() == "mysql") {
-						$tmp .= "	database[\"system\"] = \"\";\n";
-						$tmp .= "	database[\"switch\"] = \"\";\n";
+						$tmp .= "	database.system = \"\";\n";
+						$tmp .= "	database.switch = \"\";\n";
 					}
 					$tmp .= "\n";
 				}
 				$tmp .= "--set defaults\n";
 				$tmp .= "	expire = {}\n";
-				$tmp .= "	expire[\"directory\"] = \"3600\";\n";
-				$tmp .= "	expire[\"dialplan\"] = \"3600\";\n";
-				$tmp .= "	expire[\"languages\"] = \"3600\";\n";
-				$tmp .= "	expire[\"sofia.conf\"] = \"3600\";\n";
-				$tmp .= "	expire[\"acl.conf\"] = \"3600\";\n";
+				$tmp .= "	expire.directory = \"3600\";\n";
+				$tmp .= "	expire.dialplan = \"3600\";\n";
+				$tmp .= "	expire.languages = \"3600\";\n";
+				$tmp .= "	expire.sofia_conf = \"3600\";\n";
+				$tmp .= "	expire.acl_conf = \"3600\";\n";
 				$tmp .= "\n";
 				$tmp .= "--set xml_handler\n";
 				$tmp .= "	xml_handler = {}\n";
-				$tmp .= "	xml_handler[\"fs_path\"] = false;\n";
+				$tmp .= "	xml_handler.fs_path = false;\n";
 				$tmp .= "\n";
 				$tmp .= "--set the debug options\n";
-				$tmp .= "	debug[\"params\"] = false;\n";
-				$tmp .= "	debug[\"sql\"] = false;\n";
-				$tmp .= "	debug[\"xml_request\"] = false;\n";
-				$tmp .= "	debug[\"xml_string\"] = false;\n";
-				$tmp .= "	debug[\"cache\"] = false;\n";
+				$tmp .= "	debug.params = false;\n";
+				$tmp .= "	debug.sql = false;\n";
+				$tmp .= "	debug.xml_request = false;\n";
+				$tmp .= "	debug.xml_string = false;\n";
+				$tmp .= "	debug.cache = false;\n";
 				$tmp .= "\n";
 				$tmp .= "--additional info\n";
 				$tmp .= "	domain_count = ".$this->global_settings->domain_count().";\n";
-				$tmp .= normalize_path_to_os("	temp_dir = [[".$this->global_settings->switch_temp_dir()."]];\n");
+				$tmp .= normalize_path("	temp_dir = [[".$this->global_settings->switch_temp_dir()."]];\n");
 				if (isset($_SESSION['domain']['dial_string']['text'])) {
 					$tmp .= "	dial_string = \"".$_SESSION['domain']['dial_string']['text']."\";\n";
 				}