diff --git a/Makefile.am b/Makefile.am
index 051c22f..d46b2e6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,47 +16,47 @@
 libndn_c_la_SOURCES = \
   config.h \
   ndn-cpp/c/data.h \
-  ndn-cpp/c/Interest.h \
-  ndn-cpp/c/Key.h \
-  ndn-cpp/c/Name.h \
-  ndn-cpp/c/PublisherPublicKeyDigest.h \
+  ndn-cpp/c/interest.h \
+  ndn-cpp/c/key.h \
+  ndn-cpp/c/name.h \
+  ndn-cpp/c/publisher-public-key-digest.h \
   ndn-cpp/c/errors.c ndn-cpp/c/errors.h \
-  ndn-cpp/c/encoding/BinaryXML.h \
+  ndn-cpp/c/encoding/binary-xml.h \
   ndn-cpp/c/encoding/binary-xml-data.c ndn-cpp/c/encoding/binary-xml-data.h \
-  ndn-cpp/c/encoding/BinaryXMLDecoder.c ndn-cpp/c/encoding/BinaryXMLDecoder.h \
-  ndn-cpp/c/encoding/BinaryXMLElementReader.c ndn-cpp/c/encoding/BinaryXMLElementReader.h \
-  ndn-cpp/c/encoding/BinaryXMLEncoder.c ndn-cpp/c/encoding/BinaryXMLEncoder.h \
-  ndn-cpp/c/encoding/BinaryXMLInterest.c ndn-cpp/c/encoding/BinaryXMLInterest.h \
-  ndn-cpp/c/encoding/BinaryXMLKey.c ndn-cpp/c/encoding/BinaryXMLKey.h \
-  ndn-cpp/c/encoding/BinaryXMLName.c ndn-cpp/c/encoding/BinaryXMLName.h \
-  ndn-cpp/c/encoding/BinaryXMLPublisherPublicKeyDigest.c ndn-cpp/c/encoding/BinaryXMLPublisherPublicKeyDigest.h \
-  ndn-cpp/c/encoding/BinaryXMLStructureDecoder.c ndn-cpp/c/encoding/BinaryXMLStructureDecoder.h \
-  ndn-cpp/c/transport/SocketTransport.c ndn-cpp/c/transport/SocketTransport.h \
-  ndn-cpp/c/transport/TcpTransport.h \
-  ndn-cpp/c/transport/UdpTransport.h \
-  ndn-cpp/c/util/DynamicUCharArray.c ndn-cpp/c/util/DynamicUCharArray.h \
+  ndn-cpp/c/encoding/binary-xml-decoder.c ndn-cpp/c/encoding/binary-xml-decoder.h \
+  ndn-cpp/c/encoding/binary-xml-element-reader.c ndn-cpp/c/encoding/binary-xml-element-reader.h \
+  ndn-cpp/c/encoding/binary-xml-encoder.c ndn-cpp/c/encoding/binary-xml-encoder.h \
+  ndn-cpp/c/encoding/binary-xml-interest.c ndn-cpp/c/encoding/binary-xml-interest.h \
+  ndn-cpp/c/encoding/binary-xml-key.c ndn-cpp/c/encoding/binary-xml-key.h \
+  ndn-cpp/c/encoding/binary-xml-name.c ndn-cpp/c/encoding/binary-xml-name.h \
+  ndn-cpp/c/encoding/binary-xml-publisher-public-key-digest.c ndn-cpp/c/encoding/binary-xml-publisher-public-key-digest.h \
+  ndn-cpp/c/encoding/binary-xml-structure-decoder.c ndn-cpp/c/encoding/binary-xml-structure-decoder.h \
+  ndn-cpp/c/transport/socket-transport.c ndn-cpp/c/transport/socket-transport.h \
+  ndn-cpp/c/transport/tcp-transport.h \
+  ndn-cpp/c/transport/udp-transport.h \
+  ndn-cpp/c/util/dynamic-uchar-array.c ndn-cpp/c/util/dynamic-uchar-array.h \
   ndn-cpp/c/util/ndn_memory.c ndn-cpp/c/util/ndn_memory.h \
   ndn-cpp/c/util/ndn_realloc.c ndn-cpp/c/util/ndn_realloc.h
 
 libndn_cpp_la_SOURCES = \
   config.h ndn-cpp/common.hpp \
-  ndn-cpp/Closure.hpp \
+  ndn-cpp/closure.hpp \
   ndn-cpp/data.cpp ndn-cpp/c/data.h ndn-cpp/data.hpp \
-  ndn-cpp/Interest.cpp ndn-cpp/c/Interest.h ndn-cpp/Interest.hpp \
-  ndn-cpp/Key.cpp ndn-cpp/c/Key.h ndn-cpp/Key.hpp \
+  ndn-cpp/interest.cpp ndn-cpp/c/interest.h ndn-cpp/interest.hpp \
+  ndn-cpp/key.cpp ndn-cpp/c/key.h ndn-cpp/key.hpp \
   ndn-cpp/face.cpp ndn-cpp/face.hpp \
