[fidl] Regenerate FIDL

Change-Id: Iab84707c7bbb266518e09b301f12beed20a947b0
Reviewed-on: https://fuchsia-review.googlesource.com/c/third_party/go/+/447446
Commit-Queue: Bruno Dal Bo <brunodalbo@google.com>
Reviewed-by: Tamir Duberstein <tamird@google.com>
diff --git a/api/fuchsia.txt b/api/fuchsia.txt
index d28796d..ed95a11 100644
--- a/api/fuchsia.txt
+++ b/api/fuchsia.txt
@@ -2255,6 +2255,8 @@
 pkg syscall/zx/io, type WatchedEvent struct, Event uint8
 pkg syscall/zx/io, type WatchedEvent struct, Len uint8
 pkg syscall/zx/io, type WatchedEvent struct, Name []uint8
+pkg syscall/zx/logger, const ComponentNamePlaceholderTag = "COMPONENT_NAME"
+pkg syscall/zx/logger, const ComponentNamePlaceholderTag string
 pkg syscall/zx/logger, const LogDumpLogsOrdinal = 5677235824019750106
 pkg syscall/zx/logger, const LogDumpLogsOrdinal uint64
 pkg syscall/zx/logger, const LogDumpLogsSafeOrdinal = 1505222195749004569
@@ -3545,12 +3547,6 @@
 pkg syscall/zx/posix, method (Errno) IsUnknown() bool
 pkg syscall/zx/posix, method (Errno) String() string
 pkg syscall/zx/posix, type Errno int32
-pkg syscall/zx/posix/socket, const BaseSocketBind2Ordinal = 9197974932656647351
-pkg syscall/zx/posix/socket, const BaseSocketBind2Ordinal uint64
-pkg syscall/zx/posix/socket, const BaseSocketBind2ResultErr = 2
-pkg syscall/zx/posix/socket, const BaseSocketBind2ResultErr ideal-int
-pkg syscall/zx/posix/socket, const BaseSocketBind2ResultResponse = 1
-pkg syscall/zx/posix/socket, const BaseSocketBind2ResultResponse ideal-int
 pkg syscall/zx/posix/socket, const BaseSocketBindOrdinal = 1118115255807776188
 pkg syscall/zx/posix/socket, const BaseSocketBindOrdinal uint64
 pkg syscall/zx/posix/socket, const BaseSocketBindResultErr = 2
@@ -3561,12 +3557,6 @@
 pkg syscall/zx/posix/socket, const BaseSocketCloneOrdinal uint64
 pkg syscall/zx/posix/socket, const BaseSocketCloseOrdinal = 5983530995951066180
 pkg syscall/zx/posix/socket, const BaseSocketCloseOrdinal uint64
-pkg syscall/zx/posix/socket, const BaseSocketConnect2Ordinal = 1146432661059373772
-pkg syscall/zx/posix/socket, const BaseSocketConnect2Ordinal uint64
-pkg syscall/zx/posix/socket, const BaseSocketConnect2ResultErr = 2
-pkg syscall/zx/posix/socket, const BaseSocketConnect2ResultErr ideal-int
-pkg syscall/zx/posix/socket, const BaseSocketConnect2ResultResponse = 1
-pkg syscall/zx/posix/socket, const BaseSocketConnect2ResultResponse ideal-int
 pkg syscall/zx/posix/socket, const BaseSocketConnectOrdinal = 1705719532842400689
 pkg syscall/zx/posix/socket, const BaseSocketConnectOrdinal uint64
 pkg syscall/zx/posix/socket, const BaseSocketConnectResultErr = 2
@@ -3583,24 +3573,12 @@
 pkg syscall/zx/posix/socket, const BaseSocketDisconnectResultResponse ideal-int
 pkg syscall/zx/posix/socket, const BaseSocketGetAttrOrdinal = 8689798978500614909
 pkg syscall/zx/posix/socket, const BaseSocketGetAttrOrdinal uint64
-pkg syscall/zx/posix/socket, const BaseSocketGetPeerName2Ordinal = 9074383226662875935
-pkg syscall/zx/posix/socket, const BaseSocketGetPeerName2Ordinal uint64
-pkg syscall/zx/posix/socket, const BaseSocketGetPeerName2ResultErr = 2
-pkg syscall/zx/posix/socket, const BaseSocketGetPeerName2ResultErr ideal-int
-pkg syscall/zx/posix/socket, const BaseSocketGetPeerName2ResultResponse = 1
-pkg syscall/zx/posix/socket, const BaseSocketGetPeerName2ResultResponse ideal-int
 pkg syscall/zx/posix/socket, const BaseSocketGetPeerNameOrdinal = 4614448585615564437
 pkg syscall/zx/posix/socket, const BaseSocketGetPeerNameOrdinal uint64
 pkg syscall/zx/posix/socket, const BaseSocketGetPeerNameResultErr = 2
 pkg syscall/zx/posix/socket, const BaseSocketGetPeerNameResultErr ideal-int
 pkg syscall/zx/posix/socket, const BaseSocketGetPeerNameResultResponse = 1
 pkg syscall/zx/posix/socket, const BaseSocketGetPeerNameResultResponse ideal-int
-pkg syscall/zx/posix/socket, const BaseSocketGetSockName2Ordinal = 8951648123632983667
-pkg syscall/zx/posix/socket, const BaseSocketGetSockName2Ordinal uint64
-pkg syscall/zx/posix/socket, const BaseSocketGetSockName2ResultErr = 2
-pkg syscall/zx/posix/socket, const BaseSocketGetSockName2ResultErr ideal-int
-pkg syscall/zx/posix/socket, const BaseSocketGetSockName2ResultResponse = 1
-pkg syscall/zx/posix/socket, const BaseSocketGetSockName2ResultResponse ideal-int
 pkg syscall/zx/posix/socket, const BaseSocketGetSockNameOrdinal = 4730495873806049181
 pkg syscall/zx/posix/socket, const BaseSocketGetSockNameOrdinal uint64
 pkg syscall/zx/posix/socket, const BaseSocketGetSockNameResultErr = 2
@@ -3629,16 +3607,12 @@
 pkg syscall/zx/posix/socket, const BaseSocketSetSockOptResultResponse ideal-int
 pkg syscall/zx/posix/socket, const BaseSocketSyncOrdinal = 1773723578397144345
 pkg syscall/zx/posix/socket, const BaseSocketSyncOrdinal uint64
-pkg syscall/zx/posix/socket, const DatagramSocketBind2Ordinal = 9197974932656647351
-pkg syscall/zx/posix/socket, const DatagramSocketBind2Ordinal uint64
 pkg syscall/zx/posix/socket, const DatagramSocketBindOrdinal = 1118115255807776188
 pkg syscall/zx/posix/socket, const DatagramSocketBindOrdinal uint64
 pkg syscall/zx/posix/socket, const DatagramSocketCloneOrdinal = 6512600400724287855
 pkg syscall/zx/posix/socket, const DatagramSocketCloneOrdinal uint64
 pkg syscall/zx/posix/socket, const DatagramSocketCloseOrdinal = 5983530995951066180
 pkg syscall/zx/posix/socket, const DatagramSocketCloseOrdinal uint64
-pkg syscall/zx/posix/socket, const DatagramSocketConnect2Ordinal = 1146432661059373772
-pkg syscall/zx/posix/socket, const DatagramSocketConnect2Ordinal uint64
 pkg syscall/zx/posix/socket, const DatagramSocketConnectOrdinal = 1705719532842400689
 pkg syscall/zx/posix/socket, const DatagramSocketConnectOrdinal uint64
 pkg syscall/zx/posix/socket, const DatagramSocketDescribeOrdinal = 1152055232528178848
@@ -3647,12 +3621,8 @@
 pkg syscall/zx/posix/socket, const DatagramSocketDisconnectOrdinal uint64
 pkg syscall/zx/posix/socket, const DatagramSocketGetAttrOrdinal = 8689798978500614909
 pkg syscall/zx/posix/socket, const DatagramSocketGetAttrOrdinal uint64
-pkg syscall/zx/posix/socket, const DatagramSocketGetPeerName2Ordinal = 9074383226662875935
-pkg syscall/zx/posix/socket, const DatagramSocketGetPeerName2Ordinal uint64
 pkg syscall/zx/posix/socket, const DatagramSocketGetPeerNameOrdinal = 4614448585615564437
 pkg syscall/zx/posix/socket, const DatagramSocketGetPeerNameOrdinal uint64
-pkg syscall/zx/posix/socket, const DatagramSocketGetSockName2Ordinal = 8951648123632983667
-pkg syscall/zx/posix/socket, const DatagramSocketGetSockName2Ordinal uint64
 pkg syscall/zx/posix/socket, const DatagramSocketGetSockNameOrdinal = 4730495873806049181
 pkg syscall/zx/posix/socket, const DatagramSocketGetSockNameOrdinal uint64
 pkg syscall/zx/posix/socket, const DatagramSocketGetSockOptOrdinal = 7924918138357155140
@@ -3667,12 +3637,6 @@
 pkg syscall/zx/posix/socket, const DatagramSocketProtocolIcmpEcho DatagramSocketProtocol
 pkg syscall/zx/posix/socket, const DatagramSocketProtocolUdp = 1
 pkg syscall/zx/posix/socket, const DatagramSocketProtocolUdp DatagramSocketProtocol
-pkg syscall/zx/posix/socket, const DatagramSocketRecvMsg2Ordinal = 1945882644002596140
-pkg syscall/zx/posix/socket, const DatagramSocketRecvMsg2Ordinal uint64
-pkg syscall/zx/posix/socket, const DatagramSocketRecvMsg2ResultErr = 2
-pkg syscall/zx/posix/socket, const DatagramSocketRecvMsg2ResultErr ideal-int
-pkg syscall/zx/posix/socket, const DatagramSocketRecvMsg2ResultResponse = 1
-pkg syscall/zx/posix/socket, const DatagramSocketRecvMsg2ResultResponse ideal-int
 pkg syscall/zx/posix/socket, const DatagramSocketRecvMsgOrdinal = 8165942820816825210
 pkg syscall/zx/posix/socket, const DatagramSocketRecvMsgOrdinal uint64
 pkg syscall/zx/posix/socket, const DatagramSocketRecvMsgResultErr = 2
@@ -3689,12 +3653,6 @@
 pkg syscall/zx/posix/socket, const DatagramSocketSetAttrOrdinal uint64
 pkg syscall/zx/posix/socket, const DatagramSocketSetSockOptOrdinal = 665529441061168881
 pkg syscall/zx/posix/socket, const DatagramSocketSetSockOptOrdinal uint64
-pkg syscall/zx/posix/socket, const DatagramSocketShutdown2Ordinal = 7446289768222241464
-pkg syscall/zx/posix/socket, const DatagramSocketShutdown2Ordinal uint64
-pkg syscall/zx/posix/socket, const DatagramSocketShutdown2ResultErr = 2
-pkg syscall/zx/posix/socket, const DatagramSocketShutdown2ResultErr ideal-int
-pkg syscall/zx/posix/socket, const DatagramSocketShutdown2ResultResponse = 1
-pkg syscall/zx/posix/socket, const DatagramSocketShutdown2ResultResponse ideal-int
 pkg syscall/zx/posix/socket, const DatagramSocketShutdownOrdinal = 4350574647411923264
 pkg syscall/zx/posix/socket, const DatagramSocketShutdownOrdinal uint64
 pkg syscall/zx/posix/socket, const DatagramSocketShutdownResultErr = 2
@@ -3751,28 +3709,18 @@
 pkg syscall/zx/posix/socket, const ShutdownModeWrite ShutdownMode
 pkg syscall/zx/posix/socket, const ShutdownMode_Mask = 3
 pkg syscall/zx/posix/socket, const ShutdownMode_Mask ShutdownMode
-pkg syscall/zx/posix/socket, const StreamSocketAccept2Ordinal = 3712820282481341230
-pkg syscall/zx/posix/socket, const StreamSocketAccept2Ordinal uint64
-pkg syscall/zx/posix/socket, const StreamSocketAccept2ResultErr = 2
-pkg syscall/zx/posix/socket, const StreamSocketAccept2ResultErr ideal-int
-pkg syscall/zx/posix/socket, const StreamSocketAccept2ResultResponse = 1
-pkg syscall/zx/posix/socket, const StreamSocketAccept2ResultResponse ideal-int
 pkg syscall/zx/posix/socket, const StreamSocketAcceptOrdinal = 6536884020639482211
 pkg syscall/zx/posix/socket, const StreamSocketAcceptOrdinal uint64
 pkg syscall/zx/posix/socket, const StreamSocketAcceptResultErr = 2
 pkg syscall/zx/posix/socket, const StreamSocketAcceptResultErr ideal-int
 pkg syscall/zx/posix/socket, const StreamSocketAcceptResultResponse = 1
 pkg syscall/zx/posix/socket, const StreamSocketAcceptResultResponse ideal-int
-pkg syscall/zx/posix/socket, const StreamSocketBind2Ordinal = 9197974932656647351
-pkg syscall/zx/posix/socket, const StreamSocketBind2Ordinal uint64
 pkg syscall/zx/posix/socket, const StreamSocketBindOrdinal = 1118115255807776188
 pkg syscall/zx/posix/socket, const StreamSocketBindOrdinal uint64
 pkg syscall/zx/posix/socket, const StreamSocketCloneOrdinal = 6512600400724287855
 pkg syscall/zx/posix/socket, const StreamSocketCloneOrdinal uint64
 pkg syscall/zx/posix/socket, const StreamSocketCloseOrdinal = 5983530995951066180
 pkg syscall/zx/posix/socket, const StreamSocketCloseOrdinal uint64
-pkg syscall/zx/posix/socket, const StreamSocketConnect2Ordinal = 1146432661059373772
-pkg syscall/zx/posix/socket, const StreamSocketConnect2Ordinal uint64
 pkg syscall/zx/posix/socket, const StreamSocketConnectOrdinal = 1705719532842400689
 pkg syscall/zx/posix/socket, const StreamSocketConnectOrdinal uint64
 pkg syscall/zx/posix/socket, const StreamSocketDescribeOrdinal = 1152055232528178848
@@ -3781,12 +3729,8 @@
 pkg syscall/zx/posix/socket, const StreamSocketDisconnectOrdinal uint64
 pkg syscall/zx/posix/socket, const StreamSocketGetAttrOrdinal = 8689798978500614909
 pkg syscall/zx/posix/socket, const StreamSocketGetAttrOrdinal uint64
-pkg syscall/zx/posix/socket, const StreamSocketGetPeerName2Ordinal = 9074383226662875935
-pkg syscall/zx/posix/socket, const StreamSocketGetPeerName2Ordinal uint64
 pkg syscall/zx/posix/socket, const StreamSocketGetPeerNameOrdinal = 4614448585615564437
 pkg syscall/zx/posix/socket, const StreamSocketGetPeerNameOrdinal uint64
-pkg syscall/zx/posix/socket, const StreamSocketGetSockName2Ordinal = 8951648123632983667
-pkg syscall/zx/posix/socket, const StreamSocketGetSockName2Ordinal uint64
 pkg syscall/zx/posix/socket, const StreamSocketGetSockNameOrdinal = 4730495873806049181
 pkg syscall/zx/posix/socket, const StreamSocketGetSockNameOrdinal uint64
 pkg syscall/zx/posix/socket, const StreamSocketGetSockOptOrdinal = 7924918138357155140
@@ -3811,36 +3755,24 @@
 pkg syscall/zx/posix/socket, const StreamSocketSetSockOptOrdinal uint64
 pkg syscall/zx/posix/socket, const StreamSocketSyncOrdinal = 1773723578397144345
 pkg syscall/zx/posix/socket, const StreamSocketSyncOrdinal uint64
-pkg syscall/zx/posix/socket, func BaseSocketBind2ResultWithErr(posix.Errno) BaseSocketBind2Result
-pkg syscall/zx/posix/socket, func BaseSocketBind2ResultWithResponse(BaseSocketBind2Response) BaseSocketBind2Result
 pkg syscall/zx/posix/socket, func BaseSocketBindResultWithErr(posix.Errno) BaseSocketBindResult
 pkg syscall/zx/posix/socket, func BaseSocketBindResultWithResponse(BaseSocketBindResponse) BaseSocketBindResult
-pkg syscall/zx/posix/socket, func BaseSocketConnect2ResultWithErr(posix.Errno) BaseSocketConnect2Result
-pkg syscall/zx/posix/socket, func BaseSocketConnect2ResultWithResponse(BaseSocketConnect2Response) BaseSocketConnect2Result
 pkg syscall/zx/posix/socket, func BaseSocketConnectResultWithErr(posix.Errno) BaseSocketConnectResult
 pkg syscall/zx/posix/socket, func BaseSocketConnectResultWithResponse(BaseSocketConnectResponse) BaseSocketConnectResult
 pkg syscall/zx/posix/socket, func BaseSocketDisconnectResultWithErr(posix.Errno) BaseSocketDisconnectResult
 pkg syscall/zx/posix/socket, func BaseSocketDisconnectResultWithResponse(BaseSocketDisconnectResponse) BaseSocketDisconnectResult
