diff --git a/src/org/yaaic/view/ServerActivity.java b/src/org/yaaic/view/ConversationActivity.java
similarity index 97%
rename from src/org/yaaic/view/ServerActivity.java
rename to src/org/yaaic/view/ConversationActivity.java
index 8e4388f..e6eaf14 100644
--- a/src/org/yaaic/view/ServerActivity.java
+++ b/src/org/yaaic/view/ConversationActivity.java
@@ -68,9 +68,9 @@ import org.yaaic.receiver.ServerReceiver;
  * 
  * @author Sebastian Kaspari <sebastian@yaaic.org>
  */
-public class ServerActivity extends Activity implements ServiceConnection, ServerListener, ChannelListener, OnItemClickListener, OnKeyListener, OnItemSelectedListener
+public class ConversationActivity extends Activity implements ServiceConnection, ServerListener, ChannelListener, OnItemClickListener, OnKeyListener, OnItemSelectedListener
 {
-	public static final String TAG = "Yaaic/ServerActivity";
+	public static final String TAG = "Yaaic/ConversationActivity";
 	
 	private int serverId;
 	private Server server;
diff --git a/src/org/yaaic/view/ServersActivity.java b/src/org/yaaic/view/ServersActivity.java
index f1bb09a..79425cb 100644
--- a/src/org/yaaic/view/ServersActivity.java
+++ b/src/org/yaaic/view/ServersActivity.java
@@ -126,7 +126,7 @@ public class ServersActivity extends ListActivity implements ServiceConnection,
 			binder.connect(server);
 		}
 
-		Intent intent = new Intent(this, ServerActivity.class);
+		Intent intent = new Intent(this, ConversationActivity.class);
 		intent.putExtra("serverId", server.getId());
 		startActivityForResult(intent, 0);
 	}