--- a/src/com/beem/project/beem/ui/ContactList.java	Mon Aug 10 00:26:59 2009 +0200
+++ b/src/com/beem/project/beem/ui/ContactList.java	Mon Aug 10 03:55:05 2009 +0200
@@ -298,10 +298,10 @@
 	    }
 	}
 
-	private final List<DataSetObserver> observers;
+	private final List<DataSetObserver> mObservers;
 
 	public MyExpandableListAdapter() {
-	    observers = new ArrayList<DataSetObserver>();
+	    mObservers = new ArrayList<DataSetObserver>();
 	}
 
 	@Override
@@ -368,7 +368,7 @@
 	    for (String name : mGroupName) {
 		Collections.sort(mGroupMap.get(name), new ComparatorContactListByStatusAndName<Contact>());
 	    }
-	    for (DataSetObserver obs : observers) {
+	    for (DataSetObserver obs : mObservers) {
 		obs.onChanged();
 	    }
 	}
@@ -492,12 +492,12 @@
 
 	@Override
 	public void registerDataSetObserver(DataSetObserver observer) {
-	    observers.add(observer);
+	    mObservers.add(observer);
 	}
 
 	@Override
 	public void unregisterDataSetObserver(DataSetObserver observer) {
-	    observers.remove(observer);
+	    mObservers.remove(observer);
 	}
     }
 

--- a/src/com/beem/project/beem/ui/Login.java	Mon Aug 10 00:26:59 2009 +0200
+++ b/src/com/beem/project/beem/ui/Login.java	Mon Aug 10 03:55:05 2009 +0200
@@ -215,16 +215,16 @@
     }
 
     private class BeemServiceConnection implements ServiceConnection {
-	private IXmppConnection xmppConnection = null;
+	private IXmppConnection mXmppConnection = null;
 
 	@Override
 	public void onServiceConnected(ComponentName name, IBinder service) {
 	    mIsConnected = true;
 	    mXmppFacade = IXmppFacade.Stub.asInterface(service);
 	    try {
-		xmppConnection = mXmppFacade.createConnection();
-		xmppConnection.addConnectionListener(new BeemConnectionListener());
-		if (!xmppConnection.isAuthentificated()) {
+		mXmppConnection = mXmppFacade.createConnection();
+		mXmppConnection.addConnectionListener(new BeemConnectionListener());
+		if (!mXmppConnection.isAuthentificated()) {
 		    mConnectionHandler.post(new Runnable() {
 
 			@Override