@@ -73,12 +73,12 @@
 	 * for each constant string. We change the const char* to point to our
 	 * struct on the first call to a constant string so we can have more
 	 * than those two ivars.
 	 */
 	struct of_string_ivars {
-		char   *string;
-		size_t length;
+		char   *cString;
+		size_t cStringLength;
 		BOOL   isUTF8;
 	} *restrict s;
 	/*
 	 * Unused in OFString, however, OFConstantString sets this to SIZE_MAX
 	 * once it allocated and initialized the struct.
@@ -92,48 +92,48 @@
 + string;
 
 /**
  * Creates a new OFString from a UTF-8 encoded C string.
  *
- * \param string A UTF-8 encoded C string to initialize the OFString with
+ * \param cString A UTF-8 encoded C string to initialize the OFString with
  * \return A new autoreleased OFString
  */
-+ stringWithCString: (const char*)string;
++ stringWithCString: (const char*)cString;
 
 /**
  * Creates a new OFString from a C string with the specified encoding.
  *
  * \param string A C string to initialize the OFString with
  * \param encoding The encoding of the C string
  * \return A new autoreleased OFString
  */
-+ stringWithCString: (const char*)string
++ stringWithCString: (const char*)cString
 	   encoding: (of_string_encoding_t)encoding;
 
 /**
  * Creates a new OFString from a C string with the specified encoding and
  * length.
  *
- * \param string A C string to initialize the OFString with
+ * \param cString A C string to initialize the OFString with
  * \param encoding The encoding of the C string
- * \param length The length of the C string
+ * \param cStringLength The length of the C string
  * \return A new autoreleased OFString
  */
-+ stringWithCString: (const char*)string
++ stringWithCString: (const char*)cString
 	   encoding: (of_string_encoding_t)encoding
-	     length: (size_t)length;
+	     length: (size_t)cStringLength;
 
 /**
  * Creates a new OFString from a UTF-8 encoded C string with the specified
  * length.
  *
- * \param string A UTF-8 encoded C string to initialize the OFString with
- * \param length The length of the UTF-8 encoded C string
+ * \param cString A UTF-8 encoded C string to initialize the OFString with
+ * \param cStringLength The length of the UTF-8 encoded C string
  * \return A new autoreleased OFString
  */
-+ stringWithCString: (const char*)string
-	     length: (size_t)length;
++ stringWithCString: (const char*)cString
+	     length: (size_t)cStringLength;
 
 /**
  * Creates a new OFString from another string.
  *
  * \param string A string to initialize the OFString with
@@ -290,49 +290,49 @@
 		 encoding: (of_string_encoding_t)encoding;
 
 /**
  * Initializes an already allocated OFString from a UTF-8 encoded C string.
  *
- * \param string A UTF-8 encoded C string to initialize the OFString with
+ * \param cString A UTF-8 encoded C string to initialize the OFString with
  * \return An initialized OFString
  */
-- initWithCString: (const char*)string;
+- initWithCString: (const char*)cString;
 
 /**
  * Initializes an already allocated OFString from a C string with the specified
  * encoding.
  *
- * \param string A C string to initialize the OFString with
+ * \param cString A C string to initialize the OFString with
  * \param encoding The encoding of the C string
  * \return An initialized OFString
  */
-- initWithCString: (const char*)string
+- initWithCString: (const char*)cString
 	 encoding: (of_string_encoding_t)encoding;
 
 /**
  * Initializes an already allocated OFString from a C string with the specified
  * encoding and length.
  *
- * \param string A C string to initialize the OFString with
+ * \param cString A C string to initialize the OFString with
  * \param encoding The encoding of the C string
- * \param length The length of the C string
+ * \param cStringLength The length of the C string
  * \return An initialized OFString
  */
-- initWithCString: (const char*)string
+- initWithCString: (const char*)cString
 	 encoding: (of_string_encoding_t)encoding
-	   length: (size_t)length;
+	   length: (size_t)cStringLength;
 
 /**
  * Initializes an already allocated OFString from a UTF-8 encoded C string with
  * the specified length.
  *
- * \param string A UTF-8 encoded C string to initialize the OFString with
- * \param length The length of the UTF-8 encoded C string
+ * \param cString A UTF-8 encoded C string to initialize the OFString with
+ * \param cStringLength The length of the UTF-8 encoded C string
  * \return An initialized OFString
  */
-- initWithCString: (const char*)string
-	   length: (size_t)length;
+- initWithCString: (const char*)cString
+	   length: (size_t)cStringLength;
 
 /**
  * Initializes an already allocated OFString with another string.
  *
  * \param string A string to initialize the OFString with