I'd rather rename the class names better than the service name...