Updated setup.py to reflect some file name changes