diff --git a/ndn-cpp/c/encoding/binary-xml-data.c b/ndn-cpp/c/encoding/binary-xml-data.c
index ad9ffbf..385d229 100644
--- a/ndn-cpp/c/encoding/binary-xml-data.c
+++ b/ndn-cpp/c/encoding/binary-xml-data.c
@@ -4,10 +4,10 @@
  * See COPYING for copyright and distribution information.
  */
 
-#include "BinaryXMLEncoder.h"
-#include "BinaryXMLDecoder.h"
-#include "BinaryXMLName.h"
-#include "BinaryXMLPublisherPublicKeyDigest.h"
+#include "binary-xml-encoder.h"
+#include "binary-xml-decoder.h"
+#include "binary-xml-name.h"
+#include "binary-xml-publisher-public-key-digest.h"
 #include "binary-xml-data.h"
 
 static ndn_Error encodeSignature(struct ndn_Signature *signature, struct ndn_BinaryXmlEncoder *encoder)
diff --git a/ndn-cpp/c/encoding/binary-xml-data.h b/ndn-cpp/c/encoding/binary-xml-data.h
index f3b14e9..ebe2370 100644
--- a/ndn-cpp/c/encoding/binary-xml-data.h
+++ b/ndn-cpp/c/encoding/binary-xml-data.h
@@ -8,8 +8,8 @@
 
 #include "../errors.h"
 #include "../data.h"
