The MacOS toolbox modules have acquired an _ in front of their name. Normal usage is through a wrapper module (without underscore) which lives in the Carbon package.

26 files changed, 178 insertions, 172 deletions

diff --git a/Mac/Include/macbuildno.h b/Mac/Include/macbuildno.h
index e282285..604ce64 100644
--- a/Mac/Include/macbuildno.h
+++ b/Mac/Include/macbuildno.h
@@ -1 +1 @@
-#define BUILD 101
+#define BUILD 104
diff --git a/Mac/Modules/ae/aesupport.py b/Mac/Modules/ae/aesupport.py
index a7351e2..7a00986 100644
--- a/Mac/Modules/ae/aesupport.py
+++ b/Mac/Modules/ae/aesupport.py
@@ -164,7 +164,7 @@ initstuff = initstuff + """
 	PyMac_INIT_TOOLBOX_OBJECT_CONVERT(AEDesc, AEDesc_Convert);
 """
 
-module = MacModule('AE', 'AE', includestuff, finalstuff, initstuff)
+module = MacModule('_AE', 'AE', includestuff, finalstuff, initstuff)
 
 class AEDescDefinition(GlobalObjectDefinition):
 
@@ -222,5 +222,5 @@ execfile('aegen.py')
 for f in functions: module.add(f)
 for f in aedescmethods: aedescobject.add(f)
 
-SetOutputFileName('AEmodule.c')
+SetOutputFileName('_AEmodule.c')
 module.generate()
diff --git a/Mac/Modules/app/appsupport.py b/Mac/Modules/app/appsupport.py
index d370a57..5cfe29c 100644
--- a/Mac/Modules/app/appsupport.py
+++ b/Mac/Modules/app/appsupport.py
@@ -7,12 +7,12 @@ import string
 
 # Declarations that change for each manager
 MACHEADERFILE = 'Appearance.h'		# The Apple header file
-MODNAME = 'App'				# The name of the module
+MODNAME = '_App'				# The name of the module
 OBJECTNAME = 'UNUSED'			# The basic name of the objects used here
 KIND = 'Record'				# Usually 'Ptr' or 'Handle'
 
 # The following is *usually* unchanged but may still require tuning
-MODPREFIX = MODNAME			# The prefix for module-wide routines
+MODPREFIX = 'App'			# The prefix for module-wide routines
 OBJECTTYPE = OBJECTNAME + KIND		# The C type used to represent them
 OBJECTPREFIX = MODPREFIX + 'Obj'	# The prefix for object methods
 INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner
diff --git a/Mac/Modules/cf/cfsupport.py b/Mac/Modules/cf/cfsupport.py
index 95a26f6..1f3f357 100644
--- a/Mac/Modules/cf/cfsupport.py
+++ b/Mac/Modules/cf/cfsupport.py
@@ -8,10 +8,10 @@
 import string
 
 # Declarations that change for each manager
-MODNAME = 'CF'				# The name of the module
+MODNAME = '_CF'				# The name of the module
 
 # The following is *usually* unchanged but may still require tuning
-MODPREFIX = MODNAME			# The prefix for module-wide routines
+MODPREFIX = 'CF'			# The prefix for module-wide routines
 INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner
 OUTPUTFILE = MODNAME + "module.c"	# The file generated by this program
 
diff --git a/Mac/Modules/cm/cmsupport.py b/Mac/Modules/cm/cmsupport.py
index cb9112b..6511a3c 100644
--- a/Mac/Modules/cm/cmsupport.py
+++ b/Mac/Modules/cm/cmsupport.py
@@ -7,10 +7,10 @@ import string
 
 # Declarations that change for each manager
 MACHEADERFILE = 'Components.h'		# The Apple header file
-MODNAME = 'Cm'				# The name of the module
+MODNAME = '_Cm'				# The name of the module
 
 # The following is *usually* unchanged but may still require tuning
-MODPREFIX = MODNAME			# The prefix for module-wide routines
+MODPREFIX = 'Cm'			# The prefix for module-wide routines
 C_OBJECTPREFIX = 'CmpObj'	# The prefix for object methods
 CI_OBJECTPREFIX = 'CmpInstObj'
 INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner
diff --git a/Mac/Modules/ctl/ctlsupport.py b/Mac/Modules/ctl/ctlsupport.py
index 869811b..f65d7fb 100644
--- a/Mac/Modules/ctl/ctlsupport.py
+++ b/Mac/Modules/ctl/ctlsupport.py
@@ -7,11 +7,11 @@ import string
 
 # Declarations that change for each manager
 MACHEADERFILE = 'Controls.h'		# The Apple header file
-MODNAME = 'Ctl'				# The name of the module
+MODNAME = '_Ctl'				# The name of the module
 OBJECTNAME = 'Control'			# The basic name of the objects used here
 
 # The following is *usually* unchanged but may still require tuning
-MODPREFIX = MODNAME			# The prefix for module-wide routines
+MODPREFIX = 'Ctl'			# The prefix for module-wide routines
 OBJECTTYPE = OBJECTNAME + 'Handle'	# The C type used to represent them
 OBJECTPREFIX = MODPREFIX + 'Obj'	# The prefix for object methods
 INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner
