diff --git a/src/net/java/sip/communicator/impl/gui/UIServiceImpl.java b/src/net/java/sip/communicator/impl/gui/UIServiceImpl.java
index 825e3dd73..52d9dbc63 100644
--- a/src/net/java/sip/communicator/impl/gui/UIServiceImpl.java
+++ b/src/net/java/sip/communicator/impl/gui/UIServiceImpl.java
@@ -24,7 +24,7 @@
 import net.java.sip.communicator.service.contactlist.MetaContact;
 import net.java.sip.communicator.service.gui.AccountRegistrationWizardContainer;
 import net.java.sip.communicator.service.gui.ApplicationWindow;
-import net.java.sip.communicator.service.gui.ConfigurationManager;
+import net.java.sip.communicator.service.gui.ConfigurationWindow;
 import net.java.sip.communicator.service.gui.ContactAwareComponent;
 import net.java.sip.communicator.service.gui.ContainerID;
 import net.java.sip.communicator.service.gui.PopupDialog;
@@ -412,12 +412,12 @@ public AccountRegistrationWizardContainer getAccountRegWizardContainer() {
     }
 
     /**
-     * Implements the <code>UIService.getConfigurationManager</code>.
-     * Returns the current implementation of the <tt>ConfigurationManager</tt>
+     * Implements the <code>UIService.getConfigurationWindow</code>.
+     * Returns the current implementation of the <tt>ConfigurationWindow</tt>
      * interface.
      * @see UIService#getConfigurationManager()
      */
-    public ConfigurationManager getConfigurationManager() {
+    public ConfigurationWindow getConfigurationWindow() {
         return this.configurationFrame;
     }
 }
diff --git a/src/net/java/sip/communicator/service/gui/ConfigurationManager.java b/src/net/java/sip/communicator/service/gui/ConfigurationWindow.java
similarity index 76%
rename from src/net/java/sip/communicator/service/gui/ConfigurationManager.java
rename to src/net/java/sip/communicator/service/gui/ConfigurationWindow.java
index 295f7db68..e0bb7046a 100644
--- a/src/net/java/sip/communicator/service/gui/ConfigurationManager.java
+++ b/src/net/java/sip/communicator/service/gui/ConfigurationWindow.java
@@ -7,7 +7,7 @@
 package net.java.sip.communicator.service.gui;
 
 /**
- * The <tt>ConfigurationManager</tt> is a contianer contianing
+ * The <tt>ConfigurationWindow</tt> is a contianer contianing
  * <tt>ConfigurationForm</tt>s. It is meant to be implemented by the
  * UIService implementation to provide a mechanism for adding and removing
  * configuration forms in the GUI. 
@@ -17,16 +17,16 @@
  * each bundle is able to provide its own configuration form in the UI by adding
  * it through this interface.
  * <p>
- * The <tt>ConfigurationManager</tt> for the current ui implementation could
- * be obtained by invoking <code>UIService.getConfigurationManager</code> method.
+ * The <tt>ConfigurationWindow</tt> for the current ui implementation could
+ * be obtained by invoking <code>UIService.getConfigurationWindow</code> method.
  * 
  * @author Yana Stamcheva
  */
-public interface ConfigurationManager extends ApplicationWindow {
+public interface ConfigurationWindow extends ApplicationWindow {
 
     /**
      * Adds the given <tt>ConfigurationForm</tt> in this
-     * <tt>ConfigurationManager</tt>. Meant to be used by bundles that want to
+     * <tt>ConfigurationWindow</tt>. Meant to be used by bundles that want to
      * add to the UI their own specific configuration forms. 
      * @param configForm The <tt>ConfigurationForm</tt> to add.
      * @throws ClassCastException if the contained form object in the given
@@ -38,11 +38,11 @@ public void addConfigurationForm(ConfigurationForm configForm)
     
     /**
      * Removes the given <tt>ConfigurationForm</tt> from this
-     * <tt>ConfigurationManager</tt>.
+     * <tt>ConfigurationWindow</tt>.
      * 
      * @param configForm The <tt>ConfigurationForm</tt> to remove.
      * @throws IllegalArgumentException if the given <tt>ConfigurationForm</tt>
-     * is not contained in this <tt>ConfigurationManager</tt>.
+     * is not contained in this <tt>ConfigurationWindow</tt>.
      */
     public void removeConfigurationForm(ConfigurationForm configForm)
         throws IllegalArgumentException;
diff --git a/src/net/java/sip/communicator/service/gui/UIService.java b/src/net/java/sip/communicator/service/gui/UIService.java
index 8457cad3a..94d310fa0 100644
--- a/src/net/java/sip/communicator/service/gui/UIService.java
+++ b/src/net/java/sip/communicator/service/gui/UIService.java
@@ -252,16 +252,16 @@ public ApplicationWindow getApplicationWindow(WindowID windowID)
     public ApplicationWindow getChatWindow(Contact contact);
     
     /**
-     * Returns the <tt>ConfigurationManager</tt> implementation for this
-     * UIService implementation. The <tt>ConfigurationManager</tt> is a
+     * Returns the <tt>ConfigurationWindow</tt> implementation for this
+     * UIService implementation. The <tt>ConfigurationWindow</tt> is a
      * contianer contianing <tt>ConfigurationForm</tt>s. It is meant to be
      * implemented by the UIService implementation to provide a mechanism
      * for adding and removing configuration forms in the GUI. 
      * 
-     * @return the <tt>ConfigurationManager</tt> implementation for this
+     * @return the <tt>ConfigurationWindow</tt> implementation for this
      * UIService implementation
      */
-    public ConfigurationManager getConfigurationManager();
+    public ConfigurationWindow getConfigurationWindow();
     
     /**
      * Returns an iterator over a set of windowID-s. Each WindowID points to