--- a/dwt/internal/cocoa/NSNotification.d	Sat Aug 09 17:00:02 2008 +0200
+++ b/dwt/internal/cocoa/NSNotification.d	Tue Aug 19 17:35:17 2008 +0200
@@ -18,7 +18,7 @@
 import dwt.internal.cocoa.NSObject;
 import dwt.internal.cocoa.NSString;
 import dwt.internal.cocoa.OS;
-import dwt.internal.objc.runtime;
+import objc = dwt.internal.objc.runtime;
 
 public class NSNotification : NSObject
 {
@@ -35,33 +35,33 @@
 
     public NSString name ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_name);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_name);
         return result !is null ? new NSString(result) : null;
     }
 
     public static id static_notificationWithName_object_ (NSString aName, id anObject)
     {
-        objc.id result = OS.objc_msgSend(OS.class_NSNotification, OS.sel_notificationWithName_1object_1, aName !is null ? aName.id : null,
-                anObject !is null ? anObject.id : null);
+        objc.id result = OS.objc_msgSend(OS.class_NSNotification, OS.sel_notificationWithName_1object_1, aName !is null ? aName.id_ : null,
+                anObject !is null ? anObject.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
     public static id static_notificationWithName_object_userInfo_ (NSString aName, id anObject, NSDictionary aUserInfo)
     {
-        objc.id result = OS.objc_msgSend(OS.class_NSNotification, OS.sel_notificationWithName_1object_1userInfo_1, aName !is null ? aName.id : null,
-                anObject !is null ? anObject.id : null, aUserInfo !is null ? aUserInfo.id : null);
+        objc.id result = OS.objc_msgSend(OS.class_NSNotification, OS.sel_notificationWithName_1object_1userInfo_1, aName !is null ? aName.id_ : null,
+                anObject !is null ? anObject.id_ : null, aUserInfo !is null ? aUserInfo.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
     public id object ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_object);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_object);
         return result !is null ? new id(result) : null;
     }
 
     public NSDictionary userInfo ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_userInfo);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_userInfo);
         return result !is null ? new NSDictionary(result) : null;
     }