-  ndn-cpp/Name.cpp ndn-cpp/c/Name.h ndn-cpp/Name.hpp \
-  ndn-cpp/PublisherPublicKeyDigest.hpp \
-  ndn-cpp/c/encoding/BinaryXML.h \
-  ndn-cpp/c/encoding/BinaryXMLDecoder.h ndn-cpp/encoding/BinaryXMLDecoder.hpp \
-  ndn-cpp/c/encoding/BinaryXMLElementReader.h ndn-cpp/encoding/BinaryXMLElementReader.cpp ndn-cpp/encoding/BinaryXMLElementReader.hpp \
-  ndn-cpp/c/encoding/BinaryXMLEncoder.h ndn-cpp/encoding/BinaryXMLEncoder.hpp ndn-cpp/c/util/DynamicUCharArray.h \
-  ndn-cpp/c/encoding/BinaryXMLStructureDecoder.h ndn-cpp/encoding/BinaryXMLStructureDecoder.hpp \
-  ndn-cpp/encoding/BinaryXMLWireFormat.cpp ndn-cpp/c/encoding/BinaryXMLName.h ndn-cpp/encoding/BinaryXMLWireFormat.hpp \
-  ndn-cpp/encoding/WireFormat.cpp ndn-cpp/encoding/WireFormat.hpp \
-  ndn-cpp/c/transport/SocketTransport.h ndn-cpp/c/transport/TcpTransport.h ndn-cpp/transport/TcpTransport.cpp ndn-cpp/transport/TcpTransport.hpp \
-  ndn-cpp/transport/Transport.cpp ndn-cpp/transport/Transport.hpp \
-  ndn-cpp/c/transport/SocketTransport.h ndn-cpp/c/transport/UdpTransport.h ndn-cpp/transport/UdpTransport.cpp ndn-cpp/transport/UdpTransport.hpp
+  ndn-cpp/name.cpp ndn-cpp/c/name.h ndn-cpp/name.hpp \
+  ndn-cpp/publisher-public-key-digest.hpp \
+  ndn-cpp/c/encoding/binary-xml.h \
+  ndn-cpp/c/encoding/binary-xml-decoder.h ndn-cpp/encoding/binary-xml-decoder.hpp \
+  ndn-cpp/c/encoding/binary-xml-element-reader.h ndn-cpp/encoding/binary-xml-element-reader.cpp ndn-cpp/encoding/binary-xml-element-reader.hpp \
+  ndn-cpp/c/encoding/binary-xml-encoder.h ndn-cpp/encoding/binary-xml-encoder.hpp ndn-cpp/c/util/dynamic-uchar-array.h \
+  ndn-cpp/c/encoding/binary-xml-structure-decoder.h ndn-cpp/encoding/binary-xml-structure-decoder.hpp \
+  ndn-cpp/encoding/binary-xml-wire-format.cpp ndn-cpp/c/encoding/binary-xml-name.h ndn-cpp/encoding/binary-xml-wire-format.hpp \
+  ndn-cpp/encoding/wire-format.cpp ndn-cpp/encoding/wire-format.hpp \
+  ndn-cpp/c/transport/socket-transport.h ndn-cpp/c/transport/tcp-transport.h ndn-cpp/transport/tcp-transport.cpp ndn-cpp/transport/tcp-transport.hpp \
+  ndn-cpp/transport/transport.cpp ndn-cpp/transport/transport.hpp \
+  ndn-cpp/c/transport/socket-transport.h ndn-cpp/c/transport/udp-transport.h ndn-cpp/transport/udp-transport.cpp ndn-cpp/transport/udp-transport.hpp
 
 bin_test_encode_decode_interest_SOURCES = tests/test-encode-decode-interest.cpp
 bin_test_encode_decode_interest_LDADD = libndn-cpp.la libndn-c.la
diff --git a/Makefile.in b/Makefile.in
index 26716ad..ae2ecf4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -134,16 +134,16 @@
 am__dirstamp = $(am__leading_dot)dirstamp
 am_libndn_c_la_OBJECTS = ndn-cpp/c/errors.lo \
 	ndn-cpp/c/encoding/binary-xml-data.lo \
