@@ -43,15 +43,15 @@
 - initWithConnection: (XMPPConnection*)connection_
 {
 	self = [super init];
 
 	@try {
-		rosterItems = [[OFMutableDictionary alloc] init];
-		connection = connection_;
-		[connection addDelegate: self];
-		delegates = [[XMPPMulticastDelegate alloc] init];
-		dataStorage = [connection dataStorage];
+		_rosterItems = [[OFMutableDictionary alloc] init];
+		_connection = connection_;
+		[_connection addDelegate: self];
+		_delegates = [[XMPPMulticastDelegate alloc] init];
+		_dataStorage = [_connection dataStorage];
 	} @catch (id e) {
 		[self release];
 		@throw e;
 	}
 
@@ -58,37 +58,37 @@
 	return self;
 }
 
 - (void)dealloc
 {
-	[connection removeDelegate: self];
-	[delegates release];
-	[rosterItems release];
+	[_connection removeDelegate: self];
+	[_delegates release];
+	[_rosterItems release];
 
 	[super dealloc];
 }
 
 - (OFDictionary*)rosterItems
 {
-	return [[rosterItems copy] autorelease];
+	return [[_rosterItems copy] autorelease];
 }
 
 - (void)requestRoster
 {
 	XMPPIQ *iq;
 	OFXMLElement *query;
 
-	rosterRequested = YES;
+	_rosterRequested = YES;
 
 	iq = [XMPPIQ IQWithType: @"get"
-			     ID: [connection generateStanzaID]];
+			     ID: [_connection generateStanzaID]];
 
 	query = [OFXMLElement elementWithName: @"query"
 				    namespace: XMPP_NS_ROSTER];
 
-	if ([connection supportsRosterVersioning]) {
-		OFString *ver = [dataStorage stringValueForPath: @"roster.ver"];
+	if ([_connection supportsRosterVersioning]) {
+		OFString *ver = [_dataStorage stringValueForPath: @"roster.ver"];
 
 		if (ver == nil)
 			ver = @"";
 
 		[query addAttributeWithName: @"ver"
@@ -95,17 +95,17 @@
 				stringValue: ver];
 	}
 
 	[iq addChild: query];
 
-	[connection sendIQ: iq
-	    callbackTarget: self
-		  selector: @selector(XMPP_handleInitialRosterForConnection:
+	[_connection sendIQ: iq
+	     callbackTarget: self
+		   selector: @selector(XMPP_handleInitialRosterForConnection:
 				IQ:)];
 }
 
-- (BOOL)connection: (XMPPConnection*)connection_
+- (BOOL)connection: (XMPPConnection*)connection
       didReceiveIQ: (XMPPIQ*)iq
 {
 	OFXMLElement *rosterElement;
 	OFXMLElement *element;
 	XMPPRosterItem *rosterItem;
@@ -123,27 +123,27 @@
 				      namespace: XMPP_NS_ROSTER];
 
 	if (element != nil) {
 		rosterItem = [self XMPP_rosterItemWithXMLElement: element];
 
-		[delegates broadcastSelector: @selector(
-						  roster:didReceiveRosterItem:)
-				  withObject: self
-				  withObject: rosterItem];
+		[_delegates broadcastSelector: @selector(
+						   roster:didReceiveRosterItem:)
+				   withObject: self
+				   withObject: rosterItem];
 
 		[self XMPP_updateRosterItem: rosterItem];
 	}
 
-	if ([connection supportsRosterVersioning]) {
+	if ([_connection supportsRosterVersioning]) {
 		OFString *ver =
 		    [[rosterElement attributeForName: @"ver"] stringValue];
-		[dataStorage setStringValue: ver
-				    forPath: @"roster.ver"];
-		[dataStorage save];
+		[_dataStorage setStringValue: ver
+				     forPath: @"roster.ver"];
+		[_dataStorage save];
 	}
 
-	[connection_ sendStanza: [iq resultIQ]];
+	[connection sendStanza: [iq resultIQ]];
 
 	return YES;
 }
 
 - (void)addRosterItem: (XMPPRosterItem*)rosterItem
@@ -151,12 +151,12 @@
 	[self updateRosterItem: rosterItem];
 }
 
 - (void)updateRosterItem: (XMPPRosterItem*)rosterItem
 {
-	XMPPIQ *iq = [XMPPIQ IQWithType: @"set"
-				     ID: [connection generateStanzaID]];
+	XMPPIQ *IQ = [XMPPIQ IQWithType: @"set"
+				     ID: [_connection generateStanzaID]];
 	OFXMLElement *query = [OFXMLElement elementWithName: @"query"
 						  namespace: XMPP_NS_ROSTER];
 	OFXMLElement *item = [OFXMLElement elementWithName: @"item"
 						 namespace: XMPP_NS_ROSTER];
 	OFEnumerator *enumerator;
@@ -173,19 +173,19 @@
 		[item addChild: [OFXMLElement elementWithName: @"group"
 						    namespace: XMPP_NS_ROSTER
 						  stringValue: group]];
 
 	[query addChild: item];
-	[iq addChild: query];
+	[IQ addChild: query];
 
-	[connection sendStanza: iq];
+	[_connection sendStanza: IQ];
 }
 
 - (void)deleteRosterItem: (XMPPRosterItem*)rosterItem
 {
-	XMPPIQ *iq = [XMPPIQ IQWithType: @"set"
-				     ID: [connection generateStanzaID]];
+	XMPPIQ *IQ = [XMPPIQ IQWithType: @"set"
+				     ID: [_connection generateStanzaID]];
 	OFXMLElement *query = [OFXMLElement elementWithName: @"query"
 						  namespace: XMPP_NS_ROSTER];
 	OFXMLElement *item = [OFXMLElement elementWithName: @"item"
 						 namespace: XMPP_NS_ROSTER];
 
@@ -193,48 +193,48 @@
 		       stringValue: [[rosterItem JID] bareJID]];
 	[item addAttributeWithName: @"subscription"
 		       stringValue: @"remove"];
 
 	[query addChild: item];
-	[iq addChild: query];
+	[IQ addChild: query];
 
-	[connection sendStanza: iq];
+	[_connection sendStanza: IQ];
 }
 
 - (void)addDelegate: (id <XMPPRosterDelegate>)delegate
 {
-	[delegates addDelegate: delegate];
+	[_delegates addDelegate: delegate];
 }
 
 - (void)removeDelegate: (id <XMPPRosterDelegate>)delegate
 {
-	[delegates removeDelegate: delegate];
+	[_delegates removeDelegate: delegate];
 }
 
