diff --git a/libraries/AP_UAVCAN/AP_UAVCAN.h b/libraries/AP_UAVCAN/AP_UAVCAN.h
index 99bba6a91c..795ac77108 100644
--- a/libraries/AP_UAVCAN/AP_UAVCAN.h
+++ b/libraries/AP_UAVCAN/AP_UAVCAN.h
@@ -178,7 +178,7 @@ private:
     uavcan::Node<0> *_node;
 
     uint8_t _driver_index;
-    char _thread_name[9];
+    char _thread_name[13];
     bool _initialized;
     ///// SRV output /////
     struct {
diff --git a/libraries/AP_UAVCAN/AP_UAVCAN_Server.cpp b/libraries/AP_UAVCAN/AP_UAVCAN_Server.cpp
index 478a6625b9..25e808670c 100644
--- a/libraries/AP_UAVCAN/AP_UAVCAN_Server.cpp
+++ b/libraries/AP_UAVCAN/AP_UAVCAN_Server.cpp
@@ -546,7 +546,7 @@ void trampoline_handleNodeInfo(const uavcan::ServiceCallResult<uavcan::protocol:
     uavcan::copy(resp.getResponse().hardware_version.unique_id.begin(),
                  resp.getResponse().hardware_version.unique_id.end(),
                  unique_id);
-    snprintf(name, ARRAY_SIZE(name), "%s", resp.getResponse().name.c_str());
+    strncpy(name, resp.getResponse().name.c_str(), sizeof(name)-1);
     AP::uavcan_server().handleNodeInfo(node_id, unique_id, name);
 }