diff --git a/ndn-cpp/Name.cpp b/ndn-cpp/Name.cpp
index 63a0c4f..cdcbd61 100644
--- a/ndn-cpp/Name.cpp
+++ b/ndn-cpp/Name.cpp
@@ -147,7 +147,7 @@
   return result.str();
 }
 
-bool NameComponent::setFromEscapedString(const char *first, const char *last)
+bool Name::Component::setFromEscapedString(const char *first, const char *last)
 {
   string trimmedString(first, last);
   trim(trimmedString);
@@ -217,7 +217,7 @@
     if (iComponentEnd == string::npos)
       iComponentEnd = uri.size();
     
-    components_.push_back(NameComponent());
+    components_.push_back(Component());
     if (!components_[components_.size() - 1].setFromEscapedString(&uri[iComponentStart], &uri[iComponentEnd]))
       // Ignore the illegal component.  This also gets rid of a trailing '/'.
       components_.pop_back();