--- a/dwt/internal/cocoa/NSTimeZone.d	Sat Aug 09 17:00:02 2008 +0200
+++ b/dwt/internal/cocoa/NSTimeZone.d	Tue Aug 19 17:35:17 2008 +0200
@@ -53,7 +53,7 @@
 
     public NSString abbreviation ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_abbreviation);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_abbreviation);
         return result !is null ? new NSString(result) : null;
     }
 
@@ -65,24 +65,24 @@
 
     public NSString abbreviationForDate (NSDate aDate)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_abbreviationForDate_1, aDate !is null ? aDate.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_abbreviationForDate_1, aDate !is null ? aDate.id_ : null);
         return result !is null ? new NSString(result) : null;
     }
 
     public NSData data ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_data);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_data);
         return result !is null ? new NSData(result) : null;
     }
 
     public NSTimeInterval daylightSavingTimeOffset ()
     {
-        return cast(NSTimeInterval) OS.objc_msgSend_fpret(this.id, OS.sel_daylightSavingTimeOffset);
+        return cast(NSTimeInterval) OS.objc_msgSend_fpret(this.id_, OS.sel_daylightSavingTimeOffset);
     }
 
     public NSTimeInterval daylightSavingTimeOffsetForDate (NSDate aDate)
     {
-        return cast(NSTimeInterval) OS.objc_msgSend_fpret(this.id, OS.sel_daylightSavingTimeOffsetForDate_1, aDate !is null ? aDate.id : null);
+        return cast(NSTimeInterval) OS.objc_msgSend_fpret(this.id_, OS.sel_daylightSavingTimeOffsetForDate_1, aDate !is null ? aDate.id_ : null);
     }
 
     public static NSTimeZone defaultTimeZone ()
@@ -93,35 +93,35 @@
 
     public NSString description ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_description);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_description);
         return result !is null ? new NSString(result) : null;
     }
 
     public id initWithName_ (NSString tzName)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithName_1, tzName !is null ? tzName.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithName_1, tzName !is null ? tzName.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
     public id initWithName_data_ (NSString tzName, NSData aData)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithName_1data_1, tzName !is null ? tzName.id : null, aData !is null ? aData.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithName_1data_1, tzName !is null ? tzName.id_ : null, aData !is null ? aData.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
     public bool isDaylightSavingTime ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_isDaylightSavingTime) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_isDaylightSavingTime) !is null;
     }
 
     public bool isDaylightSavingTimeForDate (NSDate aDate)
     {
-        return OS.objc_msgSend(this.id, OS.sel_isDaylightSavingTimeForDate_1, aDate !is null ? aDate.id : null) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_isDaylightSavingTimeForDate_1, aDate !is null ? aDate.id_ : null) !is null;
     }
 
     public bool isEqualToTimeZone (NSTimeZone aTimeZone)
     {
-        return OS.objc_msgSend(this.id, OS.sel_isEqualToTimeZone_1, aTimeZone !is null ? aTimeZone.id : null) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_isEqualToTimeZone_1, aTimeZone !is null ? aTimeZone.id_ : null) !is null;
     }
 
     public static NSArray knownTimeZoneNames ()
@@ -138,25 +138,25 @@
 
     public NSString localizedName (NSTimeZoneNameStyle style, NSLocale locale)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_localizedName_1locale_1, style, locale !is null ? locale.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_localizedName_1locale_1, style, locale !is null ? locale.id_ : null);
         return result !is null ? new NSString(result) : null;
     }
 
     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 NSDate nextDaylightSavingTimeTransition ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_nextDaylightSavingTimeTransition);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_nextDaylightSavingTimeTransition);
         return result !is null ? new NSDate(result) : null;
     }
 
     public NSDate nextDaylightSavingTimeTransitionAfterDate (NSDate aDate)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_nextDaylightSavingTimeTransitionAfterDate_1, aDate !is null ? aDate.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_nextDaylightSavingTimeTransitionAfterDate_1, aDate !is null ? aDate.id_ : null);
         return result !is null ? new NSDate(result) : null;
     }
 
@@ -167,17 +167,17 @@
 
     public NSInteger secondsFromGMT ()
     {
-        return cast(NSInteger) OS.objc_msgSend(this.id, OS.sel_secondsFromGMT);
+        return cast(NSInteger) OS.objc_msgSend(this.id_, OS.sel_secondsFromGMT);
     }
 
     public NSInteger secondsFromGMTForDate (NSDate aDate)
     {
-        return cast(NSInteger) OS.objc_msgSend(this.id, OS.sel_secondsFromGMTForDate_1, aDate !is null ? aDate.id : null);
+        return cast(NSInteger) OS.objc_msgSend(this.id_, OS.sel_secondsFromGMTForDate_1, aDate !is null ? aDate.id_ : null);
     }
 
     public static void setDefaultTimeZone (NSTimeZone aTimeZone)
     {
-        OS.objc_msgSend(OS.class_NSTimeZone, OS.sel_setDefaultTimeZone_1, aTimeZone !is null ? aTimeZone.id : null);
+        OS.objc_msgSend(OS.class_NSTimeZone, OS.sel_setDefaultTimeZone_1, aTimeZone !is null ? aTimeZone.id_ : null);
     }
 
     public static NSTimeZone systemTimeZone ()
@@ -194,20 +194,20 @@
 
     public static id timeZoneWithAbbreviation (NSString abbreviation)
     {
-        objc.id result = OS.objc_msgSend(OS.class_NSTimeZone, OS.sel_timeZoneWithAbbreviation_1, abbreviation !is null ? abbreviation.id : null);
+        objc.id result = OS.objc_msgSend(OS.class_NSTimeZone, OS.sel_timeZoneWithAbbreviation_1, abbreviation !is null ? abbreviation.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
     public static id static_timeZoneWithName_ (NSString tzName)
     {
-        objc.id result = OS.objc_msgSend(OS.class_NSTimeZone, OS.sel_timeZoneWithName_1, tzName !is null ? tzName.id : null);
+        objc.id result = OS.objc_msgSend(OS.class_NSTimeZone, OS.sel_timeZoneWithName_1, tzName !is null ? tzName.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
     public static id static_timeZoneWithName_data_ (NSString tzName, NSData aData)
     {
-        objc.id result = OS.objc_msgSend(OS.class_NSTimeZone, OS.sel_timeZoneWithName_1data_1, tzName !is null ? tzName.id : null,
-                aData !is null ? aData.id : null);
+        objc.id result = OS.objc_msgSend(OS.class_NSTimeZone, OS.sel_timeZoneWithName_1data_1, tzName !is null ? tzName.id_ : null,
+                aData !is null ? aData.id_ : null);
         return result !is null ? new id(result) : null;
     }