Add support for naming services