shell: More compact layout for the services

Fixes #730
Reviewed-by: Stef Walter <stefw@redhat.com>
shell: Remove service from the name

This affects sockets, timers etc too

Closes #733
Reviewed-by: Stef Walter <stefw@redhat.com>