diff --git a/src/BuildUtil/UnixBuildSoftwares.cs b/src/BuildUtil/UnixBuildSoftwares.cs
index 75e259f4..b5ecebe7 100644
--- a/src/BuildUtil/UnixBuildSoftwares.cs
+++ b/src/BuildUtil/UnixBuildSoftwares.cs
@@ -143,7 +143,7 @@ namespace BuildUtil
 			@"bin\BuiltHamcoreFiles",
 			@"bin\hamcore",
 			"Cedar",
-			"Ham",
+			"vpntest",
 			"Mayaqua",
 			"Neo",
 			"vpnbridge",
@@ -732,7 +732,7 @@ namespace BuildUtil
 		{
 			string[] programNames =
 			{
-				"Ham",
+				"vpntest",
 				"vpnserver",
 				"vpnbridge",
 				"vpnclient",
diff --git a/src/Cedar/WinUi.c b/src/Cedar/WinUi.c
index ff84e76f..7ea05e0c 100644
--- a/src/Cedar/WinUi.c
+++ b/src/Cedar/WinUi.c
@@ -1965,8 +1965,8 @@ void RegistWindowsFirewallAllEx(char *dir)
 	MsRegistWindowsFirewallEx2(CEDAR_CUI_STR, "vpncmd.exe", dir);
 	MsRegistWindowsFirewallEx2(CEDAR_CUI_STR, "vpncmd_x64.exe", dir);
 
-	MsRegistWindowsFirewallEx2(CEDAR_PRODUCT_STR, "ham.exe", dir);
-	MsRegistWindowsFirewallEx2(CEDAR_PRODUCT_STR, "ham_x64.exe", dir);
+	MsRegistWindowsFirewallEx2(CEDAR_PRODUCT_STR, "vpntest.exe", dir);
+	MsRegistWindowsFirewallEx2(CEDAR_PRODUCT_STR, "vpntest_x64.exe", dir);
 }
 
 // Check whether the notification service is already running
diff --git a/src/Ham/Cert.ico b/src/Ham/Cert.ico
deleted file mode 100644
index ec86d51a..00000000
Binary files a/src/Ham/Cert.ico and /dev/null differ
diff --git a/src/Ham/Mon.c b/src/Ham/Mon.c
deleted file mode 100644
index d3f5a12f..00000000
--- a/src/Ham/Mon.c
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/Ham/Mon.h b/src/Ham/Mon.h
deleted file mode 100644
index d3f5a12f..00000000
--- a/src/Ham/Mon.h
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/Ham/Scan.c b/src/Ham/Scan.c
deleted file mode 100644
index d3f5a12f..00000000
--- a/src/Ham/Scan.c
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/Ham/Scan.h b/src/Ham/Scan.h
deleted file mode 100644
index d3f5a12f..00000000
--- a/src/Ham/Scan.h
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/SEVPN.sln b/src/SEVPN.sln
index 5435d06a..1c4a3124 100644
--- a/src/SEVPN.sln
+++ b/src/SEVPN.sln
@@ -90,7 +90,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cedar", "Cedar\Cedar.vcproj
 		{384815C3-333C-4CEC-9DCD-B6AB2602EBB9} = {384815C3-333C-4CEC-9DCD-B6AB2602EBB9}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ham", "Ham\Ham.vcproj", "{1ED5782B-1734-4FC6-AA9E-F7181CDBA8A7}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vpntest", "vpntest\vpntest.vcproj", "{1ED5782B-1734-4FC6-AA9E-F7181CDBA8A7}"
 	ProjectSection(ProjectDependencies) = postProject
 		{DB2A0C4F-D685-41DD-91BA-06E9EEA381CF} = {DB2A0C4F-D685-41DD-91BA-06E9EEA381CF}
 		{2928D768-DEC3-40D3-8E51-26E364497C9B} = {2928D768-DEC3-40D3-8E51-26E364497C9B}
diff --git a/src/Ham/resource.h b/src/vpntest/resource.h
similarity index 100%
rename from src/Ham/resource.h
rename to src/vpntest/resource.h
diff --git a/src/Ham/Ham.c b/src/vpntest/vpntest.c
similarity index 100%
rename from src/Ham/Ham.c
rename to src/vpntest/vpntest.c
diff --git a/src/Ham/Ham.h b/src/vpntest/vpntest.h
similarity index 100%
rename from src/Ham/Ham.h
rename to src/vpntest/vpntest.h
diff --git a/src/Ham/NIC.ico b/src/vpntest/vpntest.ico
similarity index 100%
rename from src/Ham/NIC.ico
rename to src/vpntest/vpntest.ico
diff --git a/src/Ham/Ham.rc b/src/vpntest/vpntest.rc
similarity index 91%
rename from src/Ham/Ham.rc
rename to src/vpntest/vpntest.rc
index f39cbd95..6d048626 100644
--- a/src/Ham/Ham.rc
+++ b/src/vpntest/vpntest.rc
@@ -54,7 +54,7 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_ICON2               ICON                    "NIC.ico"
+IDI_ICON2               ICON                    "vpntest.ico"
 #endif    // Japanese resources
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/Ham/Ham.vcproj b/src/vpntest/vpntest.vcproj
similarity index 92%
rename from src/Ham/Ham.vcproj
rename to src/vpntest/vpntest.vcproj
index 5400b8c6..e8533dc5 100644
--- a/src/Ham/Ham.vcproj
+++ b/src/vpntest/vpntest.vcproj
@@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9.00"
-	Name="Ham"
+	Name="vpntest"
 	ProjectGUID="{1ED5782B-1734-4FC6-AA9E-F7181CDBA8A7}"
-	RootNamespace="Ham"
+	RootNamespace="vpntest"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="131072"
 	>
@@ -72,7 +72,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="&quot;$(SolutionDir)tmp\VersionResources\$(ProjectName)_$(PlatformName).res&quot;"
-				OutputFile="$(OutDir)\Ham.exe"
+				OutputFile="$(OutDir)\vpntest.exe"
 				LinkIncremental="2"
 				GenerateManifest="false"
 				AdditionalManifestDependencies="type=&apos;win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; processorArchitecture=&apos;x86&apos;  publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos;"
@@ -165,7 +165,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="&quot;$(SolutionDir)tmp\VersionResources\$(ProjectName)_$(PlatformName).res&quot;"
-				OutputFile="$(OutDir)\Ham_x64.exe"
+				OutputFile="$(OutDir)\vpntest_x64.exe"
 				LinkIncremental="2"
 				GenerateManifest="false"
 				AdditionalManifestDependencies="type=&apos;win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; processorArchitecture=&apos;amd64&apos;  publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos;"
@@ -261,7 +261,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="&quot;$(SolutionDir)tmp\VersionResources\$(ProjectName)_$(PlatformName).res&quot;"
-				OutputFile="$(OutDir)\Ham.exe"
+				OutputFile="$(OutDir)\vpntest.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;C:\Program Files (x86)\Microsoft Visual Studio 8\VC\lib&quot;"
 				GenerateManifest="false"
@@ -363,7 +363,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="&quot;$(SolutionDir)tmp\VersionResources\$(ProjectName)_$(PlatformName).res&quot;"
-				OutputFile="$(OutDir)\Ham_x64.exe"
+				OutputFile="$(OutDir)\vpntest_x64.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
 				GenerateManifest="false"
@@ -417,15 +417,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath=".\Ham.c"
-				>
-			</File>
-			<File
-				RelativePath=".\Mon.c"
-				>
-			</File>
-			<File
-				RelativePath=".\Scan.c"
+				RelativePath=".\vpntest.c"
 				>
 			</File>
 		</Filter>
@@ -435,19 +427,7 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath=".\Ham.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Mon.h"
-				>
-			</File>
-			<File
-				RelativePath=".\resource.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Scan.h"
+				RelativePath=".\vpntest.h"
 				>
 			</File>
 		</Filter>
@@ -457,15 +437,11 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 			<File
-				RelativePath=".\Cert.ico"
+				RelativePath=".\vpntest.rc"
 				>
 			</File>
 			<File
-				RelativePath=".\Ham.rc"
-				>
-			</File>
-			<File
-				RelativePath=".\NIC.ico"
+				RelativePath=".\vpntest.ico"
 				>
 			</File>
 		</Filter>