Index: src/sas/perspectives/fitting/basepage.py
===================================================================
--- src/sas/perspectives/fitting/basepage.py	(revision 794922220f2fb3b23dd08c648aabf87b4850596c)
+++ src/sas/perspectives/fitting/basepage.py	(revision b9a5f0eb8e8cbff8f8d934bbfa4ea18168141e13)
@@ -2015,5 +2015,5 @@
                     temp_smear = self.current_smearer
             # compute weight for the current data
-            from sas import get_weight
+            from sas.perspectives.fitting.utils import get_weight
             flag = self.get_weight_flag()
             weight = get_weight(data=self.data, is2d=self._is_2D(), flag=flag)
@@ -3136,5 +3136,5 @@
         """
         from help_panel import  HelpWindow
-import sas.models as models
+        import sas.models as models
         
         # Get models help model_function path
@@ -3173,5 +3173,5 @@
         Get the string copies of the param names and values in the tap
         """
-        content = 'sansview_parameter_values:'
+        content = 'sasview_parameter_values:'
         # Do it if params exist
         if  self.parameters != []:
@@ -3402,5 +3402,5 @@
         # put the text into dictionary
         lines = text.split(':')
-        if lines[0] != 'sansview_parameter_values':
+        if lines[0] != 'sasview_parameter_values':
             self._copy_info(False)
             return False
Index: src/sas/perspectives/fitting/console.py
===================================================================
--- src/sas/perspectives/fitting/console.py	(revision 794922220f2fb3b23dd08c648aabf87b4850596c)
+++ src/sas/perspectives/fitting/console.py	(revision b9a5f0eb8e8cbff8f8d934bbfa4ea18168141e13)
@@ -147,10 +147,10 @@
                 d_flag = (hasattr(self.result, "data") and \
                     self.result.data is not None and \
-                    hasattr(self.result.data, "sans_data") and 
-                    self.result.data.sans_data is not None)
+                    hasattr(self.result.data, "sas_data") and 
+                    self.result.data.sas_data is not None)
                 m_flag = (hasattr(self.result, "model") and \
                           self.result.model is not None)
                 if d_flag:
-                    data_name = self.result.data.sans_data.name
+                    data_name = self.result.data.sas_data.name
                 if m_flag:
                     model_name = str(self.result.model.name)
Index: src/sas/perspectives/fitting/fitpage.py
===================================================================
--- src/sas/perspectives/fitting/fitpage.py	(revision 794922220f2fb3b23dd08c648aabf87b4850596c)
+++ src/sas/perspectives/fitting/fitpage.py	(revision b9a5f0eb8e8cbff8f8d934bbfa4ea18168141e13)
@@ -608,5 +608,5 @@
         model_disp = wx.StaticText(self, -1, 'Function')
         CHECK_STATE = self.cb1.GetValue()
-import sas.models.dispersion_models
+        import sas.models.dispersion_models
         self.polydisp = sas.models.dispersion_models.models
 
@@ -2175,5 +2175,5 @@
         """
         # compute weight for the current data
-        from sas import get_weight
+        from sas.perspectives.fitting.utils import get_weight
         flag_weight = self.get_weight_flag()
         if is_2D == None:
Index: src/sas/perspectives/fitting/fitting.py
===================================================================
--- src/sas/perspectives/fitting/fitting.py	(revision 794922220f2fb3b23dd08c648aabf87b4850596c)
+++ src/sas/perspectives/fitting/fitting.py	(revision b9a5f0eb8e8cbff8f8d934bbfa4ea18168141e13)
@@ -33,12 +33,12 @@
 from sas.guiframe.data_processor import BatchCell
 from sas.fit.Fitting import Fit
-from sas import ConsoleUpdate
-from sas import FitProblemDictionary
-from sas import FitPanel
-from sas import ResultPanel, PlotResultEvent
-
-from sas import FitThread
-from sas import Reader
-from sas import Chi2UpdateEvent
+from sas.perspectives.fitting.console import ConsoleUpdate
+from sas.perspectives.fitting.fitproblem import FitProblemDictionary
+from sas.perspectives.fitting.fitpanel import FitPanel
+from sas.perspectives.fitting.resultpanel import ResultPanel, PlotResultEvent
+
+from sas.perspectives.fitting.fit_thread import FitThread
+from sas.perspectives.fitting.pagestate import Reader
+from sas.perspectives.fitting.fitpage import Chi2UpdateEvent
 from sas.perspectives.calculator.model_editor import TextDialog
 from sas.perspectives.calculator.model_editor import EditorWindow
Index: src/sas/perspectives/fitting/ftol_dialog.py
===================================================================
--- src/sas/perspectives/fitting/ftol_dialog.py	(revision 794922220f2fb3b23dd08c648aabf87b4850596c)
+++ src/sas/perspectives/fitting/ftol_dialog.py	(revision b9a5f0eb8e8cbff8f8d934bbfa4ea18168141e13)
@@ -17,5 +17,5 @@
 # default ftol
 F_TOL = 1.49012e-08
-SANS_F_TOL = 5e-05
+SAS_F_TOL = 5e-05
 
 PANEL_WIDTH = 270
@@ -38,5 +38,5 @@
         vbox = wx.BoxSizer(wx.VERTICAL)
         title_text = wx.StaticText(self, id=wx.NewId(), label='FTol selection (Leastsq)')
-        self.default_bt = wx.RadioButton(self, -1, 'SansView Default (5e-05)', (15, 30), style=wx.RB_GROUP)
+        self.default_bt = wx.RadioButton(self, -1, 'SasView Default (5e-05)', (15, 30), style=wx.RB_GROUP)
         self.default_bt.SetValue(True)
         self.default_bt.Bind(wx.EVT_RADIOBUTTON, self.OnFtolSelection)
@@ -88,5 +88,5 @@
         """
         if self.default_bt.GetValue():
