diff --git a/.travis.yml b/.travis.yml
index 6aa66cb..97c3521 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,8 +11,8 @@
 before_install:
   - travis_retry sudo apt-get update
   - travis_retry sudo apt-get install -qq libssl-dev libpcap-dev libboost1.48-all-dev libcrypto++-dev libsqlite3-dev
-  - travis_retry git clone git://github.com/named-data/ndn-cpp-dev ndn-cpp-dev
-  - cd ndn-cpp-dev
+  - travis_retry git clone --depth 1 git://github.com/named-data/ndn-cxx ndn-cxx
+  - cd ndn-cxx
   - ./waf configure
   - ./waf -j1
   - sudo ./waf install
diff --git a/.waf-tools/default-compiler-flags.py b/.waf-tools/default-compiler-flags.py
index 9f7843e..4e9548c 100644
--- a/.waf-tools/default-compiler-flags.py
+++ b/.waf-tools/default-compiler-flags.py
@@ -9,6 +9,8 @@
 def options(opt):
     opt.add_option('--debug', '--with-debug', action='store_true', default=False, dest='debug',
                    help='''Compile in debugging mode without all optimizations (-O0)''')
+    opt.add_option('--with-c++11', action='store_true', default=False, dest='use_cxx11',
+                   help='''Enable C++11 mode (experimental, may not work)''')
 
 def configure(conf):
     areCustomCxxflagsPresent = (len(conf.env.CXXFLAGS) > 0)
diff --git a/README-dev.md b/README-dev.md
index aab44e9..17af2ee 100644
--- a/README-dev.md
+++ b/README-dev.md
@@ -8,13 +8,13 @@
 
     /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
     /**
-     * Copyright (c) 2014  Regents of the University of California,
-     *                     Arizona Board of Regents,
-     *                     Colorado State University,
-     *                     University Pierre & Marie Curie, Sorbonne University,
-     *                     Washington University in St. Louis,
-     *                     Beijing Institute of Technology,
-     *                     The University of Memphis
+     * Copyright (c) 2014,  Regents of the University of California,
+     *                      Arizona Board of Regents,
+     *                      Colorado State University,
+     *                      University Pierre & Marie Curie, Sorbonne University,
+     *                      Washington University in St. Louis,
+     *                      Beijing Institute of Technology,
+     *                      The University of Memphis
      *
      * This file is part of NFD (Named Data Networking Forwarding Daemon).
      * See AUTHORS.md for complete list of NFD authors and contributors.
@@ -34,7 +34,7 @@
      * \author Author's Name <email@domain>
      * \author Other Author's Name <another.email@domain>
      ////// [end of optional part] //////
-     **/
+     */
 
 Recommendations
 ---------------
diff --git a/common.hpp b/common.hpp
index ec7a612..6e13c4e 100644
--- a/common.hpp
+++ b/common.hpp
@@ -39,9 +39,9 @@
 #define PROTECTED_WITH_TESTS_ELSE_PRIVATE private
 #endif
 
-#include <ndn-cpp-dev/common.hpp>
-#include <ndn-cpp-dev/interest.hpp>
-#include <ndn-cpp-dev/data.hpp>
+#include <ndn-cxx/common.hpp>
+#include <ndn-cxx/interest.hpp>
+#include <ndn-cxx/data.hpp>
 
 #include <boost/assert.hpp>
 #include <boost/lexical_cast.hpp>
diff --git a/core/face-monitor.cpp b/core/face-monitor.cpp
index 658d4b9..914e3df 100644
--- a/core/face-monitor.cpp
+++ b/core/face-monitor.cpp
@@ -26,7 +26,7 @@
 #include "face-monitor.hpp"
 #include "core/logger.hpp"
 
