RTGOV-366 Update service type values and support random customer names