Use full service's names in user prompts

Fixes bz#896618

Change-Id: I5b453f4d3f54be6066a9837ce3569179fb4613bb