@@ -74,11 +74,11 @@
 
 	@try {
 		void *pool = objc_autoreleasePoolPush();
 
 		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];
@@ -138,19 +138,19 @@
 	return true;
 }
 
 - (unsigned long)hash
 {
-	uint32_t hash;
-
-	OF_HASH_INIT(hash);
-
-	OF_HASH_ADD_HASH(hash, _name.hash);
-	OF_HASH_ADD_HASH(hash, _namespace.hash);
-	OF_HASH_ADD_HASH(hash, _stringValue.hash);
-
-	OF_HASH_FINALIZE(hash);
+	unsigned long hash;
+
+	OFHashInit(&hash);
+
+	OFHashAddHash(&hash, _name.hash);
+	OFHashAddHash(&hash, _namespace.hash);
+	OFHashAddHash(&hash, _stringValue.hash);
+
+	OFHashFinalize(&hash);
 
 	return hash;
 }
 
 - (OFXMLElement *)XMLElementBySerializing
@@ -157,14 +157,12 @@
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFXMLElement *element;
 
 	element = [OFXMLElement elementWithName: self.className
-				      namespace: OF_SERIALIZATION_NS];
-
-	[element addAttributeWithName: @"name"
-			  stringValue: _name];
+				      namespace: OFSerializationNS];
+	[element addAttributeWithName: @"name" stringValue: _name];
 
 	if (_namespace != nil)
 		[element addAttributeWithName: @"namespace"
 				  stringValue: _namespace];