Properly conform to java naming conventions