diff --git a/tools/ndns-create-zone.cpp b/tools/ndns-create-zone.cpp
index 4cc4eca..a30875f 100644
--- a/tools/ndns-create-zone.cpp
+++ b/tools/ndns-create-zone.cpp
@@ -26,6 +26,8 @@
 #include <boost/filesystem.hpp>
 #include <string>
 
+NDNS_LOG_INIT("NdnsCreateZone")
+
 int
 main(int argc, char* argv[])
 {
@@ -131,7 +133,7 @@
     ndn::ndns::ManagementTool tool(db, keyChain);
     ndn::ndns::Zone createdZone = tool.createZone(zone, parent, cacheTtl, certTtl, ksk, dsk, dkey);
     ndn::security::v2::Certificate dkeyCert = tool.getZoneDkey(createdZone);
-    std::cout << "Generated DKEY " << dkeyCert.getName() << std::endl;
+    NDNS_LOG_INFO("Generated DKEY " << dkeyCert.getName());
     ndn::io::save(dkeyCert, std::cout);
   }
   catch (const std::exception& ex) {
diff --git a/tools/ndns-dig.cpp b/tools/ndns-dig.cpp
index aebbdf1..888138b 100644
--- a/tools/ndns-dig.cpp
+++ b/tools/ndns-dig.cpp
@@ -22,7 +22,7 @@
 #include "clients/response.hpp"
 #include "clients/query.hpp"
 #include "clients/iterative-query-controller.hpp"
-#include "validator.hpp"
+#include "validator/validator.hpp"
 #include "util/util.hpp"
 
 #include <ndn-cxx/security/key-chain.hpp>
diff --git a/tools/ndns-update.cpp b/tools/ndns-update.cpp
index 5fdbf67..ff75417 100644
--- a/tools/ndns-update.cpp
+++ b/tools/ndns-update.cpp
@@ -20,7 +20,7 @@
 #include "clients/response.hpp"
 #include "clients/query.hpp"
 #include "ndns-label.hpp"
-#include "validator.hpp"
+#include "validator/validator.hpp"
 #include "ndns-enum.hpp"
 #include "ndns-tlv.hpp"
 #include "logger.hpp"