@@ -44,11 +44,11 @@
  */
 #ifndef __cplusplus
 @property OF_NULLABLE_PROPERTY (readonly, nonatomic) OFString *namespace;
 #else
 @property OF_NULLABLE_PROPERTY (readonly, nonatomic, getter=namespace)
-    OFString *namespace_;
+    OFString *nameSpace;
 #endif
 
 /**
  * @brief Creates a new XML attribute.
  *
@@ -61,16 +61,16 @@
 
 /**
  * @brief Creates a new XML attribute.
  *
  * @param name The name of the attribute
- * @param namespace_ The namespace of the attribute
+ * @param nameSpace The namespace of the attribute
  * @param stringValue The string value of the attribute
  * @return A new autoreleased OFXMLAttribute with the specified parameters
  */
 + (instancetype)attributeWithName: (OFString *)name
-			namespace: (nullable OFString *)namespace_
+			namespace: (nullable OFString *)nameSpace
 		      stringValue: (OFString *)stringValue;
 
 /**
  * @brief Initializes an already allocated OFXMLAttribute.
  *
@@ -83,17 +83,17 @@
 
 /**
  * @brief Initializes an already allocated OFXMLAttribute.
  *
  * @param name The name of the attribute
- * @param namespace_ The namespace of the attribute
+ * @param nameSpace The namespace of the attribute
  * @param stringValue The string value of the attribute
  * @return An initialized OFXMLAttribute with the specified parameters
  */
 - (instancetype)initWithName: (OFString *)name
-		   namespace: (nullable OFString *)namespace_
+		   namespace: (nullable OFString *)nameSpace
 		 stringValue: (OFString *)stringValue;
 
 - (instancetype)initWithSerialization: (OFXMLElement *)element;
 @end
 
 OF_ASSUME_NONNULL_END