Refacoted some function names to follow PEP convetions.