Renamed readers service
Renamed classes and specs