Implemented service aliases, hopefully retaining backwards compatibility.