@@ -118,12 +118,12 @@
 
 	attributeNS = namespace_for_prefix(attributePrefix, namespaces);
 
 	if ((attributePrefix != nil && attributeNS == nil))
 		@throw [OFUnboundNamespaceException
-		    newWithClass: isa
-			  prefix: attributePrefix];
+		    exceptionWithClass: isa
+				prefix: attributePrefix];
 
 	[attribute->ns release];
 	attribute->ns = [attributeNS retain];
 }
 
@@ -156,11 +156,11 @@
 	memcpy(selectors, selectors_, sizeof(selectors_));
 
 	for (i = 0; i < OF_XMLPARSER_NUM_STATES; i++) {
 		if (![self instancesRespondToSelector: selectors[i]])
 			@throw [OFInitializationFailedException
-			    newWithClass: self];
+			    exceptionWithClass: self];
 
 		lookupTable[i] = (state_function)
 		    [self instanceMethodForSelector: selectors[i]];
 	}
 }
@@ -302,12 +302,12 @@
 	size_t length;
 
 	if ((finishedParsing || [previous count] < 1) && buffer[*i] != ' ' &&
 	    buffer[*i] != '\t' && buffer[*i] != '\n' && buffer[*i] != '\r' &&
 	    buffer[*i] != '\f' && buffer[*i] != '<')
-		@throw [OFMalformedXMLException newWithClass: isa
-						      parser: self];
+		@throw [OFMalformedXMLException exceptionWithClass: isa
+							    parser: self];
 
 	if (buffer[*i] != '<')
 		return;
 
 	if ((length = *i - *last) > 0)
@@ -336,12 +336,12 @@
 - (void)_parseTagOpenedWithBuffer: (const char*)buffer
 				i: (size_t*)i
 			     last: (size_t*)last
 {
 	if (finishedParsing && buffer[*i] != '!' && buffer[*i] != '?')
-		@throw [OFMalformedXMLException newWithClass: isa
-						      parser: self];
+		@throw [OFMalformedXMLException exceptionWithClass: isa
+							    parser: self];
 
 	switch (buffer[*i]) {
 		case '?':
 			*last = *i + 1;
 			state = OF_XMLPARSER_IN_PROCESSING_INSTRUCTIONS;
@@ -479,12 +479,12 @@
 		if ([pi isEqual: @"xml"] || [pi hasPrefix: @"xml "] ||
 		    [pi hasPrefix: @"xml\t"] || [pi hasPrefix: @"xml\r"] ||
 		    [pi hasPrefix: @"xml\n"])
 			if (![self _parseXMLProcessingInstructions: pi])
 				@throw [OFMalformedXMLException
-				    newWithClass: isa
-					parser: self];
+				    exceptionWithClass: isa
+						parser: self];
 
 		[delegate parser: self
 		    foundProcessingInstructions: pi];
 
 		[pool release];
@@ -539,13 +539,13 @@
 		OFString *ns;
 
 		ns = namespace_for_prefix(prefix, namespaces);
 
 		if (prefix != nil && ns == nil)
-			@throw
-			    [OFUnboundNamespaceException newWithClass: isa
-							       prefix: prefix];
+			@throw [OFUnboundNamespaceException
+			    exceptionWithClass: isa
+					prefix: prefix];
 
 		pool2 = [[OFAutoreleasePool alloc] init];
 
 		[delegate parser: self
 		 didStartElement: name
@@ -624,21 +624,21 @@
 		name = [cacheString copy];
 		prefix = nil;
 	}
 
 	if (![[previous lastObject] isEqual: cacheString])
-		@throw [OFMalformedXMLException newWithClass: isa
-						      parser: self];
+		@throw [OFMalformedXMLException exceptionWithClass: isa
+							    parser: self];
 
 	[previous removeLastObject];
 
 	[cache removeNItems: [cache count]];
 
 	ns = namespace_for_prefix(prefix, namespaces);
 	if (prefix != nil && ns == nil)
-		@throw [OFUnboundNamespaceException newWithClass: isa
-							  prefix: prefix];
+		@throw [OFUnboundNamespaceException exceptionWithClass: isa
+								prefix: prefix];
 
 	[delegate parser: self
 	   didEndElement: name
 	      withPrefix: prefix
 	       namespace: ns];
@@ -685,12 +685,12 @@
 	attributesCount = [attributes count];
 
 	ns = namespace_for_prefix(prefix, namespaces);
 
 	if (prefix != nil && ns == nil)
-		@throw [OFUnboundNamespaceException newWithClass: isa
-							  prefix: prefix];
+		@throw [OFUnboundNamespaceException exceptionWithClass: isa
+								prefix: prefix];
 
 	for (j = 0; j < attributesCount; j++)
 		resolve_attribute_namespace(attributesCArray[j], namespaces,
 		    isa);
 
@@ -790,12 +790,12 @@
 	if (buffer[*i] == ' ' || buffer[*i] == '\t' || buffer[*i] == '\n' ||
 	    buffer[*i] == '\r' || buffer[*i] == '\f')
 		return;
 
 	if (buffer[*i] != '\'' && buffer[*i] != '"')
-		@throw [OFMalformedXMLException newWithClass: isa
-						      parser: self];
+		@throw [OFMalformedXMLException exceptionWithClass: isa
+							    parser: self];
 
 	delimiter = buffer[*i];
 	state = OF_XMLPARSER_IN_ATTR_VALUE;
 }
 