-            return SANS_F_TOL
+            return SAS_F_TOL
         elif self.sci_default_bt.GetValue():
             return F_TOL
@@ -102,3 +102,3 @@
             except:
                 return None
-        return SANS_F_TOL
+        return SAS_F_TOL
Index: src/sas/perspectives/fitting/media/category_manager_help.html
===================================================================
--- src/sas/perspectives/fitting/media/category_manager_help.html	(revision 794922220f2fb3b23dd08c648aabf87b4850596c)
+++ src/sas/perspectives/fitting/media/category_manager_help.html	(revision b9a5f0eb8e8cbff8f8d934bbfa4ea18168141e13)
@@ -9,5 +9,5 @@
 <p>
 
-Our SANS models are, by default, classified into 5 categories; shapes, shape-independent, 
+Our SAS models are, by default, classified into 5 categories; shapes, shape-independent, 
 structure factor, and customized models, where these categories (except the customized models) can be reassigned, added, and removed using 'Category Manager'.
 Each models can also be enabled(shown)/disabled(hidden) from the category that they
Index: src/sas/perspectives/fitting/media/model_use_help.html
===================================================================
--- src/sas/perspectives/fitting/media/model_use_help.html	(revision 794922220f2fb3b23dd08c648aabf87b4850596c)
+++ src/sas/perspectives/fitting/media/model_use_help.html	(revision b9a5f0eb8e8cbff8f8d934bbfa4ea18168141e13)
@@ -31,5 +31,5 @@
 	See 'Custom model editor' in the side menu on left.
 	Advanced users can write your own model and save it (in .py format) into <b>plugin_models</b> directory
-	in .sansview of your home directory (eg., username\.sansview>\plugin_models). You plugin
+	in .sasview of your home directory (eg., username\.sasview>\plugin_models). You plugin
 	model will be added into "<>Customized Models</>"  on the next model selection.
 </p>
Index: src/sas/perspectives/fitting/models.py
===================================================================
--- src/sas/perspectives/fitting/models.py	(revision 794922220f2fb3b23dd08c648aabf87b4850596c)
+++ src/sas/perspectives/fitting/models.py	(revision b9a5f0eb8e8cbff8f8d934bbfa4ea18168141e13)
@@ -159,5 +159,5 @@
     dir = find_plugins_dir()
     if not os.path.isdir(dir):
-        msg = "SansView couldn't locate Model plugin folder."
+        msg = "SasView couldn't locate Model plugin folder."
         msg += """ "%s" does not exist""" % dir
         logging.warning(msg)
Index: src/sas/perspectives/fitting/pagestate.py
===================================================================
--- src/sas/perspectives/fitting/pagestate.py	(revision 794922220f2fb3b23dd08c648aabf87b4850596c)
+++ src/sas/perspectives/fitting/pagestate.py	(revision b9a5f0eb8e8cbff8f8d934bbfa4ea18168141e13)
@@ -973,5 +973,5 @@
     ## Wildcards
     type = ["Fitting files (*.fitv)|*.fitv"
-            "SANSView file (*.svs)|*.svs"]
+            "SASView file (*.svs)|*.svs"]
     ## List of allowed extensions
     ext = ['.fitv', '.FITV', '.svs', 'SVS']
