diff --git a/interest.rst b/interest.rst
index 0c47c04..025ee13 100644
--- a/interest.rst
+++ b/interest.rst
@@ -65,11 +65,13 @@
 
 ::
 
-    PublisherPublicKeyLocator ::= PUBLISHER-PUBLIC-KEY-TYPE TLV-LENGTH Name
+    PublisherPublicKeyLocator ::= KeyLocator
 
 This element specifies the name of the key which is used to sign the Data packet that the consumer is requesting.
 This is a way for the Interest to select answers from a particular publisher.
 
+See :ref:`KeyLocator` section for more detail.
+
 Exclude
 +++++++
 
diff --git a/signature.rst b/signature.rst
index 02fa20d..8c35ada 100644
--- a/signature.rst
+++ b/signature.rst
@@ -19,7 +19,7 @@
                         SignatureType
                         ... (SignatureType-specific TLVs)
 
-    SignatureValue ::= SIGNATURE-BITS-TYPE TLV-LENGTH
+    SignatureValue ::= SIGNATURE-VALUE-TYPE TLV-LENGTH
                         ... (SignatureType-specific TLVs and 
                         BYTE+
 
@@ -70,7 +70,8 @@
     SignatureInfo ::= SIGNATURE-INFO-TYPE TLV-LENGTH(=3)
                         SIGNATURE-TYPE-TYPE TLV-LENGTH(=1) 0
 
-    SignatureValue ::= BYTE{32}(=SHA256{Name, MetaInfo, Content, SignatureInfo})
+    SignatureValue ::= SIGNATURE-VALUE-TYPE TLV-LENGTH(=32)
+                         BYTE+(=SHA256{Name, MetaInfo, Content, SignatureInfo})
 
 
 .. _SignatureSha256WithRsa:
@@ -88,7 +89,8 @@
                         SIGNATURE-TYPE-TYPE TLV-LENGTH(=1) 1
                         KeyLocator
 
-    SignatureValue ::= BYTE+(=RSA over SHA256{Name, MetaInfo, Content, SignatureInfo})
+    SignatureValue ::= SIGNATURE-VALUE-TYPE TLV-LENGTH
+                         BYTE+(=RSA over SHA256{Name, MetaInfo, Content, SignatureInfo})
 
 .. note::
 
@@ -117,7 +119,8 @@
 ..                         SIGNATURE-TYPE-TYPE TLV-LENGTH(=1) 2
 ..                         KeyLocator
 
-..     SignatureValue ::= BYTE{32}(=RSA over SHA256{Name, MetaInfo, Content, SignatureInfo})
+..     SignatureValue ::= SIGNATURE-VALUE-TYPE TLV-LENGTH
+..                        BYTE+(=RSA over SHA256{Name, MetaInfo, Content, SignatureInfo})
 ..                        Witness
 
 ..     Witness ::= WITNESS-TYPE TLV-LENGTH BYTE+