move service name arguments into options