diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/CallJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/CallJabberImpl.java
index a4e1f9eb7..62fcd28f7 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/CallJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/CallJabberImpl.java
@@ -68,7 +68,7 @@ public void addCallPeer(CallPeerJabberImpl callParticipant)
         callParticipant.addCallPeerListener(this);
 
         this.callParticipants.add(callParticipant);
-        fireCallParticipantEvent(
+        fireCallPeerEvent(
             callParticipant, CallPeerEvent.CALL_PEER_ADDED);
     }
 
@@ -88,7 +88,7 @@ public void removeCallParticipant(CallPeerJabberImpl callParticipant)
         callParticipant.setCall(null);
         callParticipant.removeCallPeerListener(this);
 
-        fireCallParticipantEvent(
+        fireCallPeerEvent(
             callParticipant, CallPeerEvent.CALL_PEER_REMVOVED);
 
         if(callParticipants.size() == 0)
diff --git a/src/net/java/sip/communicator/impl/protocol/mock/MockCall.java b/src/net/java/sip/communicator/impl/protocol/mock/MockCall.java
index f66601b4f..b14cc5d1e 100644
--- a/src/net/java/sip/communicator/impl/protocol/mock/MockCall.java
+++ b/src/net/java/sip/communicator/impl/protocol/mock/MockCall.java
@@ -72,7 +72,7 @@ public void addCallParticipant(MockCallParticipant callParticipant)
 
         logger.info("Will fire participant added");
 
-        fireCallParticipantEvent(
+        fireCallPeerEvent(
             callParticipant, CallPeerEvent.CALL_PEER_ADDED);
     }
 
@@ -91,7 +91,7 @@ public void removeCallParticipant(MockCallParticipant callParticipant)
         this.callParticipants.remove(callParticipant);
         callParticipant.removeCallPeerListener(this);
 
-        fireCallParticipantEvent(
+        fireCallPeerEvent(
             callParticipant, CallPeerEvent.CALL_PEER_REMVOVED);
 
         if(callParticipants.size() == 0)
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/CallSipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/CallSipImpl.java
index edfef96c1..2e55a70aa 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/CallSipImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/CallSipImpl.java
@@ -65,7 +65,7 @@ public void addCallPeer(CallPeerSipImpl callParticipant)
         callParticipant.addCallPeerListener(this);
 
         this.callParticipants.add(callParticipant);
-        fireCallParticipantEvent(callParticipant,
+        fireCallPeerEvent(callParticipant,
             CallPeerEvent.CALL_PEER_ADDED);
     }
 
@@ -86,7 +86,7 @@ public void removeCallParticipant(CallPeerSipImpl callParticipant)
 
         try
         {
-            fireCallParticipantEvent(callParticipant,
+            fireCallPeerEvent(callParticipant,
                 CallPeerEvent.CALL_PEER_REMVOVED);
         }
         finally
diff --git a/src/net/java/sip/communicator/service/protocol/Call.java b/src/net/java/sip/communicator/service/protocol/Call.java
index f7912a3e4..4a8661230 100644
--- a/src/net/java/sip/communicator/service/protocol/Call.java
+++ b/src/net/java/sip/communicator/service/protocol/Call.java
@@ -120,21 +120,21 @@ public int hashCode()
     }
 
     /**
-     * Returns an iterator over all call participants.
-     * @return an Iterator over all participants currently involved in the call.
+     * Returns an iterator over all call peers.
+     * @return an Iterator over all peers currently involved in the call.
      */
     public abstract Iterator<CallPeer> getCallPeers();
 
     /**
-     * Returns the number of participants currently associated with this call.
-     * @return an <tt>int</tt> indicating the number of participants currently
+     * Returns the number of peers currently associated with this call.
+     * @return an <tt>int</tt> indicating the number of peers currently
      * associated with this call.
      */
     public abstract int getCallPeerCount();
 
     /**
      * Adds a call change listener to this call so that it could receive events
-     * on new call participants, theme changes and others.
+     * on new call peers, theme changes and others.
      *
      * @param listener the listener to register
      */
@@ -172,21 +172,21 @@ public ProtocolProviderService getProtocolProvider()
     }
 
     /**
-     * Creates a <tt>CallParticipantEvent</tt> with
-     * <tt>sourceCallParticipant</tt> and <tt>eventID</tt> and dispatches it on
+     * Creates a <tt>CallPeerEvent</tt> with
+     * <tt>sourceCallPeer</tt> and <tt>eventID</tt> and dispatches it on
      * all currently registered listeners.
      *
-     * @param sourceCallParticipant the source <tt>CallParticipant</tt> for the
+     * @param sourceCallPeer the source <tt>CallPeer</tt> for the
      * newly created event.
      * @param eventID the ID of the event to create (see CPE member ints)
      */
-    protected void fireCallParticipantEvent(CallPeer sourceCallParticipant,
-                                            int             eventID)
+    protected void fireCallPeerEvent(CallPeer sourceCallPeer,
+                                     int      eventID)
     {
         CallPeerEvent cpEvent = new CallPeerEvent(
-            sourceCallParticipant, this, eventID);
+            sourceCallPeer, this, eventID);
 
-        logger.debug("Dispatching a CallParticipant event to "
+        logger.debug("Dispatching a CallPeer event to "
                      + callListeners.size()
                      +" listeners. event is: " + cpEvent.toString());
 
@@ -215,7 +215,7 @@ else if (eventID == CallPeerEvent.CALL_PEER_REMVOVED)
      */
     public String toString()
     {
-        return "Call: id=" + getCallID() + " participants="
+        return "Call: id=" + getCallID() + " peers="
                            + getCallPeerCount();
     }
 
@@ -300,7 +300,7 @@ public boolean isDefaultEncrypted()
 
     /**
      * Check if to include the ZRTP attribute to SIP/SDP
-     * 
+     *
      * @return include the ZRTP attribute to SIP/SDP
      */
     public boolean isSipZrtpAttribute() {