@@ -159,11 +159,11 @@
 
 - initWithName: (OFString *)name
      namespace: (OFString *)namespace
    stringValue: (OFString *)stringValue
 {
-	self = [super OF_init];
+	self = [super of_init];
 
 	@try {
 		if (name == nil)
 			@throw [OFInvalidArgumentException exception];
 
@@ -185,11 +185,11 @@
 	return self;
 }
 
 - initWithElement: (OFXMLElement *)element
 {
-	self = [super OF_init];
+	self = [super of_init];
 
 	@try {
 		if (element == nil)
 			@throw [OFInvalidArgumentException exception];
 
@@ -274,11 +274,11 @@
 }
 #endif
 
 - initWithSerialization: (OFXMLElement *)element
 {
-	self = [super OF_init];
+	self = [super of_init];
 
 	@try {
 		void *pool = objc_autoreleasePoolPush();
 		OFXMLElement *attributesElement, *namespacesElement;
 		OFXMLElement *childrenElement;
@@ -420,11 +420,11 @@
 	[ret makeImmutable];
 
 	return ret;
 }
 
-- (OFString *)OF_XMLStringWithParent: (OFXMLElement *)parent
+- (OFString *)of_XMLStringWithParent: (OFXMLElement *)parent
 			  namespaces: (OFDictionary *)allNamespaces
 			 indentation: (unsigned int)indentation
 			       level: (unsigned int)level
 {
 	void *pool;
@@ -589,11 +589,11 @@
 			if (ind)
 				[tmp addItem: "\n"];
 
 			if ([child isKindOfClass: [OFXMLElement class]])
 				childString = [(OFXMLElement *)child
-				    OF_XMLStringWithParent: self
+				    of_XMLStringWithParent: self
 						namespaces: allNamespaces
 					       indentation: ind
 						     level: level + 1];
 			else
 				childString = [child
@@ -664,28 +664,28 @@
 	return ret;
 }
 
 - (OFString *)XMLString
 {
-	return [self OF_XMLStringWithParent: nil
+	return [self of_XMLStringWithParent: nil
 				 namespaces: nil
 				indentation: 0
 				      level: 0];
 }
 
 - (OFString *)XMLStringWithIndentation: (unsigned int)indentation
 {
-	return [self OF_XMLStringWithParent: nil
+	return [self of_XMLStringWithParent: nil
 				 namespaces: nil
 				indentation: indentation
 				      level: 0];
 }
 
 - (OFString *)XMLStringWithIndentation: (unsigned int)indentation
 				 level: (unsigned int)level
 {
-	return [self OF_XMLStringWithParent: nil
+	return [self of_XMLStringWithParent: nil
 				 namespaces: nil
 				indentation: indentation
 				      level: level];
 }