refactor names to follow PEP 8.   fixes #18