diff --git a/dll/win32/shell32/autocomplete.cpp b/dll/win32/shell32/CAutoComplete.cpp
similarity index 100%
rename from dll/win32/shell32/autocomplete.cpp
rename to dll/win32/shell32/CAutoComplete.cpp
diff --git a/dll/win32/shell32/autocomplete.h b/dll/win32/shell32/CAutoComplete.h
similarity index 100%
rename from dll/win32/shell32/autocomplete.h
rename to dll/win32/shell32/CAutoComplete.h
diff --git a/dll/win32/shell32/shlview.cpp b/dll/win32/shell32/CDefView.cpp
similarity index 100%
rename from dll/win32/shell32/shlview.cpp
rename to dll/win32/shell32/CDefView.cpp
diff --git a/dll/win32/shell32/defcontextmenu.cpp b/dll/win32/shell32/CDefaultContextMenu.cpp
similarity index 100%
rename from dll/win32/shell32/defcontextmenu.cpp
rename to dll/win32/shell32/CDefaultContextMenu.cpp
diff --git a/dll/win32/shell32/desktop.cpp b/dll/win32/shell32/CDesktopBrowser.cpp
similarity index 100%
rename from dll/win32/shell32/desktop.cpp
rename to dll/win32/shell32/CDesktopBrowser.cpp
diff --git a/dll/win32/shell32/dragdrophelper.cpp b/dll/win32/shell32/CDropTargetHelper.cpp
similarity index 100%
rename from dll/win32/shell32/dragdrophelper.cpp
rename to dll/win32/shell32/CDropTargetHelper.cpp
diff --git a/dll/win32/shell32/dragdrophelper.h b/dll/win32/shell32/CDropTargetHelper.h
similarity index 100%
rename from dll/win32/shell32/dragdrophelper.h
rename to dll/win32/shell32/CDropTargetHelper.h
diff --git a/dll/win32/shell32/enumidlist.cpp b/dll/win32/shell32/CEnumIDListBase.cpp
similarity index 100%
rename from dll/win32/shell32/enumidlist.cpp
rename to dll/win32/shell32/CEnumIDListBase.cpp
diff --git a/dll/win32/shell32/enumidlist.h b/dll/win32/shell32/CEnumIDListBase.h
similarity index 100%
rename from dll/win32/shell32/enumidlist.h
rename to dll/win32/shell32/CEnumIDListBase.h
diff --git a/dll/win32/shell32/extracticon.cpp b/dll/win32/shell32/CExtractIcon.cpp
similarity index 100%
rename from dll/win32/shell32/extracticon.cpp
rename to dll/win32/shell32/CExtractIcon.cpp
diff --git a/dll/win32/shell32/shlfsbind.cpp b/dll/win32/shell32/CFileSysBindData.cpp
similarity index 100%
rename from dll/win32/shell32/shlfsbind.cpp
rename to dll/win32/shell32/CFileSysBindData.cpp
diff --git a/dll/win32/shell32/dataobject.cpp b/dll/win32/shell32/CIDLDataObj.cpp
similarity index 100%
rename from dll/win32/shell32/dataobject.cpp
rename to dll/win32/shell32/CIDLDataObj.cpp
diff --git a/dll/win32/shell32/CMakeLists.txt b/dll/win32/shell32/CMakeLists.txt
index 0536d811d3e..13fac9e15c3 100644
--- a/dll/win32/shell32/CMakeLists.txt
+++ b/dll/win32/shell32/CMakeLists.txt
@@ -16,55 +16,54 @@ include_directories(
     ${REACTOS_SOURCE_DIR})
 
 list(APPEND SOURCE
-    #authors.cpp
-    autocomplete.cpp
+    CAutoComplete.cpp
     brsfolder.cpp
     changenotify.cpp
     classes.cpp
     clipboard.cpp
     CMenuBand.cpp
     CMenuDeskBar.cpp
-    dataobject.cpp
+    CIDLDataObj.cpp
     dde.cpp
     debughlp.cpp
-    desktop.cpp
+    CDesktopBrowser.cpp
     dialogs/dialogs.cpp
     dialogs/drive.cpp
     dialogs/drvdefext.cpp
     dialogs/folder_options.cpp
     dialogs/filedefext.cpp
     dialogs/fprop.cpp
-    dragdrophelper.cpp
-    enumidlist.cpp
-    extracticon.cpp
+    CDropTargetHelper.cpp
+    CEnumIDListBase.cpp
+    CExtractIcon.cpp
     folders.cpp
     iconcache.cpp
     shell32.cpp
-    shellitem.cpp
-    shelllink.cpp
-    folders/desktop.cpp
-    folders/fs.cpp
-    folders/mycomp.cpp
-    folders/mydocuments.cpp
-    folders/printers.cpp
-    folders/admintools.cpp
-    folders/netplaces.cpp
-    folders/fonts.cpp
-    folders/cpanel.cpp
-    folders/recyclebin.cpp
+    CShellItem.cpp
+    CShellLink.cpp
+    folders/CDesktopFolder.cpp
+    folders/CFSFolder.cpp
+    folders/CDrivesFolder.cpp
+    folders/CMyDocsFolder.cpp
+    folders/CPrinterFolder.cpp
+    folders/CAdminToolsFolder.cpp
+    folders/CNetFolder.cpp
+    folders/CFontsFolder.cpp
+    folders/CControlPanelFolder.cpp
+    folders/CRecycleBin.cpp
     droptargets/CexeDropHandler.cpp
     shlexec.cpp
     shlfileop.cpp
     shlfolder.cpp
-    shlfsbind.cpp
+    CFileSysBindData.cpp
     shlmenu.cpp
-    shlview.cpp
+    CDefView.cpp
     stubs.cpp
     systray.cpp
-    defcontextmenu.cpp
-    openwithmenu.cpp
-    newmenu.cpp
-    startmenu.cpp
+    CDefaultContextMenu.cpp
+    COpenWithMenu.cpp
+    CNewMenu.cpp
+    CStartMenu.cpp
     precomp.h)
 
 add_library(shell32 SHARED
diff --git a/dll/win32/shell32/newmenu.cpp b/dll/win32/shell32/CNewMenu.cpp
similarity index 100%
rename from dll/win32/shell32/newmenu.cpp
rename to dll/win32/shell32/CNewMenu.cpp
diff --git a/dll/win32/shell32/newmenu.h b/dll/win32/shell32/CNewMenu.h
similarity index 100%
rename from dll/win32/shell32/newmenu.h
rename to dll/win32/shell32/CNewMenu.h
diff --git a/dll/win32/shell32/openwithmenu.cpp b/dll/win32/shell32/COpenWithMenu.cpp
similarity index 100%
rename from dll/win32/shell32/openwithmenu.cpp
rename to dll/win32/shell32/COpenWithMenu.cpp
diff --git a/dll/win32/shell32/openwithmenu.h b/dll/win32/shell32/COpenWithMenu.h
similarity index 100%
rename from dll/win32/shell32/openwithmenu.h
rename to dll/win32/shell32/COpenWithMenu.h
diff --git a/dll/win32/shell32/shellitem.cpp b/dll/win32/shell32/CShellItem.cpp
similarity index 100%
rename from dll/win32/shell32/shellitem.cpp
rename to dll/win32/shell32/CShellItem.cpp
diff --git a/dll/win32/shell32/shellitem.h b/dll/win32/shell32/CShellItem.h
similarity index 100%
rename from dll/win32/shell32/shellitem.h
rename to dll/win32/shell32/CShellItem.h
diff --git a/dll/win32/shell32/shelllink.cpp b/dll/win32/shell32/CShellLink.cpp
similarity index 100%
rename from dll/win32/shell32/shelllink.cpp
rename to dll/win32/shell32/CShellLink.cpp
diff --git a/dll/win32/shell32/shelllink.h b/dll/win32/shell32/CShellLink.h
similarity index 100%
rename from dll/win32/shell32/shelllink.h
rename to dll/win32/shell32/CShellLink.h
diff --git a/dll/win32/shell32/startmenu.cpp b/dll/win32/shell32/CStartMenu.cpp
similarity index 100%
rename from dll/win32/shell32/startmenu.cpp
rename to dll/win32/shell32/CStartMenu.cpp
diff --git a/dll/win32/shell32/startmenu.h b/dll/win32/shell32/CStartMenu.h
similarity index 100%
rename from dll/win32/shell32/startmenu.h
rename to dll/win32/shell32/CStartMenu.h
diff --git a/dll/win32/shell32/folders/admintools.cpp b/dll/win32/shell32/folders/CAdminToolsFolder.cpp
similarity index 100%
rename from dll/win32/shell32/folders/admintools.cpp
rename to dll/win32/shell32/folders/CAdminToolsFolder.cpp
diff --git a/dll/win32/shell32/folders/admintools.h b/dll/win32/shell32/folders/CAdminToolsFolder.h
similarity index 100%
rename from dll/win32/shell32/folders/admintools.h
rename to dll/win32/shell32/folders/CAdminToolsFolder.h
diff --git a/dll/win32/shell32/folders/cpanel.cpp b/dll/win32/shell32/folders/CControlPanelFolder.cpp
similarity index 100%
rename from dll/win32/shell32/folders/cpanel.cpp
rename to dll/win32/shell32/folders/CControlPanelFolder.cpp
diff --git a/dll/win32/shell32/folders/cpanel.h b/dll/win32/shell32/folders/CControlPanelFolder.h
similarity index 100%
rename from dll/win32/shell32/folders/cpanel.h
rename to dll/win32/shell32/folders/CControlPanelFolder.h
diff --git a/dll/win32/shell32/folders/desktop.cpp b/dll/win32/shell32/folders/CDesktopFolder.cpp
similarity index 100%
rename from dll/win32/shell32/folders/desktop.cpp
rename to dll/win32/shell32/folders/CDesktopFolder.cpp
diff --git a/dll/win32/shell32/folders/desktop.h b/dll/win32/shell32/folders/CDesktopFolder.h
similarity index 100%
rename from dll/win32/shell32/folders/desktop.h
rename to dll/win32/shell32/folders/CDesktopFolder.h
diff --git a/dll/win32/shell32/folders/mycomp.cpp b/dll/win32/shell32/folders/CDrivesFolder.cpp
similarity index 100%
rename from dll/win32/shell32/folders/mycomp.cpp
rename to dll/win32/shell32/folders/CDrivesFolder.cpp
diff --git a/dll/win32/shell32/folders/mycomp.h b/dll/win32/shell32/folders/CDrivesFolder.h
similarity index 100%
rename from dll/win32/shell32/folders/mycomp.h
rename to dll/win32/shell32/folders/CDrivesFolder.h
diff --git a/dll/win32/shell32/folders/fs.cpp b/dll/win32/shell32/folders/CFSFolder.cpp
similarity index 100%
rename from dll/win32/shell32/folders/fs.cpp
rename to dll/win32/shell32/folders/CFSFolder.cpp
diff --git a/dll/win32/shell32/folders/fs.h b/dll/win32/shell32/folders/CFSFolder.h
similarity index 100%
rename from dll/win32/shell32/folders/fs.h
rename to dll/win32/shell32/folders/CFSFolder.h
diff --git a/dll/win32/shell32/folders/fonts.cpp b/dll/win32/shell32/folders/CFontsFolder.cpp
similarity index 100%
rename from dll/win32/shell32/folders/fonts.cpp
rename to dll/win32/shell32/folders/CFontsFolder.cpp
diff --git a/dll/win32/shell32/folders/fonts.h b/dll/win32/shell32/folders/CFontsFolder.h
similarity index 100%
rename from dll/win32/shell32/folders/fonts.h
rename to dll/win32/shell32/folders/CFontsFolder.h
diff --git a/dll/win32/shell32/folders/mydocuments.cpp b/dll/win32/shell32/folders/CMyDocsFolder.cpp
similarity index 100%
rename from dll/win32/shell32/folders/mydocuments.cpp
rename to dll/win32/shell32/folders/CMyDocsFolder.cpp
diff --git a/dll/win32/shell32/folders/mydocuments.h b/dll/win32/shell32/folders/CMyDocsFolder.h
similarity index 100%
rename from dll/win32/shell32/folders/mydocuments.h
rename to dll/win32/shell32/folders/CMyDocsFolder.h
diff --git a/dll/win32/shell32/folders/netplaces.cpp b/dll/win32/shell32/folders/CNetFolder.cpp
similarity index 100%
rename from dll/win32/shell32/folders/netplaces.cpp
rename to dll/win32/shell32/folders/CNetFolder.cpp
diff --git a/dll/win32/shell32/folders/netplaces.h b/dll/win32/shell32/folders/CNetFolder.h
similarity index 100%
rename from dll/win32/shell32/folders/netplaces.h
rename to dll/win32/shell32/folders/CNetFolder.h
diff --git a/dll/win32/shell32/folders/printers.cpp b/dll/win32/shell32/folders/CPrinterFolder.cpp
similarity index 100%
rename from dll/win32/shell32/folders/printers.cpp
rename to dll/win32/shell32/folders/CPrinterFolder.cpp
diff --git a/dll/win32/shell32/folders/printers.h b/dll/win32/shell32/folders/CPrinterFolder.h
similarity index 100%
rename from dll/win32/shell32/folders/printers.h
rename to dll/win32/shell32/folders/CPrinterFolder.h
diff --git a/dll/win32/shell32/folders/recyclebin.cpp b/dll/win32/shell32/folders/CRecycleBin.cpp
similarity index 100%
rename from dll/win32/shell32/folders/recyclebin.cpp
rename to dll/win32/shell32/folders/CRecycleBin.cpp
diff --git a/dll/win32/shell32/folders/recyclebin.h b/dll/win32/shell32/folders/CRecycleBin.h
similarity index 100%
rename from dll/win32/shell32/folders/recyclebin.h
rename to dll/win32/shell32/folders/CRecycleBin.h
diff --git a/dll/win32/shell32/precomp.h b/dll/win32/shell32/precomp.h
index 1a3f02e75b3..0e67b5acff1 100644
--- a/dll/win32/shell32/precomp.h
+++ b/dll/win32/shell32/precomp.h
@@ -40,27 +40,27 @@
 #include "wine/shell32_main.h"
 #include "shresdef.h"
 #include "cpanel.h"
-#include "enumidlist.h"
+#include "CEnumIDListBase.h"
 #include "shfldr.h"
 #include "shellfolder.h"
-#include "shellitem.h"
-#include "shelllink.h"
-#include "dragdrophelper.h"
-#include "autocomplete.h"
-#include "folders/fs.h"
-#include "folders/mycomp.h"
-#include "folders/desktop.h"
-#include "folders/cpanel.h"
-#include "folders/mydocuments.h"
-#include "folders/netplaces.h"
-#include "folders/fonts.h"
-#include "folders/printers.h"
-#include "folders/admintools.h"
-#include "folders/recyclebin.h"
+#include "CShellItem.h"
+#include "CShellLink.h"
+#include "CDropTargetHelper.h"
+#include "CAutoComplete.h"
+#include "folders/CFSFolder.h"
+#include "folders/CDrivesFolder.h"
+#include "folders/CDesktopFolder.h"
+#include "folders/CControlPanelFolder.h"
+#include "folders/CMyDocsFolder.h"
+#include "folders/CNetFolder.h"
+#include "folders/CFontsFolder.h"
+#include "folders/CPrinterFolder.h"
+#include "folders/CAdminToolsFolder.h"
+#include "folders/CRecycleBin.h"
 #include "droptargets/CexeDropHandler.h"
-#include "openwithmenu.h"
-#include "newmenu.h"
-#include "startmenu.h"
+#include "COpenWithMenu.h"
+#include "CNewMenu.h"
+#include "CStartMenu.h"
 #include "filedefext.h"
 #include "drvdefext.h"
 #include "CMenuBand.h"