diff --git a/src/exclude.cpp b/src/exclude.cpp
index bf6bfef..8d29629 100644
--- a/src/exclude.cpp
+++ b/src/exclude.cpp
@@ -127,7 +127,7 @@
 
   size_t totalLength = 0;
 
-  // Exclude ::= EXCLUDE-TYPE TLV-LENGTH Any? (NameComponent (Any)?)+
+  // Exclude ::= EXCLUDE-TYPE TLV-LENGTH Any? (GenericNameComponent (Any)?)+
   // Any     ::= ANY-TYPE TLV-LENGTH(=0)
 
   for (const Entry& entry : m_entries) {
@@ -177,7 +177,7 @@
     BOOST_THROW_EXCEPTION(Error("Exclude element cannot be empty"));
   }
 
-  // Exclude ::= EXCLUDE-TYPE TLV-LENGTH Any? (NameComponent (Any)?)+
+  // Exclude ::= EXCLUDE-TYPE TLV-LENGTH Any? (GenericNameComponent (Any)?)+
   // Any     ::= ANY-TYPE TLV-LENGTH(=0)
 
   Block::element_const_iterator i = m_wire.elements_begin();
diff --git a/src/interest.cpp b/src/interest.cpp
index 60e284b..3fc425b 100644
--- a/src/interest.cpp
+++ b/src/interest.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -250,9 +250,9 @@
         return false;
       // There's opportunity to inspect the Exclude filter and determine whether
       // the digest would make a difference.
-      // eg. "<NameComponent>AA</NameComponent><Any/>" doesn't exclude any digest -
-      //     fullName not needed;
-      //     "<Any/><NameComponent>AA</NameComponent>" and
+      // eg. "<GenericNameComponent>AA</GenericNameComponent><Any/>" doesn't exclude
+      //     any digest - fullName not needed;
+      //     "<Any/><GenericNameComponent>AA</GenericNameComponent>" and
       //     "<Any/><ImplicitSha256DigestComponent>ffffffffffffffffffffffffffffffff
       //      </ImplicitSha256DigestComponent>"
       //     excludes all digests - fullName not needed;