X-Git-Url: http://nitlanguage.org

diff --git a/lib/cocoa/foundation.nit b/lib/cocoa/foundation.nit
index 2996315..3ea7b5e 100644
--- a/lib/cocoa/foundation.nit
+++ b/lib/cocoa/foundation.nit
@@ -35,30 +35,30 @@ extern class NSString in "ObjC" `{ NSString * `}
 	new nil in "ObjC" `{ return nil; `}
 
 	# Get an UTF8 encoded `char*` copy of `self`
-	fun utf8_string: NativeString in "ObjC" `{ return (char *)[self UTF8String]; `}
+	fun utf8_string: CString in "ObjC" `{ return (char *)[self UTF8String]; `}
 
 	redef fun to_s do return utf8_string.to_s
 end
 
-redef class NativeString
+redef class CString
 	# Get a `NSString` from `self` with the specified `length`
 	fun to_nsstring(length: Int): NSString in "ObjC" `{
 		return [[NSString alloc] initWithBytes:self
 			length:length
-			encoding:NSASCIIStringEncoding];
+			encoding:NSUTF8StringEncoding];
 	`}
 end
 
 redef class Text
 	# Get a `NSString` from `self`
-	fun to_nsstring: NSString do return to_cstring.to_nsstring(length)
+	fun to_nsstring: NSString do return to_cstring.to_nsstring(byte_length)
 end
 
 # Wrapper of byte buffers
 extern class NSData in "ObjC" `{ NSData * `}
 
 	# Pointer to contained data
-	fun bytes: NativeString in "ObjC" `{ return (char*)self.bytes; `}
+	fun bytes: CString in "ObjC" `{ return (char*)self.bytes; `}
 
 	# Number of bytes containted in `self`
 	fun length: Int in "ObjC" `{ return self.length; `}