diff --git a/src/name-assignment/assignment-func.hpp b/src/name-assignment/assignment-func.hpp
index 7a45e93..a574d05 100644
--- a/src/name-assignment/assignment-func.hpp
+++ b/src/name-assignment/assignment-func.hpp
@@ -18,8 +18,8 @@
  * See AUTHORS.md for complete list of ndncert authors and contributors.
  */
 
-#ifndef NDNCERT_ASSIGNMENT_FUNCS_HPP
-#define NDNCERT_ASSIGNMENT_FUNCS_HPP
+#ifndef NDNCERT_ASSIGNMENT_FUNC_HPP
+#define NDNCERT_ASSIGNMENT_FUNC_HPP
 
 #include "detail/ca-request-state.hpp"
 
@@ -82,4 +82,4 @@
 } // namespace ndncert
 } // namespace ndn
 
-#endif // NDNCERT_ASSIGNMENT_FUNCS_HPP
+#endif // NDNCERT_ASSIGNMENT_FUNC_HPP
diff --git a/src/name-assignment/assignment-hash.hpp b/src/name-assignment/assignment-hash.hpp
index 3163f79..941ce5a 100644
--- a/src/name-assignment/assignment-hash.hpp
+++ b/src/name-assignment/assignment-hash.hpp
@@ -42,4 +42,4 @@
 } // namespace ndncert
 } // namespace ndn
 
-#endif //NDNCERT_ASSIGNMENT_HASH_HPP
+#endif // NDNCERT_ASSIGNMENT_HASH_HPP
diff --git a/src/name-assignment/assignment-param.hpp b/src/name-assignment/assignment-param.hpp
index 5e60dc1..dc45e03 100644
--- a/src/name-assignment/assignment-param.hpp
+++ b/src/name-assignment/assignment-param.hpp
@@ -40,4 +40,4 @@
 } // namespace ndncert
 } // namespace ndn
 
-#endif //NDNCERT_ASSIGNMENT_PARAM_HPP
+#endif // NDNCERT_ASSIGNMENT_PARAM_HPP
diff --git a/src/name-assignment/assignment-random.cpp b/src/name-assignment/assignment-random.cpp
index 7b24481..59f6477 100644
--- a/src/name-assignment/assignment-random.cpp
+++ b/src/name-assignment/assignment-random.cpp
@@ -38,5 +38,5 @@
   return resultList;
 }
 
-}
-}
+} // namespace ndncert
+} // namespace ndn
diff --git a/src/name-assignment/assignment-random.hpp b/src/name-assignment/assignment-random.hpp
index c65cd5d..93e288d 100644
--- a/src/name-assignment/assignment-random.hpp
+++ b/src/name-assignment/assignment-random.hpp
@@ -41,4 +41,4 @@
 } // namespace ndncert
 } // namespace ndn
 
-#endif //NDNCERT_ASSIGNMENT_RANDOM_HPP
+#endif // NDNCERT_ASSIGNMENT_RANDOM_HPP