diff --git a/build.py b/build.py
index f4dedb9..b099255 100644
--- a/build.py
+++ b/build.py
@@ -67,18 +67,18 @@ if 1:
   except FileExistsError:
     pass
   CopyFile(BASE + r'\build\Win32_Release\TunSafe.exe', BASE + r'\installer\x86\TunSafe.exe')
-  CopyFile(BASE + r'\build\Win32_Release\ts.exe', BASE + r'\installer\x86\ts.exe')
+  CopyFile(BASE + r'\build\Win32_Release\ts.exe', BASE + r'\installer\x86\TunSafe.com')
   SignExe(BASE + r'\installer\x86\TunSafe.exe')
-  SignExe(BASE + r'\installer\x86\ts.exe')
+  SignExe(BASE + r'\installer\x86\TunSafe.com')
 
   try:
     os.mkdir(BASE + r'\installer\x64')
   except FileExistsError:
     pass
   CopyFile(BASE + r'\build\x64_Release\TunSafe.exe',   BASE + r'\installer\x64\TunSafe.exe')
-  CopyFile(BASE + r'\build\x64_Release\ts.exe',   BASE + r'\installer\x64\ts.exe')
+  CopyFile(BASE + r'\build\x64_Release\ts.exe',   BASE + r'\installer\x64\TunSafe.com')
   SignExe(BASE + r'\installer\x64\TunSafe.exe')
-  SignExe(BASE + r'\installer\x64\ts.exe')
+  SignExe(BASE + r'\installer\x64\TunSafe.com')
 
 VERSION = GetVersion()
 
@@ -87,7 +87,7 @@ SignExe(BASE + r'\installer\TunSafe-%s.exe' % VERSION)
 
 zipf = zipfile.ZipFile(BASE + '\installer\TunSafe-%s-x86.zip' % VERSION, 'w', zipfile.ZIP_DEFLATED)
 zipf.write(BASE + r'\installer\x86\TunSafe.exe', 'TunSafe.exe')
-zipf.write(BASE + r'\installer\x86\ts.exe', 'ts.exe')
+zipf.write(BASE + r'\installer\x86\TunSafe.com', 'TunSafe.com')
 zipf.write(BASE + r'\installer\License.txt', 'License.txt')
 zipf.write(BASE + r'\installer\ChangeLog.txt', 'ChangeLog.txt')
 zipf.write(BASE + r'\installer\TunSafe.conf', 'Config\\TunSafe.conf')
@@ -95,7 +95,7 @@ zipf.close()
 
 zipf = zipfile.ZipFile(BASE + '\installer\TunSafe-%s-x64.zip' % VERSION, 'w', zipfile.ZIP_DEFLATED)
 zipf.write(BASE + r'\installer\x64\TunSafe.exe', 'TunSafe.exe')
-zipf.write(BASE + r'\installer\x64\ts.exe', 'ts.exe')
+zipf.write(BASE + r'\installer\x64\TunSafe.com', 'TunSafe.com')
 zipf.write(BASE + r'\installer\License.txt', 'License.txt')
 zipf.write(BASE + r'\installer\ChangeLog.txt', 'ChangeLog.txt')
 zipf.write(BASE + r'\installer\TunSafe.conf', 'Config\\TunSafe.conf')
diff --git a/installer/tunsafe.nsi b/installer/tunsafe.nsi
index 8550365..6737fbd 100644
--- a/installer/tunsafe.nsi
+++ b/installer/tunsafe.nsi
@@ -57,12 +57,12 @@ Section "TunSafe Client" SecTunSafe
 		DetailPrint "Installing 64-bit version of TunSafe."
 		SetOutPath "$INSTDIR"
 		File "x64\TunSafe.exe"
-		File "x64\ts.exe"
+		File "x64\TunSafe.com"
 	${Else}
 		DetailPrint "Installing 32-bit version of TunSafe."
 		SetOutPath "$INSTDIR"
 		File "x86\TunSafe.exe"
-		File "x86\ts.exe"
+		File "x86\TunSafe.com"
 	${EndIf}
 	File "License.txt"
 	File "ChangeLog.txt"
diff --git a/ts.cpp b/ts.cpp
index fd363f2..f8b086c 100644
--- a/ts.cpp
+++ b/ts.cpp
@@ -36,7 +36,7 @@
 #define ANSI_FG_WHITE "\x1b[37m"
 
 #if defined(OS_WIN)
-#define EXENAME "ts"
+#define EXENAME "tunsafe"
 
 static bool SendMessageToService(HANDLE pipe, int message, const void *data, size_t data_size) {
   uint8 *temp = new uint8[data_size + 5];
@@ -607,7 +607,7 @@ static int HandleSetCommand(int argc, char **argv) {
   char hexkey[65];
 
   if (argc == 0) {
-    fprintf(stderr, "Usage: ts set <interface> [address <address>] [listen-port <port>] [private-key <file path>] "
+    fprintf(stderr, "Usage: " EXENAME " set <interface> [address <address>] [listen-port <port>] [private-key <file path>] "
             "[peer <base64 public key> [remove] [preshared-key <file path>] [endpoint <ip>:<port>] "
             "[persistent-keepalive <interval seconds>] [allowed-ips <ip1>/<cidr1>[,<ip2>/<cidr2>]] ]");
     return 1;