#9 - fix up naming to pacify pep8-naming