--- a/dwt/internal/cocoa/NSMutableString.d	Sat Aug 09 17:00:02 2008 +0200
+++ b/dwt/internal/cocoa/NSMutableString.d	Tue Aug 19 17:35:17 2008 +0200
@@ -13,7 +13,9 @@
  *******************************************************************************/
 module dwt.internal.cocoa.NSMutableString;
 
+import dwt.internal.cocoa.id;
 import dwt.internal.cocoa.NSInteger;
+import dwt.internal.cocoa.NSRange;
 import dwt.internal.cocoa.NSString;
 import dwt.internal.cocoa.OS;
 import objc = dwt.internal.objc.runtime;
@@ -33,44 +35,44 @@
 
     public void appendFormat (NSString appendFormat)
     {
-        OS.objc_msgSend(this.id, OS.sel_appendFormat_1, appendFormat !is null ? appendFormat.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_appendFormat_1, appendFormat !is null ? appendFormat.id_ : null);
     }
 
     public void appendString (NSString aString)
     {
-        OS.objc_msgSend(this.id, OS.sel_appendString_1, aString !is null ? aString.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_appendString_1, aString !is null ? aString.id_ : null);
     }
 
     public void deleteCharactersInRange (NSRange range)
     {
-        OS.objc_msgSend(this.id, OS.sel_deleteCharactersInRange_1, range);
+        OS.objc_msgSend(this.id_, OS.sel_deleteCharactersInRange_1, range);
     }
 
     public NSMutableString initWithCapacity (NSUInteger capacity)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithCapacity_1, capacity);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithCapacity_1, capacity);
         return result !is null ? this : null;
     }
 
     public void insertString (NSString aString, NSUInteger loc)
     {
-        OS.objc_msgSend(this.id, OS.sel_insertString_1atIndex_1, aString !is null ? aString.id : null, loc);
+        OS.objc_msgSend(this.id_, OS.sel_insertString_1atIndex_1, aString !is null ? aString.id_ : null, loc);
     }
 
     public void replaceCharactersInRange (NSRange range, NSString aString)
     {
-        OS.objc_msgSend(this.id, OS.sel_replaceCharactersInRange_1withString_1, range, aString !is null ? aString.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_replaceCharactersInRange_1withString_1, range, aString !is null ? aString.id_ : null);
     }
 
-    public NSUInteger replaceOccurrencesOfString (NSString target, NSString replacement, int options, NSRange searchRange)
+    public NSUInteger replaceOccurrencesOfString (NSString target, NSString replacement, NSStringCompareOptions options, NSRange searchRange)
     {
-        return cast(NSUInteger) OS.objc_msgSend(this.id, OS.sel_replaceOccurrencesOfString_1withString_1options_1range_1, target !is null ? target.id : null,
-                replacement !is null ? replacement.id : null, options, searchRange);
+        return cast(NSUInteger) OS.objc_msgSend(this.id_, OS.sel_replaceOccurrencesOfString_1withString_1options_1range_1, target !is null ? target.id_ : null,
+                replacement !is null ? replacement.id_ : null, options, searchRange);
     }
 
     public void setString (NSString aString)
     {
-        OS.objc_msgSend(this.id, OS.sel_setString_1, aString !is null ? aString.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setString_1, aString !is null ? aString.id_ : null);
     }
 
     public static id stringWithCapacity (NSUInteger capacity)