Rename once again

Python 2 imports stink