Renamed to more appropriate class name.