Regenerated again, now clases are sorted by code, and with synonyms after

the primary name.

8 files changed, 1059 insertions, 1049 deletions

diff --git a/Lib/plat-mac/lib-scriptpackages/StdSuites/AppleScript_Suite.py b/Lib/plat-mac/lib-scriptpackages/StdSuites/AppleScript_Suite.py
index 28bc0ed..24ad562 100644
--- a/Lib/plat-mac/lib-scriptpackages/StdSuites/AppleScript_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/StdSuites/AppleScript_Suite.py
@@ -740,129 +740,57 @@ class AppleScript_Suite_Events:
 			return _arguments['----']
 
 
-class empty_ae_name_(aetools.ComponentItem):
-	""" - the undefined value """
-	want = 'undf'
-
-class April(aetools.ComponentItem):
-	"""April - the month of April """
-	want = 'apr '
-
-class August(aetools.ComponentItem):
-	"""August - the month of August """
-	want = 'aug '
-
-class C_string(aetools.ComponentItem):
-	"""C string - text followed by a null """
-	want = 'cstr'
-
-C_strings = C_string
-
-class December(aetools.ComponentItem):
-	"""December - the month of December """
-	want = 'dec '
+class anything(aetools.ComponentItem):
+	"""anything - any class or reference """
+	want = '****'
 
-class February(aetools.ComponentItem):
-	"""February - the month of February """
-	want = 'feb '
+class pictures(aetools.ComponentItem):
+	"""pictures -  """
+	want = 'PICT'
 
-class Friday(aetools.ComponentItem):
-	"""Friday - Friday """
-	want = 'fri '
+picture = pictures
 
-class January(aetools.ComponentItem):
-	"""January - the month of January """
-	want = 'jan '
+class styled_text(aetools.ComponentItem):
+	"""styled text - text with font, size, and style information """
+	want = 'STXT'
 
-class July(aetools.ComponentItem):
-	"""July - the month of July """
-	want = 'jul '
+styled_text = styled_text
 
-class June(aetools.ComponentItem):
-	"""June - the month of June """
-	want = 'jun '
+class strings(aetools.ComponentItem):
+	"""strings -  """
+	want = 'TEXT'
 
-class March(aetools.ComponentItem):
-	"""March - the month of March """
-	want = 'mar '
+string = strings
 
-class May(aetools.ComponentItem):
-	"""May - the month of May """
-	want = 'may '
+class aliases(aetools.ComponentItem):
+	"""aliases -  """
+	want = 'alis'
 
-class Monday(aetools.ComponentItem):
-	"""Monday - Monday """
-	want = 'mon '
+alias = aliases
 
-class November(aetools.ComponentItem):
-	"""November - the month of November """
-	want = 'nov '
+class April(aetools.ComponentItem):
+	"""April - the month of April """
+	want = 'apr '
 
-class October(aetools.ComponentItem):
-	"""October - the month of October """
-	want = 'oct '
+class August(aetools.ComponentItem):
+	"""August - the month of August """
+	want = 'aug '
 
-class Pascal_string(aetools.ComponentItem):
-	"""Pascal string - text up to 255 characters preceded by a length byte """
-	want = 'pstr'
+class booleans(aetools.ComponentItem):
+	"""booleans -  """
+	want = 'bool'
 
-Pascal_strings = Pascal_string
+boolean = booleans
 
-class RGB_color(aetools.ComponentItem):
-	"""RGB color - Three integers specifying red, green, blue color values """
+class RGB_colors(aetools.ComponentItem):
+	"""RGB colors -  """
 	want = 'cRGB'
 
-RGB_colors = RGB_color
-
-class Saturday(aetools.ComponentItem):
-	"""Saturday - Saturday """
-	want = 'sat '
-
-class September(aetools.ComponentItem):
-	"""September - the month of September """
-	want = 'sep '
-
-class Sunday(aetools.ComponentItem):
-	"""Sunday - Sunday """
-	want = 'sun '
-
-class Thursday(aetools.ComponentItem):
-	"""Thursday - Thursday """
-	want = 'thu '
-
-class Tuesday(aetools.ComponentItem):
-	"""Tuesday - Tuesday """
-	want = 'tue '
-
-class Unicode_text(aetools.ComponentItem):
-	"""Unicode text -  """
-	want = 'utxt'
-
-Unicode_text = Unicode_text
-
-class Wednesday(aetools.ComponentItem):
-	"""Wednesday - Wednesday """
-	want = 'wed '
-
-class alias(aetools.ComponentItem):
-	"""alias - a file on a disk or server.  The file must exist when you check the syntax of your script. """
-	want = 'alis'
-
-class alias_or_string(aetools.ComponentItem):
-	"""alias or string - an alias or string """
-	want = 'sf  '
-
-aliases = alias
-
-class anything(aetools.ComponentItem):
-	"""anything - any class or reference """
-	want = '****'
+RGB_color = RGB_colors
 
-class app(aetools.ComponentItem):
-	"""app - Short name for application """
+class application(aetools.ComponentItem):
+	"""application - specifies global properties of AppleScript """
 	want = 'capp'
-
-application = app
 class AppleScript(aetools.NProperty):
 	"""AppleScript - the top-level script object """
 	which = 'ascr'
@@ -916,41 +844,13 @@ class weeks(aetools.NProperty):
 	which = 'week'
 	want = 'long'
 
-applications = app
-
-class boolean(aetools.ComponentItem):
-	"""boolean - A true or false value """
-	want = 'bool'
-
-booleans = boolean
+applications = application
 
-class centimeters(aetools.ComponentItem):
-	"""centimeters - a distance measurement in SI centimeters """
-	want = 'cmtr'
+app = application
 
-centimetres = centimeters
-
-class character(aetools.ComponentItem):
-	"""character - an individual text character """
-	want = 'cha '
-
-characters = character
-
-class class_(aetools.ComponentItem):
-	"""class - the type of a value """
-	want = 'pcls'
-class _3c_Inheritance_3e_(aetools.NProperty):
-	"""<Inheritance> - inherits some of its properties from this class """
-	which = 'c@#^'
-	want = 'type'
-
-classes = class_
-
-class constant(aetools.ComponentItem):
-	"""constant - A constant value """
-	want = 'enum'
-
-constants = constant
+class upper_case(aetools.ComponentItem):
+	"""upper case - Text with lower case converted to upper case """
+	want = 'case'
 
 class cubic_centimeters(aetools.ComponentItem):
 	"""cubic centimeters - a volume measurement in SI cubic centimeters """
@@ -962,9 +862,31 @@ class cubic_feet(aetools.ComponentItem):
 	"""cubic feet - a volume measurement in Imperial cubic feet """
 	want = 'cfet'
 
-class cubic_inches(aetools.ComponentItem):
-	"""cubic inches - a volume measurement in Imperial cubic inches """
-	want = 'cuin'
+class characters(aetools.ComponentItem):
+	"""characters -  """
+	want = 'cha '
+
+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):
+	"""language code - the language code for the text """
+	which = 'plcd'
+	want = 'shor'
+class script_code(aetools.NProperty):
+	"""script code - the script code for the text """
+	which = 'pscd'
+	want = 'shor'
+
+writing_code_infos = writing_code_info
+
+class text_items(aetools.ComponentItem):
+	"""text items -  """
+	want = 'citm'
+
+text_item = text_items
 
 class cubic_meters(aetools.ComponentItem):
 	"""cubic meters - a volume measurement in SI cubic meters """
@@ -972,47 +894,43 @@ class cubic_meters(aetools.ComponentItem):
 
 cubic_metres = cubic_meters
 
-class cubic_yards(aetools.ComponentItem):
-	"""cubic yards - a distance measurement in Imperial cubic yards """
-	want = 'cyrd'
+class centimeters(aetools.ComponentItem):
+	"""centimeters - a distance measurement in SI centimeters """
+	want = 'cmtr'
 
-class data(aetools.ComponentItem):
-	"""data - an AppleScript raw data object """
-	want = 'rdat'
+centimetres = centimeters
 
-class date(aetools.ComponentItem):
-	"""date - Absolute date and time values """
-	want = 'ldt '
-class date_string(aetools.NProperty):
-	"""date string - the date portion of a date-time value as text """
-	which = 'dstr'
-	want = 'TEXT'
-class day(aetools.NProperty):
-	"""day - the day of the month of a date """
-	which = 'day '
-	want = 'long'
-class month(aetools.NProperty):
-	"""month - the month of a date """
-	which = 'mnth'
-	want = 'mnth'
-class time(aetools.NProperty):
-	"""time - the time since midnight of a date """
-	which = 'time'
-	want = 'long'
-class time_string(aetools.NProperty):
-	"""time string - the time portion of a date-time value as text """
-	which = 'tstr'
-	want = 'TEXT'
-class weekday(aetools.NProperty):
-	"""weekday - the day of a week of a date """
-	which = 'wkdy'
-	want = 'wkdy'
-class year(aetools.NProperty):
-	"""year - the year of a date """
-	which = 'year'
+class item(aetools.ComponentItem):
+	"""item - An item of any type """
+	want = 'cobj'
+class id(aetools.NProperty):
+	"""id - the unique ID number of this object """
+	which = 'ID  '
 	want = 'long'
 
-dates = date
+items = item
+
+class C_strings(aetools.ComponentItem):
+	"""C strings -  """
+	want = 'cstr'
+
+C_string = C_strings
+
+class text(aetools.ComponentItem):
+	"""text - text with language and style information """
+	want = 'ctxt'
+
+class cubic_inches(aetools.ComponentItem):
+	"""cubic inches - a volume measurement in Imperial cubic inches """
+	want = 'cuin'
+
+class cubic_yards(aetools.ComponentItem):
+	"""cubic yards - a distance measurement in Imperial cubic yards """
+	want = 'cyrd'
+
+class December(aetools.ComponentItem):
+	"""December - the month of December """
+	want = 'dec '
 
 class degrees_Celsius(aetools.ComponentItem):
 	"""degrees Celsius - a temperature measurement in SI degrees Celsius """
@@ -1026,27 +944,47 @@ class degrees_Kelvin(aetools.ComponentItem):
 	"""degrees Kelvin - a temperature measurement in degrees Kelvin """
 	want = 'degk'
 
-class encoded_string(aetools.ComponentItem):
-	"""encoded string - text encoded using the Text Encoding Converter """
+class reals(aetools.ComponentItem):
+	"""reals -  """
+	want = 'doub'
+
+real = reals
+
+class encoded_strings(aetools.ComponentItem):
+	"""encoded strings -  """
 	want = 'encs'
 
-encoded_strings = encoded_string
+encoded_string = encoded_strings
+
+class constants(aetools.ComponentItem):
+	"""constants -  """
+	want = 'enum'
+
+constant = constants
 
-class event(aetools.ComponentItem):
-	"""event - an AppleEvents event """
+class events(aetools.ComponentItem):
+	"""events -  """
 	want = 'evnt'
 
-events = event
+event = events
+
+class February(aetools.ComponentItem):
+	"""February - the month of February """
+	want = 'feb '
 
 class feet(aetools.ComponentItem):
 	"""feet - a distance measurement in Imperial feet """
 	want = 'feet'
 
