diff --git a/reactos/base/system/CMakeLists.txt b/reactos/base/system/CMakeLists.txt
index 3c338810096..e92a5066749 100644
--- a/reactos/base/system/CMakeLists.txt
+++ b/reactos/base/system/CMakeLists.txt
@@ -10,7 +10,7 @@ add_subdirectory(regsvr32)
 add_subdirectory(rundll32)
 add_subdirectory(runonce)
 add_subdirectory(services)
-add_subdirectory(smss2)
+add_subdirectory(smss)
 add_subdirectory(subst)
 add_subdirectory(userinit)
 add_subdirectory(winlogon)
diff --git a/reactos/base/system/smss2/CMakeLists.txt b/reactos/base/system/smss/CMakeLists.txt
similarity index 100%
rename from reactos/base/system/smss2/CMakeLists.txt
rename to reactos/base/system/smss/CMakeLists.txt
diff --git a/reactos/base/system/smss2/crashdmp.c b/reactos/base/system/smss/crashdmp.c
similarity index 100%
rename from reactos/base/system/smss2/crashdmp.c
rename to reactos/base/system/smss/crashdmp.c
diff --git a/reactos/base/system/smss2/pagefile.c b/reactos/base/system/smss/pagefile.c
similarity index 100%
rename from reactos/base/system/smss2/pagefile.c
rename to reactos/base/system/smss/pagefile.c
diff --git a/reactos/base/system/smss2/sminit.c b/reactos/base/system/smss/sminit.c
similarity index 100%
rename from reactos/base/system/smss2/sminit.c
rename to reactos/base/system/smss/sminit.c
diff --git a/reactos/base/system/smss2/smloop.c b/reactos/base/system/smss/smloop.c
similarity index 100%
rename from reactos/base/system/smss2/smloop.c
rename to reactos/base/system/smss/smloop.c
diff --git a/reactos/base/system/smss2/smsbapi.c b/reactos/base/system/smss/smsbapi.c
similarity index 100%
rename from reactos/base/system/smss2/smsbapi.c
rename to reactos/base/system/smss/smsbapi.c
diff --git a/reactos/base/system/smss2/smsessn.c b/reactos/base/system/smss/smsessn.c
similarity index 100%
rename from reactos/base/system/smss2/smsessn.c
rename to reactos/base/system/smss/smsessn.c
diff --git a/reactos/base/system/smss2/smss.c b/reactos/base/system/smss/smss.c
similarity index 100%
rename from reactos/base/system/smss2/smss.c
rename to reactos/base/system/smss/smss.c
diff --git a/reactos/base/system/smss2/smss.h b/reactos/base/system/smss/smss.h
similarity index 100%
rename from reactos/base/system/smss2/smss.h
rename to reactos/base/system/smss/smss.h
diff --git a/reactos/base/system/smss2/smss.rc b/reactos/base/system/smss/smss.rc
similarity index 100%
rename from reactos/base/system/smss2/smss.rc
rename to reactos/base/system/smss/smss.rc
diff --git a/reactos/base/system/smss2/smsubsys.c b/reactos/base/system/smss/smsubsys.c
similarity index 100%
rename from reactos/base/system/smss2/smsubsys.c
rename to reactos/base/system/smss/smsubsys.c
diff --git a/reactos/base/system/smss2/smutil.c b/reactos/base/system/smss/smutil.c
similarity index 100%
rename from reactos/base/system/smss2/smutil.c
rename to reactos/base/system/smss/smutil.c