More renaming from JavaClass to ClassFile, and converting from string to ClassReference.