Renamed service and config class