@@ -55,11 +55,11 @@
  * \param str A UTF-8 encoded C string to initialize the OFString with
  * \param len The length of the string
  * \return A new autoreleased OFString
  */
 + stringWithCString: (const char*)str
-	  andLength: (size_t)len;
+	     length: (size_t)len;
 
 /**
  * Creates a new OFString from a format string.
  * See printf for the format syntax.
  *
@@ -98,11 +98,11 @@
  * \param str A UTF-8 encoded C string to initialize the OFString with
  * \param len The length of the string
  * \return An initialized OFString
  */
 - initWithCString: (const char*)str
-	andLength: (size_t)len;
+	   length: (size_t)len;
 
 /**
  * Initializes an already allocated OFString with a format string.
  * See printf for the format syntax.
  *
@@ -118,11 +118,11 @@
  * \param fmt A string used as format to initialize the OFString
  * \param args The arguments used in the format string
  * \return An initialized OFString
  */
 - initWithFormat: (OFString*)fmt
-    andArguments: (va_list)args;
+       arguments: (va_list)args;
 
 /**
  * Initializes an already allocated OFString with another string.
  *
  * \param str A string to initialize the OFString with
@@ -208,15 +208,15 @@
 - appendCString: (const char*)str;
 - appendCString: (const char*)str
      withLength: (size_t)len;
 - appendCStringWithoutUTF8Checking: (const char*)str;
 - appendCStringWithoutUTF8Checking: (const char*)str
-			 andLength: (size_t)len;
+			    length: (size_t)len;
 - appendString: (OFString*)str;
 - appendWithFormat: (OFString*)fmt, ...;
 - appendWithFormat: (OFString*)fmt
-      andArguments: (va_list)args;
+	 arguments: (va_list)args;
 - reverse;
 - upper;
 - lower;
 - replaceOccurrencesOfString: (OFString*)str
 		  withString: (OFString*)repl;