-class file_specification(aetools.ComponentItem):
-	"""file specification - a file specification as used by the operating system """
+class Friday(aetools.ComponentItem):
+	"""Friday - Friday """
+	want = 'fri '
+
+class file_specifications(aetools.ComponentItem):
+	"""file specifications -  """
 	want = 'fss '
 
-file_specifications = file_specification
+file_specification = file_specifications
 
 class gallons(aetools.ComponentItem):
 	"""gallons - a volume measurement in Imperial gallons """
@@ -1056,37 +994,49 @@ class grams(aetools.ComponentItem):
 	"""grams - a mass measurement in SI meters """
 	want = 'gram'
 
-class handler(aetools.ComponentItem):
-	"""handler - an AppleScript event or subroutine handler """
+class handlers(aetools.ComponentItem):
+	"""handlers -  """
 	want = 'hand'
 
-handlers = handler
+handler = handlers
 
 class inches(aetools.ComponentItem):
 	"""inches - a distance measurement in Imperial inches """
 	want = 'inch'
 
-class integer(aetools.ComponentItem):
-	"""integer - An integral number """
-	want = 'long'
-
-integers = integer
-
 class international_text(aetools.ComponentItem):
-	"""international text -  """
+	"""international text - text that begins with a writing code """
 	want = 'itxt'
 
 international_text = international_text
 
-class item(aetools.ComponentItem):
-	"""item - An item of any type """
-	want = 'cobj'
-class id(aetools.NProperty):
-	"""id - the unique ID number of this object """
-	which = 'ID  '
-	want = 'long'
+class January(aetools.ComponentItem):
+	"""January - the month of January """
+	want = 'jan '
 
-items = item
+class July(aetools.ComponentItem):
+	"""July - the month of July """
+	want = 'jul '
+
+class June(aetools.ComponentItem):
+	"""June - the month of June """
+	want = 'jun '
+
+class reference_forms(aetools.ComponentItem):
+	"""reference forms -  """
+	want = 'kfrm'
+
+reference_form = reference_forms
+
+class kilograms(aetools.ComponentItem):
+	"""kilograms - a mass measurement in SI kilograms """
+	want = 'kgrm'
+
+class kilometers(aetools.ComponentItem):
+	"""kilometers - a distance measurement in SI kilometers """
+	want = 'kmtr'
+
+kilometres = kilometers
 
 class keystroke(aetools.ComponentItem):
 	"""keystroke - a press of a key combination on a Macintosh keyboard """
@@ -1106,29 +1056,51 @@ class modifiers(aetools.NProperty):
 
 keystrokes = keystroke
 
-class kilograms(aetools.ComponentItem):
-	"""kilograms - a mass measurement in SI kilograms """
-	want = 'kgrm'
-
-class kilometers(aetools.ComponentItem):
-	"""kilometers - a distance measurement in SI kilometers """
-	want = 'kmtr'
-
-kilometres = kilometers
+class pounds(aetools.ComponentItem):
+	"""pounds - a weight measurement in SI meters """
+	want = 'lbs '
 
-class linked_list(aetools.ComponentItem):
-	"""linked list - An ordered collection of items """
-	want = 'llst'
-class length(aetools.NProperty):
-	"""length - the length of a list """
-	which = 'leng'
+class date(aetools.ComponentItem):
+	"""date - Absolute date and time values """
+	want = 'ldt '
+class date_string(aetools.NProperty):
+	"""date string - the date portion of a date-time value as text """
+	which = 'dstr'
+	want = 'TEXT'
+class day(aetools.NProperty):
+	"""day - the day of the month of a date """
+	which = 'day '
+	want = 'long'
+class month(aetools.NProperty):
+	"""month - the month of a date """
+	which = 'mnth'
+	want = 'mnth'
+class time(aetools.NProperty):
+	"""time - the time since midnight of a date """
+	which = 'time'
+	want = 'long'
+class time_string(aetools.NProperty):
+	"""time string - the time portion of a date-time value as text """
+	which = 'tstr'
+	want = 'TEXT'
+class weekday(aetools.NProperty):
+	"""weekday - the day of a week of a date """
+	which = 'wkdy'
+	want = 'wkdy'
+class year(aetools.NProperty):
+	"""year - the year of a date """
+	which = 'year'
 	want = 'long'
 
-linked_lists = linked_list
+dates = date
 
 class list(aetools.ComponentItem):
 	"""list - An ordered collection of items """
 	want = 'list'
+class length(aetools.NProperty):
+	"""length - the length of a list """
+	which = 'leng'
+	want = 'long'
 class rest(aetools.NProperty):
 	"""rest - all items of the list excluding first """
 	which = 'rest'
@@ -1138,31 +1110,51 @@ class reverse(aetools.NProperty):
 	which = 'rvse'
 	want = 'list'
 
+lists = list
+
+class liters(aetools.ComponentItem):
+	"""liters - a volume measurement in SI liters """
+	want = 'litr'
+
+litres = liters
+
+class linked_list(aetools.ComponentItem):
+	"""linked list - An ordered collection of items """
+	want = 'llst'
+
+linked_lists = linked_list
+
+class integers(aetools.ComponentItem):
+	"""integers -  """
+	want = 'long'
+
+integer = integers
+
 class list_or_record(aetools.ComponentItem):
 	"""list or record - a list or record """
 	want = 'lr  '
 
-class list_or_string(aetools.ComponentItem):
-	"""list or string - a list or string """
-	want = 'ls  '
-
 class list_2c__record_or_text(aetools.ComponentItem):
 	"""list, record or text - a list, record or text """
 	want = 'lrs '
 
-lists = list
+class list_or_string(aetools.ComponentItem):
+	"""list or string - a list or string """
+	want = 'ls  '
 
-class liters(aetools.ComponentItem):
-	"""liters - a volume measurement in SI liters """
-	want = 'litr'
+class machines(aetools.ComponentItem):
+	"""machines -  """
+	want = 'mach'
 
-litres = liters
+machine = machines
 
-class machine(aetools.ComponentItem):
-	"""machine - a computer """
-	want = 'mach'
+class March(aetools.ComponentItem):
+	"""March - the month of March """
+	want = 'mar '
 
-machines = machine
+class May(aetools.ComponentItem):
+	"""May - the month of May """
+	want = 'may '
 
 class meters(aetools.ComponentItem):
 	"""meters - a distance measurement in SI meters """
@@ -1174,55 +1166,73 @@ class miles(aetools.ComponentItem):
 	"""miles - a distance measurement in Imperial miles """
 	want = 'mile'
 
-class missing_value(aetools.ComponentItem):
-	"""missing value - unavailable value, such as properties missing from heterogeneous classes in a Whose clause """
-	want = 'msng'
+class months(aetools.ComponentItem):
+	"""months -  """
+	want = 'mnth'
 
-missing_values = missing_value
+month = months
 
-class month(aetools.ComponentItem):
-	"""month - a month """
-	want = 'mnth'
+class Monday(aetools.ComponentItem):
+	"""Monday - Monday """
+	want = 'mon '
 
-months = month
+class missing_values(aetools.ComponentItem):
+	"""missing values -  """
+	want = 'msng'
 
-class number(aetools.ComponentItem):
-	"""number - an integer or real number """
-	want = 'nmbr'
+missing_value = missing_values
 
 class number_or_date(aetools.ComponentItem):
 	"""number or date - a number or date """
 	want = 'nd  '
 
+class number_2c__date_or_text(aetools.ComponentItem):
+	"""number, date or text - a number, date or text """
+	want = 'nds '
+
+class numbers(aetools.ComponentItem):
+	"""numbers -  """
+	want = 'nmbr'
+
+number = numbers
+
+class November(aetools.ComponentItem):
+	"""November - the month of November """
+	want = 'nov '
+
 class number_or_string(aetools.ComponentItem):
 	"""number or string - a number or string """
 	want = 'ns  '
 
-class number_2c__date_or_text(aetools.ComponentItem):
-	"""number, date or text - a number, date or text """
-	want = 'nds '
+class references(aetools.ComponentItem):
+	"""references -  """
+	want = 'obj '
 
-numbers = number
+reference = references
+
+class October(aetools.ComponentItem):
+	"""October - the month of October """
+	want = 'oct '
 
 class ounces(aetools.ComponentItem):
 	"""ounces - a weight measurement in SI meters """
 	want = 'ozs '
 
-class picture(aetools.ComponentItem):
-	"""picture - A QuickDraw picture object """
-	want = 'PICT'
-
-pictures = picture
+class class_(aetools.ComponentItem):
+	"""class - the type of a value """
+	want = 'pcls'
+class _3c_Inheritance_3e_(aetools.NProperty):
+	"""<Inheritance> - inherits some of its properties from this class """
+	which = 'c@#^'
+	want = 'type'
 
-class pounds(aetools.ComponentItem):
-	"""pounds - a weight measurement in SI meters """
-	want = 'lbs '
+classes = class_
 
-class preposition(aetools.ComponentItem):
-	"""preposition - an AppleEvents preposition """
+class prepositions(aetools.ComponentItem):
+	"""prepositions -  """
 	want = 'prep'
 
-prepositions = preposition
+preposition = prepositions
 
 class properties(aetools.ComponentItem):
 	"""properties -  """
@@ -1230,33 +1240,37 @@ class properties(aetools.ComponentItem):
 
 property = properties
 
+class writing_code(aetools.ComponentItem):
+	"""writing code - codes that identify the language and script system """
+	want = 'psct'
+
+class Pascal_strings(aetools.ComponentItem):
+	"""Pascal strings -  """
+	want = 'pstr'
+
+Pascal_string = Pascal_strings
+
 class quarts(aetools.ComponentItem):
 	"""quarts - a volume measurement in Imperial quarts """
 	want = 'qrts'
 
-class real(aetools.ComponentItem):
-	"""real - A real number """
-	want = 'doub'
-
-reals = real
+class data(aetools.ComponentItem):
+	"""data - an AppleScript raw data object """
+	want = 'rdat'
 
-class record(aetools.ComponentItem):
-	"""record - A set of labeled items """
+class records(aetools.ComponentItem):
+	"""records -  """
 	want = 'reco'
 
-records = record
-
-class reference(aetools.ComponentItem):
-	"""reference - an AppleScript reference """
-	want = 'obj '
+record = records
 
-class reference_form(aetools.ComponentItem):
-	"""reference form - an AppleEvents key form """
-	want = 'kfrm'
-
-reference_forms = reference_form
+class Saturday(aetools.ComponentItem):
+	"""Saturday - Saturday """
+	want = 'sat '
 
-references = reference
+class seconds(aetools.ComponentItem):
+	"""seconds - more than one second """
+	want = 'scnd'
 
 class script(aetools.ComponentItem):
 	"""script - An AppleScript script """
@@ -1272,15 +1286,19 @@ class parent(aetools.NProperty):
 
 scripts = script
 
-class seconds(aetools.ComponentItem):
-	"""seconds - more than one second """
-	want = 'scnd'
+class September(aetools.ComponentItem):
+	"""September - the month of September """
+	want = 'sep '
+
+class alias_or_string(aetools.ComponentItem):
+	"""alias or string - an alias or string """
+	want = 'sf  '
 
-class sound(aetools.ComponentItem):
-	"""sound - a sound object on the clipboard """
+class sounds(aetools.ComponentItem):
+	"""sounds -  """
 	want = 'snd '
 