-pkg syscall/zx/posix/socket, func BaseSocketGetPeerName2ResultWithErr(posix.Errno) BaseSocketGetPeerName2Result
-pkg syscall/zx/posix/socket, func BaseSocketGetPeerName2ResultWithResponse(BaseSocketGetPeerName2Response) BaseSocketGetPeerName2Result
 pkg syscall/zx/posix/socket, func BaseSocketGetPeerNameResultWithErr(posix.Errno) BaseSocketGetPeerNameResult
 pkg syscall/zx/posix/socket, func BaseSocketGetPeerNameResultWithResponse(BaseSocketGetPeerNameResponse) BaseSocketGetPeerNameResult
-pkg syscall/zx/posix/socket, func BaseSocketGetSockName2ResultWithErr(posix.Errno) BaseSocketGetSockName2Result
-pkg syscall/zx/posix/socket, func BaseSocketGetSockName2ResultWithResponse(BaseSocketGetSockName2Response) BaseSocketGetSockName2Result
 pkg syscall/zx/posix/socket, func BaseSocketGetSockNameResultWithErr(posix.Errno) BaseSocketGetSockNameResult
 pkg syscall/zx/posix/socket, func BaseSocketGetSockNameResultWithResponse(BaseSocketGetSockNameResponse) BaseSocketGetSockNameResult
 pkg syscall/zx/posix/socket, func BaseSocketGetSockOptResultWithErr(posix.Errno) BaseSocketGetSockOptResult
 pkg syscall/zx/posix/socket, func BaseSocketGetSockOptResultWithResponse(BaseSocketGetSockOptResponse) BaseSocketGetSockOptResult
 pkg syscall/zx/posix/socket, func BaseSocketSetSockOptResultWithErr(posix.Errno) BaseSocketSetSockOptResult
 pkg syscall/zx/posix/socket, func BaseSocketSetSockOptResultWithResponse(BaseSocketSetSockOptResponse) BaseSocketSetSockOptResult
-pkg syscall/zx/posix/socket, func DatagramSocketRecvMsg2ResultWithErr(posix.Errno) DatagramSocketRecvMsg2Result
-pkg syscall/zx/posix/socket, func DatagramSocketRecvMsg2ResultWithResponse(DatagramSocketRecvMsg2Response) DatagramSocketRecvMsg2Result
 pkg syscall/zx/posix/socket, func DatagramSocketRecvMsgResultWithErr(posix.Errno) DatagramSocketRecvMsgResult
 pkg syscall/zx/posix/socket, func DatagramSocketRecvMsgResultWithResponse(DatagramSocketRecvMsgResponse) DatagramSocketRecvMsgResult
 pkg syscall/zx/posix/socket, func DatagramSocketSendMsgResultWithErr(posix.Errno) DatagramSocketSendMsgResult
 pkg syscall/zx/posix/socket, func DatagramSocketSendMsgResultWithResponse(DatagramSocketSendMsgResponse) DatagramSocketSendMsgResult
-pkg syscall/zx/posix/socket, func DatagramSocketShutdown2ResultWithErr(posix.Errno) DatagramSocketShutdown2Result
-pkg syscall/zx/posix/socket, func DatagramSocketShutdown2ResultWithResponse(DatagramSocketShutdown2Response) DatagramSocketShutdown2Result
 pkg syscall/zx/posix/socket, func DatagramSocketShutdownResultWithErr(posix.Errno) DatagramSocketShutdownResult
 pkg syscall/zx/posix/socket, func DatagramSocketShutdownResultWithResponse(DatagramSocketShutdownResponse) DatagramSocketShutdownResult
 pkg syscall/zx/posix/socket, func NewBaseSocketWithCtxInterfaceRequest() (BaseSocketWithCtxInterfaceRequest, *BaseSocketWithCtxInterface, error)
@@ -3855,27 +3787,15 @@
 pkg syscall/zx/posix/socket, func ProviderInterfaceNameToIndexResultWithResponse(ProviderInterfaceNameToIndexResponse) ProviderInterfaceNameToIndexResult
 pkg syscall/zx/posix/socket, func ProviderStreamSocketResultWithErr(posix.Errno) ProviderStreamSocketResult
 pkg syscall/zx/posix/socket, func ProviderStreamSocketResultWithResponse(ProviderStreamSocketResponse) ProviderStreamSocketResult
-pkg syscall/zx/posix/socket, func StreamSocketAccept2ResultWithErr(posix.Errno) StreamSocketAccept2Result
-pkg syscall/zx/posix/socket, func StreamSocketAccept2ResultWithResponse(StreamSocketAccept2Response) StreamSocketAccept2Result
 pkg syscall/zx/posix/socket, func StreamSocketAcceptResultWithErr(posix.Errno) StreamSocketAcceptResult
 pkg syscall/zx/posix/socket, func StreamSocketAcceptResultWithResponse(StreamSocketAcceptResponse) StreamSocketAcceptResult
 pkg syscall/zx/posix/socket, func StreamSocketListenResultWithErr(posix.Errno) StreamSocketListenResult
 pkg syscall/zx/posix/socket, func StreamSocketListenResultWithResponse(StreamSocketListenResponse) StreamSocketListenResult
-pkg syscall/zx/posix/socket, method (*BaseSocketBind2Response) Marshaler() fidl.Marshaler
-pkg syscall/zx/posix/socket, method (*BaseSocketBind2Result) Ordinal() uint64
-pkg syscall/zx/posix/socket, method (*BaseSocketBind2Result) SetErr(posix.Errno)
-pkg syscall/zx/posix/socket, method (*BaseSocketBind2Result) SetResponse(BaseSocketBind2Response)
-pkg syscall/zx/posix/socket, method (*BaseSocketBind2Result) Which() I_baseSocketBind2ResultTag
 pkg syscall/zx/posix/socket, method (*BaseSocketBindResponse) Marshaler() fidl.Marshaler
 pkg syscall/zx/posix/socket, method (*BaseSocketBindResult) Ordinal() uint64
 pkg syscall/zx/posix/socket, method (*BaseSocketBindResult) SetErr(posix.Errno)
 pkg syscall/zx/posix/socket, method (*BaseSocketBindResult) SetResponse(BaseSocketBindResponse)
 pkg syscall/zx/posix/socket, method (*BaseSocketBindResult) Which() I_baseSocketBindResultTag
-pkg syscall/zx/posix/socket, method (*BaseSocketConnect2Response) Marshaler() fidl.Marshaler
-pkg syscall/zx/posix/socket, method (*BaseSocketConnect2Result) Ordinal() uint64
-pkg syscall/zx/posix/socket, method (*BaseSocketConnect2Result) SetErr(posix.Errno)
-pkg syscall/zx/posix/socket, method (*BaseSocketConnect2Result) SetResponse(BaseSocketConnect2Response)
-pkg syscall/zx/posix/socket, method (*BaseSocketConnect2Result) Which() I_baseSocketConnect2ResultTag
 pkg syscall/zx/posix/socket, method (*BaseSocketConnectResponse) Marshaler() fidl.Marshaler
 pkg syscall/zx/posix/socket, method (*BaseSocketConnectResult) Ordinal() uint64
 pkg syscall/zx/posix/socket, method (*BaseSocketConnectResult) SetErr(posix.Errno)
@@ -3888,21 +3808,11 @@
 pkg syscall/zx/posix/socket, method (*BaseSocketDisconnectResult) Which() I_baseSocketDisconnectResultTag
 pkg syscall/zx/posix/socket, method (*BaseSocketEventProxy) Handle() *zx.Handle
 pkg syscall/zx/posix/socket, method (*BaseSocketEventProxy) OnOpen(int32, *io.NodeInfo) error
-pkg syscall/zx/posix/socket, method (*BaseSocketGetPeerName2Response) Marshaler() fidl.Marshaler
-pkg syscall/zx/posix/socket, method (*BaseSocketGetPeerName2Result) Ordinal() uint64
-pkg syscall/zx/posix/socket, method (*BaseSocketGetPeerName2Result) SetErr(posix.Errno)
-pkg syscall/zx/posix/socket, method (*BaseSocketGetPeerName2Result) SetResponse(BaseSocketGetPeerName2Response)
-pkg syscall/zx/posix/socket, method (*BaseSocketGetPeerName2Result) Which() I_baseSocketGetPeerName2ResultTag
 pkg syscall/zx/posix/socket, method (*BaseSocketGetPeerNameResponse) Marshaler() fidl.Marshaler
 pkg syscall/zx/posix/socket, method (*BaseSocketGetPeerNameResult) Ordinal() uint64
 pkg syscall/zx/posix/socket, method (*BaseSocketGetPeerNameResult) SetErr(posix.Errno)
 pkg syscall/zx/posix/socket, method (*BaseSocketGetPeerNameResult) SetResponse(BaseSocketGetPeerNameResponse)
 pkg syscall/zx/posix/socket, method (*BaseSocketGetPeerNameResult) Which() I_baseSocketGetPeerNameResultTag
-pkg syscall/zx/posix/socket, method (*BaseSocketGetSockName2Response) Marshaler() fidl.Marshaler
-pkg syscall/zx/posix/socket, method (*BaseSocketGetSockName2Result) Ordinal() uint64
-pkg syscall/zx/posix/socket, method (*BaseSocketGetSockName2Result) SetErr(posix.Errno)
-pkg syscall/zx/posix/socket, method (*BaseSocketGetSockName2Result) SetResponse(BaseSocketGetSockName2Response)
-pkg syscall/zx/posix/socket, method (*BaseSocketGetSockName2Result) Which() I_baseSocketGetSockName2ResultTag
 pkg syscall/zx/posix/socket, method (*BaseSocketGetSockNameResponse) Marshaler() fidl.Marshaler
 pkg syscall/zx/posix/socket, method (*BaseSocketGetSockNameResult) Ordinal() uint64
 pkg syscall/zx/posix/socket, method (*BaseSocketGetSockNameResult) SetErr(posix.Errno)
@@ -3919,19 +3829,15 @@
 pkg syscall/zx/posix/socket, method (*BaseSocketSetSockOptResult) SetResponse(BaseSocketSetSockOptResponse)
 pkg syscall/zx/posix/socket, method (*BaseSocketSetSockOptResult) Which() I_baseSocketSetSockOptResultTag
 pkg syscall/zx/posix/socket, method (*BaseSocketWithCtxInterface) Bind(context.Context, net.SocketAddress) (BaseSocketBindResult, error)
-pkg syscall/zx/posix/socket, method (*BaseSocketWithCtxInterface) Bind2(context.Context, net.SocketAddress) (BaseSocketBind2Result, error)
 pkg syscall/zx/posix/socket, method (*BaseSocketWithCtxInterface) Clone(context.Context, uint32, io.NodeWithCtxInterfaceRequest) error
 pkg syscall/zx/posix/socket, method (*BaseSocketWithCtxInterface) Close(context.Context) (int32, error)
 pkg syscall/zx/posix/socket, method (*BaseSocketWithCtxInterface) Connect(context.Context, net.SocketAddress) (BaseSocketConnectResult, error)
-pkg syscall/zx/posix/socket, method (*BaseSocketWithCtxInterface) Connect2(context.Context, net.SocketAddress) (BaseSocketConnect2Result, error)
 pkg syscall/zx/posix/socket, method (*BaseSocketWithCtxInterface) Describe(context.Context) (io.NodeInfo, error)
 pkg syscall/zx/posix/socket, method (*BaseSocketWithCtxInterface) Disconnect(context.Context) (BaseSocketDisconnectResult, error)
 pkg syscall/zx/posix/socket, method (*BaseSocketWithCtxInterface) ExpectOnOpen(context.Context) (int32, *io.NodeInfo, error)
 pkg syscall/zx/posix/socket, method (*BaseSocketWithCtxInterface) GetAttr(context.Context) (int32, io.NodeAttributes, error)
 pkg syscall/zx/posix/socket, method (*BaseSocketWithCtxInterface) GetPeerName(context.Context) (BaseSocketGetPeerNameResult, error)
-pkg syscall/zx/posix/socket, method (*BaseSocketWithCtxInterface) GetPeerName2(context.Context) (BaseSocketGetPeerName2Result, error)
 pkg syscall/zx/posix/socket, method (*BaseSocketWithCtxInterface) GetSockName(context.Context) (BaseSocketGetSockNameResult, error)
-pkg syscall/zx/posix/socket, method (*BaseSocketWithCtxInterface) GetSockName2(context.Context) (BaseSocketGetSockName2Result, error)
 pkg syscall/zx/posix/socket, method (*BaseSocketWithCtxInterface) GetSockOpt(context.Context, int16, int16) (BaseSocketGetSockOptResult, error)
 pkg syscall/zx/posix/socket, method (*BaseSocketWithCtxInterface) Handle() *zx.Handle
 pkg syscall/zx/posix/socket, method (*BaseSocketWithCtxInterface) NodeGetFlags(context.Context) (int32, uint32, error)
@@ -3945,11 +3851,6 @@
 pkg syscall/zx/posix/socket, method (*BaseSocketWithCtxTransitionalBase) NodeSetFlags(context.Context, uint32) (int32, error)
 pkg syscall/zx/posix/socket, method (*DatagramSocketEventProxy) Handle() *zx.Handle
 pkg syscall/zx/posix/socket, method (*DatagramSocketEventProxy) OnOpen(int32, *io.NodeInfo) error
-pkg syscall/zx/posix/socket, method (*DatagramSocketRecvMsg2Response) Marshaler() fidl.Marshaler
-pkg syscall/zx/posix/socket, method (*DatagramSocketRecvMsg2Result) Ordinal() uint64
-pkg syscall/zx/posix/socket, method (*DatagramSocketRecvMsg2Result) SetErr(posix.Errno)
-pkg syscall/zx/posix/socket, method (*DatagramSocketRecvMsg2Result) SetResponse(DatagramSocketRecvMsg2Response)
-pkg syscall/zx/posix/socket, method (*DatagramSocketRecvMsg2Result) Which() I_datagramSocketRecvMsg2ResultTag
 pkg syscall/zx/posix/socket, method (*DatagramSocketRecvMsgResponse) Marshaler() fidl.Marshaler
 pkg syscall/zx/posix/socket, method (*DatagramSocketRecvMsgResult) Ordinal() uint64
 pkg syscall/zx/posix/socket, method (*DatagramSocketRecvMsgResult) SetErr(posix.Errno)
@@ -3960,41 +3861,30 @@
 pkg syscall/zx/posix/socket, method (*DatagramSocketSendMsgResult) SetErr(posix.Errno)
 pkg syscall/zx/posix/socket, method (*DatagramSocketSendMsgResult) SetResponse(DatagramSocketSendMsgResponse)
 pkg syscall/zx/posix/socket, method (*DatagramSocketSendMsgResult) Which() I_datagramSocketSendMsgResultTag
-pkg syscall/zx/posix/socket, method (*DatagramSocketShutdown2Response) Marshaler() fidl.Marshaler
-pkg syscall/zx/posix/socket, method (*DatagramSocketShutdown2Result) Ordinal() uint64
-pkg syscall/zx/posix/socket, method (*DatagramSocketShutdown2Result) SetErr(posix.Errno)
-pkg syscall/zx/posix/socket, method (*DatagramSocketShutdown2Result) SetResponse(DatagramSocketShutdown2Response)
-pkg syscall/zx/posix/socket, method (*DatagramSocketShutdown2Result) Which() I_datagramSocketShutdown2ResultTag
 pkg syscall/zx/posix/socket, method (*DatagramSocketShutdownResponse) Marshaler() fidl.Marshaler
 pkg syscall/zx/posix/socket, method (*DatagramSocketShutdownResult) Ordinal() uint64
 pkg syscall/zx/posix/socket, method (*DatagramSocketShutdownResult) SetErr(posix.Errno)
 pkg syscall/zx/posix/socket, method (*DatagramSocketShutdownResult) SetResponse(DatagramSocketShutdownResponse)
 pkg syscall/zx/posix/socket, method (*DatagramSocketShutdownResult) Which() I_datagramSocketShutdownResultTag
 pkg syscall/zx/posix/socket, method (*DatagramSocketWithCtxInterface) Bind(context.Context, net.SocketAddress) (BaseSocketBindResult, error)
-pkg syscall/zx/posix/socket, method (*DatagramSocketWithCtxInterface) Bind2(context.Context, net.SocketAddress) (BaseSocketBind2Result, error)
 pkg syscall/zx/posix/socket, method (*DatagramSocketWithCtxInterface) Clone(context.Context, uint32, io.NodeWithCtxInterfaceRequest) error
 pkg syscall/zx/posix/socket, method (*DatagramSocketWithCtxInterface) Close(context.Context) (int32, error)
 pkg syscall/zx/posix/socket, method (*DatagramSocketWithCtxInterface) Connect(context.Context, net.SocketAddress) (BaseSocketConnectResult, error)
-pkg syscall/zx/posix/socket, method (*DatagramSocketWithCtxInterface) Connect2(context.Context, net.SocketAddress) (BaseSocketConnect2Result, error)
 pkg syscall/zx/posix/socket, method (*DatagramSocketWithCtxInterface) Describe(context.Context) (io.NodeInfo, error)
 pkg syscall/zx/posix/socket, method (*DatagramSocketWithCtxInterface) Disconnect(context.Context) (BaseSocketDisconnectResult, error)
 pkg syscall/zx/posix/socket, method (*DatagramSocketWithCtxInterface) ExpectOnOpen(context.Context) (int32, *io.NodeInfo, error)
 pkg syscall/zx/posix/socket, method (*DatagramSocketWithCtxInterface) GetAttr(context.Context) (int32, io.NodeAttributes, error)
 pkg syscall/zx/posix/socket, method (*DatagramSocketWithCtxInterface) GetPeerName(context.Context) (BaseSocketGetPeerNameResult, error)
