@@ -27,13 +27,13 @@
  * \brief A class for easy handling of JIDs.
  */
 @interface XMPPJID: OFObject <OFCopying>
 {
 /// \cond internal
-	OFString *node;
-	OFString *domain;
-	OFString *resource;
+	OFString *_node;
+	OFString *_domain;
+	OFString *_resource;
 /// \endcond
 }
 
 #ifdef OF_HAVE_PROPERTIES
 /// \brief The JID's localpart
@@ -52,22 +52,22 @@
 + JID;
 
 /**
  * \brief Creates a new autoreleased XMPPJID from a string.
  *
- * \param str The string to parse into a JID object
+ * \param string The string to parse into a JID object
  * \return A new autoreleased XMPPJID
  */
-+ JIDWithString: (OFString*)str;
++ JIDWithString: (OFString*)string;
 
 /**
  * \brief Initializes an already allocated XMPPJID with a string.
  *
  * \param str The string to parse into a JID object
  * \return A initialized XMPPJID
  */
-- initWithString: (OFString*)str;
+- initWithString: (OFString*)string;
 
 /**
  * \brief Returns the bare JID.
  *
  * \return An OFString containing the bare JID