@@ -26,19 +26,19 @@
 #import "XMPPMulticastDelegate.h"
 #import "XMPPPresence.h"
 #import "XMPPRosterItem.h"
 
 @implementation XMPPContactManager
-- initWithConnection: (XMPPConnection*)connection_
-	      roster: (XMPPRoster*)roster_
+- initWithConnection: (XMPPConnection*)connection
+	      roster: (XMPPRoster*)roster
 {
 	self = [super init];
 
 	@try {
-		_connection = connection_;
+		_connection = connection;
 		[_connection addDelegate: self];
-		_roster = roster_;
+		_roster = roster;
 		[_roster addDelegate: self];
 		_contacts = [[OFMutableDictionary alloc] init];
 		_delegates = [[XMPPMulticastDelegate alloc] init];
 	} @catch (id e) {
 		[self release];
@@ -87,11 +87,11 @@
 - (OFDictionary*)contacts
 {
 	OF_GETTER(_contacts, true)
 }
 
-- (void)rosterWasReceived: (XMPPRoster*)roster_
+- (void)rosterWasReceived: (XMPPRoster*)roster
 {
 	OFEnumerator *contactEnumerator;
 	XMPPContact *contact;
 	OFDictionary *rosterItems;
 	OFEnumerator *rosterItemEnumerator;
@@ -105,14 +105,14 @@
 				   withObject: contact];
 	}
 	[_contacts release];
 
 	_contacts = [[OFMutableDictionary alloc] init];
-	rosterItems = [roster_ rosterItems];
+	rosterItems = [roster rosterItems];
 	rosterItemEnumerator = [rosterItems keyEnumerator];
 	while ((bareJID = [rosterItemEnumerator nextObject]) != nil) {
-		contact = [[XMPPContact new] autorelease];
+		contact = [[[XMPPContact alloc] init] autorelease];
 		[contact XMPP_setRosterItem:
 		    [rosterItems objectForKey: bareJID]];
 		[_contacts setObject: contact
 			      forKey: bareJID];
 		[_delegates broadcastSelector: @selector(contactManager:
@@ -139,11 +139,11 @@
 		[_contacts removeObjectForKey: bareJID];
 		return;
 	}
 
 	if (contact == nil) {
-		contact = [[XMPPContact new] autorelease];
+		contact = [[[XMPPContact alloc] init] autorelease];
 		[contact XMPP_setRosterItem: rosterItem];
 		[_contacts setObject: contact
 			     forKey: bareJID];
 		[_delegates broadcastSelector: @selector(contactManager:
 						   didAddContact:)