Index: src/OFXMLElement.h
==================================================================
--- src/OFXMLElement.h
+++ src/OFXMLElement.h
@@ -219,11 +219,11 @@
 
 /**
  * \return A new autoreleased OFString representing the OFXMLElement as an
  * XML string
  */
-- (OFString*)stringValue;
+- (OFString*)XMLString;
 
 /**
  * Adds the specified attribute.
  *
  * If an attribute with the same name and namespace already exists, it is not

Index: src/OFXMLElement.m
==================================================================
--- src/OFXMLElement.m
+++ src/OFXMLElement.m
@@ -263,11 +263,11 @@
 - (OFArray*)children
 {
 	return [[children copy] autorelease];
 }
 
-- (OFString*)_stringValueWithParent: (OFXMLElement*)parent
+- (OFString*)_XMLStringWithParent: (OFXMLElement*)parent
 {
 	OFAutoreleasePool *pool, *pool2;
 	char *str_c;
 	size_t len, i, j, attrs_count;
 	OFString *prefix, *parent_prefix;
@@ -434,11 +434,11 @@
 
 		for (j = 0; j < children_count; j++)
 			append(tmp, @selector(
 			    appendCStringWithoutUTF8Checking:),
 			    [[children_carray[j]
-			        _stringValueWithParent: self] cString]);
+			    _XMLStringWithParent: self] cString]);
 
 		len += [tmp cStringLength] + [name cStringLength] + 2;
 		@try {
 			str_c = [self resizeMemory: str_c
 					    toSize: len];
@@ -484,18 +484,18 @@
 		[self freeMemory: str_c];
 	}
 	return ret;
 }
 
-- (OFString*)stringValue
+- (OFString*)XMLString
 {
-	return [self _stringValueWithParent: nil];
+	return [self _XMLStringWithParent: nil];
 }
 
 - (OFString*)description
 {
-	return [self stringValue];
+	return [self XMLString];
 }
 
 - (void)addAttribute: (OFXMLAttribute*)attr
 {
 	if (name == nil)

Index: tests/OFXMLElementBuilderTests.m
==================================================================
--- tests/OFXMLElementBuilderTests.m
+++ tests/OFXMLElementBuilderTests.m
@@ -49,14 +49,14 @@
 	[p setDelegate: builder];
 	[builder setDelegate: self];
 
 	TEST(@"Building elements from parsed XML",
 	    R([p parseString: str]) &&
-	    elem[0] != nil && [[elem[0] stringValue] isEqual: str] &&
+	    elem[0] != nil && [[elem[0] XMLString] isEqual: str] &&
 	    R([p parseString: @"<!--foo-->"]) &&
-	    elem[1] != nil && [[elem[1] stringValue] isEqual: @"<!--foo-->"])
+	    elem[1] != nil && [[elem[1] XMLString] isEqual: @"<!--foo-->"])
 
 	[elem[0] release];
 	[elem[1] release];
 	[pool drain];
 }
 @end

Index: tests/OFXMLElementTests.m
==================================================================
--- tests/OFXMLElementTests.m
+++ tests/OFXMLElementTests.m
@@ -32,60 +32,60 @@
 	OFXMLElement *elem[4];
 	OFArray *a;
 
 	TEST(@"+[elementWithName:]",
 	    (elem[0] = [OFXMLElement elementWithName: @"foo"]) &&
-	    [[elem[0] stringValue] isEqual: @"<foo/>"])
+	    [[elem[0] XMLString] isEqual: @"<foo/>"])
 
 	TEST(@"+[elementWithName:stringValue:]",
 	    (elem[1] = [OFXMLElement elementWithName: @"foo"
 					 stringValue: @"b&ar"]) &&
-	    [[elem[1] stringValue] isEqual: @"<foo>b&amp;ar</foo>"])
+	    [[elem[1] XMLString] isEqual: @"<foo>b&amp;ar</foo>"])
 
 	TEST(@"+[elementWithName:namespace:]",
 	    (elem[2] = [OFXMLElement elementWithName: @"foo"
 					   namespace: @"urn:objfw:test"]) &&
 	    R([elem[2] addAttributeWithName: @"test"
 				stringValue: @"test"]) &&
 	    R([elem[2] setPrefix: @"objfw-test"
 		    forNamespace: @"urn:objfw:test"]) &&
-	    [[elem[2] stringValue] isEqual: @"<objfw-test:foo test='test'/>"] &&
+	    [[elem[2] XMLString] isEqual: @"<objfw-test:foo test='test'/>"] &&
 	    (elem[3] = [OFXMLElement elementWithName: @"foo"
 					   namespace: @"urn:objfw:test"]) &&
 	    R([elem[3] addAttributeWithName: @"test"
 				stringValue: @"test"]) &&
-	    [[elem[3] stringValue] isEqual:
+	    [[elem[3] XMLString] isEqual:
 	    @"<foo xmlns='urn:objfw:test' test='test'/>"])
 
 	TEST(@"+[elementWithName:namespace:stringValue:]",
 	    (elem[3] = [OFXMLElement elementWithName: @"foo"
 					   namespace: @"urn:objfw:test"
 					 stringValue: @"x"]) &&
 	    R([elem[3] setPrefix: @"objfw-test"
 		    forNamespace: @"urn:objfw:test"]) &&
-	    [[elem[3] stringValue] isEqual:
+	    [[elem[3] XMLString] isEqual:
 	    @"<objfw-test:foo>x</objfw-test:foo>"])
 
 	TEST(@"+[elementWithCharacters:]",
 	    (elem[3] = [OFXMLElement elementWithCharacters: @"<foo>"]) &&
-	    [[elem[3] stringValue] isEqual: @"&lt;foo&gt;"])
+	    [[elem[3] XMLString] isEqual: @"&lt;foo&gt;"])
 
 	TEST(@"+[elementWithCDATA:]",
 	    (elem[3] = [OFXMLElement elementWithCDATA: @"<foo>"]) &&
-	    [[elem[3] stringValue] isEqual: @"<![CDATA[<foo>]]>"]);
+	    [[elem[3] XMLString] isEqual: @"<![CDATA[<foo>]]>"]);
 
 	TEST(@"+[elementWithComment:]",
 	    (elem[3] = [OFXMLElement elementWithComment: @" comment "]) &&
-	    [[elem[3] stringValue] isEqual: @"<!-- comment -->"])
+	    [[elem[3] XMLString] isEqual: @"<!-- comment -->"])
 
 	TEST(@"-[addAttributeWithName:stringValue:]",
 	    R([elem[0] addAttributeWithName: @"foo"
 				stringValue: @"b&ar"]) &&
-	    [[elem[0] stringValue] isEqual: @"<foo foo='b&amp;ar'/>"] &&
+	    [[elem[0] XMLString] isEqual: @"<foo foo='b&amp;ar'/>"] &&
 	    R([elem[1] addAttributeWithName: @"foo"
 				stringValue: @"b&ar"]) &&
-	    [[elem[1] stringValue] isEqual:
+	    [[elem[1] XMLString] isEqual:
 	    @"<foo foo='b&amp;ar'>b&amp;ar</foo>"])
 
 	TEST(@"-[setPrefix:forNamespace:]",
 	    R([elem[1] setPrefix: @"objfw-test"
 		    forNamespace: @"urn:objfw:test"]))
@@ -95,34 +95,34 @@
 				  namespace: @"urn:objfw:test"
 				stringValue: @"bar"]) &&
 	    R([elem[1] addAttributeWithName: @"foo"
 				  namespace: @"urn:objfw:test"
 				stringValue: @"ignored"]) &&
-	    [[elem[1] stringValue] isEqual:
+	    [[elem[1] XMLString] isEqual:
 	    @"<foo foo='b&amp;ar' objfw-test:foo='bar'>b&amp;ar</foo>"])
 
 	TEST(@"-[removeAttributeForName:namespace:]",
 	    R([elem[1] removeAttributeForName: @"foo"]) &&
-	    [[elem[1] stringValue] isEqual:
+	    [[elem[1] XMLString] isEqual:
 	    @"<foo objfw-test:foo='bar'>b&amp;ar</foo>"] &&
 	    R([elem[1] removeAttributeForName: @"foo"
 				    namespace: @"urn:objfw:test"]) &&
-	    [[elem[1] stringValue] isEqual: @"<foo>b&amp;ar</foo>"])
+	    [[elem[1] XMLString] isEqual: @"<foo>b&amp;ar</foo>"])
 
 	TEST(@"-[addChild:]",
 	    R([elem[0] addChild: [OFXMLElement elementWithName: @"bar"]]) &&
-	    [[elem[0] stringValue] isEqual:
+	    [[elem[0] XMLString] isEqual:
 	    @"<foo foo='b&amp;ar'><bar/></foo>"] &&
 	    R([elem[2] addChild: [OFXMLElement elementWithName: @"bar"
 		      namespace: @"urn:objfw:test"]]) &&
-	    [[elem[2] stringValue] isEqual:
+	    [[elem[2] XMLString] isEqual:
 	    @"<objfw-test:foo test='test'><objfw-test:bar/></objfw-test:foo>"])
 
 	TEST(@"-[elementsForName:namespace:]",
 	    (a = [elem[2] elementsForName: @"bar"
 				namespace: @"urn:objfw:test"]) &&
-	    [a count] == 1 && [[[a firstObject] stringValue] isEqual:
+	    [a count] == 1 && [[[a firstObject] XMLString] isEqual:
 	    @"<bar xmlns='urn:objfw:test'/>"])
 
 	[pool drain];
 }
 @end