 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-26 07:13:21.959100848 +0000
-@@ -39,28 +39,28 @@
++++ 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"
++#define NPF_DRIVER_NAME				"TORNPF"
++#define NPF_DRIVER_NAME_WIDECHAR		L"TORNPF"
  
  //
  // Derived strings

 //
-#define WINPCAP_GLOBAL_KEY				"SOFTWARE\\CaceTech\\WinPcapOem"
-#define WINPCAP_GLOBAL_KEY_WIDECHAR		L"SOFTWARE\\CaceTech\\WinPcapOem"
+#define WINPCAP_GLOBAL_KEY				"SOFTWARE\\TorProject\\ModWinPcap"
+#define WINPCAP_GLOBAL_KEY_WIDECHAR		L"SOFTWARE\\TorProject\\ModWinPcap"
 #define WINPCAP_INSTANCE_KEY			WINPCAP_GLOBAL_KEY "\\" NPF_DRIVER_NAME
 #define WINPCAP_INSTANCE_KEY_WIDECHAR	WINPCAP_GLOBAL_KEY_WIDECHAR	L"\\" NPF_DRIVER_NAME_WIDECHAR
 #define MAX_WINPCAP_KEY_CHARS 512
@@ -68,16 +68,16 @@
 //
 // Subkeys names
 //

-#define NPF_DRIVER_NAME_REG_KEY					"NpfDriverName"				///< (HHH) packet.dll
-#define NPF_DRIVER_COMPLETE_DEVICE_PREFIX_REG_KEY "NpfCompleteDriverPrefix"	///< (III) packet.dll
-#define NPF_DRIVER_COMPLETE_PATH_REG_KEY		"NpfDriverCompletePath"		///< (LLL) 
+#define NPF_DEVICES_PREFIX_REG_KEY		"NpfDeviceNamesPrefix"
+#define NPF_DEVICES_PREFIX_REG_KEY_WC		L"NpfDeviceNamesPrefix"
+#define NPF_EVENTS_NAMES_REG_KEY		"NpfEventsNames"
+#define NPF_EVENTS_NAMES_REG_KEY_WC		L"NpfEventsNames"
+#define NPF_FAKE_NDISWAN_ADAPTER_NAME_REG_KEY	"NdiswanAdapterName"
+#define NPF_FAKE_NDISWAN_ADAPTER_DESC_REG_KEY	"NdiswanAdapterDescription"
+#define NPF_SERVICE_DESC_REG_KEY		"NpfServiceDescription"	
+#define NPF_DRIVER_NAME_REG_KEY			"NpfDriverName"
+#define NPF_DRIVER_COMPLETE_DEVICE_PREFIX_REG_KEY "NpfCompleteDriverPrefix"
+#define NPF_DRIVER_COMPLETE_PATH_REG_KEY	"NpfDriverCompletePath"
 
 #endif //__WPCAPNAMES_H_EED6D131C6DB4dd696757D219977A7E5
 
