OGDCH-157: Only generate new package name if needed
OGDCH-157: Do not use _gen_new_name to munge