Renamed some items to match java conventions.