Update java class names

- Use class naming conventions