22 files changed, 40 insertions, 40 deletions
diff --git a/km/build/wdk8.1update/special/nt_path_converter/.gitignore b/km/build/wdk8.1update/special/nt_namespace/.gitignore
index 4ded7c4..4ded7c4 100644
--- a/km/build/wdk8.1update/special/nt_path_converter/.gitignore
+++ b/km/build/wdk8.1update/special/nt_namespace/.gitignore
diff --git a/km/build/wdk8.1update/special/nt_path_converter/nt_path_converter.vs12.sln b/km/build/wdk8.1update/special/nt_namespace/nt_namespace.vs12.sln
index 45cf003..7b06101 100644
--- a/km/build/wdk8.1update/special/nt_path_converter/nt_path_converter.vs12.sln
+++ b/km/build/wdk8.1update/special/nt_namespace/nt_namespace.vs12.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0.40629.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nt_path_converter.vs12", "nt_path_converter.vs12.vcxproj", "{6B611107-4492-46B1-A233-12BAB1FF0FC2}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nt_namespace.vs12", "nt_namespace.vs12.vcxproj", "{6B611107-4492-46B1-A233-12BAB1FF0FC2}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/km/build/wdk8.1update/special/nt_path_converter/nt_path_converter.vs12.vcxproj b/km/build/wdk8.1update/special/nt_namespace/nt_namespace.vs12.vcxproj
index f87134e..9b33bb0 100644
--- a/km/build/wdk8.1update/special/nt_path_converter/nt_path_converter.vs12.vcxproj
+++ b/km/build/wdk8.1update/special/nt_namespace/nt_namespace.vs12.vcxproj
@@ -57,7 +57,7 @@
     <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
     <Configuration Condition="'$(Configuration)' == ''">Win8.1 Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <RootNamespace>nt_path_converter_vs12</RootNamespace>
+    <RootNamespace>nt_namespace_vs12</RootNamespace>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8.1 Debug|Win32'" Label="Configuration">
@@ -217,14 +217,14 @@
     <FilesToPackage Include="@(Inf->'%(CopyOutput)')" Condition="'@(Inf)'!=''" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\src\special\nt_path_converter\control_codes.h" />
