diff --git a/src/ca-module.cpp b/src/ca-module.cpp
index 2b3c500..b5b257e 100644
--- a/src/ca-module.cpp
+++ b/src/ca-module.cpp
@@ -21,7 +21,7 @@
 #include "ca-module.hpp"
 #include "detail/crypto-helper.hpp"
 #include "identity-challenge/challenge-module.hpp"
-#include "name-assignments/assignment-funcs.hpp"
+#include "name-assignment/assignment-func.hpp"
 #include "detail/challenge-encoder.hpp"
 #include "detail/error-encoder.hpp"
 #include "detail/info-encoder.hpp"
diff --git a/src/configuration.cpp b/src/configuration.cpp
index d5ae255..aab0df5 100644
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -22,7 +22,7 @@
 #include "identity-challenge/challenge-module.hpp"
 #include <ndn-cxx/util/io.hpp>
 #include <boost/filesystem.hpp>
-#include "name-assignments/assignment-funcs.hpp"
+#include "name-assignment/assignment-func.hpp"
 
 namespace ndn {
 namespace ndncert {
diff --git a/src/configuration.hpp b/src/configuration.hpp
index 50d2a8b..8a1d037 100644
--- a/src/configuration.hpp
+++ b/src/configuration.hpp
@@ -22,7 +22,7 @@
 #define NDNCERT_CONFIGURATION_HPP
 
 #include "detail/ca-state.hpp"
-#include "name-assignments/assignment-funcs.hpp"
+#include "name-assignment/assignment-func.hpp"
 
 namespace ndn {
 namespace ndncert {
diff --git a/src/name-assignments/assignment-funcs.cpp b/src/name-assignment/assignment-func.cpp
similarity index 97%
rename from src/name-assignments/assignment-funcs.cpp
rename to src/name-assignment/assignment-func.cpp
index cba9c65..6a55cc2 100644
--- a/src/name-assignments/assignment-funcs.cpp
+++ b/src/name-assignment/assignment-func.cpp
@@ -18,7 +18,7 @@
  * See AUTHORS.md for complete list of ndncert authors and contributors.
  */
 
-#include "assignment-funcs.hpp"
+#include "assignment-func.hpp"
 #include <ndn-cxx/util/random.hpp>
 
 namespace ndn {
diff --git a/src/name-assignments/assignment-funcs.hpp b/src/name-assignment/assignment-func.hpp
similarity index 100%
rename from src/name-assignments/assignment-funcs.hpp
rename to src/name-assignment/assignment-func.hpp
diff --git a/src/name-assignments/assignment-hash.cpp b/src/name-assignment/assignment-hash.cpp
similarity index 100%
rename from src/name-assignments/assignment-hash.cpp
rename to src/name-assignment/assignment-hash.cpp
diff --git a/src/name-assignments/assignment-hash.hpp b/src/name-assignment/assignment-hash.hpp
similarity index 97%
rename from src/name-assignments/assignment-hash.hpp
rename to src/name-assignment/assignment-hash.hpp
index a8ca6a6..b0532f7 100644
--- a/src/name-assignments/assignment-hash.hpp
+++ b/src/name-assignment/assignment-hash.hpp
@@ -21,7 +21,7 @@
 #ifndef NDNCERT_ASSIGNMENT_HASH_HPP
 #define NDNCERT_ASSIGNMENT_HASH_HPP
 
-#include "assignment-funcs.hpp"
+#include "assignment-func.hpp"
 
 namespace ndn {
 namespace ndncert {
diff --git a/src/name-assignments/assignment-param.cpp b/src/name-assignment/assignment-param.cpp
similarity index 100%
rename from src/name-assignments/assignment-param.cpp
rename to src/name-assignment/assignment-param.cpp
diff --git a/src/name-assignments/assignment-param.hpp b/src/name-assignment/assignment-param.hpp
similarity index 97%
rename from src/name-assignments/assignment-param.hpp
rename to src/name-assignment/assignment-param.hpp
index 6b705df..cdbb410 100644
--- a/src/name-assignments/assignment-param.hpp
+++ b/src/name-assignment/assignment-param.hpp
@@ -21,7 +21,7 @@
 #ifndef NDNCERT_ASSIGNMENT_PARAM_HPP
 #define NDNCERT_ASSIGNMENT_PARAM_HPP
 
-#include "assignment-funcs.hpp"
+#include "assignment-func.hpp"
 
 namespace ndn {
 namespace ndncert {
diff --git a/src/name-assignments/assignment-random.cpp b/src/name-assignment/assignment-random.cpp
similarity index 100%
rename from src/name-assignments/assignment-random.cpp
rename to src/name-assignment/assignment-random.cpp
diff --git a/src/name-assignments/assignment-random.hpp b/src/name-assignment/assignment-random.hpp
similarity index 97%
rename from src/name-assignments/assignment-random.hpp
rename to src/name-assignment/assignment-random.hpp
index d145fc7..c65cd5d 100644
--- a/src/name-assignments/assignment-random.hpp
+++ b/src/name-assignment/assignment-random.hpp
@@ -21,7 +21,7 @@
 #ifndef NDNCERT_ASSIGNMENT_RANDOM_HPP
 #define NDNCERT_ASSIGNMENT_RANDOM_HPP
 
-#include "assignment-funcs.hpp"
+#include "assignment-func.hpp"
 
 namespace ndn {
 namespace ndncert {