fix default rename confilct
add classpath change..
Merge remote-tracking branch 'origin/master'