Renamed classes to fit syntax