Index: src/OFXMLAttribute.h
==================================================================
--- src/OFXMLAttribute.h
+++ src/OFXMLAttribute.h
@@ -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

Index: src/OFXMLElement.h
==================================================================
--- src/OFXMLElement.h
+++ src/OFXMLElement.h
@@ -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.
  *

Index: src/OFXMLElementBuilder.h
==================================================================
--- src/OFXMLElementBuilder.h
+++ src/OFXMLElementBuilder.h
@@ -71,16 +71,16 @@
  * an OFMalformedXMLException.
  *
  * @param builder The builder which did not expect the close tag
  * @param name The name of the close tag
  * @param prefix The prefix of the close tag
- * @param namespace_ The namespace of the close tag
+ * @param nameSpace The namespace of the close tag
  */
 - (void)elementBuilder: (OFXMLElementBuilder *)builder
   didNotExpectCloseTag: (OFString *)name
 		prefix: (nullable OFString *)prefix
-	     namespace: (nullable OFString *)namespace_;
+	     namespace: (nullable OFString *)nameSpace;
 
 /**
  * @brief This callback is called when the XML parser for the element builder
  *	  found an unknown entity.
  *

Index: src/OFXMLParser.h
==================================================================
--- src/OFXMLParser.h
+++ src/OFXMLParser.h
@@ -162,11 +162,11 @@
 @property (readonly, nonatomic) size_t lineNumber;
 
 /**
  * @brief Whether the XML parser has finished parsing.
  */
-@property (readonly, nonatomic) bool hasFinishedParsing;
+@property (readonly, nonatomic, getter=hasFinishedParsing) bool finishedParsing;
 
 /**
  * @brief The depth limit for the XML parser.
  *
  * If the depth limit is exceeded, an OFMalformedXMLException is thrown.

Index: src/exceptions/OFUnboundNamespaceException.h
==================================================================
--- src/exceptions/OFUnboundNamespaceException.h
+++ src/exceptions/OFUnboundNamespaceException.h
@@ -35,11 +35,11 @@
  * @brief The unbound namespace.
  */
 #ifndef __cplusplus
 @property (readonly, nonatomic) OFString *namespace;
 #else
-@property (readonly, nonatomic, getter=namespace) OFString *namespace_;
+@property (readonly, nonatomic, getter=namespace) OFString *nameSpace;
 #endif
 
 /**
  * @brief The element in which the namespace was not bound.
  */
@@ -48,27 +48,27 @@
 + (instancetype)exception OF_UNAVAILABLE;
 
 /**
  * @brief Creates a new, autoreleased unbound namespace exception.
  *
- * @param namespace_ The namespace which is unbound
+ * @param nameSpace The namespace which is unbound
  * @param element The element in which the namespace was not bound
  * @return A new, autoreleased unbound namespace exception
  */
-+ (instancetype)exceptionWithNamespace: (OFString *)namespace_
++ (instancetype)exceptionWithNamespace: (OFString *)nameSpace
 			       element: (OFXMLElement *)element;
 
 - (instancetype)init OF_UNAVAILABLE;
 
 /**
  * @brief Initializes an already allocated unbound namespace exception.
  *
- * @param namespace_ The namespace which is unbound
+ * @param nameSpace The namespace which is unbound
  * @param element The element in which the namespace was not bound
  * @return An initialized unbound namespace exception
  */
-- (instancetype)initWithNamespace: (OFString *)namespace_
+- (instancetype)initWithNamespace: (OFString *)nameSpace
 			  element: (OFXMLElement *)element
     OF_DESIGNATED_INITIALIZER;
 @end
 
 OF_ASSUME_NONNULL_END