Rename Hipc to Cmif where appropriate (#3880)

3 files changed, 70 insertions, 70 deletions

diff --git a/Ryujinx.HLE/HOS/Services/Sockets/Bsd/IClient.cs b/Ryujinx.HLE/HOS/Services/Sockets/Bsd/IClient.cs
index bc174cce..b63864c9 100644
--- a/Ryujinx.HLE/HOS/Services/Sockets/Bsd/IClient.cs
+++ b/Ryujinx.HLE/HOS/Services/Sockets/Bsd/IClient.cs
@@ -128,7 +128,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
             context.Memory.Write(bufferPosition, BsdSockAddr.FromIPEndPoint(endPoint));
         }
 
-        [CommandHipc(0)]
+        [CommandCmif(0)]
         // Initialize(nn::socket::BsdBufferConfig config, u64 pid, u64 transferMemorySize, KObject<copy, transfer_memory>, pid) -> u32 bsd_errno
         public ResultCode RegisterClient(ServiceCtx context)
         {
@@ -158,7 +158,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
             return ResultCode.Success;
         }
 
-        [CommandHipc(1)]
+        [CommandCmif(1)]
         // StartMonitoring(u64, pid)
         public ResultCode StartMonitoring(ServiceCtx context)
         {
@@ -169,21 +169,21 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
             return ResultCode.Success;
         }
 
-        [CommandHipc(2)]
+        [CommandCmif(2)]
         // Socket(u32 domain, u32 type, u32 protocol) -> (i32 ret, u32 bsd_errno)
         public ResultCode Socket(ServiceCtx context)
         {
             return SocketInternal(context, false);
         }
 
-        [CommandHipc(3)]
+        [CommandCmif(3)]
         // SocketExempt(u32 domain, u32 type, u32 protocol) -> (i32 ret, u32 bsd_errno)
         public ResultCode SocketExempt(ServiceCtx context)
         {
             return SocketInternal(context, true);
         }
 
-        [CommandHipc(4)]
+        [CommandCmif(4)]
         // Open(u32 flags, array<unknown, 0x21> path) -> (i32 ret, u32 bsd_errno)
         public ResultCode Open(ServiceCtx context)
         {
@@ -204,7 +204,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
             return ResultCode.Success;
         }
 
-        [CommandHipc(5)]
+        [CommandCmif(5)]
         // Select(u32 nfds, nn::socket::timeval timeout, buffer<nn::socket::fd_set, 0x21, 0> readfds_in, buffer<nn::socket::fd_set, 0x21, 0> writefds_in, buffer<nn::socket::fd_set, 0x21, 0> errorfds_in)
         // -> (i32 ret, u32 bsd_errno, buffer<nn::socket::fd_set, 0x22, 0> readfds_out, buffer<nn::socket::fd_set, 0x22, 0> writefds_out, buffer<nn::socket::fd_set, 0x22, 0> errorfds_out)
         public ResultCode Select(ServiceCtx context)
@@ -325,7 +325,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
             return ResultCode.Success;
         }
 
-        [CommandHipc(6)]
+        [CommandCmif(6)]
         // Poll(u32 nfds, u32 timeout, buffer<unknown, 0x21, 0> fds) -> (i32 ret, u32 bsd_errno, buffer<unknown, 0x22, 0>)
         public ResultCode Poll(ServiceCtx context)
         {
@@ -463,7 +463,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
             return WriteBsdResult(context, updateCount, errno);
         }
 
-        [CommandHipc(7)]
+        [CommandCmif(7)]
         // Sysctl(buffer<unknown, 0x21, 0>, buffer<unknown, 0x21, 0>) -> (i32 ret, u32 bsd_errno, u32, buffer<unknown, 0x22, 0>)
         public ResultCode Sysctl(ServiceCtx context)
         {
@@ -474,7 +474,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
             return ResultCode.Success;
         }
 
-        [CommandHipc(8)]
+        [CommandCmif(8)]
         // Recv(u32 socket, u32 flags) -> (i32 ret, u32 bsd_errno, array<i8, 0x22> message)
         public ResultCode Recv(ServiceCtx context)
         {
@@ -504,7 +504,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
             return WriteBsdResult(context, result, errno);
         }
 
