Renamed horribly named class.