diff --git a/tools/ndnsec/accumulator.hpp b/tools/ndnsec/accumulator.hpp
index 7c08581..fb7f357 100644
--- a/tools/ndnsec/accumulator.hpp
+++ b/tools/ndnsec/accumulator.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_TOOLS_NDNSEC_ACCUMULATOR_HPP
-#define NDN_TOOLS_NDNSEC_ACCUMULATOR_HPP
+#ifndef NDN_CXX_TOOLS_NDNSEC_ACCUMULATOR_HPP
+#define NDN_CXX_TOOLS_NDNSEC_ACCUMULATOR_HPP
 
 #include <boost/program_options/value_semantic.hpp>
 
@@ -165,4 +165,4 @@
 } // namespace ndnsec
 } // namespace ndn
 
-#endif // NDN_TOOLS_NDNSEC_ACCUMULATOR_HPP
+#endif // NDN_CXX_TOOLS_NDNSEC_ACCUMULATOR_HPP
diff --git a/tools/ndnsec/ndnsec-pch.hpp b/tools/ndnsec/ndnsec-pch.hpp
index ea537fa..c72b650 100644
--- a/tools/ndnsec/ndnsec-pch.hpp
+++ b/tools/ndnsec/ndnsec-pch.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_TOOLS_NDNSEC_NDNSEC_PCH_HPP
-#define NDN_TOOLS_NDNSEC_NDNSEC_PCH_HPP
+#ifndef NDN_CXX_TOOLS_NDNSEC_NDNSEC_PCH_HPP
+#define NDN_CXX_TOOLS_NDNSEC_NDNSEC_PCH_HPP
 
 #include "util.hpp"
 
@@ -28,4 +28,4 @@
 
 #include <boost/asio/ip/tcp.hpp>
 
-#endif // NDN_TOOLS_NDNSEC_NDNSEC_PCH_HPP
+#endif // NDN_CXX_TOOLS_NDNSEC_NDNSEC_PCH_HPP
diff --git a/tools/ndnsec/ndnsec.hpp b/tools/ndnsec/ndnsec.hpp
index dd34dd9..bb773ea 100644
--- a/tools/ndnsec/ndnsec.hpp
+++ b/tools/ndnsec/ndnsec.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,13 +19,13 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_TOOLS_NDNSEC_NDNSEC_HPP
-#define NDN_TOOLS_NDNSEC_NDNSEC_HPP
+#ifndef NDN_CXX_TOOLS_NDNSEC_NDNSEC_HPP
+#define NDN_CXX_TOOLS_NDNSEC_NDNSEC_HPP
 
 namespace ndn {
 namespace ndnsec {
 
-// TODO convert to tool registry (may be)
+// TODO: convert to tool registry (maybe)
 
 int
 ndnsec_list(int argc, char** argv);
@@ -66,4 +66,4 @@
 } // namespace ndnsec
 } // namespace ndn
 
-#endif // NDN_TOOLS_NDNSEC_NDNSEC_HPP
+#endif // NDN_CXX_TOOLS_NDNSEC_NDNSEC_HPP
diff --git a/tools/ndnsec/util.hpp b/tools/ndnsec/util.hpp
index f069c34..8aed837 100644
--- a/tools/ndnsec/util.hpp
+++ b/tools/ndnsec/util.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_TOOLS_NDNSEC_UTIL_HPP
-#define NDN_TOOLS_NDNSEC_UTIL_HPP
+#ifndef NDN_CXX_TOOLS_NDNSEC_UTIL_HPP
+#define NDN_CXX_TOOLS_NDNSEC_UTIL_HPP
 
 #include "ndn-cxx/security/key-chain.hpp"
 
@@ -67,4 +67,4 @@
 } // namespace ndnsec
 } // namespace ndn
 
-#endif // NDN_TOOLS_NDNSEC_UTIL_HPP
+#endif // NDN_CXX_TOOLS_NDNSEC_UTIL_HPP