--- a/dwt/internal/cocoa/NSScriptCommandDescription.d	Sat Aug 09 17:00:02 2008 +0200
+++ b/dwt/internal/cocoa/NSScriptCommandDescription.d	Tue Aug 19 17:35:17 2008 +0200
@@ -39,81 +39,81 @@
 
     public FourCharCode appleEventClassCode ()
     {
-        return cast(FourCharCode) OS.objc_msgSend(this.id, OS.sel_appleEventClassCode);
+        return cast(FourCharCode) OS.objc_msgSend(this.id_, OS.sel_appleEventClassCode);
     }
 
     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 appleEventCodeForArgumentWithName (NSString argumentName)
     {
-        return cast(FourCharCode) OS.objc_msgSend(this.id, OS.sel_appleEventCodeForArgumentWithName_1, argumentName !is null ? argumentName.id : null);
+        return cast(FourCharCode) OS.objc_msgSend(this.id_, OS.sel_appleEventCodeForArgumentWithName_1, argumentName !is null ? argumentName.id_ : null);
     }
 
     public FourCharCode appleEventCodeForReturnType ()
     {
-        return cast(FourCharCode) OS.objc_msgSend(this.id, OS.sel_appleEventCodeForReturnType);
+        return cast(FourCharCode) OS.objc_msgSend(this.id_, OS.sel_appleEventCodeForReturnType);
     }
 
     public NSArray argumentNames ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_argumentNames);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_argumentNames);
         return result !is null ? new NSArray(result) : null;
     }
 
     public NSString commandClassName ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_commandClassName);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_commandClassName);
         return result !is null ? new NSString(result) : null;
     }
 
     public NSString commandName ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_commandName);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_commandName);
         return result !is null ? new NSString(result) : null;
     }
 
     public NSScriptCommand createCommandInstance ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_createCommandInstance);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_createCommandInstance);
         return result !is null ? new NSScriptCommand(result) : null;
     }
 
     public NSScriptCommand createCommandInstanceWithZone (NSZone* zone)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_createCommandInstanceWithZone_1, zone);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_createCommandInstanceWithZone_1, zone);
         return result !is null ? new NSScriptCommand(result) : null;
     }
 
     public id initWithSuiteName (NSString suiteName, NSString commandName, NSDictionary commandDeclaration)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithSuiteName_1commandName_1dictionary_1, suiteName !is null ? suiteName.id : null,
-                commandName !is null ? commandName.id : null, commandDeclaration !is null ? commandDeclaration.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithSuiteName_1commandName_1dictionary_1, suiteName !is null ? suiteName.id_ : null,
+                commandName !is null ? commandName.id_ : null, commandDeclaration !is null ? commandDeclaration.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
     public bool isOptionalArgumentWithName (NSString argumentName)
     {
-        return OS.objc_msgSend(this.id, OS.sel_isOptionalArgumentWithName_1, argumentName !is null ? argumentName.id : null) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_isOptionalArgumentWithName_1, argumentName !is null ? argumentName.id_ : null) !is null;
     }
 
     public NSString returnType ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_returnType);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_returnType);
         return result !is null ? new NSString(result) : 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 NSString typeForArgumentWithName (NSString argumentName)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_typeForArgumentWithName_1, argumentName !is null ? argumentName.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_typeForArgumentWithName_1, argumentName !is null ? argumentName.id_ : null);
         return result !is null ? new NSString(result) : null;
     }