-        [CommandHipc(9)]
+        [CommandCmif(9)]
         // RecvFrom(u32 sock, u32 flags) -> (i32 ret, u32 bsd_errno, u32 addrlen, buffer<i8, 0x22, 0> message, buffer<nn::socket::sockaddr_in, 0x22, 0x10>)
         public ResultCode RecvFrom(ServiceCtx context)
         {
@@ -544,7 +544,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
             return WriteBsdResult(context, result, errno);
         }
 
-        [CommandHipc(10)]
+        [CommandCmif(10)]
         // Send(u32 socket, u32 flags, buffer<i8, 0x21, 0>) -> (i32 ret, u32 bsd_errno)
         public ResultCode Send(ServiceCtx context)
         {
@@ -572,7 +572,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
             return WriteBsdResult(context, result, errno);
         }
 
-        [CommandHipc(11)]
+        [CommandCmif(11)]
         // SendTo(u32 socket, u32 flags, buffer<i8, 0x21, 0>, buffer<nn::socket::sockaddr_in, 0x21, 0x10>) -> (i32 ret, u32 bsd_errno)
         public ResultCode SendTo(ServiceCtx context)
         {
@@ -603,7 +603,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
             return WriteBsdResult(context, result, errno);
         }
 
-        [CommandHipc(12)]
+        [CommandCmif(12)]
         // Accept(u32 socket) -> (i32 ret, u32 bsd_errno, u32 addrlen, buffer<nn::socket::sockaddr_in, 0x22, 0x10> addr)
         public ResultCode Accept(ServiceCtx context)
         {
@@ -646,7 +646,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
             return WriteBsdResult(context, -1, errno);
         }
 
-        [CommandHipc(13)]
+        [CommandCmif(13)]
         // Bind(u32 socket, buffer<nn::socket::sockaddr_in, 0x21, 0x10> addr) -> (i32 ret, u32 bsd_errno)
         public ResultCode Bind(ServiceCtx context)
         {
@@ -667,7 +667,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
             return WriteBsdResult(context, 0, errno);
         }
 
-        [CommandHipc(14)]
+        [CommandCmif(14)]
         // Connect(u32 socket, buffer<nn::socket::sockaddr_in, 0x21, 0x10>) -> (i32 ret, u32 bsd_errno)
         public ResultCode Connect(ServiceCtx context)
         {
@@ -688,7 +688,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
             return WriteBsdResult(context, 0, errno);
         }
 
-        [CommandHipc(15)]
+        [CommandCmif(15)]
         // GetPeerName(u32 socket) -> (i32 ret, u32 bsd_errno, u32 addrlen, buffer<nn::socket::sockaddr_in, 0x22, 0x10> addr)
         public ResultCode GetPeerName(ServiceCtx context)
         {
@@ -715,7 +715,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
             return WriteBsdResult(context, 0, errno);
         }
 
-        [CommandHipc(16)]
+        [CommandCmif(16)]
         // GetSockName(u32 socket) -> (i32 ret, u32 bsd_errno, u32 addrlen, buffer<nn::socket::sockaddr_in, 0x22, 0x10> addr)
         public ResultCode GetSockName(ServiceCtx context)
         {
@@ -738,7 +738,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
             return WriteBsdResult(context, 0, errno);
         }
 
-        [CommandHipc(17)]
+        [CommandCmif(17)]
         // GetSockOpt(u32 socket, u32 level, u32 option_name) -> (i32 ret, u32 bsd_errno, u32, buffer<unknown, 0x22, 0>)
         public ResultCode GetSockOpt(ServiceCtx context)
         {
@@ -765,7 +765,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
             return WriteBsdResult(context, 0, errno);
         }
 
-        [CommandHipc(18)]
+        [CommandCmif(18)]
         // Listen(u32 socket, u32 backlog) -> (i32 ret, u32 bsd_errno)
         public ResultCode Listen(ServiceCtx context)
         {
@@ -783,7 +783,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
             return WriteBsdResult(context, 0, errno);
         }
 
