diff --git a/cpp/initiator/initiator_executor.cpp b/cpp/initiator/initiator_executor.cpp
index d4fde952..3fe434a8 100644
--- a/cpp/initiator/initiator_executor.cpp
+++ b/cpp/initiator/initiator_executor.cpp
@@ -203,7 +203,7 @@ void InitiatorExecutor::Command(span<uint8_t> cdb)
     const auto cmd = static_cast<scsi_command>(cdb[cdb_offset]);
     const int sent_count = bus.SendHandShake(cdb.data() + cdb_offset, static_cast<int>(cdb.size()) - cdb_offset);
     if (static_cast<int>(cdb.size()) < sent_count) {
-        initiator_logger.error("Command {} failed", CommandMetaData::Instance().GetCommandName(cmd));
+        initiator_logger.error("Execution of {} failed", CommandMetaData::Instance().GetCommandName(cmd));
     }
 
     cdb_offset += sent_count;
diff --git a/cpp/shared/command_meta_data.cpp b/cpp/shared/command_meta_data.cpp
index ad1d4af4..a2986ed1 100644
--- a/cpp/shared/command_meta_data.cpp
+++ b/cpp/shared/command_meta_data.cpp
@@ -15,19 +15,19 @@ using namespace spdlog;
 CommandMetaData::CommandMetaData()
 {
     for (int i = 0x00; i < 0x1f; i++) {
-        AddCommand(static_cast<scsi_command>(i), 6, fmt::format("UNKNOWN COMMAND ${:02x}", i), { 0, 0, 0, 0, false });
+        AddCommand(static_cast<scsi_command>(i), 6, fmt::format("command ${:02x}", i), { 0, 0, 0, 0, false });
     }
 
     for (int i = 0x20; i < 0x80; i++) {
-        AddCommand(static_cast<scsi_command>(i), 10, fmt::format("UNKNOWN COMMAND ${:02x}", i), { 0, 0, 0, 0, false });
+        AddCommand(static_cast<scsi_command>(i), 10, fmt::format("command ${:02x}", i), { 0, 0, 0, 0, false });
     }
 
     for (int i = 0x80; i < 0xa0; i++) {
-        AddCommand(static_cast<scsi_command>(i), 16, fmt::format("UNKNOWN COMMAND ${:02x}", i), { 0, 0, 0, 0, false });
+        AddCommand(static_cast<scsi_command>(i), 16, fmt::format("command ${:02x}", i), { 0, 0, 0, 0, false });
     }
 
     for (int i = 0xa0; i < 0xc0; i++) {
-        AddCommand(static_cast<scsi_command>(i), 12, fmt::format("UNKNOWN COMMAND ${:02x}", i), { 0, 0, 0, 0, false });
+        AddCommand(static_cast<scsi_command>(i), 12, fmt::format("command ${:02x}", i), { 0, 0, 0, 0, false });
     }
 
     // This explicit mapping only contains commands known/supported by s2p