Index: sasview/default_categories.json
===================================================================
--- sasview/default_categories.json	(revision db46d13d6ad925ea6da0c9aa178a62e3dc325cdb)
+++ sasview/default_categories.json	(revision bac39885d06de43899f47f5dc2062257802be7cb)
@@ -1,1 +1,1 @@
-{"Shapes": [["BarBellModel", true], ["PearlNecklaceModel", true], ["HollowCylinderModel", true], ["CoreMultiShellModel", true], ["FCCrystalModel", true], ["ParallelepipedModel", true], ["FuzzySphereModel", true], ["CoreShellEllipsoidXTModel", true], ["LamellarPCrystalModel", true], ["BCCrystalModel", true], ["EllipticalCylinderModel", true], ["RectangularHollowPrismInfThinWallsModel", true], ["CSParallelepipedModel", true], ["OnionExpShellModel", true], ["MultiShellModel", true], ["RaspBerryModel", true], ["CoreShellEllipsoidModel", true], ["CappedCylinderModel", true], ["CylinderModel", true], ["SphericalSLDModel", true], ["SCCrystalModel", true], ["StackedDisksModel", true], ["LamellarPSHGModel", true], ["CoreShellBicelleModel", true], ["RectangularHollowPrismModel", true], ["LamellarPSModel", true], ["EllipsoidModel", true], ["SphereModel", true], ["VesicleModel", true], ["TriaxialEllipsoidModel", true], ["LamellarModel", true], ["PringlesModel", true], ["RectangularPrismModel", true], ["CoreShellCylinderModel", true], ["BinaryHSModel", true], ["FlexibleCylinderModel", true], ["LamellarFFHGModel", true], ["FlexCylEllipXModel", true], ["LinearPearlsModel", true], ["CoreShellModel", true]], "Structure Factor": [["SquareWellStructure", true], ["HayterMSAStructure", true], ["HardsphereStructure", true], ["StickyHSStructure", true]], "Shape-Independent": [["TwoPowerLawModel", true], ["GelFitModel", true], ["DABModel", true], ["PowerLawAbsModel", true], ["PorodModel", true], ["GuinierModel", true], ["RPA10Model", true], ["TeubnerStreyModel", true], ["StarPolymer", true], ["UnifiedPowerRgModel", true], ["MassSurfaceFractal", true], ["Core2ndMomentModel", true], ["TwoLorentzianModel", true], ["DebyeModel", true], ["MassFractalModel", true], ["GuinierPorodModel", true], ["CorrLengthModel", true], ["PolymerExclVolume", true], ["FractalModel", true], ["PeakLorentzModel", true], ["BroadPeakModel", true], ["FractalCoreShellModel", true], ["PeakGaussModel", true], ["BEPolyelectrolyte", true], ["Poly_GaussCoil", true], ["SurfaceFractalModel", true], ["GaussLorentzGelModel", true], ["LorentzModel", true]], "Uncategorized": [["ReflectivityModel", true], ["ReflectivityIIModel", true], ["LineModel", true], ["MicelleSphCoreModel", true]]}
+{"Shapes": [["cylinder", true], ["lamellarPC", true], ["core_shell_cylinder", true], ["barbell", true], ["fuzzy_sphere", true], ["sphere", true], ["triaxial_ellipsoid", true], ["rectangular_prism", true], ["core_shell_bicelle", true], ["flexible_cylinder", true], ["hollow_rectangular_prism", true], ["ellipsoid", true], ["flexible_cylinder_ex", true], ["capped_cylinder", true], ["core_shell_ellipsoid", true], ["core_shell_parallelepiped", true], ["core_shell_ellipsoid_xt", true], ["vesicle", true], ["core_shell_sphere", true], ["parallelepiped", true], ["hollow_cylinder", true], ["linear_pearls", true], ["pearl_necklace", true], ["lamellar", true], ["multi_shell", true], ["hollow_rectangular_prism_infinitely_thin_walls", true], ["sc_crystal", true], ["stacked_disks", true]], "Structure Factor": [["stickyhardsphere", true], ["hayter_msa", true], ["squarewell", true], ["hardsphere", true]], "Shape-Independent": [["guinier", true], ["gel_fit", true], ["teubner_strey", true], ["gaussian_peak", true], ["mono_gauss_coil", true], ["mass_surface_fractal", true], ["adsorbed_layer", true], ["two_lorentzian", true], ["correlation_length", true], ["dab", true], ["poly_gauss_coil", true], ["guinier_porod", true], ["star_polymer", true], ["two_power_law", true], ["power_law", true], ["peak_lorentz", true], ["rpa", true], ["broad_peak", true], ["surface_fractal", true], ["be_polyelectrolyte", true], ["mass_fractal", true], ["polymer_excl_volume", true], ["porod", true], ["gauss_lorentz_gel", true], ["lorentz", true], ["fractal_core_shell", true]], "Uncategorized": [["line", true], ["fcc_paracrystal", true], ["elliptical_cylinder", true], ["lamellarPS", true], ["micelle_spherical_core", true], ["lamellar_FFHG", true], ["bcc_paracrystal", true], ["sphere (python)", true], ["lamellarCailleHG", true]]}
Index: sview/default_categories.p
===================================================================
--- sasview/default_categories.p	(revision 794922220f2fb3b23dd08c648aabf87b4850596c)
+++ 	(revision )
@@ -1,304 +1,0 @@
-ccollections
-defaultdict
-p1
-(c__builtin__
-list
-p2
-tRp3
-S'Shapes'
-p4
-(lp5
-(S'PearlNecklaceModel'
-p6
-I01
-tp7
-a(S'HollowCylinderModel'
-p8
-I01
-tp9
-a(S'CoreMultiShellModel'
-p10
-I01
-tp11
-a(S'FCCrystalModel'
-p12
-I01
-tp13
-a(S'FuzzySphereModel'
-p14
-I01
-tp15
-a(S'CSParallelepipedModel'
-p16
-I01
-tp17
-a(S'EllipticalCylinderModel'
-p18
-I01
-tp19
-a(S'BCCrystalModel'
-p20
-I01
-tp21
-a(S'LamellarFFHGModel'
-p22
-I01
-tp23
-a(S'LamellarPCrystalModel'
-p24
-I01
-tp25
-a(S'OnionExpShellModel'
-p26
-I01
-tp27
-a(S'VesicleModel'
-p28
-I01
-tp29
-a(S'MultiShellModel'
-p30
-I01
-tp31
-a(S'RaspBerryModel'
-p32
-I01
-tp33
-a(S'CoreShellEllipsoidModel'
-p34
-I01
-tp35
-a(S'CappedCylinderModel'
-p36
-I01
-tp37
-a(S'CylinderModel'
-p38
-I01
-tp39
-a(S'SphericalSLDModel'
-p40
-I01
-tp41
-a(S'StackedDisksModel'
-p42
-I01
-tp43
-a(S'LamellarPSHGModel'
-p44
-I01
-tp45
-a(S'CoreShellBicelleModel'
-p46
-I01
-tp47
-a(S'LamellarPSModel'
-p48
-I01
-tp49
-a(S'EllipsoidModel'
-p50
-I01
-tp51
-a(S'SphereModel'
-p52
-I01
-tp53
-a(S'ParallelepipedModel'
-p54
-I01
-tp55
-a(S'TriaxialEllipsoidModel'
-p56
-I01
-tp57
-a(S'LamellarModel'
-p58
-I01
-tp59
-a(S'BarBellModel'
-p60
-I01
-tp61
-a(S'CoreShellCylinderModel'
-p62
-I01
-tp63
-a(S'BinaryHSModel'
-p64
-I01
-tp65
-a(S'FlexibleCylinderModel'
-p66
-I01
-tp67
-a(S'SCCrystalModel'
-p68
-I01
-tp69
-a(S'FlexCylEllipXModel'
-p70
-I01
-tp71
-a(S'LinearPearlsModel'
-p72
-I01
-tp73
-a(S'CoreShellModel'
-p74
-I01
-tp75
-asS'Structure Factor'
-p76
-(lp77
-(S'SquareWellStructure'
-p78
-I01
-tp79
-a(S'HayterMSAStructure'
-p80
-I01
-tp81
-a(S'HardsphereStructure'
-p82
-I01
-tp83
-a(S'StickyHSStructure'
-p84
-I01
-tp85
-asS'Shape-Independent'
-p86
-(lp87
-(S'TwoPowerLawModel'
-p88
-I01
-tp89
-a(S'GelFitModel'
-p90
-I01
-tp91
-a(S'DABModel'
-p92
-I01
-tp93
-a(S'PowerLawAbsModel'
-p94
-I01
-tp95
-a(S'PorodModel'
-p96
-I01
-tp97
-a(S'MassFractalModel'
-p98
-I01
-tp99
-a(S'TeubnerStreyModel'
-p100
-I01
-tp101
-a(S'BEPolyelectrolyte'
-p102
-I01
-tp103
-a(S'DebyeModel'
-p104
-I01
-tp105
-a(S'MassSurfaceFractal'
-p106
-I01
-tp107
-a(S'Core2ndMomentModel'
-p108
-I01
-tp109
-a(S'RPA10Model'
-p110
-I01
-tp111
-a(S'TwoLorentzianModel'
-p112
-I01
-tp113
-a(S'UnifiedPowerRgModel'
-p114
-I01
-tp115
-a(S'PolymerExclVolume'
-p116
-I01
-tp117
-a(S'GuinierModel'
-p118
-I01
-tp119
-a(S'GuinierPorodModel'
-p120
-I01
-tp121
-a(S'CorrLengthModel'
-p122
-I01
-tp123
-a(S'StarPolymer'
-p124
-I01
-tp125
-a(S'FractalModel'
-p126
-I01
-tp127
-a(S'ReflectivityModel'
-p128
-I01
-tp129
-a(S'PeakLorentzModel'
-p130
-I01
-tp131
-a(S'BroadPeakModel'
-p132
-I01
-tp133
-a(S'ReflectivityIIModel'
-p134
-I01
-tp135
-a(S'PeakGaussModel'
-p136
-I01
-tp137
-a(S'FractalCoreShellModel'
-p138
-I01
-tp139
-a(S'Poly_GaussCoil'
-p140
-I01
-tp141
-a(S'SurfaceFractalModel'
-p142
-I01
-tp143
-a(S'GaussLorentzGelModel'
-p144
-I01
-tp145
-a(S'LorentzModel'
-p146
-I01
-tp147
-asS'Uncategorized'
-p148
-(lp149
-(S'PringlesModel'
-p150
-I01
-tp151
-a(S'LineModel'
-p152
-I01
-tp153
-as.
Index: c/sas/sasgui/guiframe/default_categories.p
===================================================================
--- src/sas/sasgui/guiframe/default_categories.p	(revision d85c194ea2f78cb2b9b3de9c969e1b8ebea6b6d2)
+++ 	(revision )
@@ -1,300 +1,0 @@
-ccollections
-defaultdict
-p1
-(c__builtin__
-list
-p2
-tRp3
-S'Shapes'
-p4
-(lp5
-(S'PearlNecklaceModel'
-p6
-I01
-tp7
-a(S'CoreShellCylinderModel'
-p8
-I01
-tp9
-a(S'CoreMultiShellModel'
-p10
-I01
-tp11
-a(S'LamellarFFHGModel'
-p12
-I01
-tp13
-a(S'FCCrystalModel'
-p14
-I01
-tp15
-a(S'FuzzySphereModel'
-p16
-I01
-tp17
-a(S'FlexCylEllipXModel'
-p18
-I01
-tp19
-a(S'BCCrystalModel'
-p20
-I01
-tp21
-a(S'EllipticalCylinderModel'
-p22
-I01
-tp23
-a(S'CSParallelepipedModel'
-p24
-I01
-tp25
-a(S'OnionExpShellModel'
-p26
-I01
-tp27
-a(S'VesicleModel'
-p28
-I01
-tp29
-a(S'MultiShellModel'
-p30
-I01
-tp31
-a(S'LamellarPCrystalModel'
-p32
-I01
-tp33
-a(S'RaspBerryModel'
-p34
-I01
-tp35
-a(S'CoreShellEllipsoidModel'
-p36
-I01
-tp37
-a(S'CappedCylinderModel'
-p38
-I01
-tp39
-a(S'SphericalSLDModel'
-p40
-I01
-tp41
-a(S'StackedDisksModel'
-p42
-I01
-tp43
-a(S'LamellarPSHGModel'
-p44
-I01
-tp45
-a(S'CoreShellBicelleModel'
-p46
-I01
-tp47
-a(S'LamellarPSModel'
-p48
-I01
-tp49
-a(S'EllipsoidModel'
-p50
-I01
-tp51
-a(S'SphereModel'
-p52
-I01
-tp53
-a(S'ParallelepipedModel'
-p54
-I01
-tp55
-a(S'TriaxialEllipsoidModel'
-p56
-I01
-tp57
-a(S'LamellarModel'
-p58
-I01
-tp59
-a(S'CylinderModel'
-p60
-I01
-tp61
-a(S'BarBellModel'
-p62
-I01
-tp63
-a(S'BinaryHSModel'
-p64
-I01
-tp65
-a(S'FlexibleCylinderModel'
-p66
-I01
-tp67
-a(S'HollowCylinderModel'
-p68
-I01
-tp69
-a(S'SCCrystalModel'
-p70
-I01
-tp71
-a(S'LinearPearlsModel'
-p72
-I01
-tp73
-a(S'CoreShellModel'
-p74
-I01
-tp75
-asS'Structure Factor'
-p76
-(lp77
-(S'SquareWellStructure'
-p78
-I01
-tp79
-a(S'HayterMSAStructure'
-p80
-I01
-tp81
-a(S'HardsphereStructure'
-p82
-I01
-tp83
-a(S'StickyHSStructure'
-p84
-I01
-tp85
-asS'Shape-Independent'
-p86
-(lp87
-(S'TwoPowerLawModel'
-p88
-I01
-tp89
-a(S'GelFitModel'
-p90
-I01
-tp91
-a(S'PowerLawAbsModel'
-p92
-I01
-tp93
-a(S'PorodModel'
-p94
-I01
-tp95
-a(S'MassFractalModel'
-p96
-I01
-tp97
-a(S'TeubnerStreyModel'
-p98
-I01
-tp99
-a(S'BEPolyelectrolyte'
-p100
-I01
-tp101
-a(S'DebyeModel'
-p102
-I01
-tp103
-a(S'MassSurfaceFractal'
-p104
-I01
-tp105
-a(S'Poly_GaussCoil'
-p106
-I01
-tp107
-a(S'Core2ndMomentModel'
-p108
-I01
-tp109
-a(S'RPA10Model'
-p110
-I01
-tp111
-a(S'TwoLorentzianModel'
-p112
-I01
-tp113
-a(S'UnifiedPowerRgModel'
-p114
-I01
-tp115
-a(S'PolymerExclVolume'
-p116
-I01
-tp117
-a(S'GuinierModel'
-p118
-I01
-tp119
-a(S'GuinierPorodModel'
-p120
-I01
-tp121
-a(S'CorrLengthModel'
-p122
-I01
-tp123
-a(S'StarPolymer'
-p124
-I01
-tp125
-a(S'FractalModel'
-p126
-I01
-tp127
-a(S'PeakLorentzModel'
-p128
-I01
-tp129
-a(S'BroadPeakModel'
-p130
-I01
-tp131
-a(S'PeakGaussModel'
-p132
-I01
-tp133
-a(S'FractalCoreShellModel'
-p134
-I01
-tp135
-a(S'DABModel'
-p136
-I01
-tp137
-a(S'SurfaceFractalModel'
-p138
-I01
-tp139
-a(S'GaussLorentzGelModel'
-p140
-I01
-tp141
-a(S'LorentzModel'
-p142
-I01
-tp143
-asS'Uncategorized'
-p144
-(lp145
-(S'LineModel'
-p146
-I01
-tp147
-a(S'ReflectivityModel'
-p148
-I01
-tp149
-a(S'ReflectivityIIModel'
-p150
-I01
-tp151
-as.
Index: src/sas/sasgui/perspectives/calculator/model_editor.py
===================================================================
--- src/sas/sasgui/perspectives/calculator/model_editor.py	(revision d85c194ea2f78cb2b9b3de9c969e1b8ebea6b6d2)
+++ src/sas/sasgui/perspectives/calculator/model_editor.py	(revision bac39885d06de43899f47f5dc2062257802be7cb)
@@ -574,5 +574,5 @@
                     if not self.is_p1_custom:
                         line = line.replace('#', '')
-                        out_f.write(line % (name1, name1) + "\n")
+                        out_f.write(line % (name1) + "\n")
                     else:
                         out_f.write(line + "\n")
@@ -586,5 +586,5 @@
                     if not self.is_p2_custom:
                         line = line.replace('#', '')
-                        out_f.write(line % (name2, name2) + "\n")
+                        out_f.write(line % (name2) + "\n")
                     else:
                         out_f.write(line + "\n")
@@ -1265,9 +1265,9 @@
 # User can change the name of the model (only with single functional model)
 #P1_model:
-#from sas.models.%s import %s as P1
+#from sasmodels.models import %s as P1
 #from %s import Model as P1
 
 #P2_model:
-#from sas.models.%s import %s as P2
+#from sasmodels.models import %s as P2
 #from %s import Model as P2
 import os
Index: src/sas/sasgui/perspectives/fitting/basepage.py
===================================================================
--- src/sas/sasgui/perspectives/fitting/basepage.py	(revision d85c194ea2f78cb2b9b3de9c969e1b8ebea6b6d2)
+++ src/sas/sasgui/perspectives/fitting/basepage.py	(revision bac39885d06de43899f47f5dc2062257802be7cb)
@@ -1282,5 +1282,5 @@
             else:
                 self.model_view.SetLabel("1D Mode")
-        
+
         ## set the select all check box to the a given state
         self.cb1.SetValue(state.cb1)
@@ -1904,5 +1904,5 @@
                         m_list.append(self.model_dict[model])
                     #else:
-                    #    msg = "This model is disabled by Category Manager." 
+                    #    msg = "This model is disabled by Category Manager."
                     #    wx.PostEvent(self.parent.parent,
                     #                 StatusEvent(status=msg, info="error"))
@@ -1945,8 +1945,5 @@
             name = model.__class__.__name__
             if models.__name__ != "NoStructure":
-                if hasattr(model, "oldname"):
-                    name = model.oldname
-                elif hasattr(model, "name"):
-                    name = model.name
+                name = model.name
                 mlist.append((name, models))
 
@@ -2417,5 +2414,5 @@
         self._draw_model()
         ## Need to use FitInside again here to replace the next four lines.
-        ## Otherwised polydispersity off does not resize the scrollwindow. 
+        ## Otherwised polydispersity off does not resize the scrollwindow.
         ## PDB Nov 28, 2015
         self.FitInside()
@@ -2461,5 +2458,5 @@
         self.values = {}
         self.weights = {}
-      
+
         #from sas.models.dispersion_models import GaussianDispersion
         from sasmodels.weights import GaussianDispersion
@@ -2970,5 +2967,5 @@
         self.Show(False)
         self.set_model_param_sizer(self.model)
-        #self._set_sizer_dispersion() 
+        #self._set_sizer_dispersion()
         self.state.magnetic_on = self.magnetic_on
         self.SetupScrolling()
@@ -3597,5 +3594,5 @@
         sizer_cat_box.Add(show_cat_button)
         #self.shape_rbutton.SetValue(True)
-      
+
         sizer_radiobutton = wx.GridSizer(2, 2, 5, 5)
         #sizer_radiobutton.Add(self.shape_rbutton)
@@ -3817,3 +3814,2 @@
         event.Skip()
         #pass
-
Index: src/sas/sasgui/perspectives/fitting/models.py
===================================================================
--- src/sas/sasgui/perspectives/fitting/models.py	(revision f66d9d1c06b3c852f3ef292fb2f9c03064a22b55)
+++ src/sas/sasgui/perspectives/fitting/models.py	(revision bac39885d06de43899f47f5dc2062257802be7cb)
@@ -303,12 +303,13 @@
         for mod_name in sasmodels.core.list_models():
             mod_def = sasmodels.core.load_model_info(mod_name)
-            self.model_dictionary[mod_def['oldname']] = make_class(mod_def,dtype=None,namestyle='oldname')
-            self.model_name_list.append(mod_def['oldname'])
+            self.model_dictionary[mod_def['name']] = make_class(mod_def,dtype=None,namestyle='name')
             if mod_def['structure_factor'] == True:
-                self.struct_list.append(self.model_dictionary[mod_def['oldname']])
+                self.struct_list.append(self.model_dictionary[mod_def['name']])
             if mod_def['variant_info'] is not None:
-                self.multi_func_list.append(self.model_dictionary[mod_def['oldname']])
+                self.multi_func_list.append(self.model_dictionary[mod_def['name']])
+            else:
+                self.model_name_list.append(mod_def['name'])
             if mod_def['ER'] is not None:
-                self.multiplication_factor.append(self.model_dictionary[mod_def['oldname']])
+                self.multiplication_factor.append(self.model_dictionary[mod_def['name']])
 
         #Looking for plugins
