Renamed to proper java class names