Modify to return dict of name:id pairs instead of list.