-	ndn-cpp/c/encoding/BinaryXMLDecoder.lo \
-	ndn-cpp/c/encoding/BinaryXMLElementReader.lo \
-	ndn-cpp/c/encoding/BinaryXMLEncoder.lo \
-	ndn-cpp/c/encoding/BinaryXMLInterest.lo \
-	ndn-cpp/c/encoding/BinaryXMLKey.lo \
-	ndn-cpp/c/encoding/BinaryXMLName.lo \
-	ndn-cpp/c/encoding/BinaryXMLPublisherPublicKeyDigest.lo \
-	ndn-cpp/c/encoding/BinaryXMLStructureDecoder.lo \
-	ndn-cpp/c/transport/SocketTransport.lo \
-	ndn-cpp/c/util/DynamicUCharArray.lo \
+	ndn-cpp/c/encoding/binary-xml-decoder.lo \
+	ndn-cpp/c/encoding/binary-xml-element-reader.lo \
+	ndn-cpp/c/encoding/binary-xml-encoder.lo \
+	ndn-cpp/c/encoding/binary-xml-interest.lo \
+	ndn-cpp/c/encoding/binary-xml-key.lo \
+	ndn-cpp/c/encoding/binary-xml-name.lo \
+	ndn-cpp/c/encoding/binary-xml-publisher-public-key-digest.lo \
+	ndn-cpp/c/encoding/binary-xml-structure-decoder.lo \
+	ndn-cpp/c/transport/socket-transport.lo \
+	ndn-cpp/c/util/dynamic-uchar-array.lo \
 	ndn-cpp/c/util/ndn_memory.lo ndn-cpp/c/util/ndn_realloc.lo
 libndn_c_la_OBJECTS = $(am_libndn_c_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
@@ -151,14 +151,14 @@
 am__v_lt_0 = --silent
 am__v_lt_1 = 
 libndn_cpp_la_LIBADD =
-am_libndn_cpp_la_OBJECTS = ndn-cpp/data.lo ndn-cpp/Interest.lo \
-	ndn-cpp/Key.lo ndn-cpp/face.lo ndn-cpp/Name.lo \
-	ndn-cpp/encoding/BinaryXMLElementReader.lo \
-	ndn-cpp/encoding/BinaryXMLWireFormat.lo \
-	ndn-cpp/encoding/WireFormat.lo \
-	ndn-cpp/transport/TcpTransport.lo \
-	ndn-cpp/transport/Transport.lo \
-	ndn-cpp/transport/UdpTransport.lo
+am_libndn_cpp_la_OBJECTS = ndn-cpp/data.lo ndn-cpp/interest.lo \
+	ndn-cpp/key.lo ndn-cpp/face.lo ndn-cpp/name.lo \
+	ndn-cpp/encoding/binary-xml-element-reader.lo \
+	ndn-cpp/encoding/binary-xml-wire-format.lo \
+	ndn-cpp/encoding/wire-format.lo \
+	ndn-cpp/transport/tcp-transport.lo \
+	ndn-cpp/transport/transport.lo \
+	ndn-cpp/transport/udp-transport.lo
 libndn_cpp_la_OBJECTS = $(am_libndn_cpp_la_OBJECTS)
 PROGRAMS = $(bin_PROGRAMS)
 am_bin_test_encode_decode_data_OBJECTS =  \
@@ -455,47 +455,47 @@
 libndn_c_la_SOURCES = \
   config.h \
   ndn-cpp/c/data.h \
-  ndn-cpp/c/Interest.h \
-  ndn-cpp/c/Key.h \
-  ndn-cpp/c/Name.h \
-  ndn-cpp/c/PublisherPublicKeyDigest.h \
+  ndn-cpp/c/interest.h \
+  ndn-cpp/c/key.h \
+  ndn-cpp/c/name.h \
+  ndn-cpp/c/publisher-public-key-digest.h \
   ndn-cpp/c/errors.c ndn-cpp/c/errors.h \
-  ndn-cpp/c/encoding/BinaryXML.h \
+  ndn-cpp/c/encoding/binary-xml.h \
   ndn-cpp/c/encoding/binary-xml-data.c ndn-cpp/c/encoding/binary-xml-data.h \
-  ndn-cpp/c/encoding/BinaryXMLDecoder.c ndn-cpp/c/encoding/BinaryXMLDecoder.h \
-  ndn-cpp/c/encoding/BinaryXMLElementReader.c ndn-cpp/c/encoding/BinaryXMLElementReader.h \
-  ndn-cpp/c/encoding/BinaryXMLEncoder.c ndn-cpp/c/encoding/BinaryXMLEncoder.h \
-  ndn-cpp/c/encoding/BinaryXMLInterest.c ndn-cpp/c/encoding/BinaryXMLInterest.h \
-  ndn-cpp/c/encoding/BinaryXMLKey.c ndn-cpp/c/encoding/BinaryXMLKey.h \
-  ndn-cpp/c/encoding/BinaryXMLName.c ndn-cpp/c/encoding/BinaryXMLName.h \
-  ndn-cpp/c/encoding/BinaryXMLPublisherPublicKeyDigest.c ndn-cpp/c/encoding/BinaryXMLPublisherPublicKeyDigest.h \
-  ndn-cpp/c/encoding/BinaryXMLStructureDecoder.c ndn-cpp/c/encoding/BinaryXMLStructureDecoder.h \
-  ndn-cpp/c/transport/SocketTransport.c ndn-cpp/c/transport/SocketTransport.h \
-  ndn-cpp/c/transport/TcpTransport.h \
-  ndn-cpp/c/transport/UdpTransport.h \
-  ndn-cpp/c/util/DynamicUCharArray.c ndn-cpp/c/util/DynamicUCharArray.h \
+  ndn-cpp/c/encoding/binary-xml-decoder.c ndn-cpp/c/encoding/binary-xml-decoder.h \
+  ndn-cpp/c/encoding/binary-xml-element-reader.c ndn-cpp/c/encoding/binary-xml-element-reader.h \
+  ndn-cpp/c/encoding/binary-xml-encoder.c ndn-cpp/c/encoding/binary-xml-encoder.h \
+  ndn-cpp/c/encoding/binary-xml-interest.c ndn-cpp/c/encoding/binary-xml-interest.h \
+  ndn-cpp/c/encoding/binary-xml-key.c ndn-cpp/c/encoding/binary-xml-key.h \
+  ndn-cpp/c/encoding/binary-xml-name.c ndn-cpp/c/encoding/binary-xml-name.h \
+  ndn-cpp/c/encoding/binary-xml-publisher-public-key-digest.c ndn-cpp/c/encoding/binary-xml-publisher-public-key-digest.h \
+  ndn-cpp/c/encoding/binary-xml-structure-decoder.c ndn-cpp/c/encoding/binary-xml-structure-decoder.h \
+  ndn-cpp/c/transport/socket-transport.c ndn-cpp/c/transport/socket-transport.h \
+  ndn-cpp/c/transport/tcp-transport.h \
+  ndn-cpp/c/transport/udp-transport.h \
+  ndn-cpp/c/util/dynamic-uchar-array.c ndn-cpp/c/util/dynamic-uchar-array.h \
   ndn-cpp/c/util/ndn_memory.c ndn-cpp/c/util/ndn_memory.h \
   ndn-cpp/c/util/ndn_realloc.c ndn-cpp/c/util/ndn_realloc.h
 
 libndn_cpp_la_SOURCES = \
   config.h ndn-cpp/common.hpp \
-  ndn-cpp/Closure.hpp \
+  ndn-cpp/closure.hpp \
   ndn-cpp/data.cpp ndn-cpp/c/data.h ndn-cpp/data.hpp \
-  ndn-cpp/Interest.cpp ndn-cpp/c/Interest.h ndn-cpp/Interest.hpp \
-  ndn-cpp/Key.cpp ndn-cpp/c/Key.h ndn-cpp/Key.hpp \
+  ndn-cpp/interest.cpp ndn-cpp/c/interest.h ndn-cpp/interest.hpp \
+  ndn-cpp/key.cpp ndn-cpp/c/key.h ndn-cpp/key.hpp \
   ndn-cpp/face.cpp ndn-cpp/face.hpp \
-  ndn-cpp/Name.cpp ndn-cpp/c/Name.h ndn-cpp/Name.hpp \
-  ndn-cpp/PublisherPublicKeyDigest.hpp \
-  ndn-cpp/c/encoding/BinaryXML.h \
-  ndn-cpp/c/encoding/BinaryXMLDecoder.h ndn-cpp/encoding/BinaryXMLDecoder.hpp \
-  ndn-cpp/c/encoding/BinaryXMLElementReader.h ndn-cpp/encoding/BinaryXMLElementReader.cpp ndn-cpp/encoding/BinaryXMLElementReader.hpp \
-  ndn-cpp/c/encoding/BinaryXMLEncoder.h ndn-cpp/encoding/BinaryXMLEncoder.hpp ndn-cpp/c/util/DynamicUCharArray.h \
-  ndn-cpp/c/encoding/BinaryXMLStructureDecoder.h ndn-cpp/encoding/BinaryXMLStructureDecoder.hpp \
-  ndn-cpp/encoding/BinaryXMLWireFormat.cpp ndn-cpp/c/encoding/BinaryXMLName.h ndn-cpp/encoding/BinaryXMLWireFormat.hpp \
-  ndn-cpp/encoding/WireFormat.cpp ndn-cpp/encoding/WireFormat.hpp \
-  ndn-cpp/c/transport/SocketTransport.h ndn-cpp/c/transport/TcpTransport.h ndn-cpp/transport/TcpTransport.cpp ndn-cpp/transport/TcpTransport.hpp \
-  ndn-cpp/transport/Transport.cpp ndn-cpp/transport/Transport.hpp \
-  ndn-cpp/c/transport/SocketTransport.h ndn-cpp/c/transport/UdpTransport.h ndn-cpp/transport/UdpTransport.cpp ndn-cpp/transport/UdpTransport.hpp
+  ndn-cpp/name.cpp ndn-cpp/c/name.h ndn-cpp/name.hpp \
+  ndn-cpp/publisher-public-key-digest.hpp \
+  ndn-cpp/c/encoding/binary-xml.h \
+  ndn-cpp/c/encoding/binary-xml-decoder.h ndn-cpp/encoding/binary-xml-decoder.hpp \
+  ndn-cpp/c/encoding/binary-xml-element-reader.h ndn-cpp/encoding/binary-xml-element-reader.cpp ndn-cpp/encoding/binary-xml-element-reader.hpp \
+  ndn-cpp/c/encoding/binary-xml-encoder.h ndn-cpp/encoding/binary-xml-encoder.hpp ndn-cpp/c/util/dynamic-uchar-array.h \
+  ndn-cpp/c/encoding/binary-xml-structure-decoder.h ndn-cpp/encoding/binary-xml-structure-decoder.hpp \
+  ndn-cpp/encoding/binary-xml-wire-format.cpp ndn-cpp/c/encoding/binary-xml-name.h ndn-cpp/encoding/binary-xml-wire-format.hpp \
+  ndn-cpp/encoding/wire-format.cpp ndn-cpp/encoding/wire-format.hpp \
+  ndn-cpp/c/transport/socket-transport.h ndn-cpp/c/transport/tcp-transport.h ndn-cpp/transport/tcp-transport.cpp ndn-cpp/transport/tcp-transport.hpp \
+  ndn-cpp/transport/transport.cpp ndn-cpp/transport/transport.hpp \
+  ndn-cpp/c/transport/socket-transport.h ndn-cpp/c/transport/udp-transport.h ndn-cpp/transport/udp-transport.cpp ndn-cpp/transport/udp-transport.hpp
 
 bin_test_encode_decode_interest_SOURCES = tests/test-encode-decode-interest.cpp
 bin_test_encode_decode_interest_LDADD = libndn-cpp.la libndn-c.la
@@ -611,28 +611,28 @@
 ndn-cpp/c/encoding/binary-xml-data.lo:  \
 	ndn-cpp/c/encoding/$(am__dirstamp) \
 	ndn-cpp/c/encoding/$(DEPDIR)/$(am__dirstamp)
-ndn-cpp/c/encoding/BinaryXMLDecoder.lo:  \
+ndn-cpp/c/encoding/binary-xml-decoder.lo:  \
 	ndn-cpp/c/encoding/$(am__dirstamp) \
 	ndn-cpp/c/encoding/$(DEPDIR)/$(am__dirstamp)
-ndn-cpp/c/encoding/BinaryXMLElementReader.lo:  \
+ndn-cpp/c/encoding/binary-xml-element-reader.lo:  \
 	ndn-cpp/c/encoding/$(am__dirstamp) \
 	ndn-cpp/c/encoding/$(DEPDIR)/$(am__dirstamp)
-ndn-cpp/c/encoding/BinaryXMLEncoder.lo:  \
+ndn-cpp/c/encoding/binary-xml-encoder.lo:  \
 	ndn-cpp/c/encoding/$(am__dirstamp) \
 	ndn-cpp/c/encoding/$(DEPDIR)/$(am__dirstamp)
-ndn-cpp/c/encoding/BinaryXMLInterest.lo:  \
+ndn-cpp/c/encoding/binary-xml-interest.lo:  \
 	ndn-cpp/c/encoding/$(am__dirstamp) \
 	ndn-cpp/c/encoding/$(DEPDIR)/$(am__dirstamp)
-ndn-cpp/c/encoding/BinaryXMLKey.lo:  \
+ndn-cpp/c/encoding/binary-xml-key.lo:  \
 	ndn-cpp/c/encoding/$(am__dirstamp) \
 	ndn-cpp/c/encoding/$(DEPDIR)/$(am__dirstamp)
-ndn-cpp/c/encoding/BinaryXMLName.lo:  \
+ndn-cpp/c/encoding/binary-xml-name.lo:  \
 	ndn-cpp/c/encoding/$(am__dirstamp) \
 	ndn-cpp/c/encoding/$(DEPDIR)/$(am__dirstamp)
-ndn-cpp/c/encoding/BinaryXMLPublisherPublicKeyDigest.lo:  \
+ndn-cpp/c/encoding/binary-xml-publisher-public-key-digest.lo:  \
 	ndn-cpp/c/encoding/$(am__dirstamp) \
 	ndn-cpp/c/encoding/$(DEPDIR)/$(am__dirstamp)
-ndn-cpp/c/encoding/BinaryXMLStructureDecoder.lo:  \
+ndn-cpp/c/encoding/binary-xml-structure-decoder.lo:  \
 	ndn-cpp/c/encoding/$(am__dirstamp) \
 	ndn-cpp/c/encoding/$(DEPDIR)/$(am__dirstamp)
 ndn-cpp/c/transport/$(am__dirstamp):
@@ -641,7 +641,7 @@
 ndn-cpp/c/transport/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) ndn-cpp/c/transport/$(DEPDIR)
 	@: > ndn-cpp/c/transport/$(DEPDIR)/$(am__dirstamp)
