diff --git a/phpgwapi/setup/setup.inc.php b/phpgwapi/setup/setup.inc.php
index d5efebd585..7296c8a985 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']     = 'phpgwapi';
-	$setup_info['phpgwapi']['version']   = '1.0.1.002';
+	$setup_info['phpgwapi']['version']   = '1.0.1.003';
 	$setup_info['phpgwapi']['versions']['current_header'] = '1.27';
 	$setup_info['phpgwapi']['enable']    = 3;
 	$setup_info['phpgwapi']['app_order'] = 1;
@@ -38,7 +38,7 @@
 	$setup_info['phpgwapi']['tables'][]  = 'phpgw_log';
 	$setup_info['phpgwapi']['tables'][]  = 'phpgw_log_msg';
 	$setup_info['phpgwapi']['tables'][]  = 'phpgw_interserv';
-	$setup_info['phpgwapi']['tables'][]  = 'phpgw_vfs';
+	$setup_info['phpgwapi']['tables'][]  = 'egw_vfs';
 	$setup_info['phpgwapi']['tables'][]  = 'phpgw_history_log';
 	$setup_info['phpgwapi']['tables'][]  = 'phpgw_async';
 
@@ -57,3 +57,4 @@
 
 
 
+
diff --git a/phpgwapi/setup/tables_current.inc.php b/phpgwapi/setup/tables_current.inc.php
index c9b4d389b2..d394243940 100644
--- a/phpgwapi/setup/tables_current.inc.php
+++ b/phpgwapi/setup/tables_current.inc.php
@@ -314,29 +314,29 @@
 			'ix' => array(),
 			'uc' => array()
 		),
-		'phpgw_vfs' => array(
+		'egw_vfs' => array(
 			'fd' => array(
-				'file_id' => array('type' => 'auto','nullable' => False),
-				'owner_id' => array('type' => 'int','precision' => '4','nullable' => False),
-				'createdby_id' => array('type' => 'int','precision' => '4'),
-				'modifiedby_id' => array('type' => 'int','precision' => '4'),
-				'created' => array('type' => 'date','nullable' => False,'default' => '1970-01-01'),
-				'modified' => array('type' => 'date'),
-				'size' => array('type' => 'int','precision' => '4'),
-				'mime_type' => array('type' => 'varchar','precision' => '64'),
-				'deleteable' => array('type' => 'char','precision' => '1','default' => 'Y'),
-				'comment' => array('type' => 'varchar','precision' => '255'),
-				'app' => array('type' => 'varchar','precision' => '25'),
-				'directory' => array('type' => 'varchar','precision' => '255'),
-				'name' => array('type' => 'varchar','precision' => '128','nullable' => False),
-				'link_directory' => array('type' => 'varchar','precision' => '255'),
-				'link_name' => array('type' => 'varchar','precision' => '128'),
-				'version' => array('type' => 'varchar','precision' => '30','nullable' => False,'default' => '0.0.0.0'),
-				'content' => array('type' => 'longtext')
+				'vfs_file_id' => array('type' => 'auto','nullable' => False),
+				'vfs_owner_id' => array('type' => 'int','precision' => '4','nullable' => False),
+				'vfs_createdby_id' => array('type' => 'int','precision' => '4'),
+				'vfs_modifiedby_id' => array('type' => 'int','precision' => '4'),
+				'vfs_created' => array('type' => 'date','nullable' => False,'default' => '1970-01-01'),
+				'vfs_modified' => array('type' => 'date'),
+				'vfs_size' => array('type' => 'int','precision' => '4'),
+				'vfs_mime_type' => array('type' => 'varchar','precision' => '64'),
+				'vfs_deleteable' => array('type' => 'char','precision' => '1','default' => 'Y'),
+				'vfs_comment' => array('type' => 'varchar','precision' => '255'),
+				'vfs_app' => array('type' => 'varchar','precision' => '25'),
+				'vfs_directory' => array('type' => 'varchar','precision' => '255'),
+				'vfs_name' => array('type' => 'varchar','precision' => '128','nullable' => False),
+				'vfs_link_directory' => array('type' => 'varchar','precision' => '255'),
+				'vfs_link_name' => array('type' => 'varchar','precision' => '128'),
+				'vfs_version' => array('type' => 'varchar','precision' => '30','nullable' => False,'default' => '0.0.0.0'),
+				'vfs_content' => array('type' => 'text')
 			),
-			'pk' => array('file_id'),
+			'pk' => array('vfs_file_id'),
 			'fk' => array(),
-			'ix' => array(array('directory','name','mime_type')),
+			'ix' => array(array('vfs_directory','vfs_name','vfs_mime_type')),
 			'uc' => array()
 		),
 		'phpgw_history_log' => array(
@@ -370,4 +370,3 @@
 			'uc' => array()
 		)
 	);
