diff --git a/src/net/java/sip/communicator/impl/callhistory/CallHistoryServiceImpl.java b/src/net/java/sip/communicator/impl/callhistory/CallHistoryServiceImpl.java
index 3e5bcded6..2e2ddb9ec 100644
--- a/src/net/java/sip/communicator/impl/callhistory/CallHistoryServiceImpl.java
+++ b/src/net/java/sip/communicator/impl/callhistory/CallHistoryServiceImpl.java
@@ -380,8 +380,8 @@ else if(propName.equals(STRUCTURE_NAMES[6]))
         final int callParticipantCount = callParticipantIDs == null ? 0 : callParticipantIDs.size();
         for (int i = 0; i < callParticipantCount; i++)
         {
-            CallParticipantRecordImpl cpr =
-                new CallParticipantRecordImpl(callParticipantIDs.get(i),
+            CallPeerRecordImpl cpr =
+                new CallPeerRecordImpl(callParticipantIDs.get(i),
                     new Date(Long.parseLong(callParticipantStart.get(i))),
                     new Date(Long.parseLong(callParticipantEnd.get(i))));
 
@@ -862,7 +862,7 @@ public void peerStateChanged(CallPeerChangeEvent evt)
                     return;
                 else
                 {
-                    CallParticipantRecordImpl participantRecord =
+                    CallPeerRecordImpl participantRecord =
                         findParticipantRecord(evt.getSourceCallParticipant());
 
                     if(participantRecord == null)
@@ -886,7 +886,7 @@ public void peerStateChanged(CallPeerChangeEvent evt)
         });
 
         Date startDate = new Date();
-        CallParticipantRecordImpl newRec = new CallParticipantRecordImpl(
+        CallPeerRecordImpl newRec = new CallPeerRecordImpl(
             callParticipant.getAddress(),
             startDate,
             startDate);
@@ -905,8 +905,8 @@ private void handleParticipantRemoved(CallPeer callParticipant,
         CallRecord callRecord = findCallRecord(srcCall);
         String pAddress = callParticipant.getAddress();
 
-        CallParticipantRecordImpl cpRecord =
-            (CallParticipantRecordImpl)callRecord.findParticipantRecord(pAddress);
+        CallPeerRecordImpl cpRecord =
+            (CallPeerRecordImpl)callRecord.findParticipantRecord(pAddress);
 
         // no such participant
         if(cpRecord == null)
@@ -946,7 +946,7 @@ private CallRecordImpl findCallRecord(Call call)
      * @param callParticipant CallParticipant participant
      * @return CallParticipantRecordImpl the corresponding record
      */
-    private CallParticipantRecordImpl findParticipantRecord(
+    private CallPeerRecordImpl findParticipantRecord(
         CallPeer callParticipant)
     {
         CallRecord record = findCallRecord(callParticipant.getCall());
@@ -954,7 +954,7 @@ private CallParticipantRecordImpl findParticipantRecord(
         if (record == null)
             return null;
 
-        return (CallParticipantRecordImpl) record.findParticipantRecord(
+        return (CallPeerRecordImpl) record.findParticipantRecord(
                 callParticipant.getAddress());
     }
 
diff --git a/src/net/java/sip/communicator/impl/callhistory/CallParticipantRecordImpl.java b/src/net/java/sip/communicator/impl/callhistory/CallParticipantRecordImpl.java
deleted file mode 100644
index c8340dec5..000000000
--- a/src/net/java/sip/communicator/impl/callhistory/CallParticipantRecordImpl.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package net.java.sip.communicator.impl.callhistory;
-
-import java.util.*;
-
-import net.java.sip.communicator.service.callhistory.*;
-import net.java.sip.communicator.service.protocol.*;
-
-/**
- * Added some setters to CallParticipantRecord
- * @author Damian Minkov
- */
-public class CallParticipantRecordImpl
-    extends CallPeerRecord
-{
-    /**
-     * Creates CallParticipantRecord
-     * @param participantAddress String
-     * @param startTime Date
-     * @param endTime Date
-     */
-    public CallParticipantRecordImpl(
-        String participantAddress,
-        Date startTime,
-        Date endTime)
-    {
-        super(participantAddress, startTime, endTime);
-    }
-
-    /**
-     * Sets the time the participant joined the call
-     * @param startTime Date
-     */
-    public void setStartTime(Date startTime)
-    {
-        this.startTime = startTime;
-    }
-
-    /**
-     * Sets the particiapnts address
-     * @param participantAddress String
-     */
-    public void setParticipantAddress(String participantAddress)
-    {
-        this.peerAddress = participantAddress;
-    }
-
-    /**
-     * Sets the time participant leaves the call
-     * @param endTime Date
-     */
-    public void setEndTime(Date endTime)
-    {
-        this.endTime = endTime;
-    }
-
-    /**
-     * Sets the participant state
-     * @param state CallParticipantState
-     */
-    public void setState(CallPeerState state)
-    {
-        this.state = state;
-    }
-}
diff --git a/src/net/java/sip/communicator/impl/callhistory/CallRecordImpl.java b/src/net/java/sip/communicator/impl/callhistory/CallRecordImpl.java
index b4457b99a..efb0c832a 100644
--- a/src/net/java/sip/communicator/impl/callhistory/CallRecordImpl.java
+++ b/src/net/java/sip/communicator/impl/callhistory/CallRecordImpl.java
@@ -62,8 +62,8 @@ public void setEndTime(Date endTime)
 
         for (CallPeerRecord item : participantRecords)
         {
-            CallParticipantRecordImpl itemImpl =
-                (CallParticipantRecordImpl) item;
+            CallPeerRecordImpl itemImpl =
+                (CallPeerRecordImpl) item;
             if (item.getEndTime() == null)
                 itemImpl.setEndTime(endTime);
         }