diff --git a/tests/tools/nfd-status/channel-module.t.cpp b/tests/tools/nfdc/channel-module.t.cpp
similarity index 93%
rename from tests/tools/nfd-status/channel-module.t.cpp
rename to tests/tools/nfdc/channel-module.t.cpp
index f524907..8624cd3 100644
--- a/tests/tools/nfd-status/channel-module.t.cpp
+++ b/tests/tools/nfdc/channel-module.t.cpp
@@ -23,16 +23,16 @@
  * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "nfd-status/channel-module.hpp"
+#include "nfdc/channel-module.hpp"
 
 #include "module-fixture.hpp"
 
 namespace nfd {
 namespace tools {
-namespace nfd_status {
+namespace nfdc {
 namespace tests {
 
-BOOST_AUTO_TEST_SUITE(NfdStatus)
+BOOST_AUTO_TEST_SUITE(Nfdc)
 BOOST_FIXTURE_TEST_SUITE(TestChannelModule, ModuleFixture<ChannelModule>)
 
 const std::string STATUS_XML = stripXmlSpaces(R"XML(
@@ -67,9 +67,9 @@
 }
 
 BOOST_AUTO_TEST_SUITE_END() // TestChannelModule
-BOOST_AUTO_TEST_SUITE_END() // NfdStatus
+BOOST_AUTO_TEST_SUITE_END() // Nfdc
 
 } // namespace tests
-} // namespace nfd_status
+} // namespace nfdc
 } // namespace tools
 } // namespace nfd
diff --git a/tests/tools/nfd-status/face-module.t.cpp b/tests/tools/nfdc/face-module.t.cpp
similarity index 96%
rename from tests/tools/nfd-status/face-module.t.cpp
rename to tests/tools/nfdc/face-module.t.cpp
index 292ccd8..6d316e6 100644
--- a/tests/tools/nfd-status/face-module.t.cpp
+++ b/tests/tools/nfdc/face-module.t.cpp
@@ -23,16 +23,16 @@
  * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "nfd-status/face-module.hpp"
+#include "nfdc/face-module.hpp"
 
 #include "module-fixture.hpp"
 
 namespace nfd {
 namespace tools {
-namespace nfd_status {
+namespace nfdc {
 namespace tests {
 
-BOOST_AUTO_TEST_SUITE(NfdStatus)
+BOOST_AUTO_TEST_SUITE(Nfdc)
 BOOST_FIXTURE_TEST_SUITE(TestFaceModule, ModuleFixture<FaceModule>)
 
 const std::string STATUS_XML = stripXmlSpaces(R"XML(
@@ -138,9 +138,9 @@
 }
 
 BOOST_AUTO_TEST_SUITE_END() // TestFaceModule
-BOOST_AUTO_TEST_SUITE_END() // NfdStatus
+BOOST_AUTO_TEST_SUITE_END() // Nfdc
 
 } // namespace tests
-} // namespace nfd_status
+} // namespace nfdc
 } // namespace tools
 } // namespace nfd
diff --git a/tests/tools/nfd-status/fib-module.t.cpp b/tests/tools/nfdc/fib-module.t.cpp
similarity index 95%
rename from tests/tools/nfd-status/fib-module.t.cpp
rename to tests/tools/nfdc/fib-module.t.cpp
index f509461..3ec3775 100644
--- a/tests/tools/nfd-status/fib-module.t.cpp
+++ b/tests/tools/nfdc/fib-module.t.cpp
@@ -23,16 +23,16 @@
  * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "nfd-status/fib-module.hpp"
+#include "nfdc/fib-module.hpp"
 
 #include "module-fixture.hpp"
 
 namespace nfd {
 namespace tools {
-namespace nfd_status {
+namespace nfdc {
 namespace tests {
 
-BOOST_AUTO_TEST_SUITE(NfdStatus)
+BOOST_AUTO_TEST_SUITE(Nfdc)
 BOOST_FIXTURE_TEST_SUITE(TestFibModule, ModuleFixture<FibModule>)
 
 const std::string STATUS_XML = stripXmlSpaces(R"XML(
@@ -96,9 +96,9 @@
 }
 
 BOOST_AUTO_TEST_SUITE_END() // TestFibModule
-BOOST_AUTO_TEST_SUITE_END() // NfdStatus
+BOOST_AUTO_TEST_SUITE_END() // Nfdc
 
 } // namespace tests
-} // namespace nfd_status
+} // namespace nfdc
 } // namespace tools
 } // namespace nfd
