diff --git a/src/configuration.cpp b/src/configuration.cpp
index 5b01efc..9af6f28 100644
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -188,7 +188,7 @@
 namespace requester {
 
 void
-RequesterCaCache::load(const std::string& fileName)
+ProfileStorage::load(const std::string& fileName)
 {
   JsonSection configJson;
   try {
@@ -204,7 +204,7 @@
 }
 
 void
-RequesterCaCache::load(const JsonSection& configSection)
+ProfileStorage::load(const JsonSection& configSection)
 {
   m_caItems.clear();
   auto caList = configSection.get_child("ca-list");
@@ -219,7 +219,7 @@
 }
 
 void
-RequesterCaCache::save(const std::string& fileName) const
+ProfileStorage::save(const std::string& fileName) const
 {
   JsonSection configJson;
   for (const auto& caItem : m_caItems) {
@@ -234,13 +234,13 @@
 }
 
 void
-RequesterCaCache::removeCaProfile(const Name& caName)
+ProfileStorage::removeCaProfile(const Name& caName)
 {
   m_caItems.remove_if([&](const CaProfile& item) { return item.m_caPrefix == caName; });
 }
 
 void
-RequesterCaCache::addCaProfile(const CaProfile& profile)
+ProfileStorage::addCaProfile(const CaProfile& profile)
 {
   for (auto& item : m_caItems) {
     if (item.m_caPrefix == profile.m_caPrefix) {
diff --git a/src/configuration.hpp b/src/configuration.hpp
index 3671e20..ec8ccb1 100644
--- a/src/configuration.hpp
+++ b/src/configuration.hpp
@@ -150,7 +150,7 @@
  * For Client configuration format, please refer to:
  *   https://github.com/named-data/ndncert/wiki/Client-Configuration-Sample
  */
-class RequesterCaCache
+class ProfileStorage
 {
 public:
   /**
diff --git a/src/requester.hpp b/src/requester.hpp
index fddd35b..b37f90a 100644
--- a/src/requester.hpp
+++ b/src/requester.hpp
@@ -52,7 +52,7 @@
    * @brief Decodes the CA profile from the replied CA profile Data packet.
    *
    * Will first verify the signature of the packet using the key provided inside the profile.
-   * The application should be cautious whether to add CaProfile into the RequesterCaCache.
+   * The application should be cautious whether to add CaProfile into the ProfileStorage.
    *
    * @param reply The Data packet replied from CA profile fetching Interest.
    * @return the CaProfile if decoding is successful
@@ -66,7 +66,7 @@
    *
    * Will first verify the signature of the packet using the key provided inside the profile and
    * verify the certificate's digest matches the one obtained from the original CA.
-   * The application should be cautious whether to add CaProfile into the RequesterCaCache.
+   * The application should be cautious whether to add CaProfile into the ProfileStorage.
    *
    * @param reply The Data packet replied from CA profile fetching Interest.
    * @param caCertFullName The full name obtained from original CA's probe response.