Remove hardcoded service ID/move to config YAML; make names more consistent