@@ -22,19 +22,15 @@
  * @brief A representation of an attribute of an XML element as an object.
  */
 @interface OFXMLAttribute: OFXMLNode
 {
 @public
-	OFString *name;
-	OFString *ns;
-	OFString *stringValue;
+	OFString *_name, *_namespace, *_stringValue;
 }
 
 #ifdef OF_HAVE_PROPERTIES
-@property (readonly, copy) OFString *name;
-@property (readonly, copy, getter=namespace) OFString *ns;
-@property (readonly, copy) OFString *stringValue;
+@property (readonly, copy) OFString *name, *namespace, *stringValue;
 #endif
 
 /*!
  * @brief Creates a new XML attribute.
  *
@@ -47,16 +43,16 @@
 
 /*!
  * @brief Creates a new XML attribute.
  *
  * @param name The name of the attribute
- * @param ns 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: (OFString*)ns
+			namespace: (OFString*)namespace_
 		      stringValue: (OFString*)stringValue;
 
 /*!
  * @brief Initializes an already allocated OFXMLAttribute.
  *
@@ -69,16 +65,16 @@
 
 /*!
  * @brief Initializes an already allocated OFXMLAttribute.
  *
  * @param name The name of the attribute
- * @param ns 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
  */
 - initWithName: (OFString*)name
-     namespace: (OFString*)ns
+     namespace: (OFString*)namespace_
    stringValue: (OFString*)stringValue;
 
 /*!
  * @brief Returns the name of the attribute as an autoreleased OFString.
  *