--- a/dwt/internal/cocoa/NSSocketPortNameServer.d	Sat Aug 09 17:00:02 2008 +0200
+++ b/dwt/internal/cocoa/NSSocketPortNameServer.d	Tue Aug 19 17:35:17 2008 +0200
@@ -13,6 +13,7 @@
  *******************************************************************************/
 module dwt.internal.cocoa.NSSocketPortNameServer;
 
+import dwt.internal.cocoa.id;
 import dwt.internal.cocoa.NSPort;
 import dwt.internal.cocoa.NSPortNameServer;
 import dwt.internal.cocoa.NSString;
@@ -34,47 +35,47 @@
 
     public ushort defaultNameServerPortNumber ()
     {
-        return cast(ushort) OS.objc_msgSend(this.id, OS.sel_defaultNameServerPortNumber);
+        return cast(ushort) OS.objc_msgSend(this.id_, OS.sel_defaultNameServerPortNumber);
     }
 
     public NSPort portForName_ (NSString name)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_portForName_1, name !is null ? name.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_portForName_1, name !is null ? name.id_ : null);
         return result !is null ? new NSPort(result) : null;
     }
 
     public NSPort portForName_host_ (NSString name, NSString host)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_portForName_1host_1, name !is null ? name.id : null, host !is null ? host.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_portForName_1host_1, name !is null ? name.id_ : null, host !is null ? host.id_ : null);
         return result !is null ? new NSPort(result) : null;
     }
 
     public NSPort portForName_host_nameServerPortNumber_ (NSString name, NSString host, ushort portNumber)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_portForName_1host_1nameServerPortNumber_1, name !is null ? name.id : null,
-                host !is null ? host.id : null, portNumber);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_portForName_1host_1nameServerPortNumber_1, name !is null ? name.id_ : null,
+                host !is null ? host.id_ : null, portNumber);
         return result !is null ? new NSPort(result) : null;
     }
 
     public bool registerPort_name_ (NSPort port, NSString name)
     {
-        return OS.objc_msgSend(this.id, OS.sel_registerPort_1name_1, port !is null ? port.id : null, name !is null ? name.id : null) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_registerPort_1name_1, port !is null ? port.id_ : null, name !is null ? name.id_ : null) !is null;
     }
 
     public bool registerPort_name_nameServerPortNumber_ (NSPort port, NSString name, ushort portNumber)
     {
-        return OS.objc_msgSend(this.id, OS.sel_registerPort_1name_1nameServerPortNumber_1, port !is null ? port.id : null,
-                name !is null ? name.id : null, portNumber) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_registerPort_1name_1nameServerPortNumber_1, port !is null ? port.id_ : null,
+                name !is null ? name.id_ : null, portNumber) !is null;
     }
 
     public bool removePortForName (NSString name)
     {
-        return OS.objc_msgSend(this.id, OS.sel_removePortForName_1, name !is null ? name.id : null) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_removePortForName_1, name !is null ? name.id_ : null) !is null;
     }
 
     public void setDefaultNameServerPortNumber (ushort portNumber)
     {
-        OS.objc_msgSend(this.id, OS.sel_setDefaultNameServerPortNumber_1, portNumber);
+        OS.objc_msgSend(this.id_, OS.sel_setDefaultNameServerPortNumber_1, portNumber);
     }
 
     public static id sharedInstance ()