Index: trunk/xpressme_integration_kit/class/modInfo_class.php
===================================================================
--- trunk/xpressme_integration_kit/class/modInfo_class.php	(revision 788)
+++ trunk/xpressme_integration_kit/class/modInfo_class.php	(revision 789)
@@ -83,6 +83,6 @@
 		$this->xoops_upload_url = $this->_get_xoops_upload_url();
 		$this->xoops_cache_path = $this->_get_xoops_cache_path();
-    	$this->module_path=dirname(dirname(__FILE__));
-    	$this->module_name=basename($this->module_path);
+    	$this->module_name = basename(dirname(dirname(__FILE__)));
+    	$this->module_path = $this->xoops_root_path . '/modules/' . $this->module_name;
 		$this->module_url = $this->xoops_url . '/modules/' . $this->module_name;
 		$this->xoops_lang =  @$GLOBALS["xoopsConfig"]['language'];
Index: trunk/xpressme_integration_kit/include/wp_installer.php
===================================================================
--- trunk/xpressme_integration_kit/include/wp_installer.php	(revision 788)
+++ trunk/xpressme_integration_kit/include/wp_installer.php	(revision 789)
@@ -46,8 +46,9 @@
 	//xpress
 	global $wpdb,$wp_rewrite, $wp_queries, $table_prefix, $wp_db_version, $wp_roles, $wp_query,$wp_embed;
+	global $modInfo;
 	$msgs = array();
 		
-	$site_url= XOOPS_URL."/modules/".$mydirname;
-	$mydirpath = XOOPS_ROOT_PATH . '/modules/' . $mydirname;
+	$site_url= $modInfo->get_module_url();
+	$mydirpath = $modInfo->get_module_path();
 	$path = $mydirpath . '/';
 	$site_name = ucfirst($mydirname) . ' ' . _MI_XP2_NAME;
@@ -106,5 +107,5 @@
 	
 	// Rewrite Option for Xpress
-	$xoops_conf_tbl = XOOPS_DB_PREFIX . '_config' ;
+	$xoops_conf_tbl = $modInfo->get_xoops_db_prefix() . '_config' ;
 	$sql = "SELECT conf_value FROM  $xoops_conf_tbl WHERE `conf_name` = 'default_TZ'";
 	$xoops_default_TZ = $wpdb->get_var($sql);
@@ -147,6 +148,6 @@
 	
 	// create XPressME table
-	$xp_prefix = preg_replace('/wordpress/','wp',$mydirname);
-	$views_table = XOOPS_DB_PREFIX . '_' . $xp_prefix .'_views' ;
+	$xp_prefix = $modInfo->get_module_db_prefix();
+	$views_table = $xp_prefix .'views' ;
 
 	$charset_collate = '';
@@ -166,5 +167,5 @@
 	$msgs[] = "$views_table table of XPressME was made.<br />";
 	
-	$d3forum_link = XOOPS_DB_PREFIX . '_' . $xp_prefix .'_d3forum_link' ;
+	$d3forum_link = $xp_prefix .'d3forum_link' ;
 	$views_queries ="CREATE TABLE $d3forum_link (
   		comment_ID bigint(20) unsigned NOT NULL default '0',
@@ -178,5 +179,5 @@
 	$msgs[] = "$d3forum_link table of XPressME was made.<br />";
 	
-	$group_role = XOOPS_DB_PREFIX . '_' . $xp_prefix .'_group_role' ;
+	$group_role = $xp_prefix .'group_role' ;
 	$views_queries ="CREATE TABLE $group_role (
   		groupid smallint(5) unsigned NOT NULL default '0',
@@ -194,5 +195,5 @@
 	$wpdb->query($sql);
 	
-	$notify_reserve = XOOPS_DB_PREFIX . '_' . $xp_prefix .'_notify_reserve' ;
+	$notify_reserve = $xp_prefix .'notify_reserve' ;
 	$queries ="CREATE TABLE $notify_reserve (
   		notify_reserve_id bigint(20) NOT NULL AUTO_INCREMENT ,