-    <ClInclude Include="..\..\..\..\src\special\nt_path_converter\device.h" />
-    <ClInclude Include="..\..\..\..\src\special\nt_path_converter\nt2dos.h" />
+    <ClInclude Include="..\..\..\..\src\special\nt_namespace\control_codes.h" />
+    <ClInclude Include="..\..\..\..\src\special\nt_namespace\device.h" />
+    <ClInclude Include="..\..\..\..\src\special\nt_namespace\nt2dos.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\..\src\special\nt_path_converter\device.c" />
-    <ClCompile Include="..\..\..\..\src\special\nt_path_converter\main.c" />
-    <ClCompile Include="..\..\..\..\src\special\nt_path_converter\nt2dos.c" />
+    <ClCompile Include="..\..\..\..\src\special\nt_namespace\device.c" />
+    <ClCompile Include="..\..\..\..\src\special\nt_namespace\main.c" />
+    <ClCompile Include="..\..\..\..\src\special\nt_namespace\nt2dos.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/km/src/special/dirs b/km/src/special/dirs
index 479f4db..6492e74 100644
--- a/km/src/special/dirs
+++ b/km/src/special/dirs
@@ -1 +1 @@
-DIRS = nt_path_converter sysenter
+DIRS = nt_namespace sysenter
diff --git a/km/src/special/nt_path_converter/control_codes.h b/km/src/special/nt_namespace/control_codes.h
index 3fb2aff..3fb2aff 100644
--- a/km/src/special/nt_path_converter/control_codes.h
+++ b/km/src/special/nt_namespace/control_codes.h
diff --git a/km/src/special/nt_path_converter/device.c b/km/src/special/nt_namespace/device.c
index a179984..6d88dc4 100644
--- a/km/src/special/nt_path_converter/device.c
+++ b/km/src/special/nt_namespace/device.c
@@ -38,8 +38,8 @@ static NTSTATUS handle_convert_nt_path(
     UNICODE_STRING uUnresolved, uResolved;
     NTSTATUS status = STATUS_SUCCESS;
 
-    DbgPrint("nt_path_converter: unresolved path: %ws\n", (WCHAR *) in_buf);
-    DbgPrint("nt_path_converter: unresolved size: %lu\n", in_buf_size);
+    DbgPrint("nt_namespace: unresolved path: %ws\n", (WCHAR *) in_buf);
+    DbgPrint("nt_namespace: unresolved size: %lu\n", in_buf_size);
 
     RtlInitUnicodeString(&uUnresolved, (WCHAR *) in_buf);
     status = nt2dos(&uResolved, &uUnresolved);
@@ -49,8 +49,8 @@ static NTSTATUS handle_convert_nt_path(
 
     *nbwritten = uResolved.Length + sizeof(WCHAR);
 
-    DbgPrint("nt_path_converter: resolved path: %wZ\n", &uResolved);
-    DbgPrint("nt_path_converter: resolved size: %Iu\n", *nbwritten);
+    DbgPrint("nt_namespace: resolved path: %wZ\n", &uResolved);
+    DbgPrint("nt_namespace: resolved size: %Iu\n", *nbwritten);
 
     if (out_buf_size < *nbwritten)
     {
@@ -127,8 +127,8 @@ Device;
 static DeviceInfo devices_info[NUMOF_DEVICES] =
 {
     {
-        L"\\Device\\nt_path_converter",
-        L"\\DosDevices\\nt_path_converter",
+        L"\\Device\\nt_namespace",
+        L"\\DosDevices\\nt_namespace",
     },
 };
 
diff --git a/km/src/special/nt_path_converter/device.h b/km/src/special/nt_namespace/device.h
index 4f117e9..4f117e9 100644
--- a/km/src/special/nt_path_converter/device.h
+++ b/km/src/special/nt_namespace/device.h
diff --git a/km/src/special/nt_path_converter/main.c b/km/src/special/nt_namespace/main.c
index a1c08e8..a1c08e8 100644
--- a/km/src/special/nt_path_converter/main.c
+++ b/km/src/special/nt_namespace/main.c
diff --git a/km/src/special/nt_path_converter/makefile b/km/src/special/nt_namespace/makefile
index 5acbbd2..5acbbd2 100644
--- a/km/src/special/nt_path_converter/makefile
+++ b/km/src/special/nt_namespace/makefile
diff --git a/km/src/special/nt_path_converter/nt2dos.c b/km/src/special/nt_namespace/nt2dos.c
index d1bdb3d..d1bdb3d 100644
--- a/km/src/special/nt_path_converter/nt2dos.c
+++ b/km/src/special/nt_namespace/nt2dos.c
diff --git a/km/src/special/nt_path_converter/nt2dos.h b/km/src/special/nt_namespace/nt2dos.h
index ce0b690..ce0b690 100644
--- a/km/src/special/nt_path_converter/nt2dos.h
+++ b/km/src/special/nt_namespace/nt2dos.h
diff --git a/km/src/special/nt_path_converter/sources b/km/src/special/nt_namespace/sources
index 02a42cd..7629a23 100644
--- a/km/src/special/nt_path_converter/sources
+++ b/km/src/special/nt_namespace/sources
@@ -1,3 +1,3 @@
 TARGETTYPE = DRIVER
-TARGETNAME = nt_path_converter
+TARGETNAME = nt_namespace
 SOURCES = device.c main.c nt2dos.c
diff --git a/um/README.md b/um/README.md
index 4a30be2..7601f25 100644
--- a/um/README.md
+++ b/um/README.md
@@ -5,13 +5,13 @@ A couple of usage examples are included along with the drivers.
 
 * [libservice]: Utilities to load/unload the drivers.
 * [libsimple]: [simple] driver usage examples.
-* [libnt_path_converter]: [nt_path_converter] driver usage examples.
+* [libnt_namespace]: [nt_namespace] driver usage examples.
 
 [libservice]: service/README.md
 [libsimple]: wrappers/simple/README.md
 [simple]: ../km/src/simple
-[libnt_path_converter]: wrappers/special/nt_path_converter/README.md
-[nt_path_converter]: ../km/src/special/nt_path_converter
+[libnt_namespace]: wrappers/special/nt_namespace/README.md
+[nt_namespace]: ../km/src/special/nt_namespace
 
 Building
 --------
diff --git a/um/wrappers/special/CMakeLists.txt b/um/wrappers/special/CMakeLists.txt
index ed48e00..40b32f6 100644
--- a/um/wrappers/special/CMakeLists.txt
+++ b/um/wrappers/special/CMakeLists.txt
@@ -1 +1 @@
-add_subdirectory(nt_path_converter)
+add_subdirectory(nt_namespace)
diff --git a/um/wrappers/special/nt_namespace/CMakeLists.txt b/um/wrappers/special/nt_namespace/CMakeLists.txt
new file mode 100644
index 0000000..ede2673
--- /dev/null
+++ b/um/wrappers/special/nt_namespace/CMakeLists.txt
@@ -0,0 +1,10 @@
+project(libnt_namespace)
+file(GLOB libnt_namespace_sources "src/*.cpp")
+file(GLOB_RECURSE libnt_namespace_headers "include/*.hpp")
+add_library(libnt_namespace
+    ${libnt_namespace_sources}
+    ${libnt_namespace_headers})
+target_link_libraries(libnt_namespace libservice)
+target_include_directories(libnt_namespace PUBLIC include/)
+
+add_subdirectory(utils)
diff --git a/um/wrappers/special/nt_path_converter/README.md b/um/wrappers/special/nt_namespace/README.md
index b295a80..22a74ee 100644
--- a/um/wrappers/special/nt_path_converter/README.md
+++ b/um/wrappers/special/nt_namespace/README.md
@@ -1,9 +1,9 @@
-nt_path_converter driver utilities
+nt_namespace driver utilities
 ==================================
 
-[nt_path_converter] driver usage examples.
+[nt_namespace] driver usage examples.
 
-[nt_path_converter]: ../../../../km/src/special/nt_path_converter
+[nt_namespace]: ../../../../km/src/special/nt_namespace
 
 Usage
 -----
diff --git a/um/wrappers/special/nt_path_converter/include/libnt_path_converter/all.hpp b/um/wrappers/special/nt_namespace/include/libnt_namespace/all.hpp
index 474b802..474b802 100644
--- a/um/wrappers/special/nt_path_converter/include/libnt_path_converter/all.hpp
+++ b/um/wrappers/special/nt_namespace/include/libnt_namespace/all.hpp
diff --git a/um/wrappers/special/nt_path_converter/include/libnt_path_converter/device.hpp b/um/wrappers/special/nt_namespace/include/libnt_namespace/device.hpp
index e1d75fb..775b707 100644
--- a/um/wrappers/special/nt_path_converter/include/libnt_path_converter/device.hpp
+++ b/um/wrappers/special/nt_namespace/include/libnt_namespace/device.hpp
@@ -9,7 +9,7 @@
 
 #include <string>
 
-namespace libnt_path_converter
+namespace libnt_namespace
 {
     class Device : libservice::Device
     {
diff --git a/um/wrappers/special/nt_path_converter/src/device.cpp b/um/wrappers/special/nt_namespace/src/device.cpp
index 2b5b89a..1187b1c 100644
--- a/um/wrappers/special/nt_path_converter/src/device.cpp
+++ b/um/wrappers/special/nt_namespace/src/device.cpp
@@ -3,7 +3,7 @@
 // For details, see https://github.com/egor-tensin/windows7-drivers.
 // Distributed under the MIT License.
 
-#include "libnt_path_converter/device.hpp"
+#include "libnt_namespace/device.hpp"
 
 #include "libservice/all.hpp"
 
@@ -12,11 +12,11 @@
 #include <string>
 #include <vector>
 
-namespace libnt_path_converter
+namespace libnt_namespace
 {
     namespace
     {
-        const auto device_path = "\\\\.\\nt_path_converter";
+        const auto device_path = "\\\\.\\nt_namespace";
         const auto control_code = CTL_CODE(0x8000, 0x800, METHOD_BUFFERED, FILE_ANY_ACCESS);
     }
 
diff --git a/um/wrappers/special/nt_path_converter/utils/CMakeLists.txt b/um/wrappers/special/nt_namespace/utils/CMakeLists.txt
index 9c5254b..294a713 100644
--- a/um/wrappers/special/nt_path_converter/utils/CMakeLists.txt
+++ b/um/wrappers/special/nt_namespace/utils/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_executable(convert_nt_path convert_nt_path.cpp)
-target_link_libraries(convert_nt_path PRIVATE libnt_path_converter)
+target_link_libraries(convert_nt_path PRIVATE libnt_namespace)
 if(MINGW)
     target_compile_options(convert_nt_path PRIVATE -municode)
     target_link_libraries(convert_nt_path PRIVATE -municode)
diff --git a/um/wrappers/special/nt_path_converter/utils/convert_nt_path.cpp b/um/wrappers/special/nt_namespace/utils/convert_nt_path.cpp
index 9d25242..5a77fed 100644
--- a/um/wrappers/special/nt_path_converter/utils/convert_nt_path.cpp
+++ b/um/wrappers/special/nt_namespace/utils/convert_nt_path.cpp
@@ -3,7 +3,7 @@
 // For details, see https://github.com/egor-tensin/windows7-drivers.
 // Distributed under the MIT License.
 
-#include "libnt_path_converter/all.hpp"
+#include "libnt_namespace/all.hpp"
 
 #include <exception>
 #include <iostream>
@@ -12,7 +12,7 @@ int wmain(int argc, wchar_t* argv[])
 {
     try
     {
-        libnt_path_converter::Device dev;
+        libnt_namespace::Device dev;
         for (int i = 1; i < argc; ++i)
             std::wcout << dev.convert_nt_path(argv[i]) << L"\n";
     }
diff --git a/um/wrappers/special/nt_path_converter/CMakeLists.txt b/um/wrappers/special/nt_path_converter/CMakeLists.txt
deleted file mode 100644
index 69f85d0..0000000
--- a/um/wrappers/special/nt_path_converter/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-project(libnt_path_converter)
-file(GLOB libnt_path_converter_sources "src/*.cpp")
-file(GLOB_RECURSE libnt_path_converter_headers "include/*.hpp")
-add_library(libnt_path_converter
-    ${libnt_path_converter_sources}
-    ${libnt_path_converter_headers})
-target_link_libraries(libnt_path_converter libservice)
-target_include_directories(libnt_path_converter PUBLIC include/)
-
-add_subdirectory(utils)