@@ -23,22 +23,27 @@
 {
 	OFString *_namespace, *_prefix;
 }
 
 #ifdef OF_HAVE_PROPERTIES
-@property (readonly, copy, nonatomic) OFString *namespace, *prefix;
+# ifdef __cplusplus
+@property (readonly, copy, nonatomic, getter=namespace) OFString *namespace_;
+# else
+@property (readonly, copy, nonatomic) OFString *namespace;
+# endif
+@property (readonly, copy, nonatomic) OFString *prefix;
 #endif
 
 /*!
  * @brief Creates a new, autoreleased unbound namespace exception.
  *
  * @param class_ The class of the object which caused the exception
- * @param namespace The namespace which is unbound
+ * @param namespace_ The namespace which is unbound
  * @return A new, autoreleased unbound namespace exception
  */
 + (instancetype)exceptionWithClass: (Class)class_
-			 namespace: (OFString*)namespace;
+			 namespace: (OFString*)namespace_;
 
 /*!
  * @brief Creates a new, autoreleased unbound namespace exception.
  *
  * @param class_ The class of the object which caused the exception
@@ -50,15 +55,15 @@
 
 /*!
  * @brief Initializes an already allocated unbound namespace exception.
  *
  * @param class_ The class of the object which caused the exception
- * @param namespace The namespace which is unbound
+ * @param namespace_ The namespace which is unbound
  * @return An initialized unbound namespace exception
  */
 - initWithClass: (Class)class_
-      namespace: (OFString*)namespace;
+      namespace: (OFString*)namespace_;
 
 /*!
  * @brief Initializes an already allocated unbound namespace exception.
  *
  * @param class_ The class of the object which caused the exception