Minor renamings: Setup.py updated with correcpond renamings from main module