-ndn-cpp/c/transport/SocketTransport.lo:  \
+ndn-cpp/c/transport/socket-transport.lo:  \
 	ndn-cpp/c/transport/$(am__dirstamp) \
 	ndn-cpp/c/transport/$(DEPDIR)/$(am__dirstamp)
 ndn-cpp/c/util/$(am__dirstamp):
@@ -650,7 +650,7 @@
 ndn-cpp/c/util/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) ndn-cpp/c/util/$(DEPDIR)
 	@: > ndn-cpp/c/util/$(DEPDIR)/$(am__dirstamp)
-ndn-cpp/c/util/DynamicUCharArray.lo: ndn-cpp/c/util/$(am__dirstamp) \
+ndn-cpp/c/util/dynamic-uchar-array.lo: ndn-cpp/c/util/$(am__dirstamp) \
 	ndn-cpp/c/util/$(DEPDIR)/$(am__dirstamp)
 ndn-cpp/c/util/ndn_memory.lo: ndn-cpp/c/util/$(am__dirstamp) \
 	ndn-cpp/c/util/$(DEPDIR)/$(am__dirstamp)
@@ -667,13 +667,13 @@
 	@: > ndn-cpp/$(DEPDIR)/$(am__dirstamp)
 ndn-cpp/data.lo: ndn-cpp/$(am__dirstamp) \
 	ndn-cpp/$(DEPDIR)/$(am__dirstamp)
