fixed function names for pep8
Merge pull request #32 from Itxaka/6.1

fixed function names for pep8