UHM-937 Update messages to reference service type