diff --git a/org.eclipse.epf.toolbox/src/org/eclipse/epf/toolbox/utils/CopyPIIFiles.java b/org.eclipse.epf.toolbox/src/org/eclipse/epf/toolbox/utils/CopyPIIFiles.java
index 6925234..bf349ef 100644
--- a/org.eclipse.epf.toolbox/src/org/eclipse/epf/toolbox/utils/CopyPIIFiles.java
+++ b/org.eclipse.epf.toolbox/src/org/eclipse/epf/toolbox/utils/CopyPIIFiles.java
@@ -64,8 +64,11 @@
 	}
 	
 	//Hard coded parameters
-	private String sourceRootFolderStr = "C:\\Documents and Settings\\wlu\\Desktop\\Dev\\aa_devTemp\\Rmc75SnapshortOn_04022009\\Rmc75SnapshortOn_04022009";
-	private String targetRootFolderStr = "C:\\Documents and Settings\\wlu\\Desktop\\Dev\\aa_devTemp\\Rmc75SnapshortOn_04022009\\RmcPIIFiles";	
+//	private String sourceRootFolderStr = "C:\\Documents and Settings\\wlu\\Desktop\\Dev\\aa_devTemp\\Rmc75SnapshortOn_04022009\\Rmc75SnapshortOn_04022009";
+//	private String targetRootFolderStr = "C:\\Documents and Settings\\wlu\\Desktop\\Dev\\aa_devTemp\\Rmc75SnapshortOn_04022009\\RmcPIIFiles";	
+	private String sourceRootFolderStr = "C:\\ec\\rmc75SnapShort";
+	private String targetRootFolderStr = "E:\\Root\\a_Rmc7.5.0.1\\Tvt\\z-PIIFiles\\RMC7.5.0.1-0824-2009\\RmcPIIFiles";	
+
 	
 	private File sourceRootFolder;
 	private File targetRootFolder;
diff --git a/org.eclipse.epf.toolbox/src/org/eclipse/epf/toolbox/utils/RenameFiles.java b/org.eclipse.epf.toolbox/src/org/eclipse/epf/toolbox/utils/RenameFiles.java
index a0a0eaa..49c0756 100644
--- a/org.eclipse.epf.toolbox/src/org/eclipse/epf/toolbox/utils/RenameFiles.java
+++ b/org.eclipse.epf.toolbox/src/org/eclipse/epf/toolbox/utils/RenameFiles.java
@@ -5,10 +5,12 @@
 public class RenameFiles {
 
 	//Given strings
-	private static final String lang = "_ja";
-	private static final String pkg = ".nl1";
-	
-	private static final String rootPath = "C:/a_dev/Tvt/j";
+		
+	private static final String lang = "_ar";
+	private static final String pkg = ".nlBidi";
+	private static final String fpkg = ".nlsBidi";
+	private static final String rootPath = "E:/Root/a_Rmc7.5.0.1/Tvt/Returns/1stReturns/renamed/ARA/RmcTool";
+
 	
 	private static final String[] props = {
 		".properties",
@@ -59,7 +61,11 @@
 		String folderName = folderFile.getName();
 		if ((folderName.startsWith(epf) || folderName.startsWith(rmc))
 				&& !folderName.endsWith(pkg)) {
-			File renamedFile = new File(folderFile.getAbsolutePath() + pkg);
+			boolean isFeature = folderName.endsWith(".feature");
+			String lastStr = isFeature ? fpkg : pkg;
+			
+			File renamedFile = new File(folderFile.getAbsolutePath() + lastStr);
+
 			folderFile.renameTo(renamedFile);
 			System.out.println("LD> renamedFile: " + renamedFile);
 		} else {