3 files changed, 24 insertions, 24 deletions
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
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 @@ import MacOS
 
 _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 @@ class _Prop_system_wide_UI_element(aetools.NProperty):
 
 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._privpropdict = {
 }
 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 @@ import aetools
 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 @@ import Hidden_Suite
 _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_module = {
 _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 @@ _code_to_fullname = {
 
 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 @@ import StdSuites
 #
 # 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(color_well)
 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 @@ _classdeclarations = {
     '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,