-sounds = sound
+sound = sounds
 
 class square_feet(aetools.ComponentItem):
 	"""square feet - an area measurement in Imperial square feet """
@@ -1292,61 +1310,57 @@ class square_kilometers(aetools.ComponentItem):
 
 square_kilometres = square_kilometers
 
+class square_miles(aetools.ComponentItem):
+	"""square miles - an area measurement in Imperial square miles """
+	want = 'sqmi'
+
 class square_meters(aetools.ComponentItem):
 	"""square meters - an area measurement in SI square meters """
 	want = 'sqrm'
 
 square_metres = square_meters
 
-class square_miles(aetools.ComponentItem):
-	"""square miles - an area measurement in Imperial square miles """
-	want = 'sqmi'
-
 class square_yards(aetools.ComponentItem):
 	"""square yards - an area measurement in Imperial square yards """
 	want = 'sqyd'
 
-class string(aetools.ComponentItem):
-	"""string - text in 8-bit Macintosh Roman format """
-	want = 'TEXT'
-
-strings = string
-
 class styled_Clipboard_text(aetools.ComponentItem):
-	"""styled Clipboard text -  """
+	"""styled Clipboard text - clipboard text with font, size, and style information """
 	want = 'styl'
 
 styled_Clipboard_text = styled_Clipboard_text
 
+class Sunday(aetools.ComponentItem):
+	"""Sunday - Sunday """
+	want = 'sun '
+
 class styled_Unicode_text(aetools.ComponentItem):
-	"""styled Unicode text -  """
+	"""styled Unicode text - styled text in the Unicode format """
 	want = 'sutx'
 
 styled_Unicode_text = styled_Unicode_text
 
-class styled_text(aetools.ComponentItem):
-	"""styled text -  """
-	want = 'STXT'
-
-styled_text = styled_text
-
-class text(aetools.ComponentItem):
-	"""text - text with language and style information """
-	want = 'ctxt'
-
-class text_item(aetools.ComponentItem):
-	"""text item - text between delimiters """
-	want = 'citm'
+class Thursday(aetools.ComponentItem):
+	"""Thursday - Thursday """
+	want = 'thu '
 
-text_items = text_item
+class Tuesday(aetools.ComponentItem):
+	"""Tuesday - Tuesday """
+	want = 'tue '
 
 class type_class(aetools.ComponentItem):
 	"""type class - the name of a particular class (or any four-character code) """
 	want = 'type'
 
-class upper_case(aetools.ComponentItem):
-	"""upper case - Text with lower case converted to upper case """
-	want = 'case'
+class empty_ae_name_(aetools.ComponentItem):
+	""" - the undefined value """
+	want = 'undf'
+
+class Unicode_text(aetools.ComponentItem):
+	"""Unicode text - text in the Unicode format (cannot be viewed without conversion) """
+	want = 'utxt'
+
+Unicode_text = Unicode_text
 
 class vector(aetools.ComponentItem):
 	"""vector - An ordered collection of items """
@@ -1358,251 +1372,165 @@ class version(aetools.ComponentItem):
 	"""version - a version value """
 	want = 'vers'
 
-class weekday(aetools.ComponentItem):
-	"""weekday - a weekday """
-	want = 'wkdy'
-
-weekdays = weekday
-
-class writing_code(aetools.ComponentItem):
-	"""writing code - codes that identify the language and script system """
-	want = 'psct'
+class Wednesday(aetools.ComponentItem):
+	"""Wednesday - Wednesday """
+	want = 'wed '
 
-class writing_code_info(aetools.ComponentItem):
-	"""writing code info - script code and language code of text run """
-	want = 'citl'
-class language_code(aetools.NProperty):
-	"""language code - the language code for the text """
-	which = 'plcd'
-	want = 'shor'
-class script_code(aetools.NProperty):
-	"""script code - the script code for the text """
-	which = 'pscd'
-	want = 'shor'
+class weekdays(aetools.ComponentItem):
+	"""weekdays -  """
+	want = 'wkdy'
 
-writing_code_infos = writing_code_info
+weekday = weekdays
 
 class yards(aetools.ComponentItem):
 	"""yards - a distance measurement in Imperial yards """
 	want = 'yard'
 
-class zone(aetools.ComponentItem):
-	"""zone - an AppleTalk zone """
+class zones(aetools.ComponentItem):
+	"""zones -  """
 	want = 'zone'
 
