Index: trunk/xpressme_integration_kit/class/config_from_xoops.class.php
===================================================================
--- trunk/xpressme_integration_kit/class/config_from_xoops.class.php	(revision 551)
+++ trunk/xpressme_integration_kit/class/config_from_xoops.class.php	(revision 583)
@@ -93,9 +93,5 @@
 		$this->xoops_upload_path = $this->xoops_root_path .'/uploads';
 		$this->xoops_upload_url = $this->xoops_url . '/uploads';
-		
-		if ($this->module_name == 'wordpress')
-			$this->module_db_prefix =  $this->xoops_db_prefix  . '_wp_';
-		else
-			$this->module_db_prefix =  $this->xoops_db_prefix  . '_' . $this->module_name . '_';
+		$this->module_db_prefix = $this->xoops_db_prefix  . '_' . preg_replace('/wordpress/','wp',$this->module_name) . '_';
 		
 		$this->set_module_version();
Index: trunk/xpressme_integration_kit/class/xpressD3commentContent.class.php
===================================================================
--- trunk/xpressme_integration_kit/class/xpressD3commentContent.class.php	(revision 551)
+++ trunk/xpressme_integration_kit/class/xpressD3commentContent.class.php	(revision 583)
@@ -22,6 +22,5 @@
 			if( preg_match( '/[^0-9a-zA-Z_-]/' , $mydirname ) ) die( 'Invalid mydirname' ) ;
 			
-			$xpress_prefix = $mydirname;
-			if ($xpress_prefix == 'wordpress') $xpress_prefix = 'wp';
+			$xpress_prefix = preg_replace('/wordpress/','wp',$mydirname);
 
 			// query
@@ -74,6 +73,5 @@
 					if( preg_match( '/[^0-9a-zA-Z_-]/' , $mydirname ) ) die( 'Invalid mydirname' ) ;
 					
-					$xpress_prefix = $mydirname;
-					if ($xpress_prefix == 'wordpress') $xpress_prefix = 'wp';
+					$xpress_prefix = preg_replace('/wordpress/','wp',$mydirname);
 
 					// query
@@ -160,6 +158,5 @@
 			$post_id = intval( $link_id ) ;
 			$mydirname = $this->mydirname ;
-			$xpress_prefix = $mydirname;
-			if ($xpress_prefix == 'wordpress') $xpress_prefix = 'wp';
+			$xpress_prefix = preg_replace('/wordpress/','wp',$mydirname);
 			
 			$db =& Database::getInstance() ;
@@ -199,6 +196,5 @@
 			if( preg_match( '/[^0-9a-zA-Z_-]/' , $mydirname ) ) die( 'Invalid mydirname' ) ;
 			
-			$xpress_prefix = $mydirname;
-			if ($xpress_prefix == 'wordpress') $xpress_prefix = 'wp';
+			$xpress_prefix = preg_replace('/wordpress/','wp',$mydirname);
 			
 			$table_term_relationships = $db->prefix($xpress_prefix."_term_relationships");
@@ -273,6 +269,5 @@
 
 			$mydirname = $this->mydirname ;
-			$xpress_prefix = $mydirname;
-			if ($xpress_prefix == 'wordpress') $xpress_prefix = 'wp';
+			$xpress_prefix = preg_replace('/wordpress/','wp',$mydirname);
 			$d3f_forum_dir  = $this->d3forum_dirname;
 			
@@ -419,7 +414,5 @@
 		function get_wp_comment_ID($d3forum_post_ID){
 			$xp_prefix = $wpdirname = basename( dirname( dirname( __FILE__ ) ) ) ;
-			if ($xp_prefix == 'wordpress'){
-				$xp_prefix = 'wp';
-			}
+			$xp_prefix = preg_replace('/wordpress/','wp',$xp_prefix);
 			
 			$xoopsDB =& Database::getInstance();