Use correct java naming conventions