diff --git a/setup.py b/setup.py
index 11d0bb2..0488c3c 100644
--- a/setup.py
+++ b/setup.py
@@ -3,15 +3,6 @@
 from sys import platform
 from distutils.core import setup, Extension
 
-setup(name='PYSCSI',
-      version='1.0',
-      license='LGPLv2.1',
-      author='Ronnie Sahlberg',
-      author_email='ronniesahlberg@gmail.com',
-      description='Module for calling SCSI devices from Python',
-      packages=['pyscsi', 'pyscsi.pyscsi', 'pyscsi.utils'])
-
-
 #
 # SGIO is linux specific
 #
@@ -19,11 +10,20 @@
     linux_sgio_module = Extension('linux_sgio.linux_sgio',
                                   sources=['linux_sgio/sgiomodule.c'])
 
-    setup(name='LINUX_SGIO',
+    setup(name='pyscsi-linux',
           version='1.0',
           license='LGPLv2.1',
           author='Ronnie Sahlberg',
           author_email='ronniesahlberg@gmail.com',
-          description='Module for calling Linux SG_IO devices',
-          packages=['linux_sgio'],
+          description='Module for calling SCSI devices from Python, Python binding for Linux SCSI Generic (sg) Driver',
+          packages=['pyscsi', 'pyscsi.pyscsi', 'pyscsi.utils', 'linux_sgio'],
           ext_modules=[linux_sgio_module])
+
+else:
+    setup(name='pyscsi',
+          version='1.0',
+          license='LGPLv2.1',
+          author='Ronnie Sahlberg',
+          author_email='ronniesahlberg@gmail.com',
+          description='Module for calling SCSI devices from Python',
+          packages=['pyscsi', 'pyscsi.pyscsi', 'pyscsi.utils'])