diff --git a/src/include/nfc/nfc-types.h b/src/include/nfc/nfc-types.h
index 72f8e2a..3cdd29a 100644
--- a/src/include/nfc/nfc-types.h
+++ b/src/include/nfc/nfc-types.h
@@ -80,7 +80,7 @@ typedef struct {
  */
 typedef struct {
   /** Device name (e.g. "ACS ACR 38U-CCID 00 00") */
-  char acDevice[BUFSIZ];
+  char acDevice[DEVICE_NAME_LENGTH];
   /** Driver name (e.g. "PN532_UART")*/
   char* pcDriver;
   /** Port (e.g. "/dev/ttyUSB0") */
diff --git a/src/lib/drivers/acr122.c b/src/lib/drivers/acr122.c
index df9bdf5..69c188d 100644
--- a/src/lib/drivers/acr122.c
+++ b/src/lib/drivers/acr122.c
@@ -167,8 +167,8 @@ acr122_list_devices(nfc_device_desc_t pnddDevices[], size_t szDevices, size_t *p
     if (bSupported)
     {
       // Supported ACR122 device found
-      strncpy(pnddDevices[*pszDeviceFound].acDevice, acDeviceNames + szPos, BUFSIZ - 1);
-      pnddDevices[*pszDeviceFound].acDevice[BUFSIZ - 1] = '\0';
+      strncpy(pnddDevices[*pszDeviceFound].acDevice, acDeviceNames + szPos, DEVICE_NAME_LENGTH - 1);
+      pnddDevices[*pszDeviceFound].acDevice[DEVICE_NAME_LENGTH - 1] = '\0';
       pnddDevices[*pszDeviceFound].pcDriver = ACR122_DRIVER_NAME;
       pnddDevices[*pszDeviceFound].uiBusIndex = uiBusIndex;
       (*pszDeviceFound)++;
diff --git a/src/lib/drivers/pn532_uart.c b/src/lib/drivers/pn532_uart.c
index 89562bb..f18e40f 100644
--- a/src/lib/drivers/pn532_uart.c
+++ b/src/lib/drivers/pn532_uart.c
@@ -106,8 +106,8 @@ pn532_uart_list_devices(nfc_device_desc_t pnddDevices[], size_t szDevices, size_
     {
       // PN532_UART device found
       uart_close(sp);
-      snprintf(pnddDevices[*pszDeviceFound].acDevice, BUFSIZ - 1, "%s (%s)", "PN532", acConnect);
-      pnddDevices[*pszDeviceFound].acDevice[BUFSIZ - 1] = '\0';
+      snprintf(pnddDevices[*pszDeviceFound].acDevice, DEVICE_NAME_LENGTH - 1, "%s (%s)", "PN532", acConnect);
+      pnddDevices[*pszDeviceFound].acDevice[DEVICE_NAME_LENGTH - 1] = '\0';
       pnddDevices[*pszDeviceFound].pcDriver = PN532_UART_DRIVER_NAME;
       //pnddDevices[*pszDeviceFound].pcPort = strndup(acConnect, BUFFER_LENGTH - 1);
       pnddDevices[*pszDeviceFound].pcPort = strdup(acConnect);