Simplify handling of 'friendly' service names.
Simplify handling of 'friendly' service names.

For consistency with textbook/flash_services@47ff647ddc305db6f181eadfa342b80ae964efc9

textbook/flash,textbook/flash,textbook/flash