fixup! WIP: move branch pair gen to abdt_naming
fixup! fixup! WIP: move branch pair gen to abdt_naming