@@ -14,25 +14,25 @@
  */
 
 #include "config.h"
 
 #import "OFXMLElementBuilder.h"
-#import "OFXMLElement.h"
+#import "OFArray.h"
 #import "OFXMLAttribute.h"
-#import "OFXMLCharacters.h"
 #import "OFXMLCDATA.h"
+#import "OFXMLCharacters.h"
 #import "OFXMLComment.h"
-#import "OFXMLProcessingInstructions.h"
+#import "OFXMLElement.h"
 #import "OFXMLParser.h"
-#import "OFArray.h"
+#import "OFXMLProcessingInstruction.h"
 
 #import "OFMalformedXMLException.h"
 
 @implementation OFXMLElementBuilder
 @synthesize delegate = _delegate;
 
-+ (instancetype)elementBuilder
++ (instancetype)builder
 {
 	return [[[self alloc] init] autorelease];
 }
 
 - (instancetype)init
@@ -54,23 +54,24 @@
 	[_stack release];
 
 	[super dealloc];
 }
 
--		 (void)parser: (OFXMLParser *)parser
-  foundProcessingInstructions: (OFString *)pi
+-			  (void)parser: (OFXMLParser *)parser
+  foundProcessingInstructionWithTarget: (OFString *)target
+				  data: (OFString *)data
 {
-	OFXMLProcessingInstructions *node = [OFXMLProcessingInstructions
-	    processingInstructionsWithString: pi];
+	OFXMLProcessingInstruction *node = [OFXMLProcessingInstruction
+	    processingInstructionWithTarget: target
+				       data: data];
 	OFXMLElement *parent = _stack.lastObject;
 
 	if (parent != nil)
 		[parent addChild: node];
 	else if ([_delegate respondsToSelector:
 	    @selector(elementBuilder:didBuildParentlessNode:)])
-		[_delegate elementBuilder: self
-		   didBuildParentlessNode: node];
+		[_delegate elementBuilder: self didBuildParentlessNode: node];
 }
 
 -    (void)parser: (OFXMLParser *)parser
   didStartElement: (OFString *)name
 	   prefix: (OFString *)prefix
@@ -134,12 +135,11 @@
 
 	if (parent != nil)
 		[parent addChild: node];
 	else if ([_delegate respondsToSelector:
 	    @selector(elementBuilder:didBuildParentlessNode:)])
-		[_delegate  elementBuilder: self
-		    didBuildParentlessNode: node];
+		[_delegate  elementBuilder: self didBuildParentlessNode: node];
 }
 
 - (void)parser: (OFXMLParser *)parser
     foundCDATA: (OFString *)CDATA
 {
@@ -148,26 +148,24 @@
 
 	if (parent != nil)
 		[parent addChild: node];
 	else if ([_delegate respondsToSelector:
 	    @selector(elementBuilder:didBuildParentlessNode:)])
-		[_delegate elementBuilder: self
-		   didBuildParentlessNode: node];
+		[_delegate elementBuilder: self didBuildParentlessNode: node];
 }
 
 - (void)parser: (OFXMLParser *)parser
   foundComment: (OFString *)comment
 {
-	OFXMLComment *node = [OFXMLComment commentWithString: comment];
+	OFXMLComment *node = [OFXMLComment commentWithText: comment];
 	OFXMLElement *parent = _stack.lastObject;
 
 	if (parent != nil)
 		[parent addChild: node];
 	else if ([_delegate respondsToSelector:
 	    @selector(elementBuilder:didBuildParentlessNode:)])
-		[_delegate elementBuilder: self
-		   didBuildParentlessNode: node];
+		[_delegate elementBuilder: self didBuildParentlessNode: node];
 }
 
 -      (OFString *)parser: (OFXMLParser *)parser
   foundUnknownEntityNamed: (OFString *)entity
 {