rhbz#947381 Changes to the service name to make them more descriptive

    Change-Id: I07f264e16da507ebf2658de86e0520e5dcd229cd

Change-Id: I59cf71a80c17374ef01bbbece4fc27853eb2e33f
Signed-off-by: Francesco Vollero <fvollero@redhat.com>