Renamed classes to be more specific