Branch name fixes.
Fix file name creation.
Don't export "branch" vocab.
Merge 1.x