diff --git a/machine_name.hpp b/machine_name.hpp
index 61bbbe4..4c8a60c 100644
--- a/machine_name.hpp
+++ b/machine_name.hpp
@@ -18,14 +18,22 @@
 
 #include <ipmid/api.h>
 
+#include <ipmid/api-types.hpp>
+#include <vector>
+
 namespace google
 {
 namespace ipmi
 {
 
+struct GetMachineNameReply
+{
+    uint8_t machineNameLength;
+} __attribute__((packed));
+
 // Handle the machine name command.
-ipmi_ret_t getMachineName(const uint8_t* reqBuf, uint8_t* replyBuf,
-                          size_t* dataLen, HandlerInterface* handler);
+Resp getMachineName(const std::vector<std::uint8_t>& data,
+                    HandlerInterface* handler);
 
 } // namespace ipmi
 } // namespace google