diff --git a/ndn-cpp/c/encoding/binary-xml-data.c b/ndn-cpp/c/encoding/binary-xml-data.c
index 16a1497..de34f9d 100644
--- a/ndn-cpp/c/encoding/binary-xml-data.c
+++ b/ndn-cpp/c/encoding/binary-xml-data.c
@@ -173,7 +173,7 @@
 }
 
 ndn_Error ndn_encodeBinaryXmlData
-  (struct ndn_Data *data, unsigned int *signedFieldsBeginOffset, unsigned int *signedFieldsEndOffset, struct ndn_BinaryXmlEncoder *encoder)
+  (struct ndn_Data *data, unsigned int *signedPortionBeginOffset, unsigned int *signedPortionEndOffset, struct ndn_BinaryXmlEncoder *encoder)
 {
   ndn_Error error;
   if ((error = ndn_BinaryXmlEncoder_writeElementStartDTag(encoder, ndn_BinaryXml_DTag_ContentObject)))
@@ -182,7 +182,7 @@
   if ((error = encodeSignature(&data->signature, encoder)))
     return error;
   
-  *signedFieldsBeginOffset = encoder->offset;
+  *signedPortionBeginOffset = encoder->offset;
 
   if ((error = ndn_encodeBinaryXmlName(&data->name, encoder)))
     return error;
@@ -194,7 +194,7 @@
       (encoder, ndn_BinaryXml_DTag_Content, data->content, data->contentLength)))
     return error;
 
-  *signedFieldsEndOffset = encoder->offset;
+  *signedPortionEndOffset = encoder->offset;
 
   if ((error = ndn_BinaryXmlEncoder_writeElementClose(encoder)))
     return error;
@@ -203,7 +203,7 @@
 }
 
 ndn_Error ndn_decodeBinaryXmlData
-  (struct ndn_Data *data, unsigned int *signedFieldsBeginOffset, unsigned int *signedFieldsEndOffset, struct ndn_BinaryXmlDecoder *decoder)
+  (struct ndn_Data *data, unsigned int *signedPortionBeginOffset, unsigned int *signedPortionEndOffset, struct ndn_BinaryXmlDecoder *decoder)
 {
   ndn_Error error;
   if ((error = ndn_BinaryXmlDecoder_readElementStartDTag(decoder, ndn_BinaryXml_DTag_ContentObject)))
@@ -219,7 +219,7 @@
   else
     ndn_Signature_initialize(&data->signature, data->signature.keyLocator.keyName.components, data->signature.keyLocator.keyName.maxComponents);
   
-  *signedFieldsBeginOffset = decoder->offset;
+  *signedPortionBeginOffset = decoder->offset;
   
   if ((error = ndn_decodeBinaryXmlName(&data->name, decoder)))
     return error;
@@ -238,7 +238,7 @@
       (decoder, ndn_BinaryXml_DTag_Content, 1, &data->content, &data->contentLength)))
     return error; 
   
-  *signedFieldsEndOffset = decoder->offset;
+  *signedPortionEndOffset = decoder->offset;
 
   if ((error = ndn_BinaryXmlDecoder_readElementClose(decoder)))
     return error;
diff --git a/ndn-cpp/c/encoding/binary-xml-data.h b/ndn-cpp/c/encoding/binary-xml-data.h
index 3168cb1..caf9e35 100644
--- a/ndn-cpp/c/encoding/binary-xml-data.h
+++ b/ndn-cpp/c/encoding/binary-xml-data.h
@@ -19,28 +19,28 @@
 /**
  * Encode the data packet as binary XML.
  * @param data Pointer to the data object to encode.
- * @param signedFieldsBeginOffset Return the offset in the encoding of the beginning of the fields which are signed.
+ * @param signedPortionBeginOffset Return the offset in the encoding of the beginning of the signed portion.
  * If you are not encoding in order to sign, you can ignore this returned value.
- * @param signedFieldsEndOffset Return the offset in the encoding of the end of the fields which are signed.
+ * @param signedPortionEndOffset Return the offset in the encoding of the end of the signed portion.
  * If you are not encoding in order to sign, you can ignore this returned value.
  * @param encoder Pointer to the ndn_BinaryXmlEncoder struct which receives the encoding. 
  * @return 0 for success, else an error code.
  */
 ndn_Error ndn_encodeBinaryXmlData
-  (struct ndn_Data *data, unsigned int *signedFieldsBeginOffset, unsigned int *signedFieldsEndOffset, struct ndn_BinaryXmlEncoder *encoder);
+  (struct ndn_Data *data, unsigned int *signedPortionBeginOffset, unsigned int *signedPortionEndOffset, struct ndn_BinaryXmlEncoder *encoder);
 
 /**
  * Decode the data packet as binary XML and set the fields in the data object.
  * @param data Pointer to the data object whose fields are updated.
- * @param signedFieldsBeginOffset Return the offset in the input buffer of the beginning of the fields which are signed.
+ * @param signedPortionBeginOffset Return the offset in the input buffer of the beginning of the signed portion.
  * If you are not decoding in order to verify, you can ignore this returned value.
- * @param signedFieldsEndOffset Return the offset in the input buffer of the end of the fields which are signed.
+ * @param signedPortionEndOffset Return the offset in the input buffer of the end of the signed portion.
  * If you are not decoding in order to verify, you can ignore this returned value.
  * @param decoder Pointer to the ndn_BinaryXmlDecoder struct which has been initialized with the buffer to decode. 
  * @return 0 for success, else an error code.
  */
 ndn_Error ndn_decodeBinaryXmlData
-  (struct ndn_Data *data, unsigned int *signedFieldsBeginOffset, unsigned int *signedFieldsEndOffset, struct ndn_BinaryXmlDecoder *decoder);
+  (struct ndn_Data *data, unsigned int *signedPortionBeginOffset, unsigned int *signedPortionEndOffset, struct ndn_BinaryXmlDecoder *decoder);
 
 #ifdef __cplusplus
 }