diff --git a/Mac/Modules/dlg/dlgsupport.py b/Mac/Modules/dlg/dlgsupport.py
index b166b42..af72b3a 100644
--- a/Mac/Modules/dlg/dlgsupport.py
+++ b/Mac/Modules/dlg/dlgsupport.py
@@ -240,7 +240,7 @@ class MyObjectDefinition(GlobalObjectDefinition):
 		Output("DisposeDialog(%s);", itselfname)
 
 # Create the generator groups and link them
-module = MacModule('Dlg', 'Dlg', includestuff, finalstuff, initstuff)
+module = MacModule('_Dlg', 'Dlg', includestuff, finalstuff, initstuff)
 object = MyObjectDefinition('Dialog', 'DlgObj', 'DialogPtr')
 module.addobject(object)
 
@@ -300,5 +300,5 @@ f = ManualGenerator("SetUserItemHandler", setuseritembody)
 module.add(f)
 
 # generate output
-SetOutputFileName('Dlgmodule.c')
+SetOutputFileName('_Dlgmodule.c')
 module.generate()
diff --git a/Mac/Modules/drag/dragsupport.py b/Mac/Modules/drag/dragsupport.py
index c35111e..e26ddd5 100644
--- a/Mac/Modules/drag/dragsupport.py
+++ b/Mac/Modules/drag/dragsupport.py
@@ -7,11 +7,11 @@ import string
 
 # Declarations that change for each manager
 MACHEADERFILE = 'Drag.h'		# The Apple header file
-MODNAME = 'Drag'				# The name of the module
+MODNAME = '_Drag'				# The name of the module
 OBJECTNAME = 'DragObj'			# The basic name of the objects used here
 
 # The following is *usually* unchanged but may still require tuning
-MODPREFIX = MODNAME			# The prefix for module-wide routines
+MODPREFIX = 'Drag'			# The prefix for module-wide routines
 OBJECTTYPE = 'DragRef'	# The C type used to represent them
 OBJECTPREFIX = MODPREFIX + 'Obj'	# The prefix for object methods
 INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner
diff --git a/Mac/Modules/evt/evtsupport.py b/Mac/Modules/evt/evtsupport.py
index 88ee6c2..ede353d 100644
--- a/Mac/Modules/evt/evtsupport.py
+++ b/Mac/Modules/evt/evtsupport.py
@@ -7,12 +7,12 @@ import string
 
 # Declarations that change for each manager
 MACHEADERFILE = 'Events.h'		# The Apple header file
-MODNAME = 'Evt'				# The name of the module
+MODNAME = '_Evt'				# The name of the module
 OBJECTNAME = 'Event'			# The basic name of the objects used here
 KIND = 'Record'				# Usually 'Ptr' or 'Handle'
 
 # The following is *usually* unchanged but may still require tuning
-MODPREFIX = MODNAME			# The prefix for module-wide routines
+MODPREFIX = 'Evt'			# The prefix for module-wide routines
 OBJECTTYPE = OBJECTNAME + KIND		# The C type used to represent them
 OBJECTPREFIX = MODPREFIX + 'Obj'	# The prefix for object methods
 INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner
diff --git a/Mac/Modules/fm/fmsupport.py b/Mac/Modules/fm/fmsupport.py
index 9ec1e0e..3b40716 100644
--- a/Mac/Modules/fm/fmsupport.py
+++ b/Mac/Modules/fm/fmsupport.py
@@ -7,10 +7,10 @@ import string
 
 # Declarations that change for each manager
 MACHEADERFILE = 'Fonts.h'		# The Apple header file
-MODNAME = 'Fm'				# The name of the module
+MODNAME = '_Fm'				# The name of the module
 
 # The following is *usually* unchanged but may still require tuning
-MODPREFIX = MODNAME			# The prefix for module-wide routines
+MODPREFIX = 'Fm'			# The prefix for module-wide routines
 INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner
 OUTPUTFILE = MODNAME + "module.c"	# The file generated by this program
 
diff --git a/Mac/Modules/help/helpsupport.py b/Mac/Modules/help/helpsupport.py
index 3eeb06a..96fbfe2 100644
--- a/Mac/Modules/help/helpsupport.py
+++ b/Mac/Modules/help/helpsupport.py
@@ -7,12 +7,12 @@ import string
 
 # Declarations that change for each manager
 MACHEADERFILE = 'Balloons.h'		# The Apple header file
-MODNAME = 'Help'				# The name of the module
+MODNAME = '_Help'				# The name of the module
 OBJECTNAME = 'UNUSED'			# The basic name of the objects used here
 KIND = 'Record'				# Usually 'Ptr' or 'Handle'
 
 # The following is *usually* unchanged but may still require tuning
-MODPREFIX = MODNAME			# The prefix for module-wide routines
+MODPREFIX = 'Help'			# The prefix for module-wide routines
 OBJECTTYPE = OBJECTNAME + KIND		# The C type used to represent them
 OBJECTPREFIX = MODPREFIX + 'Obj'	# The prefix for object methods
 INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner
diff --git a/Mac/Modules/icn/icnsupport.py b/Mac/Modules/icn/icnsupport.py
index bfdc555..52d075d 100644
--- a/Mac/Modules/icn/icnsupport.py
+++ b/Mac/Modules/icn/icnsupport.py
@@ -7,12 +7,12 @@ import string
 
 # Declarations that change for each manager
 MACHEADERFILE = 'Icons.h'		# The Apple header file
