--- a/dwt/internal/cocoa/NSScriptObjectSpecifier.d	Sat Aug 09 17:00:02 2008 +0200
+++ b/dwt/internal/cocoa/NSScriptObjectSpecifier.d	Tue Aug 19 17:35:17 2008 +0200
@@ -37,132 +37,132 @@
 
     public NSScriptObjectSpecifier childSpecifier ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_childSpecifier);
-        return result is this.id ? this : (result !is null ? new NSScriptObjectSpecifier(result) : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_childSpecifier);
+        return result is this.id_ ? this : (result !is null ? new NSScriptObjectSpecifier(result) : null);
     }
 
     public NSScriptClassDescription containerClassDescription ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_containerClassDescription);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_containerClassDescription);
         return result !is null ? new NSScriptClassDescription(result) : null;
     }
 
     public bool containerIsObjectBeingTested ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_containerIsObjectBeingTested) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_containerIsObjectBeingTested) !is null;
     }
 
     public bool containerIsRangeContainerObject ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_containerIsRangeContainerObject) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_containerIsRangeContainerObject) !is null;
     }
 
     public NSScriptObjectSpecifier containerSpecifier ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_containerSpecifier);
-        return result is this.id ? this : (result !is null ? new NSScriptObjectSpecifier(result) : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_containerSpecifier);
+        return result is this.id_ ? this : (result !is null ? new NSScriptObjectSpecifier(result) : null);
     }
 
     public NSAppleEventDescriptor descriptor ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_descriptor);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_descriptor);
         return result !is null ? new NSAppleEventDescriptor(result) : null;
     }
 
     public NSInteger evaluationErrorNumber ()
     {
-        return cast(NSInteger) OS.objc_msgSend(this.id, OS.sel_evaluationErrorNumber);
+        return cast(NSInteger) OS.objc_msgSend(this.id_, OS.sel_evaluationErrorNumber);
     }
 
     public NSScriptObjectSpecifier evaluationErrorSpecifier ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_evaluationErrorSpecifier);
-        return result is this.id ? this : (result !is null ? new NSScriptObjectSpecifier(result) : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_evaluationErrorSpecifier);
+        return result is this.id_ ? this : (result !is null ? new NSScriptObjectSpecifier(result) : null);
     }
 
     public NSInteger* indicesOfObjectsByEvaluatingWithContainer (id container, NSInteger* count)
     {
-        return cast(NSInteger*) OS.objc_msgSend(this.id, OS.sel_indicesOfObjectsByEvaluatingWithContainer_1count_1, container !is null ? container.id : null, count);
+        return cast(NSInteger*) OS.objc_msgSend(this.id_, OS.sel_indicesOfObjectsByEvaluatingWithContainer_1count_1, container !is null ? container.id_ : null, count);
     }
 
     public id initWithContainerClassDescription (NSScriptClassDescription classDesc, NSScriptObjectSpecifier container, NSString property)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithContainerClassDescription_1containerSpecifier_1key_1,
-                classDesc !is null ? classDesc.id : null, container !is null ? container.id : null, property !is null ? property.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithContainerClassDescription_1containerSpecifier_1key_1,
+                classDesc !is null ? classDesc.id_ : null, container !is null ? container.id_ : null, property !is null ? property.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
     public id initWithContainerSpecifier (NSScriptObjectSpecifier container, NSString property)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithContainerSpecifier_1key_1, container !is null ? container.id : null,
-                property !is null ? property.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithContainerSpecifier_1key_1, container !is null ? container.id_ : null,
+                property !is null ? property.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
     public NSString key ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_key);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_key);
         return result !is null ? new NSString(result) : null;
     }
 
     public NSScriptClassDescription keyClassDescription ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_keyClassDescription);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_keyClassDescription);
         return result !is null ? new NSScriptClassDescription(result) : null;
     }
 
     public static NSScriptObjectSpecifier objectSpecifierWithDescriptor (NSAppleEventDescriptor descriptor)
     {
         objc.id result = OS.objc_msgSend(OS.class_NSScriptObjectSpecifier, OS.sel_objectSpecifierWithDescriptor_1,
-                descriptor !is null ? descriptor.id : null);
+                descriptor !is null ? descriptor.id_ : null);
         return result !is null ? new NSScriptObjectSpecifier(result) : null;
     }
 
     public id objectsByEvaluatingSpecifier ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_objectsByEvaluatingSpecifier);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_objectsByEvaluatingSpecifier);
         return result !is null ? new id(result) : null;
     }
 
     public id objectsByEvaluatingWithContainers (id containers)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_objectsByEvaluatingWithContainers_1, containers !is null ? containers.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_objectsByEvaluatingWithContainers_1, containers !is null ? containers.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
     public void setChildSpecifier (NSScriptObjectSpecifier child)
     {
-        OS.objc_msgSend(this.id, OS.sel_setChildSpecifier_1, child !is null ? child.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setChildSpecifier_1, child !is null ? child.id_ : null);
     }
 
     public void setContainerClassDescription (NSScriptClassDescription classDesc)
     {
-        OS.objc_msgSend(this.id, OS.sel_setContainerClassDescription_1, classDesc !is null ? classDesc.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setContainerClassDescription_1, classDesc !is null ? classDesc.id_ : null);
     }
 
     public void setContainerIsObjectBeingTested (bool flag)
     {
-        OS.objc_msgSend(this.id, OS.sel_setContainerIsObjectBeingTested_1, flag);
+        OS.objc_msgSend(this.id_, OS.sel_setContainerIsObjectBeingTested_1, flag);
     }
 
     public void setContainerIsRangeContainerObject (bool flag)
     {
-        OS.objc_msgSend(this.id, OS.sel_setContainerIsRangeContainerObject_1, flag);
+        OS.objc_msgSend(this.id_, OS.sel_setContainerIsRangeContainerObject_1, flag);
     }
 
     public void setContainerSpecifier (NSScriptObjectSpecifier subRef)
     {
-        OS.objc_msgSend(this.id, OS.sel_setContainerSpecifier_1, subRef !is null ? subRef.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setContainerSpecifier_1, subRef !is null ? subRef.id_ : null);
     }
 
     public void setEvaluationErrorNumber (NSInteger error)
     {
-        OS.objc_msgSend(this.id, OS.sel_setEvaluationErrorNumber_1, error);
+        OS.objc_msgSend(this.id_, OS.sel_setEvaluationErrorNumber_1, error);
     }
 
     public void setKey (NSString key)
     {
-        OS.objc_msgSend(this.id, OS.sel_setKey_1, key !is null ? key.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setKey_1, key !is null ? key.id_ : null);
     }
 
 }