--- a/dwt/internal/cocoa/NSWhoseSpecifier.d	Sat Aug 09 17:00:02 2008 +0200
+++ b/dwt/internal/cocoa/NSWhoseSpecifier.d	Tue Aug 19 17:35:17 2008 +0200
@@ -56,61 +56,61 @@
 
     public NSWhoseSubelementIdentifier endSubelementIdentifier ()
     {
-        return cast(NSWhoseSubelementIdentifier) OS.objc_msgSend(this.id, OS.sel_endSubelementIdentifier);
+        return cast(NSWhoseSubelementIdentifier) OS.objc_msgSend(this.id_, OS.sel_endSubelementIdentifier);
     }
 
     public NSInteger endSubelementIndex ()
     {
-        return cast(NSInteger) OS.objc_msgSend(this.id, OS.sel_endSubelementIndex);
+        return cast(NSInteger) OS.objc_msgSend(this.id_, OS.sel_endSubelementIndex);
     }
 
     public id initWithContainerClassDescription (NSScriptClassDescription classDesc, NSScriptObjectSpecifier container, NSString property,
             NSScriptWhoseTest test)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithContainerClassDescription_1containerSpecifier_1key_1test_1,
-                classDesc !is null ? classDesc.id : null, container !is null ? container.id : null, property !is null ? property.id : null,
-                test !is null ? test.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithContainerClassDescription_1containerSpecifier_1key_1test_1,
+                classDesc !is null ? classDesc.id_ : null, container !is null ? container.id_ : null, property !is null ? property.id_ : null,
+                test !is null ? test.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
     public void setEndSubelementIdentifier (NSWhoseSubelementIdentifier subelement)
     {
-        OS.objc_msgSend(this.id, OS.sel_setEndSubelementIdentifier_1, subelement);
+        OS.objc_msgSend(this.id_, OS.sel_setEndSubelementIdentifier_1, subelement);
     }
 
     public void setEndSubelementIndex (NSInteger index)
     {
-        OS.objc_msgSend(this.id, OS.sel_setEndSubelementIndex_1, index);
+        OS.objc_msgSend(this.id_, OS.sel_setEndSubelementIndex_1, index);
     }
 
     public void setStartSubelementIdentifier (NSWhoseSubelementIdentifier subelement)
     {
-        OS.objc_msgSend(this.id, OS.sel_setStartSubelementIdentifier_1, subelement);
+        OS.objc_msgSend(this.id_, OS.sel_setStartSubelementIdentifier_1, subelement);
     }
 
     public void setStartSubelementIndex (NSInteger index)
     {
-        OS.objc_msgSend(this.id, OS.sel_setStartSubelementIndex_1, index);
+        OS.objc_msgSend(this.id_, OS.sel_setStartSubelementIndex_1, index);
     }
 
     public void setTest (NSScriptWhoseTest test)
     {
-        OS.objc_msgSend(this.id, OS.sel_setTest_1, test !is null ? test.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setTest_1, test !is null ? test.id_ : null);
     }
 
     public NSWhoseSubelementIdentifier startSubelementIdentifier ()
     {
-        return cast(NSWhoseSubelementIdentifier) OS.objc_msgSend(this.id, OS.sel_startSubelementIdentifier);
+        return cast(NSWhoseSubelementIdentifier) OS.objc_msgSend(this.id_, OS.sel_startSubelementIdentifier);
     }
 
     public NSInteger startSubelementIndex ()
     {
-        return cast(NSInteger) OS.objc_msgSend(this.id, OS.sel_startSubelementIndex);
+        return cast(NSInteger) OS.objc_msgSend(this.id_, OS.sel_startSubelementIndex);
     }
 
     public NSScriptWhoseTest test ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_test);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_test);
         return result !is null ? new NSScriptWhoseTest(result) : null;
     }