-MODNAME = 'Icn'				# The name of the module
+MODNAME = '_Icn'				# The name of the module
 OBJECTNAME = 'Icon'			# The basic name of the objects used here
 KIND = 'Handle'				# Usually 'Ptr' or 'Handle'
 
 # The following is *usually* unchanged but may still require tuning
-MODPREFIX = MODNAME			# The prefix for module-wide routines
+MODPREFIX = 'Icn'			# The prefix for module-wide routines
 OBJECTTYPE = OBJECTNAME + KIND		# The C type used to represent them
 OBJECTPREFIX = MODPREFIX + 'Obj'	# The prefix for object methods
 INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner
diff --git a/Mac/Modules/list/listsupport.py b/Mac/Modules/list/listsupport.py
index d5ddd5b..b9bb964 100644
--- a/Mac/Modules/list/listsupport.py
+++ b/Mac/Modules/list/listsupport.py
@@ -7,12 +7,12 @@ import string
 
 # Declarations that change for each manager
 MACHEADERFILE = 'Lists.h'		# The Apple header file
-MODNAME = 'List'				# The name of the module
+MODNAME = '_List'				# The name of the module
 OBJECTNAME = 'List'			# The basic name of the objects used here
 KIND = 'Handle'				# Usually 'Ptr' or 'Handle'
 
 # The following is *usually* unchanged but may still require tuning
-MODPREFIX = MODNAME			# The prefix for module-wide routines
+MODPREFIX = 'List'			# The prefix for module-wide routines
 OBJECTTYPE = "ListHandle"		# The C type used to represent them
 OBJECTPREFIX = MODPREFIX + 'Obj'	# The prefix for object methods
 INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner
diff --git a/Mac/Modules/macconfig.c b/Mac/Modules/macconfig.c
index 50c7d89..0e4dd91 100644
--- a/Mac/Modules/macconfig.c
+++ b/Mac/Modules/macconfig.c
@@ -94,35 +94,35 @@ extern void initicglue();
 #ifndef USE_CORE_TOOLBOX
 #define USE_CORE_TOOLBOX
 #endif
-extern void initApp();
-extern void initFm();
-extern void initHelp();
-extern void initIcn();
-extern void initList();
-extern void initMlte();
-extern void initQdoffs();
-extern void initSnd();
-extern void initSndihooks();
-extern void initScrap();
-extern void initTE();
+extern void init_App();
+extern void init_Fm();
+extern void init_Help();
+extern void init_Icn();
+extern void init_List();
+extern void init_Mlte();
+extern void init_Qdoffs();
+extern void init_Snd();
+extern void init_Sndihooks();
+extern void init_Scrap();
+extern void init_TE();
 extern void initColorPicker();
 extern void initPrinting();
-extern void initCF();
+extern void init_CF();
 #endif
 #ifdef USE_CORE_TOOLBOX
-extern void initAE();
-extern void initCtl();
-extern void initDlg();
-extern void initDrag();
-extern void initEvt();
-extern void initMenu();
-extern void initQd();
-extern void initRes();
-extern void initWin();
+extern void init_AE();
+extern void init_Ctl();
+extern void init_Dlg();
+extern void init_Drag();
+extern void init_Evt();
+extern void init_Menu();
+extern void init_Qd();
+extern void init_Res();
+extern void init_Win();
 #endif
 #ifdef USE_QT
-extern void initCm();
-extern void initQt();
+extern void init_Cm();
+extern void init_Qt();
 #endif
 
 #ifdef USE_IMG
