Restore support for /NAMES