Index: trunk/language/english/admin.php
===================================================================
--- trunk/language/english/admin.php	(revision 177)
+++ trunk/language/english/admin.php	(revision 183)
@@ -1,5 +1,5 @@
 <?php
-if( ! defined( 'XPRESS_ADMIN_LANG_INCLUDED' ) ) {
-	define( 'XPRESS_ADMIN_LANG_INCLUDED' , 1 ) ;
+if( ! defined( 'XP2_ADMIN_LANG_INCLUDED' ) ) {
+	define( 'XP2_ADMIN_LANG_INCLUDED' , 1 ) ;
 	
 // altsys
@@ -9,27 +9,27 @@
 	define('_MD_A_MYMENU_MYPREFERENCES','general');
 
-	define("_AM_SYSTEM_INFO","System infomation");
-	define("_AM_XOOPS_CONFIG_INFO","Set value that XPressME acquired from XOOPS");
-	define("_AM_XPRESS_PLUGIN","Active plug-in list at wordpress");
-	define("_AM_XPRESS_STATS","WordPress Stats");
-	define("_AM_XPRESS_CATEGORIES","Category count");
-	define("_AM_XPRESS_ARTICLES","Blog article count");
-	define("_AM_XPRESS_AUTHORS","Author count");
-	define("_AM_XPRESS_SYS_REPORT","Show Report Mode");
-	define("_AM_XPRESS_SYS_NORMAL","Show Normal Mode");
+	define("_AM_XP2_SYSTEM_INFO","System infomation");
+	define("_AM_XP2_XOOPS_CONFIG_INFO","Set value that XPressME acquired from XOOPS");
+	define("_AM_XP2_PLUGIN","Active plug-in list at wordpress");
+	define("_AM_XP2_STATS","WordPress Stats");
+	define("_AM_XP2_CATEGORIES","Category count");
+	define("_AM_XP2_ARTICLES","Blog article count");
+	define("_AM_XP2_AUTHORS","Author count");
+	define("_AM_XP2_SYS_REPORT","Show Report Mode");
+	define("_AM_XP2_SYS_NORMAL","Show Normal Mode");
 
 // Block Check	
-	define("_AM_XP_BLOCK_OK","The block is normal. ");
-	define("_AM_XP_BLOCK_NG","There is an abnormal block. ");
-	define("_AM_XP_BLOCK_REPAIR_HOWTO","Please correct the block according to the following procedures. ");
-	define("_AM_XP_BLOCK_REPAIR_STEP1","Step 1");
-	define("_AM_XP_BLOCK_REMOVE","Remove xoops block table");
-	define("_AM_XP_BLOCK_REMOVE_NOTE","Please use carefully, because <b>Remove Block</b> deletes records in block table");
-	define("_AM_XP_BLOCK_REPAIR_STEP2","Step 2");
-	define("_AM_XP_BLOCK_UPDATE","The block is restructured with the update of the module.");
-	define("_AM_XP_TO_MODELE_UPDATE","To the module update");
-	define("_AM_XP_BLOCK_REPAIR_STEP3","Step3");
-	define("_AM_XP_BLOCK_ADMIN_SETTING","The arrangement setting of the block and the access authority of the block are set again. ");
-	define("_AM_XP_BLOCK_TO_SETTING","to blocks/permissions");
+	define("_AM_XP2_BLOCK_OK","The block is normal. ");
+	define("_AM_XP2_BLOCK_NG","There is an abnormal block. ");
+	define("_AM_XP2_BLOCK_REPAIR_HOWTO","Please correct the block according to the following procedures. ");
+	define("_AM_XP2_BLOCK_REPAIR_STEP1","Step 1");
+	define("_AM_XP2_BLOCK_REMOVE","Remove xoops block table");
+	define("_AM_XP2_BLOCK_REMOVE_NOTE","Please use carefully, because <b>Remove Block</b> deletes records in block table");
+	define("_AM_XP2_BLOCK_REPAIR_STEP2","Step 2");
+	define("_AM_XP2_BLOCK_UPDATE","The block is restructured with the update of the module.");
+	define("_AM_XP2_TO_MODELE_UPDATE","To the module update");
+	define("_AM_XP2_BLOCK_REPAIR_STEP3","Step3");
+	define("_AM_XP2_BLOCK_ADMIN_SETTING","The arrangement setting of the block and the access authority of the block are set again. ");
+	define("_AM_XP2_BLOCK_TO_SETTING","to blocks/permissions");
 	
 	
Index: trunk/language/english/blocks.php
===================================================================
--- trunk/language/english/blocks.php	(revision 177)
+++ trunk/language/english/blocks.php	(revision 183)
@@ -1,132 +1,132 @@
 <?php
-if( ! defined( 'XPRESS_BLOCK_LANG_INCLUDED' ) ) {
-	define( 'XPRESS_BLOCK_LANG_INCLUDED' , 1 ) ;
+if( ! defined( 'XP2_BLOCK_LANG_INCLUDED' ) ) {
+	define( 'XP2_BLOCK_LANG_INCLUDED' , 1 ) ;
 // general	
-	define("_MB_XPRESS_COUNT",'Number of displays');
-	define("_MB_XPRESS_COUNT_ZERO_ALL",'Number of displays (Everything is displayed in case of 0)');
-	define("_MB_XPRESS_LENGTH","length");
-	define("_MB_XPRESS_ALL","all");
-	define("_MB_XPRESS_BLOCK_CACHE_ERR","Cash doesn't exist. <br />Please access the %s module first.");
-	define("_MB_XPRESS_SHOW_NUM_OF_POST","The number of entries is displayed.");
-	define("_MB_XPRESS_SHOW_DROP_DOWN","It displays it by the drop down list.");
-	define("_MB_XPRESS_HIDE_EMPTY","hide empty");
-	define("_MB_XPRESS_TITLE","title");
-	define("_MB_XPRESS_PUBLISH_DATE","publish date");
-	define("_MB_XPRESS_SORT_ORDER","sort order");
-	define("_MB_XPRESS_SORT_ASC","ASC");
-	define("_MB_XPRESS_SORT_DESC","DESC");
-	define("_MB_XPRESS_SHOW_DATE_SELECT","Date Display");
-	define("_MB_XPRESS_SHOW_DATE_NONE","Not display");
-	define("_MB_XPRESS_SHOW_POST_DATE","Post Date");
-	define("_MB_XPRESS_SHOW_MODIFY_DATE","Modify Date");
-	define("_MB_XPRESS_SHOW_DATE","The date is displayed.");
-	define("_MB_XPRESS_DATE_FORMAT","Format at date (The setting with WordPress is applied for the blank).");
-	define("_MB_XPRESS_TIME_FORMAT","Format at time (The setting with WordPress is applied for the blank).");
-	define("_MB_XPRESS_FLAT","Flat");
-	define("_MB_XPRESS_LIST","List");
-	define("_MB_XPRESS_FILE_NAME","Files Name");
+	define("_MB_XP2_COUNT",'Number of displays');
+	define("_MB_XP2_COUNT_ZERO_ALL",'Number of displays (Everything is displayed in case of 0)');
+	define("_MB_XP2_LENGTH","length");
+	define("_MB_XP2_ALL","all");
+	define("_MB_XP2_BLOCK_CACHE_ERR","Cash doesn't exist. <br />Please access the %s module first.");
+	define("_MB_XP2_SHOW_NUM_OF_POST","The number of entries is displayed.");
+	define("_MB_XP2_SHOW_DROP_DOWN","It displays it by the drop down list.");
+	define("_MB_XP2_HIDE_EMPTY","hide empty");
+	define("_MB_XP2_TITLE","title");
+	define("_MB_XP2_PUBLISH_DATE","publish date");
+	define("_MB_XP2_SORT_ORDER","sort order");
+	define("_MB_XP2_SORT_ASC","ASC");
+	define("_MB_XP2_SORT_DESC","DESC");
+	define("_MB_XP2_SHOW_DATE_SELECT","Date Display");
+	define("_MB_XP2_SHOW_DATE_NONE","Not display");
+	define("_MB_XP2_SHOW_POST_DATE","Post Date");
+	define("_MB_XP2_SHOW_MODIFY_DATE","Modify Date");
+	define("_MB_XP2_SHOW_DATE","The date is displayed.");
+	define("_MB_XP2_DATE_FORMAT","Format at date (The setting with WordPress is applied for the blank).");
+	define("_MB_XP2_TIME_FORMAT","Format at time (The setting with WordPress is applied for the blank).");
+	define("_MB_XP2_FLAT","Flat");
+	define("_MB_XP2_LIST","List");
+	define("_MB_XP2_FILE_NAME","Files Name");
 	
 // recent comment block	
-	define("_MB_XPRESS_COMM_DISP_AUTH","The comment author name is displayed.");
-	define("_MB_XPRESS_COMM_DISP_TYPE","The comment type is displayed.");
-	define("_MB_XPRESS_COM_TYPE","select the type of the displayed comment.");
-	define("_MB_XPRESS_COMMENT","Comment");
-	define("_MB_XPRESS_TRUCKBACK","Trackback");
-	define("_MB_XPRESS_PINGBACK","Pingback");
+	define("_MB_XP2_COMM_DISP_AUTH","The comment author name is displayed.");
+	define("_MB_XP2_COMM_DISP_TYPE","The comment type is displayed.");
+	define("_MB_XP2_COM_TYPE","select the type of the displayed comment.");
+	define("_MB_XP2_COMMENT","Comment");
+	define("_MB_XP2_TRUCKBACK","Trackback");
+	define("_MB_XP2_PINGBACK","Pingback");
 	
 // recent posts content
-	define("_MB_XPRESS_P_EXCERPT","The post is displayed by the except.");
-	define("_MB_XPRESS_P_EXCERPT_SIZE","Number of except characters");
-	define("_MB_XPRESS_CATS_SELECT","Select categorie");
-	define("_MB_XPRESS_TAGS_SELECT","Tags Select(Comma separated list of tags)");
+	define("_MB_XP2_P_EXCERPT","The post is displayed by the except.");
+	define("_MB_XP2_P_EXCERPT_SIZE","Number of except characters");
+	define("_MB_XP2_CATS_SELECT","Select categorie");
+	define("_MB_XP2_TAGS_SELECT","Tags Select(Comma separated list of tags)");
 	
 // recent posts list	
-	define("_MB_XPRESS_REDNEW_DAYS","Passed days displayed by marking red 'New'");
-	define("_MB_XPRESS_GREENNEW_DAYS","Passed days displayed by marking green 'New'");	
+	define("_MB_XP2_REDNEW_DAYS","Passed days displayed by marking red 'New'");
+	define("_MB_XP2_GREENNEW_DAYS","Passed days displayed by marking green 'New'");	
 
 // calender		
-	define("_MB_XPRESS_SUN_COLOR","Color on Sunday");
-	define("_MB_XPRESS_SAT_COLOR","Color on Saturday");
+	define("_MB_XP2_SUN_COLOR","Color on Sunday");
+	define("_MB_XP2_SAT_COLOR","Color on Saturday");
 	
 // popular		
-	define("_MB_MONTH_RANGE","The one in the number a specified month is displayed (0; all).");
+	define("_MB_XP2_MONTH_RANGE","The one in the number a specified month is displayed (0; all).");
 	
 // archives
-	define("_MB_XPRESS_ARC_TYPE","The type of archive");
-	define("_MB_XPRESS_ARC_YEAR","yearly");
-	define("_MB_XPRESS_ARC_MONTH","monthly");
-	define("_MB_XPRESS_ARC_WEEK","weekly");
-	define("_MB_XPRESS_ARC_DAY","daily");
-	define("_MB_XPRESS_ARC_POST","post by post");
+	define("_MB_XP2_ARC_TYPE","The type of archive");
+	define("_MB_XP2_ARC_YEAR","yearly");
+	define("_MB_XP2_ARC_MONTH","monthly");
+	define("_MB_XP2_ARC_WEEK","weekly");
+	define("_MB_XP2_ARC_DAY","daily");
+	define("_MB_XP2_ARC_POST","post by post");
 
 // authors	
-	define("_MB_XPRESS_EXCLUEDEADMIN","The manager is excluded from the list.");
-	define("_MB_XPRESS_SHOW_FULLNAME","The author name is displayed by the full name.");
+	define("_MB_XP2_EXCLUEDEADMIN","The manager is excluded from the list.");
+	define("_MB_XP2_SHOW_FULLNAME","The author name is displayed by the full name.");
 
 // page 	
-	define("_MB_XPRESS_PAGE_ORDERBY","List Pages by Page Order ");
-	define("_MB_XPRESS_PAGE_TITLE","post_title");
-	define("_MB_XPRESS_PAGE_MENU_ORDER","menu_order");
-	define("_MB_XPRESS_PAGE_POST_DATE","post_date");
-	define("_MB_XPRESS_PAGE_POST_MODIFY","post_modified");
-	define("_MB_XPRESS_PAGE_ID","ID");
-	define("_MB_XPRESS_PAGE_AUTHOR","post_author ID");
-	define("_MB_XPRESS_PAGE_SLUG","post_name");
-	define("_MB_XPRESS_PAGE_EXCLUDE","Define a comma-separated list of Page IDs to be excluded from the list ");
-	define("_MB_XPRESS_PAGE_EXCLUDE_TREE","Define a comma-separated list of parent Page IDs to be excluded. Use this parameter to exclude a parent and all of that parent's child Pages.");
-	define("_MB_XPRESS_PAGE_INCLUDE","Only include certain Pages in the list , this parameter takes a comma-separated list of Page IDs. ");
-	define("_MB_XPRESS_PAGE_DEPTH","how many levels in the hierarchy of pages are to be included in the list (0=all Pages and sub-pages displayedj");
-	define("_MB_XPRESS_PAGE_CHILD_OF","Displays the sub-pages of a single Page onlyB(uses the ID for a Page as the valuej");
-	define("_MB_XPRESS_PAGE_HIERARCHICAL","Display sub-Pages in an indented manner below their parent or list the Pages inline.");
-	define("_MB_XPRESS_PAGE_META_KEY","Only include the Pages that have this Custom Field Key (use in conjunction with the meta_value field).");
-	define("_MB_XPRESS_PAGE_META_VALUE","Only include the Pages that have this Custom Field Value (use in conjuntion with the meta_key field).");
+	define("_MB_XP2_PAGE_ORDERBY","List Pages by Page Order ");
+	define("_MB_XP2_PAGE_TITLE","post_title");
+	define("_MB_XP2_PAGE_MENU_ORDER","menu_order");
+	define("_MB_XP2_PAGE_POST_DATE","post_date");
+	define("_MB_XP2_PAGE_POST_MODIFY","post_modified");
+	define("_MB_XP2_PAGE_ID","ID");
+	define("_MB_XP2_PAGE_AUTHOR","post_author ID");
+	define("_MB_XP2_PAGE_SLUG","post_name");
+	define("_MB_XP2_PAGE_EXCLUDE","Define a comma-separated list of Page IDs to be excluded from the list ");
+	define("_MB_XP2_PAGE_EXCLUDE_TREE","Define a comma-separated list of parent Page IDs to be excluded. Use this parameter to exclude a parent and all of that parent's child Pages.");
+	define("_MB_XP2_PAGE_INCLUDE","Only include certain Pages in the list , this parameter takes a comma-separated list of Page IDs. ");
+	define("_MB_XP2_PAGE_DEPTH","how many levels in the hierarchy of pages are to be included in the list (0=all Pages and sub-pages displayedj");
+	define("_MB_XP2_PAGE_CHILD_OF","Displays the sub-pages of a single Page onlyB(uses the ID for a Page as the valuej");
+	define("_MB_XP2_PAGE_HIERARCHICAL","Display sub-Pages in an indented manner below their parent or list the Pages inline.");
+	define("_MB_XP2_PAGE_META_KEY","Only include the Pages that have this Custom Field Key (use in conjunction with the meta_value field).");
+	define("_MB_XP2_PAGE_META_VALUE","Only include the Pages that have this Custom Field Value (use in conjuntion with the meta_key field).");
 	
 // Search
-	define("_MB_XPRESS_SEARCH_LENGTH","Length of search textbox");
+	define("_MB_XP2_SEARCH_LENGTH","Length of search textbox");
 	
 // tag cloud
-	define("_MB_XPRESS_CLOUD_SMALLEST",'The text size of the tag with the smallest count value ');
-	define("_MB_XPRESS_CLOUD_LARGEST",'The text size of the tag with the highest count value');
-	define("_MB_XPRESS_CLOUD_UNIT","Unit of measure as pertains to the smallest and largest values. This can be any CSS length value, e.g. pt, px, em, %;");
-	define("_MB_XPRESS_CLOUD_NUMBER","The number of actual tags to display in the cloud. (Use '0' to display all tags.)");
-	define("_MB_XPRESS_CLOUD_FORMAT","Format of the cloud display");
-	define("_MB_XPRESS_CLOUD_ORDERBY","Order of the tags");
-	define("_MB_XPRESS_CLOUD_ORDER","Sort order. Valid values('RAND' tags are in a random order. Note: this parameter was introduced with Version 2.5.)");
-	define("_MB_XPRESS_CLOUD_EXCLUDE","Comma separated list of tags (term_id) to exclude.");
-	define("_MB_XPRESS_CLOUD_INCLUDE","Comma separated list of tags (term_id) to include.");
-	define("_MB_XPRESS_RAND","RAND");
-	define("_MB_XPRESS_TAG_NAME","tag name");
-	define("_MB_XPRESS_TAG_COUNT","count");
+	define("_MB_XP2_CLOUD_SMALLEST",'The text size of the tag with the smallest count value ');
+	define("_MB_XP2_CLOUD_LARGEST",'The text size of the tag with the highest count value');
+	define("_MB_XP2_CLOUD_UNIT","Unit of measure as pertains to the smallest and largest values. This can be any CSS length value, e.g. pt, px, em, %;");
+	define("_MB_XP2_CLOUD_NUMBER","The number of actual tags to display in the cloud. (Use '0' to display all tags.)");
+	define("_MB_XP2_CLOUD_FORMAT","Format of the cloud display");
+	define("_MB_XP2_CLOUD_ORDERBY","Order of the tags");
+	define("_MB_XP2_CLOUD_ORDER","Sort order. Valid values('RAND' tags are in a random order. Note: this parameter was introduced with Version 2.5.)");
+	define("_MB_XP2_CLOUD_EXCLUDE","Comma separated list of tags (term_id) to exclude.");
+	define("_MB_XP2_CLOUD_INCLUDE","Comma separated list of tags (term_id) to include.");
+	define("_MB_XP2_RAND","RAND");
+	define("_MB_XP2_TAG_NAME","tag name");
+	define("_MB_XP2_TAG_COUNT","count");
 	
 // Categorie
-	define("_MB_XPRESS_CAT_ALL_STR","All categories link Display Title. (blank is not displayj");
-	define("_MB_XPRESS_CAT_ORDERBY","Order of the categories");
-	define("_MB_XPRESS_CAT_NAME","name");
-	define("_MB_XPRESS_CAT_COUNT","count");
-	define("_MB_XPRESS_CAT_ID","ID");
-	define("_MB_XPRESS_SHOW_LAST_UPDATE","Should the last updated timestamp for posts be displayed.");
-	define("_MB_XPRESS_CAT_HIDE_EMPTY","hide display of categories with no posts.");
-	define("_MB_XPRESS_DESC_FOR_TITLE","Sets whether a category's description is inserted into the title attribute of the links created");
-	define("_MB_XPRESS_CAT_EXCLUDE","Exclude one or more categories from the results. This parameter takes a comma-separated list of categories by unique ID");
-	define("_MB_XPRESS_CAT_INCLUDE","Only include the categories detailed in a comma-separated list by unique ID, in ascending order.");
-	define("_MB_XPRESS_CAT_HIERARCHICAL","Display sub-categories as inner list items (below the parent list item) or inline.");
-	define("_MB_XPRESS_CAT_DEPTH","how many levels in the hierarchy of Categories are to be included in the list of Categories.(0=All Categories and child Categories)");
+	define("_MB_XP2_CAT_ALL_STR","All categories link Display Title. (blank is not displayj");
+	define("_MB_XP2_CAT_ORDERBY","Order of the categories");
+	define("_MB_XP2_CAT_NAME","name");
+	define("_MB_XP2_CAT_COUNT","count");
+	define("_MB_XP2_CAT_ID","ID");
+	define("_MB_XP2_SHOW_LAST_UPDATE","Should the last updated timestamp for posts be displayed.");
+	define("_MB_XP2_CAT_HIDE_EMPTY","hide display of categories with no posts.");
+	define("_MB_XP2_DESC_FOR_TITLE","Sets whether a category's description is inserted into the title attribute of the links created");
+	define("_MB_XP2_CAT_EXCLUDE","Exclude one or more categories from the results. This parameter takes a comma-separated list of categories by unique ID");
+	define("_MB_XP2_CAT_INCLUDE","Only include the categories detailed in a comma-separated list by unique ID, in ascending order.");
+	define("_MB_XP2_CAT_HIERARCHICAL","Display sub-categories as inner list items (below the parent list item) or inline.");
+	define("_MB_XP2_CAT_DEPTH","how many levels in the hierarchy of Categories are to be included in the list of Categories.(0=All Categories and child Categories)");
 	
 // meta 
-	define("_MB_XPRESS_META_WP_LINK","The link to the WordPress site is displayed.");
-	define("_MB_XPRESS_META_XOOPS_LINK","The link to the Xoops site is displayed.");
-	define("_MB_XPRESS_META_POST_RSS","RSS of the posts is displayed.");
-	define("_MB_XPRESS_META_COMMENT_RSS","RSS of the comments is displayed.");
-	define("_MB_XPRESS_META_POST_NEW","'new post' is displayed.");
-	define("_MB_XPRESS_META_ADMIN","'admin' is displayed.");
-	define("_MB_XPRESS_META_README","ReadMe is displayed.");
-	define("_MB_XPRESS_META_CH_STYLE","'display mode' is displayed.");
+	define("_MB_XP2_META_WP_LINK","The link to the WordPress site is displayed.");
+	define("_MB_XP2_META_XOOPS_LINK","The link to the Xoops site is displayed.");
+	define("_MB_XP2_META_POST_RSS","RSS of the posts is displayed.");
+	define("_MB_XP2_META_COMMENT_RSS","RSS of the comments is displayed.");
+	define("_MB_XP2_META_POST_NEW","'new post' is displayed.");
+	define("_MB_XP2_META_ADMIN","'admin' is displayed.");
+	define("_MB_XP2_META_README","ReadMe is displayed.");
+	define("_MB_XP2_META_CH_STYLE","'display mode' is displayed.");
 
 // meta 
-	define("_MB_XPRESS_SELECT_WIDGET","Displayed Widget is selected.");
+	define("_MB_XP2_SELECT_WIDGET","Displayed Widget is selected.");
 	
 // custom 
-	define("_MB_XPRESS_ENHACED_FILE","Input the file name used in the custom block.");
-	define("_MB_XPRESS_MAKE_ENHACED_FILE","Please make the file specified here in the block directory of the theme.");
+	define("_MB_XP2_ENHACED_FILE","Input the file name used in the custom block.");
+	define("_MB_XP2_MAKE_ENHACED_FILE","Please make the file specified here in the block directory of the theme.");
 }
 ?>
Index: trunk/language/english/main.php
===================================================================
--- trunk/language/english/main.php	(revision 177)
+++ trunk/language/english/main.php	(revision 183)
@@ -1,5 +1,5 @@
 <?php
-if( ! defined( 'XPRESS_MAIN_LANG_INCLUDED' ) ) {
-	define( 'XPRESS_MAIN_LANG_INCLUDED' , 1 ) ;
+if( ! defined( 'XP2_MAIN_LANG_INCLUDED' ) ) {
+	define( 'XP2_MAIN_LANG_INCLUDED' , 1 ) ;
 	
 }
Index: trunk/language/english/modinfo.php
===================================================================
--- trunk/language/english/modinfo.php	(revision 177)
+++ trunk/language/english/modinfo.php	(revision 183)
@@ -4,83 +4,83 @@
 
 	// The name of this module admin menu
-	define("_MI_MENU_SYS_INFO","System information");
-	define("_MI_MENU_BLOCK_ADMIN","blocks/permissions");
-	define("_MI_MENU_BLOCK_CHECK","blocks check");
+	define("_MI_XP2_MENU_SYS_INFO","System information");
+	define("_MI_XP2_MENU_BLOCK_ADMIN","blocks/permissions");
+	define("_MI_XP2_MENU_BLOCK_CHECK","blocks check");
 	
 	// The name of this module
-	define("_MI_XPRESS_NAME","blog");
+	define("_MI_XP2_NAME","blog");
 
 	// A brief description of this module
-	define("_MI_XPRESS_DESC","WordPress For XOOPS Community");
+	define("_MI_XP2_DESC","WordPress For XOOPS Community");
 
 	// Sub menu titles
-	define("_MI_XPRESS_MENU_POST_NEW","New Post");
-	define("_MI_XPRESS_MENU_EDIT","Edit Post");
-	define("_MI_XPRESS_MENU_ADMIN","WordPress Admin");
-	define("_MI_XPRESS_MENU_XPRESS","XPressME Setting");
+	define("_MI_XP2_MENU_POST_NEW","New Post");
+	define("_MI_XP2_MENU_EDIT","Edit Post");
+	define("_MI_XP2_MENU_ADMIN","WordPress Admin");
+	define("_MI_XP2_MENU_XPRESS","XPressME Setting");
 
 	// Block Name
-	define("_MI_XPRESS_BLOCK_COMMENTS","Recent Comments");
-	define("_MI_XPRESS_BLOCK_CONTENT","Recent Posts with content");
-	define("_MI_XPRESS_BLOCK_POSTS","Recent Post Title");
-	define("_MI_XPRESS_BLOCK_CALENDER","Calendar");
-	define("_MI_XPRESS_BLOCK_POPULAR","Popular post list");
-	define("_MI_XPRESS_BLOCK_ARCHIVE","Archive");
-	define("_MI_XPRESS_BLOCK_AUTHORS","Author List");
-	define("_MI_XPRESS_BLOCK_PAGE","Page");
-	define("_MI_XPRESS_BLOCK_SEARCH","Search");
-	define("_MI_XPRESS_BLOCK_TAG","Tag Cloud");
-	define("_MI_XPRESS_BLOCK_CATEGORY","Category");
-	define("_MI_XPRESS_BLOCK_META","Meta");
-	define("_MI_XPRESS_BLOCK_SIDEBAR","Sidebar Navigation");
-	define("_MI_XPRESS_BLOCK_WIDGET","Widget");
-	define("_MI_XPRESS_BLOCK_ENHANCED","Enhanced");
+	define("_MI_XP2_BLOCK_COMMENTS","Recent Comments");
+	define("_MI_XP2_BLOCK_CONTENT","Recent Posts with content");
+	define("_MI_XP2_BLOCK_POSTS","Recent Post Title");
+	define("_MI_XP2_BLOCK_CALENDER","Calendar");
+	define("_MI_XP2_BLOCK_POPULAR","Popular post list");
+	define("_MI_XP2_BLOCK_ARCHIVE","Archive");
+	define("_MI_XP2_BLOCK_AUTHORS","Author List");
+	define("_MI_XP2_BLOCK_PAGE","Page");
+	define("_MI_XP2_BLOCK_SEARCH","Search");
+	define("_MI_XP2_BLOCK_TAG","Tag Cloud");
+	define("_MI_XP2_BLOCK_CATEGORY","Category");
+	define("_MI_XP2_BLOCK_META","Meta");
+	define("_MI_XP2_BLOCK_SIDEBAR","Sidebar Navigation");
+	define("_MI_XP2_BLOCK_WIDGET","Widget");
+	define("_MI_XP2_BLOCK_ENHANCED","Enhanced");
 
 	// Notify Categories
-	define('_MI_XPRESS_NOTCAT_GLOBAL', 'ALL');
-	define('_MI_XPRESS_NOTCAT_GLOBALDSC', 'Notification option in the entire blog');
-	define('_MI_XPRESS_NOTCAT_CAT', 'Category under selection');
-	define('_MI_XPRESS_NOTCAT_CATDSC', 'Notification option to category under selection');
-	define('_MI_XPRESS_NOTCAT_AUTHOR', 'Author who is selecting it'); 
-	define('_MI_XPRESS_NOTCAT_AUTHORDSC', 'Notification option to author who is selecting it');
-	define('_MI_XPRESS_NOTCAT_POST', 'Article on display'); 
-	define('_MI_XPRESS_NOTCAT_POSTDSC', 'Notification option to article on display');
+	define('_MI_XP2_NOTCAT_GLOBAL', 'ALL');
+	define('_MI_XP2_NOTCAT_GLOBALDSC', 'Notification option in the entire blog');
+	define('_MI_XP2_NOTCAT_CAT', 'Category under selection');
+	define('_MI_XP2_NOTCAT_CATDSC', 'Notification option to category under selection');
+	define('_MI_XP2_NOTCAT_AUTHOR', 'Author who is selecting it'); 
+	define('_MI_XP2_NOTCAT_AUTHORDSC', 'Notification option to author who is selecting it');
+	define('_MI_XP2_NOTCAT_POST', 'Article on display'); 
+	define('_MI_XP2_NOTCAT_POSTDSC', 'Notification option to article on display');
 
 	// Each Notifications
-	define('_MI_XPRESS_NOTIFY_GLOBAL_WAITING', 'Approval waiting');
-	define('_MI_XPRESS_NOTIFY_GLOBAL_WAITINGCAP', 'It notifies when the contribution and the edit that requires approving are done. Manager exclusive use');
-	define('_MI_XPRESS_NOTIFY_GLOBAL_WAITINGSBJ', '[{X_SITENAME}] {X_MODULE}: Approval waiting');
+	define('_MI_XP2_NOTIFY_GLOBAL_WAITING', 'Approval waiting');
+	define('_MI_XP2_NOTIFY_GLOBAL_WAITINGCAP', 'It notifies when the contribution and the edit that requires approving are done. Manager exclusive use');
+	define('_MI_XP2_NOTIFY_GLOBAL_WAITINGSBJ', '[{X_SITENAME}] {X_MODULE}: Approval waiting');
 
-	define('_MI_XPRESS_NOTIFY_GLOBAL_NEWPOST', 'Contribution of article');
-	define('_MI_XPRESS_NOTIFY_GLOBAL_NEWPOSTCAP', 'It notifies when the article is contributed in either of the entire this blog. ');
-	define('_MI_XPRESS_NOTIFY_GLOBAL_NEWPOSTSBJ', '[{XPRESS_BLOG_NAME}]Article: "{XPRESS_POST_TITLE}"');
+	define('_MI_XP2_NOTIFY_GLOBAL_NEWPOST', 'Contribution of article');
+	define('_MI_XP2_NOTIFY_GLOBAL_NEWPOSTCAP', 'It notifies when the article is contributed in either of the entire this blog. ');
+	define('_MI_XP2_NOTIFY_GLOBAL_NEWPOSTSBJ', '[{XPRESS_BLOG_NAME}]Article: "{XPRESS_POST_TITLE}"');
 
-	define('_MI_XPRESS_NOTIFY_GLOBAL_NEWCOMMENT', 'Comment contribution');
-	define('_MI_XPRESS_NOTIFY_GLOBAL_NEWCOMMENTCAP', 'It notifies when the comment is contributed in either of the entire this blog. ');
-	define('_MI_XPRESS_NOTIFY_GLOBAL_NEWCOMMENTSBJ', '[{XPRESS_BLOG_NAME}]Comment: "{XPRESS_POST_TITLE}"');
+	define('_MI_XP2_NOTIFY_GLOBAL_NEWCOMMENT', 'Comment contribution');
+	define('_MI_XP2_NOTIFY_GLOBAL_NEWCOMMENTCAP', 'It notifies when the comment is contributed in either of the entire this blog. ');
+	define('_MI_XP2_NOTIFY_GLOBAL_NEWCOMMENTSBJ', '[{XPRESS_BLOG_NAME}]Comment: "{XPRESS_POST_TITLE}"');
 
-	define('_MI_XPRESS_NOTIFY_CAT_NEWPOST', 'Article contribution to selection category');
-	define('_MI_XPRESS_NOTIFY_CAT_NEWPOSTCAP', 'It notifies when there is an article contribution in this category.');
-	define('_MI_XPRESS_NOTIFY_CAT_NEWPOSTSBJ', '[{XPRESS_BLOG_NAME}]Article: "{XPRESS_POST_TITLE}" (Condition:Category="{XPRESS_CAT_TITLE}")');
+	define('_MI_XP2_NOTIFY_CAT_NEWPOST', 'Article contribution to selection category');
+	define('_MI_XP2_NOTIFY_CAT_NEWPOSTCAP', 'It notifies when there is an article contribution in this category.');
+	define('_MI_XP2_NOTIFY_CAT_NEWPOSTSBJ', '[{XPRESS_BLOG_NAME}]Article: "{XPRESS_POST_TITLE}" (Condition:Category="{XPRESS_CAT_TITLE}")');
 
-	define('_MI_XPRESS_NOTIFY_CAT_NEWCOMMENT', 'Comment contribution to selection category');
-	define('_MI_XPRESS_NOTIFY_CAT_NEWCOMMENTCAP', 'It notifies when there is a comment contribution in this category. ');
-	define('_MI_XPRESS_NOTIFY_CAT_NEWCOMMENTSBJ', '[{XPRESS_BLOG_NAME}]Comment: (Article"{XPRESS_POST_TITLE}") (Condition:Category="{XPRESS_CAT_TITLE}")');
+	define('_MI_XP2_NOTIFY_CAT_NEWCOMMENT', 'Comment contribution to selection category');
+	define('_MI_XP2_NOTIFY_CAT_NEWCOMMENTCAP', 'It notifies when there is a comment contribution in this category. ');
+	define('_MI_XP2_NOTIFY_CAT_NEWCOMMENTSBJ', '[{XPRESS_BLOG_NAME}]Comment: (Article"{XPRESS_POST_TITLE}") (Condition:Category="{XPRESS_CAT_TITLE}")');
 
-	define('_MI_XPRESS_NOTIFY_AUT_NEWPOST', 'Article contribution by selection contributor');
-	define('_MI_XPRESS_NOTIFY_AUT_NEWPOSTCAP', 'It notifies when there is an article contribution from this contributor. ');
-	define('_MI_XPRESS_NOTIFY_AUT_NEWPOSTSBJ', '[{XPRESS_BLOG_NAME}]Article: "{XPRESS_POST_TITLE}" (Condition:Author="{XPRESS_AUTH_NAME}")');
+	define('_MI_XP2_NOTIFY_AUT_NEWPOST', 'Article contribution by selection contributor');
+	define('_MI_XP2_NOTIFY_AUT_NEWPOSTCAP', 'It notifies when there is an article contribution from this contributor. ');
+	define('_MI_XP2_NOTIFY_AUT_NEWPOSTSBJ', '[{XPRESS_BLOG_NAME}]Article: "{XPRESS_POST_TITLE}" (Condition:Author="{XPRESS_AUTH_NAME}")');
 
-	define('_MI_XPRESS_NOTIFY_AUT_NEWCOMMENT', 'Comment contribution to selection contributor article');
-	define('_MI_XPRESS_NOTIFY_AUT_NEWCOMMENTCAP', 'It notifies when the comment contribution is in the article by this contributor. ');
-	define('_MI_XPRESS_NOTIFY_AUT_NEWCOMMENTSBJ', '[{XPRESS_BLOG_NAME}]Comment: (Article"{XPRESS_POST_TITLE}") (Condition:Author="{XPRESS_AUTH_NAME}")');
+	define('_MI_XP2_NOTIFY_AUT_NEWCOMMENT', 'Comment contribution to selection contributor article');
+	define('_MI_XP2_NOTIFY_AUT_NEWCOMMENTCAP', 'It notifies when the comment contribution is in the article by this contributor. ');
+	define('_MI_XP2_NOTIFY_AUT_NEWCOMMENTSBJ', '[{XPRESS_BLOG_NAME}]Comment: (Article"{XPRESS_POST_TITLE}") (Condition:Author="{XPRESS_AUTH_NAME}")');
 
-	define('_MI_XPRESS_NOTIFY_POST_EDITPOST', 'Article change');
-	define('_MI_XPRESS_NOTIFY_POST_EDITPOSTCAP', 'It notifies when there is a change in the article on the display. ');
-	define('_MI_XPRESS_NOTIFY_POST_EDITPOSTSBJ', '[{XPRESS_BLOG_NAME}]Article: "{XPRESS_POST_TITLE}"Change (Condition:Article specification)');
+	define('_MI_XP2_NOTIFY_POST_EDITPOST', 'Article change');
+	define('_MI_XP2_NOTIFY_POST_EDITPOSTCAP', 'It notifies when there is a change in the article on the display. ');
+	define('_MI_XP2_NOTIFY_POST_EDITPOSTSBJ', '[{XPRESS_BLOG_NAME}]Article: "{XPRESS_POST_TITLE}"Change (Condition:Article specification)');
 
-	define('_MI_XPRESS_NOTIFY_POST_NEWCOMMENT', 'Comment contribution to article');
-	define('_MI_XPRESS_NOTIFY_POST_NEWCOMMENTCAP', 'It notifies when the comment is contributed in the article on the display. ');
-	define('_MI_XPRESS_NOTIFY_POST_NEWCOMMENTSBJ', '[{XPRESS_BLOG_NAME}]Comment: (Article"{XPRESS_POST_TITLE}") (Condition:Article specification)');
+	define('_MI_XP2_NOTIFY_POST_NEWCOMMENT', 'Comment contribution to article');
+	define('_MI_XP2_NOTIFY_POST_NEWCOMMENTCAP', 'It notifies when the comment is contributed in the article on the display. ');
+	define('_MI_XP2_NOTIFY_POST_NEWCOMMENTSBJ', '[{XPRESS_BLOG_NAME}]Comment: (Article"{XPRESS_POST_TITLE}") (Condition:Article specification)');
 
 }