@@ -33,11 +33,11 @@
 	OFString *defaultNamespace;
 	OFMutableArray *attributes;
 	OFMutableDictionary *namespaces;
 	OFMutableArray *children;
 	OFString *characters;
-	OFString *cdata;
+	OFString *CDATA;
 	OFMutableString *comment;
 }
 
 #ifdef OF_HAVE_PROPERTIES
 @property (readonly, copy) OFString *name;
@@ -53,16 +53,16 @@
  */
 + elementWithName: (OFString*)name;
 
 /**
  * \param name The name for the element
- * \param stringval The value for the element
+ * \param stringValue The value for the element
  * \return A new autoreleased OFXMLElement with the specified element name and
  *	   value
  */
 + elementWithName: (OFString*)name
-      stringValue: (OFString*)stringval;
+      stringValue: (OFString*)stringValue;
 
 /**
  * \param name The name for the element
  * \param ns The namespace for the element
  * \return A new autoreleased OFXMLElement with the specified element name and
@@ -72,34 +72,34 @@
 	namespace: (OFString*)ns;
 
 /**
  * \param name The name for the element
  * \param ns The namespace for the element
- * \param stringval The value for the element
+ * \param stringValue The value for the element
  * \return A new autoreleased OFXMLElement with the specified element name,
  *	   namespace and value
  */
 + elementWithName: (OFString*)name
 	namespace: (OFString*)ns
-      stringValue: (OFString*)stringval;
+      stringValue: (OFString*)stringValue;
 
 /**
  * Creates a new element, only consisting of the specified characters.
  *
- * \param chars The characters the element represents
+ * \param characters The characters the element represents
  * \return A new autoreleased OFXMLElement consisting of the specified
  *	   characters
  */
-+ elementWithCharacters: (OFString*)chars;
++ elementWithCharacters: (OFString*)characters;
 
 /**
  * Creates a new element, only consisting of the specified CDATA.
  *
- * \param cdata The CDATA the element represents
+ * \param CDATA The CDATA the element represents
  * \return A new autoreleased OFXMLElement consisting of the specified CDATA
  */
-+ elementWithCDATA: (OFString*)cdata;
++ elementWithCDATA: (OFString*)CDATA;
 
 /**
  * Creates a new element, only consisting of the specified comment.
  *
  * \param comment The comment the element represents
@@ -108,14 +108,14 @@
 + elementWithComment: (OFString*)comment;
 
 /**
  * Parses the string and returns an OFXMLElement for it.
  *
- * \param str The string to parse
+ * \param string The string to parse
  * \return A new autoreleased OFXMLElement with the contents of the string
  */
-+ elementWithXMLString: (OFString*)str;
++ elementWithXMLString: (OFString*)string;
 
 /**
  * Initializes an already allocated OFXMLElement with the specified element
  * name.
  *
@@ -127,16 +127,16 @@
 /**
  * Initializes an already allocated OFXMLElement with the specified element
  * name and value.
  *
  * \param name The name for the element
- * \param stringval The value for the element
+ * \param stringValue The value for the element
  * \return An initialized OFXMLElement with the specified element name and
  *	   value
  */
 - initWithName: (OFString*)name
-   stringValue: (OFString*)stringval;
+   stringValue: (OFString*)stringValue;
 
 /**
  * Initializes an already allocated OFXMLElement with the specified element
  * name and namespace.
  *
@@ -152,35 +152,35 @@
  * Initializes an already allocated OFXMLElement with the specified element
  * name, namespace and value.
  *
  * \param name The name for the element
  * \param ns The namespace for the element
- * \param stringval The value for the element
+ * \param stringValue The value for the element
  * \return An initialized OFXMLElement with the specified element name,
  *	   namespace and value
  */
 - initWithName: (OFString*)name
      namespace: (OFString*)ns
-   stringValue: (OFString*)stringval;
+   stringValue: (OFString*)stringValue;
 
 /**
  * Initializes an already allocated OFXMLElement so that it only consists of the
  * specified characters.
  *
- * \param chars The characters the element represents
+ * \param characters The characters the element represents
  * \return An initialized OFXMLElement consisting of the specified characters
  */
-- initWithCharacters: (OFString*)chars;
+- initWithCharacters: (OFString*)characters;
 
 /**
  * Initializes an already allocated OFXMLElement so that it only consists of the
  * specified CDATA.
  *
- * \param cdata The CDATA the element represents
+ * \param CDATA The CDATA the element represents
  * \return An initialized OFXMLElement consisting of the specified CDATA
  */
-- initWithCDATA: (OFString*)cdata;
+- initWithCDATA: (OFString*)CDATA;
 
 /**
  * Initializes an already allocated OFXMLElement so that it only consists of the
  * specified comment.
  *
@@ -190,14 +190,14 @@
 - initWithComment: (OFString*)comment;
 
 /**
  * Parses the string and initializes an already allocated OFXMLElement with it.
  *
- * \param str The string to parse
+ * \param string The string to parse
  * \return An initialized OFXMLElement with the contents of the string
  */
