diff --git a/src/encoding/tlv-face-management.hpp b/src/encoding/tlv-ndnd.hpp
similarity index 80%
rename from src/encoding/tlv-face-management.hpp
rename to src/encoding/tlv-ndnd.hpp
index 86798df..c76f00c 100644
--- a/src/encoding/tlv-face-management.hpp
+++ b/src/encoding/tlv-ndnd.hpp
@@ -7,14 +7,14 @@
  * Author: Alexander Afanasyev <alexander.afanasyev@ucla.edu>
  */
 
-#ifndef NDN_TLV_FACE_MANAGEMENT_HPP
-#define NDN_TLV_FACE_MANAGEMENT_HPP
+#ifndef NDN_TLV_NDND_HPP
+#define NDN_TLV_NDND_HPP
 
 #include "tlv.hpp"
 
 namespace ndn {
-namespace Tlv {
-namespace FaceManagement {
+namespace tlv {
+namespace ndnd {
 
 enum {
   FaceInstance       = 128,
@@ -43,8 +43,17 @@
   FORW_CAPTURE_OK   = 128
 };
 
+} // namespace ndnd
+} // namespace tlv
+
+
+// temporary, until all the dependent code is updated
+namespace Tlv {
+namespace FaceManagement {
+using namespace ::ndn::tlv::ndnd;
 } // namespace FaceManagement
 } // namespace Tlv
+
 } // namespace ndn
 
-#endif // NDN_TLV_FACE_MANAGEMENT_HPP
+#endif // NDN_TLV_NDND_HPP
diff --git a/src/encoding/tlv-nfd-control.hpp b/src/encoding/tlv-nfd.hpp
similarity index 69%
rename from src/encoding/tlv-nfd-control.hpp
rename to src/encoding/tlv-nfd.hpp
index 34ac171..584f62a 100644
--- a/src/encoding/tlv-nfd-control.hpp
+++ b/src/encoding/tlv-nfd.hpp
@@ -7,12 +7,12 @@
  * Author: Alexander Afanasyev <alexander.afanasyev@ucla.edu>
  */
 
-#ifndef NDN_TLV_NFD_CONTROL_HPP
-#define NDN_TLV_NFD_CONTROL_HPP
+#ifndef NDN_TLV_NFD_HPP
+#define NDN_TLV_NFD_HPP
 
 namespace ndn {
 namespace tlv {
-namespace nfd_control {
+namespace nfd {
 
 enum {
   // ControlResponse
@@ -28,18 +28,18 @@
 
   // Face Management Protocol
   FaceManagementOptions = 108,
-  Uri                   = 114,
-
-  // Local Control Header
-  LocalControlHeader = 109,
-  LocalControlInfo   = 110,
-  IncomingFaceId     = 111,
-  NextHopFaceId      = 112
+  Uri                   = 114
 };
 
+enum {
+  // Local Control Header
+  LocalControlHeader = 80,
+  IncomingFaceId     = 81,
+  NextHopFaceId      = 82
+};
 
-} // namespace nfd_control
+} // namespace nfd
 } // namespace tlv
 } // namespace ndn
 
-#endif // NDN_TLV_NFD_CONTROL_HPP
+#endif // NDN_TLV_NFD_HPP