More renaming, restore gen_generic_lpu.py.