more naming changes
Merge branch 'master' of https://github.com/jgammel/firstbootstrap

name changes and such