Add Name and NameMap.  Replaces ServiceFactory.