renaming for Java; WIP