diff --git a/tools/ndn-nac/add-member.cpp b/tools/ndn-nac/add-member.cpp
index c6d0347..4d82044 100644
--- a/tools/ndn-nac/add-member.cpp
+++ b/tools/ndn-nac/add-member.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2014-2020, Regents of the University of California
+/*
+ * Copyright (c) 2014-2022, Regents of the University of California
  *
  * NAC library is free software: you can redistribute it and/or modify it under the
  * terms of the GNU Lesser General Public License as published by the Free Software
@@ -20,8 +20,7 @@
 #include "ndn-nac.hpp"
 #include "access-manager.hpp"
 
-namespace ndn {
-namespace nac {
+namespace ndn::nac {
 
 int
 nac_add_member(int argc, char** argv)
@@ -103,5 +102,4 @@
   }
 }
 
-} // namespace nac
-} // namespace ndn
+} // namespace ndn::nac
diff --git a/tools/ndn-nac/dump-kek.cpp b/tools/ndn-nac/dump-kek.cpp
index afc8047..a1b9d2a 100644
--- a/tools/ndn-nac/dump-kek.cpp
+++ b/tools/ndn-nac/dump-kek.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2014-2020, Regents of the University of California
+/*
+ * Copyright (c) 2014-2022, Regents of the University of California
  *
  * NAC library is free software: you can redistribute it and/or modify it under the
  * terms of the GNU Lesser General Public License as published by the Free Software
@@ -20,8 +20,7 @@
 #include "ndn-nac.hpp"
 #include "access-manager.hpp"
 
-namespace ndn {
-namespace nac {
+namespace ndn::nac {
 
 int
 nac_dump_kek(int argc, char** argv)
@@ -95,5 +94,4 @@
   }
 }
 
-} // namespace nac
-} // namespace ndn
+} // namespace ndn::nac
diff --git a/tools/ndn-nac/ndn-nac.hpp b/tools/ndn-nac/ndn-nac.hpp
index a80c531..007022f 100644
--- a/tools/ndn-nac/ndn-nac.hpp
+++ b/tools/ndn-nac/ndn-nac.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2021, Regents of the University of California
+ * Copyright (c) 2014-2022, Regents of the University of California
  *
  * NAC library is free software: you can redistribute it and/or modify it under the
  * terms of the GNU Lesser General Public License as published by the Free Software
@@ -32,8 +32,7 @@
 #include <ndn-cxx/util/exception.hpp>
 #include <ndn-cxx/util/io.hpp>
 
-namespace ndn {
-namespace nac {
+namespace ndn::nac {
 
 int
 nac_dump_kek(int argc, char** argv);
@@ -61,7 +60,6 @@
   }
 }
 
-} // namespace nac
-} // namespace ndn
+} // namespace ndn::nac
 
 #endif // NAC_TOOLS_NDN_NAC_NDN_NAC_HPP