Change method naming convention to match pep8