Index: src/OFXMLElement.m
==================================================================
--- src/OFXMLElement.m
+++ src/OFXMLElement.m
@@ -206,11 +206,11 @@
 		@throw [OFInvalidArgumentException exception];
 
 	pool = objc_autoreleasePoolPush();
 
 	parser = [OFXMLParser parser];
-	builder = [OFXMLElementBuilder elementBuilder];
+	builder = [OFXMLElementBuilder builder];
 	delegate = [[[OFXMLElementElementBuilderDelegate alloc] init]
 	    autorelease];
 
 	parser.delegate = builder;
 	builder.delegate = delegate;
@@ -237,11 +237,11 @@
 	[self release];
 
 	pool = objc_autoreleasePoolPush();
 
 	parser = [OFXMLParser parser];
-	builder = [OFXMLElementBuilder elementBuilder];
+	builder = [OFXMLElementBuilder builder];
 	delegate = [[[OFXMLElementElementBuilderDelegate alloc] init]
 	    autorelease];
 
 	parser.delegate = builder;
 	builder.delegate = delegate;

Index: src/OFXMLElementBuilder.h
==================================================================
--- src/OFXMLElementBuilder.h
+++ src/OFXMLElementBuilder.h
@@ -118,9 +118,9 @@
 /**
  * @brief Creates a new element builder.
  *
  * @return A new, autoreleased OFXMLElementBuilder
  */
-+ (instancetype)elementBuilder;
++ (instancetype)builder;
 @end
 
 OF_ASSUME_NONNULL_END

Index: src/OFXMLElementBuilder.m
==================================================================
--- src/OFXMLElementBuilder.m
+++ src/OFXMLElementBuilder.m
@@ -28,11 +28,11 @@
 #import "OFMalformedXMLException.h"
 
 @implementation OFXMLElementBuilder
 @synthesize delegate = _delegate;
 
-+ (instancetype)elementBuilder
++ (instancetype)builder
 {
 	return [[[self alloc] init] autorelease];
 }
 
 - (instancetype)init

Index: tests/OFXMLElementBuilderTests.m
==================================================================
--- tests/OFXMLElementBuilderTests.m
+++ tests/OFXMLElementBuilderTests.m
@@ -38,11 +38,11 @@
 
 - (void)XMLElementBuilderTests
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFXMLParser *p = [OFXMLParser parser];
-	OFXMLElementBuilder *builder = [OFXMLElementBuilder elementBuilder];
+	OFXMLElementBuilder *builder = [OFXMLElementBuilder builder];
 	OFString *str = @"<foo>bar<![CDATA[f<oo]]>baz<qux/>"
 	    " <qux xmlns:qux='urn:qux'><?asd?><qux:bar/><x qux:y='z'/></qux>"
 	    "</foo>";
 
 	p.delegate = builder;