diff --git a/phpgwapi/inc/class.xmlrpc_client.inc.php b/phpgwapi/inc/class.xmlrpc_client.inc.php
index c0cf264491..a606f4344d 100644
--- a/phpgwapi/inc/class.xmlrpc_client.inc.php
+++ b/phpgwapi/inc/class.xmlrpc_client.inc.php
@@ -149,7 +149,7 @@
 			$op = 'POST ' . $this->path . " HTTP/1.0\r\nUser-Agent: PHP XMLRPC 2.0\r\n"
 				. 'Host: '. $this->server . "\r\n"
 				. 'X-EGW-Server: '  . $this->server . ' ' . "\r\n"
-				. 'X-EGW-Version: ' . $GLOBALS['egw_info']['server']['versions']['phpgwapi'] . "\r\n"
+				. 'X-EGW-Version: ' . $GLOBALS['phpgw_info']['server']['versions']['phpgwapi'] . "\r\n"
 				. $credentials
 				. "Content-Type: text/xml\r\nContent-Length: "
 				. strlen($msg->payload) . "\r\n\r\n"
@@ -211,7 +211,7 @@
 			// return the header too
 			curl_setopt($curl, CURLOPT_HTTPHEADER, array(
 				'X-EGW-Server: '  . $this->server,
-				'X-EGW-Version: ' . $GLOBALS['egw_info']['server']['versions']['phpgwapi'],
+				'X-EGW-Version: ' . $GLOBALS['phpgw_info']['server']['versions']['phpgwapi'],
 				'Content-Type: text/xml'
 			));
 			if ($timeout)
diff --git a/phpgwapi/inc/class.xmlrpc_server.inc.php b/phpgwapi/inc/class.xmlrpc_server.inc.php
index f5e9e8320d..83fae22b43 100644
--- a/phpgwapi/inc/class.xmlrpc_server.inc.php
+++ b/phpgwapi/inc/class.xmlrpc_server.inc.php
@@ -170,8 +170,8 @@
 		}
 	}
 
-	if(empty($GLOBALS['egw_info']['server']['xmlrpc_type']))
+	if(empty($GLOBALS['phpgw_info']['server']['xmlrpc_type']))
 	{
-		$GLOBALS['egw_info']['server']['xmlrpc_type'] = 'php';
+		$GLOBALS['phpgw_info']['server']['xmlrpc_type'] = 'php';
 	}
-	include_once(PHPGW_API_INC.SEP.'class.xmlrpc_server_' . $GLOBALS['egw_info']['server']['xmlrpc_type'] . '.inc.php');
+	include_once(PHPGW_API_INC.SEP.'class.xmlrpc_server_' . $GLOBALS['phpgw_info']['server']['xmlrpc_type'] . '.inc.php');
diff --git a/phpgwapi/inc/class.xmlrpc_server_epi.inc.php b/phpgwapi/inc/class.xmlrpc_server_epi.inc.php
index b889b8a8af..af20a2de41 100644
--- a/phpgwapi/inc/class.xmlrpc_server_epi.inc.php
+++ b/phpgwapi/inc/class.xmlrpc_server_epi.inc.php
@@ -69,7 +69,7 @@
 			{
 				$fp = fopen($this->log,'a+');
 				fwrite($fp,"\n\n" . date('Y-m-d H:i:s') . " authorized="
-					. ($this->authed ? $GLOBALS['egw_info']['user']['account_lid'] : 'False')
+					. ($this->authed ? $GLOBALS['phpgw_info']['user']['account_lid'] : 'False')
 					. ", method='$this->last_method'\n");
 				fwrite($fp,"==== GOT ============================\n" . $GLOBALS['HTTP_RAW_POST_DATA']
 					. "\n==== RETURNED =======================\n");
diff --git a/phpgwapi/inc/class.xmlrpc_server_php.inc.php b/phpgwapi/inc/class.xmlrpc_server_php.inc.php
index 166cce6d3c..20b356fe52 100644
--- a/phpgwapi/inc/class.xmlrpc_server_php.inc.php
+++ b/phpgwapi/inc/class.xmlrpc_server_php.inc.php
@@ -101,7 +101,7 @@
 			{
 				$fp = fopen($this->log,'a+');
 				fwrite($fp,"\n\n".date('Y-m-d H:i:s') . " authorized="
-					. ($this->authed?$GLOBALS['egw_info']['user']['account_lid']:'False')
+					. ($this->authed?$GLOBALS['phpgw_info']['user']['account_lid']:'False')
 					. ", method='$this->last_method'\n");
 				fwrite($fp,"==== GOT ============================\n" . $GLOBALS['HTTP_RAW_POST_DATA']
 					. "\n==== RETURNED =======================\n");
diff --git a/phpgwapi/inc/xml_functions.inc.php b/phpgwapi/inc/xml_functions.inc.php
index dacf54b7b0..9ca787048e 100644
--- a/phpgwapi/inc/xml_functions.inc.php
+++ b/phpgwapi/inc/xml_functions.inc.php
@@ -893,7 +893,7 @@
 	$GLOBALS['_xmlrpcs_phpgw_api_version_doc'] = 'Returns the eGroupWare API version';
 	function _xmlrpcs_phpgw_api_version($server,$m)
 	{
-		$version = $GLOBALS['egw_info']['server']['versions']['phpgwapi'];
+		$version = $GLOBALS['phpgw_info']['server']['versions']['phpgwapi'];
 
 		return CreateObject('phpgwapi.xmlrpcresp',CreateObject('phpgwapi.xmlrpcval',$version,'string'));
 	}