fix name errors
more name errors
Merge pull request #197 from rmcgibbo/typo-bugfix

fix name errors