Fixed java naming inconsistencies