@@ -23,26 +23,26 @@
 
 @implementation TestsAppDelegate (OFXMLElementBuilderTests)
 - (void)elementBuilder: (OFXMLElementBuilder *)builder
        didBuildElement: (OFXMLElement *)element
 {
-	OF_ENSURE(i == 0);
+	OFEnsure(i == 0);
 	nodes[i++] = [element retain];
 }
 
 -   (void)elementBuilder: (OFXMLElementBuilder *)builder
   didBuildParentlessNode: (OFXMLNode *)node
 {
-	OF_ENSURE(i == 1);
+	OFEnsure(i == 1);
 	nodes[i++] = [node retain];
 }
 
 - (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;