@@ -500,14 +500,14 @@
 
 	if ([[element namespace] isEqual: XMPP_NS_SASL])
 		[self XMPP_handleSASL: element];
 }
 
-- (void)elementBuilder: (OFXMLElementBuilder *)builder
-  didNotExpectCloseTag: (OFString *)name
-	    withPrefix: (OFString *)prefix
-	     namespace: (OFString *)ns
+- (void)elementBuilder: (OFXMLElementBuilder*)builder
+  didNotExpectCloseTag: (OFString*)name
+	    withPrefix: (OFString*)prefix
+	     namespace: (OFString*)ns
 {
 	if (![name isEqual: @"stream"] || ![prefix isEqual: @"stream"] ||
 	    ![ns isEqual: XMPP_NS_STREAM])
 		@throw [OFMalformedXMLException
 		    exceptionWithClass: [builder class]
@@ -531,11 +531,11 @@
 	oldElementBuilder = elementBuilder;
 
 	parser = [[OFXMLParser alloc] init];
 	[parser setDelegate: self];
 
-	elementBuilder = [[OFXMLElementBuilder alloc] init];
+	elementBuilder = [[XMPPXMLElementBuilder alloc] init];
 	[elementBuilder setDelegate: self];
 
 	[sock writeFormat: @"<?xml version='1.0'?>\n"
 			   @"<stream:stream to='%@' "
 			   @"xmlns='" XMPP_NS_CLIENT @"' "