--- a/dwt/internal/cocoa/NSScriptClassDescription.d	Sat Aug 09 17:00:02 2008 +0200
+++ b/dwt/internal/cocoa/NSScriptClassDescription.d	Tue Aug 19 17:35:17 2008 +0200
@@ -37,12 +37,12 @@
 
     public FourCharCode appleEventCode ()
     {
-        return cast(FourCharCode) OS.objc_msgSend(this.id, OS.sel_appleEventCode);
+        return cast(FourCharCode) OS.objc_msgSend(this.id_, OS.sel_appleEventCode);
     }
 
     public FourCharCode appleEventCodeForKey (NSString key)
     {
-        return cast(FourCharCode) OS.objc_msgSend(this.id, OS.sel_appleEventCodeForKey_1, key !is null ? key.id : null);
+        return cast(FourCharCode) OS.objc_msgSend(this.id_, OS.sel_appleEventCodeForKey_1, key !is null ? key.id_ : null);
     }
 
     //public static NSScriptClassDescription classDescriptionForClass(int aClass) {
@@ -52,101 +52,101 @@
 
     public NSScriptClassDescription classDescriptionForKey (NSString key)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_classDescriptionForKey_1, key !is null ? key.id : null);
-        return result is this.id ? this : (result !is null ? new NSScriptClassDescription(result) : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_classDescriptionForKey_1, key !is null ? key.id_ : null);
+        return result is this.id_ ? this : (result !is null ? new NSScriptClassDescription(result) : null);
     }
 
     public NSString className ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_className);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_className);
         return result !is null ? new NSString(result) : null;
     }
 
     public NSString defaultSubcontainerAttributeKey ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_defaultSubcontainerAttributeKey);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_defaultSubcontainerAttributeKey);
         return result !is null ? new NSString(result) : null;
     }
 
     public bool hasOrderedToManyRelationshipForKey (NSString key)
     {
-        return OS.objc_msgSend(this.id, OS.sel_hasOrderedToManyRelationshipForKey_1, key !is null ? key.id : null) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_hasOrderedToManyRelationshipForKey_1, key !is null ? key.id_ : null) !is null;
     }
 
     public bool hasPropertyForKey (NSString key)
     {
-        return OS.objc_msgSend(this.id, OS.sel_hasPropertyForKey_1, key !is null ? key.id : null) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_hasPropertyForKey_1, key !is null ? key.id_ : null) !is null;
     }
 
     public bool hasReadablePropertyForKey (NSString key)
     {
-        return OS.objc_msgSend(this.id, OS.sel_hasReadablePropertyForKey_1, key !is null ? key.id : null) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_hasReadablePropertyForKey_1, key !is null ? key.id_ : null) !is null;
     }
 
     public bool hasWritablePropertyForKey (NSString key)
     {
-        return OS.objc_msgSend(this.id, OS.sel_hasWritablePropertyForKey_1, key !is null ? key.id : null) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_hasWritablePropertyForKey_1, key !is null ? key.id_ : null) !is null;
     }
 
     public NSString implementationClassName ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_implementationClassName);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_implementationClassName);
         return result !is null ? new NSString(result) : null;
     }
 
     public id initWithSuiteName (NSString suiteName, NSString className, NSDictionary classDeclaration)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithSuiteName_1className_1dictionary_1, suiteName !is null ? suiteName.id : null,
-                className !is null ? className.id : null, classDeclaration !is null ? classDeclaration.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithSuiteName_1className_1dictionary_1, suiteName !is null ? suiteName.id_ : null,
+                className !is null ? className.id_ : null, classDeclaration !is null ? classDeclaration.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
     public bool isLocationRequiredToCreateForKey (NSString toManyRelationshipKey)
     {
-        return OS.objc_msgSend(this.id, OS.sel_isLocationRequiredToCreateForKey_1, toManyRelationshipKey !is null ? toManyRelationshipKey.id : null) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_isLocationRequiredToCreateForKey_1, toManyRelationshipKey !is null ? toManyRelationshipKey.id_ : null) !is null;
     }
 
     public bool isReadOnlyKey (NSString key)
     {
-        return OS.objc_msgSend(this.id, OS.sel_isReadOnlyKey_1, key !is null ? key.id : null) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_isReadOnlyKey_1, key !is null ? key.id_ : null) !is null;
     }
 
     public NSString keyWithAppleEventCode (FourCharCode appleEventCode)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_keyWithAppleEventCode_1, appleEventCode);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_keyWithAppleEventCode_1, appleEventCode);
         return result !is null ? new NSString(result) : null;
     }
 
     public bool matchesAppleEventCode (FourCharCode appleEventCode)
     {
-        return OS.objc_msgSend(this.id, OS.sel_matchesAppleEventCode_1, appleEventCode) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_matchesAppleEventCode_1, appleEventCode) !is null;
     }
 
-    public int selectorForCommand (NSScriptCommandDescription commandDescription)
+    public objc.SEL selectorForCommand (NSScriptCommandDescription commandDescription)
     {
-        return OS.objc_msgSend(this.id, OS.sel_selectorForCommand_1, commandDescription !is null ? commandDescription.id : null);
+        return cast(objc.SEL) OS.objc_msgSend(this.id_, OS.sel_selectorForCommand_1, commandDescription !is null ? commandDescription.id_ : null);
     }
 
     public NSString suiteName ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_suiteName);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_suiteName);
         return result !is null ? new NSString(result) : null;
     }
 
     public NSScriptClassDescription superclassDescription ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_superclassDescription);
-        return result is this.id ? this : (result !is null ? new NSScriptClassDescription(result) : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_superclassDescription);
+        return result is this.id_ ? this : (result !is null ? new NSScriptClassDescription(result) : null);
     }
 
     public bool supportsCommand (NSScriptCommandDescription commandDescription)
     {
-        return OS.objc_msgSend(this.id, OS.sel_supportsCommand_1, commandDescription !is null ? commandDescription.id : null) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_supportsCommand_1, commandDescription !is null ? commandDescription.id_ : null) !is null;
     }
 
     public NSString typeForKey (NSString key)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_typeForKey_1, key !is null ? key.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_typeForKey_1, key !is null ? key.id_ : null);
         return result !is null ? new NSString(result) : null;
     }