-        [CommandHipc(19)]
+        [CommandCmif(19)]
         // Ioctl(u32 fd, u32 request, u32 bufcount, buffer<unknown, 0x21, 0>, buffer<unknown, 0x21, 0>, buffer<unknown, 0x21, 0>, buffer<unknown, 0x21, 0>) -> (i32 ret, u32 bsd_errno, buffer<unknown, 0x22, 0>, buffer<unknown, 0x22, 0>, buffer<unknown, 0x22, 0>, buffer<unknown, 0x22, 0>)
         public ResultCode Ioctl(ServiceCtx context)
         {
@@ -818,7 +818,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
             return WriteBsdResult(context, 0, errno);
         }
 
-        [CommandHipc(20)]
+        [CommandCmif(20)]
         // Fcntl(u32 socket, u32 cmd, u32 arg) -> (i32 ret, u32 bsd_errno)
         public ResultCode Fcntl(ServiceCtx context)
         {
@@ -852,7 +852,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
             return WriteBsdResult(context, result, errno);
         }
 
-        [CommandHipc(21)]
+        [CommandCmif(21)]
         // SetSockOpt(u32 socket, u32 level, u32 option_name, buffer<unknown, 0x21, 0> option_value) -> (i32 ret, u32 bsd_errno)
         public ResultCode SetSockOpt(ServiceCtx context)
         {
@@ -875,7 +875,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
             return WriteBsdResult(context, 0, errno);
         }
 
-        [CommandHipc(22)]
+        [CommandCmif(22)]
         // Shutdown(u32 socket, u32 how) -> (i32 ret, u32 bsd_errno)
         public ResultCode Shutdown(ServiceCtx context)
         {
@@ -898,7 +898,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
             return WriteBsdResult(context, 0, errno);
         }
 
-        [CommandHipc(23)]
+        [CommandCmif(23)]
         // ShutdownAllSockets(u32 how) -> (i32 ret, u32 bsd_errno)
         public ResultCode ShutdownAllSockets(ServiceCtx context)
         {
@@ -914,7 +914,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
             return WriteBsdResult(context, 0, errno);
         }
 
-        [CommandHipc(24)]
+        [CommandCmif(24)]
         // Write(u32 fd, buffer<i8, 0x21, 0> message) -> (i32 ret, u32 bsd_errno)
         public ResultCode Write(ServiceCtx context)
         {
@@ -941,7 +941,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
             return WriteBsdResult(context, result, errno);
         }
 
-        [CommandHipc(25)]
+        [CommandCmif(25)]
         // Read(u32 fd) -> (i32 ret, u32 bsd_errno, buffer<i8, 0x22, 0> message)
         public ResultCode Read(ServiceCtx context)
         {
@@ -970,7 +970,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
             return WriteBsdResult(context, result, errno);
         }
 
-        [CommandHipc(26)]
+        [CommandCmif(26)]
         // Close(u32 fd) -> (i32 ret, u32 bsd_errno)
         public ResultCode Close(ServiceCtx context)
         {
@@ -986,7 +986,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
             return WriteBsdResult(context, 0, errno);
         }
 
-        [CommandHipc(27)]
+        [CommandCmif(27)]
         // DuplicateSocket(u32 fd, u64 reserved) -> (i32 ret, u32 bsd_errno)
         public ResultCode DuplicateSocket(ServiceCtx context)
         {
@@ -1012,7 +1012,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
         }
 
 
-        [CommandHipc(29)] // 7.0.0+
+        [CommandCmif(29)] // 7.0.0+
         // RecvMMsg(u32 fd, u32 vlen, u32 flags, u32 reserved, nn::socket::TimeVal timeout) -> (i32 ret, u32 bsd_errno, buffer<bytes, 6> message);
         public ResultCode RecvMMsg(ServiceCtx context)
         {
@@ -1055,7 +1055,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
             return WriteBsdResult(context, result, errno);
         }
 
