WIP: Add support for local vs remote branch naming