 -#define NPF_SERVICE_DESC					"WinPcap Packet Driver (" NPF_DRIVER_NAME ")"			///< (FFF) packet.dll
 -#define NPF_DRIVER_COMPLETE_DEVICE_PREFIX	"\\Device\\" NPF_DRIVER_NAME "_"						///< (III) packet.dll
 -#define NPF_DRIVER_COMPLETE_PATH			"system32\\drivers\\" NPF_DRIVER_NAME ".sys"			///< (LLL) packet.dll
-+#define NPF_DEVICE_NAMES_PREFIX				NPF_DRIVER_NAME "_"
++#define NPF_DEVICE_NAMES_PREFIX			NPF_DRIVER_NAME "_"
 +#define NPF_DEVICE_NAMES_PREFIX_WIDECHAR	NPF_DRIVER_NAME_WIDECHAR L"_"
-+#define NPF_EVENTS_NAMES					NPF_DRIVER_NAME
-+#define NPF_EVENTS_NAMES_WIDECHAR			NPF_DRIVER_NAME_WIDECHAR
-+#define FAKE_NDISWAN_ADAPTER_NAME			"\\Device\\" NPF_DRIVER_NAME "_GenericDialupAdapter"
++#define NPF_EVENTS_NAMES			NPF_DRIVER_NAME
++#define NPF_EVENTS_NAMES_WIDECHAR		NPF_DRIVER_NAME_WIDECHAR
++#define FAKE_NDISWAN_ADAPTER_NAME		"\\Device\\" NPF_DRIVER_NAME "_GenericDialupAdapter"
 +#define FAKE_NDISWAN_ADAPTER_DESCRIPTION	"Adapter for generic dialup and VPN capture"
-+#define NPF_SERVICE_DESC					"Tor WinPcap Packet Driver (" NPF_DRIVER_NAME ")"
++#define NPF_SERVICE_DESC			"Tor WinPcap Packet Driver (" NPF_DRIVER_NAME ")"
 +#define NPF_DRIVER_COMPLETE_DEVICE_PREFIX	"\\Device\\" NPF_DRIVER_NAME "_"
-+#define NPF_DRIVER_COMPLETE_PATH			NPF_DRIVER_NAME ".sys"
++#define NPF_DRIVER_COMPLETE_PATH		"system32\\drivers\\" NPF_DRIVER_NAME ".sys"
  
  
  //

-#define WINPCAP_REV		0
+#define WINPCAP_REV	0
 #define WINPCAP_BUILD	1237
-#define WINPCAP_VER_STRING	"4.1.0.1237"
+#define WINPCAP_VER_STRING	"9.1.0.1237"
 #define WINPCAP_PACKET9x_STRING_VERSION	"4.1 beta4"
 #define WINPCAP_WPCAP_STRING_VERSION "4.1 beta4"
 
 #define WINPCAP_COMPANY_NAME 			"CACE Technologies, Inc."
 
-#define WINPCAP_PRODUCT_NAME 			"WinPcap"
+#define WINPCAP_PRODUCT_NAME 			"Tor WinPcap Driver"
 
 #define WINPCAP_COPYRIGHT_STRING 		"Copyright  2005-2008 CACE Technologies. Copyright  1999-2005 NetGroup, Politecnico di Torino."
 #define WINPCAP_WANPACKET_COPYRIGHT_STRING "Copyright  2005-2008 CACE Technologies. Copyright  2003-2005 NetGroup, Politecnico di Torino."

diff -Naur orig-winpcap/Common/WpcapNames.h mod-winpcap/Common/WpcapNames.h
--- orig-winpcap/Common/WpcapNames.h	2007-11-14 20:22:04.000000000 +0000
+++ mod-winpcap/Common/WpcapNames.h	2008-09-27 09:13:29.564581776 +0000
@@ -39,45 +39,45 @@
 //  - please do not use prefix names longer than 70 chars. 
 //  - the following characters are surely accepted in the prefixes:  "[A-Z][a-z][0-9]_-',"   
 //
-#define NPF_DRIVER_NAME							"NPF"					///< (HHH) Packet.dll
-#define NPF_DRIVER_NAME_WIDECHAR				L"NPF"					///< (HHH) Packet.dll
+#define NPF_DRIVER_NAME				"TORNPF"
+#define NPF_DRIVER_NAME_WIDECHAR		L"TORNPF"
 
 //
 // Derived strings
