diff --git a/src/detail/challenge-encoder.hpp b/src/detail/challenge-encoder.hpp
index 0bd930c..f5cad6f 100644
--- a/src/detail/challenge-encoder.hpp
+++ b/src/detail/challenge-encoder.hpp
@@ -34,7 +34,7 @@
 void
 decodeDataContent(const Block& contentBlock, requester::RequestState& state);
 
-} // namespace ChallengeEncoder
+} // namespace challengetlv
 } // namespace ndncert
 } // namespace ndn
 
diff --git a/src/detail/error-encoder.hpp b/src/detail/error-encoder.hpp
index 650dd11..99d9dd8 100644
--- a/src/detail/error-encoder.hpp
+++ b/src/detail/error-encoder.hpp
@@ -39,8 +39,8 @@
 std::tuple<ErrorCode, std::string>
 decodefromDataContent(const Block& block);
 
-}  // namespace errortlv
-}  // namespace ndncert
-}  // namespace ndn
+} // namespace errortlv
+} // namespace ndncert
+} // namespace ndn
 
-#endif  // NDNCERT_DETAIL_ERROR_ENCODER_HPP
\ No newline at end of file
+#endif // NDNCERT_DETAIL_ERROR_ENCODER_HPP
\ No newline at end of file
diff --git a/src/detail/info-encoder.hpp b/src/detail/info-encoder.hpp
index ae5348e..03adfd8 100644
--- a/src/detail/info-encoder.hpp
+++ b/src/detail/info-encoder.hpp
@@ -39,7 +39,7 @@
 CaProfile
 decodeDataContent(const Block& block);
 
-} // namespace InfoEncoder
+} // namespace infotlv
 } // namespace ndncert
 } // namespace ndn
 
diff --git a/src/detail/probe-encoder.hpp b/src/detail/probe-encoder.hpp
index a7b212a..2b63cc1 100644
--- a/src/detail/probe-encoder.hpp
+++ b/src/detail/probe-encoder.hpp
@@ -44,7 +44,7 @@
 std::multimap<std::string, std::string>
 decodeApplicationParameters(const Block& block);
 
-} // namespace ProbeEncoder
+} // namespace probetlv
 } // namespace ndncert
 } // namespace ndn