diff --git a/reactos/bootdata/packages/reactos.dff b/reactos/bootdata/packages/reactos.dff
index f9b23e65655..9b5212a50db 100755
--- a/reactos/bootdata/packages/reactos.dff
+++ b/reactos/bootdata/packages/reactos.dff
@@ -84,7 +84,7 @@ lib\dbghelp\dbghelp.dll                 1
 lib\ddraw\ddraw.dll                     1
 lib\devenum\devenum.dll                 1
 lib\devmgr\devmgr.dll                   1
-lib\dhcpcapi\dhcpcapi.dll               1
+lib\dhcpcsvc\dhcpcsvc.dll               1
 lib\dinput\dinput.dll                   1
 lib\dinput8\dinput8.dll                 1
 lib\dnsapi\dnsapi.dll                   1
diff --git a/reactos/lib/cpl/ncpa/ncpa.xml b/reactos/lib/cpl/ncpa/ncpa.xml
index 2f4528de364..27632f06c00 100644
--- a/reactos/lib/cpl/ncpa/ncpa.xml
+++ b/reactos/lib/cpl/ncpa/ncpa.xml
@@ -12,7 +12,7 @@
 	<library>comctl32</library>
 	<library>iphlpapi</library>
 	<library>ws2_32</library>
-	<library>dhcpcapi</library>
+	<library>dhcpcsvc</library>
 	<library>ntdll</library>
 	<file>ncpa.c</file>
 	<file>tcpip_properties.c</file>
diff --git a/reactos/lib/dhcpcapi/dhcpcapi.rc b/reactos/lib/dhcpcapi/dhcpcapi.rc
deleted file mode 100755
index fafe7d6aa87..00000000000
--- a/reactos/lib/dhcpcapi/dhcpcapi.rc
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <windows.h>
-
-#define REACTOS_VERSION_DLL
-#define REACTOS_STR_FILE_DESCRIPTION	"DHCP Client API\0"
-#define REACTOS_STR_INTERNAL_NAME	"dhcpcapi\0"
-#define REACTOS_STR_ORIGINAL_FILENAME	"dhcpcapi.dll\0"
-#include <reactos/version.rc>
diff --git a/reactos/lib/dhcpcapi/dhcpcapi.c b/reactos/lib/dhcpcsvc/dhcpcsvc.c
similarity index 100%
rename from reactos/lib/dhcpcapi/dhcpcapi.c
rename to reactos/lib/dhcpcsvc/dhcpcsvc.c
diff --git a/reactos/lib/dhcpcapi/dhcpcapi.def b/reactos/lib/dhcpcsvc/dhcpcsvc.def
similarity index 87%
rename from reactos/lib/dhcpcapi/dhcpcapi.def
rename to reactos/lib/dhcpcsvc/dhcpcsvc.def
index e5b07606edf..094e7e9f4eb 100644
--- a/reactos/lib/dhcpcapi/dhcpcapi.def
+++ b/reactos/lib/dhcpcsvc/dhcpcsvc.def
@@ -1,10 +1,10 @@
 ; $Id: dhcpcapi.def 14337 2005-03-26 22:10:04Z $
 ;
-; dhcpcapi.def
+; dhcpcsvc.def
 ;
 ; ReactOS Operating System
 ;
-LIBRARY dhcpcapi.dll
+LIBRARY dhcpcsvc.dll
 EXPORTS
 DhcpCApiInitialize@4
 DhcpCApiCleanup@0
diff --git a/reactos/lib/dhcpcsvc/dhcpcsvc.rc b/reactos/lib/dhcpcsvc/dhcpcsvc.rc
new file mode 100755
index 00000000000..dcff3bad44b
--- /dev/null
+++ b/reactos/lib/dhcpcsvc/dhcpcsvc.rc
@@ -0,0 +1,7 @@
+#include <windows.h>
+
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"DHCP Client Service\0"
+#define REACTOS_STR_INTERNAL_NAME	"dhcpcsvc\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"dhcpcsvc.dll\0"
+#include <reactos/version.rc>
diff --git a/reactos/lib/dhcpcapi/dhcpcapi.xml b/reactos/lib/dhcpcsvc/dhcpcsvc.xml
similarity index 52%
rename from reactos/lib/dhcpcapi/dhcpcapi.xml
rename to reactos/lib/dhcpcsvc/dhcpcsvc.xml
index fab6bb8caae..e0a2f02e6f7 100644
--- a/reactos/lib/dhcpcapi/dhcpcapi.xml
+++ b/reactos/lib/dhcpcsvc/dhcpcsvc.xml
@@ -1,6 +1,6 @@
-<module name="dhcpcapi" type="win32dll" installbase="system32" installname="dhcpcapi.dll">
-	<importlibrary definition="dhcpcapi.def" />
-	<include base="dhcpcapi">include</include>
+<module name="dhcpcsvc" type="win32dll" installbase="system32" installname="dhcpcsvc.dll">
+	<importlibrary definition="dhcpcsvc.def" />
+	<include base="dhcpcsvc">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_WINNT=0x0500" />
@@ -9,6 +9,6 @@
 	<library>msvcrt</library>
 	<library>ws2_32</library>
 	<library>iphlpapi</library>
-	<file>dhcpcapi.c</file>
-	<file>dhcpcapi.rc</file>
+	<file>dhcpcsvc.c</file>
+	<file>dhcpcsvc.rc</file>
 </module>
diff --git a/reactos/lib/directory.xml b/reactos/lib/directory.xml
index 4e6ca3b91be..ffd758a014d 100644
--- a/reactos/lib/directory.xml
+++ b/reactos/lib/directory.xml
@@ -62,8 +62,8 @@
 <directory name="devmgr">
 	<xi:include href="devmgr/devmgr.xml" />
 </directory>
-<directory name="dhcpcapi">
-	<xi:include href="dhcpcapi/dhcpcapi.xml" />
+<directory name="dhcpcsvc">
+	<xi:include href="dhcpcsvc/dhcpcsvc.xml" />
 </directory>
 <directory name="dinput">
 	<xi:include href="dinput/dinput.xml" />