Making names consistent and removing the PyCXX stuff I had added.