change variable names for upcoming fixes

Need to fix Java version for Java 6 and the new variable names make a
bit more sense anyway as they point to a file and not a path.