oldmap: get rid of legacy _ref suffixes