diff --git a/ndn-cpp/encoding/BinaryXMLDecoder.hpp b/ndn-cpp/encoding/binary-xml-decoder.hpp
similarity index 96%
rename from ndn-cpp/encoding/BinaryXMLDecoder.hpp
rename to ndn-cpp/encoding/binary-xml-decoder.hpp
index f537935..2848457 100644
--- a/ndn-cpp/encoding/BinaryXMLDecoder.hpp
+++ b/ndn-cpp/encoding/binary-xml-decoder.hpp
@@ -8,7 +8,7 @@
 
 #include <stdexcept>
 #include "../c/errors.h"
-#include "../c/encoding/BinaryXMLDecoder.h"
+#include "../c/encoding/binary-xml-decoder.h"
 
 namespace ndn {
 
diff --git a/ndn-cpp/encoding/BinaryXMLElementReader.cpp b/ndn-cpp/encoding/binary-xml-element-reader.cpp
similarity index 88%
rename from ndn-cpp/encoding/BinaryXMLElementReader.cpp
rename to ndn-cpp/encoding/binary-xml-element-reader.cpp
index 7658483..e326dbf 100644
--- a/ndn-cpp/encoding/BinaryXMLElementReader.cpp
+++ b/ndn-cpp/encoding/binary-xml-element-reader.cpp
@@ -3,7 +3,7 @@
  * See COPYING for copyright and distribution information.
  */
 
-#include "BinaryXMLElementReader.hpp"
+#include "binary-xml-element-reader.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cpp/encoding/BinaryXMLElementReader.hpp b/ndn-cpp/encoding/binary-xml-element-reader.hpp
similarity index 95%
rename from ndn-cpp/encoding/BinaryXMLElementReader.hpp
rename to ndn-cpp/encoding/binary-xml-element-reader.hpp
index 3a10ba5..96c0a5e 100644
--- a/ndn-cpp/encoding/BinaryXMLElementReader.hpp
+++ b/ndn-cpp/encoding/binary-xml-element-reader.hpp
@@ -6,7 +6,7 @@
 #ifndef NDN_BINARYXMLELEMENTREADER_HPP
 #define	NDN_BINARYXMLELEMENTREADER_HPP
 
-#include "../c/encoding/BinaryXMLElementReader.h"
+#include "../c/encoding/binary-xml-element-reader.h"
 
 namespace ndn {
 
diff --git a/ndn-cpp/encoding/BinaryXMLEncoder.hpp b/ndn-cpp/encoding/binary-xml-encoder.hpp
similarity index 95%
rename from ndn-cpp/encoding/BinaryXMLEncoder.hpp
rename to ndn-cpp/encoding/binary-xml-encoder.hpp
index 37a9ecc..3bf1f45 100644
--- a/ndn-cpp/encoding/BinaryXMLEncoder.hpp
+++ b/ndn-cpp/encoding/binary-xml-encoder.hpp
@@ -9,7 +9,7 @@
 #include <vector>
 #include "../common.hpp"
 #include "../c/util/ndn_realloc.h"
-#include "../c/encoding/BinaryXMLEncoder.h"
+#include "../c/encoding/binary-xml-encoder.h"
 
 namespace ndn {
   
diff --git a/ndn-cpp/encoding/BinaryXMLStructureDecoder.hpp b/ndn-cpp/encoding/binary-xml-structure-decoder.hpp
similarity index 100%
rename from ndn-cpp/encoding/BinaryXMLStructureDecoder.hpp
rename to ndn-cpp/encoding/binary-xml-structure-decoder.hpp
diff --git a/ndn-cpp/encoding/BinaryXMLWireFormat.cpp b/ndn-cpp/encoding/binary-xml-wire-format.cpp
similarity index 93%
rename from ndn-cpp/encoding/BinaryXMLWireFormat.cpp
rename to ndn-cpp/encoding/binary-xml-wire-format.cpp
index ffda086..f4ddf78 100644
--- a/ndn-cpp/encoding/BinaryXMLWireFormat.cpp
+++ b/ndn-cpp/encoding/binary-xml-wire-format.cpp
@@ -4,13 +4,13 @@
  */
 
 #include <stdexcept>
-#include "../c/encoding/BinaryXMLInterest.h"
+#include "../c/encoding/binary-xml-interest.h"
 #include "../c/encoding/binary-xml-data.h"
-#include "../Interest.hpp"
+#include "../interest.hpp"
 #include "../data.hpp"
-#include "BinaryXMLEncoder.hpp"
-#include "BinaryXMLDecoder.hpp"
-#include "BinaryXMLWireFormat.hpp"
+#include "binary-xml-encoder.hpp"
+#include "binary-xml-decoder.hpp"
+#include "binary-xml-wire-format.hpp"
 
 using namespace std;
 
diff --git a/ndn-cpp/encoding/BinaryXMLWireFormat.hpp b/ndn-cpp/encoding/binary-xml-wire-format.hpp
similarity index 95%
rename from ndn-cpp/encoding/BinaryXMLWireFormat.hpp
rename to ndn-cpp/encoding/binary-xml-wire-format.hpp
index eeba0dc..e9e4802 100644
--- a/ndn-cpp/encoding/BinaryXMLWireFormat.hpp
+++ b/ndn-cpp/encoding/binary-xml-wire-format.hpp
@@ -6,7 +6,7 @@
 #ifndef NDN_BINARYXMLWIREFORMAT_HPP
 #define	NDN_BINARYXMLWIREFORMAT_HPP
 
-#include "WireFormat.hpp"
+#include "wire-format.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cpp/encoding/WireFormat.cpp b/ndn-cpp/encoding/wire-format.cpp
similarity index 97%
rename from ndn-cpp/encoding/WireFormat.cpp
rename to ndn-cpp/encoding/wire-format.cpp
index 56f37d3..60e3f19 100644
--- a/ndn-cpp/encoding/WireFormat.cpp
+++ b/ndn-cpp/encoding/wire-format.cpp
@@ -4,7 +4,7 @@
  */
 
 #include <stdexcept>
-#include "WireFormat.hpp"
+#include "wire-format.hpp"
 
 using namespace std;
 
diff --git a/ndn-cpp/encoding/WireFormat.hpp b/ndn-cpp/encoding/wire-format.hpp
similarity index 100%
rename from ndn-cpp/encoding/WireFormat.hpp
rename to ndn-cpp/encoding/wire-format.hpp