-        [CommandHipc(30)] // 7.0.0+
+        [CommandCmif(30)] // 7.0.0+
         // SendMMsg(u32 fd, u32 vlen, u32 flags) -> (i32 ret, u32 bsd_errno, buffer<bytes, 6> message);
         public ResultCode SendMMsg(ServiceCtx context)
         {
@@ -1096,7 +1096,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
             return WriteBsdResult(context, result, errno);
         }
 
-        [CommandHipc(31)] // 7.0.0+
+        [CommandCmif(31)] // 7.0.0+
         // EventFd(nn::socket::EventFdFlags flags, u64 initval) -> (i32 ret, u32 bsd_errno)
         public ResultCode EventFd(ServiceCtx context)
         {
diff --git a/Ryujinx.HLE/HOS/Services/Sockets/Nsd/IManager.cs b/Ryujinx.HLE/HOS/Services/Sockets/Nsd/IManager.cs
index b098e2ed..0b7adff4 100644
--- a/Ryujinx.HLE/HOS/Services/Sockets/Nsd/IManager.cs
+++ b/Ryujinx.HLE/HOS/Services/Sockets/Nsd/IManager.cs
@@ -47,21 +47,21 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Nsd
             };
         }
 
-        [CommandHipc(5)] // 11.0.0+
+        [CommandCmif(5)] // 11.0.0+
         // GetSettingUrl() -> buffer<unknown<0x100>, 0x16>
         public ResultCode GetSettingUrl(ServiceCtx context)
         {
             throw new ServiceNotImplementedException(this, context);
         }
 
-        [CommandHipc(10)]
+        [CommandCmif(10)]
         // GetSettingName() -> buffer<unknown<0x100>, 0x16>
         public ResultCode GetSettingName(ServiceCtx context)
         {
             throw new ServiceNotImplementedException(this, context);
         }
 
-        [CommandHipc(11)]
+        [CommandCmif(11)]
         // GetEnvironmentIdentifier() -> buffer<bytes<8> environment_identifier, 0x16>
         public ResultCode GetEnvironmentIdentifier(ServiceCtx context)
         {
@@ -81,7 +81,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Nsd
             return result;
         }
 
-        [CommandHipc(12)]
+        [CommandCmif(12)]
         // GetDeviceId() -> bytes<0x10, 1>
         public ResultCode GetDeviceId(ServiceCtx context)
         {
@@ -90,7 +90,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Nsd
             return ResultCode.Success;
         }
 
-        [CommandHipc(13)]
+        [CommandCmif(13)]
         // DeleteSettings(u32)
         public ResultCode DeleteSettings(ServiceCtx context)
         {
@@ -127,14 +127,14 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Nsd
             return ResultCode.Success;
         }
 
-        [CommandHipc(14)]
+        [CommandCmif(14)]
         // ImportSettings(u32, buffer<unknown, 5>) -> buffer<unknown, 6>
         public ResultCode ImportSettings(ServiceCtx context)
         {
             throw new ServiceNotImplementedException(this, context);
         }
 
-        [CommandHipc(15)] // 4.0.0+
+        [CommandCmif(15)] // 4.0.0+
         // SetChangeEnvironmentIdentifierDisabled(bytes<1>)
         public ResultCode SetChangeEnvironmentIdentifierDisabled(ServiceCtx context)
         {
@@ -153,7 +153,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Nsd
             return ResultCode.Success;
         }
 
-        [CommandHipc(20)]
+        [CommandCmif(20)]
         // Resolve(buffer<unknown<0x100>, 0x15>) -> buffer<unknown<0x100>, 0x16>
         public ResultCode Resolve(ServiceCtx context)
         {
@@ -176,7 +176,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Nsd
             return result;
         }
 
-        [CommandHipc(21)]
+        [CommandCmif(21)]
         // ResolveEx(buffer<unknown<0x100>, 0x15>) -> (u32, buffer<unknown<0x100>, 0x16>)
         public ResultCode ResolveEx(ServiceCtx context)
         {
@@ -201,56 +201,56 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Nsd
             return result;
         }
 
