diff --git a/src/ca-module.cpp b/src/ca-module.cpp
index 6b370dc..f04d3df 100644
--- a/src/ca-module.cpp
+++ b/src/ca-module.cpp
@@ -25,7 +25,7 @@
 #include "detail/challenge-encoder.hpp"
 #include "detail/error-encoder.hpp"
 #include "detail/info-encoder.hpp"
-#include "detail/new-renew-revoke-encoder.hpp"
+#include "detail/request-encoder.hpp"
 #include "detail/probe-encoder.hpp"
 #include <ndn-cxx/metadata-object.hpp>
 #include <ndn-cxx/security/signing-helpers.hpp>
diff --git a/src/detail/new-renew-revoke-encoder.cpp b/src/detail/request-encoder.cpp
similarity index 98%
rename from src/detail/new-renew-revoke-encoder.cpp
rename to src/detail/request-encoder.cpp
index 5ad3859..1801b63 100644
--- a/src/detail/new-renew-revoke-encoder.cpp
+++ b/src/detail/request-encoder.cpp
@@ -18,7 +18,7 @@
  * See AUTHORS.md for complete list of ndncert authors and contributors.
  */
 
-#include "detail/new-renew-revoke-encoder.hpp"
+#include "detail/request-encoder.hpp"
 #include <ndn-cxx/security/transform/base64-encode.hpp>
 #include <ndn-cxx/security/transform/buffer-source.hpp>
 #include <ndn-cxx/security/transform/stream-sink.hpp>
diff --git a/src/detail/new-renew-revoke-encoder.hpp b/src/detail/request-encoder.hpp
similarity index 89%
rename from src/detail/new-renew-revoke-encoder.hpp
rename to src/detail/request-encoder.hpp
index 25a9989..aff7c62 100644
--- a/src/detail/new-renew-revoke-encoder.hpp
+++ b/src/detail/request-encoder.hpp
@@ -18,8 +18,8 @@
  * See AUTHORS.md for complete list of ndncert authors and contributors.
  */
 
-#ifndef NDNCERT_DETAIL_NEW_RENEW_REVOKE_ENCODER_HPP
-#define NDNCERT_DETAIL_NEW_RENEW_REVOKE_ENCODER_HPP
+#ifndef NDNCERT_DETAIL_REQUEST_ENCODER_HPP
+#define NDNCERT_DETAIL_REQUEST_ENCODER_HPP
 
 #include "detail/ca-request-state.hpp"
 
@@ -37,8 +37,7 @@
 
 Block
 encodeDataContent(const std::vector<uint8_t>& ecdhKey, const std::array<uint8_t, 32>& salt,
-                  const RequestId& requestId,
-                  const std::vector<std::string>& challenges);
+                  const RequestId& requestId, const std::vector<std::string>& challenges);
 
 std::list<std::string>
 decodeDataContent(const Block& content, std::vector<uint8_t>& ecdhKey,
diff --git a/src/requester-request.cpp b/src/requester-request.cpp
index 44e4d96..72f7162 100644
--- a/src/requester-request.cpp
+++ b/src/requester-request.cpp
@@ -24,7 +24,7 @@
 #include "detail/challenge-encoder.hpp"
 #include "detail/error-encoder.hpp"
 #include "detail/info-encoder.hpp"
-#include "detail/new-renew-revoke-encoder.hpp"
+#include "detail/request-encoder.hpp"
 #include "detail/probe-encoder.hpp"
 #include <ndn-cxx/security/signing-helpers.hpp>
 #include <ndn-cxx/security/transform/base64-encode.hpp>