diff --git a/src/net/java/sip/communicator/service/protocol/AbstractConferenceMember.java b/src/net/java/sip/communicator/service/protocol/AbstractConferenceMember.java
index e98e0a5c9..8ed775edc 100644
--- a/src/net/java/sip/communicator/service/protocol/AbstractConferenceMember.java
+++ b/src/net/java/sip/communicator/service/protocol/AbstractConferenceMember.java
@@ -11,7 +11,7 @@
 /**
  * Provides the default implementation of the <code>ConferenceMember</code>
  * interface.
- * 
+ *
  * @author Lubomir Marinov
  */
 public class AbstractConferenceMember
@@ -20,10 +20,10 @@ public class AbstractConferenceMember
 {
 
     /**
-     * The <code>CallParticipant</code> which is the conference focus of this
+     * The <code>CallPeer</code> which is the conference focus of this
      * <code>ConferenceMember</code>.
      */
-    private final CallPeer conferenceFocusCallParticipant;
+    private final CallPeer conferenceFocusCallPeer;
 
     /**
      * The user-friendly display name of this <code>ConferenceMember</code> in
@@ -38,17 +38,17 @@ public class AbstractConferenceMember
     private ConferenceMemberState state = ConferenceMemberState.UNKNOWN;
 
     public AbstractConferenceMember(
-        CallPeer conferenceFocusCallParticipant)
+        CallPeer conferenceFocusCallPeer)
     {
-        this.conferenceFocusCallParticipant = conferenceFocusCallParticipant;
+        this.conferenceFocusCallPeer = conferenceFocusCallPeer;
     }
 
     /*
-     * Implements ConferenceMember#getConferenceFocusCallParticipant().
+     * Implements ConferenceMember#getConferenceFocusCallPeer().
      */
-    public CallPeer getConferenceFocusCallParticipant()
+    public CallPeer getConferenceFocusCallPeer()
     {
-        return conferenceFocusCallParticipant;
+        return conferenceFocusCallPeer;
     }
 
     /*
@@ -71,7 +71,7 @@ public ConferenceMemberState getState()
      * Sets the user-friendly display name of this <code>ConferenceMember</code>
      * in the conference and fires a new <code>PropertyChangeEvent</code> for
      * the property <code>#DISPLAY_NAME_PROPERTY_NAME</code>.
-     * 
+     *
      * @param displayName
      *            the user-friendly display name of this
      *            <code>ConferenceMember</code> in the conference
@@ -98,7 +98,7 @@ public void setDisplayName(String displayName)
      * <code>ConferenceMember</code> in the conference and fires a new
      * <code>PropertyChangeEvent</code> for the property
      * <code>#STATE_PROPERTY_NAME</code>.
-     * 
+     *
      * @param state
      *            the state of the device and signaling session of this
      *            <code>ConferenceMember</code> in the conference
diff --git a/src/net/java/sip/communicator/service/protocol/ConferenceMember.java b/src/net/java/sip/communicator/service/protocol/ConferenceMember.java
index 27d908116..cef9e93ee 100644
--- a/src/net/java/sip/communicator/service/protocol/ConferenceMember.java
+++ b/src/net/java/sip/communicator/service/protocol/ConferenceMember.java
@@ -10,8 +10,8 @@
 
 /**
  * Represents a member and its details in a telephony conference managed by a
- * <code>CallParticipant</code> in its role as a conference focus.
- * 
+ * <code>CallPeer</code> in its role as a conference focus.
+ *
  * @author Lubomir Marinov
  */
 public interface ConferenceMember
@@ -37,7 +37,7 @@ public interface ConferenceMember
      * properties of this <code>ConferenceMember</code> such as
      * <code>#DISPLAY_NAME_PROPERTY_NAME</code> and
      * <code>#STATE_PROPERTY_NAME</code>.
-     * 
+     *
      * @param listener
      *            a <code>PropertyChangeListener</code> to be notified about
      *            changes in the values of the properties of this
@@ -50,26 +50,26 @@ public interface ConferenceMember
     /**
      * Gets the user-friendly display name of this <code>ConferenceMember</code>
      * in the conference.
-     * 
+     *
      * @return the user-friendly display name of this
      *         <code>ConferenceMember</code> in the conference
      */
     public String getDisplayName();
 
     /**
-     * Gets the <code>CallParticipant</code> which is the conference focus of
+     * Gets the <code>CallPeer</code> which is the conference focus of
      * this <code>ConferenceMember</code>.
-     * 
-     * @return the <code>CallParticipant</code> which is the conference focus of
+     *
+     * @return the <code>CallPeer</code> which is the conference focus of
      *         this <code>ConferenceMember</code>
      */
-    public CallPeer getConferenceFocusCallParticipant();
+    public CallPeer getConferenceFocusCallPeer();
 
     /**
      * Gets the state of the device and signaling session of this
      * <code>ConferenceMember</code> in the conference in the form of a
      * <code>ConferenceMemberState</code> value.
-     * 
+     *
      * @return a <code>ConferenceMemberState</code> value which represents the
      *         state of the device and signaling session of this
      *         <code>ConferenceMember</code> in the conference
@@ -82,7 +82,7 @@ public interface ConferenceMember
      * properties of this <code>ConferenceMember</code> such as
      * <code>#DISPLAY_NAME_PROPERTY_NAME</code> and
      * <code>#STATE_PROPERTY_NAME</code>.
-     * 
+     *
      * @param listener
      *            a <code>PropertyChangeListener</code> to no longer be notified
      *            about changes in the values of the properties of this