even more NAMES support