-- initWithXMLString: (OFString*)str;
+- initWithXMLString: (OFString*)string;
 
 /**
  * \return The name of the element
  */
 - (OFString*)name;
@@ -225,13 +225,13 @@
 - (OFArray*)children;
 
 /**
  * Removes all children and sets the string value to the specified string.
  *
- * \param value The new string value for the element
+ * \param stringValue The new string value for the element
  */
-- (void)setStringValue: (OFString*)value;
+- (void)setStringValue: (OFString*)stringValue;
 
 /**
  * \return A string with the string value of all children concatenated
  */
 - (OFString*)stringValue;
@@ -246,69 +246,69 @@
  * Adds the specified attribute.
  *
  * If an attribute with the same name and namespace already exists, it is not
  * added.
  *
- * \param attr The attribute to add
+ * \param attribute The attribute to add
  */
-- (void)addAttribute: (OFXMLAttribute*)attr;
+- (void)addAttribute: (OFXMLAttribute*)attribute;
 
 /**
  * Adds the specified attribute with the specified value.
  *
  * If an attribute with the same name and namespace already exists, it is not
  * added.
  *
  * \param name The name of the attribute
- * \param value The value of the attribute
+ * \param stringValue The value of the attribute
  */
 - (void)addAttributeWithName: (OFString*)name
-		 stringValue: (OFString*)value;
+		 stringValue: (OFString*)stringValue;
 
 /**
  * Adds the specified attribute with the specified namespace and value.
  *
  * If an attribute with the same name and namespace already exists, it is not
  * added.
  *
  * \param name The name of the attribute
  * \param ns The namespace of the attribute
- * \param value The value of the attribute
+ * \param stringValue The value of the attribute
  */
 - (void)addAttributeWithName: (OFString*)name
 		   namespace: (OFString*)ns
-		 stringValue: (OFString*)value;
+		 stringValue: (OFString*)stringValue;
 
 /**
- * \param attrname The name of the attribute
+ * \param attributeName The name of the attribute
  * \return The attribute with the specified name
  */
-- (OFXMLAttribute*)attributeForName: (OFString*)attrname;
+- (OFXMLAttribute*)attributeForName: (OFString*)attributeName;
 
 /**
- * \param attrname The name of the attribute
- * \param attrns The namespace of the attribute
+ * \param attributeName The name of the attribute
+ * \param attributeNS The namespace of the attribute
  * \return The attribute with the specified name and namespace
  */
-- (OFXMLAttribute*)attributeForName: (OFString*)attrname
-			  namespace: (OFString*)attrns;
+- (OFXMLAttribute*)attributeForName: (OFString*)attributeName
+			  namespace: (OFString*)attributeNS;
 
 /**
  * Removes the attribute with the specified name.
  *
- * \param attrname The name of the attribute
+ * \param attribteName The name of the attribute
  */
-- (void)removeAttributeForName: (OFString*)attrname;
+- (void)removeAttributeForName: (OFString*)attributeName;
 
 /**
  * Removes the attribute with the specified name and namespace.
  *
- * \param attrname The name of the attribute
- * \param attrns The namespace of the attribute
+ * \param attributeName The name of the attribute
+ * \param attributeNS The namespace of the attribute
  */
-- (void)removeAttributeForName: (OFString*)attrname
-		     namespace: (OFString*)attrns;
+- (void)removeAttributeForName: (OFString*)attributeName
+		     namespace: (OFString*)attributeNS;
 
 /**
  * Sets a prefix for a namespace.
  *
  * \param prefix The prefix for the namespace
@@ -339,32 +339,32 @@
  * \param child Another OFXMLElement which is added as a child
  */
 - (void)addChild: (OFXMLElement*)child;
 
 /**
- * \param elemname The name of the element
+ * \param elementName The name of the element
  * \return The first child element with the specified name
  */
-- (OFXMLElement*)elementForName: (OFString*)elemname;
+- (OFXMLElement*)elementForName: (OFString*)elementName;
 
 /**
- * \param elemname The name of the elements
+ * \param elementName The name of the elements
  * \return The child elements with the specified name
  */
-- (OFArray*)elementsForName: (OFString*)elemname;
+- (OFArray*)elementsForName: (OFString*)elementName;
 
 /**
- * \param elemname The name of the element
- * \param elemns The namespace of the element
+ * \param elementName The name of the element
+ * \param elementNS The namespace of the element
  * \return The first child element with the specified name and namespace
  */
-- (OFXMLElement*)elementForName: (OFString*)elemname
-		      namespace: (OFString*)elemns;
+- (OFXMLElement*)elementForName: (OFString*)elementName
+		      namespace: (OFString*)elementNS;
 
 /**
- * \param elemname The name of the elements
- * \param elemns The namespace of the elements
+ * \param elementName The name of the elements
+ * \param elementNS The namespace of the elements
  * \return The child elements with the specified name and namespace
  */
-- (OFArray*)elementsForName: (OFString*)elemname
-		  namespace: (OFString*)elemns;
+- (OFArray*)elementsForName: (OFString*)elementName
+		  namespace: (OFString*)elementNS;
 @end