diff --git a/tests/tools/nfd-status/format-helpers.t.cpp b/tests/tools/nfdc/format-helpers.t.cpp
similarity index 92%
rename from tests/tools/nfd-status/format-helpers.t.cpp
rename to tests/tools/nfdc/format-helpers.t.cpp
index 01d7f47..f380544 100644
--- a/tests/tools/nfd-status/format-helpers.t.cpp
+++ b/tests/tools/nfdc/format-helpers.t.cpp
@@ -23,18 +23,18 @@
  * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "nfd-status/format-helpers.hpp"
+#include "nfdc/format-helpers.hpp"
 
 #include "tests/test-common.hpp"
 
 namespace nfd {
 namespace tools {
-namespace nfd_status {
+namespace nfdc {
 namespace tests {
 
 using boost::test_tools::output_test_stream;
 
-BOOST_AUTO_TEST_SUITE(NfdStatus)
+BOOST_AUTO_TEST_SUITE(Nfdc)
 BOOST_AUTO_TEST_SUITE(TestFormatHelpers)
 
 BOOST_AUTO_TEST_SUITE(Xml)
@@ -66,9 +66,9 @@
 BOOST_AUTO_TEST_SUITE_END() // Text
 
 BOOST_AUTO_TEST_SUITE_END() // TestFormatHelpers
-BOOST_AUTO_TEST_SUITE_END() // NfdStatus
+BOOST_AUTO_TEST_SUITE_END() // Nfdc
 
 } // namespace tests
-} // namespace nfd_status
+} // namespace nfdc
 } // namespace tools
 } // namespace nfd
diff --git a/tests/tools/nfd-status/forwarder-general-module.t.cpp b/tests/tools/nfdc/forwarder-general-module.t.cpp
similarity index 96%
rename from tests/tools/nfd-status/forwarder-general-module.t.cpp
rename to tests/tools/nfdc/forwarder-general-module.t.cpp
index e9c881b..d210dc7 100644
--- a/tests/tools/nfd-status/forwarder-general-module.t.cpp
+++ b/tests/tools/nfdc/forwarder-general-module.t.cpp
@@ -23,17 +23,17 @@
  * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "nfd-status/forwarder-general-module.hpp"
+#include "nfdc/forwarder-general-module.hpp"
 #include <ndn-cxx/security/signing-helpers.hpp>
 
 #include "module-fixture.hpp"
 
 namespace nfd {
 namespace tools {
-namespace nfd_status {
+namespace nfdc {
 namespace tests {
 
-BOOST_AUTO_TEST_SUITE(NfdStatus)
+BOOST_AUTO_TEST_SUITE(Nfdc)
 BOOST_FIXTURE_TEST_SUITE(TestForwarderGeneralModule, ModuleFixture<ForwarderGeneralModule>)
 
 class MakeNfdIdCollector
@@ -148,9 +148,9 @@
 }
 
 BOOST_AUTO_TEST_SUITE_END() // TestForwarderGeneralModule
-BOOST_AUTO_TEST_SUITE_END() // NfdStatus
+BOOST_AUTO_TEST_SUITE_END() // Nfdc
 
 } // namespace tests
-} // namespace nfd_status
+} // namespace nfdc
 } // namespace tools
 } // namespace nfd
diff --git a/tests/tools/nfd-status/module-fixture.hpp b/tests/tools/nfdc/module-fixture.hpp
similarity index 98%
rename from tests/tools/nfd-status/module-fixture.hpp
rename to tests/tools/nfdc/module-fixture.hpp
index 38d0d64..61f2295 100644
--- a/tests/tools/nfd-status/module-fixture.hpp
+++ b/tests/tools/nfdc/module-fixture.hpp
@@ -26,7 +26,7 @@
 #ifndef NFD_TESTS_TOOLS_NFD_STATUS_MODULE_FIXTURE_HPP
 #define NFD_TESTS_TOOLS_NFD_STATUS_MODULE_FIXTURE_HPP
 
-#include "nfd-status/module.hpp"
+#include "nfdc/module.hpp"
 #include <ndn-cxx/security/validator-null.hpp>
 #include <ndn-cxx/util/dummy-client-face.hpp>
 
@@ -35,7 +35,7 @@
 
 namespace nfd {
 namespace tools {
-namespace nfd_status {
+namespace nfdc {
 namespace tests {
 
 using namespace nfd::tests;
@@ -229,7 +229,7 @@
 }
 
 } // namespace tests
-} // namespace nfd_status
+} // namespace nfdc
 } // namespace tools
 } // namespace nfd
 
