Rename 'winroute' module into 'winnet'

27 files changed, 143 insertions, 151 deletions

diff --git a/windows/winroute/extras.sln b/windows/winnet/extras.sln
index 28d1d51341..a6fec71c96 100644
--- a/windows/winroute/extras.sln
+++ b/windows/winnet/extras.sln
@@ -8,7 +8,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "loader", "src\extras\loader
 		{89C5CDE8-04DB-4D9C-A8D8-7F786DAFB6D4} = {89C5CDE8-04DB-4D9C-A8D8-7F786DAFB6D4}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winroute", "src\winroute\winroute.vcxproj", "{89C5CDE8-04DB-4D9C-A8D8-7F786DAFB6D4}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winnet", "src\winnet\winnet.vcxproj", "{89C5CDE8-04DB-4D9C-A8D8-7F786DAFB6D4}"
 	ProjectSection(ProjectDependencies) = postProject
 		{B52E2D10-A94A-4605-914A-2DCEF6A757EF} = {B52E2D10-A94A-4605-914A-2DCEF6A757EF}
 	EndProjectSection
diff --git a/windows/winnet/src/extras/loader/loader.cpp b/windows/winnet/src/extras/loader/loader.cpp
new file mode 100644
index 0000000000..1ee58a7df5
--- /dev/null
+++ b/windows/winnet/src/extras/loader/loader.cpp
@@ -0,0 +1,10 @@
+#include "stdafx.h"
+#include "../../winnet/winnet.h"
+
+int main()
+{
+	const auto status = WinNet_GetTapInterfaceIpv6Status(nullptr, nullptr);
+
+    return 0;
+}
+
diff --git a/windows/winroute/src/extras/loader/loader.vcxproj b/windows/winnet/src/extras/loader/loader.vcxproj
index bf010c1fd0..40f6888214 100644
--- a/windows/winroute/src/extras/loader/loader.vcxproj
+++ b/windows/winnet/src/extras/loader/loader.vcxproj
@@ -111,7 +111,7 @@
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>$(SolutionDir)/bin/$(Platform)-$(Configuration)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>winroute.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>winnet.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -127,7 +127,7 @@
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>$(SolutionDir)/bin/$(Platform)-$(Configuration)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>winroute.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>winnet.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -147,7 +147,7 @@
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>$(SolutionDir)/bin/$(Platform)-$(Configuration)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>winroute.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>winnet.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -167,7 +167,7 @@
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>$(SolutionDir)/bin/$(Platform)-$(Configuration)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>winroute.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>winnet.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/windows/winroute/src/extras/loader/loader.vcxproj.filters b/windows/winnet/src/extras/loader/loader.vcxproj.filters
index cd0f4643c7..cd0f4643c7 100644
--- a/windows/winroute/src/extras/loader/loader.vcxproj.filters
+++ b/windows/winnet/src/extras/loader/loader.vcxproj.filters
diff --git a/windows/winroute/src/extras/loader/stdafx.cpp b/windows/winnet/src/extras/loader/stdafx.cpp
index 8d6fa45555..8d6fa45555 100644
--- a/windows/winroute/src/extras/loader/stdafx.cpp
+++ b/windows/winnet/src/extras/loader/stdafx.cpp
diff --git a/windows/winroute/src/extras/loader/stdafx.h b/windows/winnet/src/extras/loader/stdafx.h
index b005a839de..b005a839de 100644
--- a/windows/winroute/src/extras/loader/stdafx.h
+++ b/windows/winnet/src/extras/loader/stdafx.h
diff --git a/windows/winroute/src/extras/loader/targetver.h b/windows/winnet/src/extras/loader/targetver.h
index 87c0086de7..87c0086de7 100644
--- a/windows/winroute/src/extras/loader/targetver.h
+++ b/windows/winnet/src/extras/loader/targetver.h
diff --git a/windows/winroute/src/winroute/InterfacePair.cpp b/windows/winnet/src/winnet/InterfacePair.cpp
index 3c8af26079..3c8af26079 100644
--- a/windows/winroute/src/winroute/InterfacePair.cpp
+++ b/windows/winnet/src/winnet/InterfacePair.cpp
diff --git a/windows/winroute/src/winroute/InterfacePair.h b/windows/winnet/src/winnet/InterfacePair.h
index 9582bac3cd..9582bac3cd 100644
--- a/windows/winroute/src/winroute/InterfacePair.h
+++ b/windows/winnet/src/winnet/InterfacePair.h
diff --git a/windows/winroute/src/winroute/NetworkInterfaces.cpp b/windows/winnet/src/winnet/NetworkInterfaces.cpp
index 2aa352de27..2aa352de27 100644
--- a/windows/winroute/src/winroute/NetworkInterfaces.cpp
+++ b/windows/winnet/src/winnet/NetworkInterfaces.cpp
diff --git a/windows/winroute/src/winroute/NetworkInterfaces.h b/windows/winnet/src/winnet/NetworkInterfaces.h
index bf1d53dddf..bf1d53dddf 100644
--- a/windows/winroute/src/winroute/NetworkInterfaces.h
+++ b/windows/winnet/src/winnet/NetworkInterfaces.h
diff --git a/windows/winroute/src/winroute/dllmain.cpp b/windows/winnet/src/winnet/dllmain.cpp
index e66eb0495d..e66eb0495d 100644
--- a/windows/winroute/src/winroute/dllmain.cpp
+++ b/windows/winnet/src/winnet/dllmain.cpp
diff --git a/windows/winroute/src/winroute/interfaceutils.cpp b/windows/winnet/src/winnet/interfaceutils.cpp
index 1f3b95d3d9..1f3b95d3d9 100644
--- a/windows/winroute/src/winroute/interfaceutils.cpp
+++ b/windows/winnet/src/winnet/interfaceutils.cpp
diff --git a/windows/winroute/src/winroute/interfaceutils.h b/windows/winnet/src/winnet/interfaceutils.h
index c016706ba5..c016706ba5 100644
--- a/windows/winroute/src/winroute/interfaceutils.h
+++ b/windows/winnet/src/winnet/interfaceutils.h
diff --git a/windows/winroute/src/winroute/stdafx.cpp b/windows/winnet/src/winnet/stdafx.cpp
index b29c52afc9..b29c52afc9 100644
--- a/windows/winroute/src/winroute/stdafx.cpp
+++ b/windows/winnet/src/winnet/stdafx.cpp
diff --git a/windows/winroute/src/winroute/stdafx.h b/windows/winnet/src/winnet/stdafx.h
index 254cb49b0d..254cb49b0d 100644
--- a/windows/winroute/src/winroute/stdafx.h
+++ b/windows/winnet/src/winnet/stdafx.h
diff --git a/windows/winroute/src/winroute/targetver.h b/windows/winnet/src/winnet/targetver.h
index b8b7263c9e..b8b7263c9e 100644
--- a/windows/winroute/src/winroute/targetver.h
+++ b/windows/winnet/src/winnet/targetver.h
diff --git a/windows/winroute/src/winroute/winroute.cpp b/windows/winnet/src/winnet/winnet.cpp
index 0f00444111..ba14c737da 100644
--- a/windows/winroute/src/winroute/winroute.cpp
+++ b/windows/winnet/src/winnet/winnet.cpp
@@ -1,26 +1,26 @@
 #include "stdafx.h"