-pkg syscall/zx/posix/socket, method (*DatagramSocketWithCtxInterface) GetPeerName2(context.Context) (BaseSocketGetPeerName2Result, error)
 pkg syscall/zx/posix/socket, method (*DatagramSocketWithCtxInterface) GetSockName(context.Context) (BaseSocketGetSockNameResult, error)
-pkg syscall/zx/posix/socket, method (*DatagramSocketWithCtxInterface) GetSockName2(context.Context) (BaseSocketGetSockName2Result, error)
 pkg syscall/zx/posix/socket, method (*DatagramSocketWithCtxInterface) GetSockOpt(context.Context, int16, int16) (BaseSocketGetSockOptResult, error)
 pkg syscall/zx/posix/socket, method (*DatagramSocketWithCtxInterface) Handle() *zx.Handle
 pkg syscall/zx/posix/socket, method (*DatagramSocketWithCtxInterface) NodeGetFlags(context.Context) (int32, uint32, error)
 pkg syscall/zx/posix/socket, method (*DatagramSocketWithCtxInterface) NodeSetFlags(context.Context, uint32) (int32, error)
 pkg syscall/zx/posix/socket, method (*DatagramSocketWithCtxInterface) RecvMsg(context.Context, bool, uint32, bool, RecvMsgFlags) (DatagramSocketRecvMsgResult, error)
-pkg syscall/zx/posix/socket, method (*DatagramSocketWithCtxInterface) RecvMsg2(context.Context, bool, uint32, bool, RecvMsgFlags) (DatagramSocketRecvMsg2Result, error)
 pkg syscall/zx/posix/socket, method (*DatagramSocketWithCtxInterface) SendMsg(context.Context, *net.SocketAddress, []uint8, SendControlData, SendMsgFlags) (DatagramSocketSendMsgResult, error)
 pkg syscall/zx/posix/socket, method (*DatagramSocketWithCtxInterface) SetAttr(context.Context, uint32, io.NodeAttributes) (int32, error)
 pkg syscall/zx/posix/socket, method (*DatagramSocketWithCtxInterface) SetSockOpt(context.Context, int16, int16, []uint8) (BaseSocketSetSockOptResult, error)
 pkg syscall/zx/posix/socket, method (*DatagramSocketWithCtxInterface) Shutdown(context.Context, ShutdownMode) (DatagramSocketShutdownResult, error)
-pkg syscall/zx/posix/socket, method (*DatagramSocketWithCtxInterface) Shutdown2(context.Context, ShutdownMode) (DatagramSocketShutdown2Result, error)
 pkg syscall/zx/posix/socket, method (*DatagramSocketWithCtxInterface) Sync(context.Context) (int32, error)
 pkg syscall/zx/posix/socket, method (*DatagramSocketWithCtxInterfaceRequest) Handle() *zx.Handle
 pkg syscall/zx/posix/socket, method (*DatagramSocketWithCtxStub) Dispatch(fidl.DispatchArgs) (fidl.Message, bool, error)
@@ -4056,11 +3946,6 @@
 pkg syscall/zx/posix/socket, method (*RecvControlData) HasUnknownData() bool
 pkg syscall/zx/posix/socket, method (*SendControlData) GetUnknownData() map[uint64]fidl.UnknownData
 pkg syscall/zx/posix/socket, method (*SendControlData) HasUnknownData() bool
-pkg syscall/zx/posix/socket, method (*StreamSocketAccept2Response) Marshaler() fidl.Marshaler
-pkg syscall/zx/posix/socket, method (*StreamSocketAccept2Result) Ordinal() uint64
-pkg syscall/zx/posix/socket, method (*StreamSocketAccept2Result) SetErr(posix.Errno)
-pkg syscall/zx/posix/socket, method (*StreamSocketAccept2Result) SetResponse(StreamSocketAccept2Response)
-pkg syscall/zx/posix/socket, method (*StreamSocketAccept2Result) Which() I_streamSocketAccept2ResultTag
 pkg syscall/zx/posix/socket, method (*StreamSocketAcceptResponse) Marshaler() fidl.Marshaler
 pkg syscall/zx/posix/socket, method (*StreamSocketAcceptResult) Ordinal() uint64
 pkg syscall/zx/posix/socket, method (*StreamSocketAcceptResult) SetErr(posix.Errno)
@@ -4074,21 +3959,16 @@
 pkg syscall/zx/posix/socket, method (*StreamSocketListenResult) SetResponse(StreamSocketListenResponse)
 pkg syscall/zx/posix/socket, method (*StreamSocketListenResult) Which() I_streamSocketListenResultTag
 pkg syscall/zx/posix/socket, method (*StreamSocketWithCtxInterface) Accept(context.Context, bool) (StreamSocketAcceptResult, error)
-pkg syscall/zx/posix/socket, method (*StreamSocketWithCtxInterface) Accept2(context.Context) (StreamSocketAccept2Result, error)
 pkg syscall/zx/posix/socket, method (*StreamSocketWithCtxInterface) Bind(context.Context, net.SocketAddress) (BaseSocketBindResult, error)
-pkg syscall/zx/posix/socket, method (*StreamSocketWithCtxInterface) Bind2(context.Context, net.SocketAddress) (BaseSocketBind2Result, error)
 pkg syscall/zx/posix/socket, method (*StreamSocketWithCtxInterface) Clone(context.Context, uint32, io.NodeWithCtxInterfaceRequest) error
 pkg syscall/zx/posix/socket, method (*StreamSocketWithCtxInterface) Close(context.Context) (int32, error)
 pkg syscall/zx/posix/socket, method (*StreamSocketWithCtxInterface) Connect(context.Context, net.SocketAddress) (BaseSocketConnectResult, error)
-pkg syscall/zx/posix/socket, method (*StreamSocketWithCtxInterface) Connect2(context.Context, net.SocketAddress) (BaseSocketConnect2Result, error)
 pkg syscall/zx/posix/socket, method (*StreamSocketWithCtxInterface) Describe(context.Context) (io.NodeInfo, error)
 pkg syscall/zx/posix/socket, method (*StreamSocketWithCtxInterface) Disconnect(context.Context) (BaseSocketDisconnectResult, error)
 pkg syscall/zx/posix/socket, method (*StreamSocketWithCtxInterface) ExpectOnOpen(context.Context) (int32, *io.NodeInfo, error)
 pkg syscall/zx/posix/socket, method (*StreamSocketWithCtxInterface) GetAttr(context.Context) (int32, io.NodeAttributes, error)
 pkg syscall/zx/posix/socket, method (*StreamSocketWithCtxInterface) GetPeerName(context.Context) (BaseSocketGetPeerNameResult, error)
-pkg syscall/zx/posix/socket, method (*StreamSocketWithCtxInterface) GetPeerName2(context.Context) (BaseSocketGetPeerName2Result, error)
 pkg syscall/zx/posix/socket, method (*StreamSocketWithCtxInterface) GetSockName(context.Context) (BaseSocketGetSockNameResult, error)
-pkg syscall/zx/posix/socket, method (*StreamSocketWithCtxInterface) GetSockName2(context.Context) (BaseSocketGetSockName2Result, error)
 pkg syscall/zx/posix/socket, method (*StreamSocketWithCtxInterface) GetSockOpt(context.Context, int16, int16) (BaseSocketGetSockOptResult, error)
 pkg syscall/zx/posix/socket, method (*StreamSocketWithCtxInterface) Handle() *zx.Handle
 pkg syscall/zx/posix/socket, method (*StreamSocketWithCtxInterface) Listen(context.Context, int16) (StreamSocketListenResult, error)
@@ -4130,21 +4010,11 @@
 pkg syscall/zx/posix/socket, method (StreamSocketProtocol) I_EnumValues() []StreamSocketProtocol
 pkg syscall/zx/posix/socket, method (StreamSocketProtocol) IsUnknown() bool
 pkg syscall/zx/posix/socket, method (StreamSocketProtocol) String() string
-pkg syscall/zx/posix/socket, type BaseSocketBind2Response struct
-pkg syscall/zx/posix/socket, type BaseSocketBind2Result struct
-pkg syscall/zx/posix/socket, type BaseSocketBind2Result struct, Err posix.Errno
-pkg syscall/zx/posix/socket, type BaseSocketBind2Result struct, Response BaseSocketBind2Response
-pkg syscall/zx/posix/socket, type BaseSocketBind2Result struct, embedded I_baseSocketBind2ResultTag
 pkg syscall/zx/posix/socket, type BaseSocketBindResponse struct
 pkg syscall/zx/posix/socket, type BaseSocketBindResult struct
 pkg syscall/zx/posix/socket, type BaseSocketBindResult struct, Err posix.Errno
 pkg syscall/zx/posix/socket, type BaseSocketBindResult struct, Response BaseSocketBindResponse
 pkg syscall/zx/posix/socket, type BaseSocketBindResult struct, embedded I_baseSocketBindResultTag
-pkg syscall/zx/posix/socket, type BaseSocketConnect2Response struct
-pkg syscall/zx/posix/socket, type BaseSocketConnect2Result struct
-pkg syscall/zx/posix/socket, type BaseSocketConnect2Result struct, Err posix.Errno
-pkg syscall/zx/posix/socket, type BaseSocketConnect2Result struct, Response BaseSocketConnect2Response
-pkg syscall/zx/posix/socket, type BaseSocketConnect2Result struct, embedded I_baseSocketConnect2ResultTag
 pkg syscall/zx/posix/socket, type BaseSocketConnectResponse struct
 pkg syscall/zx/posix/socket, type BaseSocketConnectResult struct
 pkg syscall/zx/posix/socket, type BaseSocketConnectResult struct, Err posix.Errno
@@ -4157,24 +4027,12 @@
 pkg syscall/zx/posix/socket, type BaseSocketDisconnectResult struct, embedded I_baseSocketDisconnectResultTag
 pkg syscall/zx/posix/socket, type BaseSocketEventProxy struct
 pkg syscall/zx/posix/socket, type BaseSocketEventProxy struct, embedded zx.Channel
-pkg syscall/zx/posix/socket, type BaseSocketGetPeerName2Response struct
-pkg syscall/zx/posix/socket, type BaseSocketGetPeerName2Response struct, Addr net.SocketAddress
-pkg syscall/zx/posix/socket, type BaseSocketGetPeerName2Result struct
-pkg syscall/zx/posix/socket, type BaseSocketGetPeerName2Result struct, Err posix.Errno
-pkg syscall/zx/posix/socket, type BaseSocketGetPeerName2Result struct, Response BaseSocketGetPeerName2Response
-pkg syscall/zx/posix/socket, type BaseSocketGetPeerName2Result struct, embedded I_baseSocketGetPeerName2ResultTag
 pkg syscall/zx/posix/socket, type BaseSocketGetPeerNameResponse struct
 pkg syscall/zx/posix/socket, type BaseSocketGetPeerNameResponse struct, Addr net.SocketAddress
 pkg syscall/zx/posix/socket, type BaseSocketGetPeerNameResult struct
 pkg syscall/zx/posix/socket, type BaseSocketGetPeerNameResult struct, Err posix.Errno
 pkg syscall/zx/posix/socket, type BaseSocketGetPeerNameResult struct, Response BaseSocketGetPeerNameResponse
 pkg syscall/zx/posix/socket, type BaseSocketGetPeerNameResult struct, embedded I_baseSocketGetPeerNameResultTag
-pkg syscall/zx/posix/socket, type BaseSocketGetSockName2Response struct
-pkg syscall/zx/posix/socket, type BaseSocketGetSockName2Response struct, Addr net.SocketAddress
-pkg syscall/zx/posix/socket, type BaseSocketGetSockName2Result struct
-pkg syscall/zx/posix/socket, type BaseSocketGetSockName2Result struct, Err posix.Errno
-pkg syscall/zx/posix/socket, type BaseSocketGetSockName2Result struct, Response BaseSocketGetSockName2Response
-pkg syscall/zx/posix/socket, type BaseSocketGetSockName2Result struct, embedded I_baseSocketGetSockName2ResultTag
 pkg syscall/zx/posix/socket, type BaseSocketGetSockNameResponse struct
 pkg syscall/zx/posix/socket, type BaseSocketGetSockNameResponse struct, Addr net.SocketAddress
 pkg syscall/zx/posix/socket, type BaseSocketGetSockNameResult struct
@@ -4192,20 +4050,16 @@
 pkg syscall/zx/posix/socket, type BaseSocketSetSockOptResult struct, Err posix.Errno
 pkg syscall/zx/posix/socket, type BaseSocketSetSockOptResult struct, Response BaseSocketSetSockOptResponse
 pkg syscall/zx/posix/socket, type BaseSocketSetSockOptResult struct, embedded I_baseSocketSetSockOptResultTag
-pkg syscall/zx/posix/socket, type BaseSocketWithCtx interface { Bind, Bind2, Clone, Close, Connect, Connect2, Describe, Disconnect, GetAttr, GetPeerName, GetPeerName2, GetSockName, GetSockName2, GetSockOpt, NodeGetFlags, NodeSetFlags, SetAttr, SetSockOpt, Sync }
+pkg syscall/zx/posix/socket, type BaseSocketWithCtx interface { Bind, Clone, Close, Connect, Describe, Disconnect, GetAttr, GetPeerName, GetSockName, GetSockOpt, NodeGetFlags, NodeSetFlags, SetAttr, SetSockOpt, Sync }
 pkg syscall/zx/posix/socket, type BaseSocketWithCtx interface, Bind(context.Context, net.SocketAddress) (BaseSocketBindResult, error)
-pkg syscall/zx/posix/socket, type BaseSocketWithCtx interface, Bind2(context.Context, net.SocketAddress) (BaseSocketBind2Result, error)
 pkg syscall/zx/posix/socket, type BaseSocketWithCtx interface, Clone(context.Context, uint32, io.NodeWithCtxInterfaceRequest) error
 pkg syscall/zx/posix/socket, type BaseSocketWithCtx interface, Close(context.Context) (int32, error)
 pkg syscall/zx/posix/socket, type BaseSocketWithCtx interface, Connect(context.Context, net.SocketAddress) (BaseSocketConnectResult, error)
-pkg syscall/zx/posix/socket, type BaseSocketWithCtx interface, Connect2(context.Context, net.SocketAddress) (BaseSocketConnect2Result, error)
 pkg syscall/zx/posix/socket, type BaseSocketWithCtx interface, Describe(context.Context) (io.NodeInfo, error)
 pkg syscall/zx/posix/socket, type BaseSocketWithCtx interface, Disconnect(context.Context) (BaseSocketDisconnectResult, error)
 pkg syscall/zx/posix/socket, type BaseSocketWithCtx interface, GetAttr(context.Context) (int32, io.NodeAttributes, error)
 pkg syscall/zx/posix/socket, type BaseSocketWithCtx interface, GetPeerName(context.Context) (BaseSocketGetPeerNameResult, error)
-pkg syscall/zx/posix/socket, type BaseSocketWithCtx interface, GetPeerName2(context.Context) (BaseSocketGetPeerName2Result, error)
 pkg syscall/zx/posix/socket, type BaseSocketWithCtx interface, GetSockName(context.Context) (BaseSocketGetSockNameResult, error)
-pkg syscall/zx/posix/socket, type BaseSocketWithCtx interface, GetSockName2(context.Context) (BaseSocketGetSockName2Result, error)
 pkg syscall/zx/posix/socket, type BaseSocketWithCtx interface, GetSockOpt(context.Context, int16, int16) (BaseSocketGetSockOptResult, error)
 pkg syscall/zx/posix/socket, type BaseSocketWithCtx interface, NodeGetFlags(context.Context) (int32, uint32, error)
 pkg syscall/zx/posix/socket, type BaseSocketWithCtx interface, NodeSetFlags(context.Context, uint32) (int32, error)
@@ -4222,15 +4076,6 @@
 pkg syscall/zx/posix/socket, type DatagramSocketEventProxy struct
 pkg syscall/zx/posix/socket, type DatagramSocketEventProxy struct, embedded zx.Channel
 pkg syscall/zx/posix/socket, type DatagramSocketProtocol uint32
-pkg syscall/zx/posix/socket, type DatagramSocketRecvMsg2Response struct
-pkg syscall/zx/posix/socket, type DatagramSocketRecvMsg2Response struct, Addr *net.SocketAddress
-pkg syscall/zx/posix/socket, type DatagramSocketRecvMsg2Response struct, Control RecvControlData
-pkg syscall/zx/posix/socket, type DatagramSocketRecvMsg2Response struct, Data []uint8
-pkg syscall/zx/posix/socket, type DatagramSocketRecvMsg2Response struct, Truncated uint32
-pkg syscall/zx/posix/socket, type DatagramSocketRecvMsg2Result struct
-pkg syscall/zx/posix/socket, type DatagramSocketRecvMsg2Result struct, Err posix.Errno
-pkg syscall/zx/posix/socket, type DatagramSocketRecvMsg2Result struct, Response DatagramSocketRecvMsg2Response
-pkg syscall/zx/posix/socket, type DatagramSocketRecvMsg2Result struct, embedded I_datagramSocketRecvMsg2ResultTag
 pkg syscall/zx/posix/socket, type DatagramSocketRecvMsgResponse struct
 pkg syscall/zx/posix/socket, type DatagramSocketRecvMsgResponse struct, Addr *net.SocketAddress
 pkg syscall/zx/posix/socket, type DatagramSocketRecvMsgResponse struct, Control RecvControlData
