diff --git a/build.vc10/nfs41_driver.vcxproj b/build.vc10/nfs41_driver.vcxproj
index 4a0f569..6b91eef 100644
--- a/build.vc10/nfs41_driver.vcxproj
+++ b/build.vc10/nfs41_driver.vcxproj
@@ -57,65 +57,65 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\projects\ms-nfs41-client\sys\objchk_wlh_x86\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\projects\ms-nfs41-client\sys\objchk_wlh_x86\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call $(WDKPATH)\bin\setenv.bat $(WDKPATH) chk x86 wlh
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\projects\ms-nfs41-client\sys\objchk_win7_x86\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\projects\ms-nfs41-client\sys\objchk_win7_x86\</IntDir>
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call $(WDKPATH)\bin\setenv.bat $(WDKPATH) chk x86 win7
 cd /d C:\projects\ms-nfs41-client\sys
 build</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">rmdir /s /q C:\projects\ms-nfs41-client\sys\objchk_wlh_x86
-call $(WDKPATH)\bin\setenv.bat $(WDKPATH) chk x86 wlh
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">rmdir /s /q C:\projects\ms-nfs41-client\sys\objchk_win7_x86
+call $(WDKPATH)\bin\setenv.bat $(WDKPATH) chk x86 win7
 cd /d C:\projects\ms-nfs41-client\sys
 build</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">rmdir /s /q C:\projects\ms-nfs41-client\sys\objchk_wlh_x86</NMakeCleanCommandLine>
-    <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\projects\ms-nfs41-client\sys\objchk_wlh_x86\i386\nfs41_driver.sys</NMakeOutput>
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">rmdir /s /q C:\projects\ms-nfs41-client\sys\objchk_win7_x86</NMakeCleanCommandLine>
+    <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\projects\ms-nfs41-client\sys\objchk_win7_x86\i386\nfs41_driver.sys</NMakeOutput>
     <NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WIN32;_CONSOLE;_X86_;_DDK_;_DEBUG;DBG=1;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
     <NMakeIncludeSearchPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(WDKPATH)\inc\ddk;$(WDKPATH)\inc\api;$(WDKPATH)\inc\crt;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
     <NMakeForcedIncludes Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeForcedIncludes)</NMakeForcedIncludes>
     <NMakeAssemblySearchPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeAssemblySearchPath)</NMakeAssemblySearchPath>
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:\projects\ms-nfs41-client\sys\objchk_wlh_amd64\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:\projects\ms-nfs41-client\sys\objchk_wlh_amd64\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call $(WDKPATH)\bin\setenv.bat $(WDKPATH) chk x64 wlh
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:\projects\ms-nfs41-client\sys\objchk_win7_amd64\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:\projects\ms-nfs41-client\sys\objchk_win7_amd64\</IntDir>
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call $(WDKPATH)\bin\setenv.bat $(WDKPATH) chk x64 win7
 cd /d C:\projects\ms-nfs41-client\sys
 build</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">rmdir /s /q C:\projects\ms-nfs41-client\sys\objchk_wlh_amd64
-call $(WDKPATH)\bin\setenv.bat $(WDKPATH) chk x64 wlh
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">rmdir /s /q C:\projects\ms-nfs41-client\sys\objchk_win7_amd64
+call $(WDKPATH)\bin\setenv.bat $(WDKPATH) chk x64 win7
 cd /d C:\projects\ms-nfs41-client\sys
 build</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">rmdir /s /q C:\projects\ms-nfs41-client\sys\objchk_wlh_amd64</NMakeCleanCommandLine>
