diff --git a/css/global.css b/css/global.css
index 023c8f35..469f6a23 100644
--- a/css/global.css
+++ b/css/global.css
@@ -23,7 +23,7 @@ span.versionInfo{
 	display: inline-block;
 }
 
-div.OGPVersionArea{
+div.GSPVersionArea{
 	width: 100%;
 	position: relative;
 }
diff --git a/gsp_api.php b/gsp_api.php
index c398cbc5..2c63e9f2 100644
--- a/gsp_api.php
+++ b/gsp_api.php
@@ -281,7 +281,7 @@ function api_server()
 	{
 		$remote_server_id = $_POST['remote_server_id'];
 		$remote_server = $db->getRemoteServer($remote_server_id);
-		$remote = new OGPRemoteLibrary($remote_server['agent_ip'],$remote_server['agent_port'],$remote_server['encryption_key'],$remote_server['timeout']);
+		$remote = new GSPRemoteLibrary($remote_server['agent_ip'],$remote_server['agent_port'],$remote_server['encryption_key'],$remote_server['timeout']);
 		$status = "200";
 		$message = $remote->status_chk() == 1?'online':'offline';
 	}
@@ -290,7 +290,7 @@ function api_server()
 	{
 		$remote_server_id = $_POST['remote_server_id'];
 		$remote_server = $db->getRemoteServer($remote_server_id);
-		$remote = new OGPRemoteLibrary($remote_server['agent_ip'],$remote_server['agent_port'],$remote_server['encryption_key'],$remote_server['timeout']);
+		$remote = new GSPRemoteLibrary($remote_server['agent_ip'],$remote_server['agent_port'],$remote_server['encryption_key'],$remote_server['timeout']);
 		$remote->agent_restart();
 		$status = "200";
 		$message = "success";
@@ -488,7 +488,7 @@ function api_user_games()
 		if(!isPortValid($port))
 			return array("status" => '309', "message" => "The given port is not a valid port.");
 		
-		$remote = new OGPRemoteLibrary($remote_server['agent_ip'],$remote_server['agent_port'],$remote_server['encryption_key'],$remote_server['timeout']);
+		$remote = new GSPRemoteLibrary($remote_server['agent_ip'],$remote_server['agent_port'],$remote_server['encryption_key'],$remote_server['timeout']);
 		$host_stat = $remote->status_chk();
 		if($host_stat !== 1)
 			return array("status" => '310', "message" => "The remote server is offline.");
@@ -581,7 +581,7 @@ function api_user_games()
 			}
 		}
 		
-		$remote = new OGPRemoteLibrary($game_home['agent_ip'],$game_home['agent_port'],$game_home['encryption_key'],$game_home['timeout']);
+		$remote = new GSPRemoteLibrary($game_home['agent_ip'],$game_home['agent_port'],$game_home['encryption_key'],$game_home['timeout']);
 		$host_stat = $remote->status_chk();
 		if($host_stat !== 1)
 			return array("status" => '310', "message" => "The remote server is offline.");
@@ -957,7 +957,7 @@ function api_gamemanager()
     if($server_xml === FALSE)
 		return array("status" => '305', "message" => "No game configuration found for home_cfg_id #" . $home_cfg_id . ".");
 	
-	$remote = new OGPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
+	$remote = new GSPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
 	$host_stat = $remote->status_chk();
 	if($host_stat !== 1)
 		return array("status" => '310', "message" => "The remote server is offline.");
@@ -1421,7 +1421,7 @@ function api_litefm()
     if($server_xml === FALSE)
 		return array("status" => '305', "message" => "No game configuration found for home_cfg_id #" . $home_cfg_id . ".");
 	
-	$remote = new OGPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
+	$remote = new GSPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
 	$host_stat = $remote->status_chk();
 	if($host_stat !== 1)
 		return array("status" => '310', "message" => "The remote server is offline.");
@@ -1514,7 +1514,7 @@ function api_addonsmanager()
 		if($server_xml === FALSE)
 			return array("status" => '305', "message" => "No game configuration found for home_cfg_id #" . $home_cfg_id . ".");
 		
-		$remote = new OGPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
+		$remote = new GSPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
 		$host_stat = $remote->status_chk();
 		if($host_stat !== 1)
 			return array("status" => '310', "message" => "The remote server is offline.");
@@ -1632,7 +1632,7 @@ function api_steam_workshop()
 		if($server_xml === FALSE)
 			return array("status" => '305', "message" => "No game configuration found for home_cfg_id #" . $home_cfg_id . ".");
 		
-		$remote = new OGPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
+		$remote = new GSPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
 		$host_stat = $remote->status_chk();
 		if($host_stat !== 1)
 			return array("status" => '310', "message" => "The remote server is offline.");
