Change function names according to PEP8