diff --git a/src/fetcher.cc b/src/fetcher.cc
index d59f457..44ab9fc 100644
--- a/src/fetcher.cc
+++ b/src/fetcher.cc
@@ -132,8 +132,8 @@
 
   if (m_forwardingHint == Name ())
   {
-    // check whether data is verified in this case; if verified invoke callback
-    if (data->verified())
+    // check whether data integrity is checked in this case
+    if (data->integrityChecked())
     {
       if (!m_segmentCallback.empty ())
       {
@@ -149,12 +149,12 @@
   }
   else
     {
-      // in this case we don't care whether "data" is verified, in fact, we expect it is unverified
+      // in this case we don't care whether "data" is verified,  in fact, we expect it is unverified
       try {
         PcoPtr pco = make_shared<ParsedContentObject> (*data->contentPtr ());
 
         // we need to verify this pco and apply callback only when verified
-        if (m_ccnx->verifyPco(pco))
+        if (m_ccnx->checkPcoIntegrity(pco))
         {
           if (!m_segmentCallback.empty ())
             {