@@ -4246,40 +4091,29 @@
 pkg syscall/zx/posix/socket, type DatagramSocketSendMsgResult struct, Err posix.Errno
 pkg syscall/zx/posix/socket, type DatagramSocketSendMsgResult struct, Response DatagramSocketSendMsgResponse
 pkg syscall/zx/posix/socket, type DatagramSocketSendMsgResult struct, embedded I_datagramSocketSendMsgResultTag
-pkg syscall/zx/posix/socket, type DatagramSocketShutdown2Response struct
-pkg syscall/zx/posix/socket, type DatagramSocketShutdown2Result struct
-pkg syscall/zx/posix/socket, type DatagramSocketShutdown2Result struct, Err posix.Errno
-pkg syscall/zx/posix/socket, type DatagramSocketShutdown2Result struct, Response DatagramSocketShutdown2Response
-pkg syscall/zx/posix/socket, type DatagramSocketShutdown2Result struct, embedded I_datagramSocketShutdown2ResultTag
 pkg syscall/zx/posix/socket, type DatagramSocketShutdownResponse struct
 pkg syscall/zx/posix/socket, type DatagramSocketShutdownResult struct
 pkg syscall/zx/posix/socket, type DatagramSocketShutdownResult struct, Err posix.Errno
 pkg syscall/zx/posix/socket, type DatagramSocketShutdownResult struct, Response DatagramSocketShutdownResponse
 pkg syscall/zx/posix/socket, type DatagramSocketShutdownResult struct, embedded I_datagramSocketShutdownResultTag
-pkg syscall/zx/posix/socket, type DatagramSocketWithCtx interface { Bind, Bind2, Clone, Close, Connect, Connect2, Describe, Disconnect, GetAttr, GetPeerName, GetPeerName2, GetSockName, GetSockName2, GetSockOpt, NodeGetFlags, NodeSetFlags, RecvMsg, RecvMsg2, SendMsg, SetAttr, SetSockOpt, Shutdown, Shutdown2, Sync }
+pkg syscall/zx/posix/socket, type DatagramSocketWithCtx interface { Bind, Clone, Close, Connect, Describe, Disconnect, GetAttr, GetPeerName, GetSockName, GetSockOpt, NodeGetFlags, NodeSetFlags, RecvMsg, SendMsg, SetAttr, SetSockOpt, Shutdown, Sync }
 pkg syscall/zx/posix/socket, type DatagramSocketWithCtx interface, Bind(context.Context, net.SocketAddress) (BaseSocketBindResult, error)
-pkg syscall/zx/posix/socket, type DatagramSocketWithCtx interface, Bind2(context.Context, net.SocketAddress) (BaseSocketBind2Result, error)
 pkg syscall/zx/posix/socket, type DatagramSocketWithCtx interface, Clone(context.Context, uint32, io.NodeWithCtxInterfaceRequest) error
 pkg syscall/zx/posix/socket, type DatagramSocketWithCtx interface, Close(context.Context) (int32, error)
 pkg syscall/zx/posix/socket, type DatagramSocketWithCtx interface, Connect(context.Context, net.SocketAddress) (BaseSocketConnectResult, error)
-pkg syscall/zx/posix/socket, type DatagramSocketWithCtx interface, Connect2(context.Context, net.SocketAddress) (BaseSocketConnect2Result, error)
 pkg syscall/zx/posix/socket, type DatagramSocketWithCtx interface, Describe(context.Context) (io.NodeInfo, error)
 pkg syscall/zx/posix/socket, type DatagramSocketWithCtx interface, Disconnect(context.Context) (BaseSocketDisconnectResult, error)
 pkg syscall/zx/posix/socket, type DatagramSocketWithCtx interface, GetAttr(context.Context) (int32, io.NodeAttributes, error)
 pkg syscall/zx/posix/socket, type DatagramSocketWithCtx interface, GetPeerName(context.Context) (BaseSocketGetPeerNameResult, error)
-pkg syscall/zx/posix/socket, type DatagramSocketWithCtx interface, GetPeerName2(context.Context) (BaseSocketGetPeerName2Result, error)
 pkg syscall/zx/posix/socket, type DatagramSocketWithCtx interface, GetSockName(context.Context) (BaseSocketGetSockNameResult, error)
-pkg syscall/zx/posix/socket, type DatagramSocketWithCtx interface, GetSockName2(context.Context) (BaseSocketGetSockName2Result, error)
 pkg syscall/zx/posix/socket, type DatagramSocketWithCtx interface, GetSockOpt(context.Context, int16, int16) (BaseSocketGetSockOptResult, error)
 pkg syscall/zx/posix/socket, type DatagramSocketWithCtx interface, NodeGetFlags(context.Context) (int32, uint32, error)
 pkg syscall/zx/posix/socket, type DatagramSocketWithCtx interface, NodeSetFlags(context.Context, uint32) (int32, error)
 pkg syscall/zx/posix/socket, type DatagramSocketWithCtx interface, RecvMsg(context.Context, bool, uint32, bool, RecvMsgFlags) (DatagramSocketRecvMsgResult, error)
-pkg syscall/zx/posix/socket, type DatagramSocketWithCtx interface, RecvMsg2(context.Context, bool, uint32, bool, RecvMsgFlags) (DatagramSocketRecvMsg2Result, error)
 pkg syscall/zx/posix/socket, type DatagramSocketWithCtx interface, SendMsg(context.Context, *net.SocketAddress, []uint8, SendControlData, SendMsgFlags) (DatagramSocketSendMsgResult, error)
 pkg syscall/zx/posix/socket, type DatagramSocketWithCtx interface, SetAttr(context.Context, uint32, io.NodeAttributes) (int32, error)
 pkg syscall/zx/posix/socket, type DatagramSocketWithCtx interface, SetSockOpt(context.Context, int16, int16, []uint8) (BaseSocketSetSockOptResult, error)
 pkg syscall/zx/posix/socket, type DatagramSocketWithCtx interface, Shutdown(context.Context, ShutdownMode) (DatagramSocketShutdownResult, error)
-pkg syscall/zx/posix/socket, type DatagramSocketWithCtx interface, Shutdown2(context.Context, ShutdownMode) (DatagramSocketShutdown2Result, error)
 pkg syscall/zx/posix/socket, type DatagramSocketWithCtx interface, Sync(context.Context) (int32, error)
 pkg syscall/zx/posix/socket, type DatagramSocketWithCtxInterface struct
 pkg syscall/zx/posix/socket, type DatagramSocketWithCtxInterface struct, embedded zx.Channel
@@ -4290,27 +4124,20 @@
 pkg syscall/zx/posix/socket, type DatagramSocketWithCtxTransitionalBase struct
 pkg syscall/zx/posix/socket, type Domain int16
 pkg syscall/zx/posix/socket, type Empty struct
-pkg syscall/zx/posix/socket, type I_baseSocketBind2ResultTag uint64
 pkg syscall/zx/posix/socket, type I_baseSocketBindResultTag uint64
-pkg syscall/zx/posix/socket, type I_baseSocketConnect2ResultTag uint64
 pkg syscall/zx/posix/socket, type I_baseSocketConnectResultTag uint64
 pkg syscall/zx/posix/socket, type I_baseSocketDisconnectResultTag uint64
-pkg syscall/zx/posix/socket, type I_baseSocketGetPeerName2ResultTag uint64
 pkg syscall/zx/posix/socket, type I_baseSocketGetPeerNameResultTag uint64
-pkg syscall/zx/posix/socket, type I_baseSocketGetSockName2ResultTag uint64
 pkg syscall/zx/posix/socket, type I_baseSocketGetSockNameResultTag uint64
 pkg syscall/zx/posix/socket, type I_baseSocketGetSockOptResultTag uint64
 pkg syscall/zx/posix/socket, type I_baseSocketSetSockOptResultTag uint64
-pkg syscall/zx/posix/socket, type I_datagramSocketRecvMsg2ResultTag uint64
 pkg syscall/zx/posix/socket, type I_datagramSocketRecvMsgResultTag uint64
 pkg syscall/zx/posix/socket, type I_datagramSocketSendMsgResultTag uint64
-pkg syscall/zx/posix/socket, type I_datagramSocketShutdown2ResultTag uint64
 pkg syscall/zx/posix/socket, type I_datagramSocketShutdownResultTag uint64
 pkg syscall/zx/posix/socket, type I_providerDatagramSocketResultTag uint64
 pkg syscall/zx/posix/socket, type I_providerInterfaceIndexToNameResultTag uint64
 pkg syscall/zx/posix/socket, type I_providerInterfaceNameToIndexResultTag uint64
 pkg syscall/zx/posix/socket, type I_providerStreamSocketResultTag uint64
-pkg syscall/zx/posix/socket, type I_streamSocketAccept2ResultTag uint64
 pkg syscall/zx/posix/socket, type I_streamSocketAcceptResultTag uint64
 pkg syscall/zx/posix/socket, type I_streamSocketListenResultTag uint64
 pkg syscall/zx/posix/socket, type InterfaceAddresses struct
@@ -4369,12 +4196,6 @@
 pkg syscall/zx/posix/socket, type SendControlData struct, I_unknownData interface{}
 pkg syscall/zx/posix/socket, type SendMsgFlags uint16
 pkg syscall/zx/posix/socket, type ShutdownMode uint16
-pkg syscall/zx/posix/socket, type StreamSocketAccept2Response struct
-pkg syscall/zx/posix/socket, type StreamSocketAccept2Response struct, S StreamSocketWithCtxInterface
-pkg syscall/zx/posix/socket, type StreamSocketAccept2Result struct
-pkg syscall/zx/posix/socket, type StreamSocketAccept2Result struct, Err posix.Errno
-pkg syscall/zx/posix/socket, type StreamSocketAccept2Result struct, Response StreamSocketAccept2Response
-pkg syscall/zx/posix/socket, type StreamSocketAccept2Result struct, embedded I_streamSocketAccept2ResultTag
 pkg syscall/zx/posix/socket, type StreamSocketAcceptResponse struct
 pkg syscall/zx/posix/socket, type StreamSocketAcceptResponse struct, Addr *net.SocketAddress
 pkg syscall/zx/posix/socket, type StreamSocketAcceptResponse struct, S StreamSocketWithCtxInterface
@@ -4390,22 +4211,17 @@
 pkg syscall/zx/posix/socket, type StreamSocketListenResult struct, Response StreamSocketListenResponse
 pkg syscall/zx/posix/socket, type StreamSocketListenResult struct, embedded I_streamSocketListenResultTag
 pkg syscall/zx/posix/socket, type StreamSocketProtocol uint32
-pkg syscall/zx/posix/socket, type StreamSocketWithCtx interface { Accept, Accept2, Bind, Bind2, Clone, Close, Connect, Connect2, Describe, Disconnect, GetAttr, GetPeerName, GetPeerName2, GetSockName, GetSockName2, GetSockOpt, Listen, NodeGetFlags, NodeSetFlags, SetAttr, SetSockOpt, Sync }
+pkg syscall/zx/posix/socket, type StreamSocketWithCtx interface { Accept, Bind, Clone, Close, Connect, Describe, Disconnect, GetAttr, GetPeerName, GetSockName, GetSockOpt, Listen, NodeGetFlags, NodeSetFlags, SetAttr, SetSockOpt, Sync }
 pkg syscall/zx/posix/socket, type StreamSocketWithCtx interface, Accept(context.Context, bool) (StreamSocketAcceptResult, error)
-pkg syscall/zx/posix/socket, type StreamSocketWithCtx interface, Accept2(context.Context) (StreamSocketAccept2Result, error)
 pkg syscall/zx/posix/socket, type StreamSocketWithCtx interface, Bind(context.Context, net.SocketAddress) (BaseSocketBindResult, error)
-pkg syscall/zx/posix/socket, type StreamSocketWithCtx interface, Bind2(context.Context, net.SocketAddress) (BaseSocketBind2Result, error)
 pkg syscall/zx/posix/socket, type StreamSocketWithCtx interface, Clone(context.Context, uint32, io.NodeWithCtxInterfaceRequest) error
 pkg syscall/zx/posix/socket, type StreamSocketWithCtx interface, Close(context.Context) (int32, error)
 pkg syscall/zx/posix/socket, type StreamSocketWithCtx interface, Connect(context.Context, net.SocketAddress) (BaseSocketConnectResult, error)
-pkg syscall/zx/posix/socket, type StreamSocketWithCtx interface, Connect2(context.Context, net.SocketAddress) (BaseSocketConnect2Result, error)
 pkg syscall/zx/posix/socket, type StreamSocketWithCtx interface, Describe(context.Context) (io.NodeInfo, error)
 pkg syscall/zx/posix/socket, type StreamSocketWithCtx interface, Disconnect(context.Context) (BaseSocketDisconnectResult, error)
 pkg syscall/zx/posix/socket, type StreamSocketWithCtx interface, GetAttr(context.Context) (int32, io.NodeAttributes, error)
 pkg syscall/zx/posix/socket, type StreamSocketWithCtx interface, GetPeerName(context.Context) (BaseSocketGetPeerNameResult, error)
-pkg syscall/zx/posix/socket, type StreamSocketWithCtx interface, GetPeerName2(context.Context) (BaseSocketGetPeerName2Result, error)
 pkg syscall/zx/posix/socket, type StreamSocketWithCtx interface, GetSockName(context.Context) (BaseSocketGetSockNameResult, error)
-pkg syscall/zx/posix/socket, type StreamSocketWithCtx interface, GetSockName2(context.Context) (BaseSocketGetSockName2Result, error)
 pkg syscall/zx/posix/socket, type StreamSocketWithCtx interface, GetSockOpt(context.Context, int16, int16) (BaseSocketGetSockOptResult, error)
 pkg syscall/zx/posix/socket, type StreamSocketWithCtx interface, Listen(context.Context, int16) (StreamSocketListenResult, error)
 pkg syscall/zx/posix/socket, type StreamSocketWithCtx interface, NodeGetFlags(context.Context) (int32, uint32, error)
diff --git a/src/syscall/zx/diagnostics/impl.go b/src/syscall/zx/diagnostics/impl.go
index 39687d8..2b25886 100644
--- a/src/syscall/zx/diagnostics/impl.go
+++ b/src/syscall/zx/diagnostics/impl.go
@@ -31,7 +31,12 @@
 type Format uint32
 
 const (
+
+	// Dump read results per the Diagnostics Json
+	// Schema specifications.
 	FormatJson Format = 1
+
+	// Dump read results per the Iquery text specifications.
 	FormatText Format = 2
 )
 
