Renamed classes due to consistency issues