diff --git a/Lib/plat-mac/lib-scriptpackages/CodeWarrior/__init__.py b/Lib/plat-mac/lib-scriptpackages/CodeWarrior/__init__.py
index 84c817d..c67e92f 100644
--- a/Lib/plat-mac/lib-scriptpackages/CodeWarrior/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/CodeWarrior/__init__.py
@@ -47,6 +47,15 @@
 #
 # Set property and element dictionaries now that all classes have been defined
 #
+getbaseclasses(character)
+getbaseclasses(text)
+getbaseclasses(window)
+getbaseclasses(file)
+getbaseclasses(line)
+getbaseclasses(selection_2d_object)
+getbaseclasses(application)
+getbaseclasses(insertion_point)
+getbaseclasses(document)
 getbaseclasses(single_class_browser)
 getbaseclasses(project_document)
 getbaseclasses(symbol_browser)
@@ -100,20 +109,20 @@
 getbaseclasses(Target_Source_Trees)
 getbaseclasses(Debugger_Display)
 getbaseclasses(class_)
-getbaseclasses(character)
-getbaseclasses(text)
-getbaseclasses(window)
-getbaseclasses(file)
-getbaseclasses(line)
-getbaseclasses(selection_2d_object)
-getbaseclasses(application)
-getbaseclasses(insertion_point)
-getbaseclasses(document)
 
 #
 # Indices of types declared in this module
 #
 _classdeclarations = {
+    'cha ' : character,
+    'ctxt' : text,
+    'cwin' : window,
+    'file' : file,
+    'clin' : line,
+    'csel' : selection_2d_object,
+    'capp' : application,
+    'cins' : insertion_point,
+    'docu' : document,
     '1BRW' : single_class_browser,
     'PRJD' : project_document,
     'SYMB' : symbol_browser,
@@ -167,15 +176,6 @@
     'TSTs' : Target_Source_Trees,
     'DbDS' : Debugger_Display,
     'Clas' : class_,
-    'cha ' : character,
-    'ctxt' : text,
-    'cwin' : window,
-    'file' : file,
-    'clin' : line,
-    'csel' : selection_2d_object,
-    'capp' : application,
-    'cins' : insertion_point,
-    'docu' : document,
 }
 
 
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/__init__.py b/Lib/plat-mac/lib-scriptpackages/Finder/__init__.py
index 30cf57a..1be70ba 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/__init__.py
@@ -67,17 +67,6 @@
 #
 # Set property and element dictionaries now that all classes have been defined
 #
-getbaseclasses(process)
-getbaseclasses(application_process)
-getbaseclasses(desk_accessory_process)
-getbaseclasses(application)
-getbaseclasses(package)
-getbaseclasses(file)
-getbaseclasses(application_file)
-getbaseclasses(alias_file)
-getbaseclasses(internet_location_file)
-getbaseclasses(document_file)
-getbaseclasses(clipping)
 getbaseclasses(icon_view_options)
 getbaseclasses(label)
 getbaseclasses(column)
@@ -85,18 +74,29 @@
 getbaseclasses(alias_list)
 getbaseclasses(icon_family)
 getbaseclasses(list_view_options)
-getbaseclasses(application)
 getbaseclasses(item)
-getbaseclasses(trash_2d_object)
-getbaseclasses(desktop_2d_object)
-getbaseclasses(container)
-getbaseclasses(folder)
-getbaseclasses(disk)
+getbaseclasses(package)
+getbaseclasses(file)
+getbaseclasses(application_file)
+getbaseclasses(alias_file)
+getbaseclasses(internet_location_file)
+getbaseclasses(document_file)
+getbaseclasses(clipping)
 getbaseclasses(preferences_window)
 getbaseclasses(Finder_window)
 getbaseclasses(window)
 getbaseclasses(clipping_window)
 getbaseclasses(information_window)
+getbaseclasses(application)
+getbaseclasses(process)
+getbaseclasses(application_process)
+getbaseclasses(desk_accessory_process)
+getbaseclasses(application)
+getbaseclasses(trash_2d_object)
+getbaseclasses(desktop_2d_object)
+getbaseclasses(container)
+getbaseclasses(folder)
+getbaseclasses(disk)
 getbaseclasses(StdSuites.Type_Names_Suite.double_integer)
 getbaseclasses(StdSuites.Type_Names_Suite.version)
 getbaseclasses(StdSuites.Type_Names_Suite.RGB16_color)
