refactoring var names
Merge branch 'feature/java-update'