Rename func names to be consistent with gen_*()