Index: test/sasdataloader/plugins/test_reader.py
===================================================================
--- test/sasdataloader/plugins/test_reader.py	(revision 8c9ffde290eafed946f800881bf4901b48445d4c)
+++ test/sasdataloader/plugins/test_reader.py	(revision 35ec2791ba4240f8154f552ce6ead4e850779a20)
@@ -9,5 +9,5 @@
 """
 import numpy, os
-from sans.dataloader.data_info import Data1D
+from sas.dataloader.data_info import Data1D
 
 
Index: test/sasdataloader/test/error_conditions.py
===================================================================
--- test/sasdataloader/test/error_conditions.py	(revision 8c9ffde290eafed946f800881bf4901b48445d4c)
+++ test/sasdataloader/test/error_conditions.py	(revision 35ec2791ba4240f8154f552ce6ead4e850779a20)
@@ -1,3 +1,3 @@
-from sans.dataloader.loader import Loader
+from sas.dataloader.loader import Loader
 import unittest
 
Index: test/sasdataloader/test/testLoad.py
===================================================================
--- test/sasdataloader/test/testLoad.py	(revision 8c9ffde290eafed946f800881bf4901b48445d4c)
+++ test/sasdataloader/test/testLoad.py	(revision 35ec2791ba4240f8154f552ce6ead4e850779a20)
@@ -14,6 +14,6 @@
 import unittest
 import math
-import sans.dataloader
-from sans.dataloader.loader import  Loader
+import sas.dataloader
+from sas.dataloader.loader import  Loader
 
 # Check whether we should test image loading on this system 
Index: test/sasdataloader/test/testplugings.py
===================================================================
--- test/sasdataloader/test/testplugings.py	(revision 8c9ffde290eafed946f800881bf4901b48445d4c)
+++ test/sasdataloader/test/testplugings.py	(revision 35ec2791ba4240f8154f552ce6ead4e850779a20)
@@ -4,5 +4,5 @@
 
 import unittest
-from sans.dataloader.loader import  Loader, Registry
+from sas.dataloader.loader import  Loader, Registry
 class testLoader(unittest.TestCase):
     
Index: test/sasdataloader/test/utest_abs_reader.py
===================================================================
--- test/sasdataloader/test/utest_abs_reader.py	(revision 8c9ffde290eafed946f800881bf4901b48445d4c)
+++ test/sasdataloader/test/utest_abs_reader.py	(revision 35ec2791ba4240f8154f552ce6ead4e850779a20)
@@ -5,6 +5,6 @@
 import unittest
 import numpy, math
-from sans.dataloader.loader import  Loader
-from sans.dataloader.data_info import Data1D
+from sas.dataloader.loader import  Loader
+from sas.dataloader.data_info import Data1D
  
 import os.path
@@ -13,5 +13,5 @@
     
     def setUp(self):
-        from sans.dataloader.readers.abs_reader import Reader
+        from sas.dataloader.readers.abs_reader import Reader
         self.data = Reader().read("jan08002.ABS")
         
@@ -311,5 +311,5 @@
         
     def test_writer(self):
-        from sans.dataloader.readers.cansas_reader import Reader
+        from sas.dataloader.readers.cansas_reader import Reader
         r = Reader()
         x = numpy.ones(5)
Index: test/sasdataloader/test/utest_ascii.py
===================================================================
--- test/sasdataloader/test/utest_ascii.py	(revision 8c9ffde290eafed946f800881bf4901b48445d4c)
+++ test/sasdataloader/test/utest_ascii.py	(revision 35ec2791ba4240f8154f552ce6ead4e850779a20)
@@ -6,5 +6,5 @@
 
 import unittest
-from sans.dataloader.loader import  Loader
+from sas.dataloader.loader import  Loader
  
 import os.path
Index: test/sasdataloader/test/utest_averaging.py
===================================================================
--- test/sasdataloader/test/utest_averaging.py	(revision 8c9ffde290eafed946f800881bf4901b48445d4c)
+++ test/sasdataloader/test/utest_averaging.py	(revision 35ec2791ba4240f8154f552ce6ead4e850779a20)
@@ -2,10 +2,10 @@
 import unittest
 
-from sans.dataloader.loader import  Loader
-from sans.dataloader.manipulations import Ring, CircularAverage, SectorPhi, get_q,reader2D_converter
+from sas.dataloader.loader import  Loader
+from sas.dataloader.manipulations import Ring, CircularAverage, SectorPhi, get_q,reader2D_converter
  
 import os.path
 import numpy, math
-import sans.dataloader.data_info as data_info
+import sas.dataloader.data_info as data_info
 
 class Averaging(unittest.TestCase):
@@ -137,5 +137,5 @@
             The test data was not generated by IGOR.
         """
