/NAMES handling enhancement (merge of e2df834, resolves #7).