-zones = zone
-empty_ae_name_._superclassnames = []
-empty_ae_name_._privpropdict = {
-}
-empty_ae_name_._privelemdict = {
-}
-April._superclassnames = []
-April._privpropdict = {
-}
-April._privelemdict = {
-}
-August._superclassnames = []
-August._privpropdict = {
-}
-August._privelemdict = {
-}
-C_string._superclassnames = []
-C_string._privpropdict = {
-}
-C_string._privelemdict = {
-}
-December._superclassnames = []
-December._privpropdict = {
-}
-December._privelemdict = {
-}
-February._superclassnames = []
-February._privpropdict = {
-}
-February._privelemdict = {
-}
-Friday._superclassnames = []
-Friday._privpropdict = {
-}
-Friday._privelemdict = {
-}
-January._superclassnames = []
-January._privpropdict = {
-}
-January._privelemdict = {
-}
-July._superclassnames = []
-July._privpropdict = {
-}
-July._privelemdict = {
-}
-June._superclassnames = []
-June._privpropdict = {
-}
-June._privelemdict = {
-}
-March._superclassnames = []
-March._privpropdict = {
-}
-March._privelemdict = {
-}
-May._superclassnames = []
-May._privpropdict = {
-}
-May._privelemdict = {
-}
-Monday._superclassnames = []
-Monday._privpropdict = {
-}
-Monday._privelemdict = {
+zone = zones
+anything._superclassnames = []
+anything._privpropdict = {
 }
-November._superclassnames = []
-November._privpropdict = {
+anything._privelemdict = {
 }
-November._privelemdict = {
+pictures._superclassnames = []
+pictures._privpropdict = {
 }
-October._superclassnames = []
-October._privpropdict = {
+pictures._privelemdict = {
 }
-October._privelemdict = {
+styled_text._superclassnames = []
+styled_text._privpropdict = {
 }
-Pascal_string._superclassnames = []
-Pascal_string._privpropdict = {
+styled_text._privelemdict = {
 }
-Pascal_string._privelemdict = {
+styled_text._superclassnames = []
+styled_text._privpropdict = {
 }
-RGB_color._superclassnames = []
-RGB_color._privpropdict = {
+styled_text._privelemdict = {
 }
-RGB_color._privelemdict = {
+strings._superclassnames = []
+strings._privpropdict = {
 }
-Saturday._superclassnames = []
-Saturday._privpropdict = {
+strings._privelemdict = {
 }
-Saturday._privelemdict = {
+aliases._superclassnames = []
+aliases._privpropdict = {
 }
-September._superclassnames = []
-September._privpropdict = {
+aliases._privelemdict = {
 }
-September._privelemdict = {
+April._superclassnames = []
+April._privpropdict = {
 }
-Sunday._superclassnames = []
-Sunday._privpropdict = {
+April._privelemdict = {
 }
-Sunday._privelemdict = {
+August._superclassnames = []
+August._privpropdict = {
 }
-Thursday._superclassnames = []
-Thursday._privpropdict = {
+August._privelemdict = {
 }
-Thursday._privelemdict = {
+booleans._superclassnames = []
+booleans._privpropdict = {
 }
-Tuesday._superclassnames = []
-Tuesday._privpropdict = {
+booleans._privelemdict = {
 }
-Tuesday._privelemdict = {
+RGB_colors._superclassnames = []
+RGB_colors._privpropdict = {
 }
-Unicode_text._superclassnames = []
-Unicode_text._privpropdict = {
+RGB_colors._privelemdict = {
 }
-Unicode_text._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,
+}
+application._privelemdict = {
 }
-Unicode_text._superclassnames = []
-Unicode_text._privpropdict = {
+upper_case._superclassnames = []
+upper_case._privpropdict = {
 }
-Unicode_text._privelemdict = {
+upper_case._privelemdict = {
 }
-Wednesday._superclassnames = []
-Wednesday._privpropdict = {
+cubic_centimeters._superclassnames = []
+cubic_centimeters._privpropdict = {
 }
-Wednesday._privelemdict = {
+cubic_centimeters._privelemdict = {
 }
-alias._superclassnames = []
-alias._privpropdict = {
+cubic_feet._superclassnames = []
+cubic_feet._privpropdict = {
 }
-alias._privelemdict = {
+cubic_feet._privelemdict = {
 }
-alias_or_string._superclassnames = []
-alias_or_string._privpropdict = {
+characters._superclassnames = []
+characters._privpropdict = {
 }
-alias_or_string._privelemdict = {
+characters._privelemdict = {
 }
-anything._superclassnames = []
-anything._privpropdict = {
+writing_code_info._superclassnames = []
+writing_code_info._privpropdict = {
+	'language_code' : language_code,
+	'script_code' : script_code,
 }
-anything._privelemdict = {
+writing_code_info._privelemdict = {
 }
-app._superclassnames = []
-app._privpropdict = {
+text_items._superclassnames = []
+text_items._privpropdict = {
 }
-app._privelemdict = {
+text_items._privelemdict = {
 }
-boolean._superclassnames = []
-boolean._privpropdict = {
+cubic_meters._superclassnames = []
+cubic_meters._privpropdict = {
 }
-boolean._privelemdict = {
+cubic_meters._privelemdict = {
 }
 centimeters._superclassnames = []
 centimeters._privpropdict = {
 }
 centimeters._privelemdict = {
 }
-character._superclassnames = []
-character._privpropdict = {
-}
-character._privelemdict = {
-}
-class_._superclassnames = ['type_class']
-class_._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-}
-class_._privelemdict = {
-}
-constant._superclassnames = []
-constant._privpropdict = {
+item._superclassnames = []
+item._privpropdict = {
+	'id' : id,
 }
-constant._privelemdict = {
+item._privelemdict = {
 }
-cubic_centimeters._superclassnames = []
-cubic_centimeters._privpropdict = {
+C_strings._superclassnames = []
+C_strings._privpropdict = {
 }
-cubic_centimeters._privelemdict = {
+C_strings._privelemdict = {
 }
-cubic_feet._superclassnames = []
-cubic_feet._privpropdict = {
+text._superclassnames = []
+text._privpropdict = {
 }
-cubic_feet._privelemdict = {
+text._privelemdict = {
 }
 cubic_inches._superclassnames = []
 cubic_inches._privpropdict = {
 }
 cubic_inches._privelemdict = {
 }
-cubic_meters._superclassnames = []
-cubic_meters._privpropdict = {
-}
-cubic_meters._privelemdict = {
-}
 cubic_yards._superclassnames = []
 cubic_yards._privpropdict = {
 }
 cubic_yards._privelemdict = {
 }
-data._superclassnames = []
-data._privpropdict = {
-}
-data._privelemdict = {
-}
-date._superclassnames = []
-date._privpropdict = {
-	'date_string' : date_string,
-	'day' : day,
-	'month' : month,
-	'time' : time,
-	'time_string' : time_string,
-	'weekday' : weekday,
-	'year' : year,
+December._superclassnames = []
+December._privpropdict = {
 }
-date._privelemdict = {
+December._privelemdict = {
 }
 degrees_Celsius._superclassnames = []
 degrees_Celsius._privpropdict = {
@@ -1619,25 +1547,45 @@ degrees_Kelvin._privpropdict = {
 }
 degrees_Kelvin._privelemdict = {
 }
-encoded_string._superclassnames = []
-encoded_string._privpropdict = {
+reals._superclassnames = []
+reals._privpropdict = {
+}
+reals._privelemdict = {
+}
+encoded_strings._superclassnames = []
+encoded_strings._privpropdict = {
+}
+encoded_strings._privelemdict = {
+}
+constants._superclassnames = []
+constants._privpropdict = {
+}
+constants._privelemdict = {
 }
-encoded_string._privelemdict = {
+events._superclassnames = []
+events._privpropdict = {
 }
-event._superclassnames = []
-event._privpropdict = {
+events._privelemdict = {
 }
-event._privelemdict = {
+February._superclassnames = []
+February._privpropdict = {
+}
+February._privelemdict = {
 }
 feet._superclassnames = []
 feet._privpropdict = {
 }
 feet._privelemdict = {
 }
-file_specification._superclassnames = []
-file_specification._privpropdict = {
+Friday._superclassnames = []
+Friday._privpropdict = {
+}
+Friday._privelemdict = {
+}
+file_specifications._superclassnames = []
+file_specifications._privpropdict = {
 }
-file_specification._privelemdict = {
+file_specifications._privelemdict = {
 }
 gallons._superclassnames = []
 gallons._privpropdict = {
@@ -1649,21 +1597,16 @@ grams._privpropdict = {
 }
 grams._privelemdict = {
 }
-handler._superclassnames = []
-handler._privpropdict = {
+handlers._superclassnames = []
+handlers._privpropdict = {
 }
-handler._privelemdict = {
+handlers._privelemdict = {
 }
 inches._superclassnames = []
 inches._privpropdict = {
 }
 inches._privelemdict = {
 }
-integer._superclassnames = []
-integer._privpropdict = {
-}
-integer._privelemdict = {
-}
 international_text._superclassnames = []
 international_text._privpropdict = {
 }
@@ -1674,19 +1617,25 @@ international_text._privpropdict = {
 }
 international_text._privelemdict = {
 }
-item._superclassnames = []
-item._privpropdict = {
-	'id' : id,
+January._superclassnames = []
+January._privpropdict = {
 }
-item._privelemdict = {
+January._privelemdict = {
 }
-keystroke._superclassnames = []
-keystroke._privpropdict = {
-	'key' : key,
-	'key_kind' : key_kind,
-	'modifiers' : modifiers,
+July._superclassnames = []
+July._privpropdict = {
 }
-keystroke._privelemdict = {
+July._privelemdict = {
+}
+June._superclassnames = []
+June._privpropdict = {
+}
+June._privelemdict = {
+}
+reference_forms._superclassnames = []
+reference_forms._privpropdict = {
+}
+reference_forms._privelemdict = {
 }
 kilograms._superclassnames = []
 kilograms._privpropdict = {
@@ -1698,11 +1647,30 @@ kilometers._privpropdict = {
 }
 kilometers._privelemdict = {
 }
-linked_list._superclassnames = []
-linked_list._privpropdict = {
-	'length' : length,
+keystroke._superclassnames = []
+keystroke._privpropdict = {
+	'key' : key,
+	'key_kind' : key_kind,
+	'modifiers' : modifiers,
 }
-linked_list._privelemdict = {
+keystroke._privelemdict = {
+}
+pounds._superclassnames = []
+pounds._privpropdict = {
+}
+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._privelemdict = {
 }
 list._superclassnames = []
 list._privpropdict = {
@@ -1712,30 +1680,51 @@ list._privpropdict = {
 }
 list._privelemdict = {
 }
+liters._superclassnames = []
+liters._privpropdict = {
+}
+liters._privelemdict = {
+}
+linked_list._superclassnames = []
+linked_list._privpropdict = {
+	'length' : length,
+}
+linked_list._privelemdict = {
+}
+integers._superclassnames = []
+integers._privpropdict = {
+}
+integers._privelemdict = {
+}
 list_or_record._superclassnames = []
 list_or_record._privpropdict = {
 }
 list_or_record._privelemdict = {
 }
+list_2c__record_or_text._superclassnames = []
+list_2c__record_or_text._privpropdict = {
+}
+list_2c__record_or_text._privelemdict = {
+}
 list_or_string._superclassnames = []
 list_or_string._privpropdict = {
 }
 list_or_string._privelemdict = {
 }
-list_2c__record_or_text._superclassnames = []
-list_2c__record_or_text._privpropdict = {
+machines._superclassnames = []
+machines._privpropdict = {
 }
-list_2c__record_or_text._privelemdict = {
+machines._privelemdict = {
 }
-liters._superclassnames = []
-liters._privpropdict = {
+March._superclassnames = []
+March._privpropdict = {
 }
-liters._privelemdict = {
+March._privelemdict = {
 }
-machine._superclassnames = []
-machine._privpropdict = {
+May._superclassnames = []
+May._privpropdict = {
 }
-machine._privelemdict = {
+May._privelemdict = {
 }
 meters._superclassnames = []
 meters._privpropdict = {
@@ -1747,85 +1736,111 @@ miles._privpropdict = {
 }
 miles._privelemdict = {
 }
-missing_value._superclassnames = []
-missing_value._privpropdict = {
+months._superclassnames = []
+months._privpropdict = {
 }
-missing_value._privelemdict = {
+months._privelemdict = {
 }
-month._superclassnames = []
-month._privpropdict = {
+Monday._superclassnames = []
+Monday._privpropdict = {
 }
-month._privelemdict = {
+Monday._privelemdict = {
 }
-number._superclassnames = []
-number._privpropdict = {
+missing_values._superclassnames = []
+missing_values._privpropdict = {
 }
-number._privelemdict = {
+missing_values._privelemdict = {
 }
 number_or_date._superclassnames = []
 number_or_date._privpropdict = {
 }
 number_or_date._privelemdict = {
 }
+number_2c__date_or_text._superclassnames = []
+number_2c__date_or_text._privpropdict = {
+}
+number_2c__date_or_text._privelemdict = {
+}
+numbers._superclassnames = []
+numbers._privpropdict = {
+}
+numbers._privelemdict = {
+}
+November._superclassnames = []
+November._privpropdict = {
+}
+November._privelemdict = {
+}
 number_or_string._superclassnames = []
 number_or_string._privpropdict = {
 }
 number_or_string._privelemdict = {
 }
-number_2c__date_or_text._superclassnames = []
-number_2c__date_or_text._privpropdict = {
+references._superclassnames = []
+references._privpropdict = {
 }
-number_2c__date_or_text._privelemdict = {
+references._privelemdict = {
+}
+October._superclassnames = []
+October._privpropdict = {
+}
+October._privelemdict = {
 }
 ounces._superclassnames = []
 ounces._privpropdict = {
 }
 ounces._privelemdict = {
 }
-picture._superclassnames = []
-picture._privpropdict = {
-}
-picture._privelemdict = {
-}
-pounds._superclassnames = []
-pounds._privpropdict = {
+class_._superclassnames = ['type_class']
+class_._privpropdict = {
+	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
 }
-pounds._privelemdict = {
+class_._privelemdict = {
 }
-preposition._superclassnames = []
-preposition._privpropdict = {
+prepositions._superclassnames = []
+prepositions._privpropdict = {
 }
-preposition._privelemdict = {
+prepositions._privelemdict = {
 }
 properties._superclassnames = []
 properties._privpropdict = {
 }
 properties._privelemdict = {
 }
+writing_code._superclassnames = []
+writing_code._privpropdict = {
+}
+writing_code._privelemdict = {
+}
+Pascal_strings._superclassnames = []
+Pascal_strings._privpropdict = {
+}
+Pascal_strings._privelemdict = {
+}
 quarts._superclassnames = []
 quarts._privpropdict = {
 }
 quarts._privelemdict = {
 }
-real._superclassnames = []
-real._privpropdict = {
+data._superclassnames = []
+data._privpropdict = {
 }
-real._privelemdict = {
+data._privelemdict = {
 }
-record._superclassnames = []
-record._privpropdict = {
+records._superclassnames = []
+records._privpropdict = {
 }
-record._privelemdict = {
+records._privelemdict = {
 }
-reference._superclassnames = []
-reference._privpropdict = {
+Saturday._superclassnames = []
+Saturday._privpropdict = {
 }
-reference._privelemdict = {
+Saturday._privelemdict = {
 }
-reference_form._superclassnames = []
-reference_form._privpropdict = {
+seconds._superclassnames = []
+seconds._privpropdict = {
 }
-reference_form._privelemdict = {
+seconds._privelemdict = {
 }
 script._superclassnames = []
 script._privpropdict = {
@@ -1834,15 +1849,20 @@ script._privpropdict = {
 }
 script._privelemdict = {
 }
-seconds._superclassnames = []
-seconds._privpropdict = {
+September._superclassnames = []
+September._privpropdict = {
 }
-seconds._privelemdict = {
+September._privelemdict = {
+}
+alias_or_string._superclassnames = []
+alias_or_string._privpropdict = {
+}
+alias_or_string._privelemdict = {
 }
-sound._superclassnames = []
-sound._privpropdict = {
+sounds._superclassnames = []
+sounds._privpropdict = {
 }
-sound._privelemdict = {
+sounds._privelemdict = {
 }
 square_feet._superclassnames = []
 square_feet._privpropdict = {
@@ -1854,26 +1874,21 @@ square_kilometers._privpropdict = {
 }
 square_kilometers._privelemdict = {
 }
-square_meters._superclassnames = []
-square_meters._privpropdict = {
-}
-square_meters._privelemdict = {
-}
 square_miles._superclassnames = []
 square_miles._privpropdict = {
 }
 square_miles._privelemdict = {
 }
+square_meters._superclassnames = []
+square_meters._privpropdict = {
+}
+square_meters._privelemdict = {
+}
 square_yards._superclassnames = []
 square_yards._privpropdict = {
 }
 square_yards._privelemdict = {
 }
-string._superclassnames = []
-string._privpropdict = {
-}
-string._privelemdict = {
-}
 styled_Clipboard_text._superclassnames = []
 styled_Clipboard_text._privpropdict = {
 }
@@ -1884,6 +1899,11 @@ styled_Clipboard_text._privpropdict = {
 }
 styled_Clipboard_text._privelemdict = {
 }
+Sunday._superclassnames = []
+Sunday._privpropdict = {
+}
+Sunday._privelemdict = {
+}
 styled_Unicode_text._superclassnames = []
 styled_Unicode_text._privpropdict = {
 }
@@ -1894,35 +1914,35 @@ styled_Unicode_text._privpropdict = {
 }
 styled_Unicode_text._privelemdict = {
 }
-styled_text._superclassnames = []
-styled_text._privpropdict = {
+Thursday._superclassnames = []
+Thursday._privpropdict = {
 }
-styled_text._privelemdict = {
+Thursday._privelemdict = {
 }
-styled_text._superclassnames = []
-styled_text._privpropdict = {
+Tuesday._superclassnames = []
+Tuesday._privpropdict = {
 }
-styled_text._privelemdict = {
+Tuesday._privelemdict = {
 }
-text._superclassnames = []
-text._privpropdict = {
+type_class._superclassnames = []
+type_class._privpropdict = {
 }
-text._privelemdict = {
+type_class._privelemdict = {
 }
-text_item._superclassnames = []
-text_item._privpropdict = {
+empty_ae_name_._superclassnames = []
+empty_ae_name_._privpropdict = {
 }
-text_item._privelemdict = {
+empty_ae_name_._privelemdict = {
 }
-type_class._superclassnames = []
-type_class._privpropdict = {
+Unicode_text._superclassnames = []
+Unicode_text._privpropdict = {
 }
-type_class._privelemdict = {
+Unicode_text._privelemdict = {
 }
-upper_case._superclassnames = []
-upper_case._privpropdict = {
+Unicode_text._superclassnames = []
+Unicode_text._privpropdict = {
 }
-upper_case._privelemdict = {
+Unicode_text._privelemdict = {
 }
 vector._superclassnames = []
 vector._privpropdict = {
@@ -1935,32 +1955,25 @@ version._privpropdict = {
 }
 version._privelemdict = {
 }
-weekday._superclassnames = []
-weekday._privpropdict = {
-}
-weekday._privelemdict = {
-}
-writing_code._superclassnames = []
-writing_code._privpropdict = {
+Wednesday._superclassnames = []
+Wednesday._privpropdict = {
 }
-writing_code._privelemdict = {
+Wednesday._privelemdict = {
 }
-writing_code_info._superclassnames = []
-writing_code_info._privpropdict = {
-	'language_code' : language_code,
-	'script_code' : script_code,
+weekdays._superclassnames = []
+weekdays._privpropdict = {
 }
-writing_code_info._privelemdict = {
+weekdays._privelemdict = {
 }
 yards._superclassnames = []
 yards._privpropdict = {
 }
 yards._privelemdict = {
 }
-zone._superclassnames = []
-zone._privpropdict = {
+zones._superclassnames = []
+zones._privpropdict = {
 }
-zone._privelemdict = {
+zones._privelemdict = {
 }
 _Enum_boov = {
 	'true' : 'true',	# the true boolean value
@@ -2029,25 +2042,25 @@ _Enum_misc = {
 #
 _classdeclarations = {
 	'****' : anything,
-	'PICT' : picture,
+	'PICT' : pictures,
 	'STXT' : styled_text,
-	'TEXT' : string,
-	'alis' : alias,
+	'TEXT' : strings,
+	'alis' : aliases,
 	'apr ' : April,
 	'aug ' : August,
-	'bool' : boolean,
-	'cRGB' : RGB_color,
-	'capp' : app,
+	'bool' : booleans,
+	'cRGB' : RGB_colors,
+	'capp' : application,
 	'case' : upper_case,
 	'ccmt' : cubic_centimeters,
 	'cfet' : cubic_feet,
-	'cha ' : character,
+	'cha ' : characters,
 	'citl' : writing_code_info,
-	'citm' : text_item,
+	'citm' : text_items,
 	'cmet' : cubic_meters,
 	'cmtr' : centimeters,
 	'cobj' : item,
-	'cstr' : C_string,
+	'cstr' : C_strings,
 	'ctxt' : text,
 	'cuin' : cubic_inches,
 	'cyrd' : cubic_yards,
@@ -2055,23 +2068,23 @@ _classdeclarations = {
 	'degc' : degrees_Celsius,
 	'degf' : degrees_Fahrenheit,
 	'degk' : degrees_Kelvin,
-	'doub' : real,
-	'encs' : encoded_string,
-	'enum' : constant,
-	'evnt' : event,
+	'doub' : reals,
+	'encs' : encoded_strings,
+	'enum' : constants,
+	'evnt' : events,
 	'feb ' : February,
 	'feet' : feet,
 	'fri ' : Friday,
-	'fss ' : file_specification,
+	'fss ' : file_specifications,
 	'galn' : gallons,
 	'gram' : grams,
-	'hand' : handler,
+	'hand' : handlers,
 	'inch' : inches,
 	'itxt' : international_text,
 	'jan ' : January,
 	'jul ' : July,
 	'jun ' : June,
-	'kfrm' : reference_form,
+	'kfrm' : reference_forms,
 	'kgrm' : kilograms,
 	'kmtr' : kilometers,
 	'kprs' : keystroke,
@@ -2080,40 +2093,40 @@ _classdeclarations = {
 	'list' : list,
 	'litr' : liters,
 	'llst' : linked_list,
-	'long' : integer,
+	'long' : integers,
 	'lr  ' : list_or_record,
 	'lrs ' : list_2c__record_or_text,
 	'ls  ' : list_or_string,
-	'mach' : machine,
+	'mach' : machines,
 	'mar ' : March,
 	'may ' : May,
 	'metr' : meters,
 	'mile' : miles,
-	'mnth' : month,
+	'mnth' : months,
 	'mon ' : Monday,
-	'msng' : missing_value,
+	'msng' : missing_values,
 	'nd  ' : number_or_date,
 	'nds ' : number_2c__date_or_text,
-	'nmbr' : number,
+	'nmbr' : numbers,
 	'nov ' : November,
 	'ns  ' : number_or_string,
-	'obj ' : reference,
+	'obj ' : references,
 	'oct ' : October,
 	'ozs ' : ounces,
 	'pcls' : class_,
-	'prep' : preposition,
+	'prep' : prepositions,
 	'prop' : properties,
 	'psct' : writing_code,
-	'pstr' : Pascal_string,
+	'pstr' : Pascal_strings,
 	'qrts' : quarts,
 	'rdat' : data,
-	'reco' : record,
+	'reco' : records,
 	'sat ' : Saturday,
 	'scnd' : seconds,
 	'scpt' : script,
 	'sep ' : September,
 	'sf  ' : alias_or_string,
-	'snd ' : sound,
+	'snd ' : sounds,
 	'sqft' : square_feet,
 	'sqkm' : square_kilometers,
 	'sqmi' : square_miles,
@@ -2130,9 +2143,9 @@ _classdeclarations = {
 	'vect' : vector,
 	'vers' : version,
 	'wed ' : Wednesday,
-	'wkdy' : weekday,
+	'wkdy' : weekdays,
 	'yard' : yards,
-	'zone' : zone,
+	'zone' : zones,
 }
 
 _propdeclarations = {
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 c49fdfb..f520a9c 100644
--- a/Lib/plat-mac/lib-scriptpackages/StdSuites/Macintosh_Connectivity_Clas.py
+++ b/Lib/plat-mac/lib-scriptpackages/StdSuites/Macintosh_Connectivity_Clas.py
@@ -29,6 +29,24 @@ class ID(aetools.NProperty):
 
 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):
+	"""conduit - How the addressee is physically connected """
+	which = 'pcon'
+	want = 'econ'
+class properties(aetools.NProperty):
+	"""properties - property that allows getting and setting of multiple properties """
+	which = 'pALL'
+	want = 'reco'
+class protocol(aetools.NProperty):
+	"""protocol - How to talk to this addressee """
+	which = 'pprt'
+	want = 'epro'
+
+address_specifications = address_specification
+
 class AppleTalk_address(aetools.ComponentItem):
 	"""AppleTalk address - Addresses a device or service connected via the AppleTalk protocol """
 	want = 'cat '
@@ -47,6 +65,26 @@ class AppleTalk_zone(aetools.NProperty):
 
 AppleTalk_addresses = AppleTalk_address
 
+class bus_slot(aetools.ComponentItem):
+	"""bus slot - Addresses a PC, PCI, or NuBus card """
+	want = 'cbus'
+
+bus_slots = bus_slot
+
+class device_specification(aetools.ComponentItem):
+	"""device specification - A device connected to a computer """
+	want = 'cdev'
+class device_address(aetools.NProperty):
+	"""device address - the address of the device """
+	which = 'pdva'
+	want = 'cadr'
+class device_type(aetools.NProperty):
+	"""device type - the kind of device """
+	which = 'pdvt'
+	want = 'edvt'
+
+device_specifications = device_specification
+
 class Ethernet_address(aetools.ComponentItem):
 	"""Ethernet address - Addresses a device by its Ethernet address """
 	want = 'cen '
@@ -111,53 +149,15 @@ class Token_Ring_address(aetools.ComponentItem):
 
 Token_Ring_addresses = Token_Ring_address
 
-class USB_Addresses(aetools.ComponentItem):
-	"""USB Addresses -  """
+class USB_address(aetools.ComponentItem):
+	"""USB address - Addresses a device on the Universal Serial Bus """
 	want = 'cusb'
-
-USB_address = USB_Addresses
 class name(aetools.NProperty):
 	"""name - the USB device name """
 	which = 'pnam'
 	want = 'TEXT'
 
-class address_specification(aetools.ComponentItem):
-	"""address specification - Unique designation of a device or service connected to this computer """
-	want = 'cadr'
-class conduit(aetools.NProperty):
-	"""conduit - How the addressee is physically connected """
-	which = 'pcon'
-	want = 'econ'
-class properties(aetools.NProperty):
-	"""properties - property that allows getting and setting of multiple properties """
-	which = 'pALL'
-	want = 'reco'
-class protocol(aetools.NProperty):
-	"""protocol - How to talk to this addressee """
-	which = 'pprt'
-	want = 'epro'
-
-address_specifications = address_specification
-
-class bus_slot(aetools.ComponentItem):
-	"""bus slot - Addresses a PC, PCI, or NuBus card """
-	want = 'cbus'
-
-bus_slots = bus_slot
-
-class device_specification(aetools.ComponentItem):
-	"""device specification - A device connected to a computer """
-	want = 'cdev'
-class device_address(aetools.NProperty):
-	"""device address - the address of the device """
-	which = 'pdva'
-	want = 'cadr'
-class device_type(aetools.NProperty):
-	"""device type - the kind of device """
-	which = 'pdvt'
-	want = 'edvt'
-
-device_specifications = device_specification
+USB_Addresses = USB_address
 ADB_address._superclassnames = ['address_specification']
 ADB_address._privpropdict = {
 	'ID' : ID,
@@ -165,6 +165,14 @@ ADB_address._privpropdict = {
 }
 ADB_address._privelemdict = {
 }
+address_specification._superclassnames = []
+address_specification._privpropdict = {
+	'conduit' : conduit,
+	'properties' : properties,
+	'protocol' : protocol,
+}
+address_specification._privelemdict = {
+}
 AppleTalk_address._superclassnames = ['address_specification']
 AppleTalk_address._privpropdict = {
 	'AppleTalk_machine' : AppleTalk_machine,
@@ -174,6 +182,21 @@ AppleTalk_address._privpropdict = {
 }
 AppleTalk_address._privelemdict = {
 }
+bus_slot._superclassnames = ['address_specification']
+bus_slot._privpropdict = {
+	'ID' : ID,
+	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
+}
+bus_slot._privelemdict = {
+}
+device_specification._superclassnames = []
+device_specification._privpropdict = {
+	'device_address' : device_address,
+	'device_type' : device_type,
+	'properties' : properties,
+}
+device_specification._privelemdict = {
+}
 Ethernet_address._superclassnames = ['address_specification']
 Ethernet_address._privpropdict = {
 	'ID' : ID,
@@ -222,33 +245,12 @@ Token_Ring_address._privpropdict = {
 }
 Token_Ring_address._privelemdict = {
 }
-USB_Addresses._superclassnames = []
-USB_Addresses._privpropdict = {
-}
-USB_Addresses._privelemdict = {
-}
-address_specification._superclassnames = []
-address_specification._privpropdict = {
-	'conduit' : conduit,
-	'properties' : properties,
-	'protocol' : protocol,
-}
-address_specification._privelemdict = {
-}
-bus_slot._superclassnames = ['address_specification']
-bus_slot._privpropdict = {
-	'ID' : ID,
+USB_address._superclassnames = ['address_specification']
+USB_address._privpropdict = {
 	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
+	'name' : name,
 }
-bus_slot._privelemdict = {
-}
-device_specification._superclassnames = []
-device_specification._privpropdict = {
-	'device_address' : device_address,
-	'device_type' : device_type,
-	'properties' : properties,
-}
-device_specification._privelemdict = {
+USB_address._privelemdict = {
 }
 _Enum_econ = {
 	'ADB' : 'eadb',	# 
@@ -337,7 +339,7 @@ _classdeclarations = {
 	'clt ' : LocalTalk_address,
 	'cscs' : SCSI_address,
 	'ctok' : Token_Ring_address,
-	'cusb' : USB_Addresses,
+	'cusb' : USB_address,
 }
 
 _propdeclarations = {
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 bf78ea1..6705d6b 100644
--- a/Lib/plat-mac/lib-scriptpackages/StdSuites/QuickDraw_Graphics_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/StdSuites/QuickDraw_Graphics_Suite.py
@@ -119,45 +119,17 @@ class writing_code(aetools.NProperty):
 
 drawing_areas = drawing_area
 
-class graphic_group(aetools.ComponentItem):
-	"""graphic group - Group of graphics """
-	want = 'cpic'
-
-graphic_groups = graphic_group
-
-class graphic_line(aetools.ComponentItem):
-	"""graphic line - A graphic line """
-	want = 'glin'
-class arrow_style(aetools.NProperty):
-	"""arrow style - the arrow style """
-	which = 'arro'
-	want = 'arro'
-class dash_style(aetools.NProperty):
-	"""dash style - the dash style """
-	which = 'pdst'
-	want = 'tdas'
-class end_point(aetools.NProperty):
-	"""end point - the ending point of the line """
-	which = 'pend'
-	want = 'QDpt'
-class start_point(aetools.NProperty):
-	"""start point - the starting point of the line """
-	which = 'pstp'
-	want = 'QDpt'
-
-graphic_lines = graphic_line
-
-class graphic_object(aetools.ComponentItem):
-	"""graphic object - A graphic object """
+class graphic_objects(aetools.ComponentItem):
+	"""graphic objects -  """
 	want = 'cgob'
 
-graphic_objects = graphic_object
+graphic_object = graphic_objects
 
-class graphic_shape(aetools.ComponentItem):
-	"""graphic shape - A graphic shape """
+class graphic_shapes(aetools.ComponentItem):
+	"""graphic shapes -  """
 	want = 'cgsh'
 
-graphic_shapes = graphic_shape
+graphic_shape = graphic_shapes
 
 class graphic_text(aetools.ComponentItem):
 	"""graphic text - A series of characters within a drawing area """
@@ -179,23 +151,11 @@ class uniform_styles(aetools.NProperty):
 	which = 'ustl'
 	want = 'tsty'
 
-class oval(aetools.ComponentItem):
-	"""oval - An oval """
+class ovals(aetools.ComponentItem):
+	"""ovals -  """
 	want = 'covl'
 
-ovals = oval
-
-class pixel(aetools.ComponentItem):
-	"""pixel - A pixel """
-	want = 'cpxl'
-
-class pixel_map(aetools.ComponentItem):
-	"""pixel map - A pixel map """
-	want = 'cpix'
-
-pixel_maps = pixel_map
-
-pixels = pixel
+oval = ovals
 
 class polygon(aetools.ComponentItem):
 	"""polygon - A polygon """
@@ -207,11 +167,29 @@ class point_list(aetools.NProperty):
 
 polygons = polygon
 
-class rectangle(aetools.ComponentItem):
-	"""rectangle - A rectangle """
+class graphic_groups(aetools.ComponentItem):
+	"""graphic groups -  """
+	want = 'cpic'
+
+graphic_group = graphic_groups
+
+class pixel_maps(aetools.ComponentItem):
+	"""pixel maps -  """
+	want = 'cpix'
+
+pixel_map = pixel_maps
+
+class pixel(aetools.ComponentItem):
+	"""pixel - A pixel """
+	want = 'cpxl'
+
+pixels = pixel
+
+class rectangles(aetools.ComponentItem):
+	"""rectangles -  """
 	want = 'crec'
 
-rectangles = rectangle
+rectangle = rectangles
 
 class rounded_rectangle(aetools.ComponentItem):
 	"""rounded rectangle - A rounded rectangle """
@@ -226,6 +204,28 @@ class corner_curve_width(aetools.NProperty):
 	want = 'shor'
 
 rounded_rectangles = rounded_rectangle
+
+class graphic_line(aetools.ComponentItem):
+	"""graphic line - A graphic line """
+	want = 'glin'
+class arrow_style(aetools.NProperty):
+	"""arrow style - the arrow style """
+	which = 'arro'
+	want = 'arro'
+class dash_style(aetools.NProperty):
+	"""dash style - the dash style """
+	which = 'pdst'
+	want = 'tdas'
+class end_point(aetools.NProperty):
+	"""end point - the ending point of the line """
+	which = 'pend'
+	want = 'QDpt'
+class start_point(aetools.NProperty):
+	"""start point - the starting point of the line """
+	which = 'pstp'
+	want = 'QDpt'
+
+graphic_lines = graphic_line
 arc._superclassnames = []
 arc._privpropdict = {
 	'arc_angle' : arc_angle,
@@ -259,29 +259,15 @@ drawing_area._privpropdict = {
 }
 drawing_area._privelemdict = {
 }
-graphic_group._superclassnames = []
-graphic_group._privpropdict = {
+graphic_objects._superclassnames = []
+graphic_objects._privpropdict = {
 }
-graphic_group._privelemdict = {
+graphic_objects._privelemdict = {
 }
-graphic_line._superclassnames = []
-graphic_line._privpropdict = {
-	'arrow_style' : arrow_style,
-	'dash_style' : dash_style,
-	'end_point' : end_point,
-	'start_point' : start_point,
+graphic_shapes._superclassnames = []
+graphic_shapes._privpropdict = {
 }
-graphic_line._privelemdict = {
-}
-graphic_object._superclassnames = []
-graphic_object._privpropdict = {
-}
-graphic_object._privelemdict = {
-}
-graphic_shape._superclassnames = []
-graphic_shape._privpropdict = {
-}
-graphic_shape._privelemdict = {
+graphic_shapes._privelemdict = {
 }
 graphic_text._superclassnames = []
 graphic_text._privpropdict = {
@@ -292,21 +278,10 @@ graphic_text._privpropdict = {
 }
 graphic_text._privelemdict = {
 }
-oval._superclassnames = []
-oval._privpropdict = {
+ovals._superclassnames = []
+ovals._privpropdict = {
 }
-oval._privelemdict = {
-}
-pixel._superclassnames = []
-pixel._privpropdict = {
-	'color' : color,
-}
-pixel._privelemdict = {
-}
-pixel_map._superclassnames = []
-pixel_map._privpropdict = {
-}
-pixel_map._privelemdict = {
+ovals._privelemdict = {
 }
 polygon._superclassnames = []
 polygon._privpropdict = {
@@ -314,10 +289,26 @@ polygon._privpropdict = {
 }
 polygon._privelemdict = {
 }
-rectangle._superclassnames = []
-rectangle._privpropdict = {
+graphic_groups._superclassnames = []
+graphic_groups._privpropdict = {
+}
+graphic_groups._privelemdict = {
+}
+pixel_maps._superclassnames = []
+pixel_maps._privpropdict = {
+}
+pixel_maps._privelemdict = {
+}
+pixel._superclassnames = []
+pixel._privpropdict = {
+	'color' : color,
+}
+pixel._privelemdict = {
+}
+rectangles._superclassnames = []
+rectangles._privpropdict = {
 }
-rectangle._privelemdict = {
+rectangles._privelemdict = {
 }
 rounded_rectangle._superclassnames = []
 rounded_rectangle._privpropdict = {
@@ -326,6 +317,15 @@ rounded_rectangle._privpropdict = {
 }
 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,
+}
+graphic_line._privelemdict = {
+}
 _Enum_arro = {
 	'no_arrow' : 'arno',	# No arrow on line
 	'arrow_at_start' : 'arst',	# Arrow at start of line
@@ -358,15 +358,15 @@ _Enum_tran = {
 _classdeclarations = {
 	'carc' : arc,
 	'cdrw' : drawing_area,
-	'cgob' : graphic_object,
-	'cgsh' : graphic_shape,
+	'cgob' : graphic_objects,
+	'cgsh' : graphic_shapes,
 	'cgtx' : graphic_text,
-	'covl' : oval,
+	'covl' : ovals,
 	'cpgn' : polygon,
-	'cpic' : graphic_group,
-	'cpix' : pixel_map,
+	'cpic' : graphic_groups,
+	'cpix' : pixel_maps,
 	'cpxl' : pixel,
-	'crec' : rectangle,
+	'crec' : rectangles,
 	'crrc' : rounded_rectangle,
 	'glin' : graphic_line,
 }
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 b74c60b..22fd94d 100644
--- a/Lib/plat-mac/lib-scriptpackages/StdSuites/QuickDraw_Graphics_Suppleme.py
+++ b/Lib/plat-mac/lib-scriptpackages/StdSuites/QuickDraw_Graphics_Suppleme.py
@@ -33,11 +33,11 @@ class translation(aetools.NProperty):
 
 drawing_areas = drawing_area
 
-class graphic_group(aetools.ComponentItem):
-	"""graphic group - Group of graphics """
+class graphic_groups(aetools.ComponentItem):
+	"""graphic groups -  """
 	want = 'cpic'
 
-graphic_groups = graphic_group
+graphic_group = graphic_groups
 drawing_area._superclassnames = []
 drawing_area._privpropdict = {
 	'rotation' : rotation,
@@ -46,10 +46,10 @@ drawing_area._privpropdict = {
 }
 drawing_area._privelemdict = {
 }
-graphic_group._superclassnames = []
-graphic_group._privpropdict = {
+graphic_groups._superclassnames = []
+graphic_groups._privpropdict = {
 }
-graphic_group._privelemdict = {
+graphic_groups._privelemdict = {
 }
 
 #
@@ -57,7 +57,7 @@ graphic_group._privelemdict = {
 #
 _classdeclarations = {
 	'cdrw' : drawing_area,
-	'cpic' : graphic_group,
+	'cpic' : graphic_groups,
 }
 
 _propdeclarations = {
diff --git a/Lib/plat-mac/lib-scriptpackages/StdSuites/Standard_Suite.py b/Lib/plat-mac/lib-scriptpackages/StdSuites/Standard_Suite.py
index 59d336b..2e85473 100644
--- a/Lib/plat-mac/lib-scriptpackages/StdSuites/Standard_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/StdSuites/Standard_Suite.py
@@ -448,11 +448,11 @@ class Standard_Suite_Events(builtin_Suite_Events):
 			return _arguments['----']
 
 
-class alias(aetools.ComponentItem):
-	"""alias - a file on a disk or server.  The file must exist when you check the syntax of your script. """
+class aliases(aetools.ComponentItem):
+	"""aliases -  """
 	want = 'alis'
 
-aliases = alias
+alias = aliases
 
 class application(aetools.ComponentItem):
 	"""application - An application program """
@@ -480,31 +480,11 @@ class version(aetools.NProperty):
 
 applications = application
 
-class document(aetools.ComponentItem):
-	"""document - A document of a scriptable application """
-	want = 'docu'
-class modified(aetools.NProperty):
-	"""modified - Has the document been modified since the last save? """
-	which = 'imod'
-	want = 'bool'
-
-documents = document
-
-class file(aetools.ComponentItem):
-	"""file - a file on a disk or server """
-	want = 'file'
-class stationery(aetools.NProperty):
-	"""stationery - Is the file a stationery file? """
-	which = 'pspd'
-	want = 'bool'
-
-files = file
-
-class insertion_point(aetools.ComponentItem):
-	"""insertion point - An insertion location between two objects """
+class insertion_points(aetools.ComponentItem):
+	"""insertion points -  """
 	want = 'cins'
 
-insertion_points = insertion_point
+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. """
@@ -559,10 +539,30 @@ class zoomed(aetools.NProperty):
 	want = 'bool'
 
 windows = window
-alias._superclassnames = []
-alias._privpropdict = {
+
+class document(aetools.ComponentItem):
+	"""document - A document of a scriptable application """
+	want = 'docu'
+class modified(aetools.NProperty):
+	"""modified - Has the document been modified since the last save? """
+	which = 'imod'
+	want = 'bool'
+
+documents = document
+
+class file(aetools.ComponentItem):
+	"""file - a file on a disk or server """
+	want = 'file'
+class stationery(aetools.NProperty):
+	"""stationery - Is the file a stationery file? """
+	which = 'pspd'
+	want = 'bool'
+
+files = file
+aliases._superclassnames = []
+aliases._privpropdict = {
 }
-alias._privelemdict = {
+aliases._privelemdict = {
 }
 application._superclassnames = []
 application._privpropdict = {
@@ -574,22 +574,10 @@ application._privpropdict = {
 }
 application._privelemdict = {
 }
-document._superclassnames = []
-document._privpropdict = {
-	'modified' : modified,
-}
-document._privelemdict = {
-}
-file._superclassnames = []
-file._privpropdict = {
-	'stationery' : stationery,
-}
-file._privelemdict = {
-}
-insertion_point._superclassnames = []
-insertion_point._privpropdict = {
+insertion_points._superclassnames = []
+insertion_points._privpropdict = {
 }
-insertion_point._privelemdict = {
+insertion_points._privelemdict = {
 }
 selection_2d_object._superclassnames = []
 selection_2d_object._privpropdict = {
@@ -612,6 +600,18 @@ window._privpropdict = {
 }
 window._privelemdict = {
 }
+document._superclassnames = []
+document._privpropdict = {
+	'modified' : modified,
+}
+document._privelemdict = {
+}
+file._superclassnames = []
+file._privpropdict = {
+	'stationery' : stationery,
+}
+file._privelemdict = {
+}
 class _3c_(aetools.NComparison):
 	"""< - Less than """
 class _3d_(aetools.NComparison):
@@ -663,9 +663,9 @@ _Enum_styl = {
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'alis' : alias,
+	'alis' : aliases,
 	'capp' : application,
-	'cins' : insertion_point,
+	'cins' : insertion_points,
 	'csel' : selection_2d_object,
 	'cwin' : window,
 	'docu' : document,
diff --git a/Lib/plat-mac/lib-scriptpackages/StdSuites/Table_Suite.py b/Lib/plat-mac/lib-scriptpackages/StdSuites/Table_Suite.py
index 522f04c..390edd6 100644
--- a/Lib/plat-mac/lib-scriptpackages/StdSuites/Table_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/StdSuites/Table_Suite.py
@@ -39,17 +39,17 @@ class name(aetools.NProperty):
 
 columns = column
 
-class row(aetools.ComponentItem):
-	"""row - A row """
+class rows(aetools.ComponentItem):
+	"""rows -  """
 	want = 'crow'
 
-rows = row
+row = rows
 
-class table(aetools.ComponentItem):
-	"""table - A table """
+class tables(aetools.ComponentItem):
+	"""tables -  """
 	want = 'ctbl'
 
-tables = table
+table = tables
 cell._superclassnames = []
 cell._privpropdict = {
 	'formula' : formula,
@@ -63,15 +63,15 @@ column._privpropdict = {
 }
 column._privelemdict = {
 }
-row._superclassnames = []
-row._privpropdict = {
+rows._superclassnames = []
+rows._privpropdict = {
 }
-row._privelemdict = {
+rows._privelemdict = {
 }
-table._superclassnames = []
-table._privpropdict = {
+tables._superclassnames = []
+tables._privpropdict = {
 }
-table._privelemdict = {
+tables._privelemdict = {
 }
 _Enum_prtn = {
 	'read_only' : 'nmod',	# Can\xd5t change values or formulas
@@ -86,8 +86,8 @@ _Enum_prtn = {
 _classdeclarations = {
 	'ccel' : cell,
 	'ccol' : column,
-	'crow' : row,
-	'ctbl' : table,
+	'crow' : rows,
+	'ctbl' : tables,
 }
 
 _propdeclarations = {
diff --git a/Lib/plat-mac/lib-scriptpackages/StdSuites/Text_Suite.py b/Lib/plat-mac/lib-scriptpackages/StdSuites/Text_Suite.py
index bdf1baa..c104f82 100644
--- a/Lib/plat-mac/lib-scriptpackages/StdSuites/Text_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/StdSuites/Text_Suite.py
@@ -15,13 +15,23 @@ class Text_Suite_Events:
 	pass
 
 
-class character(aetools.ComponentItem):
-	"""character - A character """
-	want = 'cha '
+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):
 	"""<inheritance> - inherits some of its properties from this class """
 	which = 'c@#^'
 	want = 'ctxt'
+class name(aetools.NProperty):
+	"""name - the name """
+	which = 'pnam'
+	want = 'itxt'
+
+text_flows = text_flow
+
+class character(aetools.ComponentItem):
+	"""character - A character """
+	want = 'cha '
 
 class line(aetools.ComponentItem):
 	"""line - A line of text """
@@ -72,15 +82,11 @@ class writing_code(aetools.NProperty):
 #        element 'ctxt' as ['indx']
 #        element 'cwor' as ['indx']
 
-class text_flow(aetools.ComponentItem):
-	"""text flow - A contiguous block of text.  Page layout applications call this a \xd4story.\xd5 """
-	want = 'cflo'
-class name(aetools.NProperty):
-	"""name - the name """
-	which = 'pnam'
-	want = 'itxt'
+class word(aetools.ComponentItem):
+	"""word - A word """
+	want = 'cwor'
 
-text_flows = text_flow
+words = word
 
 class text_style_info(aetools.ComponentItem):
 	"""text style info - On and Off styles of text run """
@@ -95,12 +101,13 @@ class on_styles(aetools.NProperty):
 	want = 'styl'
 
 text_style_infos = text_style_info
-
-class word(aetools.ComponentItem):
-	"""word - A word """
-	want = 'cwor'
-
-words = word
+text_flow._superclassnames = ['text']
+text_flow._privpropdict = {
+	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
+	'name' : name,
+}
+text_flow._privelemdict = {
+}
 character._superclassnames = ['text']
 character._privpropdict = {
 	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
@@ -136,12 +143,11 @@ text._privelemdict = {
 	'text' : text,
 	'word' : word,
 }
-text_flow._superclassnames = ['text']
-text_flow._privpropdict = {
+word._superclassnames = ['text']
+word._privpropdict = {
 	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
-	'name' : name,
 }
-text_flow._privelemdict = {
+word._privelemdict = {
 }
 text_style_info._superclassnames = []
 text_style_info._privpropdict = {
@@ -150,12 +156,6 @@ text_style_info._privpropdict = {
 }
 text_style_info._privelemdict = {
 }
-word._superclassnames = ['text']
-word._privpropdict = {
-	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
-}
-word._privelemdict = {
-}
 _Enum_just = {
 	'left' : 'left',	# Align with left margin
 	'right' : 'rght',	# Align with right margin
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 eb616d6..87a4b84 100644
--- a/Lib/plat-mac/lib-scriptpackages/StdSuites/Type_Names_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/StdSuites/Type_Names_Suite.py
@@ -19,13 +19,17 @@ class PostScript_picture(aetools.ComponentItem):
 	"""PostScript picture -  """
 	want = 'EPS '
 
-class RGB16_color(aetools.ComponentItem):
-	"""RGB16 color -  """
-	want = 'tr16'
+class point(aetools.ComponentItem):
+	"""point - point coordinates """
+	want = 'QDpt'
 
-class RGB96_color(aetools.ComponentItem):
-	"""RGB96 color -  """
-	want = 'tr96'
+class string(aetools.ComponentItem):
+	"""string - a string of characters """
+	want = 'TEXT'
+
+plain_text = string
+
+plain_text = string
 
 class TIFF_picture(aetools.ComponentItem):
 	"""TIFF picture -  """
@@ -35,22 +39,34 @@ class application_dictionary(aetools.ComponentItem):
 	"""application dictionary -  """
 	want = 'aete'
 
-class bounding_rectangle(aetools.ComponentItem):
-	"""bounding rectangle - bounding rectangle """
-	want = 'qdrt'
+class system_dictionary(aetools.ComponentItem):
+	"""system dictionary -  """
+	want = 'aeut'
 
 class color_table(aetools.ComponentItem):
 	"""color table -  """
 	want = 'clrt'
 
-class dash_style(aetools.ComponentItem):
-	"""dash style -  """
-	want = 'tdas'
+class menu_item(aetools.ComponentItem):
+	"""menu item -  """
+	want = 'cmen'
+
+class menu(aetools.ComponentItem):
+	"""menu -  """
+	want = 'cmnu'
 
 class double_integer(aetools.ComponentItem):
 	"""double integer -  """
 	want = 'comp'
 
+class type_element_info(aetools.ComponentItem):
+	"""type element info -  """
+	want = 'elin'
+
+class type_event_info(aetools.ComponentItem):
+	"""type event info - information about an event """
+	want = 'evin'
+
 class extended_real(aetools.ComponentItem):
 	"""extended real -  """
 	want = 'exte'
@@ -67,14 +83,14 @@ class fixed_rectangle(aetools.ComponentItem):
 	"""fixed rectangle -  """
 	want = 'frct'
 
+class type_class_info(aetools.ComponentItem):
+	"""type class info - information about properties and elements of a class """
+	want = 'gcli'
+
 class location_reference(aetools.ComponentItem):
 	"""location reference -  """
 	want = 'insl'
 
-class long_fixed(aetools.ComponentItem):
-	"""long fixed -  """
-	want = 'lfxd'
-
 class long_fixed_point(aetools.ComponentItem):
 	"""long fixed point -  """
 	want = 'lfpt'
@@ -83,6 +99,10 @@ class long_fixed_rectangle(aetools.ComponentItem):
 	"""long fixed rectangle -  """
 	want = 'lfrc'
 
+class long_fixed(aetools.ComponentItem):
+	"""long fixed -  """
+	want = 'lfxd'
+
 class long_point(aetools.ComponentItem):
 	"""long point -  """
 	want = 'lpnt'
@@ -95,39 +115,25 @@ class machine_location(aetools.ComponentItem):
 	"""machine location -  """
 	want = 'mLoc'
 
-class menu(aetools.ComponentItem):
-	"""menu -  """
-	want = 'cmnu'
-
-class menu_item(aetools.ComponentItem):
-	"""menu item -  """
-	want = 'cmen'
+class unsigned_integer(aetools.ComponentItem):
+	"""unsigned integer -  """
+	want = 'magn'
 
 class null(aetools.ComponentItem):
 	"""null -  """
 	want = 'null'
 
-class pixel_map_record(aetools.ComponentItem):
-	"""pixel map record -  """
-	want = 'tpmm'
-
-class plain_text(aetools.ComponentItem):
-	"""plain text -  """
-	want = 'TEXT'
-
-plain_text = plain_text
-
-class point(aetools.ComponentItem):
-	"""point - point coordinates """
-	want = 'QDpt'
+class type_property_info(aetools.ComponentItem):
+	"""type property info -  """
+	want = 'pinf'
 
-class rotation(aetools.ComponentItem):
-	"""rotation -  """
-	want = 'trot'
+class type_parameter_info(aetools.ComponentItem):
+	"""type parameter info -  """
+	want = 'pmin'
 
-class scrap_styles(aetools.ComponentItem):
-	"""scrap styles -  """
-	want = 'styl'
+class bounding_rectangle(aetools.ComponentItem):
+	"""bounding rectangle - bounding rectangle """
+	want = 'qdrt'
 
 class small_integer(aetools.ComponentItem):
 	"""small integer -  """
@@ -137,43 +143,37 @@ class small_real(aetools.ComponentItem):
 	"""small real -  """
 	want = 'sing'
 
-string = plain_text
+class scrap_styles(aetools.ComponentItem):
+	"""scrap styles -  """
+	want = 'styl'
 
-class system_dictionary(aetools.ComponentItem):
-	"""system dictionary -  """
-	want = 'aeut'
+class type_suite_info(aetools.ComponentItem):
+	"""type suite info -  """
+	want = 'suin'
 
 class target_id(aetools.ComponentItem):
 	"""target id -  """
 	want = 'targ'
 
-class type_class_info(aetools.ComponentItem):
-	"""type class info - information about properties and elements of a class """
-	want = 'gcli'
-
-class type_element_info(aetools.ComponentItem):
-	"""type element info -  """
-	want = 'elin'
-
-class type_event_info(aetools.ComponentItem):
-	"""type event info - information about an event """
-	want = 'evin'
+class dash_style(aetools.ComponentItem):
+	"""dash style -  """
+	want = 'tdas'
 
-class type_parameter_info(aetools.ComponentItem):
-	"""type parameter info -  """
-	want = 'pmin'
+class pixel_map_record(aetools.ComponentItem):
+	"""pixel map record -  """
+	want = 'tpmm'
 
-class type_property_info(aetools.ComponentItem):
-	"""type property info -  """
-	want = 'pinf'
+class RGB16_color(aetools.ComponentItem):
+	"""RGB16 color -  """
+	want = 'tr16'
 
-class type_suite_info(aetools.ComponentItem):
-	"""type suite info -  """
-	want = 'suin'
+class RGB96_color(aetools.ComponentItem):
+	"""RGB96 color -  """
+	want = 'tr96'
 
-class unsigned_integer(aetools.ComponentItem):
-	"""unsigned integer -  """
-	want = 'magn'
+class rotation(aetools.ComponentItem):
+	"""rotation -  """
+	want = 'trot'
 
 class version(aetools.ComponentItem):
 	"""version -  """
@@ -183,15 +183,15 @@ PostScript_picture._privpropdict = {
 }
 PostScript_picture._privelemdict = {
 }
-RGB16_color._superclassnames = []
-RGB16_color._privpropdict = {
+point._superclassnames = []
+point._privpropdict = {
 }
-RGB16_color._privelemdict = {
+point._privelemdict = {
 }
-RGB96_color._superclassnames = []
-RGB96_color._privpropdict = {
+string._superclassnames = []
+string._privpropdict = {
 }
-RGB96_color._privelemdict = {
+string._privelemdict = {
 }
 TIFF_picture._superclassnames = []
 TIFF_picture._privpropdict = {
@@ -203,26 +203,41 @@ application_dictionary._privpropdict = {
 }
 application_dictionary._privelemdict = {
 }
-bounding_rectangle._superclassnames = []
-bounding_rectangle._privpropdict = {
+system_dictionary._superclassnames = []
+system_dictionary._privpropdict = {
 }
-bounding_rectangle._privelemdict = {
+system_dictionary._privelemdict = {
 }
 color_table._superclassnames = []
 color_table._privpropdict = {
 }
 color_table._privelemdict = {
 }
-dash_style._superclassnames = []
-dash_style._privpropdict = {
+menu_item._superclassnames = []
+menu_item._privpropdict = {
 }
-dash_style._privelemdict = {
+menu_item._privelemdict = {
+}
+menu._superclassnames = []
+menu._privpropdict = {
+}
+menu._privelemdict = {
 }
 double_integer._superclassnames = []
 double_integer._privpropdict = {
 }
 double_integer._privelemdict = {
 }
+type_element_info._superclassnames = []
+type_element_info._privpropdict = {
+}
+type_element_info._privelemdict = {
+}
+type_event_info._superclassnames = []
+type_event_info._privpropdict = {
+}
+type_event_info._privelemdict = {
+}
 extended_real._superclassnames = []
 extended_real._privpropdict = {
 }
@@ -243,16 +258,16 @@ fixed_rectangle._privpropdict = {
 }
 fixed_rectangle._privelemdict = {
 }
+type_class_info._superclassnames = []
+type_class_info._privpropdict = {
+}
+type_class_info._privelemdict = {
+}
 location_reference._superclassnames = []
 location_reference._privpropdict = {
 }
 location_reference._privelemdict = {
 }
-long_fixed._superclassnames = []
-long_fixed._privpropdict = {
-}
-long_fixed._privelemdict = {
-}
 long_fixed_point._superclassnames = []
 long_fixed_point._privpropdict = {
 }
@@ -263,6 +278,11 @@ long_fixed_rectangle._privpropdict = {
 }
 long_fixed_rectangle._privelemdict = {
 }
+long_fixed._superclassnames = []
+long_fixed._privpropdict = {
+}
+long_fixed._privelemdict = {
+}
 long_point._superclassnames = []
 long_point._privpropdict = {
 }
@@ -278,50 +298,30 @@ machine_location._privpropdict = {
 }
 machine_location._privelemdict = {
 }
-menu._superclassnames = []
-menu._privpropdict = {
-}
-menu._privelemdict = {
-}
-menu_item._superclassnames = []
-menu_item._privpropdict = {
+unsigned_integer._superclassnames = []
+unsigned_integer._privpropdict = {
 }
-menu_item._privelemdict = {
+unsigned_integer._privelemdict = {
 }
 null._superclassnames = []
 null._privpropdict = {
 }
 null._privelemdict = {
 }
-pixel_map_record._superclassnames = []
-pixel_map_record._privpropdict = {
-}
-pixel_map_record._privelemdict = {
-}
-plain_text._superclassnames = []
-plain_text._privpropdict = {
-}
-plain_text._privelemdict = {
-}
-plain_text._superclassnames = []
-plain_text._privpropdict = {
-}
-plain_text._privelemdict = {
-}
-point._superclassnames = []
-point._privpropdict = {
+type_property_info._superclassnames = []
+type_property_info._privpropdict = {
 }
-point._privelemdict = {
+type_property_info._privelemdict = {
 }
-rotation._superclassnames = []
-rotation._privpropdict = {
+type_parameter_info._superclassnames = []
+type_parameter_info._privpropdict = {
 }
-rotation._privelemdict = {
+type_parameter_info._privelemdict = {
 }
-scrap_styles._superclassnames = []
-scrap_styles._privpropdict = {
+bounding_rectangle._superclassnames = []
+bounding_rectangle._privpropdict = {
 }
-scrap_styles._privelemdict = {
+bounding_rectangle._privelemdict = {
 }
 small_integer._superclassnames = []
 small_integer._privpropdict = {
@@ -333,50 +333,45 @@ small_real._privpropdict = {
 }
 small_real._privelemdict = {
 }
-system_dictionary._superclassnames = []
-system_dictionary._privpropdict = {
+scrap_styles._superclassnames = []
+scrap_styles._privpropdict = {
 }
-system_dictionary._privelemdict = {
+scrap_styles._privelemdict = {
+}
+type_suite_info._superclassnames = []
+type_suite_info._privpropdict = {
+}
+type_suite_info._privelemdict = {
 }
 target_id._superclassnames = []
 target_id._privpropdict = {
 }
 target_id._privelemdict = {
 }
-type_class_info._superclassnames = []
-type_class_info._privpropdict = {
-}
-type_class_info._privelemdict = {
-}
-type_element_info._superclassnames = []
-type_element_info._privpropdict = {
-}
-type_element_info._privelemdict = {
-}
-type_event_info._superclassnames = []
-type_event_info._privpropdict = {
+dash_style._superclassnames = []
+dash_style._privpropdict = {
 }
-type_event_info._privelemdict = {
+dash_style._privelemdict = {
 }
-type_parameter_info._superclassnames = []
-type_parameter_info._privpropdict = {
+pixel_map_record._superclassnames = []
+pixel_map_record._privpropdict = {
 }
-type_parameter_info._privelemdict = {
+pixel_map_record._privelemdict = {
 }
-type_property_info._superclassnames = []
-type_property_info._privpropdict = {
+RGB16_color._superclassnames = []
+RGB16_color._privpropdict = {
 }
-type_property_info._privelemdict = {
+RGB16_color._privelemdict = {
 }
-type_suite_info._superclassnames = []
-type_suite_info._privpropdict = {
+RGB96_color._superclassnames = []
+RGB96_color._privpropdict = {
 }
-type_suite_info._privelemdict = {
+RGB96_color._privelemdict = {
 }
-unsigned_integer._superclassnames = []
-unsigned_integer._privpropdict = {
+rotation._superclassnames = []
+rotation._privpropdict = {
 }
-unsigned_integer._privelemdict = {
+rotation._privelemdict = {
 }
 version._superclassnames = []
 version._privpropdict = {
@@ -390,7 +385,7 @@ version._privelemdict = {
 _classdeclarations = {
 	'EPS ' : PostScript_picture,
 	'QDpt' : point,
-	'TEXT' : plain_text,
+	'TEXT' : string,
 	'TIFF' : TIFF_picture,
 	'aete' : application_dictionary,
 	'aeut' : system_dictionary,