-        [CommandHipc(30)]
+        [CommandCmif(30)]
         // GetNasServiceSetting(buffer<unknown<0x10>, 0x15>) -> buffer<unknown<0x108>, 0x16>
         public ResultCode GetNasServiceSetting(ServiceCtx context)
         {
             throw new ServiceNotImplementedException(this, context);
         }
 
-        [CommandHipc(31)]
+        [CommandCmif(31)]
         // GetNasServiceSettingEx(buffer<unknown<0x10>, 0x15>) -> (u32, buffer<unknown<0x108>, 0x16>)
         public ResultCode GetNasServiceSettingEx(ServiceCtx context)
         {
             throw new ServiceNotImplementedException(this, context);
         }
 
-        [CommandHipc(40)]
+        [CommandCmif(40)]
         // GetNasRequestFqdn() -> buffer<unknown<0x100>, 0x16>
         public ResultCode GetNasRequestFqdn(ServiceCtx context)
         {
             throw new ServiceNotImplementedException(this, context);
         }
 
-        [CommandHipc(41)]
+        [CommandCmif(41)]
         // GetNasRequestFqdnEx() -> (u32, buffer<unknown<0x100>, 0x16>)
         public ResultCode GetNasRequestFqdnEx(ServiceCtx context)
         {
             throw new ServiceNotImplementedException(this, context);
         }
 
-        [CommandHipc(42)]
+        [CommandCmif(42)]
         // GetNasApiFqdn() -> buffer<unknown<0x100>, 0x16>
         public ResultCode GetNasApiFqdn(ServiceCtx context)
         {
             throw new ServiceNotImplementedException(this, context);
         }
 
-        [CommandHipc(43)]
+        [CommandCmif(43)]
         // GetNasApiFqdnEx() -> (u32, buffer<unknown<0x100>, 0x16>)
         public ResultCode GetNasApiFqdnEx(ServiceCtx context)
         {
             throw new ServiceNotImplementedException(this, context);
         }
 
-        [CommandHipc(50)]
+        [CommandCmif(50)]
         // GetCurrentSetting() -> buffer<unknown<0x12bf0>, 0x16>
         public ResultCode GetCurrentSetting(ServiceCtx context)
         {
             throw new ServiceNotImplementedException(this, context);
         }
 
-        [CommandHipc(51)] // 9.0.0+
+        [CommandCmif(51)] // 9.0.0+
         // WriteTestParameter(buffer<?>)
         public ResultCode WriteTestParameter(ServiceCtx context)
         {
@@ -259,7 +259,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Nsd
             throw new ServiceNotImplementedException(this, context);
         }
 
-        [CommandHipc(52)] // 9.0.0+
+        [CommandCmif(52)] // 9.0.0+
         // ReadTestParameter() -> buffer<?>
         public ResultCode ReadTestParameter(ServiceCtx context)
         {
@@ -268,7 +268,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Nsd
             throw new ServiceNotImplementedException(this, context);
         }
 
-        [CommandHipc(60)]
+        [CommandCmif(60)]
         // ReadSaveDataFromFsForTest() -> buffer<unknown<0x12bf0>, 0x16>
         public ResultCode ReadSaveDataFromFsForTest(ServiceCtx context)
         {
@@ -284,7 +284,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Nsd
             return ResultCode.Success;
         }
 
-        [CommandHipc(61)]
+        [CommandCmif(61)]
         // WriteSaveDataToFsForTest(buffer<unknown<0x12bf0>, 0x15>)
         public ResultCode WriteSaveDataToFsForTest(ServiceCtx context)
         {
@@ -313,7 +313,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Nsd
             return ResultCode.Success;
         }
 
-        [CommandHipc(62)]
+        [CommandCmif(62)]
         // DeleteSaveDataOfFsForTest()
         public ResultCode DeleteSaveDataOfFsForTest(ServiceCtx context)
         {
@@ -342,7 +342,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Nsd
             return ResultCode.Success;
         }
 
