Changed class name to match with standard java naming convention