@@ -142,17 +142,6 @@
 # Indices of types declared in this module
 #
 _classdeclarations = {
-    'prcs' : process,
-    'pcap' : application_process,
-    'pcda' : desk_accessory_process,
-    'capp' : application,
-    'pack' : package,
-    'file' : file,
-    'appf' : application_file,
-    'alia' : alias_file,
-    'inlf' : internet_location_file,
-    'docf' : document_file,
-    'clpf' : clipping,
     'icop' : icon_view_options,
     'clbl' : label,
     'lvcl' : column,
@@ -160,18 +149,29 @@
     'alst' : alias_list,
     'ifam' : icon_family,
     'lvop' : list_view_options,
-    'capp' : application,
     'cobj' : item,
-    'ctrs' : trash_2d_object,
-    'cdsk' : desktop_2d_object,
-    'ctnr' : container,
-    'cfol' : folder,
-    'cdis' : disk,
+    'pack' : package,
+    'file' : file,
+    'appf' : application_file,
+    'alia' : alias_file,
+    'inlf' : internet_location_file,
+    'docf' : document_file,
+    'clpf' : clipping,
     'pwnd' : preferences_window,
     'brow' : Finder_window,
     'cwin' : window,
     'lwnd' : clipping_window,
     'iwnd' : information_window,
+    'capp' : application,
+    'prcs' : process,
+    'pcap' : application_process,
+    'pcda' : desk_accessory_process,
+    'capp' : application,
+    'ctrs' : trash_2d_object,
+    'cdsk' : desktop_2d_object,
+    'ctnr' : container,
+    'cfol' : folder,
+    'cdis' : disk,
     'comp' : StdSuites.Type_Names_Suite.double_integer,
     'vers' : StdSuites.Type_Names_Suite.version,
     'tr16' : StdSuites.Type_Names_Suite.RGB16_color,
diff --git a/Lib/plat-mac/lib-scriptpackages/Netscape/__init__.py b/Lib/plat-mac/lib-scriptpackages/Netscape/__init__.py
index 4ab5de6..937c79f 100644
--- a/Lib/plat-mac/lib-scriptpackages/Netscape/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/Netscape/__init__.py
@@ -61,8 +61,6 @@
 #
 getbaseclasses(window)
 getbaseclasses(application)
-getbaseclasses(text)
-getbaseclasses(styleset)
 getbaseclasses(StdSuites.Text_Suite.text_flow)
 getbaseclasses(StdSuites.Text_Suite.character)
 getbaseclasses(StdSuites.Text_Suite.text_style_info)
@@ -70,6 +68,8 @@
 getbaseclasses(StdSuites.Text_Suite.word)
 getbaseclasses(StdSuites.Text_Suite.paragraph)
 getbaseclasses(StdSuites.Text_Suite.text)
+getbaseclasses(text)
+getbaseclasses(styleset)
 
 #
 # Indices of types declared in this module
@@ -77,8 +77,6 @@
 _classdeclarations = {
     'cwin' : window,
     'capp' : application,
-    'ctxt' : text,
-    'stys' : styleset,
     'cflo' : StdSuites.Text_Suite.text_flow,
     'cha ' : StdSuites.Text_Suite.character,
     'tsty' : StdSuites.Text_Suite.text_style_info,
@@ -86,6 +84,8 @@
     'cwor' : StdSuites.Text_Suite.word,
     'cpar' : StdSuites.Text_Suite.paragraph,
     'ctxt' : StdSuites.Text_Suite.text,
+    'ctxt' : text,
+    'stys' : styleset,
 }
 
 
diff --git a/Lib/plat-mac/lib-scriptpackages/StdSuites/__init__.py b/Lib/plat-mac/lib-scriptpackages/StdSuites/__init__.py
index 21a289a..1ab2994 100644
--- a/Lib/plat-mac/lib-scriptpackages/StdSuites/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/StdSuites/__init__.py
@@ -220,13 +220,6 @@
 getbaseclasses(long_fixed)
 getbaseclasses(null)
 getbaseclasses(target_id)
-getbaseclasses(paragraph)
-getbaseclasses(character)
-getbaseclasses(text_flow)
-getbaseclasses(text_style_info)
-getbaseclasses(line)
-getbaseclasses(word)
-getbaseclasses(text)
 getbaseclasses(graphic_group)
 getbaseclasses(oval)
 getbaseclasses(graphic_text)
@@ -240,8 +233,19 @@
 getbaseclasses(arc)
 getbaseclasses(pixel_map)
 getbaseclasses(rectangle)
+getbaseclasses(paragraph)
+getbaseclasses(character)
+getbaseclasses(text_flow)
+getbaseclasses(text_style_info)
+getbaseclasses(line)
+getbaseclasses(word)
+getbaseclasses(text)
 getbaseclasses(graphic_group)
 getbaseclasses(drawing_area)
+getbaseclasses(cell)
+getbaseclasses(column)
+getbaseclasses(table)
+getbaseclasses(row)
 getbaseclasses(AppleTalk_address)
 getbaseclasses(address_specification)
 getbaseclasses(Token_Ring_address)
@@ -254,10 +258,6 @@
 getbaseclasses(LocalTalk_address)
 getbaseclasses(IP_address)
 getbaseclasses(Ethernet_address)
-getbaseclasses(cell)
-getbaseclasses(column)
-getbaseclasses(table)
-getbaseclasses(row)
 
 #
 # Indices of types declared in this module
@@ -415,13 +415,6 @@
     'lfxd' : long_fixed,
     'null' : null,
     'targ' : target_id,
-    'cpar' : paragraph,
-    'cha ' : character,
-    'cflo' : text_flow,
-    'tsty' : text_style_info,
-    'clin' : line,
-    'cwor' : word,
-    'ctxt' : text,
     'cpic' : graphic_group,
     'covl' : oval,
     'cgtx' : graphic_text,
@@ -435,8 +428,19 @@
     'carc' : arc,
     'cpix' : pixel_map,
     'crec' : rectangle,
+    'cpar' : paragraph,
+    'cha ' : character,
+    'cflo' : text_flow,
+    'tsty' : text_style_info,
+    'clin' : line,
+    'cwor' : word,
+    'ctxt' : text,
     'cpic' : graphic_group,
     'cdrw' : drawing_area,
+    'ccel' : cell,
+    'ccol' : column,
+    'ctbl' : table,
+    'crow' : row,
     'cat ' : AppleTalk_address,
     'cadr' : address_specification,
     'ctok' : Token_Ring_address,
@@ -449,10 +453,6 @@
     'clt ' : LocalTalk_address,
     'cip ' : IP_address,
     'cen ' : Ethernet_address,
-    'ccel' : cell,
-    'ccol' : column,
-    'ctbl' : table,
-    'crow' : row,
 }
 
 