-#include "BinaryXMLEncoder.h"
-#include "BinaryXMLDecoder.h"
+#include "binary-xml-encoder.h"
+#include "binary-xml-decoder.h"
 
 #ifdef	__cplusplus
 extern "C" {
diff --git a/ndn-cpp/c/encoding/BinaryXMLDecoder.c b/ndn-cpp/c/encoding/binary-xml-decoder.c
similarity index 99%
rename from ndn-cpp/c/encoding/BinaryXMLDecoder.c
rename to ndn-cpp/c/encoding/binary-xml-decoder.c
index a44af26..7e2140d 100644
--- a/ndn-cpp/c/encoding/BinaryXMLDecoder.c
+++ b/ndn-cpp/c/encoding/binary-xml-decoder.c
@@ -4,8 +4,8 @@
  * See COPYING for copyright and distribution information.
  */
 
-#include "BinaryXML.h"
-#include "BinaryXMLDecoder.h"
+#include "binary-xml.h"
+#include "binary-xml-decoder.h"
 
 /**
  * Return the octet at self->offset, converting to unsigned int.  Increment self->offset.
diff --git a/ndn-cpp/c/encoding/BinaryXMLDecoder.h b/ndn-cpp/c/encoding/binary-xml-decoder.h
similarity index 100%
rename from ndn-cpp/c/encoding/BinaryXMLDecoder.h
rename to ndn-cpp/c/encoding/binary-xml-decoder.h
diff --git a/ndn-cpp/c/encoding/BinaryXMLElementReader.c b/ndn-cpp/c/encoding/binary-xml-element-reader.c
similarity index 98%
rename from ndn-cpp/c/encoding/BinaryXMLElementReader.c
rename to ndn-cpp/c/encoding/binary-xml-element-reader.c
index 556c376..4bbd081 100644
--- a/ndn-cpp/c/encoding/BinaryXMLElementReader.c
+++ b/ndn-cpp/c/encoding/binary-xml-element-reader.c
@@ -3,7 +3,7 @@
  * See COPYING for copyright and distribution information.
  */
 
-#include "BinaryXMLElementReader.h"
+#include "binary-xml-element-reader.h"
 
 ndn_Error ndn_BinaryXmlElementReader_onReceivedData
   (struct ndn_BinaryXmlElementReader *self, unsigned char *data, unsigned int dataLength)
diff --git a/ndn-cpp/c/encoding/BinaryXMLElementReader.h b/ndn-cpp/c/encoding/binary-xml-element-reader.h
similarity index 97%
rename from ndn-cpp/c/encoding/BinaryXMLElementReader.h
rename to ndn-cpp/c/encoding/binary-xml-element-reader.h
index f4501ad..2b09e25 100644
--- a/ndn-cpp/c/encoding/BinaryXMLElementReader.h
+++ b/ndn-cpp/c/encoding/binary-xml-element-reader.h
@@ -7,8 +7,8 @@
 #define	NDN_BINARYXMLELEMENTREADER_H
 
 #include "../errors.h"
-#include "BinaryXMLStructureDecoder.h"
-#include "../util/DynamicUCharArray.h"
+#include "binary-xml-structure-decoder.h"
+#include "../util/dynamic-uchar-array.h"
 
 #ifdef	__cplusplus
 extern "C" {
diff --git a/ndn-cpp/c/encoding/BinaryXMLEncoder.c b/ndn-cpp/c/encoding/binary-xml-encoder.c
similarity index 99%
rename from ndn-cpp/c/encoding/BinaryXMLEncoder.c
rename to ndn-cpp/c/encoding/binary-xml-encoder.c
index 0b38f87..33f1696 100644
--- a/ndn-cpp/c/encoding/BinaryXMLEncoder.c
+++ b/ndn-cpp/c/encoding/binary-xml-encoder.c
@@ -6,8 +6,8 @@
 
 #include <math.h>
 #include "../util/ndn_memory.h"
-#include "BinaryXML.h"
-#include "BinaryXMLEncoder.h"
+#include "binary-xml.h"
+#include "binary-xml-encoder.h"
 
 enum {
   ENCODING_LIMIT_1_BYTE = ((1 << ndn_BinaryXml_TT_VALUE_BITS) - 1),
diff --git a/ndn-cpp/c/encoding/BinaryXMLEncoder.h b/ndn-cpp/c/encoding/binary-xml-encoder.h
similarity index 98%
rename from ndn-cpp/c/encoding/BinaryXMLEncoder.h
rename to ndn-cpp/c/encoding/binary-xml-encoder.h
index c300d17..4df49b4 100644
--- a/ndn-cpp/c/encoding/BinaryXMLEncoder.h
+++ b/ndn-cpp/c/encoding/binary-xml-encoder.h
@@ -7,8 +7,8 @@
 #define	NDN_BINARYXMLENCODER_H
 
 #include "../errors.h"
-#include "../util/DynamicUCharArray.h"
-#include "BinaryXML.h"
+#include "../util/dynamic-uchar-array.h"
+#include "binary-xml.h"
 
 #ifdef	__cplusplus
 extern "C" {
diff --git a/ndn-cpp/c/encoding/BinaryXMLInterest.c b/ndn-cpp/c/encoding/binary-xml-interest.c
similarity index 97%
rename from ndn-cpp/c/encoding/BinaryXMLInterest.c
rename to ndn-cpp/c/encoding/binary-xml-interest.c
index 953f76d..45e855b 100644
--- a/ndn-cpp/c/encoding/BinaryXMLInterest.c
+++ b/ndn-cpp/c/encoding/binary-xml-interest.c
@@ -4,11 +4,11 @@
  * See COPYING for copyright and distribution information.
  */
 
-#include "BinaryXMLEncoder.h"
-#include "BinaryXMLDecoder.h"
-#include "BinaryXMLName.h"
-#include "BinaryXMLPublisherPublicKeyDigest.h"
-#include "BinaryXMLInterest.h"
+#include "binary-xml-encoder.h"
+#include "binary-xml-decoder.h"
+#include "binary-xml-name.h"
+#include "binary-xml-publisher-public-key-digest.h"
+#include "binary-xml-interest.h"
 
 static ndn_Error encodeExclude(struct ndn_Exclude *exclude, struct ndn_BinaryXmlEncoder *encoder)
 {
diff --git a/ndn-cpp/c/encoding/BinaryXMLInterest.h b/ndn-cpp/c/encoding/binary-xml-interest.h
similarity index 84%
rename from ndn-cpp/c/encoding/BinaryXMLInterest.h
rename to ndn-cpp/c/encoding/binary-xml-interest.h
index 960871f..a1c9631 100644
--- a/ndn-cpp/c/encoding/BinaryXMLInterest.h
+++ b/ndn-cpp/c/encoding/binary-xml-interest.h
@@ -7,9 +7,9 @@
 #define	NDN_BINARYXMLINTEREST_H
 
 #include "../errors.h"
-#include "../Interest.h"
-#include "BinaryXMLEncoder.h"
-#include "BinaryXMLDecoder.h"
+#include "../interest.h"
+#include "binary-xml-encoder.h"
+#include "binary-xml-decoder.h"
 
 #ifdef	__cplusplus
 extern "C" {
diff --git a/ndn-cpp/c/encoding/BinaryXMLKey.c b/ndn-cpp/c/encoding/binary-xml-key.c
similarity index 97%
rename from ndn-cpp/c/encoding/BinaryXMLKey.c
rename to ndn-cpp/c/encoding/binary-xml-key.c
index e7e7f41..c26adba 100644
--- a/ndn-cpp/c/encoding/BinaryXMLKey.c
+++ b/ndn-cpp/c/encoding/binary-xml-key.c
@@ -4,9 +4,9 @@
  * See COPYING for copyright and distribution information.
  */
 
-#include "BinaryXML.h"
-#include "BinaryXMLStructureDecoder.h"
-#include "BinaryXMLKey.h"
+#include "binary-xml.h"
+#include "binary-xml-structure-decoder.h"
+#include "binary-xml-key.h"
 
 ndn_Error ndn_encodeBinaryXmlKeyLocator(struct ndn_KeyLocator *keyLocator, struct ndn_BinaryXmlEncoder *encoder)
 {
diff --git a/ndn-cpp/c/encoding/BinaryXMLKey.h b/ndn-cpp/c/encoding/binary-xml-key.h
similarity index 94%
rename from ndn-cpp/c/encoding/BinaryXMLKey.h
rename to ndn-cpp/c/encoding/binary-xml-key.h
index 8ccbcac..38c7420 100644
--- a/ndn-cpp/c/encoding/BinaryXMLKey.h
+++ b/ndn-cpp/c/encoding/binary-xml-key.h
@@ -7,9 +7,9 @@
 #define	NDN_BINARYXMLKEY_H
 
 #include "../errors.h"
-#include "../Key.h"
-#include "BinaryXMLEncoder.h"
-#include "BinaryXMLDecoder.h"
+#include "../key.h"
+#include "binary-xml-encoder.h"
+#include "binary-xml-decoder.h"
 
 #ifdef	__cplusplus
 extern "C" {
diff --git a/ndn-cpp/c/encoding/BinaryXMLName.c b/ndn-cpp/c/encoding/binary-xml-name.c
similarity index 94%
rename from ndn-cpp/c/encoding/BinaryXMLName.c
rename to ndn-cpp/c/encoding/binary-xml-name.c
index 97adda0..ffdea75 100644
--- a/ndn-cpp/c/encoding/BinaryXMLName.c
+++ b/ndn-cpp/c/encoding/binary-xml-name.c
@@ -4,9 +4,9 @@
  * See COPYING for copyright and distribution information.
  */
 
-#include "BinaryXMLEncoder.h"
-#include "BinaryXMLDecoder.h"
-#include "BinaryXMLName.h"
+#include "binary-xml-encoder.h"
+#include "binary-xml-decoder.h"
+#include "binary-xml-name.h"
 
 ndn_Error ndn_encodeBinaryXmlName(struct ndn_Name *name, struct ndn_BinaryXmlEncoder *encoder)
 {
diff --git a/ndn-cpp/c/encoding/BinaryXMLName.h b/ndn-cpp/c/encoding/binary-xml-name.h
similarity index 83%
rename from ndn-cpp/c/encoding/BinaryXMLName.h
rename to ndn-cpp/c/encoding/binary-xml-name.h
index f165c4b..db2d3cd 100644
--- a/ndn-cpp/c/encoding/BinaryXMLName.h
+++ b/ndn-cpp/c/encoding/binary-xml-name.h
@@ -7,9 +7,9 @@
 #define	NDN_BINARYXMLNAME_H
 
 #include "../errors.h"
-#include "../Name.h"
-#include "BinaryXMLEncoder.h"
-#include "BinaryXMLDecoder.h"
+#include "../name.h"
+#include "binary-xml-encoder.h"
+#include "binary-xml-decoder.h"
 
 #ifdef	__cplusplus
 extern "C" {
diff --git a/ndn-cpp/c/encoding/BinaryXMLPublisherPublicKeyDigest.c b/ndn-cpp/c/encoding/binary-xml-publisher-public-key-digest.c
similarity index 95%
rename from ndn-cpp/c/encoding/BinaryXMLPublisherPublicKeyDigest.c
rename to ndn-cpp/c/encoding/binary-xml-publisher-public-key-digest.c
index 493ab8c..dfc95d1 100644
--- a/ndn-cpp/c/encoding/BinaryXMLPublisherPublicKeyDigest.c
+++ b/ndn-cpp/c/encoding/binary-xml-publisher-public-key-digest.c
@@ -4,8 +4,8 @@
  * See COPYING for copyright and distribution information.
  */
 
-#include "BinaryXML.h"
-#include "BinaryXMLPublisherPublicKeyDigest.h"
+#include "binary-xml.h"
+#include "binary-xml-publisher-public-key-digest.h"
 
 ndn_Error ndn_encodeBinaryXmlPublisherPublicKeyDigest
   (struct ndn_PublisherPublicKeyDigest *publisherPublicKeyDigest, struct ndn_BinaryXmlEncoder *encoder)
diff --git a/ndn-cpp/c/encoding/BinaryXMLPublisherPublicKeyDigest.h b/ndn-cpp/c/encoding/binary-xml-publisher-public-key-digest.h
similarity index 94%
rename from ndn-cpp/c/encoding/BinaryXMLPublisherPublicKeyDigest.h
rename to ndn-cpp/c/encoding/binary-xml-publisher-public-key-digest.h
index eb3e2a8..c6017b1 100644
--- a/ndn-cpp/c/encoding/BinaryXMLPublisherPublicKeyDigest.h
+++ b/ndn-cpp/c/encoding/binary-xml-publisher-public-key-digest.h
@@ -7,9 +7,9 @@
 #define	NDN_BINARYXMLPUBLISHERPUBLICKEYDIGEST_H
 
 #include "../errors.h"
-#include "../PublisherPublicKeyDigest.h"
-#include "BinaryXMLEncoder.h"
-#include "BinaryXMLDecoder.h"
+#include "../publisher-public-key-digest.h"
+#include "binary-xml-encoder.h"
+#include "binary-xml-decoder.h"
 
 #ifdef	__cplusplus
 extern "C" {
diff --git a/ndn-cpp/c/encoding/BinaryXMLStructureDecoder.c b/ndn-cpp/c/encoding/binary-xml-structure-decoder.c
similarity index 97%
rename from ndn-cpp/c/encoding/BinaryXMLStructureDecoder.c
rename to ndn-cpp/c/encoding/binary-xml-structure-decoder.c
index dbd4ac5..2c114fe 100644
--- a/ndn-cpp/c/encoding/BinaryXMLStructureDecoder.c
+++ b/ndn-cpp/c/encoding/binary-xml-structure-decoder.c
@@ -4,9 +4,9 @@
  */
 
 #include "../util/ndn_memory.h"
-#include "BinaryXML.h"
-#include "BinaryXMLDecoder.h"
-#include "BinaryXMLStructureDecoder.h"
+#include "binary-xml.h"
+#include "binary-xml-decoder.h"
+#include "binary-xml-structure-decoder.h"
 
 void ndn_BinaryXmlStructureDecoder_init(struct ndn_BinaryXmlStructureDecoder *self) 
 {
diff --git a/ndn-cpp/c/encoding/BinaryXMLStructureDecoder.h b/ndn-cpp/c/encoding/binary-xml-structure-decoder.h
similarity index 100%
rename from ndn-cpp/c/encoding/BinaryXMLStructureDecoder.h
rename to ndn-cpp/c/encoding/binary-xml-structure-decoder.h
diff --git a/ndn-cpp/c/encoding/BinaryXML.h b/ndn-cpp/c/encoding/binary-xml.h
similarity index 100%
rename from ndn-cpp/c/encoding/BinaryXML.h
rename to ndn-cpp/c/encoding/binary-xml.h