-    <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:\projects\ms-nfs41-client\sys\objchk_wlh_amd64\amd64\nfs41_driver.sys</NMakeOutput>
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">rmdir /s /q C:\projects\ms-nfs41-client\sys\objchk_win7_amd64</NMakeCleanCommandLine>
+    <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:\projects\ms-nfs41-client\sys\objchk_win7_amd64\amd64\nfs41_driver.sys</NMakeOutput>
     <NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">WIN32;_CONSOLE;_AMD64_;_DDK_;_DEBUG;DBG=1;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
     <NMakeIncludeSearchPath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(WDKPATH)\inc\ddk;$(WDKPATH)\inc\api;$(WDKPATH)\inc\crt;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
     <NMakeForcedIncludes Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakeForcedIncludes)</NMakeForcedIncludes>
     <NMakeAssemblySearchPath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakeAssemblySearchPath)</NMakeAssemblySearchPath>
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\projects\ms-nfs41-client\sys\objfre_wlh_x86\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\projects\ms-nfs41-client\sys\objfre_wlh_x86\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call $(WDKPATH)\bin\setenv.bat $(WDKPATH) fre x86 wlh
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\projects\ms-nfs41-client\sys\objfre_win7_x86\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\projects\ms-nfs41-client\sys\objfre_win7_x86\</IntDir>
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call $(WDKPATH)\bin\setenv.bat $(WDKPATH) fre x86 win7
 cd /d C:\projects\ms-nfs41-client\sys
 build</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">rmdir /s /q C:\projects\ms-nfs41-client\sys\objfre_wlh_x86
-call $(WDKPATH)\bin\setenv.bat $(WDKPATH) fre x86 wlh
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">rmdir /s /q C:\projects\ms-nfs41-client\sys\objfre_win7_x86
+call $(WDKPATH)\bin\setenv.bat $(WDKPATH) fre x86 win7
 cd /d C:\projects\ms-nfs41-client\sys
 build</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">rmdir /s /q C:\projects\ms-nfs41-client\sys\objfre_wlh_x86</NMakeCleanCommandLine>
-    <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\projects\ms-nfs41-client\sys\objfre_wlh_x86\i386\nfs41_driver.sys</NMakeOutput>
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">rmdir /s /q C:\projects\ms-nfs41-client\sys\objfre_win7_x86</NMakeCleanCommandLine>
+    <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\projects\ms-nfs41-client\sys\objfre_win7_x86\i386\nfs41_driver.sys</NMakeOutput>
     <NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;_CONSOLE;_X86_;_DDK_;_NDEBUG;DBG=0;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
     <NMakeIncludeSearchPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(WDKPATH)\inc\ddk;$(WDKPATH)\inc\api;$(WDKPATH)\inc\crt;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
     <NMakeForcedIncludes Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedIncludes)</NMakeForcedIncludes>
     <NMakeAssemblySearchPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeAssemblySearchPath)</NMakeAssemblySearchPath>
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:\projects\ms-nfs41-client\sys\objfre_wlh_amd64\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:\projects\ms-nfs41-client\sys\objfre_wlh_amd64\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call $(WDKPATH)\bin\setenv.bat $(WDKPATH) fre x64 wlh
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:\projects\ms-nfs41-client\sys\objfre_win7_amd64\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:\projects\ms-nfs41-client\sys\objfre_win7_amd64\</IntDir>
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call $(WDKPATH)\bin\setenv.bat $(WDKPATH) fre x64 win7
 cd /d C:\projects\ms-nfs41-client\sys
 build</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">rmdir /s /q C:\projects\ms-nfs41-client\sys\objfre_wlh_amd64
-call $(WDKPATH)\bin\setenv.bat $(WDKPATH) fre x64 wlh
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">rmdir /s /q C:\projects\ms-nfs41-client\sys\objfre_win7_amd64
+call $(WDKPATH)\bin\setenv.bat $(WDKPATH) fre x64 win7
 cd /d C:\projects\ms-nfs41-client\sys
 build</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">rmdir /s /q C:\projects\ms-nfs41-client\sys\objfre_wlh_amd64</NMakeCleanCommandLine>
-    <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:\projects\ms-nfs41-client\sys\objfre_wlh_amd64\amd64\nfs41_driver.sys</NMakeOutput>
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">rmdir /s /q C:\projects\ms-nfs41-client\sys\objfre_win7_amd64</NMakeCleanCommandLine>
+    <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:\projects\ms-nfs41-client\sys\objfre_win7_amd64\amd64\nfs41_driver.sys</NMakeOutput>
     <NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">WIN32;_CONSOLE;_AMD64_;_DDK_;_NDEBUG;DBG=0;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
     <NMakeIncludeSearchPath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(WDKPATH)\inc\ddk;$(WDKPATH)\inc\api;$(WDKPATH)\inc\crt;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
     <NMakeForcedIncludes Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(NMakeForcedIncludes)</NMakeForcedIncludes>