Fix some lingering name problems
Merge pull request #1 from ethanhinson/master

Fix some lingering name problems