diff --git a/meson.build b/meson.build
index ba84462..449ed3c 100644
--- a/meson.build
+++ b/meson.build
@@ -89,7 +89,7 @@
   output: 'pldmd.service',
 )
 
-subdir('tool')
+subdir('pldmtool')
 
 if get_option('tests').enabled()
   subdir('test')
diff --git a/tool/meson.build b/pldmtool/meson.build
similarity index 100%
rename from tool/meson.build
rename to pldmtool/meson.build
diff --git a/tool/oem/ibm/pldm_host_cmd.cpp b/pldmtool/oem/ibm/pldm_host_cmd.cpp
similarity index 100%
rename from tool/oem/ibm/pldm_host_cmd.cpp
rename to pldmtool/oem/ibm/pldm_host_cmd.cpp
diff --git a/tool/oem/ibm/pldm_host_cmd.hpp b/pldmtool/oem/ibm/pldm_host_cmd.hpp
similarity index 100%
rename from tool/oem/ibm/pldm_host_cmd.hpp
rename to pldmtool/oem/ibm/pldm_host_cmd.hpp
diff --git a/tool/pldm_base_cmd.cpp b/pldmtool/pldm_base_cmd.cpp
similarity index 100%
rename from tool/pldm_base_cmd.cpp
rename to pldmtool/pldm_base_cmd.cpp
diff --git a/tool/pldm_base_cmd.hpp b/pldmtool/pldm_base_cmd.hpp
similarity index 100%
rename from tool/pldm_base_cmd.hpp
rename to pldmtool/pldm_base_cmd.hpp
diff --git a/tool/pldm_bios_cmd.cpp b/pldmtool/pldm_bios_cmd.cpp
similarity index 100%
rename from tool/pldm_bios_cmd.cpp
rename to pldmtool/pldm_bios_cmd.cpp
diff --git a/tool/pldm_bios_cmd.hpp b/pldmtool/pldm_bios_cmd.hpp
similarity index 100%
rename from tool/pldm_bios_cmd.hpp
rename to pldmtool/pldm_bios_cmd.hpp
diff --git a/tool/pldm_cmd_helper.cpp b/pldmtool/pldm_cmd_helper.cpp
similarity index 100%
rename from tool/pldm_cmd_helper.cpp
rename to pldmtool/pldm_cmd_helper.cpp
diff --git a/tool/pldm_cmd_helper.hpp b/pldmtool/pldm_cmd_helper.hpp
similarity index 100%
rename from tool/pldm_cmd_helper.hpp
rename to pldmtool/pldm_cmd_helper.hpp
diff --git a/tool/pldm_fru_cmd.cpp b/pldmtool/pldm_fru_cmd.cpp
similarity index 100%
rename from tool/pldm_fru_cmd.cpp
rename to pldmtool/pldm_fru_cmd.cpp
diff --git a/tool/pldm_fru_cmd.hpp b/pldmtool/pldm_fru_cmd.hpp
similarity index 100%
rename from tool/pldm_fru_cmd.hpp
rename to pldmtool/pldm_fru_cmd.hpp
diff --git a/tool/pldm_platform_cmd.cpp b/pldmtool/pldm_platform_cmd.cpp
similarity index 100%
rename from tool/pldm_platform_cmd.cpp
rename to pldmtool/pldm_platform_cmd.cpp
diff --git a/tool/pldm_platform_cmd.hpp b/pldmtool/pldm_platform_cmd.hpp
similarity index 100%
rename from tool/pldm_platform_cmd.hpp
rename to pldmtool/pldm_platform_cmd.hpp
diff --git a/tool/pldmtool.cpp b/pldmtool/pldmtool.cpp
similarity index 97%
rename from tool/pldmtool.cpp
rename to pldmtool/pldmtool.cpp
index e893765..4b65b2a 100644
--- a/tool/pldmtool.cpp
+++ b/pldmtool/pldmtool.cpp
@@ -3,7 +3,7 @@
 #include "pldm_cmd_helper.hpp"
 #include "pldm_fru_cmd.hpp"
 #include "pldm_platform_cmd.hpp"
-#include "tool/oem/ibm/pldm_host_cmd.hpp"
+#include "pldmtool/oem/ibm/pldm_host_cmd.hpp"
 
 #include <CLI/CLI.hpp>