diff --git a/Lib/plat-mac/lib-scriptpackages/SystemEvents/Disk_2d_Folder_2d_File_Suite.py b/Lib/plat-mac/lib-scriptpackages/SystemEvents/Disk_Folder_File_Suite.py
similarity index 99%
rename from Lib/plat-mac/lib-scriptpackages/SystemEvents/Disk_2d_Folder_2d_File_Suite.py
rename to Lib/plat-mac/lib-scriptpackages/SystemEvents/Disk_Folder_File_Suite.py
index b3e1757..4b9e49f 100644
--- a/Lib/plat-mac/lib-scriptpackages/SystemEvents/Disk_2d_Folder_2d_File_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/SystemEvents/Disk_Folder_File_Suite.py
@@ -10,7 +10,7 @@
 
 _code = 'cdis'
 
-class Disk_2d_Folder_2d_File_Suite_Events:
+class Disk_Folder_File_Suite_Events:
 
     _argmap_move = {
         'to' : 'insh',
diff --git a/Lib/plat-mac/lib-scriptpackages/SystemEvents/System_Events_Suite.py b/Lib/plat-mac/lib-scriptpackages/SystemEvents/System_Events_Suite.py
index 5c245da..3fa5893 100644
--- a/Lib/plat-mac/lib-scriptpackages/SystemEvents/System_Events_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/SystemEvents/System_Events_Suite.py
@@ -50,7 +50,7 @@
 
 applications = application
 application._superclassnames = []
-import Disk_2d_Folder_2d_File_Suite
+import Disk_Folder_File_Suite
 import Standard_Suite
 import Folder_Actions_Suite
 import Login_Items_Suite
@@ -63,15 +63,15 @@
 }
 application._privelemdict = {
     'UI_element' : Processes_Suite.UI_element,
-    'alias' : Disk_2d_Folder_2d_File_Suite.alias,
+    'alias' : Disk_Folder_File_Suite.alias,
     'application_process' : Processes_Suite.application_process,
     'desk_accessory_process' : Processes_Suite.desk_accessory_process,
-    'disk' : Disk_2d_Folder_2d_File_Suite.disk,
+    'disk' : Disk_Folder_File_Suite.disk,
     'document' : Standard_Suite.document,
-    'file' : Disk_2d_Folder_2d_File_Suite.file,
-    'folder' : Disk_2d_Folder_2d_File_Suite.folder,
+    'file' : Disk_Folder_File_Suite.file,
+    'folder' : Disk_Folder_File_Suite.folder,
     'folder_action' : Folder_Actions_Suite.folder_action,
-    'item' : Disk_2d_Folder_2d_File_Suite.item,
+    'item' : Disk_Folder_File_Suite.item,
     'login_item' : Login_Items_Suite.login_item,
     'process' : Processes_Suite.process,
     'window' : Standard_Suite.window,
diff --git a/Lib/plat-mac/lib-scriptpackages/SystemEvents/__init__.py b/Lib/plat-mac/lib-scriptpackages/SystemEvents/__init__.py
index a7330c2..8115e08 100644
--- a/Lib/plat-mac/lib-scriptpackages/SystemEvents/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/SystemEvents/__init__.py
@@ -5,7 +5,7 @@
 Error = aetools.Error
 import Standard_Suite
 import Text_Suite
-import Disk_2d_Folder_2d_File_Suite
+import Disk_Folder_File_Suite
 import Folder_Actions_Suite
 import Login_Items_Suite
 import Power_Suite
@@ -17,7 +17,7 @@
 _code_to_module = {
     '????' : Standard_Suite,
     '????' : Text_Suite,
-    'cdis' : Disk_2d_Folder_2d_File_Suite,
+    'cdis' : Disk_Folder_File_Suite,
     'faco' : Folder_Actions_Suite,
     'logi' : Login_Items_Suite,
     'powr' : Power_Suite,
@@ -31,7 +31,7 @@
 _code_to_fullname = {
     '????' : ('SystemEvents.Standard_Suite', 'Standard_Suite'),
     '????' : ('SystemEvents.Text_Suite', 'Text_Suite'),
-    'cdis' : ('SystemEvents.Disk_2d_Folder_2d_File_Suite', 'Disk_2d_Folder_2d_File_Suite'),
+    'cdis' : ('SystemEvents.Disk_Folder_File_Suite', 'Disk_Folder_File_Suite'),
     'faco' : ('SystemEvents.Folder_Actions_Suite', 'Folder_Actions_Suite'),
     'logi' : ('SystemEvents.Login_Items_Suite', 'Login_Items_Suite'),
     'powr' : ('SystemEvents.Power_Suite', 'Power_Suite'),
@@ -42,7 +42,7 @@
 
 from Standard_Suite import *
 from Text_Suite import *
-from Disk_2d_Folder_2d_File_Suite import *
+from Disk_Folder_File_Suite import *
 from Folder_Actions_Suite import *
 from Login_Items_Suite import *
 from Power_Suite import *
@@ -67,17 +67,18 @@
 #
 # Set property and element dictionaries now that all classes have been defined
 #
-getbaseclasses(color)
-getbaseclasses(window)
-getbaseclasses(application)
-getbaseclasses(item)
-getbaseclasses(document)
 getbaseclasses(character)
 getbaseclasses(attachment)
 getbaseclasses(paragraph)
 getbaseclasses(word)
 getbaseclasses(attribute_run)
 getbaseclasses(text)
+getbaseclasses(color)
+getbaseclasses(window)
+getbaseclasses(application)
+getbaseclasses(item)
+getbaseclasses(document)
+getbaseclasses(application)
 getbaseclasses(login_item)
 getbaseclasses(file)
 getbaseclasses(alias)
@@ -170,23 +171,23 @@
 getbaseclasses(scroll_bar)
 getbaseclasses(combo_box)
 getbaseclasses(browser)
-getbaseclasses(application)
 
 #
 # Indices of types declared in this module
 #
 _classdeclarations = {
-    'colr' : color,
-    'cwin' : window,
-    'capp' : application,
-    'cobj' : item,
-    'docu' : document,
     'cha ' : character,
     'atts' : attachment,
     'cpar' : paragraph,
     'cwor' : word,
     'catr' : attribute_run,
     'ctxt' : text,
+    'colr' : color,
+    'cwin' : window,
+    'capp' : application,
+    'cobj' : item,
+    'docu' : document,
+    'capp' : application,
     'logi' : login_item,
     'file' : file,
     'alis' : alias,
@@ -279,13 +280,12 @@
     'scrb' : scroll_bar,
     'comB' : combo_box,
     'broW' : browser,
-    'capp' : application,
 }
 
 
 class SystemEvents(Standard_Suite_Events,
         Text_Suite_Events,
-        Disk_2d_Folder_2d_File_Suite_Events,
+        Disk_Folder_File_Suite_Events,
         Folder_Actions_Suite_Events,
         Login_Items_Suite_Events,
         Power_Suite_Events,
diff --git a/Mac/scripts/genallsuites.py b/Mac/scripts/genallsuites.py
index cdd9ee8..884d4a4 100644
--- a/Mac/scripts/genallsuites.py
+++ b/Mac/scripts/genallsuites.py
@@ -28,7 +28,8 @@
 gensuitemodule.processfile(SYSTEMEVENTS,
 	output=os.path.join(DSTDIR, 'SystemEvents'),
 	basepkgname='StdSuites',
-	edit_modnames=[], verbose=verbose)
+	edit_modnames=[('Disk_2d_Folder_2d_File_Suite', 'Disk_Folder_File_Suite')], 
+	verbose=verbose)
 gensuitemodule.processfile(CODEWARRIOR,
 	output=os.path.join(DSTDIR, 'CodeWarrior'),
 	basepkgname='StdSuites',