Regenerated with property names with _Prop_ prepended.

53 files changed, 1697 insertions, 2860 deletions

diff --git a/Lib/plat-mac/lib-scriptpackages/CodeWarrior/CodeWarrior_suite.py b/Lib/plat-mac/lib-scriptpackages/CodeWarrior/CodeWarrior_suite.py
index 1b6f85a..e015c83 100644
--- a/Lib/plat-mac/lib-scriptpackages/CodeWarrior/CodeWarrior_suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/CodeWarrior/CodeWarrior_suite.py
@@ -247,7 +247,7 @@ class CodeWarrior_suite_Events:
 class single_class_browser(aetools.ComponentItem):
 	"""single class browser - a single class browser """
 	want = '1BRW'
-class inherits(aetools.NProperty):
+class _Prop_inherits(aetools.NProperty):
 	"""inherits - all properties and elements of the given class are inherited by this class. """
 	which = 'c@#^'
 	want = 'TXTD'
@@ -311,7 +311,7 @@ build_progress_documents = build_progress_document
 class project_document(aetools.ComponentItem):
 	"""project document - a project document """
 	want = 'PRJD'
-class current_target(aetools.NProperty):
+class _Prop_current_target(aetools.NProperty):
 	"""current target - the current target """
 	which = 'CURT'
 	want = 'TRGT'
@@ -322,11 +322,11 @@ project_documents = project_document
 class subtarget(aetools.ComponentItem):
 	"""subtarget - a target that is prerequisite for another target """
 	want = 'SBTG'
-class link_against_output(aetools.NProperty):
+class _Prop_link_against_output(aetools.NProperty):
 	"""link against output - is the output of this subtarget linked into its dependent target? """
 	which = 'LNKO'
 	want = 'bool'
-class target(aetools.NProperty):
+class _Prop_target(aetools.NProperty):
 	"""target - the target that is dependent on this subtarget """
 	which = 'TrgT'
 	want = 'TRGT'
@@ -336,67 +336,67 @@ subtargets = subtarget
 class target_file(aetools.ComponentItem):
 	"""target file - a source or header file in a target """
 	want = 'SRCF'
-class code_size(aetools.NProperty):
+class _Prop_code_size(aetools.NProperty):
 	"""code size - the size of the code (in bytes) produced by compiling this source file """
 	which = 'CSZE'
 	want = 'long'
-class compiled_date(aetools.NProperty):
+class _Prop_compiled_date(aetools.NProperty):
 	"""compiled date - the date and this source file was last compiled """
 	which = 'CMPD'
 	want = 'ldt '
-class data_size(aetools.NProperty):
+class _Prop_data_size(aetools.NProperty):
 	"""data size - the size of the date (in bytes) produced by compiling this source file """
 	which = 'DSZE'
 	want = 'long'
-class debug(aetools.NProperty):
+class _Prop_debug(aetools.NProperty):
 	"""debug - is debugging information generated for this source file? """
 	which = 'DBUG'
 	want = 'bool'
-class dependents(aetools.NProperty):
+class _Prop_dependents(aetools.NProperty):
 	"""dependents - the source files that need this source file in order to build """
 	which = 'DPND'
 	want = 'list'
-class id(aetools.NProperty):
+class _Prop_id(aetools.NProperty):
 	"""id - the unique ID number of the target file """
 	which = 'ID  '
 	want = 'long'
-class init_before(aetools.NProperty):
+class _Prop_init_before(aetools.NProperty):
 	"""init before - is the \xd4initialize before\xd5 flag set for this shared library? """
 	which = 'INIT'
 	want = 'bool'
-class link_index(aetools.NProperty):
+class _Prop_link_index(aetools.NProperty):
 	"""link index - the index of the source file in its target\xd5s link order (-1 if source file is not in link order) """
 	which = 'LIDX'
 	want = 'long'
-class linked(aetools.NProperty):
+class _Prop_linked(aetools.NProperty):
 	"""linked - is the source file in the link order of its target? """
 	which = 'LINK'
 	want = 'bool'
-class location(aetools.NProperty):
+class _Prop_location(aetools.NProperty):
 	"""location - the location of the target file on disk """
 	which = 'FILE'
 	want = 'fss '
-class merge_output(aetools.NProperty):
+class _Prop_merge_output(aetools.NProperty):
 	"""merge output - is this shared library merged into another code fragment? """
 	which = 'MRGE'
 	want = 'bool'
-class modified_date(aetools.NProperty):
+class _Prop_modified_date(aetools.NProperty):
 	"""modified date - the date and time this source file was last modified """
 	which = 'MODD'
 	want = 'ldt '
-class path(aetools.NProperty):
+class _Prop_path(aetools.NProperty):
 	"""path - the path of the source file on disk """
 	which = 'Path'
 	want = 'itxt'
-class prerequisites(aetools.NProperty):
+class _Prop_prerequisites(aetools.NProperty):
 	"""prerequisites - the source files needed to build this source file """
 	which = 'PRER'
 	want = 'list'
-class type(aetools.NProperty):
+class _Prop_type(aetools.NProperty):
 	"""type - the type of source file """
 	which = 'FTYP'
 	want = 'FTYP'
-class weak_link(aetools.NProperty):
+class _Prop_weak_link(aetools.NProperty):
 	"""weak link - is this shared library linked weakly? """
 	which = 'WEAK'
 	want = 'bool'
@@ -418,11 +418,11 @@ ToolServer_worksheets = ToolServer_worksheet
 class target(aetools.ComponentItem):
 	"""target - a target in a project """
 	want = 'TRGT'
-class name(aetools.NProperty):
+class _Prop_name(aetools.NProperty):
 	"""name -  """
 	which = 'pnam'
 	want = 'itxt'
-class project_document(aetools.NProperty):
+class _Prop_project_document(aetools.NProperty):
 	"""project document - the project document that contains this target """
 	which = 'PrjD'
 	want = 'PRJD'
@@ -434,11 +434,11 @@ targets = target
 class text_document(aetools.ComponentItem):
 	"""text document - a document that contains text """
 	want = 'TXTD'
-class modified(aetools.NProperty):
+class _Prop_modified(aetools.NProperty):
 	"""modified - Has the document been modified since the last save? """
 	which = 'imod'
 	want = 'bool'
-class selection(aetools.NProperty):
+class _Prop_selection(aetools.NProperty):
 	"""selection - the selection visible to the user """
 	which = 'sele'
 	want = 'csel'
@@ -450,118 +450,118 @@ class selection(aetools.NProperty):
 text_documents = text_document
 single_class_browser._superclassnames = ['text_document']
 single_class_browser._privpropdict = {
-	'inherits' : inherits,
+	'inherits' : _Prop_inherits,
 }
 single_class_browser._privelemdict = {
 }
 import Standard_Suite
 single_class_hierarchy._superclassnames = ['document']
 single_class_hierarchy._privpropdict = {
-	'inherits' : inherits,
+	'inherits' : _Prop_inherits,
 }
 single_class_hierarchy._privelemdict = {
 }
 class_browser._superclassnames = ['text_document']
 class_browser._privpropdict = {
-	'inherits' : inherits,
+	'inherits' : _Prop_inherits,
 }
 class_browser._privelemdict = {
 }
 file_compare_document._superclassnames = ['text_document']
 file_compare_document._privpropdict = {
-	'inherits' : inherits,
+	'inherits' : _Prop_inherits,
 }
 file_compare_document._privelemdict = {
 }
 catalog_document._superclassnames = ['text_document']
 catalog_document._privpropdict = {
-	'inherits' : inherits,
+	'inherits' : _Prop_inherits,
 }
 catalog_document._privelemdict = {
 }
 editor_document._superclassnames = ['text_document']
 editor_document._privpropdict = {
-	'inherits' : inherits,
+	'inherits' : _Prop_inherits,
 }
 editor_document._privelemdict = {
 }
 class_hierarchy._superclassnames = ['document']
 class_hierarchy._privpropdict = {
-	'inherits' : inherits,
+	'inherits' : _Prop_inherits,
 }
 class_hierarchy._privelemdict = {
 }
 project_inspector._superclassnames = ['document']
 project_inspector._privpropdict = {
-	'inherits' : inherits,
+	'inherits' : _Prop_inherits,
 }
 project_inspector._privelemdict = {
 }
 message_document._superclassnames = ['text_document']
 message_document._privpropdict = {
-	'inherits' : inherits,
+	'inherits' : _Prop_inherits,
 }
 message_document._privelemdict = {
 }
 build_progress_document._superclassnames = ['document']
 build_progress_document._privpropdict = {
-	'inherits' : inherits,
+	'inherits' : _Prop_inherits,
 }
 build_progress_document._privelemdict = {
 }
 project_document._superclassnames = ['document']
 project_document._privpropdict = {
-	'current_target' : current_target,
-	'inherits' : inherits,
+	'current_target' : _Prop_current_target,
+	'inherits' : _Prop_inherits,
 }
 project_document._privelemdict = {
 	'target' : target,
 }
 subtarget._superclassnames = ['target']
 subtarget._privpropdict = {
-	'inherits' : inherits,
-	'link_against_output' : link_against_output,
-	'target' : target,
+	'inherits' : _Prop_inherits,
+	'link_against_output' : _Prop_link_against_output,
+	'target' : _Prop_target,
 }
 subtarget._privelemdict = {
 }
 target_file._superclassnames = []
 target_file._privpropdict = {
-	'code_size' : code_size,
-	'compiled_date' : compiled_date,
-	'data_size' : data_size,
-	'debug' : debug,
-	'dependents' : dependents,
-	'id' : id,
-	'init_before' : init_before,
-	'link_index' : link_index,
-	'linked' : linked,
-	'location' : location,
-	'merge_output' : merge_output,
-	'modified_date' : modified_date,
-	'path' : path,
-	'prerequisites' : prerequisites,
-	'type' : type,
-	'weak_link' : weak_link,
+	'code_size' : _Prop_code_size,
+	'compiled_date' : _Prop_compiled_date,
+	'data_size' : _Prop_data_size,
+	'debug' : _Prop_debug,
+	'dependents' : _Prop_dependents,
+	'id' : _Prop_id,
+	'init_before' : _Prop_init_before,
+	'link_index' : _Prop_link_index,
+	'linked' : _Prop_linked,
+	'location' : _Prop_location,
+	'merge_output' : _Prop_merge_output,
+	'modified_date' : _Prop_modified_date,
+	'path' : _Prop_path,
+	'prerequisites' : _Prop_prerequisites,
+	'type' : _Prop_type,
+	'weak_link' : _Prop_weak_link,
 }
 target_file._privelemdict = {
 }
 symbol_browser._superclassnames = ['text_document']
 symbol_browser._privpropdict = {
-	'inherits' : inherits,
+	'inherits' : _Prop_inherits,
 }
 symbol_browser._privelemdict = {
 }
 ToolServer_worksheet._superclassnames = ['text_document']
 ToolServer_worksheet._privpropdict = {
-	'inherits' : inherits,
+	'inherits' : _Prop_inherits,
 }
 ToolServer_worksheet._privelemdict = {
 }
 target._superclassnames = []
 target._privpropdict = {
-	'name' : name,
-	'project_document' : project_document,
+	'name' : _Prop_name,
+	'project_document' : _Prop_project_document,
 }
 target._privelemdict = {
 	'subtarget' : subtarget,
@@ -569,9 +569,9 @@ target._privelemdict = {
 }
 text_document._superclassnames = ['document']
 text_document._privpropdict = {
-	'inherits' : inherits,
-	'modified' : modified,
-	'selection' : selection,
+	'inherits' : _Prop_inherits,
+	'modified' : _Prop_modified,
+	'selection' : _Prop_selection,
 }
 text_document._privelemdict = {
 	'character' : Standard_Suite.character,
@@ -643,40 +643,3 @@ _classdeclarations = {
 	'TRGT' : target,
 	'TXTD' : text_document,
 }
-
-_propdeclarations = {
-	'CMPD' : compiled_date,
-	'CSZE' : code_size,
-	'CURT' : current_target,
-	'DBUG' : debug,
-	'DPND' : dependents,
-	'DSZE' : data_size,
-	'FILE' : location,
-	'FTYP' : type,
-	'ID  ' : id,
-	'INIT' : init_before,
-	'LIDX' : link_index,
-	'LINK' : linked,
-	'LNKO' : link_against_output,
-	'MODD' : modified_date,
-	'MRGE' : merge_output,
-	'PRER' : prerequisites,
-	'Path' : path,
-	'PrjD' : project_document,
-	'TrgT' : target,
-	'WEAK' : weak_link,
-	'c@#^' : inherits,
-	'imod' : modified,
-	'pnam' : name,
-	'sele' : selection,
-}
-
-_compdeclarations = {
-}
-
-_enumdeclarations = {
-	'DKND' : _Enum_DKND,
-	'FTYP' : _Enum_FTYP,
-	'Inte' : _Enum_Inte,
-	'PERM' : _Enum_PERM,
-}
diff --git a/Lib/plat-mac/lib-scriptpackages/CodeWarrior/Metrowerks_Shell_Suite.py b/Lib/plat-mac/lib-scriptpackages/CodeWarrior/Metrowerks_Shell_Suite.py
index b6f166c..8584796 100644
--- a/Lib/plat-mac/lib-scriptpackages/CodeWarrior/Metrowerks_Shell_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/CodeWarrior/Metrowerks_Shell_Suite.py
@@ -793,43 +793,43 @@ class Metrowerks_Shell_Suite_Events:
 class Browser_Coloring(aetools.ComponentItem):
 	"""Browser Coloring - Colors for Browser symbols. """
 	want = 'BRKW'
-class Browser_Keywords(aetools.NProperty):
+class _Prop_Browser_Keywords(aetools.NProperty):
 	"""Browser Keywords - Mark Browser symbols with color. """
 	which = 'BW00'
 	want = 'bool'
-class Classes_Color(aetools.NProperty):
+class _Prop_Classes_Color(aetools.NProperty):
 	"""Classes Color - The color for classes. """
 	which = 'BW01'
 	want = 'cRGB'
-class Constants_Color(aetools.NProperty):
+class _Prop_Constants_Color(aetools.NProperty):
 	"""Constants Color - The color for constants. """
 	which = 'BW02'
 	want = 'cRGB'
-class Enums_Color(aetools.NProperty):
+class _Prop_Enums_Color(aetools.NProperty):
 	"""Enums Color - The color for enums. """
 	which = 'BW03'
 	want = 'cRGB'
-class Functions_Color(aetools.NProperty):
+class _Prop_Functions_Color(aetools.NProperty):
 	"""Functions Color - Set color for functions. """
 	which = 'BW04'
 	want = 'cRGB'
-class Globals_Color(aetools.NProperty):
+class _Prop_Globals_Color(aetools.NProperty):
 	"""Globals Color - The color for globals """
 	which = 'BW05'
 	want = 'cRGB'
-class Macros_Color(aetools.NProperty):
+class _Prop_Macros_Color(aetools.NProperty):
 	"""Macros Color - The color for macros. """
 	which = 'BW06'
 	want = 'cRGB'
-class Template_Commands_in_Menu(aetools.NProperty):
+class _Prop_Template_Commands_in_Menu(aetools.NProperty):
 	"""Template Commands in Menu - Include template commands in context menus """
 	which = 'BW10'
 	want = 'bool'
-class Templates_Color(aetools.NProperty):
+class _Prop_Templates_Color(aetools.NProperty):
 	"""Templates Color - Set color for templates. """
 	which = 'BW07'
 	want = 'cRGB'
-class Typedefs_Color(aetools.NProperty):
+class _Prop_Typedefs_Color(aetools.NProperty):
 	"""Typedefs Color - The color for typedefs. """
 	which = 'BW08'
 	want = 'cRGB'
@@ -837,31 +837,31 @@ class Typedefs_Color(aetools.NProperty):
 class Build_Settings(aetools.ComponentItem):
 	"""Build Settings - Build Settings preferences. """
 	want = 'BSTG'
-class Build_Before_Running(aetools.NProperty):
+class _Prop_Build_Before_Running(aetools.NProperty):
 	"""Build Before Running - Build the target before running. """
 	which = 'BX04'
 	want = 'BXbr'
-class Compiler_Thread_Stack_Size(aetools.NProperty):
+class _Prop_Compiler_Thread_Stack_Size(aetools.NProperty):
 	"""Compiler Thread Stack Size - Compiler Thread Stack Size """
 	which = 'BX06'
 	want = 'long'
-class Completion_Sound(aetools.NProperty):
+class _Prop_Completion_Sound(aetools.NProperty):
 	"""Completion Sound - Play a sound when finished a Bring Up To Date or Make command. """
 	which = 'BX01'
 	want = 'bool'
-class Failure_Sound(aetools.NProperty):
+class _Prop_Failure_Sound(aetools.NProperty):
 	"""Failure Sound - The sound CodeWarrior plays when it cannot finish a Bring Up To Date or Make command. """
 	which = 'BX03'
 	want = 'TEXT'
-class Include_Cache_Size(aetools.NProperty):
+class _Prop_Include_Cache_Size(aetools.NProperty):
 	"""Include Cache Size - Include file cache size. """
 	which = 'BX05'
 	want = 'long'
-class Save_Before_Building(aetools.NProperty):
+class _Prop_Save_Before_Building(aetools.NProperty):
 	"""Save Before Building - Save open editor files before build operations """
 	which = 'BX07'
 	want = 'bool'
-class Success_Sound(aetools.NProperty):
+class _Prop_Success_Sound(aetools.NProperty):
 	"""Success Sound - The sound CodeWarrior plays when it successfully finishes a Bring Up To Date or Make command. """
 	which = 'BX02'
 	want = 'TEXT'
@@ -869,15 +869,15 @@ class Success_Sound(aetools.NProperty):
 class base_class(aetools.ComponentItem):
 	"""base class - A base class or super class of a class """
 	want = 'BsCl'
-class access(aetools.NProperty):
+class _Prop_access(aetools.NProperty):
 	"""access -  """
 	which = 'Acce'
 	want = 'Acce'
-class class_(aetools.NProperty):
+class _Prop_class_(aetools.NProperty):
 	"""class - The class object corresponding to this base class """
 	which = 'Clas'
 	want = 'obj '
-class virtual(aetools.NProperty):
+class _Prop_virtual(aetools.NProperty):
 	"""virtual -  """
 	which = 'Virt'
 	want = 'bool'
@@ -887,19 +887,19 @@ base_classes = base_class
 class Custom_Keywords(aetools.ComponentItem):
 	"""Custom Keywords -  """
 	want = 'CUKW'
-class Custom_Color_1(aetools.NProperty):
+class _Prop_Custom_Color_1(aetools.NProperty):
 	"""Custom Color 1 - The color for the first set of custom keywords. """
 	which = 'GH05'
 	want = 'cRGB'
-class Custom_Color_2(aetools.NProperty):
+class _Prop_Custom_Color_2(aetools.NProperty):
 	"""Custom Color 2 - The color for the second set custom keywords. """
 	which = 'GH06'
 	want = 'cRGB'
-class Custom_Color_3(aetools.NProperty):
+class _Prop_Custom_Color_3(aetools.NProperty):
 	"""Custom Color 3 - The color for the third set of custom keywords. """
 	which = 'GH07'
 	want = 'cRGB'
-class Custom_Color_4(aetools.NProperty):
+class _Prop_Custom_Color_4(aetools.NProperty):
 	"""Custom Color 4 - The color for the fourth set of custom keywords. """
 	which = 'GH08'
 	want = 'cRGB'
@@ -912,31 +912,31 @@ class browser_catalog(aetools.ComponentItem):
 class class_(aetools.ComponentItem):
 	"""class - A class, struct, or record type in the current project. """
 	want = 'Clas'
-class all_subclasses(aetools.NProperty):
+class _Prop_all_subclasses(aetools.NProperty):
 	"""all subclasses - the classes directly or indirectly derived from this class """
 	which = 'SubA'
 	want = 'Clas'
-class declaration_end_offset(aetools.NProperty):
+class _Prop_declaration_end_offset(aetools.NProperty):
 	"""declaration end offset - End of class declaration """
 	which = 'DcEn'
 	want = 'long'
-class declaration_file(aetools.NProperty):
+class _Prop_declaration_file(aetools.NProperty):
 	"""declaration file - Source file containing the class declaration """
 	which = 'DcFl'
 	want = 'fss '
-class declaration_start_offset(aetools.NProperty):
+class _Prop_declaration_start_offset(aetools.NProperty):
 	"""declaration start offset - Start of class declaration source code """
 	which = 'DcSt'
 	want = 'long'
-class language(aetools.NProperty):
+class _Prop_language(aetools.NProperty):
 	"""language - Implementation language of this class """
 	which = 'Lang'
 	want = 'Lang'
-class name(aetools.NProperty):
+class _Prop_name(aetools.NProperty):
 	"""name -  """
 	which = 'pnam'
 	want = 'TEXT'
-class subclasses(aetools.NProperty):
+class _Prop_subclasses(aetools.NProperty):
 	"""subclasses - the immediate subclasses of this class """
 	which = 'SubC'
 	want = 'Clas'
@@ -949,43 +949,43 @@ classes = class_
 class Debugger_Display(aetools.ComponentItem):
 	"""Debugger Display - Debugger Display preferences """
 	want = 'DbDS'
-class Default_Array_Size(aetools.NProperty):
+class _Prop_Default_Array_Size(aetools.NProperty):
 	"""Default Array Size - Controls whether CodeWarrior uses its own integrated editor or an external application for editing text files. """
 	which = 'Db08'
 	want = 'shor'
-class Show_As_Decimal(aetools.NProperty):
+class _Prop_Show_As_Decimal(aetools.NProperty):
 	"""Show As Decimal - Show variable values as decimal by default """
 	which = 'Db10'
 	want = 'bool'
-class Show_Locals(aetools.NProperty):
+class _Prop_Show_Locals(aetools.NProperty):
 	"""Show Locals - Show locals by default """
 	which = 'Db09'
 	want = 'bool'
-class Show_Variable_Types(aetools.NProperty):
+class _Prop_Show_Variable_Types(aetools.NProperty):
 	"""Show Variable Types - Show variable types by default. """
 	which = 'Db01'
 	want = 'bool'
-class Sort_By_Method(aetools.NProperty):
+class _Prop_Sort_By_Method(aetools.NProperty):
 	"""Sort By Method - Sort functions by method. """
 	which = 'Db02'
 	want = 'bool'
-class Threads_in_Window(aetools.NProperty):
+class _Prop_Threads_in_Window(aetools.NProperty):
 	"""Threads in Window - Show threads in separate windows. """
 	which = 'Db04'
 	want = 'bool'
-class Use_RTTI(aetools.NProperty):
+class _Prop_Use_RTTI(aetools.NProperty):
 	"""Use RTTI - Enable RunTime Type Information. """
 	which = 'Db03'
 	want = 'bool'
-class Variable_Changed_Hilite(aetools.NProperty):
+class _Prop_Variable_Changed_Hilite(aetools.NProperty):
 	"""Variable Changed Hilite - Variable changed hilite color. """
 	which = 'Db07'
 	want = 'cRGB'
-class Variable_Hints(aetools.NProperty):
+class _Prop_Variable_Hints(aetools.NProperty):
 	"""Variable Hints - Show variable hints. """
 	which = 'Db05'
 	want = 'bool'
-class Watchpoint_Hilite(aetools.NProperty):
+class _Prop_Watchpoint_Hilite(aetools.NProperty):
 	"""Watchpoint Hilite - Watchpoint hilite color. """
 	which = 'Db06'
 	want = 'cRGB'
@@ -993,43 +993,43 @@ class Watchpoint_Hilite(aetools.NProperty):
 class Debugger_Global(aetools.ComponentItem):
 	"""Debugger Global - Debugger Global preferences """
 	want = 'DbGL'
-class Auto_Target_Libraries(aetools.NProperty):
+class _Prop_Auto_Target_Libraries(aetools.NProperty):
 	"""Auto Target Libraries - Automatically target libraries when debugging """
 	which = 'Dg11'
 	want = 'bool'
-class Cache_Edited_Files(aetools.NProperty):
+class _Prop_Cache_Edited_Files(aetools.NProperty):
 	"""Cache Edited Files - Cache edit files between debug sessions """
 	which = 'Dg12'
 	want = 'bool'
-class Confirm_Kill(aetools.NProperty):
+class _Prop_Confirm_Kill(aetools.NProperty):
 	"""Confirm Kill - Confirm the \xd4killing\xd5 of the process. """
 	which = 'Dg04'
 	want = 'bool'
-class Dont_Step_in_Runtime(aetools.NProperty):
+class _Prop_Dont_Step_in_Runtime(aetools.NProperty):
 	"""Dont Step in Runtime - Don\xd5t step into runtime code when debugging. """
 	which = 'Dg07'
 	want = 'bool'
-class File_Cache_Duration(aetools.NProperty):
+class _Prop_File_Cache_Duration(aetools.NProperty):
 	"""File Cache Duration - Duration to keep files in cache (in days) """
 	which = 'Dg13'
 	want = 'shor'
-class Ignore_Mod_Dates(aetools.NProperty):
+class _Prop_Ignore_Mod_Dates(aetools.NProperty):
 	"""Ignore Mod Dates - Ignore modification dates of files. """
 	which = 'Dg01'
 	want = 'bool'
-class Launch_Apps_on_Open(aetools.NProperty):
+class _Prop_Launch_Apps_on_Open(aetools.NProperty):
 	"""Launch Apps on Open - Launch applications on the opening of sym files. """
 	which = 'Dg03'
 	want = 'bool'
-class Open_All_Classes(aetools.NProperty):
+class _Prop_Open_All_Classes(aetools.NProperty):
 	"""Open All Classes - Open all Java class files. """
 	which = 'Dg02'
 	want = 'bool'
-class Select_Stack_Crawl(aetools.NProperty):
+class _Prop_Select_Stack_Crawl(aetools.NProperty):
 	"""Select Stack Crawl - Select the stack crawl. """
 	which = 'Dg06'
 	want = 'bool'
-class Stop_at_Main(aetools.NProperty):
+class _Prop_Stop_at_Main(aetools.NProperty):
 	"""Stop at Main - Stop to debug on the main() function. """
 	which = 'Dg05'
 	want = 'bool'
@@ -1037,35 +1037,35 @@ class Stop_at_Main(aetools.NProperty):
 class Debugger_Target(aetools.ComponentItem):
 	"""Debugger Target - Debugger Target preferences """
 	want = 'DbTG'
-class Cache_symbolics(aetools.NProperty):
+class _Prop_Cache_symbolics(aetools.NProperty):
 	"""Cache symbolics - Cache symbolics between runs when executable doesn\xd5t change, else release symbolics files after killing process. """
 	which = 'Dt15'
 	want = 'bool'
-class Data_Update_Interval(aetools.NProperty):
+class _Prop_Data_Update_Interval(aetools.NProperty):
 	"""Data Update Interval - How often to update the data while running (in seconds) """
 	which = 'Dt09'
 	want = 'long'
-class Log_System_Messages(aetools.NProperty):
+class _Prop_Log_System_Messages(aetools.NProperty):
 	"""Log System Messages - Log all system messages while debugging. """
 	which = 'Dt02'
 	want = 'bool'
-class Relocated_Executable_Path(aetools.NProperty):
+class _Prop_Relocated_Executable_Path(aetools.NProperty):
 	"""Relocated Executable Path - Path to location of relocated libraries, code resources or remote debugging folder """
 	which = 'Dt10'
 	want = 'RlPt'
-class Stop_at_temp_breakpoint(aetools.NProperty):
+class _Prop_Stop_at_temp_breakpoint(aetools.NProperty):
 	"""Stop at temp breakpoint - Stop at a temp breakpoint on program launch. Set breakpoint type in Temp Breakpoint Type AppleEvent. """
 	which = 'Dt13'
 	want = 'bool'
-class Temp_Breakpoint_Type(aetools.NProperty):
+class _Prop_Temp_Breakpoint_Type(aetools.NProperty):
 	"""Temp Breakpoint Type - Type of temp breakpoint to set on program launch. """
 	which = 'Dt16'
 	want = 'TmpB'
-class Temp_breakpoint_names(aetools.NProperty):
+class _Prop_Temp_breakpoint_names(aetools.NProperty):
 	"""Temp breakpoint names - Comma separated list of names to attempt to stop at on program launch. First symbol to resolve in list is the temp BP that will be set. """
 	which = 'Dt14'
 	want = 'ctxt'
-class Update_Data_While_Running(aetools.NProperty):
+class _Prop_Update_Data_While_Running(aetools.NProperty):
 	"""Update Data While Running - Should pause to update data while running """
 	which = 'Dt08'
 	want = 'bool'
@@ -1073,11 +1073,11 @@ class Update_Data_While_Running(aetools.NProperty):
 class Debugger_Windowing(aetools.ComponentItem):
 	"""Debugger Windowing -  """
 	want = 'DbWN'
-class Debugging_Start_Action(aetools.NProperty):
+class _Prop_Debugging_Start_Action(aetools.NProperty):
 	"""Debugging Start Action - What action to take when debug session starts """
 	which = 'Dw01'
 	want = 'DbSA'
-class Do_Nothing_To_Projects(aetools.NProperty):
+class _Prop_Do_Nothing_To_Projects(aetools.NProperty):
 	"""Do Nothing To Projects - Suppress debugging start action for project windows """
 	which = 'Dw02'
 	want = 'bool'
@@ -1085,7 +1085,7 @@ class Do_Nothing_To_Projects(aetools.NProperty):
 class data_member(aetools.ComponentItem):
 	"""data member - A class data member or field """
 	want = 'DtMb'
-class static(aetools.NProperty):
+class _Prop_static(aetools.NProperty):
 	"""static -  """
 	which = 'Stat'
 	want = 'bool'
@@ -1095,63 +1095,63 @@ data_members = data_member
 class Editor(aetools.ComponentItem):
 	"""Editor -  """
 	want = 'EDTR'
-class Background_Color(aetools.NProperty):
+class _Prop_Background_Color(aetools.NProperty):
 	"""Background Color - Color of the background of editor windows. """
 	which = 'ED13'
 	want = 'cRGB'
-class Balance(aetools.NProperty):
+class _Prop_Balance(aetools.NProperty):
 	"""Balance - Flash the matching opening bracket when you type a closing bracket. """
 	which = 'ED03'
 	want = 'bool'
-class Context_Popup_Delay(aetools.NProperty):
+class _Prop_Context_Popup_Delay(aetools.NProperty):
 	"""Context Popup Delay - The amount of time, in sixtieths of a second, before the context popup is displayed if you click and hold on a browser symbol. """
 	which = 'ED14'
 	want = 'long'
-class Default_Text_File_Format(aetools.NProperty):
+class _Prop_Default_Text_File_Format(aetools.NProperty):
 	"""Default Text File Format - Default text file format (i.e. which type of line endings to use) """
 	which = 'ED17'
 	want = 'TxtF'
-class Dynamic_Scroll(aetools.NProperty):
+class _Prop_Dynamic_Scroll(aetools.NProperty):
 	"""Dynamic Scroll - Display a window\xd5s contents as you move the scroll box. """
 	which = 'ED02'
 	want = 'bool'
-class Flash_Delay(aetools.NProperty):
+class _Prop_Flash_Delay(aetools.NProperty):
 	"""Flash Delay - The amount of time, in sixtieths of a second, the editor highlights a matching bracket. """
 	which = 'ED01'
 	want = 'long'
-class Left_Margin_Line_Select(aetools.NProperty):
+class _Prop_Left_Margin_Line_Select(aetools.NProperty):
 	"""Left Margin Line Select - Clicking in the left margin selects lines """
 	which = 'ED16'
 	want = 'bool'
-class Main_Text_Color(aetools.NProperty):
+class _Prop_Main_Text_Color(aetools.NProperty):
 	"""Main Text Color - Main, default, color for text. """
 	which = 'ED12'
 	want = 'cRGB'
-class Relaxed_C_Popup_Parsing(aetools.NProperty):
+class _Prop_Relaxed_C_Popup_Parsing(aetools.NProperty):
 	"""Relaxed C Popup Parsing - Relax the function parser for C source files """
 	which = 'ED15'
 	want = 'bool'
-class Remember_Font(aetools.NProperty):
+class _Prop_Remember_Font(aetools.NProperty):
 	"""Remember Font - Display a source file with its own font settings. """
 	which = 'ED08'
 	want = 'bool'
-class Remember_Selection(aetools.NProperty):
+class _Prop_Remember_Selection(aetools.NProperty):
 	"""Remember Selection - Restore the previous selection in a file when you open it. """
 	which = 'ED09'
 	want = 'bool'
-class Remember_Window(aetools.NProperty):
+class _Prop_Remember_Window(aetools.NProperty):
 	"""Remember Window - Restore the last size and position for a source file window when you open it. """
 	which = 'ED10'
 	want = 'bool'
-class Sort_Function_Popup(aetools.NProperty):
+class _Prop_Sort_Function_Popup(aetools.NProperty):
 	"""Sort Function Popup -  """
 	which = 'ED06'
 	want = 'bool'
-class Use_Drag__26__Drop_Editing(aetools.NProperty):
+class _Prop_Use_Drag__26__Drop_Editing(aetools.NProperty):
 	"""Use Drag & Drop Editing - Use Drag & Drop text editing. """
 	which = 'ED04'
 	want = 'bool'
-class Use_Multiple_Undo(aetools.NProperty):
+class _Prop_Use_Multiple_Undo(aetools.NProperty):
 	"""Use Multiple Undo -  """
 	which = 'ED07'
 	want = 'bool'
@@ -1159,7 +1159,7 @@ class Use_Multiple_Undo(aetools.NProperty):
 class Environment_Variable(aetools.ComponentItem):
 	"""Environment Variable - Environment variable for host OS """
 	want = 'EnvV'
-class value(aetools.NProperty):
+class _Prop_value(aetools.NProperty):
 	"""value - Value of the environment variable """
 	which = 'Valu'
 	want = 'TEXT'
@@ -1167,19 +1167,19 @@ class value(aetools.NProperty):
 class Error_Information(aetools.ComponentItem):
 	"""Error Information - Describes a single error or warning from the compiler or the linker. """
 	want = 'ErrM'
-class disk_file(aetools.NProperty):
+class _Prop_disk_file(aetools.NProperty):
 	"""disk file - The file where the error occurred.  May not be returned for certain kinds of errors (eg, link errors). """
 	which = 'file'
 	want = 'fss '
-class lineNumber(aetools.NProperty):
+class _Prop_lineNumber(aetools.NProperty):
 	"""lineNumber - The line in the file where the error occurred.  May not be returned for certain kinds of errors (eg, link errors). """
 	which = 'ErrL'
 	want = 'long'
-class message(aetools.NProperty):
+class _Prop_message(aetools.NProperty):
 	"""message - The error or warning message. """
 	which = 'ErrS'
 	want = 'TEXT'
-class messageKind(aetools.NProperty):
+class _Prop_messageKind(aetools.NProperty):
 	"""messageKind - The type of error or warning. """
 	which = 'ErrT'
 	want = 'ErrT'
@@ -1191,7 +1191,7 @@ class Function_Information(aetools.ComponentItem):
 class File_Mappings(aetools.ComponentItem):
 	"""File Mappings - Mappings of extensions & file types to compilers """
 	want = 'FLMP'
-class Mappings(aetools.NProperty):
+class _Prop_Mappings(aetools.NProperty):
 	"""Mappings -  """
 	which = 'FMps'
 	want = 'FMap'
@@ -1199,31 +1199,31 @@ class Mappings(aetools.NProperty):
 class File_Mapping(aetools.ComponentItem):
 	"""File Mapping -  """
 	want = 'FMap'
-class Compiler(aetools.NProperty):
+class _Prop_Compiler(aetools.NProperty):
 	"""Compiler -  """
 	which = 'TA07'
 	want = 'TEXT'
-class Extension(aetools.NProperty):
+class _Prop_Extension(aetools.NProperty):
 	"""Extension -  """
 	which = 'TA02'
 	want = 'TEXT'
-class File_Type(aetools.NProperty):
+class _Prop_File_Type(aetools.NProperty):
 	"""File Type -  """
 	which = 'PR04'
 	want = 'TEXT'
-class Ignored_by_Make(aetools.NProperty):
+class _Prop_Ignored_by_Make(aetools.NProperty):
 	"""Ignored by Make -  """
 	which = 'TA06'
 	want = 'bool'
-class Launchable(aetools.NProperty):
+class _Prop_Launchable(aetools.NProperty):
 	"""Launchable -  """
 	which = 'TA05'
 	want = 'bool'
-class Precompiled(aetools.NProperty):
+class _Prop_Precompiled(aetools.NProperty):
 	"""Precompiled -  """
 	which = 'TA03'
 	want = 'bool'
-class Resource_File(aetools.NProperty):
+class _Prop_Resource_File(aetools.NProperty):
 	"""Resource File -  """
 	which = 'TA04'
 	want = 'bool'
@@ -1231,7 +1231,7 @@ class Resource_File(aetools.NProperty):
 class Global_Source_Trees(aetools.ComponentItem):
 	"""Global Source Trees - Globally-defined source tree roots """
 	want = 'GSTs'
-class Source_Trees(aetools.NProperty):
+class _Prop_Source_Trees(aetools.NProperty):
 	"""Source Trees - List of source tree roots """
 	which = 'ST01'
 	want = 'SrcT'
@@ -1239,39 +1239,39 @@ class Source_Trees(aetools.NProperty):
 class Extras(aetools.ComponentItem):
 	"""Extras -  """
 	want = 'GXTR'
-class Automatic_Toolbar_Help(aetools.NProperty):
+class _Prop_Automatic_Toolbar_Help(aetools.NProperty):
 	"""Automatic Toolbar Help - Automatically show balloon help in toolbar after delay """
 	which = 'EX19'
 	want = 'bool'
-class External_Reference(aetools.NProperty):
+class _Prop_External_Reference(aetools.NProperty):
 	"""External Reference - Which on-line function reference to use. """
 	which = 'EX08'
 	want = 'RefP'
-class Full_Screen_Zoom(aetools.NProperty):
+class _Prop_Full_Screen_Zoom(aetools.NProperty):
 	"""Full Screen Zoom - Zoom windows to the full screen width. """
 	which = 'EX07'
 	want = 'bool'
-class Recent_Editor_Count(aetools.NProperty):
+class _Prop_Recent_Editor_Count(aetools.NProperty):
 	"""Recent Editor Count - Maximum number of editor documents to show in the \xd2Open Recent\xd3 menu """
 	which = 'EX16'
 	want = 'shor'
-class Recent_Project_Count(aetools.NProperty):
+class _Prop_Recent_Project_Count(aetools.NProperty):
 	"""Recent Project Count - Maximum number of project documents to show in the \xd2Open Recent\xd3 menu """
 	which = 'EX17'
 	want = 'shor'
-class Use_Editor_Extensions(aetools.NProperty):
+class _Prop_Use_Editor_Extensions(aetools.NProperty):
 	"""Use Editor Extensions - Controls the use of the Editor Extensions menu """
 	which = 'EX10'
 	want = 'bool'
-class Use_External_Editor(aetools.NProperty):
+class _Prop_Use_External_Editor(aetools.NProperty):
 	"""Use External Editor - Controls whether CodeWarrior uses its own integrated editor or an external application for editing text files. """
 	which = 'EX11'
 	want = 'bool'
-class Use_Script_Menu(aetools.NProperty):
+class _Prop_Use_Script_Menu(aetools.NProperty):
 	"""Use Script Menu - Controls the use of the AppleScript menu """
 	which = 'EX12'
 	want = 'bool'
-class Use_ToolServer_Menu(aetools.NProperty):
+class _Prop_Use_ToolServer_Menu(aetools.NProperty):
 	"""Use ToolServer Menu - Controls the use of the ToolServer menu """
 	which = 'EX18'
 	want = 'bool'
@@ -1279,19 +1279,19 @@ class Use_ToolServer_Menu(aetools.NProperty):
 class Build_Extras(aetools.ComponentItem):
 	"""Build Extras -  """
 	want = 'LXTR'
-class Browser_Active(aetools.NProperty):
+class _Prop_Browser_Active(aetools.NProperty):
 	"""Browser Active - Allow the collection of browser information. """
 	which = 'EX09'
 	want = 'bool'
-class Cache_Subproject_Data(aetools.NProperty):
+class _Prop_Cache_Subproject_Data(aetools.NProperty):
 	"""Cache Subproject Data -  """
 	which = 'EX31'
 	want = 'bool'
-class Dump_Browser_Info(aetools.NProperty):
+class _Prop_Dump_Browser_Info(aetools.NProperty):
 	"""Dump Browser Info -  """
 	which = 'EX30'
 	want = 'bool'
-class Modification_Date_Caching(aetools.NProperty):
+class _Prop_Modification_Date_Caching(aetools.NProperty):
 	"""Modification Date Caching -  """
 	which = 'EX04'
 	want = 'bool'
@@ -1299,15 +1299,15 @@ class Modification_Date_Caching(aetools.NProperty):
 class member_function(aetools.ComponentItem):
 	"""member function - A class member function or method. """
 	want = 'MbFn'
-class implementation_end_offset(aetools.NProperty):
+class _Prop_implementation_end_offset(aetools.NProperty):
 	"""implementation end offset - end of member function definition """
 	which = 'DfEn'
 	want = 'long'
-class implementation_file(aetools.NProperty):
+class _Prop_implementation_file(aetools.NProperty):
 	"""implementation file - Source file containing the member function definition """
 	which = 'DfFl'
 	want = 'fss '
-class implementation_start_offset(aetools.NProperty):
+class _Prop_implementation_start_offset(aetools.NProperty):
 	"""implementation start offset - start of member function definition source code """
 	which = 'DfSt'
 	want = 'long'
@@ -1317,23 +1317,23 @@ member_functions = member_function
 class Access_Paths(aetools.ComponentItem):
 	"""Access Paths - Contains the definitions of a project\xd5s access (search) paths. """
 	want = 'PATH'
-class Always_Full_Search(aetools.NProperty):
+class _Prop_Always_Full_Search(aetools.NProperty):
 	"""Always Full Search - To force the compiler to search for system includes like it searches for user includes. """
 	which = 'PA02'
 	want = 'bool'
-class Convert_Paths(aetools.NProperty):
+class _Prop_Convert_Paths(aetools.NProperty):
 	"""Convert Paths - Enables conversion of DOS & Unix-style relative paths when searching for files. """
 	which = 'PA04'
 	want = 'bool'
-class Require_Framework_Includes(aetools.NProperty):
+class _Prop_Require_Framework_Includes(aetools.NProperty):
 	"""Require Framework Includes - Causes the IDE to only look in the framework access paths if a Mac OS X framework style include (i.e. <Carbon/Carbon.h> ) is used. """
 	which = 'PA05'
 	want = 'bool'
-class System_Paths(aetools.NProperty):
+class _Prop_System_Paths(aetools.NProperty):
 	"""System Paths - To add an access path for the include files. (Not supported in Pascal) """
 	which = 'PA03'
 	want = 'PInf'
-class User_Paths(aetools.NProperty):
+class _Prop_User_Paths(aetools.NProperty):
 	"""User Paths - To add an access path for the source files. """
 	which = 'PA01'
 	want = 'PInf'
@@ -1341,27 +1341,27 @@ class User_Paths(aetools.NProperty):
 class Path_Information(aetools.ComponentItem):
 	"""Path Information - Contains all of the parameters that describe an access path. """
 	want = 'PInf'
-class format(aetools.NProperty):
+class _Prop_format(aetools.NProperty):
 	"""format - Format of the a """
 	which = 'Frmt'
 	want = 'PthF'
-class framework(aetools.NProperty):
+class _Prop_framework(aetools.NProperty):
 	"""framework - Is the path a Mac OS X framework style path?  (This flag is readable but not writeable from AppleScript.) """
 	which = 'Frmw'
 	want = 'bool'
-class host_flags(aetools.NProperty):
+class _Prop_host_flags(aetools.NProperty):
 	"""host flags - Bit fields enabling the access path for each host OS (1 = Mac OS, 2 = Windows) """
 	which = 'HstF'
 	want = 'long'
-class origin(aetools.NProperty):
+class _Prop_origin(aetools.NProperty):
 	"""origin -  """
 	which = 'Orig'
 	want = 'PPrm'
-class recursive(aetools.NProperty):
+class _Prop_recursive(aetools.NProperty):
 	"""recursive - Will the path be searched recursively?  (Default is true) """
 	which = 'Recu'
 	want = 'bool'
-class root(aetools.NProperty):
+class _Prop_root(aetools.NProperty):
 	"""root - Name of the root of the relative path. Pre-defined values are \xd2Absolute\xd3, \xd2Project\xd3, \xd2CodeWarrior\xd3, and  \xd2System\xd3. Anything else is a user-defined root. """
 	which = 'Root'
 	want = 'TEXT'
@@ -1369,11 +1369,11 @@ class root(aetools.NProperty):
 class Plugin_Settings(aetools.ComponentItem):
 	"""Plugin Settings - Settings for plugin tools """
 	want = 'PSTG'
-class Disable_Third_Party_COM_Plugins(aetools.NProperty):
+class _Prop_Disable_Third_Party_COM_Plugins(aetools.NProperty):
 	"""Disable Third Party COM Plugins - Disable COM plugins from third parties """
 	which = 'PX02'
 	want = 'bool'
-class Plugin_Diagnostics_Level(aetools.NProperty):
+class _Prop_Plugin_Diagnostics_Level(aetools.NProperty):
 	"""Plugin Diagnostics Level - Plugin Diagnostics Level is for those who are developing plugins for the IDE and need to debug them. """
 	which = 'PX01'
 	want = 'PXdg'
@@ -1381,19 +1381,19 @@ class Plugin_Diagnostics_Level(aetools.NProperty):
 class Runtime_Settings(aetools.ComponentItem):
 	"""Runtime Settings - Runtime settings """
 	want = 'RSTG'
-class Command_Line_Arguments(aetools.NProperty):
+class _Prop_Command_Line_Arguments(aetools.NProperty):
 	"""Command Line Arguments - Extra command line args to pass to executable """
 	which = 'RS02'
 	want = 'TEXT'
-class Environment_Variables(aetools.NProperty):
+class _Prop_Environment_Variables(aetools.NProperty):
 	"""Environment Variables - Environment variables to use when running the executable """
 	which = 'RS04'
 	want = 'EnvV'
-class Host_Application(aetools.NProperty):
+class _Prop_Host_Application(aetools.NProperty):
 	"""Host Application - Host application for running/debugging libraries and code resources """
 	which = 'RS01'
 	want = 'RlPt'
-class Working_Directory(aetools.NProperty):
+class _Prop_Working_Directory(aetools.NProperty):
 	"""Working Directory - Working directory to use when running the executable """
 	which = 'RS03'
 	want = 'TEXT'
@@ -1405,15 +1405,15 @@ class Relative_Path(aetools.ComponentItem):
 class Shielded_Folder(aetools.ComponentItem):
 	"""Shielded Folder -  """
 	want = 'SFit'
-class Expression_To_Match(aetools.NProperty):
+class _Prop_Expression_To_Match(aetools.NProperty):
 	"""Expression To Match - Regular expression which describes folders to skip """
 	which = 'SF01'
 	want = 'TEXT'
-class Skip_Find_And_Compare_Operations(aetools.NProperty):
+class _Prop_Skip_Find_And_Compare_Operations(aetools.NProperty):
 	"""Skip Find And Compare Operations - Matching folders will be skipped during find and compare operations """
 	which = 'SF03'
 	want = 'bool'
-class Skip_Project_Operations(aetools.NProperty):
+class _Prop_Skip_Project_Operations(aetools.NProperty):
 	"""Skip Project Operations - Matching folders will be skipped during project operations """
 	which = 'SF02'
 	want = 'bool'
@@ -1421,7 +1421,7 @@ class Skip_Project_Operations(aetools.NProperty):
 class Shielded_Folders(aetools.ComponentItem):
 	"""Shielded Folders - Folders skipped when performing project and find-and-compare operations """
 	want = 'SHFL'
-class Shielded_Items(aetools.NProperty):
+class _Prop_Shielded_Items(aetools.NProperty):
 	"""Shielded Items -  """
 	which = 'SFis'
 	want = 'SFit'
@@ -1429,19 +1429,19 @@ class Shielded_Items(aetools.NProperty):
 class Syntax_Coloring(aetools.ComponentItem):
 	"""Syntax Coloring -  """
 	want = 'SNTX'
-class Comment_Color(aetools.NProperty):
+class _Prop_Comment_Color(aetools.NProperty):
 	"""Comment Color - The color for comments. """
 	which = 'GH02'
 	want = 'cRGB'
-class Keyword_Color(aetools.NProperty):
+class _Prop_Keyword_Color(aetools.NProperty):
 	"""Keyword Color - The color for language keywords. """
 	which = 'GH03'
 	want = 'cRGB'
-class String_Color(aetools.NProperty):
+class _Prop_String_Color(aetools.NProperty):
 	"""String Color - The color for strings. """
 	which = 'GH04'
 	want = 'cRGB'
-class Syntax_Coloring(aetools.NProperty):
+class _Prop_Syntax_Coloring(aetools.NProperty):
 	"""Syntax Coloring - Mark keywords and comments with color. """
 	which = 'GH01'
 	want = 'bool'
@@ -1449,27 +1449,27 @@ class Syntax_Coloring(aetools.NProperty):
 class Segment(aetools.ComponentItem):
 	"""Segment - A segment or group in the project """
 	want = 'Seg '
-class filecount(aetools.NProperty):
+class _Prop_filecount(aetools.NProperty):
 	"""filecount -  """
 	which = 'NumF'
 	want = 'shor'
-class seg_2d_locked(aetools.NProperty):
+class _Prop_seg_2d_locked(aetools.NProperty):
 	"""seg-locked - Is the segment locked ? [68K only] """
 	which = 'PLck'
 	want = 'bool'
-class seg_2d_preloaded(aetools.NProperty):
+class _Prop_seg_2d_preloaded(aetools.NProperty):
 	"""seg-preloaded - Is the segment preloaded ? [68K only] """
 	which = 'Prel'
 	want = 'bool'
-class seg_2d_protected(aetools.NProperty):
+class _Prop_seg_2d_protected(aetools.NProperty):
 	"""seg-protected - Is the segment protected ? [68K only] """
 	which = 'Prot'
 	want = 'bool'
-class seg_2d_purgeable(aetools.NProperty):
+class _Prop_seg_2d_purgeable(aetools.NProperty):
 	"""seg-purgeable - Is the segment purgeable ? [68K only] """
 	which = 'Purg'
 	want = 'bool'
-class seg_2d_system_heap(aetools.NProperty):
+class _Prop_seg_2d_system_heap(aetools.NProperty):
 	"""seg-system heap - Is the segment loaded into the system heap ? [68K only] """
 	which = 'SysH'
 	want = 'bool'
@@ -1477,35 +1477,35 @@ class seg_2d_system_heap(aetools.NProperty):
 class ProjectFile(aetools.ComponentItem):
 	"""ProjectFile - A file contained in a project """
 	want = 'SrcF'
-class codesize(aetools.NProperty):
+class _Prop_codesize(aetools.NProperty):
 	"""codesize - The size of this file\xd5s code. """
 	which = 'CSiz'
 	want = 'long'
-class datasize(aetools.NProperty):
+class _Prop_datasize(aetools.NProperty):
 	"""datasize - The size of this file\xd5s data. """
 	which = 'DSiz'
 	want = 'long'
-class filetype(aetools.NProperty):
+class _Prop_filetype(aetools.NProperty):
 	"""filetype - What kind of file is this ? """
 	which = 'SrcT'
 	want = 'SrcT'
-class includes(aetools.NProperty):
+class _Prop_includes(aetools.NProperty):
 	"""includes -  """
 	which = 'IncF'
 	want = 'fss '
-class initialize_before(aetools.NProperty):
+class _Prop_initialize_before(aetools.NProperty):
 	"""initialize before - Initialize the shared library before the main application. """
 	which = 'Bfor'
 	want = 'bool'
-class symbols(aetools.NProperty):
+class _Prop_symbols(aetools.NProperty):
 	"""symbols - Are debugging symbols generated for this file ? """
 	which = 'SymG'
 	want = 'bool'
-class up_to_date(aetools.NProperty):
+class _Prop_up_to_date(aetools.NProperty):
 	"""up to date - Has the file been compiled since its last modification ? """
 	which = 'UpTD'
 	want = 'bool'
-class weak_link(aetools.NProperty):
+class _Prop_weak_link(aetools.NProperty):
 	"""weak link - Is this file imported weakly into the project ? [PowerPC only] """
 	which = 'Weak'
 	want = 'bool'
@@ -1513,11 +1513,11 @@ class weak_link(aetools.NProperty):
 class Source_Tree(aetools.ComponentItem):
 	"""Source Tree - User-defined source tree root """
 	want = 'SrcT'
-class path(aetools.NProperty):
+class _Prop_path(aetools.NProperty):
 	"""path - path for the user-defined source tree root """
 	which = 'Path'
 	want = 'TEXT'
-class path_kind(aetools.NProperty):
+class _Prop_path_kind(aetools.NProperty):
 	"""path kind - kind of path """
 	which = 'Kind'
 	want = 'STKd'
@@ -1525,35 +1525,35 @@ class path_kind(aetools.NProperty):
 class Target_Settings(aetools.ComponentItem):
 	"""Target Settings - Contains the definitions of a project\xd5s target. """
 	want = 'TARG'
-class Linker(aetools.NProperty):
+class _Prop_Linker(aetools.NProperty):
 	"""Linker - The name of the current linker. """
 	which = 'TA01'
 	want = 'TEXT'
-class Output_Directory_Location(aetools.NProperty):
+class _Prop_Output_Directory_Location(aetools.NProperty):
 	"""Output Directory Location - Location of output directory """
 	which = 'TA16'
 	want = 'RlPt'
-class Output_Directory_Origin(aetools.NProperty):
+class _Prop_Output_Directory_Origin(aetools.NProperty):
 	"""Output Directory Origin - Origin of path to output directory. Usage of this property is deprecated. Use the \xd2Output Directory Location\xd3 property instead. """
 	which = 'TA12'
 	want = 'PPrm'
-class Output_Directory_Path(aetools.NProperty):
+class _Prop_Output_Directory_Path(aetools.NProperty):
 	"""Output Directory Path - Path to output directory. Usage of this property is deprecated. Use the \xd2Output Directory Location\xd3 property instead. """
 	which = 'TA11'
 	want = 'TEXT'
-class Post_Linker(aetools.NProperty):
+class _Prop_Post_Linker(aetools.NProperty):
 	"""Post Linker -  """
 	which = 'TA09'
 	want = 'TEXT'
-class Pre_Linker(aetools.NProperty):
+class _Prop_Pre_Linker(aetools.NProperty):
 	"""Pre Linker -  """
 	which = 'TA13'
 	want = 'TEXT'
-class Target_Name(aetools.NProperty):
+class _Prop_Target_Name(aetools.NProperty):
 	"""Target Name -  """
 	which = 'TA10'
 	want = 'TEXT'
-class Use_Relative_Paths(aetools.NProperty):
+class _Prop_Use_Relative_Paths(aetools.NProperty):
 	"""Use Relative Paths - Save project entries using relative paths """
 	which = 'TA15'
 	want = 'bool'
@@ -1565,47 +1565,47 @@ class Target_Source_Trees(aetools.ComponentItem):
 class VCS_Setup(aetools.ComponentItem):
 	"""VCS Setup - The version control system preferences. """
 	want = 'VCSs'
-class Always_Prompt(aetools.NProperty):
+class _Prop_Always_Prompt(aetools.NProperty):
 	"""Always Prompt - Always show login dialog """
 	which = 'VC07'
 	want = 'bool'
-class Auto_Connect(aetools.NProperty):
+class _Prop_Auto_Connect(aetools.NProperty):
 	"""Auto Connect - Automatically connect to database when starting. """
 	which = 'VC05'
 	want = 'bool'
-class Connection_Method(aetools.NProperty):
+class _Prop_Connection_Method(aetools.NProperty):
 	"""Connection Method - Name of Version Control System to use. """
 	which = 'VC02'
 	want = 'TEXT'
-class Database_Path(aetools.NProperty):
+class _Prop_Database_Path(aetools.NProperty):
 	"""Database Path - Path to the VCS database. """
 	which = 'VC09'
 	want = 'RlPt'
-class Local_Path(aetools.NProperty):
+class _Prop_Local_Path(aetools.NProperty):
 	"""Local Path - Path to the local root """
 	which = 'VC10'
 	want = 'RlPt'
-class Mount_Volume(aetools.NProperty):
+class _Prop_Mount_Volume(aetools.NProperty):
 	"""Mount Volume - Attempt to mount the database volume if it isn't available. """
 	which = 'VC08'
 	want = 'bool'
-class Password(aetools.NProperty):
+class _Prop_Password(aetools.NProperty):
 	"""Password - The password for the VCS. """
 	which = 'VC04'
 	want = 'TEXT'
-class Store_Password(aetools.NProperty):
+class _Prop_Store_Password(aetools.NProperty):
 	"""Store Password - Store the password. """
 	which = 'VC06'
 	want = 'bool'
-class Use_Global_Settings(aetools.NProperty):
+class _Prop_Use_Global_Settings(aetools.NProperty):
 	"""Use Global Settings - Use the global VCS settings by default """
 	which = 'VC11'
 	want = 'bool'
-class Username(aetools.NProperty):
+class _Prop_Username(aetools.NProperty):
 	"""Username - The user name for the VCS. """
 	which = 'VC03'
 	want = 'TEXT'
-class VCS_Active(aetools.NProperty):
+class _Prop_VCS_Active(aetools.NProperty):
 	"""VCS Active - Use Version Control """
 	which = 'VC01'
 	want = 'bool'
@@ -1613,71 +1613,71 @@ class VCS_Active(aetools.NProperty):
 class Font(aetools.ComponentItem):
 	"""Font -  """
 	want = 'mFNT'
-class Auto_Indent(aetools.NProperty):
+class _Prop_Auto_Indent(aetools.NProperty):
 	"""Auto Indent - Indent new lines automatically. """
 	which = 'FN01'
 	want = 'bool'
-class Tab_Indents_Selection(aetools.NProperty):
+class _Prop_Tab_Indents_Selection(aetools.NProperty):
 	"""Tab Indents Selection - Tab indents selection when multiple lines are selected """
 	which = 'FN03'
 	want = 'bool'
-class Tab_Inserts_Spaces(aetools.NProperty):
+class _Prop_Tab_Inserts_Spaces(aetools.NProperty):
 	"""Tab Inserts Spaces - Insert spaces instead of tab character """
 	which = 'FN04'
 	want = 'bool'
-class Tab_Size(aetools.NProperty):
+class _Prop_Tab_Size(aetools.NProperty):
 	"""Tab Size -  """
 	which = 'FN02'
 	want = 'shor'
-class Text_Font(aetools.NProperty):
+class _Prop_Text_Font(aetools.NProperty):
 	"""Text Font - The font used in editing windows. """
 	which = 'ptxf'
 	want = 'TEXT'
-class Text_Size(aetools.NProperty):
+class _Prop_Text_Size(aetools.NProperty):
 	"""Text Size - The size of the text in an editing window. """
 	which = 'ptps'
 	want = 'shor'
 Browser_Coloring._superclassnames = []
 Browser_Coloring._privpropdict = {
-	'Browser_Keywords' : Browser_Keywords,
-	'Classes_Color' : Classes_Color,
-	'Constants_Color' : Constants_Color,
-	'Enums_Color' : Enums_Color,
-	'Functions_Color' : Functions_Color,
-	'Globals_Color' : Globals_Color,
-	'Macros_Color' : Macros_Color,
-	'Template_Commands_in_Menu' : Template_Commands_in_Menu,
-	'Templates_Color' : Templates_Color,
-	'Typedefs_Color' : Typedefs_Color,
+	'Browser_Keywords' : _Prop_Browser_Keywords,
+	'Classes_Color' : _Prop_Classes_Color,
+	'Constants_Color' : _Prop_Constants_Color,
+	'Enums_Color' : _Prop_Enums_Color,
+	'Functions_Color' : _Prop_Functions_Color,
+	'Globals_Color' : _Prop_Globals_Color,
+	'Macros_Color' : _Prop_Macros_Color,
+	'Template_Commands_in_Menu' : _Prop_Template_Commands_in_Menu,
+	'Templates_Color' : _Prop_Templates_Color,
+	'Typedefs_Color' : _Prop_Typedefs_Color,
 }
 Browser_Coloring._privelemdict = {
 }
 Build_Settings._superclassnames = []
 Build_Settings._privpropdict = {
-	'Build_Before_Running' : Build_Before_Running,
-	'Compiler_Thread_Stack_Size' : Compiler_Thread_Stack_Size,
-	'Completion_Sound' : Completion_Sound,
-	'Failure_Sound' : Failure_Sound,
-	'Include_Cache_Size' : Include_Cache_Size,
-	'Save_Before_Building' : Save_Before_Building,
-	'Success_Sound' : Success_Sound,
+	'Build_Before_Running' : _Prop_Build_Before_Running,
+	'Compiler_Thread_Stack_Size' : _Prop_Compiler_Thread_Stack_Size,
+	'Completion_Sound' : _Prop_Completion_Sound,
+	'Failure_Sound' : _Prop_Failure_Sound,
+	'Include_Cache_Size' : _Prop_Include_Cache_Size,
+	'Save_Before_Building' : _Prop_Save_Before_Building,
+	'Success_Sound' : _Prop_Success_Sound,
 }
 Build_Settings._privelemdict = {
 }
 base_class._superclassnames = []
 base_class._privpropdict = {
-	'access' : access,
-	'class_' : class_,
-	'virtual' : virtual,
+	'access' : _Prop_access,
+	'class_' : _Prop_class_,
+	'virtual' : _Prop_virtual,
 }
 base_class._privelemdict = {
 }
 Custom_Keywords._superclassnames = []
 Custom_Keywords._privpropdict = {
-	'Custom_Color_1' : Custom_Color_1,
-	'Custom_Color_2' : Custom_Color_2,
-	'Custom_Color_3' : Custom_Color_3,
-	'Custom_Color_4' : Custom_Color_4,
+	'Custom_Color_1' : _Prop_Custom_Color_1,
+	'Custom_Color_2' : _Prop_Custom_Color_2,
+	'Custom_Color_3' : _Prop_Custom_Color_3,
+	'Custom_Color_4' : _Prop_Custom_Color_4,
 }
 Custom_Keywords._privelemdict = {
 }
@@ -1689,13 +1689,13 @@ browser_catalog._privelemdict = {
 }
 class_._superclassnames = []
 class_._privpropdict = {
-	'all_subclasses' : all_subclasses,
-	'declaration_end_offset' : declaration_end_offset,
-	'declaration_file' : declaration_file,
-	'declaration_start_offset' : declaration_start_offset,
-	'language' : language,
-	'name' : name,
-	'subclasses' : subclasses,
+	'all_subclasses' : _Prop_all_subclasses,
+	'declaration_end_offset' : _Prop_declaration_end_offset,
+	'declaration_file' : _Prop_declaration_file,
+	'declaration_start_offset' : _Prop_declaration_start_offset,
+	'language' : _Prop_language,
+	'name' : _Prop_name,
+	'subclasses' : _Prop_subclasses,
 }
 class_._privelemdict = {
 	'base_class' : base_class,
@@ -1704,323 +1704,323 @@ class_._privelemdict = {
 }
 Debugger_Display._superclassnames = []
 Debugger_Display._privpropdict = {
-	'Default_Array_Size' : Default_Array_Size,
-	'Show_As_Decimal' : Show_As_Decimal,
-	'Show_Locals' : Show_Locals,
-	'Show_Variable_Types' : Show_Variable_Types,
-	'Sort_By_Method' : Sort_By_Method,
-	'Threads_in_Window' : Threads_in_Window,
-	'Use_RTTI' : Use_RTTI,
-	'Variable_Changed_Hilite' : Variable_Changed_Hilite,
-	'Variable_Hints' : Variable_Hints,
-	'Watchpoint_Hilite' : Watchpoint_Hilite,
+	'Default_Array_Size' : _Prop_Default_Array_Size,
+	'Show_As_Decimal' : _Prop_Show_As_Decimal,
+	'Show_Locals' : _Prop_Show_Locals,
+	'Show_Variable_Types' : _Prop_Show_Variable_Types,
+	'Sort_By_Method' : _Prop_Sort_By_Method,
+	'Threads_in_Window' : _Prop_Threads_in_Window,
+	'Use_RTTI' : _Prop_Use_RTTI,
+	'Variable_Changed_Hilite' : _Prop_Variable_Changed_Hilite,
+	'Variable_Hints' : _Prop_Variable_Hints,
+	'Watchpoint_Hilite' : _Prop_Watchpoint_Hilite,
 }
 Debugger_Display._privelemdict = {
 }
 Debugger_Global._superclassnames = []
 Debugger_Global._privpropdict = {
-	'Auto_Target_Libraries' : Auto_Target_Libraries,
-	'Cache_Edited_Files' : Cache_Edited_Files,
-	'Confirm_Kill' : Confirm_Kill,
-	'Dont_Step_in_Runtime' : Dont_Step_in_Runtime,
-	'File_Cache_Duration' : File_Cache_Duration,
-	'Ignore_Mod_Dates' : Ignore_Mod_Dates,
-	'Launch_Apps_on_Open' : Launch_Apps_on_Open,
-	'Open_All_Classes' : Open_All_Classes,
-	'Select_Stack_Crawl' : Select_Stack_Crawl,
-	'Stop_at_Main' : Stop_at_Main,
+	'Auto_Target_Libraries' : _Prop_Auto_Target_Libraries,
+	'Cache_Edited_Files' : _Prop_Cache_Edited_Files,
+	'Confirm_Kill' : _Prop_Confirm_Kill,
+	'Dont_Step_in_Runtime' : _Prop_Dont_Step_in_Runtime,
+	'File_Cache_Duration' : _Prop_File_Cache_Duration,
+	'Ignore_Mod_Dates' : _Prop_Ignore_Mod_Dates,
+	'Launch_Apps_on_Open' : _Prop_Launch_Apps_on_Open,
+	'Open_All_Classes' : _Prop_Open_All_Classes,
+	'Select_Stack_Crawl' : _Prop_Select_Stack_Crawl,
+	'Stop_at_Main' : _Prop_Stop_at_Main,
 }
 Debugger_Global._privelemdict = {
 }
 Debugger_Target._superclassnames = []
 Debugger_Target._privpropdict = {
-	'Auto_Target_Libraries' : Auto_Target_Libraries,
-	'Cache_symbolics' : Cache_symbolics,
-	'Data_Update_Interval' : Data_Update_Interval,
-	'Log_System_Messages' : Log_System_Messages,
-	'Relocated_Executable_Path' : Relocated_Executable_Path,
-	'Stop_at_temp_breakpoint' : Stop_at_temp_breakpoint,
-	'Temp_Breakpoint_Type' : Temp_Breakpoint_Type,
-	'Temp_breakpoint_names' : Temp_breakpoint_names,
-	'Update_Data_While_Running' : Update_Data_While_Running,
+	'Auto_Target_Libraries' : _Prop_Auto_Target_Libraries,
+	'Cache_symbolics' : _Prop_Cache_symbolics,
+	'Data_Update_Interval' : _Prop_Data_Update_Interval,
+	'Log_System_Messages' : _Prop_Log_System_Messages,
+	'Relocated_Executable_Path' : _Prop_Relocated_Executable_Path,
+	'Stop_at_temp_breakpoint' : _Prop_Stop_at_temp_breakpoint,
+	'Temp_Breakpoint_Type' : _Prop_Temp_Breakpoint_Type,
+	'Temp_breakpoint_names' : _Prop_Temp_breakpoint_names,
+	'Update_Data_While_Running' : _Prop_Update_Data_While_Running,
 }
 Debugger_Target._privelemdict = {
 }
 Debugger_Windowing._superclassnames = []
 Debugger_Windowing._privpropdict = {
-	'Debugging_Start_Action' : Debugging_Start_Action,
-	'Do_Nothing_To_Projects' : Do_Nothing_To_Projects,
+	'Debugging_Start_Action' : _Prop_Debugging_Start_Action,
+	'Do_Nothing_To_Projects' : _Prop_Do_Nothing_To_Projects,
 }
 Debugger_Windowing._privelemdict = {
 }
 data_member._superclassnames = []
 data_member._privpropdict = {
-	'access' : access,
-	'declaration_end_offset' : declaration_end_offset,
-	'declaration_start_offset' : declaration_start_offset,
-	'name' : name,
-	'static' : static,
+	'access' : _Prop_access,
+	'declaration_end_offset' : _Prop_declaration_end_offset,
+	'declaration_start_offset' : _Prop_declaration_start_offset,
+	'name' : _Prop_name,
+	'static' : _Prop_static,
 }
 data_member._privelemdict = {
 }
 Editor._superclassnames = []
 Editor._privpropdict = {
-	'Background_Color' : Background_Color,
-	'Balance' : Balance,
-	'Context_Popup_Delay' : Context_Popup_Delay,
-	'Default_Text_File_Format' : Default_Text_File_Format,
-	'Dynamic_Scroll' : Dynamic_Scroll,
-	'Flash_Delay' : Flash_Delay,
-	'Left_Margin_Line_Select' : Left_Margin_Line_Select,
-	'Main_Text_Color' : Main_Text_Color,
-	'Relaxed_C_Popup_Parsing' : Relaxed_C_Popup_Parsing,
-	'Remember_Font' : Remember_Font,
-	'Remember_Selection' : Remember_Selection,
-	'Remember_Window' : Remember_Window,
-	'Sort_Function_Popup' : Sort_Function_Popup,
-	'Use_Drag__26__Drop_Editing' : Use_Drag__26__Drop_Editing,
-	'Use_Multiple_Undo' : Use_Multiple_Undo,
+	'Background_Color' : _Prop_Background_Color,
+	'Balance' : _Prop_Balance,
+	'Context_Popup_Delay' : _Prop_Context_Popup_Delay,
+	'Default_Text_File_Format' : _Prop_Default_Text_File_Format,
+	'Dynamic_Scroll' : _Prop_Dynamic_Scroll,
+	'Flash_Delay' : _Prop_Flash_Delay,
+	'Left_Margin_Line_Select' : _Prop_Left_Margin_Line_Select,
+	'Main_Text_Color' : _Prop_Main_Text_Color,
+	'Relaxed_C_Popup_Parsing' : _Prop_Relaxed_C_Popup_Parsing,
+	'Remember_Font' : _Prop_Remember_Font,
+	'Remember_Selection' : _Prop_Remember_Selection,
+	'Remember_Window' : _Prop_Remember_Window,
+	'Sort_Function_Popup' : _Prop_Sort_Function_Popup,
+	'Use_Drag__26__Drop_Editing' : _Prop_Use_Drag__26__Drop_Editing,
+	'Use_Multiple_Undo' : _Prop_Use_Multiple_Undo,
 }
 Editor._privelemdict = {
 }
 Environment_Variable._superclassnames = []
 Environment_Variable._privpropdict = {
-	'name' : name,
-	'value' : value,
+	'name' : _Prop_name,
+	'value' : _Prop_value,
 }
 Environment_Variable._privelemdict = {
 }
 Error_Information._superclassnames = []
 Error_Information._privpropdict = {
-	'disk_file' : disk_file,
-	'lineNumber' : lineNumber,
-	'message' : message,
-	'messageKind' : messageKind,
+	'disk_file' : _Prop_disk_file,
+	'lineNumber' : _Prop_lineNumber,
+	'message' : _Prop_message,
+	'messageKind' : _Prop_messageKind,
 }
 Error_Information._privelemdict = {
 }
 Function_Information._superclassnames = []
 Function_Information._privpropdict = {
-	'disk_file' : disk_file,
-	'lineNumber' : lineNumber,
+	'disk_file' : _Prop_disk_file,
+	'lineNumber' : _Prop_lineNumber,
 }
 Function_Information._privelemdict = {
 }
 File_Mappings._superclassnames = []
 File_Mappings._privpropdict = {
-	'Mappings' : Mappings,
+	'Mappings' : _Prop_Mappings,
 }
 File_Mappings._privelemdict = {
 }
 File_Mapping._superclassnames = []
 File_Mapping._privpropdict = {
-	'Compiler' : Compiler,
-	'Extension' : Extension,
-	'File_Type' : File_Type,
-	'Ignored_by_Make' : Ignored_by_Make,
-	'Launchable' : Launchable,
-	'Precompiled' : Precompiled,
-	'Resource_File' : Resource_File,
+	'Compiler' : _Prop_Compiler,
+	'Extension' : _Prop_Extension,
+	'File_Type' : _Prop_File_Type,
+	'Ignored_by_Make' : _Prop_Ignored_by_Make,
+	'Launchable' : _Prop_Launchable,
+	'Precompiled' : _Prop_Precompiled,
+	'Resource_File' : _Prop_Resource_File,
 }
 File_Mapping._privelemdict = {
 }
 Global_Source_Trees._superclassnames = []
 Global_Source_Trees._privpropdict = {
-	'Source_Trees' : Source_Trees,
+	'Source_Trees' : _Prop_Source_Trees,
 }
 Global_Source_Trees._privelemdict = {
 }
 Extras._superclassnames = []
 Extras._privpropdict = {
-	'Automatic_Toolbar_Help' : Automatic_Toolbar_Help,
-	'External_Reference' : External_Reference,
-	'Full_Screen_Zoom' : Full_Screen_Zoom,
-	'Recent_Editor_Count' : Recent_Editor_Count,
-	'Recent_Project_Count' : Recent_Project_Count,
-	'Use_Editor_Extensions' : Use_Editor_Extensions,
-	'Use_External_Editor' : Use_External_Editor,
-	'Use_Script_Menu' : Use_Script_Menu,
-	'Use_ToolServer_Menu' : Use_ToolServer_Menu,
+	'Automatic_Toolbar_Help' : _Prop_Automatic_Toolbar_Help,
+	'External_Reference' : _Prop_External_Reference,
+	'Full_Screen_Zoom' : _Prop_Full_Screen_Zoom,
+	'Recent_Editor_Count' : _Prop_Recent_Editor_Count,
+	'Recent_Project_Count' : _Prop_Recent_Project_Count,
+	'Use_Editor_Extensions' : _Prop_Use_Editor_Extensions,
+	'Use_External_Editor' : _Prop_Use_External_Editor,
+	'Use_Script_Menu' : _Prop_Use_Script_Menu,
+	'Use_ToolServer_Menu' : _Prop_Use_ToolServer_Menu,
 }
 Extras._privelemdict = {
 }
 Build_Extras._superclassnames = []
 Build_Extras._privpropdict = {
-	'Browser_Active' : Browser_Active,
-	'Cache_Subproject_Data' : Cache_Subproject_Data,
-	'Dump_Browser_Info' : Dump_Browser_Info,
-	'Modification_Date_Caching' : Modification_Date_Caching,
+	'Browser_Active' : _Prop_Browser_Active,
+	'Cache_Subproject_Data' : _Prop_Cache_Subproject_Data,
+	'Dump_Browser_Info' : _Prop_Dump_Browser_Info,
+	'Modification_Date_Caching' : _Prop_Modification_Date_Caching,
 }
 Build_Extras._privelemdict = {
 }
 member_function._superclassnames = []
 member_function._privpropdict = {
-	'access' : access,
-	'declaration_end_offset' : declaration_end_offset,
-	'declaration_file' : declaration_file,
-	'declaration_start_offset' : declaration_start_offset,
-	'implementation_end_offset' : implementation_end_offset,
-	'implementation_file' : implementation_file,
-	'implementation_start_offset' : implementation_start_offset,
-	'name' : name,
-	'static' : static,
-	'virtual' : virtual,
+	'access' : _Prop_access,
+	'declaration_end_offset' : _Prop_declaration_end_offset,
+	'declaration_file' : _Prop_declaration_file,
+	'declaration_start_offset' : _Prop_declaration_start_offset,
+	'implementation_end_offset' : _Prop_implementation_end_offset,
+	'implementation_file' : _Prop_implementation_file,
+	'implementation_start_offset' : _Prop_implementation_start_offset,
+	'name' : _Prop_name,
+	'static' : _Prop_static,
+	'virtual' : _Prop_virtual,
 }
 member_function._privelemdict = {
 }
 Access_Paths._superclassnames = []
 Access_Paths._privpropdict = {
-	'Always_Full_Search' : Always_Full_Search,
-	'Convert_Paths' : Convert_Paths,
-	'Require_Framework_Includes' : Require_Framework_Includes,
-	'System_Paths' : System_Paths,
-	'User_Paths' : User_Paths,
+	'Always_Full_Search' : _Prop_Always_Full_Search,
+	'Convert_Paths' : _Prop_Convert_Paths,
+	'Require_Framework_Includes' : _Prop_Require_Framework_Includes,
+	'System_Paths' : _Prop_System_Paths,
+	'User_Paths' : _Prop_User_Paths,
 }
 Access_Paths._privelemdict = {
 }
 Path_Information._superclassnames = []
 Path_Information._privpropdict = {
-	'format' : format,
-	'framework' : framework,
-	'host_flags' : host_flags,
-	'name' : name,
-	'origin' : origin,
-	'recursive' : recursive,
-	'root' : root,
+	'format' : _Prop_format,
+	'framework' : _Prop_framework,
+	'host_flags' : _Prop_host_flags,
+	'name' : _Prop_name,
+	'origin' : _Prop_origin,
+	'recursive' : _Prop_recursive,
+	'root' : _Prop_root,
 }
 Path_Information._privelemdict = {
 }
 Plugin_Settings._superclassnames = []
 Plugin_Settings._privpropdict = {
-	'Disable_Third_Party_COM_Plugins' : Disable_Third_Party_COM_Plugins,
-	'Plugin_Diagnostics_Level' : Plugin_Diagnostics_Level,
+	'Disable_Third_Party_COM_Plugins' : _Prop_Disable_Third_Party_COM_Plugins,
+	'Plugin_Diagnostics_Level' : _Prop_Plugin_Diagnostics_Level,
 }
 Plugin_Settings._privelemdict = {
 }
 Runtime_Settings._superclassnames = []
 Runtime_Settings._privpropdict = {
-	'Command_Line_Arguments' : Command_Line_Arguments,
-	'Environment_Variables' : Environment_Variables,
-	'Host_Application' : Host_Application,
-	'Working_Directory' : Working_Directory,
+	'Command_Line_Arguments' : _Prop_Command_Line_Arguments,
+	'Environment_Variables' : _Prop_Environment_Variables,
+	'Host_Application' : _Prop_Host_Application,
+	'Working_Directory' : _Prop_Working_Directory,
 }
 Runtime_Settings._privelemdict = {
 }
 Relative_Path._superclassnames = []
 Relative_Path._privpropdict = {
-	'format' : format,
-	'name' : name,
-	'origin' : origin,
-	'root' : root,
+	'format' : _Prop_format,
+	'name' : _Prop_name,
+	'origin' : _Prop_origin,
+	'root' : _Prop_root,
 }
 Relative_Path._privelemdict = {
 }
 Shielded_Folder._superclassnames = []
 Shielded_Folder._privpropdict = {
-	'Expression_To_Match' : Expression_To_Match,
-	'Skip_Find_And_Compare_Operations' : Skip_Find_And_Compare_Operations,
-	'Skip_Project_Operations' : Skip_Project_Operations,
+	'Expression_To_Match' : _Prop_Expression_To_Match,
+	'Skip_Find_And_Compare_Operations' : _Prop_Skip_Find_And_Compare_Operations,
+	'Skip_Project_Operations' : _Prop_Skip_Project_Operations,
 }
 Shielded_Folder._privelemdict = {
 }
 Shielded_Folders._superclassnames = []
 Shielded_Folders._privpropdict = {
-	'Shielded_Items' : Shielded_Items,
+	'Shielded_Items' : _Prop_Shielded_Items,
 }
 Shielded_Folders._privelemdict = {
 }
 Syntax_Coloring._superclassnames = []
 Syntax_Coloring._privpropdict = {
-	'Comment_Color' : Comment_Color,
-	'Custom_Color_1' : Custom_Color_1,
-	'Custom_Color_2' : Custom_Color_2,
-	'Custom_Color_3' : Custom_Color_3,
-	'Custom_Color_4' : Custom_Color_4,
-	'Keyword_Color' : Keyword_Color,
-	'String_Color' : String_Color,
-	'Syntax_Coloring' : Syntax_Coloring,
+	'Comment_Color' : _Prop_Comment_Color,
+	'Custom_Color_1' : _Prop_Custom_Color_1,
+	'Custom_Color_2' : _Prop_Custom_Color_2,
+	'Custom_Color_3' : _Prop_Custom_Color_3,
+	'Custom_Color_4' : _Prop_Custom_Color_4,
+	'Keyword_Color' : _Prop_Keyword_Color,
+	'String_Color' : _Prop_String_Color,
+	'Syntax_Coloring' : _Prop_Syntax_Coloring,
 }
 Syntax_Coloring._privelemdict = {
 }
 Segment._superclassnames = []
 Segment._privpropdict = {
-	'filecount' : filecount,
-	'name' : name,
-	'seg_2d_locked' : seg_2d_locked,
-	'seg_2d_preloaded' : seg_2d_preloaded,
-	'seg_2d_protected' : seg_2d_protected,
-	'seg_2d_purgeable' : seg_2d_purgeable,
-	'seg_2d_system_heap' : seg_2d_system_heap,
+	'filecount' : _Prop_filecount,
+	'name' : _Prop_name,
+	'seg_2d_locked' : _Prop_seg_2d_locked,
+	'seg_2d_preloaded' : _Prop_seg_2d_preloaded,
+	'seg_2d_protected' : _Prop_seg_2d_protected,
+	'seg_2d_purgeable' : _Prop_seg_2d_purgeable,
+	'seg_2d_system_heap' : _Prop_seg_2d_system_heap,
 }
 Segment._privelemdict = {
 }
 ProjectFile._superclassnames = []
 ProjectFile._privpropdict = {
-	'codesize' : codesize,
-	'datasize' : datasize,
-	'disk_file' : disk_file,
-	'filetype' : filetype,
-	'includes' : includes,
-	'initialize_before' : initialize_before,
-	'name' : name,
-	'symbols' : symbols,
-	'up_to_date' : up_to_date,
-	'weak_link' : weak_link,
+	'codesize' : _Prop_codesize,
+	'datasize' : _Prop_datasize,
+	'disk_file' : _Prop_disk_file,
+	'filetype' : _Prop_filetype,
+	'includes' : _Prop_includes,
+	'initialize_before' : _Prop_initialize_before,
+	'name' : _Prop_name,
+	'symbols' : _Prop_symbols,
+	'up_to_date' : _Prop_up_to_date,
+	'weak_link' : _Prop_weak_link,
 }
 ProjectFile._privelemdict = {
 }
 Source_Tree._superclassnames = []
 Source_Tree._privpropdict = {
-	'format' : format,
-	'name' : name,
-	'path' : path,
-	'path_kind' : path_kind,
+	'format' : _Prop_format,
+	'name' : _Prop_name,
+	'path' : _Prop_path,
+	'path_kind' : _Prop_path_kind,
 }
 Source_Tree._privelemdict = {
 }
 Target_Settings._superclassnames = []
 Target_Settings._privpropdict = {
-	'Linker' : Linker,
-	'Output_Directory_Location' : Output_Directory_Location,
-	'Output_Directory_Origin' : Output_Directory_Origin,
-	'Output_Directory_Path' : Output_Directory_Path,
-	'Post_Linker' : Post_Linker,
-	'Pre_Linker' : Pre_Linker,
-	'Target_Name' : Target_Name,
-	'Use_Relative_Paths' : Use_Relative_Paths,
+	'Linker' : _Prop_Linker,
+	'Output_Directory_Location' : _Prop_Output_Directory_Location,
+	'Output_Directory_Origin' : _Prop_Output_Directory_Origin,
+	'Output_Directory_Path' : _Prop_Output_Directory_Path,
+	'Post_Linker' : _Prop_Post_Linker,
+	'Pre_Linker' : _Prop_Pre_Linker,
+	'Target_Name' : _Prop_Target_Name,
+	'Use_Relative_Paths' : _Prop_Use_Relative_Paths,
 }
 Target_Settings._privelemdict = {
 }
 Target_Source_Trees._superclassnames = []
 Target_Source_Trees._privpropdict = {
-	'Source_Trees' : Source_Trees,
+	'Source_Trees' : _Prop_Source_Trees,
 }
 Target_Source_Trees._privelemdict = {
 }
 VCS_Setup._superclassnames = []
 VCS_Setup._privpropdict = {
-	'Always_Prompt' : Always_Prompt,
-	'Auto_Connect' : Auto_Connect,
-	'Connection_Method' : Connection_Method,
-	'Database_Path' : Database_Path,
-	'Local_Path' : Local_Path,
-	'Mount_Volume' : Mount_Volume,
-	'Password' : Password,
-	'Store_Password' : Store_Password,
-	'Use_Global_Settings' : Use_Global_Settings,
-	'Username' : Username,
-	'VCS_Active' : VCS_Active,
+	'Always_Prompt' : _Prop_Always_Prompt,
+	'Auto_Connect' : _Prop_Auto_Connect,
+	'Connection_Method' : _Prop_Connection_Method,
+	'Database_Path' : _Prop_Database_Path,
+	'Local_Path' : _Prop_Local_Path,
+	'Mount_Volume' : _Prop_Mount_Volume,
+	'Password' : _Prop_Password,
+	'Store_Password' : _Prop_Store_Password,
+	'Use_Global_Settings' : _Prop_Use_Global_Settings,
+	'Username' : _Prop_Username,
+	'VCS_Active' : _Prop_VCS_Active,
 }
 VCS_Setup._privelemdict = {
 }
 Font._superclassnames = []
 Font._privpropdict = {
-	'Auto_Indent' : Auto_Indent,
-	'Tab_Indents_Selection' : Tab_Indents_Selection,
-	'Tab_Inserts_Spaces' : Tab_Inserts_Spaces,
-	'Tab_Size' : Tab_Size,
-	'Text_Font' : Text_Font,
-	'Text_Size' : Text_Size,
+	'Auto_Indent' : _Prop_Auto_Indent,
+	'Tab_Indents_Selection' : _Prop_Tab_Indents_Selection,
+	'Tab_Inserts_Spaces' : _Prop_Tab_Inserts_Spaces,
+	'Tab_Size' : _Prop_Tab_Size,
+	'Text_Font' : _Prop_Text_Font,
+	'Text_Size' : _Prop_Text_Size,
 }
 Font._privelemdict = {
 }
@@ -2173,201 +2173,3 @@ _classdeclarations = {
 	'VCSs' : VCS_Setup,
 	'mFNT' : Font,
 }
-
-_propdeclarations = {
-	'Acce' : access,
-	'BW00' : Browser_Keywords,
-	'BW01' : Classes_Color,
-	'BW02' : Constants_Color,
-	'BW03' : Enums_Color,
-	'BW04' : Functions_Color,
-	'BW05' : Globals_Color,
-	'BW06' : Macros_Color,
-	'BW07' : Templates_Color,
-	'BW08' : Typedefs_Color,
-	'BW10' : Template_Commands_in_Menu,
-	'BX01' : Completion_Sound,
-	'BX02' : Success_Sound,
-	'BX03' : Failure_Sound,
-	'BX04' : Build_Before_Running,
-	'BX05' : Include_Cache_Size,
-	'BX06' : Compiler_Thread_Stack_Size,
-	'BX07' : Save_Before_Building,
-	'Bfor' : initialize_before,
-	'CSiz' : codesize,
-	'Clas' : class_,
-	'DSiz' : datasize,
-	'Db01' : Show_Variable_Types,
-	'Db02' : Sort_By_Method,
-	'Db03' : Use_RTTI,
-	'Db04' : Threads_in_Window,
-	'Db05' : Variable_Hints,
-	'Db06' : Watchpoint_Hilite,
-	'Db07' : Variable_Changed_Hilite,
-	'Db08' : Default_Array_Size,
-	'Db09' : Show_Locals,
-	'Db10' : Show_As_Decimal,
-	'DcEn' : declaration_end_offset,
-	'DcFl' : declaration_file,
-	'DcSt' : declaration_start_offset,
-	'DfEn' : implementation_end_offset,
-	'DfFl' : implementation_file,
-	'DfSt' : implementation_start_offset,
-	'Dg01' : Ignore_Mod_Dates,
-	'Dg02' : Open_All_Classes,
-	'Dg03' : Launch_Apps_on_Open,
-	'Dg04' : Confirm_Kill,
-	'Dg05' : Stop_at_Main,
-	'Dg06' : Select_Stack_Crawl,
-	'Dg07' : Dont_Step_in_Runtime,
-	'Dg11' : Auto_Target_Libraries,
-	'Dg12' : Cache_Edited_Files,
-	'Dg13' : File_Cache_Duration,
-	'Dt02' : Log_System_Messages,
-	'Dt08' : Update_Data_While_Running,
-	'Dt09' : Data_Update_Interval,
-	'Dt10' : Relocated_Executable_Path,
-	'Dt13' : Stop_at_temp_breakpoint,
-	'Dt14' : Temp_breakpoint_names,
-	'Dt15' : Cache_symbolics,
-	'Dt16' : Temp_Breakpoint_Type,
-	'Dw01' : Debugging_Start_Action,
-	'Dw02' : Do_Nothing_To_Projects,
-	'ED01' : Flash_Delay,
-	'ED02' : Dynamic_Scroll,
-	'ED03' : Balance,
-	'ED04' : Use_Drag__26__Drop_Editing,
-	'ED06' : Sort_Function_Popup,
-	'ED07' : Use_Multiple_Undo,
-	'ED08' : Remember_Font,
-	'ED09' : Remember_Selection,
-	'ED10' : Remember_Window,
-	'ED12' : Main_Text_Color,
-	'ED13' : Background_Color,
-	'ED14' : Context_Popup_Delay,
-	'ED15' : Relaxed_C_Popup_Parsing,
-	'ED16' : Left_Margin_Line_Select,
-	'ED17' : Default_Text_File_Format,
-	'EX04' : Modification_Date_Caching,
-	'EX07' : Full_Screen_Zoom,
-	'EX08' : External_Reference,
-	'EX09' : Browser_Active,
-	'EX10' : Use_Editor_Extensions,
-	'EX11' : Use_External_Editor,
-	'EX12' : Use_Script_Menu,
-	'EX16' : Recent_Editor_Count,
-	'EX17' : Recent_Project_Count,
-	'EX18' : Use_ToolServer_Menu,
-	'EX19' : Automatic_Toolbar_Help,
-	'EX30' : Dump_Browser_Info,
-	'EX31' : Cache_Subproject_Data,
-	'ErrL' : lineNumber,
-	'ErrS' : message,
-	'ErrT' : messageKind,
-	'FMps' : Mappings,
-	'FN01' : Auto_Indent,
-	'FN02' : Tab_Size,
-	'FN03' : Tab_Indents_Selection,
-	'FN04' : Tab_Inserts_Spaces,
-	'Frmt' : format,
-	'Frmw' : framework,
-	'GH01' : Syntax_Coloring,
-	'GH02' : Comment_Color,
-	'GH03' : Keyword_Color,
-	'GH04' : String_Color,
-	'GH05' : Custom_Color_1,
-	'GH06' : Custom_Color_2,
-	'GH07' : Custom_Color_3,
-	'GH08' : Custom_Color_4,
-	'HstF' : host_flags,
-	'IncF' : includes,
-	'Kind' : path_kind,
-	'Lang' : language,
-	'NumF' : filecount,
-	'Orig' : origin,
-	'PA01' : User_Paths,
-	'PA02' : Always_Full_Search,
-	'PA03' : System_Paths,
-	'PA04' : Convert_Paths,
-	'PA05' : Require_Framework_Includes,
-	'PLck' : seg_2d_locked,
-	'PR04' : File_Type,
-	'PX01' : Plugin_Diagnostics_Level,
-	'PX02' : Disable_Third_Party_COM_Plugins,
-	'Path' : path,
-	'Prel' : seg_2d_preloaded,
-	'Prot' : seg_2d_protected,
-	'Purg' : seg_2d_purgeable,
-	'RS01' : Host_Application,
-	'RS02' : Command_Line_Arguments,
-	'RS03' : Working_Directory,
-	'RS04' : Environment_Variables,
-	'Recu' : recursive,
-	'Root' : root,
-	'SF01' : Expression_To_Match,
-	'SF02' : Skip_Project_Operations,
-	'SF03' : Skip_Find_And_Compare_Operations,
-	'SFis' : Shielded_Items,
-	'ST01' : Source_Trees,
-	'SrcT' : filetype,
-	'Stat' : static,
-	'SubA' : all_subclasses,
-	'SubC' : subclasses,
-	'SymG' : symbols,
-	'SysH' : seg_2d_system_heap,
-	'TA01' : Linker,
-	'TA02' : Extension,
-	'TA03' : Precompiled,
-	'TA04' : Resource_File,
-	'TA05' : Launchable,
-	'TA06' : Ignored_by_Make,
-	'TA07' : Compiler,
-	'TA09' : Post_Linker,
-	'TA10' : Target_Name,
-	'TA11' : Output_Directory_Path,
-	'TA12' : Output_Directory_Origin,
-	'TA13' : Pre_Linker,
-	'TA15' : Use_Relative_Paths,
-	'TA16' : Output_Directory_Location,
-	'UpTD' : up_to_date,
-	'VC01' : VCS_Active,
-	'VC02' : Connection_Method,
-	'VC03' : Username,
-	'VC04' : Password,
-	'VC05' : Auto_Connect,
-	'VC06' : Store_Password,
-	'VC07' : Always_Prompt,
-	'VC08' : Mount_Volume,
-	'VC09' : Database_Path,
-	'VC10' : Local_Path,
-	'VC11' : Use_Global_Settings,
-	'Valu' : value,
-	'Virt' : virtual,
-	'Weak' : weak_link,
-	'file' : disk_file,
-	'pnam' : name,
-	'ptps' : Text_Size,
-	'ptxf' : Text_Font,
-}
-
-_compdeclarations = {
-}
-
-_enumdeclarations = {
-	'Acce' : _Enum_Acce,
-	'BXbr' : _Enum_BXbr,
-	'DbSA' : _Enum_DbSA,
-	'DgBL' : _Enum_DgBL,
-	'ErrT' : _Enum_ErrT,
-	'Inte' : _Enum_Inte,
-	'Lang' : _Enum_Lang,
-	'PPrm' : _Enum_PPrm,
-	'PXdg' : _Enum_PXdg,
-	'PthF' : _Enum_PthF,
-	'RefP' : _Enum_RefP,
-	'STKd' : _Enum_STKd,
-	'SrcT' : _Enum_SrcT,
-	'TmpB' : _Enum_TmpB,
-	'TxtF' : _Enum_TxtF,
-	'savo' : _Enum_savo,
-}
diff --git a/Lib/plat-mac/lib-scriptpackages/CodeWarrior/Required.py b/Lib/plat-mac/lib-scriptpackages/CodeWarrior/Required.py
index a8b9a03..75f4cd3 100644
--- a/Lib/plat-mac/lib-scriptpackages/CodeWarrior/Required.py
+++ b/Lib/plat-mac/lib-scriptpackages/CodeWarrior/Required.py
@@ -50,13 +50,3 @@ _Enum_Conv = {
 #
 _classdeclarations = {
 }
-
-_propdeclarations = {
-}
-
-_compdeclarations = {
-}
-
-_enumdeclarations = {
-	'Conv' : _Enum_Conv,
-}
diff --git a/Lib/plat-mac/lib-scriptpackages/CodeWarrior/Standard_Suite.py b/Lib/plat-mac/lib-scriptpackages/CodeWarrior/Standard_Suite.py
index 27d9e63..2879818 100644
--- a/Lib/plat-mac/lib-scriptpackages/CodeWarrior/Standard_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/CodeWarrior/Standard_Suite.py
@@ -175,7 +175,7 @@ class Standard_Suite_Events(Standard_Suite_Events):
 class application(aetools.ComponentItem):
 	"""application - an application program """
 	want = 'capp'
-class user_interaction(aetools.NProperty):
+class _Prop_user_interaction(aetools.NProperty):
 	"""user interaction - user interaction level """
 	which = 'inte'
 	want = 'Inte'
@@ -185,11 +185,11 @@ class user_interaction(aetools.NProperty):
 class character(aetools.ComponentItem):
 	"""character - a character """
 	want = 'cha '
-class length(aetools.NProperty):
+class _Prop_length(aetools.NProperty):
 	"""length - length in characters of this object """
 	which = 'pLen'
 	want = 'long'
-class offset(aetools.NProperty):
+class _Prop_offset(aetools.NProperty):
 	"""offset - offset of a text object from the beginning of the document (first char has offset 1) """
 	which = 'pOff'
 	want = 'long'
@@ -201,7 +201,7 @@ class insertion_point(aetools.ComponentItem):
 class line(aetools.ComponentItem):
 	"""line - lines of text """
 	want = 'clin'
-class index(aetools.NProperty):
+class _Prop_index(aetools.NProperty):
 	"""index - index of a line object from the beginning of the document (first line has index 1) """
 	which = 'pidx'
 	want = 'long'
@@ -212,7 +212,7 @@ lines = line
 class selection_2d_object(aetools.ComponentItem):
 	"""selection-object - the selection visible to the user """
 	want = 'csel'
-class contents(aetools.NProperty):
+class _Prop_contents(aetools.NProperty):
 	"""contents - the contents of the selection """
 	which = 'pcnt'
 	want = 'type'
@@ -231,27 +231,27 @@ class text(aetools.ComponentItem):
 class window(aetools.ComponentItem):
 	"""window - A window """
 	want = 'cwin'
-class bounds(aetools.NProperty):
+class _Prop_bounds(aetools.NProperty):
 	"""bounds - the boundary rectangle for the window """
 	which = 'pbnd'
 	want = 'qdrt'
-class document(aetools.NProperty):
+class _Prop_document(aetools.NProperty):
 	"""document - the document that owns this window """
 	which = 'docu'
 	want = 'docu'
-class name(aetools.NProperty):
+class _Prop_name(aetools.NProperty):
 	"""name - the title of the window """
 	which = 'pnam'
 	want = 'itxt'
-class position(aetools.NProperty):
+class _Prop_position(aetools.NProperty):
 	"""position - upper left coordinates of window """
 	which = 'ppos'
 	want = 'QDpt'
-class visible(aetools.NProperty):
+class _Prop_visible(aetools.NProperty):
 	"""visible - is the window visible? """
 	which = 'pvis'
 	want = 'bool'
-class zoomed(aetools.NProperty):
+class _Prop_zoomed(aetools.NProperty):
 	"""zoomed - Is the window zoomed? """
 	which = 'pzum'
 	want = 'bool'
@@ -261,19 +261,19 @@ windows = window
 class document(aetools.ComponentItem):
 	"""document - a document """
 	want = 'docu'
-class file_permissions(aetools.NProperty):
+class _Prop_file_permissions(aetools.NProperty):
 	"""file permissions - the file permissions for the document """
 	which = 'PERM'
 	want = 'PERM'
-class kind(aetools.NProperty):
+class _Prop_kind(aetools.NProperty):
 	"""kind - the kind of document """
 	which = 'DKND'
 	want = 'DKND'
-class location(aetools.NProperty):
+class _Prop_location(aetools.NProperty):
 	"""location - the file of the document """
 	which = 'FILE'
 	want = 'fss '
-class window(aetools.NProperty):
+class _Prop_window(aetools.NProperty):
 	"""window - the window of the document. """
 	which = 'cwin'
 	want = 'cwin'
@@ -287,7 +287,7 @@ class files(aetools.ComponentItem):
 file = files
 application._superclassnames = []
 application._privpropdict = {
-	'user_interaction' : user_interaction,
+	'user_interaction' : _Prop_user_interaction,
 }
 application._privelemdict = {
 	'document' : document,
@@ -295,32 +295,32 @@ application._privelemdict = {
 }
 character._superclassnames = []
 character._privpropdict = {
-	'length' : length,
-	'offset' : offset,
+	'length' : _Prop_length,
+	'offset' : _Prop_offset,
 }
 character._privelemdict = {
 }
 insertion_point._superclassnames = []
 insertion_point._privpropdict = {
-	'length' : length,
-	'offset' : offset,
+	'length' : _Prop_length,
+	'offset' : _Prop_offset,
 }
 insertion_point._privelemdict = {
 }
 line._superclassnames = []
 line._privpropdict = {
-	'index' : index,
-	'length' : length,
-	'offset' : offset,
+	'index' : _Prop_index,
+	'length' : _Prop_length,
+	'offset' : _Prop_offset,
 }
 line._privelemdict = {
 	'character' : character,
 }
 selection_2d_object._superclassnames = []
 selection_2d_object._privpropdict = {
-	'contents' : contents,
-	'length' : length,
-	'offset' : offset,
+	'contents' : _Prop_contents,
+	'length' : _Prop_length,
+	'offset' : _Prop_offset,
 }
 selection_2d_object._privelemdict = {
 	'character' : character,
@@ -329,8 +329,8 @@ selection_2d_object._privelemdict = {
 }
 text._superclassnames = []
 text._privpropdict = {
-	'length' : length,
-	'offset' : offset,
+	'length' : _Prop_length,
+	'offset' : _Prop_offset,
 }
 text._privelemdict = {
 	'character' : character,
@@ -340,24 +340,24 @@ text._privelemdict = {
 }
 window._superclassnames = []
 window._privpropdict = {
-	'bounds' : bounds,
-	'document' : document,
-	'index' : index,
-	'name' : name,
-	'position' : position,
-	'visible' : visible,
-	'zoomed' : zoomed,
+	'bounds' : _Prop_bounds,
+	'document' : _Prop_document,
+	'index' : _Prop_index,
+	'name' : _Prop_name,
+	'position' : _Prop_position,
+	'visible' : _Prop_visible,
+	'zoomed' : _Prop_zoomed,
 }
 window._privelemdict = {
 }
 document._superclassnames = []
 document._privpropdict = {
-	'file_permissions' : file_permissions,
-	'index' : index,
-	'kind' : kind,
-	'location' : location,
-	'name' : name,
-	'window' : window,
+	'file_permissions' : _Prop_file_permissions,
+	'index' : _Prop_index,
+	'kind' : _Prop_kind,
+	'location' : _Prop_location,
+	'name' : _Prop_name,
+	'window' : _Prop_window,
 }
 document._privelemdict = {
 }
@@ -381,27 +381,3 @@ _classdeclarations = {
 	'docu' : document,
 	'file' : files,
 }
-
-_propdeclarations = {
-	'DKND' : kind,
-	'FILE' : location,
-	'PERM' : file_permissions,
-	'cwin' : window,
-	'docu' : document,
-	'inte' : user_interaction,
-	'pLen' : length,
-	'pOff' : offset,
-	'pbnd' : bounds,
-	'pcnt' : contents,
-	'pidx' : index,
-	'pnam' : name,
-	'ppos' : position,
-	'pvis' : visible,
-	'pzum' : zoomed,
-}
-
-_compdeclarations = {
-}
-
-_enumdeclarations = {
-}
diff --git a/Lib/plat-mac/lib-scriptpackages/CodeWarrior/__init__.py b/Lib/plat-mac/lib-scriptpackages/CodeWarrior/__init__.py
index 7d669bf..a68de96 100644
--- a/Lib/plat-mac/lib-scriptpackages/CodeWarrior/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/CodeWarrior/__init__.py
@@ -47,6 +47,15 @@ import StdSuites
 #
 # 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(Font)
 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 @@ _classdeclarations = {
 	'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/Explorer/Microsoft_Internet_Explorer.py b/Lib/plat-mac/lib-scriptpackages/Explorer/Microsoft_Internet_Explorer.py
index 9ee1691..bcf1120 100644
--- a/Lib/plat-mac/lib-scriptpackages/Explorer/Microsoft_Internet_Explorer.py
+++ b/Lib/plat-mac/lib-scriptpackages/Explorer/Microsoft_Internet_Explorer.py
@@ -85,12 +85,3 @@ class Microsoft_Internet_Explorer_Events:
 #
 _classdeclarations = {
 }
-
-_propdeclarations = {
-}
-
-_compdeclarations = {
-}
-
-_enumdeclarations = {
-}
diff --git a/Lib/plat-mac/lib-scriptpackages/Explorer/Netscape_Suite.py b/Lib/plat-mac/lib-scriptpackages/Explorer/Netscape_Suite.py
index 45b11c6..3d91737 100644
--- a/Lib/plat-mac/lib-scriptpackages/Explorer/Netscape_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Explorer/Netscape_Suite.py
@@ -38,12 +38,3 @@ class Netscape_Suite_Events:
 #
 _classdeclarations = {
 }
-
-_propdeclarations = {
-}
-
-_compdeclarations = {
-}
-
-_enumdeclarations = {
-}
diff --git a/Lib/plat-mac/lib-scriptpackages/Explorer/Required_Suite.py b/Lib/plat-mac/lib-scriptpackages/Explorer/Required_Suite.py
index 83f1851..987da0d 100644
--- a/Lib/plat-mac/lib-scriptpackages/Explorer/Required_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Explorer/Required_Suite.py
@@ -97,12 +97,3 @@ class Required_Suite_Events(Required_Suite_Events):
 #
 _classdeclarations = {
 }
-
-_propdeclarations = {
-}
-
-_compdeclarations = {
-}
-
-_enumdeclarations = {
-}
diff --git a/Lib/plat-mac/lib-scriptpackages/Explorer/Standard_Suite.py b/Lib/plat-mac/lib-scriptpackages/Explorer/Standard_Suite.py
index 9dee0e9..b7aff28 100644
--- a/Lib/plat-mac/lib-scriptpackages/Explorer/Standard_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Explorer/Standard_Suite.py
@@ -42,13 +42,13 @@ class Standard_Suite_Events:
 class application(aetools.ComponentItem):
 	"""application - An application program """
 	want = 'capp'
-class selected_text(aetools.NProperty):
+class _Prop_selected_text(aetools.NProperty):
 	"""selected text - the selected text """
 	which = 'stxt'
 	want = 'TEXT'
 application._superclassnames = []
 application._privpropdict = {
-	'selected_text' : selected_text,
+	'selected_text' : _Prop_selected_text,
 }
 application._privelemdict = {
 }
@@ -59,13 +59,3 @@ application._privelemdict = {
 _classdeclarations = {
 	'capp' : application,
 }
-
-_propdeclarations = {
-	'stxt' : selected_text,
-}
-
-_compdeclarations = {
-}
-
-_enumdeclarations = {
-}
diff --git a/Lib/plat-mac/lib-scriptpackages/Explorer/URL_Suite.py b/Lib/plat-mac/lib-scriptpackages/Explorer/URL_Suite.py
index c3e8c44..1cb939d 100644
--- a/Lib/plat-mac/lib-scriptpackages/Explorer/URL_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Explorer/URL_Suite.py
@@ -43,12 +43,3 @@ class URL_Suite_Events:
 #
 _classdeclarations = {
 }
-
-_propdeclarations = {
-}
-
-_compdeclarations = {
-}
-
-_enumdeclarations = {
-}
diff --git a/Lib/plat-mac/lib-scriptpackages/Explorer/Web_Browser_Suite.py b/Lib/plat-mac/lib-scriptpackages/Explorer/Web_Browser_Suite.py
index d4241b4..3d46135 100644
--- a/Lib/plat-mac/lib-scriptpackages/Explorer/Web_Browser_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Explorer/Web_Browser_Suite.py
@@ -215,12 +215,3 @@ class Web_Browser_Suite_Events:
 #
 _classdeclarations = {
 }
-
-_propdeclarations = {
-}
-
-_compdeclarations = {
-}
-
-_enumdeclarations = {
-}
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/Containers_and_folders.py b/Lib/plat-mac/lib-scriptpackages/Finder/Containers_and_folders.py
index 73cd500..08b9e76 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/Containers_and_folders.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/Containers_and_folders.py
@@ -18,35 +18,35 @@ class Containers_and_folders_Events:
 class disk(aetools.ComponentItem):
 	"""disk - A disk """
 	want = 'cdis'
-class _3c_Inheritance_3e_(aetools.NProperty):
+class _Prop__3c_Inheritance_3e_(aetools.NProperty):
 	"""<Inheritance> - inherits some of its properties from the container class """
 	which = 'c@#^'
 	want = 'ctnr'
-class capacity(aetools.NProperty):
+class _Prop_capacity(aetools.NProperty):
 	"""capacity - the total number of bytes (free or used) on the disk """
 	which = 'capa'
 	want = 'comp'
-class ejectable(aetools.NProperty):
+class _Prop_ejectable(aetools.NProperty):
 	"""ejectable - Can the media be ejected (floppies, CD's, and so on)? """
 	which = 'isej'
 	want = 'bool'
-class format(aetools.NProperty):
+class _Prop_format(aetools.NProperty):
 	"""format - the filesystem format of this disk """
 	which = 'dfmt'
 	want = 'edfm'
-class free_space(aetools.NProperty):
+class _Prop_free_space(aetools.NProperty):
 	"""free space - the number of free bytes left on the disk """
 	which = 'frsp'
 	want = 'comp'
-class ignore_privileges(aetools.NProperty):
+class _Prop_ignore_privileges(aetools.NProperty):
 	"""ignore privileges - Ignore permissions on this disk? """
 	which = 'igpr'
 	want = 'bool'
-class local_volume(aetools.NProperty):
+class _Prop_local_volume(aetools.NProperty):
 	"""local volume - Is the media a local volume (as opposed to a file server)? """
 	which = 'isrv'
 	want = 'bool'
-class startup(aetools.NProperty):
+class _Prop_startup(aetools.NProperty):
 	"""startup - Is this disk the boot disk? """
 	which = 'istd'
 	want = 'bool'
@@ -97,23 +97,23 @@ folders = folder
 class container(aetools.ComponentItem):
 	"""container - An item that contains other items """
 	want = 'ctnr'
-class completely_expanded(aetools.NProperty):
+class _Prop_completely_expanded(aetools.NProperty):
 	"""completely expanded - (NOT AVAILABLE YET) Are the container and all of its children opened as outlines? (can only be set for containers viewed as lists) """
 	which = 'pexc'
 	want = 'bool'
-class container_window(aetools.NProperty):
+class _Prop_container_window(aetools.NProperty):
 	"""container window - the container window for this folder """
 	which = 'cwnd'
 	want = 'obj '
-class entire_contents(aetools.NProperty):
+class _Prop_entire_contents(aetools.NProperty):
 	"""entire contents - the entire contents of the container, including the contents of its children """
 	which = 'ects'
 	want = 'obj '
-class expandable(aetools.NProperty):
+class _Prop_expandable(aetools.NProperty):
 	"""expandable - (NOT AVAILABLE YET) Is the container capable of being expanded as an outline? """
 	which = 'pexa'
 	want = 'bool'
-class expanded(aetools.NProperty):
+class _Prop_expanded(aetools.NProperty):
 	"""expanded - (NOT AVAILABLE YET) Is the container opened as an outline? (can only be set for containers viewed as lists) """
 	which = 'pexp'
 	want = 'bool'
@@ -133,7 +133,7 @@ containers = container
 class trash_2d_object(aetools.ComponentItem):
 	"""trash-object - Trash-object is the class of the \xd2trash\xd3 object """
 	want = 'ctrs'
-class warns_before_emptying(aetools.NProperty):
+class _Prop_warns_before_emptying(aetools.NProperty):
 	"""warns before emptying - Display a dialog when emptying the trash? """
 	which = 'warn'
 	want = 'bool'
@@ -151,14 +151,14 @@ disk._superclassnames = ['container']
 import Files
 import Finder_items
 disk._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'capacity' : capacity,
-	'ejectable' : ejectable,
-	'format' : format,
-	'free_space' : free_space,
-	'ignore_privileges' : ignore_privileges,
-	'local_volume' : local_volume,
-	'startup' : startup,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'capacity' : _Prop_capacity,
+	'ejectable' : _Prop_ejectable,
+	'format' : _Prop_format,
+	'free_space' : _Prop_free_space,
+	'ignore_privileges' : _Prop_ignore_privileges,
+	'local_volume' : _Prop_local_volume,
+	'startup' : _Prop_startup,
 }
 disk._privelemdict = {
 	'alias_file' : Files.alias_file,
@@ -174,7 +174,7 @@ disk._privelemdict = {
 }
 desktop_2d_object._superclassnames = ['container']
 desktop_2d_object._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 desktop_2d_object._privelemdict = {
 	'alias_file' : Files.alias_file,
@@ -191,7 +191,7 @@ desktop_2d_object._privelemdict = {
 }
 folder._superclassnames = ['container']
 folder._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 folder._privelemdict = {
 	'alias_file' : Files.alias_file,
@@ -207,12 +207,12 @@ folder._privelemdict = {
 }
 container._superclassnames = ['item']
 container._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'completely_expanded' : completely_expanded,
-	'container_window' : container_window,
-	'entire_contents' : entire_contents,
-	'expandable' : expandable,
-	'expanded' : expanded,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'completely_expanded' : _Prop_completely_expanded,
+	'container_window' : _Prop_container_window,
+	'entire_contents' : _Prop_entire_contents,
+	'expandable' : _Prop_expandable,
+	'expanded' : _Prop_expanded,
 }
 container._privelemdict = {
 	'alias_file' : Files.alias_file,
@@ -228,8 +228,8 @@ container._privelemdict = {
 }
 trash_2d_object._superclassnames = ['container']
 trash_2d_object._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'warns_before_emptying' : warns_before_emptying,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'warns_before_emptying' : _Prop_warns_before_emptying,
 }
 trash_2d_object._privelemdict = {
 	'alias_file' : Files.alias_file,
@@ -254,26 +254,3 @@ _classdeclarations = {
 	'ctnr' : container,
 	'ctrs' : trash_2d_object,
 }
-
-_propdeclarations = {
-	'c@#^' : _3c_Inheritance_3e_,
-	'capa' : capacity,
-	'cwnd' : container_window,
-	'dfmt' : format,
-	'ects' : entire_contents,
-	'frsp' : free_space,
-	'igpr' : ignore_privileges,
-	'isej' : ejectable,
-	'isrv' : local_volume,
-	'istd' : startup,
-	'pexa' : expandable,
-	'pexc' : completely_expanded,
-	'pexp' : expanded,
-	'warn' : warns_before_emptying,
-}
-
-_compdeclarations = {
-}
-
-_enumdeclarations = {
-}
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/Enumerations.py b/Lib/plat-mac/lib-scriptpackages/Finder/Enumerations.py
index 44eab6d..e87d914 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/Enumerations.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/Enumerations.py
@@ -124,22 +124,3 @@ _Enum_vwby = {
 #
 _classdeclarations = {
 }
-
-_propdeclarations = {
-}
-
-_compdeclarations = {
-}
-
-_enumdeclarations = {
-	'earr' : _Enum_earr,
-	'ecvw' : _Enum_ecvw,
-	'edfm' : _Enum_edfm,
-	'elsv' : _Enum_elsv,
-	'ipnl' : _Enum_ipnl,
-	'isiz' : _Enum_isiz,
-	'lvic' : _Enum_lvic,
-	'priv' : _Enum_priv,
-	'sodr' : _Enum_sodr,
-	'vwby' : _Enum_vwby,
-}
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/Files.py b/Lib/plat-mac/lib-scriptpackages/Finder/Files.py
index b754e6b..37cf458 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/Files.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/Files.py
@@ -18,11 +18,11 @@ class Files_Events:
 class alias_file(aetools.ComponentItem):
 	"""alias file - An alias file (created with \xd2Make Alias\xd3) """
 	want = 'alia'
-class _3c_Inheritance_3e_(aetools.NProperty):
+class _Prop__3c_Inheritance_3e_(aetools.NProperty):
 	"""<Inheritance> - inherits some of its properties from the file class """
 	which = 'c@#^'
 	want = 'file'
-class original_item(aetools.NProperty):
+class _Prop_original_item(aetools.NProperty):
 	"""original item - the original item pointed to by the alias """
 	which = 'orig'
 	want = 'obj '
@@ -32,27 +32,27 @@ alias_files = alias_file
 class application_file(aetools.ComponentItem):
 	"""application file - An application's file on disk """
 	want = 'appf'
-class accepts_high_level_events(aetools.NProperty):
+class _Prop_accepts_high_level_events(aetools.NProperty):
 	"""accepts high level events - Is the application high-level event aware? (OBSOLETE: always returns true) """
 	which = 'isab'
 	want = 'bool'
-class has_scripting_terminology(aetools.NProperty):
+class _Prop_has_scripting_terminology(aetools.NProperty):
 	"""has scripting terminology - Does the process have a scripting terminology, i.e., can it be scripted? """
 	which = 'hscr'
 	want = 'bool'
-class minimum_size(aetools.NProperty):
+class _Prop_minimum_size(aetools.NProperty):
 	"""minimum size - the smallest memory size with which the application can be launched """
 	which = 'mprt'
 	want = 'long'
-class opens_in_Classic(aetools.NProperty):
+class _Prop_opens_in_Classic(aetools.NProperty):
 	"""opens in Classic - Should the application launch in the Classic environment? """
 	which = 'Clsc'
 	want = 'bool'
-class preferred_size(aetools.NProperty):
+class _Prop_preferred_size(aetools.NProperty):
 	"""preferred size - the memory size with which the application will be launched """
 	which = 'appt'
 	want = 'long'
-class suggested_size(aetools.NProperty):
+class _Prop_suggested_size(aetools.NProperty):
 	"""suggested size - the memory size with which the developer recommends the application be launched """
 	which = 'sprt'
 	want = 'long'
@@ -62,7 +62,7 @@ application_files = application_file
 class clipping(aetools.ComponentItem):
 	"""clipping - A clipping """
 	want = 'clpf'
-class clipping_window(aetools.NProperty):
+class _Prop_clipping_window(aetools.NProperty):
 	"""clipping window - (NOT AVAILABLE YET) the clipping window for this clipping """
 	which = 'lwnd'
 	want = 'obj '
@@ -78,23 +78,23 @@ document_files = document_file
 class file(aetools.ComponentItem):
 	"""file - A file """
 	want = 'file'
-class creator_type(aetools.NProperty):
+class _Prop_creator_type(aetools.NProperty):
 	"""creator type - the OSType identifying the application that created the item """
 	which = 'fcrt'
 	want = 'type'
-class file_type(aetools.NProperty):
+class _Prop_file_type(aetools.NProperty):
 	"""file type - the OSType identifying the type of data contained in the item """
 	which = 'asty'
 	want = 'type'
-class product_version(aetools.NProperty):
+class _Prop_product_version(aetools.NProperty):
 	"""product version - the version of the product (visible at the top of the \xd2Get Info\xd3 window) """
 	which = 'ver2'
 	want = 'utxt'
-class stationery(aetools.NProperty):
+class _Prop_stationery(aetools.NProperty):
 	"""stationery - Is the file a stationery pad? """
 	which = 'pspd'
 	want = 'bool'
-class version(aetools.NProperty):
+class _Prop_version(aetools.NProperty):
 	"""version - the version of the file (visible at the bottom of the \xd2Get Info\xd3 window) """
 	which = 'vers'
 	want = 'utxt'
@@ -104,7 +104,7 @@ files = file
 class internet_location_file(aetools.ComponentItem):
 	"""internet location file - An file containing an internet location """
 	want = 'inlf'
-class location(aetools.NProperty):
+class _Prop_location(aetools.NProperty):
 	"""location - the internet location """
 	which = 'iloc'
 	want = 'utxt'
@@ -118,58 +118,58 @@ class package(aetools.ComponentItem):
 packages = package
 alias_file._superclassnames = ['file']
 alias_file._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'original_item' : original_item,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'original_item' : _Prop_original_item,
 }
 alias_file._privelemdict = {
 }
 application_file._superclassnames = ['file']
 application_file._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'accepts_high_level_events' : accepts_high_level_events,
-	'has_scripting_terminology' : has_scripting_terminology,
-	'minimum_size' : minimum_size,
-	'opens_in_Classic' : opens_in_Classic,
-	'preferred_size' : preferred_size,
-	'suggested_size' : suggested_size,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'accepts_high_level_events' : _Prop_accepts_high_level_events,
+	'has_scripting_terminology' : _Prop_has_scripting_terminology,
+	'minimum_size' : _Prop_minimum_size,
+	'opens_in_Classic' : _Prop_opens_in_Classic,
+	'preferred_size' : _Prop_preferred_size,
+	'suggested_size' : _Prop_suggested_size,
 }
 application_file._privelemdict = {
 }
 clipping._superclassnames = ['file']
 clipping._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'clipping_window' : clipping_window,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'clipping_window' : _Prop_clipping_window,
 }
 clipping._privelemdict = {
 }
 document_file._superclassnames = ['file']
 document_file._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 document_file._privelemdict = {
 }
 import Finder_items
 file._superclassnames = ['item']
 file._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'creator_type' : creator_type,
-	'file_type' : file_type,
-	'product_version' : product_version,
-	'stationery' : stationery,
-	'version' : version,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'creator_type' : _Prop_creator_type,
+	'file_type' : _Prop_file_type,
+	'product_version' : _Prop_product_version,
+	'stationery' : _Prop_stationery,
+	'version' : _Prop_version,
 }
 file._privelemdict = {
 }
 internet_location_file._superclassnames = ['file']
 internet_location_file._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'location' : location,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'location' : _Prop_location,
 }
 internet_location_file._privelemdict = {
 }
 package._superclassnames = ['item']
 package._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 package._privelemdict = {
 }
@@ -186,27 +186,3 @@ _classdeclarations = {
 	'inlf' : internet_location_file,
 	'pack' : package,
 }
-
-_propdeclarations = {
-	'Clsc' : opens_in_Classic,
-	'appt' : preferred_size,
-	'asty' : file_type,
-	'c@#^' : _3c_Inheritance_3e_,
-	'fcrt' : creator_type,
-	'hscr' : has_scripting_terminology,
-	'iloc' : location,
-	'isab' : accepts_high_level_events,
-	'lwnd' : clipping_window,
-	'mprt' : minimum_size,
-	'orig' : original_item,
-	'pspd' : stationery,
-	'sprt' : suggested_size,
-	'ver2' : product_version,
-	'vers' : version,
-}
-
-_compdeclarations = {
-}
-
-_enumdeclarations = {
-}
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/Finder_Basics.py b/Lib/plat-mac/lib-scriptpackages/Finder/Finder_Basics.py
index cd9b10d..feb7660 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/Finder_Basics.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/Finder_Basics.py
@@ -61,55 +61,55 @@ class Finder_Basics_Events:
 class application(aetools.ComponentItem):
 	"""application - The Finder """
 	want = 'capp'
-class Finder_preferences(aetools.NProperty):
+class _Prop_Finder_preferences(aetools.NProperty):
 	"""Finder preferences - (NOT AVAILABLE YET) Various preferences that apply to the Finder as a whole """
 	which = 'pfrp'
 	want = 'cprf'
-class clipboard(aetools.NProperty):
+class _Prop_clipboard(aetools.NProperty):
 	"""clipboard - (NOT AVAILABLE YET) the Finder\xd5s clipboard window """
 	which = 'pcli'
 	want = 'obj '
-class desktop(aetools.NProperty):
+class _Prop_desktop(aetools.NProperty):
 	"""desktop - the desktop """
 	which = 'desk'
 	want = 'cdsk'
-class frontmost(aetools.NProperty):
+class _Prop_frontmost(aetools.NProperty):
 	"""frontmost - Is the Finder the frontmost process? """
 	which = 'pisf'
 	want = 'bool'
-class home(aetools.NProperty):
+class _Prop_home(aetools.NProperty):
 	"""home - the home directory """
 	which = 'home'
 	want = 'cfol'
-class insertion_location(aetools.NProperty):
+class _Prop_insertion_location(aetools.NProperty):
 	"""insertion location - the container in which a new folder would appear if \xd2New Folder\xd3 was selected """
 	which = 'pins'
 	want = 'obj '
-class name(aetools.NProperty):
+class _Prop_name(aetools.NProperty):
 	"""name - the Finder\xd5s name """
 	which = 'pnam'
 	want = 'itxt'
-class product_version(aetools.NProperty):
+class _Prop_product_version(aetools.NProperty):
 	"""product version - the version of the System software running on this computer """
 	which = 'ver2'
 	want = 'utxt'
-class selection(aetools.NProperty):
+class _Prop_selection(aetools.NProperty):
 	"""selection - the selection in the frontmost Finder window """
 	which = 'sele'
 	want = 'obj '
-class startup_disk(aetools.NProperty):
+class _Prop_startup_disk(aetools.NProperty):
 	"""startup disk - the startup disk """
 	which = 'sdsk'
 	want = 'cdis'
-class trash(aetools.NProperty):
+class _Prop_trash(aetools.NProperty):
 	"""trash - the trash """
 	which = 'trsh'
 	want = 'ctrs'
-class version(aetools.NProperty):
+class _Prop_version(aetools.NProperty):
 	"""version - the version of the Finder """
 	which = 'vers'
 	want = 'utxt'
-class visible(aetools.NProperty):
+class _Prop_visible(aetools.NProperty):
 	"""visible - Is the Finder\xd5s layer visible? """
 	which = 'pvis'
 	want = 'bool'
@@ -133,19 +133,19 @@ import Window_classes
 import Containers_and_folders
 import Finder_items
 application._privpropdict = {
-	'Finder_preferences' : Finder_preferences,
-	'clipboard' : clipboard,
-	'desktop' : desktop,
-	'frontmost' : frontmost,
-	'home' : home,
-	'insertion_location' : insertion_location,
-	'name' : name,
-	'product_version' : product_version,
-	'selection' : selection,
-	'startup_disk' : startup_disk,
-	'trash' : trash,
-	'version' : version,
-	'visible' : visible,
+	'Finder_preferences' : _Prop_Finder_preferences,
+	'clipboard' : _Prop_clipboard,
+	'desktop' : _Prop_desktop,
+	'frontmost' : _Prop_frontmost,
+	'home' : _Prop_home,
+	'insertion_location' : _Prop_insertion_location,
+	'name' : _Prop_name,
+	'product_version' : _Prop_product_version,
+	'selection' : _Prop_selection,
+	'startup_disk' : _Prop_startup_disk,
+	'trash' : _Prop_trash,
+	'version' : _Prop_version,
+	'visible' : _Prop_visible,
 }
 application._privelemdict = {
 	'Finder_window' : Window_classes.Finder_window,
@@ -170,25 +170,3 @@ application._privelemdict = {
 _classdeclarations = {
 	'capp' : application,
 }
-
-_propdeclarations = {
-	'desk' : desktop,
-	'home' : home,
-	'pcli' : clipboard,
-	'pfrp' : Finder_preferences,
-	'pins' : insertion_location,
-	'pisf' : frontmost,
-	'pnam' : name,
-	'pvis' : visible,
-	'sdsk' : startup_disk,
-	'sele' : selection,
-	'trsh' : trash,
-	'ver2' : product_version,
-	'vers' : version,
-}
-
-_compdeclarations = {
-}
-
-_enumdeclarations = {
-}
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/Finder_items.py b/Lib/plat-mac/lib-scriptpackages/Finder/Finder_items.py
index c7856cf..6f52667 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/Finder_items.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/Finder_items.py
@@ -168,111 +168,111 @@ class Finder_items_Events:
 class item(aetools.ComponentItem):
 	"""item - An item """
 	want = 'cobj'
-class bounds(aetools.NProperty):
+class _Prop_bounds(aetools.NProperty):
 	"""bounds - the bounding rectangle of the item (can only be set for an item in a window viewed as icons or buttons) """
 	which = 'pbnd'
 	want = 'qdrt'
-class comment(aetools.NProperty):
+class _Prop_comment(aetools.NProperty):
 	"""comment - the comment of the item, displayed in the \xd2Get Info\xd3 window """
 	which = 'comt'
 	want = 'utxt'
-class container(aetools.NProperty):
+class _Prop_container(aetools.NProperty):
 	"""container - the container of the item """
 	which = 'ctnr'
 	want = 'obj '
-class creation_date(aetools.NProperty):
+class _Prop_creation_date(aetools.NProperty):
 	"""creation date - the date on which the item was created """
 	which = 'ascd'
 	want = 'ldt '
-class description(aetools.NProperty):
+class _Prop_description(aetools.NProperty):
 	"""description - a description of the item """
 	which = 'dscr'
 	want = 'utxt'
-class disk(aetools.NProperty):
+class _Prop_disk(aetools.NProperty):
 	"""disk - the disk on which the item is stored """
 	which = 'cdis'
 	want = 'obj '
-class displayed_name(aetools.NProperty):
+class _Prop_displayed_name(aetools.NProperty):
 	"""displayed name - the user-visible name of the item """
 	which = 'dnam'
 	want = 'utxt'
-class everyones_privileges(aetools.NProperty):
+class _Prop_everyones_privileges(aetools.NProperty):
 	"""everyones privileges -  """
 	which = 'gstp'
 	want = 'priv'
-class extension_hidden(aetools.NProperty):
+class _Prop_extension_hidden(aetools.NProperty):
 	"""extension hidden - Is the item's extension hidden from the user? """
 	which = 'hidx'
 	want = 'bool'
-class group(aetools.NProperty):
+class _Prop_group(aetools.NProperty):
 	"""group - the user or group that has special access to the container """
 	which = 'sgrp'
 	want = 'utxt'
-class group_privileges(aetools.NProperty):
+class _Prop_group_privileges(aetools.NProperty):
 	"""group privileges -  """
 	which = 'gppr'
 	want = 'priv'
-class icon(aetools.NProperty):
+class _Prop_icon(aetools.NProperty):
 	"""icon - the icon bitmap of the item """
 	which = 'iimg'
 	want = 'ifam'
-class index(aetools.NProperty):
+class _Prop_index(aetools.NProperty):
 	"""index - the index in the front-to-back ordering within its container """
 	which = 'pidx'
 	want = 'long'
-class information_window(aetools.NProperty):
+class _Prop_information_window(aetools.NProperty):
 	"""information window - the information window for the item """
 	which = 'iwnd'
 	want = 'obj '
-class kind(aetools.NProperty):
+class _Prop_kind(aetools.NProperty):
 	"""kind - the kind of the item """
 	which = 'kind'
 	want = 'utxt'
-class label_index(aetools.NProperty):
+class _Prop_label_index(aetools.NProperty):
 	"""label index - the label of the item """
 	which = 'labi'
 	want = 'long'
-class locked(aetools.NProperty):
+class _Prop_locked(aetools.NProperty):
 	"""locked - Is the file locked? """
 	which = 'aslk'
 	want = 'bool'
-class modification_date(aetools.NProperty):
+class _Prop_modification_date(aetools.NProperty):
 	"""modification date - the date on which the item was last modified """
 	which = 'asmo'
 	want = 'ldt '
-class name(aetools.NProperty):
+class _Prop_name(aetools.NProperty):
 	"""name - the name of the item """
 	which = 'pnam'
 	want = 'utxt'
-class name_extension(aetools.NProperty):
+class _Prop_name_extension(aetools.NProperty):
 	"""name extension - the name extension of the item (such as \xd2txt\xd3) """
 	which = 'nmxt'
 	want = 'utxt'
-class owner(aetools.NProperty):
+class _Prop_owner(aetools.NProperty):
 	"""owner - the user that owns the container """
 	which = 'sown'
 	want = 'utxt'
-class owner_privileges(aetools.NProperty):
+class _Prop_owner_privileges(aetools.NProperty):
 	"""owner privileges -  """
 	which = 'ownr'
 	want = 'priv'
-class physical_size(aetools.NProperty):
+class _Prop_physical_size(aetools.NProperty):
 	"""physical size - the actual space used by the item on disk """
 	which = 'phys'
 	want = 'comp'
-class position(aetools.NProperty):
+class _Prop_position(aetools.NProperty):
 	"""position - the position of the item within its parent window (can only be set for an item in a window viewed as icons or buttons) """
 	which = 'posn'
 	want = 'QDpt'
-class properties(aetools.NProperty):
+class _Prop_properties(aetools.NProperty):
 	"""properties - every property of an item """
 	which = 'pALL'
 	want = 'reco'
-class size(aetools.NProperty):
+class _Prop_size(aetools.NProperty):
 	"""size - the logical size of the item """
 	which = 'ptsz'
 	want = 'comp'
-class url(aetools.NProperty):
+class _Prop_url(aetools.NProperty):
 	"""url - the url of the item """
 	which = 'pURL'
 	want = 'utxt'
@@ -280,33 +280,33 @@ class url(aetools.NProperty):
 items = item
 item._superclassnames = []
 item._privpropdict = {
-	'bounds' : bounds,
-	'comment' : comment,
-	'container' : container,
-	'creation_date' : creation_date,
-	'description' : description,
-	'disk' : disk,
-	'displayed_name' : displayed_name,
-	'everyones_privileges' : everyones_privileges,
-	'extension_hidden' : extension_hidden,
-	'group' : group,
-	'group_privileges' : group_privileges,
-	'icon' : icon,
-	'index' : index,
-	'information_window' : information_window,
-	'kind' : kind,
-	'label_index' : label_index,
-	'locked' : locked,
-	'modification_date' : modification_date,
-	'name' : name,
-	'name_extension' : name_extension,
-	'owner' : owner,
-	'owner_privileges' : owner_privileges,
-	'physical_size' : physical_size,
-	'position' : position,
-	'properties' : properties,
-	'size' : size,
-	'url' : url,
+	'bounds' : _Prop_bounds,
+	'comment' : _Prop_comment,
+	'container' : _Prop_container,
+	'creation_date' : _Prop_creation_date,
+	'description' : _Prop_description,
+	'disk' : _Prop_disk,
+	'displayed_name' : _Prop_displayed_name,
+	'everyones_privileges' : _Prop_everyones_privileges,
+	'extension_hidden' : _Prop_extension_hidden,
+	'group' : _Prop_group,
+	'group_privileges' : _Prop_group_privileges,
+	'icon' : _Prop_icon,
+	'index' : _Prop_index,
+	'information_window' : _Prop_information_window,
+	'kind' : _Prop_kind,
+	'label_index' : _Prop_label_index,
+	'locked' : _Prop_locked,
+	'modification_date' : _Prop_modification_date,
+	'name' : _Prop_name,
+	'name_extension' : _Prop_name_extension,
+	'owner' : _Prop_owner,
+	'owner_privileges' : _Prop_owner_privileges,
+	'physical_size' : _Prop_physical_size,
+	'position' : _Prop_position,
+	'properties' : _Prop_properties,
+	'size' : _Prop_size,
+	'url' : _Prop_url,
 }
 item._privelemdict = {
 }
@@ -317,39 +317,3 @@ item._privelemdict = {
 _classdeclarations = {
 	'cobj' : item,
 }
-
-_propdeclarations = {
-	'ascd' : creation_date,
-	'aslk' : locked,
-	'asmo' : modification_date,
-	'cdis' : disk,
-	'comt' : comment,
-	'ctnr' : container,
-	'dnam' : displayed_name,
-	'dscr' : description,
-	'gppr' : group_privileges,
-	'gstp' : everyones_privileges,
-	'hidx' : extension_hidden,
-	'iimg' : icon,
-	'iwnd' : information_window,
-	'kind' : kind,
-	'labi' : label_index,
-	'nmxt' : name_extension,
-	'ownr' : owner_privileges,
-	'pALL' : properties,
-	'pURL' : url,
-	'pbnd' : bounds,
-	'phys' : physical_size,
-	'pidx' : index,
-	'pnam' : name,
-	'posn' : position,
-	'ptsz' : size,
-	'sgrp' : group,
-	'sown' : owner,
-}
-
-_compdeclarations = {
-}
-
-_enumdeclarations = {
-}
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/Legacy_suite.py b/Lib/plat-mac/lib-scriptpackages/Finder/Legacy_suite.py
index cfbb650..9418039 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/Legacy_suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/Legacy_suite.py
@@ -73,7 +73,7 @@ class Legacy_suite_Events:
 class application(aetools.ComponentItem):
 	"""application - The Finder """
 	want = 'capp'
-class desktop_picture(aetools.NProperty):
+class _Prop_desktop_picture(aetools.NProperty):
 	"""desktop picture - the desktop picture of the main monitor """
 	which = 'dpic'
 	want = 'file'
@@ -81,11 +81,11 @@ class desktop_picture(aetools.NProperty):
 class application_process(aetools.ComponentItem):
 	"""application process - A process launched from an application file """
 	want = 'pcap'
-class _3c_Inheritance_3e_(aetools.NProperty):
+class _Prop__3c_Inheritance_3e_(aetools.NProperty):
 	"""<Inheritance> - inherits some of its properties from the process class """
 	which = 'c@#^'
 	want = 'prcs'
-class application_file(aetools.NProperty):
+class _Prop_application_file(aetools.NProperty):
 	"""application file - the application file from which this process was launched """
 	which = 'appf'
 	want = 'appf'
@@ -95,7 +95,7 @@ application_processes = application_process
 class desk_accessory_process(aetools.ComponentItem):
 	"""desk accessory process - A process launched from a desk accessory file """
 	want = 'pcda'
-class desk_accessory_file(aetools.NProperty):
+class _Prop_desk_accessory_file(aetools.NProperty):
 	"""desk accessory file - the desk accessory file from which this process was launched """
 	which = 'dafi'
 	want = 'obj '
@@ -105,47 +105,47 @@ desk_accessory_processes = desk_accessory_process
 class process(aetools.ComponentItem):
 	"""process - A process running on this computer """
 	want = 'prcs'
-class accepts_high_level_events(aetools.NProperty):
+class _Prop_accepts_high_level_events(aetools.NProperty):
 	"""accepts high level events - Is the process high-level event aware (accepts open application, open document, print document, and quit)? """
 	which = 'isab'
 	want = 'bool'
-class accepts_remote_events(aetools.NProperty):
+class _Prop_accepts_remote_events(aetools.NProperty):
 	"""accepts remote events - Does the process accept remote events? """
 	which = 'revt'
 	want = 'bool'
-class creator_type(aetools.NProperty):
+class _Prop_creator_type(aetools.NProperty):
 	"""creator type - the OSType of the creator of the process (the signature) """
 	which = 'fcrt'
 	want = 'type'
-class file(aetools.NProperty):
+class _Prop_file(aetools.NProperty):
 	"""file - the file from which the process was launched """
 	which = 'file'
 	want = 'obj '
-class file_type(aetools.NProperty):
+class _Prop_file_type(aetools.NProperty):
 	"""file type - the OSType of the file type of the process """
 	which = 'asty'
 	want = 'type'
-class frontmost(aetools.NProperty):
+class _Prop_frontmost(aetools.NProperty):
 	"""frontmost - Is the process the frontmost process? """
 	which = 'pisf'
 	want = 'bool'
-class has_scripting_terminology(aetools.NProperty):
+class _Prop_has_scripting_terminology(aetools.NProperty):
 	"""has scripting terminology - Does the process have a scripting terminology, i.e., can it be scripted? """
 	which = 'hscr'
 	want = 'bool'
-class name(aetools.NProperty):
+class _Prop_name(aetools.NProperty):
 	"""name - the name of the process """
 	which = 'pnam'
 	want = 'itxt'
-class partition_space_used(aetools.NProperty):
+class _Prop_partition_space_used(aetools.NProperty):
 	"""partition space used - the number of bytes currently used in the process' partition """
 	which = 'pusd'
 	want = 'long'
-class total_partition_size(aetools.NProperty):
+class _Prop_total_partition_size(aetools.NProperty):
 	"""total partition size - the size of the partition with which the process was launched """
 	which = 'appt'
 	want = 'long'
-class visible(aetools.NProperty):
+class _Prop_visible(aetools.NProperty):
 	"""visible - Is the process' layer visible? """
 	which = 'pvis'
 	want = 'bool'
@@ -153,37 +153,37 @@ class visible(aetools.NProperty):
 processes = process
 application._superclassnames = []
 application._privpropdict = {
-	'desktop_picture' : desktop_picture,
+	'desktop_picture' : _Prop_desktop_picture,
 }
 application._privelemdict = {
 }
 application_process._superclassnames = ['process']
 application_process._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'application_file' : application_file,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'application_file' : _Prop_application_file,
 }
 application_process._privelemdict = {
 }
 desk_accessory_process._superclassnames = ['process']
 desk_accessory_process._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'desk_accessory_file' : desk_accessory_file,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'desk_accessory_file' : _Prop_desk_accessory_file,
 }
 desk_accessory_process._privelemdict = {
 }
 process._superclassnames = []
 process._privpropdict = {
-	'accepts_high_level_events' : accepts_high_level_events,
-	'accepts_remote_events' : accepts_remote_events,
-	'creator_type' : creator_type,
-	'file' : file,
-	'file_type' : file_type,
-	'frontmost' : frontmost,
-	'has_scripting_terminology' : has_scripting_terminology,
-	'name' : name,
-	'partition_space_used' : partition_space_used,
-	'total_partition_size' : total_partition_size,
-	'visible' : visible,
+	'accepts_high_level_events' : _Prop_accepts_high_level_events,
+	'accepts_remote_events' : _Prop_accepts_remote_events,
+	'creator_type' : _Prop_creator_type,
+	'file' : _Prop_file,
+	'file_type' : _Prop_file_type,
+	'frontmost' : _Prop_frontmost,
+	'has_scripting_terminology' : _Prop_has_scripting_terminology,
+	'name' : _Prop_name,
+	'partition_space_used' : _Prop_partition_space_used,
+	'total_partition_size' : _Prop_total_partition_size,
+	'visible' : _Prop_visible,
 }
 process._privelemdict = {
 }
@@ -197,27 +197,3 @@ _classdeclarations = {
 	'pcda' : desk_accessory_process,
 	'prcs' : process,
 }
-
-_propdeclarations = {
-	'appf' : application_file,
-	'appt' : total_partition_size,
-	'asty' : file_type,
-	'c@#^' : _3c_Inheritance_3e_,
-	'dafi' : desk_accessory_file,
-	'dpic' : desktop_picture,
-	'fcrt' : creator_type,
-	'file' : file,
-	'hscr' : has_scripting_terminology,
-	'isab' : accepts_high_level_events,
-	'pisf' : frontmost,
-	'pnam' : name,
-	'pusd' : partition_space_used,
-	'pvis' : visible,
-	'revt' : accepts_remote_events,
-}
-
-_compdeclarations = {
-}
-
-_enumdeclarations = {
-}
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/Standard_Suite.py b/Lib/plat-mac/lib-scriptpackages/Finder/Standard_Suite.py
index bbd4705..b9a172f 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/Standard_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/Standard_Suite.py
@@ -324,12 +324,3 @@ _Enum_bool = None # XXXX enum bool not found!!
 #
 _classdeclarations = {
 }
-
-_propdeclarations = {
-}
-
-_compdeclarations = {
-}
-
-_enumdeclarations = {
-}
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/Type_Definitions.py b/Lib/plat-mac/lib-scriptpackages/Finder/Type_Definitions.py
index 8e57233..6671d69 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/Type_Definitions.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/Type_Definitions.py
@@ -22,15 +22,15 @@ class alias_list(aetools.ComponentItem):
 class label(aetools.ComponentItem):
 	"""label - (NOT AVAILABLE YET) A Finder label (name and color) """
 	want = 'clbl'
-class color(aetools.NProperty):
+class _Prop_color(aetools.NProperty):
 	"""color - the color associated with the label """
 	which = 'colr'
 	want = 'cRGB'
-class index(aetools.NProperty):
+class _Prop_index(aetools.NProperty):
 	"""index - the index in the front-to-back ordering within its container """
 	which = 'pidx'
 	want = 'long'
-class name(aetools.NProperty):
+class _Prop_name(aetools.NProperty):
 	"""name - the name associated with the label """
 	which = 'pnam'
 	want = 'utxt'
@@ -38,87 +38,87 @@ class name(aetools.NProperty):
 class preferences(aetools.ComponentItem):
 	"""preferences - (NOT AVAILABLE, SUBJECT TO CHANGE) The Finder Preferences """
 	want = 'cprf'
-class button_view_arrangement(aetools.NProperty):
+class _Prop_button_view_arrangement(aetools.NProperty):
 	"""button view arrangement - the method of arrangement of icons in default Finder button view windows """
 	which = 'barr'
 	want = 'earr'
-class button_view_icon_size(aetools.NProperty):
+class _Prop_button_view_icon_size(aetools.NProperty):
 	"""button view icon size - the size of icons displayed in Finder button view windows. """
 	which = 'bisz'
 	want = 'long'
-class calculates_folder_sizes(aetools.NProperty):
+class _Prop_calculates_folder_sizes(aetools.NProperty):
 	"""calculates folder sizes - Are folder sizes calculated and displayed in Finder list view windows? """
 	which = 'sfsz'
 	want = 'bool'
-class delay_before_springing(aetools.NProperty):
+class _Prop_delay_before_springing(aetools.NProperty):
 	"""delay before springing - the delay before springing open a container in ticks (1/60th of a second) (12 is shortest delay, 60 is longest delay) """
 	which = 'dela'
 	want = 'shor'
-class list_view_icon_size(aetools.NProperty):
+class _Prop_list_view_icon_size(aetools.NProperty):
 	"""list view icon size - the size of icons displayed in Finder list view windows. """
 	which = 'lisz'
 	want = 'long'
-class shows_comments(aetools.NProperty):
+class _Prop_shows_comments(aetools.NProperty):
 	"""shows comments - Are comments displayed in default Finder list view windows? """
 	which = 'scom'
 	want = 'bool'
-class shows_creation_date(aetools.NProperty):
+class _Prop_shows_creation_date(aetools.NProperty):
 	"""shows creation date - Are creation dates displayed in default Finder list view windows? """
 	which = 'scda'
 	want = 'bool'
-class shows_kind(aetools.NProperty):
+class _Prop_shows_kind(aetools.NProperty):
 	"""shows kind - Are document kinds displayed in default Finder list view windows? """
 	which = 'sknd'
 	want = 'bool'
-class shows_label(aetools.NProperty):
+class _Prop_shows_label(aetools.NProperty):
 	"""shows label - Are labels displayed in default Finder list view windows? """
 	which = 'slbl'
 	want = 'bool'
-class shows_modification_date(aetools.NProperty):
+class _Prop_shows_modification_date(aetools.NProperty):
 	"""shows modification date - Are modification dates displayed in default Finder list view windows? """
 	which = 'sdat'
 	want = 'bool'
-class shows_size(aetools.NProperty):
+class _Prop_shows_size(aetools.NProperty):
 	"""shows size - Are file sizes displayed in default Finder list view windows? """
 	which = 'ssiz'
 	want = 'bool'
-class shows_version(aetools.NProperty):
+class _Prop_shows_version(aetools.NProperty):
 	"""shows version - Are file versions displayed in default Finder list view windows? """
 	which = 'svrs'
 	want = 'bool'
-class spatial_view_arrangement(aetools.NProperty):
+class _Prop_spatial_view_arrangement(aetools.NProperty):
 	"""spatial view arrangement - the method of arrangement of icons in default Finder spatial view windows """
 	which = 'iarr'
 	want = 'earr'
-class spatial_view_icon_size(aetools.NProperty):
+class _Prop_spatial_view_icon_size(aetools.NProperty):
 	"""spatial view icon size - the size of icons displayed in Finder spatial view windows. """
 	which = 'iisz'
 	want = 'long'
-class spring_open_folders(aetools.NProperty):
+class _Prop_spring_open_folders(aetools.NProperty):
 	"""spring open folders - Spring open folders after the specified delay? """
 	which = 'sprg'
 	want = 'bool'
-class uses_relative_dates(aetools.NProperty):
+class _Prop_uses_relative_dates(aetools.NProperty):
 	"""uses relative dates - Are relative dates (e.g., today, yesterday) shown  in Finder list view windows? """
 	which = 'urdt'
 	want = 'bool'
-class uses_simple_menus(aetools.NProperty):
+class _Prop_uses_simple_menus(aetools.NProperty):
 	"""uses simple menus - Use simplified Finder menus? """
 	which = 'usme'
 	want = 'bool'
-class uses_wide_grid(aetools.NProperty):
+class _Prop_uses_wide_grid(aetools.NProperty):
 	"""uses wide grid - Space icons on a wide grid? """
 	which = 'uswg'
 	want = 'bool'
-class view_font(aetools.NProperty):
+class _Prop_view_font(aetools.NProperty):
 	"""view font - the id of the font used in Finder views. """
 	which = 'vfnt'
 	want = 'long'
-class view_font_size(aetools.NProperty):
+class _Prop_view_font_size(aetools.NProperty):
 	"""view font size - the size of the font used in Finder views """
 	which = 'vfsz'
 	want = 'long'
-class window(aetools.NProperty):
+class _Prop_window(aetools.NProperty):
 	"""window - the window that would open if Finder preferences was opened """
 	which = 'cwin'
 	want = 'pwnd'
@@ -128,8 +128,8 @@ class icon_view_options(aetools.ComponentItem):
 	"""icon view options - the icon view options """
 	want = 'icop'
 
-arrangement = spatial_view_arrangement
-class icon_size(aetools.NProperty):
+_Prop_arrangement = _Prop_spatial_view_arrangement
+class _Prop_icon_size(aetools.NProperty):
 	"""icon size - the size of icons displayed in the icon view """
 	which = 'lvis'
 	want = 'shor'
@@ -137,41 +137,41 @@ class icon_size(aetools.NProperty):
 class icon_family(aetools.ComponentItem):
 	"""icon family - (NOT AVAILABLE YET) A family of icons """
 	want = 'ifam'
-class large_32_bit_icon(aetools.NProperty):
+class _Prop_large_32_bit_icon(aetools.NProperty):
 	"""large 32 bit icon - the large 32-bit color icon """
 	which = 'il32'
 	want = 'il32'
-class large_4_bit_icon(aetools.NProperty):
+class _Prop_large_4_bit_icon(aetools.NProperty):
 	"""large 4 bit icon - the large 4-bit color icon """
 	which = 'icl4'
 	want = 'icl4'
-class large_8_bit_icon(aetools.NProperty):
+class _Prop_large_8_bit_icon(aetools.NProperty):
 	"""large 8 bit icon - the large 8-bit color icon """
 	which = 'icl8'
 	want = 'icl8'
-class large_8_bit_mask(aetools.NProperty):
+class _Prop_large_8_bit_mask(aetools.NProperty):
 	"""large 8 bit mask - the large 8-bit mask for large 32-bit icons """
 	which = 'l8mk'
 	want = 'l8mk'
-class large_monochrome_icon_and_mask(aetools.NProperty):
+class _Prop_large_monochrome_icon_and_mask(aetools.NProperty):
 	"""large monochrome icon and mask - the large black-and-white icon and the mask for large icons """
 	which = 'ICN#'
 	want = 'ICN#'
-class small_32_bit_icon(aetools.NProperty):
+class _Prop_small_32_bit_icon(aetools.NProperty):
 	"""small 32 bit icon - the small 32-bit color icon """
 	which = 'is32'
 	want = 'is32'
-class small_4_bit_icon(aetools.NProperty):
+class _Prop_small_4_bit_icon(aetools.NProperty):
 	"""small 4 bit icon - the small 4-bit color icon """
 	which = 'ics4'
 	want = 'ics4'
-class small_8_bit_icon(aetools.NProperty):
+class _Prop_small_8_bit_icon(aetools.NProperty):
 	"""small 8 bit icon - the small 8-bit color icon """
 	which = 'ics8'
 	want = 'ics8'
 
-small_8_bit_mask = small_8_bit_icon
-class small_monochrome_icon_and_mask(aetools.NProperty):
+_Prop_small_8_bit_mask = _Prop_small_8_bit_icon
+class _Prop_small_monochrome_icon_and_mask(aetools.NProperty):
 	"""small monochrome icon and mask - the small black-and-white icon and the mask for small icons """
 	which = 'ics#'
 	want = 'ics#'
@@ -179,15 +179,15 @@ class small_monochrome_icon_and_mask(aetools.NProperty):
 class column(aetools.ComponentItem):
 	"""column - a column of a list view """
 	want = 'lvcl'
-class sort_direction(aetools.NProperty):
+class _Prop_sort_direction(aetools.NProperty):
 	"""sort direction - The direction in which the window is sorted """
 	which = 'sord'
 	want = 'sodr'
-class visible(aetools.NProperty):
+class _Prop_visible(aetools.NProperty):
 	"""visible - is this column visible """
 	which = 'pvis'
 	want = 'bool'
-class width(aetools.NProperty):
+class _Prop_width(aetools.NProperty):
 	"""width - the width of this column """
 	which = 'clwd'
 	want = 'shor'
@@ -197,7 +197,7 @@ columns = column
 class list_view_options(aetools.ComponentItem):
 	"""list view options - the list view options """
 	want = 'lvop'
-class sort_column(aetools.NProperty):
+class _Prop_sort_column(aetools.NProperty):
 	"""sort column - the column that the list view is sorted on """
 	which = 'srtc'
 	want = 'lvcl'
@@ -209,77 +209,77 @@ alias_list._privelemdict = {
 }
 label._superclassnames = []
 label._privpropdict = {
-	'color' : color,
-	'index' : index,
-	'name' : name,
+	'color' : _Prop_color,
+	'index' : _Prop_index,
+	'name' : _Prop_name,
 }
 label._privelemdict = {
 }
 preferences._superclassnames = []
 preferences._privpropdict = {
-	'button_view_arrangement' : button_view_arrangement,
-	'button_view_icon_size' : button_view_icon_size,
-	'calculates_folder_sizes' : calculates_folder_sizes,
-	'delay_before_springing' : delay_before_springing,
-	'list_view_icon_size' : list_view_icon_size,
-	'shows_comments' : shows_comments,
-	'shows_creation_date' : shows_creation_date,
-	'shows_kind' : shows_kind,
-	'shows_label' : shows_label,
-	'shows_modification_date' : shows_modification_date,
-	'shows_size' : shows_size,
-	'shows_version' : shows_version,
-	'spatial_view_arrangement' : spatial_view_arrangement,
-	'spatial_view_icon_size' : spatial_view_icon_size,
-	'spring_open_folders' : spring_open_folders,
-	'uses_relative_dates' : uses_relative_dates,
-	'uses_simple_menus' : uses_simple_menus,
-	'uses_wide_grid' : uses_wide_grid,
-	'view_font' : view_font,
-	'view_font_size' : view_font_size,
-	'window' : window,
+	'button_view_arrangement' : _Prop_button_view_arrangement,
+	'button_view_icon_size' : _Prop_button_view_icon_size,
+	'calculates_folder_sizes' : _Prop_calculates_folder_sizes,
+	'delay_before_springing' : _Prop_delay_before_springing,
+	'list_view_icon_size' : _Prop_list_view_icon_size,
+	'shows_comments' : _Prop_shows_comments,
+	'shows_creation_date' : _Prop_shows_creation_date,
+	'shows_kind' : _Prop_shows_kind,
+	'shows_label' : _Prop_shows_label,
+	'shows_modification_date' : _Prop_shows_modification_date,
+	'shows_size' : _Prop_shows_size,
+	'shows_version' : _Prop_shows_version,
+	'spatial_view_arrangement' : _Prop_spatial_view_arrangement,
+	'spatial_view_icon_size' : _Prop_spatial_view_icon_size,
+	'spring_open_folders' : _Prop_spring_open_folders,
+	'uses_relative_dates' : _Prop_uses_relative_dates,
+	'uses_simple_menus' : _Prop_uses_simple_menus,
+	'uses_wide_grid' : _Prop_uses_wide_grid,
+	'view_font' : _Prop_view_font,
+	'view_font_size' : _Prop_view_font_size,
+	'window' : _Prop_window,
 }
 preferences._privelemdict = {
 	'label' : label,
 }
 icon_view_options._superclassnames = []
 icon_view_options._privpropdict = {
-	'arrangement' : arrangement,
-	'icon_size' : icon_size,
+	'arrangement' : _Prop_arrangement,
+	'icon_size' : _Prop_icon_size,
 }
 icon_view_options._privelemdict = {
 }
 icon_family._superclassnames = []
 icon_family._privpropdict = {
-	'large_32_bit_icon' : large_32_bit_icon,
-	'large_4_bit_icon' : large_4_bit_icon,
-	'large_8_bit_icon' : large_8_bit_icon,
-	'large_8_bit_mask' : large_8_bit_mask,
-	'large_monochrome_icon_and_mask' : large_monochrome_icon_and_mask,
-	'small_32_bit_icon' : small_32_bit_icon,
-	'small_4_bit_icon' : small_4_bit_icon,
-	'small_8_bit_icon' : small_8_bit_icon,
-	'small_8_bit_mask' : small_8_bit_mask,
-	'small_monochrome_icon_and_mask' : small_monochrome_icon_and_mask,
+	'large_32_bit_icon' : _Prop_large_32_bit_icon,
+	'large_4_bit_icon' : _Prop_large_4_bit_icon,
+	'large_8_bit_icon' : _Prop_large_8_bit_icon,
+	'large_8_bit_mask' : _Prop_large_8_bit_mask,
+	'large_monochrome_icon_and_mask' : _Prop_large_monochrome_icon_and_mask,
+	'small_32_bit_icon' : _Prop_small_32_bit_icon,
+	'small_4_bit_icon' : _Prop_small_4_bit_icon,
+	'small_8_bit_icon' : _Prop_small_8_bit_icon,
+	'small_8_bit_mask' : _Prop_small_8_bit_mask,
+	'small_monochrome_icon_and_mask' : _Prop_small_monochrome_icon_and_mask,
 }
 icon_family._privelemdict = {
 }
 column._superclassnames = []
 column._privpropdict = {
-	'index' : index,
-	'name' : name,
-	'sort_direction' : sort_direction,
-	'visible' : visible,
-	'width' : width,
+	'index' : _Prop_index,
+	'name' : _Prop_name,
+	'sort_direction' : _Prop_sort_direction,
+	'visible' : _Prop_visible,
+	'width' : _Prop_width,
 }
 column._privelemdict = {
 }
 list_view_options._superclassnames = []
 list_view_options._privpropdict = {
-	'calculates_folder_sizes' : calculates_folder_sizes,
-	'icon_size' : icon_size,
-	'sort_column' : sort_column,
-	'uses_relative_dates' : uses_relative_dates,
+	'calculates_folder_sizes' : _Prop_calculates_folder_sizes,
+	'icon_size' : _Prop_icon_size,
+	'sort_column' : _Prop_sort_column,
+	'uses_relative_dates' : _Prop_uses_relative_dates,
 }
 list_view_options._privelemdict = {
 	'column' : column,
@@ -297,50 +297,3 @@ _classdeclarations = {
 	'lvcl' : column,
 	'lvop' : list_view_options,
 }
-
-_propdeclarations = {
-	'ICN#' : large_monochrome_icon_and_mask,
-	'barr' : button_view_arrangement,
-	'bisz' : button_view_icon_size,
-	'clwd' : width,
-	'colr' : color,
-	'cwin' : window,
-	'dela' : delay_before_springing,
-	'iarr' : spatial_view_arrangement,
-	'icl4' : large_4_bit_icon,
-	'icl8' : large_8_bit_icon,
-	'ics#' : small_monochrome_icon_and_mask,
-	'ics4' : small_4_bit_icon,
-	'ics8' : small_8_bit_icon,
-	'iisz' : spatial_view_icon_size,
-	'il32' : large_32_bit_icon,
-	'is32' : small_32_bit_icon,
-	'l8mk' : large_8_bit_mask,
-	'lisz' : list_view_icon_size,
-	'lvis' : icon_size,
-	'pidx' : index,
-	'pnam' : name,
-	'pvis' : visible,
-	'scda' : shows_creation_date,
-	'scom' : shows_comments,
-	'sdat' : shows_modification_date,
-	'sfsz' : calculates_folder_sizes,
-	'sknd' : shows_kind,
-	'slbl' : shows_label,
-	'sord' : sort_direction,
-	'sprg' : spring_open_folders,
-	'srtc' : sort_column,
-	'ssiz' : shows_size,
-	'svrs' : shows_version,
-	'urdt' : uses_relative_dates,
-	'usme' : uses_simple_menus,
-	'uswg' : uses_wide_grid,
-	'vfnt' : view_font,
-	'vfsz' : view_font_size,
-}
-
-_compdeclarations = {
-}
-
-_enumdeclarations = {
-}
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/Window_classes.py b/Lib/plat-mac/lib-scriptpackages/Finder/Window_classes.py
index 205b972..73062f1 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/Window_classes.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/Window_classes.py
@@ -18,23 +18,23 @@ class Window_classes_Events:
 class Finder_window(aetools.ComponentItem):
 	"""Finder window - A file viewer window """
 	want = 'brow'
-class _3c_Inheritance_3e_(aetools.NProperty):
+class _Prop__3c_Inheritance_3e_(aetools.NProperty):
 	"""<Inheritance> - inherits some of its properties from the window class """
 	which = 'c@#^'
 	want = 'cwin'
-class current_view(aetools.NProperty):
+class _Prop_current_view(aetools.NProperty):
 	"""current view - the current view for the container window """
 	which = 'pvew'
 	want = 'ecvw'
-class icon_view_options(aetools.NProperty):
+class _Prop_icon_view_options(aetools.NProperty):
 	"""icon view options - the icon view options for the container window """
 	which = 'icop'
 	want = 'icop'
-class list_view_options(aetools.NProperty):
+class _Prop_list_view_options(aetools.NProperty):
 	"""list view options - the list view options for the container window """
 	which = 'lvop'
 	want = 'lvop'
-class target(aetools.NProperty):
+class _Prop_target(aetools.NProperty):
 	"""target - the container at which this file viewer is targeted """
 	which = 'fvtg'
 	want = 'obj '
@@ -44,67 +44,67 @@ Finder_windows = Finder_window
 class window(aetools.ComponentItem):
 	"""window - A window """
 	want = 'cwin'
-class bounds(aetools.NProperty):
+class _Prop_bounds(aetools.NProperty):
 	"""bounds - the boundary rectangle for the window """
 	which = 'pbnd'
 	want = 'qdrt'
-class closeable(aetools.NProperty):
+class _Prop_closeable(aetools.NProperty):
 	"""closeable - Does the window have a close box? """
 	which = 'hclb'
 	want = 'bool'
-class collapsed(aetools.NProperty):
+class _Prop_collapsed(aetools.NProperty):
 	"""collapsed - Is the window collapsed """
 	which = 'wshd'
 	want = 'bool'
-class floating(aetools.NProperty):
+class _Prop_floating(aetools.NProperty):
 	"""floating - Does the window have a title bar? """
 	which = 'isfl'
 	want = 'bool'
-class id(aetools.NProperty):
+class _Prop_id(aetools.NProperty):
 	"""id - the unique id for this window """
 	which = 'ID  '
 	want = 'magn'
-class index(aetools.NProperty):
+class _Prop_index(aetools.NProperty):
 	"""index - the number of the window in the front-to-back layer ordering """
 	which = 'pidx'
 	want = 'long'
-class modal(aetools.NProperty):
+class _Prop_modal(aetools.NProperty):
 	"""modal - Is the window modal? """
 	which = 'pmod'
 	want = 'bool'
-class name(aetools.NProperty):
+class _Prop_name(aetools.NProperty):
 	"""name - the name of the window """
 	which = 'pnam'
 	want = 'utxt'
-class position(aetools.NProperty):
+class _Prop_position(aetools.NProperty):
 	"""position - the upper left position of the window """
 	which = 'posn'
 	want = 'QDpt'
-class properties(aetools.NProperty):
+class _Prop_properties(aetools.NProperty):
 	"""properties - every property of a window """
 	which = 'pALL'
 	want = 'reco'
-class resizable(aetools.NProperty):
+class _Prop_resizable(aetools.NProperty):
 	"""resizable - Is the window resizable? """
 	which = 'prsz'
 	want = 'bool'
-class titled(aetools.NProperty):
+class _Prop_titled(aetools.NProperty):
 	"""titled - Does the window have a title bar? """
 	which = 'ptit'
 	want = 'bool'
-class visible(aetools.NProperty):
+class _Prop_visible(aetools.NProperty):
 	"""visible - Is the window visible (always true for open Finder windows)? """
 	which = 'pvis'
 	want = 'bool'
-class zoomable(aetools.NProperty):
+class _Prop_zoomable(aetools.NProperty):
 	"""zoomable - Is the window zoomable? """
 	which = 'iszm'
 	want = 'bool'
-class zoomed(aetools.NProperty):
+class _Prop_zoomed(aetools.NProperty):
 	"""zoomed - Is the window zoomed? """
 	which = 'pzum'
 	want = 'bool'
-class zoomed_full_size(aetools.NProperty):
+class _Prop_zoomed_full_size(aetools.NProperty):
 	"""zoomed full size - Is the window zoomed to the full size of the screen? (can only be set, not read) """
 	which = 'zumf'
 	want = 'bool'
@@ -114,11 +114,11 @@ windows = window
 class information_window(aetools.ComponentItem):
 	"""information window - An inspector window (opened by \xd2Show Info\xd3) """
 	want = 'iwnd'
-class current_panel(aetools.NProperty):
+class _Prop_current_panel(aetools.NProperty):
 	"""current panel - the current panel in the information window """
 	which = 'panl'
 	want = 'ipnl'
-class item(aetools.NProperty):
+class _Prop_item(aetools.NProperty):
 	"""item - the item from which this window was opened """
 	which = 'cobj'
 	want = 'obj '
@@ -134,53 +134,53 @@ class preferences_window(aetools.ComponentItem):
 	want = 'pwnd'
 Finder_window._superclassnames = ['window']
 Finder_window._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'current_view' : current_view,
-	'icon_view_options' : icon_view_options,
-	'list_view_options' : list_view_options,
-	'target' : target,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'current_view' : _Prop_current_view,
+	'icon_view_options' : _Prop_icon_view_options,
+	'list_view_options' : _Prop_list_view_options,
+	'target' : _Prop_target,
 }
 Finder_window._privelemdict = {
 }
 window._superclassnames = []
 window._privpropdict = {
-	'bounds' : bounds,
-	'closeable' : closeable,
-	'collapsed' : collapsed,
-	'floating' : floating,
-	'id' : id,
-	'index' : index,
-	'modal' : modal,
-	'name' : name,
-	'position' : position,
-	'properties' : properties,
-	'resizable' : resizable,
-	'titled' : titled,
-	'visible' : visible,
-	'zoomable' : zoomable,
-	'zoomed' : zoomed,
-	'zoomed_full_size' : zoomed_full_size,
+	'bounds' : _Prop_bounds,
+	'closeable' : _Prop_closeable,
+	'collapsed' : _Prop_collapsed,
+	'floating' : _Prop_floating,
+	'id' : _Prop_id,
+	'index' : _Prop_index,
+	'modal' : _Prop_modal,
+	'name' : _Prop_name,
+	'position' : _Prop_position,
+	'properties' : _Prop_properties,
+	'resizable' : _Prop_resizable,
+	'titled' : _Prop_titled,
+	'visible' : _Prop_visible,
+	'zoomable' : _Prop_zoomable,
+	'zoomed' : _Prop_zoomed,
+	'zoomed_full_size' : _Prop_zoomed_full_size,
 }
 window._privelemdict = {
 }
 information_window._superclassnames = ['window']
 information_window._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'current_panel' : current_panel,
-	'item' : item,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'current_panel' : _Prop_current_panel,
+	'item' : _Prop_item,
 }
 information_window._privelemdict = {
 }
 clipping_window._superclassnames = ['window']
 clipping_window._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 clipping_window._privelemdict = {
 }
 preferences_window._superclassnames = ['window']
 preferences_window._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'current_panel' : current_panel,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'current_panel' : _Prop_current_panel,
 }
 preferences_window._privelemdict = {
 }
@@ -195,35 +195,3 @@ _classdeclarations = {
 	'lwnd' : clipping_window,
 	'pwnd' : preferences_window,
 }
-
-_propdeclarations = {
-	'ID  ' : id,
-	'c@#^' : _3c_Inheritance_3e_,
-	'cobj' : item,
-	'fvtg' : target,
-	'hclb' : closeable,
-	'icop' : icon_view_options,
-	'isfl' : floating,
-	'iszm' : zoomable,
-	'lvop' : list_view_options,
-	'pALL' : properties,
-	'panl' : current_panel,
-	'pbnd' : bounds,
-	'pidx' : index,
-	'pmod' : modal,
-	'pnam' : name,
-	'posn' : position,
-	'prsz' : resizable,
-	'ptit' : titled,
-	'pvew' : current_view,
-	'pvis' : visible,
-	'pzum' : zoomed,
-	'wshd' : collapsed,
-	'zumf' : zoomed_full_size,
-}
-
-_compdeclarations = {
-}
-
-_enumdeclarations = {
-}
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/__init__.py b/Lib/plat-mac/lib-scriptpackages/Finder/__init__.py
index c5f6a7f..80d1cbb 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/__init__.py
@@ -67,13 +67,13 @@ import StdSuites
 #
 # Set property and element dictionaries now that all classes have been defined
 #
-getbaseclasses(item)
 getbaseclasses(application)
 getbaseclasses(trash_2d_object)
 getbaseclasses(desktop_2d_object)
 getbaseclasses(container)
 getbaseclasses(folder)
 getbaseclasses(disk)
+getbaseclasses(item)
 getbaseclasses(package)
 getbaseclasses(file)
 getbaseclasses(application_file)
@@ -86,6 +86,10 @@ getbaseclasses(Finder_window)
 getbaseclasses(window)
 getbaseclasses(clipping_window)
 getbaseclasses(information_window)
+getbaseclasses(process)
+getbaseclasses(application_process)
+getbaseclasses(desk_accessory_process)
+getbaseclasses(application)
 getbaseclasses(icon_view_options)
 getbaseclasses(label)
 getbaseclasses(column)
@@ -93,10 +97,6 @@ getbaseclasses(preferences)
 getbaseclasses(alias_list)
 getbaseclasses(icon_family)
 getbaseclasses(list_view_options)
-getbaseclasses(process)
-getbaseclasses(application_process)
-getbaseclasses(desk_accessory_process)
-getbaseclasses(application)
 getbaseclasses(StdSuites.Type_Names_Suite.double_integer)
 getbaseclasses(StdSuites.Type_Names_Suite.version)
 getbaseclasses(StdSuites.Type_Names_Suite.RGB16_color)
@@ -132,7 +132,7 @@ getbaseclasses(StdSuites.Type_Names_Suite.type_parameter_info)
 getbaseclasses(StdSuites.Type_Names_Suite.extended_real)
 getbaseclasses(StdSuites.Type_Names_Suite.long_rectangle)
 getbaseclasses(StdSuites.Type_Names_Suite.dash_style)
-getbaseclasses(StdSuites.Type_Names_Suite.plain_text)
+getbaseclasses(StdSuites.Type_Names_Suite.string)
 getbaseclasses(StdSuites.Type_Names_Suite.small_real)
 getbaseclasses(StdSuites.Type_Names_Suite.null)
 getbaseclasses(StdSuites.Type_Names_Suite.location_reference)
@@ -142,13 +142,13 @@ getbaseclasses(StdSuites.Type_Names_Suite.bounding_rectangle)
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'cobj' : item,
 	'capp' : application,
 	'ctrs' : trash_2d_object,
 	'cdsk' : desktop_2d_object,
 	'ctnr' : container,
 	'cfol' : folder,
 	'cdis' : disk,
+	'cobj' : item,
 	'pack' : package,
 	'file' : file,
 	'appf' : application_file,
@@ -161,6 +161,10 @@ _classdeclarations = {
 	'cwin' : window,
 	'lwnd' : clipping_window,
 	'iwnd' : information_window,
+	'prcs' : process,
+	'pcap' : application_process,
+	'pcda' : desk_accessory_process,
+	'capp' : application,
 	'icop' : icon_view_options,
 	'clbl' : label,
 	'lvcl' : column,
@@ -168,10 +172,6 @@ _classdeclarations = {
 	'alst' : alias_list,
 	'ifam' : icon_family,
 	'lvop' : list_view_options,
-	'prcs' : process,
-	'pcap' : application_process,
-	'pcda' : desk_accessory_process,
-	'capp' : application,
 	'comp' : StdSuites.Type_Names_Suite.double_integer,
 	'vers' : StdSuites.Type_Names_Suite.version,
 	'tr16' : StdSuites.Type_Names_Suite.RGB16_color,
@@ -207,7 +207,7 @@ _classdeclarations = {
 	'exte' : StdSuites.Type_Names_Suite.extended_real,
 	'lrct' : StdSuites.Type_Names_Suite.long_rectangle,
 	'tdas' : StdSuites.Type_Names_Suite.dash_style,
-	'TEXT' : StdSuites.Type_Names_Suite.plain_text,
+	'TEXT' : StdSuites.Type_Names_Suite.string,
 	'sing' : StdSuites.Type_Names_Suite.small_real,
 	'null' : StdSuites.Type_Names_Suite.null,
 	'insl' : StdSuites.Type_Names_Suite.location_reference,
diff --git a/Lib/plat-mac/lib-scriptpackages/Netscape/Mozilla_suite.py b/Lib/plat-mac/lib-scriptpackages/Netscape/Mozilla_suite.py
index c179154..8d3de6c 100644
--- a/Lib/plat-mac/lib-scriptpackages/Netscape/Mozilla_suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Netscape/Mozilla_suite.py
@@ -255,15 +255,3 @@ _Enum_ncmd = {
 #
 _classdeclarations = {
 }
-
-_propdeclarations = {
-}
-
-_compdeclarations = {
-}
-
-_enumdeclarations = {
-	'comp' : _Enum_comp,
-	'dire' : _Enum_dire,
-	'ncmd' : _Enum_ncmd,
-}
diff --git a/Lib/plat-mac/lib-scriptpackages/Netscape/PowerPlant.py b/Lib/plat-mac/lib-scriptpackages/Netscape/PowerPlant.py
index d69b987..515715a 100644
--- a/Lib/plat-mac/lib-scriptpackages/Netscape/PowerPlant.py
+++ b/Lib/plat-mac/lib-scriptpackages/Netscape/PowerPlant.py
@@ -74,13 +74,3 @@ _Enum_dbac = {
 #
 _classdeclarations = {
 }
-
-_propdeclarations = {
-}
-
-_compdeclarations = {
-}
-
-_enumdeclarations = {
-	'dbac' : _Enum_dbac,
-}
diff --git a/Lib/plat-mac/lib-scriptpackages/Netscape/Required_suite.py b/Lib/plat-mac/lib-scriptpackages/Netscape/Required_suite.py
index 553b538..8ae504e 100644
--- a/Lib/plat-mac/lib-scriptpackages/Netscape/Required_suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Netscape/Required_suite.py
@@ -97,12 +97,3 @@ class Required_suite_Events(Required_Suite_Events):
 #
 _classdeclarations = {
 }
-
-_propdeclarations = {
-}
-
-_compdeclarations = {
-}
-
-_enumdeclarations = {
-}
diff --git a/Lib/plat-mac/lib-scriptpackages/Netscape/Standard_Suite.py b/Lib/plat-mac/lib-scriptpackages/Netscape/Standard_Suite.py
index 5e62104..96305a3 100644
--- a/Lib/plat-mac/lib-scriptpackages/Netscape/Standard_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Netscape/Standard_Suite.py
@@ -104,11 +104,11 @@ class Standard_Suite_Events(Standard_Suite_Events):
 class application(aetools.ComponentItem):
 	"""application - An application program """
 	want = 'capp'
-class alert_application(aetools.NProperty):
+class _Prop_alert_application(aetools.NProperty):
 	"""alert application - Most of the alerts will be sent to this application using yet unspecified AE interface. We need a few alert boxes: alert, confirm and notify. Any ideas on how to design this event? mailto:atotic@netscape.com. I\xd5d like to conform to the standard. """
 	which = 'ALAP'
 	want = 'type'
-class kiosk_mode(aetools.NProperty):
+class _Prop_kiosk_mode(aetools.NProperty):
 	"""kiosk mode - Kiosk mode leaves very few menus enabled """
 	which = 'KOSK'
 	want = 'long'
@@ -117,91 +117,91 @@ class kiosk_mode(aetools.NProperty):
 class window(aetools.ComponentItem):
 	"""window - A Window """
 	want = 'cwin'
-class URL(aetools.NProperty):
+class _Prop_URL(aetools.NProperty):
 	"""URL - Current URL """
 	which = 'curl'
 	want = 'TEXT'
-class bounds(aetools.NProperty):
+class _Prop_bounds(aetools.NProperty):
 	"""bounds - the boundary rectangle for the window """
 	which = 'pbnd'
 	want = 'qdrt'
-class busy(aetools.NProperty):
+class _Prop_busy(aetools.NProperty):
 	"""busy - Is window loading something right now. 2, window is busy and will reject load requests. 1, window is busy, but will interrupt outstanding loads """
 	which = 'busy'
 	want = 'long'
-class closeable(aetools.NProperty):
+class _Prop_closeable(aetools.NProperty):
 	"""closeable - Does the window have a close box? """
 	which = 'hclb'
 	want = 'bool'
-class floating(aetools.NProperty):
+class _Prop_floating(aetools.NProperty):
 	"""floating - Does the window float? """
 	which = 'isfl'
 	want = 'bool'
-class index(aetools.NProperty):
+class _Prop_index(aetools.NProperty):
 	"""index - the number of the window """
 	which = 'pidx'
 	want = 'long'
-class modal(aetools.NProperty):
+class _Prop_modal(aetools.NProperty):
 	"""modal - Is the window modal? """
 	which = 'pmod'
 	want = 'bool'
-class name(aetools.NProperty):
+class _Prop_name(aetools.NProperty):
 	"""name - the title of the window """
 	which = 'pnam'
 	want = 'itxt'
-class position(aetools.NProperty):
+class _Prop_position(aetools.NProperty):
 	"""position - upper left coordinates of window """
 	which = 'ppos'
 	want = 'QDpt'
-class resizable(aetools.NProperty):
+class _Prop_resizable(aetools.NProperty):
 	"""resizable - Is the window resizable? """
 	which = 'prsz'
 	want = 'bool'
-class titled(aetools.NProperty):
+class _Prop_titled(aetools.NProperty):
 	"""titled - Does the window have a title bar? """
 	which = 'ptit'
 	want = 'bool'
-class unique_ID(aetools.NProperty):
+class _Prop_unique_ID(aetools.NProperty):
 	"""unique ID - Window\xd5s unique ID (a bridge between WWW! suite window id\xd5s and standard AE windows) """
 	which = 'wiid'
 	want = 'long'
-class visible(aetools.NProperty):
+class _Prop_visible(aetools.NProperty):
 	"""visible - is the window visible? """
 	which = 'pvis'
 	want = 'bool'
-class zoomable(aetools.NProperty):
+class _Prop_zoomable(aetools.NProperty):
 	"""zoomable - Is the window zoomable? """
 	which = 'iszm'
 	want = 'bool'
-class zoomed(aetools.NProperty):
+class _Prop_zoomed(aetools.NProperty):
 	"""zoomed - Is the window zoomed? """
 	which = 'pzum'
 	want = 'bool'
 application._superclassnames = []
 application._privpropdict = {
-	'alert_application' : alert_application,
-	'kiosk_mode' : kiosk_mode,
+	'alert_application' : _Prop_alert_application,
+	'kiosk_mode' : _Prop_kiosk_mode,
 }
 application._privelemdict = {
 	'window' : window,
 }
 window._superclassnames = []
 window._privpropdict = {
-	'URL' : URL,
-	'bounds' : bounds,
-	'busy' : busy,
-	'closeable' : closeable,
-	'floating' : floating,
-	'index' : index,
-	'modal' : modal,
-	'name' : name,
-	'position' : position,
-	'resizable' : resizable,
-	'titled' : titled,
-	'unique_ID' : unique_ID,
-	'visible' : visible,
-	'zoomable' : zoomable,
-	'zoomed' : zoomed,
+	'URL' : _Prop_URL,
+	'bounds' : _Prop_bounds,
+	'busy' : _Prop_busy,
+	'closeable' : _Prop_closeable,
+	'floating' : _Prop_floating,
+	'index' : _Prop_index,
+	'modal' : _Prop_modal,
+	'name' : _Prop_name,
+	'position' : _Prop_position,
+	'resizable' : _Prop_resizable,
+	'titled' : _Prop_titled,
+	'unique_ID' : _Prop_unique_ID,
+	'visible' : _Prop_visible,
+	'zoomable' : _Prop_zoomable,
+	'zoomed' : _Prop_zoomed,
 }
 window._privelemdict = {
 }
@@ -213,29 +213,3 @@ _classdeclarations = {
 	'capp' : application,
 	'cwin' : window,
 }
-
-_propdeclarations = {
-	'ALAP' : alert_application,
-	'KOSK' : kiosk_mode,
-	'busy' : busy,
-	'curl' : URL,
-	'hclb' : closeable,
-	'isfl' : floating,
-	'iszm' : zoomable,
-	'pbnd' : bounds,
-	'pidx' : index,
-	'pmod' : modal,
-	'pnam' : name,
-	'ppos' : position,
-	'prsz' : resizable,
-	'ptit' : titled,
-	'pvis' : visible,
-	'pzum' : zoomed,
-	'wiid' : unique_ID,
-}
-
-_compdeclarations = {
-}
-
-_enumdeclarations = {
-}
diff --git a/Lib/plat-mac/lib-scriptpackages/Netscape/Standard_URL_suite.py b/Lib/plat-mac/lib-scriptpackages/Netscape/Standard_URL_suite.py
index ab29665..aca22b4 100644
--- a/Lib/plat-mac/lib-scriptpackages/Netscape/Standard_URL_suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Netscape/Standard_URL_suite.py
@@ -49,12 +49,3 @@ class Standard_URL_suite_Events:
 #
 _classdeclarations = {
 }
-
-_propdeclarations = {
-}
-
-_compdeclarations = {
-}
-
-_enumdeclarations = {
-}
diff --git a/Lib/plat-mac/lib-scriptpackages/Netscape/Text.py b/Lib/plat-mac/lib-scriptpackages/Netscape/Text.py
index 25fbd03..487c8db 100644
--- a/Lib/plat-mac/lib-scriptpackages/Netscape/Text.py
+++ b/Lib/plat-mac/lib-scriptpackages/Netscape/Text.py
@@ -19,23 +19,23 @@ class Text_Events(Text_Suite_Events):
 class text(aetools.ComponentItem):
 	"""text - independent text view objects """
 	want = 'ctxt'
-class beginning(aetools.NProperty):
+class _Prop_beginning(aetools.NProperty):
 	"""beginning - Beginning of element """
 	which = 'bgng'
 	want = 'obj '
-class end(aetools.NProperty):
+class _Prop_end(aetools.NProperty):
 	"""end - Ending of element """
 	which = 'end '
 	want = 'obj '
-class infront(aetools.NProperty):
+class _Prop_infront(aetools.NProperty):
 	"""infront - Immediately before element """
 	which = 'pBef'
 	want = 'obj '
-class justbehind(aetools.NProperty):
+class _Prop_justbehind(aetools.NProperty):
 	"""justbehind - Immediately after element """
 	which = 'pAft'
 	want = 'obj '
-class updateLevel(aetools.NProperty):
+class _Prop_updateLevel(aetools.NProperty):
 	"""updateLevel - updating level.  Can only be incremented or decremented.  Do so only in a try block -- if the level is greater than zero, visual text updating will cease. """
 	which = 'pUpL'
 	want = 'long'
@@ -44,27 +44,27 @@ class updateLevel(aetools.NProperty):
 class styleset(aetools.ComponentItem):
 	"""styleset - A style \xd2set\xd3 that may be used repeatedly in text objects. """
 	want = 'stys'
-class color(aetools.NProperty):
+class _Prop_color(aetools.NProperty):
 	"""color - the color """
 	which = 'colr'
 	want = 'RGB '
-class font(aetools.NProperty):
+class _Prop_font(aetools.NProperty):
 	"""font - font name """
 	which = 'font'
 	want = 'TEXT'
-class name(aetools.NProperty):
+class _Prop_name(aetools.NProperty):
 	"""name - style name """
 	which = 'pnam'
 	want = 'TEXT'
-class size(aetools.NProperty):
+class _Prop_size(aetools.NProperty):
 	"""size - the size in points """
 	which = 'ptsz'
 	want = 'long'
-class style(aetools.NProperty):
+class _Prop_style(aetools.NProperty):
 	"""style - the text styles or face attributes """
 	which = 'txst'
 	want = 'tsty'
-class writing_code(aetools.NProperty):
+class _Prop_writing_code(aetools.NProperty):
 	"""writing code - the script system and language """
 	which = 'psct'
 	want = 'tsty'
@@ -72,23 +72,23 @@ class writing_code(aetools.NProperty):
 stylesets = styleset
 text._superclassnames = []
 text._privpropdict = {
-	'beginning' : beginning,
-	'end' : end,
-	'infront' : infront,
-	'justbehind' : justbehind,
-	'updateLevel' : updateLevel,
+	'beginning' : _Prop_beginning,
+	'end' : _Prop_end,
+	'infront' : _Prop_infront,
+	'justbehind' : _Prop_justbehind,
+	'updateLevel' : _Prop_updateLevel,
 }
 text._privelemdict = {
 	'styleset' : styleset,
 }
 styleset._superclassnames = []
 styleset._privpropdict = {
-	'color' : color,
-	'font' : font,
-	'name' : name,
-	'size' : size,
-	'style' : style,
-	'writing_code' : writing_code,
+	'color' : _Prop_color,
+	'font' : _Prop_font,
+	'name' : _Prop_name,
+	'size' : _Prop_size,
+	'style' : _Prop_style,
+	'writing_code' : _Prop_writing_code,
 }
 styleset._privelemdict = {
 }
@@ -100,23 +100,3 @@ _classdeclarations = {
 	'ctxt' : text,
 	'stys' : styleset,
 }
-
-_propdeclarations = {
-	'bgng' : beginning,
-	'colr' : color,
-	'end ' : end,
-	'font' : font,
-	'pAft' : justbehind,
-	'pBef' : infront,
-	'pUpL' : updateLevel,
-	'pnam' : name,
-	'psct' : writing_code,
-	'ptsz' : size,
-	'txst' : style,
-}
-
-_compdeclarations = {
-}
-
-_enumdeclarations = {
-}
diff --git a/Lib/plat-mac/lib-scriptpackages/Netscape/WorldWideWeb_suite.py b/Lib/plat-mac/lib-scriptpackages/Netscape/WorldWideWeb_suite.py
index 5b70464..9f032c3 100644
--- a/Lib/plat-mac/lib-scriptpackages/Netscape/WorldWideWeb_suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Netscape/WorldWideWeb_suite.py
@@ -415,12 +415,3 @@ class WorldWideWeb_suite_Events:
 #
 _classdeclarations = {
 }
-
-_propdeclarations = {
-}
-
-_compdeclarations = {
-}
-
-_enumdeclarations = {
-}
diff --git a/Lib/plat-mac/lib-scriptpackages/Netscape/__init__.py b/Lib/plat-mac/lib-scriptpackages/Netscape/__init__.py
index 514a390..8a82216 100644
--- a/Lib/plat-mac/lib-scriptpackages/Netscape/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/Netscape/__init__.py
@@ -61,8 +61,6 @@ import StdSuites
 #
 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.line)
 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 @@ getbaseclasses(StdSuites.Text_Suite.text)
 _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 @@ _classdeclarations = {
 	'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/AppleScript_Suite.py b/Lib/plat-mac/lib-scriptpackages/StdSuites/AppleScript_Suite.py
index 24ad562..fffa39f 100644
--- a/Lib/plat-mac/lib-scriptpackages/StdSuites/AppleScript_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/StdSuites/AppleScript_Suite.py
@@ -791,55 +791,55 @@ RGB_color = RGB_colors
 class application(aetools.ComponentItem):
 	"""application - specifies global properties of AppleScript """
 	want = 'capp'
-class AppleScript(aetools.NProperty):
+class _Prop_AppleScript(aetools.NProperty):
 	"""AppleScript - the top-level script object """
 	which = 'ascr'
 	want = 'scpt'
-class days(aetools.NProperty):
+class _Prop_days(aetools.NProperty):
 	"""days - the number of seconds in a day """
 	which = 'days'
 	want = 'long'
-class hours(aetools.NProperty):
+class _Prop_hours(aetools.NProperty):
 	"""hours - the number of seconds in an hour """
 	which = 'hour'
 	want = 'long'
-class minutes(aetools.NProperty):
+class _Prop_minutes(aetools.NProperty):
 	"""minutes - the number of seconds in a minute """
 	which = 'min '
 	want = 'long'
-class pi(aetools.NProperty):
+class _Prop_pi(aetools.NProperty):
 	"""pi - the constant pi """
 	which = 'pi  '
 	want = 'doub'
-class print_depth(aetools.NProperty):
+class _Prop_print_depth(aetools.NProperty):
 	"""print depth - the maximum depth to print """
 	which = 'prdp'
 	want = 'long'
-class print_length(aetools.NProperty):
+class _Prop_print_length(aetools.NProperty):
 	"""print length - the maximum length to print """
 	which = 'prln'
 	want = 'long'
-class result(aetools.NProperty):
+class _Prop_result(aetools.NProperty):
 	"""result - the last result of evaluation """
 	which = 'rslt'
 	want = '****'
-class return_(aetools.NProperty):
+class _Prop_return_(aetools.NProperty):
 	"""return - a return character """
 	which = 'ret '
 	want = 'cha '
-class space(aetools.NProperty):
+class _Prop_space(aetools.NProperty):
 	"""space - a space character """
 	which = 'spac'
 	want = 'cha '
-class tab(aetools.NProperty):
+class _Prop_tab(aetools.NProperty):
 	"""tab - a tab character """
 	which = 'tab '
 	want = 'cha '
-class text_item_delimiters(aetools.NProperty):
+class _Prop_text_item_delimiters(aetools.NProperty):
 	"""text item delimiters - the text item delimiters of a string """
 	which = 'txdl'
 	want = 'list'
-class weeks(aetools.NProperty):
+class _Prop_weeks(aetools.NProperty):
 	"""weeks - the number of seconds in a week """
 	which = 'week'
 	want = 'long'
@@ -871,11 +871,11 @@ character = characters
 class writing_code_info(aetools.ComponentItem):
 	"""writing code info - script code and language code of text run """
 	want = 'citl'
-class language_code(aetools.NProperty):
+class _Prop_language_code(aetools.NProperty):
 	"""language code - the language code for the text """
 	which = 'plcd'
 	want = 'shor'
-class script_code(aetools.NProperty):
+class _Prop_script_code(aetools.NProperty):
 	"""script code - the script code for the text """
 	which = 'pscd'
 	want = 'shor'
@@ -903,7 +903,7 @@ centimetres = centimeters
 class item(aetools.ComponentItem):
 	"""item - An item of any type """
 	want = 'cobj'
-class id(aetools.NProperty):
+class _Prop_id(aetools.NProperty):
 	"""id - the unique ID number of this object """
 	which = 'ID  '
 	want = 'long'
@@ -1041,15 +1041,15 @@ kilometres = kilometers
 class keystroke(aetools.ComponentItem):
 	"""keystroke - a press of a key combination on a Macintosh keyboard """
 	want = 'kprs'
-class key(aetools.NProperty):
+class _Prop_key(aetools.NProperty):
 	"""key - the character for the key was pressed (ignoring modifiers) """
 	which = 'kMsg'
 	want = 'cha '
-class key_kind(aetools.NProperty):
+class _Prop_key_kind(aetools.NProperty):
 	"""key kind - the kind of key that was pressed """
 	which = 'kknd'
 	want = 'ekst'
-class modifiers(aetools.NProperty):
+class _Prop_modifiers(aetools.NProperty):
 	"""modifiers - the modifier keys pressed in combination """
 	which = 'kMod'
 	want = 'eMds'
@@ -1063,31 +1063,31 @@ class pounds(aetools.ComponentItem):
 class date(aetools.ComponentItem):
 	"""date - Absolute date and time values """
 	want = 'ldt '
-class date_string(aetools.NProperty):
+class _Prop_date_string(aetools.NProperty):
 	"""date string - the date portion of a date-time value as text """
 	which = 'dstr'
 	want = 'TEXT'
-class day(aetools.NProperty):
+class _Prop_day(aetools.NProperty):
 	"""day - the day of the month of a date """
 	which = 'day '
 	want = 'long'
-class month(aetools.NProperty):
+class _Prop_month(aetools.NProperty):
 	"""month - the month of a date """
 	which = 'mnth'
 	want = 'mnth'
-class time(aetools.NProperty):
+class _Prop_time(aetools.NProperty):
 	"""time - the time since midnight of a date """
 	which = 'time'
 	want = 'long'
-class time_string(aetools.NProperty):
+class _Prop_time_string(aetools.NProperty):
 	"""time string - the time portion of a date-time value as text """
 	which = 'tstr'
 	want = 'TEXT'
-class weekday(aetools.NProperty):
+class _Prop_weekday(aetools.NProperty):
 	"""weekday - the day of a week of a date """
 	which = 'wkdy'
 	want = 'wkdy'
-class year(aetools.NProperty):
+class _Prop_year(aetools.NProperty):
 	"""year - the year of a date """
 	which = 'year'
 	want = 'long'
@@ -1097,15 +1097,15 @@ dates = date
 class list(aetools.ComponentItem):
 	"""list - An ordered collection of items """
 	want = 'list'
-class length(aetools.NProperty):
+class _Prop_length(aetools.NProperty):
 	"""length - the length of a list """
 	which = 'leng'
 	want = 'long'
-class rest(aetools.NProperty):
+class _Prop_rest(aetools.NProperty):
 	"""rest - all items of the list excluding first """
 	which = 'rest'
 	want = 'list'
-class reverse(aetools.NProperty):
+class _Prop_reverse(aetools.NProperty):
 	"""reverse - the items of the list in reverse order """
 	which = 'rvse'
 	want = 'list'
@@ -1221,7 +1221,7 @@ class ounces(aetools.ComponentItem):
 class class_(aetools.ComponentItem):
 	"""class - the type of a value """
 	want = 'pcls'
-class _3c_Inheritance_3e_(aetools.NProperty):
+class _Prop__3c_Inheritance_3e_(aetools.NProperty):
 	"""<Inheritance> - inherits some of its properties from this class """
 	which = 'c@#^'
 	want = 'type'
@@ -1275,11 +1275,11 @@ class seconds(aetools.ComponentItem):
 class script(aetools.ComponentItem):
 	"""script - An AppleScript script """
 	want = 'scpt'
-class name(aetools.NProperty):
+class _Prop_name(aetools.NProperty):
 	"""name - the name of the script """
 	which = 'pnam'
 	want = 'TEXT'
-class parent(aetools.NProperty):
+class _Prop_parent(aetools.NProperty):
 	"""parent - its parent, i.e. the script that will handle events that this script doesn\xd5t """
 	which = 'pare'
 	want = 'scpt'
@@ -1443,19 +1443,19 @@ RGB_colors._privelemdict = {
 }
 application._superclassnames = []
 application._privpropdict = {
-	'AppleScript' : AppleScript,
-	'days' : days,
-	'hours' : hours,
-	'minutes' : minutes,
-	'pi' : pi,
-	'print_depth' : print_depth,
-	'print_length' : print_length,
-	'result' : result,
-	'return_' : return_,
-	'space' : space,
-	'tab' : tab,
-	'text_item_delimiters' : text_item_delimiters,
-	'weeks' : weeks,
+	'AppleScript' : _Prop_AppleScript,
+	'days' : _Prop_days,
+	'hours' : _Prop_hours,
+	'minutes' : _Prop_minutes,
+	'pi' : _Prop_pi,
+	'print_depth' : _Prop_print_depth,
+	'print_length' : _Prop_print_length,
+	'result' : _Prop_result,
+	'return_' : _Prop_return_,
+	'space' : _Prop_space,
+	'tab' : _Prop_tab,
+	'text_item_delimiters' : _Prop_text_item_delimiters,
+	'weeks' : _Prop_weeks,
 }
 application._privelemdict = {
 }
@@ -1481,8 +1481,8 @@ characters._privelemdict = {
 }
 writing_code_info._superclassnames = []
 writing_code_info._privpropdict = {
-	'language_code' : language_code,
-	'script_code' : script_code,
+	'language_code' : _Prop_language_code,
+	'script_code' : _Prop_script_code,
 }
 writing_code_info._privelemdict = {
 }
@@ -1503,7 +1503,7 @@ centimeters._privelemdict = {
 }
 item._superclassnames = []
 item._privpropdict = {
-	'id' : id,
+	'id' : _Prop_id,
 }
 item._privelemdict = {
 }
@@ -1649,9 +1649,9 @@ kilometers._privelemdict = {
 }
 keystroke._superclassnames = []
 keystroke._privpropdict = {
-	'key' : key,
-	'key_kind' : key_kind,
-	'modifiers' : modifiers,
+	'key' : _Prop_key,
+	'key_kind' : _Prop_key_kind,
+	'modifiers' : _Prop_modifiers,
 }
 keystroke._privelemdict = {
 }
@@ -1662,21 +1662,21 @@ pounds._privelemdict = {
 }
 date._superclassnames = []
 date._privpropdict = {
-	'date_string' : date_string,
-	'day' : day,
-	'month' : month,
-	'time' : time,
-	'time_string' : time_string,
-	'weekday' : weekday,
-	'year' : year,
+	'date_string' : _Prop_date_string,
+	'day' : _Prop_day,
+	'month' : _Prop_month,
+	'time' : _Prop_time,
+	'time_string' : _Prop_time_string,
+	'weekday' : _Prop_weekday,
+	'year' : _Prop_year,
 }
 date._privelemdict = {
 }
 list._superclassnames = []
 list._privpropdict = {
-	'length' : length,
-	'rest' : rest,
-	'reverse' : reverse,
+	'length' : _Prop_length,
+	'rest' : _Prop_rest,
+	'reverse' : _Prop_reverse,
 }
 list._privelemdict = {
 }
@@ -1687,7 +1687,7 @@ liters._privelemdict = {
 }
 linked_list._superclassnames = []
 linked_list._privpropdict = {
-	'length' : length,
+	'length' : _Prop_length,
 }
 linked_list._privelemdict = {
 }
@@ -1793,7 +1793,7 @@ ounces._privelemdict = {
 }
 class_._superclassnames = ['type_class']
 class_._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 class_._privelemdict = {
 }
@@ -1844,8 +1844,8 @@ seconds._privelemdict = {
 }
 script._superclassnames = []
 script._privpropdict = {
-	'name' : name,
-	'parent' : parent,
+	'name' : _Prop_name,
+	'parent' : _Prop_parent,
 }
 script._privelemdict = {
 }
@@ -1946,7 +1946,7 @@ Unicode_text._privelemdict = {
 }
 vector._superclassnames = []
 vector._privpropdict = {
-	'length' : length,
+	'length' : _Prop_length,
 }
 vector._privelemdict = {
 }
@@ -2147,49 +2147,3 @@ _classdeclarations = {
 	'yard' : yards,
 	'zone' : zones,
 }
-
-_propdeclarations = {
-	'ID  ' : id,
-	'ascr' : AppleScript,
-	'c@#^' : _3c_Inheritance_3e_,
-	'day ' : day,
-	'days' : days,
-	'dstr' : date_string,
-	'hour' : hours,
-	'kMod' : modifiers,
-	'kMsg' : key,
-	'kknd' : key_kind,
-	'leng' : length,
-	'min ' : minutes,
-	'mnth' : month,
-	'pare' : parent,
-	'pi  ' : pi,
-	'plcd' : language_code,
-	'pnam' : name,
-	'prdp' : print_depth,
-	'prln' : print_length,
-	'pscd' : script_code,
-	'rest' : rest,
-	'ret ' : return_,
-	'rslt' : result,
-	'rvse' : reverse,
-	'spac' : space,
-	'tab ' : tab,
-	'time' : time,
-	'tstr' : time_string,
-	'txdl' : text_item_delimiters,
-	'week' : weeks,
-	'wkdy' : weekday,
-	'year' : year,
-}
-
-_compdeclarations = {
-}
-
-_enumdeclarations = {
-	'boov' : _Enum_boov,
-	'cons' : _Enum_cons,
-	'eMds' : _Enum_eMds,
-	'ekst' : _Enum_ekst,
-	'misc' : _Enum_misc,
-}
diff --git a/Lib/plat-mac/lib-scriptpackages/StdSuites/Macintosh_Connectivity_Clas.py b/Lib/plat-mac/lib-scriptpackages/StdSuites/Macintosh_Connectivity_Clas.py
index f520a9c..c78079c 100644
--- a/Lib/plat-mac/lib-scriptpackages/StdSuites/Macintosh_Connectivity_Clas.py
+++ b/Lib/plat-mac/lib-scriptpackages/StdSuites/Macintosh_Connectivity_Clas.py
@@ -18,11 +18,11 @@ class Macintosh_Connectivity_Clas_Events:
 class ADB_address(aetools.ComponentItem):
 	"""ADB address - Addresses a device connected via Apple Desktop Bus """
 	want = 'cadb'
-class _3c_inheritance_3e_(aetools.NProperty):
+class _Prop__3c_inheritance_3e_(aetools.NProperty):
 	"""<inheritance> - inherits some of its properties from this class """
 	which = 'c@#^'
 	want = 'cadr'
-class ID(aetools.NProperty):
+class _Prop_ID(aetools.NProperty):
 	"""ID - the Apple Desktop Bus device ID """
 	which = 'ID  '
 	want = 'shor'
@@ -32,15 +32,15 @@ ADB_addresses = ADB_address
 class address_specification(aetools.ComponentItem):
 	"""address specification - Unique designation of a device or service connected to this computer """
 	want = 'cadr'
-class conduit(aetools.NProperty):
+class _Prop_conduit(aetools.NProperty):
 	"""conduit - How the addressee is physically connected """
 	which = 'pcon'
 	want = 'econ'
-class properties(aetools.NProperty):
+class _Prop_properties(aetools.NProperty):
 	"""properties - property that allows getting and setting of multiple properties """
 	which = 'pALL'
 	want = 'reco'
-class protocol(aetools.NProperty):
+class _Prop_protocol(aetools.NProperty):
 	"""protocol - How to talk to this addressee """
 	which = 'pprt'
 	want = 'epro'
@@ -50,15 +50,15 @@ address_specifications = address_specification
 class AppleTalk_address(aetools.ComponentItem):
 	"""AppleTalk address - Addresses a device or service connected via the AppleTalk protocol """
 	want = 'cat '
-class AppleTalk_machine(aetools.NProperty):
+class _Prop_AppleTalk_machine(aetools.NProperty):
 	"""AppleTalk machine - the machine name part of the address """
 	which = 'patm'
 	want = 'TEXT'
-class AppleTalk_type(aetools.NProperty):
+class _Prop_AppleTalk_type(aetools.NProperty):
 	"""AppleTalk type - the type part of the AppleTalk address """
 	which = 'patt'
 	want = 'TEXT'
-class AppleTalk_zone(aetools.NProperty):
+class _Prop_AppleTalk_zone(aetools.NProperty):
 	"""AppleTalk zone - the zone part of the address """
 	which = 'patz'
 	want = 'TEXT'
@@ -74,11 +74,11 @@ bus_slots = bus_slot
 class device_specification(aetools.ComponentItem):
 	"""device specification - A device connected to a computer """
 	want = 'cdev'
-class device_address(aetools.NProperty):
+class _Prop_device_address(aetools.NProperty):
 	"""device address - the address of the device """
 	which = 'pdva'
 	want = 'cadr'
-class device_type(aetools.NProperty):
+class _Prop_device_type(aetools.NProperty):
 	"""device type - the kind of device """
 	which = 'pdvt'
 	want = 'edvt'
@@ -100,11 +100,11 @@ FireWire_addresses = FireWire_address
 class IP_address(aetools.ComponentItem):
 	"""IP address - Addresses a device or service via the Internet Protocol (IP) """
 	want = 'cip '
-class DNS_form(aetools.NProperty):
+class _Prop_DNS_form(aetools.NProperty):
 	"""DNS form - the address in the form "apple.com" """
 	which = 'pdns'
 	want = 'TEXT'
-class port(aetools.NProperty):
+class _Prop_port(aetools.NProperty):
 	"""port - the port number of the service or client being addressed """
 	which = 'ppor'
 	want = 'TEXT'
@@ -114,15 +114,15 @@ IP_addresses = IP_address
 class LocalTalk_address(aetools.ComponentItem):
 	"""LocalTalk address - Addresses a device by its LocalTalk address """
 	want = 'clt '
-class network(aetools.NProperty):
+class _Prop_network(aetools.NProperty):
 	"""network - the LocalTalk network number """
 	which = 'pnet'
 	want = 'shor'
-class node(aetools.NProperty):
+class _Prop_node(aetools.NProperty):
 	"""node - the LocalTalk node number """
 	which = 'pnod'
 	want = 'shor'
-class socket(aetools.NProperty):
+class _Prop_socket(aetools.NProperty):
 	"""socket - the LocalTalk socket number """
 	which = 'psoc'
 	want = 'shor'
@@ -132,11 +132,11 @@ LocalTalk_addresses = LocalTalk_address
 class SCSI_address(aetools.ComponentItem):
 	"""SCSI address - Addresses a SCSI device """
 	want = 'cscs'
-class LUN(aetools.NProperty):
+class _Prop_LUN(aetools.NProperty):
 	"""LUN - the SCSI logical unit number """
 	which = 'pslu'
 	want = 'shor'
-class SCSI_bus(aetools.NProperty):
+class _Prop_SCSI_bus(aetools.NProperty):
 	"""SCSI bus - the SCSI bus number """
 	which = 'pscb'
 	want = 'shor'
@@ -152,7 +152,7 @@ Token_Ring_addresses = Token_Ring_address
 class USB_address(aetools.ComponentItem):
 	"""USB address - Addresses a device on the Universal Serial Bus """
 	want = 'cusb'
-class name(aetools.NProperty):
+class _Prop_name(aetools.NProperty):
 	"""name - the USB device name """
 	which = 'pnam'
 	want = 'TEXT'
@@ -160,95 +160,95 @@ class name(aetools.NProperty):
 USB_Addresses = USB_address
 ADB_address._superclassnames = ['address_specification']
 ADB_address._privpropdict = {
-	'ID' : ID,
-	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
+	'ID' : _Prop_ID,
+	'_3c_inheritance_3e_' : _Prop__3c_inheritance_3e_,
 }
 ADB_address._privelemdict = {
 }
 address_specification._superclassnames = []
 address_specification._privpropdict = {
-	'conduit' : conduit,
-	'properties' : properties,
-	'protocol' : protocol,
+	'conduit' : _Prop_conduit,
+	'properties' : _Prop_properties,
+	'protocol' : _Prop_protocol,
 }
 address_specification._privelemdict = {
 }
 AppleTalk_address._superclassnames = ['address_specification']
 AppleTalk_address._privpropdict = {
-	'AppleTalk_machine' : AppleTalk_machine,
-	'AppleTalk_type' : AppleTalk_type,
-	'AppleTalk_zone' : AppleTalk_zone,
-	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
+	'AppleTalk_machine' : _Prop_AppleTalk_machine,
+	'AppleTalk_type' : _Prop_AppleTalk_type,
+	'AppleTalk_zone' : _Prop_AppleTalk_zone,
+	'_3c_inheritance_3e_' : _Prop__3c_inheritance_3e_,
 }
 AppleTalk_address._privelemdict = {
 }
 bus_slot._superclassnames = ['address_specification']
 bus_slot._privpropdict = {
-	'ID' : ID,
-	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
+	'ID' : _Prop_ID,
+	'_3c_inheritance_3e_' : _Prop__3c_inheritance_3e_,
 }
 bus_slot._privelemdict = {
 }
 device_specification._superclassnames = []
 device_specification._privpropdict = {
-	'device_address' : device_address,
-	'device_type' : device_type,
-	'properties' : properties,
+	'device_address' : _Prop_device_address,
+	'device_type' : _Prop_device_type,
+	'properties' : _Prop_properties,
 }
 device_specification._privelemdict = {
 }
 Ethernet_address._superclassnames = ['address_specification']
 Ethernet_address._privpropdict = {
-	'ID' : ID,
-	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
+	'ID' : _Prop_ID,
+	'_3c_inheritance_3e_' : _Prop__3c_inheritance_3e_,
 }
 Ethernet_address._privelemdict = {
 }
 FireWire_address._superclassnames = ['address_specification']
 FireWire_address._privpropdict = {
-	'ID' : ID,
-	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
+	'ID' : _Prop_ID,
+	'_3c_inheritance_3e_' : _Prop__3c_inheritance_3e_,
 }
 FireWire_address._privelemdict = {
 }
 IP_address._superclassnames = ['address_specification']
 IP_address._privpropdict = {
-	'DNS_form' : DNS_form,
-	'ID' : ID,
-	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
-	'port' : port,
+	'DNS_form' : _Prop_DNS_form,
+	'ID' : _Prop_ID,
+	'_3c_inheritance_3e_' : _Prop__3c_inheritance_3e_,
+	'port' : _Prop_port,
 }
 IP_address._privelemdict = {
 }
 LocalTalk_address._superclassnames = ['address_specification']
 LocalTalk_address._privpropdict = {
-	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
-	'network' : network,
-	'node' : node,
-	'socket' : socket,
+	'_3c_inheritance_3e_' : _Prop__3c_inheritance_3e_,
+	'network' : _Prop_network,
+	'node' : _Prop_node,
+	'socket' : _Prop_socket,
 }
 LocalTalk_address._privelemdict = {
 }
 SCSI_address._superclassnames = ['address_specification']
 SCSI_address._privpropdict = {
-	'ID' : ID,
-	'LUN' : LUN,
-	'SCSI_bus' : SCSI_bus,
-	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
+	'ID' : _Prop_ID,
+	'LUN' : _Prop_LUN,
+	'SCSI_bus' : _Prop_SCSI_bus,
+	'_3c_inheritance_3e_' : _Prop__3c_inheritance_3e_,
 }
 SCSI_address._privelemdict = {
 }
 Token_Ring_address._superclassnames = ['address_specification']
 Token_Ring_address._privpropdict = {
-	'ID' : ID,
-	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
+	'ID' : _Prop_ID,
+	'_3c_inheritance_3e_' : _Prop__3c_inheritance_3e_,
 }
 Token_Ring_address._privelemdict = {
 }
 USB_address._superclassnames = ['address_specification']
 USB_address._privpropdict = {
-	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
-	'name' : name,
+	'_3c_inheritance_3e_' : _Prop__3c_inheritance_3e_,
+	'name' : _Prop_name,
 }
 USB_address._privelemdict = {
 }
@@ -341,33 +341,3 @@ _classdeclarations = {
 	'ctok' : Token_Ring_address,
 	'cusb' : USB_address,
 }
-
-_propdeclarations = {
-	'ID  ' : ID,
-	'c@#^' : _3c_inheritance_3e_,
-	'pALL' : properties,
-	'patm' : AppleTalk_machine,
-	'patt' : AppleTalk_type,
-	'patz' : AppleTalk_zone,
-	'pcon' : conduit,
-	'pdns' : DNS_form,
-	'pdva' : device_address,
-	'pdvt' : device_type,
-	'pnam' : name,
-	'pnet' : network,
-	'pnod' : node,
-	'ppor' : port,
-	'pprt' : protocol,
-	'pscb' : SCSI_bus,
-	'pslu' : LUN,
-	'psoc' : socket,
-}
-
-_compdeclarations = {
-}
-
-_enumdeclarations = {
-	'econ' : _Enum_econ,
-	'edvt' : _Enum_edvt,
-	'epro' : _Enum_epro,
-}
diff --git a/Lib/plat-mac/lib-scriptpackages/StdSuites/QuickDraw_Graphics_Suite.py b/Lib/plat-mac/lib-scriptpackages/StdSuites/QuickDraw_Graphics_Suite.py
index 6705d6b..4bbab39 100644
--- a/Lib/plat-mac/lib-scriptpackages/StdSuites/QuickDraw_Graphics_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/StdSuites/QuickDraw_Graphics_Suite.py
@@ -18,43 +18,43 @@ class QuickDraw_Graphics_Suite_Events:
 class arc(aetools.ComponentItem):
 	"""arc - An arc """
 	want = 'carc'
-class arc_angle(aetools.NProperty):
+class _Prop_arc_angle(aetools.NProperty):
 	"""arc angle - the angle of the arc in degrees """
 	which = 'parc'
 	want = 'fixd'
-class bounds(aetools.NProperty):
+class _Prop_bounds(aetools.NProperty):
 	"""bounds - the smallest rectangle that contains the entire arc """
 	which = 'pbnd'
 	want = 'qdrt'
-class definition_rect(aetools.NProperty):
+class _Prop_definition_rect(aetools.NProperty):
 	"""definition rect - the rectangle that contains the circle or oval used to define the arc """
 	which = 'pdrt'
 	want = 'qdrt'
-class fill_color(aetools.NProperty):
+class _Prop_fill_color(aetools.NProperty):
 	"""fill color - the fill color """
 	which = 'flcl'
 	want = 'cRGB'
-class fill_pattern(aetools.NProperty):
+class _Prop_fill_pattern(aetools.NProperty):
 	"""fill pattern - the fill pattern """
 	which = 'flpt'
 	want = 'cpix'
-class pen_color(aetools.NProperty):
+class _Prop_pen_color(aetools.NProperty):
 	"""pen color - the pen color """
 	which = 'ppcl'
 	want = 'cRGB'
-class pen_pattern(aetools.NProperty):
+class _Prop_pen_pattern(aetools.NProperty):
 	"""pen pattern - the pen pattern """
 	which = 'pppa'
 	want = 'cpix'
-class pen_width(aetools.NProperty):
+class _Prop_pen_width(aetools.NProperty):
 	"""pen width - the pen width """
 	which = 'ppwd'
 	want = 'shor'
-class start_angle(aetools.NProperty):
+class _Prop_start_angle(aetools.NProperty):
 	"""start angle - the angle that defines the start of the arc, in degrees """
 	which = 'pang'
 	want = 'fixd'
-class transfer_mode(aetools.NProperty):
+class _Prop_transfer_mode(aetools.NProperty):
 	"""transfer mode - the transfer mode """
 	which = 'pptm'
 	want = 'tran'
@@ -64,55 +64,55 @@ arcs = arc
 class drawing_area(aetools.ComponentItem):
 	"""drawing area - Container for graphics and supporting information """
 	want = 'cdrw'
-class background_color(aetools.NProperty):
+class _Prop_background_color(aetools.NProperty):
 	"""background color - the color used to fill in unoccupied areas """
 	which = 'pbcl'
 	want = 'cRGB'
-class background_pattern(aetools.NProperty):
+class _Prop_background_pattern(aetools.NProperty):
 	"""background pattern - the pattern used to fill in unoccupied areas """
 	which = 'pbpt'
 	want = 'cpix'
-class color_table(aetools.NProperty):
+class _Prop_color_table(aetools.NProperty):
 	"""color table - the color table """
 	which = 'cltb'
 	want = 'clrt'
-class default_font(aetools.NProperty):
+class _Prop_default_font(aetools.NProperty):
 	"""default font - the name of the default font for text objects """
 	which = 'ptxf'
 	want = 'itxt'
-class default_location(aetools.NProperty):
+class _Prop_default_location(aetools.NProperty):
 	"""default location - the default location of each new graphic object """
 	which = 'pnel'
 	want = 'QDpt'
-class default_size(aetools.NProperty):
+class _Prop_default_size(aetools.NProperty):
 	"""default size - the default size for text objects """
 	which = 'ptps'
 	want = 'fixd'
-class name(aetools.NProperty):
+class _Prop_name(aetools.NProperty):
 	"""name - the name """
 	which = 'pnam'
 	want = 'itxt'
-class ordering(aetools.NProperty):
+class _Prop_ordering(aetools.NProperty):
 	"""ordering - the ordered list of graphic objects in the drawing area """
 	which = 'gobs'
 	want = 'obj '
-class pixel_depth(aetools.NProperty):
+class _Prop_pixel_depth(aetools.NProperty):
 	"""pixel depth - the number of bits per pixel """
 	which = 'pdpt'
 	want = 'shor'
-class style(aetools.NProperty):
+class _Prop_style(aetools.NProperty):
 	"""style - the default text style for text objects """
 	which = 'txst'
 	want = 'tsty'
-class text_color(aetools.NProperty):
+class _Prop_text_color(aetools.NProperty):
 	"""text color - the default color for text objects """
 	which = 'ptxc'
 	want = 'cRGB'
-class update_on_change(aetools.NProperty):
+class _Prop_update_on_change(aetools.NProperty):
 	"""update on change - Redraw after each change? """
 	which = 'pupd'
 	want = 'bool'
-class writing_code(aetools.NProperty):
+class _Prop_writing_code(aetools.NProperty):
 	"""writing code - the script system and language of text objects in the drawing area """
 	which = 'psct'
 	want = 'intl'
@@ -134,19 +134,19 @@ graphic_shape = graphic_shapes
 class graphic_text(aetools.ComponentItem):
 	"""graphic text - A series of characters within a drawing area """
 	want = 'cgtx'
-class color(aetools.NProperty):
+class _Prop_color(aetools.NProperty):
 	"""color - the color of the first character """
 	which = 'colr'
 	want = 'cRGB'
-class font(aetools.NProperty):
+class _Prop_font(aetools.NProperty):
 	"""font - the name of the font of the first character """
 	which = 'font'
 	want = 'ctxt'
-class size(aetools.NProperty):
+class _Prop_size(aetools.NProperty):
 	"""size - the size in points of the first character """
 	which = 'ptsz'
 	want = 'fixd'
-class uniform_styles(aetools.NProperty):
+class _Prop_uniform_styles(aetools.NProperty):
 	"""uniform styles - the text styles that are uniform throughout the text """
 	which = 'ustl'
 	want = 'tsty'
@@ -160,7 +160,7 @@ oval = ovals
 class polygon(aetools.ComponentItem):
 	"""polygon - A polygon """
 	want = 'cpgn'
-class point_list(aetools.NProperty):
+class _Prop_point_list(aetools.NProperty):
 	"""point list - the list of points that define the polygon """
 	which = 'ptlt'
 	want = 'QDpt'
@@ -194,11 +194,11 @@ rectangle = rectangles
 class rounded_rectangle(aetools.ComponentItem):
 	"""rounded rectangle - A rounded rectangle """
 	want = 'crrc'
-class corner_curve_height(aetools.NProperty):
+class _Prop_corner_curve_height(aetools.NProperty):
 	"""corner curve height - the height of the oval used to define the shape of the rounded corners """
 	which = 'pchd'
 	want = 'shor'
-class corner_curve_width(aetools.NProperty):
+class _Prop_corner_curve_width(aetools.NProperty):
 	"""corner curve width - the width of the oval used to define the shape of the rounded corners """
 	which = 'pcwd'
 	want = 'shor'
@@ -208,19 +208,19 @@ rounded_rectangles = rounded_rectangle
 class graphic_line(aetools.ComponentItem):
 	"""graphic line - A graphic line """
 	want = 'glin'
-class arrow_style(aetools.NProperty):
+class _Prop_arrow_style(aetools.NProperty):
 	"""arrow style - the arrow style """
 	which = 'arro'
 	want = 'arro'
-class dash_style(aetools.NProperty):
+class _Prop_dash_style(aetools.NProperty):
 	"""dash style - the dash style """
 	which = 'pdst'
 	want = 'tdas'
-class end_point(aetools.NProperty):
+class _Prop_end_point(aetools.NProperty):
 	"""end point - the ending point of the line """
 	which = 'pend'
 	want = 'QDpt'
-class start_point(aetools.NProperty):
+class _Prop_start_point(aetools.NProperty):
 	"""start point - the starting point of the line """
 	which = 'pstp'
 	want = 'QDpt'
@@ -228,34 +228,34 @@ class start_point(aetools.NProperty):
 graphic_lines = graphic_line
 arc._superclassnames = []
 arc._privpropdict = {
-	'arc_angle' : arc_angle,
-	'bounds' : bounds,
-	'definition_rect' : definition_rect,
-	'fill_color' : fill_color,
-	'fill_pattern' : fill_pattern,
-	'pen_color' : pen_color,
-	'pen_pattern' : pen_pattern,
-	'pen_width' : pen_width,
-	'start_angle' : start_angle,
-	'transfer_mode' : transfer_mode,
+	'arc_angle' : _Prop_arc_angle,
+	'bounds' : _Prop_bounds,
+	'definition_rect' : _Prop_definition_rect,
+	'fill_color' : _Prop_fill_color,
+	'fill_pattern' : _Prop_fill_pattern,
+	'pen_color' : _Prop_pen_color,
+	'pen_pattern' : _Prop_pen_pattern,
+	'pen_width' : _Prop_pen_width,
+	'start_angle' : _Prop_start_angle,
+	'transfer_mode' : _Prop_transfer_mode,
 }
 arc._privelemdict = {
 }
 drawing_area._superclassnames = []
 drawing_area._privpropdict = {
-	'background_color' : background_color,
-	'background_pattern' : background_pattern,
-	'color_table' : color_table,
-	'default_font' : default_font,
-	'default_location' : default_location,
-	'default_size' : default_size,
-	'name' : name,
-	'ordering' : ordering,
-	'pixel_depth' : pixel_depth,
-	'style' : style,
-	'text_color' : text_color,
-	'update_on_change' : update_on_change,
-	'writing_code' : writing_code,
+	'background_color' : _Prop_background_color,
+	'background_pattern' : _Prop_background_pattern,
+	'color_table' : _Prop_color_table,
+	'default_font' : _Prop_default_font,
+	'default_location' : _Prop_default_location,
+	'default_size' : _Prop_default_size,
+	'name' : _Prop_name,
+	'ordering' : _Prop_ordering,
+	'pixel_depth' : _Prop_pixel_depth,
+	'style' : _Prop_style,
+	'text_color' : _Prop_text_color,
+	'update_on_change' : _Prop_update_on_change,
+	'writing_code' : _Prop_writing_code,
 }
 drawing_area._privelemdict = {
 }
@@ -271,10 +271,10 @@ graphic_shapes._privelemdict = {
 }
 graphic_text._superclassnames = []
 graphic_text._privpropdict = {
-	'color' : color,
-	'font' : font,
-	'size' : size,
-	'uniform_styles' : uniform_styles,
+	'color' : _Prop_color,
+	'font' : _Prop_font,
+	'size' : _Prop_size,
+	'uniform_styles' : _Prop_uniform_styles,
 }
 graphic_text._privelemdict = {
 }
@@ -285,7 +285,7 @@ ovals._privelemdict = {
 }
 polygon._superclassnames = []
 polygon._privpropdict = {
-	'point_list' : point_list,
+	'point_list' : _Prop_point_list,
 }
 polygon._privelemdict = {
 }
@@ -301,7 +301,7 @@ pixel_maps._privelemdict = {
 }
 pixel._superclassnames = []
 pixel._privpropdict = {
-	'color' : color,
+	'color' : _Prop_color,
 }
 pixel._privelemdict = {
 }
@@ -312,17 +312,17 @@ rectangles._privelemdict = {
 }
 rounded_rectangle._superclassnames = []
 rounded_rectangle._privpropdict = {
-	'corner_curve_height' : corner_curve_height,
-	'corner_curve_width' : corner_curve_width,
+	'corner_curve_height' : _Prop_corner_curve_height,
+	'corner_curve_width' : _Prop_corner_curve_width,
 }
 rounded_rectangle._privelemdict = {
 }
 graphic_line._superclassnames = []
 graphic_line._privpropdict = {
-	'arrow_style' : arrow_style,
-	'dash_style' : dash_style,
-	'end_point' : end_point,
-	'start_point' : start_point,
+	'arrow_style' : _Prop_arrow_style,
+	'dash_style' : _Prop_dash_style,
+	'end_point' : _Prop_end_point,
+	'start_point' : _Prop_start_point,
 }
 graphic_line._privelemdict = {
 }
@@ -370,48 +370,3 @@ _classdeclarations = {
 	'crrc' : rounded_rectangle,
 	'glin' : graphic_line,
 }
-
-_propdeclarations = {
-	'arro' : arrow_style,
-	'cltb' : color_table,
-	'colr' : color,
-	'flcl' : fill_color,
-	'flpt' : fill_pattern,
-	'font' : font,
-	'gobs' : ordering,
-	'pang' : start_angle,
-	'parc' : arc_angle,
-	'pbcl' : background_color,
-	'pbnd' : bounds,
-	'pbpt' : background_pattern,
-	'pchd' : corner_curve_height,
-	'pcwd' : corner_curve_width,
-	'pdpt' : pixel_depth,
-	'pdrt' : definition_rect,
-	'pdst' : dash_style,
-	'pend' : end_point,
-	'pnam' : name,
-	'pnel' : default_location,
-	'ppcl' : pen_color,
-	'pppa' : pen_pattern,
-	'pptm' : transfer_mode,
-	'ppwd' : pen_width,
-	'psct' : writing_code,
-	'pstp' : start_point,
-	'ptlt' : point_list,
-	'ptps' : default_size,
-	'ptsz' : size,
-	'ptxc' : text_color,
-	'ptxf' : default_font,
-	'pupd' : update_on_change,
-	'txst' : style,
-	'ustl' : uniform_styles,
-}
-
-_compdeclarations = {
-}
-
-_enumdeclarations = {
-	'arro' : _Enum_arro,
-	'tran' : _Enum_tran,
-}
diff --git a/Lib/plat-mac/lib-scriptpackages/StdSuites/QuickDraw_Graphics_Suppleme.py b/Lib/plat-mac/lib-scriptpackages/StdSuites/QuickDraw_Graphics_Suppleme.py
index 22fd94d..7c26d6b 100644
--- a/Lib/plat-mac/lib-scriptpackages/StdSuites/QuickDraw_Graphics_Suppleme.py
+++ b/Lib/plat-mac/lib-scriptpackages/StdSuites/QuickDraw_Graphics_Suppleme.py
@@ -18,15 +18,15 @@ class QuickDraw_Graphics_Suppleme_Events:
 class drawing_area(aetools.ComponentItem):
 	"""drawing area - Container for graphics and supporting information """
 	want = 'cdrw'
-class rotation(aetools.NProperty):
+class _Prop_rotation(aetools.NProperty):
 	"""rotation - the default rotation for objects in the drawing area """
 	which = 'prot'
 	want = 'trot'
-class scale(aetools.NProperty):
+class _Prop_scale(aetools.NProperty):
 	"""scale - the default scaling for objects in the drawing area """
 	which = 'pscl'
 	want = 'fixd'
-class translation(aetools.NProperty):
+class _Prop_translation(aetools.NProperty):
 	"""translation - the default repositioning for objects in the drawing area """
 	which = 'ptrs'
 	want = 'QDpt'
@@ -40,9 +40,9 @@ class graphic_groups(aetools.ComponentItem):
 graphic_group = graphic_groups
 drawing_area._superclassnames = []
 drawing_area._privpropdict = {
-	'rotation' : rotation,
-	'scale' : scale,
-	'translation' : translation,
+	'rotation' : _Prop_rotation,
+	'scale' : _Prop_scale,
+	'translation' : _Prop_translation,
 }
 drawing_area._privelemdict = {
 }
@@ -59,15 +59,3 @@ _classdeclarations = {
 	'cdrw' : drawing_area,
 	'cpic' : graphic_groups,
 }
-
-_propdeclarations = {
-	'prot' : rotation,
-	'pscl' : scale,
-	'ptrs' : translation,
-}
-
-_compdeclarations = {
-}
-
-_enumdeclarations = {
-}
diff --git a/Lib/plat-mac/lib-scriptpackages/StdSuites/Required_Suite.py b/Lib/plat-mac/lib-scriptpackages/StdSuites/Required_Suite.py
index d0d5c36..0bd5696 100644
--- a/Lib/plat-mac/lib-scriptpackages/StdSuites/Required_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/StdSuites/Required_Suite.py
@@ -21,12 +21,3 @@ class Required_Suite_Events(builtin_Suite_Events):
 #
 _classdeclarations = {
 }
-
-_propdeclarations = {
-}
-
-_compdeclarations = {
-}
-
-_enumdeclarations = {
-}
diff --git a/Lib/plat-mac/lib-scriptpackages/StdSuites/Standard_Suite.py b/Lib/plat-mac/lib-scriptpackages/StdSuites/Standard_Suite.py
index 2e85473..45a4b0d 100644
--- a/Lib/plat-mac/lib-scriptpackages/StdSuites/Standard_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/StdSuites/Standard_Suite.py
@@ -457,23 +457,23 @@ alias = aliases
 class application(aetools.ComponentItem):
 	"""application - An application program """
 	want = 'capp'
-class clipboard(aetools.NProperty):
+class _Prop_clipboard(aetools.NProperty):
 	"""clipboard - the contents of the clipboard for this application """
 	which = 'pcli'
 	want = '****'
-class frontmost(aetools.NProperty):
+class _Prop_frontmost(aetools.NProperty):
 	"""frontmost - Is this the frontmost application? """
 	which = 'pisf'
 	want = 'bool'
-class name(aetools.NProperty):
+class _Prop_name(aetools.NProperty):
 	"""name - the name of the application """
 	which = 'pnam'
 	want = 'itxt'
-class selection(aetools.NProperty):
+class _Prop_selection(aetools.NProperty):
 	"""selection - the selection visible to the user.  Use the \xd4select\xd5 command to set a new selection; use \xd4contents of selection\xd5 to get or change information in the document. """
 	which = 'sele'
 	want = 'csel'
-class version(aetools.NProperty):
+class _Prop_version(aetools.NProperty):
 	"""version - the version of the application """
 	which = 'vers'
 	want = 'vers'
@@ -489,7 +489,7 @@ insertion_point = insertion_points
 class selection_2d_object(aetools.ComponentItem):
 	"""selection-object - A way to refer to the state of the current of the selection.  Use the \xd4select\xd5 command to make a new selection. """
 	want = 'csel'
-class contents(aetools.NProperty):
+class _Prop_contents(aetools.NProperty):
 	"""contents - the information currently selected.  Use \xd4contents of selection\xd5 to get or change information in a document. """
 	which = 'pcnt'
 	want = '****'
@@ -497,43 +497,43 @@ class contents(aetools.NProperty):
 class window(aetools.ComponentItem):
 	"""window - A window """
 	want = 'cwin'
-class bounds(aetools.NProperty):
+class _Prop_bounds(aetools.NProperty):
 	"""bounds - the boundary rectangle for the window """
 	which = 'pbnd'
 	want = 'qdrt'
-class closeable(aetools.NProperty):
+class _Prop_closeable(aetools.NProperty):
 	"""closeable - Does the window have a close box? """
 	which = 'hclb'
 	want = 'bool'
-class floating(aetools.NProperty):
+class _Prop_floating(aetools.NProperty):
 	"""floating - Does the window float? """
 	which = 'isfl'
 	want = 'bool'
-class index(aetools.NProperty):
+class _Prop_index(aetools.NProperty):
 	"""index - the number of the window """
 	which = 'pidx'
 	want = 'long'
-class modal(aetools.NProperty):
+class _Prop_modal(aetools.NProperty):
 	"""modal - Is the window modal? """
 	which = 'pmod'
 	want = 'bool'
-class resizable(aetools.NProperty):
+class _Prop_resizable(aetools.NProperty):
 	"""resizable - Is the window resizable? """
 	which = 'prsz'
 	want = 'bool'
-class titled(aetools.NProperty):
+class _Prop_titled(aetools.NProperty):
 	"""titled - Does the window have a title bar? """
 	which = 'ptit'
 	want = 'bool'
-class visible(aetools.NProperty):
+class _Prop_visible(aetools.NProperty):
 	"""visible - Is the window visible? """
 	which = 'pvis'
 	want = 'bool'
-class zoomable(aetools.NProperty):
+class _Prop_zoomable(aetools.NProperty):
 	"""zoomable - Is the window zoomable? """
 	which = 'iszm'
 	want = 'bool'
-class zoomed(aetools.NProperty):
+class _Prop_zoomed(aetools.NProperty):
 	"""zoomed - Is the window zoomed? """
 	which = 'pzum'
 	want = 'bool'
@@ -543,7 +543,7 @@ windows = window
 class document(aetools.ComponentItem):
 	"""document - A document of a scriptable application """
 	want = 'docu'
-class modified(aetools.NProperty):
+class _Prop_modified(aetools.NProperty):
 	"""modified - Has the document been modified since the last save? """
 	which = 'imod'
 	want = 'bool'
@@ -553,7 +553,7 @@ documents = document
 class file(aetools.ComponentItem):
 	"""file - a file on a disk or server """
 	want = 'file'
-class stationery(aetools.NProperty):
+class _Prop_stationery(aetools.NProperty):
 	"""stationery - Is the file a stationery file? """
 	which = 'pspd'
 	want = 'bool'
@@ -566,11 +566,11 @@ aliases._privelemdict = {
 }
 application._superclassnames = []
 application._privpropdict = {
-	'clipboard' : clipboard,
-	'frontmost' : frontmost,
-	'name' : name,
-	'selection' : selection,
-	'version' : version,
+	'clipboard' : _Prop_clipboard,
+	'frontmost' : _Prop_frontmost,
+	'name' : _Prop_name,
+	'selection' : _Prop_selection,
+	'version' : _Prop_version,
 }
 application._privelemdict = {
 }
@@ -581,34 +581,34 @@ insertion_points._privelemdict = {
 }
 selection_2d_object._superclassnames = []
 selection_2d_object._privpropdict = {
-	'contents' : contents,
+	'contents' : _Prop_contents,
 }
 selection_2d_object._privelemdict = {
 }
 window._superclassnames = []
 window._privpropdict = {
-	'bounds' : bounds,
-	'closeable' : closeable,
-	'floating' : floating,
-	'index' : index,
-	'modal' : modal,
-	'resizable' : resizable,
-	'titled' : titled,
-	'visible' : visible,
-	'zoomable' : zoomable,
-	'zoomed' : zoomed,
+	'bounds' : _Prop_bounds,
+	'closeable' : _Prop_closeable,
+	'floating' : _Prop_floating,
+	'index' : _Prop_index,
+	'modal' : _Prop_modal,
+	'resizable' : _Prop_resizable,
+	'titled' : _Prop_titled,
+	'visible' : _Prop_visible,
+	'zoomable' : _Prop_zoomable,
+	'zoomed' : _Prop_zoomed,
 }
 window._privelemdict = {
 }
 document._superclassnames = []
 document._privpropdict = {
-	'modified' : modified,
+	'modified' : _Prop_modified,
 }
 document._privelemdict = {
 }
 file._superclassnames = []
 file._privpropdict = {
-	'stationery' : stationery,
+	'stationery' : _Prop_stationery,
 }
 file._privelemdict = {
 }
@@ -671,41 +671,3 @@ _classdeclarations = {
 	'docu' : document,
 	'file' : file,
 }
-
-_propdeclarations = {
-	'hclb' : closeable,
-	'imod' : modified,
-	'isfl' : floating,
-	'iszm' : zoomable,
-	'pbnd' : bounds,
-	'pcli' : clipboard,
-	'pcnt' : contents,
-	'pidx' : index,
-	'pisf' : frontmost,
-	'pmod' : modal,
-	'pnam' : name,
-	'prsz' : resizable,
-	'pspd' : stationery,
-	'ptit' : titled,
-	'pvis' : visible,
-	'pzum' : zoomed,
-	'sele' : selection,
-	'vers' : version,
-}
-
-_compdeclarations = {
-	'<   ' : _3c_,
-	'<=  ' : _b2_,
-	'=   ' : _3d_,
-	'>   ' : _3e_,
-	'>=  ' : _b3_,
-	'bgwt' : starts_with,
-	'cont' : contains,
-	'ends' : ends_with,
-}
-
-_enumdeclarations = {
-	'kfrm' : _Enum_kfrm,
-	'savo' : _Enum_savo,
-	'styl' : _Enum_styl,
-}
diff --git a/Lib/plat-mac/lib-scriptpackages/StdSuites/Table_Suite.py b/Lib/plat-mac/lib-scriptpackages/StdSuites/Table_Suite.py
index 390edd6..09e326c 100644
--- a/Lib/plat-mac/lib-scriptpackages/StdSuites/Table_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/StdSuites/Table_Suite.py
@@ -18,11 +18,11 @@ class Table_Suite_Events:
 class cell(aetools.ComponentItem):
 	"""cell - A cell """
 	want = 'ccel'
-class formula(aetools.NProperty):
+class _Prop_formula(aetools.NProperty):
 	"""formula - the formula of the cell """
 	which = 'pfor'
 	want = 'ctxt'
-class protection(aetools.NProperty):
+class _Prop_protection(aetools.NProperty):
 	"""protection - Indicates whether value or formula in the cell can be changed """
 	which = 'ppro'
 	want = 'prtn'
@@ -32,7 +32,7 @@ cells = cell
 class column(aetools.ComponentItem):
 	"""column - A column """
 	want = 'ccol'
-class name(aetools.NProperty):
+class _Prop_name(aetools.NProperty):
 	"""name - the name of the column """
 	which = 'pnam'
 	want = 'itxt'
@@ -52,14 +52,14 @@ class tables(aetools.ComponentItem):
 table = tables
 cell._superclassnames = []
 cell._privpropdict = {
-	'formula' : formula,
-	'protection' : protection,
+	'formula' : _Prop_formula,
+	'protection' : _Prop_protection,
 }
 cell._privelemdict = {
 }
 column._superclassnames = []
 column._privpropdict = {
-	'name' : name,
+	'name' : _Prop_name,
 }
 column._privelemdict = {
 }
@@ -89,16 +89,3 @@ _classdeclarations = {
 	'crow' : rows,
 	'ctbl' : tables,
 }
-
-_propdeclarations = {
-	'pfor' : formula,
-	'pnam' : name,
-	'ppro' : protection,
-}
-
-_compdeclarations = {
-}
-
-_enumdeclarations = {
-	'prtn' : _Enum_prtn,
-}
diff --git a/Lib/plat-mac/lib-scriptpackages/StdSuites/Text_Suite.py b/Lib/plat-mac/lib-scriptpackages/StdSuites/Text_Suite.py
index c104f82..2d9d84a 100644
--- a/Lib/plat-mac/lib-scriptpackages/StdSuites/Text_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/StdSuites/Text_Suite.py
@@ -18,11 +18,11 @@ class Text_Suite_Events:
 class text_flow(aetools.ComponentItem):
 	"""text flow - A contiguous block of text.  Page layout applications call this a \xd4story.\xd5 """
 	want = 'cflo'
-class _3c_inheritance_3e_(aetools.NProperty):
+class _Prop__3c_inheritance_3e_(aetools.NProperty):
 	"""<inheritance> - inherits some of its properties from this class """
 	which = 'c@#^'
 	want = 'ctxt'
-class name(aetools.NProperty):
+class _Prop_name(aetools.NProperty):
 	"""name - the name """
 	which = 'pnam'
 	want = 'itxt'
@@ -36,7 +36,7 @@ class character(aetools.ComponentItem):
 class line(aetools.ComponentItem):
 	"""line - A line of text """
 	want = 'clin'
-class justification(aetools.NProperty):
+class _Prop_justification(aetools.NProperty):
 	"""justification - the justification of the text """
 	which = 'pjst'
 	want = 'just'
@@ -52,27 +52,27 @@ paragraphs = paragraph
 class text(aetools.ComponentItem):
 	"""text - Text """
 	want = 'ctxt'
-class color(aetools.NProperty):
+class _Prop_color(aetools.NProperty):
 	"""color - the color of the first character """
 	which = 'colr'
 	want = 'cRGB'
-class font(aetools.NProperty):
+class _Prop_font(aetools.NProperty):
 	"""font - the name of the font of the first character """
 	which = 'font'
 	want = 'ctxt'
-class size(aetools.NProperty):
+class _Prop_size(aetools.NProperty):
 	"""size - the size in points of the first character """
 	which = 'ptsz'
 	want = 'fixd'
-class style(aetools.NProperty):
+class _Prop_style(aetools.NProperty):
 	"""style - the text style of the first character of the first character """
 	which = 'txst'
 	want = 'tsty'
-class uniform_styles(aetools.NProperty):
+class _Prop_uniform_styles(aetools.NProperty):
 	"""uniform styles - the text styles that are uniform throughout the text """
 	which = 'ustl'
 	want = 'tsty'
-class writing_code(aetools.NProperty):
+class _Prop_writing_code(aetools.NProperty):
 	"""writing code - the script system and language """
 	which = 'psct'
 	want = 'intl'
@@ -91,11 +91,11 @@ words = word
 class text_style_info(aetools.ComponentItem):
 	"""text style info - On and Off styles of text run """
 	want = 'tsty'
-class off_styles(aetools.NProperty):
+class _Prop_off_styles(aetools.NProperty):
 	"""off styles - the styles that are off for the text """
 	which = 'ofst'
 	want = 'styl'
-class on_styles(aetools.NProperty):
+class _Prop_on_styles(aetools.NProperty):
 	"""on styles - the styles that are on for the text """
 	which = 'onst'
 	want = 'styl'
@@ -103,38 +103,38 @@ class on_styles(aetools.NProperty):
 text_style_infos = text_style_info
 text_flow._superclassnames = ['text']
 text_flow._privpropdict = {
-	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
-	'name' : name,
+	'_3c_inheritance_3e_' : _Prop__3c_inheritance_3e_,
+	'name' : _Prop_name,
 }
 text_flow._privelemdict = {
 }
 character._superclassnames = ['text']
 character._privpropdict = {
-	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
+	'_3c_inheritance_3e_' : _Prop__3c_inheritance_3e_,
 }
 character._privelemdict = {
 }
 line._superclassnames = ['text']
 line._privpropdict = {
-	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
-	'justification' : justification,
+	'_3c_inheritance_3e_' : _Prop__3c_inheritance_3e_,
+	'justification' : _Prop_justification,
 }
 line._privelemdict = {
 }
 paragraph._superclassnames = ['text']
 paragraph._privpropdict = {
-	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
+	'_3c_inheritance_3e_' : _Prop__3c_inheritance_3e_,
 }
 paragraph._privelemdict = {
 }
 text._superclassnames = []
 text._privpropdict = {
-	'color' : color,
-	'font' : font,
-	'size' : size,
-	'style' : style,
-	'uniform_styles' : uniform_styles,
-	'writing_code' : writing_code,
+	'color' : _Prop_color,
+	'font' : _Prop_font,
+	'size' : _Prop_size,
+	'style' : _Prop_style,
+	'uniform_styles' : _Prop_uniform_styles,
+	'writing_code' : _Prop_writing_code,
 }
 text._privelemdict = {
 	'character' : character,
@@ -145,14 +145,14 @@ text._privelemdict = {
 }
 word._superclassnames = ['text']
 word._privpropdict = {
-	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
+	'_3c_inheritance_3e_' : _Prop__3c_inheritance_3e_,
 }
 word._privelemdict = {
 }
 text_style_info._superclassnames = []
 text_style_info._privpropdict = {
-	'off_styles' : off_styles,
-	'on_styles' : on_styles,
+	'off_styles' : _Prop_off_styles,
+	'on_styles' : _Prop_on_styles,
 }
 text_style_info._privelemdict = {
 }
@@ -194,25 +194,3 @@ _classdeclarations = {
 	'cwor' : word,
 	'tsty' : text_style_info,
 }
-
-_propdeclarations = {
-	'c@#^' : _3c_inheritance_3e_,
-	'colr' : color,
-	'font' : font,
-	'ofst' : off_styles,
-	'onst' : on_styles,
-	'pjst' : justification,
-	'pnam' : name,
-	'psct' : writing_code,
-	'ptsz' : size,
-	'txst' : style,
-	'ustl' : uniform_styles,
-}
-
-_compdeclarations = {
-}
-
-_enumdeclarations = {
-	'just' : _Enum_just,
-	'styl' : _Enum_styl,
-}
diff --git a/Lib/plat-mac/lib-scriptpackages/StdSuites/Type_Names_Suite.py b/Lib/plat-mac/lib-scriptpackages/StdSuites/Type_Names_Suite.py
index 87a4b84..1b42dae 100644
--- a/Lib/plat-mac/lib-scriptpackages/StdSuites/Type_Names_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/StdSuites/Type_Names_Suite.py
@@ -424,12 +424,3 @@ _classdeclarations = {
 	'trot' : rotation,
 	'vers' : version,
 }
-
-_propdeclarations = {
-}
-
-_compdeclarations = {
-}
-
-_enumdeclarations = {
-}
diff --git a/Lib/plat-mac/lib-scriptpackages/StdSuites/__init__.py b/Lib/plat-mac/lib-scriptpackages/StdSuites/__init__.py
index 85ea47a..20c775b 100644
--- a/Lib/plat-mac/lib-scriptpackages/StdSuites/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/StdSuites/__init__.py
@@ -173,24 +173,13 @@ getbaseclasses(Saturday)
 getbaseclasses(September)
 getbaseclasses(file_specification)
 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)
-getbaseclasses(FireWire_address)
-getbaseclasses(bus_slot)
-getbaseclasses(SCSI_address)
-getbaseclasses(ADB_address)
-getbaseclasses(USB_address)
-getbaseclasses(device_specification)
-getbaseclasses(LocalTalk_address)
-getbaseclasses(IP_address)
-getbaseclasses(Ethernet_address)
+getbaseclasses(window)
+getbaseclasses(file)
+getbaseclasses(selection_2d_object)
+getbaseclasses(alias)
+getbaseclasses(application)
+getbaseclasses(insertion_point)
+getbaseclasses(document)
 getbaseclasses(small_integer)
 getbaseclasses(RGB16_color)
 getbaseclasses(version)
@@ -238,13 +227,6 @@ getbaseclasses(text_style_info)
 getbaseclasses(line)
 getbaseclasses(word)
 getbaseclasses(text)
-getbaseclasses(window)
-getbaseclasses(file)
-getbaseclasses(selection_2d_object)
-getbaseclasses(alias)
-getbaseclasses(application)
-getbaseclasses(insertion_point)
-getbaseclasses(document)
 getbaseclasses(graphic_group)
 getbaseclasses(oval)
 getbaseclasses(graphic_text)
@@ -258,6 +240,24 @@ getbaseclasses(rounded_rectangle)
 getbaseclasses(arc)
 getbaseclasses(pixel_map)
 getbaseclasses(rectangle)
+getbaseclasses(graphic_group)
+getbaseclasses(drawing_area)
+getbaseclasses(AppleTalk_address)
+getbaseclasses(address_specification)
+getbaseclasses(Token_Ring_address)
+getbaseclasses(FireWire_address)
+getbaseclasses(bus_slot)
+getbaseclasses(SCSI_address)
+getbaseclasses(ADB_address)
+getbaseclasses(USB_address)
+getbaseclasses(device_specification)
+getbaseclasses(LocalTalk_address)
+getbaseclasses(IP_address)
+getbaseclasses(Ethernet_address)
+getbaseclasses(cell)
+getbaseclasses(column)
+getbaseclasses(table)
+getbaseclasses(row)
 
 #
 # Indices of types declared in this module
@@ -368,24 +368,13 @@ _classdeclarations = {
 	'sep ' : September,
 	'fss ' : file_specification,
 	'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,
-	'cfw ' : FireWire_address,
-	'cbus' : bus_slot,
-	'cscs' : SCSI_address,
-	'cadb' : ADB_address,
-	'cusb' : USB_address,
-	'cdev' : device_specification,
-	'clt ' : LocalTalk_address,
-	'cip ' : IP_address,
-	'cen ' : Ethernet_address,
+	'cwin' : window,
+	'file' : file,
+	'csel' : selection_2d_object,
+	'alis' : alias,
+	'capp' : application,
+	'cins' : insertion_point,
+	'docu' : document,
 	'shor' : small_integer,
 	'tr16' : RGB16_color,
 	'vers' : version,
@@ -433,13 +422,6 @@ _classdeclarations = {
 	'clin' : line,
 	'cwor' : word,
 	'ctxt' : text,
-	'cwin' : window,
-	'file' : file,
-	'csel' : selection_2d_object,
-	'alis' : alias,
-	'capp' : application,
-	'cins' : insertion_point,
-	'docu' : document,
 	'cpic' : graphic_group,
 	'covl' : oval,
 	'cgtx' : graphic_text,
@@ -453,6 +435,24 @@ _classdeclarations = {
 	'carc' : arc,
 	'cpix' : pixel_map,
 	'crec' : rectangle,
+	'cpic' : graphic_group,
+	'cdrw' : drawing_area,
+	'cat ' : AppleTalk_address,
+	'cadr' : address_specification,
+	'ctok' : Token_Ring_address,
+	'cfw ' : FireWire_address,
+	'cbus' : bus_slot,
+	'cscs' : SCSI_address,
+	'cadb' : ADB_address,
+	'cusb' : USB_address,
+	'cdev' : device_specification,
+	'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_2d_Folder_2d_File_Suite.py
index 7e35c53..548e981 100644
--- a/Lib/plat-mac/lib-scriptpackages/SystemEvents/Disk_2d_Folder_2d_File_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/SystemEvents/Disk_2d_Folder_2d_File_Suite.py
@@ -42,15 +42,15 @@ class Disk_2d_Folder_2d_File_Suite_Events:
 class alias(aetools.ComponentItem):
 	"""alias - An alias in the file system """
 	want = 'alis'
-class _3c_Inheritance_3e_(aetools.NProperty):
+class _Prop__3c_Inheritance_3e_(aetools.NProperty):
 	"""<Inheritance> - All of the properties of the superclass. """
 	which = 'c@#^'
 	want = 'cobj'
-class properties(aetools.NProperty):
+class _Prop_properties(aetools.NProperty):
 	"""properties - every property of the alias """
 	which = 'pALL'
 	want = '****'
-class version(aetools.NProperty):
+class _Prop_version(aetools.NProperty):
 	"""version - the version of the application bundle referenced by the alias (visible at the bottom of the "Get Info" window) """
 	which = 'vers'
 	want = 'utxt'
@@ -64,31 +64,31 @@ aliases = alias
 class disk(aetools.ComponentItem):
 	"""disk - A disk in the file system """
 	want = 'cdis'
-class capacity(aetools.NProperty):
+class _Prop_capacity(aetools.NProperty):
 	"""capacity - the total number of bytes (free or used) on the disk """
 	which = 'capa'
 	want = 'magn'
-class ejectable(aetools.NProperty):
+class _Prop_ejectable(aetools.NProperty):
 	"""ejectable - Can the media be ejected (floppies, CD's, and so on)? """
 	which = 'isej'
 	want = 'bool'
-class format(aetools.NProperty):
+class _Prop_format(aetools.NProperty):
 	"""format - the file system format of this disk """
 	which = 'dfmt'
 	want = 'edfm'
-class free_space(aetools.NProperty):
+class _Prop_free_space(aetools.NProperty):
 	"""free space - the number of free bytes left on the disk """
 	which = 'frsp'
 	want = 'magn'
-class ignore_privileges(aetools.NProperty):
+class _Prop_ignore_privileges(aetools.NProperty):
 	"""ignore privileges - Ignore permissions on this disk? """
 	which = 'igpr'
 	want = 'bool'
-class local_volume(aetools.NProperty):
+class _Prop_local_volume(aetools.NProperty):
 	"""local volume - Is the media a local volume (as opposed to a file server)? """
 	which = 'isrv'
 	want = 'bool'
-class startup(aetools.NProperty):
+class _Prop_startup(aetools.NProperty):
 	"""startup - Is this disk the boot disk? """
 	which = 'istd'
 	want = 'bool'
@@ -112,51 +112,51 @@ folders = folder
 class item(aetools.ComponentItem):
 	"""item - An item in the file system """
 	want = 'cobj'
-class POSIX_path(aetools.NProperty):
+class _Prop_POSIX_path(aetools.NProperty):
 	"""POSIX path - the POSIX file system path of the item """
 	which = 'posx'
 	want = 'utxt'
-class busy_status(aetools.NProperty):
+class _Prop_busy_status(aetools.NProperty):
 	"""busy status - Is the item busy? """
 	which = 'busy'
 	want = 'bool'
-class creation_date(aetools.NProperty):
+class _Prop_creation_date(aetools.NProperty):
 	"""creation date - the date on which the item was created """
 	which = 'ascd'
 	want = '****'
-class displayed_name(aetools.NProperty):
+class _Prop_displayed_name(aetools.NProperty):
 	"""displayed name - the name of the item as displayed in the User Interface """
 	which = 'dnam'
 	want = 'utxt'
-class modification_date(aetools.NProperty):
+class _Prop_modification_date(aetools.NProperty):
 	"""modification date - the date on which the item was last modified """
 	which = 'asmo'
 	want = '****'
-class name(aetools.NProperty):
+class _Prop_name(aetools.NProperty):
 	"""name - the name of the item """
 	which = 'pnam'
 	want = 'utxt'
-class name_extension(aetools.NProperty):
+class _Prop_name_extension(aetools.NProperty):
 	"""name extension - the extension portion of the name """
 	which = 'extn'
 	want = 'utxt'
-class package_folder(aetools.NProperty):
+class _Prop_package_folder(aetools.NProperty):
 	"""package folder - Is the item a package? """
 	which = 'pkgf'
 	want = 'bool'
-class path(aetools.NProperty):
+class _Prop_path(aetools.NProperty):
 	"""path - the file system path of the item """
 	which = 'ppth'
 	want = 'utxt'
-class url(aetools.NProperty):
+class _Prop_url(aetools.NProperty):
 	"""url - the url of the item """
 	which = 'url '
 	want = 'utxt'
-class visible(aetools.NProperty):
+class _Prop_visible(aetools.NProperty):
 	"""visible - Is the item visible? """
 	which = 'pvis'
 	want = 'bool'
-class volume(aetools.NProperty):
+class _Prop_volume(aetools.NProperty):
 	"""volume - the volume on which the item resides """
 	which = 'volu'
 	want = 'utxt'
@@ -166,27 +166,27 @@ items = item
 class file(aetools.ComponentItem):
 	"""file - A file in the file system """
 	want = 'file'
-class creator_type(aetools.NProperty):
+class _Prop_creator_type(aetools.NProperty):
 	"""creator type - the OSType identifying the application that created the file """
 	which = 'fcrt'
 	want = 'utxt'
-class file_type(aetools.NProperty):
+class _Prop_file_type(aetools.NProperty):
 	"""file type - the OSType identifying the type of data contained in the file """
 	which = 'asty'
 	want = 'utxt'
-class physical_size(aetools.NProperty):
+class _Prop_physical_size(aetools.NProperty):
 	"""physical size - the actual space used by the file on disk """
 	which = 'phys'
 	want = '****'
-class product_version(aetools.NProperty):
+class _Prop_product_version(aetools.NProperty):
 	"""product version - the version of the product (visible at the top of the "Get Info" window) """
 	which = 'ver2'
 	want = 'utxt'
-class size(aetools.NProperty):
+class _Prop_size(aetools.NProperty):
 	"""size - the logical size of the file """
 	which = 'ptsz'
 	want = '****'
-class stationery(aetools.NProperty):
+class _Prop_stationery(aetools.NProperty):
 	"""stationery - Is the file a stationery pad? """
 	which = 'pspd'
 	want = 'bool'
@@ -194,9 +194,9 @@ class stationery(aetools.NProperty):
 files = file
 alias._superclassnames = ['item']
 alias._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'properties' : properties,
-	'version' : version,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'properties' : _Prop_properties,
+	'version' : _Prop_version,
 }
 alias._privelemdict = {
 	'alias' : alias,
@@ -206,15 +206,15 @@ alias._privelemdict = {
 }
 disk._superclassnames = ['item']
 disk._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'capacity' : capacity,
-	'ejectable' : ejectable,
-	'format' : format,
-	'free_space' : free_space,
-	'ignore_privileges' : ignore_privileges,
-	'local_volume' : local_volume,
-	'properties' : properties,
-	'startup' : startup,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'capacity' : _Prop_capacity,
+	'ejectable' : _Prop_ejectable,
+	'format' : _Prop_format,
+	'free_space' : _Prop_free_space,
+	'ignore_privileges' : _Prop_ignore_privileges,
+	'local_volume' : _Prop_local_volume,
+	'properties' : _Prop_properties,
+	'startup' : _Prop_startup,
 }
 disk._privelemdict = {
 	'alias' : alias,
@@ -224,8 +224,8 @@ disk._privelemdict = {
 }
 folder._superclassnames = ['item']
 folder._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'properties' : properties,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'properties' : _Prop_properties,
 }
 folder._privelemdict = {
 	'alias' : alias,
@@ -235,34 +235,34 @@ folder._privelemdict = {
 }
 item._superclassnames = []
 item._privpropdict = {
-	'POSIX_path' : POSIX_path,
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'busy_status' : busy_status,
-	'creation_date' : creation_date,
-	'displayed_name' : displayed_name,
-	'modification_date' : modification_date,
-	'name' : name,
-	'name_extension' : name_extension,
-	'package_folder' : package_folder,
-	'path' : path,
-	'properties' : properties,
-	'url' : url,
-	'visible' : visible,
-	'volume' : volume,
+	'POSIX_path' : _Prop_POSIX_path,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'busy_status' : _Prop_busy_status,
+	'creation_date' : _Prop_creation_date,
+	'displayed_name' : _Prop_displayed_name,
+	'modification_date' : _Prop_modification_date,
+	'name' : _Prop_name,
+	'name_extension' : _Prop_name_extension,
+	'package_folder' : _Prop_package_folder,
+	'path' : _Prop_path,
+	'properties' : _Prop_properties,
+	'url' : _Prop_url,
+	'visible' : _Prop_visible,
+	'volume' : _Prop_volume,
 }
 item._privelemdict = {
 }
 file._superclassnames = ['item']
 file._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'creator_type' : creator_type,
-	'file_type' : file_type,
-	'physical_size' : physical_size,
-	'product_version' : product_version,
-	'properties' : properties,
-	'size' : size,
-	'stationery' : stationery,
-	'version' : version,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'creator_type' : _Prop_creator_type,
+	'file_type' : _Prop_file_type,
+	'physical_size' : _Prop_physical_size,
+	'product_version' : _Prop_product_version,
+	'properties' : _Prop_properties,
+	'size' : _Prop_size,
+	'stationery' : _Prop_stationery,
+	'version' : _Prop_version,
 }
 file._privelemdict = {
 }
@@ -295,41 +295,3 @@ _classdeclarations = {
 	'cobj' : item,
 	'file' : file,
 }
-
-_propdeclarations = {
-	'ascd' : creation_date,
-	'asmo' : modification_date,
-	'asty' : file_type,
-	'busy' : busy_status,
-	'c@#^' : _3c_Inheritance_3e_,
-	'capa' : capacity,
-	'dfmt' : format,
-	'dnam' : displayed_name,
-	'extn' : name_extension,
-	'fcrt' : creator_type,
-	'frsp' : free_space,
-	'igpr' : ignore_privileges,
-	'isej' : ejectable,
-	'isrv' : local_volume,
-	'istd' : startup,
-	'pALL' : properties,
-	'phys' : physical_size,
-	'pkgf' : package_folder,
-	'pnam' : name,
-	'posx' : POSIX_path,
-	'ppth' : path,
-	'pspd' : stationery,
-	'ptsz' : size,
-	'pvis' : visible,
-	'url ' : url,
-	'ver2' : product_version,
-	'vers' : version,
-	'volu' : volume,
-}
-
-_compdeclarations = {
-}
-
-_enumdeclarations = {
-	'edfm' : _Enum_edfm,
-}
diff --git a/Lib/plat-mac/lib-scriptpackages/SystemEvents/Folder_Actions_Suite.py b/Lib/plat-mac/lib-scriptpackages/SystemEvents/Folder_Actions_Suite.py
index 666dd81..680cd1d 100644
--- a/Lib/plat-mac/lib-scriptpackages/SystemEvents/Folder_Actions_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/SystemEvents/Folder_Actions_Suite.py
@@ -150,27 +150,27 @@ class Folder_Actions_Suite_Events:
 class folder_action(aetools.ComponentItem):
 	"""folder action - An action attached to a folder in the file system """
 	want = 'foac'
-class _3c_Inheritance_3e_(aetools.NProperty):
+class _Prop__3c_Inheritance_3e_(aetools.NProperty):
 	"""<Inheritance> - All of the properties of the superclass. """
 	which = 'c@#^'
 	want = 'cobj'
-class enabled(aetools.NProperty):
+class _Prop_enabled(aetools.NProperty):
 	"""enabled - Is the folder action enabled? """
 	which = 'enaB'
 	want = 'bool'
-class name(aetools.NProperty):
+class _Prop_name(aetools.NProperty):
 	"""name - the name of the folder action, which is also the name of the folder """
 	which = 'pnam'
 	want = 'utxt'
-class path(aetools.NProperty):
+class _Prop_path(aetools.NProperty):
 	"""path - the path to the folder to which the folder action applies """
 	which = 'ppth'
 	want = '****'
-class properties(aetools.NProperty):
+class _Prop_properties(aetools.NProperty):
 	"""properties - every property of the folder action """
 	which = 'pALL'
 	want = '****'
-class volume(aetools.NProperty):
+class _Prop_volume(aetools.NProperty):
 	"""volume - the volume on which the folder action resides """
 	which = 'volu'
 	want = 'utxt'
@@ -181,7 +181,7 @@ folder_actions = folder_action
 class script(aetools.ComponentItem):
 	"""script - A script invoked by a folder action """
 	want = 'scpt'
-class POSIX_path(aetools.NProperty):
+class _Prop_POSIX_path(aetools.NProperty):
 	"""POSIX path - the POSIX file system path of the disk """
 	which = 'posx'
 	want = 'utxt'
@@ -190,23 +190,23 @@ scripts = script
 import Standard_Suite
 folder_action._superclassnames = ['item']
 folder_action._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'enabled' : enabled,
-	'name' : name,
-	'path' : path,
-	'properties' : properties,
-	'volume' : volume,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'enabled' : _Prop_enabled,
+	'name' : _Prop_name,
+	'path' : _Prop_path,
+	'properties' : _Prop_properties,
+	'volume' : _Prop_volume,
 }
 folder_action._privelemdict = {
 	'script' : script,
 }
 script._superclassnames = ['item']
 script._privpropdict = {
-	'POSIX_path' : POSIX_path,
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'name' : name,
-	'path' : path,
-	'properties' : properties,
+	'POSIX_path' : _Prop_POSIX_path,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'name' : _Prop_name,
+	'path' : _Prop_path,
+	'properties' : _Prop_properties,
 }
 script._privelemdict = {
 }
@@ -226,20 +226,3 @@ _classdeclarations = {
 	'foac' : folder_action,
 	'scpt' : script,
 }
-
-_propdeclarations = {
-	'c@#^' : _3c_Inheritance_3e_,
-	'enaB' : enabled,
-	'pALL' : properties,
-	'pnam' : name,
-	'posx' : POSIX_path,
-	'ppth' : path,
-	'volu' : volume,
-}
-
-_compdeclarations = {
-}
-
-_enumdeclarations = {
-	'actn' : _Enum_actn,
-}
diff --git a/Lib/plat-mac/lib-scriptpackages/SystemEvents/Hidden_Suite.py b/Lib/plat-mac/lib-scriptpackages/SystemEvents/Hidden_Suite.py
index 2776878..16971d7 100644
--- a/Lib/plat-mac/lib-scriptpackages/SystemEvents/Hidden_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/SystemEvents/Hidden_Suite.py
@@ -39,12 +39,3 @@ class Hidden_Suite_Events(Type_Names_Suite_Events):
 #
 _classdeclarations = {
 }
-
-_propdeclarations = {
-}
-
-_compdeclarations = {
-}
-
-_enumdeclarations = {
-}
diff --git a/Lib/plat-mac/lib-scriptpackages/SystemEvents/Login_Items_Suite.py b/Lib/plat-mac/lib-scriptpackages/SystemEvents/Login_Items_Suite.py
index 9206b88..4ab4911 100644
--- a/Lib/plat-mac/lib-scriptpackages/SystemEvents/Login_Items_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/SystemEvents/Login_Items_Suite.py
@@ -18,23 +18,23 @@ class Login_Items_Suite_Events:
 class login_item(aetools.ComponentItem):
 	"""login item - an item to be launched or opened at login """
 	want = 'logi'
-class _3c_Inheritance_3e_(aetools.NProperty):
+class _Prop__3c_Inheritance_3e_(aetools.NProperty):
 	"""<Inheritance> - All of the properties of the superclass. """
 	which = 'c@#^'
 	want = 'cobj'
-class hidden(aetools.NProperty):
+class _Prop_hidden(aetools.NProperty):
 	"""hidden - Is the Login Item hidden when launched? """
 	which = 'hidn'
 	want = 'bool'
-class kind(aetools.NProperty):
+class _Prop_kind(aetools.NProperty):
 	"""kind - the file type of the Login Item """
 	which = 'kind'
 	want = 'utxt'
-class name(aetools.NProperty):
+class _Prop_name(aetools.NProperty):
 	"""name - the name of the Login Item """
 	which = 'pnam'
 	want = 'utxt'
-class path(aetools.NProperty):
+class _Prop_path(aetools.NProperty):
 	"""path - the file system path to the Login Item """
 	which = 'ppth'
 	want = 'utxt'
@@ -43,11 +43,11 @@ login_items = login_item
 import Standard_Suite
 login_item._superclassnames = ['item']
 login_item._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'hidden' : hidden,
-	'kind' : kind,
-	'name' : name,
-	'path' : path,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'hidden' : _Prop_hidden,
+	'kind' : _Prop_kind,
+	'name' : _Prop_name,
+	'path' : _Prop_path,
 }
 login_item._privelemdict = {
 }
@@ -58,17 +58,3 @@ login_item._privelemdict = {
 _classdeclarations = {
 	'logi' : login_item,
 }
-
-_propdeclarations = {
-	'c@#^' : _3c_Inheritance_3e_,
-	'hidn' : hidden,
-	'kind' : kind,
-	'pnam' : name,
-	'ppth' : path,
-}
-
-_compdeclarations = {
-}
-
-_enumdeclarations = {
-}
diff --git a/Lib/plat-mac/lib-scriptpackages/SystemEvents/Power_Suite.py b/Lib/plat-mac/lib-scriptpackages/SystemEvents/Power_Suite.py
index 9745dd8..8eecdd0 100644
--- a/Lib/plat-mac/lib-scriptpackages/SystemEvents/Power_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/SystemEvents/Power_Suite.py
@@ -78,12 +78,3 @@ class Power_Suite_Events:
 #
 _classdeclarations = {
 }
-
-_propdeclarations = {
-}
-
-_compdeclarations = {
-}
-
-_enumdeclarations = {
-}
diff --git a/Lib/plat-mac/lib-scriptpackages/SystemEvents/Processes_Suite.py b/Lib/plat-mac/lib-scriptpackages/SystemEvents/Processes_Suite.py
index 4cf4e8e..ce9562c 100644
--- a/Lib/plat-mac/lib-scriptpackages/SystemEvents/Processes_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/SystemEvents/Processes_Suite.py
@@ -227,7 +227,7 @@ class Processes_Suite_Events:
 class browser(aetools.ComponentItem):
 	"""browser - A browser belonging to a window """
 	want = 'broW'
-class _3c_Inheritance_3e_(aetools.NProperty):
+class _Prop__3c_Inheritance_3e_(aetools.NProperty):
 	"""<Inheritance> - All of the properties of the superclass. """
 	which = 'c@#^'
 	want = 'uiel'
@@ -1206,7 +1206,7 @@ outlines = outline
 class application_process(aetools.ComponentItem):
 	"""application process - A process launched from an application file """
 	want = 'pcap'
-class application_file(aetools.NProperty):
+class _Prop_application_file(aetools.NProperty):
 	"""application file - a reference to the application file from which this process was launched """
 	which = 'appf'
 	want = '****'
@@ -1259,7 +1259,7 @@ application_processes = application_process
 class desk_accessory_process(aetools.ComponentItem):
 	"""desk accessory process - A process launched from an desk accessory file """
 	want = 'pcda'
-class desk_accessory_file(aetools.NProperty):
+class _Prop_desk_accessory_file(aetools.NProperty):
 	"""desk accessory file - a reference to the desk accessory file from which this process was launched """
 	which = 'dafi'
 	want = '****'
@@ -1359,59 +1359,59 @@ pop_up_buttons = pop_up_button
 class process(aetools.ComponentItem):
 	"""process - A process running on this computer """
 	want = 'prcs'
-class Classic(aetools.NProperty):
+class _Prop_Classic(aetools.NProperty):
 	"""Classic - Is the process running in the Classic environment? """
 	which = 'clsc'
 	want = 'bool'
-class accepts_high_level_events(aetools.NProperty):
+class _Prop_accepts_high_level_events(aetools.NProperty):
 	"""accepts high level events - Is the process high-level event aware (accepts open application, open document, print document, and quit)? """
 	which = 'isab'
 	want = 'bool'
-class accepts_remote_events(aetools.NProperty):
+class _Prop_accepts_remote_events(aetools.NProperty):
 	"""accepts remote events - Does the process accept remote events? """
 	which = 'revt'
 	want = 'bool'
-class creator_type(aetools.NProperty):
+class _Prop_creator_type(aetools.NProperty):
 	"""creator type - the OSType of the creator of the process (the signature) """
 	which = 'fcrt'
 	want = 'utxt'
-class displayed_name(aetools.NProperty):
+class _Prop_displayed_name(aetools.NProperty):
 	"""displayed name - the name of the file from which the process was launched, as displayed in the User Interface """
 	which = 'dnam'
 	want = 'utxt'
-class file(aetools.NProperty):
+class _Prop_file(aetools.NProperty):
 	"""file - the file from which the process was launched """
 	which = 'file'
 	want = '****'
-class file_type(aetools.NProperty):
+class _Prop_file_type(aetools.NProperty):
 	"""file type - the OSType of the file type of the process """
 	which = 'asty'
 	want = 'utxt'
-class frontmost(aetools.NProperty):
+class _Prop_frontmost(aetools.NProperty):
 	"""frontmost - Is the process the frontmost process """
 	which = 'pisf'
 	want = 'bool'
-class has_scripting_terminology(aetools.NProperty):
+class _Prop_has_scripting_terminology(aetools.NProperty):
 	"""has scripting terminology - Does the process have a scripting terminology, i.e., can it be scripted? """
 	which = 'hscr'
 	want = 'bool'
-class name(aetools.NProperty):
+class _Prop_name(aetools.NProperty):
 	"""name - the name of the process """
 	which = 'pnam'
 	want = 'utxt'
-class partition_space_used(aetools.NProperty):
+class _Prop_partition_space_used(aetools.NProperty):
 	"""partition space used - the number of bytes currently used in the process' partition """
 	which = 'pusd'
 	want = 'magn'
-class properties(aetools.NProperty):
+class _Prop_properties(aetools.NProperty):
 	"""properties - every property of the process """
 	which = 'pALL'
 	want = '****'
-class total_partition_size(aetools.NProperty):
+class _Prop_total_partition_size(aetools.NProperty):
 	"""total partition size - the size of the partition with which the process was launched """
 	which = 'appt'
 	want = 'magn'
-class visible(aetools.NProperty):
+class _Prop_visible(aetools.NProperty):
 	"""visible - Is the process' layer visible? """
 	which = 'pvis'
 	want = 'bool'
@@ -2314,63 +2314,63 @@ text_fields = text_field
 class UI_element(aetools.ComponentItem):
 	"""UI element - A piece of the user interface of a process """
 	want = 'uiel'
-class class_(aetools.NProperty):
+class _Prop_class_(aetools.NProperty):
 	"""class - the class of the UI Element, which identifies it function """
 	which = 'pcls'
 	want = 'type'
-class description(aetools.NProperty):
+class _Prop_description(aetools.NProperty):
 	"""description - a more complete description of the UI element and its capabilities """
 	which = 'desc'
 	want = 'utxt'
-class enabled(aetools.NProperty):
+class _Prop_enabled(aetools.NProperty):
 	"""enabled - Is the UI element enabled? ( Does it accept clicks? ) """
 	which = 'enab'
 	want = 'bool'
-class focused(aetools.NProperty):
+class _Prop_focused(aetools.NProperty):
 	"""focused - Is the focus on this UI element? """
 	which = 'focu'
 	want = 'bool'
-class help(aetools.NProperty):
+class _Prop_help(aetools.NProperty):
 	"""help - an encoded description of the UI element and its capabilities """
 	which = 'help'
 	want = 'utxt'
-class maximum(aetools.NProperty):
+class _Prop_maximum(aetools.NProperty):
 	"""maximum - the maximum vale that the UI element can take on """
 	which = 'maxi'
 	want = 'long'
-class minimum(aetools.NProperty):
+class _Prop_minimum(aetools.NProperty):
 	"""minimum - the minimum vale that the UI element can take on """
 	which = 'mini'
 	want = 'long'
-class orientation(aetools.NProperty):
+class _Prop_orientation(aetools.NProperty):
 	"""orientation - the orientation of the UI element """
 	which = 'orie'
 	want = 'utxt'
-class position(aetools.NProperty):
+class _Prop_position(aetools.NProperty):
 	"""position - the position of the UI element """
 	which = 'posn'
 	want = 'QDpt'
-class role(aetools.NProperty):
+class _Prop_role(aetools.NProperty):
 	"""role - an encoded description of the UI element and its capabilities """
 	which = 'role'
 	want = 'utxt'
-class selected(aetools.NProperty):
+class _Prop_selected(aetools.NProperty):
 	"""selected - Is the UI element selected? """
 	which = 'selE'
 	want = '****'
-class size(aetools.NProperty):
+class _Prop_size(aetools.NProperty):
 	"""size - the size of the UI element """
 	which = 'ptsz'
 	want = 'QDpt'
-class subrole(aetools.NProperty):
+class _Prop_subrole(aetools.NProperty):
 	"""subrole - an encoded description of the UI element and its capabilities """
 	which = 'sbrl'
 	want = 'utxt'
-class title(aetools.NProperty):
+class _Prop_title(aetools.NProperty):
 	"""title - the title of the UI element as it appears on the screen """
 	which = 'titl'
 	want = 'utxt'
-class value(aetools.NProperty):
+class _Prop_value(aetools.NProperty):
 	"""value - the current value of the UI element """
 	which = 'valu'
 	want = 'long'
@@ -2466,7 +2466,7 @@ class value_indicator(aetools.ComponentItem):
 value_indicators = value_indicator
 browser._superclassnames = ['UI_element']
 browser._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 browser._privelemdict = {
 	'UI_element' : UI_element,
@@ -2513,7 +2513,7 @@ browser._privelemdict = {
 }
 busy_indicator._superclassnames = ['UI_element']
 busy_indicator._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 busy_indicator._privelemdict = {
 	'UI_element' : UI_element,
@@ -2560,7 +2560,7 @@ busy_indicator._privelemdict = {
 }
 button._superclassnames = ['UI_element']
 button._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 button._privelemdict = {
 	'UI_element' : UI_element,
@@ -2607,7 +2607,7 @@ button._privelemdict = {
 }
 application._superclassnames = ['UI_element']
 application._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 application._privelemdict = {
 	'UI_element' : UI_element,
@@ -2654,7 +2654,7 @@ application._privelemdict = {
 }
 column._superclassnames = ['UI_element']
 column._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 column._privelemdict = {
 	'UI_element' : UI_element,
@@ -2701,7 +2701,7 @@ column._privelemdict = {
 }
 check_box._superclassnames = ['UI_element']
 check_box._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 check_box._privelemdict = {
 	'UI_element' : UI_element,
@@ -2748,7 +2748,7 @@ check_box._privelemdict = {
 }
 color_well._superclassnames = ['UI_element']
 color_well._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 color_well._privelemdict = {
 	'UI_element' : UI_element,
@@ -2795,7 +2795,7 @@ color_well._privelemdict = {
 }
 combo_box._superclassnames = ['UI_element']
 combo_box._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 combo_box._privelemdict = {
 	'UI_element' : UI_element,
@@ -2842,7 +2842,7 @@ combo_box._privelemdict = {
 }
 row._superclassnames = ['UI_element']
 row._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 row._privelemdict = {
 	'UI_element' : UI_element,
@@ -2889,7 +2889,7 @@ row._privelemdict = {
 }
 window._superclassnames = ['UI_element']
 window._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 window._privelemdict = {
 	'UI_element' : UI_element,
@@ -2968,7 +2968,7 @@ window._privelemdict = {
 }
 drawer._superclassnames = ['UI_element']
 drawer._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 drawer._privelemdict = {
 	'UI_element' : UI_element,
@@ -3015,7 +3015,7 @@ drawer._privelemdict = {
 }
 grow_area._superclassnames = ['UI_element']
 grow_area._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 grow_area._privelemdict = {
 	'UI_element' : UI_element,
@@ -3062,7 +3062,7 @@ grow_area._privelemdict = {
 }
 image._superclassnames = ['UI_element']
 image._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 image._privelemdict = {
 	'UI_element' : UI_element,
@@ -3109,7 +3109,7 @@ image._privelemdict = {
 }
 incrementor._superclassnames = ['UI_element']
 incrementor._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 incrementor._privelemdict = {
 	'UI_element' : UI_element,
@@ -3156,7 +3156,7 @@ incrementor._privelemdict = {
 }
 list._superclassnames = ['UI_element']
 list._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 list._privelemdict = {
 	'UI_element' : UI_element,
@@ -3203,7 +3203,7 @@ list._privelemdict = {
 }
 menu_bar._superclassnames = ['UI_element']
 menu_bar._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 menu_bar._privelemdict = {
 	'UI_element' : UI_element,
@@ -3251,7 +3251,7 @@ menu_bar._privelemdict = {
 }
 menu_button._superclassnames = ['UI_element']
 menu_button._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 menu_button._privelemdict = {
 	'UI_element' : UI_element,
@@ -3298,7 +3298,7 @@ menu_button._privelemdict = {
 }
 menu._superclassnames = ['UI_element']
 menu._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 menu._privelemdict = {
 	'UI_element' : UI_element,
@@ -3346,7 +3346,7 @@ menu._privelemdict = {
 }
 menu_item._superclassnames = ['UI_element']
 menu_item._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 menu_item._privelemdict = {
 	'UI_element' : UI_element,
@@ -3394,7 +3394,7 @@ menu_item._privelemdict = {
 }
 outline._superclassnames = ['UI_element']
 outline._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 outline._privelemdict = {
 	'UI_element' : UI_element,
@@ -3441,8 +3441,8 @@ outline._privelemdict = {
 }
 application_process._superclassnames = ['process']
 application_process._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'application_file' : application_file,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'application_file' : _Prop_application_file,
 }
 application_process._privelemdict = {
 	'UI_element' : UI_element,
@@ -3491,8 +3491,8 @@ application_process._privelemdict = {
 }
 desk_accessory_process._superclassnames = ['process']
 desk_accessory_process._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'desk_accessory_file' : desk_accessory_file,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'desk_accessory_file' : _Prop_desk_accessory_file,
 }
 desk_accessory_process._privelemdict = {
 	'UI_element' : UI_element,
@@ -3541,7 +3541,7 @@ desk_accessory_process._privelemdict = {
 }
 pop_up_button._superclassnames = ['UI_element']
 pop_up_button._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 pop_up_button._privelemdict = {
 	'UI_element' : UI_element,
@@ -3588,21 +3588,21 @@ pop_up_button._privelemdict = {
 }
 process._superclassnames = ['UI_element']
 process._privpropdict = {
-	'Classic' : Classic,
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'accepts_high_level_events' : accepts_high_level_events,
-	'accepts_remote_events' : accepts_remote_events,
-	'creator_type' : creator_type,
-	'displayed_name' : displayed_name,
-	'file' : file,
-	'file_type' : file_type,
-	'frontmost' : frontmost,
-	'has_scripting_terminology' : has_scripting_terminology,
-	'name' : name,
-	'partition_space_used' : partition_space_used,
-	'properties' : properties,
-	'total_partition_size' : total_partition_size,
-	'visible' : visible,
+	'Classic' : _Prop_Classic,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'accepts_high_level_events' : _Prop_accepts_high_level_events,
+	'accepts_remote_events' : _Prop_accepts_remote_events,
+	'creator_type' : _Prop_creator_type,
+	'displayed_name' : _Prop_displayed_name,
+	'file' : _Prop_file,
+	'file_type' : _Prop_file_type,
+	'frontmost' : _Prop_frontmost,
+	'has_scripting_terminology' : _Prop_has_scripting_terminology,
+	'name' : _Prop_name,
+	'partition_space_used' : _Prop_partition_space_used,
+	'properties' : _Prop_properties,
+	'total_partition_size' : _Prop_total_partition_size,
+	'visible' : _Prop_visible,
 }
 process._privelemdict = {
 	'UI_element' : UI_element,
@@ -3651,7 +3651,7 @@ process._privelemdict = {
 }
 progress_indicator._superclassnames = ['UI_element']
 progress_indicator._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 progress_indicator._privelemdict = {
 	'UI_element' : UI_element,
@@ -3698,7 +3698,7 @@ progress_indicator._privelemdict = {
 }
 radio_button._superclassnames = ['UI_element']
 radio_button._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 radio_button._privelemdict = {
 	'UI_element' : UI_element,
@@ -3745,7 +3745,7 @@ radio_button._privelemdict = {
 }
 relevance_indicator._superclassnames = ['UI_element']
 relevance_indicator._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 relevance_indicator._privelemdict = {
 	'UI_element' : UI_element,
@@ -3792,7 +3792,7 @@ relevance_indicator._privelemdict = {
 }
 radio_group._superclassnames = ['UI_element']
 radio_group._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 radio_group._privelemdict = {
 	'UI_element' : UI_element,
@@ -3840,7 +3840,7 @@ radio_group._privelemdict = {
 }
 scroll_area._superclassnames = ['UI_element']
 scroll_area._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 scroll_area._privelemdict = {
 	'UI_element' : UI_element,
@@ -3887,7 +3887,7 @@ scroll_area._privelemdict = {
 }
 scroll_bar._superclassnames = ['UI_element']
 scroll_bar._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 scroll_bar._privelemdict = {
 	'UI_element' : UI_element,
@@ -3936,7 +3936,7 @@ scroll_bar._privelemdict = {
 }
 group._superclassnames = ['UI_element']
 group._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 group._privelemdict = {
 	'UI_element' : UI_element,
@@ -3985,7 +3985,7 @@ group._privelemdict = {
 }
 sheet._superclassnames = ['UI_element']
 sheet._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 sheet._privelemdict = {
 	'UI_element' : UI_element,
@@ -4032,7 +4032,7 @@ sheet._privelemdict = {
 }
 slider._superclassnames = ['UI_element']
 slider._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 slider._privelemdict = {
 	'UI_element' : UI_element,
@@ -4079,7 +4079,7 @@ slider._privelemdict = {
 }
 splitter_group._superclassnames = ['UI_element']
 splitter_group._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 splitter_group._privelemdict = {
 	'UI_element' : UI_element,
@@ -4126,7 +4126,7 @@ splitter_group._privelemdict = {
 }
 splitter._superclassnames = ['UI_element']
 splitter._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 splitter._privelemdict = {
 	'UI_element' : UI_element,
@@ -4173,7 +4173,7 @@ splitter._privelemdict = {
 }
 static_text._superclassnames = ['UI_element']
 static_text._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 static_text._privelemdict = {
 	'UI_element' : UI_element,
@@ -4221,7 +4221,7 @@ static_text._privelemdict = {
 }
 system_wide_UI_element._superclassnames = ['UI_element']
 system_wide_UI_element._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 system_wide_UI_element._privelemdict = {
 	'UI_element' : UI_element,
@@ -4268,7 +4268,7 @@ system_wide_UI_element._privelemdict = {
 }
 tab_group._superclassnames = ['UI_element']
 tab_group._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 tab_group._privelemdict = {
 	'UI_element' : UI_element,
@@ -4315,7 +4315,7 @@ tab_group._privelemdict = {
 }
 table._superclassnames = ['UI_element']
 table._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 table._privelemdict = {
 	'UI_element' : UI_element,
@@ -4362,7 +4362,7 @@ table._privelemdict = {
 }
 tool_bar._superclassnames = ['UI_element']
 tool_bar._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 tool_bar._privelemdict = {
 	'UI_element' : UI_element,
@@ -4409,7 +4409,7 @@ tool_bar._privelemdict = {
 }
 text_area._superclassnames = ['UI_element']
 text_area._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 text_area._privelemdict = {
 	'UI_element' : UI_element,
@@ -4456,7 +4456,7 @@ text_area._privelemdict = {
 }
 text_field._superclassnames = ['UI_element']
 text_field._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 text_field._privelemdict = {
 	'UI_element' : UI_element,
@@ -4504,23 +4504,23 @@ text_field._privelemdict = {
 import Standard_Suite
 UI_element._superclassnames = ['item']
 UI_element._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'class_' : class_,
-	'description' : description,
-	'enabled' : enabled,
-	'focused' : focused,
-	'help' : help,
-	'maximum' : maximum,
-	'minimum' : minimum,
-	'name' : name,
-	'orientation' : orientation,
-	'position' : position,
-	'role' : role,
-	'selected' : selected,
-	'size' : size,
-	'subrole' : subrole,
-	'title' : title,
-	'value' : value,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'class_' : _Prop_class_,
+	'description' : _Prop_description,
+	'enabled' : _Prop_enabled,
+	'focused' : _Prop_focused,
+	'help' : _Prop_help,
+	'maximum' : _Prop_maximum,
+	'minimum' : _Prop_minimum,
+	'name' : _Prop_name,
+	'orientation' : _Prop_orientation,
+	'position' : _Prop_position,
+	'role' : _Prop_role,
+	'selected' : _Prop_selected,
+	'size' : _Prop_size,
+	'subrole' : _Prop_subrole,
+	'title' : _Prop_title,
+	'value' : _Prop_value,
 }
 UI_element._privelemdict = {
 	'UI_element' : UI_element,
@@ -4567,7 +4567,7 @@ UI_element._privelemdict = {
 }
 value_indicator._superclassnames = ['UI_element']
 value_indicator._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 value_indicator._privelemdict = {
 	'UI_element' : UI_element,
@@ -4676,46 +4676,3 @@ _classdeclarations = {
 	'uiel' : UI_element,
 	'vali' : value_indicator,
 }
-
-_propdeclarations = {
-	'appf' : application_file,
-	'appt' : total_partition_size,
-	'asty' : file_type,
-	'c@#^' : _3c_Inheritance_3e_,
-	'clsc' : Classic,
-	'dafi' : desk_accessory_file,
-	'desc' : description,
-	'dnam' : displayed_name,
-	'enab' : enabled,
-	'fcrt' : creator_type,
-	'file' : file,
-	'focu' : focused,
-	'help' : help,
-	'hscr' : has_scripting_terminology,
-	'isab' : accepts_high_level_events,
-	'maxi' : maximum,
-	'mini' : minimum,
-	'orie' : orientation,
-	'pALL' : properties,
-	'pcls' : class_,
-	'pisf' : frontmost,
-	'pnam' : name,
-	'posn' : position,
-	'ptsz' : size,
-	'pusd' : partition_space_used,
-	'pvis' : visible,
-	'revt' : accepts_remote_events,
-	'role' : role,
-	'sbrl' : subrole,
-	'selE' : selected,
-	'titl' : title,
-	'valu' : value,
-}
-
-_compdeclarations = {
-}
-
-_enumdeclarations = {
-	'eMds' : _Enum_eMds,
-	'eMky' : _Enum_eMky,
-}
diff --git a/Lib/plat-mac/lib-scriptpackages/SystemEvents/Standard_Suite.py b/Lib/plat-mac/lib-scriptpackages/SystemEvents/Standard_Suite.py
index 814b6e4..27a978e 100644
--- a/Lib/plat-mac/lib-scriptpackages/SystemEvents/Standard_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/SystemEvents/Standard_Suite.py
@@ -333,19 +333,19 @@ class Standard_Suite_Events:
 class application(aetools.ComponentItem):
 	"""application - An application's top level scripting object. """
 	want = 'capp'
-class _3c_Inheritance_3e_(aetools.NProperty):
+class _Prop__3c_Inheritance_3e_(aetools.NProperty):
 	"""<Inheritance> - All of the properties of the superclass. """
 	which = 'c@#^'
 	want = 'cobj'
-class frontmost(aetools.NProperty):
+class _Prop_frontmost(aetools.NProperty):
 	"""frontmost - Is this the frontmost (active) application? """
 	which = 'pisf'
 	want = 'bool'
-class name(aetools.NProperty):
+class _Prop_name(aetools.NProperty):
 	"""name - The name of the application. """
 	which = 'pnam'
 	want = 'utxt'
-class version(aetools.NProperty):
+class _Prop_version(aetools.NProperty):
 	"""version - The version of the application. """
 	which = 'vers'
 	want = 'utxt'
@@ -357,11 +357,11 @@ applications = application
 class item(aetools.ComponentItem):
 	"""item - A scriptable object. """
 	want = 'cobj'
-class class_(aetools.NProperty):
+class _Prop_class_(aetools.NProperty):
 	"""class - The class of the object. """
 	which = 'pcls'
 	want = 'type'
-class properties(aetools.NProperty):
+class _Prop_properties(aetools.NProperty):
 	"""properties - All of the object's properties. """
 	which = 'pALL'
 	want = 'reco'
@@ -377,59 +377,59 @@ colors = color
 class window(aetools.ComponentItem):
 	"""window - A window. """
 	want = 'cwin'
-class bounds(aetools.NProperty):
+class _Prop_bounds(aetools.NProperty):
 	"""bounds - The bounding rectangle of the window. """
 	which = 'pbnd'
 	want = 'qdrt'
-class closeable(aetools.NProperty):
+class _Prop_closeable(aetools.NProperty):
 	"""closeable - Whether the window has a close box. """
 	which = 'hclb'
 	want = 'bool'
-class document(aetools.NProperty):
+class _Prop_document(aetools.NProperty):
 	"""document - The document whose contents are being displayed in the window. """
 	which = 'docu'
 	want = 'docu'
-class floating(aetools.NProperty):
+class _Prop_floating(aetools.NProperty):
 	"""floating - Whether the window floats. """
 	which = 'isfl'
 	want = 'bool'
-class id(aetools.NProperty):
+class _Prop_id(aetools.NProperty):
 	"""id - The unique identifier of the window. """
 	which = 'ID  '
 	want = 'long'
-class index(aetools.NProperty):
+class _Prop_index(aetools.NProperty):
 	"""index - The index of the window in the back-to-front window ordering. """
 	which = 'pidx'
 	want = 'long'
-class miniaturizable(aetools.NProperty):
+class _Prop_miniaturizable(aetools.NProperty):
 	"""miniaturizable - Whether the window can be miniaturized. """
 	which = 'ismn'
 	want = 'bool'
-class miniaturized(aetools.NProperty):
+class _Prop_miniaturized(aetools.NProperty):
 	"""miniaturized - Whether the window is currently miniaturized. """
 	which = 'pmnd'
 	want = 'bool'
-class modal(aetools.NProperty):
+class _Prop_modal(aetools.NProperty):
 	"""modal - Whether the window is the application's current modal window. """
 	which = 'pmod'
 	want = 'bool'
-class resizable(aetools.NProperty):
+class _Prop_resizable(aetools.NProperty):
 	"""resizable - Whether the window can be resized. """
 	which = 'prsz'
 	want = 'bool'
-class titled(aetools.NProperty):
+class _Prop_titled(aetools.NProperty):
 	"""titled - Whether the window has a title bar. """
 	which = 'ptit'
 	want = 'bool'
-class visible(aetools.NProperty):
+class _Prop_visible(aetools.NProperty):
 	"""visible - Whether the window is currently visible. """
 	which = 'pvis'
 	want = 'bool'
-class zoomable(aetools.NProperty):
+class _Prop_zoomable(aetools.NProperty):
 	"""zoomable - Whether the window can be zoomed. """
 	which = 'iszm'
 	want = 'bool'
-class zoomed(aetools.NProperty):
+class _Prop_zoomed(aetools.NProperty):
 	"""zoomed - Whether the window is currently zoomed. """
 	which = 'pzum'
 	want = 'bool'
@@ -439,11 +439,11 @@ windows = window
 class document(aetools.ComponentItem):
 	"""document - A document. """
 	want = 'docu'
-class modified(aetools.NProperty):
+class _Prop_modified(aetools.NProperty):
 	"""modified - Has the document been modified since the last save? """
 	which = 'imod'
 	want = 'bool'
-class path(aetools.NProperty):
+class _Prop_path(aetools.NProperty):
 	"""path - The document's path. """
 	which = 'ppth'
 	want = 'utxt'
@@ -451,10 +451,10 @@ class path(aetools.NProperty):
 documents = document
 application._superclassnames = ['item']
 application._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'frontmost' : frontmost,
-	'name' : name,
-	'version' : version,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'frontmost' : _Prop_frontmost,
+	'name' : _Prop_name,
+	'version' : _Prop_version,
 }
 application._privelemdict = {
 	'document' : document,
@@ -462,44 +462,44 @@ application._privelemdict = {
 }
 item._superclassnames = []
 item._privpropdict = {
-	'class_' : class_,
-	'properties' : properties,
+	'class_' : _Prop_class_,
+	'properties' : _Prop_properties,
 }
 item._privelemdict = {
 }
 color._superclassnames = ['item']
 color._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 color._privelemdict = {
 }
 window._superclassnames = ['item']
 window._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'bounds' : bounds,
-	'closeable' : closeable,
-	'document' : document,
-	'floating' : floating,
-	'id' : id,
-	'index' : index,
-	'miniaturizable' : miniaturizable,
-	'miniaturized' : miniaturized,
-	'modal' : modal,
-	'name' : name,
-	'resizable' : resizable,
-	'titled' : titled,
-	'visible' : visible,
-	'zoomable' : zoomable,
-	'zoomed' : zoomed,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'bounds' : _Prop_bounds,
+	'closeable' : _Prop_closeable,
+	'document' : _Prop_document,
+	'floating' : _Prop_floating,
+	'id' : _Prop_id,
+	'index' : _Prop_index,
+	'miniaturizable' : _Prop_miniaturizable,
+	'miniaturized' : _Prop_miniaturized,
+	'modal' : _Prop_modal,
+	'name' : _Prop_name,
+	'resizable' : _Prop_resizable,
+	'titled' : _Prop_titled,
+	'visible' : _Prop_visible,
+	'zoomable' : _Prop_zoomable,
+	'zoomed' : _Prop_zoomed,
 }
 window._privelemdict = {
 }
 document._superclassnames = ['item']
 document._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'modified' : modified,
-	'name' : name,
-	'path' : path,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'modified' : _Prop_modified,
+	'name' : _Prop_name,
+	'path' : _Prop_path,
 }
 document._privelemdict = {
 }
@@ -536,43 +536,3 @@ _classdeclarations = {
 	'cwin' : window,
 	'docu' : document,
 }
-
-_propdeclarations = {
-	'ID  ' : id,
-	'c@#^' : _3c_Inheritance_3e_,
-	'docu' : document,
-	'hclb' : closeable,
-	'imod' : modified,
-	'isfl' : floating,
-	'ismn' : miniaturizable,
-	'iszm' : zoomable,
-	'pALL' : properties,
-	'pbnd' : bounds,
-	'pcls' : class_,
-	'pidx' : index,
-	'pisf' : frontmost,
-	'pmnd' : miniaturized,
-	'pmod' : modal,
-	'pnam' : name,
-	'ppth' : path,
-	'prsz' : resizable,
-	'ptit' : titled,
-	'pvis' : visible,
-	'pzum' : zoomed,
-	'vers' : version,
-}
-
-_compdeclarations = {
-	'<   ' : _3c_,
-	'<=  ' : _b2_,
-	'=   ' : _3d_,
-	'>   ' : _3e_,
-	'>=  ' : _b3_,
-	'bgwt' : starts_with,
-	'cont' : contains,
-	'ends' : ends_with,
-}
-
-_enumdeclarations = {
-	'savo' : _Enum_savo,
-}
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 ace4516..1f6af42 100644
--- a/Lib/plat-mac/lib-scriptpackages/SystemEvents/System_Events_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/SystemEvents/System_Events_Suite.py
@@ -18,19 +18,19 @@ class System_Events_Suite_Events:
 class application(aetools.ComponentItem):
 	"""application - The System Events application """
 	want = 'capp'
-class _3c_Inheritance_3e_(aetools.NProperty):
+class _Prop__3c_Inheritance_3e_(aetools.NProperty):
 	"""<Inheritance> - All of the properties of the superclass. """
 	which = 'c@#^'
 	want = 'capp'
-class folder_actions_enabled(aetools.NProperty):
+class _Prop_folder_actions_enabled(aetools.NProperty):
 	"""folder actions enabled - Are Folder Actions currently being processed? """
 	which = 'faen'
 	want = 'bool'
-class properties(aetools.NProperty):
+class _Prop_properties(aetools.NProperty):
 	"""properties - every property of the System Events application """
 	which = 'pALL'
 	want = '****'
-class system_wide_UI_element(aetools.NProperty):
+class _Prop_system_wide_UI_element(aetools.NProperty):
 	"""system wide UI element - the UI element for the entire system """
 	which = 'swui'
 	want = 'uiel'
@@ -56,10 +56,10 @@ import Folder_Actions_Suite
 import Login_Items_Suite
 import Processes_Suite
 application._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'folder_actions_enabled' : folder_actions_enabled,
-	'properties' : properties,
-	'system_wide_UI_element' : system_wide_UI_element,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'folder_actions_enabled' : _Prop_folder_actions_enabled,
+	'properties' : _Prop_properties,
+	'system_wide_UI_element' : _Prop_system_wide_UI_element,
 }
 application._privelemdict = {
 	'UI_element' : Processes_Suite.UI_element,
@@ -83,16 +83,3 @@ application._privelemdict = {
 _classdeclarations = {
 	'capp' : application,
 }
-
-_propdeclarations = {
-	'c@#^' : _3c_Inheritance_3e_,
-	'faen' : folder_actions_enabled,
-	'pALL' : properties,
-	'swui' : system_wide_UI_element,
-}
-
-_compdeclarations = {
-}
-
-_enumdeclarations = {
-}
diff --git a/Lib/plat-mac/lib-scriptpackages/SystemEvents/Text_Suite.py b/Lib/plat-mac/lib-scriptpackages/SystemEvents/Text_Suite.py
index 8691264..7deaec7 100644
--- a/Lib/plat-mac/lib-scriptpackages/SystemEvents/Text_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/SystemEvents/Text_Suite.py
@@ -18,11 +18,11 @@ class Text_Suite_Events:
 class attachment(aetools.ComponentItem):
 	"""attachment - Represents an inline text attachment.  This class is used mainly for make commands. """
 	want = 'atts'
-class _3c_Inheritance_3e_(aetools.NProperty):
+class _Prop__3c_Inheritance_3e_(aetools.NProperty):
 	"""<Inheritance> - All of the properties of the superclass. """
 	which = 'c@#^'
 	want = 'ctxt'
-class file_name(aetools.NProperty):
+class _Prop_file_name(aetools.NProperty):
 	"""file name - The path to the file for the attachment """
 	which = 'atfn'
 	want = 'utxt'
@@ -34,15 +34,15 @@ class file_name(aetools.NProperty):
 class attribute_run(aetools.ComponentItem):
 	"""attribute run - This subdivides the text into chunks that all have the same attributes. """
 	want = 'catr'
-class color(aetools.NProperty):
+class _Prop_color(aetools.NProperty):
 	"""color - The color of the first character. """
 	which = 'colr'
 	want = 'colr'
-class font(aetools.NProperty):
+class _Prop_font(aetools.NProperty):
 	"""font - The name of the font of the first character. """
 	which = 'font'
 	want = 'utxt'
-class size(aetools.NProperty):
+class _Prop_size(aetools.NProperty):
 	"""size - The size in points of the first character. """
 	which = 'ptsz'
 	want = 'long'
@@ -92,8 +92,8 @@ class word(aetools.ComponentItem):
 words = word
 attachment._superclassnames = ['text']
 attachment._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'file_name' : file_name,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'file_name' : _Prop_file_name,
 }
 attachment._privelemdict = {
 	'attribute_run' : attribute_run,
@@ -104,10 +104,10 @@ attachment._privelemdict = {
 import Standard_Suite
 attribute_run._superclassnames = ['item']
 attribute_run._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'color' : color,
-	'font' : font,
-	'size' : size,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'color' : _Prop_color,
+	'font' : _Prop_font,
+	'size' : _Prop_size,
 }
 attribute_run._privelemdict = {
 	'attribute_run' : attribute_run,
@@ -117,10 +117,10 @@ attribute_run._privelemdict = {
 }
 character._superclassnames = ['item']
 character._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'color' : color,
-	'font' : font,
-	'size' : size,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'color' : _Prop_color,
+	'font' : _Prop_font,
+	'size' : _Prop_size,
 }
 character._privelemdict = {
 	'attribute_run' : attribute_run,
@@ -130,10 +130,10 @@ character._privelemdict = {
 }
 paragraph._superclassnames = ['item']
 paragraph._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'color' : color,
-	'font' : font,
-	'size' : size,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'color' : _Prop_color,
+	'font' : _Prop_font,
+	'size' : _Prop_size,
 }
 paragraph._privelemdict = {
 	'attribute_run' : attribute_run,
@@ -143,10 +143,10 @@ paragraph._privelemdict = {
 }
 text._superclassnames = ['item']
 text._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'color' : color,
-	'font' : font,
-	'size' : size,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'color' : _Prop_color,
+	'font' : _Prop_font,
+	'size' : _Prop_size,
 }
 text._privelemdict = {
 	'attribute_run' : attribute_run,
@@ -156,10 +156,10 @@ text._privelemdict = {
 }
 word._superclassnames = ['item']
 word._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'color' : color,
-	'font' : font,
-	'size' : size,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'color' : _Prop_color,
+	'font' : _Prop_font,
+	'size' : _Prop_size,
 }
 word._privelemdict = {
 	'attribute_run' : attribute_run,
@@ -179,17 +179,3 @@ _classdeclarations = {
 	'ctxt' : text,
 	'cwor' : word,
 }
-
-_propdeclarations = {
-	'atfn' : file_name,
-	'c@#^' : _3c_Inheritance_3e_,
-	'colr' : color,
-	'font' : font,
-	'ptsz' : size,
-}
-
-_compdeclarations = {
-}
-
-_enumdeclarations = {
-}
diff --git a/Lib/plat-mac/lib-scriptpackages/SystemEvents/__init__.py b/Lib/plat-mac/lib-scriptpackages/SystemEvents/__init__.py
index 6a639ff..de07377 100644
--- a/Lib/plat-mac/lib-scriptpackages/SystemEvents/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/SystemEvents/__init__.py
@@ -73,8 +73,6 @@ getbaseclasses(paragraph)
 getbaseclasses(word)
 getbaseclasses(attribute_run)
 getbaseclasses(text)
-getbaseclasses(script)
-getbaseclasses(folder_action)
 getbaseclasses(file)
 getbaseclasses(alias)
 getbaseclasses(item)
@@ -85,47 +83,8 @@ getbaseclasses(window)
 getbaseclasses(application)
 getbaseclasses(item)
 getbaseclasses(document)
-getbaseclasses(login_item)
-getbaseclasses(StdSuites.Type_Names_Suite.double_integer)
-getbaseclasses(StdSuites.Type_Names_Suite.version)
-getbaseclasses(StdSuites.Type_Names_Suite.RGB16_color)
-getbaseclasses(StdSuites.Type_Names_Suite.system_dictionary)
-getbaseclasses(StdSuites.Type_Names_Suite.color_table)
-getbaseclasses(StdSuites.Type_Names_Suite.fixed_point)
-getbaseclasses(StdSuites.Type_Names_Suite.TIFF_picture)
-getbaseclasses(StdSuites.Type_Names_Suite.type_element_info)
-getbaseclasses(StdSuites.Type_Names_Suite.type_event_info)
-getbaseclasses(StdSuites.Type_Names_Suite.machine_location)
-getbaseclasses(StdSuites.Type_Names_Suite.PostScript_picture)
-getbaseclasses(StdSuites.Type_Names_Suite.point)
-getbaseclasses(StdSuites.Type_Names_Suite.long_fixed_point)
-getbaseclasses(StdSuites.Type_Names_Suite.menu_item)
-getbaseclasses(StdSuites.Type_Names_Suite.scrap_styles)
-getbaseclasses(StdSuites.Type_Names_Suite.application_dictionary)
-getbaseclasses(StdSuites.Type_Names_Suite.unsigned_integer)
-getbaseclasses(StdSuites.Type_Names_Suite.menu)
-getbaseclasses(StdSuites.Type_Names_Suite.fixed_rectangle)
-getbaseclasses(StdSuites.Type_Names_Suite.type_property_info)
-getbaseclasses(StdSuites.Type_Names_Suite.long_fixed_rectangle)
-getbaseclasses(StdSuites.Type_Names_Suite.long_fixed)
-getbaseclasses(StdSuites.Type_Names_Suite.type_suite_info)
-getbaseclasses(StdSuites.Type_Names_Suite.rotation)
-getbaseclasses(StdSuites.Type_Names_Suite.small_integer)
-getbaseclasses(StdSuites.Type_Names_Suite.fixed)
-getbaseclasses(StdSuites.Type_Names_Suite.long_point)
-getbaseclasses(StdSuites.Type_Names_Suite.type_class_info)
-getbaseclasses(StdSuites.Type_Names_Suite.RGB96_color)
-getbaseclasses(StdSuites.Type_Names_Suite.target_id)
-getbaseclasses(StdSuites.Type_Names_Suite.pixel_map_record)
-getbaseclasses(StdSuites.Type_Names_Suite.type_parameter_info)
-getbaseclasses(StdSuites.Type_Names_Suite.extended_real)
-getbaseclasses(StdSuites.Type_Names_Suite.long_rectangle)
-getbaseclasses(StdSuites.Type_Names_Suite.dash_style)
-getbaseclasses(StdSuites.Type_Names_Suite.plain_text)
-getbaseclasses(StdSuites.Type_Names_Suite.small_real)
-getbaseclasses(StdSuites.Type_Names_Suite.null)
-getbaseclasses(StdSuites.Type_Names_Suite.location_reference)
-getbaseclasses(StdSuites.Type_Names_Suite.bounding_rectangle)
+getbaseclasses(script)
+getbaseclasses(folder_action)
 getbaseclasses(window)
 getbaseclasses(radio_button)
 getbaseclasses(list)
@@ -170,7 +129,48 @@ getbaseclasses(color_well)
 getbaseclasses(scroll_bar)
 getbaseclasses(combo_box)
 getbaseclasses(browser)
+getbaseclasses(StdSuites.Type_Names_Suite.double_integer)
+getbaseclasses(StdSuites.Type_Names_Suite.version)
+getbaseclasses(StdSuites.Type_Names_Suite.RGB16_color)
+getbaseclasses(StdSuites.Type_Names_Suite.system_dictionary)
+getbaseclasses(StdSuites.Type_Names_Suite.color_table)
+getbaseclasses(StdSuites.Type_Names_Suite.fixed_point)
+getbaseclasses(StdSuites.Type_Names_Suite.TIFF_picture)
+getbaseclasses(StdSuites.Type_Names_Suite.type_element_info)
+getbaseclasses(StdSuites.Type_Names_Suite.type_event_info)
+getbaseclasses(StdSuites.Type_Names_Suite.machine_location)
+getbaseclasses(StdSuites.Type_Names_Suite.PostScript_picture)
+getbaseclasses(StdSuites.Type_Names_Suite.point)
+getbaseclasses(StdSuites.Type_Names_Suite.long_fixed_point)
+getbaseclasses(StdSuites.Type_Names_Suite.menu_item)
+getbaseclasses(StdSuites.Type_Names_Suite.scrap_styles)
+getbaseclasses(StdSuites.Type_Names_Suite.application_dictionary)
+getbaseclasses(StdSuites.Type_Names_Suite.unsigned_integer)
+getbaseclasses(StdSuites.Type_Names_Suite.menu)
+getbaseclasses(StdSuites.Type_Names_Suite.fixed_rectangle)
+getbaseclasses(StdSuites.Type_Names_Suite.type_property_info)
+getbaseclasses(StdSuites.Type_Names_Suite.long_fixed_rectangle)
+getbaseclasses(StdSuites.Type_Names_Suite.long_fixed)
+getbaseclasses(StdSuites.Type_Names_Suite.type_suite_info)
+getbaseclasses(StdSuites.Type_Names_Suite.rotation)
+getbaseclasses(StdSuites.Type_Names_Suite.small_integer)
+getbaseclasses(StdSuites.Type_Names_Suite.fixed)
+getbaseclasses(StdSuites.Type_Names_Suite.long_point)
+getbaseclasses(StdSuites.Type_Names_Suite.type_class_info)
+getbaseclasses(StdSuites.Type_Names_Suite.RGB96_color)
+getbaseclasses(StdSuites.Type_Names_Suite.target_id)
+getbaseclasses(StdSuites.Type_Names_Suite.pixel_map_record)
+getbaseclasses(StdSuites.Type_Names_Suite.type_parameter_info)
+getbaseclasses(StdSuites.Type_Names_Suite.extended_real)
+getbaseclasses(StdSuites.Type_Names_Suite.long_rectangle)
+getbaseclasses(StdSuites.Type_Names_Suite.dash_style)
+getbaseclasses(StdSuites.Type_Names_Suite.string)
+getbaseclasses(StdSuites.Type_Names_Suite.small_real)
+getbaseclasses(StdSuites.Type_Names_Suite.null)
+getbaseclasses(StdSuites.Type_Names_Suite.location_reference)
+getbaseclasses(StdSuites.Type_Names_Suite.bounding_rectangle)
 getbaseclasses(application)
+getbaseclasses(login_item)
 
 #
 # Indices of types declared in this module
@@ -182,8 +182,6 @@ _classdeclarations = {
 	'cwor' : word,
 	'catr' : attribute_run,
 	'ctxt' : text,
-	'scpt' : script,
-	'foac' : folder_action,
 	'file' : file,
 	'alis' : alias,
 	'cobj' : item,
@@ -194,47 +192,8 @@ _classdeclarations = {
 	'capp' : application,
 	'cobj' : item,
 	'docu' : document,
-	'logi' : login_item,
-	'comp' : StdSuites.Type_Names_Suite.double_integer,
-	'vers' : StdSuites.Type_Names_Suite.version,
-	'tr16' : StdSuites.Type_Names_Suite.RGB16_color,
-	'aeut' : StdSuites.Type_Names_Suite.system_dictionary,
-	'clrt' : StdSuites.Type_Names_Suite.color_table,
-	'fpnt' : StdSuites.Type_Names_Suite.fixed_point,
-	'TIFF' : StdSuites.Type_Names_Suite.TIFF_picture,
-	'elin' : StdSuites.Type_Names_Suite.type_element_info,
-	'evin' : StdSuites.Type_Names_Suite.type_event_info,
-	'mLoc' : StdSuites.Type_Names_Suite.machine_location,
-	'EPS ' : StdSuites.Type_Names_Suite.PostScript_picture,
-	'QDpt' : StdSuites.Type_Names_Suite.point,
-	'lfpt' : StdSuites.Type_Names_Suite.long_fixed_point,
-	'cmen' : StdSuites.Type_Names_Suite.menu_item,
-	'styl' : StdSuites.Type_Names_Suite.scrap_styles,
-	'aete' : StdSuites.Type_Names_Suite.application_dictionary,
-	'magn' : StdSuites.Type_Names_Suite.unsigned_integer,
-	'cmnu' : StdSuites.Type_Names_Suite.menu,
-	'frct' : StdSuites.Type_Names_Suite.fixed_rectangle,
-	'pinf' : StdSuites.Type_Names_Suite.type_property_info,
-	'lfrc' : StdSuites.Type_Names_Suite.long_fixed_rectangle,
-	'lfxd' : StdSuites.Type_Names_Suite.long_fixed,
-	'suin' : StdSuites.Type_Names_Suite.type_suite_info,
-	'trot' : StdSuites.Type_Names_Suite.rotation,
-	'shor' : StdSuites.Type_Names_Suite.small_integer,
-	'fixd' : StdSuites.Type_Names_Suite.fixed,
-	'lpnt' : StdSuites.Type_Names_Suite.long_point,
-	'gcli' : StdSuites.Type_Names_Suite.type_class_info,
-	'tr96' : StdSuites.Type_Names_Suite.RGB96_color,
-	'targ' : StdSuites.Type_Names_Suite.target_id,
-	'tpmm' : StdSuites.Type_Names_Suite.pixel_map_record,
-	'pmin' : StdSuites.Type_Names_Suite.type_parameter_info,
-	'exte' : StdSuites.Type_Names_Suite.extended_real,
-	'lrct' : StdSuites.Type_Names_Suite.long_rectangle,
-	'tdas' : StdSuites.Type_Names_Suite.dash_style,
-	'TEXT' : StdSuites.Type_Names_Suite.plain_text,
-	'sing' : StdSuites.Type_Names_Suite.small_real,
-	'null' : StdSuites.Type_Names_Suite.null,
-	'insl' : StdSuites.Type_Names_Suite.location_reference,
-	'qdrt' : StdSuites.Type_Names_Suite.bounding_rectangle,
+	'scpt' : script,
+	'foac' : folder_action,
 	'cwin' : window,
 	'radB' : radio_button,
 	'list' : list,
@@ -279,7 +238,48 @@ _classdeclarations = {
 	'scrb' : scroll_bar,
 	'comB' : combo_box,
 	'broW' : browser,
+	'comp' : StdSuites.Type_Names_Suite.double_integer,
+	'vers' : StdSuites.Type_Names_Suite.version,
+	'tr16' : StdSuites.Type_Names_Suite.RGB16_color,
+	'aeut' : StdSuites.Type_Names_Suite.system_dictionary,
+	'clrt' : StdSuites.Type_Names_Suite.color_table,
+	'fpnt' : StdSuites.Type_Names_Suite.fixed_point,
+	'TIFF' : StdSuites.Type_Names_Suite.TIFF_picture,
+	'elin' : StdSuites.Type_Names_Suite.type_element_info,
+	'evin' : StdSuites.Type_Names_Suite.type_event_info,
+	'mLoc' : StdSuites.Type_Names_Suite.machine_location,
+	'EPS ' : StdSuites.Type_Names_Suite.PostScript_picture,
+	'QDpt' : StdSuites.Type_Names_Suite.point,
+	'lfpt' : StdSuites.Type_Names_Suite.long_fixed_point,
+	'cmen' : StdSuites.Type_Names_Suite.menu_item,
+	'styl' : StdSuites.Type_Names_Suite.scrap_styles,
+	'aete' : StdSuites.Type_Names_Suite.application_dictionary,
+	'magn' : StdSuites.Type_Names_Suite.unsigned_integer,
+	'cmnu' : StdSuites.Type_Names_Suite.menu,
+	'frct' : StdSuites.Type_Names_Suite.fixed_rectangle,
+	'pinf' : StdSuites.Type_Names_Suite.type_property_info,
+	'lfrc' : StdSuites.Type_Names_Suite.long_fixed_rectangle,
+	'lfxd' : StdSuites.Type_Names_Suite.long_fixed,
+	'suin' : StdSuites.Type_Names_Suite.type_suite_info,
+	'trot' : StdSuites.Type_Names_Suite.rotation,
+	'shor' : StdSuites.Type_Names_Suite.small_integer,
+	'fixd' : StdSuites.Type_Names_Suite.fixed,
+	'lpnt' : StdSuites.Type_Names_Suite.long_point,
+	'gcli' : StdSuites.Type_Names_Suite.type_class_info,
+	'tr96' : StdSuites.Type_Names_Suite.RGB96_color,
+	'targ' : StdSuites.Type_Names_Suite.target_id,
+	'tpmm' : StdSuites.Type_Names_Suite.pixel_map_record,
+	'pmin' : StdSuites.Type_Names_Suite.type_parameter_info,
+	'exte' : StdSuites.Type_Names_Suite.extended_real,
+	'lrct' : StdSuites.Type_Names_Suite.long_rectangle,
+	'tdas' : StdSuites.Type_Names_Suite.dash_style,
+	'TEXT' : StdSuites.Type_Names_Suite.string,
+	'sing' : StdSuites.Type_Names_Suite.small_real,
+	'null' : StdSuites.Type_Names_Suite.null,
+	'insl' : StdSuites.Type_Names_Suite.location_reference,
+	'qdrt' : StdSuites.Type_Names_Suite.bounding_rectangle,
 	'capp' : application,
+	'logi' : login_item,
 }
 
 
diff --git a/Lib/plat-mac/lib-scriptpackages/Terminal/Standard_Suite.py b/Lib/plat-mac/lib-scriptpackages/Terminal/Standard_Suite.py
index c48e447..92c1e1f 100644
--- a/Lib/plat-mac/lib-scriptpackages/Terminal/Standard_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Terminal/Standard_Suite.py
@@ -333,19 +333,19 @@ class Standard_Suite_Events:
 class application(aetools.ComponentItem):
 	"""application - An application's top level scripting object. """
 	want = 'capp'
-class _3c_Inheritance_3e_(aetools.NProperty):
+class _Prop__3c_Inheritance_3e_(aetools.NProperty):
 	"""<Inheritance> - All of the properties of the superclass. """
 	which = 'c@#^'
 	want = 'cobj'
-class frontmost(aetools.NProperty):
+class _Prop_frontmost(aetools.NProperty):
 	"""frontmost - Is this the frontmost (active) application? """
 	which = 'pisf'
 	want = 'bool'
-class name(aetools.NProperty):
+class _Prop_name(aetools.NProperty):
 	"""name - The name of the application. """
 	which = 'pnam'
 	want = 'utxt'
-class version(aetools.NProperty):
+class _Prop_version(aetools.NProperty):
 	"""version - The version of the application. """
 	which = 'vers'
 	want = 'utxt'
@@ -357,11 +357,11 @@ applications = application
 class item(aetools.ComponentItem):
 	"""item - A scriptable object. """
 	want = 'cobj'
-class class_(aetools.NProperty):
+class _Prop_class_(aetools.NProperty):
 	"""class - The class of the object. """
 	which = 'pcls'
 	want = 'type'
-class properties(aetools.NProperty):
+class _Prop_properties(aetools.NProperty):
 	"""properties - All of the object's properties. """
 	which = 'pALL'
 	want = 'reco'
@@ -377,59 +377,59 @@ colors = color
 class window(aetools.ComponentItem):
 	"""window - A window. """
 	want = 'cwin'
-class bounds(aetools.NProperty):
+class _Prop_bounds(aetools.NProperty):
 	"""bounds - The bounding rectangle of the window. """
 	which = 'pbnd'
 	want = 'qdrt'
-class closeable(aetools.NProperty):
+class _Prop_closeable(aetools.NProperty):
 	"""closeable - Whether the window has a close box. """
 	which = 'hclb'
 	want = 'bool'
-class document(aetools.NProperty):
+class _Prop_document(aetools.NProperty):
 	"""document - The document whose contents are being displayed in the window. """
 	which = 'docu'
 	want = 'docu'
-class floating(aetools.NProperty):
+class _Prop_floating(aetools.NProperty):
 	"""floating - Whether the window floats. """
 	which = 'isfl'
 	want = 'bool'
-class id(aetools.NProperty):
+class _Prop_id(aetools.NProperty):
 	"""id - The unique identifier of the window. """
 	which = 'ID  '
 	want = 'long'
-class index(aetools.NProperty):
+class _Prop_index(aetools.NProperty):
 	"""index - The index of the window in the back-to-front window ordering. """
 	which = 'pidx'
 	want = 'long'
-class miniaturizable(aetools.NProperty):
+class _Prop_miniaturizable(aetools.NProperty):
 	"""miniaturizable - Whether the window can be miniaturized. """
 	which = 'ismn'
 	want = 'bool'
-class miniaturized(aetools.NProperty):
+class _Prop_miniaturized(aetools.NProperty):
 	"""miniaturized - Whether the window is currently miniaturized. """
 	which = 'pmnd'
 	want = 'bool'
-class modal(aetools.NProperty):
+class _Prop_modal(aetools.NProperty):
 	"""modal - Whether the window is the application's current modal window. """
 	which = 'pmod'
 	want = 'bool'
-class resizable(aetools.NProperty):
+class _Prop_resizable(aetools.NProperty):
 	"""resizable - Whether the window can be resized. """
 	which = 'prsz'
 	want = 'bool'
-class titled(aetools.NProperty):
+class _Prop_titled(aetools.NProperty):
 	"""titled - Whether the window has a title bar. """
 	which = 'ptit'
 	want = 'bool'
-class visible(aetools.NProperty):
+class _Prop_visible(aetools.NProperty):
 	"""visible - Whether the window is currently visible. """
 	which = 'pvis'
 	want = 'bool'
-class zoomable(aetools.NProperty):
+class _Prop_zoomable(aetools.NProperty):
 	"""zoomable - Whether the window can be zoomed. """
 	which = 'iszm'
 	want = 'bool'
-class zoomed(aetools.NProperty):
+class _Prop_zoomed(aetools.NProperty):
 	"""zoomed - Whether the window is currently zoomed. """
 	which = 'pzum'
 	want = 'bool'
@@ -439,11 +439,11 @@ windows = window
 class document(aetools.ComponentItem):
 	"""document - A document. """
 	want = 'docu'
-class modified(aetools.NProperty):
+class _Prop_modified(aetools.NProperty):
 	"""modified - Has the document been modified since the last save? """
 	which = 'imod'
 	want = 'bool'
-class path(aetools.NProperty):
+class _Prop_path(aetools.NProperty):
 	"""path - The document's path. """
 	which = 'ppth'
 	want = 'utxt'
@@ -451,10 +451,10 @@ class path(aetools.NProperty):
 documents = document
 application._superclassnames = ['item']
 application._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'frontmost' : frontmost,
-	'name' : name,
-	'version' : version,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'frontmost' : _Prop_frontmost,
+	'name' : _Prop_name,
+	'version' : _Prop_version,
 }
 application._privelemdict = {
 	'document' : document,
@@ -462,44 +462,44 @@ application._privelemdict = {
 }
 item._superclassnames = []
 item._privpropdict = {
-	'class_' : class_,
-	'properties' : properties,
+	'class_' : _Prop_class_,
+	'properties' : _Prop_properties,
 }
 item._privelemdict = {
 }
 color._superclassnames = ['item']
 color._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 color._privelemdict = {
 }
 window._superclassnames = ['item']
 window._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'bounds' : bounds,
-	'closeable' : closeable,
-	'document' : document,
-	'floating' : floating,
-	'id' : id,
-	'index' : index,
-	'miniaturizable' : miniaturizable,
-	'miniaturized' : miniaturized,
-	'modal' : modal,
-	'name' : name,
-	'resizable' : resizable,
-	'titled' : titled,
-	'visible' : visible,
-	'zoomable' : zoomable,
-	'zoomed' : zoomed,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'bounds' : _Prop_bounds,
+	'closeable' : _Prop_closeable,
+	'document' : _Prop_document,
+	'floating' : _Prop_floating,
+	'id' : _Prop_id,
+	'index' : _Prop_index,
+	'miniaturizable' : _Prop_miniaturizable,
+	'miniaturized' : _Prop_miniaturized,
+	'modal' : _Prop_modal,
+	'name' : _Prop_name,
+	'resizable' : _Prop_resizable,
+	'titled' : _Prop_titled,
+	'visible' : _Prop_visible,
+	'zoomable' : _Prop_zoomable,
+	'zoomed' : _Prop_zoomed,
 }
 window._privelemdict = {
 }
 document._superclassnames = ['item']
 document._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'modified' : modified,
-	'name' : name,
-	'path' : path,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'modified' : _Prop_modified,
+	'name' : _Prop_name,
+	'path' : _Prop_path,
 }
 document._privelemdict = {
 }
@@ -536,43 +536,3 @@ _classdeclarations = {
 	'cwin' : window,
 	'docu' : document,
 }
-
-_propdeclarations = {
-	'ID  ' : id,
-	'c@#^' : _3c_Inheritance_3e_,
-	'docu' : document,
-	'hclb' : closeable,
-	'imod' : modified,
-	'isfl' : floating,
-	'ismn' : miniaturizable,
-	'iszm' : zoomable,
-	'pALL' : properties,
-	'pbnd' : bounds,
-	'pcls' : class_,
-	'pidx' : index,
-	'pisf' : frontmost,
-	'pmnd' : miniaturized,
-	'pmod' : modal,
-	'pnam' : name,
-	'ppth' : path,
-	'prsz' : resizable,
-	'ptit' : titled,
-	'pvis' : visible,
-	'pzum' : zoomed,
-	'vers' : version,
-}
-
-_compdeclarations = {
-	'<   ' : _3c_,
-	'<=  ' : _b2_,
-	'=   ' : _3d_,
-	'>   ' : _3e_,
-	'>=  ' : _b3_,
-	'bgwt' : starts_with,
-	'cont' : contains,
-	'ends' : ends_with,
-}
-
-_enumdeclarations = {
-	'savo' : _Enum_savo,
-}
diff --git a/Lib/plat-mac/lib-scriptpackages/Terminal/Terminal_Suite.py b/Lib/plat-mac/lib-scriptpackages/Terminal/Terminal_Suite.py
index a724e7f..29a95db 100644
--- a/Lib/plat-mac/lib-scriptpackages/Terminal/Terminal_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Terminal/Terminal_Suite.py
@@ -64,11 +64,11 @@ class Terminal_Suite_Events:
 class application(aetools.ComponentItem):
 	"""application - The Terminal program """
 	want = 'capp'
-class _3c_Inheritance_3e_(aetools.NProperty):
+class _Prop__3c_Inheritance_3e_(aetools.NProperty):
 	"""<Inheritance> - All of the properties of the superclass. """
 	which = 'c@#^'
 	want = 'capp'
-class properties(aetools.NProperty):
+class _Prop_properties(aetools.NProperty):
 	"""properties - every property of the Terminal program """
 	which = 'pALL'
 	want = '****'
@@ -80,91 +80,91 @@ applications = application
 class window(aetools.ComponentItem):
 	"""window - A Terminal window """
 	want = 'cwin'
-class background_color(aetools.NProperty):
+class _Prop_background_color(aetools.NProperty):
 	"""background color - the background color for the window """
 	which = 'pbcl'
 	want = '****'
-class bold_text_color(aetools.NProperty):
+class _Prop_bold_text_color(aetools.NProperty):
 	"""bold text color - the bold text color for the window """
 	which = 'pbtc'
 	want = '****'
-class bounds(aetools.NProperty):
+class _Prop_bounds(aetools.NProperty):
 	"""bounds - the boundary rectangle for the window, relative to the upper left corner of the screen """
 	which = 'pbnd'
 	want = '****'
-class busy(aetools.NProperty):
+class _Prop_busy(aetools.NProperty):
 	"""busy - Is the window busy running a process? """
 	which = 'busy'
 	want = 'bool'
-class contents(aetools.NProperty):
+class _Prop_contents(aetools.NProperty):
 	"""contents - the currently visible contents of the window """
 	which = 'pcnt'
 	want = 'utxt'
-class cursor_color(aetools.NProperty):
+class _Prop_cursor_color(aetools.NProperty):
 	"""cursor color - the cursor color for the window """
 	which = 'pcuc'
 	want = '****'
-class custom_title(aetools.NProperty):
+class _Prop_custom_title(aetools.NProperty):
 	"""custom title - the custom title for the window """
 	which = 'titl'
 	want = 'utxt'
-class frame(aetools.NProperty):
+class _Prop_frame(aetools.NProperty):
 	"""frame - the origin and size of the window """
 	which = 'pfra'
 	want = '****'
-class frontmost(aetools.NProperty):
+class _Prop_frontmost(aetools.NProperty):
 	"""frontmost - Is the window in front of the other Terminal windows? """
 	which = 'pisf'
 	want = 'bool'
-class history(aetools.NProperty):
+class _Prop_history(aetools.NProperty):
 	"""history - the contents of the entire scrolling buffer of the window """
 	which = 'hist'
 	want = 'utxt'
-class normal_text_color(aetools.NProperty):
+class _Prop_normal_text_color(aetools.NProperty):
 	"""normal text color - the normal text color for the window """
 	which = 'ptxc'
 	want = '****'
-class number_of_columns(aetools.NProperty):
+class _Prop_number_of_columns(aetools.NProperty):
 	"""number of columns - the number of columns in the window """
 	which = 'ccol'
 	want = 'long'
-class number_of_rows(aetools.NProperty):
+class _Prop_number_of_rows(aetools.NProperty):
 	"""number of rows - the number of rows in the window """
 	which = 'crow'
 	want = 'long'
-class origin(aetools.NProperty):
+class _Prop_origin(aetools.NProperty):
 	"""origin - the lower left coordinates of the window, relative to the lower left corner of the screen """
 	which = 'pori'
 	want = '****'
-class position(aetools.NProperty):
+class _Prop_position(aetools.NProperty):
 	"""position - the upper left coordinates of the window, relative to the upper left corner of the screen """
 	which = 'ppos'
 	want = '****'
-class processes(aetools.NProperty):
+class _Prop_processes(aetools.NProperty):
 	"""processes - a list of the currently running processes """
 	which = 'prcs'
 	want = 'utxt'
-class size(aetools.NProperty):
+class _Prop_size(aetools.NProperty):
 	"""size - the width and height of the window """
 	which = 'psiz'
 	want = '****'
-class title_displays_custom_title(aetools.NProperty):
+class _Prop_title_displays_custom_title(aetools.NProperty):
 	"""title displays custom title - Does the title for the window contain a custom title? """
 	which = 'tdct'
 	want = 'bool'
-class title_displays_device_name(aetools.NProperty):
+class _Prop_title_displays_device_name(aetools.NProperty):
 	"""title displays device name - Does the title for the window contain the device name? """
 	which = 'tddn'
 	want = 'bool'
-class title_displays_file_name(aetools.NProperty):
+class _Prop_title_displays_file_name(aetools.NProperty):
 	"""title displays file name - Does the title for the window contain the file name? """
 	which = 'tdfn'
 	want = 'bool'
-class title_displays_shell_path(aetools.NProperty):
+class _Prop_title_displays_shell_path(aetools.NProperty):
 	"""title displays shell path - Does the title for the window contain the shell path? """
 	which = 'tdsp'
 	want = 'bool'
-class title_displays_window_size(aetools.NProperty):
+class _Prop_title_displays_window_size(aetools.NProperty):
 	"""title displays window size - Does the title for the window contain the window size? """
 	which = 'tdws'
 	want = 'bool'
@@ -173,8 +173,8 @@ windows = window
 application._superclassnames = []
 import Standard_Suite
 application._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'properties' : properties,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'properties' : _Prop_properties,
 }
 application._privelemdict = {
 	'document' : Standard_Suite.document,
@@ -182,30 +182,30 @@ application._privelemdict = {
 }
 window._superclassnames = []
 window._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'background_color' : background_color,
-	'bold_text_color' : bold_text_color,
-	'bounds' : bounds,
-	'busy' : busy,
-	'contents' : contents,
-	'cursor_color' : cursor_color,
-	'custom_title' : custom_title,
-	'frame' : frame,
-	'frontmost' : frontmost,
-	'history' : history,
-	'normal_text_color' : normal_text_color,
-	'number_of_columns' : number_of_columns,
-	'number_of_rows' : number_of_rows,
-	'origin' : origin,
-	'position' : position,
-	'processes' : processes,
-	'properties' : properties,
-	'size' : size,
-	'title_displays_custom_title' : title_displays_custom_title,
-	'title_displays_device_name' : title_displays_device_name,
-	'title_displays_file_name' : title_displays_file_name,
-	'title_displays_shell_path' : title_displays_shell_path,
-	'title_displays_window_size' : title_displays_window_size,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'background_color' : _Prop_background_color,
+	'bold_text_color' : _Prop_bold_text_color,
+	'bounds' : _Prop_bounds,
+	'busy' : _Prop_busy,
+	'contents' : _Prop_contents,
+	'cursor_color' : _Prop_cursor_color,
+	'custom_title' : _Prop_custom_title,
+	'frame' : _Prop_frame,
+	'frontmost' : _Prop_frontmost,
+	'history' : _Prop_history,
+	'normal_text_color' : _Prop_normal_text_color,
+	'number_of_columns' : _Prop_number_of_columns,
+	'number_of_rows' : _Prop_number_of_rows,
+	'origin' : _Prop_origin,
+	'position' : _Prop_position,
+	'processes' : _Prop_processes,
+	'properties' : _Prop_properties,
+	'size' : _Prop_size,
+	'title_displays_custom_title' : _Prop_title_displays_custom_title,
+	'title_displays_device_name' : _Prop_title_displays_device_name,
+	'title_displays_file_name' : _Prop_title_displays_file_name,
+	'title_displays_shell_path' : _Prop_title_displays_shell_path,
+	'title_displays_window_size' : _Prop_title_displays_window_size,
 }
 window._privelemdict = {
 }
@@ -217,36 +217,3 @@ _classdeclarations = {
 	'capp' : application,
 	'cwin' : window,
 }
-
-_propdeclarations = {
-	'busy' : busy,
-	'c@#^' : _3c_Inheritance_3e_,
-	'ccol' : number_of_columns,
-	'crow' : number_of_rows,
-	'hist' : history,
-	'pALL' : properties,
-	'pbcl' : background_color,
-	'pbnd' : bounds,
-	'pbtc' : bold_text_color,
-	'pcnt' : contents,
-	'pcuc' : cursor_color,
-	'pfra' : frame,
-	'pisf' : frontmost,
-	'pori' : origin,
-	'ppos' : position,
-	'prcs' : processes,
-	'psiz' : size,
-	'ptxc' : normal_text_color,
-	'tdct' : title_displays_custom_title,
-	'tddn' : title_displays_device_name,
-	'tdfn' : title_displays_file_name,
-	'tdsp' : title_displays_shell_path,
-	'tdws' : title_displays_window_size,
-	'titl' : custom_title,
-}
-
-_compdeclarations = {
-}
-
-_enumdeclarations = {
-}
diff --git a/Lib/plat-mac/lib-scriptpackages/Terminal/Text_Suite.py b/Lib/plat-mac/lib-scriptpackages/Terminal/Text_Suite.py
index 3b4fb29..3ab6c6d 100644
--- a/Lib/plat-mac/lib-scriptpackages/Terminal/Text_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Terminal/Text_Suite.py
@@ -18,11 +18,11 @@ class Text_Suite_Events:
 class attachment(aetools.ComponentItem):
 	"""attachment - Represents an inline text attachment.  This class is used mainly for make commands. """
 	want = 'atts'
-class _3c_Inheritance_3e_(aetools.NProperty):
+class _Prop__3c_Inheritance_3e_(aetools.NProperty):
 	"""<Inheritance> - All of the properties of the superclass. """
 	which = 'c@#^'
 	want = 'ctxt'
-class file_name(aetools.NProperty):
+class _Prop_file_name(aetools.NProperty):
 	"""file name - The path to the file for the attachment """
 	which = 'atfn'
 	want = 'utxt'
@@ -34,15 +34,15 @@ class file_name(aetools.NProperty):
 class attribute_run(aetools.ComponentItem):
 	"""attribute run - This subdivides the text into chunks that all have the same attributes. """
 	want = 'catr'
-class color(aetools.NProperty):
+class _Prop_color(aetools.NProperty):
 	"""color - The color of the first character. """
 	which = 'colr'
 	want = 'colr'
-class font(aetools.NProperty):
+class _Prop_font(aetools.NProperty):
 	"""font - The name of the font of the first character. """
 	which = 'font'
 	want = 'utxt'
-class size(aetools.NProperty):
+class _Prop_size(aetools.NProperty):
 	"""size - The size in points of the first character. """
 	which = 'ptsz'
 	want = 'long'
@@ -92,8 +92,8 @@ class word(aetools.ComponentItem):
 words = word
 attachment._superclassnames = ['text']
 attachment._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'file_name' : file_name,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'file_name' : _Prop_file_name,
 }
 attachment._privelemdict = {
 	'attribute_run' : attribute_run,
@@ -104,10 +104,10 @@ attachment._privelemdict = {
 import Standard_Suite
 attribute_run._superclassnames = ['item']
 attribute_run._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'color' : color,
-	'font' : font,
-	'size' : size,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'color' : _Prop_color,
+	'font' : _Prop_font,
+	'size' : _Prop_size,
 }
 attribute_run._privelemdict = {
 	'attribute_run' : attribute_run,
@@ -117,10 +117,10 @@ attribute_run._privelemdict = {
 }
 character._superclassnames = ['item']
 character._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'color' : color,
-	'font' : font,
-	'size' : size,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'color' : _Prop_color,
+	'font' : _Prop_font,
+	'size' : _Prop_size,
 }
 character._privelemdict = {
 	'attribute_run' : attribute_run,
@@ -130,10 +130,10 @@ character._privelemdict = {
 }
 paragraph._superclassnames = ['item']
 paragraph._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'color' : color,
-	'font' : font,
-	'size' : size,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'color' : _Prop_color,
+	'font' : _Prop_font,
+	'size' : _Prop_size,
 }
 paragraph._privelemdict = {
 	'attribute_run' : attribute_run,
@@ -143,10 +143,10 @@ paragraph._privelemdict = {
 }
 text._superclassnames = ['item']
 text._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'color' : color,
-	'font' : font,
-	'size' : size,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'color' : _Prop_color,
+	'font' : _Prop_font,
+	'size' : _Prop_size,
 }
 text._privelemdict = {
 	'attribute_run' : attribute_run,
@@ -156,10 +156,10 @@ text._privelemdict = {
 }
 word._superclassnames = ['item']
 word._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'color' : color,
-	'font' : font,
-	'size' : size,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'color' : _Prop_color,
+	'font' : _Prop_font,
+	'size' : _Prop_size,
 }
 word._privelemdict = {
 	'attribute_run' : attribute_run,
@@ -179,17 +179,3 @@ _classdeclarations = {
 	'ctxt' : text,
 	'cwor' : word,
 }
-
-_propdeclarations = {
-	'atfn' : file_name,
-	'c@#^' : _3c_Inheritance_3e_,
-	'colr' : color,
-	'font' : font,
-	'ptsz' : size,
-}
-
-_compdeclarations = {
-}
-
-_enumdeclarations = {
-}
diff --git a/Lib/plat-mac/lib-scriptpackages/Terminal/__init__.py b/Lib/plat-mac/lib-scriptpackages/Terminal/__init__.py
index 10d2baf..1aaf3d8 100644
--- a/Lib/plat-mac/lib-scriptpackages/Terminal/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/Terminal/__init__.py
@@ -43,14 +43,14 @@ import StdSuites
 #
 # Set property and element dictionaries now that all classes have been defined
 #
-getbaseclasses(window)
-getbaseclasses(application)
 getbaseclasses(character)
 getbaseclasses(attachment)
 getbaseclasses(paragraph)
 getbaseclasses(word)
 getbaseclasses(attribute_run)
 getbaseclasses(text)
+getbaseclasses(window)
+getbaseclasses(application)
 getbaseclasses(color)
 getbaseclasses(window)
 getbaseclasses(application)
@@ -61,14 +61,14 @@ getbaseclasses(document)
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'cwin' : window,
-	'capp' : application,
 	'cha ' : character,
 	'atts' : attachment,
 	'cpar' : paragraph,
 	'cwor' : word,
 	'catr' : attribute_run,
 	'ctxt' : text,
+	'cwin' : window,
+	'capp' : application,
 	'colr' : color,
 	'cwin' : window,
 	'capp' : application,