Fix default-port / service-name mixup