-        from sans.dataloader.manipulations import Boxsum, Boxavg
+        from sas.dataloader.manipulations import Boxsum, Boxavg
         
         r = Boxsum(x_min=.01, x_max=.015, y_min=0.01, y_max=0.015)
@@ -155,5 +155,5 @@
             The test data was not generated by IGOR.
         """
-        from sans.dataloader.manipulations import SlabX
+        from sas.dataloader.manipulations import SlabX
         
         r = SlabX(x_min=-.01, x_max=.01, y_min=-0.0002, y_max=0.0002, bin_width=0.0004)
@@ -172,5 +172,5 @@
             The test data was not generated by IGOR.
         """
-        from sans.dataloader.manipulations import SlabY
+        from sas.dataloader.manipulations import SlabY
         
         r = SlabY(x_min=.005, x_max=.01, y_min=-0.01, y_max=0.01, bin_width=0.0004)
@@ -191,5 +191,5 @@
             The test data was not generated by IGOR.
         """
-        from sans.dataloader.manipulations import SectorPhi
+        from sas.dataloader.manipulations import SectorPhi
         import math
         
@@ -209,5 +209,5 @@
             The test data was not generated by IGOR.
         """
-        from sans.dataloader.manipulations import SectorPhi
+        from sas.dataloader.manipulations import SectorPhi
         import math
         
@@ -227,5 +227,5 @@
             The test data was not generated by IGOR.
         """
-        from sans.dataloader.manipulations import SectorQ
+        from sas.dataloader.manipulations import SectorQ
         import math
         
Index: test/sasdataloader/test/utest_cansas.py
===================================================================
--- test/sasdataloader/test/utest_cansas.py	(revision 8c9ffde290eafed946f800881bf4901b48445d4c)
+++ test/sasdataloader/test/utest_cansas.py	(revision 35ec2791ba4240f8154f552ce6ead4e850779a20)
@@ -6,10 +6,10 @@
 warnings.simplefilter("ignore")
 
-import sans.dataloader.readers.cansas_reader as cansas
-from sans.dataloader.loader import Loader
-from sans.dataloader.data_info import Data1D
-from sans.dataloader.readers.xml_reader import XMLreader
-from sans.dataloader.readers.cansas_reader import Reader
-from sans.dataloader.readers.cansas_constants import CansasConstants
+import sas.dataloader.readers.cansas_reader as cansas
+from sas.dataloader.loader import Loader
+from sas.dataloader.data_info import Data1D
+from sas.dataloader.readers.xml_reader import XMLreader
+from sas.dataloader.readers.cansas_reader import Reader
+from sas.dataloader.readers.cansas_constants import CansasConstants
 
 import os
Index: test/sasdataloader/test/utest_red2d_reader.py
===================================================================
--- test/sasdataloader/test/utest_red2d_reader.py	(revision 8c9ffde290eafed946f800881bf4901b48445d4c)
+++ test/sasdataloader/test/utest_red2d_reader.py	(revision 35ec2791ba4240f8154f552ce6ead4e850779a20)
@@ -6,5 +6,5 @@
 
 import unittest
-from sans.dataloader.loader import  Loader
+from sas.dataloader.loader import  Loader
  
 import os.path
