diff --git a/src/java/org/jivesoftware/spark/Workspace.java b/src/java/org/jivesoftware/spark/Workspace.java
index 6575b2d2..17bdb8e5 100644
--- a/src/java/org/jivesoftware/spark/Workspace.java
+++ b/src/java/org/jivesoftware/spark/Workspace.java
@@ -30,7 +30,7 @@ import org.jivesoftware.spark.ui.ChatRoomNotFoundException;
 import org.jivesoftware.spark.ui.CommandPanel;
 import org.jivesoftware.spark.ui.ContactItem;
 import org.jivesoftware.spark.ui.ContactList;
-import org.jivesoftware.spark.ui.conferences.Conferences;
+import org.jivesoftware.spark.ui.conferences.ConferencePlugin;
 import org.jivesoftware.spark.ui.status.StatusBar;
 import org.jivesoftware.spark.util.SwingWorker;
 import org.jivesoftware.spark.util.log.Log;
@@ -77,7 +77,7 @@ public class Workspace extends JPanel implements PacketListener {
     private StatusBar statusBox;
     private CommandPanel commandPanel;
     private ContactList contactList;
-    private Conferences conferences;
+    private ConferencePlugin conferences;
 
     private static Workspace singleton;
     private static final Object LOCK = new Object();
@@ -186,7 +186,7 @@ public class Workspace extends JPanel implements PacketListener {
         // Load VCard information for status box
         statusBox.loadVCard();
 
-        conferences = new Conferences();
+        conferences = new ConferencePlugin();
         conferences.initialize();
 
         // Initialize Search Service
diff --git a/src/java/org/jivesoftware/spark/ui/conferences/BookmarkedConferences.java b/src/java/org/jivesoftware/spark/ui/conferences/BookmarkedConferences.java
index a72557a1..60990426 100644
--- a/src/java/org/jivesoftware/spark/ui/conferences/BookmarkedConferences.java
+++ b/src/java/org/jivesoftware/spark/ui/conferences/BookmarkedConferences.java
@@ -274,7 +274,7 @@ public class BookmarkedConferences extends JPanel {
     }
 
     public void browseRooms(String serviceName) {
-        ConferenceRooms rooms = new ConferenceRooms(tree, serviceName);
+        ConferenceRoomBrowser rooms = new ConferenceRoomBrowser(tree, serviceName);
         rooms.invoke();
     }
 
diff --git a/src/java/org/jivesoftware/spark/ui/conferences/Conferences.java b/src/java/org/jivesoftware/spark/ui/conferences/ConferencePlugin.java
similarity index 96%
rename from src/java/org/jivesoftware/spark/ui/conferences/Conferences.java
rename to src/java/org/jivesoftware/spark/ui/conferences/ConferencePlugin.java
index 729a0bb7..02105320 100644
--- a/src/java/org/jivesoftware/spark/ui/conferences/Conferences.java
+++ b/src/java/org/jivesoftware/spark/ui/conferences/ConferencePlugin.java
@@ -35,7 +35,6 @@ import org.jivesoftware.spark.ui.ContactList;
 import org.jivesoftware.spark.ui.PresenceListener;
 import org.jivesoftware.spark.ui.rooms.ChatRoomImpl;
 import org.jivesoftware.spark.ui.rooms.GroupChatRoom;
-import org.jivesoftware.spark.ui.status.StatusBar;
 import org.jivesoftware.spark.util.ModelUtil;
 import org.jivesoftware.spark.util.SwingWorker;
 import org.jivesoftware.spark.util.log.Log;
@@ -59,7 +58,7 @@ import java.util.List;
  * Conference plugin is reponsible for the initial loading of MultiUser Chat support. To disable plugin,
  * you can remove from the plugins.xml file located in the classpath of Communicator.
  */
-public class Conferences {
+public class ConferencePlugin {
     private static BookmarkedConferences bookedMarkedConferences;
 
     private boolean mucSupported;
@@ -88,7 +87,7 @@ public class Conferences {
             commandPanel.add(joinConference);
             joinConference.addActionListener(new ActionListener() {
                 public void actionPerformed(ActionEvent e) {
-                    ConferenceRooms rooms = new ConferenceRooms(bookedMarkedConferences.getTree(), getDefaultServiceName());
+                    ConferenceRoomBrowser rooms = new ConferenceRoomBrowser(bookedMarkedConferences.getTree(), getDefaultServiceName());
                     rooms.invoke();
                 }
             });
diff --git a/src/java/org/jivesoftware/spark/ui/conferences/ConferenceRooms.java b/src/java/org/jivesoftware/spark/ui/conferences/ConferenceRoomBrowser.java
similarity index 96%
rename from src/java/org/jivesoftware/spark/ui/conferences/ConferenceRooms.java
rename to src/java/org/jivesoftware/spark/ui/conferences/ConferenceRoomBrowser.java
index f558bef5..1464861d 100644
--- a/src/java/org/jivesoftware/spark/ui/conferences/ConferenceRooms.java
+++ b/src/java/org/jivesoftware/spark/ui/conferences/ConferenceRoomBrowser.java
@@ -72,7 +72,7 @@ import javax.swing.tree.TreePath;
  * creation and joining of rooms for group chat discussions as well as the listing
  * of the creation times, number of occupants in a room, and the room name itself.
  */
-public class ConferenceRooms extends JPanel implements ActionListener {
+public class ConferenceRoomBrowser extends JPanel implements ActionListener {
     private final RoomList roomsTable;
     private final RolloverButton createButton = new RolloverButton("", SparkRes.getImageIcon(SparkRes.SMALL_USER1_NEW));
     private final RolloverButton joinRoomButton = new RolloverButton("", SparkRes.getImageIcon(SparkRes.DOOR_IMAGE));
@@ -95,7 +95,7 @@ public class ConferenceRooms extends JPanel implements ActionListener {
      * @param serviceName the name of the conference service.
      *                    //TODO This needs to be refactored.
      */
-    public ConferenceRooms(final Tree serviceTree, final String serviceName) {
+    public ConferenceRoomBrowser(final Tree serviceTree, final String serviceName) {
 
         this.setLayout(new BorderLayout());
 
@@ -272,7 +272,7 @@ public class ConferenceRooms extends JPanel implements ActionListener {
         if (!isBookmarked) {
             JiveTreeNode node = (JiveTreeNode)serviceTree.getLastSelectedPathComponent();
             if (node == null) {
-                TreePath path = serviceTree.findByName(serviceTree, new String[]{rootNode.toString(), Conferences.getDefaultServiceName()});
+                TreePath path = serviceTree.findByName(serviceTree, new String[]{rootNode.toString(), ConferencePlugin.getDefaultServiceName()});
                 node = (JiveTreeNode)path.getLastPathComponent();
             }
             JiveTreeNode roomNode = new JiveTreeNode(roomName, false, SparkRes.getImageIcon(SparkRes.BOOKMARK_ICON));