Updated files to better use Java naming conventions