diff --git a/phpgwapi/inc/class.interserver.inc.php b/phpgwapi/inc/class.interserver.inc.php
index f11624b598..337fa9147a 100644
--- a/phpgwapi/inc/class.interserver.inc.php
+++ b/phpgwapi/inc/class.interserver.inc.php
@@ -27,7 +27,7 @@
 	{
 		var $db;
 		var $accounts;
-		var $table = 'phpgw_interserv';
+		var $table = 'egw_interserv';
 		var $total = 0;
 		var $result = '';
 
@@ -117,7 +117,7 @@
 			$this->read_repository();
 			if($this->server['trust_level'])
 			{
-				$this->accounts = CreateObject('phpgwapi.accounts');
+				$this->accounts =& CreateObject('phpgwapi.accounts');
 				$this->accounts->server = $this->serverid;
 			}
 			$this->security = $this->server['server_security'];
diff --git a/phpgwapi/setup/default_records.inc.php b/phpgwapi/setup/default_records.inc.php
index 0b895b8837..d5b2081e74 100644
--- a/phpgwapi/setup/default_records.inc.php
+++ b/phpgwapi/setup/default_records.inc.php
@@ -169,7 +169,7 @@ foreach(array(
 	),__LINE__,__FILE__);
 }
 
-$oProc->query("INSERT INTO phpgw_interserv(server_name,server_host,server_url,trust_level,trust_rel,server_mode) VALUES ('eGW demo',NULL,'http://www.egroupware.org/egroupware/xmlrpc.php',99,0,'xmlrpc')");
+$oProc->query("INSERT INTO egw_interserv(server_name,server_host,server_url,trust_level,trust_rel,server_mode) VALUES ('eGW demo',NULL,'http://www.egroupware.org/egroupware/xmlrpc.php',99,0,'xmlrpc')");
 
 // insert the VFS basedir /home
 $oProc->query ("INSERT INTO egw_vfs (owner_id, createdby_id, modifiedby_id, created, modified, size, mime_type, deleteable, comment, app, directory, name, link_directory, link_name) VALUES (0,0,0,'1970-01-01',NULL,NULL,'Directory','Y',NULL,NULL,'/','', NULL, NULL)");
diff --git a/phpgwapi/setup/setup.inc.php b/phpgwapi/setup/setup.inc.php
index 222cca1257..abe62c80df 100755
--- a/phpgwapi/setup/setup.inc.php
+++ b/phpgwapi/setup/setup.inc.php
@@ -14,7 +14,7 @@
 	/* Basic information about this app */
 	$setup_info['phpgwapi']['name']      = 'phpgwapi';
 	$setup_info['phpgwapi']['title']     = 'eGroupWare API';
-	$setup_info['phpgwapi']['version']   = '1.0.1.027';
+	$setup_info['phpgwapi']['version']   = '1.0.1.028';
 	$setup_info['phpgwapi']['versions']['current_header'] = '1.28';
 	$setup_info['phpgwapi']['enable']    = 3;
 	$setup_info['phpgwapi']['app_order'] = 1;
@@ -37,7 +37,7 @@
 	$setup_info['phpgwapi']['tables'][]  = 'phpgw_addressbook_extra';
 	$setup_info['phpgwapi']['tables'][]  = 'egw_log';
 	$setup_info['phpgwapi']['tables'][]  = 'egw_log_msg';
-	$setup_info['phpgwapi']['tables'][]  = 'phpgw_interserv';
+	$setup_info['phpgwapi']['tables'][]  = 'egw_interserv';
 	$setup_info['phpgwapi']['tables'][]  = 'egw_vfs';
 	$setup_info['phpgwapi']['tables'][]  = 'egw_history_log';
 	$setup_info['phpgwapi']['tables'][]  = 'egw_async';
diff --git a/phpgwapi/setup/tables_current.inc.php b/phpgwapi/setup/tables_current.inc.php
index 58d19f3df8..3eb8da7a14 100644
--- a/phpgwapi/setup/tables_current.inc.php
+++ b/phpgwapi/setup/tables_current.inc.php
@@ -294,7 +294,7 @@
 			'ix' => array(),
 			'uc' => array()
 		),
-		'phpgw_interserv' => array(
+		'egw_interserv' => array(
 			'fd' => array(
 				'server_id' => array('type' => 'auto','nullable' => False),
 				'server_name' => array('type' => 'varchar','precision' => '64','nullable' => True),
diff --git a/phpgwapi/setup/tables_update.inc.php b/phpgwapi/setup/tables_update.inc.php
index 22c356fc5e..1c44ec9e9b 100644
--- a/phpgwapi/setup/tables_update.inc.php
+++ b/phpgwapi/setup/tables_update.inc.php
@@ -888,4 +888,13 @@
 
 		return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.0.1.027';
 	}
+
+
+	$test[] = '1.0.1.027';
+	function phpgwapi_upgrade1_0_1_027()
+	{
+		$GLOBALS['egw_setup']->oProc->RenameTable('phpgw_interserv','egw_interserv');
+
+		return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.0.1.028';
+	}
 ?>