diff --git a/dll/shellext/netshell/README b/dll/shellext/netshell/README
index d0fc735594d..ea4315108d2 100644
--- a/dll/shellext/netshell/README
+++ b/dll/shellext/netshell/README
@@ -60,7 +60,7 @@ reimplement these stubs alongside all its unimplemented interfaces and objects,
 the system netshell with ours (INetConnectionManager and IEnumNetConnection are only the tip
 of the iceberg).
 However it is perfectly fine if one copies our netshell in a different folder and change the
-registry settings to make it handle CLSID_ConnectionFolder, CLSID_LanConnectionUi and CLSID_ConnectionTray.
+registry settings to make it handle CLSID_NetworkConnections, CLSID_LanConnectionUi and CLSID_ConnectionTray.
 When doing so there are actually two options about how to test. One is leaving #define USE_CUSTOM_CONMGR 1
 as is and the other is setting is to 0. What this does is that when 0, the connections will be enumerated
 in the shell folder and the tray using the system's INetConnectionManager (which resides in the system's
diff --git a/dll/shellext/netshell/netshell.cpp b/dll/shellext/netshell/netshell.cpp
index 17ef8e747b5..abdf8af9bd7 100644
--- a/dll/shellext/netshell/netshell.cpp
+++ b/dll/shellext/netshell/netshell.cpp
@@ -17,7 +17,7 @@ public:
 };
 
 BEGIN_OBJECT_MAP(ObjectMap)
-    OBJECT_ENTRY(CLSID_ConnectionFolder, CNetworkConnections)
+    OBJECT_ENTRY(CLSID_NetworkConnections, CNetworkConnections)
     OBJECT_ENTRY(CLSID_ConnectionManager, CNetConnectionManager)
     OBJECT_ENTRY(CLSID_LanConnectionUi, CNetConnectionPropertyUi)
     OBJECT_ENTRY(CLSID_ConnectionTray, CLanStatus)
diff --git a/dll/shellext/netshell/shfldr_netconnect.cpp b/dll/shellext/netshell/shfldr_netconnect.cpp
index dca42527e7a..3c14b9672e9 100644
--- a/dll/shellext/netshell/shfldr_netconnect.cpp
+++ b/dll/shellext/netshell/shfldr_netconnect.cpp
@@ -797,7 +797,7 @@ HRESULT WINAPI CNetworkConnections::GetClassID(CLSID *lpClassId)
     if (!lpClassId)
         return E_POINTER;
 
-    *lpClassId = CLSID_ConnectionFolder;
+    *lpClassId = CLSID_NetworkConnections;
 
     return S_OK;
 }
diff --git a/dll/shellext/netshell/shfldr_netconnect.h b/dll/shellext/netshell/shfldr_netconnect.h
index c96fbb7d519..4e081739020 100644
--- a/dll/shellext/netshell/shfldr_netconnect.h
+++ b/dll/shellext/netshell/shfldr_netconnect.h
@@ -8,7 +8,7 @@ typedef struct {
 } shvheader;
 
 class CNetworkConnections:
-    public CComCoClass<CNetworkConnections, &CLSID_ConnectionFolder>,
+    public CComCoClass<CNetworkConnections, &CLSID_NetworkConnections>,
     public CComObjectRootEx<CComMultiThreadModelNoCS>,
     public IPersistFolder2,
     public IShellExtInit,
diff --git a/dll/win32/shell32/folders/CRegFolder.cpp b/dll/win32/shell32/folders/CRegFolder.cpp
index b983b5496a2..ece1845838d 100644
--- a/dll/win32/shell32/folders/CRegFolder.cpp
+++ b/dll/win32/shell32/folders/CRegFolder.cpp
@@ -412,7 +412,7 @@ BOOL CRegFolder::_IsInNameSpace(_In_ LPCITEMIDLIST pidl)
     CLSID clsid = *_ILGetGUIDPointer(pidl);
     if (IsEqualGUID(clsid, CLSID_Printers))
         return TRUE;
-    if (IsEqualGUID(clsid, CLSID_ConnectionFolder))
+    if (IsEqualGUID(clsid, CLSID_NetworkConnections))
         return TRUE;
     FIXME("Check registry\n");
     return TRUE;
diff --git a/modules/rostests/apitests/com/netshell.c b/modules/rostests/apitests/com/netshell.c
index 2562d5e46d2..3d107a54d9a 100644
--- a/modules/rostests/apitests/com/netshell.c
+++ b/modules/rostests/apitests/com/netshell.c
@@ -20,7 +20,7 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] =
         L"Both"
     },
     {
-        ID_NAME(CLSID_ConnectionFolder),
+        ID_NAME(CLSID_NetworkConnections),
         {
             {    0x0,   &IID_IPersistFolder2 },
             {    0x0,       &IID_IPersistFolder },