Replace service IDs with class names where possible

[szymach]

Current services IDs should be recreated as aliases for new ones, with class names as IDs.