diff --git a/platform-mc/terminus.hpp b/platform-mc/terminus.hpp
index 8ea5a57..fd878b5 100644
--- a/platform-mc/terminus.hpp
+++ b/platform-mc/terminus.hpp
@@ -139,6 +139,12 @@
         return tid;
     }
 
+    /** @brief The setter to set terminus's mctp medium */
+    void setTerminusName(const EntityName& tName)
+    {
+        terminusName = tName;
+    }
+
     /** @brief The getter to get terminus's mctp medium */
     std::optional<std::string_view> getTerminusName()
     {
diff --git a/platform-mc/terminus_manager.cpp b/platform-mc/terminus_manager.cpp
index d90b6cf..0de6ce9 100644
--- a/platform-mc/terminus_manager.cpp
+++ b/platform-mc/terminus_manager.cpp
@@ -431,6 +431,15 @@
     }
     termini[tid]->setSupportedCommands(pldmCmds);
 
+    /* Use the MCTP target name as the default terminus name */
+    MctpInfoName mctpInfoName = std::get<4>(mctpInfo);
+    if (mctpInfoName.has_value())
+    {
+        lg2::info("Terminus {TID} has default Terminus Name {NAME}", "NAME",
+                  mctpInfoName.value(), "TID", tid);
+        termini[tid]->setTerminusName(mctpInfoName.value());
+    }
+
     co_return PLDM_SUCCESS;
 }