Updated files to adhere to Java naming conventions
Fixed an upcoming merge conflict
Fixed a variable rename I missed during the last refactoring
Merge pull request #6 from justjanne/pr/java-naming-conventions

Updated files to adhere to Java naming conventions