-ndn-cpp/Interest.lo: ndn-cpp/$(am__dirstamp) \
+ndn-cpp/interest.lo: ndn-cpp/$(am__dirstamp) \
 	ndn-cpp/$(DEPDIR)/$(am__dirstamp)
-ndn-cpp/Key.lo: ndn-cpp/$(am__dirstamp) \
+ndn-cpp/key.lo: ndn-cpp/$(am__dirstamp) \
 	ndn-cpp/$(DEPDIR)/$(am__dirstamp)
 ndn-cpp/face.lo: ndn-cpp/$(am__dirstamp) \
 	ndn-cpp/$(DEPDIR)/$(am__dirstamp)
-ndn-cpp/Name.lo: ndn-cpp/$(am__dirstamp) \
+ndn-cpp/name.lo: ndn-cpp/$(am__dirstamp) \
 	ndn-cpp/$(DEPDIR)/$(am__dirstamp)
 ndn-cpp/encoding/$(am__dirstamp):
 	@$(MKDIR_P) ndn-cpp/encoding
@@ -681,13 +681,13 @@
 ndn-cpp/encoding/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) ndn-cpp/encoding/$(DEPDIR)
 	@: > ndn-cpp/encoding/$(DEPDIR)/$(am__dirstamp)
-ndn-cpp/encoding/BinaryXMLElementReader.lo:  \
+ndn-cpp/encoding/binary-xml-element-reader.lo:  \
 	ndn-cpp/encoding/$(am__dirstamp) \
 	ndn-cpp/encoding/$(DEPDIR)/$(am__dirstamp)
-ndn-cpp/encoding/BinaryXMLWireFormat.lo:  \
+ndn-cpp/encoding/binary-xml-wire-format.lo:  \
 	ndn-cpp/encoding/$(am__dirstamp) \
 	ndn-cpp/encoding/$(DEPDIR)/$(am__dirstamp)
-ndn-cpp/encoding/WireFormat.lo: ndn-cpp/encoding/$(am__dirstamp) \
+ndn-cpp/encoding/wire-format.lo: ndn-cpp/encoding/$(am__dirstamp) \
 	ndn-cpp/encoding/$(DEPDIR)/$(am__dirstamp)
 ndn-cpp/transport/$(am__dirstamp):
 	@$(MKDIR_P) ndn-cpp/transport
@@ -695,11 +695,11 @@
 ndn-cpp/transport/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) ndn-cpp/transport/$(DEPDIR)
 	@: > ndn-cpp/transport/$(DEPDIR)/$(am__dirstamp)
-ndn-cpp/transport/TcpTransport.lo: ndn-cpp/transport/$(am__dirstamp) \
+ndn-cpp/transport/tcp-transport.lo: ndn-cpp/transport/$(am__dirstamp) \
 	ndn-cpp/transport/$(DEPDIR)/$(am__dirstamp)
-ndn-cpp/transport/Transport.lo: ndn-cpp/transport/$(am__dirstamp) \
+ndn-cpp/transport/transport.lo: ndn-cpp/transport/$(am__dirstamp) \
 	ndn-cpp/transport/$(DEPDIR)/$(am__dirstamp)
-ndn-cpp/transport/UdpTransport.lo: ndn-cpp/transport/$(am__dirstamp) \
+ndn-cpp/transport/udp-transport.lo: ndn-cpp/transport/$(am__dirstamp) \
 	ndn-cpp/transport/$(DEPDIR)/$(am__dirstamp)
 
 libndn-cpp.la: $(libndn_cpp_la_OBJECTS) $(libndn_cpp_la_DEPENDENCIES) $(EXTRA_libndn_cpp_la_DEPENDENCIES) 
@@ -802,31 +802,31 @@
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/$(DEPDIR)/Interest.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/$(DEPDIR)/Key.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/$(DEPDIR)/Name.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/$(DEPDIR)/data.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/$(DEPDIR)/face.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/$(DEPDIR)/interest.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/$(DEPDIR)/key.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/$(DEPDIR)/name.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/c/$(DEPDIR)/errors.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/c/encoding/$(DEPDIR)/BinaryXMLDecoder.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/c/encoding/$(DEPDIR)/BinaryXMLElementReader.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/c/encoding/$(DEPDIR)/BinaryXMLEncoder.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/c/encoding/$(DEPDIR)/BinaryXMLInterest.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/c/encoding/$(DEPDIR)/BinaryXMLKey.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/c/encoding/$(DEPDIR)/BinaryXMLName.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/c/encoding/$(DEPDIR)/BinaryXMLPublisherPublicKeyDigest.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/c/encoding/$(DEPDIR)/BinaryXMLStructureDecoder.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/c/encoding/$(DEPDIR)/binary-xml-data.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/c/transport/$(DEPDIR)/SocketTransport.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/c/util/$(DEPDIR)/DynamicUCharArray.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/c/encoding/$(DEPDIR)/binary-xml-decoder.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/c/encoding/$(DEPDIR)/binary-xml-element-reader.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/c/encoding/$(DEPDIR)/binary-xml-encoder.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/c/encoding/$(DEPDIR)/binary-xml-interest.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/c/encoding/$(DEPDIR)/binary-xml-key.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/c/encoding/$(DEPDIR)/binary-xml-name.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/c/encoding/$(DEPDIR)/binary-xml-publisher-public-key-digest.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/c/encoding/$(DEPDIR)/binary-xml-structure-decoder.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/c/transport/$(DEPDIR)/socket-transport.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/c/util/$(DEPDIR)/dynamic-uchar-array.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/c/util/$(DEPDIR)/ndn_memory.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/c/util/$(DEPDIR)/ndn_realloc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/encoding/$(DEPDIR)/BinaryXMLElementReader.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/encoding/$(DEPDIR)/BinaryXMLWireFormat.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/encoding/$(DEPDIR)/WireFormat.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/transport/$(DEPDIR)/TcpTransport.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/transport/$(DEPDIR)/Transport.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/transport/$(DEPDIR)/UdpTransport.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/encoding/$(DEPDIR)/binary-xml-element-reader.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/encoding/$(DEPDIR)/binary-xml-wire-format.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/encoding/$(DEPDIR)/wire-format.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/transport/$(DEPDIR)/tcp-transport.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/transport/$(DEPDIR)/transport.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/transport/$(DEPDIR)/udp-transport.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/test-encode-decode-data.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/test-encode-decode-interest.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/test-get-async.Po@am__quote@
diff --git a/libtool b/libtool
index 0331b3e..c53c58a 100755
--- a/libtool
+++ b/libtool
@@ -2,7 +2,7 @@
 
 # libtool - Provide generalized library-building support services.
 # Generated automatically by config.status (ndn-cpp) 0.5