-?>
diff --git a/phpgwapi/setup/tables_update.inc.php b/phpgwapi/setup/tables_update.inc.php
index 68645bcd9d..85497e6433 100644
--- a/phpgwapi/setup/tables_update.inc.php
+++ b/phpgwapi/setup/tables_update.inc.php
@@ -83,4 +83,56 @@
 		return $GLOBALS['setup_info']['phpgwapi']['currentver'];
 	}
 
-?>
+
+
+	$test[] = '1.0.1.002';
+	function phpgwapi_upgrade1_0_1_002()
+	{
+		$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_vfs','file_id','vfs_file_id');
+		$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_vfs','owner_id','vfs_owner_id');
+		$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_vfs','createdby_id','vfs_createdby_id');
+		$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_vfs','modifiedby_id','vfs_modifiedby_id');
+		$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_vfs','created','vfs_created');
+		$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_vfs','modified','vfs_modified');
+		$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_vfs','size','vfs_size');
+		$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_vfs','mime_type','vfs_mime_type');
+		$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_vfs','deleteable','vfs_deleteable');
+		$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_vfs','comment','vfs_comment');
+		$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_vfs','app','vfs_app');
+		$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_vfs','directory','vfs_directory');
+		$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_vfs','name','vfs_name');
+		$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_vfs','link_directory','vfs_link_directory');
+		$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_vfs','link_name','vfs_link_name');
+		$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_vfs','version','vfs_version');
+		$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_vfs','content','vfs_content');
+		$GLOBALS['phpgw_setup']->oProc->RenameTable('phpgw_vfs','egw_vfs');
+
+		$GLOBALS['phpgw_setup']->oProc->RefreshTable('egw_vfs',array(
+			'fd' => array(
+				'vfs_file_id' => array('type' => 'auto','nullable' => False),
+				'vfs_owner_id' => array('type' => 'int','precision' => '4','nullable' => False),
+				'vfs_createdby_id' => array('type' => 'int','precision' => '4'),
+				'vfs_modifiedby_id' => array('type' => 'int','precision' => '4'),
+				'vfs_created' => array('type' => 'date','nullable' => False,'default' => '1970-01-01'),
+				'vfs_modified' => array('type' => 'date'),
+				'vfs_size' => array('type' => 'int','precision' => '4'),
+				'vfs_mime_type' => array('type' => 'varchar','precision' => '64'),
+				'vfs_deleteable' => array('type' => 'char','precision' => '1','default' => 'Y'),
+				'vfs_comment' => array('type' => 'varchar','precision' => '255'),
+				'vfs_app' => array('type' => 'varchar','precision' => '25'),
+				'vfs_directory' => array('type' => 'varchar','precision' => '255'),
+				'vfs_name' => array('type' => 'varchar','precision' => '128','nullable' => False),
+				'vfs_link_directory' => array('type' => 'varchar','precision' => '255'),
+				'vfs_link_name' => array('type' => 'varchar','precision' => '128'),
+				'vfs_version' => array('type' => 'varchar','precision' => '30','nullable' => False,'default' => '0.0.0.0'),
+				'vfs_content' => array('type' => 'text')
+			),
+			'pk' => array('vfs_file_id'),
+			'fk' => array(),
+			'ix' => array(array('vfs_directory','vfs_name','vfs_mime_type')),
+			'uc' => array()
+		));
+
+		$GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.0.1.003';
+		return $GLOBALS['setup_info']['phpgwapi']['currentver'];
+	}