Index: tests/OFXMLParserTests.m
==================================================================
--- tests/OFXMLParserTests.m
+++ tests/OFXMLParserTests.m
@@ -25,12 +25,12 @@
 static OFString *module = @"OFXMLParser";
 static int i = 0;
 
 enum event_type {
 	PROCESSING_INSTRUCTIONS,
-	TAG_START,
-	TAG_END,
+	TAG_OPEN,
+	TAG_CLOSE,
 	STRING,
 	CDATA,
 	COMMENT
 };
 
@@ -56,11 +56,11 @@
 	case 2:
 		TEST(msg, type == PROCESSING_INSTRUCTIONS &&
 		    [string isEqual: @"p?i"])
 		break;
 	case 3:
-		TEST(msg, type == TAG_START && [name isEqual: @"root"] &&
+		TEST(msg, type == TAG_OPEN && [name isEqual: @"root"] &&
 		    prefix == nil && ns == nil && attrs.count == 0)
 		break;
 	case 4:
 		TEST(msg, type == STRING && [string isEqual: @"\n\n "])
 		break;
@@ -67,22 +67,22 @@
 	case 5:
 		TEST(msg, type == CDATA && [string isEqual: @"f<]]]oo]"] &&
 		    parser.lineNumber == 3)
 		break;
 	case 6:
-		TEST(msg, type == TAG_START && [name isEqual: @"bar"] &&
+		TEST(msg, type == TAG_OPEN && [name isEqual: @"bar"] &&
 		    prefix == nil && ns == nil && attrs == nil)
 		break;
 	case 7:
-		TEST(msg, type == TAG_END && [name isEqual: @"bar"] &&
+		TEST(msg, type == TAG_CLOSE && [name isEqual: @"bar"] &&
 		    prefix == nil && ns == nil && attrs == nil)
 		break;
 	case 8:
 		TEST(msg, type == STRING && [string isEqual: @"\n "])
 		break;
 	case 9:
-		TEST(msg, type == TAG_START && [name isEqual: @"foobar"] &&
+		TEST(msg, type == TAG_OPEN && [name isEqual: @"foobar"] &&
 		    prefix == nil && [ns isEqual: @"urn:objfw:test:foobar"] &&
 		    attrs.count == 1 &&
 		    /* xmlns attr */
 		    [[[attrs objectAtIndex: 0] name] isEqual: @"xmlns"] &&
 		    [[attrs objectAtIndex: 0] namespace] == nil &&
@@ -91,11 +91,11 @@
 		break;
 	case 10:
 		TEST(msg, type == STRING && [string isEqual: @"\n  "])
 		break;
 	case 11:
-		TEST(msg, type == TAG_START && [name isEqual: @"qux"] &&
+		TEST(msg, type == TAG_OPEN && [name isEqual: @"qux"] &&
 		    prefix == nil && [ns isEqual: @"urn:objfw:test:foobar"] &&
 		    attrs.count == 1 &&
 		    /* xmlns:foo attr */
 		    [[[attrs objectAtIndex: 0] name] isEqual: @"foo"] &&
 		    [[[attrs objectAtIndex: 0] namespace] isEqual:
@@ -105,11 +105,11 @@
 		break;
 	case 12:
 		TEST(msg, type == STRING && [string isEqual: @"\n   "])
 		break;
 	case 13:
-		TEST(msg, type == TAG_START && [name isEqual: @"bla"] &&
+		TEST(msg, type == TAG_OPEN && [name isEqual: @"bla"] &&
 		    [prefix isEqual: @"foo"] &&
 		    [ns isEqual: @"urn:objfw:test:foo"] &&
 		    attrs.count == 2 &&
 		    /* foo:bla attr */
 		    [[[attrs objectAtIndex: 0] name] isEqual: @"bla"] &&
@@ -123,11 +123,11 @@
 		break;
 	case 14:
 		TEST(msg, type == STRING && [string isEqual: @"\n    "])
 		break;
 	case 15:
-		TEST(msg, type == TAG_START && [name isEqual: @"blup"] &&
+		TEST(msg, type == TAG_OPEN && [name isEqual: @"blup"] &&
 		    prefix == nil && [ns isEqual: @"urn:objfw:test:foobar"] &&
 		    attrs.count == 2 &&
 		    /* foo:qux attr */
 		    [[[attrs objectAtIndex: 0] name] isEqual: @"qux"] &&
 		    [[[attrs objectAtIndex: 0] namespace] isEqual:
@@ -137,18 +137,18 @@
 		    [[[attrs objectAtIndex: 1] name] isEqual: @"quxqux"] &&
 		    [[attrs objectAtIndex: 1] namespace] == nil &&
 		    [[[attrs objectAtIndex: 1] stringValue] isEqual: @"test"])
 		break;
 	case 16:
-		TEST(msg, type == TAG_END && [name isEqual: @"blup"] &&
+		TEST(msg, type == TAG_CLOSE && [name isEqual: @"blup"] &&
 		    prefix == nil && [ns isEqual: @"urn:objfw:test:foobar"])
 		break;
 	case 17:
 		TEST(msg, type == STRING && [string isEqual: @"\n    "])
 		break;
 	case 18:
-		TEST(msg, type == TAG_START && [name isEqual: @"bla"] &&
+		TEST(msg, type == TAG_OPEN && [name isEqual: @"bla"] &&
 		    [prefix isEqual: @"bla"] &&
 		    [ns isEqual: @"urn:objfw:test:bla"] && attrs.count == 3 &&
 		    /* xmlns:bla attr */
 		    [[[attrs objectAtIndex: 0] name] isEqual: @"bla"] &&
 		    [[[attrs objectAtIndex: 0] namespace] isEqual:
@@ -164,19 +164,19 @@
 		    [[[attrs objectAtIndex: 2] namespace] isEqual:
 		    @"urn:objfw:test:bla"] &&
 		    [[[attrs objectAtIndex: 2] stringValue] isEqual: @"blafoo"])
 		break;
 	case 19:
-		TEST(msg, type == TAG_END && [name isEqual: @"bla"] &&
+		TEST(msg, type == TAG_CLOSE && [name isEqual: @"bla"] &&
 		    [prefix isEqual: @"bla"] &&
 		    [ns isEqual: @"urn:objfw:test:bla"])
 		break;
 	case 20:
 		TEST(msg, type == STRING && [string isEqual: @"\n    "])
 		break;
 	case 21:
-		TEST(msg, type == TAG_START && [name isEqual: @"abc"] &&
+		TEST(msg, type == TAG_OPEN && [name isEqual: @"abc"] &&
 		    prefix == nil && [ns isEqual: @"urn:objfw:test:abc"] &&
 		    attrs.count == 3 &&
 		    /* xmlns attr */
 		    [[[attrs objectAtIndex: 0] name] isEqual: @"xmlns"] &&
 		    [[attrs objectAtIndex: 0] namespace] == nil &&
@@ -191,18 +191,18 @@
 		    [[[attrs objectAtIndex: 2] namespace] isEqual:
 		    @"urn:objfw:test:foo"] &&
 		    [[[attrs objectAtIndex: 2] stringValue] isEqual: @"abc"])
 		break;
 	case 22:
-		TEST(msg, type == TAG_END && [name isEqual: @"abc"] &&
+		TEST(msg, type == TAG_CLOSE && [name isEqual: @"abc"] &&
 		    prefix == nil && [ns isEqual: @"urn:objfw:test:abc"])
 		break;
 	case 23:
 		TEST(msg, type == STRING && [string isEqual: @"\n   "])
 		break;
 	case 24:
-		TEST(msg, type == TAG_END && [name isEqual: @"bla"] &&
+		TEST(msg, type == TAG_CLOSE && [name isEqual: @"bla"] &&
 		    [prefix isEqual: @"foo"] &&
 		    [ns isEqual: @"urn:objfw:test:foo"])
 		break;
 	case 25:
 		TEST(msg, type == STRING && [string isEqual: @"\n   "])
@@ -212,25 +212,25 @@
 		break;
 	case 27:
 		TEST(msg, type == STRING && [string isEqual: @"\n  "])
 		break;
 	case 28:
-		TEST(msg, type == TAG_END && [name isEqual: @"qux"] &&
+		TEST(msg, type == TAG_CLOSE && [name isEqual: @"qux"] &&
 		    prefix == nil && [ns isEqual: @"urn:objfw:test:foobar"])
 		break;
 	case 29:
 		TEST(msg, type == STRING && [string isEqual: @"\n "])
 		break;
 	case 30:
-		TEST(msg, type == TAG_END && [name isEqual: @"foobar"] &&
+		TEST(msg, type == TAG_CLOSE && [name isEqual: @"foobar"] &&
 		    prefix == nil && [ns isEqual: @"urn:objfw:test:foobar"])
 		break;
 	case 31:
 		TEST(msg, type == STRING && [string isEqual: @"\n"])
 		break;
 	case 32:
-		TEST(msg, type == TAG_END && [name isEqual: @"root"] &&
+		TEST(msg, type == TAG_CLOSE && [name isEqual: @"root"] &&
 		    prefix == nil && ns == nil);
 		break;
 	}
 }
 
@@ -251,11 +251,11 @@
 	   prefix: (OFString *)prefix
 	namespace: (OFString *)ns
        attributes: (OFArray *)attrs
 {
 	[self	    parser: parser
-	    didCreateEvent: TAG_START
+	    didCreateEvent: TAG_OPEN
 		      name: name
 		    prefix: prefix
 		 namespace: ns
 		attributes: attrs
 		    string: nil];
@@ -265,11 +265,11 @@
   didEndElement: (OFString *)name
 	 prefix: (OFString *)prefix
       namespace: (OFString *)ns
 {
 	[self	    parser: parser
-	    didCreateEvent: TAG_END
+	    didCreateEvent: TAG_CLOSE
 		      name: name
 		    prefix: prefix
 		 namespace: ns
 		attributes: nil
 		    string: nil];