@@ -49,19 +49,19 @@
 }
 
 static Class charactersClass = Nil;
 static Class CDATAClass = Nil;
 
-@interface OFXMLElement_OFXMLElementBuilderDelegate: OFObject
+@interface OFXMLElementElementBuilderDelegate: OFObject
     <OFXMLElementBuilderDelegate>
 {
 @public
 	OFXMLElement *_element;
 }
 @end
 
-@implementation OFXMLElement_OFXMLElementBuilderDelegate
+@implementation OFXMLElementElementBuilderDelegate
 - (void)elementBuilder: (OFXMLElementBuilder *)builder
        didBuildElement: (OFXMLElement *)element
 {
 	if (_element == nil)
 		_element = [element retain];
@@ -214,11 +214,11 @@
 - (instancetype)initWithXMLString: (OFString *)string
 {
 	void *pool;
 	OFXMLParser *parser;
 	OFXMLElementBuilder *builder;
-	OFXMLElement_OFXMLElementBuilderDelegate *delegate;
+	OFXMLElementElementBuilderDelegate *delegate;
 
 	[self release];
 
 	if (string == nil)
 		@throw [OFInvalidArgumentException exception];
@@ -225,11 +225,11 @@
 
 	pool = objc_autoreleasePoolPush();
 
 	parser = [OFXMLParser parser];
 	builder = [OFXMLElementBuilder elementBuilder];
-	delegate = [[[OFXMLElement_OFXMLElementBuilderDelegate alloc] init]
+	delegate = [[[OFXMLElementElementBuilderDelegate alloc] init]
 	    autorelease];
 
 	parser.delegate = builder;
 	builder.delegate = delegate;
 
@@ -249,19 +249,19 @@
 - (instancetype)initWithFile: (OFString *)path
 {
 	void *pool;
 	OFXMLParser *parser;
 	OFXMLElementBuilder *builder;
-	OFXMLElement_OFXMLElementBuilderDelegate *delegate;
+	OFXMLElementElementBuilderDelegate *delegate;
 
 	[self release];
 
 	pool = objc_autoreleasePoolPush();
 
 	parser = [OFXMLParser parser];
 	builder = [OFXMLElementBuilder elementBuilder];
-	delegate = [[[OFXMLElement_OFXMLElementBuilderDelegate alloc] init]
+	delegate = [[[OFXMLElementElementBuilderDelegate alloc] init]
 	    autorelease];
 
 	parser.delegate = builder;
 	builder.delegate = delegate;