Renamed classes to match updated api