diff --git a/src/configuration.hpp b/src/configuration.hpp
index 42d79dd..d13397c 100644
--- a/src/configuration.hpp
+++ b/src/configuration.hpp
@@ -21,7 +21,7 @@
 #ifndef NDNCERT_CONFIGURATION_HPP
 #define NDNCERT_CONFIGURATION_HPP
 
-#include "detail/ca-state.hpp"
+#include "detail/ca-request-state.hpp"
 #include "name-assignment/assignment-func.hpp"
 
 namespace ndn {
diff --git a/src/detail/ca-state.cpp b/src/detail/ca-request-state.cpp
similarity index 95%
rename from src/detail/ca-state.cpp
rename to src/detail/ca-request-state.cpp
index 9b1f96b..c1f5875 100644
--- a/src/detail/ca-state.cpp
+++ b/src/detail/ca-request-state.cpp
@@ -18,7 +18,7 @@
  * See AUTHORS.md for complete list of ndncert authors and contributors.
  */
 
-#include "detail/ca-state.hpp"
+#include "detail/ca-request-state.hpp"
 #include <ndn-cxx/util/indented-stream.hpp>
 
 namespace ndn {
@@ -101,9 +101,6 @@
     os << "Challenge remaining tries:" << request.m_challengeState->m_remainingTries << " times\n";
     os << "Challenge remaining time: " << request.m_challengeState->m_remainingTime.count() << " seconds\n";
     os << "Challenge last update: " << time::toIsoString(request.m_challengeState->m_timestamp) << "\n";
-    std::stringstream ss;
-    boost::property_tree::write_json(ss, request.m_challengeState->m_secrets);
-    os << "Challenge secret:\n" << ss.str() << "\n";
   }
   os << "Certificate:\n";
   util::IndentedStream os2(os, "  ");
diff --git a/src/detail/ca-state.hpp b/src/detail/ca-request-state.hpp
similarity index 100%
rename from src/detail/ca-state.hpp
rename to src/detail/ca-request-state.hpp
diff --git a/src/detail/ca-storage.hpp b/src/detail/ca-storage.hpp
index 7ccecd8..c353f5c 100644
--- a/src/detail/ca-storage.hpp
+++ b/src/detail/ca-storage.hpp
@@ -21,7 +21,7 @@
 #ifndef NDNCERT_DETAIL_CA_STORAGE_HPP
 #define NDNCERT_DETAIL_CA_STORAGE_HPP
 
-#include "detail/ca-state.hpp"
+#include "detail/ca-request-state.hpp"
 
 namespace ndn {
 namespace ndncert {
diff --git a/src/detail/challenge-encoder.hpp b/src/detail/challenge-encoder.hpp
index fb9d5d2..b47938e 100644
--- a/src/detail/challenge-encoder.hpp
+++ b/src/detail/challenge-encoder.hpp
@@ -21,7 +21,7 @@
 #ifndef NDNCERT_DETAIL_CHALLENGE_STEP_HPP
 #define NDNCERT_DETAIL_CHALLENGE_STEP_HPP
 
-#include "detail/ca-state.hpp"
+#include "detail/ca-request-state.hpp"
 #include "requester-state.hpp"
 
 namespace ndn {
diff --git a/src/detail/new-renew-revoke-encoder.hpp b/src/detail/new-renew-revoke-encoder.hpp
index a6d3d4a..96c6862 100644
--- a/src/detail/new-renew-revoke-encoder.hpp
+++ b/src/detail/new-renew-revoke-encoder.hpp
@@ -21,7 +21,7 @@
 #ifndef NDNCERT_DETAIL_NEW_RENEW_REVOKE_ENCODER_HPP
 #define NDNCERT_DETAIL_NEW_RENEW_REVOKE_ENCODER_HPP
 
-#include "detail/ca-state.hpp"
+#include "detail/ca-request-state.hpp"
 
 namespace ndn {
 namespace ndncert {
diff --git a/src/identity-challenge/challenge-module.hpp b/src/identity-challenge/challenge-module.hpp
index f1c942f..1e2ca81 100644
--- a/src/identity-challenge/challenge-module.hpp
+++ b/src/identity-challenge/challenge-module.hpp
@@ -21,7 +21,7 @@
 #ifndef NDNCERT_CHALLENGE_MODULE_HPP
 #define NDNCERT_CHALLENGE_MODULE_HPP
 
-#include "detail/ca-state.hpp"
+#include "detail/ca-request-state.hpp"
 
 namespace ndn {
 namespace ndncert {
diff --git a/src/name-assignment/assignment-func.hpp b/src/name-assignment/assignment-func.hpp
index 81fc58a..7a45e93 100644
--- a/src/name-assignment/assignment-func.hpp
+++ b/src/name-assignment/assignment-func.hpp
@@ -21,7 +21,7 @@
 #ifndef NDNCERT_ASSIGNMENT_FUNCS_HPP
 #define NDNCERT_ASSIGNMENT_FUNCS_HPP
 
-#include "detail/ca-state.hpp"
+#include "detail/ca-request-state.hpp"
 
 namespace ndn {
 namespace ndncert {
diff --git a/src/requester-state.hpp b/src/requester-state.hpp
index 2c90fac..fed7743 100644
--- a/src/requester-state.hpp
+++ b/src/requester-state.hpp
@@ -21,7 +21,7 @@
 #ifndef NDNCERT_REQUESTER_STATE_HPP
 #define NDNCERT_REQUESTER_STATE_HPP
 
-#include "detail/ca-state.hpp"
+#include "detail/ca-request-state.hpp"
 #include "detail/crypto-helpers.hpp"
 #include "configuration.hpp"