--- a/src/com/beem/project/beem/ui/Chat.java	Fri Nov 13 19:18:38 2009 +0100
+++ b/src/com/beem/project/beem/ui/Chat.java	Fri Nov 13 20:33:07 2009 +0100
@@ -248,9 +248,9 @@
 		    final List<Contact> openedChats = mChatManager.getOpenedChatList();
 		    
 		    if (openedChats.size() > 0)
-			createChangeChatDialog(openedChats);
+			createChatSwitcherDialog(openedChats);
 		    else
-			createNoMoreChatsDialog();
+			createNoActiveChatsDialog();
 		} catch (RemoteException e) {
 		    Log.e(TAG, e.getMessage());
 		}
@@ -272,7 +272,7 @@
      * Create the change chat dialog.
      * @param openedChats A list containing the JID of participants of the opened chats.
      */
-    private void createChangeChatDialog(final List<Contact> openedChats) {
+    private void createChatSwitcherDialog(final List<Contact> openedChats) {
 	CharSequence[] items = new CharSequence[openedChats.size()];
 
 	int i = 0;
@@ -293,15 +293,15 @@
 		Chat.this.onNewIntent(chatIntent);
 	    }
 	});
-	AlertDialog changeChatDialog = builder.create();
-	changeChatDialog.show();
+	AlertDialog chatSwitcherDialog = builder.create();
+	chatSwitcherDialog.show();
     }
     
-    private void createNoMoreChatsDialog() {
+    private void createNoActiveChatsDialog() {
 	AlertDialog.Builder builder = new AlertDialog.Builder(this);
 	builder.setMessage(getString(R.string.chat_no_more_chats));
-	AlertDialog noMoreChatsDialog = builder.create();
-	noMoreChatsDialog.show();
+	AlertDialog noActiveChatsDialog = builder.create();
+	noActiveChatsDialog.show();
     }
 
     /**