NAMES processing fix