diff --git a/phosphor-ldap-config/Makefile.am b/phosphor-ldap-config/Makefile.am
index 101d8a7..7080ac5 100644
--- a/phosphor-ldap-config/Makefile.am
+++ b/phosphor-ldap-config/Makefile.am
@@ -1,13 +1,16 @@
 bin_PROGRAMS = phosphor-ldap-conf
 
-noinst_HEADERS = ldap_configuration.hpp ldap_config_mgr.hpp utils.hpp
+noinst_HEADERS = \
+            ldap_config.hpp \
+            ldap_config_mgr.hpp \
+            utils.hpp
 
 phosphor_ldap_conf_SOURCES = \
                 main.cpp \
                 utils.cpp \
-                ldap_configuration.cpp \
+                ldap_config.cpp \
                 ldap_config_mgr.cpp \
-                ldap_serialize.cpp
+                ldap_config_serialize.cpp
 
 phosphor_ldap_conf_LDFLAGS = $(SDBUSPLUS_LIBS) \
                              $(PHOSPHOR_DBUS_INTERFACES_LIBS) \
diff --git a/phosphor-ldap-config/ldap_configuration.cpp b/phosphor-ldap-config/ldap_config.cpp
similarity index 99%
rename from phosphor-ldap-config/ldap_configuration.cpp
rename to phosphor-ldap-config/ldap_config.cpp
index 4edbed7..d10a711 100644
--- a/phosphor-ldap-config/ldap_configuration.cpp
+++ b/phosphor-ldap-config/ldap_config.cpp
@@ -1,6 +1,6 @@
 #include "ldap_config_mgr.hpp"
-#include "ldap_configuration.hpp"
-#include "ldap_serialize.hpp"
+#include "ldap_config.hpp"
+#include "ldap_config_serialize.hpp"
 #include "utils.hpp"
 #include <filesystem>
 #include <fstream>
diff --git a/phosphor-ldap-config/ldap_configuration.hpp b/phosphor-ldap-config/ldap_config.hpp
similarity index 100%
rename from phosphor-ldap-config/ldap_configuration.hpp
rename to phosphor-ldap-config/ldap_config.hpp
diff --git a/phosphor-ldap-config/ldap_config_mgr.cpp b/phosphor-ldap-config/ldap_config_mgr.cpp
index 35baa9c..0a79ef2 100644
--- a/phosphor-ldap-config/ldap_config_mgr.cpp
+++ b/phosphor-ldap-config/ldap_config_mgr.cpp
@@ -1,6 +1,6 @@
 #include "ldap_config_mgr.hpp"
-#include "ldap_configuration.hpp"
-#include "ldap_serialize.hpp"
+#include "ldap_config.hpp"
+#include "ldap_config_serialize.hpp"
 
 #include "utils.hpp"
 #include <filesystem>
diff --git a/phosphor-ldap-config/ldap_config_mgr.hpp b/phosphor-ldap-config/ldap_config_mgr.hpp
index 24c12a9..b30d98c 100644
--- a/phosphor-ldap-config/ldap_config_mgr.hpp
+++ b/phosphor-ldap-config/ldap_config_mgr.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "ldap_configuration.hpp"
+#include "ldap_config.hpp"
 
 #include "config.h"
 #include <xyz/openbmc_project/User/Ldap/Config/server.hpp>
diff --git a/phosphor-ldap-config/ldap_serialize.cpp b/phosphor-ldap-config/ldap_config_serialize.cpp
similarity index 97%
rename from phosphor-ldap-config/ldap_serialize.cpp
rename to phosphor-ldap-config/ldap_config_serialize.cpp
index 510686c..6c80a74 100644
--- a/phosphor-ldap-config/ldap_serialize.cpp
+++ b/phosphor-ldap-config/ldap_config_serialize.cpp
@@ -3,8 +3,8 @@
 #include <cereal/archives/binary.hpp>
 #include <fstream>
 
-#include "ldap_serialize.hpp"
-#include "ldap_configuration.hpp"
+#include "ldap_config_serialize.hpp"
+#include "ldap_config.hpp"
 #include <phosphor-logging/log.hpp>
 #include "config.h"
 
diff --git a/phosphor-ldap-config/ldap_serialize.hpp b/phosphor-ldap-config/ldap_config_serialize.hpp
similarity index 96%
rename from phosphor-ldap-config/ldap_serialize.hpp
rename to phosphor-ldap-config/ldap_config_serialize.hpp
index b784baf..b20ccd4 100644
--- a/phosphor-ldap-config/ldap_serialize.hpp
+++ b/phosphor-ldap-config/ldap_config_serialize.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <filesystem>
-#include "ldap_configuration.hpp"
+#include "ldap_config.hpp"
 
 namespace phosphor
 {
diff --git a/test/Makefile.am b/test/Makefile.am
index 17f5774..a03ce28 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -28,9 +28,9 @@
                             -lldap \
                             -lgmock
 ldap_config_test_SOURCES  = ldap_config_test.cpp utils_test.cpp
-ldap_config_test_LDADD  = $(top_builddir)/phosphor-ldap-config/ldap_configuration.o \
+ldap_config_test_LDADD  = $(top_builddir)/phosphor-ldap-config/ldap_config.o \
                           $(top_builddir)/phosphor-ldap-config/utils.o \
-                          $(top_builddir)/phosphor-ldap-config/ldap_serialize.o \
+                          $(top_builddir)/phosphor-ldap-config/ldap_config_serialize.o \
                           $(top_builddir)/phosphor-ldap-config/ldap_config_mgr.o
 
 check_PROGRAMS += ldap_mapper_test
diff --git a/test/ldap_config_test.cpp b/test/ldap_config_test.cpp
index 4cbb363..05cea20 100644
--- a/test/ldap_config_test.cpp
+++ b/test/ldap_config_test.cpp
@@ -1,7 +1,7 @@
 #include "config.h"
-#include "phosphor-ldap-config/ldap_configuration.hpp"
+#include "phosphor-ldap-config/ldap_config.hpp"
 #include "phosphor-ldap-config/ldap_config_mgr.hpp"
-#include "phosphor-ldap-config/ldap_serialize.hpp"
+#include "phosphor-ldap-config/ldap_config_serialize.hpp"
 
 #include <phosphor-logging/log.hpp>
 #include <phosphor-logging/elog-errors.hpp>