Finish merger of iid2name and cid2name functions to reuse code where possible. Removal of obsolete functions.