changes names and fixes setup.py