Rename make_*() to generate_*()