REP-77 - Validate service name in service list

This feels like the wrong place to do this. It should happen in the `validServiceNames` method.