Revert "renaming", not sure why breaking setup.py was a good idea

This reverts commit c9c6790f99d7d2f471404ab564671485795f82ef.