diff --git a/daemon/table/pit-entry.cpp b/daemon/table/pit-entry.cpp
index 2edbc9f..53929e6 100644
--- a/daemon/table/pit-entry.cpp
+++ b/daemon/table/pit-entry.cpp
@@ -50,7 +50,7 @@
 }
 
 InRecordCollection::iterator
-Entry::getInRecord(const Face& face, uint64_t endpointId)
+Entry::getInRecord(const Face& face, EndpointId endpointId)
 {
   return std::find_if(m_inRecords.begin(), m_inRecords.end(),
     [&face, endpointId] (const InRecord& inRecord) {
@@ -59,7 +59,7 @@
 }
 
 InRecordCollection::iterator
-Entry::insertOrUpdateInRecord(Face& face, uint64_t endpointId, const Interest& interest)
+Entry::insertOrUpdateInRecord(Face& face, EndpointId endpointId, const Interest& interest)
 {
   BOOST_ASSERT(this->canMatch(interest));
 
@@ -77,7 +77,7 @@
 }
 
 void
-Entry::deleteInRecord(const Face& face, uint64_t endpointId)
+Entry::deleteInRecord(const Face& face, EndpointId endpointId)
 {
   auto it = std::find_if(m_inRecords.begin(), m_inRecords.end(),
     [&face, endpointId] (const InRecord& inRecord) {
@@ -95,7 +95,7 @@
 }
 
 OutRecordCollection::iterator
-Entry::getOutRecord(const Face& face, uint64_t endpointId)
+Entry::getOutRecord(const Face& face, EndpointId endpointId)
 {
   return std::find_if(m_outRecords.begin(), m_outRecords.end(),
     [&face, endpointId] (const OutRecord& outRecord) {
@@ -104,7 +104,7 @@
 }
 
 OutRecordCollection::iterator
-Entry::insertOrUpdateOutRecord(Face& face, uint64_t endpointId, const Interest& interest)
+Entry::insertOrUpdateOutRecord(Face& face, EndpointId endpointId, const Interest& interest)
 {
   BOOST_ASSERT(this->canMatch(interest));
 
@@ -122,7 +122,7 @@
 }
 
 void
-Entry::deleteOutRecord(const Face& face, uint64_t endpointId)
+Entry::deleteOutRecord(const Face& face, EndpointId endpointId)
 {
   auto it = std::find_if(m_outRecords.begin(), m_outRecords.end(),
     [&face, endpointId] (const OutRecord& outRecord) {