diff --git a/.gitignore b/.gitignore
index 410c804..db21ec6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -74,8 +74,8 @@
 
 # Tools
 tools/tlvdump
-tools/ndncatchunks
-tools/ndnputchunks
+tools/ndncatchunks3
+tools/ndnputchunks3
 
 # Examples
 examples/consumer
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 3b9d701..f344e7d 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,10 +1,10 @@
 LDADD = ../libndn-cpp-dev.la @BOOST_SYSTEM_LIB@
 
-bin_PROGRAMS = tlvdump ndncatchunks ndnputchunks
+bin_PROGRAMS = tlvdump ndncatchunks3 ndnputchunks3
 
 tlvdump_SOURCES      = tlvdump.cpp
 
-ndncatchunks_SOURCES = ndncatchunks.cpp
+ndncatchunks3_SOURCES = ndncatchunks3.cpp
 
-ndnputchunks_SOURCES = ndnputchunks.cpp
+ndnputchunks3_SOURCES = ndnputchunks3.cpp
 
diff --git a/tools/ndncatchunks.cpp b/tools/ndncatchunks3.cpp
similarity index 100%
rename from tools/ndncatchunks.cpp
rename to tools/ndncatchunks3.cpp
diff --git a/tools/ndnputchunks.cpp b/tools/ndnputchunks3.cpp
similarity index 100%
rename from tools/ndnputchunks.cpp
rename to tools/ndnputchunks3.cpp