define <java-symbol> for multiple fix, renamed some files