Name refactor to follow pep8 recommendations