Rename some stuff for Python3 compatibility