OGDCH-157: Fix misuse of _gen_new_name