Receiver and Service class name changes accordingly