diff --git a/SDK/SDK.vcxproj b/SDK/SDK.vcxproj
index 2f481de..cafe36f 100644
--- a/SDK/SDK.vcxproj
+++ b/SDK/SDK.vcxproj
@@ -119,6 +119,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableUAC>false</EnableUAC>
       <ModuleDefinitionFile>sdk.def</ModuleDefinitionFile>
+      <AdditionalDependencies>Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
diff --git a/SDK/rpc_client.cpp b/SDK/rpc_client.cpp
index 06beb8f..269e656 100644
--- a/SDK/rpc_client.cpp
+++ b/SDK/rpc_client.cpp
@@ -2,8 +2,6 @@
 #include "sdk.h"
 #include "util.h"
 
-#pragma comment(lib, "Rpcrt4.lib")
-
 static RPC_WSTR pszStringBinding = NULL;
 extern std::function<int(WxMessage_t)> g_cbReceiveTextMsg;
 
@@ -14,7 +12,7 @@ RPC_STATUS RpcConnectServer()
     status = RpcStringBindingCompose(NULL,                                             // UUID to bind to
                                      reinterpret_cast<RPC_WSTR>((RPC_WSTR)L"ncalrpc"), // Use TCP/IP protocol
                                      NULL,                                             // TCP/IP network address to use
-                                     reinterpret_cast<RPC_WSTR>((RPC_WSTR)L"tmp_endpoint"), // TCP/IP port to use
+                                     reinterpret_cast<RPC_WSTR>((RPC_WSTR)L"wcferry"), // TCP/IP port to use
                                      NULL,               // Protocol dependent network options to use
                                      &pszStringBinding); // String binding output
 
diff --git a/Spy/Spy.vcxproj b/Spy/Spy.vcxproj
index 4ca44e3..8eae960 100644
--- a/Spy/Spy.vcxproj
+++ b/Spy/Spy.vcxproj
@@ -122,6 +122,7 @@
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableUAC>false</EnableUAC>
+      <AdditionalDependencies>Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <Midl>
       <AdditionalOptions>/prefix client "client_" server "server_" </AdditionalOptions>
diff --git a/Spy/rpc_server.cpp b/Spy/rpc_server.cpp
index 344b34d..972d8d3 100644
--- a/Spy/rpc_server.cpp
+++ b/Spy/rpc_server.cpp
@@ -3,14 +3,12 @@
 
 #include "get_contacts.h"
 #include "monitor.h"
+#include "rpc_h.h"
 #include "rpc_server.h"
 #include "sdk.h"
 #include "send_msg.h"
 #include "spy_types.h"
 
-#include "rpc_h.h"
-#pragma comment(lib, "Rpcrt4.lib")
-
 extern HANDLE g_hEvent;
 extern MsgQueue_t g_MsgQueue;
 extern const MsgTypesMap_t g_WxMsgTypes;
@@ -129,8 +127,8 @@ int RpcStartServer(HMODULE hModule)
     // remote procedure calls.
     status = RpcServerUseProtseqEp(reinterpret_cast<RPC_WSTR>((RPC_WSTR)L"ncalrpc"), // Use TCP/IP protocol
                                    RPC_C_LISTEN_MAX_CALLS_DEFAULT,                   // Backlog queue length for TCP/IP.
-                                   reinterpret_cast<RPC_WSTR>((RPC_WSTR)L"tmp_endpoint"), // TCP/IP port to use
-                                   NULL                                                   // No security
+                                   reinterpret_cast<RPC_WSTR>((RPC_WSTR)L"wcferry"), // TCP/IP port to use
+                                   NULL                                              // No security
     );
 
     if (status)