WIP: move branch pair gen to abdt_naming