diff --git a/src/protocol-detail/challenge.cpp b/src/protocol-detail/challenge.cpp
index 847f7db..0116923 100644
--- a/src/protocol-detail/challenge.cpp
+++ b/src/protocol-detail/challenge.cpp
@@ -24,7 +24,7 @@
 namespace ndncert {
 
 Block
-CHALLENGE::encodeDataPayload(const RequestState& request)
+CHALLENGE::encodeDataPayload(const CaState& request)
 {
   Block response = makeEmptyBlock(tlv_encrypted_payload);
   response.push_back(makeNonNegativeIntegerBlock(tlv_status, static_cast<size_t>(request.m_status)));
diff --git a/src/protocol-detail/challenge.hpp b/src/protocol-detail/challenge.hpp
index 8078237..e50d01e 100644
--- a/src/protocol-detail/challenge.hpp
+++ b/src/protocol-detail/challenge.hpp
@@ -21,7 +21,7 @@
 #ifndef NDNCERT_PROTOCOL_DETAIL_CHALLENGE_HPP
 #define NDNCERT_PROTOCOL_DETAIL_CHALLENGE_HPP
 
-#include "../request-state.hpp"
+#include "../ca-state.hpp"
 
 namespace ndn {
 namespace ndncert {
@@ -29,7 +29,7 @@
 class CHALLENGE {
 public:
   static Block
-  encodeDataPayload(const RequestState& request);
+  encodeDataPayload(const CaState& request);
 
   struct DecodedData{
       Status status;
diff --git a/src/protocol-detail/new-renew-revoke.cpp b/src/protocol-detail/new-renew-revoke.cpp
index 6cae7ff..9d6f5f8 100644
--- a/src/protocol-detail/new-renew-revoke.cpp
+++ b/src/protocol-detail/new-renew-revoke.cpp
@@ -76,7 +76,7 @@
 
 Block
 NEW_RENEW_REVOKE::encodeDataContent(const std::string& ecdhKey, const std::string& salt,
-                                    const RequestState& request,
+                                    const CaState& request,
                                     const std::list<std::string>& challenges)
 {
   Block response = makeEmptyBlock(tlv::Content);
diff --git a/src/protocol-detail/new-renew-revoke.hpp b/src/protocol-detail/new-renew-revoke.hpp
index 4c9cb18..86c46d0 100644
--- a/src/protocol-detail/new-renew-revoke.hpp
+++ b/src/protocol-detail/new-renew-revoke.hpp
@@ -21,7 +21,7 @@
 #ifndef NDNCERT_PROTOCOL_DETAIL_NEW_RENEW_REVOKE_HPP
 #define NDNCERT_PROTOCOL_DETAIL_NEW_RENEW_REVOKE_HPP
 
-#include "../request-state.hpp"
+#include "../ca-state.hpp"
 
 namespace ndn {
 namespace ndncert {
@@ -36,7 +36,7 @@
 
   static Block
   encodeDataContent(const std::string& ecdhKey, const std::string& salt,
-                             const RequestState& request,
+                             const CaState& request,
                              const std::list<std::string>& challenges);
   struct DecodedData {
     std::string ecdhKey;