@@ -850,12 +850,12 @@
 {
 	if (buffer[*i] == '>') {
 		*last = *i + 1;
 		state = OF_XMLPARSER_OUTSIDE_TAG;
 	} else
-		@throw [OFMalformedXMLException newWithClass: isa
-						      parser: self];
+		@throw [OFMalformedXMLException exceptionWithClass: isa
+							    parser: self];
 }
 
 /* Expecting closing '>' or space */
 - (void)_parseExpectSpaceOrCloseWithBuffer: (const char*)buffer
 					 i: (size_t*)i
@@ -864,22 +864,22 @@
 	if (buffer[*i] == '>') {
 		*last = *i + 1;
 		state = OF_XMLPARSER_OUTSIDE_TAG;
 	} else if (buffer[*i] != ' ' && buffer[*i] != '\t' &&
 	    buffer[*i] != '\n' && buffer[*i] != '\r' && buffer[*i] != '\f')
-		@throw [OFMalformedXMLException newWithClass: isa
-						      parser: self];
+		@throw [OFMalformedXMLException exceptionWithClass: isa
+							    parser: self];
 }
 
 /* In <! */
 - (void)_parseInExclamationMarkWithBuffer: (const char*)buffer
 					i: (size_t*)i
 				     last: (size_t*)last
 {
 	if (finishedParsing && buffer[*i] != '-')
-		@throw [OFMalformedXMLException newWithClass: isa
-						      parser: self];
+		@throw [OFMalformedXMLException exceptionWithClass: isa
+							    parser: self];
 
 	if (buffer[*i] == '-')
 		state = OF_XMLPARSER_IN_COMMENT_OPENING;
 	else if (buffer[*i] == '[') {
 		state = OF_XMLPARSER_IN_CDATA_OPENING;
@@ -886,12 +886,12 @@
 		level = 0;
 	} else if (buffer[*i] == 'D') {
 		state = OF_XMLPARSER_IN_DOCTYPE;
 		level = 0;
 	} else
-		@throw [OFMalformedXMLException newWithClass: isa
-						      parser: self];
+		@throw [OFMalformedXMLException exceptionWithClass: isa
+							    parser: self];
 
 	*last = *i + 1;
 }
 
 /* CDATA */
@@ -898,12 +898,12 @@
 - (void)_parseInCDATAOpeningWithBuffer: (const char*)buffer
 				     i: (size_t*)i
 				  last: (size_t*)last
 {
 	if (buffer[*i] != "CDATA["[level])
-		@throw [OFMalformedXMLException newWithClass: isa
-						      parser: self];
+		@throw [OFMalformedXMLException exceptionWithClass: isa
+							    parser: self];
 
 	if (++level == 6) {
 		state = OF_XMLPARSER_IN_CDATA_1;
 		level = 0;
 	}
@@ -958,12 +958,12 @@
 - (void)_parseInCommentOpeningWithBuffer: (const char*)buffer
 				       i: (size_t*)i
 				    last: (size_t*)last
 {
 	if (buffer[*i] != '-')
-		@throw [OFMalformedXMLException newWithClass: isa
-						      parser: self];
+		@throw [OFMalformedXMLException exceptionWithClass: isa
+							    parser: self];
 
 	*last = *i + 1;
 	state = OF_XMLPARSER_IN_COMMENT_1;
 	level = 0;
 }
@@ -987,12 +987,12 @@
 {
 	OFAutoreleasePool *pool;
 	OFString *comment;
 
 	if (buffer[*i] != '>')
-		@throw [OFMalformedXMLException newWithClass: isa
-						      parser: self];
+		@throw [OFMalformedXMLException exceptionWithClass: isa
+							    parser: self];
 
 	pool = [[OFAutoreleasePool alloc] init];
 
 	cache_append(cache, buffer + *last, encoding, *i - *last);
 	comment = transform_string(cache, 2, NO, nil);
@@ -1014,12 +1014,12 @@
 			     last: (size_t*)last
 {
 	if ((level < 6 && buffer[*i] != "OCTYPE"[level]) ||
 	    (level == 6 && buffer[*i] != ' ' && buffer[*i] != '\t' &&
 	    buffer[*i] != '\n' && buffer[*i] != '\r' && buffer[*i] != '\f'))
-		@throw [OFMalformedXMLException newWithClass: isa
-						      parser: self];
+		@throw [OFMalformedXMLException exceptionWithClass: isa
+							    parser: self];
 
 	if (level < 7 || buffer[*i] == '<')
 		level++;
 
 	if (buffer[*i] == '>') {