Refactor to allow combined name mappings, expecting only 1 to be valid