-        [CommandHipc(63)] // 4.0.0+
+        [CommandCmif(63)] // 4.0.0+
         // IsChangeEnvironmentIdentifierDisabled() -> bytes<1>
         public ResultCode IsChangeEnvironmentIdentifierDisabled(ServiceCtx context)
         {
@@ -357,7 +357,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Nsd
             return ResultCode.Success;
         }
 
-        [CommandHipc(100)] // 10.0.0+
+        [CommandCmif(100)] // 10.0.0+
         // GetApplicationServerEnvironmentType() -> bytes<1>
         public ResultCode GetApplicationServerEnvironmentType(ServiceCtx context)
         {
@@ -385,14 +385,14 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Nsd
             return ResultCode.Success;
         }
 
-        [CommandHipc(101)] // 10.0.0+
+        [CommandCmif(101)] // 10.0.0+
         // SetApplicationServerEnvironmentType(bytes<1>)
         public ResultCode SetApplicationServerEnvironmentType(ServiceCtx context)
         {
             throw new ServiceNotImplementedException(this, context);
         }
 
-        [CommandHipc(102)] // 10.0.0+
+        [CommandCmif(102)] // 10.0.0+
         // DeleteApplicationServerEnvironmentType()
         public ResultCode DeleteApplicationServerEnvironmentType(ServiceCtx context)
         {
diff --git a/Ryujinx.HLE/HOS/Services/Sockets/Sfdnsres/IResolver.cs b/Ryujinx.HLE/HOS/Services/Sockets/Sfdnsres/IResolver.cs
index 13c5597f..64c3acbb 100644
--- a/Ryujinx.HLE/HOS/Services/Sockets/Sfdnsres/IResolver.cs
+++ b/Ryujinx.HLE/HOS/Services/Sockets/Sfdnsres/IResolver.cs
@@ -23,7 +23,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Sfdnsres
             DnsMitmResolver.Instance.ReloadEntries(context);
         }
 
-        [CommandHipc(0)]
+        [CommandCmif(0)]
         // SetDnsAddressesPrivateRequest(u32, buffer<unknown, 5, 0>)
         public ResultCode SetDnsAddressesPrivateRequest(ServiceCtx context)
         {
@@ -37,7 +37,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Sfdnsres
             return ResultCode.NotAllocated;
         }
 
-        [CommandHipc(1)]
+        [CommandCmif(1)]
         // GetDnsAddressPrivateRequest(u32) -> buffer<unknown, 6, 0>
         public ResultCode GetDnsAddressPrivateRequest(ServiceCtx context)
         {
@@ -51,7 +51,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Sfdnsres
             return ResultCode.NotAllocated;
         }
 
-        [CommandHipc(2)]
+        [CommandCmif(2)]
         // GetHostByNameRequest(u8, u32, u64, pid, buffer<unknown, 5, 0>) -> (u32, u32, u32, buffer<unknown, 6, 0>)
         public ResultCode GetHostByNameRequest(ServiceCtx context)
         {
@@ -64,7 +64,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Sfdnsres
             return GetHostByNameRequestImpl(context, inputBufferPosition, inputBufferSize, outputBufferPosition, outputBufferSize, false, 0, 0);
         }
 
-        [CommandHipc(3)]
+        [CommandCmif(3)]
         // GetHostByAddrRequest(u32, u32, u32, u64, pid, buffer<unknown, 5, 0>) -> (u32, u32, u32, buffer<unknown, 6, 0>)
         public ResultCode GetHostByAddrRequest(ServiceCtx context)
         {
@@ -77,7 +77,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Sfdnsres
             return GetHostByAddrRequestImpl(context, inputBufferPosition, inputBufferSize, outputBufferPosition, outputBufferSize, false, 0, 0);
         }
 
-        [CommandHipc(4)]
+        [CommandCmif(4)]
         // GetHostStringErrorRequest(u32) -> buffer<unknown, 6, 0>
         public ResultCode GetHostStringErrorRequest(ServiceCtx context)
         {
@@ -107,7 +107,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Sfdnsres
             return resultCode;
         }
 
