Fix some syntax/naming issues.
Merge branch 'gh-pages-fix-branchname' into gh-pages