--- a/dwt/internal/cocoa/NSScriptSuiteRegistry.d	Sat Aug 09 17:00:02 2008 +0200
+++ b/dwt/internal/cocoa/NSScriptSuiteRegistry.d	Tue Aug 19 17:35:17 2008 +0200
@@ -13,7 +13,7 @@
  *******************************************************************************/
 module dwt.internal.cocoa.NSScriptSuiteRegistry;
 
-import dwt.internal.c.carboncore.MacTypes : FourCharCodes;
+import dwt.internal.c.carboncore.MacTypes : FourCharCode;
 import dwt.internal.cocoa.NSArray;
 import dwt.internal.cocoa.NSBundle;
 import dwt.internal.cocoa.NSData;
@@ -40,70 +40,70 @@
 
     public NSData aeteResource (NSString languageName)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_aeteResource_1, languageName !is null ? languageName.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_aeteResource_1, languageName !is null ? languageName.id_ : null);
         return result !is null ? new NSData(result) : null;
     }
 
     public FourCharCode appleEventCodeForSuite (NSString suiteName)
     {
-        return cast(FourCharCode) OS.objc_msgSend(this.id, OS.sel_appleEventCodeForSuite_1, suiteName !is null ? suiteName.id : null);
+        return cast(FourCharCode) OS.objc_msgSend(this.id_, OS.sel_appleEventCodeForSuite_1, suiteName !is null ? suiteName.id_ : null);
     }
 
     public NSBundle bundleForSuite (NSString suiteName)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_bundleForSuite_1, suiteName !is null ? suiteName.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_bundleForSuite_1, suiteName !is null ? suiteName.id_ : null);
         return result !is null ? new NSBundle(result) : null;
     }
 
     public NSScriptClassDescription classDescriptionWithAppleEventCode (FourCharCode appleEventCode)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_classDescriptionWithAppleEventCode_1, appleEventCode);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_classDescriptionWithAppleEventCode_1, appleEventCode);
         return result !is null ? new NSScriptClassDescription(result) : null;
     }
 
     public NSDictionary classDescriptionsInSuite (NSString suiteName)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_classDescriptionsInSuite_1, suiteName !is null ? suiteName.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_classDescriptionsInSuite_1, suiteName !is null ? suiteName.id_ : null);
         return result !is null ? new NSDictionary(result) : null;
     }
 
     public NSScriptCommandDescription commandDescriptionWithAppleEventClass (FourCharCode appleEventClassCode, FourCharCode appleEventIDCode)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_commandDescriptionWithAppleEventClass_1andAppleEventCode_1, appleEventClassCode,
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_commandDescriptionWithAppleEventClass_1andAppleEventCode_1, appleEventClassCode,
                 appleEventIDCode);
         return result !is null ? new NSScriptCommandDescription(result) : null;
     }
 
     public NSDictionary commandDescriptionsInSuite (NSString suiteName)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_commandDescriptionsInSuite_1, suiteName !is null ? suiteName.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_commandDescriptionsInSuite_1, suiteName !is null ? suiteName.id_ : null);
         return result !is null ? new NSDictionary(result) : null;
     }
 
     public void loadSuiteWithDictionary (NSDictionary suiteDeclaration, NSBundle bundle)
     {
-        OS.objc_msgSend(this.id, OS.sel_loadSuiteWithDictionary_1fromBundle_1, suiteDeclaration !is null ? suiteDeclaration.id : null,
-                bundle !is null ? bundle.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_loadSuiteWithDictionary_1fromBundle_1, suiteDeclaration !is null ? suiteDeclaration.id_ : null,
+                bundle !is null ? bundle.id_ : null);
     }
 
     public void loadSuitesFromBundle (NSBundle bundle)
     {
-        OS.objc_msgSend(this.id, OS.sel_loadSuitesFromBundle_1, bundle !is null ? bundle.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_loadSuitesFromBundle_1, bundle !is null ? bundle.id_ : null);
     }
 
     public void registerClassDescription (NSScriptClassDescription classDescription)
     {
-        OS.objc_msgSend(this.id, OS.sel_registerClassDescription_1, classDescription !is null ? classDescription.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_registerClassDescription_1, classDescription !is null ? classDescription.id_ : null);
     }
 
     public void registerCommandDescription (NSScriptCommandDescription commandDescription)
     {
-        OS.objc_msgSend(this.id, OS.sel_registerCommandDescription_1, commandDescription !is null ? commandDescription.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_registerCommandDescription_1, commandDescription !is null ? commandDescription.id_ : null);
     }
 
     public static void setSharedScriptSuiteRegistry (NSScriptSuiteRegistry registry)
     {
-        OS.objc_msgSend(OS.class_NSScriptSuiteRegistry, OS.sel_setSharedScriptSuiteRegistry_1, registry !is null ? registry.id : null);
+        OS.objc_msgSend(OS.class_NSScriptSuiteRegistry, OS.sel_setSharedScriptSuiteRegistry_1, registry !is null ? registry.id_ : null);
     }
 
     public static NSScriptSuiteRegistry sharedScriptSuiteRegistry ()
@@ -114,13 +114,13 @@
 
     public NSString suiteForAppleEventCode (FourCharCode appleEventCode)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_suiteForAppleEventCode_1, appleEventCode);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_suiteForAppleEventCode_1, appleEventCode);
         return result !is null ? new NSString(result) : null;
     }
 
     public NSArray suiteNames ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_suiteNames);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_suiteNames);
         return result !is null ? new NSArray(result) : null;
     }