@@ -110,9 +115,19 @@
 type StreamMode uint8
 
 const (
-	StreamModeSnapshot              StreamMode = 1
+
+	// The stream will serve a snapshot of the diagnostics data at the time of
+	// connection, then end.
+	StreamModeSnapshot StreamMode = 1
+
+	// The stream will serve a snapshot of the diagnostics data at the time of
+	// connection, then subsequent calls to the stream will hang until
+	// new diagnostics data is available.
 	StreamModeSnapshotThenSubscribe StreamMode = 2
-	StreamModeSubscribe             StreamMode = 3
+
+	// Calls to the stream will hang until new diagnostics data is available. Between calls to
+	// the stream, newly arrived data is buffered.
+	StreamModeSubscribe StreamMode = 3
 )
 
 func (_ StreamMode) I_EnumValues() []StreamMode {
@@ -157,9 +172,15 @@
 type DataType uint8
 
 const (
-	DataTypeInspect   DataType = 1
+
+	// Complete inspect hierarchies on the system.
+	DataTypeInspect DataType = 1
+
+	// Start|Stop|Running|DiagnosticsReady events on the system.
 	DataTypeLifecycle DataType = 2
-	DataTypeLogs      DataType = 3
+
+	// Log streams on the system.
+	DataTypeLogs DataType = 3
 )
 
 func (_ DataType) I_EnumValues() []DataType {
@@ -205,11 +226,23 @@
 type Severity uint8
 
 const (
+
+	// Trace records include detailed information about program execution.
 	SeverityTrace Severity = 16
+
+	// Debug records include development-facing information about program execution.
 	SeverityDebug Severity = 32
-	SeverityInfo  Severity = 48
-	SeverityWarn  Severity = 64
+
+	// Info records include general information about program execution. (default)
+	SeverityInfo Severity = 48
+
+	// Warning records include information about potentially problematic operations.
+	SeverityWarn Severity = 64
+
+	// Error records include information about failed operations.
 	SeverityError Severity = 80
+
+	// Fatal records convey information about operations which cause a program's termination.
 	SeverityFatal Severity = 96
 )
 
diff --git a/src/syscall/zx/hardware/network/impl.go b/src/syscall/zx/hardware/network/impl.go
index 56ac144..7f6a2f4 100644
--- a/src/syscall/zx/hardware/network/impl.go
+++ b/src/syscall/zx/hardware/network/impl.go
@@ -155,6 +155,8 @@
 type InfoType uint32
 
 const (
+
+	// No extra information is available.
 	InfoTypeNoInfo InfoType = 0
 )
 
@@ -192,10 +194,18 @@
 type RxAcceleration uint8
 
 const (
-	RxAccelerationValidatedEthernetFcs  RxAcceleration = 0
+
+	// Inbound rx frame validated the Ethernet Frame Check Sequence.
+	RxAccelerationValidatedEthernetFcs RxAcceleration = 0
+
+	// Inbound rx frame validated the IPv4 checksum.
 	RxAccelerationValidatedIpv4Checksum RxAcceleration = 1
-	RxAccelerationValidatedTcpChecksum  RxAcceleration = 2
-	RxAccelerationValidatedUdpChecksum  RxAcceleration = 3
+
+	// Inbound rx frame validated the TCP checksum.
+	RxAccelerationValidatedTcpChecksum RxAcceleration = 2
+
+	// Inbound rx frame validated the UDP checksum.
+	RxAccelerationValidatedUdpChecksum RxAcceleration = 3
 )
 
 func (_ RxAcceleration) I_EnumValues() []RxAcceleration {
@@ -247,10 +257,18 @@
 type TxAcceleration uint8
 
 const (
-	TxAccelerationComputeEthernetFcs  TxAcceleration = 0
+
+	// Request that device calculate the Ethernet Frame Check Sequence and write it in place.
+	TxAccelerationComputeEthernetFcs TxAcceleration = 0
+
+	// Request that the device calculate the IPv4 checksum and write it in place.
 	TxAccelerationComputeIpv4Checksum TxAcceleration = 1
-	TxAccelerationComputeTcpChecksum  TxAcceleration = 2
-	TxAccelerationComputeUdpChecksum  TxAcceleration = 3
+
+	// Request that the device calculate the TCP checksum and write it in place.
+	TxAccelerationComputeTcpChecksum TxAcceleration = 2
+
+	// Request that the device calculate the UDP checksum and write it in place.
+	TxAccelerationComputeUdpChecksum TxAcceleration = 3
 )
 
 func (_ TxAcceleration) I_EnumValues() []TxAcceleration {
@@ -301,9 +319,16 @@
 type MacFilterMode uint32
 
 const (
-	MacFilterModeMulticastFilter      MacFilterMode = 0
+
+	// Device accepts only unicast frames addressed to its own unicast address, or multicast frames
+	// that are part of the multicast address filter list.
+	MacFilterModeMulticastFilter MacFilterMode = 0
+
+	// Device accepts unicast frames addressed to its own unicast address, or any multicast frames.
 	MacFilterModeMulticastPromiscuous MacFilterMode = 1
-	MacFilterModePromiscuous          MacFilterMode = 2
+
+	// Device accepts all frames.
+	MacFilterModePromiscuous MacFilterMode = 2
 )
 
 func (_ MacFilterMode) I_EnumValues() []MacFilterMode {
diff --git a/src/syscall/zx/io/impl.go b/src/syscall/zx/io/impl.go
index 09e02bd..b8f487a 100644
--- a/src/syscall/zx/io/impl.go
+++ b/src/syscall/zx/io/impl.go
@@ -176,9 +176,15 @@
 type SeekOrigin uint32
 
 const (
-	SeekOriginStart   SeekOrigin = 0
+
+	// Seek from the start of the file.
+	SeekOriginStart SeekOrigin = 0
+
+	// Seek from the current position in the file.
 	SeekOriginCurrent SeekOrigin = 1
-	SeekOriginEnd     SeekOrigin = 2
+
+	// Seek from the end of the file.
+	SeekOriginEnd SeekOrigin = 2
 )
 
 func (_ SeekOrigin) I_EnumValues() []SeekOrigin {
diff --git a/src/syscall/zx/logger/impl.go b/src/syscall/zx/logger/impl.go
index c93c244..6847bc9 100644
--- a/src/syscall/zx/logger/impl.go
+++ b/src/syscall/zx/logger/impl.go
@@ -25,6 +25,10 @@
 	MaxTags uint8 = 5
 	// Max tag length that can be passed to filter by listener.
 	MaxTagLenBytes uint8 = 63
+	// A placeholder tag which indicates to a `LogSink` that the tag should be replaced with
+	// the actual name of the logging component. If that name is unavailable, `LogSink`
+	// implementations should replace this value with `UNKNOWN`.
+	ComponentNamePlaceholderTag string = "COMPONENT_NAME"
 	// Max number of LogInterestSelectors that can be specified via a listener.
 	MaxLogSelectors uint8 = 5
 	// Max tags that will be attached to a LogMessage.
diff --git a/src/syscall/zx/net/impl.go b/src/syscall/zx/net/impl.go
index acfcbb4..3c75d58 100644
--- a/src/syscall/zx/net/impl.go
+++ b/src/syscall/zx/net/impl.go
@@ -21,9 +21,19 @@
 type LookupError uint32
 
 const (
-	LookupErrorNotFound      LookupError = 1
-	LookupErrorTransient     LookupError = 2
-	LookupErrorInvalidArgs   LookupError = 3
+
+	// No result was found for this query.
+	LookupErrorNotFound LookupError = 1
+
+	// The lookup failed, but may succeed at a later time. For instance, the
+	// network or DNS server may be unreachable.
+	LookupErrorTransient LookupError = 2
+
+	// The lookup failed due to an invalid argument (for instance, the hostname was not encoded
+	// correctly, or was too long).
+	LookupErrorInvalidArgs LookupError = 3
+
+	// The lookup failed due to an internal error.
 	LookupErrorInternalError LookupError = 4
 )
 
diff --git a/src/syscall/zx/net/stack/impl.go b/src/syscall/zx/net/stack/impl.go
index 8abec2b..ad6c148 100644
--- a/src/syscall/zx/net/stack/impl.go
+++ b/src/syscall/zx/net/stack/impl.go
@@ -21,7 +21,11 @@
 type PresenceStatus uint32
 
 const (
-	PresenceStatusAdded   PresenceStatus = 1
+
+	// The interface is added.
+	PresenceStatusAdded PresenceStatus = 1
+
+	// The interface is removed.
 	PresenceStatusRemoved PresenceStatus = 2
 )
 
@@ -62,8 +66,12 @@
 type PhysicalStatus uint32
 
 const (
+
+	// The link is not attached to the medium.
 	PhysicalStatusDown PhysicalStatus = 1
-	PhysicalStatusUp   PhysicalStatus = 2
+
+	// The link is attached to the medium.
+	PhysicalStatusUp PhysicalStatus = 2
 )
 
 func (_ PhysicalStatus) I_EnumValues() []PhysicalStatus {
@@ -103,8 +111,12 @@
 type AdministrativeStatus uint32
 
 const (
+
+	// The interface is administratively disabled.
 	AdministrativeStatusDisabled AdministrativeStatus = 1
-	AdministrativeStatusEnabled  AdministrativeStatus = 2
+
+	// The interface is administratively enabled.
+	AdministrativeStatusEnabled AdministrativeStatus = 2
 )
 
 func (_ AdministrativeStatus) I_EnumValues() []AdministrativeStatus {
diff --git a/src/syscall/zx/posix/socket/impl.go b/src/syscall/zx/posix/socket/impl.go
index 897b0be..254ff06 100644
--- a/src/syscall/zx/posix/socket/impl.go
+++ b/src/syscall/zx/posix/socket/impl.go
@@ -27,7 +27,11 @@
 type Domain int16
 
 const (
+
+	// An IPv4 socket. Equivalent to `AF_INET`.
 	DomainIpv4 Domain = 0
+
+	// An IPv6 socket. Equivalent to `AF_INET6`.
 	DomainIpv6 Domain = 1
 )
 
@@ -72,7 +76,19 @@
 type DatagramSocketProtocol uint32
 
 const (
-	DatagramSocketProtocolUdp      DatagramSocketProtocol = 1
+
+	// UDP (User Datagram Protocol).
+	//
+	// A UDP socket is equivalent to the POSIX API of `SOCK_DGRAM` with a protocol of 0 or
+	// `IPPROTO_UDP`.
+	DatagramSocketProtocolUdp DatagramSocketProtocol = 1
+
+	// ICMP (Internet Control Message Protocol) echo.
+	//
+	// An ICMP echo socket is equivalent to the POSIX API of `SOCK_DGRAM` with a protocol of
+	// `IPPROTO_ICMP` `IPPROTO_ICMPV6` (depending on provided domain).
+	//
+	// Datagrams sent over an ICMP echo socket *must* have a valid ICMP or ICMPv6 echo header.
 	DatagramSocketProtocolIcmpEcho DatagramSocketProtocol = 2
 )
 
@@ -117,6 +133,11 @@
 type StreamSocketProtocol uint32
 
 const (
+
+	// TCP (Transmission Control Protocol).
+	//
+	// A TCP socket is equivalent to the POSIX API of `SOCK_STREAM` with a protocol of 0 or
+	// `IPPROTO_TCP`.
 	StreamSocketProtocolTcp StreamSocketProtocol = 0
 )
 
@@ -303,48 +324,6 @@
 	return _mBaseSocketGetPeerNameResponse
 }
 
-type BaseSocketBind2Response struct {
-	_ struct{} `fidl:"s" fidl_size_v1:"1" fidl_alignment_v1:"1"`
-}
-
-var _mBaseSocketBind2Response = _bindings.CreateLazyMarshaler(BaseSocketBind2Response{})
-
-func (msg *BaseSocketBind2Response) Marshaler() _bindings.Marshaler {
-	return _mBaseSocketBind2Response
-}
-
-type BaseSocketConnect2Response struct {
-	_ struct{} `fidl:"s" fidl_size_v1:"1" fidl_alignment_v1:"1"`
-}
-
-var _mBaseSocketConnect2Response = _bindings.CreateLazyMarshaler(BaseSocketConnect2Response{})
-
-func (msg *BaseSocketConnect2Response) Marshaler() _bindings.Marshaler {
-	return _mBaseSocketConnect2Response
-}
-
-type BaseSocketGetSockName2Response struct {
-	_    struct{}                 `fidl:"s" fidl_size_v1:"24" fidl_alignment_v1:"8"`
-	Addr fuchsianet.SocketAddress `fidl_offset_v1:"0"`
-}
-
-var _mBaseSocketGetSockName2Response = _bindings.CreateLazyMarshaler(BaseSocketGetSockName2Response{})
-
-func (msg *BaseSocketGetSockName2Response) Marshaler() _bindings.Marshaler {
-	return _mBaseSocketGetSockName2Response
-}
-
-type BaseSocketGetPeerName2Response struct {
-	_    struct{}                 `fidl:"s" fidl_size_v1:"24" fidl_alignment_v1:"8"`
-	Addr fuchsianet.SocketAddress `fidl_offset_v1:"0"`
-}
-
-var _mBaseSocketGetPeerName2Response = _bindings.CreateLazyMarshaler(BaseSocketGetPeerName2Response{})
-
-func (msg *BaseSocketGetPeerName2Response) Marshaler() _bindings.Marshaler {
-	return _mBaseSocketGetPeerName2Response
-}
-
 type BaseSocketSetSockOptResponse struct {
 	_ struct{} `fidl:"s" fidl_size_v1:"1" fidl_alignment_v1:"1"`
 }
@@ -401,30 +380,6 @@
 	return _mDatagramSocketSendMsgResponse
 }
 
-type DatagramSocketShutdown2Response struct {
-	_ struct{} `fidl:"s" fidl_size_v1:"1" fidl_alignment_v1:"1"`
-}
-
-var _mDatagramSocketShutdown2Response = _bindings.CreateLazyMarshaler(DatagramSocketShutdown2Response{})
-
-func (msg *DatagramSocketShutdown2Response) Marshaler() _bindings.Marshaler {
-	return _mDatagramSocketShutdown2Response
-}
-
-type DatagramSocketRecvMsg2Response struct {
-	_         struct{}                  `fidl:"s" fidl_size_v1:"64" fidl_alignment_v1:"8"`
-	Addr      *fuchsianet.SocketAddress `fidl_offset_v1:"0"`
-	Data      []uint8                   `fidl_offset_v1:"24" fidl_bounds:""`
-	Control   RecvControlData           `fidl_offset_v1:"40"`
-	Truncated uint32                    `fidl_offset_v1:"56"`
-}
-
-var _mDatagramSocketRecvMsg2Response = _bindings.CreateLazyMarshaler(DatagramSocketRecvMsg2Response{})
-
-func (msg *DatagramSocketRecvMsg2Response) Marshaler() _bindings.Marshaler {
-	return _mDatagramSocketRecvMsg2Response
-}
-
 type StreamSocketListenResponse struct {
 	_ struct{} `fidl:"s" fidl_size_v1:"1" fidl_alignment_v1:"1"`
 }
@@ -447,17 +402,6 @@
 	return _mStreamSocketAcceptResponse
 }
 
-type StreamSocketAccept2Response struct {
-	_ struct{}                     `fidl:"s" fidl_size_v1:"4" fidl_alignment_v1:"4"`
-	S StreamSocketWithCtxInterface `fidl_offset_v1:"0" fidl_handle_subtype:"4"`
-}
-
-var _mStreamSocketAccept2Response = _bindings.CreateLazyMarshaler(StreamSocketAccept2Response{})
-
-func (msg *StreamSocketAccept2Response) Marshaler() _bindings.Marshaler {
-	return _mStreamSocketAccept2Response
-}
-
 type ProviderStreamSocketResponse struct {
 	_ struct{}                     `fidl:"s" fidl_size_v1:"4" fidl_alignment_v1:"4"`
 	S StreamSocketWithCtxInterface `fidl_offset_v1:"0" fidl_handle_subtype:"4"`
@@ -715,72 +659,6 @@
 	return _mbaseSocketWithCtxGetPeerNameResponse
 }
 
-type baseSocketWithCtxBind2Request struct {
-	_    struct{}                 `fidl:"s" fidl_size_v1:"24" fidl_alignment_v1:"8"`
-	Addr fuchsianet.SocketAddress `fidl_offset_v1:"0"`
-}
-
-var _mbaseSocketWithCtxBind2Request = _bindings.CreateLazyMarshaler(baseSocketWithCtxBind2Request{})
-
-func (msg *baseSocketWithCtxBind2Request) Marshaler() _bindings.Marshaler {
-	return _mbaseSocketWithCtxBind2Request
-}
-
-type baseSocketWithCtxBind2Response struct {
-	_      struct{}              `fidl:"s" fidl_size_v1:"24" fidl_alignment_v1:"8"`
-	Result BaseSocketBind2Result `fidl_offset_v1:"0"`
-}
-
-var _mbaseSocketWithCtxBind2Response = _bindings.CreateLazyMarshaler(baseSocketWithCtxBind2Response{})
-
-func (msg *baseSocketWithCtxBind2Response) Marshaler() _bindings.Marshaler {
-	return _mbaseSocketWithCtxBind2Response
-}
-
-type baseSocketWithCtxConnect2Request struct {
-	_    struct{}                 `fidl:"s" fidl_size_v1:"24" fidl_alignment_v1:"8"`
-	Addr fuchsianet.SocketAddress `fidl_offset_v1:"0"`
-}
-
-var _mbaseSocketWithCtxConnect2Request = _bindings.CreateLazyMarshaler(baseSocketWithCtxConnect2Request{})
-
-func (msg *baseSocketWithCtxConnect2Request) Marshaler() _bindings.Marshaler {
-	return _mbaseSocketWithCtxConnect2Request
-}
-
-type baseSocketWithCtxConnect2Response struct {
-	_      struct{}                 `fidl:"s" fidl_size_v1:"24" fidl_alignment_v1:"8"`
-	Result BaseSocketConnect2Result `fidl_offset_v1:"0"`
-}
-
-var _mbaseSocketWithCtxConnect2Response = _bindings.CreateLazyMarshaler(baseSocketWithCtxConnect2Response{})
-
-func (msg *baseSocketWithCtxConnect2Response) Marshaler() _bindings.Marshaler {
-	return _mbaseSocketWithCtxConnect2Response
-}
-
-type baseSocketWithCtxGetSockName2Response struct {
-	_      struct{}                     `fidl:"s" fidl_size_v1:"24" fidl_alignment_v1:"8"`
-	Result BaseSocketGetSockName2Result `fidl_offset_v1:"0"`
-}
-
-var _mbaseSocketWithCtxGetSockName2Response = _bindings.CreateLazyMarshaler(baseSocketWithCtxGetSockName2Response{})
-
-func (msg *baseSocketWithCtxGetSockName2Response) Marshaler() _bindings.Marshaler {
-	return _mbaseSocketWithCtxGetSockName2Response
-}
-
-type baseSocketWithCtxGetPeerName2Response struct {
-	_      struct{}                     `fidl:"s" fidl_size_v1:"24" fidl_alignment_v1:"8"`
-	Result BaseSocketGetPeerName2Result `fidl_offset_v1:"0"`
-}
-
-var _mbaseSocketWithCtxGetPeerName2Response = _bindings.CreateLazyMarshaler(baseSocketWithCtxGetPeerName2Response{})
-
-func (msg *baseSocketWithCtxGetPeerName2Response) Marshaler() _bindings.Marshaler {
-	return _mbaseSocketWithCtxGetPeerName2Response
-}
-
 type baseSocketWithCtxSetSockOptRequest struct {
 	_       struct{} `fidl:"s" fidl_size_v1:"24" fidl_alignment_v1:"8"`
 	Level   int16    `fidl_offset_v1:"0"`
@@ -1031,72 +909,6 @@
 	return _mdatagramSocketWithCtxGetPeerNameResponse
 }
 
-type datagramSocketWithCtxBind2Request struct {
-	_    struct{}                 `fidl:"s" fidl_size_v1:"24" fidl_alignment_v1:"8"`
-	Addr fuchsianet.SocketAddress `fidl_offset_v1:"0"`
-}
-
-var _mdatagramSocketWithCtxBind2Request = _bindings.CreateLazyMarshaler(datagramSocketWithCtxBind2Request{})
-
-func (msg *datagramSocketWithCtxBind2Request) Marshaler() _bindings.Marshaler {
-	return _mdatagramSocketWithCtxBind2Request
-}
-
-type datagramSocketWithCtxBind2Response struct {
-	_      struct{}              `fidl:"s" fidl_size_v1:"24" fidl_alignment_v1:"8"`
-	Result BaseSocketBind2Result `fidl_offset_v1:"0"`
-}
-
-var _mdatagramSocketWithCtxBind2Response = _bindings.CreateLazyMarshaler(datagramSocketWithCtxBind2Response{})
-
-func (msg *datagramSocketWithCtxBind2Response) Marshaler() _bindings.Marshaler {
-	return _mdatagramSocketWithCtxBind2Response
-}
-
-type datagramSocketWithCtxConnect2Request struct {
-	_    struct{}                 `fidl:"s" fidl_size_v1:"24" fidl_alignment_v1:"8"`
-	Addr fuchsianet.SocketAddress `fidl_offset_v1:"0"`
-}
-
-var _mdatagramSocketWithCtxConnect2Request = _bindings.CreateLazyMarshaler(datagramSocketWithCtxConnect2Request{})
-
-func (msg *datagramSocketWithCtxConnect2Request) Marshaler() _bindings.Marshaler {
-	return _mdatagramSocketWithCtxConnect2Request
-}
-
-type datagramSocketWithCtxConnect2Response struct {
-	_      struct{}                 `fidl:"s" fidl_size_v1:"24" fidl_alignment_v1:"8"`
-	Result BaseSocketConnect2Result `fidl_offset_v1:"0"`
-}
-
-var _mdatagramSocketWithCtxConnect2Response = _bindings.CreateLazyMarshaler(datagramSocketWithCtxConnect2Response{})
-
-func (msg *datagramSocketWithCtxConnect2Response) Marshaler() _bindings.Marshaler {
-	return _mdatagramSocketWithCtxConnect2Response
-}
-
-type datagramSocketWithCtxGetSockName2Response struct {
-	_      struct{}                     `fidl:"s" fidl_size_v1:"24" fidl_alignment_v1:"8"`
-	Result BaseSocketGetSockName2Result `fidl_offset_v1:"0"`
-}
-
-var _mdatagramSocketWithCtxGetSockName2Response = _bindings.CreateLazyMarshaler(datagramSocketWithCtxGetSockName2Response{})
-
-func (msg *datagramSocketWithCtxGetSockName2Response) Marshaler() _bindings.Marshaler {
-	return _mdatagramSocketWithCtxGetSockName2Response
-}
-
-type datagramSocketWithCtxGetPeerName2Response struct {
-	_      struct{}                     `fidl:"s" fidl_size_v1:"24" fidl_alignment_v1:"8"`
-	Result BaseSocketGetPeerName2Result `fidl_offset_v1:"0"`
-}
-
-var _mdatagramSocketWithCtxGetPeerName2Response = _bindings.CreateLazyMarshaler(datagramSocketWithCtxGetPeerName2Response{})
-
-func (msg *datagramSocketWithCtxGetPeerName2Response) Marshaler() _bindings.Marshaler {
-	return _mdatagramSocketWithCtxGetPeerName2Response
-}
-
 type datagramSocketWithCtxSetSockOptRequest struct {
 	_       struct{} `fidl:"s" fidl_size_v1:"24" fidl_alignment_v1:"8"`
 	Level   int16    `fidl_offset_v1:"0"`
@@ -1216,53 +1028,6 @@
 	return _mdatagramSocketWithCtxSendMsgResponse
 }
 
-type datagramSocketWithCtxShutdown2Request struct {
-	_    struct{}     `fidl:"s" fidl_size_v1:"8" fidl_alignment_v1:"8"`
-	Mode ShutdownMode `fidl_offset_v1:"0"`
-}
-
-var _mdatagramSocketWithCtxShutdown2Request = _bindings.CreateLazyMarshaler(datagramSocketWithCtxShutdown2Request{})
-
-func (msg *datagramSocketWithCtxShutdown2Request) Marshaler() _bindings.Marshaler {
-	return _mdatagramSocketWithCtxShutdown2Request
-}
-
-type datagramSocketWithCtxShutdown2Response struct {
-	_      struct{}                      `fidl:"s" fidl_size_v1:"24" fidl_alignment_v1:"8"`
-	Result DatagramSocketShutdown2Result `fidl_offset_v1:"0"`
-}
-
-var _mdatagramSocketWithCtxShutdown2Response = _bindings.CreateLazyMarshaler(datagramSocketWithCtxShutdown2Response{})
-
-func (msg *datagramSocketWithCtxShutdown2Response) Marshaler() _bindings.Marshaler {
-	return _mdatagramSocketWithCtxShutdown2Response
-}
-
-type datagramSocketWithCtxRecvMsg2Request struct {
-	_           struct{}     `fidl:"s" fidl_size_v1:"16" fidl_alignment_v1:"8"`
-	WantAddr    bool         `fidl_offset_v1:"0"`
-	DataLen     uint32       `fidl_offset_v1:"4"`
-	WantControl bool         `fidl_offset_v1:"8"`
-	Flags       RecvMsgFlags `fidl_offset_v1:"10"`
-}
-
-var _mdatagramSocketWithCtxRecvMsg2Request = _bindings.CreateLazyMarshaler(datagramSocketWithCtxRecvMsg2Request{})
-
-func (msg *datagramSocketWithCtxRecvMsg2Request) Marshaler() _bindings.Marshaler {
-	return _mdatagramSocketWithCtxRecvMsg2Request
-}
-
-type datagramSocketWithCtxRecvMsg2Response struct {
-	_      struct{}                     `fidl:"s" fidl_size_v1:"24" fidl_alignment_v1:"8"`
-	Result DatagramSocketRecvMsg2Result `fidl_offset_v1:"0"`
-}
-
-var _mdatagramSocketWithCtxRecvMsg2Response = _bindings.CreateLazyMarshaler(datagramSocketWithCtxRecvMsg2Response{})
-
-func (msg *datagramSocketWithCtxRecvMsg2Response) Marshaler() _bindings.Marshaler {
-	return _mdatagramSocketWithCtxRecvMsg2Response
-}
-
 type streamSocketWithCtxCloneRequest struct {
 	_      struct{}                              `fidl:"s" fidl_size_v1:"8" fidl_alignment_v1:"8"`
 	Flags  uint32                                `fidl_offset_v1:"0"`
@@ -1466,72 +1231,6 @@
 	return _mstreamSocketWithCtxGetPeerNameResponse
 }
 
-type streamSocketWithCtxBind2Request struct {
-	_    struct{}                 `fidl:"s" fidl_size_v1:"24" fidl_alignment_v1:"8"`
-	Addr fuchsianet.SocketAddress `fidl_offset_v1:"0"`
-}
-
-var _mstreamSocketWithCtxBind2Request = _bindings.CreateLazyMarshaler(streamSocketWithCtxBind2Request{})
-
-func (msg *streamSocketWithCtxBind2Request) Marshaler() _bindings.Marshaler {
-	return _mstreamSocketWithCtxBind2Request
-}
-
-type streamSocketWithCtxBind2Response struct {
-	_      struct{}              `fidl:"s" fidl_size_v1:"24" fidl_alignment_v1:"8"`
-	Result BaseSocketBind2Result `fidl_offset_v1:"0"`
-}
-
-var _mstreamSocketWithCtxBind2Response = _bindings.CreateLazyMarshaler(streamSocketWithCtxBind2Response{})
-
-func (msg *streamSocketWithCtxBind2Response) Marshaler() _bindings.Marshaler {
-	return _mstreamSocketWithCtxBind2Response
-}
-
-type streamSocketWithCtxConnect2Request struct {
-	_    struct{}                 `fidl:"s" fidl_size_v1:"24" fidl_alignment_v1:"8"`
-	Addr fuchsianet.SocketAddress `fidl_offset_v1:"0"`
-}
-
-var _mstreamSocketWithCtxConnect2Request = _bindings.CreateLazyMarshaler(streamSocketWithCtxConnect2Request{})
-
-func (msg *streamSocketWithCtxConnect2Request) Marshaler() _bindings.Marshaler {
-	return _mstreamSocketWithCtxConnect2Request
-}
-
-type streamSocketWithCtxConnect2Response struct {
-	_      struct{}                 `fidl:"s" fidl_size_v1:"24" fidl_alignment_v1:"8"`
-	Result BaseSocketConnect2Result `fidl_offset_v1:"0"`
-}
-
-var _mstreamSocketWithCtxConnect2Response = _bindings.CreateLazyMarshaler(streamSocketWithCtxConnect2Response{})
-
-func (msg *streamSocketWithCtxConnect2Response) Marshaler() _bindings.Marshaler {
-	return _mstreamSocketWithCtxConnect2Response
-}
-
-type streamSocketWithCtxGetSockName2Response struct {
-	_      struct{}                     `fidl:"s" fidl_size_v1:"24" fidl_alignment_v1:"8"`
-	Result BaseSocketGetSockName2Result `fidl_offset_v1:"0"`
-}
-
-var _mstreamSocketWithCtxGetSockName2Response = _bindings.CreateLazyMarshaler(streamSocketWithCtxGetSockName2Response{})
-
-func (msg *streamSocketWithCtxGetSockName2Response) Marshaler() _bindings.Marshaler {
-	return _mstreamSocketWithCtxGetSockName2Response
-}
-
-type streamSocketWithCtxGetPeerName2Response struct {
-	_      struct{}                     `fidl:"s" fidl_size_v1:"24" fidl_alignment_v1:"8"`
-	Result BaseSocketGetPeerName2Result `fidl_offset_v1:"0"`
-}
-
-var _mstreamSocketWithCtxGetPeerName2Response = _bindings.CreateLazyMarshaler(streamSocketWithCtxGetPeerName2Response{})
-
-func (msg *streamSocketWithCtxGetPeerName2Response) Marshaler() _bindings.Marshaler {
-	return _mstreamSocketWithCtxGetPeerName2Response
-}
-
 type streamSocketWithCtxSetSockOptRequest struct {
 	_       struct{} `fidl:"s" fidl_size_v1:"24" fidl_alignment_v1:"8"`
 	Level   int16    `fidl_offset_v1:"0"`
@@ -1623,17 +1322,6 @@
 	return _mstreamSocketWithCtxAcceptResponse
 }
 
-type streamSocketWithCtxAccept2Response struct {
-	_      struct{}                  `fidl:"s" fidl_size_v1:"24" fidl_alignment_v1:"8"`
-	Result StreamSocketAccept2Result `fidl_offset_v1:"0"`
-}
-
-var _mstreamSocketWithCtxAccept2Response = _bindings.CreateLazyMarshaler(streamSocketWithCtxAccept2Response{})
-
-func (msg *streamSocketWithCtxAccept2Response) Marshaler() _bindings.Marshaler {
-	return _mstreamSocketWithCtxAccept2Response
-}
-
 type providerWithCtxStreamSocketRequest struct {
 	_      struct{}             `fidl:"s" fidl_size_v1:"8" fidl_alignment_v1:"8"`
 	Domain Domain               `fidl_offset_v1:"0"`
@@ -1950,178 +1638,6 @@
 	return _u
 }
 
-type I_baseSocketBind2ResultTag uint64
-
-const (
-	BaseSocketBind2ResultResponse = 1 // 0x00000001
-	BaseSocketBind2ResultErr      = 2 // 0x00000002
-)
-
-type BaseSocketBind2Result struct {
-	I_baseSocketBind2ResultTag `fidl:"x!" fidl_size_v1:"24" fidl_alignment_v1:"8"`
-	Response                   BaseSocketBind2Response `fidl_ordinal:"1"`
-	Err                        fuchsiaposix.Errno      `fidl_ordinal:"2"`
-}
-
-func (_m *BaseSocketBind2Result) Which() I_baseSocketBind2ResultTag {
-	return _m.I_baseSocketBind2ResultTag
-}
-
-func (_m *BaseSocketBind2Result) Ordinal() uint64 {
-	return uint64(_m.I_baseSocketBind2ResultTag)
-}
-
-func (_m *BaseSocketBind2Result) SetResponse(response BaseSocketBind2Response) {
-	_m.I_baseSocketBind2ResultTag = BaseSocketBind2ResultResponse
-	_m.Response = response
-}
-
-func BaseSocketBind2ResultWithResponse(response BaseSocketBind2Response) BaseSocketBind2Result {
-	var _u BaseSocketBind2Result
-	_u.SetResponse(response)
-	return _u
-}
-
-func (_m *BaseSocketBind2Result) SetErr(err fuchsiaposix.Errno) {
-	_m.I_baseSocketBind2ResultTag = BaseSocketBind2ResultErr
-	_m.Err = err
-}
-
-func BaseSocketBind2ResultWithErr(err fuchsiaposix.Errno) BaseSocketBind2Result {
-	var _u BaseSocketBind2Result
-	_u.SetErr(err)
-	return _u
-}
-
-type I_baseSocketConnect2ResultTag uint64
-
-const (
-	BaseSocketConnect2ResultResponse = 1 // 0x00000001
-	BaseSocketConnect2ResultErr      = 2 // 0x00000002
-)
-
-type BaseSocketConnect2Result struct {
-	I_baseSocketConnect2ResultTag `fidl:"x!" fidl_size_v1:"24" fidl_alignment_v1:"8"`
-	Response                      BaseSocketConnect2Response `fidl_ordinal:"1"`
-	Err                           fuchsiaposix.Errno         `fidl_ordinal:"2"`
-}
-
-func (_m *BaseSocketConnect2Result) Which() I_baseSocketConnect2ResultTag {
-	return _m.I_baseSocketConnect2ResultTag
-}
-
-func (_m *BaseSocketConnect2Result) Ordinal() uint64 {
-	return uint64(_m.I_baseSocketConnect2ResultTag)
-}
-
-func (_m *BaseSocketConnect2Result) SetResponse(response BaseSocketConnect2Response) {
-	_m.I_baseSocketConnect2ResultTag = BaseSocketConnect2ResultResponse
-	_m.Response = response
-}
-
-func BaseSocketConnect2ResultWithResponse(response BaseSocketConnect2Response) BaseSocketConnect2Result {
-	var _u BaseSocketConnect2Result
-	_u.SetResponse(response)
-	return _u
-}
-
-func (_m *BaseSocketConnect2Result) SetErr(err fuchsiaposix.Errno) {
-	_m.I_baseSocketConnect2ResultTag = BaseSocketConnect2ResultErr
-	_m.Err = err
-}
-
-func BaseSocketConnect2ResultWithErr(err fuchsiaposix.Errno) BaseSocketConnect2Result {
-	var _u BaseSocketConnect2Result
-	_u.SetErr(err)
-	return _u
-}
-
-type I_baseSocketGetSockName2ResultTag uint64
-
-const (
-	BaseSocketGetSockName2ResultResponse = 1 // 0x00000001
-	BaseSocketGetSockName2ResultErr      = 2 // 0x00000002
-)
-
-type BaseSocketGetSockName2Result struct {
-	I_baseSocketGetSockName2ResultTag `fidl:"x!" fidl_size_v1:"24" fidl_alignment_v1:"8"`
-	Response                          BaseSocketGetSockName2Response `fidl_ordinal:"1"`
-	Err                               fuchsiaposix.Errno             `fidl_ordinal:"2"`
-}
-
-func (_m *BaseSocketGetSockName2Result) Which() I_baseSocketGetSockName2ResultTag {
-	return _m.I_baseSocketGetSockName2ResultTag
-}
-
-func (_m *BaseSocketGetSockName2Result) Ordinal() uint64 {
-	return uint64(_m.I_baseSocketGetSockName2ResultTag)
-}
-
-func (_m *BaseSocketGetSockName2Result) SetResponse(response BaseSocketGetSockName2Response) {
-	_m.I_baseSocketGetSockName2ResultTag = BaseSocketGetSockName2ResultResponse
-	_m.Response = response
-}
-
-func BaseSocketGetSockName2ResultWithResponse(response BaseSocketGetSockName2Response) BaseSocketGetSockName2Result {
-	var _u BaseSocketGetSockName2Result
-	_u.SetResponse(response)
-	return _u
-}
-
-func (_m *BaseSocketGetSockName2Result) SetErr(err fuchsiaposix.Errno) {
-	_m.I_baseSocketGetSockName2ResultTag = BaseSocketGetSockName2ResultErr
-	_m.Err = err
-}
-
-func BaseSocketGetSockName2ResultWithErr(err fuchsiaposix.Errno) BaseSocketGetSockName2Result {
-	var _u BaseSocketGetSockName2Result
-	_u.SetErr(err)
-	return _u
-}
-
-type I_baseSocketGetPeerName2ResultTag uint64
-
-const (
-	BaseSocketGetPeerName2ResultResponse = 1 // 0x00000001
-	BaseSocketGetPeerName2ResultErr      = 2 // 0x00000002
-)
-
-type BaseSocketGetPeerName2Result struct {
-	I_baseSocketGetPeerName2ResultTag `fidl:"x!" fidl_size_v1:"24" fidl_alignment_v1:"8"`
-	Response                          BaseSocketGetPeerName2Response `fidl_ordinal:"1"`
-	Err                               fuchsiaposix.Errno             `fidl_ordinal:"2"`
-}
-
-func (_m *BaseSocketGetPeerName2Result) Which() I_baseSocketGetPeerName2ResultTag {
-	return _m.I_baseSocketGetPeerName2ResultTag
-}
-
-func (_m *BaseSocketGetPeerName2Result) Ordinal() uint64 {
-	return uint64(_m.I_baseSocketGetPeerName2ResultTag)
-}
-
-func (_m *BaseSocketGetPeerName2Result) SetResponse(response BaseSocketGetPeerName2Response) {
-	_m.I_baseSocketGetPeerName2ResultTag = BaseSocketGetPeerName2ResultResponse
-	_m.Response = response
-}
-
-func BaseSocketGetPeerName2ResultWithResponse(response BaseSocketGetPeerName2Response) BaseSocketGetPeerName2Result {
-	var _u BaseSocketGetPeerName2Result
-	_u.SetResponse(response)
-	return _u
-}
-
-func (_m *BaseSocketGetPeerName2Result) SetErr(err fuchsiaposix.Errno) {
-	_m.I_baseSocketGetPeerName2ResultTag = BaseSocketGetPeerName2ResultErr
-	_m.Err = err
-}
-
-func BaseSocketGetPeerName2ResultWithErr(err fuchsiaposix.Errno) BaseSocketGetPeerName2Result {
-	var _u BaseSocketGetPeerName2Result
-	_u.SetErr(err)
-	return _u
-}
-
 type I_baseSocketSetSockOptResultTag uint64
 
 const (
@@ -2337,92 +1853,6 @@
 	return _u
 }
 
-type I_datagramSocketShutdown2ResultTag uint64
-
-const (
-	DatagramSocketShutdown2ResultResponse = 1 // 0x00000001
-	DatagramSocketShutdown2ResultErr      = 2 // 0x00000002
-)
-
-type DatagramSocketShutdown2Result struct {
-	I_datagramSocketShutdown2ResultTag `fidl:"x!" fidl_size_v1:"24" fidl_alignment_v1:"8"`
-	Response                           DatagramSocketShutdown2Response `fidl_ordinal:"1"`
-	Err                                fuchsiaposix.Errno              `fidl_ordinal:"2"`
-}
-
-func (_m *DatagramSocketShutdown2Result) Which() I_datagramSocketShutdown2ResultTag {
-	return _m.I_datagramSocketShutdown2ResultTag
-}
-
-func (_m *DatagramSocketShutdown2Result) Ordinal() uint64 {
-	return uint64(_m.I_datagramSocketShutdown2ResultTag)
-}
-
-func (_m *DatagramSocketShutdown2Result) SetResponse(response DatagramSocketShutdown2Response) {
-	_m.I_datagramSocketShutdown2ResultTag = DatagramSocketShutdown2ResultResponse
-	_m.Response = response
-}
-
-func DatagramSocketShutdown2ResultWithResponse(response DatagramSocketShutdown2Response) DatagramSocketShutdown2Result {
-	var _u DatagramSocketShutdown2Result
-	_u.SetResponse(response)
-	return _u
-}
-
-func (_m *DatagramSocketShutdown2Result) SetErr(err fuchsiaposix.Errno) {
-	_m.I_datagramSocketShutdown2ResultTag = DatagramSocketShutdown2ResultErr
-	_m.Err = err
-}
-
-func DatagramSocketShutdown2ResultWithErr(err fuchsiaposix.Errno) DatagramSocketShutdown2Result {
-	var _u DatagramSocketShutdown2Result
-	_u.SetErr(err)
-	return _u
-}
-
-type I_datagramSocketRecvMsg2ResultTag uint64
-
-const (
-	DatagramSocketRecvMsg2ResultResponse = 1 // 0x00000001
-	DatagramSocketRecvMsg2ResultErr      = 2 // 0x00000002
-)
-
-type DatagramSocketRecvMsg2Result struct {
-	I_datagramSocketRecvMsg2ResultTag `fidl:"x!" fidl_size_v1:"24" fidl_alignment_v1:"8"`
-	Response                          DatagramSocketRecvMsg2Response `fidl_ordinal:"1"`
-	Err                               fuchsiaposix.Errno             `fidl_ordinal:"2"`
-}
-
-func (_m *DatagramSocketRecvMsg2Result) Which() I_datagramSocketRecvMsg2ResultTag {
-	return _m.I_datagramSocketRecvMsg2ResultTag
-}
-
-func (_m *DatagramSocketRecvMsg2Result) Ordinal() uint64 {
-	return uint64(_m.I_datagramSocketRecvMsg2ResultTag)
-}
-
-func (_m *DatagramSocketRecvMsg2Result) SetResponse(response DatagramSocketRecvMsg2Response) {
-	_m.I_datagramSocketRecvMsg2ResultTag = DatagramSocketRecvMsg2ResultResponse
-	_m.Response = response
-}
-
-func DatagramSocketRecvMsg2ResultWithResponse(response DatagramSocketRecvMsg2Response) DatagramSocketRecvMsg2Result {
-	var _u DatagramSocketRecvMsg2Result
-	_u.SetResponse(response)
-	return _u
-}
-
-func (_m *DatagramSocketRecvMsg2Result) SetErr(err fuchsiaposix.Errno) {
-	_m.I_datagramSocketRecvMsg2ResultTag = DatagramSocketRecvMsg2ResultErr
-	_m.Err = err
-}
-
-func DatagramSocketRecvMsg2ResultWithErr(err fuchsiaposix.Errno) DatagramSocketRecvMsg2Result {
-	var _u DatagramSocketRecvMsg2Result
-	_u.SetErr(err)
-	return _u
-}
-
 type I_streamSocketListenResultTag uint64
 
 const (
@@ -2509,49 +1939,6 @@
 	return _u
 }
 
-type I_streamSocketAccept2ResultTag uint64
-
-const (
-	StreamSocketAccept2ResultResponse = 1 // 0x00000001
-	StreamSocketAccept2ResultErr      = 2 // 0x00000002
-)
-
-type StreamSocketAccept2Result struct {
-	I_streamSocketAccept2ResultTag `fidl:"x!" fidl_size_v1:"24" fidl_alignment_v1:"8"`
-	Response                       StreamSocketAccept2Response `fidl_ordinal:"1"`
-	Err                            fuchsiaposix.Errno          `fidl_ordinal:"2"`
-}
-
-func (_m *StreamSocketAccept2Result) Which() I_streamSocketAccept2ResultTag {
-	return _m.I_streamSocketAccept2ResultTag
-}
-
-func (_m *StreamSocketAccept2Result) Ordinal() uint64 {
-	return uint64(_m.I_streamSocketAccept2ResultTag)
-}
-
-func (_m *StreamSocketAccept2Result) SetResponse(response StreamSocketAccept2Response) {
-	_m.I_streamSocketAccept2ResultTag = StreamSocketAccept2ResultResponse
-	_m.Response = response
-}
-
-func StreamSocketAccept2ResultWithResponse(response StreamSocketAccept2Response) StreamSocketAccept2Result {
-	var _u StreamSocketAccept2Result
-	_u.SetResponse(response)
-	return _u
-}
-
-func (_m *StreamSocketAccept2Result) SetErr(err fuchsiaposix.Errno) {
-	_m.I_streamSocketAccept2ResultTag = StreamSocketAccept2ResultErr
-	_m.Err = err
-}
-
-func StreamSocketAccept2ResultWithErr(err fuchsiaposix.Errno) StreamSocketAccept2Result {
-	var _u StreamSocketAccept2Result
-	_u.SetErr(err)
-	return _u
-}
-
 type I_providerStreamSocketResultTag uint64
 
 const (
@@ -2890,10 +2277,6 @@
 	BaseSocketDisconnectOrdinal   uint64 = 0x20eaedba2e0f70a4
 	BaseSocketGetSockNameOrdinal  uint64 = 0x41a618ef19a91f9d
 	BaseSocketGetPeerNameOrdinal  uint64 = 0x4009d08a4beb5e95
-	BaseSocketBind2Ordinal        uint64 = 0x7fa5c577e1f26cb7
-	BaseSocketConnect2Ordinal     uint64 = 0xfe8f26e61598acc
-	BaseSocketGetSockName2Ordinal uint64 = 0x7c3aa48a636f9e73
-	BaseSocketGetPeerName2Ordinal uint64 = 0x7deeaf776d00f31f
 	BaseSocketSetSockOptOrdinal   uint64 = 0x93c6f802203e6f1
 	BaseSocketGetSockOptOrdinal   uint64 = 0x6dfaf70f0ed40544
 )
@@ -3065,42 +2448,6 @@
 	return resp_.Result, err_
 }
 
-// Sets the local address used for the socket.
-func (p *BaseSocketWithCtxInterface) Bind2(ctx_ _bindings.Context, addr fuchsianet.SocketAddress) (BaseSocketBind2Result, error) {
-	req_ := &baseSocketWithCtxBind2Request{
-		Addr: addr,
-	}
-	resp_ := &baseSocketWithCtxBind2Response{}
-	err_ := ((*_bindings.ChannelProxy)(p)).Call(BaseSocketBind2Ordinal, req_, resp_)
-	return resp_.Result, err_
-}
-
-// Initiates a connection to a remote address.
-func (p *BaseSocketWithCtxInterface) Connect2(ctx_ _bindings.Context, addr fuchsianet.SocketAddress) (BaseSocketConnect2Result, error) {
-	req_ := &baseSocketWithCtxConnect2Request{
-		Addr: addr,
-	}
-	resp_ := &baseSocketWithCtxConnect2Response{}
-	err_ := ((*_bindings.ChannelProxy)(p)).Call(BaseSocketConnect2Ordinal, req_, resp_)
-	return resp_.Result, err_
-}
-
-// Retrieves the local socket address.
-func (p *BaseSocketWithCtxInterface) GetSockName2(ctx_ _bindings.Context) (BaseSocketGetSockName2Result, error) {
-	var req_ _bindings.Message
-	resp_ := &baseSocketWithCtxGetSockName2Response{}
-	err_ := ((*_bindings.ChannelProxy)(p)).Call(BaseSocketGetSockName2Ordinal, req_, resp_)
-	return resp_.Result, err_
-}
-
-// Retrieves the remote socket address.
-func (p *BaseSocketWithCtxInterface) GetPeerName2(ctx_ _bindings.Context) (BaseSocketGetPeerName2Result, error) {
-	var req_ _bindings.Message
-	resp_ := &baseSocketWithCtxGetPeerName2Response{}
-	err_ := ((*_bindings.ChannelProxy)(p)).Call(BaseSocketGetPeerName2Ordinal, req_, resp_)
-	return resp_.Result, err_
-}
-
 // Sets the value of a socket option.
 func (p *BaseSocketWithCtxInterface) SetSockOpt(ctx_ _bindings.Context, level int16, optname int16, optval []uint8) (BaseSocketSetSockOptResult, error) {
 	req_ := &baseSocketWithCtxSetSockOptRequest{
@@ -3206,14 +2553,6 @@
 	GetSockName(ctx_ _bindings.Context) (BaseSocketGetSockNameResult, error)
 	// Retrieves the remote socket address.
 	GetPeerName(ctx_ _bindings.Context) (BaseSocketGetPeerNameResult, error)
-	// Sets the local address used for the socket.
-	Bind2(ctx_ _bindings.Context, addr fuchsianet.SocketAddress) (BaseSocketBind2Result, error)
-	// Initiates a connection to a remote address.
-	Connect2(ctx_ _bindings.Context, addr fuchsianet.SocketAddress) (BaseSocketConnect2Result, error)
-	// Retrieves the local socket address.
-	GetSockName2(ctx_ _bindings.Context) (BaseSocketGetSockName2Result, error)
-	// Retrieves the remote socket address.
-	GetPeerName2(ctx_ _bindings.Context) (BaseSocketGetPeerName2Result, error)
 	// Sets the value of a socket option.
 	SetSockOpt(ctx_ _bindings.Context, level int16, optname int16, optval []uint8) (BaseSocketSetSockOptResult, error)
 	// Retrieves the value of a socket option.
@@ -3347,42 +2686,6 @@
 		out_ := baseSocketWithCtxGetPeerNameResponse{}
 		out_.Result = result
 		return &out_, true, err_
-	case BaseSocketBind2Ordinal:
-		in_ := baseSocketWithCtxBind2Request{}
-		marshalerCtx, ok := _bindings.GetMarshalerContext(args_.Ctx)
-		if !ok {
-			return nil, false, _bindings.ErrMissingMarshalerContext
-		}
-		if _, _, err_ := _bindings.UnmarshalWithContext2(marshalerCtx, args_.Bytes, args_.HandleInfos, &in_); err_ != nil {
-			return nil, false, err_
-		}
-		result, err_ := s_.Impl.Bind2(args_.Ctx, in_.Addr)
-		out_ := baseSocketWithCtxBind2Response{}
-		out_.Result = result
-		return &out_, true, err_
-	case BaseSocketConnect2Ordinal:
-		in_ := baseSocketWithCtxConnect2Request{}
-		marshalerCtx, ok := _bindings.GetMarshalerContext(args_.Ctx)
-		if !ok {
-			return nil, false, _bindings.ErrMissingMarshalerContext
-		}
-		if _, _, err_ := _bindings.UnmarshalWithContext2(marshalerCtx, args_.Bytes, args_.HandleInfos, &in_); err_ != nil {
-			return nil, false, err_
-		}
-		result, err_ := s_.Impl.Connect2(args_.Ctx, in_.Addr)
-		out_ := baseSocketWithCtxConnect2Response{}
-		out_.Result = result
-		return &out_, true, err_
-	case BaseSocketGetSockName2Ordinal:
-		result, err_ := s_.Impl.GetSockName2(args_.Ctx)
-		out_ := baseSocketWithCtxGetSockName2Response{}
-		out_.Result = result
-		return &out_, true, err_
-	case BaseSocketGetPeerName2Ordinal:
-		result, err_ := s_.Impl.GetPeerName2(args_.Ctx)
-		out_ := baseSocketWithCtxGetPeerName2Response{}
-		out_.Result = result
-		return &out_, true, err_
 	case BaseSocketSetSockOptOrdinal:
 		in_ := baseSocketWithCtxSetSockOptRequest{}
 		marshalerCtx, ok := _bindings.GetMarshalerContext(args_.Ctx)
@@ -3438,17 +2741,11 @@
 	DatagramSocketDisconnectOrdinal   uint64 = 0x20eaedba2e0f70a4
 	DatagramSocketGetSockNameOrdinal  uint64 = 0x41a618ef19a91f9d
 	DatagramSocketGetPeerNameOrdinal  uint64 = 0x4009d08a4beb5e95
-	DatagramSocketBind2Ordinal        uint64 = 0x7fa5c577e1f26cb7
-	DatagramSocketConnect2Ordinal     uint64 = 0xfe8f26e61598acc
-	DatagramSocketGetSockName2Ordinal uint64 = 0x7c3aa48a636f9e73
-	DatagramSocketGetPeerName2Ordinal uint64 = 0x7deeaf776d00f31f
 	DatagramSocketSetSockOptOrdinal   uint64 = 0x93c6f802203e6f1
 	DatagramSocketGetSockOptOrdinal   uint64 = 0x6dfaf70f0ed40544
 	DatagramSocketShutdownOrdinal     uint64 = 0x3c6058976bced940
 	DatagramSocketRecvMsgOrdinal      uint64 = 0x715341bb02f02b7a
 	DatagramSocketSendMsgOrdinal      uint64 = 0x359b626d62a7f17b
-	DatagramSocketShutdown2Ordinal    uint64 = 0x67568917918332b8
-	DatagramSocketRecvMsg2Ordinal     uint64 = 0x1b0129f47a5f652c
 )
 
 type DatagramSocketWithCtxInterface _bindings.ChannelProxy
@@ -3618,42 +2915,6 @@
 	return resp_.Result, err_
 }
 
-// Sets the local address used for the socket.
-func (p *DatagramSocketWithCtxInterface) Bind2(ctx_ _bindings.Context, addr fuchsianet.SocketAddress) (BaseSocketBind2Result, error) {
-	req_ := &datagramSocketWithCtxBind2Request{
-		Addr: addr,
-	}
-	resp_ := &datagramSocketWithCtxBind2Response{}
-	err_ := ((*_bindings.ChannelProxy)(p)).Call(DatagramSocketBind2Ordinal, req_, resp_)
-	return resp_.Result, err_
-}
-
-// Initiates a connection to a remote address.
-func (p *DatagramSocketWithCtxInterface) Connect2(ctx_ _bindings.Context, addr fuchsianet.SocketAddress) (BaseSocketConnect2Result, error) {
-	req_ := &datagramSocketWithCtxConnect2Request{
-		Addr: addr,
-	}
-	resp_ := &datagramSocketWithCtxConnect2Response{}
-	err_ := ((*_bindings.ChannelProxy)(p)).Call(DatagramSocketConnect2Ordinal, req_, resp_)
-	return resp_.Result, err_
-}
-
-// Retrieves the local socket address.
-func (p *DatagramSocketWithCtxInterface) GetSockName2(ctx_ _bindings.Context) (BaseSocketGetSockName2Result, error) {
-	var req_ _bindings.Message
-	resp_ := &datagramSocketWithCtxGetSockName2Response{}
-	err_ := ((*_bindings.ChannelProxy)(p)).Call(DatagramSocketGetSockName2Ordinal, req_, resp_)
-	return resp_.Result, err_
-}
-
-// Retrieves the remote socket address.
-func (p *DatagramSocketWithCtxInterface) GetPeerName2(ctx_ _bindings.Context) (BaseSocketGetPeerName2Result, error) {
-	var req_ _bindings.Message
-	resp_ := &datagramSocketWithCtxGetPeerName2Response{}
-	err_ := ((*_bindings.ChannelProxy)(p)).Call(DatagramSocketGetPeerName2Ordinal, req_, resp_)
-	return resp_.Result, err_
-}
-
 // Sets the value of a socket option.
 func (p *DatagramSocketWithCtxInterface) SetSockOpt(ctx_ _bindings.Context, level int16, optname int16, optval []uint8) (BaseSocketSetSockOptResult, error) {
 	req_ := &datagramSocketWithCtxSetSockOptRequest{
@@ -3713,29 +2974,6 @@
 	return resp_.Result, err_
 }
 
-// Shuts down part of the socket.
-func (p *DatagramSocketWithCtxInterface) Shutdown2(ctx_ _bindings.Context, mode ShutdownMode) (DatagramSocketShutdown2Result, error) {
-	req_ := &datagramSocketWithCtxShutdown2Request{
-		Mode: mode,
-	}
-	resp_ := &datagramSocketWithCtxShutdown2Response{}
-	err_ := ((*_bindings.ChannelProxy)(p)).Call(DatagramSocketShutdown2Ordinal, req_, resp_)
-	return resp_.Result, err_
-}
-
-// Receives a message from the socket.
-func (p *DatagramSocketWithCtxInterface) RecvMsg2(ctx_ _bindings.Context, wantAddr bool, dataLen uint32, wantControl bool, flags RecvMsgFlags) (DatagramSocketRecvMsg2Result, error) {
-	req_ := &datagramSocketWithCtxRecvMsg2Request{
-		WantAddr:    wantAddr,
-		DataLen:     dataLen,
-		WantControl: wantControl,
-		Flags:       flags,
-	}
-	resp_ := &datagramSocketWithCtxRecvMsg2Response{}
-	err_ := ((*_bindings.ChannelProxy)(p)).Call(DatagramSocketRecvMsg2Ordinal, req_, resp_)
-	return resp_.Result, err_
-}
-
 // A datagram socket.
 //
 // This type's [`fuchsia.io.Node/Describe`] method returns an eventpair which is used to signal
@@ -3813,14 +3051,6 @@
 	GetSockName(ctx_ _bindings.Context) (BaseSocketGetSockNameResult, error)
 	// Retrieves the remote socket address.
 	GetPeerName(ctx_ _bindings.Context) (BaseSocketGetPeerNameResult, error)
-	// Sets the local address used for the socket.
-	Bind2(ctx_ _bindings.Context, addr fuchsianet.SocketAddress) (BaseSocketBind2Result, error)
-	// Initiates a connection to a remote address.
-	Connect2(ctx_ _bindings.Context, addr fuchsianet.SocketAddress) (BaseSocketConnect2Result, error)
-	// Retrieves the local socket address.
-	GetSockName2(ctx_ _bindings.Context) (BaseSocketGetSockName2Result, error)
-	// Retrieves the remote socket address.
-	GetPeerName2(ctx_ _bindings.Context) (BaseSocketGetPeerName2Result, error)
 	// Sets the value of a socket option.
 	SetSockOpt(ctx_ _bindings.Context, level int16, optname int16, optval []uint8) (BaseSocketSetSockOptResult, error)
 	// Retrieves the value of a socket option.
@@ -3831,10 +3061,6 @@
 	RecvMsg(ctx_ _bindings.Context, wantAddr bool, dataLen uint32, wantControl bool, flags RecvMsgFlags) (DatagramSocketRecvMsgResult, error)
 	// Sends a message on the socket.
 	SendMsg(ctx_ _bindings.Context, addr *fuchsianet.SocketAddress, data []uint8, control SendControlData, flags SendMsgFlags) (DatagramSocketSendMsgResult, error)
-	// Shuts down part of the socket.
-	Shutdown2(ctx_ _bindings.Context, mode ShutdownMode) (DatagramSocketShutdown2Result, error)
-	// Receives a message from the socket.
-	RecvMsg2(ctx_ _bindings.Context, wantAddr bool, dataLen uint32, wantControl bool, flags RecvMsgFlags) (DatagramSocketRecvMsg2Result, error)
 }
 
 type DatagramSocketWithCtxTransitionalBase struct{}
@@ -3964,42 +3190,6 @@
 		out_ := datagramSocketWithCtxGetPeerNameResponse{}
 		out_.Result = result
 		return &out_, true, err_
-	case DatagramSocketBind2Ordinal:
-		in_ := datagramSocketWithCtxBind2Request{}
-		marshalerCtx, ok := _bindings.GetMarshalerContext(args_.Ctx)
-		if !ok {
-			return nil, false, _bindings.ErrMissingMarshalerContext
-		}
-		if _, _, err_ := _bindings.UnmarshalWithContext2(marshalerCtx, args_.Bytes, args_.HandleInfos, &in_); err_ != nil {
-			return nil, false, err_
-		}
-		result, err_ := s_.Impl.Bind2(args_.Ctx, in_.Addr)
-		out_ := datagramSocketWithCtxBind2Response{}
-		out_.Result = result
-		return &out_, true, err_
-	case DatagramSocketConnect2Ordinal:
-		in_ := datagramSocketWithCtxConnect2Request{}
-		marshalerCtx, ok := _bindings.GetMarshalerContext(args_.Ctx)
-		if !ok {
-			return nil, false, _bindings.ErrMissingMarshalerContext
-		}
-		if _, _, err_ := _bindings.UnmarshalWithContext2(marshalerCtx, args_.Bytes, args_.HandleInfos, &in_); err_ != nil {
-			return nil, false, err_
-		}
-		result, err_ := s_.Impl.Connect2(args_.Ctx, in_.Addr)
-		out_ := datagramSocketWithCtxConnect2Response{}
-		out_.Result = result
-		return &out_, true, err_
-	case DatagramSocketGetSockName2Ordinal:
-		result, err_ := s_.Impl.GetSockName2(args_.Ctx)
-		out_ := datagramSocketWithCtxGetSockName2Response{}
-		out_.Result = result
-		return &out_, true, err_
-	case DatagramSocketGetPeerName2Ordinal:
-		result, err_ := s_.Impl.GetPeerName2(args_.Ctx)
-		out_ := datagramSocketWithCtxGetPeerName2Response{}
-		out_.Result = result
-		return &out_, true, err_
 	case DatagramSocketSetSockOptOrdinal:
 		in_ := datagramSocketWithCtxSetSockOptRequest{}
 		marshalerCtx, ok := _bindings.GetMarshalerContext(args_.Ctx)
@@ -4065,32 +3255,6 @@
 		out_ := datagramSocketWithCtxSendMsgResponse{}
 		out_.Result = result
 		return &out_, true, err_
-	case DatagramSocketShutdown2Ordinal:
-		in_ := datagramSocketWithCtxShutdown2Request{}
-		marshalerCtx, ok := _bindings.GetMarshalerContext(args_.Ctx)
-		if !ok {
-			return nil, false, _bindings.ErrMissingMarshalerContext
-		}
-		if _, _, err_ := _bindings.UnmarshalWithContext2(marshalerCtx, args_.Bytes, args_.HandleInfos, &in_); err_ != nil {
-			return nil, false, err_
-		}
-		result, err_ := s_.Impl.Shutdown2(args_.Ctx, in_.Mode)
-		out_ := datagramSocketWithCtxShutdown2Response{}
-		out_.Result = result
-		return &out_, true, err_
-	case DatagramSocketRecvMsg2Ordinal:
-		in_ := datagramSocketWithCtxRecvMsg2Request{}
-		marshalerCtx, ok := _bindings.GetMarshalerContext(args_.Ctx)
-		if !ok {
-			return nil, false, _bindings.ErrMissingMarshalerContext
-		}
-		if _, _, err_ := _bindings.UnmarshalWithContext2(marshalerCtx, args_.Bytes, args_.HandleInfos, &in_); err_ != nil {
-			return nil, false, err_
-		}
-		result, err_ := s_.Impl.RecvMsg2(args_.Ctx, in_.WantAddr, in_.DataLen, in_.WantControl, in_.Flags)
-		out_ := datagramSocketWithCtxRecvMsg2Response{}
-		out_.Result = result
-		return &out_, true, err_
 	}
 	return nil, false, _bindings.ErrUnknownOrdinal
 }
@@ -4120,15 +3284,10 @@
 	StreamSocketDisconnectOrdinal   uint64 = 0x20eaedba2e0f70a4
 	StreamSocketGetSockNameOrdinal  uint64 = 0x41a618ef19a91f9d
 	StreamSocketGetPeerNameOrdinal  uint64 = 0x4009d08a4beb5e95
-	StreamSocketBind2Ordinal        uint64 = 0x7fa5c577e1f26cb7
-	StreamSocketConnect2Ordinal     uint64 = 0xfe8f26e61598acc
-	StreamSocketGetSockName2Ordinal uint64 = 0x7c3aa48a636f9e73
-	StreamSocketGetPeerName2Ordinal uint64 = 0x7deeaf776d00f31f
 	StreamSocketSetSockOptOrdinal   uint64 = 0x93c6f802203e6f1
 	StreamSocketGetSockOptOrdinal   uint64 = 0x6dfaf70f0ed40544
 	StreamSocketListenOrdinal       uint64 = 0x3d0a65ced3d10108
 	StreamSocketAcceptOrdinal       uint64 = 0x5ab7ad620424c163
-	StreamSocketAccept2Ordinal      uint64 = 0x33869660242a732e
 )
 
 type StreamSocketWithCtxInterface _bindings.ChannelProxy
@@ -4298,42 +3457,6 @@
 	return resp_.Result, err_
 }
 
