Change method names to follow PEP8