@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2008-2021 Jonathan Schleifer <js@nil.im>
+ * Copyright (c) 2008-2022 Jonathan Schleifer <js@nil.im>
  *
  * All rights reserved.
  *
  * This file is part of ObjFW. It may be distributed under the terms of the
  * Q Public License 1.0, which can be found in the file LICENSE.QPL included in
@@ -50,11 +50,11 @@
  */
 #ifndef __cplusplus
 @property OF_NULLABLE_PROPERTY (copy, nonatomic) OFString *namespace;
 #else
 @property OF_NULLABLE_PROPERTY (copy, nonatomic,
-    getter=namespace, setter=setNamespace:) OFString *namespace_;
+    getter=namespace, setter=setNamespace:) OFString *nameSpace;
 #endif
 
 /**
  * @brief The default namespace for the element to be used if there is no
  *	  parent.
@@ -99,29 +99,29 @@
 
 /**
  * @brief Creates a new XML element with the specified name and namespace.
  *
  * @param name The name for the element
- * @param namespace_ The namespace for the element
+ * @param nameSpace The namespace for the element
  * @return A new autoreleased OFXMLElement with the specified element name and
  *	   namespace
  */
 + (instancetype)elementWithName: (OFString *)name
-		      namespace: (nullable OFString *)namespace_;
+		      namespace: (nullable OFString *)nameSpace;
 
 /**
  * @brief Creates a new XML element with the specified name, namespace and
  * 	  string value.
  *
  * @param name The name for the element
- * @param namespace_ The namespace for the element
+ * @param nameSpace The namespace for the element
  * @param stringValue The value for the element
  * @return A new autoreleased OFXMLElement with the specified element name,
  *	   namespace and value
  */
 + (instancetype)elementWithName: (OFString *)name
-		      namespace: (nullable OFString *)namespace_
+		      namespace: (nullable OFString *)nameSpace
 		    stringValue: (nullable OFString *)stringValue;
 
 /**
  * @brief Creates a new element with the specified element.
  *
@@ -173,29 +173,29 @@
 /**
  * @brief Initializes an already allocated OFXMLElement with the specified name
  *	  and namespace.
  *
  * @param name The name for the element
- * @param namespace_ The namespace for the element
+ * @param nameSpace The namespace for the element
  * @return An initialized OFXMLElement with the specified element name and
  *	   namespace
  */
 - (instancetype)initWithName: (OFString *)name
-		   namespace: (nullable OFString *)namespace_;
+		   namespace: (nullable OFString *)nameSpace;
 
 /**
  * @brief Initializes an already allocated OFXMLElement with the specified name,
  *	  namespace and value.
  *
  * @param name The name for the element
- * @param namespace_ The namespace for the element
+ * @param nameSpace The namespace for the element
  * @param stringValue The value for the element
  * @return An initialized OFXMLElement with the specified element name,
  *	   namespace and value
  */
 - (instancetype)initWithName: (OFString *)name
-		   namespace: (nullable OFString *)namespace_
+		   namespace: (nullable OFString *)nameSpace
 		 stringValue: (nullable OFString *)stringValue;
 
 /**
  * @brief Initializes an already allocated OFXMLElement with the specified
  *	  element.
@@ -228,21 +228,21 @@
 
 /**
  * @brief Sets a prefix for a namespace.
  *
  * @param prefix The prefix for the namespace
- * @param namespace_ The namespace for which the prefix is set
+ * @param nameSpace The namespace for which the prefix is set
  */
-- (void)setPrefix: (OFString *)prefix forNamespace: (OFString *)namespace_;
+- (void)setPrefix: (OFString *)prefix forNamespace: (OFString *)nameSpace;
 
 /**
  * @brief Binds a prefix for a namespace.
  *
  * @param prefix The prefix for the namespace
- * @param namespace_ The namespace for which the prefix is bound
+ * @param nameSpace The namespace for which the prefix is bound
  */
-- (void)bindPrefix: (OFString *)prefix forNamespace: (OFString *)namespace_;
+- (void)bindPrefix: (OFString *)prefix forNamespace: (OFString *)nameSpace;
 
 /**
  * @brief Adds the specified attribute.
  *
  * If an attribute with the same name and namespace already exists, it is not
@@ -270,15 +270,15 @@
  *
  * If an attribute with the same name and namespace already exists, it is not
  * added.
  *
  * @param name The name of the attribute
- * @param namespace_ The namespace of the attribute
+ * @param nameSpace The namespace of the attribute
  * @param stringValue The value of the attribute
  */
 - (void)addAttributeWithName: (OFString *)name
-		   namespace: (nullable OFString *)namespace_
+		   namespace: (nullable OFString *)nameSpace
 		 stringValue: (OFString *)stringValue;
 
 /**
  * @brief Returns the attribute with the specified name.
  *