@@ -268,11 +268,11 @@
 		OFXMLElement *childrenElement;
 		OFEnumerator *keyEnumerator, *objectEnumerator;
 		OFString *key, *object;
 
 		if (![element.name isEqual: self.className] ||
-		    ![element.namespace isEqual: OF_SERIALIZATION_NS])
+		    ![element.namespace isEqual: OFSerializationNS])
 			@throw [OFInvalidArgumentException exception];
 
 		_name = [[element attributeForName: @"name"].stringValue copy];
 		_namespace = [[element attributeForName: @"namespace"]
 		    .stringValue copy];
@@ -279,20 +279,20 @@
 		_defaultNamespace = [[element attributeForName:
 		    @"defaultNamespace"].stringValue copy];
 
 		attributesElement = [[element
 		    elementForName: @"attributes"
-			 namespace: OF_SERIALIZATION_NS] elementsForNamespace:
-		    OF_SERIALIZATION_NS].firstObject;
+			 namespace: OFSerializationNS] elementsForNamespace:
+		    OFSerializationNS].firstObject;
 		namespacesElement = [[element
 		    elementForName: @"namespaces"
-			 namespace: OF_SERIALIZATION_NS] elementsForNamespace:
-		    OF_SERIALIZATION_NS].firstObject;
+			 namespace: OFSerializationNS] elementsForNamespace:
+		    OFSerializationNS].firstObject;
 		childrenElement = [[element
 		    elementForName: @"children"
-			 namespace: OF_SERIALIZATION_NS] elementsForNamespace:
-		    OF_SERIALIZATION_NS].firstObject;
+			 namespace: OFSerializationNS] elementsForNamespace:
+		    OFSerializationNS].firstObject;
 
 		_attributes = [attributesElement.objectByDeserializing
 		    mutableCopy];
 		_namespaces = [namespacesElement.objectByDeserializing
 		    mutableCopy];
@@ -653,11 +653,11 @@
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFXMLElement *element;
 
 	element = [OFXMLElement elementWithName: self.className
-				      namespace: OF_SERIALIZATION_NS];
+				      namespace: OFSerializationNS];
 
 	if (_name != nil)
 		[element addAttributeWithName: @"name" stringValue: _name];
 
 	if (_namespace != nil)
@@ -671,11 +671,11 @@
 	if (_attributes != nil) {
 		OFXMLElement *attributesElement;
 
 		attributesElement =
 		    [OFXMLElement elementWithName: @"attributes"
-					namespace: OF_SERIALIZATION_NS];
+					namespace: OFSerializationNS];
 		[attributesElement addChild:
 		    _attributes.XMLElementBySerializing];
 		[element addChild: attributesElement];
 	}
 
@@ -690,11 +690,11 @@
 		    @"http://www.w3.org/2000/xmlns/"];
 
 		if (namespacesCopy.count > 0) {
 			namespacesElement =
 			    [OFXMLElement elementWithName: @"namespaces"
-						namespace: OF_SERIALIZATION_NS];
+						namespace: OFSerializationNS];
 			[namespacesElement addChild:
 			    namespacesCopy.XMLElementBySerializing];
 			[element addChild: namespacesElement];
 		}
 	}
@@ -702,11 +702,11 @@
 	if (_children != nil) {
 		OFXMLElement *childrenElement;
 
 		childrenElement =
 		    [OFXMLElement elementWithName: @"children"
-					namespace: OF_SERIALIZATION_NS];
+					namespace: OFSerializationNS];
 		[childrenElement addChild: _children.XMLElementBySerializing];
 		[element addChild: childrenElement];
 	}
 
 	[element retain];