fix #3: Issue3 - Fix legacy names left in the tests
Merge pull request #4 from snowmantw/issue3

fix #3: Issue3 - Fix legacy names left in the tests