Prepare for multiple oauth channels

Maybe revert this name change, it's not adding much clarity.