--- a/dwt/internal/cocoa/NSXMLDTD.d	Sat Aug 09 17:00:02 2008 +0200
+++ b/dwt/internal/cocoa/NSXMLDTD.d	Tue Aug 19 17:35:17 2008 +0200
@@ -39,96 +39,96 @@
 
     public void addChild (NSXMLNode child)
     {
-        OS.objc_msgSend(this.id, OS.sel_addChild_1, child !is null ? child.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_addChild_1, child !is null ? child.id_ : null);
     }
 
     public NSXMLDTDNode attributeDeclarationForName (NSString name, NSString elementName)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_attributeDeclarationForName_1elementName_1, name !is null ? name.id : null,
-                elementName !is null ? elementName.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_attributeDeclarationForName_1elementName_1, name !is null ? name.id_ : null,
+                elementName !is null ? elementName.id_ : null);
         return result !is null ? new NSXMLDTDNode(result) : null;
     }
 
     public NSXMLDTDNode elementDeclarationForName (NSString name)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_elementDeclarationForName_1, name !is null ? name.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_elementDeclarationForName_1, name !is null ? name.id_ : null);
         return result !is null ? new NSXMLDTDNode(result) : null;
     }
 
     public NSXMLDTDNode entityDeclarationForName (NSString name)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_entityDeclarationForName_1, name !is null ? name.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_entityDeclarationForName_1, name !is null ? name.id_ : null);
         return result !is null ? new NSXMLDTDNode(result) : null;
     }
 
     public id initWithContentsOfURL (NSURL url, NSUInteger mask, /*NSError** */objc.id** error)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithContentsOfURL_1options_1error_1, url !is null ? url.id : null, mask, error);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithContentsOfURL_1options_1error_1, url !is null ? url.id_ : null, mask, error);
         return result !is null ? new id(result) : null;
     }
 
     public id initWithData (NSData data, NSUInteger mask, /*NSError** */objc.id** error)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithData_1options_1error_1, data !is null ? data.id : null, mask, error);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithData_1options_1error_1, data !is null ? data.id_ : null, mask, error);
         return result !is null ? new id(result) : null;
     }
 
     public void insertChild (NSXMLNode child, NSUInteger index)
     {
-        OS.objc_msgSend(this.id, OS.sel_insertChild_1atIndex_1, child !is null ? child.id : null, index);
+        OS.objc_msgSend(this.id_, OS.sel_insertChild_1atIndex_1, child !is null ? child.id_ : null, index);
     }
 
     public void insertChildren (NSArray children, NSUInteger index)
     {
-        OS.objc_msgSend(this.id, OS.sel_insertChildren_1atIndex_1, children !is null ? children.id : null, index);
+        OS.objc_msgSend(this.id_, OS.sel_insertChildren_1atIndex_1, children !is null ? children.id_ : null, index);
     }
 
     public NSXMLDTDNode notationDeclarationForName (NSString name)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_notationDeclarationForName_1, name !is null ? name.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_notationDeclarationForName_1, name !is null ? name.id_ : null);
         return result !is null ? new NSXMLDTDNode(result) : null;
     }
 
     public static NSXMLDTDNode predefinedEntityDeclarationForName (NSString name)
     {
-        objc.id result = OS.objc_msgSend(OS.class_NSXMLDTD, OS.sel_predefinedEntityDeclarationForName_1, name !is null ? name.id : null);
+        objc.id result = OS.objc_msgSend(OS.class_NSXMLDTD, OS.sel_predefinedEntityDeclarationForName_1, name !is null ? name.id_ : null);
         return result !is null ? new NSXMLDTDNode(result) : null;
     }
 
     public NSString publicID ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_publicID);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_publicID);
         return result !is null ? new NSString(result) : null;
     }
 
     public void removeChildAtIndex (NSUInteger index)
     {
-        OS.objc_msgSend(this.id, OS.sel_removeChildAtIndex_1, index);
+        OS.objc_msgSend(this.id_, OS.sel_removeChildAtIndex_1, index);
     }
 
     public void replaceChildAtIndex (NSUInteger index, NSXMLNode node)
     {
-        OS.objc_msgSend(this.id, OS.sel_replaceChildAtIndex_1withNode_1, index, node !is null ? node.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_replaceChildAtIndex_1withNode_1, index, node !is null ? node.id_ : null);
     }
 
     public void setChildren (NSArray children)
     {
-        OS.objc_msgSend(this.id, OS.sel_setChildren_1, children !is null ? children.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setChildren_1, children !is null ? children.id_ : null);
     }
 
     public void setPublicID (NSString publicID)
     {
-        OS.objc_msgSend(this.id, OS.sel_setPublicID_1, publicID !is null ? publicID.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setPublicID_1, publicID !is null ? publicID.id_ : null);
     }
 
     public void setSystemID (NSString systemID)
     {
-        OS.objc_msgSend(this.id, OS.sel_setSystemID_1, systemID !is null ? systemID.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setSystemID_1, systemID !is null ? systemID.id_ : null);
     }
 
     public NSString systemID ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_systemID);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_systemID);
         return result !is null ? new NSString(result) : null;
     }