diff --git a/server/request_handler.cpp b/server/request_handler.cpp
index 1a959a1..c7b8898 100644
--- a/server/request_handler.cpp
+++ b/server/request_handler.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2013-2016, Regents of the University of California.
+ * Copyright (c) 2013-2017, Regents of the University of California.
  *
  * This file is part of ChronoShare, a decentralized file sharing application over NDN.
  *
@@ -47,7 +47,7 @@
 namespace http {
 namespace server {
 
-INIT_LOGGER("HttpServer")
+_LOG_INIT(HttpServer);
 
 request_handler::request_handler(const std::string& doc_root)
   : doc_root_(doc_root.c_str())
diff --git a/server/server.cpp b/server/server.cpp
index 46c983a..f52b448 100644
--- a/server/server.cpp
+++ b/server/server.cpp
@@ -37,7 +37,7 @@
 
 using namespace ndn::chronoshare;
 
-INIT_LOGGER("HttpServer")
+_LOG_INIT(HttpServer);
 
 server::server(const std::string& address, const std::string& port, const std::string& doc_root)
   : io_service_()