diff --git a/home.php b/home.php
index 1fade329..f841a1e0 100644
--- a/home.php
+++ b/home.php
@@ -26,7 +26,7 @@ $db = createDatabaseConnection($db_type, $db_host, $db_user, $db_pass, $db_name,
 include_once("includes/lang.php");
 
 if (!$db instanceof GSPDatabase) {
-	ogpLang();
+	gspLang();
 	die(get_lang('no_db_connection'));
 }
 
@@ -37,7 +37,7 @@ if(hasValue($_SESSION['user_id'])){
 
 $settings = $db->getSettings();
 @$GLOBALS['panel_language'] = $settings['panel_language'];
-ogpLang();
+gspLang();
 
 require_once("includes/view.php");
 $view = new OGPView();
diff --git a/includes/api_functions.php b/includes/api_functions.php
index 496e5b41..3437fb8a 100644
--- a/includes/api_functions.php
+++ b/includes/api_functions.php
@@ -91,7 +91,7 @@ function get_start_cmd($user_info,$remote,$server_xml,$home_info,$mod_id,$ip,$po
 	$cli_param_data['IP'] = $ip;
 	$cli_param_data['PORT'] = $port;
 	$cli_param_data['HOSTNAME'] = $home_info['home_name'];
-	$cli_param_data['PID_FILE'] = "ogp_game_startup.pid";
+	$cli_param_data['PID_FILE'] = "gsp_game_startup.pid";
 	
 	// Linux
 	if( preg_match("/Linux/", $os) )
diff --git a/includes/database_mysqli.php b/includes/database_mysqli.php
index 0631a244..97921cef 100644
--- a/includes/database_mysqli.php
+++ b/includes/database_mysqli.php
@@ -3762,7 +3762,7 @@ class GSPDatabaseMySQL extends GSPDatabase
 					case 'server':
 						require_once('includes/lib_remote.php');
 						$home_info = $this->getGameHomeWithoutMods($home_id);
-						$remote = new OGPRemoteLibrary($home_info['agent_ip'], $home_info['agent_port'], $home_info['encryption_key'], $home_info['timeout']);
+						$remote = new GSPRemoteLibrary($home_info['agent_ip'], $home_info['agent_port'], $home_info['encryption_key'], $home_info['timeout']);
 						$agent_online = $remote->status_chk() === 1;
 						if( $agent_online )
 						{
diff --git a/includes/form_table_class.php b/includes/form_table_class.php
index f9ef27a4..dc0c59b7 100644
--- a/includes/form_table_class.php
+++ b/includes/form_table_class.php
@@ -112,7 +112,7 @@ class FormTable {
 			print_failure(get_lang_f('invalid_setting_type',$type));
 		}
 
-		if ( defined("OGP_LANG_".$name."_info") )
+		if ( defined("GSP_LANG_".$name."_info") )
 		{
 			echo "</td><td><div class='image-tip' id='".$this->i."' ><img src='images/icon_help_small.gif' ><span class='tip' id='".$this->i."' >".str_replace("'",'"',get_lang($name."_info"))."</span></div></td></tr>";
 			$this->i++;
@@ -128,7 +128,7 @@ class FormTable {
 		echo "<tr><td align='right' $td_extra><label for='".$name."'>".get_lang($name).":</label></td>";
 		echo "<td align='left'>".$data."</td>\n";
 
-		if ( defined("OGP_LANG_".$name."_info") )
+		if ( defined("GSP_LANG_".$name."_info") )
 		{
 			echo "<td><div class='image-tip' id='".$this->i."' ><img src='images/icon_help_small.gif' ><span class='tip' id='".$this->i."' >".str_replace("'",'"',get_lang($name."_info"))."</span></div></td>\n</tr>\n";
 			$this->i++;
diff --git a/includes/functions.php b/includes/functions.php
index 5cf4cbd1..2e285c07 100644
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -1047,7 +1047,7 @@ function deleteMysqlAddonDatabasesForGameServerHome($home_id){
 				if($mysql_db['remote_server_id'] != "0")
 				{
 					$remote_server = $db->getRemoteServer($mysql_db['remote_server_id']);
-					$remote = new OGPRemoteLibrary($remote_server['agent_ip'],$remote_server['agent_port'],$remote_server['encryption_key'],$remote_server['timeout']);
+					$remote = new GSPRemoteLibrary($remote_server['agent_ip'],$remote_server['agent_port'],$remote_server['encryption_key'],$remote_server['timeout']);
 					$host_stat = $remote->status_chk();
 					if($host_stat === 1 )
 					{
diff --git a/includes/helpers.php b/includes/helpers.php
index 463a9fe0..7f90a812 100644
--- a/includes/helpers.php
+++ b/includes/helpers.php
@@ -4,7 +4,7 @@
  */
 
 // Globals
-$OGPLangPre = "OGP_LANG_";
+$GSPLangPre = "GSP_LANG_";
 
 // Ignore any request with unwanted values at 'm' or 'p'
 if( isset($_REQUEST['m']) and !preg_match("/^([a-z]|[0-9]|_|-)+$/i", $_REQUEST['m']) )
@@ -457,12 +457,12 @@ function getGitHubOrganization($gitHubURL){
 }
 
 function getOGPLangConstantsJSON(){
-	global $OGPLangPre;
+	global $GSPLangPre;
 	$finalConsts = array();
 	
 	$consts = get_defined_constants(true);
 	foreach($consts["user"] as $key => $value){
-		if(startsWith($key, $OGPLangPre)){
+		if(startsWith($key, $GSPLangPre)){
 			$finalConsts[$key] = $value;
 		}
 	}
diff --git a/includes/lang.php b/includes/lang.php
index 219e10ae..1e96e1c4 100644
--- a/includes/lang.php
+++ b/includes/lang.php
@@ -17,11 +17,11 @@ function add_lang_module($lang_module)
 {
     global $lang_modules;
     array_push($lang_modules,$lang_module);
-    // Need to reload langs if module is added after the first ogpLang call.
-    ogpLang();
+    // Need to reload langs if module is added after the first gspLang call.
+    gspLang();
 }
 
-function ogpLang()
+function gspLang()
 {
     global $lang_modules;
 	$locale_files = makefilelist("lang/", ".|..|.svn", true, "folders");
@@ -68,15 +68,15 @@ function ogpLang()
 
 function get_lang($lang_index)
 {
-	global $OGPLangPre;
+	global $GSPLangPre;
 	
     if (defined($lang_index))
     {
         return constant($lang_index);
     }
     
-    if(!startsWith($lang_index, $OGPLangPre)){
-		$newLangIndex = $OGPLangPre . $lang_index;
+    if(!startsWith($lang_index, $GSPLangPre)){
+		$newLangIndex = $GSPLangPre . $lang_index;
 		if (defined($newLangIndex))
 		{
 			return constant($newLangIndex);
@@ -89,7 +89,7 @@ function get_lang($lang_index)
 
 function get_lang_f()
 {
-	global $OGPLangPre;
+	global $GSPLangPre;
     $args = func_get_args();
     $lang_index = array_shift($args);
 
@@ -98,8 +98,8 @@ function get_lang_f()
         return vsprintf(constant($lang_index),$args);
     }
     
-    if(!startsWith($lang_index, $OGPLangPre)){
-		$newLangIndex = $OGPLangPre . $lang_index;
+    if(!startsWith($lang_index, $GSPLangPre)){
+		$newLangIndex = $GSPLangPre . $lang_index;
 		if (defined($newLangIndex))
 		{
 			return vsprintf(constant($newLangIndex),$args);
diff --git a/includes/lib_remote.php b/includes/lib_remote.php
index 9c438e2e..3f9a7acc 100644
--- a/includes/lib_remote.php
+++ b/includes/lib_remote.php
@@ -6,12 +6,12 @@
 require_once("Crypt/XXTEA.php");
 
 // Screen type for servers
-define("OGP_SCREEN_TYPE_HOME","HOME");
-define("OGP_SCREEN_TYPE_UPDATE","UPDATE");
+define("GSP_SCREEN_TYPE_HOME","HOME");
+define("GSP_SCREEN_TYPE_UPDATE","UPDATE");
 
 define("AGENT_ERROR_NOT_EXECUTABLE",-13);
 
-class OGPRemoteLibrary
+class GSPRemoteLibrary
 {
 	private $port;
 	private $host;
diff --git a/includes/navig.php b/includes/navig.php
index 5ad8425c..83c0ecfa 100644
--- a/includes/navig.php
+++ b/includes/navig.php
@@ -78,13 +78,13 @@ function navigation() {
 
                 include_once( $include_file );
 
-                if ( !function_exists( 'exec_ogp_module' ) )
+                if ( !function_exists( 'exec_gsp_module' ) )
                 {
                     print_failure("Missing module execute function.");
                     return;
                 }
 
-                exec_ogp_module();
+                exec_gsp_module();
                 return;
             }
             print_failure("Invalid subpage given.");
@@ -94,12 +94,12 @@ function navigation() {
         else if ( is_file( MODULES.$_REQUEST['m'].'/'.$_REQUEST['m'].'.php') )
         {
             include( MODULES.$_REQUEST['m'].'/'.$_REQUEST['m'].'.php');
-            if ( !function_exists( 'exec_ogp_module' ) )
+            if ( !function_exists( 'exec_gsp_module' ) )
             {
                 print_failure("Missing module execute function.");
                 return;
             }
-            exec_ogp_module();
+            exec_gsp_module();
         }
         // If files above are not found then we print an error.
         else
diff --git a/includes/view.php b/includes/view.php
index e5834bb5..153bafa9 100644
--- a/includes/view.php
+++ b/includes/view.php
@@ -29,7 +29,7 @@ class OGPView {
 	function menu(){}
 	
     function printView($cleared = false, $dataType = "html") {
-        global $db, $OGPLangPre;
+        global $db, $GSPLangPre;
 
         if ( is_object($db) && array_key_exists( "GSPDatabase", class_parents($db) ) ) {
             $panel_settings = $db->getSettings();
@@ -82,7 +82,7 @@ class OGPView {
 		// Dump defined constants to json (for language javascript)
 		$jsonStrConsts = getOGPLangConstantsJSON();
 		if($jsonStrConsts !== false){
-			$this->header_code .= '<script type="text/javascript">var langConsts = ' . $jsonStrConsts . ';' . "\n" . 'var langConstPrefix = "' . $OGPLangPre . '";</script>' . "\n";
+			$this->header_code .= '<script type="text/javascript">var langConsts = ' . $jsonStrConsts . ';' . "\n" . 'var langConstPrefix = "' . $GSPLangPre . '";</script>' . "\n";
 		}
 				
 		// Include jQuery, jQuery UI, and our global CSS file in the header code
@@ -197,7 +197,7 @@ class OGPView {
         if ( is_object($db) && array_key_exists( "GSPDatabase", class_parents($db) ) ) {
             $footer .= "<div class=\"footer center\">";
             $footer .= get_lang_f('cur_theme', !empty($_SESSION['users_theme']) ? $_SESSION['users_theme'] : @$panel_settings['theme']) . " - " . $db->getNbOfQueries()." ".get_lang('queries_executed');
-            $footer .= "<br />".get_lang('copyright')." &copy; <a href=\"http://www.opengamepanel.org\">Open Game Panel</a> " . date("Y") . " - ".get_lang('all_rights_reserved')." - <span class='versionInfo'>".get_lang('show_version')."</span><br /><div class='inline-block OGPVersionArea'><span class='version hide'>" . get_lang('version') . ":</span>&nbsp; <span class='hide versionNumber'>".@$panel_settings['ogp_version']."</span> <span class='copyVersionResult' lang='" . get_lang('copied') . "'></span></div></div>";
+            $footer .= "<br />".get_lang('copyright')." &copy; <a href=\"http://www.gameservers-world.com\">GameServer Panel</a> " . date("Y") . " - ".get_lang('all_rights_reserved')." - <span class='versionInfo'>".get_lang('show_version')."</span><br /><div class='inline-block GSPVersionArea'><span class='version hide'>" . get_lang('version') . ":</span>&nbsp; <span class='hide versionNumber'>".@$panel_settings['gsp_version']."</span> <span class='copyVersionResult' lang='" . get_lang('copied') . "'></span></div></div>";
         }
         else
         {
diff --git a/index.php b/index.php
index 034b53d9..17b7b284 100644
--- a/index.php
+++ b/index.php
@@ -43,7 +43,7 @@ $db = createDatabaseConnection($db_type, $db_host, $db_user, $db_pass, $db_name,
 include_once("includes/lang.php");
 
 if (!$db instanceof GSPDatabase) {
-	ogpLang();
+	gspLang();
 	die(get_lang('no_db_connection'));
 }
 
@@ -54,7 +54,7 @@ if(hasValue($_SESSION['user_id'])){
 
 $settings = $db->getSettings();
 @$GLOBALS['panel_language'] = $settings['panel_language'];
-ogpLang();
+gspLang();
 
 require_once("includes/view.php");
 $view = new OGPView();
diff --git a/modules/TS3Admin/TS3Admin.php b/modules/TS3Admin/TS3Admin.php
index 61e78876..2ea516f3 100644
--- a/modules/TS3Admin/TS3Admin.php
+++ b/modules/TS3Admin/TS3Admin.php
@@ -3,7 +3,7 @@
  * Administrative interface for the ts3admin module
  */
 
-function exec_ogp_module()
+function exec_gsp_module()
 {
 	$templates_folder = 'modules/TS3Admin/templates_c';
 	if( is_writable( $templates_folder ) )
diff --git a/modules/TS3Admin/templates_c/%%F7^F7F^F7F34188%%header.tpl.php b/modules/TS3Admin/templates_c/%%F7^F7F^F7F34188%%header.tpl.php
index f01433f0..ccc499e9 100644
--- a/modules/TS3Admin/templates_c/%%F7^F7F^F7F34188%%header.tpl.php
+++ b/modules/TS3Admin/templates_c/%%F7^F7F^F7F34188%%header.tpl.php
@@ -3,25 +3,25 @@
 <script src="modules/TS3Admin/webinterface.js" type="text/javascript"></script>
 <body onload="onLoad();<?php if ($this->_tpl_vars['liveviewAutoUpdate'] == true): ?>liveViewUpdateInterval = setInterval('serverViewUpdate(false)', 10000);<?php endif; ?>">
 <div id="jsMsg" style="display:none;">
-	<span id="js_error"><?php echo $this->_tpl_vars['lang']['OGP_LANG_js_error']; ?>
+	<span id="js_error"><?php echo $this->_tpl_vars['lang']['GSP_LANG_js_error']; ?>
 </span>
-	<span id="js_ajax_error"><?php echo $this->_tpl_vars['lang']['OGP_LANG_js_ajax_error']; ?>
+	<span id="js_ajax_error"><?php echo $this->_tpl_vars['lang']['GSP_LANG_js_ajax_error']; ?>
 </span>
-	<span id="js_confirm_server_stop" title="<?php echo $this->_tpl_vars['lang']['OGP_LANG_js_confirm_server_stop']; ?>
+	<span id="js_confirm_server_stop" title="<?php echo $this->_tpl_vars['lang']['GSP_LANG_js_confirm_server_stop']; ?>
 "></span>
-	<span id="js_confirm_server_delete" title="<?php echo $this->_tpl_vars['lang']['OGP_LANG_js_confirm_server_delete']; ?>
+	<span id="js_confirm_server_delete" title="<?php echo $this->_tpl_vars['lang']['GSP_LANG_js_confirm_server_delete']; ?>
 "></span>
-	<span id="js_notice_server_deleted" title="<?php echo $this->_tpl_vars['lang']['OGP_LANG_js_notice_server_deleted']; ?>
+	<span id="js_notice_server_deleted" title="<?php echo $this->_tpl_vars['lang']['GSP_LANG_js_notice_server_deleted']; ?>
 "></span>
-	<span id="js_prompt_banduration" title="<?php echo $this->_tpl_vars['lang']['OGP_LANG_js_prompt_banduration']; ?>
+	<span id="js_prompt_banduration" title="<?php echo $this->_tpl_vars['lang']['GSP_LANG_js_prompt_banduration']; ?>
 "></span>
-	<span id="js_prompt_banreason" title="<?php echo $this->_tpl_vars['lang']['OGP_LANG_js_prompt_banreason']; ?>
+	<span id="js_prompt_banreason" title="<?php echo $this->_tpl_vars['lang']['GSP_LANG_js_prompt_banreason']; ?>
 "></span>
-	<span id="js_prompt_msg_to" title="<?php echo $this->_tpl_vars['lang']['OGP_LANG_js_prompt_msg_to']; ?>
+	<span id="js_prompt_msg_to" title="<?php echo $this->_tpl_vars['lang']['GSP_LANG_js_prompt_msg_to']; ?>
 "></span>
-	<span id="js_prompt_poke_to" title="<?php echo $this->_tpl_vars['lang']['OGP_LANG_js_prompt_poke_to']; ?>
+	<span id="js_prompt_poke_to" title="<?php echo $this->_tpl_vars['lang']['GSP_LANG_js_prompt_poke_to']; ?>
 "></span>
-	<span id="js_prompt_new_propvalue" title="<?php echo $this->_tpl_vars['lang']['OGP_LANG_js_prompt_new_propvalue']; ?>
+	<span id="js_prompt_new_propvalue" title="<?php echo $this->_tpl_vars['lang']['GSP_LANG_js_prompt_new_propvalue']; ?>
 "></span>
 </div>
 <!--[if IE]>
diff --git a/modules/addonsmanager/addons_installer.php b/modules/addonsmanager/addons_installer.php
index 7950a860..6c62d322 100644
--- a/modules/addonsmanager/addons_installer.php
+++ b/modules/addonsmanager/addons_installer.php
@@ -23,7 +23,7 @@ require_once("includes/lib_remote.php");
 require_once("modules/config_games/server_config_parser.php");
 require_once("protocol/lgsl/lgsl_protocol.php");
 
-function exec_ogp_module() {
+function exec_gsp_module() {
 
     global $db,$view;
 	$home_id = $_REQUEST['home_id'];
@@ -74,7 +74,7 @@ function exec_ogp_module() {
 			return;
 		}
 		
-		$remote = new OGPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
+		$remote = new GSPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
 		
 		$addon_info = $addons_rows[0];
 		$url = $addon_info['url'];
diff --git a/modules/addonsmanager/addons_manager.php b/modules/addonsmanager/addons_manager.php
index 075cdd7f..53a925ef 100644
--- a/modules/addonsmanager/addons_manager.php
+++ b/modules/addonsmanager/addons_manager.php
@@ -4,7 +4,7 @@
  * Component of the addonsmanager module
  */
 
-function exec_ogp_module() {
+function exec_gsp_module() {
 
 	global $db;
 	
diff --git a/modules/addonsmanager/user_addons.php b/modules/addonsmanager/user_addons.php
index 1dc66d47..0b409df6 100644
--- a/modules/addonsmanager/user_addons.php
+++ b/modules/addonsmanager/user_addons.php
@@ -3,7 +3,7 @@
  * Component of the addonsmanager module
  */
 
-function exec_ogp_module() {
+function exec_gsp_module() {
 	global $db;
 	$home_id = $_GET['home_id'];
 	$mod_id = $_GET['mod_id'];
diff --git a/modules/administration/administration.php b/modules/administration/administration.php
index 2eb441e9..e5e57316 100644
--- a/modules/administration/administration.php
+++ b/modules/administration/administration.php
@@ -3,7 +3,7 @@
  * Administrative interface for the administration module
  */
 
-function exec_ogp_module() 
+function exec_gsp_module() 
 {
 	global $db,$view;
 	echo "<h2>".get_lang('administration')."</h2>";
diff --git a/modules/administration/backupdwl.php b/modules/administration/backupdwl.php
index 989f2dbe..dd4af0d8 100644
--- a/modules/administration/backupdwl.php
+++ b/modules/administration/backupdwl.php
@@ -3,7 +3,7 @@
  * Component of the administration module
  */
 
-function exec_ogp_module() 
+function exec_gsp_module() 
 {
 	$path = getcwd()."/".$_GET['randir']."/"; // change the path to fit your websites document structure
 	$fullPath = $path.$_GET['dwfile'];
diff --git a/modules/administration/banlist.php b/modules/administration/banlist.php
index 70b9fe37..e81d4893 100644
--- a/modules/administration/banlist.php
+++ b/modules/administration/banlist.php
@@ -4,7 +4,7 @@
  * Component of the administration module
  */
 
-function exec_ogp_module() 
+function exec_gsp_module() 
 {
 	echo "<h2>".get_lang('ban_list')."</h2>";
 	global $db, $settings;
diff --git a/modules/administration/iframe.php b/modules/administration/iframe.php
index a88707bc..8bcc57af 100644
--- a/modules/administration/iframe.php
+++ b/modules/administration/iframe.php
@@ -3,7 +3,7 @@
  * Component of the administration module
  */
 
-function exec_ogp_module() 
+function exec_gsp_module() 
 {
 
 if(isset($_POST['default']))
diff --git a/modules/administration/watch_logger.php b/modules/administration/watch_logger.php
index 24936267..f29ff65c 100644
--- a/modules/administration/watch_logger.php
+++ b/modules/administration/watch_logger.php
@@ -4,7 +4,7 @@
  * Component of the administration module
  */
 
-function exec_ogp_module() {
+function exec_gsp_module() {
 	global $db, $view, $loggedInUserInfo;
 
 	$search_field = (isset($_GET['search']) && !empty($_GET['search'])) ? $_GET['search'] : false;
diff --git a/modules/backup-restore/backup-restore.php b/modules/backup-restore/backup-restore.php
index 7f50e762..f17a3ac4 100644
--- a/modules/backup-restore/backup-restore.php
+++ b/modules/backup-restore/backup-restore.php
@@ -2,7 +2,7 @@
 
 include "function.php";
 
-function exec_ogp_module(){
+function exec_gsp_module(){
 
 	if($_SERVER['REQUEST_METHOD'] === 'GET'){
 		$homeid = $_GET['home_id'];
diff --git a/modules/billing/add_to_cart.php b/modules/billing/add_to_cart.php
index 604dec02..1f59dedc 100644
--- a/modules/billing/add_to_cart.php
+++ b/modules/billing/add_to_cart.php
@@ -22,7 +22,7 @@
  *
  */
 
-function exec_ogp_module()
+function exec_gsp_module()
 {
 	global $db ,$view;
 	$settings = $db->getSettings();
diff --git a/modules/billing/bak/add_to_cart.php b/modules/billing/bak/add_to_cart.php
index 604dec02..1f59dedc 100644
--- a/modules/billing/bak/add_to_cart.php
+++ b/modules/billing/bak/add_to_cart.php
@@ -22,7 +22,7 @@
  *
  */
 
-function exec_ogp_module()
+function exec_gsp_module()
 {
 	global $db ,$view;
 	$settings = $db->getSettings();
diff --git a/modules/billing/bak/bill.php b/modules/billing/bak/bill.php
index 3b03dd55..284a63dc 100644
--- a/modules/billing/bak/bill.php
+++ b/modules/billing/bak/bill.php
@@ -1,5 +1,5 @@
 <?php
-function exec_ogp_module()
+function exec_gsp_module()
 {
 	//Include database connection details
 	require('includes/config.inc.php');
diff --git a/modules/billing/bak/coupon.php b/modules/billing/bak/coupon.php
index 8f8a553b..2ba51942 100644
--- a/modules/billing/bak/coupon.php
+++ b/modules/billing/bak/coupon.php
@@ -1,5 +1,5 @@
 <?php
-function exec_ogp_module()
+function exec_gsp_module()
 {		
 	global $db;
 
diff --git a/modules/billing/bak/coupons.php b/modules/billing/bak/coupons.php
index 8f8a553b..2ba51942 100644
--- a/modules/billing/bak/coupons.php
+++ b/modules/billing/bak/coupons.php
@@ -1,5 +1,5 @@
 <?php
-function exec_ogp_module()
+function exec_gsp_module()
 {		
 	global $db;
 
diff --git a/modules/billing/bak/create_servers.php b/modules/billing/bak/create_servers.php
index 3f995f12..887b8c48 100644
--- a/modules/billing/bak/create_servers.php
+++ b/modules/billing/bak/create_servers.php
@@ -2,7 +2,7 @@
 require_once("includes/lib_remote.php");
 require_once("modules/config_games/server_config_parser.php");
 
-function exec_ogp_module()
+function exec_gsp_module()
 {
 	global $db,$view,$settings;
 	$user_id = $_SESSION['user_id'];
@@ -62,7 +62,7 @@ function exec_ogp_module()
 				$home_info = $db->getGameHomeWithoutMods($home_id);
 				
 				//Create the remote connection
-				$remote = new OGPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
+				$remote = new GSPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
 				
 				//Reassign the server
 				$db->assignHomeTo( "user", $user_id, $home_id, $access_rights );
@@ -147,7 +147,7 @@ function exec_ogp_module()
 				$home_info = $db->getGameHomeWithoutMods($home_id);
 				
 				//Create the remote connection
-				$remote = new OGPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
+				$remote = new GSPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
 								
 				//Get Full home info in 1 array
 				$home_info = $db->getGameHome($home_id);
diff --git a/modules/billing/bak/cron-shop.php b/modules/billing/bak/cron-shop.php
index 33804526..48b3d64b 100644
--- a/modules/billing/bak/cron-shop.php
+++ b/modules/billing/bak/cron-shop.php
@@ -114,7 +114,7 @@ else
                 $home_id = $user_home['home_id'];
                 $home_info = $db->getGameHomeWithoutMods($home_id);
                 $server_info = $db->getRemoteServerById($home_info['remote_server_id']);
-                $remote = new OGPRemoteLibrary($server_info['agent_ip'], $server_info['agent_port'], $server_info['encryption_key'],$server_info['timeout']);
+                $remote = new GSPRemoteLibrary($server_info['agent_ip'], $server_info['agent_port'], $server_info['encryption_key'],$server_info['timeout']);
                 $ftp_login = isset($home_info['ftp_login']) ? $home_info['ftp_login'] : $home_id;
                 $remote->ftp_mgr("userdel", $ftp_login);
                 $db->changeFtpStatus('disabled',$home_id);
@@ -168,7 +168,7 @@ else
                 $home_id = $user_home['home_id'];
                 $home_info = $db->getGameHomeWithoutMods($home_id);
                 $server_info = $db->getRemoteServerById($home_info['remote_server_id']);
-                $remote = new OGPRemoteLibrary($server_info['agent_ip'], $server_info['agent_port'], $server_info['encryption_key'],$server_info['timeout']);
+                $remote = new GSPRemoteLibrary($server_info['agent_ip'], $server_info['agent_port'], $server_info['encryption_key'],$server_info['timeout']);
 
                 // Remove the game home from db
                 $db->deleteGameHome($home_id);
diff --git a/modules/billing/bak/orders.php b/modules/billing/bak/orders.php
index 5cf721f2..d08c08e4 100644
--- a/modules/billing/bak/orders.php
+++ b/modules/billing/bak/orders.php
@@ -1,5 +1,5 @@
 <?php 
-function exec_ogp_module()
+function exec_gsp_module()
 {
 	error_reporting(E_ALL);
 	
diff --git a/modules/billing/bak/paid.php b/modules/billing/bak/paid.php
index c9731d78..603bb6be 100644
--- a/modules/billing/bak/paid.php
+++ b/modules/billing/bak/paid.php
@@ -1,5 +1,5 @@
 <?php
-function exec_ogp_module()
+function exec_gsp_module()
 {	
 global $db,$view,$settings;
 $loadpage = "?m=billing&p=paid";
diff --git a/modules/billing/bak/paypal.php b/modules/billing/bak/paypal.php
index fb9ec855..b5b46018 100644
--- a/modules/billing/bak/paypal.php
+++ b/modules/billing/bak/paypal.php
@@ -1,5 +1,5 @@
 <?php
-function exec_ogp_module()
+function exec_gsp_module()
 {
 global $db,$view;
 $settings = $db->getSettings();
diff --git a/modules/billing/bak/settings.php b/modules/billing/bak/settings.php
index 0e0e15fe..b55b7807 100644
--- a/modules/billing/bak/settings.php
+++ b/modules/billing/bak/settings.php
@@ -4,7 +4,7 @@ function curPageName()
 	return substr($_SERVER["SCRIPT_NAME"],strrpos($_SERVER["SCRIPT_NAME"],"/")+1);
 }
 
-function exec_ogp_module()
+function exec_gsp_module()
 {		
 	require('includes/config.inc.php');
 	require_once('modules/settings/functions.php');
diff --git a/modules/billing/bak/shop.php b/modules/billing/bak/shop.php
index d85c6207..4503f8fa 100644
--- a/modules/billing/bak/shop.php
+++ b/modules/billing/bak/shop.php
@@ -22,7 +22,7 @@
  *
  */
 
-function exec_ogp_module()
+function exec_gsp_module()
 {	
 	global $db, $view;
 
diff --git a/modules/billing/bill.php b/modules/billing/bill.php
index 2667fcf4..6394a0af 100644
--- a/modules/billing/bill.php
+++ b/modules/billing/bill.php
@@ -1,5 +1,5 @@
 <?php
-function exec_ogp_module()
+function exec_gsp_module()
 {
 	//Include database connection details
 	require('includes/config.inc.php');
diff --git a/modules/billing/cart.php b/modules/billing/cart.php
index f35aaead..9fa97289 100644
--- a/modules/billing/cart.php
+++ b/modules/billing/cart.php
@@ -41,7 +41,7 @@ function assignOrdersToCart($user_id,$tax_amount,$currency,$coupon_id){
 	return $db->resultInsertId( 'billing_carts', $fields );
 }
 
-function exec_ogp_module()
+function exec_gsp_module()
 {
 	error_reporting(E_ALL);
 	
diff --git a/modules/billing/coupon.php b/modules/billing/coupon.php
index 8f8a553b..2ba51942 100644
--- a/modules/billing/coupon.php
+++ b/modules/billing/coupon.php
@@ -1,5 +1,5 @@
 <?php
-function exec_ogp_module()
+function exec_gsp_module()
 {		
 	global $db;
 
diff --git a/modules/billing/coupons.php b/modules/billing/coupons.php
index 8f8a553b..2ba51942 100644
--- a/modules/billing/coupons.php
+++ b/modules/billing/coupons.php
@@ -1,5 +1,5 @@
 <?php
-function exec_ogp_module()
+function exec_gsp_module()
 {		
 	global $db;
 
diff --git a/modules/billing/create_servers.php b/modules/billing/create_servers.php
index 3f995f12..ce950c84 100644
--- a/modules/billing/create_servers.php
+++ b/modules/billing/create_servers.php
@@ -62,7 +62,7 @@ function exec_ogp_module()
 				$home_info = $db->getGameHomeWithoutMods($home_id);
 				
 				//Create the remote connection
-				$remote = new OGPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
+				$remote = new GSPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
 				
 				//Reassign the server
 				$db->assignHomeTo( "user", $user_id, $home_id, $access_rights );
@@ -147,7 +147,7 @@ function exec_ogp_module()
 				$home_info = $db->getGameHomeWithoutMods($home_id);
 				
 				//Create the remote connection
-				$remote = new OGPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
+				$remote = new GSPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
 								
 				//Get Full home info in 1 array
 				$home_info = $db->getGameHome($home_id);
diff --git a/modules/billing/cron-shop.php b/modules/billing/cron-shop.php
index b206f1f2..d4e4ccfe 100644
--- a/modules/billing/cron-shop.php
+++ b/modules/billing/cron-shop.php
@@ -115,7 +115,7 @@ else
                 $home_id = $user_home['home_id'];
                 $home_info = $db->getGameHomeWithoutMods($home_id);
                 $server_info = $db->getRemoteServerById($home_info['remote_server_id']);
-                $remote = new OGPRemoteLibrary($server_info['agent_ip'], $server_info['agent_port'], $server_info['encryption_key'],$server_info['timeout']);
+                $remote = new GSPRemoteLibrary($server_info['agent_ip'], $server_info['agent_port'], $server_info['encryption_key'],$server_info['timeout']);
                 $ftp_login = isset($home_info['ftp_login']) ? $home_info['ftp_login'] : $home_id;
                 $remote->ftp_mgr("userdel", $ftp_login);
                 $db->changeFtpStatus('disabled',$home_id);
@@ -169,7 +169,7 @@ else
                 $home_id = $user_home['home_id'];
                 $home_info = $db->getGameHomeWithoutMods($home_id);
                 $server_info = $db->getRemoteServerById($home_info['remote_server_id']);
-                $remote = new OGPRemoteLibrary($server_info['agent_ip'], $server_info['agent_port'], $server_info['encryption_key'],$server_info['timeout']);
+                $remote = new GSPRemoteLibrary($server_info['agent_ip'], $server_info['agent_port'], $server_info['encryption_key'],$server_info['timeout']);
 
                 // Remove the game home from db
                 $db->deleteGameHome($home_id);
diff --git a/modules/billing/paid.php b/modules/billing/paid.php
index c9731d78..603bb6be 100644
--- a/modules/billing/paid.php
+++ b/modules/billing/paid.php
@@ -1,5 +1,5 @@
 <?php
-function exec_ogp_module()
+function exec_gsp_module()
 {	
 global $db,$view,$settings;
 $loadpage = "?m=billing&p=paid";
diff --git a/modules/billing/paypal.php b/modules/billing/paypal.php
index fb9ec855..b5b46018 100644
--- a/modules/billing/paypal.php
+++ b/modules/billing/paypal.php
@@ -1,5 +1,5 @@
 <?php
-function exec_ogp_module()
+function exec_gsp_module()
 {
 global $db,$view;
 $settings = $db->getSettings();
diff --git a/modules/billing/services.php b/modules/billing/services.php
index e8b7484d..ba6c2fa2 100644
--- a/modules/billing/services.php
+++ b/modules/billing/services.php
@@ -1,5 +1,5 @@
 <?php
-function exec_ogp_module()
+function exec_gsp_module()
 {		
 	global $db;
 	
diff --git a/modules/billing/settings.php b/modules/billing/settings.php
index 0e0e15fe..b55b7807 100644
--- a/modules/billing/settings.php
+++ b/modules/billing/settings.php
@@ -4,7 +4,7 @@ function curPageName()
 	return substr($_SERVER["SCRIPT_NAME"],strrpos($_SERVER["SCRIPT_NAME"],"/")+1);
 }
 
-function exec_ogp_module()
+function exec_gsp_module()
 {		
 	require('includes/config.inc.php');
 	require_once('modules/settings/functions.php');
diff --git a/modules/circular/circular.php b/modules/circular/circular.php
index da3e48fe..484bec08 100644
--- a/modules/circular/circular.php
+++ b/modules/circular/circular.php
@@ -3,7 +3,7 @@
  * Component of the circular module
  */
 include 'modules/circular/functions.php';
-function exec_ogp_module()
+function exec_gsp_module()
 {
 	global $db;
 	if(isset($_POST['send_circular']))
diff --git a/modules/circular/show_circular.php b/modules/circular/show_circular.php
index 6158b8b7..82814a8a 100644
--- a/modules/circular/show_circular.php
+++ b/modules/circular/show_circular.php
@@ -3,7 +3,7 @@
  * Component of the circular module
  */
 include 'modules/circular/functions.php';
-function exec_ogp_module()
+function exec_gsp_module()
 {
 	$circulars = get_circulars();
 	if(isset($_GET['list']))
diff --git a/modules/config_games/cli-params.php b/modules/config_games/cli-params.php
index 834c9c99..7045bf48 100644
--- a/modules/config_games/cli-params.php
+++ b/modules/config_games/cli-params.php
@@ -3,7 +3,7 @@
  * Component of the config_games module
  */
 
-function exec_ogp_module() {
+function exec_gsp_module() {
 	@$arch = $_POST['arch'];
 	@$os = $_POST['os'];
 	@$protocol = $_POST['protocol'];
diff --git a/modules/config_games/config_servers.php b/modules/config_games/config_servers.php
index 77085594..918dd462 100644
--- a/modules/config_games/config_servers.php
+++ b/modules/config_games/config_servers.php
@@ -5,7 +5,7 @@
 
 require_once("server_config_parser.php");
 
-function exec_ogp_module() {
+function exec_gsp_module() {
 
     global $db,$view;
     $game_cfgs = $db->getGameCfgs();
diff --git a/modules/config_games/create.php b/modules/config_games/create.php
index 033f3f26..31beed5a 100644
--- a/modules/config_games/create.php
+++ b/modules/config_games/create.php
@@ -3,7 +3,7 @@
  * Component of the config_games module
  */
 
-function exec_ogp_module() {
+function exec_gsp_module() {
 	@$arch = $_POST['arch'];
 	@$os = $_POST['os'];
 	@$protocol = $_POST['protocol'];
diff --git a/modules/config_games/set_mods.php b/modules/config_games/set_mods.php
index 3aed69dc..e4f34b37 100644
--- a/modules/config_games/set_mods.php
+++ b/modules/config_games/set_mods.php
@@ -3,7 +3,7 @@
  * Component of the config_games module
  */
 
-function exec_ogp_module() {
+function exec_gsp_module() {
 	@$arch = $_POST['arch'];
 	@$os = $_POST['os'];
 	@$protocol = $_POST['protocol'];
diff --git a/modules/config_games/set_params.php b/modules/config_games/set_params.php
index a59b0d7c..aa16213f 100644
--- a/modules/config_games/set_params.php
+++ b/modules/config_games/set_params.php
@@ -3,7 +3,7 @@
  * Component of the config_games module
  */
 
-function exec_ogp_module() {
+function exec_gsp_module() {
 	@$arch = $_POST['arch'];
 	@$os = $_POST['os'];
 	@$protocol = $_POST['protocol'];
diff --git a/modules/config_games/xml_config_creator.php b/modules/config_games/xml_config_creator.php
index 23575e9b..bdab4eac 100644
--- a/modules/config_games/xml_config_creator.php
+++ b/modules/config_games/xml_config_creator.php
@@ -3,7 +3,7 @@
  * Component of the config_games module
  */
 
-function exec_ogp_module() {
+function exec_gsp_module() {
 	?>
 	<h2>XML Config Creator</h2>
 	 <table BORDER=1>
diff --git a/modules/cron/cron.php b/modules/cron/cron.php
index 4f177949..1bc6764a 100644
--- a/modules/cron/cron.php
+++ b/modules/cron/cron.php
@@ -5,7 +5,7 @@
 require_once('includes/lib_remote.php');
 require_once('modules/cron/shared_cron_functions.php');
 
-function exec_ogp_module() 
+function exec_gsp_module() 
 {
 	global $db, $view;
 	$r_servers = $db->getRemoteServers();
@@ -37,7 +37,7 @@ function exec_ogp_module()
 	{
 		if(!checkCronInput($_POST['minute'], $_POST['hour'], $_POST['dayOfTheMonth'], $_POST['month'], $_POST['dayOfTheWeek']))
 		{
-			print_failure(get_lang('OGP_LANG_bad_inputs'));
+			print_failure(get_lang('GSP_LANG_bad_inputs'));
 			$view->refresh('?m=cron&p=cron',2);
 			return;
 		}
@@ -73,13 +73,13 @@ function exec_ogp_module()
 					break;
 			}
 			
-			$remote = new OGPRemoteLibrary( $game_home['agent_ip'], $game_home['agent_port'],
+			$remote = new GSPRemoteLibrary( $game_home['agent_ip'], $game_home['agent_port'],
 											$game_home['encryption_key'], $game_home['timeout'] );
 		}
 		else
 		{
 			$r_server_id = $_POST['r_server_id'];
-			$remote = new OGPRemoteLibrary( $remote_servers[$r_server_id]['agent_ip'],
+			$remote = new GSPRemoteLibrary( $remote_servers[$r_server_id]['agent_ip'],
 											$remote_servers[$r_server_id]['agent_port'],
 											$remote_servers[$r_server_id]['encryption_key'],
 											$remote_servers[$r_server_id]['timeout']);
@@ -101,7 +101,7 @@ function exec_ogp_module()
 	}
 	elseif( isset($_POST['removeJob']) and isset($remote_servers[$_POST['r_server_id']]) and isset($jobsArray[$_POST['r_server_id']][$_POST['job_id']]) )
 	{	
-		$remote = new OGPRemoteLibrary( $remote_servers[$_POST['r_server_id']]['agent_ip'],
+		$remote = new GSPRemoteLibrary( $remote_servers[$_POST['r_server_id']]['agent_ip'],
 										$remote_servers[$_POST['r_server_id']]['agent_port'],
 										$remote_servers[$_POST['r_server_id']]['encryption_key'],
 										$remote_servers[$_POST['r_server_id']]['timeout']);
diff --git a/modules/cron/events.php b/modules/cron/events.php
index b6d12824..4cc017e0 100644
--- a/modules/cron/events.php
+++ b/modules/cron/events.php
@@ -3,7 +3,7 @@
  * Component of the cron module
  */
 
-function exec_ogp_module() 
+function exec_gsp_module() 
 {	
 	// Using the refreshed class
 	if( isset($_GET['get_cronevents']) )
@@ -12,7 +12,7 @@ function exec_ogp_module()
 		global $db;
 		$remote_server_id = $_GET['r_server_id'];
 		$remote_server = $db->getRemoteServer($remote_server_id);
-		$remote = new OGPRemoteLibrary($remote_server['agent_ip'], $remote_server['agent_port'], $remote_server['encryption_key'], $remote_server['timeout'] );
+		$remote = new GSPRemoteLibrary($remote_server['agent_ip'], $remote_server['agent_port'], $remote_server['encryption_key'], $remote_server['timeout'] );
 		if($remote->status_chk() != 1)
 		{
 			print_failure(get_lang("agent_offline"));
diff --git a/modules/cron/shared_cron_functions.php b/modules/cron/shared_cron_functions.php
index 9b9f6be1..5766146a 100644
--- a/modules/cron/shared_cron_functions.php
+++ b/modules/cron/shared_cron_functions.php
@@ -9,7 +9,7 @@ function reloadJobs($server_homes, $remote_servers, $getAllJobs = true)
 	$jobsArray = array();
 	foreach( $remote_servers as $rhost_id => $remote_server )
 	{
-		$remote = new OGPRemoteLibrary($remote_server['agent_ip'], $remote_server['agent_port'], $remote_server['encryption_key'], $remote_server['timeout']);
+		$remote = new GSPRemoteLibrary($remote_server['agent_ip'], $remote_server['agent_port'], $remote_server['encryption_key'], $remote_server['timeout']);
 		if($remote->status_chk() != 1)
 		{
 			$remote_servers_offline[$rhost_id] = $remote_server;
@@ -85,7 +85,7 @@ function updateCronJobTokens($old_token, $token){
 	$remote_servers = $db->getRemoteServers();
 	foreach($remote_servers as $remote_server)
 	{
-		$remote = new OGPRemoteLibrary($remote_server['agent_ip'], $remote_server['agent_port'], $remote_server['encryption_key'], $remote_server['timeout']);
+		$remote = new GSPRemoteLibrary($remote_server['agent_ip'], $remote_server['agent_port'], $remote_server['encryption_key'], $remote_server['timeout']);
 		$jobs = $remote->scheduler_list_tasks();
 		foreach($jobs as $job_id => $job)
 		{
@@ -105,7 +105,7 @@ function deleteJobsByHomeServerID($home_id){
 		$remote_servers = $db->getRemoteServers();
 		foreach($remote_servers as $remote_server)
 		{
-			$remote = new OGPRemoteLibrary($remote_server['agent_ip'], $remote_server['agent_port'], $remote_server['encryption_key'], $remote_server['timeout']);
+			$remote = new GSPRemoteLibrary($remote_server['agent_ip'], $remote_server['agent_port'], $remote_server['encryption_key'], $remote_server['timeout']);
 			$jobs = $remote->scheduler_list_tasks();
 			foreach($jobs as $job_id => $job)
 			{
@@ -214,7 +214,7 @@ function updateCronJobsToNewApi()
 		$mod_key = '';
 		foreach($remote_servers as $remote_server)
 		{
-			$remote = new OGPRemoteLibrary($remote_server['agent_ip'], $remote_server['agent_port'], $remote_server['encryption_key'], $remote_server['timeout']);
+			$remote = new GSPRemoteLibrary($remote_server['agent_ip'], $remote_server['agent_port'], $remote_server['encryption_key'], $remote_server['timeout']);
 			$jobs = $remote->scheduler_list_tasks();
 			if(!is_array($jobs))
 				continue;
diff --git a/modules/cron/thetime.php b/modules/cron/thetime.php
index cf5fe581..5d3cb3b4 100644
--- a/modules/cron/thetime.php
+++ b/modules/cron/thetime.php
@@ -4,11 +4,11 @@
  */
 
 require_once('includes/lib_remote.php');
-function exec_ogp_module() 
+function exec_gsp_module() 
 {
 	global $db;
 	$remote_server = $db->getRemoteServer($_GET['r_server_id']);
-	$remote = new OGPRemoteLibrary( $remote_server['agent_ip'], $remote_server['agent_port'],
+	$remote = new GSPRemoteLibrary( $remote_server['agent_ip'], $remote_server['agent_port'],
 									$remote_server['encryption_key'], $remote_server['timeout'] );
 	
 	if($remote->status_chk() == 1)
diff --git a/modules/cron/user_cron.php b/modules/cron/user_cron.php
index 107ede88..44fb248e 100644
--- a/modules/cron/user_cron.php
+++ b/modules/cron/user_cron.php
@@ -6,7 +6,7 @@ error_reporting(E_ALL);
 require_once('includes/lib_remote.php');
 require_once('modules/cron/shared_cron_functions.php');
 
-function exec_ogp_module() 
+function exec_gsp_module() 
 {
 	global $db, $view;
 	$isAdmin = $db->isAdmin($_SESSION['user_id']);
@@ -38,7 +38,7 @@ function exec_ogp_module()
 	{
 		if(!checkCronInput($_POST['minute'], $_POST['hour'], $_POST['dayOfTheMonth'], $_POST['month'], $_POST['dayOfTheWeek']))
 		{
-			print_failure(get_lang('OGP_LANG_bad_inputs'));
+			print_failure(get_lang('GSP_LANG_bad_inputs'));
 			$view->refresh('?m=cron&p=user_cron',2);
 			return;
 		}
@@ -81,7 +81,7 @@ function exec_ogp_module()
 				   $_POST['dayOfTheWeek']." ".
 				   $command;
 			
-			$remote = new OGPRemoteLibrary( $game_home['agent_ip'],
+			$remote = new GSPRemoteLibrary( $game_home['agent_ip'],
 											$game_home['agent_port'],
 											$game_home['encryption_key'],
 											$game_home['timeout']);
@@ -95,7 +95,7 @@ function exec_ogp_module()
 	}
 	elseif( isset($_POST['removeJob']) and isset($remote_servers[$_POST['r_server_id']]) and isset($jobsArray[$_POST['r_server_id']][$_POST['job_id']]) )
 	{	
-		$remote = new OGPRemoteLibrary( $remote_servers[$_POST['r_server_id']]['agent_ip'],
+		$remote = new GSPRemoteLibrary( $remote_servers[$_POST['r_server_id']]['agent_ip'],
 										$remote_servers[$_POST['r_server_id']]['agent_port'],
 										$remote_servers[$_POST['r_server_id']]['encryption_key'],
 										$remote_servers[$_POST['r_server_id']]['timeout'] );
diff --git a/modules/dashboard/dashboard.php b/modules/dashboard/dashboard.php
index 05f3dfa9..6cf18e97 100644
--- a/modules/dashboard/dashboard.php
+++ b/modules/dashboard/dashboard.php
@@ -8,7 +8,7 @@
 require_once('includes/lib_remote.php');
 
 
-function exec_ogp_module() 
+function exec_gsp_module() 
 {
 	global $db, $settings, $loggedInUserInfo;
 	
@@ -225,7 +225,7 @@ function exec_ogp_module()
 
 			if( isset($_GET['remote_server_id']) AND $_GET['remote_server_id'] == $server_row['remote_server_id'] )
 			{
-				$remote = new OGPRemoteLibrary( $server_row['agent_ip'], $server_row['agent_port'], 
+				$remote = new GSPRemoteLibrary( $server_row['agent_ip'], $server_row['agent_port'], 
 												$server_row['encryption_key'], $server_row['timeout'] );
 				$host_stat = $remote->status_chk();
 				if( $host_stat === 1 )
@@ -253,7 +253,7 @@ function exec_ogp_module()
 			if($remote_server_id)
 			{
 				$remote_server = $db->getRemoteServer($remote_server_id);
-				$remote = new OGPRemoteLibrary( $remote_server['agent_ip'], $remote_server['agent_port'], 
+				$remote = new GSPRemoteLibrary( $remote_server['agent_ip'], $remote_server['agent_port'], 
 												$remote_server['encryption_key'], $remote_server['timeout'] );
 				$host_stat = $remote->status_chk();
 				if( $host_stat === 1 )
diff --git a/modules/dashboard/query_ref.php b/modules/dashboard/query_ref.php
index 524024e9..2efbb6ca 100644
--- a/modules/dashboard/query_ref.php
+++ b/modules/dashboard/query_ref.php
@@ -17,7 +17,7 @@ function print_player_list_ogp_dashboard($player_list,$players,$playersmax,$game
 	return $data;
 }
 
-function exec_ogp_module() 
+function exec_gsp_module() 
 {
 	$server_key = 'server_'.$_GET['ip'].'_'.$_GET['port'];
 	if(isset($_GET['show']) and $_GET['show'] == "players")
diff --git a/modules/dashboard/updateWidgets.php b/modules/dashboard/updateWidgets.php
index 86420d4a..bf50e880 100644
--- a/modules/dashboard/updateWidgets.php
+++ b/modules/dashboard/updateWidgets.php
@@ -3,7 +3,7 @@
  * Component of the dashboard module
  */
 
-function exec_ogp_module()
+function exec_gsp_module()
 {
     global $db;
 
diff --git a/modules/dsi/dsi_admin.php b/modules/dsi/dsi_admin.php
index ffacb385..23c2281e 100644
--- a/modules/dsi/dsi_admin.php
+++ b/modules/dsi/dsi_admin.php
@@ -21,7 +21,7 @@
 define("DSI_BASEPATH", "modules/dsi/");
 require_once(DSI_BASEPATH . 'includes/functions_ui.php');
 require_once('modules/config_games/server_config_parser.php'); 
-function exec_ogp_module(){
+function exec_gsp_module(){
 	global $db;
 	global $view;
 	
diff --git a/modules/dsi/dsi_list.php b/modules/dsi/dsi_list.php
index 5a1e00c2..58b767da 100644
--- a/modules/dsi/dsi_list.php
+++ b/modules/dsi/dsi_list.php
@@ -10,7 +10,7 @@ require_once("modules/config_games/server_config_parser.php");
 require_once('includes/lib_remote.php');
 require_once('protocol/lgsl/lgsl_protocol.php');
 require_once('protocol/GameQ/GameQ.php');
-function exec_ogp_module(){
+function exec_gsp_module(){
 	global $db;
 	$online = isset( $_POST['online'] ) ? TRUE : FALSE;
 	$server_homes = $db->getIpPorts();
@@ -62,8 +62,8 @@ function exec_ogp_module(){
 		// Get display IP
 		$public_ip = checkDisplayPublicIP($server_home['display_public_ip'],$server_home['ip'] != $server_home['agent_ip'] ? $server_home['ip'] : $server_home['agent_ip']);
 		
-		$remote = new OGPRemoteLibrary($server_home['agent_ip'], $server_home['agent_port'], $server_home['encryption_key'], $server_home['timeout']);
-		$screen_running = $remote->is_screen_running(OGP_SCREEN_TYPE_HOME,$server_home['home_id']) === 1;
+		$remote = new GSPRemoteLibrary($server_home['agent_ip'], $server_home['agent_port'], $server_home['encryption_key'], $server_home['timeout']);
+		$screen_running = $remote->is_screen_running(GSP_SCREEN_TYPE_HOME,$server_home['home_id']) === 1;
 		if($screen_running) $servers_running++;
 		if( ( $online and $screen_running ) OR ( isset( $_GET['home_id-mod_id-ip-port'] ) 
 						 and $_GET['home_id-mod_id-ip-port'] == 
diff --git a/modules/dsi/dsi_user.php b/modules/dsi/dsi_user.php
index 33605fa6..8635f59c 100644
--- a/modules/dsi/dsi_user.php
+++ b/modules/dsi/dsi_user.php
@@ -25,7 +25,7 @@ require_once('modules/gamemanager/home_handling_functions.php');
 require_once('modules/config_games/server_config_parser.php');
 require_once('protocol/lgsl/lgsl_protocol.php');
 require_once('protocol/GameQ/GameQ.php');
-function exec_ogp_module(){
+function exec_gsp_module(){
 	global $db;
 	echo "<h2>".get_lang("dsi_long")."</h2>";
 	
diff --git a/modules/dsi/image.php b/modules/dsi/image.php
index a29a8fd5..2b1e1ce7 100644
--- a/modules/dsi/image.php
+++ b/modules/dsi/image.php
@@ -26,7 +26,7 @@ require(DSI_BASEPATH . 'includes/functions.php');
 require("modules/gamemanager/home_handling_functions.php");
 require('modules/config_games/server_config_parser.php'); 
 
-function exec_ogp_module(){
+function exec_gsp_module(){
 	global $db,$view,$settings;
 	
 	if(isset($_GET["s"])){
diff --git a/modules/editconfigfiles/configFileList.php b/modules/editconfigfiles/configFileList.php
index da2f392e..a5abc2b6 100644
--- a/modules/editconfigfiles/configFileList.php
+++ b/modules/editconfigfiles/configFileList.php
@@ -25,7 +25,7 @@
 require_once('modules/editconfigfiles/functions.php');
 require_once("modules/config_games/server_config_parser.php");
 
-function exec_ogp_module()
+function exec_gsp_module()
 {
     global $db, $view;
     
diff --git a/modules/editconfigfiles/modify.php b/modules/editconfigfiles/modify.php
index be8faeff..5c6981df 100644
--- a/modules/editconfigfiles/modify.php
+++ b/modules/editconfigfiles/modify.php
@@ -27,7 +27,7 @@ require 'modules/editconfigfiles/functions.php';
 require_once 'modules/config_games/server_config_parser.php';
 require 'includes/lib_remote.php';
 
-function exec_ogp_module()
+function exec_gsp_module()
 {
     global $db, $view;
     
@@ -59,7 +59,7 @@ function exec_ogp_module()
         return;
     }
     
-    $remote = new OGPRemoteLibrary($server_home['agent_ip'], $server_home['agent_port'], $server_home['encryption_key'], $server_home['timeout']);
+    $remote = new GSPRemoteLibrary($server_home['agent_ip'], $server_home['agent_port'], $server_home['encryption_key'], $server_home['timeout']);
     
     if ($remote->status_chk() === 0) {
         print_failure(get_lang('agent_offline'));
diff --git a/modules/faq/faq.php b/modules/faq/faq.php
index 7ad304ff..8dda0b73 100644
--- a/modules/faq/faq.php
+++ b/modules/faq/faq.php
@@ -28,7 +28,7 @@
 <script type="text/javascript" src="modules/faq/faq.js"></script>
 <link type="text/css" rel="stylesheet" href="modules/faq/syntaxhighlighter/styles/shCoreDefault.css"/>
 <?php
-function exec_ogp_module()
+function exec_gsp_module()
 {
 	echo '<h2>F.A.Q.</h2>';
 	echo '<div class="maincategory"><img class="headerimage" src="modules/faq/faq.png">Categories<div style="float:right" >'.
diff --git a/modules/fast_download/admin_fastdl.php b/modules/fast_download/admin_fastdl.php
index a4ea382e..f322c2ea 100644
--- a/modules/fast_download/admin_fastdl.php
+++ b/modules/fast_download/admin_fastdl.php
@@ -7,7 +7,7 @@ require_once("modules/config_games/server_config_parser.php");
 require_once('includes/lib_remote.php');
 require_once('modules/fast_download/functions.php');
 require('includes/form_table_class.php');
-function exec_ogp_module()
+function exec_gsp_module()
 {
 	global $db,$view;
 	echo "<h2>".get_lang("fast_dl")."</h2>\n";
@@ -122,7 +122,7 @@ function exec_ogp_module()
 			$remote_server_id = $_GET['remote_server_id'];
 			$remote_server = $db->getRemoteServer($remote_server_id);
 			$rserver = $db->getRemoteServerById($remote_server_id);
-			$remote = new OGPRemoteLibrary( $rserver['agent_ip'],
+			$remote = new GSPRemoteLibrary( $rserver['agent_ip'],
 											$rserver['agent_port'],
 											$rserver['encryption_key'],
 											$rserver['timeout']);
@@ -206,7 +206,7 @@ function exec_ogp_module()
 		{
 			$remote_server_id = $_GET['remote_server_id'];
 			$rserver = $db->getRemoteServerById($remote_server_id);
-			$remote = new OGPRemoteLibrary( $rserver['agent_ip'],
+			$remote = new GSPRemoteLibrary( $rserver['agent_ip'],
 											$rserver['agent_port'],
 											$rserver['encryption_key'],
 											$rserver['timeout']);
@@ -317,7 +317,7 @@ function exec_ogp_module()
 				$server_home = $db->getGameHomeByIP($ip, $port);
 				if ( !$server_home )
 					return;
-				$remote = new OGPRemoteLibrary($server_home['agent_ip'], 
+				$remote = new GSPRemoteLibrary($server_home['agent_ip'], 
 											   $server_home['agent_port'], 
 											   $server_home['encryption_key'], 
 											   $server_home['timeout']);
diff --git a/modules/fast_download/user_fastd.php b/modules/fast_download/user_fastd.php
index 6cebe171..89436351 100644
--- a/modules/fast_download/user_fastd.php
+++ b/modules/fast_download/user_fastd.php
@@ -6,7 +6,7 @@
 require_once("modules/config_games/server_config_parser.php");
 require_once('includes/lib_remote.php');
 require_once('modules/fast_download/functions.php');
-function exec_ogp_module() 
+function exec_gsp_module() 
 {
 	global $db,$view;
 	echo "<h2>".get_lang("fast_dl")."</h2>\n";
@@ -52,7 +52,7 @@ function exec_ogp_module()
 			return;
 		}
 				
-		$remote = new OGPRemoteLibrary($server_home['agent_ip'], 
+		$remote = new GSPRemoteLibrary($server_home['agent_ip'], 
 									   $server_home['agent_port'], 
 									   $server_home['encryption_key'], 
 									   $server_home['timeout']);
diff --git a/modules/ftp/ftp.php b/modules/ftp/ftp.php
index 7cf72e3d..19de91d1 100644
--- a/modules/ftp/ftp.php
+++ b/modules/ftp/ftp.php
@@ -3,7 +3,7 @@
  * Component of the ftp module
  */
 
-function exec_ogp_module()
+function exec_gsp_module()
 {
 	global $db,$view,$settings;
 
diff --git a/modules/ftp/ftp_admin.php b/modules/ftp/ftp_admin.php
index 21dd62f2..7741a683 100644
--- a/modules/ftp/ftp_admin.php
+++ b/modules/ftp/ftp_admin.php
@@ -4,7 +4,7 @@
  * Administrative interface for the ftp module
  */
 
-function exec_ogp_module()
+function exec_gsp_module()
 {
 	include('includes/lib_remote.php');
 	
@@ -15,7 +15,7 @@ function exec_ogp_module()
 	{
 		$success = true;
 		$server_row = $db->getRemoteServer($_POST['remote_server_id']);
-		$remote = new OGPRemoteLibrary($server_row['agent_ip'],$server_row['agent_port'],$server_row['encryption_key'],$server_row['timeout']);
+		$remote = new GSPRemoteLibrary($server_row['agent_ip'],$server_row['agent_port'],$server_row['encryption_key'],$server_row['timeout']);
 		$post_ftp_login = strip_real_escape_string($_POST['ftp_login']);		
 		$post_ftp_password = strip_real_escape_string($_POST['ftp_password']);
 		$post_full_path = strip_real_escape_string($_POST['full_path']);
@@ -64,7 +64,7 @@ function exec_ogp_module()
 	{
 		$ftp_login = strip_real_escape_string($_POST['ftp_login']);
 		$server_row = $db->getRemoteServer($_POST['remote_server_id']);
-		$remote = new OGPRemoteLibrary($server_row['agent_ip'],$server_row['agent_port'],$server_row['encryption_key'],$server_row['timeout']);
+		$remote = new GSPRemoteLibrary($server_row['agent_ip'],$server_row['agent_port'],$server_row['encryption_key'],$server_row['timeout']);
 
 		$remote->ftp_mgr("userdel", $ftp_login);
 
@@ -75,7 +75,7 @@ function exec_ogp_module()
 	if(isset($_POST['edit_ftp_user']))
 	{
 		$server_row = $db->getRemoteServer($_POST['remote_server_id']);
-		$remote = new OGPRemoteLibrary($server_row['agent_ip'],$server_row['agent_port'],$server_row['encryption_key'],$server_row['timeout']);
+		$remote = new GSPRemoteLibrary($server_row['agent_ip'],$server_row['agent_port'],$server_row['encryption_key'],$server_row['timeout']);
 		$ftp_login = strip_real_escape_string($_POST['ftp_login']);
 		$settings = "";
 		foreach($_POST as $key => $value)
@@ -128,7 +128,7 @@ function exec_ogp_module()
 		foreach ( $servers as $server_row )
 		{
 			$display_ip = checkDisplayPublicIP($server_row['display_public_ip'],$server_row['agent_ip']);
-			$remote = new OGPRemoteLibrary($server_row['agent_ip'],$server_row['agent_port'],$server_row['encryption_key'],$server_row['timeout']);
+			$remote = new GSPRemoteLibrary($server_row['agent_ip'],$server_row['agent_port'],$server_row['encryption_key'],$server_row['timeout']);
 
 			$host_stat = $remote->status_chk();
 			
diff --git a/modules/gamemanager/cfg_text_replace.php b/modules/gamemanager/cfg_text_replace.php
index 160cdc03..c36e5764 100644
--- a/modules/gamemanager/cfg_text_replace.php
+++ b/modules/gamemanager/cfg_text_replace.php
@@ -103,7 +103,7 @@ print_r($file_replacements);
 echo "</xmp>"; */
 
 require_once('includes/lib_remote.php');
-$remote = new OGPRemoteLibrary($server_home['agent_ip'], $server_home['agent_port'], $server_home['encryption_key'], $server_home['timeout']);
+$remote = new GSPRemoteLibrary($server_home['agent_ip'], $server_home['agent_port'], $server_home['encryption_key'], $server_home['timeout']);
 
 foreach($file_replacements as $filepath => $replacements)
 {
diff --git a/modules/gamemanager/get_server_log.php b/modules/gamemanager/get_server_log.php
index ce111c0b..0d963b99 100644
--- a/modules/gamemanager/get_server_log.php
+++ b/modules/gamemanager/get_server_log.php
@@ -16,14 +16,14 @@ if (!$home_id || !$mod_id) {
 $db = getOGPDBInstance(); // Replace with your DB instance
 $home_info = $db->getGameHome($home_id);
 $server_xml = read_server_config(SERVER_CONFIG_LOCATION."/".$home_info['home_cfg_file']);
-$remote = new OGPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
+$remote = new GSPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
 
 $home_log = "";
 if( isset( $server_xml->console_log ) ) {
     $log_path = preg_replace("/%mod%/i", $home_info['mods'][$mod_id]['mod_key'], $server_xml->console_log);
     $log_retval = $remote->remote_readfile( $home_info['home_path'].'/'.$log_path, $home_log );
 } else {
-    $log_retval = $remote->get_log(OGP_SCREEN_TYPE_HOME, $home_info['home_id'], clean_path($home_info['home_path']."/".$server_xml->exe_location), $home_log);
+    $log_retval = $remote->get_log(GSP_SCREEN_TYPE_HOME, $home_info['home_id'], clean_path($home_info['home_path']."/".$server_xml->exe_location), $home_log);
 }
 $lines = explode("\n", $home_log);
 $home_log = implode("\n", array_slice($lines, -40));
diff --git a/modules/gamemanager/home_handling_functions.php b/modules/gamemanager/home_handling_functions.php
index 0c45a796..b7932588 100644
--- a/modules/gamemanager/home_handling_functions.php
+++ b/modules/gamemanager/home_handling_functions.php
@@ -32,7 +32,7 @@ function get_start_cmd($remote,$server_xml,$home_info,$mod_id,$ip,$port,$db)
 	$cli_param_data['IP'] = $ip;
 	$cli_param_data['PORT'] = $port;
 	$cli_param_data['HOSTNAME'] = $home_info['home_name'];
-	$cli_param_data['PID_FILE'] = "ogp_game_startup.pid";
+	$cli_param_data['PID_FILE'] = "gsp_game_startup.pid";
 	
 	// Linux
 	if( preg_match("/Linux/", $os) )
@@ -217,7 +217,7 @@ function exec_operation( $action, $home_id, $mod_id, $ip, $port, $override = fal
         return FALSE;
 	
 	require_once('includes/lib_remote.php');
-	$remote = new OGPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
+	$remote = new GSPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
 	$os = $remote->what_os();
 		
 	if ( $action != "stop" )
@@ -231,7 +231,7 @@ function exec_operation( $action, $home_id, $mod_id, $ip, $port, $override = fal
 		}
 	}
 
-	$screen_running = $remote->is_screen_running(OGP_SCREEN_TYPE_HOME,$home_info['home_id']) === 1;
+	$screen_running = $remote->is_screen_running(GSP_SCREEN_TYPE_HOME,$home_info['home_id']) === 1;
 	
 	if ( $action == "stop" AND $screen_running )
 	{
diff --git a/modules/gamemanager/log.php b/modules/gamemanager/log.php
index 9c20062d..6f6b3844 100644
--- a/modules/gamemanager/log.php
+++ b/modules/gamemanager/log.php
@@ -42,20 +42,20 @@ require_once("modules/config_games/server_config_parser.php");
     }
 
     require_once('includes/lib_remote.php');
-    $remote = new OGPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
+    $remote = new GSPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
 
     $home_log = "";
 	
 	if( isset( $server_xml->console_log ) )
 	{
-		$log_retval = $remote->get_log(OGP_SCREEN_TYPE_HOME,
+		$log_retval = $remote->get_log(GSP_SCREEN_TYPE_HOME,
 			$home_info['home_id'],
 			clean_path($home_info['home_path']),
 			$home_log, 100, (string) $server_xml->console_log);
 	}
 	else
 	{
-		$log_retval = $remote->get_log(OGP_SCREEN_TYPE_HOME,
+		$log_retval = $remote->get_log(GSP_SCREEN_TYPE_HOME,
 			$home_info['home_id'],
 			clean_path($home_info['home_path']."/".$server_xml->exe_location),
 			$home_log);
diff --git a/modules/gamemanager/mini_start.php b/modules/gamemanager/mini_start.php
index 2c5a84f1..c2b6e4cd 100644
--- a/modules/gamemanager/mini_start.php
+++ b/modules/gamemanager/mini_start.php
@@ -294,7 +294,7 @@ elseif($server_home['home_id'] == $_POST['home_id'])
 		
 	
 	$cli_param_data['HOSTNAME'] = $server_home['home_name'];
-	$cli_param_data['PID_FILE'] = "ogp_game_startup.pid";
+	$cli_param_data['PID_FILE'] = "gsp_game_startup.pid";
 	
 	$os = $remote->what_os();
 	
@@ -337,7 +337,7 @@ elseif($server_home['home_id'] == $_POST['home_id'])
 	
 	// We do this check because sometimes server does not answer to lgsl check
 	// done below and is still running.
-	if ( $remote->is_screen_running(OGP_SCREEN_TYPE_HOME,$server_home['home_id']) === 1 )
+	if ( $remote->is_screen_running(GSP_SCREEN_TYPE_HOME,$server_home['home_id']) === 1 )
 	{
 		echo "<p>".get_lang_f('server_already_running')."<a href=?m=gamemanager&amp;p=stop&amp;home_id=".$server_home['home_id'].
 			"&amp;ip=".$ip."&amp;port=".
diff --git a/modules/gamemanager/rcon_presets.php b/modules/gamemanager/rcon_presets.php
index bf922d86..22b02408 100644
--- a/modules/gamemanager/rcon_presets.php
+++ b/modules/gamemanager/rcon_presets.php
@@ -3,7 +3,7 @@
  * Component of the gamemanager module
  */
 
-function exec_ogp_module() {
+function exec_gsp_module() {
 
 	global $db;
 
diff --git a/modules/gamemanager/ref_servermonitor.php b/modules/gamemanager/ref_servermonitor.php
index a279f940..f2604e7b 100644
--- a/modules/gamemanager/ref_servermonitor.php
+++ b/modules/gamemanager/ref_servermonitor.php
@@ -6,7 +6,7 @@
 require_once('modules/gamemanager/home_handling_functions.php');
 require_once("modules/config_games/server_config_parser.php");
 require_once('includes/lib_remote.php');
-function exec_ogp_module()
+function exec_gsp_module()
 {
 	global $db;
 
@@ -99,7 +99,7 @@ function exec_ogp_module()
 		}
 		$remote_server_id = $server_home['remote_server_id'];
 		$rserver = $db->getRemoteServerById($remote_server_id);
-		$remote = new OGPRemoteLibrary($rserver['agent_ip'], $rserver['agent_port'], $rserver['encryption_key'], $rserver['timeout']);
+		$remote = new GSPRemoteLibrary($rserver['agent_ip'], $rserver['agent_port'], $rserver['encryption_key'], $rserver['timeout']);
 		$startup_file_exists = $remote->rfile_exists( "startups/".$ip."-".$port ) === 1;
 		$SrvCtrl = "<table class='srvctrl'><tr><td style='border:0;text-align:center;background:transparent'><a href='?m=gamemanager&amp;p=restart&amp;home_id=".
 					 $home_id."&amp;mod_id=".$mod_id."&amp;ip=".$ip."&amp;port=".$port.
diff --git a/modules/gamemanager/restart_server.php b/modules/gamemanager/restart_server.php
index 30809e6e..e8892380 100644
--- a/modules/gamemanager/restart_server.php
+++ b/modules/gamemanager/restart_server.php
@@ -6,7 +6,7 @@
 require_once('home_handling_functions.php');
 require_once("modules/config_games/server_config_parser.php");
 
-function exec_ogp_module() {
+function exec_gsp_module() {
     global $view,$db;
 
     $ip = $_REQUEST['ip'];
@@ -27,7 +27,7 @@ function exec_ogp_module() {
 	}
 
 	require_once('includes/lib_remote.php');
-	$remote = new OGPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
+	$remote = new GSPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
 	
 	$os = $remote->what_os();
 
@@ -66,7 +66,7 @@ function exec_ogp_module() {
 			}
 			else
 			{
-				$log_retval = $remote->get_log(OGP_SCREEN_TYPE_HOME,
+				$log_retval = $remote->get_log(GSP_SCREEN_TYPE_HOME,
 					$home_id,
 					clean_path($home_info['home_path']."/".$server_xml->exe_location),
 					$home_log);
@@ -247,7 +247,7 @@ function exec_ogp_module() {
 			}
 			else
 			{
-				$screen_running = $remote->is_screen_running(OGP_SCREEN_TYPE_HOME,$home_id);
+				$screen_running = $remote->is_screen_running(GSP_SCREEN_TYPE_HOME,$home_id);
 				if ( $screen_running == 1 )
 				{
 					print("<p class='note'>".get_lang('restarting_server')."</p>");
diff --git a/modules/gamemanager/rsync_install.php b/modules/gamemanager/rsync_install.php
index 3b634551..1509adec 100644
--- a/modules/gamemanager/rsync_install.php
+++ b/modules/gamemanager/rsync_install.php
@@ -96,7 +96,7 @@ function update_local_copies()
 
 require_once("includes/lib_remote.php");
 require_once("modules/config_games/server_config_parser.php");
-function exec_ogp_module() {
+function exec_gsp_module() {
 //update_local_copies(); #Disabled until the rsync_sites.list file from master servers is corrected.
 	global $db,$view,$settings;
 	
@@ -134,7 +134,7 @@ function exec_ogp_module() {
 	
 	$home_id = $home_info['home_id'];
 	
-	$remote = new OGPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
+	$remote = new GSPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
 	$server_xml = read_server_config(SERVER_CONFIG_LOCATION."/".$home_info['home_cfg_file']);
 	
 	if( isset($server_xml->lgsl_query_name) )
@@ -172,12 +172,12 @@ function exec_ogp_module() {
 		
 	echo "<h2>Update $home_info[home_name]</h2>";
 	
-	if ( $remote->is_screen_running(OGP_SCREEN_TYPE_HOME,$home_id) == 1 )
+	if ( $remote->is_screen_running(GSP_SCREEN_TYPE_HOME,$home_id) == 1 )
 	{
 		print_failure( get_lang("server_running_cant_update") );
 		return;
 	}
-	$update_active = $remote->get_log(OGP_SCREEN_TYPE_UPDATE,
+	$update_active = $remote->get_log(GSP_SCREEN_TYPE_UPDATE,
 		// Note exec location should not be added here as the log is in root where rsync is executed.
 		$home_id,clean_path($home_info['home_path']),
 		$log_txt,30);
diff --git a/modules/gamemanager/server_monitor.php b/modules/gamemanager/server_monitor.php
index 30a28c50..f7180d04 100644
--- a/modules/gamemanager/server_monitor.php
+++ b/modules/gamemanager/server_monitor.php
@@ -419,7 +419,7 @@ echo "<table id='servermonitor' class='tablesorter' data-sortlist='[[0,0],[3,1]]
 			
 			//End
 
-			$remote = new OGPRemoteLibrary($server_home['agent_ip'], $server_home['agent_port'], $server_home['encryption_key'], $server_home['timeout']);
+			$remote = new GSPRemoteLibrary($server_home['agent_ip'], $server_home['agent_port'], $server_home['encryption_key'], $server_home['timeout']);
 			$host_stat = $remote->status_chk();
 
 			if( $host_stat === 1)
@@ -429,8 +429,8 @@ echo "<table id='servermonitor' class='tablesorter' data-sortlist='[[0,0],[3,1]]
 				$displayIP =  checkDisplayPublicIP($server_home['display_public_ip'], $ip);
 				$address = "";
 
-				$screen_running = $remote->is_screen_running(OGP_SCREEN_TYPE_HOME,$server_home['home_id']) === 1;
-				$update_in_progress = $remote->is_screen_running(OGP_SCREEN_TYPE_UPDATE,$server_home['home_id']) === 1;
+				$screen_running = $remote->is_screen_running(GSP_SCREEN_TYPE_HOME,$server_home['home_id']) === 1;
+				$update_in_progress = $remote->is_screen_running(GSP_SCREEN_TYPE_UPDATE,$server_home['home_id']) === 1;
 				if($screen_running)
 				{
 					// Check if the screen running the server is running.
diff --git a/modules/gamemanager/start_server.php b/modules/gamemanager/start_server.php
index e5aa1a15..4c88e2ef 100644
--- a/modules/gamemanager/start_server.php
+++ b/modules/gamemanager/start_server.php
@@ -6,7 +6,7 @@
 require_once('home_handling_functions.php');
 require_once("modules/config_games/server_config_parser.php");
 
-function exec_ogp_module()
+function exec_gsp_module()
 {
     global $db;
     global $view;
@@ -38,7 +38,7 @@ function exec_ogp_module()
     echo "</h2>";
 
     require_once('includes/lib_remote.php');
-    $remote = new OGPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
+    $remote = new GSPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
 
     $server_xml = read_server_config(SERVER_CONFIG_LOCATION."/".$home_info['home_cfg_file']);
 
@@ -88,7 +88,7 @@ function exec_ogp_module()
 	}
 	else
 	{
-		$log_retval = $remote->get_log(OGP_SCREEN_TYPE_HOME,
+		$log_retval = $remote->get_log(GSP_SCREEN_TYPE_HOME,
 			$home_info['home_id'],
 			clean_path($home_info['home_path']."/".$server_xml->exe_location),
 			$home_log);
@@ -160,7 +160,7 @@ function exec_ogp_module()
 	else
 		$query_ip = $ip;
 
-	$running = $remote->is_screen_running(OGP_SCREEN_TYPE_HOME,$home_info['home_id']);
+	$running = $remote->is_screen_running(GSP_SCREEN_TYPE_HOME,$home_info['home_id']);
 	
 	if ( $server_xml->lgsl_query_name )
 	{
diff --git a/modules/gamemanager/stop_server.php b/modules/gamemanager/stop_server.php
index b3152524..5af4c83f 100644
--- a/modules/gamemanager/stop_server.php
+++ b/modules/gamemanager/stop_server.php
@@ -6,7 +6,7 @@
 require_once('home_handling_functions.php');
 require_once("modules/config_games/server_config_parser.php");
 
-function exec_ogp_module() {
+function exec_gsp_module() {
 
 	global $view,$db;
 
@@ -58,7 +58,7 @@ function exec_ogp_module() {
 	}
 	else
 	{
-		$remote = new OGPRemoteLibrary($rserver['agent_ip'],
+		$remote = new GSPRemoteLibrary($rserver['agent_ip'],
 									   $rserver['agent_port'],
 									   $rserver['encryption_key'],
 									   $rserver['timeout']);
diff --git a/modules/gamemanager/update_server.php b/modules/gamemanager/update_server.php
index f46a0729..ebff7f00 100644
--- a/modules/gamemanager/update_server.php
+++ b/modules/gamemanager/update_server.php
@@ -6,7 +6,7 @@
 require_once("includes/lib_remote.php");
 require_once("modules/config_games/server_config_parser.php");
 
-function exec_ogp_module() {
+function exec_gsp_module() {
 
 	global $db;
 	global $view;
@@ -40,7 +40,7 @@ function exec_ogp_module() {
 		print_failure( get_lang("xml_steam_error") );
 		return;
 	}
-	$remote = new OGPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'], $home_info['timeout']);
+	$remote = new GSPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'], $home_info['timeout']);
 	$host_stat = $remote->status_chk();
 	if( $host_stat === 0 )
 	{
@@ -50,14 +50,14 @@ function exec_ogp_module() {
 	}
 	else
 	{
-		if ( $remote->is_screen_running(OGP_SCREEN_TYPE_HOME,$home_id) == 1 )
+		if ( $remote->is_screen_running(GSP_SCREEN_TYPE_HOME,$home_id) == 1 )
 		{
 			print_failure( get_lang("server_running_cant_update") );
 			return;
 		}
 
 		$log_txt = '';
-		$update_active = $remote->get_log(OGP_SCREEN_TYPE_UPDATE,
+		$update_active = $remote->get_log(GSP_SCREEN_TYPE_UPDATE,
 			// Note exec location should not be added here as the log is in root where steam is executed.
 			$home_id,clean_path($home_info['home_path']),
 			$log_txt);
diff --git a/modules/gamemanager/update_server_manual.php b/modules/gamemanager/update_server_manual.php
index 80b342f2..ce66096b 100644
--- a/modules/gamemanager/update_server_manual.php
+++ b/modules/gamemanager/update_server_manual.php
@@ -22,7 +22,7 @@ function do_progress($kbytes,$totalsize)
 require_once("includes/lib_remote.php");
 require_once("modules/config_games/server_config_parser.php");
 
-function exec_ogp_module() {
+function exec_gsp_module() {
 
 	global $db, $view;
 
@@ -53,7 +53,7 @@ function exec_ogp_module() {
 	if ( !empty($state) )
 	{
 		$server_xml = read_server_config(SERVER_CONFIG_LOCATION."/".$home_info['home_cfg_file']);
-		$remote = new OGPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
+		$remote = new GSPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
 		if ( $state == "start" )
 		{
 			$postinstall = $server_xml->post_install ? $server_xml->post_install : "";
diff --git a/modules/gamemanager/upload_map_image.php b/modules/gamemanager/upload_map_image.php
index f5349a52..ff18f9c1 100644
--- a/modules/gamemanager/upload_map_image.php
+++ b/modules/gamemanager/upload_map_image.php
@@ -118,7 +118,7 @@ function smart_resize_image($file,
 	return true;
 }
 
-function exec_ogp_module() {
+function exec_gsp_module() {
 
 	global $db;
 
diff --git a/modules/gamemanager/view_server_log.php b/modules/gamemanager/view_server_log.php
index 9fe1c572..37bf09ee 100644
--- a/modules/gamemanager/view_server_log.php
+++ b/modules/gamemanager/view_server_log.php
@@ -6,7 +6,7 @@
 require_once('home_handling_functions.php');
 require_once("modules/config_games/server_config_parser.php");
 
-function exec_ogp_module()
+function exec_gsp_module()
 {
     global $db;
     global $view;
@@ -46,20 +46,20 @@ function exec_ogp_module()
     }
 
     require_once('includes/lib_remote.php');
-    $remote = new OGPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
+    $remote = new GSPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
 
     $home_log = "";
 	
 	if( isset( $server_xml->console_log ) )
 	{
-		$log_retval = $remote->get_log(OGP_SCREEN_TYPE_HOME,
+		$log_retval = $remote->get_log(GSP_SCREEN_TYPE_HOME,
 			$home_info['home_id'],
 			clean_path($home_info['home_path']),
 			$home_log, 100, (string) $server_xml->console_log);
 	}
 	else
 	{
-		$log_retval = $remote->get_log(OGP_SCREEN_TYPE_HOME,
+		$log_retval = $remote->get_log(GSP_SCREEN_TYPE_HOME,
 			$home_info['home_id'],
 			clean_path($home_info['home_path']."/".$server_xml->exe_location),
 			$home_log);
diff --git a/modules/lgsl_with_img_mod/feed.php b/modules/lgsl_with_img_mod/feed.php
index 27714675..2ba1c2c7 100644
--- a/modules/lgsl_with_img_mod/feed.php
+++ b/modules/lgsl_with_img_mod/feed.php
@@ -8,7 +8,7 @@
  |                                                                                                            |
  \-----------------------------------------------------------------------------------------------------------*/
 
-function exec_ogp_module()
+function exec_gsp_module()
 {
 	//------------------------------------------------------------------------------------------------------------+
 	require "modules/lgsl_with_img_mod/lgsl_files/lgsl_class.php";
diff --git a/modules/lgsl_with_img_mod/image.php b/modules/lgsl_with_img_mod/image.php
index 87ed6b52..43f79c97 100644
--- a/modules/lgsl_with_img_mod/image.php
+++ b/modules/lgsl_with_img_mod/image.php
@@ -176,7 +176,7 @@ $name_type_vertical = false; // false/true // Global default/fallback for printi
 
 require_once "modules/lgsl_with_img_mod/lgsl_files/lgsl_class.php";
 
-function exec_ogp_module()
+function exec_gsp_module()
 {
 	error_reporting(0);	  
 	//------------------------------------------------------------------------------------------------------------+
diff --git a/modules/lgsl_with_img_mod/lgsl.php b/modules/lgsl_with_img_mod/lgsl.php
index e7c06085..c2e9f410 100644
--- a/modules/lgsl_with_img_mod/lgsl.php
+++ b/modules/lgsl_with_img_mod/lgsl.php
@@ -22,7 +22,7 @@
  *
  */
 
-function exec_ogp_module()
+function exec_gsp_module()
 {
 	echo "<h2>LGSL</h2>";
 	global $output, $lgsl_server_id;
diff --git a/modules/lgsl_with_img_mod/lgsl_admin.php b/modules/lgsl_with_img_mod/lgsl_admin.php
index 28943d0d..7f1bc772 100644
--- a/modules/lgsl_with_img_mod/lgsl_admin.php
+++ b/modules/lgsl_with_img_mod/lgsl_admin.php
@@ -22,7 +22,7 @@
  *
  */
 
-function exec_ogp_module()
+function exec_gsp_module()
 {
 	echo "<h2>LGSL Admin</h2>";
 	require "modules/lgsl_with_img_mod/lgsl_files/lgsl_config.php";
diff --git a/modules/litefm/fm_dir.php b/modules/litefm/fm_dir.php
index 2779acfb..3f8edfec 100644
--- a/modules/litefm/fm_dir.php
+++ b/modules/litefm/fm_dir.php
@@ -38,7 +38,7 @@ function exec_ogp_module()
 
 	litefm_check($home_id);
 	
-	$remote = new OGPRemoteLibrary($home_cfg['agent_ip'], $home_cfg['agent_port'], $home_cfg['encryption_key'], $home_cfg['timeout']);
+	$remote = new GSPRemoteLibrary($home_cfg['agent_ip'], $home_cfg['agent_port'], $home_cfg['encryption_key'], $home_cfg['timeout']);
 	
 	$os_string = $remote->what_os();
 	$os = preg_match("/Linux/i", $os_string) ? "linux" : "windows";
diff --git a/modules/litefm/fm_read.php b/modules/litefm/fm_read.php
index 7d81e375..a0232890 100644
--- a/modules/litefm/fm_read.php
+++ b/modules/litefm/fm_read.php
@@ -3,7 +3,7 @@
  * Component of the litefm module
  */
 
-function exec_ogp_module()
+function exec_gsp_module()
 {
 	require_once(MODULES."/litefm/litefm.php");
 
@@ -49,7 +49,7 @@ function exec_ogp_module()
 		 "<td colspan='3' ><h3>$show_path</h3></td>".
 		 "</tr></table>\n";
 	//Logic to open the file we're editing
-	$remote = new OGPRemoteLibrary($home_cfg['agent_ip'], $home_cfg['agent_port'], $home_cfg['encryption_key'], $home_cfg['timeout']);
+	$remote = new GSPRemoteLibrary($home_cfg['agent_ip'], $home_cfg['agent_port'], $home_cfg['encryption_key'], $home_cfg['timeout']);
 	$data = "";
 	$rel_path = isset($_SESSION['fm_cwd_'.$home_id]) ? $_SESSION['fm_cwd_'.$home_id]:'';
 	$filepath = clean_path($home_cfg['home_path']."/".$rel_path);
diff --git a/modules/litefm/fm_write.php b/modules/litefm/fm_write.php
index 82dbf3b3..e2918064 100644
--- a/modules/litefm/fm_write.php
+++ b/modules/litefm/fm_write.php
@@ -5,7 +5,7 @@
 
 require_once(MODULES."/litefm/litefm.php");
 
-function exec_ogp_module()
+function exec_gsp_module()
 {
 	$home_id = $_REQUEST['home_id'];
 
@@ -40,7 +40,7 @@ function exec_ogp_module()
 	{
 		$_REQUEST['file_content'] = strip_real_escape_string($_REQUEST['file_content']);
 
-		$remote = new OGPRemoteLibrary($home_cfg['agent_ip'], $home_cfg['agent_port'], $home_cfg['encryption_key'], $home_cfg['timeout']);
+		$remote = new GSPRemoteLibrary($home_cfg['agent_ip'], $home_cfg['agent_port'], $home_cfg['encryption_key'], $home_cfg['timeout']);
 		$file_info = $remote->remote_writefile($home_cfg['home_path']."/".$_SESSION['fm_cwd_'.$home_id], $_REQUEST['file_content']);
 		if ( $file_info === 1 )
 		{
diff --git a/modules/litefm/get_file.php b/modules/litefm/get_file.php
index 44296e6d..fe889fd2 100644
--- a/modules/litefm/get_file.php
+++ b/modules/litefm/get_file.php
@@ -3,7 +3,7 @@
  * Component of the litefm module
  */
 
-function exec_ogp_module()
+function exec_gsp_module()
 {
 	require_once(MODULES."/litefm/litefm.php");
 
@@ -61,7 +61,7 @@ function exec_ogp_module()
 	}
 	
 	set_time_limit(0);
-	$remote = new OGPRemoteLibrary($home_cfg['agent_ip'], $home_cfg['agent_port'], $home_cfg['encryption_key'], $home_cfg['timeout']);
+	$remote = new GSPRemoteLibrary($home_cfg['agent_ip'], $home_cfg['agent_port'], $home_cfg['encryption_key'], $home_cfg['timeout']);
 	$fp = fopen("$downloads_folder/$did", "w");
 	$_SESSION['download'][$did]['offset'] = $remote->remote_get_file_part($home_cfg['home_path']."/".$_SESSION['download'][$did]['fileph'], $_SESSION['download'][$did]['offset'], $data);
 	if($_SESSION['download'][$did]['offset'] != -1)
diff --git a/modules/litefm/settings.php b/modules/litefm/settings.php
index 032417c6..9a88bdf7 100644
--- a/modules/litefm/settings.php
+++ b/modules/litefm/settings.php
@@ -4,7 +4,7 @@
  */
 
 require_once(MODULES."/litefm/functions.php");
-function exec_ogp_module()
+function exec_gsp_module()
 {
 	require_once('includes/form_table_class.php');
 	global $db;
diff --git a/modules/lostpwd/lostpwd.php b/modules/lostpwd/lostpwd.php
index 978ad211..35708e00 100644
--- a/modules/lostpwd/lostpwd.php
+++ b/modules/lostpwd/lostpwd.php
@@ -17,7 +17,7 @@ function makeRandomPassword() {
     return $pass;
 }
 
-function exec_ogp_module() {
+function exec_gsp_module() {
 	
 	global $db,$view,$settings;
 	
diff --git a/modules/modulemanager/add_module.php b/modules/modulemanager/add_module.php
index 5bd878fc..913bb503 100644
--- a/modules/modulemanager/add_module.php
+++ b/modules/modulemanager/add_module.php
@@ -3,7 +3,7 @@
  * Component of the modulemanager module
  */
 
-function exec_ogp_module()
+function exec_gsp_module()
 {
     global $db;
     global $view;
diff --git a/modules/modulemanager/delete_module.php b/modules/modulemanager/delete_module.php
index 7bf63e07..ff9ae5ee 100644
--- a/modules/modulemanager/delete_module.php
+++ b/modules/modulemanager/delete_module.php
@@ -3,7 +3,7 @@
  * Component of the modulemanager module
  */
 
-function exec_ogp_module()
+function exec_gsp_module()
 {
     global $db;
     global $view;
diff --git a/modules/modulemanager/modulemanager.php b/modules/modulemanager/modulemanager.php
index eb13bd27..5168d4c2 100644
--- a/modules/modulemanager/modulemanager.php
+++ b/modules/modulemanager/modulemanager.php
@@ -3,7 +3,7 @@
  * Component of the modulemanager module
  */
 
-function exec_ogp_module()
+function exec_gsp_module()
 {
     global $db;
 
diff --git a/modules/modulemanager/update_modules.php b/modules/modulemanager/update_modules.php
index 42401946..df20eb1f 100644
--- a/modules/modulemanager/update_modules.php
+++ b/modules/modulemanager/update_modules.php
@@ -3,7 +3,7 @@
  * Component of the modulemanager module
  */
 
-function exec_ogp_module()
+function exec_gsp_module()
 {
     global $db;
     global $view;
diff --git a/modules/mysql/edit_server.php b/modules/mysql/edit_server.php
index 76dca870..a85a1919 100644
--- a/modules/mysql/edit_server.php
+++ b/modules/mysql/edit_server.php
@@ -31,7 +31,7 @@ if ( function_exists('mysqli_connect') )
 else
 	require_once("modules/mysql/mysql_database.php");
 
-function exec_ogp_module() {
+function exec_gsp_module() {
 
 	$modDb = new MySQLModuleDatabase();
 	require("includes/config.inc.php");
@@ -98,7 +98,7 @@ function exec_ogp_module() {
 				if($mysql_db['remote_server_id'] != "0")
 				{
 					$remote_server = $db->getRemoteServer($mysql_db['remote_server_id']);
-					$remote = new OGPRemoteLibrary($remote_server['agent_ip'],$remote_server['agent_port'],$remote_server['encryption_key'],$remote_server['timeout']);
+					$remote = new GSPRemoteLibrary($remote_server['agent_ip'],$remote_server['agent_port'],$remote_server['encryption_key'],$remote_server['timeout']);
 					$host_stat = $remote->status_chk();
 					if($host_stat === 1 )
 					{
@@ -184,7 +184,7 @@ function exec_ogp_module() {
 		if($mysql_db['remote_server_id'] != "0")
 		{
 			$remote_server = $db->getRemoteServer($mysql_db['remote_server_id']);
-			$remote = new OGPRemoteLibrary($remote_server['agent_ip'],$remote_server['agent_port'],$remote_server['encryption_key'],$remote_server['timeout']);
+			$remote = new GSPRemoteLibrary($remote_server['agent_ip'],$remote_server['agent_port'],$remote_server['encryption_key'],$remote_server['timeout']);
 			$host_stat = $remote->status_chk();
 			if($host_stat === 1 )
 			{
@@ -267,7 +267,7 @@ function exec_ogp_module() {
 				if($mysql_db['remote_server_id'] != "0")
 				{
 					$remote_server = $db->getRemoteServer($mysql_db['remote_server_id']);
-					$remote = new OGPRemoteLibrary($remote_server['agent_ip'],$remote_server['agent_port'],$remote_server['encryption_key'],$remote_server['timeout']);
+					$remote = new GSPRemoteLibrary($remote_server['agent_ip'],$remote_server['agent_port'],$remote_server['encryption_key'],$remote_server['timeout']);
 					$host_stat = $remote->status_chk();
 					if($host_stat === 1 )
 					{
@@ -327,7 +327,7 @@ function exec_ogp_module() {
 				if($mysql_db['remote_server_id'] != "0")
 				{
 					$remote_server = $db->getRemoteServer($mysql_db['remote_server_id']);
-					$remote = new OGPRemoteLibrary($remote_server['agent_ip'],$remote_server['agent_port'],$remote_server['encryption_key'],$remote_server['timeout']);
+					$remote = new GSPRemoteLibrary($remote_server['agent_ip'],$remote_server['agent_port'],$remote_server['encryption_key'],$remote_server['timeout']);
 					$host_stat = $remote->status_chk();
 					if($host_stat === 1 )
 					{
@@ -425,7 +425,7 @@ function exec_ogp_module() {
 					if($mysql_server['remote_server_id'] != "0")
 					{
 						$remote_server = $db->getRemoteServer($mysql_server['remote_server_id']);
-						$remote = new OGPRemoteLibrary($remote_server['agent_ip'],$remote_server['agent_port'],$remote_server['encryption_key'],$remote_server['timeout']);
+						$remote = new GSPRemoteLibrary($remote_server['agent_ip'],$remote_server['agent_port'],$remote_server['encryption_key'],$remote_server['timeout']);
 						$host_stat = $remote->status_chk();
 						if($host_stat === 1 )
 						{
diff --git a/modules/mysql/get_dump.php b/modules/mysql/get_dump.php
index 9a1b7f3d..c3fad8f0 100644
--- a/modules/mysql/get_dump.php
+++ b/modules/mysql/get_dump.php
@@ -5,7 +5,7 @@ if ( function_exists('mysqli_connect') )
 else
 	require_once("modules/mysql/mysql_database.php");
 
-function exec_ogp_module() {
+function exec_gsp_module() {
 
 	$modDb = new MySQLModuleDatabase();
 	require("includes/config.inc.php");
@@ -41,7 +41,7 @@ function exec_ogp_module() {
 	if($mysql_db['remote_server_id'] != "0")
 	{
 		$remote_server = $db->getRemoteServer($mysql_db['remote_server_id']);
-		$remote = new OGPRemoteLibrary($remote_server['agent_ip'],$remote_server['agent_port'],$remote_server['encryption_key'],$remote_server['timeout']);
+		$remote = new GSPRemoteLibrary($remote_server['agent_ip'],$remote_server['agent_port'],$remote_server['encryption_key'],$remote_server['timeout']);
 		$host_stat = $remote->status_chk();
 		if($host_stat === 1 )
 		{
diff --git a/modules/mysql/servers.php b/modules/mysql/servers.php
index b4b8af1f..77760ce0 100644
--- a/modules/mysql/servers.php
+++ b/modules/mysql/servers.php
@@ -26,7 +26,7 @@ if ( function_exists('mysqli_connect') )
 else
 	require_once("modules/mysql/mysql_database.php");
 
-function exec_ogp_module() {
+function exec_gsp_module() {
 
 	$modDb = new MySQLModuleDatabase();
 	require("includes/config.inc.php");
@@ -156,7 +156,7 @@ function exec_ogp_module() {
 		if($mysql_server['remote_server_id'] != 0)
 		{
 			$remote_server = $db->getRemoteServer($mysql_server['remote_server_id']);
-			$remote = new OGPRemoteLibrary($remote_server['agent_ip'],$remote_server['agent_port'],$remote_server['encryption_key'],$remote_server['timeout']);
+			$remote = new GSPRemoteLibrary($remote_server['agent_ip'],$remote_server['agent_port'],$remote_server['encryption_key'],$remote_server['timeout']);
 			$host_stat = $remote->status_chk();
 			if($host_stat === 0 )
 			{
diff --git a/modules/mysql/user_db.php b/modules/mysql/user_db.php
index 377ecf96..a1a65b48 100644
--- a/modules/mysql/user_db.php
+++ b/modules/mysql/user_db.php
@@ -18,7 +18,7 @@ if ( function_exists('mysqli_connect') )
 else
 	require_once("modules/mysql/mysql_database.php");
 
-function exec_ogp_module() {
+function exec_gsp_module() {
 
 	$modDb = new MySQLModuleDatabase();
 	require("includes/config.inc.php");
@@ -72,7 +72,7 @@ function exec_ogp_module() {
 		if($mysql_db['remote_server_id'] != "0")
 		{
 			$remote_server = $db->getRemoteServer($mysql_db['remote_server_id']);
-			$remote = new OGPRemoteLibrary($remote_server['agent_ip'],$remote_server['agent_port'],$remote_server['encryption_key'],$remote_server['timeout']);
+			$remote = new GSPRemoteLibrary($remote_server['agent_ip'],$remote_server['agent_port'],$remote_server['encryption_key'],$remote_server['timeout']);
 			$host_stat = $remote->status_chk();
 			if($host_stat === 1 )
 			{
@@ -221,7 +221,7 @@ function exec_ogp_module() {
 						if($mysql_db['remote_server_id'] != "0")
 						{
 							$remote_server = $db->getRemoteServer($mysql_db['remote_server_id']);
-							$remote = new OGPRemoteLibrary($remote_server['agent_ip'],$remote_server['agent_port'],$remote_server['encryption_key'],$remote_server['timeout']);
+							$remote = new GSPRemoteLibrary($remote_server['agent_ip'],$remote_server['agent_port'],$remote_server['encryption_key'],$remote_server['timeout']);
 							$host_stat = $remote->status_chk();
 							if($host_stat === 1 )
 							{
diff --git a/modules/news/admin.php b/modules/news/admin.php
index 95eb61b0..860a9a43 100644
--- a/modules/news/admin.php
+++ b/modules/news/admin.php
@@ -1,5 +1,5 @@
 <?php
-function exec_ogp_module() {
+function exec_gsp_module() {
 	define("IN_SCRIPT_ADMIN","1");
 	error_reporting(0);
 
diff --git a/modules/news/index.php b/modules/news/index.php
index fab1845e..8d810835 100644
--- a/modules/news/index.php
+++ b/modules/news/index.php
@@ -1,5 +1,5 @@
 <?php
-function exec_ogp_module() {
+function exec_gsp_module() {
 	define("IN_SCRIPT","1");
 	error_reporting(0);
 
diff --git a/modules/rcon/rcon.php b/modules/rcon/rcon.php
index a440c1e7..0389f475 100644
--- a/modules/rcon/rcon.php
+++ b/modules/rcon/rcon.php
@@ -25,7 +25,7 @@
 require_once("modules/config_games/server_config_parser.php");
 require_once('includes/lib_remote.php');
 
-function exec_ogp_module()
+function exec_gsp_module()
 {
 	global $db;
 
@@ -44,8 +44,8 @@ function exec_ogp_module()
 	foreach ( $server_homes as $server_home )
 	{
 		$server_xml = read_server_config(SERVER_CONFIG_LOCATION."/".$server_home['home_cfg_file']);
-		$remote = new OGPRemoteLibrary($server_home['agent_ip'],$server_home['agent_port'],$server_home['encryption_key'],$server_home['timeout']);
-		$screen_running = $remote->is_screen_running(OGP_SCREEN_TYPE_HOME,$server_home['home_id']) === 1;
+		$remote = new GSPRemoteLibrary($server_home['agent_ip'],$server_home['agent_port'],$server_home['encryption_key'],$server_home['timeout']);
+		$screen_running = $remote->is_screen_running(GSP_SCREEN_TYPE_HOME,$server_home['home_id']) === 1;
 		if( ( $server_xml->control_protocol == 'rcon' OR $server_xml->control_protocol == 'rcon2' OR 
 		   @$server_xml->gameq_query_name == "minecraft" OR $server_xml->control_protocol == 'lcon' ) AND $screen_running )
 		{
@@ -88,7 +88,7 @@ function exec_ogp_module()
 			{
 				list($home_id,$mod_id,$ip,$port) = explode("-", $value);
 				$home_info = $db->getGameHome($home_id);
-				$remote = new OGPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
+				$remote = new GSPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
 				$server_xml = read_server_config(SERVER_CONFIG_LOCATION."/".$home_info['home_cfg_file']);
 				$control_type = isset($server_xml->control_protocol_type) ? $server_xml->control_protocol_type : "";
 				
diff --git a/modules/register/register-exec.php b/modules/register/register-exec.php
index decf7b6f..983c2f79 100644
--- a/modules/register/register-exec.php
+++ b/modules/register/register-exec.php
@@ -15,7 +15,7 @@ function checkEmail($email) {
 }
 
 require_once("includes/functions.php");
-function exec_ogp_module()
+function exec_gsp_module()
 {
 	global $db,$view,$settings;
 		
diff --git a/modules/register/register.php b/modules/register/register.php
index 6134d1b0..fa738b88 100644
--- a/modules/register/register.php
+++ b/modules/register/register.php
@@ -9,7 +9,7 @@
 define("RECAPTCHA_API_SERVER", "http://www.google.com/recaptcha/api");
 define("RECAPTCHA_API_SECURE_SERVER", "https://www.google.com/recaptcha/api");
 
-function exec_ogp_module()
+function exec_gsp_module()
 {
 	global $db,$view,$settings;
 	
diff --git a/modules/server/add_server.php b/modules/server/add_server.php
index 37d53f22..3a703668 100644
--- a/modules/server/add_server.php
+++ b/modules/server/add_server.php
@@ -3,7 +3,7 @@
  * Component of the server module
  */
 
-function exec_ogp_module() {
+function exec_gsp_module() {
 	
 	global $view;
 	global $db;
@@ -35,7 +35,7 @@ function exec_ogp_module() {
 
 		require_once('includes/lib_remote.php');
 
-		$remote = new OGPRemoteLibrary($rhost_ip,$rhost_port,$encryption_key,$timeout);
+		$remote = new GSPRemoteLibrary($rhost_ip,$rhost_port,$encryption_key,$timeout);
 		$status = $remote->status_chk();
 		if($status === 0)
 		{
diff --git a/modules/server/arrange_ports.php b/modules/server/arrange_ports.php
index 63626a60..b0183271 100644
--- a/modules/server/arrange_ports.php
+++ b/modules/server/arrange_ports.php
@@ -1,7 +1,7 @@
 <script type="text/javascript" src="js/jquery/plugins/jquery.numeric.js"></script>
 <script type="text/javascript" src="js/modules/server.js"></script>
 <?php
-function exec_ogp_module()
+function exec_gsp_module()
 {		
 	global $db,$view;
 		
@@ -41,7 +41,7 @@ function exec_ogp_module()
 				$rhost_id = $_GET['rserver_id'];
 				$remote_server = $db->getRemoteServer($rhost_id);
 				require_once('includes/lib_remote.php');
-				$remote = new OGPRemoteLibrary($remote_server['agent_ip'],$remote_server['agent_port'],$remote_server['encryption_key'],$remote_server['timeout']);
+				$remote = new GSPRemoteLibrary($remote_server['agent_ip'],$remote_server['agent_port'],$remote_server['encryption_key'],$remote_server['timeout']);
 				$host_stat = $remote->status_chk();
 				if( $host_stat === 1)
 					$os = $remote->what_os();
diff --git a/modules/server/edit_server.php b/modules/server/edit_server.php
index 21b8070f..cd6756f3 100644
--- a/modules/server/edit_server.php
+++ b/modules/server/edit_server.php
@@ -3,7 +3,7 @@
  * Component of the server module
  */
 
-function exec_ogp_module() {
+function exec_gsp_module() {
 
     global $view;
     global $db;
@@ -148,8 +148,8 @@ function exec_ogp_module() {
 				{
 					foreach ( $servers_match_ip_id as $home_info )
 					{
-						$remote = new OGPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
-						$screen_running = $remote->is_screen_running(OGP_SCREEN_TYPE_HOME,$home_info['home_id']) === 1;
+						$remote = new GSPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
+						$screen_running = $remote->is_screen_running(GSP_SCREEN_TYPE_HOME,$home_info['home_id']) === 1;
 						if( $screen_running )
 						{
 							$servers_running = TRUE;
diff --git a/modules/server/firewall.php b/modules/server/firewall.php
index 88f35710..4ed78864 100644
--- a/modules/server/firewall.php
+++ b/modules/server/firewall.php
@@ -6,7 +6,7 @@
 require_once('includes/lib_remote.php');
 require_once("includes/form_table_class.php");
 
-function exec_ogp_module() {
+function exec_gsp_module() {
 	global $view;
 	global $db;
 
@@ -23,7 +23,7 @@ function exec_ogp_module() {
 
 	$firewall_settings = $db->getFirewallSettings($remote_server['remote_server_id']);
 
-	$remote = new OGPRemoteLibrary($remote_server['agent_ip'],$remote_server['agent_port'],$remote_server['encryption_key'],$remote_server['timeout']);
+	$remote = new GSPRemoteLibrary($remote_server['agent_ip'],$remote_server['agent_port'],$remote_server['encryption_key'],$remote_server['timeout']);
 	$host_stat = $remote->status_chk();
 
 	if( isset($_POST['reset_firewall']) )
diff --git a/modules/server/mon_stats.php b/modules/server/mon_stats.php
index 9bd739d5..5de43f32 100644
--- a/modules/server/mon_stats.php
+++ b/modules/server/mon_stats.php
@@ -42,11 +42,11 @@ function dsi_make_img($im = false, $cache_on = false, $cache_data = false, $forc
 	exit;
 }
 
-function exec_ogp_module() {
+function exec_gsp_module() {
 	global $db;
 	$remote_server = $db->getRemoteServer($_GET['remote_server_id']);
 
-	$remote = new OGPRemoteLibrary( $remote_server['agent_ip'], $remote_server['agent_port'],
+	$remote = new GSPRemoteLibrary( $remote_server['agent_ip'], $remote_server['agent_port'],
 									$remote_server['encryption_key'], $remote_server['timeout'] );
 	
 	$stats = $remote->mon_stats();	
diff --git a/modules/server/reboot.php b/modules/server/reboot.php
index 6268e1e8..719c1af9 100644
--- a/modules/server/reboot.php
+++ b/modules/server/reboot.php
@@ -4,14 +4,14 @@
  */
 
 require_once('includes/lib_remote.php');
-function exec_ogp_module() {
+function exec_gsp_module() {
 
     global $view;
     global $db;
 	echo "<h2>".get_lang('reboot')."</h2>";
 	$rhost_id = @$_REQUEST['rhost_id'];
     $remote_server = $db->getRemoteServer($rhost_id);
-	$remote = new OGPRemoteLibrary($remote_server['agent_ip'], $remote_server['agent_port'], $remote_server['encryption_key'], $remote_server['timeout']);
+	$remote = new GSPRemoteLibrary($remote_server['agent_ip'], $remote_server['agent_port'], $remote_server['encryption_key'], $remote_server['timeout']);
 	$ipAndName = $remote_server['remote_server_name'] . " " . "(" . $remote_server['agent_ip'] . ")";
 
 	// Confirm user wants to reboot the server
diff --git a/modules/server/restart.php b/modules/server/restart.php
index 9a1e2e9c..d716ae22 100644
--- a/modules/server/restart.php
+++ b/modules/server/restart.php
@@ -4,14 +4,14 @@
  */
 
 require_once('includes/lib_remote.php');
-function exec_ogp_module() {
+function exec_gsp_module() {
 
     global $view;
     global $db;
 	echo "<h2>". get_lang("restart") ."</h2>";
 	$rhost_id = @$_REQUEST['rhost_id'];
     $remote_server = $db->getRemoteServer($rhost_id);
-	$remote = new OGPRemoteLibrary($remote_server['agent_ip'], $remote_server['agent_port'], $remote_server['encryption_key'], $remote_server['timeout']);
+	$remote = new GSPRemoteLibrary($remote_server['agent_ip'], $remote_server['agent_port'], $remote_server['encryption_key'], $remote_server['timeout']);
 	
 	
 	
diff --git a/modules/server/servers.php b/modules/server/servers.php
index 3f53edf8..29f3b752 100644
--- a/modules/server/servers.php
+++ b/modules/server/servers.php
@@ -5,7 +5,7 @@
  */
 
 require_once('includes/lib_remote.php');
-function exec_ogp_module() {
+function exec_gsp_module() {
 
 	global $view;
 	global $db;
@@ -48,7 +48,7 @@ function exec_ogp_module() {
 	foreach ( $servers as $server_row )
 	{
 		#check to see if the remote daeomns are up status_chk is found in lib_remote.php
-		$remote = new OGPRemoteLibrary($server_row['agent_ip'],$server_row['agent_port'],$server_row['encryption_key'],$server_row['timeout']);
+		$remote = new GSPRemoteLibrary($server_row['agent_ip'],$server_row['agent_port'],$server_row['encryption_key'],$server_row['timeout']);
 
 		$host_stat = $remote->status_chk();
 
diff --git a/modules/server/view_log.php b/modules/server/view_log.php
index 454b1431..d4d3aa1f 100644
--- a/modules/server/view_log.php
+++ b/modules/server/view_log.php
@@ -4,14 +4,14 @@
  */
 
 require_once('includes/lib_remote.php');
-function exec_ogp_module() {
+function exec_gsp_module() {
 
     global $view;
     global $db;
 	echo "<h2>". get_lang("view_log") ."</h2>";
 	$rhost_id = @$_REQUEST['rhost_id'];
     $remote_server = $db->getRemoteServer($rhost_id);
-	$remote = new OGPRemoteLibrary($remote_server['agent_ip'], $remote_server['agent_port'], $remote_server['encryption_key'], $remote_server['timeout'] );
+	$remote = new GSPRemoteLibrary($remote_server['agent_ip'], $remote_server['agent_port'], $remote_server['encryption_key'], $remote_server['timeout'] );
 	if(isset($_POST['save_file']))
 	{
 		$file_info = $remote->remote_writefile('./gsp_agent.log', strip_real_escape_string($_REQUEST['file_content']));
diff --git a/modules/settings/api_hosts.php b/modules/settings/api_hosts.php
index a8f5e041..f55c0349 100644
--- a/modules/settings/api_hosts.php
+++ b/modules/settings/api_hosts.php
@@ -3,7 +3,7 @@
  * Component of the settings module
  */
 
-function exec_ogp_module()
+function exec_gsp_module()
 {	
 	global $db;
 	require_once 'includes/api_functions.php';
diff --git a/modules/settings/settings.php b/modules/settings/settings.php
index f7f2ba2d..6296ada3 100644
--- a/modules/settings/settings.php
+++ b/modules/settings/settings.php
@@ -3,7 +3,7 @@
  * Settings management for the settings module
  */
 
-function exec_ogp_module()
+function exec_gsp_module()
 {
 	require_once('includes/form_table_class.php');
 	global $db,$view;
diff --git a/modules/settings/themes.php b/modules/settings/themes.php
index bb943aea..6fd203e9 100644
--- a/modules/settings/themes.php
+++ b/modules/settings/themes.php
@@ -3,7 +3,7 @@
  * Component of the settings module
  */
 
-function exec_ogp_module()
+function exec_gsp_module()
 {
 	require_once('modules/settings/functions.php');
 	require_once('includes/form_table_class.php');
diff --git a/modules/status/include/cpu.php b/modules/status/include/cpu.php
index a208bf25..8ee30446 100644
--- a/modules/status/include/cpu.php
+++ b/modules/status/include/cpu.php
@@ -60,7 +60,7 @@ elseif ($os == "linux")
 		global $db;
 		$rhost_id = $_GET['remote_server_id'];
 		$remote_server = $db->getRemoteServer($rhost_id);
-		$remote = new OGPRemoteLibrary($remote_server['agent_ip'], $remote_server['agent_port'], $remote_server['encryption_key'], $remote_server['timeout']);
+		$remote = new GSPRemoteLibrary($remote_server['agent_ip'], $remote_server['agent_port'], $remote_server['encryption_key'], $remote_server['timeout']);
 		$cores = $remote->shell_action('get_cpu_usage' , 'logical');
 	}
 	else
diff --git a/modules/status/include/hdd.php b/modules/status/include/hdd.php
index d26d7230..f8674447 100644
--- a/modules/status/include/hdd.php
+++ b/modules/status/include/hdd.php
@@ -8,7 +8,7 @@ if( isset($_GET['remote_server_id']) AND $os != "nocpu" )
 	require_once('includes/lib_remote.php');
 	$rhost_id = $_GET['remote_server_id'];
 	$remote_server = $db->getRemoteServer($rhost_id);
-	$remote = new OGPRemoteLibrary($remote_server['agent_ip'], $remote_server['agent_port'], $remote_server['encryption_key'], $remote_server['timeout']);
+	$remote = new GSPRemoteLibrary($remote_server['agent_ip'], $remote_server['agent_port'], $remote_server['encryption_key'], $remote_server['timeout']);
 	$disk_info = $remote->shell_action('get_disk_usage' , 'sum');
 	$free = $disk_info['free'];
 	$used = $disk_info['used'];
diff --git a/modules/status/include/os.php b/modules/status/include/os.php
index 34b3b0cc..077969ad 100644
--- a/modules/status/include/os.php
+++ b/modules/status/include/os.php
@@ -11,7 +11,7 @@ if( isset($_GET['remote_server_id']) AND $_GET['remote_server_id'] != "webhost"
 	$rhost_id = $_GET['remote_server_id'];
 	$remote_server = $db->getRemoteServer($rhost_id);
 	require_once('includes/lib_remote.php');
-	$remote = new OGPRemoteLibrary($remote_server['agent_ip'], $remote_server['agent_port'], $remote_server['encryption_key'], $remote_server['timeout']);
+	$remote = new GSPRemoteLibrary($remote_server['agent_ip'], $remote_server['agent_port'], $remote_server['encryption_key'], $remote_server['timeout']);
 	$os_string = $remote->what_os();
 	if( preg_match("/Linux/", $os_string) ) {
 		$os = "linux";
diff --git a/modules/status/include/ram.php b/modules/status/include/ram.php
index 1e3c60a3..9f423118 100644
--- a/modules/status/include/ram.php
+++ b/modules/status/include/ram.php
@@ -31,7 +31,7 @@ elseif ($os == "linux" or $os == "cygwin") {
 		global $db;
 		$rhost_id = $_GET['remote_server_id'];
 		$remote_server = $db->getRemoteServer($rhost_id);
-		$remote = new OGPRemoteLibrary($remote_server['agent_ip'], $remote_server['agent_port'], $remote_server['encryption_key'], $remote_server['timeout']);
+		$remote = new GSPRemoteLibrary($remote_server['agent_ip'], $remote_server['agent_port'], $remote_server['encryption_key'], $remote_server['timeout']);
 		$ramstatus = $remote->shell_action('get_ram_usage' , 'status');
 		$ramusage = numbersFormatting($ramstatus['used']) . " ".get_lang('ram_of')." " . numbersFormatting($ramstatus['total']);
 		$rampercent = $ramstatus['percent'];
diff --git a/modules/status/include/task.php b/modules/status/include/task.php
index dfb70bc5..dd8e4fa9 100644
--- a/modules/status/include/task.php
+++ b/modules/status/include/task.php
@@ -10,7 +10,7 @@ if( isset($_GET['remote_server_id']) && $_GET['remote_server_id'] != "webhost")
 	require_once('includes/lib_remote.php');
 	$rhost_id = $_GET['remote_server_id'];
 	$remote_server = $db->getRemoteServer($rhost_id);
-	$remote = new OGPRemoteLibrary($remote_server['agent_ip'], $remote_server['agent_port'], $remote_server['encryption_key'], $remote_server['timeout']);
+	$remote = new GSPRemoteLibrary($remote_server['agent_ip'], $remote_server['agent_port'], $remote_server['encryption_key'], $remote_server['timeout']);
 	$taskoutput = $remote->shell_action('get_tasklist', 'tasks');
 }else{
 	if ($os == "windows" || $cygwin === true)
diff --git a/modules/status/include/uptime.php b/modules/status/include/uptime.php
index 4a26950c..d0eb894c 100644
--- a/modules/status/include/uptime.php
+++ b/modules/status/include/uptime.php
@@ -16,7 +16,7 @@ elseif ($os == "linux" or $os == "cygwin")
 		require_once('includes/lib_remote.php');
 		$rhost_id = $_GET['remote_server_id'];
 		$remote_server = $db->getRemoteServer($rhost_id);
-		$remote = new OGPRemoteLibrary($remote_server['agent_ip'], $remote_server['agent_port'], $remote_server['encryption_key'], $remote_server['timeout']);
+		$remote = new GSPRemoteLibrary($remote_server['agent_ip'], $remote_server['agent_port'], $remote_server['encryption_key'], $remote_server['timeout']);
 		list($uptime,$upsince) = $remote->shell_action('get_uptime', 'seconds');
 	}
 	else
diff --git a/modules/status/status.php b/modules/status/status.php
index 1c02520d..22504d64 100644
--- a/modules/status/status.php
+++ b/modules/status/status.php
@@ -10,7 +10,7 @@ function numbersFormatting($bytes){
     return sprintf('%1.2f' , $bytes / pow($base,$class)) . ' ' . $si_prefix[$class];
 }
 
-function exec_ogp_module()
+function exec_gsp_module()
 {
 	global $db;
 	include_once ("modules/status/include/status_functions.php");
diff --git a/modules/steam_workshop/main.php b/modules/steam_workshop/main.php
index 2d6bdd61..c5c592a0 100644
--- a/modules/steam_workshop/main.php
+++ b/modules/steam_workshop/main.php
@@ -98,7 +98,7 @@ function exec_ogp_module()
 		
 		if($xml !== false)
 		{
-			$remote = new OGPRemoteLibrary($home_cfg['agent_ip'],$home_cfg['agent_port'],$home_cfg['encryption_key'], $home_cfg['timeout']);
+			$remote = new GSPRemoteLibrary($home_cfg['agent_ip'],$home_cfg['agent_port'],$home_cfg['encryption_key'], $home_cfg['timeout']);
 			
 			if($remote->status_chk() !== 1)
 			{
@@ -107,7 +107,7 @@ function exec_ogp_module()
 			
 			if(isset($_GET['show_log']))
 			{
-				$update_active = $remote->get_log(OGP_SCREEN_TYPE_UPDATE,$home_id,clean_path($home_cfg['home_path']),$log_txt);
+				$update_active = $remote->get_log(GSP_SCREEN_TYPE_UPDATE,$home_id,clean_path($home_cfg['home_path']),$log_txt);
 				if ( $update_active == 1 )
 				{
 					if(isset($_POST['sgc']))
diff --git a/modules/steam_workshop/uninstall.php b/modules/steam_workshop/uninstall.php
index f083d330..f36ff770 100644
--- a/modules/steam_workshop/uninstall.php
+++ b/modules/steam_workshop/uninstall.php
@@ -7,7 +7,7 @@ require_once("modules/config_games/server_config_parser.php");
 require_once("modules/steam_workshop/functions.php");
 require_once('includes/form_table_class.php');
 
-function exec_ogp_module()
+function exec_gsp_module()
 {
 	Global $db,$view;
 	echo '<h2>Steam Workshop</h2>';
@@ -99,7 +99,7 @@ function exec_ogp_module()
 		
 		if($xml !== false)
 		{
-			$remote = new OGPRemoteLibrary($home_cfg['agent_ip'],$home_cfg['agent_port'],$home_cfg['encryption_key'], $home_cfg['timeout']);
+			$remote = new GSPRemoteLibrary($home_cfg['agent_ip'],$home_cfg['agent_port'],$home_cfg['encryption_key'], $home_cfg['timeout']);
 			
 			if($remote->status_chk() !== 1)
 			{
diff --git a/modules/steam_workshop/workshop_admin.php b/modules/steam_workshop/workshop_admin.php
index 2cf67912..3c72d0ca 100644
--- a/modules/steam_workshop/workshop_admin.php
+++ b/modules/steam_workshop/workshop_admin.php
@@ -4,7 +4,7 @@
  */
 require_once('includes/form_table_class.php');
 require_once("modules/steam_workshop/functions.php");
-function exec_ogp_module()
+function exec_gsp_module()
 {
 	
 	Global $db,$view;
diff --git a/modules/subusers/add_subuser-exec.php b/modules/subusers/add_subuser-exec.php
index 1f76a8a4..3fac6f09 100644
--- a/modules/subusers/add_subuser-exec.php
+++ b/modules/subusers/add_subuser-exec.php
@@ -7,7 +7,7 @@
 // OwN-3m-All
 
 require_once("includes/functions.php");
-function exec_ogp_module()
+function exec_gsp_module()
 {
 	global $db,$view;
 			
diff --git a/modules/subusers/add_subuser.php b/modules/subusers/add_subuser.php
index aa121591..200c470e 100644
--- a/modules/subusers/add_subuser.php
+++ b/modules/subusers/add_subuser.php
@@ -6,7 +6,7 @@
 //Open Game Panel Sub User Registration Add On By
 //  own3mall
 
-function exec_ogp_module()
+function exec_gsp_module()
 {
 	global $db,$view;
 
diff --git a/modules/subusers/del_subuser.php b/modules/subusers/del_subuser.php
index c76b3e8e..d176d8d3 100644
--- a/modules/subusers/del_subuser.php
+++ b/modules/subusers/del_subuser.php
@@ -7,7 +7,7 @@
 //  own3mall
 
 
-function exec_ogp_module() {
+function exec_gsp_module() {
     require_once ("includes/functions.php");
     global $db;
     global $view;
diff --git a/modules/subusers/submanage.php b/modules/subusers/submanage.php
index 2e5ff44a..6d4cea91 100644
--- a/modules/subusers/submanage.php
+++ b/modules/subusers/submanage.php
@@ -6,7 +6,7 @@
 //Open Game Panel Sub User Registration Add On By
 //  own3mall
 
-function exec_ogp_module()
+function exec_gsp_module()
 {
 	global $db;
     global $view;
diff --git a/modules/support/support.php b/modules/support/support.php
index 7dbd2b6d..eea27bff 100644
--- a/modules/support/support.php
+++ b/modules/support/support.php
@@ -22,7 +22,7 @@
  *
  */
 
-function exec_ogp_module() {
+function exec_gsp_module() {
 
 	global $db, $settings;
 
diff --git a/modules/tickets/downloadAttachment.php b/modules/tickets/downloadAttachment.php
index 8a23b08b..4579f76c 100644
--- a/modules/tickets/downloadAttachment.php
+++ b/modules/tickets/downloadAttachment.php
@@ -3,7 +3,7 @@
 require 'include/ticket.php';
 require 'include/TicketSettings.php';
 
-function exec_ogp_module()
+function exec_gsp_module()
 {
     global $db;
 
diff --git a/modules/tickets/notificationCount.php b/modules/tickets/notificationCount.php
index ce670654..7173de84 100644
--- a/modules/tickets/notificationCount.php
+++ b/modules/tickets/notificationCount.php
@@ -3,7 +3,7 @@
 require 'include/ticket.php';
 require 'include/TicketSettings.php';
 
-function exec_ogp_module()
+function exec_gsp_module()
 {
     global $db;
 
diff --git a/modules/tickets/rating.php b/modules/tickets/rating.php
index 8c17b470..9a7545c2 100644
--- a/modules/tickets/rating.php
+++ b/modules/tickets/rating.php
@@ -3,7 +3,7 @@
 require 'include/ticket.php';
 require 'include/TicketSettings.php';
 
-function exec_ogp_module()
+function exec_gsp_module()
 {
     global $db, $view;
 
diff --git a/modules/tickets/submitTicket.php b/modules/tickets/submitTicket.php
index 0497d201..a32e7207 100644
--- a/modules/tickets/submitTicket.php
+++ b/modules/tickets/submitTicket.php
@@ -7,7 +7,7 @@ require 'include/TicketSettings.php';
 
 require 'include/functions.php';
 
-function exec_ogp_module()
+function exec_gsp_module()
 {
     global $db, $view;
 
diff --git a/modules/tickets/supportTickets.php b/modules/tickets/supportTickets.php
index d8933701..06fd05b6 100644
--- a/modules/tickets/supportTickets.php
+++ b/modules/tickets/supportTickets.php
@@ -3,7 +3,7 @@
 require 'include/ticket.php';
 require 'include/functions.php';
 
-function exec_ogp_module()
+function exec_gsp_module()
 {
     global $db, $loggedInUserInfo;
 
diff --git a/modules/tickets/ticketSettings.php b/modules/tickets/ticketSettings.php
index f7a38429..fb5d5439 100644
--- a/modules/tickets/ticketSettings.php
+++ b/modules/tickets/ticketSettings.php
@@ -5,7 +5,7 @@ require 'include/functions.php';
 require 'include/TicketSettings.php';
 require 'includes/form_table_class.php';
 
-function exec_ogp_module()
+function exec_gsp_module()
 {
     global $db, $view;
 
diff --git a/modules/tickets/viewTicket.php b/modules/tickets/viewTicket.php
index e6f15fbe..e32e5a2f 100644
--- a/modules/tickets/viewTicket.php
+++ b/modules/tickets/viewTicket.php
@@ -6,7 +6,7 @@ require 'include/TicketSettings.php';
 
 require 'include/functions.php';
 
-function exec_ogp_module()
+function exec_gsp_module()
 {
     global $db, $view;
 
diff --git a/modules/tshock/bans.php b/modules/tshock/bans.php
index fc2e1afa..495f0df4 100644
--- a/modules/tshock/bans.php
+++ b/modules/tshock/bans.php
@@ -2,7 +2,7 @@
 /*
  * Component of the tshock module
  */
-function exec_ogp_module()
+function exec_gsp_module()
 {
 	include "modules/tshock/shared.php";
 	if($continue)
diff --git a/modules/tshock/create_token.php b/modules/tshock/create_token.php
index 3c4d8712..f38d1350 100644
--- a/modules/tshock/create_token.php
+++ b/modules/tshock/create_token.php
@@ -2,7 +2,7 @@
 /*
  * Component of the tshock module
  */
-function exec_ogp_module()
+function exec_gsp_module()
 {
 	include "modules/tshock/shared.php";
 	if($continue)
diff --git a/modules/tshock/server.php b/modules/tshock/server.php
index 3cbd89bd..22bfe444 100644
--- a/modules/tshock/server.php
+++ b/modules/tshock/server.php
@@ -2,7 +2,7 @@
 /*
  * Component of the tshock module
  */
-function exec_ogp_module()
+function exec_gsp_module()
 {
 	include "modules/tshock/shared.php";
 	if($continue)
diff --git a/modules/tshock/users.php b/modules/tshock/users.php
index 5d4ce801..ec488492 100644
--- a/modules/tshock/users.php
+++ b/modules/tshock/users.php
@@ -2,7 +2,7 @@
 /*
  * Component of the tshock module
  */
-function exec_ogp_module()
+function exec_gsp_module()
 {
 	include "modules/tshock/shared.php";
 	if($continue)
diff --git a/modules/update/blacklist.php b/modules/update/blacklist.php
index 66d1ccd7..2ecd66b4 100644
--- a/modules/update/blacklist.php
+++ b/modules/update/blacklist.php
@@ -40,7 +40,7 @@ function path_check()
 
     return TRUE;
 }
-function exec_ogp_module()
+function exec_gsp_module()
 {
 	global $db, $view;
 	
diff --git a/modules/update/post_update.php b/modules/update/post_update.php
index 9476564f..77ea4544 100644
--- a/modules/update/post_update.php
+++ b/modules/update/post_update.php
@@ -6,7 +6,7 @@
  // todo, make checking and updating functions for updateing on the background.
  // todo, more specified updates in smaller packages
 
-function exec_ogp_module()
+function exec_gsp_module()
 {
 	global $db, $settings;
 	runPostUpdateOperations();
diff --git a/modules/update/update.php b/modules/update/update.php
index 0e6abc6b..5a800ef2 100644
--- a/modules/update/update.php
+++ b/modules/update/update.php
@@ -5,7 +5,7 @@
 
  // todo, make checking and updating functions for updateing on the background.
  // todo, more specified updates in smaller packages
-function exec_ogp_module()
+function exec_gsp_module()
 {
         global $db, $settings;
         define('REPONAME', 'OGP-Website');
diff --git a/modules/update/updating.php b/modules/update/updating.php
index 029c826d..ed8f39a1 100644
--- a/modules/update/updating.php
+++ b/modules/update/updating.php
@@ -16,7 +16,7 @@ function rmdir_recurse($path) {
     rmdir($path);
 }
 
-function exec_ogp_module()
+function exec_gsp_module()
 {
 	define('REPONAME', 'OGP-Website');
 	if($_SESSION['users_group'] != "admin")
@@ -227,7 +227,7 @@ function exec_ogp_module()
 				// update version info in db
 
 				$version = $db->real_escape_string($_GET['version']);
-				$db->query("UPDATE GSP_DB_PREFIXsettings SET value = '$version' WHERE setting = 'ogp_version'");
+				$db->query("UPDATE GSP_DB_PREFIXsettings SET value = '$version' WHERE setting = 'gsp_version'");
 				$db->query("UPDATE GSP_DB_PREFIXsettings SET value = '$vtype' WHERE setting = 'version_type'");
 
 				// Remove the downloaded package
diff --git a/modules/user_admin/add_group.php b/modules/user_admin/add_group.php
index 340b5abc..f70a0bd4 100644
--- a/modules/user_admin/add_group.php
+++ b/modules/user_admin/add_group.php
@@ -3,7 +3,7 @@
  * Component of the user_admin module
  */
 
-function exec_ogp_module()
+function exec_gsp_module()
 {
     global $db;
     global $view;
diff --git a/modules/user_admin/add_to_group.php b/modules/user_admin/add_to_group.php
index 53a3ee32..09787f56 100644
--- a/modules/user_admin/add_to_group.php
+++ b/modules/user_admin/add_to_group.php
@@ -3,7 +3,7 @@
  * Component of the user_admin module
  */
 
-function exec_ogp_module()
+function exec_gsp_module()
 {
     global $db;
     global $view;
diff --git a/modules/user_admin/add_user.php b/modules/user_admin/add_user.php
index 52f83608..fea71fc8 100644
--- a/modules/user_admin/add_user.php
+++ b/modules/user_admin/add_user.php
@@ -3,7 +3,7 @@
  * Component of the user_admin module
  */
 
-function exec_ogp_module()
+function exec_gsp_module()
 {
     global $db;
     global $view;
diff --git a/modules/user_admin/del_from_group.php b/modules/user_admin/del_from_group.php
index be6bf0be..462ef18c 100644
--- a/modules/user_admin/del_from_group.php
+++ b/modules/user_admin/del_from_group.php
@@ -3,7 +3,7 @@
  * Component of the user_admin module
  */
 
-function exec_ogp_module()
+function exec_gsp_module()
 {
     global $db;
     global $view;
diff --git a/modules/user_admin/del_group.php b/modules/user_admin/del_group.php
index ff147f49..aea17984 100644
--- a/modules/user_admin/del_group.php
+++ b/modules/user_admin/del_group.php
@@ -3,7 +3,7 @@
  * Component of the user_admin module
  */
 
-function exec_ogp_module()
+function exec_gsp_module()
 {
     global $db;
     global $view;
diff --git a/modules/user_admin/del_user.php b/modules/user_admin/del_user.php
index fdc3a9b4..a5553da6 100644
--- a/modules/user_admin/del_user.php
+++ b/modules/user_admin/del_user.php
@@ -3,7 +3,7 @@
  * Component of the user_admin module
  */
 
-function exec_ogp_module()
+function exec_gsp_module()
 {
     global $db;
     global $view;
diff --git a/modules/user_admin/edit_user.php b/modules/user_admin/edit_user.php
index 6863523e..7c6c69f4 100644
--- a/modules/user_admin/edit_user.php
+++ b/modules/user_admin/edit_user.php
@@ -3,7 +3,7 @@
  * Component of the user_admin module
  */
 
-function exec_ogp_module() {
+function exec_gsp_module() {
 	global $db, $settings;
 	
 	// Check if the user_id is set in the uri first. Prevents notices if it's been removed.
diff --git a/modules/user_admin/show_groups.php b/modules/user_admin/show_groups.php
index f69b8a99..871885c0 100644
--- a/modules/user_admin/show_groups.php
+++ b/modules/user_admin/show_groups.php
@@ -3,7 +3,7 @@
  * Component of the user_admin module
  */
 
-function exec_ogp_module() {
+function exec_gsp_module() {
     global $db, $loggedInUserInfo;
 	
 	$page_user = (isset($_GET['page']) && (int)$_GET['page'] > 0) ? (int)$_GET['page'] : 1;
diff --git a/modules/user_admin/show_users.php b/modules/user_admin/show_users.php
index 2a8fec48..97b5f61b 100644
--- a/modules/user_admin/show_users.php
+++ b/modules/user_admin/show_users.php
@@ -26,7 +26,7 @@ td.actions{
  * Component of the user_admin module
  */
 
-function exec_ogp_module() {
+function exec_gsp_module() {
     global $db, $view, $loggedInUserInfo;
 	
 	$page_user = (isset($_GET['page']) && (int)$_GET['page'] > 0) ? (int)$_GET['page'] : 1;
diff --git a/modules/user_games/add_home.php b/modules/user_games/add_home.php
index 4c14abf4..a7ea7d24 100644
--- a/modules/user_games/add_home.php
+++ b/modules/user_games/add_home.php
@@ -118,7 +118,7 @@ function exec_ogp_module()
 				if($success){
 					$home_info = $db->getGameHomeWithoutMods($new_home_id);
 					require_once('includes/lib_remote.php');
-					$remote = new OGPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
+					$remote = new GSPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
 					
 					// Create new home directory if it doesn't already exist
 					$remote->exec("mkdir -p " . clean_path($game_path) . (!$skipId ? $new_home_id : ""));
@@ -166,7 +166,7 @@ function exec_ogp_module()
 			$rhost_id = $_POST['rserver_id'];
 		$remote_server = $db->getRemoteServer($rhost_id);
 		require_once('includes/lib_remote.php');
-		$remote = new OGPRemoteLibrary($remote_server['agent_ip'],$remote_server['agent_port'],$remote_server['encryption_key'],$remote_server['timeout']);
+		$remote = new GSPRemoteLibrary($remote_server['agent_ip'],$remote_server['agent_port'],$remote_server['encryption_key'],$remote_server['timeout']);
 		$host_stat = $remote->status_chk();
 		if( $host_stat === 1)
 			$os = $remote->what_os();
diff --git a/modules/user_games/assign_home.php b/modules/user_games/assign_home.php
index 6ad8a6cb..095b10ce 100644
--- a/modules/user_games/assign_home.php
+++ b/modules/user_games/assign_home.php
@@ -14,7 +14,7 @@ function create_selection($selection,$flag,$access_rights)
 		return $right;
 }
 
-function exec_ogp_module()
+function exec_gsp_module()
 {
 	global $db;
 	
diff --git a/modules/user_games/browser.php b/modules/user_games/browser.php
index 9880dcea..b6855460 100644
--- a/modules/user_games/browser.php
+++ b/modules/user_games/browser.php
@@ -27,7 +27,7 @@ function litefm_check($home_id)
 	return TRUE;
 }
 
-function exec_ogp_module()
+function exec_gsp_module()
 {
 	$home_id = $_REQUEST['home_id'];
 
@@ -54,7 +54,7 @@ function exec_ogp_module()
 
 	litefm_check($home_id);
 	
-	$remote = new OGPRemoteLibrary($home_cfg['agent_ip'], $home_cfg['agent_port'], $home_cfg['encryption_key'], $home_cfg['timeout']);
+	$remote = new GSPRemoteLibrary($home_cfg['agent_ip'], $home_cfg['agent_port'], $home_cfg['encryption_key'], $home_cfg['timeout']);
 
 	if($isAdmin and isset($_GET['all_fs']))
 		$path = clean_path("/".@$_SESSION['browser_cwd_'.$home_id]);
diff --git a/modules/user_games/check_expire.php b/modules/user_games/check_expire.php
index dec9ad70..f9ca415b 100644
--- a/modules/user_games/check_expire.php
+++ b/modules/user_games/check_expire.php
@@ -3,7 +3,7 @@
  * Component of the user_games module
  */
 
-function exec_ogp_module()
+function exec_gsp_module()
 {
 	global $db;
 	$expired_servers = $db->resultQuery("SELECT home_name, home_id, server_expiration_date FROM GSP_DB_PREFIXserver_homes WHERE server_expiration_date NOT LIKE 'X' AND server_expiration_date <= ".time().";");
diff --git a/modules/user_games/clone_home.php b/modules/user_games/clone_home.php
index 84c0bd35..9ec12dc5 100644
--- a/modules/user_games/clone_home.php
+++ b/modules/user_games/clone_home.php
@@ -3,7 +3,7 @@
  * Component of the user_games module
  */
 
-function exec_ogp_module()
+function exec_gsp_module()
 {
 	global $db, $settings;
 
@@ -25,7 +25,7 @@ function exec_ogp_module()
 	echo create_back_button('user_games');
 
 	include_once('includes/lib_remote.php');
-	$remote = new OGPRemoteLibrary($server_row['agent_ip'],$server_row['agent_port'],$server_row['encryption_key'],$server_row['timeout']);
+	$remote = new GSPRemoteLibrary($server_row['agent_ip'],$server_row['agent_port'],$server_row['encryption_key'],$server_row['timeout']);
 
 	if(isset($_REQUEST['clone_home']))
 	{
diff --git a/modules/user_games/custom_fields.php b/modules/user_games/custom_fields.php
index fc15501a..a3b33c82 100644
--- a/modules/user_games/custom_fields.php
+++ b/modules/user_games/custom_fields.php
@@ -64,7 +64,7 @@ function renderCustomFields($field, $home_id)
 	echo "</label></td></tr>\n";
 }
 
-function exec_ogp_module()
+function exec_gsp_module()
 {
     global $db,$view,$custom_fields,$isAdmin;
 		
@@ -91,7 +91,7 @@ function exec_ogp_module()
 	$server_xml = read_server_config(SERVER_CONFIG_LOCATION.$home_info['home_cfg_file']);
 	
 	include_once('includes/lib_remote.php');
-	$remote = new OGPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
+	$remote = new GSPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
 	
 	echo "<h2>".get_lang('editing_home_called')." \"".htmlentities($home_info['home_name'])."\"</h2>";
 
diff --git a/modules/user_games/del_home.php b/modules/user_games/del_home.php
index a45faa35..38cb05a9 100644
--- a/modules/user_games/del_home.php
+++ b/modules/user_games/del_home.php
@@ -29,7 +29,7 @@ function logHandling($home_id, $action = 'delete', &$remote){
 	}
 }
  
-function exec_ogp_module() {
+function exec_gsp_module() {
 	global $db, $view;
 	require_once('includes/lib_remote.php');
 	$home_id = $_GET['home_id'];
@@ -47,7 +47,7 @@ function exec_ogp_module() {
 		return;
 	}
 	
-	$remote = new OGPRemoteLibrary($home_info['agent_ip'], $home_info['agent_port'], $home_info['encryption_key'], $home_info['timeout']);
+	$remote = new GSPRemoteLibrary($home_info['agent_ip'], $home_info['agent_port'], $home_info['encryption_key'], $home_info['timeout']);
 	$agent_online = $remote->status_chk() === 1;
 	
 	if($y != 'y')
diff --git a/modules/user_games/edit_home.php b/modules/user_games/edit_home.php
index bf1d6889..5be1bca4 100644
--- a/modules/user_games/edit_home.php
+++ b/modules/user_games/edit_home.php
@@ -53,7 +53,7 @@ function exec_ogp_module()
 	
 	$server_xml = read_server_config(SERVER_CONFIG_LOCATION.$home_info['home_cfg_file']);
 	include_once('includes/lib_remote.php');
-	$remote = new OGPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
+	$remote = new GSPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
 	$ftp_installed = $db->isModuleInstalled('ftp');
 		
 	if( isset($_REQUEST['change_name']) )
@@ -781,7 +781,7 @@ function exec_ogp_module()
 		if ( is_array($avail_ips) && !empty($avail_ips) )
 		{
 			echo "<h3>". get_lang("ips_and_ports") ."</h3>";
-			$screen_running = $remote->is_screen_running(OGP_SCREEN_TYPE_HOME,$home_info['home_id']) === 1;
+			$screen_running = $remote->is_screen_running(GSP_SCREEN_TYPE_HOME,$home_info['home_id']) === 1;
 			if( ! $screen_running )
 			{
 				if( isset($_REQUEST['set_ip']) )
diff --git a/modules/user_games/get_size.php b/modules/user_games/get_size.php
index ff2978a4..7602944f 100644
--- a/modules/user_games/get_size.php
+++ b/modules/user_games/get_size.php
@@ -6,7 +6,7 @@ function numbersFormatting($bytes){
     return sprintf('%1.2f' , $bytes / pow($base,$class)) . ' ' . $si_prefix[$class];
 }
 
-function exec_ogp_module()
+function exec_gsp_module()
 {
 	global $db;
 	$isAdmin = $db->isAdmin( $_SESSION['user_id'] );
@@ -20,7 +20,7 @@ function exec_ogp_module()
 		if ( ! $game_home and ! $isAdmin )
 			return;
 
-		$remote = new OGPRemoteLibrary($game_home['agent_ip'], $game_home['agent_port'], $game_home['encryption_key'], $game_home['timeout']);
+		$remote = new GSPRemoteLibrary($game_home['agent_ip'], $game_home['agent_port'], $game_home['encryption_key'], $game_home['timeout']);
 		$r = $remote->rfile_exists($game_home['home_path']);
 		if($r == 1)
 		{
@@ -42,7 +42,7 @@ function exec_ogp_module()
 		$total_size = 0;
 		foreach($game_homes as $game_home)
 		{
-			$remote = new OGPRemoteLibrary($game_home['agent_ip'], $game_home['agent_port'], $game_home['encryption_key'], $game_home['timeout']);
+			$remote = new GSPRemoteLibrary($game_home['agent_ip'], $game_home['agent_port'], $game_home['encryption_key'], $game_home['timeout']);
 			$r = $remote->rfile_exists($game_home['home_path']);
 			if($r == 1)
 			{
diff --git a/modules/user_games/home_mods.php b/modules/user_games/home_mods.php
index 19cd157c..dae835b4 100644
--- a/modules/user_games/home_mods.php
+++ b/modules/user_games/home_mods.php
@@ -5,7 +5,7 @@
 
 require_once("includes/lib_remote.php");
 require_once("modules/config_games/server_config_parser.php");
-function exec_ogp_module()
+function exec_gsp_module()
 {
 	global $db, $settings;
 	$home_id = $_GET['home_id'];
@@ -14,7 +14,7 @@ function exec_ogp_module()
 	$enabled_mods = $db->getHomeMods($home_id);
 	$home_info = $db->getGameHomeWithoutMods($home_id);
 	$server_xml = read_server_config(SERVER_CONFIG_LOCATION.$home_info['home_cfg_file']);
-	$remote = new OGPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'], $home_info['timeout']);
+	$remote = new GSPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'], $home_info['timeout']);
 	if( empty($enabled_mods) )
 	{	
 		$cpu_count = $remote->cpu_count();
diff --git a/modules/user_games/install_cmds.php b/modules/user_games/install_cmds.php
index 82426ef5..57e29237 100644
--- a/modules/user_games/install_cmds.php
+++ b/modules/user_games/install_cmds.php
@@ -5,7 +5,7 @@
 
 require_once("modules/config_games/server_config_parser.php");
 
-function exec_ogp_module()
+function exec_gsp_module()
 {
 	$home_id = $_GET['home_id'];
 	$mod_id = $_GET['mod_id'];
diff --git a/modules/user_games/show_homes.php b/modules/user_games/show_homes.php
index 7eace5aa..cfa92a05 100644
--- a/modules/user_games/show_homes.php
+++ b/modules/user_games/show_homes.php
@@ -3,7 +3,7 @@
  * Component of the user_games module
  */
 
-function exec_ogp_module()
+function exec_gsp_module()
 {
 	global $db, $view, $loggedInUserInfo;
 	
diff --git a/modules/util/addadmin_helper.php b/modules/util/addadmin_helper.php
index 2a110782..a820a9b7 100644
--- a/modules/util/addadmin_helper.php
+++ b/modules/util/addadmin_helper.php
@@ -3,7 +3,7 @@
  * Administrative interface for the util module
  */
 require 'includes/lib_remote.php';
-function exec_ogp_module() 
+function exec_gsp_module() 
 {
 	global $db;
 	include 'modules/util/functions.php';
@@ -31,7 +31,7 @@ function exec_ogp_module()
 			}
 			
 			if(!empty($serverInfo)){
-				$remote = new OGPRemoteLibrary($serverInfo['agent_ip'], $serverInfo['agent_port'], $serverInfo['encryption_key'], $serverInfo['timeout']);
+				$remote = new GSPRemoteLibrary($serverInfo['agent_ip'], $serverInfo['agent_port'], $serverInfo['encryption_key'], $serverInfo['timeout']);
 				
 				if($remote->status_chk() === 1){
 					if(preg_match('/^STEAM_[01]:[01]:\d+$/', $_POST['addSteamid'])){
diff --git a/modules/util/agents.php b/modules/util/agents.php
index 7effb00b..89517efd 100644
--- a/modules/util/agents.php
+++ b/modules/util/agents.php
@@ -3,7 +3,7 @@
  * Component of the util module
  */
 include 'includes/lib_remote.php';
-function exec_ogp_module() 
+function exec_gsp_module() 
 {
 	global $db;
 	$remoteServers = $db->getRemoteServers();
@@ -11,7 +11,7 @@ function exec_ogp_module()
 	
 	if(is_array($remoteServers)){
 		foreach($remoteServers as $server){
-			$remote = new OGPRemoteLibrary($server['agent_ip'], $server['agent_port'], $server['encryption_key'], 1);
+			$remote = new GSPRemoteLibrary($server['agent_ip'], $server['agent_port'], $server['encryption_key'], 1);
 			$status = (int)$remote->status_chk();
 			
 			$servers[] = array(
diff --git a/modules/util/amx_addadmin_helper.php b/modules/util/amx_addadmin_helper.php
index 58c2fb61..02e3806f 100644
--- a/modules/util/amx_addadmin_helper.php
+++ b/modules/util/amx_addadmin_helper.php
@@ -3,7 +3,7 @@
  * Administrative interface for the util module
  */
 require 'includes/lib_remote.php';
-function exec_ogp_module() 
+function exec_gsp_module() 
 {
 	global $db;
 	include 'modules/util/functions.php';
@@ -32,7 +32,7 @@ function exec_ogp_module()
 			}
 			
 			if(!empty($serverInfo)){
-				$remote = new OGPRemoteLibrary($serverInfo['agent_ip'], $serverInfo['agent_port'], $serverInfo['encryption_key'], $serverInfo['timeout']);
+				$remote = new GSPRemoteLibrary($serverInfo['agent_ip'], $serverInfo['agent_port'], $serverInfo['encryption_key'], $serverInfo['timeout']);
 				
 				if($remote->status_chk() === 1){
 					if(($_POST['amx_login_type'] == 'amx_login_steamid' && preg_match('/^STEAM_[01]:[01]:\d+$/', $_POST['amx_Steamid']))
diff --git a/modules/util/network_tools.php b/modules/util/network_tools.php
index 7a259495..ebb793a5 100644
--- a/modules/util/network_tools.php
+++ b/modules/util/network_tools.php
@@ -3,7 +3,7 @@
  * Component of the util module
  */
 require 'includes/lib_remote.php';
-function exec_ogp_module() 
+function exec_gsp_module() 
 {
 	global $db;
 	include 'modules/util/util_config.php';
@@ -18,7 +18,7 @@ function exec_ogp_module()
 		die(get_lang('agent_invalid'));
 	}
 	
-	$remote = new OGPRemoteLibrary($server['agent_ip'], $server['agent_port'], $server['encryption_key'], 60);
+	$remote = new GSPRemoteLibrary($server['agent_ip'], $server['agent_port'], $server['encryption_key'], 60);
 	
 	if($remote->status_chk() === 0){
 		echo get_lang('networktools_agent_offline');
diff --git a/modules/util/steamid_converter.php b/modules/util/steamid_converter.php
index 2b774912..65f88458 100644
--- a/modules/util/steamid_converter.php
+++ b/modules/util/steamid_converter.php
@@ -3,7 +3,7 @@
  * Component of the util module
  */
 require 'modules/util/functions.php';
-function exec_ogp_module() 
+function exec_gsp_module() 
 {
 	require 'modules/util/util_config.php';
 	convert($_POST['steam_input']);
diff --git a/modules/util/util.php b/modules/util/util.php
index 4402ed7b..a9bfd8e5 100644
--- a/modules/util/util.php
+++ b/modules/util/util.php
@@ -3,7 +3,7 @@
  * Component of the util module
  */
 echo '<script src="js/modules/util.js"></script>';
-function exec_ogp_module() 
+function exec_gsp_module() 
 {
 	global $db;
 	include 'util_config.php';
diff --git a/protocol/TeamSpeak3/TS3Monitor.php b/protocol/TeamSpeak3/TS3Monitor.php
index 9262e5d2..b77e27d6 100644
--- a/protocol/TeamSpeak3/TS3Monitor.php
+++ b/protocol/TeamSpeak3/TS3Monitor.php
@@ -35,7 +35,7 @@ if(isset($server_home['control_password']) && $server_home['control_password'] !
 			$cfg["voice"] = $server_home['port'];
 			$cfg["query"] = 10011;
 			require_once('includes/lib_remote.php');
-			$remote = new OGPRemoteLibrary($server_home['agent_ip'], $server_home['agent_port'], $server_home['encryption_key'], $server_home['timeout']);
+			$remote = new GSPRemoteLibrary($server_home['agent_ip'], $server_home['agent_port'], $server_home['encryption_key'], $server_home['timeout']);
 			foreach($db->getHomeIpPorts($server_home['home_id']) as $ts3Port)
 			{
 				if($remote->rfile_exists( "startups/".$ts3Port['ip']."-".$ts3Port['port'] ) === 1)
diff --git a/protocol/lgsl/lgsl_protocol.php b/protocol/lgsl/lgsl_protocol.php
index b70fbe6c..1b0f0a23 100644
--- a/protocol/lgsl/lgsl_protocol.php
+++ b/protocol/lgsl/lgsl_protocol.php
@@ -4061,7 +4061,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION
 		$ip = $server['b']['ip'];
 		$port = $server['b']['c_port'];
 		$home_info = $server_home = $db->getGameHomeByIP($ip, $port);
-		$remote = new OGPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
+		$remote = new GSPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
 		$server_xml = read_server_config(SERVER_CONFIG_LOCATION."/".$home_info['home_cfg_file']);
 		$data = "";
 		$home_id = sprintf('%09d', $home_info['home_id']);
@@ -4140,7 +4140,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION
 				}
 				$server['s']['players'] = $i;
 			}
-			$screen_running = $remote->is_screen_running(OGP_SCREEN_TYPE_HOME,$home_info['home_id']) === 1;
+			$screen_running = $remote->is_screen_running(GSP_SCREEN_TYPE_HOME,$home_info['home_id']) === 1;
 			if($screen_running)
 			{
 				return TRUE;
@@ -4194,7 +4194,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION
 		$ip = $server['b']['ip'];
 		$port = $server['b']['c_port'];
 		$home_info = $server_home = $db->getGameHomeByIP($ip, $port);
-		$remote = new OGPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
+		$remote = new GSPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
 		$data = "";
 		$data = $remote->exec("VBoxManage showvminfo \"".$home_info['home_name']."\"");
 		if ( !empty($data) )
@@ -4241,7 +4241,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION
 			$server['s']['players'] = $i;
 			$server['s']['playersmax'] = $i;
 		}		
-		$screen_running = $remote->is_screen_running(OGP_SCREEN_TYPE_HOME,$home_info['home_id']) === 1;
+		$screen_running = $remote->is_screen_running(GSP_SCREEN_TYPE_HOME,$home_info['home_id']) === 1;
 		if($screen_running)
 		{
 			return TRUE;
@@ -4429,7 +4429,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION
 		if(is_array($home_info) && !empty($home_info))
 		{
 			require_once('includes/lib_remote.php');
-			$remote = new OGPRemoteLibrary($home_info['agent_ip'], $home_info['agent_port'], $home_info['encryption_key'], $home_info['timeout']);
+			$remote = new GSPRemoteLibrary($home_info['agent_ip'], $home_info['agent_port'], $home_info['encryption_key'], $home_info['timeout']);
 			$http_reply = $remote->remote_query('lgsl', $server['b']['type'], $server['b']['ip'], $server['b']['c_port'], $server['b']['q_port'], $server['b']['s_port']);
 			if($http_reply == NULL) exit("REMOTE LGSL: BAD RESPONSE");
 		}
diff --git a/server_status.php b/server_status.php
index fd239454..2a8dfe7e 100644
--- a/server_status.php
+++ b/server_status.php
@@ -28,7 +28,7 @@ $db = createDatabaseConnection($db_type, $db_host, $db_user, $db_pass, $db_name,
 include_once("includes/lang.php");
 
 if (!$db instanceof GSPDatabase) {
-    ogpLang();
+    gspLang();
     die(get_lang('no_db_connection'));
 }
 
@@ -44,7 +44,7 @@ $loggedInUserInfo = $db->getUserById($_SESSION['user_id']);
 // Get settings
 $settings = $db->getSettings();
 @$GLOBALS['panel_language'] = $settings['panel_language'];
-ogpLang();
+gspLang();
 
 function ping_host($host, $timeout = 5) {
     if (function_exists('exec')) {
@@ -85,7 +85,7 @@ $servers = $db->getRemoteServers();
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Server Status - OGP</title>
+    <title>Server Status - GSP</title>
     <style>
         body {
             font-family: Arial, sans-serif;
@@ -210,7 +210,7 @@ $servers = $db->getRemoteServers();
                         $hostname = get_hostname($server_ip);
                         
                         // Check server status
-                        $remote = new OGPRemoteLibrary($server['agent_ip'], $server['agent_port'], 
+                        $remote = new GSPRemoteLibrary($server['agent_ip'], $server['agent_port'], 
                                                     $server['encryption_key'], $server['timeout']);
                         $status = $remote->status_chk();
                         $is_online = ($status === 1);
diff --git a/themes/AdminLTE/dist/js/main.js b/themes/AdminLTE/dist/js/main.js
index 312bd386..739cb3f5 100644
--- a/themes/AdminLTE/dist/js/main.js
+++ b/themes/AdminLTE/dist/js/main.js
@@ -931,12 +931,12 @@ $(document).ready(function()
 
 
 		/* *** Footer Mod *** */
-		$('.main-footer .OGPVersionArea').addClass('d-none');
+		$('.main-footer .GSPVersionArea').addClass('d-none');
 		$('.main-footer a').attr('target', '_blank').addClass('text-dark');
 		$('.main-footer .footer').html($('.main-footer .footer').html().replace("Theme - ", "Theme for OGP by <a href='https://www.ondsen.ch' target='_blank' class='text-dark'>oNdsen</a> - "))
 		$('.main-footer .footer.center').removeClass('center');
-		$('.main-footer .OGPVersionArea .version').remove()
-		$('.main-footer .OGPVersionArea').removeClass('inline-block').addClass('d-inline-block');
+		$('.main-footer .GSPVersionArea .version').remove()
+		$('.main-footer .GSPVersionArea').removeClass('inline-block').addClass('d-inline-block');
 		$('.main-footer .footer > br').last().remove()
 	}
 
@@ -1173,17 +1173,17 @@ $(window).load(function()
 
 	$('.main-footer .versionInfo').click(function()
 	{
-		$('.OGPVersionArea, .OGPVersionArea .version, .OGPVersionArea .versionNumber').removeClass('d-none').removeClass('hide');
+		$('.GSPVersionArea, .GSPVersionArea .version, .GSPVersionArea .versionNumber').removeClass('d-none').removeClass('hide');
 
 		// add blink class to versionNumber
-		$('.OGPVersionArea .versionNumber').addClass('shortblink');
+		$('.GSPVersionArea .versionNumber').addClass('shortblink');
 		// remove after 4 seconds
 		setTimeout(function(){
-			$('.OGPVersionArea .versionNumber').removeClass('shortblink');
+			$('.GSPVersionArea .versionNumber').removeClass('shortblink');
 		}, 4000);
 
-		var copy = copyToClipboard($('.OGPVersionArea .versionNumber'));
-		toastr.info('"' + copy + '" ' + $('.OGPVersionArea .copyVersionResult').attr('lang'));
+		var copy = copyToClipboard($('.GSPVersionArea .versionNumber'));
+		toastr.info('"' + copy + '" ' + $('.GSPVersionArea .copyVersionResult').attr('lang'));
 	});
 	// circular notifications
 	if($('body > #notification').length > 0)
diff --git a/themes/AdminLTE/dist/php/theme.class.php b/themes/AdminLTE/dist/php/theme.class.php
index a0f1978f..37ef328f 100644
--- a/themes/AdminLTE/dist/php/theme.class.php
+++ b/themes/AdminLTE/dist/php/theme.class.php
@@ -84,7 +84,7 @@ class Theme
 		$firstRemoteServer = $this->getOGPServers();
 		if($firstRemoteServer)
 		{
-			$remote = new OGPRemoteLibrary($firstRemoteServer[0]['agent_ip'], $firstRemoteServer[0]['agent_port'], $firstRemoteServer[0]['encryption_key'], $firstRemoteServer[0]['timeout']);
+			$remote = new GSPRemoteLibrary($firstRemoteServer[0]['agent_ip'], $firstRemoteServer[0]['agent_port'], $firstRemoteServer[0]['encryption_key'], $firstRemoteServer[0]['timeout']);
 			if($remote->status_chk() != 1)
 			{
 				return false;
@@ -238,8 +238,8 @@ class Theme
 			foreach($serverHomes AS $key => $shData)
 			{
 				// check if the screen running the server is running.
-				$remote = new OGPRemoteLibrary($shData['agent_ip'], $shData['agent_port'], $shData['encryption_key'], $shData['timeout']);
-				if( $remote->is_screen_running(OGP_SCREEN_TYPE_HOME, $shData['home_id']))
+				$remote = new GSPRemoteLibrary($shData['agent_ip'], $shData['agent_port'], $shData['encryption_key'], $shData['timeout']);
+				if( $remote->is_screen_running(GSP_SCREEN_TYPE_HOME, $shData['home_id']))
 				{
 					$queryData = $this->getProtocolAndQuery($serverHomes[$key]);
 					$serverHomes[$key]['qProtocol'] = $queryData['qProtocol'];
diff --git a/themes/MasterControlProgram/css/main.css b/themes/MasterControlProgram/css/main.css
index cb722ba0..c597c9b2 100644
--- a/themes/MasterControlProgram/css/main.css
+++ b/themes/MasterControlProgram/css/main.css
@@ -209,7 +209,7 @@ h4.collapse,
 .inline-block{
 	display: inline-block;
 }
-div.OGPVersionArea{
+div.GSPVersionArea{
 	width: 100%;
 	position: relative;
 }
diff --git a/themes/SimpleBootstrap/css/main.css b/themes/SimpleBootstrap/css/main.css
index afe31687..b6ce338a 100644
--- a/themes/SimpleBootstrap/css/main.css
+++ b/themes/SimpleBootstrap/css/main.css
@@ -254,7 +254,7 @@ h4.collapse,
 .inline-block{
 	display: inline-block;
 }
-div.OGPVersionArea{
+div.GSPVersionArea{
 	width: 100%;
 	position: relative;
 }