-#include "winroute.h"

+#include "winnet.h"

 #include "NetworkInterfaces.h"

 #include "interfaceutils.h"

 #include "libcommon/error.h"

 #include <cstdint>

 #include <stdexcept>

 

-

 extern "C"

-WINROUTE_LINKAGE

-WINROUTE_STATUS

-WINROUTE_API

-WinRoute_EnsureTopMetric(

+WINNET_LINKAGE

+WINNET_ETM_STATUS

+WINNET_API

+WinNet_EnsureTopMetric(

 	const wchar_t *deviceAlias,

-	WinRouteErrorSink errorSink,

+	WinNetErrorSink errorSink,

 	void* errorSinkContext

-) {

+)

+{

 	try

 	{

 		NetworkInterfaces interfaces;

 		bool metrics_set = interfaces.SetTopMetricForInterfacesByAlias(deviceAlias);

-		return metrics_set ? WINROUTE_STATUS::METRIC_SET : WINROUTE_STATUS::METRIC_NO_CHANGE;

+		return metrics_set ? WINNET_ETM_STATUS::METRIC_SET : WINNET_ETM_STATUS::METRIC_NO_CHANGE;

 	}

 	catch (std::exception &err)

 	{

@@ -28,21 +28,21 @@ WinRoute_EnsureTopMetric(
 		{

 			errorSink(err.what(), errorSinkContext);

 		}

-		return WINROUTE_STATUS::FAILURE;

 

+		return WINNET_ETM_STATUS::FAILURE;

 	}

 	catch (...)

 	{

-		return WINROUTE_STATUS::FAILURE;

+		return WINNET_ETM_STATUS::FAILURE;

 	}

 };

 

 extern "C"

-WINROUTE_LINKAGE

-TAP_IPV6_STATUS

-WINROUTE_API

-GetTapInterfaceIpv6Status(

-	WinRouteErrorSink errorSink,

+WINNET_LINKAGE

+WINNET_GTII_STATUS

+WINNET_API

+WinNet_GetTapInterfaceIpv6Status(

+	WinNetErrorSink errorSink,

 	void* errorSinkContext

 )

 {

@@ -57,12 +57,12 @@ GetTapInterfaceIpv6Status(
 

 		if (NO_ERROR == status)

 		{

-			return TAP_IPV6_STATUS::ENABLED;

+			return WINNET_GTII_STATUS::ENABLED;

 		}

 

 		if (ERROR_NOT_FOUND == status)

 		{

-			return TAP_IPV6_STATUS::DISABLED;

+			return WINNET_GTII_STATUS::DISABLED;

 		}

 

 		common::error::Throw("Resolve TAP IPv6 interface", status);

@@ -74,21 +74,21 @@ GetTapInterfaceIpv6Status(
 			errorSink(err.what(), errorSinkContext);

 		}

 

-		return TAP_IPV6_STATUS::FAILURE;

+		return WINNET_GTII_STATUS::FAILURE;

 	}

 	catch (...)

 	{

-		return TAP_IPV6_STATUS::FAILURE;

+		return WINNET_GTII_STATUS::FAILURE;

 	}

 }

 

 extern "C"

-WINROUTE_LINKAGE

-TAP_GET_ALIAS_STATUS

-WINROUTE_API

-GetTapInterfaceAlias(

+WINNET_LINKAGE

+WINNET_GTIA_STATUS

+WINNET_API

+WinNet_GetTapInterfaceAlias(

 	wchar_t **alias,

-	WinRouteErrorSink errorSink,

+	WinNetErrorSink errorSink,

 	void* errorSinkContext

 )

 {

@@ -101,7 +101,7 @@ GetTapInterfaceAlias(
 

 		*alias = stringBuffer;

 

-		return TAP_GET_ALIAS_STATUS::SUCCESS;

+		return WINNET_GTIA_STATUS::SUCCESS;

 	}

 	catch (std::exception &err)

 	{

@@ -110,19 +110,19 @@ GetTapInterfaceAlias(
 			errorSink(err.what(), errorSinkContext);

 		}

 

-		return TAP_GET_ALIAS_STATUS::GENERAL_ERROR;

+		return WINNET_GTIA_STATUS::FAILURE;

 	}

 	catch (...)

 	{

-		return TAP_GET_ALIAS_STATUS::GENERAL_ERROR;

+		return WINNET_GTIA_STATUS::FAILURE;

 	}

 }

 

 extern "C"

-WINROUTE_LINKAGE

+WINNET_LINKAGE

 void

-WINROUTE_API

-ReleaseString(

+WINNET_API

+WinNet_ReleaseString(

 	wchar_t *str

 )

 {

diff --git a/windows/winnet/src/winnet/winnet.def b/windows/winnet/src/winnet/winnet.def
new file mode 100644
index 0000000000..267a797538
--- /dev/null
+++ b/windows/winnet/src/winnet/winnet.def
@@ -0,0 +1,6 @@
+LIBRARY winnet
+EXPORTS
+	WinNet_EnsureTopMetric
+	WinNet_GetTapInterfaceIpv6Status
+	WinNet_GetTapInterfaceAlias
+	WinNet_ReleaseString
diff --git a/windows/winnet/src/winnet/winnet.h b/windows/winnet/src/winnet/winnet.h
new file mode 100644
index 0000000000..b5771f5b5a
--- /dev/null
+++ b/windows/winnet/src/winnet/winnet.h
@@ -0,0 +1,73 @@
+#pragma once
+#include <cstdint>
+
+#ifdef WINNET_EXPORTS
+#define WINNET_LINKAGE __declspec(dllexport)
+#else
+#define WINNET_LINKAGE __declspec(dllimport)
+#endif
+
+#define WINNET_API __stdcall
+
+typedef void (WINNET_API *WinNetErrorSink)(const char *errorMessage, void *context);
+
+enum class WINNET_ETM_STATUS : uint32_t
+{
+	METRIC_NO_CHANGE = 0,
+	METRIC_SET = 1,
+	FAILURE = 2,
+};
+
+extern "C"
+WINNET_LINKAGE
+WINNET_ETM_STATUS
+WINNET_API
+WinNet_EnsureTopMetric(
+	const wchar_t *deviceAlias,
+	WinNetErrorSink errorSink,
+	void* errorSinkContext
+);
+
+enum class WINNET_GTII_STATUS : uint32_t
+{
+	ENABLED = 0,
+	DISABLED = 1,
+	FAILURE = 2,
+};
+
+extern "C"
+WINNET_LINKAGE
+WINNET_GTII_STATUS
+WINNET_API
+WinNet_GetTapInterfaceIpv6Status(
+	WinNetErrorSink errorSink,
+	void* errorSinkContext
+);
+
+enum class WINNET_GTIA_STATUS : uint32_t
+{
+	SUCCESS = 0,
+	FAILURE = 1,
+};
+
+extern "C"
+WINNET_LINKAGE
+WINNET_GTIA_STATUS
+WINNET_API
+WinNet_GetTapInterfaceAlias(
+	wchar_t **alias,
+	WinNetErrorSink errorSink,
+	void* errorSinkContext
+);
+
+//
+// This is a companion function to the above function.
+// Generically named in case we need other functions here that return strings.
+//
+extern "C"
+WINNET_LINKAGE
+void
+WINNET_API
+WinNet_ReleaseString(
+	wchar_t *str
+);
diff --git a/windows/winroute/src/winroute/winroute.rc b/windows/winnet/src/winnet/winnet.rc
index 2da7924287..2da7924287 100644
--- a/windows/winroute/src/winroute/winroute.rc
+++ b/windows/winnet/src/winnet/winnet.rc
diff --git a/windows/winroute/src/winroute/winroute.vcxproj b/windows/winnet/src/winnet/winnet.vcxproj
index e168887331..e43b928d6c 100644
--- a/windows/winroute/src/winroute/winroute.vcxproj
+++ b/windows/winnet/src/winnet/winnet.vcxproj
@@ -24,7 +24,7 @@
     <ClCompile Include="interfaceutils.cpp" />
     <ClCompile Include="NetworkInterfaces.cpp" />
     <ClCompile Include="stdafx.cpp" />
-    <ClCompile Include="winroute.cpp" />
+    <ClCompile Include="winnet.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="InterfacePair.h" />
@@ -32,19 +32,19 @@
     <ClInclude Include="NetworkInterfaces.h" />
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="targetver.h" />
-    <ClInclude Include="winroute.h" />
+    <ClInclude Include="winnet.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="winroute.def" />
+    <None Include="winnet.def" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="winroute.rc" />
+    <ResourceCompile Include="winnet.rc" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>15.0</VCProjectVersion>
     <ProjectGuid>{89C5CDE8-04DB-4D9C-A8D8-7F786DAFB6D4}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
-    <RootNamespace>winroute</RootNamespace>
+    <RootNamespace>winnet</RootNamespace>
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -118,7 +118,7 @@
       <WarningLevel>Level4</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;_DEBUG;WINROUTE_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;WINNET_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <LanguageStandard>stdcpplatest</LanguageStandard>
@@ -127,7 +127,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ModuleDefinitionFile>winroute.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>winnet.def</ModuleDefinitionFile>
       <AdditionalLibraryDirectories>$(SolutionDir)/bin/$(Platform)-$(Configuration)</AdditionalLibraryDirectories>
       <AdditionalDependencies>libcommon.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
@@ -138,7 +138,7 @@
       <WarningLevel>Level4</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;WINROUTE_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;WINNET_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <LanguageStandard>stdcpplatest</LanguageStandard>
@@ -149,7 +149,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>libcommon.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(SolutionDir)/bin/$(Platform)-$(Configuration)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>winroute.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>winnet.def</ModuleDefinitionFile>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -160,7 +160,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;NDEBUG;WINROUTE_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;WINNET_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <LanguageStandard>stdcpplatest</LanguageStandard>
@@ -171,7 +171,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ModuleDefinitionFile>winroute.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>winnet.def</ModuleDefinitionFile>
       <AdditionalLibraryDirectories>$(SolutionDir)/bin/$(Platform)-$(Configuration)</AdditionalLibraryDirectories>
       <AdditionalDependencies>libcommon.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
@@ -184,7 +184,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;WINROUTE_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;WINNET_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <LanguageStandard>stdcpplatest</LanguageStandard>
@@ -195,7 +195,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ModuleDefinitionFile>winroute.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>winnet.def</ModuleDefinitionFile>
       <AdditionalLibraryDirectories>$(SolutionDir)/bin/$(Platform)-$(Configuration)</AdditionalLibraryDirectories>
       <AdditionalDependencies>libcommon.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
diff --git a/windows/winroute/src/winroute/winroute.vcxproj.filters b/windows/winnet/src/winnet/winnet.vcxproj.filters
index 15b184cc7f..2d320e7908 100644
--- a/windows/winroute/src/winroute/winroute.vcxproj.filters
+++ b/windows/winnet/src/winnet/winnet.vcxproj.filters
@@ -3,7 +3,7 @@
   <ItemGroup>
     <ClCompile Include="dllmain.cpp" />
     <ClCompile Include="stdafx.cpp" />
-    <ClCompile Include="winroute.cpp" />
+    <ClCompile Include="winnet.cpp" />
     <ClCompile Include="NetworkInterfaces.cpp" />
     <ClCompile Include="InterfacePair.cpp" />
     <ClCompile Include="interfaceutils.cpp" />
@@ -11,15 +11,15 @@
   <ItemGroup>
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="targetver.h" />
-    <ClInclude Include="winroute.h" />
+    <ClInclude Include="winnet.h" />
     <ClInclude Include="NetworkInterfaces.h" />
     <ClInclude Include="InterfacePair.h" />
     <ClInclude Include="interfaceutils.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="winroute.def" />
+    <None Include="winnet.def" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="winroute.rc" />
+    <ResourceCompile Include="winnet.rc" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/windows/winroute/winroute.sln b/windows/winnet/winnet.sln
index 28b21fc2f1..8d95777b4b 100644
--- a/windows/winroute/winroute.sln
+++ b/windows/winnet/winnet.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27130.2027
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winroute", "src\winroute\winroute.vcxproj", "{89C5CDE8-04DB-4D9C-A8D8-7F786DAFB6D4}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winnet", "src\winnet\winnet.vcxproj", "{89C5CDE8-04DB-4D9C-A8D8-7F786DAFB6D4}"
 	ProjectSection(ProjectDependencies) = postProject
 		{B52E2D10-A94A-4605-914A-2DCEF6A757EF} = {B52E2D10-A94A-4605-914A-2DCEF6A757EF}
 	EndProjectSection
diff --git a/windows/winroute/src/extras/loader/loader.cpp b/windows/winroute/src/extras/loader/loader.cpp
deleted file mode 100644
index cb775538f9..0000000000
--- a/windows/winroute/src/extras/loader/loader.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "stdafx.h"
-#include "../../winroute/winroute.h"
-
-int main()
-{
-	const auto status = GetTapInterfaceIpv6Status(nullptr, nullptr);
-
-    return 0;
-}
-
diff --git a/windows/winroute/src/winroute/winroute.def b/windows/winroute/src/winroute/winroute.def
deleted file mode 100644
index 2ea9222482..0000000000
--- a/windows/winroute/src/winroute/winroute.def
+++ /dev/null
@@ -1,4 +0,0 @@
-LIBRARY winroute
-EXPORTS
-	WinRoute_EnsureTopMetric
-	GetTapInterfaceIpv6Status
diff --git a/windows/winroute/src/winroute/winroute.h b/windows/winroute/src/winroute/winroute.h
deleted file mode 100644
index ac74c264c9..0000000000
--- a/windows/winroute/src/winroute/winroute.h
+++ /dev/null
@@ -1,83 +0,0 @@
-#pragma once
-#include <cstdint>
-
-#ifdef WINROUTE_EXPORTS
-#define WINROUTE_LINKAGE __declspec(dllexport)
-#else
-#define WINROUTE_LINKAGE __declspec(dllimport)
-#endif
-
-#define WINROUTE_API __stdcall
-
-typedef void (WINROUTE_API *WinRouteErrorSink)(const char *errorMessage, void *context);
-
-enum class WINROUTE_STATUS : uint32_t
-{
-	METRIC_NO_CHANGE = 0,
-	METRIC_SET = 1,
-	FAILURE = 2,
-};
-
-
-extern "C"
-WINROUTE_LINKAGE
-WINROUTE_STATUS
-WINROUTE_API
-WinRoute_EnsureTopMetric(
-	const wchar_t *deviceAlias,
-	WinRouteErrorSink errorSink,
-	void* errorSinkContext
-);
-
-enum class TAP_IPV6_STATUS : uint32_t
-{
-	ENABLED = 0,
-	DISABLED = 1,
-	FAILURE = 2,
-};
-
-//
-// This has nothing to do with routing.
-// We should probably rename this module and use it to gather one-off network functions.
-//
-extern "C"
-WINROUTE_LINKAGE
-TAP_IPV6_STATUS
-WINROUTE_API
-GetTapInterfaceIpv6Status(
-	WinRouteErrorSink errorSink,
-	void* errorSinkContext
-);
-
-enum class TAP_GET_ALIAS_STATUS : uint32_t
-{
-	GENERAL_ERROR = 0,
-	SUCCESS = 1,
-};
-
-
-//
-// This has nothing to do with routing.
-// We should probably rename this module and use it to gather one-off network functions.
-//
-extern "C"
-WINROUTE_LINKAGE
-TAP_GET_ALIAS_STATUS
-WINROUTE_API
-GetTapInterfaceAlias(
-	wchar_t **alias,
-	WinRouteErrorSink errorSink,
-	void* errorSinkContext
-);
-
-//
-// As of now, this is a companion function to the above function.
-// Generically named in case we need other functions here that return strings.
-//
-extern "C"
-WINROUTE_LINKAGE
-void
-WINROUTE_API
-ReleaseString(
-	wchar_t *str
-);