diff --git a/src/hello-protocol.hpp b/src/hello-protocol.hpp
index bd88628..f58ffdd 100644
--- a/src/hello-protocol.hpp
+++ b/src/hello-protocol.hpp
@@ -25,8 +25,8 @@
 #include "test-access-control.hpp"
 
 #include <ndn-cxx/face.hpp>
-#include <ndn-cxx/management/nfd-control-parameters.hpp>
-#include <ndn-cxx/management/nfd-control-response.hpp>
+#include <ndn-cxx/mgmt/nfd/control-parameters.hpp>
+#include <ndn-cxx/mgmt/nfd/control-response.hpp>
 #include <ndn-cxx/util/scheduler.hpp>
 
 namespace nlsr {
diff --git a/src/nlsr.hpp b/src/nlsr.hpp
index c88f199..9eff222 100644
--- a/src/nlsr.hpp
+++ b/src/nlsr.hpp
@@ -29,8 +29,8 @@
 #include <ndn-cxx/security/key-chain.hpp>
 #include <ndn-cxx/security/certificate-cache-ttl.hpp>
 #include <ndn-cxx/util/scheduler.hpp>
-#include <ndn-cxx/management/nfd-face-event-notification.hpp>
-#include <ndn-cxx/management/nfd-face-monitor.hpp>
+#include <ndn-cxx/mgmt/nfd/face-event-notification.hpp>
+#include <ndn-cxx/mgmt/nfd/face-monitor.hpp>
 
 #include "adjacency-list.hpp"
 #include "common.hpp"
diff --git a/src/publisher/lsdb-dataset-interest-handler.cpp b/src/publisher/lsdb-dataset-interest-handler.cpp
index 3d4519c..c8abd72 100644
--- a/src/publisher/lsdb-dataset-interest-handler.cpp
+++ b/src/publisher/lsdb-dataset-interest-handler.cpp
@@ -32,7 +32,7 @@
 #include "nlsr.hpp"
 
 #include <ndn-cxx/face.hpp>
-#include <ndn-cxx/management/nfd-control-response.hpp>
+#include <ndn-cxx/mgmt/nfd/control-response.hpp>
 #include <ndn-cxx/util/regex.hpp>
 
 namespace nlsr {
diff --git a/src/route/fib.hpp b/src/route/fib.hpp
index 2e61096..4cf6d74 100644
--- a/src/route/fib.hpp
+++ b/src/route/fib.hpp
@@ -1,7 +1,8 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
  * Copyright (c) 2014-2016,  The University of Memphis,
- *                           Regents of the University of California
+ *                           Regents of the University of California,
+ *                           Arizona Board of Regents.
  *
  * This file is part of NLSR (Named-data Link State Routing).
  * See AUTHORS.md for complete list of NLSR authors and contributors.
@@ -18,7 +19,6 @@
  * NLSR, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  *
  * \author A K M Mahmudul Hoque <ahoque1@memphis.edu>
- *
  **/
 #ifndef NLSR_FIB_HPP
 #define NLSR_FIB_HPP
@@ -26,7 +26,7 @@
 #include <list>
 #include <boost/cstdint.hpp>
 
-#include <ndn-cxx/management/nfd-controller.hpp>
+#include <ndn-cxx/mgmt/nfd/controller.hpp>
 #include <ndn-cxx/util/time.hpp>
 #include "face-map.hpp"
 #include "fib-entry.hpp"
diff --git a/src/update/prefix-update-commands.hpp b/src/update/prefix-update-commands.hpp
index 2b5442a..304e044 100644
--- a/src/update/prefix-update-commands.hpp
+++ b/src/update/prefix-update-commands.hpp
@@ -22,7 +22,7 @@
 #ifndef UPDATE_PREFIX_UPDATE_COMMANDS_HPP
 #define UPDATE_PREFIX_UPDATE_COMMANDS_HPP
 
-#include <ndn-cxx/management/nfd-control-command.hpp>
+#include <ndn-cxx/mgmt/nfd/control-command.hpp>
 
 namespace nlsr {
 namespace update {
diff --git a/src/update/prefix-update-processor.cpp b/src/update/prefix-update-processor.cpp
index dcc7aa4..ee3390f 100644
--- a/src/update/prefix-update-processor.cpp
+++ b/src/update/prefix-update-processor.cpp
@@ -26,7 +26,7 @@
 #include "prefix-update-commands.hpp"
 #include "communication/sync-logic-handler.hpp"
 
-#include <ndn-cxx/management/nfd-control-response.hpp>
+#include <ndn-cxx/mgmt/nfd/control-response.hpp>
 
 namespace nlsr {
 namespace update {
diff --git a/src/update/prefix-update-processor.hpp b/src/update/prefix-update-processor.hpp
index 79e8070..93c3bfb 100644
--- a/src/update/prefix-update-processor.hpp
+++ b/src/update/prefix-update-processor.hpp
@@ -28,8 +28,8 @@
 
 #include <ndn-cxx/face.hpp>
 #include <ndn-cxx/interest.hpp>
-#include <ndn-cxx/management/nfd-control-command.hpp>
-#include <ndn-cxx/management/nfd-control-parameters.hpp>
+#include <ndn-cxx/mgmt/nfd/control-command.hpp>
+#include <ndn-cxx/mgmt/nfd/control-parameters.hpp>
 #include <ndn-cxx/security/certificate-cache-ttl.hpp>
 #include <ndn-cxx/security/key-chain.hpp>
 
diff --git a/src/utility/face-controller.hpp b/src/utility/face-controller.hpp
index 09e6163..346a9da 100644
--- a/src/utility/face-controller.hpp
+++ b/src/utility/face-controller.hpp
@@ -1,7 +1,8 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
  * Copyright (c) 2014-2016,  The University of Memphis,
- *                           Regents of the University of California
+ *                           Regents of the University of California,
+ *                           Arizona Board of Regents.
  *
  * This file is part of NLSR (Named-data Link State Routing).
  * See AUTHORS.md for complete list of NLSR authors and contributors.
@@ -16,14 +17,13 @@
  *
  * You should have received a copy of the GNU General Public License along with
  * NLSR, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
- *
  **/
 
 #ifndef NLSR_UTIL_FACE_CONTROLLER_HPP
 #define NLSR_UTIL_FACE_CONTROLLER_HPP
 
 #include <ndn-cxx/util/face-uri.hpp>
-#include <ndn-cxx/management/nfd-controller.hpp>
+#include <ndn-cxx/mgmt/nfd/controller.hpp>
 
 namespace nlsr {
 namespace util {