diff --git a/src/handles/tcp-bulk-insert-handle.cpp b/src/handles/tcp-bulk-insert-handle.cpp
index d7802ed..6c06b23 100644
--- a/src/handles/tcp-bulk-insert-handle.cpp
+++ b/src/handles/tcp-bulk-insert-handle.cpp
@@ -171,7 +171,7 @@
       offset += element.size();
       BOOST_ASSERT(offset <= m_inputBufferSize);
 
-      if (element.type() == ndn::Tlv::Data)
+      if (element.type() == ndn::tlv::Data)
         {
           try {
             Data data(element);
diff --git a/src/repo-command-parameter.hpp b/src/repo-command-parameter.hpp
index 3c4cd54..d461cdd 100644
--- a/src/repo-command-parameter.hpp
+++ b/src/repo-command-parameter.hpp
@@ -43,12 +43,12 @@
 class RepoCommandParameter
 {
 public:
-  class Error : public ndn::Tlv::Error
+  class Error : public ndn::tlv::Error
   {
   public:
     explicit
     Error(const std::string& what)
-      : ndn::Tlv::Error(what)
+      : ndn::tlv::Error(what)
     {
     }
   };
diff --git a/src/repo-command-response.hpp b/src/repo-command-response.hpp
index 92b390b..79dc027 100644
--- a/src/repo-command-response.hpp
+++ b/src/repo-command-response.hpp
@@ -40,12 +40,12 @@
 class RepoCommandResponse
 {
 public:
-  class Error : public ndn::Tlv::Error
+  class Error : public ndn::tlv::Error
   {
   public:
     explicit
     Error(const std::string& what)
-      : ndn::Tlv::Error(what)
+      : ndn::tlv::Error(what)
     {
     }
   };
diff --git a/src/repo-tlv.hpp b/src/repo-tlv.hpp
index bdc3310..45a6a0f 100644
--- a/src/repo-tlv.hpp
+++ b/src/repo-tlv.hpp
@@ -25,7 +25,7 @@
 namespace repo {
 namespace tlv {
 
-using namespace ndn::Tlv;
+using namespace ndn::tlv;
 
 enum {
   RepoCommandParameter = 201,