--- a/dwt/internal/cocoa/NSURLProtocol.d	Sat Aug 09 17:00:02 2008 +0200
+++ b/dwt/internal/cocoa/NSURLProtocol.d	Tue Aug 19 17:35:17 2008 +0200
@@ -37,38 +37,38 @@
 
     public NSCachedURLResponse cachedResponse ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_cachedResponse);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_cachedResponse);
         return result !is null ? new NSCachedURLResponse(result) : null;
     }
 
     public static bool canInitWithRequest (NSURLRequest request)
     {
-        return OS.objc_msgSend(OS.class_NSURLProtocol, OS.sel_canInitWithRequest_1, request !is null ? request.id : null) !is null;
+        return OS.objc_msgSend(OS.class_NSURLProtocol, OS.sel_canInitWithRequest_1, request !is null ? request.id_ : null) !is null;
     }
 
     public static NSURLRequest canonicalRequestForRequest (NSURLRequest request)
     {
-        objc.id result = OS.objc_msgSend(OS.class_NSURLProtocol, OS.sel_canonicalRequestForRequest_1, request !is null ? request.id : null);
+        objc.id result = OS.objc_msgSend(OS.class_NSURLProtocol, OS.sel_canonicalRequestForRequest_1, request !is null ? request.id_ : null);
         return result !is null ? new NSURLRequest(result) : null;
     }
 
     public id client ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_client);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_client);
         return result !is null ? new id(result) : null;
     }
 
     public id initWithRequest (NSURLRequest request, NSCachedURLResponse cachedResponse, id client)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithRequest_1cachedResponse_1client_1, request !is null ? request.id : null,
-                cachedResponse !is null ? cachedResponse.id : null, client !is null ? client.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithRequest_1cachedResponse_1client_1, request !is null ? request.id_ : null,
+                cachedResponse !is null ? cachedResponse.id_ : null, client !is null ? client.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
     public static id propertyForKey (NSString key, NSURLRequest request)
     {
-        objc.id result = OS.objc_msgSend(OS.class_NSURLProtocol, OS.sel_propertyForKey_1inRequest_1, key !is null ? key.id : null,
-                request !is null ? request.id : null);
+        objc.id result = OS.objc_msgSend(OS.class_NSURLProtocol, OS.sel_propertyForKey_1inRequest_1, key !is null ? key.id_ : null,
+                request !is null ? request.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
@@ -79,36 +79,36 @@
 
     public static void removePropertyForKey (NSString key, NSMutableURLRequest request)
     {
-        OS.objc_msgSend(OS.class_NSURLProtocol, OS.sel_removePropertyForKey_1inRequest_1, key !is null ? key.id : null,
-                request !is null ? request.id : null);
+        OS.objc_msgSend(OS.class_NSURLProtocol, OS.sel_removePropertyForKey_1inRequest_1, key !is null ? key.id_ : null,
+                request !is null ? request.id_ : null);
     }
 
     public NSURLRequest request ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_request);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_request);
         return result !is null ? new NSURLRequest(result) : null;
     }
 
     public static bool requestIsCacheEquivalent (NSURLRequest a, NSURLRequest b)
     {
-        return OS.objc_msgSend(OS.class_NSURLProtocol, OS.sel_requestIsCacheEquivalent_1toRequest_1, a !is null ? a.id : null,
-                b !is null ? b.id : null) !is null;
+        return OS.objc_msgSend(OS.class_NSURLProtocol, OS.sel_requestIsCacheEquivalent_1toRequest_1, a !is null ? a.id_ : null,
+                b !is null ? b.id_ : null) !is null;
     }
 
     public static void setProperty (id value, NSString key, NSMutableURLRequest request)
     {
-        OS.objc_msgSend(OS.class_NSURLProtocol, OS.sel_setProperty_1forKey_1inRequest_1, value !is null ? value.id : null,
-                key !is null ? key.id : null, request !is null ? request.id : null);
+        OS.objc_msgSend(OS.class_NSURLProtocol, OS.sel_setProperty_1forKey_1inRequest_1, value !is null ? value.id_ : null,
+                key !is null ? key.id_ : null, request !is null ? request.id_ : null);
     }
 
     public void startLoading ()
     {
-        OS.objc_msgSend(this.id, OS.sel_startLoading);
+        OS.objc_msgSend(this.id_, OS.sel_startLoading);
     }
 
     public void stopLoading ()
     {
-        OS.objc_msgSend(this.id, OS.sel_stopLoading);
+        OS.objc_msgSend(this.id_, OS.sel_stopLoading);
     }
 
     public static void unregisterClass (objc.Class protocolClass)