@@ -123,11 +123,11 @@
  * OFXMLParser is an event-based XML parser which calls the delegate's callbacks
  * as soon asit finds something, thus suitable for streams as well.
  */
 @interface OFXMLParser: OFObject <OFStringXMLUnescapingDelegate>
 {
-	id <OFXMLParserDelegate> delegate;
+	id <OFXMLParserDelegate> _delegate;
 	enum {
 		OF_XMLPARSER_OUTSIDE_TAG,
 		OF_XMLPARSER_TAG_OPENED,
 		OF_XMLPARSER_IN_PROCESSING_INSTRUCTIONS,
 		OF_XMLPARSER_IN_TAG_NAME,
@@ -145,27 +145,23 @@
 		OF_XMLPARSER_IN_COMMENT_OPENING,
 		OF_XMLPARSER_IN_COMMENT_1,
 		OF_XMLPARSER_IN_COMMENT_2,
 		OF_XMLPARSER_IN_DOCTYPE,
 		OF_XMLPARSER_NUM_STATES
-	} state;
-	OFDataArray *cache;
-	OFString *name;
-	OFString *prefix;
-	OFMutableArray *namespaces;
-	OFMutableArray *attributes;
-	OFString *attributeName;
-	OFString *attributePrefix;
-	char delimiter;
-	OFMutableArray *previous;
-	size_t level;
-	BOOL acceptProlog;
-	size_t lineNumber;
-	BOOL lastCarriageReturn;
-	BOOL finishedParsing;
-	of_string_encoding_t encoding;
-	size_t depthLimit;
+	} _state;
+	OFDataArray *_cache;
+	OFString *_name, *_prefix;
+	OFMutableArray *_namespaces, *_attributes;
+	OFString *_attributeName, *_attributePrefix;
+	char _delimiter;
+	OFMutableArray *_previous;
+	size_t _level;
+	BOOL _acceptProlog;
+	size_t _lineNumber;
+	BOOL _lastCarriageReturn, _finishedParsing;
+	of_string_encoding_t _encoding;
+	size_t _depthLimit;
 }
 
 #ifdef OF_HAVE_PROPERTIES
 @property (assign) id <OFXMLParserDelegate> delegate;
 @property size_t depthLimit;