-        [CommandHipc(5)]
+        [CommandCmif(5)]
         // GetGaiStringErrorRequest(u32) -> buffer<byte, 6, 0>
         public ResultCode GetGaiStringErrorRequest(ServiceCtx context)
         {
@@ -152,7 +152,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Sfdnsres
             return resultCode;
         }
 
-        [CommandHipc(6)]
+        [CommandCmif(6)]
         // GetAddrInfoRequest(bool enable_nsd_resolve, u32, u64 pid_placeholder, pid, buffer<i8, 5, 0> host, buffer<i8, 5, 0> service, buffer<packed_addrinfo, 5, 0> hints) -> (i32 ret, u32 bsd_errno, u32 packed_addrinfo_size, buffer<packed_addrinfo, 6, 0> response)
         public ResultCode GetAddrInfoRequest(ServiceCtx context)
         {
@@ -162,7 +162,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Sfdnsres
             return GetAddrInfoRequestImpl(context, responseBufferPosition, responseBufferSize, false, 0, 0);
         }
 
-        [CommandHipc(8)]
+        [CommandCmif(8)]
         // GetCancelHandleRequest(u64, pid) -> u32
         public ResultCode GetCancelHandleRequest(ServiceCtx context)
         {
@@ -176,7 +176,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Sfdnsres
             return ResultCode.Success;
         }
 
-        [CommandHipc(9)]
+        [CommandCmif(9)]
         // CancelRequest(u32, u64, pid)
         public ResultCode CancelRequest(ServiceCtx context)
         {
@@ -188,7 +188,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Sfdnsres
             return ResultCode.Success;
         }
 
-        [CommandHipc(10)] // 5.0.0+
+        [CommandCmif(10)] // 5.0.0+
         // GetHostByNameRequestWithOptions(u8, u32, u64, pid, buffer<unknown, 21, 0>, buffer<unknown, 21, 0>) -> (u32, u32, u32, buffer<unknown, 22, 0>)
         public ResultCode GetHostByNameRequestWithOptions(ServiceCtx context)
         {
@@ -207,7 +207,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Sfdnsres
                 optionsBufferSize);
         }
 
-        [CommandHipc(11)] // 5.0.0+
+        [CommandCmif(11)] // 5.0.0+
         // GetHostByAddrRequestWithOptions(u32, u32, u32, u64, pid, buffer<unknown, 21, 0>, buffer<unknown, 21, 0>) -> (u32, u32, u32, buffer<unknown, 22, 0>)
         public ResultCode GetHostByAddrRequestWithOptions(ServiceCtx context)
         {
@@ -226,7 +226,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Sfdnsres
                 optionsBufferSize);
         }
 
-        [CommandHipc(12)] // 5.0.0+
+        [CommandCmif(12)] // 5.0.0+
         // GetAddrInfoRequestWithOptions(bool enable_nsd_resolve, u32, u64 pid_placeholder, pid, buffer<i8, 5, 0> host, buffer<i8, 5, 0> service, buffer<packed_addrinfo, 5, 0> hints, buffer<unknown, 21, 0>) -> (i32 ret, u32 bsd_errno, u32 unknown, u32 packed_addrinfo_size, buffer<packed_addrinfo, 22, 0> response)
         public ResultCode GetAddrInfoRequestWithOptions(ServiceCtx context)
         {
@@ -236,7 +236,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Sfdnsres
             return GetAddrInfoRequestImpl(context, outputBufferPosition, outputBufferSize, true, optionsBufferPosition, optionsBufferSize);
         }
 
-        [CommandHipc(14)] // 5.0.0+
+        [CommandCmif(14)] // 5.0.0+
         // ResolverSetOptionRequest(buffer<unknown, 5, 0>, u64 unknown, u64 pid_placeholder, pid) -> (i32 ret, u32 bsd_errno)
         public ResultCode ResolverSetOptionRequest(ServiceCtx context)
         {
@@ -263,7 +263,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Sfdnsres
         }
 
         // Atmosphère extension for dns_mitm
-        [CommandHipc(65000)]
+        [CommandCmif(65000)]
         // AtmosphereReloadHostsFile()
         public ResultCode AtmosphereReloadHostsFile(ServiceCtx context)
         {