diff --git a/src/util/config-file.cpp b/src/util/config-file.cpp
index c80ddc6..ea56d12 100644
--- a/src/util/config-file.cpp
+++ b/src/util/config-file.cpp
@@ -45,15 +45,15 @@
         }
     }
 
-#ifdef NDN_CPP_SYSCONFDIR
-  path sysconfdir(NDN_CPP_SYSCONFDIR);
+#ifdef NDN_CXX_SYSCONFDIR
+  path sysconfdir(NDN_CXX_SYSCONFDIR);
   sysconfdir /= "ndn/client.conf";
 
   if (exists(sysconfdir))
     {
       return absolute(sysconfdir);
     }
-#endif // NDN_CPP_SYSCONFDIR
+#endif // NDN_CXX_SYSCONFDIR
 
   path etc("/etc/ndn/client.conf");
   if (exists(etc))
diff --git a/src/util/logging.cpp b/src/util/logging.cpp
index 0b969a0..113e3a9 100644
--- a/src/util/logging.cpp
+++ b/src/util/logging.cpp
@@ -10,7 +10,7 @@
 
 #include "logging.hpp"
 
-#ifdef NDN_CPP_HAVE_LOG4CXX
+#ifdef NDN_CXX_HAVE_LOG4CXX
 
 #include <log4cxx/logger.h>
 #include <log4cxx/basicconfigurator.h>
@@ -46,4 +46,4 @@
   configured = true;
 }
 
-#endif
+#endif // NDN_CXX_HAVE_LOG4CXX
diff --git a/src/util/logging.hpp b/src/util/logging.hpp
index 9370af0..5ee958c 100644
--- a/src/util/logging.hpp
+++ b/src/util/logging.hpp
@@ -11,7 +11,7 @@
 
 #include "../common.hpp"
 
-#ifdef NDN_CPP_HAVE_LOG4CXX
+#ifdef NDN_CXX_HAVE_LOG4CXX
 
 #include <log4cxx/logger.h>
 
@@ -48,7 +48,7 @@
 void
 INIT_LOGGERS()
 
-#else // else NDN_CPP_HAVE_LOG4CXX
+#else // else NDN_CXX_HAVE_LOG4CXX
 
 #define INIT_LOGGER(name) struct LOGGING_DISABLED
 #define _LOG_FUNCTION(x)
@@ -67,12 +67,12 @@
 #include <iostream>
 
 #define _LOG_DEBUG(x) \
-  { std::clog << s.substr(0, s.size() - 1) << " " << x << std::endl; }
+  { std::clog << x << std::endl; }
 
 #else
 #define _LOG_DEBUG(x)
 #endif
 
-#endif // NDN_CPP_HAVE_LOG4CXX
+#endif // NDN_CXX_HAVE_LOG4CXX
 
 #endif