Add NAMES support and tests