Fixes to NAMES command handling.