@@ -217,40 +217,40 @@ struct _inittab _PyImport_Inittab[] = {
 	{"icglue", initicglue},
 #endif
 #ifdef USE_CORE_TOOLBOX
-	{"AE", initAE},
-	{"Ctl", initCtl},
-	{"Dlg", initDlg},
-	{"Drag", initDrag},
-	{"Evt", initEvt},
-	{"Menu", initMenu},
-	{"Qd", initQd},
-	{"Win", initWin},
-	{"Res", initRes},
+	{"_AE", init_AE},
+	{"_Ctl", init_Ctl},
+	{"_Dlg", init_Dlg},
+	{"_Drag", init_Drag},
+	{"_Evt", init_Evt},
+	{"_Menu", init_Menu},
+	{"_Qd", init_Qd},
+	{"_Win", init_Win},
+	{"_Res", init_Res},
 #endif
 #ifdef USE_TOOLBOX
-	{"App", initApp},
-	{"Fm", initFm},
-	{"Icn", initIcn},
-	{"List", initList},
-	{"Mlte", initMlte},
-	{"Qdoffs", initQdoffs},
-	{"Snd", initSnd},
-	{"Sndihooks", initSndihooks},
+	{"_App", init_App},
+	{"_Fm", init_Fm},
+	{"_Icn", init_Icn},
+	{"_List", init_List},
+	{"_Mlte", init_Mlte},
+	{"_Qdoffs", init_Qdoffs},
+	{"_Snd", init_Snd},
+	{"_Sndihooks", init_Sndihooks},
 	/* Carbon scrap manager is completely different */
-	{"Scrap", initScrap},
-	{"TE", initTE},
+	{"_Scrap", init_Scrap},
+	{"_TE", init_TE},
 	{"ColorPicker", initColorPicker},
 #if !TARGET_API_MAC_CARBON
-	{"Help", initHelp},
+	{"_Help", init_Help},
 	{"Printing", initPrinting},
 #endif
 #if TARGET_API_MAC_CARBON
-	{"CF", initCF},
+	{"_CF", init_CF},
 #endif
 #endif
 #ifdef USE_QT
-	{"Cm", initCm},
-	{"Qt", initQt},
+	{"_Cm", init_Cm},
+	{"_Qt", init_Qt},
 #endif
 #ifdef USE_IMG
 	{"imgcolormap",	initimgcolormap},
diff --git a/Mac/Modules/menu/menusupport.py b/Mac/Modules/menu/menusupport.py
index a438f14..199c8af 100644
--- a/Mac/Modules/menu/menusupport.py
+++ b/Mac/Modules/menu/menusupport.py
@@ -7,11 +7,11 @@ import string
 
 # Declarations that change for each manager
 MACHEADERFILE = 'Menus.h'		# The Apple header file
-MODNAME = 'Menu'			# The name of the module
+MODNAME = '_Menu'			# The name of the module
 OBJECTNAME = 'Menu'			# The basic name of the objects used here
 
 # The following is *usually* unchanged but may still require tuning
-MODPREFIX = MODNAME			# The prefix for module-wide routines
+MODPREFIX = 'Menu'			# The prefix for module-wide routines
 OBJECTTYPE = OBJECTNAME + 'Handle'	# The C type used to represent them
 OBJECTPREFIX = MODPREFIX + 'Obj'	# The prefix for object methods
 INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner
diff --git a/Mac/Modules/mlte/mltesupport.py b/Mac/Modules/mlte/mltesupport.py
index a1152be..e4418cb 100644
--- a/Mac/Modules/mlte/mltesupport.py
+++ b/Mac/Modules/mlte/mltesupport.py
@@ -8,10 +8,10 @@
 import string
 
 # Declarations that change for each manager
-MODNAME = 'Mlte'				# The name of the module
+MODNAME = '_Mlte'				# The name of the module
 
 # The following is *usually* unchanged but may still require tuning
-MODPREFIX = MODNAME			# The prefix for module-wide routines
+MODPREFIX = 'Mlte'			# The prefix for module-wide routines
 INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner
 OUTPUTFILE = MODNAME + "module.c"	# The file generated by this program
 
diff --git a/Mac/Modules/qd/qdsupport.py b/Mac/Modules/qd/qdsupport.py
index cd6282b..5f7c5bc 100644
--- a/Mac/Modules/qd/qdsupport.py
+++ b/Mac/Modules/qd/qdsupport.py
@@ -7,11 +7,11 @@ import string
 
 # Declarations that change for each manager
 MACHEADERFILE = 'QuickDraw.h'		# The Apple header file
-MODNAME = 'Qd'				# The name of the module
+MODNAME = '_Qd'				# The name of the module
 OBJECTNAME = 'Graf'			# The basic name of the objects used here
 
 # The following is *usually* unchanged but may still require tuning
-MODPREFIX = MODNAME			# The prefix for module-wide routines
+MODPREFIX = 'Qd'			# The prefix for module-wide routines
 OBJECTTYPE = OBJECTNAME + 'Ptr'		# The C type used to represent them
 OBJECTPREFIX = MODPREFIX + 'Obj'	# The prefix for object methods
 INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner
diff --git a/Mac/Modules/qdoffs/qdoffssupport.py b/Mac/Modules/qdoffs/qdoffssupport.py
index bc21531..cee5f94 100644
--- a/Mac/Modules/qdoffs/qdoffssupport.py
+++ b/Mac/Modules/qdoffs/qdoffssupport.py
@@ -7,11 +7,11 @@ import string
 
 # Declarations that change for each manager
 MACHEADERFILE = 'QDOffscreen.h'		# The Apple header file
-MODNAME = 'Qdoffs'				# The name of the module
+MODNAME = '_Qdoffs'				# The name of the module
 OBJECTNAME = 'GWorld'			# The basic name of the objects used here
 
 # The following is *usually* unchanged but may still require tuning
-MODPREFIX = MODNAME			# The prefix for module-wide routines
+MODPREFIX = 'Qdoffs'			# The prefix for module-wide routines
 OBJECTTYPE = OBJECTNAME + 'Ptr'		# The C type used to represent them
 OBJECTPREFIX = OBJECTNAME + 'Obj'	# The prefix for object methods
 INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner
diff --git a/Mac/Modules/qt/qtsupport.py b/Mac/Modules/qt/qtsupport.py
index e1b7374..2d66327 100644
--- a/Mac/Modules/qt/qtsupport.py
+++ b/Mac/Modules/qt/qtsupport.py
@@ -9,11 +9,11 @@ import string
 
 # Declarations that change for each manager
 MACHEADERFILE = 'Movies.h'		# The Apple header file
-MODNAME = 'Qt'				# The name of the module
+MODNAME = '_Qt'				# The name of the module
 OBJECTNAME = 'Movie'			# The basic name of the objects used here
 
 # The following is *usually* unchanged but may still require tuning
-MODPREFIX = MODNAME			# The prefix for module-wide routines
+MODPREFIX = 'Qt'			# The prefix for module-wide routines
 OBJECTTYPE = "Movie"		# The C type used to represent them
 OBJECTPREFIX = MODPREFIX + 'Obj'	# The prefix for object methods
 INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner
diff --git a/Mac/Modules/res/ressupport.py b/Mac/Modules/res/ressupport.py
index 8be1b94..2a72748 100644
--- a/Mac/Modules/res/ressupport.py
+++ b/Mac/Modules/res/ressupport.py
@@ -93,7 +93,7 @@ initstuff = initstuff + """
 	PyMac_INIT_TOOLBOX_OBJECT_CONVERT(Handle, OptResObj_Convert);
 """
 
-module = MacModule('Res', 'Res', includestuff, finalstuff, initstuff)
+module = MacModule('_Res', 'Res', includestuff, finalstuff, initstuff)
 
 getattrHookCode = """
 if (strcmp(name, "size") == 0)
@@ -192,5 +192,5 @@ execfile('resedit.py')
 for f in functions: module.add(f)
 for f in resmethods: resobject.add(f)
 
-SetOutputFileName('Resmodule.c')
+SetOutputFileName('_Resmodule.c')
 module.generate()
diff --git a/Mac/Modules/scrap/scrapsupport.py b/Mac/Modules/scrap/scrapsupport.py
index 44dee33..516b22b 100644
--- a/Mac/Modules/scrap/scrapsupport.py
+++ b/Mac/Modules/scrap/scrapsupport.py
@@ -10,10 +10,10 @@ import string
 
 # Declarations that change for each manager
 MACHEADERFILE = 'Scrap.h'		# The Apple header file
-MODNAME = 'Scrap'				# The name of the module
+MODNAME = '_Scrap'				# The name of the module
 
 # The following is *usually* unchanged but may still require tuning
-MODPREFIX = MODNAME			# The prefix for module-wide routines
+MODPREFIX = 'Scrap'			# The prefix for module-wide routines
 INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner
 OUTPUTFILE = '@' + MODNAME + "module.c"	# The file generated by this program
 
diff --git a/Mac/Modules/snd/sndsupport.py b/Mac/Modules/snd/sndsupport.py
index dcaa654..9c100ac 100644
--- a/Mac/Modules/snd/sndsupport.py
+++ b/Mac/Modules/snd/sndsupport.py
@@ -334,7 +334,7 @@ class SpbObjectDefinition(ObjectDefinition):
 sndobject = SndObjectDefinition('SndChannel', 'SndCh', 'SndChannelPtr')
 spbobject = SpbObjectDefinition('SPB', 'SPBObj', 'SPBPtr')
 spbgenerator = ManualGenerator("SPB", "return SPBObj_New();")
-module = MacModule('Snd', 'Snd', includestuff, finalstuff, initstuff)
+module = MacModule('_Snd', 'Snd', includestuff, finalstuff, initstuff)
 module.addobject(sndobject)
 module.addobject(spbobject)
 module.add(spbgenerator)
@@ -359,5 +359,5 @@ for f in sndmethods: sndobject.add(f)
 
 # generate output
 
-SetOutputFileName('Sndmodule.c')
+SetOutputFileName('_Sndmodule.c')
 module.generate()
diff --git a/Mac/Modules/te/tesupport.py b/Mac/Modules/te/tesupport.py
index 6cb96e2..6aa5a65 100644
--- a/Mac/Modules/te/tesupport.py
+++ b/Mac/Modules/te/tesupport.py
@@ -7,12 +7,12 @@ import string
 
 # Declarations that change for each manager
 MACHEADERFILE = 'TextEdit.h'		# The Apple header file
-MODNAME = 'TE'				# The name of the module
+MODNAME = '_TE'				# The name of the module
 OBJECTNAME = 'TE'			# The basic name of the objects used here
 KIND = 'Handle'				# Usually 'Ptr' or 'Handle'
 
 # The following is *usually* unchanged but may still require tuning
-MODPREFIX = MODNAME			# The prefix for module-wide routines
+MODPREFIX = 'TE'			# The prefix for module-wide routines
 OBJECTTYPE = "TEHandle"		# The C type used to represent them
 OBJECTPREFIX = MODPREFIX + 'Obj'	# The prefix for object methods
 INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner
diff --git a/Mac/Modules/win/winsupport.py b/Mac/Modules/win/winsupport.py
index cc1c312..5bb5bda 100644
--- a/Mac/Modules/win/winsupport.py
+++ b/Mac/Modules/win/winsupport.py
@@ -7,11 +7,11 @@ import string
 
 # Declarations that change for each manager
 MACHEADERFILE = 'Windows.h'		# The Apple header file
-MODNAME = 'Win'				# The name of the module
+MODNAME = '_Win'				# The name of the module
 OBJECTNAME = 'Window'			# The basic name of the objects used here
 
 # The following is *usually* unchanged but may still require tuning
-MODPREFIX = MODNAME			# The prefix for module-wide routines
+MODPREFIX = 'Win'			# The prefix for module-wide routines
 OBJECTTYPE = OBJECTNAME + 'Ptr'		# The C type used to represent them
 OBJECTPREFIX = MODPREFIX + 'Obj'	# The prefix for object methods
 INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner
diff --git a/Mac/scripts/fullbuild.py b/Mac/scripts/fullbuild.py
index 43d69e6..11340da 100644
--- a/Mac/scripts/fullbuild.py
+++ b/Mac/scripts/fullbuild.py
@@ -250,28 +250,28 @@ I_PPC_PLUGINS : (buildmwproject, "CWIE", [
 	(":Extensions:Imaging:_tkinter.mcp", "_tkinter.ppc"),
 	(":Mac:Build:ColorPicker.mcp", "ColorPicker.ppc"),
 	(":Mac:Build:Printing.mcp", "Printing.ppc"),
-	(":Mac:Build:AE.mcp", "AE.ppc"),
-	(":Mac:Build:App.mcp", "App.ppc"),
-	(":Mac:Build:Cm.mcp", "Cm.ppc"),
-	(":Mac:Build:Ctl.mcp", "Ctl.ppc"),
-	(":Mac:Build:Dlg.mcp", "Dlg.ppc"),
-	(":Mac:Build:Drag.mcp", "Drag.ppc"),
-	(":Mac:Build:Evt.mcp", "Evt.ppc"),
-	(":Mac:Build:Fm.mcp", "Fm.ppc"),
-	(":Mac:Build:Help.mcp", "Help.ppc"),
-	(":Mac:Build:Icn.mcp", "Icn.ppc"),
-	(":Mac:Build:List.mcp", "List.ppc"),
-	(":Mac:Build:Menu.mcp", "Menu.ppc"),
-	(":Mac:Build:Mlte.mcp", "Mlte.ppc"),
-	(":Mac:Build:Qd.mcp", "Qd.ppc"),
-	(":Mac:Build:Qdoffs.mcp", "Qdoffs.ppc"),
-	(":Mac:Build:Qt.mcp", "Qt.ppc"),
-	(":Mac:Build:Res.mcp", "Res.ppc"),
-	(":Mac:Build:Scrap.mcp", "Scrap.ppc"),
-	(":Mac:Build:Snd.mcp", "Snd.ppc"),
-	(":Mac:Build:Sndihooks.mcp", "Sndihooks.ppc"),
-	(":Mac:Build:TE.mcp", "TE.ppc"),
-	(":Mac:Build:Win.mcp", "Win.ppc"),
+	(":Mac:Build:_AE.mcp", "_AE.ppc"),
+	(":Mac:Build:_App.mcp", "_App.ppc"),
+	(":Mac:Build:_Cm.mcp", "_Cm.ppc"),
+	(":Mac:Build:_Ctl.mcp", "_Ctl.ppc"),
+	(":Mac:Build:_Dlg.mcp", "_Dlg.ppc"),
+	(":Mac:Build:_Drag.mcp", "_Drag.ppc"),
+	(":Mac:Build:_Evt.mcp", "_Evt.ppc"),
+	(":Mac:Build:_Fm.mcp", "_Fm.ppc"),
+	(":Mac:Build:_Help.mcp", "_Help.ppc"),
+	(":Mac:Build:_Icn.mcp", "_Icn.ppc"),
+	(":Mac:Build:_List.mcp", "_List.ppc"),
+	(":Mac:Build:_Menu.mcp", "_Menu.ppc"),
+	(":Mac:Build:_Mlte.mcp", "_Mlte.ppc"),
+	(":Mac:Build:_Qd.mcp", "_Qd.ppc"),
+	(":Mac:Build:_Qdoffs.mcp", "_Qdoffs.ppc"),
+	(":Mac:Build:_Qt.mcp", "_Qt.ppc"),
+	(":Mac:Build:_Res.mcp", "_Res.ppc"),
+	(":Mac:Build:_Scrap.mcp", "_Scrap.ppc"),
+	(":Mac:Build:_Snd.mcp", "_Snd.ppc"),
+	(":Mac:Build:_Sndihooks.mcp", "_Sndihooks.ppc"),
+	(":Mac:Build:_TE.mcp", "_TE.ppc"),
+	(":Mac:Build:_Win.mcp", "_Win.ppc"),
 	]),
 
 I_CARBON_PLUGINS :  (buildmwproject, "CWIE", [
@@ -287,28 +287,28 @@ I_CARBON_PLUGINS :  (buildmwproject, "CWIE", [
 	(":Mac:Build:_dummy_tkinter.mcp", "_tkinter.carbon"),
 ##	(":Extensions:Imaging:_tkinter.carbon.mcp", "_tkinter.carbon"),
 	(":Mac:Build:ColorPicker.carbon.mcp", "ColorPicker.carbon"),
-	(":Mac:Build:AE.carbon.mcp", "AE.carbon"),
-	(":Mac:Build:App.carbon.mcp", "App.carbon"),
-	(":Mac:Build:CF.carbon.mcp", "CF.carbon"),
-	(":Mac:Build:Cm.carbon.mcp", "Cm.carbon"),
-	(":Mac:Build:Ctl.carbon.mcp", "Ctl.carbon"),
-	(":Mac:Build:Dlg.carbon.mcp", "Dlg.carbon"),
-	(":Mac:Build:Drag.carbon.mcp", "Drag.carbon"),
-	(":Mac:Build:Evt.carbon.mcp", "Evt.carbon"),
-	(":Mac:Build:Fm.carbon.mcp", "Fm.carbon"),
-	(":Mac:Build:Icn.carbon.mcp", "Icn.carbon"),
-	(":Mac:Build:List.carbon.mcp", "List.carbon"),
-	(":Mac:Build:Menu.carbon.mcp", "Menu.carbon"),
-	(":Mac:Build:Mlte.carbon.mcp", "Mlte.carbon"),
-	(":Mac:Build:Qd.carbon.mcp", "Qd.carbon"),
-	(":Mac:Build:Qdoffs.carbon.mcp", "Qdoffs.carbon"),
-	(":Mac:Build:Qt.carbon.mcp", "Qt.carbon"),
-	(":Mac:Build:Res.carbon.mcp", "Res.carbon"),
-	(":Mac:Build:Scrap.carbon.mcp", "Scrap.carbon"),
-	(":Mac:Build:Snd.carbon.mcp", "Snd.carbon"),
-	(":Mac:Build:Sndihooks.carbon.mcp", "Sndihooks.carbon"),
-	(":Mac:Build:TE.carbon.mcp", "TE.carbon"),
-	(":Mac:Build:Win.carbon.mcp", "Win.carbon"),
+	(":Mac:Build:_AE.carbon.mcp", "_AE.carbon"),
+	(":Mac:Build:_App.carbon.mcp", "_App.carbon"),
+	(":Mac:Build:_CF.carbon.mcp", "_CF.carbon"),
+	(":Mac:Build:_Cm.carbon.mcp", "_Cm.carbon"),
+	(":Mac:Build:_Ctl.carbon.mcp", "_Ctl.carbon"),
+	(":Mac:Build:_Dlg.carbon.mcp", "_Dlg.carbon"),
+	(":Mac:Build:_Drag.carbon.mcp", "_Drag.carbon"),
+	(":Mac:Build:_Evt.carbon.mcp", "_Evt.carbon"),
+	(":Mac:Build:_Fm.carbon.mcp", "_Fm.carbon"),
+	(":Mac:Build:_Icn.carbon.mcp", "_Icn.carbon"),
+	(":Mac:Build:_List.carbon.mcp", "_List.carbon"),
+	(":Mac:Build:_Menu.carbon.mcp", "_Menu.carbon"),
+	(":Mac:Build:_Mlte.carbon.mcp", "_Mlte.carbon"),
+	(":Mac:Build:_Qd.carbon.mcp", "_Qd.carbon"),
+	(":Mac:Build:_Qdoffs.carbon.mcp", "_Qdoffs.carbon"),
+	(":Mac:Build:_Qt.carbon.mcp", "_Qt.carbon"),
+	(":Mac:Build:_Res.carbon.mcp", "_Res.carbon"),
+	(":Mac:Build:_Scrap.carbon.mcp", "_Scrap.carbon"),
+	(":Mac:Build:_Snd.carbon.mcp", "_Snd.carbon"),
+	(":Mac:Build:_Sndihooks.carbon.mcp", "_Sndihooks.carbon"),
+	(":Mac:Build:_TE.carbon.mcp", "_TE.carbon"),
+	(":Mac:Build:_Win.carbon.mcp", "_Win.carbon"),
 	
 	]),
 
diff --git a/Mac/scripts/genpluginprojects.py b/Mac/scripts/genpluginprojects.py
index 9e7f584..1841d0a 100644
--- a/Mac/scripts/genpluginprojects.py
+++ b/Mac/scripts/genpluginprojects.py
@@ -59,7 +59,13 @@ def genpluginproject(architecture, module,
 	if not sourcedirs:
 		for moduledir in MODULEDIRS:
 			if '%' in moduledir:
-				moduledir = moduledir % module
+				# For historical reasons an initial _ in the modulename
+				# is not reflected in the folder name
+				if module[0] == '_':
+					modulewithout_ = module[1:]
+				else:
+					modulewithout_ = module
+				moduledir = moduledir % modulewithout_
 			fn = os.path.join(projectdir, os.path.join(moduledir, sources[0]))
 			if os.path.exists(fn):
 				moduledir, sourcefile = os.path.split(fn)
@@ -106,47 +112,47 @@ def	genallprojects(force=0):
 	genpluginproject("all", "_testcapi")
 	
 	# bgen-generated Toolbox modules
-	genpluginproject("carbon", "AE", outputdir="::Lib:Carbon")
-	genpluginproject("ppc", "AE", libraries=["ObjectSupportLib"], outputdir="::Lib:Carbon")
-	genpluginproject("ppc", "App", libraries=["AppearanceLib"], outputdir="::Lib:Carbon")
-	genpluginproject("carbon", "App", outputdir="::Lib:Carbon")
-	genpluginproject("ppc", "Cm", libraries=["QuickTimeLib"], outputdir="::Lib:Carbon")
-	genpluginproject("carbon", "Cm", outputdir="::Lib:Carbon")
-	genpluginproject("carbon", "Ctl", outputdir="::Lib:Carbon")
-	genpluginproject("ppc", "Ctl", libraries=["ControlsLib", "AppearanceLib"], 
+	genpluginproject("carbon", "_AE", outputdir="::Lib:Carbon")
+	genpluginproject("ppc", "_AE", libraries=["ObjectSupportLib"], outputdir="::Lib:Carbon")
+	genpluginproject("ppc", "_App", libraries=["AppearanceLib"], outputdir="::Lib:Carbon")
+	genpluginproject("carbon", "_App", outputdir="::Lib:Carbon")
+	genpluginproject("ppc", "_Cm", libraries=["QuickTimeLib"], outputdir="::Lib:Carbon")
+	genpluginproject("carbon", "_Cm", outputdir="::Lib:Carbon")
+	genpluginproject("carbon", "_Ctl", outputdir="::Lib:Carbon")
+	genpluginproject("ppc", "_Ctl", libraries=["ControlsLib", "AppearanceLib"], 
 			outputdir="::Lib:Carbon")
-	genpluginproject("carbon", "Dlg", outputdir="::Lib:Carbon")
-	genpluginproject("ppc", "Dlg", libraries=["DialogsLib", "AppearanceLib"],
+	genpluginproject("carbon", "_Dlg", outputdir="::Lib:Carbon")
+	genpluginproject("ppc", "_Dlg", libraries=["DialogsLib", "AppearanceLib"],
 			outputdir="::Lib:Carbon")
-	genpluginproject("carbon", "Drag", outputdir="::Lib:Carbon")
-	genpluginproject("ppc", "Drag", libraries=["DragLib"], outputdir="::Lib:Carbon")
-	genpluginproject("all", "Evt", outputdir="::Lib:Carbon")
-	genpluginproject("all", "Fm", outputdir="::Lib:Carbon")
-	genpluginproject("ppc", "Help", outputdir="::Lib:Carbon")
-	genpluginproject("ppc", "Icn", libraries=["IconServicesLib"], outputdir="::Lib:Carbon")
-	genpluginproject("carbon", "Icn", outputdir="::Lib:Carbon")
-	genpluginproject("all", "List", outputdir="::Lib:Carbon")
-	genpluginproject("carbon", "Menu", outputdir="::Lib:Carbon")
-	genpluginproject("ppc", "Menu", libraries=["MenusLib", "ContextualMenu", "AppearanceLib"],
+	genpluginproject("carbon", "_Drag", outputdir="::Lib:Carbon")
+	genpluginproject("ppc", "_Drag", libraries=["DragLib"], outputdir="::Lib:Carbon")
+	genpluginproject("all", "_Evt", outputdir="::Lib:Carbon")
+	genpluginproject("all", "_Fm", outputdir="::Lib:Carbon")
+	genpluginproject("ppc", "_Help", outputdir="::Lib:Carbon")
+	genpluginproject("ppc", "_Icn", libraries=["IconServicesLib"], outputdir="::Lib:Carbon")
+	genpluginproject("carbon", "_Icn", outputdir="::Lib:Carbon")
+	genpluginproject("all", "_List", outputdir="::Lib:Carbon")
+	genpluginproject("carbon", "_Menu", outputdir="::Lib:Carbon")
+	genpluginproject("ppc", "_Menu", libraries=["MenusLib", "ContextualMenu", "AppearanceLib"],
 			outputdir="::Lib:Carbon")
-	genpluginproject("all", "Qd", outputdir="::Lib:Carbon")
-	genpluginproject("ppc", "Qt", libraries=["QuickTimeLib"], outputdir="::Lib:Carbon")
-	genpluginproject("carbon", "Qt", outputdir="::Lib:Carbon")
-	genpluginproject("all", "Qdoffs", outputdir="::Lib:Carbon")
-	genpluginproject("all", "Res", outputdir="::Lib:Carbon")
-	genpluginproject("all", "Scrap", outputdir="::Lib:Carbon")
-	genpluginproject("ppc", "Snd", libraries=["SoundLib"], outputdir="::Lib:Carbon")
-	genpluginproject("carbon", "Snd", outputdir="::Lib:Carbon")
-	genpluginproject("all", "Sndihooks", sources=[":snd:Sndihooks.c"], outputdir="::Lib:Carbon")
-	genpluginproject("ppc", "TE", libraries=["DragLib"], outputdir="::Lib:Carbon")
-	genpluginproject("carbon", "TE", outputdir="::Lib:Carbon")
-	genpluginproject("ppc", "Mlte", libraries=["Textension"], outputdir="::Lib:Carbon")
-	genpluginproject("carbon", "Mlte", outputdir="::Lib:Carbon")
-	genpluginproject("carbon", "Win", outputdir="::Lib:Carbon")
-	genpluginproject("ppc", "Win", libraries=["WindowsLib", "AppearanceLib"],
+	genpluginproject("all", "_Qd", outputdir="::Lib:Carbon")
+	genpluginproject("ppc", "_Qt", libraries=["QuickTimeLib"], outputdir="::Lib:Carbon")
+	genpluginproject("carbon", "_Qt", outputdir="::Lib:Carbon")
+	genpluginproject("all", "_Qdoffs", outputdir="::Lib:Carbon")
+	genpluginproject("all", "_Res", outputdir="::Lib:Carbon")
+	genpluginproject("all", "_Scrap", outputdir="::Lib:Carbon")
+	genpluginproject("ppc", "_Snd", libraries=["SoundLib"], outputdir="::Lib:Carbon")
+	genpluginproject("carbon", "_Snd", outputdir="::Lib:Carbon")
+	genpluginproject("all", "_Sndihooks", sources=[":snd:_Sndihooks.c"], outputdir="::Lib:Carbon")
+	genpluginproject("ppc", "_TE", libraries=["DragLib"], outputdir="::Lib:Carbon")
+	genpluginproject("carbon", "_TE", outputdir="::Lib:Carbon")
+	genpluginproject("ppc", "_Mlte", libraries=["Textension"], outputdir="::Lib:Carbon")
+	genpluginproject("carbon", "_Mlte", outputdir="::Lib:Carbon")
+	genpluginproject("carbon", "_Win", outputdir="::Lib:Carbon")
+	genpluginproject("ppc", "_Win", libraries=["WindowsLib", "AppearanceLib"],
 			outputdir="::Lib:Carbon")
 	# Carbon Only?
-	genpluginproject("carbon", "CF", outputdir="::Lib:Carbon")
+	genpluginproject("carbon", "_CF", outputdir="::Lib:Carbon")
 	
 	# Other Mac modules
 	genpluginproject("all", "calldll", sources=["calldll.c"])