diff --git a/data.rst b/data.rst
index ee5995e..b225131 100644
--- a/data.rst
+++ b/data.rst
@@ -40,7 +40,7 @@
 
 ::
 
-    ContentType = CONTENT-TYPE-TYPE TLV-LENGTH nonNegativeInteger
+    ContentType = CONTENT-TYPE-TYPE TLV-LENGTH NonNegativeInteger
 
 The following ContentTypes are currently defined:
 
@@ -66,7 +66,7 @@
 
 ::
 
-    FreshnessPeriod = FRESHNESS-PERIOD-TYPE TLV-LENGTH nonNegativeInteger
+    FreshnessPeriod = FRESHNESS-PERIOD-TYPE TLV-LENGTH NonNegativeInteger
 
 The optional ``FreshnessPeriod`` indicates how long a node should wait after the arrival of this data before marking it "non-fresh".
 The encoded value is number of milliseconds.
diff --git a/interest.rst b/interest.rst
index 0e408fb..8a164ac 100644
--- a/interest.rst
+++ b/interest.rst
@@ -96,7 +96,7 @@
 
 ::
 
-    InterestLifetime = INTEREST-LIFETIME-TYPE TLV-LENGTH nonNegativeInteger
+    InterestLifetime = INTEREST-LIFETIME-TYPE TLV-LENGTH NonNegativeInteger
 
 ``InterestLifetime`` indicates the (approximate) time remaining before the Interest times out.
 The value is the number of milliseconds.  The timeout is relative to the arrival time of the Interest at the current node.
diff --git a/link.rst b/link.rst
index 1b554a7..f031d04 100644
--- a/link.rst
+++ b/link.rst
@@ -15,7 +15,7 @@
 
     Delegation = LINK-DELEGATION-TYPE TLV-LENGTH Preference Name
 
-    Preference = LINK-PREFERENCE-TYPE TLV-LENGTH nonNegativeInteger
+    Preference = LINK-PREFERENCE-TYPE TLV-LENGTH NonNegativeInteger
 
 
 Link Object is a data packet, whose content contains a list of one or more name delegations: a pair of name and the associate priority.
diff --git a/signature.rst b/signature.rst
index ca89e71..dcf9c65 100644
--- a/signature.rst
+++ b/signature.rst
@@ -63,7 +63,7 @@
 
 ::
 
-    SignatureType = SIGNATURE-TYPE-TYPE TLV-LENGTH nonNegativeInteger
+    SignatureType = SIGNATURE-TYPE-TYPE TLV-LENGTH NonNegativeInteger
 
 This specification defines the following values for ``SignatureType``:
 
@@ -126,7 +126,7 @@
 
 ::
 
-    SignatureTime = SIGNATURE-TIME-TYPE TLV-LENGTH nonNegativeInteger
+    SignatureTime = SIGNATURE-TIME-TYPE TLV-LENGTH NonNegativeInteger
 
 The value of the ``SignatureTime`` element is the timestamp of the signature, represented as the number of milliseconds since 1970-01-01T00:00:00Z (Unix epoch).
 This element can be used to indicate that the packet was signed at a particular point in time.
@@ -138,7 +138,7 @@
 
 ::
 
-    SignatureSeqNum = SIGNATURE-SEQ-NUM-TYPE TLV-LENGTH nonNegativeInteger
+    SignatureSeqNum = SIGNATURE-SEQ-NUM-TYPE TLV-LENGTH NonNegativeInteger
 
 The ``SignatureSeqNum`` element adds additional assurances that a signature will be unique.
 The ``SignatureSeqNum`` may be used to protect against replay attacks.
diff --git a/tlv.rst b/tlv.rst
index 6bf2096..4d83ffc 100644
--- a/tlv.rst
+++ b/tlv.rst
@@ -72,22 +72,19 @@
 Non Negative Integer Encoding
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-A number of TLV elements in NDN packet format take a non-negative integer as their TLV-VALUE, with the following definition::
+A number of TLV elements in the NDN packet format take a non-negative integer as their TLV-VALUE, with the following definition::
 
-    nonNegativeInteger = 1OCTET / 2OCTET / 4OCTET / 8OCTET
+    NonNegativeInteger = 1OCTET / 2OCTET / 4OCTET / 8OCTET
 
-TLV-LENGTH of the TLV element MUST be either 1, 2, 4, or 8.
-Depending on TLV-LENGTH, a nonNegativeInteger is encoded as follows:
+The TLV-LENGTH of the TLV element enclosing a ``NonNegativeInteger`` MUST be either 1, 2, 4, or 8.
+Depending on the TLV-LENGTH, a ``NonNegativeInteger`` is encoded as follows:
 
-- if the length is 1, the nonNegativeInteger is encoded in one octet;
+- if the length is 1, the ``NonNegativeInteger`` is encoded in 1 octet;
+- if the length is 2, the ``NonNegativeInteger`` is encoded in 2 octets, in network byte-order;
+- if the length is 4, the ``NonNegativeInteger`` is encoded in 4 octets, in network byte-order;
+- if the length is 8, the ``NonNegativeInteger`` is encoded in 8 octets, in network byte-order.
 
-- if the length is 2, the nonNegativeInteger is encoded in 2 octets, in network byte-order;
-
-- if the length is 4, the nonNegativeInteger is encoded in 4 octets, in network byte-order;
-
-- if the length is 8, the nonNegativeInteger is encoded in 8 octets, in network byte-order.
-
-The following shows a few examples of TLVs that have nonNegativeInteger as their value component in hexadecimal format (where ``TT`` represents ``TLV-TYPE``, followed by the ``TLV-LENGTH``, then ``TLV-VALUE``)::
+The following shows a few examples of TLVs that have a ``NonNegativeInteger`` as their value component in hexadecimal format (where ``TT`` represents the TLV-TYPE, followed by the TLV-LENGTH, and then the TLV-VALUE)::
 
     0     => TT0100
     1     => TT0101