More renaming towards PEP 8 standards.