Updated files to adhere to Java naming conventions