Rename, Working on Java Portion