diff --git a/nx/include/switch/services/htcs.h b/nx/include/switch/services/htcs.h
index 11dd70b1..cea27776 100644
--- a/nx/include/switch/services/htcs.h
+++ b/nx/include/switch/services/htcs.h
@@ -30,7 +30,7 @@ typedef struct {
     HtcsAddressFamilyType family;
     HtcsPeerName peer_name;
     HtcsPortName port_name;
-} SockAddrHtcs;
+} HtcsSockAddr;
 
 typedef struct {
     s64 tv_sec;
@@ -123,14 +123,14 @@ Result htcsEndSelect(s32 *out_err, s32 *out_count, s32 *read, size_t num_read, s
 
 /// Socket functionality.
 Result htcsSocketClose(HtcsSocket *s, s32 *out_err, s32 *out_res);
-Result htcsSocketConnect(HtcsSocket *s, s32 *out_err, s32 *out_res, const SockAddrHtcs *address);
-Result htcsSocketBind(HtcsSocket *s, s32 *out_err, s32 *out_res, const SockAddrHtcs *address);
+Result htcsSocketConnect(HtcsSocket *s, s32 *out_err, s32 *out_res, const HtcsSockAddr *address);
+Result htcsSocketBind(HtcsSocket *s, s32 *out_err, s32 *out_res, const HtcsSockAddr *address);
 Result htcsSocketListen(HtcsSocket *s, s32 *out_err, s32 *out_res, s32 backlog_count);
 Result htcsSocketShutdown(HtcsSocket *s, s32 *out_err, s32 *out_res, s32 how);
 Result htcsSocketFcntl(HtcsSocket *s, s32 *out_err, s32 *out_res, s32 command, s32 value);
 
 Result htcsSocketAcceptStart(HtcsSocket *s, u32 *out_task_id, Handle *out_event_handle);
-Result htcsSocketAcceptResults(HtcsSocket *s, s32 *out_err, HtcsSocket *out_socket, SockAddrHtcs *out_address, u32 task_id);
+Result htcsSocketAcceptResults(HtcsSocket *s, s32 *out_err, HtcsSocket *out_socket, HtcsSockAddr *out_address, u32 task_id);
 
 Result htcsSocketRecvStart(HtcsSocket *s, u32 *out_task_id, Handle *out_event_handle, s32 mem_size, s32 flags);
 Result htcsSocketRecvResults(HtcsSocket *s, s32 *out_err, s64 *out_size, void *buffer, size_t buffer_size, u32 task_id);
diff --git a/nx/source/services/htcs.c b/nx/source/services/htcs.c
index 8f970dd2..e1bfdcc4 100644
--- a/nx/source/services/htcs.c
+++ b/nx/source/services/htcs.c
@@ -168,7 +168,7 @@ Result htcsEndSelect(s32 *out_err, s32 *out_count, s32 *read, size_t num_read, s
     return rc;
 }
 
-static Result _htcsSocketCmdInAddress(HtcsSocket *s, s32 *out_err, s32 *out_res, const SockAddrHtcs *address, u32 cmd_id) {
+static Result _htcsSocketCmdInAddress(HtcsSocket *s, s32 *out_err, s32 *out_res, const HtcsSockAddr *address, u32 cmd_id) {
     struct {
         s32 err;
         s32 res;
@@ -220,11 +220,11 @@ Result htcsSocketClose(HtcsSocket *s, s32 *out_err, s32 *out_res) {
     return rc;
 }
 
-Result htcsSocketConnect(HtcsSocket *s, s32 *out_err, s32 *out_res, const SockAddrHtcs *address) {
+Result htcsSocketConnect(HtcsSocket *s, s32 *out_err, s32 *out_res, const HtcsSockAddr *address) {
     return _htcsSocketCmdInAddress(s, out_err, out_res, address, 1);
 }
 
-Result htcsSocketBind(HtcsSocket *s, s32 *out_err, s32 *out_res, const SockAddrHtcs *address) {
+Result htcsSocketBind(HtcsSocket *s, s32 *out_err, s32 *out_res, const HtcsSockAddr *address) {
     return _htcsSocketCmdInAddress(s, out_err, out_res, address, 2);
 }
 
@@ -260,9 +260,9 @@ Result htcsSocketAcceptStart(HtcsSocket *s, u32 *out_task_id, Handle *out_event_
     );
 }
 
-Result htcsSocketAcceptResults(HtcsSocket *s, s32 *out_err, HtcsSocket *out_socket, SockAddrHtcs *out_address, u32 task_id) {
+Result htcsSocketAcceptResults(HtcsSocket *s, s32 *out_err, HtcsSocket *out_socket, HtcsSockAddr *out_address, u32 task_id) {
     struct {
-        SockAddrHtcs address;
+        HtcsSockAddr address;
         s32 err;
     } out;
     Result rc = _htcsObjectDispatchInOut(&s->s, 10, task_id, out,