Rename some things in line with PEP 8