@@ -47,18 +47,18 @@
 }
 
 - (BOOL)atEndOfStream
 {
 	@throw [OFNotImplementedException newWithClass: isa
-					   andSelector: _cmd];
+					      selector: _cmd];
 }
 
 - (size_t)readNBytes: (size_t)size
 	  intoBuffer: (char*)buf
 {
 	@throw [OFNotImplementedException newWithClass: isa
-					   andSelector: _cmd];
+					      selector: _cmd];
 }
 
 - (OFString*)readLine
 {
 	size_t i, len;
@@ -69,11 +69,11 @@
 	if (cache != NULL) {
 		for (i = 0; i < cache_len; i++) {
 			if (OF_UNLIKELY(cache[i] == '\n' ||
 			    cache[i] == '\0')) {
 				ret = [OFString stringWithCString: cache
-							andLength: i];
+							   length: i];
 
 				tmp = [self allocMemoryWithSize: cache_len -
 								 i - 1];
 				memcpy(tmp, cache + i + 1, cache_len - i - 1);
 
@@ -95,11 +95,11 @@
 
 			if (cache == NULL)
 				return nil;
 
 			ret = [OFString stringWithCString: cache
-						andLength: cache_len];
+						   length: cache_len];
 
 			[self freeMemory: cache];
 			cache = NULL;
 			cache_len = 0;
 
@@ -186,11 +186,11 @@
 
 - (size_t)writeNBytes: (size_t)size
 	   fromBuffer: (const char*)buf
 {
 	@throw [OFNotImplementedException newWithClass: isa
-					   andSelector: _cmd];
+					      selector: _cmd];
 }
 
 - (size_t)writeString: (OFString*)str
 {
 	return [self writeNBytes: [str length]
@@ -217,8 +217,8 @@
 }
 
 - close
 {
 	@throw [OFNotImplementedException newWithClass: isa
-					   andSelector: _cmd];
+					      selector: _cmd];
 }
 @end