Changing names according http://www.python.org/dev/peps/pep-0008