diff --git a/Ryujinx.Core/OsHle/Services/Am/ISelfController.cs b/Ryujinx.Core/OsHle/Services/Am/ISelfController.cs
index 28047159f5..bf928f79e0 100644
--- a/Ryujinx.Core/OsHle/Services/Am/ISelfController.cs
+++ b/Ryujinx.Core/OsHle/Services/Am/ISelfController.cs
@@ -13,7 +13,7 @@ namespace Ryujinx.Core.OsHle.Services.Am
         {
             m_Commands = new Dictionary<int, ServiceProcessRequest>()
             {
-                { 1,  Exit                                  },
+                { 1,  LockExit                              },
                 { 10, SetScreenShotPermission               },
                 { 11, SetOperationModeChangedNotification   },
                 { 12, SetPerformanceModeChangedNotification },
@@ -23,7 +23,7 @@ namespace Ryujinx.Core.OsHle.Services.Am
             };
         }
 
-        public long Exit(ServiceCtx Context)
+        public long LockExit(ServiceCtx Context)
         {
             return 0;
         }
diff --git a/Ryujinx.Core/OsHle/Services/Aud/ServiceAudOut.cs b/Ryujinx.Core/OsHle/Services/Aud/IAudioOutManager.cs
similarity index 97%
rename from Ryujinx.Core/OsHle/Services/Aud/ServiceAudOut.cs
rename to Ryujinx.Core/OsHle/Services/Aud/IAudioOutManager.cs
index dd362c1565..986b5c1eee 100644
--- a/Ryujinx.Core/OsHle/Services/Aud/ServiceAudOut.cs
+++ b/Ryujinx.Core/OsHle/Services/Aud/IAudioOutManager.cs
@@ -7,13 +7,13 @@ using System.Text;
 
 namespace Ryujinx.Core.OsHle.Services.Aud
 {
-    class ServiceAudOut : IpcService
+    class IAudioOutManager : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> m_Commands;
 
         public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
 
-        public ServiceAudOut()
+        public IAudioOutManager()
         {
             m_Commands = new Dictionary<int, ServiceProcessRequest>()
             {
diff --git a/Ryujinx.Core/OsHle/Services/Aud/ServiceAudRen.cs b/Ryujinx.Core/OsHle/Services/Aud/IAudioRendererManager.cs
similarity index 95%
rename from Ryujinx.Core/OsHle/Services/Aud/ServiceAudRen.cs
rename to Ryujinx.Core/OsHle/Services/Aud/IAudioRendererManager.cs
index 245d85d8b4..fcf084a964 100644
--- a/Ryujinx.Core/OsHle/Services/Aud/ServiceAudRen.cs
+++ b/Ryujinx.Core/OsHle/Services/Aud/IAudioRendererManager.cs
@@ -3,13 +3,13 @@ using System.Collections.Generic;
 
 namespace Ryujinx.Core.OsHle.Services.Aud
 {
-    class ServiceAudRen : IpcService
+    class IAudioRendererManager : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> m_Commands;
 
         public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
 
-        public ServiceAudRen()
+        public IAudioRendererManager()
         {
             m_Commands = new Dictionary<int, ServiceProcessRequest>()
             {
diff --git a/Ryujinx.Core/OsHle/Services/ServiceFactory.cs b/Ryujinx.Core/OsHle/Services/ServiceFactory.cs
index e001a3b06d..427b239b13 100644
--- a/Ryujinx.Core/OsHle/Services/ServiceFactory.cs
+++ b/Ryujinx.Core/OsHle/Services/ServiceFactory.cs
@@ -44,10 +44,10 @@ namespace Ryujinx.Core.OsHle.Services
                     return new ServiceAppletOE();
 
                 case "audout:u":
-                    return new ServiceAudOut();
+                    return new IAudioOutManager();
 
                 case "audren:u":
-                    return new ServiceAudRen();
+                    return new IAudioRendererManager();
 
                 case "bsd:s":
                     return new ServiceBsd();