Remote administration adapted to new service name

- including little refactoring to increase readability and to allow easier changes in the future (not 100% done)
- bnc#878910