Fixed up package names to remove warning and non standardness of the setup.py