diff --git a/stratosphere/sm/source/sm_dmnt_service.cpp b/stratosphere/sm/source/sm_dmnt_service.cpp
index 5cffbb0d4..6245c4dc7 100644
--- a/stratosphere/sm/source/sm_dmnt_service.cpp
+++ b/stratosphere/sm/source/sm_dmnt_service.cpp
@@ -20,7 +20,7 @@
 #include "sm_dmnt_service.hpp"
 #include "sm_service_manager.hpp"
 
-namespace sts { namespace sm {
+namespace sts::sm {
 
     Result DmntService::AtmosphereGetRecord(Out<ServiceRecord> record, ServiceName service) {
         return sm::GetServiceRecord(record.GetPointer(), service);
@@ -34,4 +34,4 @@ namespace sts { namespace sm {
         record_size.SetValue(sizeof(ServiceRecord));
     }
 
-}}
+}
diff --git a/stratosphere/sm/source/sm_dmnt_service.hpp b/stratosphere/sm/source/sm_dmnt_service.hpp
index 1a3b9ca47..419e4462d 100644
--- a/stratosphere/sm/source/sm_dmnt_service.hpp
+++ b/stratosphere/sm/source/sm_dmnt_service.hpp
@@ -19,7 +19,7 @@
 #include <stratosphere.hpp>
 #include "sm_types.hpp"
 
-namespace sts { namespace sm {
+namespace sts::sm {
 
     /* Command IDs. */
     enum DmntServiceCmd {
@@ -43,4 +43,4 @@ namespace sts { namespace sm {
             };
     };
 
-}}
+}
diff --git a/stratosphere/sm/source/sm_manager_service.cpp b/stratosphere/sm/source/sm_manager_service.cpp
index e132706dd..55bcb2f32 100644
--- a/stratosphere/sm/source/sm_manager_service.cpp
+++ b/stratosphere/sm/source/sm_manager_service.cpp
@@ -20,7 +20,7 @@
 #include "sm_manager_service.hpp"
 #include "sm_service_manager.hpp"
 
-namespace sts { namespace sm {
+namespace sts::sm {
 
     Result ManagerService::RegisterProcess(u64 pid, InBuffer<u8> acid_sac, InBuffer<u8> aci0_sac) {
         return sm::RegisterProcess(pid, acid_sac.buffer, acid_sac.num_elements, aci0_sac.buffer, aci0_sac.num_elements);
@@ -38,4 +38,4 @@ namespace sts { namespace sm {
         R_ASSERT(sm::HasMitm(out.GetPointer(), service));
     }
 
-}}
+}
diff --git a/stratosphere/sm/source/sm_manager_service.hpp b/stratosphere/sm/source/sm_manager_service.hpp
index c8d7f5763..49e344182 100644
--- a/stratosphere/sm/source/sm_manager_service.hpp
+++ b/stratosphere/sm/source/sm_manager_service.hpp
@@ -19,7 +19,7 @@
 #include <stratosphere.hpp>
 #include "sm_types.hpp"
 
-namespace sts { namespace sm {
+namespace sts::sm {
 
     /* Command IDs. */
     enum ManagerServiceCmd {
@@ -48,4 +48,4 @@ namespace sts { namespace sm {
             };
     };
 
-}}
+}
diff --git a/stratosphere/sm/source/sm_service_manager.cpp b/stratosphere/sm/source/sm_service_manager.cpp
index 8b633664b..d53c46955 100644
--- a/stratosphere/sm/source/sm_service_manager.cpp
+++ b/stratosphere/sm/source/sm_service_manager.cpp
@@ -19,7 +19,7 @@
 
 #include "sm_service_manager.hpp"
 
-namespace sts { namespace sm {
+namespace sts::sm {
 
     /* Anonymous namespace for implementation details. */
     namespace {
@@ -720,4 +720,4 @@ namespace sts { namespace sm {
         return ResultSuccess;
     }
 
-}}
+}
diff --git a/stratosphere/sm/source/sm_service_manager.hpp b/stratosphere/sm/source/sm_service_manager.hpp
index b4ac5e0b8..2eb729ab9 100644
--- a/stratosphere/sm/source/sm_service_manager.hpp
+++ b/stratosphere/sm/source/sm_service_manager.hpp
@@ -18,7 +18,7 @@
 #include <switch.h>
 #include "sm_types.hpp"
 
-namespace sts { namespace sm {
+namespace sts::sm {
 
     /* Initialization. */
     void InitializeRegistrationLists();
@@ -48,4 +48,4 @@ namespace sts { namespace sm {
     /* Deferral extension (works around FS bug). */
     Result EndInitialDefers();
 
-}}
+}
diff --git a/stratosphere/sm/source/sm_types.hpp b/stratosphere/sm/source/sm_types.hpp
index 9896e21a9..57b792d8a 100644
--- a/stratosphere/sm/source/sm_types.hpp
+++ b/stratosphere/sm/source/sm_types.hpp
@@ -17,7 +17,7 @@
 #pragma once
 #include <cstring>
 
-namespace sts { namespace sm {
+namespace sts::sm {
 
     struct ServiceName {
         static constexpr size_t MaxLength = 8;
@@ -68,4 +68,4 @@ namespace sts { namespace sm {
     /* For process validation. */
     static constexpr u64 InvalidProcessId = static_cast<u64>(-1ull);
 
-}}
+}
diff --git a/stratosphere/sm/source/sm_user_service.cpp b/stratosphere/sm/source/sm_user_service.cpp
index 1fcb0f017..49b4f4ce9 100644
--- a/stratosphere/sm/source/sm_user_service.cpp
+++ b/stratosphere/sm/source/sm_user_service.cpp
@@ -20,7 +20,7 @@
 #include "sm_user_service.hpp"
 #include "sm_service_manager.hpp"
 
-namespace sts { namespace sm {
+namespace sts::sm {
 
     Result UserService::Initialize(PidDescriptor pid) {
         this->pid = pid.pid;
@@ -70,4 +70,4 @@ namespace sts { namespace sm {
         return sm::AssociatePidTidForMitm(pid, tid);
     }
 
-}}
+}
diff --git a/stratosphere/sm/source/sm_user_service.hpp b/stratosphere/sm/source/sm_user_service.hpp
index a939e7561..a1a461856 100644
--- a/stratosphere/sm/source/sm_user_service.hpp
+++ b/stratosphere/sm/source/sm_user_service.hpp
@@ -19,7 +19,7 @@
 #include <stratosphere.hpp>
 #include "sm_types.hpp"
 
-namespace sts { namespace sm {
+namespace sts::sm {
 
     /* Command IDs. */
     enum UserServiceCmd {
@@ -67,4 +67,4 @@ namespace sts { namespace sm {
             };
     };
 
-}}
+}