Index: src/sas/perspectives/fitting/plugin_models/polynomial5.py
===================================================================
--- src/sas/perspectives/fitting/plugin_models/polynomial5.py	(revision 794922220f2fb3b23dd08c648aabf87b4850596c)
+++ src/sas/perspectives/fitting/plugin_models/polynomial5.py	(revision b9a5f0eb8e8cbff8f8d934bbfa4ea18168141e13)
@@ -11,5 +11,5 @@
 Please select the 'Compile' from the menubar after the modification and saving.
 Note that we recommend to save the file as a different file name.
-Otherwise, it could be removed in the future on re-installation of the SansView.
+Otherwise, it could be removed in the future on re-installation of the SasView.
 ## *****************************************************************************
 """
Index: src/sas/perspectives/fitting/plugin_models/sph_bessel_jn.py
===================================================================
--- src/sas/perspectives/fitting/plugin_models/sph_bessel_jn.py	(revision 794922220f2fb3b23dd08c648aabf87b4850596c)
+++ src/sas/perspectives/fitting/plugin_models/sph_bessel_jn.py	(revision b9a5f0eb8e8cbff8f8d934bbfa4ea18168141e13)
@@ -11,5 +11,5 @@
 Please select the 'Compile' from the menubar after the modification and saving.
 Note that we recommend to save the file as a different file name.
-Otherwise, it could be removed in the future on re-installation of the SansView.
+Otherwise, it could be removed in the future on re-installation of the SasView.
 ## *****************************************************************************
 """
Index: src/sas/perspectives/fitting/plugin_models/sum_Ap1_1_Ap2.py
===================================================================
--- src/sas/perspectives/fitting/plugin_models/sum_Ap1_1_Ap2.py	(revision 794922220f2fb3b23dd08c648aabf87b4850596c)
+++ src/sas/perspectives/fitting/plugin_models/sum_Ap1_1_Ap2.py	(revision b9a5f0eb8e8cbff8f8d934bbfa4ea18168141e13)
@@ -8,5 +8,5 @@
 Please select the 'Compile' from the menubar after the modification and saving.
 Note that we recommend to save the file as a different file name.
-Otherwise, it could be removed in the future on re-installation of the SansView.
+Otherwise, it could be removed in the future on re-installation of the SasView.
 ## *****************************************************************************
 """
Index: src/sas/perspectives/fitting/plugin_models/sum_p1_p2.py
===================================================================
--- src/sas/perspectives/fitting/plugin_models/sum_p1_p2.py	(revision 794922220f2fb3b23dd08c648aabf87b4850596c)
+++ src/sas/perspectives/fitting/plugin_models/sum_p1_p2.py	(revision b9a5f0eb8e8cbff8f8d934bbfa4ea18168141e13)
@@ -8,5 +8,5 @@
 Please select the 'Compile' from the menubar after the modification and saving.
 Note that we recommend to save the file as a different file name.
-Otherwise, it could be removed in the future on re-installation of the SansView.
+Otherwise, it could be removed in the future on re-installation of the SasView.
 ## *****************************************************************************
 """
Index: src/sas/perspectives/fitting/plugin_models/testmodel.py
===================================================================
--- src/sas/perspectives/fitting/plugin_models/testmodel.py	(revision 794922220f2fb3b23dd08c648aabf87b4850596c)
+++ src/sas/perspectives/fitting/plugin_models/testmodel.py	(revision b9a5f0eb8e8cbff8f8d934bbfa4ea18168141e13)
@@ -11,5 +11,5 @@
 Please select the 'Compile' from the menubar after the modification and saving.
 Note that we recommend to save the file as a different file name.
-Otherwise, it could be removed in the future on re-installation of the SansView.
+Otherwise, it could be removed in the future on re-installation of the SasView.
 ## *****************************************************************************
 """
Index: src/sas/perspectives/fitting/plugin_models/testmodel_2.py
===================================================================
--- src/sas/perspectives/fitting/plugin_models/testmodel_2.py	(revision 794922220f2fb3b23dd08c648aabf87b4850596c)
+++ src/sas/perspectives/fitting/plugin_models/testmodel_2.py	(revision b9a5f0eb8e8cbff8f8d934bbfa4ea18168141e13)
@@ -11,5 +11,5 @@
 Please select the 'Compile' from the menubar after the modification and saving.
 Note that we recommend to save the file as a different file name.
-Otherwise, it could be removed in the future on re-installation of the SansView.
+Otherwise, it could be removed in the future on re-installation of the SasView.
 ## *****************************************************************************
 """