-- (void)setDataStorage: (id <XMPPStorage>)dataStorage_
+- (void)setDataStorage: (id <XMPPStorage>)dataStorage
 {
-	if (rosterRequested)
+	if (_rosterRequested)
 		@throw [OFInvalidArgumentException
 		    exceptionWithClass: [self class]];
 
-	dataStorage = dataStorage_;
+	_dataStorage = dataStorage;
 }
 
 - (XMPPConnection*)connection
 {
-	return connection;
+	return _connection;
 }
 
 - (id <XMPPStorage>)dataStorage
 {
-	return dataStorage;
+	return _dataStorage;
 }
 
 - (void)XMPP_updateRosterItem: (XMPPRosterItem*)rosterItem
 {
-	if ([connection supportsRosterVersioning]) {
-		OFMutableDictionary *items = [[[dataStorage dictionaryForPath:
+	if ([_connection supportsRosterVersioning]) {
+		OFMutableDictionary *items = [[[_dataStorage dictionaryForPath:
 		    @"roster.items"] mutableCopy] autorelease];
 
 		if (items == nil)
 			items = [OFMutableDictionary dictionary];
 
@@ -256,19 +256,19 @@
 			[items setObject: item
 				  forKey: [[rosterItem JID] bareJID]];
 		} else
 			[items removeObjectForKey: [[rosterItem JID] bareJID]];
 
-		[dataStorage setDictionary: items
-				   forPath: @"roster.items"];
+		[_dataStorage setDictionary: items
+				    forPath: @"roster.items"];
 	}
 
 	if (![[rosterItem subscription] isEqual: @"remove"])
-		[rosterItems setObject: rosterItem
-				forKey: [[rosterItem JID] bareJID]];
+		[_rosterItems setObject: rosterItem
+				 forKey: [[rosterItem JID] bareJID]];
 	else
-		[rosterItems removeObjectForKey: [[rosterItem JID] bareJID]];
+		[_rosterItems removeObjectForKey: [[rosterItem JID] bareJID]];
 }
 
 - (XMPPRosterItem*)XMPP_rosterItemWithXMLElement: (OFXMLElement*)element
 {
 	OFString *subscription;
@@ -313,13 +313,13 @@
 	OFXMLElement *element;
 
 	rosterElement = [iq elementForName: @"query"
 				 namespace: XMPP_NS_ROSTER];
 
-	if ([connection supportsRosterVersioning]) {
+	if ([_connection supportsRosterVersioning]) {
 		if (rosterElement == nil) {
-			OFDictionary *items = [dataStorage
+			OFDictionary *items = [_dataStorage
 			    dictionaryForPath: @"roster.items"];
 			OFEnumerator *enumerator = [items objectEnumerator];
 			OFDictionary *item;
 
 			while ((item = [enumerator nextObject]) != nil) {
@@ -335,16 +335,16 @@
 				[rosterItem setSubscription:
 				    [item objectForKey: @"subscription"]];
 				[rosterItem setGroups:
 				    [item objectForKey: @"groups"]];
 
-				[rosterItems setObject: rosterItem
-						forKey: [JID bareJID]];
+				[_rosterItems setObject: rosterItem
+						 forKey: [JID bareJID]];
 			}
 		} else
-			[dataStorage setDictionary: nil
-					   forPath: @"roster.items"];
+			[_dataStorage setDictionary: nil
+					    forPath: @"roster.items"];
 	}
 
 	enumerator = [[rosterElement children] objectEnumerator];
 	while ((element = [enumerator nextObject]) != nil) {
 		OFAutoreleasePool *pool;
@@ -359,17 +359,17 @@
 
 		[self XMPP_updateRosterItem: rosterItem];
 		[pool release];
 	}
 
-	if ([connection supportsRosterVersioning] && rosterElement != nil) {
+	if ([_connection supportsRosterVersioning] && rosterElement != nil) {
 		OFString *ver =
 		    [[rosterElement attributeForName: @"ver"] stringValue];
-		[dataStorage setStringValue: ver
-				    forPath: @"roster.ver"];
-		[dataStorage save];
+		[_dataStorage setStringValue: ver
+				     forPath: @"roster.ver"];
+		[_dataStorage save];
 	}
 
-	[delegates broadcastSelector: @selector(rosterWasReceived:)
-			  withObject: self];
+	[_delegates broadcastSelector: @selector(rosterWasReceived:)
+			   withObject: self];
 }
 @end