Doc refactor

Minor naming changes as I learn how to gh-pages.