diff --git a/tests/tools/nfd-status/rib-module.t.cpp b/tests/tools/nfdc/rib-module.t.cpp
similarity index 96%
rename from tests/tools/nfd-status/rib-module.t.cpp
rename to tests/tools/nfdc/rib-module.t.cpp
index bfd663c..6088382 100644
--- a/tests/tools/nfd-status/rib-module.t.cpp
+++ b/tests/tools/nfdc/rib-module.t.cpp
@@ -23,16 +23,16 @@
  * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "nfd-status/rib-module.hpp"
+#include "nfdc/rib-module.hpp"
 
 #include "module-fixture.hpp"
 
 namespace nfd {
 namespace tools {
-namespace nfd_status {
+namespace nfdc {
 namespace tests {
 
-BOOST_AUTO_TEST_SUITE(NfdStatus)
+BOOST_AUTO_TEST_SUITE(Nfdc)
 BOOST_FIXTURE_TEST_SUITE(TestRibModule, ModuleFixture<RibModule>)
 
 const std::string STATUS_XML = stripXmlSpaces(R"XML(
@@ -133,9 +133,9 @@
 }
 
 BOOST_AUTO_TEST_SUITE_END() // TestRibModule
-BOOST_AUTO_TEST_SUITE_END() // NfdStatus
+BOOST_AUTO_TEST_SUITE_END() // Nfdc
 
 } // namespace tests
-} // namespace nfd_status
+} // namespace nfdc
 } // namespace tools
 } // namespace nfd
diff --git a/tests/tools/nfd-status/status-report.t.cpp b/tests/tools/nfdc/status-report.t.cpp
similarity index 96%
rename from tests/tools/nfd-status/status-report.t.cpp
rename to tests/tools/nfdc/status-report.t.cpp
index 309c83a..2d89868 100644
--- a/tests/tools/nfd-status/status-report.t.cpp
+++ b/tests/tools/nfdc/status-report.t.cpp
@@ -23,14 +23,14 @@
  * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "nfd-status/status-report.hpp"
+#include "nfdc/status-report.hpp"
 #include "core/scheduler.hpp"
 
 #include "module-fixture.hpp"
 
 namespace nfd {
 namespace tools {
-namespace nfd_status {
+namespace nfdc {
 namespace tests {
 
 const std::string STATUS_XML = stripXmlSpaces(R"XML(
@@ -165,7 +165,7 @@
 };
 
 
-BOOST_AUTO_TEST_SUITE(NfdStatus)
+BOOST_AUTO_TEST_SUITE(Nfdc)
 BOOST_FIXTURE_TEST_SUITE(TestStatusReport, StatusReportModulesFixture)
 
 BOOST_AUTO_TEST_CASE(Normal)
@@ -212,9 +212,9 @@
 }
 
 BOOST_AUTO_TEST_SUITE_END() // TestRibModule
-BOOST_AUTO_TEST_SUITE_END() // NfdStatus
+BOOST_AUTO_TEST_SUITE_END() // Nfdc
 
 } // namespace tests
-} // namespace nfd_status
+} // namespace nfdc
 } // namespace tools
 } // namespace nfd
diff --git a/tests/tools/nfd-status/strategy-choice-module.t.cpp b/tests/tools/nfdc/strategy-choice-module.t.cpp
similarity index 93%
rename from tests/tools/nfd-status/strategy-choice-module.t.cpp
rename to tests/tools/nfdc/strategy-choice-module.t.cpp
index a41ba1f..68dee9f 100644
--- a/tests/tools/nfd-status/strategy-choice-module.t.cpp
+++ b/tests/tools/nfdc/strategy-choice-module.t.cpp
@@ -23,16 +23,16 @@
  * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "nfd-status/strategy-choice-module.hpp"
+#include "nfdc/strategy-choice-module.hpp"
 
 #include "module-fixture.hpp"
 
 namespace nfd {
 namespace tools {
-namespace nfd_status {
+namespace nfdc {
 namespace tests {
 
-BOOST_AUTO_TEST_SUITE(NfdStatus)
+BOOST_AUTO_TEST_SUITE(Nfdc)
 BOOST_FIXTURE_TEST_SUITE(TestStrategyChoiceModule, ModuleFixture<StrategyChoiceModule>)
 
 const std::string STATUS_XML = stripXmlSpaces(R"XML(
@@ -75,9 +75,9 @@
 }
 
 BOOST_AUTO_TEST_SUITE_END() // TestStrategyChoiceModule
-BOOST_AUTO_TEST_SUITE_END() // NfdStatus
+BOOST_AUTO_TEST_SUITE_END() // Nfdc
 
 } // namespace tests
-} // namespace nfd_status
+} // namespace nfdc
 } // namespace tools
 } // namespace nfd