Bug 1096470: use short service names; r=markco