tlv: Another set of changes to update TLV type re-assignment

Change-Id: Ia26fb0a8b30ce98bfe0184950fb975b0029fea2d
diff --git a/src/encoding/tlv.hpp b/src/encoding/tlv.hpp
index 890ea84..8a2b3fc 100644
--- a/src/encoding/tlv.hpp
+++ b/src/encoding/tlv.hpp
@@ -25,31 +25,31 @@
 struct Error : public std::runtime_error { Error(const std::string &what) : std::runtime_error(what) {} };
 
 enum {
-  Name          = 1,
-  NameComponent = 2,
-  Interest      = 3,
-  Data          = 4,
-  Selectors     = 5,
-  Nonce         = 6,
-  Scope         = 7,
-  InterestLifetime          = 8,
-  MinSuffixComponents       = 9,
-  MaxSuffixComponents       = 10,
-  PublisherPublicKeyLocator = 11,
-  Exclude       = 12,
-  ChildSelector = 13,
-  MustBeFresh   = 14,
-  Any           = 15,
-  MetaInfo      = 16,
-  Content       = 17,
-  SignatureInfo = 18,
-  SignatureValue = 19,
-  ContentType   = 20,
-  FreshnessPeriod = 21,
-  SignatureType = 22,
-  KeyLocator    = 23,
-  KeyLocatorDigest = 24,
-  FinalBlockId  = 25,
+  Interest      = 5,
+  Data          = 6,
+  Name          = 7,
+  NameComponent = 8,
+  Selectors     = 9,
+  Nonce         = 10,
+  Scope         = 11,
+  InterestLifetime          = 12,
+  MinSuffixComponents       = 13,
+  MaxSuffixComponents       = 14,
+  PublisherPublicKeyLocator = 15,
+  Exclude       = 16,
+  ChildSelector = 17,
+  MustBeFresh   = 18,
+  Any           = 19,
+  MetaInfo      = 20,
+  Content       = 21,
+  SignatureInfo = 22,
+  SignatureValue  = 23,
+  ContentType     = 24,
+  FreshnessPeriod = 25,
+  FinalBlockId  = 26,
+  SignatureType = 27,
+  KeyLocator    = 28,
+  KeyLocatorDigest = 29,
 
   AppPrivateBlock1 = 128,
   AppPrivateBlock2 = 32767