More gentest fixes. Fix up regression in IS_NAME_VALID and renames.