diff --git a/src/update/manager-base.cpp b/src/update/manager-base.cpp
index 47ff076..5a1034c 100644
--- a/src/update/manager-base.cpp
+++ b/src/update/manager-base.cpp
@@ -61,7 +61,7 @@
 
   // Only build a Name LSA if the added name is new
   if (m_namePrefixList.insert(castParams.getName())) {
-    _LOG_INFO("Advertising/Inserting name: " << castParams.getName() << "\n");
+    NLSR_LOG_INFO("Advertising/Inserting name: " << castParams.getName() << "\n");
     m_lsdb.buildAndInstallOwnNameLsa();
     return done(ndn::nfd::ControlResponse(200, "OK").setBody(parameters.wireEncode()));
   }
@@ -80,7 +80,7 @@
 
   // Only build a Name LSA if the added name is new
   if (m_namePrefixList.remove(castParams.getName())) {
-    _LOG_INFO("Withdrawing/Removing name: " << castParams.getName() << "\n");
+    NLSR_LOG_INFO("Withdrawing/Removing name: " << castParams.getName() << "\n");
     m_lsdb.buildAndInstallOwnNameLsa();
     return done(ndn::nfd::ControlResponse(200, "OK").setBody(parameters.wireEncode()));
   }
diff --git a/src/update/prefix-update-processor.cpp b/src/update/prefix-update-processor.cpp
index 6146441..4ad75dd 100644
--- a/src/update/prefix-update-processor.cpp
+++ b/src/update/prefix-update-processor.cpp
@@ -60,7 +60,7 @@
   : CommandManagerBase(dispatcher, namePrefixList, lsdb, "prefix-update")
   , m_validator(face, broadcastPrefix, certificateCache, certStore)
 {
-  _LOG_DEBUG("Setting dispatcher to capture Interests for: "
+  NLSR_LOG_DEBUG("Setting dispatcher to capture Interests for: "
     << ndn::Name(Nlsr::LOCALHOST_PREFIX).append("prefix-update"));
 
   m_dispatcher.addControlCommand<ndn::nfd::ControlParameters>(makeRelPrefix("advertise"),
@@ -88,12 +88,12 @@
 
         auto signer1 = getSignerFromTag(*request);
         std::string signer = signer1.value_or("*");
-        _LOG_DEBUG("accept " << request->getName() << " signer=" << signer);
+        NLSR_LOG_DEBUG("accept " << request->getName() << " signer=" << signer);
         accept(signer);
       },
       [reject] (const std::shared_ptr<const ndn::Interest>& request,
                 const std::string& failureInfo) {
-        _LOG_DEBUG("reject " << request->getName() << " signer=" <<
+        NLSR_LOG_DEBUG("reject " << request->getName() << " signer=" <<
                       getSignerFromTag(*request).value_or("?") << ' ' << failureInfo);
         reject(ndn::mgmt::RejectReply::STATUS403);
       });
