diff --git a/configure.sh b/configure.sh
index ee0f2aa..9ccdb44 100755
--- a/configure.sh
+++ b/configure.sh
@@ -145,7 +145,7 @@ LIBOSDP_SOURCES+=" utils/src/list.c utils/src/queue.c utils/src/slab.c utils/src
 LIBOSDP_SOURCES+=" utils/src/disjoint_set.c utils/src/logger.c"
 
 if [[ ! -z "${PACKET_TRACE}" ]] || [[ ! -z "${DATA_TRACE}" ]]; then
-	LIBOSDP_SOURCES+=" src/osdp_pcap.c utils/src/pcap_gen.c"
+	LIBOSDP_SOURCES+=" src/osdp_diag.c utils/src/pcap_gen.c"
 fi
 
 if [[ -z "${STATIC_PD}" ]]; then
diff --git a/python/setup.py b/python/setup.py
index be0ce82..3fc9c5f 100644
--- a/python/setup.py
+++ b/python/setup.py
@@ -132,8 +132,8 @@ def try_vendor_sources(src_dir, src_files, vendor_dir):
     "src/osdp_config.h.in",
 
     # Optional when PACKET_TRACE is enabled
-    "src/osdp_pcap.c",
-    "src/osdp_pcap.h",
+    "src/osdp_diag.c",
+    "src/osdp_diag.h",
     "utils/include/utils/pcap_gen.h",
     "utils/src/pcap_gen.c",
 ]
@@ -155,7 +155,7 @@ def try_vendor_sources(src_dir, src_files, vendor_dir):
 if ("CONFIG_OSDP_PACKET_TRACE" in definitions or
     "CONFIG_OSDP_DATA_TRACE" in definitions):
     source_files += [
-        "src/osdp_pcap.c",
+        "src/osdp_diag.c",
         "utils/src/pcap_gen.c",
     ]
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8b0f1e4..6f2d76c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -66,7 +66,7 @@ endif()
 
 if (CONFIG_OSDP_PACKET_TRACE OR CONFIG_OSDP_DATA_TRACE)
 	list(APPEND LIB_OSDP_SOURCES
-		${CMAKE_CURRENT_SOURCE_DIR}/osdp_pcap.c
+		${CMAKE_CURRENT_SOURCE_DIR}/osdp_diag.c
 	)
 endif()
 
diff --git a/src/osdp_cp.c b/src/osdp_cp.c
index 41012bc..37a13eb 100644
--- a/src/osdp_cp.c
+++ b/src/osdp_cp.c
@@ -10,7 +10,7 @@
 
 #include "osdp_common.h"
 #include "osdp_file.h"
-#include "osdp_pcap.h"
+#include "osdp_diag.h"
 
 #define CMD_POLL_LEN                   1
 #define CMD_LSTAT_LEN                  1
diff --git a/src/osdp_pcap.c b/src/osdp_diag.c
similarity index 100%
rename from src/osdp_pcap.c
rename to src/osdp_diag.c
diff --git a/src/osdp_pcap.h b/src/osdp_diag.h
similarity index 100%
rename from src/osdp_pcap.h
rename to src/osdp_diag.h
diff --git a/src/osdp_pd.c b/src/osdp_pd.c
index 0e3b5a6..bc00753 100644
--- a/src/osdp_pd.c
+++ b/src/osdp_pd.c
@@ -6,7 +6,7 @@
 
 #include "osdp_common.h"
 #include "osdp_file.h"
-#include "osdp_pcap.h"
+#include "osdp_diag.h"
 
 #ifndef CONFIG_OSDP_STATIC_PD
 #include <stdlib.h>
diff --git a/src/osdp_phy.c b/src/osdp_phy.c
index 2f160a2..2274500 100644
--- a/src/osdp_phy.c
+++ b/src/osdp_phy.c
@@ -5,7 +5,7 @@
  */
 
 #include "osdp_common.h"
-#include "osdp_pcap.h"
+#include "osdp_diag.h"
 
 #define OSDP_PKT_MARK                  0xFF
 #define OSDP_PKT_SOM                   0x53