--- a/dwt/internal/cocoa/NSStream.d	Sat Aug 09 17:00:02 2008 +0200
+++ b/dwt/internal/cocoa/NSStream.d	Tue Aug 19 17:35:17 2008 +0200
@@ -82,62 +82,62 @@
 
     public void close ()
     {
-        OS.objc_msgSend(this.id, OS.sel_close);
+        OS.objc_msgSend(this.id_, OS.sel_close);
     }
 
     public id delegatee ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_delegate);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_delegate);
         return result !is null ? new id(result) : null;
     }
 
     public static void getStreamsToHost (NSHost host, NSInteger port, /*NSInputStream** */objc.id** inputStream,
             /*NSOutputStream** */objc.id** outputStream)
     {
-        OS.objc_msgSend(OS.class_NSStream, OS.sel_getStreamsToHost_1port_1inputStream_1outputStream_1, host !is null ? host.id : null, port,
+        OS.objc_msgSend(OS.class_NSStream, OS.sel_getStreamsToHost_1port_1inputStream_1outputStream_1, host !is null ? host.id_ : null, port,
                 inputStream, outputStream);
     }
 
     public void open ()
     {
-        OS.objc_msgSend(this.id, OS.sel_open);
+        OS.objc_msgSend(this.id_, OS.sel_open);
     }
 
     public id propertyForKey (NSString key)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_propertyForKey_1, key !is null ? key.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_propertyForKey_1, key !is null ? key.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
     public void removeFromRunLoop (NSRunLoop aRunLoop, NSString mode)
     {
-        OS.objc_msgSend(this.id, OS.sel_removeFromRunLoop_1forMode_1, aRunLoop !is null ? aRunLoop.id : null, mode !is null ? mode.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_removeFromRunLoop_1forMode_1, aRunLoop !is null ? aRunLoop.id_ : null, mode !is null ? mode.id_ : null);
     }
 
     public void scheduleInRunLoop (NSRunLoop aRunLoop, NSString mode)
     {
-        OS.objc_msgSend(this.id, OS.sel_scheduleInRunLoop_1forMode_1, aRunLoop !is null ? aRunLoop.id : null, mode !is null ? mode.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_scheduleInRunLoop_1forMode_1, aRunLoop !is null ? aRunLoop.id_ : null, mode !is null ? mode.id_ : null);
     }
 
     public void setDelegate (id delegatee)
     {
-        OS.objc_msgSend(this.id, OS.sel_setDelegate_1, delegatee !is null ? delegatee.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setDelegate_1, delegatee !is null ? delegatee.id_ : null);
     }
 
     public bool setProperty (id property, NSString key)
     {
-        return OS.objc_msgSend(this.id, OS.sel_setProperty_1forKey_1, property !is null ? property.id : null, key !is null ? key.id : null) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_setProperty_1forKey_1, property !is null ? property.id_ : null, key !is null ? key.id_ : null) !is null;
     }
 
     public NSError streamError ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_streamError);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_streamError);
         return result !is null ? new NSError(result) : null;
     }
 
     public NSStreamStatus streamStatus ()
     {
-        return cast(NSStreamStatus) OS.objc_msgSend(this.id, OS.sel_streamStatus);
+        return cast(NSStreamStatus) OS.objc_msgSend(this.id_, OS.sel_streamStatus);
     }
 
 }