-// Sets the local address used for the socket.
-func (p *StreamSocketWithCtxInterface) Bind2(ctx_ _bindings.Context, addr fuchsianet.SocketAddress) (BaseSocketBind2Result, error) {
-	req_ := &streamSocketWithCtxBind2Request{
-		Addr: addr,
-	}
-	resp_ := &streamSocketWithCtxBind2Response{}
-	err_ := ((*_bindings.ChannelProxy)(p)).Call(StreamSocketBind2Ordinal, req_, resp_)
-	return resp_.Result, err_
-}
-
-// Initiates a connection to a remote address.
-func (p *StreamSocketWithCtxInterface) Connect2(ctx_ _bindings.Context, addr fuchsianet.SocketAddress) (BaseSocketConnect2Result, error) {
-	req_ := &streamSocketWithCtxConnect2Request{
-		Addr: addr,
-	}
-	resp_ := &streamSocketWithCtxConnect2Response{}
-	err_ := ((*_bindings.ChannelProxy)(p)).Call(StreamSocketConnect2Ordinal, req_, resp_)
-	return resp_.Result, err_
-}
-
-// Retrieves the local socket address.
-func (p *StreamSocketWithCtxInterface) GetSockName2(ctx_ _bindings.Context) (BaseSocketGetSockName2Result, error) {
-	var req_ _bindings.Message
-	resp_ := &streamSocketWithCtxGetSockName2Response{}
-	err_ := ((*_bindings.ChannelProxy)(p)).Call(StreamSocketGetSockName2Ordinal, req_, resp_)
-	return resp_.Result, err_
-}
-
-// Retrieves the remote socket address.
-func (p *StreamSocketWithCtxInterface) GetPeerName2(ctx_ _bindings.Context) (BaseSocketGetPeerName2Result, error) {
-	var req_ _bindings.Message
-	resp_ := &streamSocketWithCtxGetPeerName2Response{}
-	err_ := ((*_bindings.ChannelProxy)(p)).Call(StreamSocketGetPeerName2Ordinal, req_, resp_)
-	return resp_.Result, err_
-}
-
 // Sets the value of a socket option.
 func (p *StreamSocketWithCtxInterface) SetSockOpt(ctx_ _bindings.Context, level int16, optname int16, optval []uint8) (BaseSocketSetSockOptResult, error) {
 	req_ := &streamSocketWithCtxSetSockOptRequest{
@@ -4378,14 +3501,6 @@
 	return resp_.Result, err_
 }
 
-// Accepts a buffered incoming connection.
-func (p *StreamSocketWithCtxInterface) Accept2(ctx_ _bindings.Context) (StreamSocketAccept2Result, error) {
-	var req_ _bindings.Message
-	resp_ := &streamSocketWithCtxAccept2Response{}
-	err_ := ((*_bindings.ChannelProxy)(p)).Call(StreamSocketAccept2Ordinal, req_, resp_)
-	return resp_.Result, err_
-}
-
 // A stream socket.
 //
 // This type's [`fuchsia.io.Node/Describe`] method returns a socket which is used to transfer data
@@ -4465,14 +3580,6 @@
 	GetSockName(ctx_ _bindings.Context) (BaseSocketGetSockNameResult, error)
 	// Retrieves the remote socket address.
 	GetPeerName(ctx_ _bindings.Context) (BaseSocketGetPeerNameResult, error)
-	// Sets the local address used for the socket.
-	Bind2(ctx_ _bindings.Context, addr fuchsianet.SocketAddress) (BaseSocketBind2Result, error)
-	// Initiates a connection to a remote address.
-	Connect2(ctx_ _bindings.Context, addr fuchsianet.SocketAddress) (BaseSocketConnect2Result, error)
-	// Retrieves the local socket address.
-	GetSockName2(ctx_ _bindings.Context) (BaseSocketGetSockName2Result, error)
-	// Retrieves the remote socket address.
-	GetPeerName2(ctx_ _bindings.Context) (BaseSocketGetPeerName2Result, error)
 	// Sets the value of a socket option.
 	SetSockOpt(ctx_ _bindings.Context, level int16, optname int16, optval []uint8) (BaseSocketSetSockOptResult, error)
 	// Retrieves the value of a socket option.
@@ -4482,8 +3589,6 @@
 	Listen(ctx_ _bindings.Context, backlog int16) (StreamSocketListenResult, error)
 	// Accepts a buffered incoming connection.
 	Accept(ctx_ _bindings.Context, wantAddr bool) (StreamSocketAcceptResult, error)
-	// Accepts a buffered incoming connection.
-	Accept2(ctx_ _bindings.Context) (StreamSocketAccept2Result, error)
 }
 
 type StreamSocketWithCtxTransitionalBase struct{}
