38 files changed, 40 insertions, 40 deletions
diff --git a/Ryujinx.HLE/HOS/Services/Btm/BtmUser/IBtmUserCore.cs b/Ryujinx.HLE/HOS/Services/BluetoothManager/BtmUser/IBtmUserCore.cs
index 0ab9a3ef..47fdb88f 100644
--- a/Ryujinx.HLE/HOS/Services/Btm/BtmUser/IBtmUserCore.cs
+++ b/Ryujinx.HLE/HOS/Services/BluetoothManager/BtmUser/IBtmUserCore.cs
@@ -3,7 +3,7 @@ using Ryujinx.HLE.HOS.Ipc;
 using Ryujinx.HLE.HOS.Kernel.Common;
 using Ryujinx.HLE.HOS.Kernel.Threading;
 
-namespace Ryujinx.HLE.HOS.Services.Btm.BtmUser
+namespace Ryujinx.HLE.HOS.Services.BluetoothManager.BtmUser
 {
     class IBtmUserCore : IpcService
     {
diff --git a/Ryujinx.HLE/HOS/Services/Btm/IBtm.cs b/Ryujinx.HLE/HOS/Services/BluetoothManager/IBtm.cs
index 947fee14..48a273a0 100644
--- a/Ryujinx.HLE/HOS/Services/Btm/IBtm.cs
+++ b/Ryujinx.HLE/HOS/Services/BluetoothManager/IBtm.cs
@@ -1,4 +1,4 @@
-namespace Ryujinx.HLE.HOS.Services.Btm
+namespace Ryujinx.HLE.HOS.Services.BluetoothManager
 {
     [Service("btm")]
     class IBtm : IpcService
diff --git a/Ryujinx.HLE/HOS/Services/Btm/IBtmDebug.cs b/Ryujinx.HLE/HOS/Services/BluetoothManager/IBtmDebug.cs
index a55b7da8..259698af 100644
--- a/Ryujinx.HLE/HOS/Services/Btm/IBtmDebug.cs
+++ b/Ryujinx.HLE/HOS/Services/BluetoothManager/IBtmDebug.cs
@@ -1,4 +1,4 @@
-namespace Ryujinx.HLE.HOS.Services.Btm
+namespace Ryujinx.HLE.HOS.Services.BluetoothManager
 {
     [Service("btm:dbg")]
     class IBtmDebug : IpcService
diff --git a/Ryujinx.HLE/HOS/Services/Btm/IBtmSystem.cs b/Ryujinx.HLE/HOS/Services/BluetoothManager/IBtmSystem.cs
index 9120762c..c4210b78 100644
--- a/Ryujinx.HLE/HOS/Services/Btm/IBtmSystem.cs
+++ b/Ryujinx.HLE/HOS/Services/BluetoothManager/IBtmSystem.cs
@@ -1,4 +1,4 @@
-namespace Ryujinx.HLE.HOS.Services.Btm
+namespace Ryujinx.HLE.HOS.Services.BluetoothManager
 {
     [Service("btm:sys")]
     class IBtmSystem : IpcService
diff --git a/Ryujinx.HLE/HOS/Services/Btm/IBtmUser.cs b/Ryujinx.HLE/HOS/Services/BluetoothManager/IBtmUser.cs
index 68694187..b704b51c 100644
--- a/Ryujinx.HLE/HOS/Services/Btm/IBtmUser.cs
+++ b/Ryujinx.HLE/HOS/Services/BluetoothManager/IBtmUser.cs
@@ -1,6 +1,6 @@
-using Ryujinx.HLE.HOS.Services.Btm.BtmUser;
+using Ryujinx.HLE.HOS.Services.BluetoothManager.BtmUser;
 
-namespace Ryujinx.HLE.HOS.Services.Btm
+namespace Ryujinx.HLE.HOS.Services.BluetoothManager
 {
     [Service("btm:u")] // 5.0.0+
     class IBtmUser : IpcService
diff --git a/Ryujinx.HLE/HOS/Services/Btm/ResultCode.cs b/Ryujinx.HLE/HOS/Services/BluetoothManager/ResultCode.cs
index b222fdc8..0ad2c485 100644
--- a/Ryujinx.HLE/HOS/Services/Btm/ResultCode.cs
+++ b/Ryujinx.HLE/HOS/Services/BluetoothManager/ResultCode.cs
@@ -1,4 +1,4 @@
-namespace Ryujinx.HLE.HOS.Services.Btm
+namespace Ryujinx.HLE.HOS.Services.BluetoothManager
 {
     enum ResultCode
     {
diff --git a/Ryujinx.HLE/HOS/Services/Ldr/IDebugMonitorInterface.cs b/Ryujinx.HLE/HOS/Services/Loader/IDebugMonitorInterface.cs
index d87234da..82b24a35 100644
--- a/Ryujinx.HLE/HOS/Services/Ldr/IDebugMonitorInterface.cs
+++ b/Ryujinx.HLE/HOS/Services/Loader/IDebugMonitorInterface.cs
@@ -1,4 +1,4 @@
-namespace Ryujinx.HLE.HOS.Services.Ldr
+namespace Ryujinx.HLE.HOS.Services.Loader
 {
     [Service("ldr:dmnt")]
     class IDebugMonitorInterface : IpcService
diff --git a/Ryujinx.HLE/HOS/Services/Ldr/IProcessManagerInterface.cs b/Ryujinx.HLE/HOS/Services/Loader/IProcessManagerInterface.cs
index 9f5b5e35..2ecde2ad 100644
--- a/Ryujinx.HLE/HOS/Services/Ldr/IProcessManagerInterface.cs
+++ b/Ryujinx.HLE/HOS/Services/Loader/IProcessManagerInterface.cs
@@ -1,4 +1,4 @@
-namespace Ryujinx.HLE.HOS.Services.Ldr
+namespace Ryujinx.HLE.HOS.Services.Loader
 {
     [Service("ldr:pm")]
     class IProcessManagerInterface : IpcService
diff --git a/Ryujinx.HLE/HOS/Services/Ldr/IRoInterface.cs b/Ryujinx.HLE/HOS/Services/Loader/IRoInterface.cs
index b5ef0f07..3d58594b 100644
--- a/Ryujinx.HLE/HOS/Services/Ldr/IRoInterface.cs
+++ b/Ryujinx.HLE/HOS/Services/Loader/IRoInterface.cs
@@ -10,7 +10,7 @@ using System.IO;
 using System.Linq;
 using System.Security.Cryptography;
 
-namespace Ryujinx.HLE.HOS.Services.Ldr
+namespace Ryujinx.HLE.HOS.Services.Loader
 {
     [Service("ldr:ro")]
     [Service("ro:1")] // 7.0.0+
diff --git a/Ryujinx.HLE/HOS/Services/Ldr/IShellInterface.cs b/Ryujinx.HLE/HOS/Services/Loader/IShellInterface.cs
index 856aec52..362f82f0 100644
--- a/Ryujinx.HLE/HOS/Services/Ldr/IShellInterface.cs
+++ b/Ryujinx.HLE/HOS/Services/Loader/IShellInterface.cs
@@ -1,4 +1,4 @@
-namespace Ryujinx.HLE.HOS.Services.Ldr
+namespace Ryujinx.HLE.HOS.Services.Loader
 {
     [Service("ldr:shel")]
     class IShellInterface : IpcService
diff --git a/Ryujinx.HLE/HOS/Services/Ldr/ResultCode.cs b/Ryujinx.HLE/HOS/Services/Loader/ResultCode.cs
index 8bef26b5..4746ecc5 100644
--- a/Ryujinx.HLE/HOS/Services/Ldr/ResultCode.cs
+++ b/Ryujinx.HLE/HOS/Services/Loader/ResultCode.cs
@@ -1,4 +1,4 @@
-namespace Ryujinx.HLE.HOS.Services.Ldr
+namespace Ryujinx.HLE.HOS.Services.Loader
 {
     enum ResultCode
     {
diff --git a/Ryujinx.HLE/HOS/Services/Ldr/Types/NroInfo.cs b/Ryujinx.HLE/HOS/Services/Loader/Types/NroInfo.cs
index c65d5413..a71d4c08 100644
--- a/Ryujinx.HLE/HOS/Services/Ldr/Types/NroInfo.cs
+++ b/Ryujinx.HLE/HOS/Services/Loader/Types/NroInfo.cs
@@ -1,6 +1,6 @@
 using Ryujinx.HLE.Loaders.Executables;
 
-namespace Ryujinx.HLE.HOS.Services.Ldr
+namespace Ryujinx.HLE.HOS.Services.Loader
 {
     class NroInfo
     {
diff --git a/Ryujinx.HLE/HOS/Services/Ldr/Types/NrrHeader.cs b/Ryujinx.HLE/HOS/Services/Loader/Types/NrrHeader.cs
index a0764d1f..15217196 100644
--- a/Ryujinx.HLE/HOS/Services/Ldr/Types/NrrHeader.cs
+++ b/Ryujinx.HLE/HOS/Services/Loader/Types/NrrHeader.cs
@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace Ryujinx.HLE.HOS.Services.Ldr
+namespace Ryujinx.HLE.HOS.Services.Loader
 {
     [StructLayout(LayoutKind.Explicit, Size = 0x350)]
     unsafe struct NrrHeader
diff --git a/Ryujinx.HLE/HOS/Services/Ldr/Types/NrrInfo.cs b/Ryujinx.HLE/HOS/Services/Loader/Types/NrrInfo.cs
index 3636ce33..2c60360a 100644
--- a/Ryujinx.HLE/HOS/Services/Ldr/Types/NrrInfo.cs
+++ b/Ryujinx.HLE/HOS/Services/Loader/Types/NrrInfo.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Ryujinx.HLE.HOS.Services.Ldr
+namespace Ryujinx.HLE.HOS.Services.Loader
 {
     class NrrInfo
     {
diff --git a/Ryujinx.HLE/HOS/Services/Nim/IShopServiceAccessSystemInterface.cs b/Ryujinx.HLE/HOS/Services/Nim/IShopServiceAccessSystemInterface.cs
index ab7bcaca..bf201b98 100644
--- a/Ryujinx.HLE/HOS/Services/Nim/IShopServiceAccessSystemInterface.cs
+++ b/Ryujinx.HLE/HOS/Services/Nim/IShopServiceAccessSystemInterface.cs
@@ -1,4 +1,4 @@
-namespace Ryujinx.HLE.HOS.Services.Ldr
+namespace Ryujinx.HLE.HOS.Services.Nim
 {
     [Service("nim:ecas")] // 7.0.0+
     class IShopServiceAccessSystemInterface : IpcService
diff --git a/Ryujinx.HLE/HOS/Services/Android/NvFlinger.cs b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/NvFlinger.cs
index 63df78e5..e3e4a1a4 100644
--- a/Ryujinx.HLE/HOS/Services/Android/NvFlinger.cs
+++ b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/NvFlinger.cs
@@ -11,9 +11,9 @@ using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading;
 
-using static Ryujinx.HLE.HOS.Services.Android.Parcel;
+using static Ryujinx.HLE.HOS.Services.SurfaceFlinger.Parcel;
 
-namespace Ryujinx.HLE.HOS.Services.Android
+namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
 {
     class NvFlinger : IDisposable
     {
diff --git a/Ryujinx.HLE/HOS/Services/Android/Parcel.cs b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Parcel.cs
index 63c5a82f..f5d93423 100644
--- a/Ryujinx.HLE/HOS/Services/Android/Parcel.cs
+++ b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Parcel.cs
@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 
-namespace Ryujinx.HLE.HOS.Services.Android
+namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
 {
     static class Parcel
     {
diff --git a/Ryujinx.HLE/HOS/Services/Android/Types/BufferEntry.cs b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/BufferEntry.cs
index 91744859..cc4e07d9 100644
--- a/Ryujinx.HLE/HOS/Services/Android/Types/BufferEntry.cs
+++ b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/BufferEntry.cs
@@ -1,4 +1,4 @@
-namespace Ryujinx.HLE.HOS.Services.Android
+namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
 {
     struct BufferEntry
     {
diff --git a/Ryujinx.HLE/HOS/Services/Android/Types/BufferState.cs b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/BufferState.cs
index e79d5d8f..673da860 100644
--- a/Ryujinx.HLE/HOS/Services/Android/Types/BufferState.cs
+++ b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/BufferState.cs
@@ -1,4 +1,4 @@
-namespace Ryujinx.HLE.HOS.Services.Android
+namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
 {
     enum BufferState
     {
diff --git a/Ryujinx.HLE/HOS/Services/Android/Types/Color/ColorBytePerPixel.cs b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Color/ColorBytePerPixel.cs
index a937f15f..b47d35b4 100644
--- a/Ryujinx.HLE/HOS/Services/Android/Types/Color/ColorBytePerPixel.cs
+++ b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Color/ColorBytePerPixel.cs
@@ -1,4 +1,4 @@
-namespace Ryujinx.HLE.HOS.Services.Android
+namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
 {
     enum ColorBytePerPixel
     {
diff --git a/Ryujinx.HLE/HOS/Services/Android/Types/Color/ColorComponent.cs b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Color/ColorComponent.cs
index 7ea20df7..e9669f12 100644
--- a/Ryujinx.HLE/HOS/Services/Android/Types/Color/ColorComponent.cs
+++ b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Color/ColorComponent.cs
@@ -1,4 +1,4 @@
-namespace Ryujinx.HLE.HOS.Services.Android
+namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
 {
     enum ColorComponent : uint
     {
diff --git a/Ryujinx.HLE/HOS/Services/Android/Types/Color/ColorDataType.cs b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Color/ColorDataType.cs
index c380cb1b..cfa3b018 100644
--- a/Ryujinx.HLE/HOS/Services/Android/Types/Color/ColorDataType.cs
+++ b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Color/ColorDataType.cs
@@ -1,4 +1,4 @@
-namespace Ryujinx.HLE.HOS.Services.Android
+namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
 {
     enum ColorDataType
     {
diff --git a/Ryujinx.HLE/HOS/Services/Android/Types/Color/ColorFormat.cs b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Color/ColorFormat.cs
index 1aed4d58..227d648a 100644
--- a/Ryujinx.HLE/HOS/Services/Android/Types/Color/ColorFormat.cs
+++ b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Color/ColorFormat.cs
@@ -1,4 +1,4 @@
-namespace Ryujinx.HLE.HOS.Services.Android
+namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
 {
     enum ColorFormat : ulong
     {
diff --git a/Ryujinx.HLE/HOS/Services/Android/Types/Color/ColorShift.cs b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Color/ColorShift.cs
index 827e0445..3ad216a8 100644
--- a/Ryujinx.HLE/HOS/Services/Android/Types/Color/ColorShift.cs
+++ b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Color/ColorShift.cs
@@ -1,4 +1,4 @@
-namespace Ryujinx.HLE.HOS.Services.Android
+namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
 {
     class ColorShift
     {
diff --git a/Ryujinx.HLE/HOS/Services/Android/Types/Color/ColorSpace.cs b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Color/ColorSpace.cs
index 6ee6f428..9003a00b 100644
--- a/Ryujinx.HLE/HOS/Services/Android/Types/Color/ColorSpace.cs
+++ b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Color/ColorSpace.cs
@@ -1,4 +1,4 @@
-namespace Ryujinx.HLE.HOS.Services.Android
+namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
 {
     enum ColorSpace : ulong
     {
diff --git a/Ryujinx.HLE/HOS/Services/Android/Types/Color/ColorSwizzle.cs b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Color/ColorSwizzle.cs
index f82d5a56..4c1370c7 100644
--- a/Ryujinx.HLE/HOS/Services/Android/Types/Color/ColorSwizzle.cs
+++ b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Color/ColorSwizzle.cs
@@ -1,4 +1,4 @@
-namespace Ryujinx.HLE.HOS.Services.Android
+namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
 {
     enum ColorSwizzle
     {
diff --git a/Ryujinx.HLE/HOS/Services/Android/Types/Fence.cs b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Fence.cs
index a09b7948..356a1232 100644
--- a/Ryujinx.HLE/HOS/Services/Android/Types/Fence.cs
+++ b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Fence.cs
@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace Ryujinx.HLE.HOS.Services.Android
+namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
 {
     [StructLayout(LayoutKind.Sequential, Size = 0x8)]
     struct Fence
diff --git a/Ryujinx.HLE/HOS/Services/Android/Types/GbpBuffer.cs b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/GbpBuffer.cs
index 766806f0..b93947fd 100644
--- a/Ryujinx.HLE/HOS/Services/Android/Types/GbpBuffer.cs
+++ b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/GbpBuffer.cs
@@ -3,7 +3,7 @@ using System;
 using System.IO;
 using System.Runtime.InteropServices;
 
-namespace Ryujinx.HLE.HOS.Services.Android
+namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
 {
     struct GbpBuffer
     {
diff --git a/Ryujinx.HLE/HOS/Services/Android/Types/GraphicBufferHeader.cs b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/GraphicBufferHeader.cs
index d82523db..fae0002f 100644
--- a/Ryujinx.HLE/HOS/Services/Android/Types/GraphicBufferHeader.cs
+++ b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/GraphicBufferHeader.cs
@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace Ryujinx.HLE.HOS.Services.Android
+namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
 {
     [StructLayout(LayoutKind.Sequential, Size = 0x28)]
     struct GraphicBufferHeader
diff --git a/Ryujinx.HLE/HOS/Services/Android/Types/HalTransform.cs b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/HalTransform.cs
index fd271063..a1efed0b 100644
--- a/Ryujinx.HLE/HOS/Services/Android/Types/HalTransform.cs
+++ b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/HalTransform.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Ryujinx.HLE.HOS.Services.Android
+namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
 {
     [Flags]
     enum HalTransform
diff --git a/Ryujinx.HLE/HOS/Services/Android/Types/MultiFence.cs b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/MultiFence.cs
index a50eea89..97ad3e20 100644
--- a/Ryujinx.HLE/HOS/Services/Android/Types/MultiFence.cs
+++ b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/MultiFence.cs
@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace Ryujinx.HLE.HOS.Services.Android
+namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
 {
     [StructLayout(LayoutKind.Explicit, Size = 0x24)]
     struct MultiFence
diff --git a/Ryujinx.HLE/HOS/Services/Android/Types/NvGraphicBuffer.cs b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/NvGraphicBuffer.cs
index 90c44997..9a52245c 100644
--- a/Ryujinx.HLE/HOS/Services/Android/Types/NvGraphicBuffer.cs
+++ b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/NvGraphicBuffer.cs
@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace Ryujinx.HLE.HOS.Services.Android
+namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
 {
     [StructLayout(LayoutKind.Explicit, Size = 0x144)]
     struct NvGraphicBuffer
diff --git a/Ryujinx.HLE/HOS/Services/Android/Types/NvGraphicBufferSurface.cs b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/NvGraphicBufferSurface.cs
index d5dd682c..e084bc73 100644
--- a/Ryujinx.HLE/HOS/Services/Android/Types/NvGraphicBufferSurface.cs
+++ b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/NvGraphicBufferSurface.cs
@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace Ryujinx.HLE.HOS.Services.Android
+namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
 {
     [StructLayout(LayoutKind.Explicit, Size = 0x58)]
     struct NvGraphicBufferSurface
diff --git a/Ryujinx.HLE/HOS/Services/Android/Types/NvGraphicBufferSurfaceArray.cs b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/NvGraphicBufferSurfaceArray.cs
index be2855ff..7327b559 100644
--- a/Ryujinx.HLE/HOS/Services/Android/Types/NvGraphicBufferSurfaceArray.cs
+++ b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/NvGraphicBufferSurfaceArray.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace Ryujinx.HLE.HOS.Services.Android
+namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
 {
     [StructLayout(LayoutKind.Explicit)]
     struct NvGraphicBufferSurfaceArray
diff --git a/Ryujinx.HLE/HOS/Services/Android/Types/QueueBufferObject.cs b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/QueueBufferObject.cs
index 4112da07..684f856a 100644
--- a/Ryujinx.HLE/HOS/Services/Android/Types/QueueBufferObject.cs
+++ b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/QueueBufferObject.cs
@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace Ryujinx.HLE.HOS.Services.Android
+namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
 {
     [StructLayout(LayoutKind.Explicit)]
     struct QueueBufferObject
diff --git a/Ryujinx.HLE/HOS/Services/Android/Types/Rect.cs b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Rect.cs
index abe81abd..c2f51eea 100644
--- a/Ryujinx.HLE/HOS/Services/Android/Types/Rect.cs
+++ b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Rect.cs
@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace Ryujinx.HLE.HOS.Services.Android
+namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
 {
     [StructLayout(LayoutKind.Sequential, Size = 0x10)]
     struct Rect
diff --git a/Ryujinx.HLE/HOS/Services/Vi/RootService/ApplicationDisplayService/IHOSBinderDriver.cs b/Ryujinx.HLE/HOS/Services/Vi/RootService/ApplicationDisplayService/IHOSBinderDriver.cs
index 3ac1c270..3364ce70 100644
--- a/Ryujinx.HLE/HOS/Services/Vi/RootService/ApplicationDisplayService/IHOSBinderDriver.cs
+++ b/Ryujinx.HLE/HOS/Services/Vi/RootService/ApplicationDisplayService/IHOSBinderDriver.cs
@@ -2,7 +2,7 @@ using Ryujinx.Graphics.Gal;
 using Ryujinx.HLE.HOS.Ipc;
 using Ryujinx.HLE.HOS.Kernel.Common;
 using Ryujinx.HLE.HOS.Kernel.Threading;
-using Ryujinx.HLE.HOS.Services.Android;
+using Ryujinx.HLE.HOS.Services.SurfaceFlinger;
 using System;
 
 namespace Ryujinx.HLE.HOS.Services.Vi.RootService.ApplicationDisplayService
diff --git a/Ryujinx.HLE/HOS/Services/Vi/RootService/IApplicationDisplayService.cs b/Ryujinx.HLE/HOS/Services/Vi/RootService/IApplicationDisplayService.cs
index fba25054..a2b57e74 100644
--- a/Ryujinx.HLE/HOS/Services/Vi/RootService/IApplicationDisplayService.cs
+++ b/Ryujinx.HLE/HOS/Services/Vi/RootService/IApplicationDisplayService.cs
@@ -6,7 +6,7 @@ using System;
 using System.IO;
 using System.Text;
 
-using static Ryujinx.HLE.HOS.Services.Android.Parcel;
+using static Ryujinx.HLE.HOS.Services.SurfaceFlinger.Parcel;
 
 namespace Ryujinx.HLE.HOS.Services.Vi.RootService
 {