Renamed classes to avoid confusion