-#include <ndn-cpp-dev/face.hpp>
+#include <ndn-cxx/face.hpp>
 
 namespace nfd {
 
diff --git a/core/face-monitor.hpp b/core/face-monitor.hpp
index 6ce6595..28cfdbd 100644
--- a/core/face-monitor.hpp
+++ b/core/face-monitor.hpp
@@ -28,7 +28,7 @@
 
 #include "common.hpp"
 
-#include <ndn-cpp-dev/management/nfd-face-event-notification.hpp>
+#include <ndn-cxx/management/nfd-face-event-notification.hpp>
 
 namespace ndn {
 class Face;
diff --git a/core/logger.hpp b/core/logger.hpp
index 907ce7e..01ab1e6 100644
--- a/core/logger.hpp
+++ b/core/logger.hpp
@@ -26,7 +26,7 @@
 #define NFD_CORE_LOGGER_HPP
 
 #include "common.hpp"
-#include <ndn-cpp-dev/util/time.hpp>
+#include <ndn-cxx/util/time.hpp>
 
 /// \todo use when we enable C++11 (see todo in now())
 // #include <cinttypes>
diff --git a/core/scheduler.hpp b/core/scheduler.hpp
index f275c69..c674429 100644
--- a/core/scheduler.hpp
+++ b/core/scheduler.hpp
@@ -26,7 +26,7 @@
 #define NFD_CORE_SCHEDULER_HPP
 
 #include "common.hpp"
-#include <ndn-cpp-dev/util/scheduler.hpp>
+#include <ndn-cxx/util/scheduler.hpp>
 
 namespace nfd {
 namespace scheduler {
diff --git a/daemon/face/local-face.hpp b/daemon/face/local-face.hpp
index dbcb9bd..118dce7 100644
--- a/daemon/face/local-face.hpp
+++ b/daemon/face/local-face.hpp
@@ -26,7 +26,7 @@
 #define NFD_DAEMON_FACE_LOCAL_FACE_HPP
 
 #include "face.hpp"
-#include <ndn-cpp-dev/management/nfd-control-parameters.hpp>
+#include <ndn-cxx/management/nfd-control-parameters.hpp>
 
 namespace nfd {
 
diff --git a/daemon/face/ndnlp-slicer.cpp b/daemon/face/ndnlp-slicer.cpp
index 22d8c3b..9efe7d6 100644
--- a/daemon/face/ndnlp-slicer.cpp
+++ b/daemon/face/ndnlp-slicer.cpp
@@ -24,7 +24,7 @@
 
 #include "ndnlp-slicer.hpp"
 
-#include <ndn-cpp-dev/encoding/encoding-buffer.hpp>
+#include <ndn-cxx/encoding/encoding-buffer.hpp>
 
 namespace nfd {
 namespace ndnlp {
diff --git a/daemon/face/tcp-channel.hpp b/daemon/face/tcp-channel.hpp
index 4398ee7..c4f269c 100644
--- a/daemon/face/tcp-channel.hpp
+++ b/daemon/face/tcp-channel.hpp
@@ -26,7 +26,7 @@
 #define NFD_DAEMON_FACE_TCP_CHANNEL_HPP
 
 #include "channel.hpp"
-#include <ndn-cpp-dev/util/monotonic_deadline_timer.hpp>
+#include <ndn-cxx/util/monotonic_deadline_timer.hpp>
 #include "tcp-face.hpp"
 
 namespace nfd {
diff --git a/daemon/mgmt/app-face.hpp b/daemon/mgmt/app-face.hpp
index 1539b9e..476fda7 100644
--- a/daemon/mgmt/app-face.hpp
+++ b/daemon/mgmt/app-face.hpp
@@ -27,7 +27,7 @@
 
 #include "common.hpp"
 
-#include <ndn-cpp-dev/security/key-chain.hpp>
+#include <ndn-cxx/security/key-chain.hpp>
 
 namespace nfd {
 
diff --git a/daemon/mgmt/command-validator.cpp b/daemon/mgmt/command-validator.cpp
index ad3443c..f7b0df2 100644
--- a/daemon/mgmt/command-validator.cpp
+++ b/daemon/mgmt/command-validator.cpp
@@ -25,8 +25,8 @@
 #include "command-validator.hpp"
 #include "core/logger.hpp"
 
-#include <ndn-cpp-dev/util/io.hpp>
-#include <ndn-cpp-dev/security/identity-certificate.hpp>
+#include <ndn-cxx/util/io.hpp>
+#include <ndn-cxx/security/identity-certificate.hpp>
 
 #include <boost/filesystem.hpp>
 #include <fstream>
diff --git a/daemon/mgmt/command-validator.hpp b/daemon/mgmt/command-validator.hpp
index 8456db3..b2cb184 100644
--- a/daemon/mgmt/command-validator.hpp
+++ b/daemon/mgmt/command-validator.hpp
@@ -27,7 +27,7 @@
 
 #include "common.hpp"
 #include "config-file.hpp"
-#include <ndn-cpp-dev/util/command-interest-validator.hpp>
+#include <ndn-cxx/util/command-interest-validator.hpp>
 
 namespace nfd {
 
diff --git a/daemon/mgmt/face-flags.hpp b/daemon/mgmt/face-flags.hpp
index c4809a0..1451a27 100644
--- a/daemon/mgmt/face-flags.hpp
+++ b/daemon/mgmt/face-flags.hpp
@@ -26,7 +26,7 @@
 #define NFD_DAEMON_MGMT_FACE_FLAGS_HPP
 
 #include "face/face.hpp"
-#include <ndn-cpp-dev/management/nfd-face-flags.hpp>
+#include <ndn-cxx/management/nfd-face-flags.hpp>
 
 namespace nfd {
 
diff --git a/daemon/mgmt/face-manager.cpp b/daemon/mgmt/face-manager.cpp
index 8397253..c514637 100644
--- a/daemon/mgmt/face-manager.cpp
+++ b/daemon/mgmt/face-manager.cpp
@@ -41,7 +41,7 @@
 #include "face/ethernet-factory.hpp"
 #endif // HAVE_LIBPCAP
 
-#include <ndn-cpp-dev/management/nfd-face-event-notification.hpp>
+#include <ndn-cxx/management/nfd-face-event-notification.hpp>
 
 namespace nfd {
 
diff --git a/daemon/mgmt/face-manager.hpp b/daemon/mgmt/face-manager.hpp
index ed33975..b5a7890 100644
--- a/daemon/mgmt/face-manager.hpp
+++ b/daemon/mgmt/face-manager.hpp
@@ -31,8 +31,8 @@
 #include "mgmt/face-status-publisher.hpp"
 #include "mgmt/notification-stream.hpp"
 
-#include <ndn-cpp-dev/management/nfd-control-parameters.hpp>
-#include <ndn-cpp-dev/management/nfd-control-response.hpp>
+#include <ndn-cxx/management/nfd-control-parameters.hpp>
+#include <ndn-cxx/management/nfd-control-response.hpp>
 
 namespace nfd {
 
diff --git a/daemon/mgmt/face-status-publisher.cpp b/daemon/mgmt/face-status-publisher.cpp
index 3e0ec42..28e7155 100644
--- a/daemon/mgmt/face-status-publisher.cpp
+++ b/daemon/mgmt/face-status-publisher.cpp
@@ -27,7 +27,7 @@
 #include "core/logger.hpp"
 #include "fw/face-table.hpp"
 
-#include <ndn-cpp-dev/management/nfd-face-status.hpp>
+#include <ndn-cxx/management/nfd-face-status.hpp>
 
 namespace nfd {
 
diff --git a/daemon/mgmt/fib-enumeration-publisher.cpp b/daemon/mgmt/fib-enumeration-publisher.cpp
index daa5908..4278c98 100644
--- a/daemon/mgmt/fib-enumeration-publisher.cpp
+++ b/daemon/mgmt/fib-enumeration-publisher.cpp
@@ -26,7 +26,7 @@
 #include "core/logger.hpp"
 #include "table/fib.hpp"
 
-#include <ndn-cpp-dev/management/nfd-fib-entry.hpp>
+#include <ndn-cxx/management/nfd-fib-entry.hpp>
 
 namespace nfd {
 
diff --git a/daemon/mgmt/fib-manager.cpp b/daemon/mgmt/fib-manager.cpp
index 5afa492..0936f5c 100644
--- a/daemon/mgmt/fib-manager.cpp
+++ b/daemon/mgmt/fib-manager.cpp
@@ -30,7 +30,7 @@
 #include "mgmt/internal-face.hpp"
 #include "mgmt/app-face.hpp"
 
-#include <ndn-cpp-dev/encoding/tlv.hpp>
+#include <ndn-cxx/encoding/tlv.hpp>
 
 namespace nfd {
 
diff --git a/daemon/mgmt/manager-base.hpp b/daemon/mgmt/manager-base.hpp
index 5d19b2a..2eac9e3 100644
--- a/daemon/mgmt/manager-base.hpp
+++ b/daemon/mgmt/manager-base.hpp
@@ -30,9 +30,9 @@
 #include "mgmt/command-validator.hpp"
 #include "mgmt/internal-face.hpp"
 
-#include <ndn-cpp-dev/management/nfd-control-command.hpp>
-#include <ndn-cpp-dev/management/nfd-control-response.hpp>
-#include <ndn-cpp-dev/management/nfd-control-parameters.hpp>
+#include <ndn-cxx/management/nfd-control-command.hpp>
+#include <ndn-cxx/management/nfd-control-response.hpp>
+#include <ndn-cxx/management/nfd-control-parameters.hpp>
 
 namespace nfd {
 
diff --git a/daemon/mgmt/segment-publisher.cpp b/daemon/mgmt/segment-publisher.cpp
index fd8a16e..01f3d12 100644
--- a/daemon/mgmt/segment-publisher.cpp
+++ b/daemon/mgmt/segment-publisher.cpp
@@ -27,7 +27,7 @@
 #include "core/logger.hpp"
 #include "face/face.hpp"
 
-#include <ndn-cpp-dev/util/time.hpp>
+#include <ndn-cxx/util/time.hpp>
 
 namespace nfd {
 
diff --git a/daemon/mgmt/segment-publisher.hpp b/daemon/mgmt/segment-publisher.hpp
index a01ff76..eeefda7 100644
--- a/daemon/mgmt/segment-publisher.hpp
+++ b/daemon/mgmt/segment-publisher.hpp
@@ -28,7 +28,7 @@
 #include "common.hpp"
 #include "mgmt/app-face.hpp"
 
-#include <ndn-cpp-dev/encoding/encoding-buffer.hpp>
+#include <ndn-cxx/encoding/encoding-buffer.hpp>
 
 namespace nfd {
 
diff --git a/daemon/mgmt/status-server.hpp b/daemon/mgmt/status-server.hpp
index 60cbf39..c046adf 100644
--- a/daemon/mgmt/status-server.hpp
+++ b/daemon/mgmt/status-server.hpp
@@ -26,7 +26,7 @@
 #define NFD_DAEMON_MGMT_STATUS_SERVER_HPP
 
 #include "mgmt/app-face.hpp"
-#include <ndn-cpp-dev/management/nfd-forwarder-status.hpp>
+#include <ndn-cxx/management/nfd-forwarder-status.hpp>
 
 namespace nfd {
 
diff --git a/daemon/mgmt/strategy-choice-manager.hpp b/daemon/mgmt/strategy-choice-manager.hpp
index 94cdb11..cf46e96 100644
--- a/daemon/mgmt/strategy-choice-manager.hpp
+++ b/daemon/mgmt/strategy-choice-manager.hpp
@@ -27,7 +27,7 @@
 
 #include "mgmt/manager-base.hpp"
 
-#include <ndn-cpp-dev/management/nfd-control-parameters.hpp>
+#include <ndn-cxx/management/nfd-control-parameters.hpp>
 
 namespace nfd {
 
diff --git a/daemon/table/cs-entry.hpp b/daemon/table/cs-entry.hpp
index 33f7d64..2150b32 100644
--- a/daemon/table/cs-entry.hpp
+++ b/daemon/table/cs-entry.hpp
@@ -28,7 +28,7 @@
 #define NFD_DAEMON_TABLE_CS_ENTRY_HPP
 
 #include "common.hpp"
-#include <ndn-cpp-dev/util/crypto.hpp>
+#include <ndn-cxx/util/crypto.hpp>
 
 namespace nfd {
 
diff --git a/daemon/table/cs.cpp b/daemon/table/cs.cpp
index e5da3fa..80312c8 100644
--- a/daemon/table/cs.cpp
+++ b/daemon/table/cs.cpp
@@ -26,8 +26,8 @@
 
 #include "cs.hpp"
 #include "core/logger.hpp"
-#include <ndn-cpp-dev/util/crypto.hpp>
-#include "ndn-cpp-dev/security/signature-sha256-with-rsa.hpp"
+#include <ndn-cxx/util/crypto.hpp>
+#include "ndn-cxx/security/signature-sha256-with-rsa.hpp"
 
 #define SKIPLIST_MAX_LAYERS 32
 #define SKIPLIST_PROBABILITY 25         // 25% (p = 1/4)
diff --git a/docs/INSTALL.rst b/docs/INSTALL.rst
index 2c74157..95e2557 100644
--- a/docs/INSTALL.rst
+++ b/docs/INSTALL.rst
@@ -6,7 +6,7 @@
 Prerequisites
 -------------
 
--  `ndn-cpp-dev library <https://github.com/named-data/ndn-cpp-dev>`__
+-  `ndn-cxx library <https://github.com/named-data/ndn-cxx>`__
    and its requirements:
 
    -  ``libcrypto``
@@ -16,7 +16,7 @@
    -  Boost libraries (>= 1.48)
    -  OSX Security framework (on OSX platform only)
 
-   Refer to https://github.com/named-data/ndn-cpp-dev/blob/master/INSTALL.md for detailed
+   Refer to https://github.com/named-data/ndn-cxx/blob/master/INSTALL.md for detailed
    installation instructions.
 
 -  ``libpcap``
diff --git a/docs/manpages/nrd.rst b/docs/manpages/nrd.rst
index a825575..2f03b2a 100644
--- a/docs/manpages/nrd.rst
+++ b/docs/manpages/nrd.rst
@@ -64,4 +64,4 @@
    ~$ nrd
 
 8. Try to connect any application to NFD. For example, producer
-   application that is provided ndn-cpp-dev examples.
+   application that is provided ndn-cxx examples.
diff --git a/rib/rib-manager.hpp b/rib/rib-manager.hpp
index a8984b1..4c2c344 100644
--- a/rib/rib-manager.hpp
+++ b/rib/rib-manager.hpp
@@ -30,11 +30,11 @@
 #include "face-monitor.hpp"
 #include "core/config-file.hpp"
 
-#include <ndn-cpp-dev/security/validator-config.hpp>
-#include <ndn-cpp-dev/management/nfd-controller.hpp>
-#include <ndn-cpp-dev/management/nfd-control-command.hpp>
-#include <ndn-cpp-dev/management/nfd-control-response.hpp>
-#include <ndn-cpp-dev/management/nfd-control-parameters.hpp>
+#include <ndn-cxx/security/validator-config.hpp>
+#include <ndn-cxx/management/nfd-controller.hpp>
+#include <ndn-cxx/management/nfd-control-command.hpp>
+#include <ndn-cxx/management/nfd-control-response.hpp>
+#include <ndn-cxx/management/nfd-control-parameters.hpp>
 
 namespace nfd {
 namespace rib {
diff --git a/rib/rib.hpp b/rib/rib.hpp
index e2371eb..7c19c9f 100644
--- a/rib/rib.hpp
+++ b/rib/rib.hpp
@@ -27,7 +27,7 @@
 #define NFD_RIB_RIB_HPP
 
 #include "common.hpp"
-#include <ndn-cpp-dev/management/nfd-control-command.hpp>
+#include <ndn-cxx/management/nfd-control-command.hpp>
 
 namespace nfd {
 namespace rib {
diff --git a/tests/daemon/face/ethernet.cpp b/tests/daemon/face/ethernet.cpp
index d27fda4..270abb0 100644
--- a/tests/daemon/face/ethernet.cpp
+++ b/tests/daemon/face/ethernet.cpp
@@ -26,7 +26,7 @@
 #include "core/network-interface.hpp"
 #include "tests/test-common.hpp"
 
-#include <ndn-cpp-dev/security/key-chain.hpp>
+#include <ndn-cxx/security/key-chain.hpp>
 #include <pcap/pcap.h>
 
 namespace nfd {
diff --git a/tests/daemon/face/tcp.cpp b/tests/daemon/face/tcp.cpp
index 07e6ec5..bc3ac30 100644
--- a/tests/daemon/face/tcp.cpp
+++ b/tests/daemon/face/tcp.cpp
@@ -23,7 +23,7 @@
  **/
 
 #include "face/tcp-factory.hpp"
-#include <ndn-cpp-dev/security/key-chain.hpp>
+#include <ndn-cxx/security/key-chain.hpp>
 
 #include "tests/test-common.hpp"
 #include "tests/limited-io.hpp"
diff --git a/tests/daemon/mgmt/command-validator.cpp b/tests/daemon/mgmt/command-validator.cpp
index cb8031a..09fd6b9 100644
--- a/tests/daemon/mgmt/command-validator.cpp
+++ b/tests/daemon/mgmt/command-validator.cpp
@@ -27,8 +27,8 @@
 
 #include "tests/test-common.hpp"
 
-#include <ndn-cpp-dev/util/command-interest-generator.hpp>
-#include <ndn-cpp-dev/util/io.hpp>
+#include <ndn-cxx/util/command-interest-generator.hpp>
+#include <ndn-cxx/util/io.hpp>
 #include <boost/filesystem.hpp>
 #include <fstream>
 
diff --git a/tests/daemon/mgmt/face-manager.cpp b/tests/daemon/mgmt/face-manager.cpp
index e799944..14b62d4 100644
--- a/tests/daemon/mgmt/face-manager.cpp
+++ b/tests/daemon/mgmt/face-manager.cpp
@@ -36,8 +36,8 @@
 #include "validation-common.hpp"
 #include "face-status-publisher-common.hpp"
 
-#include <ndn-cpp-dev/encoding/tlv.hpp>
-#include <ndn-cpp-dev/management/nfd-face-event-notification.hpp>
+#include <ndn-cxx/encoding/tlv.hpp>
+#include <ndn-cxx/management/nfd-face-event-notification.hpp>
 
 namespace nfd {
 namespace tests {
diff --git a/tests/daemon/mgmt/face-status-publisher-common.hpp b/tests/daemon/mgmt/face-status-publisher-common.hpp
index 11ed191..088323f 100644
--- a/tests/daemon/mgmt/face-status-publisher-common.hpp
+++ b/tests/daemon/mgmt/face-status-publisher-common.hpp
@@ -34,7 +34,7 @@
 #include "tests/test-common.hpp"
 #include "tests/daemon/face/dummy-face.hpp"
 
-#include <ndn-cpp-dev/management/nfd-face-status.hpp>
+#include <ndn-cxx/management/nfd-face-status.hpp>
 
 namespace nfd {
 namespace tests {
diff --git a/tests/daemon/mgmt/fib-enumeration-publisher-common.hpp b/tests/daemon/mgmt/fib-enumeration-publisher-common.hpp
index 6befe54..d972d79 100644
--- a/tests/daemon/mgmt/fib-enumeration-publisher-common.hpp
+++ b/tests/daemon/mgmt/fib-enumeration-publisher-common.hpp
@@ -35,7 +35,7 @@
 #include "tests/test-common.hpp"
 #include "../face/dummy-face.hpp"
 
-#include <ndn-cpp-dev/encoding/tlv.hpp>
+#include <ndn-cxx/encoding/tlv.hpp>
 
 namespace nfd {
 namespace tests {
diff --git a/tests/daemon/mgmt/fib-enumeration-publisher.cpp b/tests/daemon/mgmt/fib-enumeration-publisher.cpp
index 725d51e..3cb5849 100644
--- a/tests/daemon/mgmt/fib-enumeration-publisher.cpp
+++ b/tests/daemon/mgmt/fib-enumeration-publisher.cpp
@@ -32,7 +32,7 @@
 
 #include "fib-enumeration-publisher-common.hpp"
 
-#include <ndn-cpp-dev/encoding/tlv.hpp>
+#include <ndn-cxx/encoding/tlv.hpp>
 
 namespace nfd {
 namespace tests {
diff --git a/tests/daemon/mgmt/segment-publisher.cpp b/tests/daemon/mgmt/segment-publisher.cpp
index e40f372..43e4523 100644
--- a/tests/daemon/mgmt/segment-publisher.cpp
+++ b/tests/daemon/mgmt/segment-publisher.cpp
@@ -27,7 +27,7 @@
 #include "mgmt/app-face.hpp"
 
 #include "tests/test-common.hpp"
-#include <ndn-cpp-dev/encoding/tlv.hpp>
+#include <ndn-cxx/encoding/tlv.hpp>
 
 namespace nfd {
 namespace tests {
diff --git a/tests/daemon/mgmt/validation-common.hpp b/tests/daemon/mgmt/validation-common.hpp
index 9aa2e28..f8b1367 100644
--- a/tests/daemon/mgmt/validation-common.hpp
+++ b/tests/daemon/mgmt/validation-common.hpp
@@ -26,7 +26,7 @@
 #define NFD_TESTS_NFD_MGMT_VALIDATION_COMMON_HPP
 
 #include "common.hpp"
-#include <ndn-cpp-dev/util/command-interest-generator.hpp>
+#include <ndn-cxx/util/command-interest-generator.hpp>
 
 namespace nfd {
 namespace tests {
diff --git a/tests/other/cs-smoketest.cpp b/tests/other/cs-smoketest.cpp
index 7c50d49..57c92ef 100644
--- a/tests/other/cs-smoketest.cpp
+++ b/tests/other/cs-smoketest.cpp
@@ -26,7 +26,7 @@
 
 #include "table/cs.hpp"
 #include "table/cs-entry.hpp"
-#include <ndn-cpp-dev/security/key-chain.hpp>
+#include <ndn-cxx/security/key-chain.hpp>
 
 namespace nfd {
 
diff --git a/tests/test-common.hpp b/tests/test-common.hpp
index f4fc0ed..8939324 100644
--- a/tests/test-common.hpp
+++ b/tests/test-common.hpp
@@ -28,7 +28,7 @@
 #include <boost/test/unit_test.hpp>
 #include "core/global-io.hpp"
 #include "core/logger.hpp"
-#include <ndn-cpp-dev/security/key-chain.hpp>
+#include <ndn-cxx/security/key-chain.hpp>
 
 namespace nfd {
 namespace tests {
diff --git a/tools/ndn-autoconfig-server.cpp b/tools/ndn-autoconfig-server.cpp
index f09a39a..abcdf5c 100644
--- a/tools/ndn-autoconfig-server.cpp
+++ b/tools/ndn-autoconfig-server.cpp
@@ -22,8 +22,8 @@
  * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  **/
 
-#include <ndn-cpp-dev/face.hpp>
-#include <ndn-cpp-dev/security/key-chain.hpp>
+#include <ndn-cxx/face.hpp>
+#include <ndn-cxx/security/key-chain.hpp>
 
 
 void
diff --git a/tools/ndn-autoconfig.cpp b/tools/ndn-autoconfig.cpp
index b6f09cc..67b2e08 100644
--- a/tools/ndn-autoconfig.cpp
+++ b/tools/ndn-autoconfig.cpp
@@ -22,9 +22,9 @@
  * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  **/
 
-#include <ndn-cpp-dev/face.hpp>
-#include <ndn-cpp-dev/management/nfd-controller.hpp>
-#include <ndn-cpp-dev/security/key-chain.hpp>
+#include <ndn-cxx/face.hpp>
+#include <ndn-cxx/management/nfd-controller.hpp>
+#include <ndn-cxx/security/key-chain.hpp>
 
 #include <sys/types.h>
 #include <netinet/in.h>
diff --git a/tools/ndn-tlv-peek.cpp b/tools/ndn-tlv-peek.cpp
index 00e0bdb..ee0436f 100644
--- a/tools/ndn-tlv-peek.cpp
+++ b/tools/ndn-tlv-peek.cpp
@@ -1,13 +1,33 @@
-/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil -*- */
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 University of Arizona.
+ * Copyright (c) 2014,  Regents of the University of California,
+ *                      Arizona Board of Regents,
+ *                      Colorado State University,
+ *                      University Pierre & Marie Curie, Sorbonne University,
+ *                      Washington University in St. Louis,
+ *                      Beijing Institute of Technology,
+ *                      The University of Memphis
  *
- * Author: Jerald Paul Abraham <jeraldabraham@email.arizona.edu>
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @author Jerald Paul Abraham <jeraldabraham@email.arizona.edu>
  */
 
 #include <boost/asio.hpp>
 
-#include <ndn-cpp-dev/face.hpp>
+#include <ndn-cxx/face.hpp>
 
 namespace ndntlvpeek {
 
diff --git a/tools/ndn-tlv-poke.cpp b/tools/ndn-tlv-poke.cpp
index ba02e5e..5ff5a50 100644
--- a/tools/ndn-tlv-poke.cpp
+++ b/tools/ndn-tlv-poke.cpp
@@ -1,14 +1,34 @@
-/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil -*- */
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 University of Arizona.
+ * Copyright (c) 2014,  Regents of the University of California,
+ *                      Arizona Board of Regents,
+ *                      Colorado State University,
+ *                      University Pierre & Marie Curie, Sorbonne University,
+ *                      Washington University in St. Louis,
+ *                      Beijing Institute of Technology,
+ *                      The University of Memphis
  *
- * Author: Jerald Paul Abraham <jeraldabraham@email.arizona.edu>
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @author Jerald Paul Abraham <jeraldabraham@email.arizona.edu>
  */
 
 #include <boost/utility.hpp>
- 
-#include <ndn-cpp-dev/face.hpp>
-#include <ndn-cpp-dev/security/key-chain.hpp>
+
+#include <ndn-cxx/face.hpp>
+#include <ndn-cxx/security/key-chain.hpp>
 
 namespace ndntlvpoke {
 
diff --git a/tools/nfd-autoreg.cpp b/tools/nfd-autoreg.cpp
index f9e8059..1de90ab 100644
--- a/tools/nfd-autoreg.cpp
+++ b/tools/nfd-autoreg.cpp
@@ -22,11 +22,11 @@
  * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  **/
 
-#include <ndn-cpp-dev/face.hpp>
-#include <ndn-cpp-dev/name.hpp>
+#include <ndn-cxx/face.hpp>
+#include <ndn-cxx/name.hpp>
 
-#include <ndn-cpp-dev/management/nfd-face-event-notification.hpp>
-#include <ndn-cpp-dev/management/nfd-controller.hpp>
+#include <ndn-cxx/management/nfd-face-event-notification.hpp>
+#include <ndn-cxx/management/nfd-controller.hpp>
 
 #include <boost/program_options/options_description.hpp>
 #include <boost/program_options/variables_map.hpp>
diff --git a/tools/nfd-status.cpp b/tools/nfd-status.cpp
index efe1283..1c1f415 100644
--- a/tools/nfd-status.cpp
+++ b/tools/nfd-status.cpp
@@ -1,17 +1,37 @@
-/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil -*- */
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 University of Arizona.
+ * Copyright (c) 2014,  Regents of the University of California,
+ *                      Arizona Board of Regents,
+ *                      Colorado State University,
+ *                      University Pierre & Marie Curie, Sorbonne University,
+ *                      Washington University in St. Louis,
+ *                      Beijing Institute of Technology,
+ *                      The University of Memphis
  *
- * Author: Jerald Paul Abraham <jeraldabraham@email.arizona.edu>
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @author Jerald Paul Abraham <jeraldabraham@email.arizona.edu>
  */
 
-#include <ndn-cpp-dev/face.hpp>
-#include <ndn-cpp-dev/name.hpp>
-#include <ndn-cpp-dev/interest.hpp>
+#include <ndn-cxx/face.hpp>
+#include <ndn-cxx/name.hpp>
+#include <ndn-cxx/interest.hpp>
 
-#include <ndn-cpp-dev/management/nfd-fib-entry.hpp>
-#include <ndn-cpp-dev/management/nfd-face-status.hpp>
-#include <ndn-cpp-dev/management/nfd-forwarder-status.hpp>
+#include <ndn-cxx/management/nfd-fib-entry.hpp>
+#include <ndn-cxx/management/nfd-face-status.hpp>
+#include <ndn-cxx/management/nfd-forwarder-status.hpp>
 
 namespace ndn {
 
diff --git a/tools/nfdc.hpp b/tools/nfdc.hpp
index b54d12f..968c276 100644
--- a/tools/nfdc.hpp
+++ b/tools/nfdc.hpp
@@ -25,9 +25,9 @@
 #ifndef NFD_TOOLS_NFDC_HPP
 #define NFD_TOOLS_NFDC_HPP
 
-#include <ndn-cpp-dev/face.hpp>
-#include <ndn-cpp-dev/management/controller.hpp>
-#include <ndn-cpp-dev/management/nfd-controller.hpp>
+#include <ndn-cxx/face.hpp>
+#include <ndn-cxx/management/controller.hpp>
+#include <ndn-cxx/management/nfd-controller.hpp>
 
 namespace nfdc {
 
diff --git a/wscript b/wscript
index a32f734..6aa342d 100644
--- a/wscript
+++ b/wscript
@@ -48,8 +48,6 @@
     opt.addDependencyOptions(nfdopt, 'librt',     '(optional)')
     opt.addDependencyOptions(nfdopt, 'libresolv', '(optional)')
 
-    nfdopt.add_option('--with-c++11', action='store_true', default=False, dest='use_cxx11',
-                      help='''Enable C++11 mode (experimental, may not work)''')
     nfdopt.add_option('--with-tests', action='store_true', default=False,
                       dest='with_tests', help='''Build unit tests''')
     nfdopt.add_option('--with-other-tests', action='store_true', default=False,
@@ -66,8 +64,8 @@
 
     conf.load('default-compiler-flags')
 
-    conf.check_cfg(package='libndn-cpp-dev', args=['--cflags', '--libs'],
-                   uselib_store='NDN_CPP', mandatory=True)
+    conf.check_cfg(package='libndn-cxx', args=['--cflags', '--libs'],
+                   uselib_store='NDN_CXX', mandatory=True)
 
     boost_libs = 'system chrono program_options'
     if conf.options.with_tests:
@@ -109,7 +107,7 @@
         name='core-objects',
         features='cxx',
         source=bld.path.ant_glob(['core/**/*.cpp']),
-        use='BOOST NDN_CPP LIBRT',
+        use='BOOST NDN_CXX LIBRT',
         includes='. core',
         export_includes='. core',
         )