diff --git a/reactos/dll/shellext/ntobjshex/CMakeLists.txt b/reactos/dll/shellext/ntobjshex/CMakeLists.txt
index af746fa5bb4..d96f1bd78e2 100644
--- a/reactos/dll/shellext/ntobjshex/CMakeLists.txt
+++ b/reactos/dll/shellext/ntobjshex/CMakeLists.txt
@@ -15,9 +15,9 @@ include_directories(
 spec2def(ntobjshex.dll ntobjshex.spec)
 
 add_library(ntobjshex SHARED
-    ntobjns.cpp
+    ntobjenum.cpp
+    ntobjfolder.cpp
     ntobjshex.cpp
-    ntobjutil.cpp
     ntobjshex.rc
     regfolder.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/ntobjshex.def)
diff --git a/reactos/dll/shellext/ntobjshex/ntobjutil.cpp b/reactos/dll/shellext/ntobjshex/ntobjenum.cpp
similarity index 99%
rename from reactos/dll/shellext/ntobjshex/ntobjutil.cpp
rename to reactos/dll/shellext/ntobjshex/ntobjenum.cpp
index 7291127b1cc..094a24217cf 100644
--- a/reactos/dll/shellext/ntobjshex/ntobjutil.cpp
+++ b/reactos/dll/shellext/ntobjshex/ntobjenum.cpp
@@ -18,7 +18,7 @@
 
 #include <precomp.h>
 
-#include "ntobjutil.h"
+#include "ntobjenum.h"
 #include <strsafe.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(ntobjshex);
diff --git a/reactos/dll/shellext/ntobjshex/ntobjutil.h b/reactos/dll/shellext/ntobjshex/ntobjenum.h
similarity index 100%
rename from reactos/dll/shellext/ntobjshex/ntobjutil.h
rename to reactos/dll/shellext/ntobjshex/ntobjenum.h
diff --git a/reactos/dll/shellext/ntobjshex/ntobjns.cpp b/reactos/dll/shellext/ntobjshex/ntobjfolder.cpp
similarity index 99%
rename from reactos/dll/shellext/ntobjshex/ntobjns.cpp
rename to reactos/dll/shellext/ntobjshex/ntobjfolder.cpp
index 0da0fd4b7b0..0de8fe2fdf0 100644
--- a/reactos/dll/shellext/ntobjshex/ntobjns.cpp
+++ b/reactos/dll/shellext/ntobjshex/ntobjfolder.cpp
@@ -7,7 +7,7 @@
  */
 
 #include "precomp.h"
-#include "ntobjutil.h"
+#include "ntobjenum.h"
 #include <ntquery.h>
 #include "util.h"
 
diff --git a/reactos/dll/shellext/ntobjshex/ntobjns.h b/reactos/dll/shellext/ntobjshex/ntobjfolder.h
similarity index 100%
rename from reactos/dll/shellext/ntobjshex/ntobjns.h
rename to reactos/dll/shellext/ntobjshex/ntobjfolder.h
diff --git a/reactos/dll/shellext/ntobjshex/precomp.h b/reactos/dll/shellext/ntobjshex/precomp.h
index c1c55412f0e..207e943a097 100644
--- a/reactos/dll/shellext/ntobjshex/precomp.h
+++ b/reactos/dll/shellext/ntobjshex/precomp.h
@@ -46,5 +46,5 @@ extern HINSTANCE g_hInstance;
 DEFINE_GUID(CLSID_NtObjectFolder,
     0x845b0fb2, 0x66e0, 0x416b, 0x8f, 0x91, 0x31, 0x4e, 0x23, 0xf7, 0xc1, 0x2d);
 
-#include "ntobjns.h"
+#include "ntobjfolder.h"
 #include "regfolder.h"
diff --git a/reactos/dll/shellext/ntobjshex/regfolder.cpp b/reactos/dll/shellext/ntobjshex/regfolder.cpp
index 441c82ef813..46696100275 100644
--- a/reactos/dll/shellext/ntobjshex/regfolder.cpp
+++ b/reactos/dll/shellext/ntobjshex/regfolder.cpp
@@ -7,7 +7,7 @@
  */
 
 #include "precomp.h"
-#include "ntobjutil.h"
+#include "ntobjenum.h"
 #include <ntquery.h>
 #include "util.h"