Still more refactoring to remove strings duplication for services' names