More char map common name tweaks