fix multi-prefix and uhnames in NAMES
Merge branch 'master' of github.com:rfw/merc