Revert "use internal variable names that more clearly indicate the data"

This reverts commit 62a5b95c6b8f212d01190da738e76ba13dd9edb8.
fix java... something went wrong with var renaming