@@ -4613,42 +3718,6 @@
 		out_ := streamSocketWithCtxGetPeerNameResponse{}
 		out_.Result = result
 		return &out_, true, err_
-	case StreamSocketBind2Ordinal:
-		in_ := streamSocketWithCtxBind2Request{}
-		marshalerCtx, ok := _bindings.GetMarshalerContext(args_.Ctx)
-		if !ok {
-			return nil, false, _bindings.ErrMissingMarshalerContext
-		}
-		if _, _, err_ := _bindings.UnmarshalWithContext2(marshalerCtx, args_.Bytes, args_.HandleInfos, &in_); err_ != nil {
-			return nil, false, err_
-		}
-		result, err_ := s_.Impl.Bind2(args_.Ctx, in_.Addr)
-		out_ := streamSocketWithCtxBind2Response{}
-		out_.Result = result
-		return &out_, true, err_
-	case StreamSocketConnect2Ordinal:
-		in_ := streamSocketWithCtxConnect2Request{}
-		marshalerCtx, ok := _bindings.GetMarshalerContext(args_.Ctx)
-		if !ok {
-			return nil, false, _bindings.ErrMissingMarshalerContext
-		}
-		if _, _, err_ := _bindings.UnmarshalWithContext2(marshalerCtx, args_.Bytes, args_.HandleInfos, &in_); err_ != nil {
-			return nil, false, err_
-		}
-		result, err_ := s_.Impl.Connect2(args_.Ctx, in_.Addr)
-		out_ := streamSocketWithCtxConnect2Response{}
-		out_.Result = result
-		return &out_, true, err_
-	case StreamSocketGetSockName2Ordinal:
-		result, err_ := s_.Impl.GetSockName2(args_.Ctx)
-		out_ := streamSocketWithCtxGetSockName2Response{}
-		out_.Result = result
-		return &out_, true, err_
-	case StreamSocketGetPeerName2Ordinal:
-		result, err_ := s_.Impl.GetPeerName2(args_.Ctx)
-		out_ := streamSocketWithCtxGetPeerName2Response{}
-		out_.Result = result
-		return &out_, true, err_
 	case StreamSocketSetSockOptOrdinal:
 		in_ := streamSocketWithCtxSetSockOptRequest{}
 		marshalerCtx, ok := _bindings.GetMarshalerContext(args_.Ctx)
@@ -4701,11 +3770,6 @@
 		out_ := streamSocketWithCtxAcceptResponse{}
 		out_.Result = result
 		return &out_, true, err_
-	case StreamSocketAccept2Ordinal:
-		result, err_ := s_.Impl.Accept2(args_.Ctx)
-		out_ := streamSocketWithCtxAccept2Response{}
-		out_.Result = result
-		return &out_, true, err_
 	}
 	return nil, false, _bindings.ErrUnknownOrdinal
 }