-# Libtool was configured on host Jeffs-MacBook-Pro.local:
+# Libtool was configured on host display1:
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
diff --git a/ndn-cpp/c/data.h b/ndn-cpp/c/data.h
index 9338846..7d25bac 100644
--- a/ndn-cpp/c/data.h
+++ b/ndn-cpp/c/data.h
@@ -6,9 +6,9 @@
 #ifndef NDN_DATA_H
 #define	NDN_DATA_H
 
-#include "Name.h"
-#include "PublisherPublicKeyDigest.h"
-#include "Key.h"
+#include "name.h"
+#include "publisher-public-key-digest.h"
+#include "key.h"
 
 #ifdef	__cplusplus
 extern "C" {
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
diff --git a/ndn-cpp/c/Interest.h b/ndn-cpp/c/interest.h
similarity index 98%
rename from ndn-cpp/c/Interest.h
rename to ndn-cpp/c/interest.h
index ada7a7e..3248835 100644
--- a/ndn-cpp/c/Interest.h
+++ b/ndn-cpp/c/interest.h
@@ -6,8 +6,8 @@
 #ifndef NDN_INTEREST_H
 #define	NDN_INTEREST_H
 
-#include "Name.h"
-#include "PublisherPublicKeyDigest.h"
+#include "name.h"
+#include "publisher-public-key-digest.h"
 
 #ifdef	__cplusplus
 extern "C" {
diff --git a/ndn-cpp/c/Key.h b/ndn-cpp/c/key.h
similarity index 100%
rename from ndn-cpp/c/Key.h
rename to ndn-cpp/c/key.h
diff --git a/ndn-cpp/c/Name.h b/ndn-cpp/c/name.h
similarity index 100%
rename from ndn-cpp/c/Name.h
rename to ndn-cpp/c/name.h
diff --git a/ndn-cpp/c/PublisherPublicKeyDigest.h b/ndn-cpp/c/publisher-public-key-digest.h
similarity index 100%
rename from ndn-cpp/c/PublisherPublicKeyDigest.h
rename to ndn-cpp/c/publisher-public-key-digest.h
diff --git a/ndn-cpp/c/transport/SocketTransport.c b/ndn-cpp/c/transport/socket-transport.c
similarity index 98%
rename from ndn-cpp/c/transport/SocketTransport.c
rename to ndn-cpp/c/transport/socket-transport.c
index ee1f72a..b4ded31 100644
--- a/ndn-cpp/c/transport/SocketTransport.c
+++ b/ndn-cpp/c/transport/socket-transport.c
@@ -3,7 +3,7 @@
  * See COPYING for copyright and distribution information.
  */
 
-#include "SocketTransport.h"
+#include "socket-transport.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/ndn-cpp/c/transport/SocketTransport.h b/ndn-cpp/c/transport/socket-transport.h
similarity index 100%
rename from ndn-cpp/c/transport/SocketTransport.h
rename to ndn-cpp/c/transport/socket-transport.h
diff --git a/ndn-cpp/c/transport/TcpTransport.h b/ndn-cpp/c/transport/tcp-transport.h
similarity index 97%
rename from ndn-cpp/c/transport/TcpTransport.h
rename to ndn-cpp/c/transport/tcp-transport.h
index 6421d4b..9a4787b 100644
--- a/ndn-cpp/c/transport/TcpTransport.h
+++ b/ndn-cpp/c/transport/tcp-transport.h
@@ -8,7 +8,7 @@
 #ifndef NDN_TCPTRANSPORT_H
 #define	NDN_TCPTRANSPORT_H
 
-#include "SocketTransport.h"
+#include "socket-transport.h"
 
 #ifdef	__cplusplus
 extern "C" {
diff --git a/ndn-cpp/c/transport/UdpTransport.h b/ndn-cpp/c/transport/udp-transport.h
similarity index 97%
rename from ndn-cpp/c/transport/UdpTransport.h
rename to ndn-cpp/c/transport/udp-transport.h
index ef113b2..c6e77bf 100644
--- a/ndn-cpp/c/transport/UdpTransport.h
+++ b/ndn-cpp/c/transport/udp-transport.h
@@ -8,7 +8,7 @@
 #ifndef NDN_UDPTRANSPORT_H
 #define	NDN_UDPTRANSPORT_H
 
-#include "SocketTransport.h"
+#include "socket-transport.h"
 
 #ifdef	__cplusplus
 extern "C" {
diff --git a/ndn-cpp/c/util/DynamicUCharArray.c b/ndn-cpp/c/util/dynamic-uchar-array.c
similarity index 95%
rename from ndn-cpp/c/util/DynamicUCharArray.c
rename to ndn-cpp/c/util/dynamic-uchar-array.c
index eb28072..c6a8f40 100644
--- a/ndn-cpp/c/util/DynamicUCharArray.c
+++ b/ndn-cpp/c/util/dynamic-uchar-array.c
@@ -3,7 +3,7 @@
  * See COPYING for copyright and distribution information.
  */
 
-#include "DynamicUCharArray.h"
+#include "dynamic-uchar-array.h"
 
 ndn_Error ndn_DynamicUCharArray_reallocArray(struct ndn_DynamicUCharArray *self, unsigned int length)
 {
diff --git a/ndn-cpp/c/util/DynamicUCharArray.h b/ndn-cpp/c/util/dynamic-uchar-array.h
similarity index 100%
rename from ndn-cpp/c/util/DynamicUCharArray.h
rename to ndn-cpp/c/util/dynamic-uchar-array.h
diff --git a/ndn-cpp/Closure.hpp b/ndn-cpp/closure.hpp
similarity index 100%
rename from ndn-cpp/Closure.hpp
rename to ndn-cpp/closure.hpp
diff --git a/ndn-cpp/data.hpp b/ndn-cpp/data.hpp
index 7da6dad..0b0dd3e 100644
--- a/ndn-cpp/data.hpp
+++ b/ndn-cpp/data.hpp
@@ -6,9 +6,9 @@
 #ifndef NDN_DATA_HPP
 #define	NDN_DATA_HPP
 
-#include "Name.hpp"
-#include "PublisherPublicKeyDigest.hpp"
-#include "Key.hpp"
+#include "name.hpp"
+#include "publisher-public-key-digest.hpp"
+#include "key.hpp"
 #include "c/data.h"
 
 namespace ndn {
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
diff --git a/ndn-cpp/face.cpp b/ndn-cpp/face.cpp
index d5c174b..eeaac00 100644
--- a/ndn-cpp/face.cpp
+++ b/ndn-cpp/face.cpp
@@ -3,8 +3,8 @@
  * See COPYING for copyright and distribution information.
  */
 
-#include "encoding/BinaryXMLDecoder.hpp"
-#include "c/encoding/BinaryXML.h"
+#include "encoding/binary-xml-decoder.hpp"
+#include "c/encoding/binary-xml.h"
 #include "data.hpp"
 #include "face.hpp"
 
diff --git a/ndn-cpp/face.hpp b/ndn-cpp/face.hpp
index b00314b..fe700ef 100644
--- a/ndn-cpp/face.hpp
+++ b/ndn-cpp/face.hpp
@@ -6,10 +6,10 @@
 #ifndef NDN_FACE_HPP
 #define	NDN_FACE_HPP
 
-#include "Closure.hpp"
-#include "Interest.hpp"
-#include "transport/UdpTransport.hpp"
-#include "encoding/BinaryXMLElementReader.hpp"
+#include "closure.hpp"
+#include "interest.hpp"
+#include "transport/udp-transport.hpp"
+#include "encoding/binary-xml-element-reader.hpp"
 
 using namespace std;
 
diff --git a/ndn-cpp/Interest.cpp b/ndn-cpp/interest.cpp
similarity index 98%
rename from ndn-cpp/Interest.cpp
rename to ndn-cpp/interest.cpp
index 634559e..7aa7e35 100644
--- a/ndn-cpp/Interest.cpp
+++ b/ndn-cpp/interest.cpp
@@ -5,7 +5,7 @@
 
 #include <stdexcept>
 #include "common.hpp"
-#include "Interest.hpp"
+#include "interest.hpp"
 
 using namespace std;
 
diff --git a/ndn-cpp/Interest.hpp b/ndn-cpp/interest.hpp
similarity index 98%
rename from ndn-cpp/Interest.hpp
rename to ndn-cpp/interest.hpp
index 370b093..ddc6fce 100644
--- a/ndn-cpp/Interest.hpp
+++ b/ndn-cpp/interest.hpp
@@ -6,9 +6,9 @@
 #ifndef NDN_INTEREST_HPP
 #define	NDN_INTEREST_HPP
 
-#include "Name.hpp"
-#include "PublisherPublicKeyDigest.hpp"
-#include "c/Interest.h"
+#include "name.hpp"
+#include "publisher-public-key-digest.hpp"
+#include "c/interest.h"
 
 namespace ndn {
   
diff --git a/ndn-cpp/Key.cpp b/ndn-cpp/key.cpp
similarity index 97%
rename from ndn-cpp/Key.cpp
rename to ndn-cpp/key.cpp
index 45425f2..41fe8b9 100644
--- a/ndn-cpp/Key.cpp
+++ b/ndn-cpp/key.cpp
@@ -4,7 +4,7 @@
  */
 
 #include "common.hpp"
-#include "Key.hpp"
+#include "key.hpp"
 
 using namespace std;
 
diff --git a/ndn-cpp/Key.hpp b/ndn-cpp/key.hpp
similarity index 98%
rename from ndn-cpp/Key.hpp
rename to ndn-cpp/key.hpp
index aa2f01b..fd9df2b 100644
--- a/ndn-cpp/Key.hpp
+++ b/ndn-cpp/key.hpp
@@ -7,7 +7,7 @@
 #define	NDN_KEY_HPP
 
 #include <vector>
-#include "c/Key.h"
+#include "c/key.h"
 
 namespace ndn {
   
diff --git a/ndn-cpp/Name.cpp b/ndn-cpp/name.cpp
similarity index 99%
rename from ndn-cpp/Name.cpp
rename to ndn-cpp/name.cpp
index b2c1faf..4996c92 100644
--- a/ndn-cpp/Name.cpp
+++ b/ndn-cpp/name.cpp
@@ -5,7 +5,7 @@
 
 #include <stdexcept>
 #include <sstream>
-#include "Name.hpp"
+#include "name.hpp"
 
 using namespace std;
 
diff --git a/ndn-cpp/Name.hpp b/ndn-cpp/name.hpp
similarity index 98%
rename from ndn-cpp/Name.hpp
rename to ndn-cpp/name.hpp
index 588aa2d..b4a8dbe 100644
--- a/ndn-cpp/Name.hpp
+++ b/ndn-cpp/name.hpp
@@ -8,8 +8,8 @@
 
 #include <vector>
 #include <string>
-#include "c/Name.h"
-#include "encoding/BinaryXMLWireFormat.hpp"
+#include "c/name.h"
+#include "encoding/binary-xml-wire-format.hpp"
 
 namespace ndn {
     
diff --git a/ndn-cpp/PublisherPublicKeyDigest.hpp b/ndn-cpp/publisher-public-key-digest.hpp
similarity index 97%
rename from ndn-cpp/PublisherPublicKeyDigest.hpp
rename to ndn-cpp/publisher-public-key-digest.hpp
index 62c22d6..af3da01 100644
--- a/ndn-cpp/PublisherPublicKeyDigest.hpp
+++ b/ndn-cpp/publisher-public-key-digest.hpp
@@ -8,7 +8,7 @@
 
 #include <vector>
 #include "common.hpp"
-#include "c/PublisherPublicKeyDigest.h"
+#include "c/publisher-public-key-digest.h"
 
 namespace ndn {
   
diff --git a/ndn-cpp/transport/TcpTransport.cpp b/ndn-cpp/transport/tcp-transport.cpp
similarity index 98%
rename from ndn-cpp/transport/TcpTransport.cpp
rename to ndn-cpp/transport/tcp-transport.cpp
index bf5180a..e8c60ed 100644
--- a/ndn-cpp/transport/TcpTransport.cpp
+++ b/ndn-cpp/transport/tcp-transport.cpp
@@ -6,7 +6,7 @@
 #include <stdexcept>
 #include "../face.hpp"
 #include "../c/util/ndn_realloc.h"
-#include "TcpTransport.hpp"
+#include "tcp-transport.hpp"
 
 using namespace std;
 
diff --git a/ndn-cpp/transport/TcpTransport.hpp b/ndn-cpp/transport/tcp-transport.hpp
similarity index 86%
rename from ndn-cpp/transport/TcpTransport.hpp
rename to ndn-cpp/transport/tcp-transport.hpp
index da8b103..d695b58 100644
--- a/ndn-cpp/transport/TcpTransport.hpp
+++ b/ndn-cpp/transport/tcp-transport.hpp
@@ -6,9 +6,9 @@
 #ifndef NDN_TCPTRANSPORT_HPP
 #define	NDN_TCPTRANSPORT_HPP
 
-#include "../c/transport/TcpTransport.h"
-#include "../c/encoding/BinaryXMLElementReader.h"
-#include "Transport.hpp"
+#include "../c/transport/tcp-transport.h"
+#include "../c/encoding/binary-xml-element-reader.h"
+#include "transport.hpp"
 
 namespace ndn {
   
diff --git a/ndn-cpp/transport/Transport.cpp b/ndn-cpp/transport/transport.cpp
similarity index 93%
rename from ndn-cpp/transport/Transport.cpp
rename to ndn-cpp/transport/transport.cpp
index 1e63649..0b3c7f3 100644
--- a/ndn-cpp/transport/Transport.cpp
+++ b/ndn-cpp/transport/transport.cpp
@@ -4,7 +4,7 @@
  */
 
 #include <stdexcept>
-#include "Transport.hpp"
+#include "transport.hpp"
 
 using namespace std;
 
diff --git a/ndn-cpp/transport/Transport.hpp b/ndn-cpp/transport/transport.hpp
similarity index 100%
rename from ndn-cpp/transport/Transport.hpp
rename to ndn-cpp/transport/transport.hpp
diff --git a/ndn-cpp/transport/UdpTransport.cpp b/ndn-cpp/transport/udp-transport.cpp
similarity index 98%
rename from ndn-cpp/transport/UdpTransport.cpp
rename to ndn-cpp/transport/udp-transport.cpp
index 5fc4a71..1416e8e 100644
--- a/ndn-cpp/transport/UdpTransport.cpp
+++ b/ndn-cpp/transport/udp-transport.cpp
@@ -6,7 +6,7 @@
 #include <stdexcept>
 #include "../face.hpp"
 #include "../c/util/ndn_realloc.h"
-#include "UdpTransport.hpp"
+#include "udp-transport.hpp"
 
 using namespace std;
 
diff --git a/ndn-cpp/transport/UdpTransport.hpp b/ndn-cpp/transport/udp-transport.hpp
similarity index 86%
rename from ndn-cpp/transport/UdpTransport.hpp
rename to ndn-cpp/transport/udp-transport.hpp
index 9043e5c..7e31cf7 100644
--- a/ndn-cpp/transport/UdpTransport.hpp
+++ b/ndn-cpp/transport/udp-transport.hpp
@@ -6,9 +6,9 @@
 #ifndef NDN_UDPTRANSPORT_HPP
 #define	NDN_UDPTRANSPORT_HPP
 
-#include "../c/transport/UdpTransport.h"
-#include "../c/encoding/BinaryXMLElementReader.h"
-#include "Transport.hpp"
+#include "../c/transport/udp-transport.h"
+#include "../c/encoding/binary-xml-element-reader.h"
+#include "transport.hpp"
 
 namespace ndn {
   
diff --git a/tests/test-encode-decode-interest.cpp b/tests/test-encode-decode-interest.cpp
index 6d5b9d3..1f8cee6 100644
--- a/tests/test-encode-decode-interest.cpp
+++ b/tests/test-encode-decode-interest.cpp
@@ -6,7 +6,7 @@
 #include <cstdlib>
 #include <sstream>
 #include <iostream>
-#include <ndn-cpp/Interest.hpp>
+#include <ndn-cpp/interest.hpp>
 
 using namespace std;
 using namespace ndn;
diff --git a/tests/test-get-async.cpp b/tests/test-get-async.cpp
index eac1ac6..8d33015 100644
--- a/tests/test-get-async.cpp
+++ b/tests/test-get-async.cpp
@@ -6,9 +6,9 @@
 #include <cstdlib>
 #include <sstream>
 #include <iostream>
-#include <ndn-cpp/Interest.hpp>
+#include <ndn-cpp/interest.hpp>
 #include <ndn-cpp/data.hpp>
-#include <ndn-cpp/transport/UdpTransport.hpp>
+#include <ndn-cpp/transport/udp-transport.hpp>
 #include <ndn-cpp/face.hpp>
 
 using namespace std;