[fidl][go] Regen

Mechanical (`./regen-fidl`) with CL
https://fuchsia-review.googlesource.com/c/fuchsia/+/267008

Change-Id: Ica1bbf2ba088c1f62029d91256e61e141d3f15cb
diff --git a/src/syscall/zx/fidl/bindingstest/impl.go b/src/syscall/zx/fidl/bindingstest/impl.go
index 10acb55..2d26e84 100644
--- a/src/syscall/zx/fidl/bindingstest/impl.go
+++ b/src/syscall/zx/fidl/bindingstest/impl.go
@@ -1431,82 +1431,82 @@
 	Test1SurpriseGenOrdinal uint32 = 1272344178
 )
 
-type Test1EchoRequest struct {
+type test1EchoRequest struct {
 	_  struct{} `fidl2:"s,16,0"`
 	In *string
 }
 
-var _mTest1EchoRequest = _bindings.CreateLazyMarshaler(Test1EchoRequest{})
+var _mtest1EchoRequest = _bindings.CreateLazyMarshaler(test1EchoRequest{})
 
-func (msg *Test1EchoRequest) Marshaler() _bindings.Marshaler {
-	return _mTest1EchoRequest
+func (msg *test1EchoRequest) Marshaler() _bindings.Marshaler {
+	return _mtest1EchoRequest
 }
 
 // Implements Payload.
-func (_ *Test1EchoRequest) InlineAlignment() int {
+func (_ *test1EchoRequest) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *Test1EchoRequest) InlineSize() int {
+func (_ *test1EchoRequest) InlineSize() int {
 	return 16
 }
 
-type Test1EchoResponse struct {
+type test1EchoResponse struct {
 	_   struct{} `fidl2:"s,16,0"`
 	Out *string
 }
 
-var _mTest1EchoResponse = _bindings.CreateLazyMarshaler(Test1EchoResponse{})
+var _mtest1EchoResponse = _bindings.CreateLazyMarshaler(test1EchoResponse{})
 
-func (msg *Test1EchoResponse) Marshaler() _bindings.Marshaler {
-	return _mTest1EchoResponse
+func (msg *test1EchoResponse) Marshaler() _bindings.Marshaler {
+	return _mtest1EchoResponse
 }
 
 // Implements Payload.
-func (_ *Test1EchoResponse) InlineAlignment() int {
+func (_ *test1EchoResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *Test1EchoResponse) InlineSize() int {
+func (_ *test1EchoResponse) InlineSize() int {
 	return 16
 }
 
-type Test1SurpriseResponse struct {
+type test1SurpriseResponse struct {
 	_   struct{} `fidl2:"s,16,0"`
 	Foo string
 }
 
-var _mTest1SurpriseResponse = _bindings.CreateLazyMarshaler(Test1SurpriseResponse{})
+var _mtest1SurpriseResponse = _bindings.CreateLazyMarshaler(test1SurpriseResponse{})
 
-func (msg *Test1SurpriseResponse) Marshaler() _bindings.Marshaler {
-	return _mTest1SurpriseResponse
+func (msg *test1SurpriseResponse) Marshaler() _bindings.Marshaler {
+	return _mtest1SurpriseResponse
 }
 
 // Implements Payload.
-func (_ *Test1SurpriseResponse) InlineAlignment() int {
+func (_ *test1SurpriseResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *Test1SurpriseResponse) InlineSize() int {
+func (_ *test1SurpriseResponse) InlineSize() int {
 	return 16
 }
 
 type Test1Interface _bindings.ChannelProxy
 
 func (p *Test1Interface) Echo(in *string) (*string, error) {
-	req_ := &Test1EchoRequest{
+	req_ := &test1EchoRequest{
 		In: in,
 	}
-	resp_ := &Test1EchoResponse{}
+	resp_ := &test1EchoResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(Test1EchoOrdinal, req_, resp_)
 	return resp_.Out, err
 }
 
 func (p *Test1Interface) ExpectSurprise() (string, error) {
-	resp_ := &Test1SurpriseResponse{}
+	resp_ := &test1SurpriseResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Recv(Test1SurpriseOrdinal, resp_)
 	return resp_.Foo, err
 }
@@ -1535,12 +1535,12 @@
 func (s *Test1Stub) DispatchNew(ord uint32, b_ []byte, h_ []_zx.Handle) (_bindings.Message, error) {
 	switch ord {
 	case Test1EchoOrdinal:
-		in_ := Test1EchoRequest{}
+		in_ := test1EchoRequest{}
 		if err_ := _bindings.Unmarshal(b_, h_, &in_); err_ != nil {
 			return nil, err_
 		}
 		out, err_ := s.Impl.Echo(in_.In)
-		out_ := Test1EchoResponse{}
+		out_ := test1EchoResponse{}
 		out_.Out = out
 		return &out_, err_
 	}
@@ -1563,7 +1563,7 @@
 type Test1EventProxy _bindings.ChannelProxy
 
 func (p *Test1EventProxy) Surprise(foo string) error {
-	event_ := &Test1SurpriseResponse{
+	event_ := &test1SurpriseResponse{
 		Foo: foo,
 	}
 	return ((*_bindings.ChannelProxy)(p)).Send(Test1SurpriseOrdinal, event_)
diff --git a/src/syscall/zx/io/impl.go b/src/syscall/zx/io/impl.go
index 452443f..d9fc2d4 100644
--- a/src/syscall/zx/io/impl.go
+++ b/src/syscall/zx/io/impl.go
@@ -17,6 +17,20 @@
 )
 
 const (
+	// Indicates the file is ready for reading.
+	FileSignalReadable uint32 = 0x01000000
+	// Indicates the file is ready for writing.
+	FileSignalWritable uint32 = 0x02000000
+	// Indicates the device is ready for reading.
+	DeviceSignalReadable uint32 = 0x01000000
+	// Indicates the device is ready for writing.
+	DeviceSignalWritable uint32 = 0x02000000
+	// Indicates the device has encountered an error state.
+	DeviceSignalError uint32 = 0x04000000
+	// Indicates the device has hung up on the current connection.
+	DeviceSignalHangup uint32 = 0x08000000
+	// Indicates an out-of-band state transition has occurred.
+	DeviceSignalOob uint32 = 0x10000000
 	// Can read from target object.
 	OpenRightReadable uint32 = 0x00000001
 	// Can write to target object.
@@ -83,7 +97,7 @@
 	// definitions.
 	ModeProtectionMask uint32 = 0x00FFF
 	// Bits indicating node type. The canonical mechanism to check
-	// for a node type is to take 'mode', bitwise and it with the
+	// for a node type is to take 'mode', bitwise AND it with the
 	// MODE_TYPE_MASK, and check exact equality against a mode type.
 	ModeTypeMask        uint32 = 0xFF000
 	ModeTypeDirectory   uint32 = 0x04000
@@ -92,9 +106,13 @@
 	ModeTypeSocket      uint32 = 0x0C000
 	ModeTypeService     uint32 = 0x10000
 	MaxIoctlHandles     uint64 = 2
-	MaxBuf              uint64 = 8192
-	MaxPath             uint64 = 4096
-	MaxFilename         uint64 = 255
+	// The maximal buffer size which can be transmitted for buffered operations.
+	// This capacity is currently set somewhat arbitrarily.
+	MaxBuf uint64 = 8192
+	// The maximum length, in bytes, of a filesystem string.
+	MaxPath uint64 = 4096
+	// The maximum length, in bytes, of a single filesystem component.
+	MaxFilename uint64 = 255
 	// The fields of 'attributes' which are used to update the Node are indicated
 	// by the 'flags' argument.
 	NodeAttributeFlagCreationTime     uint32 = 0x00000001
@@ -113,13 +131,18 @@
 	// The request should fail if a handle to the exact VMO is not returned.
 	// May not be supplied with VMO_FLAG_PRIVATE.
 	VmoFlagExact uint32 = 0x00020000
-	// Dirent type information associated with the results of ReadDirents.
-	DirentTypeUnknown     uint8 = 0
-	DirentTypeDirectory   uint8 = 4
+	// A dirent with an unknown type.
+	DirentTypeUnknown uint8 = 0
+	// A dirent representing a directory object.
+	DirentTypeDirectory uint8 = 4
+	// A dirent representing a block device object.
 	DirentTypeBlockDevice uint8 = 6
-	DirentTypeFile        uint8 = 8
-	DirentTypeSocket      uint8 = 12
-	DirentTypeService     uint8 = 16
+	// A dirent representing a file object.
+	DirentTypeFile uint8 = 8
+	// A dirent representing a socket object.
+	DirentTypeSocket uint8 = 12
+	// A dirent representing a service object.
+	DirentTypeService uint8 = 16
 	// Nodes which do not have ino values should return this value
 	// from Readdir and GetAttr.
 	InoUnknown uint64 = 0xFFFFFFFFFFFFFFFF
@@ -133,14 +156,17 @@
 	WatchEventExisting uint8 = 3
 	// Identifies that no more WATCH_EVENT_EXISTING events will be sent.
 	WatchEventIdle uint8 = 4
-	// The following are bitmasks corresponding to the "watch events".
-	// They may be used as arguments to the Directory Watch method, to
-	// specify which events should receive notifications.
-	WatchMaskDeleted       uint32 = 0x00000001
-	WatchMaskAdded         uint32 = 0x00000002
-	WatchMaskRemoved       uint32 = 0x00000004
-	WatchMaskExisting      uint32 = 0x00000008
-	WatchMaskIdle          uint32 = 0x00000010
+	// Used by Directory::Watch. Requests transmission of WATCH_EVENT_DELETED.
+	WatchMaskDeleted uint32 = 0x00000001
+	// Used by Directory::Watch. Requests transmission of WATCH_EVENT_ADDED.
+	WatchMaskAdded uint32 = 0x00000002
+	// Used by Directory::Watch. Requests transmission of WATCH_EVENT_REMOVED.
+	WatchMaskRemoved uint32 = 0x00000004
+	// Used by Directory::Watch. Requests transmission of WATCH_EVENT_EXISTING.
+	WatchMaskExisting uint32 = 0x00000008
+	// Used by Directory::Watch. Requests transmission of WATCH_EVENT_IDLE.
+	WatchMaskIdle uint32 = 0x00000010
+	// Used by Directory::Watch. Requests transmission of all watcher events.
 	WatchMaskAll           uint32 = 0x0000001F
 	MountCreateFlagReplace uint32 = 0x00000001
 	MaxFsNameBuffer        uint64 = 32
@@ -191,7 +217,13 @@
 
 // The object may be cast to interface 'File'.
 type FileObject struct {
-	_     struct{}  `fidl2:"s,4,4"`
+	_ struct{} `fidl2:"s,4,4"`
+	// An optional event which transmits information about an object's readability
+	// or writability. This event relays information about the underlying object, not
+	// the capability granted to client: this event may be signalled "readable" on a
+	// connection that does not have the capability to read.
+	//
+	// The "FILE_SIGNAL_" values may be observed on this event.
 	Event _zx.Event `fidl:"*" fidl2:"1"`
 }
 
@@ -254,11 +286,17 @@
 	return 4
 }
 
-// The object is accompanied by a VMO.
+// The object is a file which is represented as an immutable VMO.
+// Although a VMO is returned as a part of this structure, this underlying object
+// may represent multiple Vmofiles. To identify the logical portion of the VMO
+// that represents the single file, an offset and length parameter are also supplied.
 type Vmofile struct {
-	_      struct{} `fidl2:"s,24,8"`
-	Vmo    _zx.VMO  `fidl2:"0"`
+	_ struct{} `fidl2:"s,24,8"`
+	// The VMO which backs this file.
+	Vmo _zx.VMO `fidl2:"0"`
+	// The index into |vmo| which represents the first byte of the file.
 	Offset uint64
+	// The number of bytes, starting at |offset|, which may be used to represent this file.
 	Length uint64
 }
 
@@ -280,7 +318,10 @@
 
 // The object may be cast to interface 'Device'.
 type Device struct {
-	_     struct{}  `fidl2:"s,4,4"`
+	_ struct{} `fidl2:"s,4,4"`
+	// An optional event which transmits information about a device's state.
+	//
+	// The "DEVICE_SIGNAL_" values may be observed on this event.
 	Event _zx.Event `fidl:"*" fidl2:"1"`
 }
 
@@ -300,6 +341,28 @@
 	return 4
 }
 
+// The object may be cast to interface 'Tty'
+type Tty struct {
+	_     struct{}  `fidl2:"s,4,4"`
+	Event _zx.Event `fidl:"*" fidl2:"1"`
+}
+
+var _mTty = _bindings.CreateLazyMarshaler(Tty{})
+
+func (msg *Tty) Marshaler() _bindings.Marshaler {
+	return _mTty
+}
+
+// Implements Payload.
+func (_ *Tty) InlineAlignment() int {
+	return 4
+}
+
+// Implements Payload.
+func (_ *Tty) InlineSize() int {
+	return 4
+}
+
 // NodeAttributes defines generic information about a filesystem node.
 type NodeAttributes struct {
 	_ struct{} `fidl2:"s,56,8"`
@@ -335,7 +398,7 @@
 	return 56
 }
 
-// WARNING(ZX-2645): Unused.
+// TODO(ZX-2645): Unused.
 //
 // WatchedEvent describes events returned from a DirectoryWatcher.
 type WatchedEvent struct {
@@ -416,6 +479,7 @@
 	NodeInfoPipe
 	NodeInfoVmofile
 	NodeInfoDevice
+	NodeInfoTty
 )
 
 // Describes how the connection to an should be handled, as well as
@@ -430,6 +494,7 @@
 	Pipe        Pipe
 	Vmofile     Vmofile
 	Device      Device
+	Tty         Tty
 }
 
 // Implements Payload.
@@ -476,6 +541,11 @@
 	u.Device = device
 }
 
+func (u *NodeInfo) SetTty(tty Tty) {
+	u.NodeInfoTag = NodeInfoTty
+	u.Tty = tty
+}
+
 const (
 	NodeCloneOrdinal       uint32 = 402549324
 	NodeCloneGenOrdinal    uint32 = 402549324
@@ -495,179 +565,179 @@
 	NodeIoctlGenOrdinal    uint32 = 905161895
 )
 
-type NodeCloneRequest struct {
+type nodeCloneRequest struct {
 	_      struct{} `fidl2:"s,8,0"`
 	Flags  uint32
 	Object NodeInterfaceRequest `fidl2:"0"`
 }
 
-var _mNodeCloneRequest = _bindings.CreateLazyMarshaler(NodeCloneRequest{})
+var _mnodeCloneRequest = _bindings.CreateLazyMarshaler(nodeCloneRequest{})
 
-func (msg *NodeCloneRequest) Marshaler() _bindings.Marshaler {
-	return _mNodeCloneRequest
+func (msg *nodeCloneRequest) Marshaler() _bindings.Marshaler {
+	return _mnodeCloneRequest
 }
 
 // Implements Payload.
-func (_ *NodeCloneRequest) InlineAlignment() int {
+func (_ *nodeCloneRequest) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *NodeCloneRequest) InlineSize() int {
+func (_ *nodeCloneRequest) InlineSize() int {
 	return 8
 }
 
-type NodeCloseResponse struct {
+type nodeCloseResponse struct {
 	_ struct{} `fidl2:"s,8,0"`
 	S int32
 }
 
-var _mNodeCloseResponse = _bindings.CreateLazyMarshaler(NodeCloseResponse{})
+var _mnodeCloseResponse = _bindings.CreateLazyMarshaler(nodeCloseResponse{})
 
-func (msg *NodeCloseResponse) Marshaler() _bindings.Marshaler {
-	return _mNodeCloseResponse
+func (msg *nodeCloseResponse) Marshaler() _bindings.Marshaler {
+	return _mnodeCloseResponse
 }
 
 // Implements Payload.
-func (_ *NodeCloseResponse) InlineAlignment() int {
+func (_ *nodeCloseResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *NodeCloseResponse) InlineSize() int {
+func (_ *nodeCloseResponse) InlineSize() int {
 	return 8
 }
 
-type NodeDescribeResponse struct {
+type nodeDescribeResponse struct {
 	_    struct{} `fidl2:"s,32,0"`
 	Info NodeInfo
 }
 
-var _mNodeDescribeResponse = _bindings.CreateLazyMarshaler(NodeDescribeResponse{})
+var _mnodeDescribeResponse = _bindings.CreateLazyMarshaler(nodeDescribeResponse{})
 
-func (msg *NodeDescribeResponse) Marshaler() _bindings.Marshaler {
-	return _mNodeDescribeResponse
+func (msg *nodeDescribeResponse) Marshaler() _bindings.Marshaler {
+	return _mnodeDescribeResponse
 }
 
 // Implements Payload.
-func (_ *NodeDescribeResponse) InlineAlignment() int {
+func (_ *nodeDescribeResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *NodeDescribeResponse) InlineSize() int {
+func (_ *nodeDescribeResponse) InlineSize() int {
 	return 32
 }
 
-type NodeOnOpenResponse struct {
+type nodeOnOpenResponse struct {
 	_    struct{} `fidl2:"s,16,0"`
 	S    int32
 	Info *NodeInfo
 }
 
-var _mNodeOnOpenResponse = _bindings.CreateLazyMarshaler(NodeOnOpenResponse{})
+var _mnodeOnOpenResponse = _bindings.CreateLazyMarshaler(nodeOnOpenResponse{})
 
-func (msg *NodeOnOpenResponse) Marshaler() _bindings.Marshaler {
-	return _mNodeOnOpenResponse
+func (msg *nodeOnOpenResponse) Marshaler() _bindings.Marshaler {
+	return _mnodeOnOpenResponse
 }
 
 // Implements Payload.
-func (_ *NodeOnOpenResponse) InlineAlignment() int {
+func (_ *nodeOnOpenResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *NodeOnOpenResponse) InlineSize() int {
+func (_ *nodeOnOpenResponse) InlineSize() int {
 	return 16
 }
 
-type NodeSyncResponse struct {
+type nodeSyncResponse struct {
 	_ struct{} `fidl2:"s,8,0"`
 	S int32
 }
 
-var _mNodeSyncResponse = _bindings.CreateLazyMarshaler(NodeSyncResponse{})
+var _mnodeSyncResponse = _bindings.CreateLazyMarshaler(nodeSyncResponse{})
 
-func (msg *NodeSyncResponse) Marshaler() _bindings.Marshaler {
-	return _mNodeSyncResponse
+func (msg *nodeSyncResponse) Marshaler() _bindings.Marshaler {
+	return _mnodeSyncResponse
 }
 
 // Implements Payload.
-func (_ *NodeSyncResponse) InlineAlignment() int {
+func (_ *nodeSyncResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *NodeSyncResponse) InlineSize() int {
+func (_ *nodeSyncResponse) InlineSize() int {
 	return 8
 }
 
-type NodeGetAttrResponse struct {
+type nodeGetAttrResponse struct {
 	_          struct{} `fidl2:"s,64,0"`
 	S          int32
 	Attributes NodeAttributes
 }
 
-var _mNodeGetAttrResponse = _bindings.CreateLazyMarshaler(NodeGetAttrResponse{})
+var _mnodeGetAttrResponse = _bindings.CreateLazyMarshaler(nodeGetAttrResponse{})
 
-func (msg *NodeGetAttrResponse) Marshaler() _bindings.Marshaler {
-	return _mNodeGetAttrResponse
+func (msg *nodeGetAttrResponse) Marshaler() _bindings.Marshaler {
+	return _mnodeGetAttrResponse
 }
 
 // Implements Payload.
-func (_ *NodeGetAttrResponse) InlineAlignment() int {
+func (_ *nodeGetAttrResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *NodeGetAttrResponse) InlineSize() int {
+func (_ *nodeGetAttrResponse) InlineSize() int {
 	return 64
 }
 
-type NodeSetAttrRequest struct {
+type nodeSetAttrRequest struct {
 	_          struct{} `fidl2:"s,64,0"`
 	Flags      uint32
 	Attributes NodeAttributes
 }
 
-var _mNodeSetAttrRequest = _bindings.CreateLazyMarshaler(NodeSetAttrRequest{})
+var _mnodeSetAttrRequest = _bindings.CreateLazyMarshaler(nodeSetAttrRequest{})
 
-func (msg *NodeSetAttrRequest) Marshaler() _bindings.Marshaler {
-	return _mNodeSetAttrRequest
+func (msg *nodeSetAttrRequest) Marshaler() _bindings.Marshaler {
+	return _mnodeSetAttrRequest
 }
 
 // Implements Payload.
-func (_ *NodeSetAttrRequest) InlineAlignment() int {
+func (_ *nodeSetAttrRequest) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *NodeSetAttrRequest) InlineSize() int {
+func (_ *nodeSetAttrRequest) InlineSize() int {
 	return 64
 }
 
-type NodeSetAttrResponse struct {
+type nodeSetAttrResponse struct {
 	_ struct{} `fidl2:"s,8,0"`
 	S int32
 }
 
-var _mNodeSetAttrResponse = _bindings.CreateLazyMarshaler(NodeSetAttrResponse{})
+var _mnodeSetAttrResponse = _bindings.CreateLazyMarshaler(nodeSetAttrResponse{})
 
-func (msg *NodeSetAttrResponse) Marshaler() _bindings.Marshaler {
-	return _mNodeSetAttrResponse
+func (msg *nodeSetAttrResponse) Marshaler() _bindings.Marshaler {
+	return _mnodeSetAttrResponse
 }
 
 // Implements Payload.
-func (_ *NodeSetAttrResponse) InlineAlignment() int {
+func (_ *nodeSetAttrResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *NodeSetAttrResponse) InlineSize() int {
+func (_ *nodeSetAttrResponse) InlineSize() int {
 	return 8
 }
 
-type NodeIoctlRequest struct {
+type nodeIoctlRequest struct {
 	_       struct{} `fidl2:"s,48,0"`
 	Opcode  uint32
 	MaxOut  uint64
@@ -675,42 +745,42 @@
 	In      []uint8      `fidl:"8192" fidl2:"8192"`
 }
 
-var _mNodeIoctlRequest = _bindings.CreateLazyMarshaler(NodeIoctlRequest{})
+var _mnodeIoctlRequest = _bindings.CreateLazyMarshaler(nodeIoctlRequest{})
 
-func (msg *NodeIoctlRequest) Marshaler() _bindings.Marshaler {
-	return _mNodeIoctlRequest
+func (msg *nodeIoctlRequest) Marshaler() _bindings.Marshaler {
+	return _mnodeIoctlRequest
 }
 
 // Implements Payload.
-func (_ *NodeIoctlRequest) InlineAlignment() int {
+func (_ *nodeIoctlRequest) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *NodeIoctlRequest) InlineSize() int {
+func (_ *nodeIoctlRequest) InlineSize() int {
 	return 48
 }
 
-type NodeIoctlResponse struct {
+type nodeIoctlResponse struct {
 	_       struct{} `fidl2:"s,40,0"`
 	S       int32
 	Handles []_zx.Handle `fidl:"2" fidl2:"2,0"`
 	Out     []uint8      `fidl:"8192" fidl2:"8192"`
 }
 
-var _mNodeIoctlResponse = _bindings.CreateLazyMarshaler(NodeIoctlResponse{})
+var _mnodeIoctlResponse = _bindings.CreateLazyMarshaler(nodeIoctlResponse{})
 
-func (msg *NodeIoctlResponse) Marshaler() _bindings.Marshaler {
-	return _mNodeIoctlResponse
+func (msg *nodeIoctlResponse) Marshaler() _bindings.Marshaler {
+	return _mnodeIoctlResponse
 }
 
 // Implements Payload.
-func (_ *NodeIoctlResponse) InlineAlignment() int {
+func (_ *nodeIoctlResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *NodeIoctlResponse) InlineSize() int {
+func (_ *nodeIoctlResponse) InlineSize() int {
 	return 40
 }
 
@@ -731,7 +801,7 @@
 // TODO: Currently, ulib/fs ignores OPEN_RIGHT_*, and uses the rights of the original
 // connection. This is a bug.
 func (p *NodeInterface) Clone(flags uint32, object NodeInterfaceRequest) error {
-	req_ := &NodeCloneRequest{
+	req_ := &nodeCloneRequest{
 		Flags:  flags,
 		Object: object,
 	}
@@ -744,7 +814,7 @@
 // This method does not require any rights.
 func (p *NodeInterface) Close() (int32, error) {
 	var req_ _bindings.Payload
-	resp_ := &NodeCloseResponse{}
+	resp_ := &nodeCloseResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(NodeCloseOrdinal, req_, resp_)
 	return resp_.S, err
 }
@@ -755,18 +825,18 @@
 // This method does not require any rights.
 func (p *NodeInterface) Describe() (NodeInfo, error) {
 	var req_ _bindings.Payload
-	resp_ := &NodeDescribeResponse{}
+	resp_ := &nodeDescribeResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(NodeDescribeOrdinal, req_, resp_)
 	return resp_.Info, err
 }
 
-// An event produced eagerly by a fidl server if requested by |OPEN_FLAG_DESCRIBE|.
+// An event produced eagerly by a FIDL server if requested by |OPEN_FLAG_DESCRIBE|.
 //
 // Indicates the success or failure of the open operation, and optionally describes the
 // object. If the status is |ZX_OK|, |info| contains descriptive information about the object
 // (the same as would be returned by |Describe|).
 func (p *NodeInterface) ExpectOnOpen() (int32, *NodeInfo, error) {
-	resp_ := &NodeOnOpenResponse{}
+	resp_ := &nodeOnOpenResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Recv(NodeOnOpenOrdinal, resp_)
 	return resp_.S, resp_.Info, err
 }
@@ -774,7 +844,7 @@
 // Synchronizes updates to the node to the underlying media, if it exists.
 func (p *NodeInterface) Sync() (int32, error) {
 	var req_ _bindings.Payload
-	resp_ := &NodeSyncResponse{}
+	resp_ := &nodeSyncResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(NodeSyncOrdinal, req_, resp_)
 	return resp_.S, err
 }
@@ -784,7 +854,7 @@
 // This method does not require any rights.
 func (p *NodeInterface) GetAttr() (int32, NodeAttributes, error) {
 	var req_ _bindings.Payload
-	resp_ := &NodeGetAttrResponse{}
+	resp_ := &nodeGetAttrResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(NodeGetAttrOrdinal, req_, resp_)
 	return resp_.S, resp_.Attributes, err
 }
@@ -795,24 +865,24 @@
 // This method requires following rights: OPEN_RIGHT_WRITABLE.
 // TODO(ZX-1262): This access restriction is not implemented in ulib/fs.
 func (p *NodeInterface) SetAttr(flags uint32, attributes NodeAttributes) (int32, error) {
-	req_ := &NodeSetAttrRequest{
+	req_ := &nodeSetAttrRequest{
 		Flags:      flags,
 		Attributes: attributes,
 	}
-	resp_ := &NodeSetAttrResponse{}
+	resp_ := &nodeSetAttrResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(NodeSetAttrOrdinal, req_, resp_)
 	return resp_.S, err
 }
 
 // Deprecated. Only for use with compatibility with devhost.
 func (p *NodeInterface) Ioctl(opcode uint32, maxOut uint64, handles []_zx.Handle, in []uint8) (int32, []_zx.Handle, []uint8, error) {
-	req_ := &NodeIoctlRequest{
+	req_ := &nodeIoctlRequest{
 		Opcode:  opcode,
 		MaxOut:  maxOut,
 		Handles: handles,
 		In:      in,
 	}
-	resp_ := &NodeIoctlResponse{}
+	resp_ := &nodeIoctlResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(NodeIoctlOrdinal, req_, resp_)
 	return resp_.S, resp_.Handles, resp_.Out, err
 }
@@ -843,7 +913,7 @@
 	//
 	// This method does not require any rights.
 	Describe() (NodeInfo, error)
-	// An event produced eagerly by a fidl server if requested by |OPEN_FLAG_DESCRIBE|.
+	// An event produced eagerly by a FIDL server if requested by |OPEN_FLAG_DESCRIBE|.
 	//
 	// Indicates the success or failure of the open operation, and optionally describes the
 	// object. If the status is |ZX_OK|, |info| contains descriptive information about the object
@@ -884,7 +954,7 @@
 func (s *NodeStub) DispatchNew(ord uint32, b_ []byte, h_ []_zx.Handle) (_bindings.Message, error) {
 	switch ord {
 	case NodeCloneOrdinal:
-		in_ := NodeCloneRequest{}
+		in_ := nodeCloneRequest{}
 		if err_ := _bindings.Unmarshal(b_, h_, &in_); err_ != nil {
 			return nil, err_
 		}
@@ -892,41 +962,41 @@
 		return nil, err_
 	case NodeCloseOrdinal:
 		s, err_ := s.Impl.Close()
-		out_ := NodeCloseResponse{}
+		out_ := nodeCloseResponse{}
 		out_.S = s
 		return &out_, err_
 	case NodeDescribeOrdinal:
 		info, err_ := s.Impl.Describe()
-		out_ := NodeDescribeResponse{}
+		out_ := nodeDescribeResponse{}
 		out_.Info = info
 		return &out_, err_
 	case NodeSyncOrdinal:
 		s, err_ := s.Impl.Sync()
-		out_ := NodeSyncResponse{}
+		out_ := nodeSyncResponse{}
 		out_.S = s
 		return &out_, err_
 	case NodeGetAttrOrdinal:
 		s, attributes, err_ := s.Impl.GetAttr()
-		out_ := NodeGetAttrResponse{}
+		out_ := nodeGetAttrResponse{}
 		out_.S = s
 		out_.Attributes = attributes
 		return &out_, err_
 	case NodeSetAttrOrdinal:
-		in_ := NodeSetAttrRequest{}
+		in_ := nodeSetAttrRequest{}
 		if err_ := _bindings.Unmarshal(b_, h_, &in_); err_ != nil {
 			return nil, err_
 		}
 		s, err_ := s.Impl.SetAttr(in_.Flags, in_.Attributes)
-		out_ := NodeSetAttrResponse{}
+		out_ := nodeSetAttrResponse{}
 		out_.S = s
 		return &out_, err_
 	case NodeIoctlOrdinal:
-		in_ := NodeIoctlRequest{}
+		in_ := nodeIoctlRequest{}
 		if err_ := _bindings.Unmarshal(b_, h_, &in_); err_ != nil {
 			return nil, err_
 		}
 		s, handles, out, err_ := s.Impl.Ioctl(in_.Opcode, in_.MaxOut, in_.Handles, in_.In)
-		out_ := NodeIoctlResponse{}
+		out_ := nodeIoctlResponse{}
 		out_.S = s
 		out_.Handles = handles
 		out_.Out = out
@@ -951,7 +1021,7 @@
 type NodeEventProxy _bindings.ChannelProxy
 
 func (p *NodeEventProxy) OnOpen(s int32, info *NodeInfo) error {
-	event_ := &NodeOnOpenResponse{
+	event_ := &nodeOnOpenResponse{
 		S:    s,
 		Info: info,
 	}
@@ -995,179 +1065,179 @@
 	FileGetBufferGenOrdinal uint32 = 1958938995
 )
 
-type FileCloneRequest struct {
+type fileCloneRequest struct {
 	_      struct{} `fidl2:"s,8,0"`
 	Flags  uint32
 	Object NodeInterfaceRequest `fidl2:"0"`
 }
 
-var _mFileCloneRequest = _bindings.CreateLazyMarshaler(FileCloneRequest{})
+var _mfileCloneRequest = _bindings.CreateLazyMarshaler(fileCloneRequest{})
 
-func (msg *FileCloneRequest) Marshaler() _bindings.Marshaler {
-	return _mFileCloneRequest
+func (msg *fileCloneRequest) Marshaler() _bindings.Marshaler {
+	return _mfileCloneRequest
 }
 
 // Implements Payload.
-func (_ *FileCloneRequest) InlineAlignment() int {
+func (_ *fileCloneRequest) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *FileCloneRequest) InlineSize() int {
+func (_ *fileCloneRequest) InlineSize() int {
 	return 8
 }
 
-type FileCloseResponse struct {
+type fileCloseResponse struct {
 	_ struct{} `fidl2:"s,8,0"`
 	S int32
 }
 
-var _mFileCloseResponse = _bindings.CreateLazyMarshaler(FileCloseResponse{})
+var _mfileCloseResponse = _bindings.CreateLazyMarshaler(fileCloseResponse{})
 
-func (msg *FileCloseResponse) Marshaler() _bindings.Marshaler {
-	return _mFileCloseResponse
+func (msg *fileCloseResponse) Marshaler() _bindings.Marshaler {
+	return _mfileCloseResponse
 }
 
 // Implements Payload.
-func (_ *FileCloseResponse) InlineAlignment() int {
+func (_ *fileCloseResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *FileCloseResponse) InlineSize() int {
+func (_ *fileCloseResponse) InlineSize() int {
 	return 8
 }
 
-type FileDescribeResponse struct {
+type fileDescribeResponse struct {
 	_    struct{} `fidl2:"s,32,0"`
 	Info NodeInfo
 }
 
-var _mFileDescribeResponse = _bindings.CreateLazyMarshaler(FileDescribeResponse{})
+var _mfileDescribeResponse = _bindings.CreateLazyMarshaler(fileDescribeResponse{})
 
-func (msg *FileDescribeResponse) Marshaler() _bindings.Marshaler {
-	return _mFileDescribeResponse
+func (msg *fileDescribeResponse) Marshaler() _bindings.Marshaler {
+	return _mfileDescribeResponse
 }
 
 // Implements Payload.
-func (_ *FileDescribeResponse) InlineAlignment() int {
+func (_ *fileDescribeResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *FileDescribeResponse) InlineSize() int {
+func (_ *fileDescribeResponse) InlineSize() int {
 	return 32
 }
 
-type FileOnOpenResponse struct {
+type fileOnOpenResponse struct {
 	_    struct{} `fidl2:"s,16,0"`
 	S    int32
 	Info *NodeInfo
 }
 
-var _mFileOnOpenResponse = _bindings.CreateLazyMarshaler(FileOnOpenResponse{})
+var _mfileOnOpenResponse = _bindings.CreateLazyMarshaler(fileOnOpenResponse{})
 
-func (msg *FileOnOpenResponse) Marshaler() _bindings.Marshaler {
-	return _mFileOnOpenResponse
+func (msg *fileOnOpenResponse) Marshaler() _bindings.Marshaler {
+	return _mfileOnOpenResponse
 }
 
 // Implements Payload.
-func (_ *FileOnOpenResponse) InlineAlignment() int {
+func (_ *fileOnOpenResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *FileOnOpenResponse) InlineSize() int {
+func (_ *fileOnOpenResponse) InlineSize() int {
 	return 16
 }
 
-type FileSyncResponse struct {
+type fileSyncResponse struct {
 	_ struct{} `fidl2:"s,8,0"`
 	S int32
 }
 
-var _mFileSyncResponse = _bindings.CreateLazyMarshaler(FileSyncResponse{})
+var _mfileSyncResponse = _bindings.CreateLazyMarshaler(fileSyncResponse{})
 
-func (msg *FileSyncResponse) Marshaler() _bindings.Marshaler {
-	return _mFileSyncResponse
+func (msg *fileSyncResponse) Marshaler() _bindings.Marshaler {
+	return _mfileSyncResponse
 }
 
 // Implements Payload.
-func (_ *FileSyncResponse) InlineAlignment() int {
+func (_ *fileSyncResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *FileSyncResponse) InlineSize() int {
+func (_ *fileSyncResponse) InlineSize() int {
 	return 8
 }
 
-type FileGetAttrResponse struct {
+type fileGetAttrResponse struct {
 	_          struct{} `fidl2:"s,64,0"`
 	S          int32
 	Attributes NodeAttributes
 }
 
-var _mFileGetAttrResponse = _bindings.CreateLazyMarshaler(FileGetAttrResponse{})
+var _mfileGetAttrResponse = _bindings.CreateLazyMarshaler(fileGetAttrResponse{})
 
-func (msg *FileGetAttrResponse) Marshaler() _bindings.Marshaler {
-	return _mFileGetAttrResponse
+func (msg *fileGetAttrResponse) Marshaler() _bindings.Marshaler {
+	return _mfileGetAttrResponse
 }
 
 // Implements Payload.
-func (_ *FileGetAttrResponse) InlineAlignment() int {
+func (_ *fileGetAttrResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *FileGetAttrResponse) InlineSize() int {
+func (_ *fileGetAttrResponse) InlineSize() int {
 	return 64
 }
 
-type FileSetAttrRequest struct {
+type fileSetAttrRequest struct {
 	_          struct{} `fidl2:"s,64,0"`
 	Flags      uint32
 	Attributes NodeAttributes
 }
 
-var _mFileSetAttrRequest = _bindings.CreateLazyMarshaler(FileSetAttrRequest{})
+var _mfileSetAttrRequest = _bindings.CreateLazyMarshaler(fileSetAttrRequest{})
 
-func (msg *FileSetAttrRequest) Marshaler() _bindings.Marshaler {
-	return _mFileSetAttrRequest
+func (msg *fileSetAttrRequest) Marshaler() _bindings.Marshaler {
+	return _mfileSetAttrRequest
 }
 
 // Implements Payload.
-func (_ *FileSetAttrRequest) InlineAlignment() int {
+func (_ *fileSetAttrRequest) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *FileSetAttrRequest) InlineSize() int {
+func (_ *fileSetAttrRequest) InlineSize() int {
 	return 64
 }
 
-type FileSetAttrResponse struct {
+type fileSetAttrResponse struct {
 	_ struct{} `fidl2:"s,8,0"`
 	S int32
 }
 
-var _mFileSetAttrResponse = _bindings.CreateLazyMarshaler(FileSetAttrResponse{})
+var _mfileSetAttrResponse = _bindings.CreateLazyMarshaler(fileSetAttrResponse{})
 
-func (msg *FileSetAttrResponse) Marshaler() _bindings.Marshaler {
-	return _mFileSetAttrResponse
+func (msg *fileSetAttrResponse) Marshaler() _bindings.Marshaler {
+	return _mfileSetAttrResponse
 }
 
 // Implements Payload.
-func (_ *FileSetAttrResponse) InlineAlignment() int {
+func (_ *fileSetAttrResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *FileSetAttrResponse) InlineSize() int {
+func (_ *fileSetAttrResponse) InlineSize() int {
 	return 8
 }
 
-type FileIoctlRequest struct {
+type fileIoctlRequest struct {
 	_       struct{} `fidl2:"s,48,0"`
 	Opcode  uint32
 	MaxOut  uint64
@@ -1175,409 +1245,409 @@
 	In      []uint8      `fidl:"8192" fidl2:"8192"`
 }
 
-var _mFileIoctlRequest = _bindings.CreateLazyMarshaler(FileIoctlRequest{})
+var _mfileIoctlRequest = _bindings.CreateLazyMarshaler(fileIoctlRequest{})
 
-func (msg *FileIoctlRequest) Marshaler() _bindings.Marshaler {
-	return _mFileIoctlRequest
+func (msg *fileIoctlRequest) Marshaler() _bindings.Marshaler {
+	return _mfileIoctlRequest
 }
 
 // Implements Payload.
-func (_ *FileIoctlRequest) InlineAlignment() int {
+func (_ *fileIoctlRequest) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *FileIoctlRequest) InlineSize() int {
+func (_ *fileIoctlRequest) InlineSize() int {
 	return 48
 }
 
-type FileIoctlResponse struct {
+type fileIoctlResponse struct {
 	_       struct{} `fidl2:"s,40,0"`
 	S       int32
 	Handles []_zx.Handle `fidl:"2" fidl2:"2,0"`
 	Out     []uint8      `fidl:"8192" fidl2:"8192"`
 }
 
-var _mFileIoctlResponse = _bindings.CreateLazyMarshaler(FileIoctlResponse{})
+var _mfileIoctlResponse = _bindings.CreateLazyMarshaler(fileIoctlResponse{})
 
-func (msg *FileIoctlResponse) Marshaler() _bindings.Marshaler {
-	return _mFileIoctlResponse
+func (msg *fileIoctlResponse) Marshaler() _bindings.Marshaler {
+	return _mfileIoctlResponse
 }
 
 // Implements Payload.
-func (_ *FileIoctlResponse) InlineAlignment() int {
+func (_ *fileIoctlResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *FileIoctlResponse) InlineSize() int {
+func (_ *fileIoctlResponse) InlineSize() int {
 	return 40
 }
 
-type FileReadRequest struct {
+type fileReadRequest struct {
 	_     struct{} `fidl2:"s,8,0"`
 	Count uint64
 }
 
-var _mFileReadRequest = _bindings.CreateLazyMarshaler(FileReadRequest{})
+var _mfileReadRequest = _bindings.CreateLazyMarshaler(fileReadRequest{})
 
-func (msg *FileReadRequest) Marshaler() _bindings.Marshaler {
-	return _mFileReadRequest
+func (msg *fileReadRequest) Marshaler() _bindings.Marshaler {
+	return _mfileReadRequest
 }
 
 // Implements Payload.
-func (_ *FileReadRequest) InlineAlignment() int {
+func (_ *fileReadRequest) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *FileReadRequest) InlineSize() int {
+func (_ *fileReadRequest) InlineSize() int {
 	return 8
 }
 
-type FileReadResponse struct {
+type fileReadResponse struct {
 	_    struct{} `fidl2:"s,24,0"`
 	S    int32
 	Data []uint8 `fidl:"8192" fidl2:"8192"`
 }
 
-var _mFileReadResponse = _bindings.CreateLazyMarshaler(FileReadResponse{})
+var _mfileReadResponse = _bindings.CreateLazyMarshaler(fileReadResponse{})
 
-func (msg *FileReadResponse) Marshaler() _bindings.Marshaler {
-	return _mFileReadResponse
+func (msg *fileReadResponse) Marshaler() _bindings.Marshaler {
+	return _mfileReadResponse
 }
 
 // Implements Payload.
-func (_ *FileReadResponse) InlineAlignment() int {
+func (_ *fileReadResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *FileReadResponse) InlineSize() int {
+func (_ *fileReadResponse) InlineSize() int {
 	return 24
 }
 
-type FileReadAtRequest struct {
+type fileReadAtRequest struct {
 	_      struct{} `fidl2:"s,16,0"`
 	Count  uint64
 	Offset uint64
 }
 
-var _mFileReadAtRequest = _bindings.CreateLazyMarshaler(FileReadAtRequest{})
+var _mfileReadAtRequest = _bindings.CreateLazyMarshaler(fileReadAtRequest{})
 
-func (msg *FileReadAtRequest) Marshaler() _bindings.Marshaler {
-	return _mFileReadAtRequest
+func (msg *fileReadAtRequest) Marshaler() _bindings.Marshaler {
+	return _mfileReadAtRequest
 }
 
 // Implements Payload.
-func (_ *FileReadAtRequest) InlineAlignment() int {
+func (_ *fileReadAtRequest) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *FileReadAtRequest) InlineSize() int {
+func (_ *fileReadAtRequest) InlineSize() int {
 	return 16
 }
 
-type FileReadAtResponse struct {
+type fileReadAtResponse struct {
 	_    struct{} `fidl2:"s,24,0"`
 	S    int32
 	Data []uint8 `fidl:"8192" fidl2:"8192"`
 }
 
-var _mFileReadAtResponse = _bindings.CreateLazyMarshaler(FileReadAtResponse{})
+var _mfileReadAtResponse = _bindings.CreateLazyMarshaler(fileReadAtResponse{})
 
-func (msg *FileReadAtResponse) Marshaler() _bindings.Marshaler {
-	return _mFileReadAtResponse
+func (msg *fileReadAtResponse) Marshaler() _bindings.Marshaler {
+	return _mfileReadAtResponse
 }
 
 // Implements Payload.
-func (_ *FileReadAtResponse) InlineAlignment() int {
+func (_ *fileReadAtResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *FileReadAtResponse) InlineSize() int {
+func (_ *fileReadAtResponse) InlineSize() int {
 	return 24
 }
 
-type FileWriteRequest struct {
+type fileWriteRequest struct {
 	_    struct{} `fidl2:"s,16,0"`
 	Data []uint8  `fidl:"8192" fidl2:"8192"`
 }
 
-var _mFileWriteRequest = _bindings.CreateLazyMarshaler(FileWriteRequest{})
+var _mfileWriteRequest = _bindings.CreateLazyMarshaler(fileWriteRequest{})
 
-func (msg *FileWriteRequest) Marshaler() _bindings.Marshaler {
-	return _mFileWriteRequest
+func (msg *fileWriteRequest) Marshaler() _bindings.Marshaler {
+	return _mfileWriteRequest
 }
 
 // Implements Payload.
-func (_ *FileWriteRequest) InlineAlignment() int {
+func (_ *fileWriteRequest) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *FileWriteRequest) InlineSize() int {
+func (_ *fileWriteRequest) InlineSize() int {
 	return 16
 }
 
-type FileWriteResponse struct {
+type fileWriteResponse struct {
 	_      struct{} `fidl2:"s,16,0"`
 	S      int32
 	Actual uint64
 }
 
-var _mFileWriteResponse = _bindings.CreateLazyMarshaler(FileWriteResponse{})
+var _mfileWriteResponse = _bindings.CreateLazyMarshaler(fileWriteResponse{})
 
-func (msg *FileWriteResponse) Marshaler() _bindings.Marshaler {
-	return _mFileWriteResponse
+func (msg *fileWriteResponse) Marshaler() _bindings.Marshaler {
+	return _mfileWriteResponse
 }
 
 // Implements Payload.
-func (_ *FileWriteResponse) InlineAlignment() int {
+func (_ *fileWriteResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *FileWriteResponse) InlineSize() int {
+func (_ *fileWriteResponse) InlineSize() int {
 	return 16
 }
 
-type FileWriteAtRequest struct {
+type fileWriteAtRequest struct {
 	_      struct{} `fidl2:"s,24,0"`
 	Data   []uint8  `fidl:"8192" fidl2:"8192"`
 	Offset uint64
 }
 
-var _mFileWriteAtRequest = _bindings.CreateLazyMarshaler(FileWriteAtRequest{})
+var _mfileWriteAtRequest = _bindings.CreateLazyMarshaler(fileWriteAtRequest{})
 
-func (msg *FileWriteAtRequest) Marshaler() _bindings.Marshaler {
-	return _mFileWriteAtRequest
+func (msg *fileWriteAtRequest) Marshaler() _bindings.Marshaler {
+	return _mfileWriteAtRequest
 }
 
 // Implements Payload.
-func (_ *FileWriteAtRequest) InlineAlignment() int {
+func (_ *fileWriteAtRequest) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *FileWriteAtRequest) InlineSize() int {
+func (_ *fileWriteAtRequest) InlineSize() int {
 	return 24
 }
 
-type FileWriteAtResponse struct {
+type fileWriteAtResponse struct {
 	_      struct{} `fidl2:"s,16,0"`
 	S      int32
 	Actual uint64
 }
 
-var _mFileWriteAtResponse = _bindings.CreateLazyMarshaler(FileWriteAtResponse{})
+var _mfileWriteAtResponse = _bindings.CreateLazyMarshaler(fileWriteAtResponse{})
 
-func (msg *FileWriteAtResponse) Marshaler() _bindings.Marshaler {
-	return _mFileWriteAtResponse
+func (msg *fileWriteAtResponse) Marshaler() _bindings.Marshaler {
+	return _mfileWriteAtResponse
 }
 
 // Implements Payload.
-func (_ *FileWriteAtResponse) InlineAlignment() int {
+func (_ *fileWriteAtResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *FileWriteAtResponse) InlineSize() int {
+func (_ *fileWriteAtResponse) InlineSize() int {
 	return 16
 }
 
-type FileSeekRequest struct {
+type fileSeekRequest struct {
 	_      struct{} `fidl2:"s,16,0"`
 	Offset int64
 	Start  SeekOrigin
 }
 
-var _mFileSeekRequest = _bindings.CreateLazyMarshaler(FileSeekRequest{})
+var _mfileSeekRequest = _bindings.CreateLazyMarshaler(fileSeekRequest{})
 
-func (msg *FileSeekRequest) Marshaler() _bindings.Marshaler {
-	return _mFileSeekRequest
+func (msg *fileSeekRequest) Marshaler() _bindings.Marshaler {
+	return _mfileSeekRequest
 }
 
 // Implements Payload.
-func (_ *FileSeekRequest) InlineAlignment() int {
+func (_ *fileSeekRequest) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *FileSeekRequest) InlineSize() int {
+func (_ *fileSeekRequest) InlineSize() int {
 	return 16
 }
 
-type FileSeekResponse struct {
+type fileSeekResponse struct {
 	_      struct{} `fidl2:"s,16,0"`
 	S      int32
 	Offset uint64
 }
 
-var _mFileSeekResponse = _bindings.CreateLazyMarshaler(FileSeekResponse{})
+var _mfileSeekResponse = _bindings.CreateLazyMarshaler(fileSeekResponse{})
 
-func (msg *FileSeekResponse) Marshaler() _bindings.Marshaler {
-	return _mFileSeekResponse
+func (msg *fileSeekResponse) Marshaler() _bindings.Marshaler {
+	return _mfileSeekResponse
 }
 
 // Implements Payload.
-func (_ *FileSeekResponse) InlineAlignment() int {
+func (_ *fileSeekResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *FileSeekResponse) InlineSize() int {
+func (_ *fileSeekResponse) InlineSize() int {
 	return 16
 }
 
-type FileTruncateRequest struct {
+type fileTruncateRequest struct {
 	_      struct{} `fidl2:"s,8,0"`
 	Length uint64
 }
 
-var _mFileTruncateRequest = _bindings.CreateLazyMarshaler(FileTruncateRequest{})
+var _mfileTruncateRequest = _bindings.CreateLazyMarshaler(fileTruncateRequest{})
 
-func (msg *FileTruncateRequest) Marshaler() _bindings.Marshaler {
-	return _mFileTruncateRequest
+func (msg *fileTruncateRequest) Marshaler() _bindings.Marshaler {
+	return _mfileTruncateRequest
 }
 
 // Implements Payload.
-func (_ *FileTruncateRequest) InlineAlignment() int {
+func (_ *fileTruncateRequest) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *FileTruncateRequest) InlineSize() int {
+func (_ *fileTruncateRequest) InlineSize() int {
 	return 8
 }
 
-type FileTruncateResponse struct {
+type fileTruncateResponse struct {
 	_ struct{} `fidl2:"s,8,0"`
 	S int32
 }
 
-var _mFileTruncateResponse = _bindings.CreateLazyMarshaler(FileTruncateResponse{})
+var _mfileTruncateResponse = _bindings.CreateLazyMarshaler(fileTruncateResponse{})
 
-func (msg *FileTruncateResponse) Marshaler() _bindings.Marshaler {
-	return _mFileTruncateResponse
+func (msg *fileTruncateResponse) Marshaler() _bindings.Marshaler {
+	return _mfileTruncateResponse
 }
 
 // Implements Payload.
-func (_ *FileTruncateResponse) InlineAlignment() int {
+func (_ *fileTruncateResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *FileTruncateResponse) InlineSize() int {
+func (_ *fileTruncateResponse) InlineSize() int {
 	return 8
 }
 
-type FileGetFlagsResponse struct {
+type fileGetFlagsResponse struct {
 	_     struct{} `fidl2:"s,8,0"`
 	S     int32
 	Flags uint32
 }
 
-var _mFileGetFlagsResponse = _bindings.CreateLazyMarshaler(FileGetFlagsResponse{})
+var _mfileGetFlagsResponse = _bindings.CreateLazyMarshaler(fileGetFlagsResponse{})
 
-func (msg *FileGetFlagsResponse) Marshaler() _bindings.Marshaler {
-	return _mFileGetFlagsResponse
+func (msg *fileGetFlagsResponse) Marshaler() _bindings.Marshaler {
+	return _mfileGetFlagsResponse
 }
 
 // Implements Payload.
-func (_ *FileGetFlagsResponse) InlineAlignment() int {
+func (_ *fileGetFlagsResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *FileGetFlagsResponse) InlineSize() int {
+func (_ *fileGetFlagsResponse) InlineSize() int {
 	return 8
 }
 
-type FileSetFlagsRequest struct {
+type fileSetFlagsRequest struct {
 	_     struct{} `fidl2:"s,8,0"`
 	Flags uint32
 }
 
-var _mFileSetFlagsRequest = _bindings.CreateLazyMarshaler(FileSetFlagsRequest{})
+var _mfileSetFlagsRequest = _bindings.CreateLazyMarshaler(fileSetFlagsRequest{})
 
-func (msg *FileSetFlagsRequest) Marshaler() _bindings.Marshaler {
-	return _mFileSetFlagsRequest
+func (msg *fileSetFlagsRequest) Marshaler() _bindings.Marshaler {
+	return _mfileSetFlagsRequest
 }
 
 // Implements Payload.
-func (_ *FileSetFlagsRequest) InlineAlignment() int {
+func (_ *fileSetFlagsRequest) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *FileSetFlagsRequest) InlineSize() int {
+func (_ *fileSetFlagsRequest) InlineSize() int {
 	return 8
 }
 
-type FileSetFlagsResponse struct {
+type fileSetFlagsResponse struct {
 	_ struct{} `fidl2:"s,8,0"`
 	S int32
 }
 
-var _mFileSetFlagsResponse = _bindings.CreateLazyMarshaler(FileSetFlagsResponse{})
+var _mfileSetFlagsResponse = _bindings.CreateLazyMarshaler(fileSetFlagsResponse{})
 
-func (msg *FileSetFlagsResponse) Marshaler() _bindings.Marshaler {
-	return _mFileSetFlagsResponse
+func (msg *fileSetFlagsResponse) Marshaler() _bindings.Marshaler {
+	return _mfileSetFlagsResponse
 }
 
 // Implements Payload.
-func (_ *FileSetFlagsResponse) InlineAlignment() int {
+func (_ *fileSetFlagsResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *FileSetFlagsResponse) InlineSize() int {
+func (_ *fileSetFlagsResponse) InlineSize() int {
 	return 8
 }
 
-type FileGetBufferRequest struct {
+type fileGetBufferRequest struct {
 	_     struct{} `fidl2:"s,8,0"`
 	Flags uint32
 }
 
-var _mFileGetBufferRequest = _bindings.CreateLazyMarshaler(FileGetBufferRequest{})
+var _mfileGetBufferRequest = _bindings.CreateLazyMarshaler(fileGetBufferRequest{})
 
-func (msg *FileGetBufferRequest) Marshaler() _bindings.Marshaler {
-	return _mFileGetBufferRequest
+func (msg *fileGetBufferRequest) Marshaler() _bindings.Marshaler {
+	return _mfileGetBufferRequest
 }
 
 // Implements Payload.
-func (_ *FileGetBufferRequest) InlineAlignment() int {
+func (_ *fileGetBufferRequest) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *FileGetBufferRequest) InlineSize() int {
+func (_ *fileGetBufferRequest) InlineSize() int {
 	return 8
 }
 
-type FileGetBufferResponse struct {
+type fileGetBufferResponse struct {
 	_      struct{} `fidl2:"s,16,0"`
 	S      int32
 	Buffer *fuchsiamem.Buffer
 }
 
-var _mFileGetBufferResponse = _bindings.CreateLazyMarshaler(FileGetBufferResponse{})
+var _mfileGetBufferResponse = _bindings.CreateLazyMarshaler(fileGetBufferResponse{})
 
-func (msg *FileGetBufferResponse) Marshaler() _bindings.Marshaler {
-	return _mFileGetBufferResponse
+func (msg *fileGetBufferResponse) Marshaler() _bindings.Marshaler {
+	return _mfileGetBufferResponse
 }
 
 // Implements Payload.
-func (_ *FileGetBufferResponse) InlineAlignment() int {
+func (_ *fileGetBufferResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *FileGetBufferResponse) InlineSize() int {
+func (_ *fileGetBufferResponse) InlineSize() int {
 	return 16
 }
 
@@ -1598,7 +1668,7 @@
 // TODO: Currently, ulib/fs ignores OPEN_RIGHT_*, and uses the rights of the original
 // connection. This is a bug.
 func (p *FileInterface) Clone(flags uint32, object NodeInterfaceRequest) error {
-	req_ := &FileCloneRequest{
+	req_ := &fileCloneRequest{
 		Flags:  flags,
 		Object: object,
 	}
@@ -1611,7 +1681,7 @@
 // This method does not require any rights.
 func (p *FileInterface) Close() (int32, error) {
 	var req_ _bindings.Payload
-	resp_ := &FileCloseResponse{}
+	resp_ := &fileCloseResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(FileCloseOrdinal, req_, resp_)
 	return resp_.S, err
 }
@@ -1622,18 +1692,18 @@
 // This method does not require any rights.
 func (p *FileInterface) Describe() (NodeInfo, error) {
 	var req_ _bindings.Payload
-	resp_ := &FileDescribeResponse{}
+	resp_ := &fileDescribeResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(FileDescribeOrdinal, req_, resp_)
 	return resp_.Info, err
 }
 
-// An event produced eagerly by a fidl server if requested by |OPEN_FLAG_DESCRIBE|.
+// An event produced eagerly by a FIDL server if requested by |OPEN_FLAG_DESCRIBE|.
 //
 // Indicates the success or failure of the open operation, and optionally describes the
 // object. If the status is |ZX_OK|, |info| contains descriptive information about the object
 // (the same as would be returned by |Describe|).
 func (p *FileInterface) ExpectOnOpen() (int32, *NodeInfo, error) {
-	resp_ := &FileOnOpenResponse{}
+	resp_ := &fileOnOpenResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Recv(FileOnOpenOrdinal, resp_)
 	return resp_.S, resp_.Info, err
 }
@@ -1641,7 +1711,7 @@
 // Synchronizes updates to the node to the underlying media, if it exists.
 func (p *FileInterface) Sync() (int32, error) {
 	var req_ _bindings.Payload
-	resp_ := &FileSyncResponse{}
+	resp_ := &fileSyncResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(FileSyncOrdinal, req_, resp_)
 	return resp_.S, err
 }
@@ -1651,7 +1721,7 @@
 // This method does not require any rights.
 func (p *FileInterface) GetAttr() (int32, NodeAttributes, error) {
 	var req_ _bindings.Payload
-	resp_ := &FileGetAttrResponse{}
+	resp_ := &fileGetAttrResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(FileGetAttrOrdinal, req_, resp_)
 	return resp_.S, resp_.Attributes, err
 }
@@ -1662,78 +1732,78 @@
 // This method requires following rights: OPEN_RIGHT_WRITABLE.
 // TODO(ZX-1262): This access restriction is not implemented in ulib/fs.
 func (p *FileInterface) SetAttr(flags uint32, attributes NodeAttributes) (int32, error) {
-	req_ := &FileSetAttrRequest{
+	req_ := &fileSetAttrRequest{
 		Flags:      flags,
 		Attributes: attributes,
 	}
-	resp_ := &FileSetAttrResponse{}
+	resp_ := &fileSetAttrResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(FileSetAttrOrdinal, req_, resp_)
 	return resp_.S, err
 }
 
 // Deprecated. Only for use with compatibility with devhost.
 func (p *FileInterface) Ioctl(opcode uint32, maxOut uint64, handles []_zx.Handle, in []uint8) (int32, []_zx.Handle, []uint8, error) {
-	req_ := &FileIoctlRequest{
+	req_ := &fileIoctlRequest{
 		Opcode:  opcode,
 		MaxOut:  maxOut,
 		Handles: handles,
 		In:      in,
 	}
-	resp_ := &FileIoctlResponse{}
+	resp_ := &fileIoctlResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(FileIoctlOrdinal, req_, resp_)
 	return resp_.S, resp_.Handles, resp_.Out, err
 }
 
-// Read 'count' bytes at the seek offset.
+// Reads 'count' bytes at the seek offset.
 // The seek offset is moved forward by the number of bytes read.
 //
 // This method requires following rights: OPEN_RIGHT_READABLE.
 func (p *FileInterface) Read(count uint64) (int32, []uint8, error) {
-	req_ := &FileReadRequest{
+	req_ := &fileReadRequest{
 		Count: count,
 	}
-	resp_ := &FileReadResponse{}
+	resp_ := &fileReadResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(FileReadOrdinal, req_, resp_)
 	return resp_.S, resp_.Data, err
 }
 
-// Read 'count' bytes at the provided offset.
+// Reads 'count' bytes at the provided offset.
 // Does not affect the seek offset.
 //
 // This method requires following rights: OPEN_RIGHT_READABLE.
 func (p *FileInterface) ReadAt(count uint64, offset uint64) (int32, []uint8, error) {
-	req_ := &FileReadAtRequest{
+	req_ := &fileReadAtRequest{
 		Count:  count,
 		Offset: offset,
 	}
-	resp_ := &FileReadAtResponse{}
+	resp_ := &fileReadAtResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(FileReadAtOrdinal, req_, resp_)
 	return resp_.S, resp_.Data, err
 }
 
-// Write data at the seek offset.
+// Writes data at the seek offset.
 // The seek offset is moved forward by the number of bytes written.
 //
 // This method requires following rights: OPEN_RIGHT_WRITABLE.
 func (p *FileInterface) Write(data []uint8) (int32, uint64, error) {
-	req_ := &FileWriteRequest{
+	req_ := &fileWriteRequest{
 		Data: data,
 	}
-	resp_ := &FileWriteResponse{}
+	resp_ := &fileWriteResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(FileWriteOrdinal, req_, resp_)
 	return resp_.S, resp_.Actual, err
 }
 
-// Write data to the provided offset.
+// Writes data to the provided offset.
 // Does not affect the seek offset.
 //
 // This method requires following rights: OPEN_RIGHT_WRITABLE.
 func (p *FileInterface) WriteAt(data []uint8, offset uint64) (int32, uint64, error) {
-	req_ := &FileWriteAtRequest{
+	req_ := &fileWriteAtRequest{
 		Data:   data,
 		Offset: offset,
 	}
-	resp_ := &FileWriteAtResponse{}
+	resp_ := &fileWriteAtResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(FileWriteAtOrdinal, req_, resp_)
 	return resp_.S, resp_.Actual, err
 }
@@ -1743,52 +1813,52 @@
 //
 // This method does not require any rights.
 func (p *FileInterface) Seek(offset int64, start SeekOrigin) (int32, uint64, error) {
-	req_ := &FileSeekRequest{
+	req_ := &fileSeekRequest{
 		Offset: offset,
 		Start:  start,
 	}
-	resp_ := &FileSeekResponse{}
+	resp_ := &fileSeekResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(FileSeekOrdinal, req_, resp_)
 	return resp_.S, resp_.Offset, err
 }
 
-// Shrink the file size to 'length' bytes.
+// Shrinks the file size to 'length' bytes.
 //
 // This method requires following rights: OPEN_RIGHT_WRITABLE.
 func (p *FileInterface) Truncate(length uint64) (int32, error) {
-	req_ := &FileTruncateRequest{
+	req_ := &fileTruncateRequest{
 		Length: length,
 	}
-	resp_ := &FileTruncateResponse{}
+	resp_ := &fileTruncateResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(FileTruncateOrdinal, req_, resp_)
 	return resp_.S, err
 }
 
-// Acquire the Directory::Open rights and flags used to access this file.
+// Acquires the Directory::Open rights and flags used to access this file.
 //
 // This method does not require any rights.
 func (p *FileInterface) GetFlags() (int32, uint32, error) {
 	var req_ _bindings.Payload
-	resp_ := &FileGetFlagsResponse{}
+	resp_ := &fileGetFlagsResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(FileGetFlagsOrdinal, req_, resp_)
 	return resp_.S, resp_.Flags, err
 }
 
-// Change the Directory::Open flags used to access the file.
+// Changes the Directory::Open flags used to access the file.
 // Supported flags which can be turned on / off:
 // - OPEN_FLAG_APPEND
 //
 // This method does not require any rights.
 func (p *FileInterface) SetFlags(flags uint32) (int32, error) {
-	req_ := &FileSetFlagsRequest{
+	req_ := &fileSetFlagsRequest{
 		Flags: flags,
 	}
-	resp_ := &FileSetFlagsResponse{}
+	resp_ := &fileSetFlagsResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(FileSetFlagsOrdinal, req_, resp_)
 	return resp_.S, err
 }
 
-// Acquire a VMO representing this file, if there is one, with the
+// Acquires a buffer representing this file, if there is one, with the
 // requested access rights.
 //
 // |flags| may be any of VMO_FLAG_*.
@@ -1797,10 +1867,10 @@
 // - OPEN_RIGHT_WRITABLE if |flags| includes VMO_FLAG_WRITE.
 // - OPEN_RIGHT_READABLE if |flags| includes VMO_FLAG_READ or VMO_FLAG_EXEC.
 func (p *FileInterface) GetBuffer(flags uint32) (int32, *fuchsiamem.Buffer, error) {
-	req_ := &FileGetBufferRequest{
+	req_ := &fileGetBufferRequest{
 		Flags: flags,
 	}
-	resp_ := &FileGetBufferResponse{}
+	resp_ := &fileGetBufferResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(FileGetBufferOrdinal, req_, resp_)
 	return resp_.S, resp_.Buffer, err
 }
@@ -1831,7 +1901,7 @@
 	//
 	// This method does not require any rights.
 	Describe() (NodeInfo, error)
-	// An event produced eagerly by a fidl server if requested by |OPEN_FLAG_DESCRIBE|.
+	// An event produced eagerly by a FIDL server if requested by |OPEN_FLAG_DESCRIBE|.
 	//
 	// Indicates the success or failure of the open operation, and optionally describes the
 	// object. If the status is |ZX_OK|, |info| contains descriptive information about the object
@@ -1850,22 +1920,22 @@
 	SetAttr(flags uint32, attributes NodeAttributes) (int32, error)
 	// Deprecated. Only for use with compatibility with devhost.
 	Ioctl(opcode uint32, maxOut uint64, handles []_zx.Handle, in []uint8) (int32, []_zx.Handle, []uint8, error)
-	// Read 'count' bytes at the seek offset.
+	// Reads 'count' bytes at the seek offset.
 	// The seek offset is moved forward by the number of bytes read.
 	//
 	// This method requires following rights: OPEN_RIGHT_READABLE.
 	Read(count uint64) (int32, []uint8, error)
-	// Read 'count' bytes at the provided offset.
+	// Reads 'count' bytes at the provided offset.
 	// Does not affect the seek offset.
 	//
 	// This method requires following rights: OPEN_RIGHT_READABLE.
 	ReadAt(count uint64, offset uint64) (int32, []uint8, error)
-	// Write data at the seek offset.
+	// Writes data at the seek offset.
 	// The seek offset is moved forward by the number of bytes written.
 	//
 	// This method requires following rights: OPEN_RIGHT_WRITABLE.
 	Write(data []uint8) (int32, uint64, error)
-	// Write data to the provided offset.
+	// Writes data to the provided offset.
 	// Does not affect the seek offset.
 	//
 	// This method requires following rights: OPEN_RIGHT_WRITABLE.
@@ -1875,21 +1945,21 @@
 	//
 	// This method does not require any rights.
 	Seek(offset int64, start SeekOrigin) (int32, uint64, error)
-	// Shrink the file size to 'length' bytes.
+	// Shrinks the file size to 'length' bytes.
 	//
 	// This method requires following rights: OPEN_RIGHT_WRITABLE.
 	Truncate(length uint64) (int32, error)
-	// Acquire the Directory::Open rights and flags used to access this file.
+	// Acquires the Directory::Open rights and flags used to access this file.
 	//
 	// This method does not require any rights.
 	GetFlags() (int32, uint32, error)
-	// Change the Directory::Open flags used to access the file.
+	// Changes the Directory::Open flags used to access the file.
 	// Supported flags which can be turned on / off:
 	// - OPEN_FLAG_APPEND
 	//
 	// This method does not require any rights.
 	SetFlags(flags uint32) (int32, error)
-	// Acquire a VMO representing this file, if there is one, with the
+	// Acquires a buffer representing this file, if there is one, with the
 	// requested access rights.
 	//
 	// |flags| may be any of VMO_FLAG_*.
@@ -1920,7 +1990,7 @@
 func (s *FileStub) DispatchNew(ord uint32, b_ []byte, h_ []_zx.Handle) (_bindings.Message, error) {
 	switch ord {
 	case FileCloneOrdinal:
-		in_ := FileCloneRequest{}
+		in_ := fileCloneRequest{}
 		if err_ := _bindings.Unmarshal(b_, h_, &in_); err_ != nil {
 			return nil, err_
 		}
@@ -1928,126 +1998,126 @@
 		return nil, err_
 	case FileCloseOrdinal:
 		s, err_ := s.Impl.Close()
-		out_ := FileCloseResponse{}
+		out_ := fileCloseResponse{}
 		out_.S = s
 		return &out_, err_
 	case FileDescribeOrdinal:
 		info, err_ := s.Impl.Describe()
-		out_ := FileDescribeResponse{}
+		out_ := fileDescribeResponse{}
 		out_.Info = info
 		return &out_, err_
 	case FileSyncOrdinal:
 		s, err_ := s.Impl.Sync()
-		out_ := FileSyncResponse{}
+		out_ := fileSyncResponse{}
 		out_.S = s
 		return &out_, err_
 	case FileGetAttrOrdinal:
 		s, attributes, err_ := s.Impl.GetAttr()
-		out_ := FileGetAttrResponse{}
+		out_ := fileGetAttrResponse{}
 		out_.S = s
 		out_.Attributes = attributes
 		return &out_, err_
 	case FileSetAttrOrdinal:
-		in_ := FileSetAttrRequest{}
+		in_ := fileSetAttrRequest{}
 		if err_ := _bindings.Unmarshal(b_, h_, &in_); err_ != nil {
 			return nil, err_
 		}
 		s, err_ := s.Impl.SetAttr(in_.Flags, in_.Attributes)
-		out_ := FileSetAttrResponse{}
+		out_ := fileSetAttrResponse{}
 		out_.S = s
 		return &out_, err_
 	case FileIoctlOrdinal:
-		in_ := FileIoctlRequest{}
+		in_ := fileIoctlRequest{}
 		if err_ := _bindings.Unmarshal(b_, h_, &in_); err_ != nil {
 			return nil, err_
 		}
 		s, handles, out, err_ := s.Impl.Ioctl(in_.Opcode, in_.MaxOut, in_.Handles, in_.In)
-		out_ := FileIoctlResponse{}
+		out_ := fileIoctlResponse{}
 		out_.S = s
 		out_.Handles = handles
 		out_.Out = out
 		return &out_, err_
 	case FileReadOrdinal:
-		in_ := FileReadRequest{}
+		in_ := fileReadRequest{}
 		if err_ := _bindings.Unmarshal(b_, h_, &in_); err_ != nil {
 			return nil, err_
 		}
 		s, data, err_ := s.Impl.Read(in_.Count)
-		out_ := FileReadResponse{}
+		out_ := fileReadResponse{}
 		out_.S = s
 		out_.Data = data
 		return &out_, err_
 	case FileReadAtOrdinal:
-		in_ := FileReadAtRequest{}
+		in_ := fileReadAtRequest{}
 		if err_ := _bindings.Unmarshal(b_, h_, &in_); err_ != nil {
 			return nil, err_
 		}
 		s, data, err_ := s.Impl.ReadAt(in_.Count, in_.Offset)
-		out_ := FileReadAtResponse{}
+		out_ := fileReadAtResponse{}
 		out_.S = s
 		out_.Data = data
 		return &out_, err_
 	case FileWriteOrdinal:
-		in_ := FileWriteRequest{}
+		in_ := fileWriteRequest{}
 		if err_ := _bindings.Unmarshal(b_, h_, &in_); err_ != nil {
 			return nil, err_
 		}
 		s, actual, err_ := s.Impl.Write(in_.Data)
-		out_ := FileWriteResponse{}
+		out_ := fileWriteResponse{}
 		out_.S = s
 		out_.Actual = actual
 		return &out_, err_
 	case FileWriteAtOrdinal:
-		in_ := FileWriteAtRequest{}
+		in_ := fileWriteAtRequest{}
 		if err_ := _bindings.Unmarshal(b_, h_, &in_); err_ != nil {
 			return nil, err_
 		}
 		s, actual, err_ := s.Impl.WriteAt(in_.Data, in_.Offset)
-		out_ := FileWriteAtResponse{}
+		out_ := fileWriteAtResponse{}
 		out_.S = s
 		out_.Actual = actual
 		return &out_, err_
 	case FileSeekOrdinal:
-		in_ := FileSeekRequest{}
+		in_ := fileSeekRequest{}
 		if err_ := _bindings.Unmarshal(b_, h_, &in_); err_ != nil {
 			return nil, err_
 		}
 		s, offset, err_ := s.Impl.Seek(in_.Offset, in_.Start)
-		out_ := FileSeekResponse{}
+		out_ := fileSeekResponse{}
 		out_.S = s
 		out_.Offset = offset
 		return &out_, err_
 	case FileTruncateOrdinal:
-		in_ := FileTruncateRequest{}
+		in_ := fileTruncateRequest{}
 		if err_ := _bindings.Unmarshal(b_, h_, &in_); err_ != nil {
 			return nil, err_
 		}
 		s, err_ := s.Impl.Truncate(in_.Length)
-		out_ := FileTruncateResponse{}
+		out_ := fileTruncateResponse{}
 		out_.S = s
 		return &out_, err_
 	case FileGetFlagsOrdinal:
 		s, flags, err_ := s.Impl.GetFlags()
-		out_ := FileGetFlagsResponse{}
+		out_ := fileGetFlagsResponse{}
 		out_.S = s
 		out_.Flags = flags
 		return &out_, err_
 	case FileSetFlagsOrdinal:
-		in_ := FileSetFlagsRequest{}
+		in_ := fileSetFlagsRequest{}
 		if err_ := _bindings.Unmarshal(b_, h_, &in_); err_ != nil {
 			return nil, err_
 		}
 		s, err_ := s.Impl.SetFlags(in_.Flags)
-		out_ := FileSetFlagsResponse{}
+		out_ := fileSetFlagsResponse{}
 		out_.S = s
 		return &out_, err_
 	case FileGetBufferOrdinal:
-		in_ := FileGetBufferRequest{}
+		in_ := fileGetBufferRequest{}
 		if err_ := _bindings.Unmarshal(b_, h_, &in_); err_ != nil {
 			return nil, err_
 		}
 		s, buffer, err_ := s.Impl.GetBuffer(in_.Flags)
-		out_ := FileGetBufferResponse{}
+		out_ := fileGetBufferResponse{}
 		out_.S = s
 		out_.Buffer = buffer
 		return &out_, err_
@@ -2071,7 +2141,7 @@
 type FileEventProxy _bindings.ChannelProxy
 
 func (p *FileEventProxy) OnOpen(s int32, info *NodeInfo) error {
-	event_ := &FileOnOpenResponse{
+	event_ := &fileOnOpenResponse{
 		S:    s,
 		Info: info,
 	}
@@ -2083,24 +2153,24 @@
 	DirectoryWatcherOnEventGenOrdinal uint32 = 546032797
 )
 
-type DirectoryWatcherOnEventRequest struct {
+type directoryWatcherOnEventRequest struct {
 	_      struct{} `fidl2:"s,16,0"`
 	Events []uint8  `fidl:"8192" fidl2:"8192"`
 }
 
-var _mDirectoryWatcherOnEventRequest = _bindings.CreateLazyMarshaler(DirectoryWatcherOnEventRequest{})
+var _mdirectoryWatcherOnEventRequest = _bindings.CreateLazyMarshaler(directoryWatcherOnEventRequest{})
 
-func (msg *DirectoryWatcherOnEventRequest) Marshaler() _bindings.Marshaler {
-	return _mDirectoryWatcherOnEventRequest
+func (msg *directoryWatcherOnEventRequest) Marshaler() _bindings.Marshaler {
+	return _mdirectoryWatcherOnEventRequest
 }
 
 // Implements Payload.
-func (_ *DirectoryWatcherOnEventRequest) InlineAlignment() int {
+func (_ *directoryWatcherOnEventRequest) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *DirectoryWatcherOnEventRequest) InlineSize() int {
+func (_ *directoryWatcherOnEventRequest) InlineSize() int {
 	return 16
 }
 
@@ -2108,14 +2178,14 @@
 
 // TODO(smklein): Convert this to a vector of WatchedEvents, when possible.
 func (p *DirectoryWatcherInterface) OnEvent(events []uint8) error {
-	req_ := &DirectoryWatcherOnEventRequest{
+	req_ := &directoryWatcherOnEventRequest{
 		Events: events,
 	}
 	err := ((*_bindings.ChannelProxy)(p)).Send(DirectoryWatcherOnEventOrdinal, req_)
 	return err
 }
 
-// WARNING(ZX-2645): Unused.
+// TODO(ZX-2645): Unused.
 //
 // DirectoryWatcher transmits messages from a filesystem server
 // about events happening in the filesystem. Clients can register
@@ -2146,7 +2216,7 @@
 func (s *DirectoryWatcherStub) DispatchNew(ord uint32, b_ []byte, h_ []_zx.Handle) (_bindings.Message, error) {
 	switch ord {
 	case DirectoryWatcherOnEventOrdinal:
-		in_ := DirectoryWatcherOnEventRequest{}
+		in_ := directoryWatcherOnEventRequest{}
 		if err_ := _bindings.Unmarshal(b_, h_, &in_); err_ != nil {
 			return nil, err_
 		}
@@ -2206,179 +2276,179 @@
 	DirectoryWatchGenOrdinal       uint32 = 1522700084
 )
 
-type DirectoryCloneRequest struct {
+type directoryCloneRequest struct {
 	_      struct{} `fidl2:"s,8,0"`
 	Flags  uint32
 	Object NodeInterfaceRequest `fidl2:"0"`
 }
 
-var _mDirectoryCloneRequest = _bindings.CreateLazyMarshaler(DirectoryCloneRequest{})
+var _mdirectoryCloneRequest = _bindings.CreateLazyMarshaler(directoryCloneRequest{})
 
-func (msg *DirectoryCloneRequest) Marshaler() _bindings.Marshaler {
-	return _mDirectoryCloneRequest
+func (msg *directoryCloneRequest) Marshaler() _bindings.Marshaler {
+	return _mdirectoryCloneRequest
 }
 
 // Implements Payload.
-func (_ *DirectoryCloneRequest) InlineAlignment() int {
+func (_ *directoryCloneRequest) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *DirectoryCloneRequest) InlineSize() int {
+func (_ *directoryCloneRequest) InlineSize() int {
 	return 8
 }
 
-type DirectoryCloseResponse struct {
+type directoryCloseResponse struct {
 	_ struct{} `fidl2:"s,8,0"`
 	S int32
 }
 
-var _mDirectoryCloseResponse = _bindings.CreateLazyMarshaler(DirectoryCloseResponse{})
+var _mdirectoryCloseResponse = _bindings.CreateLazyMarshaler(directoryCloseResponse{})
 
-func (msg *DirectoryCloseResponse) Marshaler() _bindings.Marshaler {
-	return _mDirectoryCloseResponse
+func (msg *directoryCloseResponse) Marshaler() _bindings.Marshaler {
+	return _mdirectoryCloseResponse
 }
 
 // Implements Payload.
-func (_ *DirectoryCloseResponse) InlineAlignment() int {
+func (_ *directoryCloseResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *DirectoryCloseResponse) InlineSize() int {
+func (_ *directoryCloseResponse) InlineSize() int {
 	return 8
 }
 
-type DirectoryDescribeResponse struct {
+type directoryDescribeResponse struct {
 	_    struct{} `fidl2:"s,32,0"`
 	Info NodeInfo
 }
 
-var _mDirectoryDescribeResponse = _bindings.CreateLazyMarshaler(DirectoryDescribeResponse{})
+var _mdirectoryDescribeResponse = _bindings.CreateLazyMarshaler(directoryDescribeResponse{})
 
-func (msg *DirectoryDescribeResponse) Marshaler() _bindings.Marshaler {
-	return _mDirectoryDescribeResponse
+func (msg *directoryDescribeResponse) Marshaler() _bindings.Marshaler {
+	return _mdirectoryDescribeResponse
 }
 
 // Implements Payload.
-func (_ *DirectoryDescribeResponse) InlineAlignment() int {
+func (_ *directoryDescribeResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *DirectoryDescribeResponse) InlineSize() int {
+func (_ *directoryDescribeResponse) InlineSize() int {
 	return 32
 }
 
-type DirectoryOnOpenResponse struct {
+type directoryOnOpenResponse struct {
 	_    struct{} `fidl2:"s,16,0"`
 	S    int32
 	Info *NodeInfo
 }
 
-var _mDirectoryOnOpenResponse = _bindings.CreateLazyMarshaler(DirectoryOnOpenResponse{})
+var _mdirectoryOnOpenResponse = _bindings.CreateLazyMarshaler(directoryOnOpenResponse{})
 
-func (msg *DirectoryOnOpenResponse) Marshaler() _bindings.Marshaler {
-	return _mDirectoryOnOpenResponse
+func (msg *directoryOnOpenResponse) Marshaler() _bindings.Marshaler {
+	return _mdirectoryOnOpenResponse
 }
 
 // Implements Payload.
-func (_ *DirectoryOnOpenResponse) InlineAlignment() int {
+func (_ *directoryOnOpenResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *DirectoryOnOpenResponse) InlineSize() int {
+func (_ *directoryOnOpenResponse) InlineSize() int {
 	return 16
 }
 
-type DirectorySyncResponse struct {
+type directorySyncResponse struct {
 	_ struct{} `fidl2:"s,8,0"`
 	S int32
 }
 
-var _mDirectorySyncResponse = _bindings.CreateLazyMarshaler(DirectorySyncResponse{})
+var _mdirectorySyncResponse = _bindings.CreateLazyMarshaler(directorySyncResponse{})
 
-func (msg *DirectorySyncResponse) Marshaler() _bindings.Marshaler {
-	return _mDirectorySyncResponse
+func (msg *directorySyncResponse) Marshaler() _bindings.Marshaler {
+	return _mdirectorySyncResponse
 }
 
 // Implements Payload.
-func (_ *DirectorySyncResponse) InlineAlignment() int {
+func (_ *directorySyncResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *DirectorySyncResponse) InlineSize() int {
+func (_ *directorySyncResponse) InlineSize() int {
 	return 8
 }
 
-type DirectoryGetAttrResponse struct {
+type directoryGetAttrResponse struct {
 	_          struct{} `fidl2:"s,64,0"`
 	S          int32
 	Attributes NodeAttributes
 }
 
-var _mDirectoryGetAttrResponse = _bindings.CreateLazyMarshaler(DirectoryGetAttrResponse{})
+var _mdirectoryGetAttrResponse = _bindings.CreateLazyMarshaler(directoryGetAttrResponse{})
 
-func (msg *DirectoryGetAttrResponse) Marshaler() _bindings.Marshaler {
-	return _mDirectoryGetAttrResponse
+func (msg *directoryGetAttrResponse) Marshaler() _bindings.Marshaler {
+	return _mdirectoryGetAttrResponse
 }
 
 // Implements Payload.
-func (_ *DirectoryGetAttrResponse) InlineAlignment() int {
+func (_ *directoryGetAttrResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *DirectoryGetAttrResponse) InlineSize() int {
+func (_ *directoryGetAttrResponse) InlineSize() int {
 	return 64
 }
 
-type DirectorySetAttrRequest struct {
+type directorySetAttrRequest struct {
 	_          struct{} `fidl2:"s,64,0"`
 	Flags      uint32
 	Attributes NodeAttributes
 }
 
-var _mDirectorySetAttrRequest = _bindings.CreateLazyMarshaler(DirectorySetAttrRequest{})
+var _mdirectorySetAttrRequest = _bindings.CreateLazyMarshaler(directorySetAttrRequest{})
 
-func (msg *DirectorySetAttrRequest) Marshaler() _bindings.Marshaler {
-	return _mDirectorySetAttrRequest
+func (msg *directorySetAttrRequest) Marshaler() _bindings.Marshaler {
+	return _mdirectorySetAttrRequest
 }
 
 // Implements Payload.
-func (_ *DirectorySetAttrRequest) InlineAlignment() int {
+func (_ *directorySetAttrRequest) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *DirectorySetAttrRequest) InlineSize() int {
+func (_ *directorySetAttrRequest) InlineSize() int {
 	return 64
 }
 
-type DirectorySetAttrResponse struct {
+type directorySetAttrResponse struct {
 	_ struct{} `fidl2:"s,8,0"`
 	S int32
 }
 
-var _mDirectorySetAttrResponse = _bindings.CreateLazyMarshaler(DirectorySetAttrResponse{})
+var _mdirectorySetAttrResponse = _bindings.CreateLazyMarshaler(directorySetAttrResponse{})
 
-func (msg *DirectorySetAttrResponse) Marshaler() _bindings.Marshaler {
-	return _mDirectorySetAttrResponse
+func (msg *directorySetAttrResponse) Marshaler() _bindings.Marshaler {
+	return _mdirectorySetAttrResponse
 }
 
 // Implements Payload.
-func (_ *DirectorySetAttrResponse) InlineAlignment() int {
+func (_ *directorySetAttrResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *DirectorySetAttrResponse) InlineSize() int {
+func (_ *directorySetAttrResponse) InlineSize() int {
 	return 8
 }
 
-type DirectoryIoctlRequest struct {
+type directoryIoctlRequest struct {
 	_       struct{} `fidl2:"s,48,0"`
 	Opcode  uint32
 	MaxOut  uint64
@@ -2386,46 +2456,46 @@
 	In      []uint8      `fidl:"8192" fidl2:"8192"`
 }
 
-var _mDirectoryIoctlRequest = _bindings.CreateLazyMarshaler(DirectoryIoctlRequest{})
+var _mdirectoryIoctlRequest = _bindings.CreateLazyMarshaler(directoryIoctlRequest{})
 
-func (msg *DirectoryIoctlRequest) Marshaler() _bindings.Marshaler {
-	return _mDirectoryIoctlRequest
+func (msg *directoryIoctlRequest) Marshaler() _bindings.Marshaler {
+	return _mdirectoryIoctlRequest
 }
 
 // Implements Payload.
-func (_ *DirectoryIoctlRequest) InlineAlignment() int {
+func (_ *directoryIoctlRequest) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *DirectoryIoctlRequest) InlineSize() int {
+func (_ *directoryIoctlRequest) InlineSize() int {
 	return 48
 }
 
-type DirectoryIoctlResponse struct {
+type directoryIoctlResponse struct {
 	_       struct{} `fidl2:"s,40,0"`
 	S       int32
 	Handles []_zx.Handle `fidl:"2" fidl2:"2,0"`
 	Out     []uint8      `fidl:"8192" fidl2:"8192"`
 }
 
-var _mDirectoryIoctlResponse = _bindings.CreateLazyMarshaler(DirectoryIoctlResponse{})
+var _mdirectoryIoctlResponse = _bindings.CreateLazyMarshaler(directoryIoctlResponse{})
 
-func (msg *DirectoryIoctlResponse) Marshaler() _bindings.Marshaler {
-	return _mDirectoryIoctlResponse
+func (msg *directoryIoctlResponse) Marshaler() _bindings.Marshaler {
+	return _mdirectoryIoctlResponse
 }
 
 // Implements Payload.
-func (_ *DirectoryIoctlResponse) InlineAlignment() int {
+func (_ *directoryIoctlResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *DirectoryIoctlResponse) InlineSize() int {
+func (_ *directoryIoctlResponse) InlineSize() int {
 	return 40
 }
 
-type DirectoryOpenRequest struct {
+type directoryOpenRequest struct {
 	_      struct{} `fidl2:"s,32,0"`
 	Flags  uint32
 	Mode   uint32
@@ -2433,279 +2503,279 @@
 	Object NodeInterfaceRequest `fidl2:"0"`
 }
 
-var _mDirectoryOpenRequest = _bindings.CreateLazyMarshaler(DirectoryOpenRequest{})
+var _mdirectoryOpenRequest = _bindings.CreateLazyMarshaler(directoryOpenRequest{})
 
-func (msg *DirectoryOpenRequest) Marshaler() _bindings.Marshaler {
-	return _mDirectoryOpenRequest
+func (msg *directoryOpenRequest) Marshaler() _bindings.Marshaler {
+	return _mdirectoryOpenRequest
 }
 
 // Implements Payload.
-func (_ *DirectoryOpenRequest) InlineAlignment() int {
+func (_ *directoryOpenRequest) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *DirectoryOpenRequest) InlineSize() int {
+func (_ *directoryOpenRequest) InlineSize() int {
 	return 32
 }
 
-type DirectoryUnlinkRequest struct {
+type directoryUnlinkRequest struct {
 	_    struct{} `fidl2:"s,16,0"`
 	Path string   `fidl:"4096" fidl2:"4096"`
 }
 
-var _mDirectoryUnlinkRequest = _bindings.CreateLazyMarshaler(DirectoryUnlinkRequest{})
+var _mdirectoryUnlinkRequest = _bindings.CreateLazyMarshaler(directoryUnlinkRequest{})
 
-func (msg *DirectoryUnlinkRequest) Marshaler() _bindings.Marshaler {
-	return _mDirectoryUnlinkRequest
+func (msg *directoryUnlinkRequest) Marshaler() _bindings.Marshaler {
+	return _mdirectoryUnlinkRequest
 }
 
 // Implements Payload.
-func (_ *DirectoryUnlinkRequest) InlineAlignment() int {
+func (_ *directoryUnlinkRequest) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *DirectoryUnlinkRequest) InlineSize() int {
+func (_ *directoryUnlinkRequest) InlineSize() int {
 	return 16
 }
 
-type DirectoryUnlinkResponse struct {
+type directoryUnlinkResponse struct {
 	_ struct{} `fidl2:"s,8,0"`
 	S int32
 }
 
-var _mDirectoryUnlinkResponse = _bindings.CreateLazyMarshaler(DirectoryUnlinkResponse{})
+var _mdirectoryUnlinkResponse = _bindings.CreateLazyMarshaler(directoryUnlinkResponse{})
 
-func (msg *DirectoryUnlinkResponse) Marshaler() _bindings.Marshaler {
-	return _mDirectoryUnlinkResponse
+func (msg *directoryUnlinkResponse) Marshaler() _bindings.Marshaler {
+	return _mdirectoryUnlinkResponse
 }
 
 // Implements Payload.
-func (_ *DirectoryUnlinkResponse) InlineAlignment() int {
+func (_ *directoryUnlinkResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *DirectoryUnlinkResponse) InlineSize() int {
+func (_ *directoryUnlinkResponse) InlineSize() int {
 	return 8
 }
 
-type DirectoryReadDirentsRequest struct {
+type directoryReadDirentsRequest struct {
 	_        struct{} `fidl2:"s,8,0"`
 	MaxBytes uint64
 }
 
-var _mDirectoryReadDirentsRequest = _bindings.CreateLazyMarshaler(DirectoryReadDirentsRequest{})
+var _mdirectoryReadDirentsRequest = _bindings.CreateLazyMarshaler(directoryReadDirentsRequest{})
 
-func (msg *DirectoryReadDirentsRequest) Marshaler() _bindings.Marshaler {
-	return _mDirectoryReadDirentsRequest
+func (msg *directoryReadDirentsRequest) Marshaler() _bindings.Marshaler {
+	return _mdirectoryReadDirentsRequest
 }
 
 // Implements Payload.
-func (_ *DirectoryReadDirentsRequest) InlineAlignment() int {
+func (_ *directoryReadDirentsRequest) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *DirectoryReadDirentsRequest) InlineSize() int {
+func (_ *directoryReadDirentsRequest) InlineSize() int {
 	return 8
 }
 
-type DirectoryReadDirentsResponse struct {
+type directoryReadDirentsResponse struct {
 	_       struct{} `fidl2:"s,24,0"`
 	S       int32
 	Dirents []uint8 `fidl:"8192" fidl2:"8192"`
 }
 
-var _mDirectoryReadDirentsResponse = _bindings.CreateLazyMarshaler(DirectoryReadDirentsResponse{})
+var _mdirectoryReadDirentsResponse = _bindings.CreateLazyMarshaler(directoryReadDirentsResponse{})
 
-func (msg *DirectoryReadDirentsResponse) Marshaler() _bindings.Marshaler {
-	return _mDirectoryReadDirentsResponse
+func (msg *directoryReadDirentsResponse) Marshaler() _bindings.Marshaler {
+	return _mdirectoryReadDirentsResponse
 }
 
 // Implements Payload.
-func (_ *DirectoryReadDirentsResponse) InlineAlignment() int {
+func (_ *directoryReadDirentsResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *DirectoryReadDirentsResponse) InlineSize() int {
+func (_ *directoryReadDirentsResponse) InlineSize() int {
 	return 24
 }
 
-type DirectoryRewindResponse struct {
+type directoryRewindResponse struct {
 	_ struct{} `fidl2:"s,8,0"`
 	S int32
 }
 
-var _mDirectoryRewindResponse = _bindings.CreateLazyMarshaler(DirectoryRewindResponse{})
+var _mdirectoryRewindResponse = _bindings.CreateLazyMarshaler(directoryRewindResponse{})
 
-func (msg *DirectoryRewindResponse) Marshaler() _bindings.Marshaler {
-	return _mDirectoryRewindResponse
+func (msg *directoryRewindResponse) Marshaler() _bindings.Marshaler {
+	return _mdirectoryRewindResponse
 }
 
 // Implements Payload.
-func (_ *DirectoryRewindResponse) InlineAlignment() int {
+func (_ *directoryRewindResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *DirectoryRewindResponse) InlineSize() int {
+func (_ *directoryRewindResponse) InlineSize() int {
 	return 8
 }
 
-type DirectoryGetTokenResponse struct {
+type directoryGetTokenResponse struct {
 	_     struct{} `fidl2:"s,8,0"`
 	S     int32
 	Token _zx.Handle `fidl:"*" fidl2:"1"`
 }
 
-var _mDirectoryGetTokenResponse = _bindings.CreateLazyMarshaler(DirectoryGetTokenResponse{})
+var _mdirectoryGetTokenResponse = _bindings.CreateLazyMarshaler(directoryGetTokenResponse{})
 
-func (msg *DirectoryGetTokenResponse) Marshaler() _bindings.Marshaler {
-	return _mDirectoryGetTokenResponse
+func (msg *directoryGetTokenResponse) Marshaler() _bindings.Marshaler {
+	return _mdirectoryGetTokenResponse
 }
 
 // Implements Payload.
-func (_ *DirectoryGetTokenResponse) InlineAlignment() int {
+func (_ *directoryGetTokenResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *DirectoryGetTokenResponse) InlineSize() int {
+func (_ *directoryGetTokenResponse) InlineSize() int {
 	return 8
 }
 
-type DirectoryRenameRequest struct {
+type directoryRenameRequest struct {
 	_              struct{}   `fidl2:"s,40,0"`
 	Src            string     `fidl:"4096" fidl2:"4096"`
 	DstParentToken _zx.Handle `fidl2:"0"`
 	Dst            string     `fidl:"4096" fidl2:"4096"`
 }
 
-var _mDirectoryRenameRequest = _bindings.CreateLazyMarshaler(DirectoryRenameRequest{})
+var _mdirectoryRenameRequest = _bindings.CreateLazyMarshaler(directoryRenameRequest{})
 
-func (msg *DirectoryRenameRequest) Marshaler() _bindings.Marshaler {
-	return _mDirectoryRenameRequest
+func (msg *directoryRenameRequest) Marshaler() _bindings.Marshaler {
+	return _mdirectoryRenameRequest
 }
 
 // Implements Payload.
-func (_ *DirectoryRenameRequest) InlineAlignment() int {
+func (_ *directoryRenameRequest) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *DirectoryRenameRequest) InlineSize() int {
+func (_ *directoryRenameRequest) InlineSize() int {
 	return 40
 }
 
-type DirectoryRenameResponse struct {
+type directoryRenameResponse struct {
 	_ struct{} `fidl2:"s,8,0"`
 	S int32
 }
 
-var _mDirectoryRenameResponse = _bindings.CreateLazyMarshaler(DirectoryRenameResponse{})
+var _mdirectoryRenameResponse = _bindings.CreateLazyMarshaler(directoryRenameResponse{})
 
-func (msg *DirectoryRenameResponse) Marshaler() _bindings.Marshaler {
-	return _mDirectoryRenameResponse
+func (msg *directoryRenameResponse) Marshaler() _bindings.Marshaler {
+	return _mdirectoryRenameResponse
 }
 
 // Implements Payload.
-func (_ *DirectoryRenameResponse) InlineAlignment() int {
+func (_ *directoryRenameResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *DirectoryRenameResponse) InlineSize() int {
+func (_ *directoryRenameResponse) InlineSize() int {
 	return 8
 }
 
-type DirectoryLinkRequest struct {
+type directoryLinkRequest struct {
 	_              struct{}   `fidl2:"s,40,0"`
 	Src            string     `fidl:"4096" fidl2:"4096"`
 	DstParentToken _zx.Handle `fidl2:"0"`
 	Dst            string     `fidl:"4096" fidl2:"4096"`
 }
 
-var _mDirectoryLinkRequest = _bindings.CreateLazyMarshaler(DirectoryLinkRequest{})
+var _mdirectoryLinkRequest = _bindings.CreateLazyMarshaler(directoryLinkRequest{})
 
-func (msg *DirectoryLinkRequest) Marshaler() _bindings.Marshaler {
-	return _mDirectoryLinkRequest
+func (msg *directoryLinkRequest) Marshaler() _bindings.Marshaler {
+	return _mdirectoryLinkRequest
 }
 
 // Implements Payload.
-func (_ *DirectoryLinkRequest) InlineAlignment() int {
+func (_ *directoryLinkRequest) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *DirectoryLinkRequest) InlineSize() int {
+func (_ *directoryLinkRequest) InlineSize() int {
 	return 40
 }
 
-type DirectoryLinkResponse struct {
+type directoryLinkResponse struct {
 	_ struct{} `fidl2:"s,8,0"`
 	S int32
 }
 
-var _mDirectoryLinkResponse = _bindings.CreateLazyMarshaler(DirectoryLinkResponse{})
+var _mdirectoryLinkResponse = _bindings.CreateLazyMarshaler(directoryLinkResponse{})
 
-func (msg *DirectoryLinkResponse) Marshaler() _bindings.Marshaler {
-	return _mDirectoryLinkResponse
+func (msg *directoryLinkResponse) Marshaler() _bindings.Marshaler {
+	return _mdirectoryLinkResponse
 }
 
 // Implements Payload.
-func (_ *DirectoryLinkResponse) InlineAlignment() int {
+func (_ *directoryLinkResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *DirectoryLinkResponse) InlineSize() int {
+func (_ *directoryLinkResponse) InlineSize() int {
 	return 8
 }
 
-type DirectoryWatchRequest struct {
+type directoryWatchRequest struct {
 	_       struct{} `fidl2:"s,16,0"`
 	Mask    uint32
 	Options uint32
 	Watcher _zx.Channel `fidl2:"0"`
 }
 
-var _mDirectoryWatchRequest = _bindings.CreateLazyMarshaler(DirectoryWatchRequest{})
+var _mdirectoryWatchRequest = _bindings.CreateLazyMarshaler(directoryWatchRequest{})
 
-func (msg *DirectoryWatchRequest) Marshaler() _bindings.Marshaler {
-	return _mDirectoryWatchRequest
+func (msg *directoryWatchRequest) Marshaler() _bindings.Marshaler {
+	return _mdirectoryWatchRequest
 }
 
 // Implements Payload.
-func (_ *DirectoryWatchRequest) InlineAlignment() int {
+func (_ *directoryWatchRequest) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *DirectoryWatchRequest) InlineSize() int {
+func (_ *directoryWatchRequest) InlineSize() int {
 	return 16
 }
 
-type DirectoryWatchResponse struct {
+type directoryWatchResponse struct {
 	_ struct{} `fidl2:"s,8,0"`
 	S int32
 }
 
-var _mDirectoryWatchResponse = _bindings.CreateLazyMarshaler(DirectoryWatchResponse{})
+var _mdirectoryWatchResponse = _bindings.CreateLazyMarshaler(directoryWatchResponse{})
 
-func (msg *DirectoryWatchResponse) Marshaler() _bindings.Marshaler {
-	return _mDirectoryWatchResponse
+func (msg *directoryWatchResponse) Marshaler() _bindings.Marshaler {
+	return _mdirectoryWatchResponse
 }
 
 // Implements Payload.
-func (_ *DirectoryWatchResponse) InlineAlignment() int {
+func (_ *directoryWatchResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *DirectoryWatchResponse) InlineSize() int {
+func (_ *directoryWatchResponse) InlineSize() int {
 	return 8
 }
 
@@ -2726,7 +2796,7 @@
 // TODO: Currently, ulib/fs ignores OPEN_RIGHT_*, and uses the rights of the original
 // connection. This is a bug.
 func (p *DirectoryInterface) Clone(flags uint32, object NodeInterfaceRequest) error {
-	req_ := &DirectoryCloneRequest{
+	req_ := &directoryCloneRequest{
 		Flags:  flags,
 		Object: object,
 	}
@@ -2739,7 +2809,7 @@
 // This method does not require any rights.
 func (p *DirectoryInterface) Close() (int32, error) {
 	var req_ _bindings.Payload
-	resp_ := &DirectoryCloseResponse{}
+	resp_ := &directoryCloseResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryCloseOrdinal, req_, resp_)
 	return resp_.S, err
 }
@@ -2750,18 +2820,18 @@
 // This method does not require any rights.
 func (p *DirectoryInterface) Describe() (NodeInfo, error) {
 	var req_ _bindings.Payload
-	resp_ := &DirectoryDescribeResponse{}
+	resp_ := &directoryDescribeResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryDescribeOrdinal, req_, resp_)
 	return resp_.Info, err
 }
 
-// An event produced eagerly by a fidl server if requested by |OPEN_FLAG_DESCRIBE|.
+// An event produced eagerly by a FIDL server if requested by |OPEN_FLAG_DESCRIBE|.
 //
 // Indicates the success or failure of the open operation, and optionally describes the
 // object. If the status is |ZX_OK|, |info| contains descriptive information about the object
 // (the same as would be returned by |Describe|).
 func (p *DirectoryInterface) ExpectOnOpen() (int32, *NodeInfo, error) {
-	resp_ := &DirectoryOnOpenResponse{}
+	resp_ := &directoryOnOpenResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Recv(DirectoryOnOpenOrdinal, resp_)
 	return resp_.S, resp_.Info, err
 }
@@ -2769,7 +2839,7 @@
 // Synchronizes updates to the node to the underlying media, if it exists.
 func (p *DirectoryInterface) Sync() (int32, error) {
 	var req_ _bindings.Payload
-	resp_ := &DirectorySyncResponse{}
+	resp_ := &directorySyncResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(DirectorySyncOrdinal, req_, resp_)
 	return resp_.S, err
 }
@@ -2779,7 +2849,7 @@
 // This method does not require any rights.
 func (p *DirectoryInterface) GetAttr() (int32, NodeAttributes, error) {
 	var req_ _bindings.Payload
-	resp_ := &DirectoryGetAttrResponse{}
+	resp_ := &directoryGetAttrResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryGetAttrOrdinal, req_, resp_)
 	return resp_.S, resp_.Attributes, err
 }
@@ -2790,35 +2860,38 @@
 // This method requires following rights: OPEN_RIGHT_WRITABLE.
 // TODO(ZX-1262): This access restriction is not implemented in ulib/fs.
 func (p *DirectoryInterface) SetAttr(flags uint32, attributes NodeAttributes) (int32, error) {
-	req_ := &DirectorySetAttrRequest{
+	req_ := &directorySetAttrRequest{
 		Flags:      flags,
 		Attributes: attributes,
 	}
-	resp_ := &DirectorySetAttrResponse{}
+	resp_ := &directorySetAttrResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(DirectorySetAttrOrdinal, req_, resp_)
 	return resp_.S, err
 }
 
 // Deprecated. Only for use with compatibility with devhost.
 func (p *DirectoryInterface) Ioctl(opcode uint32, maxOut uint64, handles []_zx.Handle, in []uint8) (int32, []_zx.Handle, []uint8, error) {
-	req_ := &DirectoryIoctlRequest{
+	req_ := &directoryIoctlRequest{
 		Opcode:  opcode,
 		MaxOut:  maxOut,
 		Handles: handles,
 		In:      in,
 	}
-	resp_ := &DirectoryIoctlResponse{}
+	resp_ := &directoryIoctlResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryIoctlOrdinal, req_, resp_)
 	return resp_.S, resp_.Handles, resp_.Out, err
 }
 
-// Open a new object relative to this directory object.
+// Opens a new object relative to this directory object.
 //
 // Flags may be any of the OPEN_FLAG_* and OPEN_RIGHT_* values, bitwise ORed together.
 // The OPEN_FLAG_DESCRIBE flag may cause an |OnOpen| event to be transmitted
 // on the |object| handle, indicating the type of object opened.
+//
+// If an unknown value is sent for either flags or mode, the connection should
+// be closed.
 func (p *DirectoryInterface) Open(flags uint32, mode uint32, path string, object NodeInterfaceRequest) error {
-	req_ := &DirectoryOpenRequest{
+	req_ := &directoryOpenRequest{
 		Flags:  flags,
 		Mode:   mode,
 		Path:   path,
@@ -2828,12 +2901,36 @@
 	return err
 }
 
-// Remove an object relative to this directory object.
+// Detaches an object from this directory object.
+//
+// The underlying object may or may not be deleted after this method
+// completes: although the link will be removed from the containing directory,
+// objects with multiple references (such as files which are still open)
+// will not actually be destroyed until all references are removed.
+//
+// If a directory is unlinked while it still has an open reference,
+// it must become read-only, preventing new entries from being created
+// until all references close and the directory is destroyed.
+//
+// |path| identifies the file which should be detached.
+// If |path| contains multiple segments, separated by "/" characters,
+// then the directory is traversed, one segment at a time, relative to the
+// originally accessed Directory.
+//
+// Returns:
+//   ZX_ERR_ACCESS_DENIED if the connection (or the underlying filesystem) does not
+//     allow writable access.
+//   ZX_ERR_INVALID_ARGS if |path| contains ".." segments.
+//   ZX_ERR_NOT_EMPTY if |path| refers to a non-empty directory.
+//   ZX_ERR_UNAVAILABLE if |path| refers to a mount point, containing a remote channel.
+//   ZX_ERR_UNAVAILABLE if |path| is ".".
+//
+// Other errors may be returned for filesystem-specific reasons.
 func (p *DirectoryInterface) Unlink(path string) (int32, error) {
-	req_ := &DirectoryUnlinkRequest{
+	req_ := &directoryUnlinkRequest{
 		Path: path,
 	}
-	resp_ := &DirectoryUnlinkResponse{}
+	resp_ := &directoryUnlinkResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryUnlinkOrdinal, req_, resp_)
 	return resp_.S, err
 }
@@ -2855,54 +2952,54 @@
 //   // Unterminated name of entry.
 //   char name[0];
 // }
+//
 func (p *DirectoryInterface) ReadDirents(maxBytes uint64) (int32, []uint8, error) {
-	req_ := &DirectoryReadDirentsRequest{
+	req_ := &directoryReadDirentsRequest{
 		MaxBytes: maxBytes,
 	}
-	resp_ := &DirectoryReadDirentsResponse{}
+	resp_ := &directoryReadDirentsResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryReadDirentsOrdinal, req_, resp_)
 	return resp_.S, resp_.Dirents, err
 }
 
-// Reset the directory seek offset.
+// Resets the directory seek offset.
 func (p *DirectoryInterface) Rewind() (int32, error) {
 	var req_ _bindings.Payload
-	resp_ := &DirectoryRewindResponse{}
+	resp_ := &directoryRewindResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryRewindOrdinal, req_, resp_)
 	return resp_.S, err
 }
 
-// Acquire a token to a Directory which can be used to identify
+// Acquires a token to a Directory which can be used to identify
 // access to it at a later point in time.
 func (p *DirectoryInterface) GetToken() (int32, _zx.Handle, error) {
 	var req_ _bindings.Payload
-	resp_ := &DirectoryGetTokenResponse{}
+	resp_ := &directoryGetTokenResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryGetTokenOrdinal, req_, resp_)
 	return resp_.S, resp_.Token, err
 }
 
-// Within the directory, rename an object named src to the name dst, in
-// a directory represented by token.
+// Renames an object named src to the name dst, in a directory represented by token.
 func (p *DirectoryInterface) Rename(src string, dstParentToken _zx.Handle, dst string) (int32, error) {
-	req_ := &DirectoryRenameRequest{
+	req_ := &directoryRenameRequest{
 		Src:            src,
 		DstParentToken: dstParentToken,
 		Dst:            dst,
 	}
-	resp_ := &DirectoryRenameResponse{}
+	resp_ := &directoryRenameResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryRenameOrdinal, req_, resp_)
 	return resp_.S, err
 }
 
-// Within the directory, create a link to an object named src by the name
-// dst, within a directory represented by token.
+// Creates a link to an object named src by the name dst, within a directory represented by
+// token.
 func (p *DirectoryInterface) Link(src string, dstParentToken _zx.Handle, dst string) (int32, error) {
-	req_ := &DirectoryLinkRequest{
+	req_ := &directoryLinkRequest{
 		Src:            src,
 		DstParentToken: dstParentToken,
 		Dst:            dst,
 	}
-	resp_ := &DirectoryLinkResponse{}
+	resp_ := &directoryLinkResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryLinkOrdinal, req_, resp_)
 	return resp_.S, err
 }
@@ -2918,17 +3015,17 @@
 // };
 // Where names are NOT null-terminated.
 //
-// This API is unstable; in the future, watcher will be a "DirectoryWatcher" client.
+// TODO: This API is unstable; in the future, watcher will be a "DirectoryWatcher" client.
 //
 // Mask specifies a bitmask of events to observe.
 // Options must be zero; it is reserved.
 func (p *DirectoryInterface) Watch(mask uint32, options uint32, watcher _zx.Channel) (int32, error) {
-	req_ := &DirectoryWatchRequest{
+	req_ := &directoryWatchRequest{
 		Mask:    mask,
 		Options: options,
 		Watcher: watcher,
 	}
-	resp_ := &DirectoryWatchResponse{}
+	resp_ := &directoryWatchResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryWatchOrdinal, req_, resp_)
 	return resp_.S, err
 }
@@ -2959,7 +3056,7 @@
 	//
 	// This method does not require any rights.
 	Describe() (NodeInfo, error)
-	// An event produced eagerly by a fidl server if requested by |OPEN_FLAG_DESCRIBE|.
+	// An event produced eagerly by a FIDL server if requested by |OPEN_FLAG_DESCRIBE|.
 	//
 	// Indicates the success or failure of the open operation, and optionally describes the
 	// object. If the status is |ZX_OK|, |info| contains descriptive information about the object
@@ -2978,13 +3075,40 @@
 	SetAttr(flags uint32, attributes NodeAttributes) (int32, error)
 	// Deprecated. Only for use with compatibility with devhost.
 	Ioctl(opcode uint32, maxOut uint64, handles []_zx.Handle, in []uint8) (int32, []_zx.Handle, []uint8, error)
-	// Open a new object relative to this directory object.
+	// Opens a new object relative to this directory object.
 	//
 	// Flags may be any of the OPEN_FLAG_* and OPEN_RIGHT_* values, bitwise ORed together.
 	// The OPEN_FLAG_DESCRIBE flag may cause an |OnOpen| event to be transmitted
 	// on the |object| handle, indicating the type of object opened.
+	//
+	// If an unknown value is sent for either flags or mode, the connection should
+	// be closed.
 	Open(flags uint32, mode uint32, path string, object NodeInterfaceRequest) error
-	// Remove an object relative to this directory object.
+	// Detaches an object from this directory object.
+	//
+	// The underlying object may or may not be deleted after this method
+	// completes: although the link will be removed from the containing directory,
+	// objects with multiple references (such as files which are still open)
+	// will not actually be destroyed until all references are removed.
+	//
+	// If a directory is unlinked while it still has an open reference,
+	// it must become read-only, preventing new entries from being created
+	// until all references close and the directory is destroyed.
+	//
+	// |path| identifies the file which should be detached.
+	// If |path| contains multiple segments, separated by "/" characters,
+	// then the directory is traversed, one segment at a time, relative to the
+	// originally accessed Directory.
+	//
+	// Returns:
+	//   ZX_ERR_ACCESS_DENIED if the connection (or the underlying filesystem) does not
+	//     allow writable access.
+	//   ZX_ERR_INVALID_ARGS if |path| contains ".." segments.
+	//   ZX_ERR_NOT_EMPTY if |path| refers to a non-empty directory.
+	//   ZX_ERR_UNAVAILABLE if |path| refers to a mount point, containing a remote channel.
+	//   ZX_ERR_UNAVAILABLE if |path| is ".".
+	//
+	// Other errors may be returned for filesystem-specific reasons.
 	Unlink(path string) (int32, error)
 	// Reads a collection of variably sized dirents into a buffer.
 	// The number of dirents in a directory may be very large: akin to
@@ -3003,17 +3127,17 @@
 	//   // Unterminated name of entry.
 	//   char name[0];
 	// }
+	//
 	ReadDirents(maxBytes uint64) (int32, []uint8, error)
-	// Reset the directory seek offset.
+	// Resets the directory seek offset.
 	Rewind() (int32, error)
-	// Acquire a token to a Directory which can be used to identify
+	// Acquires a token to a Directory which can be used to identify
 	// access to it at a later point in time.
 	GetToken() (int32, _zx.Handle, error)
-	// Within the directory, rename an object named src to the name dst, in
-	// a directory represented by token.
+	// Renames an object named src to the name dst, in a directory represented by token.
 	Rename(src string, dstParentToken _zx.Handle, dst string) (int32, error)
-	// Within the directory, create a link to an object named src by the name
-	// dst, within a directory represented by token.
+	// Creates a link to an object named src by the name dst, within a directory represented by
+	// token.
 	Link(src string, dstParentToken _zx.Handle, dst string) (int32, error)
 	// Watches a directory, receiving events of added messages on the
 	// watcher request channel.
@@ -3026,7 +3150,7 @@
 	// };
 	// Where names are NOT null-terminated.
 	//
-	// This API is unstable; in the future, watcher will be a "DirectoryWatcher" client.
+	// TODO: This API is unstable; in the future, watcher will be a "DirectoryWatcher" client.
 	//
 	// Mask specifies a bitmask of events to observe.
 	// Options must be zero; it is reserved.
@@ -3053,7 +3177,7 @@
 func (s *DirectoryStub) DispatchNew(ord uint32, b_ []byte, h_ []_zx.Handle) (_bindings.Message, error) {
 	switch ord {
 	case DirectoryCloneOrdinal:
-		in_ := DirectoryCloneRequest{}
+		in_ := directoryCloneRequest{}
 		if err_ := _bindings.Unmarshal(b_, h_, &in_); err_ != nil {
 			return nil, err_
 		}
@@ -3061,107 +3185,107 @@
 		return nil, err_
 	case DirectoryCloseOrdinal:
 		s, err_ := s.Impl.Close()
-		out_ := DirectoryCloseResponse{}
+		out_ := directoryCloseResponse{}
 		out_.S = s
 		return &out_, err_
 	case DirectoryDescribeOrdinal:
 		info, err_ := s.Impl.Describe()
-		out_ := DirectoryDescribeResponse{}
+		out_ := directoryDescribeResponse{}
 		out_.Info = info
 		return &out_, err_
 	case DirectorySyncOrdinal:
 		s, err_ := s.Impl.Sync()
-		out_ := DirectorySyncResponse{}
+		out_ := directorySyncResponse{}
 		out_.S = s
 		return &out_, err_
 	case DirectoryGetAttrOrdinal:
 		s, attributes, err_ := s.Impl.GetAttr()
-		out_ := DirectoryGetAttrResponse{}
+		out_ := directoryGetAttrResponse{}
 		out_.S = s
 		out_.Attributes = attributes
 		return &out_, err_
 	case DirectorySetAttrOrdinal:
-		in_ := DirectorySetAttrRequest{}
+		in_ := directorySetAttrRequest{}
 		if err_ := _bindings.Unmarshal(b_, h_, &in_); err_ != nil {
 			return nil, err_
 		}
 		s, err_ := s.Impl.SetAttr(in_.Flags, in_.Attributes)
-		out_ := DirectorySetAttrResponse{}
+		out_ := directorySetAttrResponse{}
 		out_.S = s
 		return &out_, err_
 	case DirectoryIoctlOrdinal:
-		in_ := DirectoryIoctlRequest{}
+		in_ := directoryIoctlRequest{}
 		if err_ := _bindings.Unmarshal(b_, h_, &in_); err_ != nil {
 			return nil, err_
 		}
 		s, handles, out, err_ := s.Impl.Ioctl(in_.Opcode, in_.MaxOut, in_.Handles, in_.In)
-		out_ := DirectoryIoctlResponse{}
+		out_ := directoryIoctlResponse{}
 		out_.S = s
 		out_.Handles = handles
 		out_.Out = out
 		return &out_, err_
 	case DirectoryOpenOrdinal:
-		in_ := DirectoryOpenRequest{}
+		in_ := directoryOpenRequest{}
 		if err_ := _bindings.Unmarshal(b_, h_, &in_); err_ != nil {
 			return nil, err_
 		}
 		err_ := s.Impl.Open(in_.Flags, in_.Mode, in_.Path, in_.Object)
 		return nil, err_
 	case DirectoryUnlinkOrdinal:
-		in_ := DirectoryUnlinkRequest{}
+		in_ := directoryUnlinkRequest{}
 		if err_ := _bindings.Unmarshal(b_, h_, &in_); err_ != nil {
 			return nil, err_
 		}
 		s, err_ := s.Impl.Unlink(in_.Path)
-		out_ := DirectoryUnlinkResponse{}
+		out_ := directoryUnlinkResponse{}
 		out_.S = s
 		return &out_, err_
 	case DirectoryReadDirentsOrdinal:
-		in_ := DirectoryReadDirentsRequest{}
+		in_ := directoryReadDirentsRequest{}
 		if err_ := _bindings.Unmarshal(b_, h_, &in_); err_ != nil {
 			return nil, err_
 		}
 		s, dirents, err_ := s.Impl.ReadDirents(in_.MaxBytes)
-		out_ := DirectoryReadDirentsResponse{}
+		out_ := directoryReadDirentsResponse{}
 		out_.S = s
 		out_.Dirents = dirents
 		return &out_, err_
 	case DirectoryRewindOrdinal:
 		s, err_ := s.Impl.Rewind()
-		out_ := DirectoryRewindResponse{}
+		out_ := directoryRewindResponse{}
 		out_.S = s
 		return &out_, err_
 	case DirectoryGetTokenOrdinal:
 		s, token, err_ := s.Impl.GetToken()
-		out_ := DirectoryGetTokenResponse{}
+		out_ := directoryGetTokenResponse{}
 		out_.S = s
 		out_.Token = token
 		return &out_, err_
 	case DirectoryRenameOrdinal:
-		in_ := DirectoryRenameRequest{}
+		in_ := directoryRenameRequest{}
 		if err_ := _bindings.Unmarshal(b_, h_, &in_); err_ != nil {
 			return nil, err_
 		}
 		s, err_ := s.Impl.Rename(in_.Src, in_.DstParentToken, in_.Dst)
-		out_ := DirectoryRenameResponse{}
+		out_ := directoryRenameResponse{}
 		out_.S = s
 		return &out_, err_
 	case DirectoryLinkOrdinal:
-		in_ := DirectoryLinkRequest{}
+		in_ := directoryLinkRequest{}
 		if err_ := _bindings.Unmarshal(b_, h_, &in_); err_ != nil {
 			return nil, err_
 		}
 		s, err_ := s.Impl.Link(in_.Src, in_.DstParentToken, in_.Dst)
-		out_ := DirectoryLinkResponse{}
+		out_ := directoryLinkResponse{}
 		out_.S = s
 		return &out_, err_
 	case DirectoryWatchOrdinal:
-		in_ := DirectoryWatchRequest{}
+		in_ := directoryWatchRequest{}
 		if err_ := _bindings.Unmarshal(b_, h_, &in_); err_ != nil {
 			return nil, err_
 		}
 		s, err_ := s.Impl.Watch(in_.Mask, in_.Options, in_.Watcher)
-		out_ := DirectoryWatchResponse{}
+		out_ := directoryWatchResponse{}
 		out_.S = s
 		return &out_, err_
 	}
@@ -3184,7 +3308,7 @@
 type DirectoryEventProxy _bindings.ChannelProxy
 
 func (p *DirectoryEventProxy) OnOpen(s int32, info *NodeInfo) error {
-	event_ := &DirectoryOnOpenResponse{
+	event_ := &directoryOnOpenResponse{
 		S:    s,
 		Info: info,
 	}
@@ -3238,179 +3362,179 @@
 	DirectoryAdminGetDevicePathGenOrdinal   uint32 = 787943096
 )
 
-type DirectoryAdminCloneRequest struct {
+type directoryAdminCloneRequest struct {
 	_      struct{} `fidl2:"s,8,0"`
 	Flags  uint32
 	Object NodeInterfaceRequest `fidl2:"0"`
 }
 
-var _mDirectoryAdminCloneRequest = _bindings.CreateLazyMarshaler(DirectoryAdminCloneRequest{})
+var _mdirectoryAdminCloneRequest = _bindings.CreateLazyMarshaler(directoryAdminCloneRequest{})
 
-func (msg *DirectoryAdminCloneRequest) Marshaler() _bindings.Marshaler {
-	return _mDirectoryAdminCloneRequest
+func (msg *directoryAdminCloneRequest) Marshaler() _bindings.Marshaler {
+	return _mdirectoryAdminCloneRequest
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminCloneRequest) InlineAlignment() int {
+func (_ *directoryAdminCloneRequest) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminCloneRequest) InlineSize() int {
+func (_ *directoryAdminCloneRequest) InlineSize() int {
 	return 8
 }
 
-type DirectoryAdminCloseResponse struct {
+type directoryAdminCloseResponse struct {
 	_ struct{} `fidl2:"s,8,0"`
 	S int32
 }
 
-var _mDirectoryAdminCloseResponse = _bindings.CreateLazyMarshaler(DirectoryAdminCloseResponse{})
+var _mdirectoryAdminCloseResponse = _bindings.CreateLazyMarshaler(directoryAdminCloseResponse{})
 
-func (msg *DirectoryAdminCloseResponse) Marshaler() _bindings.Marshaler {
-	return _mDirectoryAdminCloseResponse
+func (msg *directoryAdminCloseResponse) Marshaler() _bindings.Marshaler {
+	return _mdirectoryAdminCloseResponse
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminCloseResponse) InlineAlignment() int {
+func (_ *directoryAdminCloseResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminCloseResponse) InlineSize() int {
+func (_ *directoryAdminCloseResponse) InlineSize() int {
 	return 8
 }
 
-type DirectoryAdminDescribeResponse struct {
+type directoryAdminDescribeResponse struct {
 	_    struct{} `fidl2:"s,32,0"`
 	Info NodeInfo
 }
 
-var _mDirectoryAdminDescribeResponse = _bindings.CreateLazyMarshaler(DirectoryAdminDescribeResponse{})
+var _mdirectoryAdminDescribeResponse = _bindings.CreateLazyMarshaler(directoryAdminDescribeResponse{})
 
-func (msg *DirectoryAdminDescribeResponse) Marshaler() _bindings.Marshaler {
-	return _mDirectoryAdminDescribeResponse
+func (msg *directoryAdminDescribeResponse) Marshaler() _bindings.Marshaler {
+	return _mdirectoryAdminDescribeResponse
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminDescribeResponse) InlineAlignment() int {
+func (_ *directoryAdminDescribeResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminDescribeResponse) InlineSize() int {
+func (_ *directoryAdminDescribeResponse) InlineSize() int {
 	return 32
 }
 
-type DirectoryAdminOnOpenResponse struct {
+type directoryAdminOnOpenResponse struct {
 	_    struct{} `fidl2:"s,16,0"`
 	S    int32
 	Info *NodeInfo
 }
 
-var _mDirectoryAdminOnOpenResponse = _bindings.CreateLazyMarshaler(DirectoryAdminOnOpenResponse{})
+var _mdirectoryAdminOnOpenResponse = _bindings.CreateLazyMarshaler(directoryAdminOnOpenResponse{})
 
-func (msg *DirectoryAdminOnOpenResponse) Marshaler() _bindings.Marshaler {
-	return _mDirectoryAdminOnOpenResponse
+func (msg *directoryAdminOnOpenResponse) Marshaler() _bindings.Marshaler {
+	return _mdirectoryAdminOnOpenResponse
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminOnOpenResponse) InlineAlignment() int {
+func (_ *directoryAdminOnOpenResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminOnOpenResponse) InlineSize() int {
+func (_ *directoryAdminOnOpenResponse) InlineSize() int {
 	return 16
 }
 
-type DirectoryAdminSyncResponse struct {
+type directoryAdminSyncResponse struct {
 	_ struct{} `fidl2:"s,8,0"`
 	S int32
 }
 
-var _mDirectoryAdminSyncResponse = _bindings.CreateLazyMarshaler(DirectoryAdminSyncResponse{})
+var _mdirectoryAdminSyncResponse = _bindings.CreateLazyMarshaler(directoryAdminSyncResponse{})
 
-func (msg *DirectoryAdminSyncResponse) Marshaler() _bindings.Marshaler {
-	return _mDirectoryAdminSyncResponse
+func (msg *directoryAdminSyncResponse) Marshaler() _bindings.Marshaler {
+	return _mdirectoryAdminSyncResponse
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminSyncResponse) InlineAlignment() int {
+func (_ *directoryAdminSyncResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminSyncResponse) InlineSize() int {
+func (_ *directoryAdminSyncResponse) InlineSize() int {
 	return 8
 }
 
-type DirectoryAdminGetAttrResponse struct {
+type directoryAdminGetAttrResponse struct {
 	_          struct{} `fidl2:"s,64,0"`
 	S          int32
 	Attributes NodeAttributes
 }
 
-var _mDirectoryAdminGetAttrResponse = _bindings.CreateLazyMarshaler(DirectoryAdminGetAttrResponse{})
+var _mdirectoryAdminGetAttrResponse = _bindings.CreateLazyMarshaler(directoryAdminGetAttrResponse{})
 
-func (msg *DirectoryAdminGetAttrResponse) Marshaler() _bindings.Marshaler {
-	return _mDirectoryAdminGetAttrResponse
+func (msg *directoryAdminGetAttrResponse) Marshaler() _bindings.Marshaler {
+	return _mdirectoryAdminGetAttrResponse
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminGetAttrResponse) InlineAlignment() int {
+func (_ *directoryAdminGetAttrResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminGetAttrResponse) InlineSize() int {
+func (_ *directoryAdminGetAttrResponse) InlineSize() int {
 	return 64
 }
 
-type DirectoryAdminSetAttrRequest struct {
+type directoryAdminSetAttrRequest struct {
 	_          struct{} `fidl2:"s,64,0"`
 	Flags      uint32
 	Attributes NodeAttributes
 }
 
-var _mDirectoryAdminSetAttrRequest = _bindings.CreateLazyMarshaler(DirectoryAdminSetAttrRequest{})
+var _mdirectoryAdminSetAttrRequest = _bindings.CreateLazyMarshaler(directoryAdminSetAttrRequest{})
 
-func (msg *DirectoryAdminSetAttrRequest) Marshaler() _bindings.Marshaler {
-	return _mDirectoryAdminSetAttrRequest
+func (msg *directoryAdminSetAttrRequest) Marshaler() _bindings.Marshaler {
+	return _mdirectoryAdminSetAttrRequest
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminSetAttrRequest) InlineAlignment() int {
+func (_ *directoryAdminSetAttrRequest) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminSetAttrRequest) InlineSize() int {
+func (_ *directoryAdminSetAttrRequest) InlineSize() int {
 	return 64
 }
 
-type DirectoryAdminSetAttrResponse struct {
+type directoryAdminSetAttrResponse struct {
 	_ struct{} `fidl2:"s,8,0"`
 	S int32
 }
 
-var _mDirectoryAdminSetAttrResponse = _bindings.CreateLazyMarshaler(DirectoryAdminSetAttrResponse{})
+var _mdirectoryAdminSetAttrResponse = _bindings.CreateLazyMarshaler(directoryAdminSetAttrResponse{})
 
-func (msg *DirectoryAdminSetAttrResponse) Marshaler() _bindings.Marshaler {
-	return _mDirectoryAdminSetAttrResponse
+func (msg *directoryAdminSetAttrResponse) Marshaler() _bindings.Marshaler {
+	return _mdirectoryAdminSetAttrResponse
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminSetAttrResponse) InlineAlignment() int {
+func (_ *directoryAdminSetAttrResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminSetAttrResponse) InlineSize() int {
+func (_ *directoryAdminSetAttrResponse) InlineSize() int {
 	return 8
 }
 
-type DirectoryAdminIoctlRequest struct {
+type directoryAdminIoctlRequest struct {
 	_       struct{} `fidl2:"s,48,0"`
 	Opcode  uint32
 	MaxOut  uint64
@@ -3418,46 +3542,46 @@
 	In      []uint8      `fidl:"8192" fidl2:"8192"`
 }
 
-var _mDirectoryAdminIoctlRequest = _bindings.CreateLazyMarshaler(DirectoryAdminIoctlRequest{})
+var _mdirectoryAdminIoctlRequest = _bindings.CreateLazyMarshaler(directoryAdminIoctlRequest{})
 
-func (msg *DirectoryAdminIoctlRequest) Marshaler() _bindings.Marshaler {
-	return _mDirectoryAdminIoctlRequest
+func (msg *directoryAdminIoctlRequest) Marshaler() _bindings.Marshaler {
+	return _mdirectoryAdminIoctlRequest
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminIoctlRequest) InlineAlignment() int {
+func (_ *directoryAdminIoctlRequest) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminIoctlRequest) InlineSize() int {
+func (_ *directoryAdminIoctlRequest) InlineSize() int {
 	return 48
 }
 
-type DirectoryAdminIoctlResponse struct {
+type directoryAdminIoctlResponse struct {
 	_       struct{} `fidl2:"s,40,0"`
 	S       int32
 	Handles []_zx.Handle `fidl:"2" fidl2:"2,0"`
 	Out     []uint8      `fidl:"8192" fidl2:"8192"`
 }
 
-var _mDirectoryAdminIoctlResponse = _bindings.CreateLazyMarshaler(DirectoryAdminIoctlResponse{})
+var _mdirectoryAdminIoctlResponse = _bindings.CreateLazyMarshaler(directoryAdminIoctlResponse{})
 
-func (msg *DirectoryAdminIoctlResponse) Marshaler() _bindings.Marshaler {
-	return _mDirectoryAdminIoctlResponse
+func (msg *directoryAdminIoctlResponse) Marshaler() _bindings.Marshaler {
+	return _mdirectoryAdminIoctlResponse
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminIoctlResponse) InlineAlignment() int {
+func (_ *directoryAdminIoctlResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminIoctlResponse) InlineSize() int {
+func (_ *directoryAdminIoctlResponse) InlineSize() int {
 	return 40
 }
 
-type DirectoryAdminOpenRequest struct {
+type directoryAdminOpenRequest struct {
 	_      struct{} `fidl2:"s,32,0"`
 	Flags  uint32
 	Mode   uint32
@@ -3465,452 +3589,452 @@
 	Object NodeInterfaceRequest `fidl2:"0"`
 }
 
-var _mDirectoryAdminOpenRequest = _bindings.CreateLazyMarshaler(DirectoryAdminOpenRequest{})
+var _mdirectoryAdminOpenRequest = _bindings.CreateLazyMarshaler(directoryAdminOpenRequest{})
 
-func (msg *DirectoryAdminOpenRequest) Marshaler() _bindings.Marshaler {
-	return _mDirectoryAdminOpenRequest
+func (msg *directoryAdminOpenRequest) Marshaler() _bindings.Marshaler {
+	return _mdirectoryAdminOpenRequest
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminOpenRequest) InlineAlignment() int {
+func (_ *directoryAdminOpenRequest) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminOpenRequest) InlineSize() int {
+func (_ *directoryAdminOpenRequest) InlineSize() int {
 	return 32
 }
 
-type DirectoryAdminUnlinkRequest struct {
+type directoryAdminUnlinkRequest struct {
 	_    struct{} `fidl2:"s,16,0"`
 	Path string   `fidl:"4096" fidl2:"4096"`
 }
 
-var _mDirectoryAdminUnlinkRequest = _bindings.CreateLazyMarshaler(DirectoryAdminUnlinkRequest{})
+var _mdirectoryAdminUnlinkRequest = _bindings.CreateLazyMarshaler(directoryAdminUnlinkRequest{})
 
-func (msg *DirectoryAdminUnlinkRequest) Marshaler() _bindings.Marshaler {
-	return _mDirectoryAdminUnlinkRequest
+func (msg *directoryAdminUnlinkRequest) Marshaler() _bindings.Marshaler {
+	return _mdirectoryAdminUnlinkRequest
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminUnlinkRequest) InlineAlignment() int {
+func (_ *directoryAdminUnlinkRequest) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminUnlinkRequest) InlineSize() int {
+func (_ *directoryAdminUnlinkRequest) InlineSize() int {
 	return 16
 }
 
-type DirectoryAdminUnlinkResponse struct {
+type directoryAdminUnlinkResponse struct {
 	_ struct{} `fidl2:"s,8,0"`
 	S int32
 }
 
-var _mDirectoryAdminUnlinkResponse = _bindings.CreateLazyMarshaler(DirectoryAdminUnlinkResponse{})
+var _mdirectoryAdminUnlinkResponse = _bindings.CreateLazyMarshaler(directoryAdminUnlinkResponse{})
 
-func (msg *DirectoryAdminUnlinkResponse) Marshaler() _bindings.Marshaler {
-	return _mDirectoryAdminUnlinkResponse
+func (msg *directoryAdminUnlinkResponse) Marshaler() _bindings.Marshaler {
+	return _mdirectoryAdminUnlinkResponse
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminUnlinkResponse) InlineAlignment() int {
+func (_ *directoryAdminUnlinkResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminUnlinkResponse) InlineSize() int {
+func (_ *directoryAdminUnlinkResponse) InlineSize() int {
 	return 8
 }
 
-type DirectoryAdminReadDirentsRequest struct {
+type directoryAdminReadDirentsRequest struct {
 	_        struct{} `fidl2:"s,8,0"`
 	MaxBytes uint64
 }
 
-var _mDirectoryAdminReadDirentsRequest = _bindings.CreateLazyMarshaler(DirectoryAdminReadDirentsRequest{})
+var _mdirectoryAdminReadDirentsRequest = _bindings.CreateLazyMarshaler(directoryAdminReadDirentsRequest{})
 
-func (msg *DirectoryAdminReadDirentsRequest) Marshaler() _bindings.Marshaler {
-	return _mDirectoryAdminReadDirentsRequest
+func (msg *directoryAdminReadDirentsRequest) Marshaler() _bindings.Marshaler {
+	return _mdirectoryAdminReadDirentsRequest
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminReadDirentsRequest) InlineAlignment() int {
+func (_ *directoryAdminReadDirentsRequest) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminReadDirentsRequest) InlineSize() int {
+func (_ *directoryAdminReadDirentsRequest) InlineSize() int {
 	return 8
 }
 
-type DirectoryAdminReadDirentsResponse struct {
+type directoryAdminReadDirentsResponse struct {
 	_       struct{} `fidl2:"s,24,0"`
 	S       int32
 	Dirents []uint8 `fidl:"8192" fidl2:"8192"`
 }
 
-var _mDirectoryAdminReadDirentsResponse = _bindings.CreateLazyMarshaler(DirectoryAdminReadDirentsResponse{})
+var _mdirectoryAdminReadDirentsResponse = _bindings.CreateLazyMarshaler(directoryAdminReadDirentsResponse{})
 
-func (msg *DirectoryAdminReadDirentsResponse) Marshaler() _bindings.Marshaler {
-	return _mDirectoryAdminReadDirentsResponse
+func (msg *directoryAdminReadDirentsResponse) Marshaler() _bindings.Marshaler {
+	return _mdirectoryAdminReadDirentsResponse
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminReadDirentsResponse) InlineAlignment() int {
+func (_ *directoryAdminReadDirentsResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminReadDirentsResponse) InlineSize() int {
+func (_ *directoryAdminReadDirentsResponse) InlineSize() int {
 	return 24
 }
 
-type DirectoryAdminRewindResponse struct {
+type directoryAdminRewindResponse struct {
 	_ struct{} `fidl2:"s,8,0"`
 	S int32
 }
 
-var _mDirectoryAdminRewindResponse = _bindings.CreateLazyMarshaler(DirectoryAdminRewindResponse{})
+var _mdirectoryAdminRewindResponse = _bindings.CreateLazyMarshaler(directoryAdminRewindResponse{})
 
-func (msg *DirectoryAdminRewindResponse) Marshaler() _bindings.Marshaler {
-	return _mDirectoryAdminRewindResponse
+func (msg *directoryAdminRewindResponse) Marshaler() _bindings.Marshaler {
+	return _mdirectoryAdminRewindResponse
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminRewindResponse) InlineAlignment() int {
+func (_ *directoryAdminRewindResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminRewindResponse) InlineSize() int {
+func (_ *directoryAdminRewindResponse) InlineSize() int {
 	return 8
 }
 
-type DirectoryAdminGetTokenResponse struct {
+type directoryAdminGetTokenResponse struct {
 	_     struct{} `fidl2:"s,8,0"`
 	S     int32
 	Token _zx.Handle `fidl:"*" fidl2:"1"`
 }
 
-var _mDirectoryAdminGetTokenResponse = _bindings.CreateLazyMarshaler(DirectoryAdminGetTokenResponse{})
+var _mdirectoryAdminGetTokenResponse = _bindings.CreateLazyMarshaler(directoryAdminGetTokenResponse{})
 
-func (msg *DirectoryAdminGetTokenResponse) Marshaler() _bindings.Marshaler {
-	return _mDirectoryAdminGetTokenResponse
+func (msg *directoryAdminGetTokenResponse) Marshaler() _bindings.Marshaler {
+	return _mdirectoryAdminGetTokenResponse
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminGetTokenResponse) InlineAlignment() int {
+func (_ *directoryAdminGetTokenResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminGetTokenResponse) InlineSize() int {
+func (_ *directoryAdminGetTokenResponse) InlineSize() int {
 	return 8
 }
 
-type DirectoryAdminRenameRequest struct {
+type directoryAdminRenameRequest struct {
 	_              struct{}   `fidl2:"s,40,0"`
 	Src            string     `fidl:"4096" fidl2:"4096"`
 	DstParentToken _zx.Handle `fidl2:"0"`
 	Dst            string     `fidl:"4096" fidl2:"4096"`
 }
 
-var _mDirectoryAdminRenameRequest = _bindings.CreateLazyMarshaler(DirectoryAdminRenameRequest{})
+var _mdirectoryAdminRenameRequest = _bindings.CreateLazyMarshaler(directoryAdminRenameRequest{})
 
-func (msg *DirectoryAdminRenameRequest) Marshaler() _bindings.Marshaler {
-	return _mDirectoryAdminRenameRequest
+func (msg *directoryAdminRenameRequest) Marshaler() _bindings.Marshaler {
+	return _mdirectoryAdminRenameRequest
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminRenameRequest) InlineAlignment() int {
+func (_ *directoryAdminRenameRequest) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminRenameRequest) InlineSize() int {
+func (_ *directoryAdminRenameRequest) InlineSize() int {
 	return 40
 }
 
-type DirectoryAdminRenameResponse struct {
+type directoryAdminRenameResponse struct {
 	_ struct{} `fidl2:"s,8,0"`
 	S int32
 }
 
-var _mDirectoryAdminRenameResponse = _bindings.CreateLazyMarshaler(DirectoryAdminRenameResponse{})
+var _mdirectoryAdminRenameResponse = _bindings.CreateLazyMarshaler(directoryAdminRenameResponse{})
 
-func (msg *DirectoryAdminRenameResponse) Marshaler() _bindings.Marshaler {
-	return _mDirectoryAdminRenameResponse
+func (msg *directoryAdminRenameResponse) Marshaler() _bindings.Marshaler {
+	return _mdirectoryAdminRenameResponse
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminRenameResponse) InlineAlignment() int {
+func (_ *directoryAdminRenameResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminRenameResponse) InlineSize() int {
+func (_ *directoryAdminRenameResponse) InlineSize() int {
 	return 8
 }
 
-type DirectoryAdminLinkRequest struct {
+type directoryAdminLinkRequest struct {
 	_              struct{}   `fidl2:"s,40,0"`
 	Src            string     `fidl:"4096" fidl2:"4096"`
 	DstParentToken _zx.Handle `fidl2:"0"`
 	Dst            string     `fidl:"4096" fidl2:"4096"`
 }
 
-var _mDirectoryAdminLinkRequest = _bindings.CreateLazyMarshaler(DirectoryAdminLinkRequest{})
+var _mdirectoryAdminLinkRequest = _bindings.CreateLazyMarshaler(directoryAdminLinkRequest{})
 
-func (msg *DirectoryAdminLinkRequest) Marshaler() _bindings.Marshaler {
-	return _mDirectoryAdminLinkRequest
+func (msg *directoryAdminLinkRequest) Marshaler() _bindings.Marshaler {
+	return _mdirectoryAdminLinkRequest
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminLinkRequest) InlineAlignment() int {
+func (_ *directoryAdminLinkRequest) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminLinkRequest) InlineSize() int {
+func (_ *directoryAdminLinkRequest) InlineSize() int {
 	return 40
 }
 
-type DirectoryAdminLinkResponse struct {
+type directoryAdminLinkResponse struct {
 	_ struct{} `fidl2:"s,8,0"`
 	S int32
 }
 
-var _mDirectoryAdminLinkResponse = _bindings.CreateLazyMarshaler(DirectoryAdminLinkResponse{})
+var _mdirectoryAdminLinkResponse = _bindings.CreateLazyMarshaler(directoryAdminLinkResponse{})
 
-func (msg *DirectoryAdminLinkResponse) Marshaler() _bindings.Marshaler {
-	return _mDirectoryAdminLinkResponse
+func (msg *directoryAdminLinkResponse) Marshaler() _bindings.Marshaler {
+	return _mdirectoryAdminLinkResponse
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminLinkResponse) InlineAlignment() int {
+func (_ *directoryAdminLinkResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminLinkResponse) InlineSize() int {
+func (_ *directoryAdminLinkResponse) InlineSize() int {
 	return 8
 }
 
-type DirectoryAdminWatchRequest struct {
+type directoryAdminWatchRequest struct {
 	_       struct{} `fidl2:"s,16,0"`
 	Mask    uint32
 	Options uint32
 	Watcher _zx.Channel `fidl2:"0"`
 }
 
-var _mDirectoryAdminWatchRequest = _bindings.CreateLazyMarshaler(DirectoryAdminWatchRequest{})
+var _mdirectoryAdminWatchRequest = _bindings.CreateLazyMarshaler(directoryAdminWatchRequest{})
 
-func (msg *DirectoryAdminWatchRequest) Marshaler() _bindings.Marshaler {
-	return _mDirectoryAdminWatchRequest
+func (msg *directoryAdminWatchRequest) Marshaler() _bindings.Marshaler {
+	return _mdirectoryAdminWatchRequest
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminWatchRequest) InlineAlignment() int {
+func (_ *directoryAdminWatchRequest) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminWatchRequest) InlineSize() int {
+func (_ *directoryAdminWatchRequest) InlineSize() int {
 	return 16
 }
 
-type DirectoryAdminWatchResponse struct {
+type directoryAdminWatchResponse struct {
 	_ struct{} `fidl2:"s,8,0"`
 	S int32
 }
 
-var _mDirectoryAdminWatchResponse = _bindings.CreateLazyMarshaler(DirectoryAdminWatchResponse{})
+var _mdirectoryAdminWatchResponse = _bindings.CreateLazyMarshaler(directoryAdminWatchResponse{})
 
-func (msg *DirectoryAdminWatchResponse) Marshaler() _bindings.Marshaler {
-	return _mDirectoryAdminWatchResponse
+func (msg *directoryAdminWatchResponse) Marshaler() _bindings.Marshaler {
+	return _mdirectoryAdminWatchResponse
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminWatchResponse) InlineAlignment() int {
+func (_ *directoryAdminWatchResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminWatchResponse) InlineSize() int {
+func (_ *directoryAdminWatchResponse) InlineSize() int {
 	return 8
 }
 
-type DirectoryAdminMountRequest struct {
+type directoryAdminMountRequest struct {
 	_      struct{} `fidl2:"s,8,0"`
 	Remote DirectoryInterface
 }
 
-var _mDirectoryAdminMountRequest = _bindings.CreateLazyMarshaler(DirectoryAdminMountRequest{})
+var _mdirectoryAdminMountRequest = _bindings.CreateLazyMarshaler(directoryAdminMountRequest{})
 
-func (msg *DirectoryAdminMountRequest) Marshaler() _bindings.Marshaler {
-	return _mDirectoryAdminMountRequest
+func (msg *directoryAdminMountRequest) Marshaler() _bindings.Marshaler {
+	return _mdirectoryAdminMountRequest
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminMountRequest) InlineAlignment() int {
+func (_ *directoryAdminMountRequest) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminMountRequest) InlineSize() int {
+func (_ *directoryAdminMountRequest) InlineSize() int {
 	return 8
 }
 
-type DirectoryAdminMountResponse struct {
+type directoryAdminMountResponse struct {
 	_ struct{} `fidl2:"s,8,0"`
 	S int32
 }
 
-var _mDirectoryAdminMountResponse = _bindings.CreateLazyMarshaler(DirectoryAdminMountResponse{})
+var _mdirectoryAdminMountResponse = _bindings.CreateLazyMarshaler(directoryAdminMountResponse{})
 
-func (msg *DirectoryAdminMountResponse) Marshaler() _bindings.Marshaler {
-	return _mDirectoryAdminMountResponse
+func (msg *directoryAdminMountResponse) Marshaler() _bindings.Marshaler {
+	return _mdirectoryAdminMountResponse
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminMountResponse) InlineAlignment() int {
+func (_ *directoryAdminMountResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminMountResponse) InlineSize() int {
+func (_ *directoryAdminMountResponse) InlineSize() int {
 	return 8
 }
 
-type DirectoryAdminMountAndCreateRequest struct {
+type directoryAdminMountAndCreateRequest struct {
 	_      struct{} `fidl2:"s,32,0"`
 	Remote DirectoryInterface
 	Name   string `fidl:"255" fidl2:"255"`
 	Flags  uint32
 }
 
-var _mDirectoryAdminMountAndCreateRequest = _bindings.CreateLazyMarshaler(DirectoryAdminMountAndCreateRequest{})
+var _mdirectoryAdminMountAndCreateRequest = _bindings.CreateLazyMarshaler(directoryAdminMountAndCreateRequest{})
 
-func (msg *DirectoryAdminMountAndCreateRequest) Marshaler() _bindings.Marshaler {
-	return _mDirectoryAdminMountAndCreateRequest
+func (msg *directoryAdminMountAndCreateRequest) Marshaler() _bindings.Marshaler {
+	return _mdirectoryAdminMountAndCreateRequest
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminMountAndCreateRequest) InlineAlignment() int {
+func (_ *directoryAdminMountAndCreateRequest) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminMountAndCreateRequest) InlineSize() int {
+func (_ *directoryAdminMountAndCreateRequest) InlineSize() int {
 	return 32
 }
 
-type DirectoryAdminMountAndCreateResponse struct {
+type directoryAdminMountAndCreateResponse struct {
 	_ struct{} `fidl2:"s,8,0"`
 	S int32
 }
 
-var _mDirectoryAdminMountAndCreateResponse = _bindings.CreateLazyMarshaler(DirectoryAdminMountAndCreateResponse{})
+var _mdirectoryAdminMountAndCreateResponse = _bindings.CreateLazyMarshaler(directoryAdminMountAndCreateResponse{})
 
-func (msg *DirectoryAdminMountAndCreateResponse) Marshaler() _bindings.Marshaler {
-	return _mDirectoryAdminMountAndCreateResponse
+func (msg *directoryAdminMountAndCreateResponse) Marshaler() _bindings.Marshaler {
+	return _mdirectoryAdminMountAndCreateResponse
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminMountAndCreateResponse) InlineAlignment() int {
+func (_ *directoryAdminMountAndCreateResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminMountAndCreateResponse) InlineSize() int {
+func (_ *directoryAdminMountAndCreateResponse) InlineSize() int {
 	return 8
 }
 
-type DirectoryAdminUnmountResponse struct {
+type directoryAdminUnmountResponse struct {
 	_ struct{} `fidl2:"s,8,0"`
 	S int32
 }
 
-var _mDirectoryAdminUnmountResponse = _bindings.CreateLazyMarshaler(DirectoryAdminUnmountResponse{})
+var _mdirectoryAdminUnmountResponse = _bindings.CreateLazyMarshaler(directoryAdminUnmountResponse{})
 
-func (msg *DirectoryAdminUnmountResponse) Marshaler() _bindings.Marshaler {
-	return _mDirectoryAdminUnmountResponse
+func (msg *directoryAdminUnmountResponse) Marshaler() _bindings.Marshaler {
+	return _mdirectoryAdminUnmountResponse
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminUnmountResponse) InlineAlignment() int {
+func (_ *directoryAdminUnmountResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminUnmountResponse) InlineSize() int {
+func (_ *directoryAdminUnmountResponse) InlineSize() int {
 	return 8
 }
 
-type DirectoryAdminUnmountNodeResponse struct {
+type directoryAdminUnmountNodeResponse struct {
 	_      struct{} `fidl2:"s,8,0"`
 	S      int32
 	Remote DirectoryInterface `fidl:"*"`
 }
 
-var _mDirectoryAdminUnmountNodeResponse = _bindings.CreateLazyMarshaler(DirectoryAdminUnmountNodeResponse{})
+var _mdirectoryAdminUnmountNodeResponse = _bindings.CreateLazyMarshaler(directoryAdminUnmountNodeResponse{})
 
-func (msg *DirectoryAdminUnmountNodeResponse) Marshaler() _bindings.Marshaler {
-	return _mDirectoryAdminUnmountNodeResponse
+func (msg *directoryAdminUnmountNodeResponse) Marshaler() _bindings.Marshaler {
+	return _mdirectoryAdminUnmountNodeResponse
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminUnmountNodeResponse) InlineAlignment() int {
+func (_ *directoryAdminUnmountNodeResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminUnmountNodeResponse) InlineSize() int {
+func (_ *directoryAdminUnmountNodeResponse) InlineSize() int {
 	return 8
 }
 
-type DirectoryAdminQueryFilesystemResponse struct {
+type directoryAdminQueryFilesystemResponse struct {
 	_    struct{} `fidl2:"s,16,0"`
 	S    int32
 	Info *FilesystemInfo
 }
 
-var _mDirectoryAdminQueryFilesystemResponse = _bindings.CreateLazyMarshaler(DirectoryAdminQueryFilesystemResponse{})
+var _mdirectoryAdminQueryFilesystemResponse = _bindings.CreateLazyMarshaler(directoryAdminQueryFilesystemResponse{})
 
-func (msg *DirectoryAdminQueryFilesystemResponse) Marshaler() _bindings.Marshaler {
-	return _mDirectoryAdminQueryFilesystemResponse
+func (msg *directoryAdminQueryFilesystemResponse) Marshaler() _bindings.Marshaler {
+	return _mdirectoryAdminQueryFilesystemResponse
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminQueryFilesystemResponse) InlineAlignment() int {
+func (_ *directoryAdminQueryFilesystemResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminQueryFilesystemResponse) InlineSize() int {
+func (_ *directoryAdminQueryFilesystemResponse) InlineSize() int {
 	return 16
 }
 
-type DirectoryAdminGetDevicePathResponse struct {
+type directoryAdminGetDevicePathResponse struct {
 	_    struct{} `fidl2:"s,24,0"`
 	S    int32
 	Path *string `fidl:"4096" fidl2:"4096"`
 }
 
-var _mDirectoryAdminGetDevicePathResponse = _bindings.CreateLazyMarshaler(DirectoryAdminGetDevicePathResponse{})
+var _mdirectoryAdminGetDevicePathResponse = _bindings.CreateLazyMarshaler(directoryAdminGetDevicePathResponse{})
 
-func (msg *DirectoryAdminGetDevicePathResponse) Marshaler() _bindings.Marshaler {
-	return _mDirectoryAdminGetDevicePathResponse
+func (msg *directoryAdminGetDevicePathResponse) Marshaler() _bindings.Marshaler {
+	return _mdirectoryAdminGetDevicePathResponse
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminGetDevicePathResponse) InlineAlignment() int {
+func (_ *directoryAdminGetDevicePathResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *DirectoryAdminGetDevicePathResponse) InlineSize() int {
+func (_ *directoryAdminGetDevicePathResponse) InlineSize() int {
 	return 24
 }
 
@@ -3931,7 +4055,7 @@
 // TODO: Currently, ulib/fs ignores OPEN_RIGHT_*, and uses the rights of the original
 // connection. This is a bug.
 func (p *DirectoryAdminInterface) Clone(flags uint32, object NodeInterfaceRequest) error {
-	req_ := &DirectoryAdminCloneRequest{
+	req_ := &directoryAdminCloneRequest{
 		Flags:  flags,
 		Object: object,
 	}
@@ -3944,7 +4068,7 @@
 // This method does not require any rights.
 func (p *DirectoryAdminInterface) Close() (int32, error) {
 	var req_ _bindings.Payload
-	resp_ := &DirectoryAdminCloseResponse{}
+	resp_ := &directoryAdminCloseResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminCloseOrdinal, req_, resp_)
 	return resp_.S, err
 }
@@ -3955,18 +4079,18 @@
 // This method does not require any rights.
 func (p *DirectoryAdminInterface) Describe() (NodeInfo, error) {
 	var req_ _bindings.Payload
-	resp_ := &DirectoryAdminDescribeResponse{}
+	resp_ := &directoryAdminDescribeResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminDescribeOrdinal, req_, resp_)
 	return resp_.Info, err
 }
 
-// An event produced eagerly by a fidl server if requested by |OPEN_FLAG_DESCRIBE|.
+// An event produced eagerly by a FIDL server if requested by |OPEN_FLAG_DESCRIBE|.
 //
 // Indicates the success or failure of the open operation, and optionally describes the
 // object. If the status is |ZX_OK|, |info| contains descriptive information about the object
 // (the same as would be returned by |Describe|).
 func (p *DirectoryAdminInterface) ExpectOnOpen() (int32, *NodeInfo, error) {
-	resp_ := &DirectoryAdminOnOpenResponse{}
+	resp_ := &directoryAdminOnOpenResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Recv(DirectoryAdminOnOpenOrdinal, resp_)
 	return resp_.S, resp_.Info, err
 }
@@ -3974,7 +4098,7 @@
 // Synchronizes updates to the node to the underlying media, if it exists.
 func (p *DirectoryAdminInterface) Sync() (int32, error) {
 	var req_ _bindings.Payload
-	resp_ := &DirectoryAdminSyncResponse{}
+	resp_ := &directoryAdminSyncResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminSyncOrdinal, req_, resp_)
 	return resp_.S, err
 }
@@ -3984,7 +4108,7 @@
 // This method does not require any rights.
 func (p *DirectoryAdminInterface) GetAttr() (int32, NodeAttributes, error) {
 	var req_ _bindings.Payload
-	resp_ := &DirectoryAdminGetAttrResponse{}
+	resp_ := &directoryAdminGetAttrResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminGetAttrOrdinal, req_, resp_)
 	return resp_.S, resp_.Attributes, err
 }
@@ -3995,35 +4119,38 @@
 // This method requires following rights: OPEN_RIGHT_WRITABLE.
 // TODO(ZX-1262): This access restriction is not implemented in ulib/fs.
 func (p *DirectoryAdminInterface) SetAttr(flags uint32, attributes NodeAttributes) (int32, error) {
-	req_ := &DirectoryAdminSetAttrRequest{
+	req_ := &directoryAdminSetAttrRequest{
 		Flags:      flags,
 		Attributes: attributes,
 	}
-	resp_ := &DirectoryAdminSetAttrResponse{}
+	resp_ := &directoryAdminSetAttrResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminSetAttrOrdinal, req_, resp_)
 	return resp_.S, err
 }
 
 // Deprecated. Only for use with compatibility with devhost.
 func (p *DirectoryAdminInterface) Ioctl(opcode uint32, maxOut uint64, handles []_zx.Handle, in []uint8) (int32, []_zx.Handle, []uint8, error) {
-	req_ := &DirectoryAdminIoctlRequest{
+	req_ := &directoryAdminIoctlRequest{
 		Opcode:  opcode,
 		MaxOut:  maxOut,
 		Handles: handles,
 		In:      in,
 	}
-	resp_ := &DirectoryAdminIoctlResponse{}
+	resp_ := &directoryAdminIoctlResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminIoctlOrdinal, req_, resp_)
 	return resp_.S, resp_.Handles, resp_.Out, err
 }
 
-// Open a new object relative to this directory object.
+// Opens a new object relative to this directory object.
 //
 // Flags may be any of the OPEN_FLAG_* and OPEN_RIGHT_* values, bitwise ORed together.
 // The OPEN_FLAG_DESCRIBE flag may cause an |OnOpen| event to be transmitted
 // on the |object| handle, indicating the type of object opened.
+//
+// If an unknown value is sent for either flags or mode, the connection should
+// be closed.
 func (p *DirectoryAdminInterface) Open(flags uint32, mode uint32, path string, object NodeInterfaceRequest) error {
-	req_ := &DirectoryAdminOpenRequest{
+	req_ := &directoryAdminOpenRequest{
 		Flags:  flags,
 		Mode:   mode,
 		Path:   path,
@@ -4033,12 +4160,36 @@
 	return err
 }
 
-// Remove an object relative to this directory object.
+// Detaches an object from this directory object.
+//
+// The underlying object may or may not be deleted after this method
+// completes: although the link will be removed from the containing directory,
+// objects with multiple references (such as files which are still open)
+// will not actually be destroyed until all references are removed.
+//
+// If a directory is unlinked while it still has an open reference,
+// it must become read-only, preventing new entries from being created
+// until all references close and the directory is destroyed.
+//
+// |path| identifies the file which should be detached.
+// If |path| contains multiple segments, separated by "/" characters,
+// then the directory is traversed, one segment at a time, relative to the
+// originally accessed Directory.
+//
+// Returns:
+//   ZX_ERR_ACCESS_DENIED if the connection (or the underlying filesystem) does not
+//     allow writable access.
+//   ZX_ERR_INVALID_ARGS if |path| contains ".." segments.
+//   ZX_ERR_NOT_EMPTY if |path| refers to a non-empty directory.
+//   ZX_ERR_UNAVAILABLE if |path| refers to a mount point, containing a remote channel.
+//   ZX_ERR_UNAVAILABLE if |path| is ".".
+//
+// Other errors may be returned for filesystem-specific reasons.
 func (p *DirectoryAdminInterface) Unlink(path string) (int32, error) {
-	req_ := &DirectoryAdminUnlinkRequest{
+	req_ := &directoryAdminUnlinkRequest{
 		Path: path,
 	}
-	resp_ := &DirectoryAdminUnlinkResponse{}
+	resp_ := &directoryAdminUnlinkResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminUnlinkOrdinal, req_, resp_)
 	return resp_.S, err
 }
@@ -4060,54 +4211,54 @@
 //   // Unterminated name of entry.
 //   char name[0];
 // }
+//
 func (p *DirectoryAdminInterface) ReadDirents(maxBytes uint64) (int32, []uint8, error) {
-	req_ := &DirectoryAdminReadDirentsRequest{
+	req_ := &directoryAdminReadDirentsRequest{
 		MaxBytes: maxBytes,
 	}
-	resp_ := &DirectoryAdminReadDirentsResponse{}
+	resp_ := &directoryAdminReadDirentsResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminReadDirentsOrdinal, req_, resp_)
 	return resp_.S, resp_.Dirents, err
 }
 
-// Reset the directory seek offset.
+// Resets the directory seek offset.
 func (p *DirectoryAdminInterface) Rewind() (int32, error) {
 	var req_ _bindings.Payload
-	resp_ := &DirectoryAdminRewindResponse{}
+	resp_ := &directoryAdminRewindResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminRewindOrdinal, req_, resp_)
 	return resp_.S, err
 }
 
-// Acquire a token to a Directory which can be used to identify
+// Acquires a token to a Directory which can be used to identify
 // access to it at a later point in time.
 func (p *DirectoryAdminInterface) GetToken() (int32, _zx.Handle, error) {
 	var req_ _bindings.Payload
-	resp_ := &DirectoryAdminGetTokenResponse{}
+	resp_ := &directoryAdminGetTokenResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminGetTokenOrdinal, req_, resp_)
 	return resp_.S, resp_.Token, err
 }
 
-// Within the directory, rename an object named src to the name dst, in
-// a directory represented by token.
+// Renames an object named src to the name dst, in a directory represented by token.
 func (p *DirectoryAdminInterface) Rename(src string, dstParentToken _zx.Handle, dst string) (int32, error) {
-	req_ := &DirectoryAdminRenameRequest{
+	req_ := &directoryAdminRenameRequest{
 		Src:            src,
 		DstParentToken: dstParentToken,
 		Dst:            dst,
 	}
-	resp_ := &DirectoryAdminRenameResponse{}
+	resp_ := &directoryAdminRenameResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminRenameOrdinal, req_, resp_)
 	return resp_.S, err
 }
 
-// Within the directory, create a link to an object named src by the name
-// dst, within a directory represented by token.
+// Creates a link to an object named src by the name dst, within a directory represented by
+// token.
 func (p *DirectoryAdminInterface) Link(src string, dstParentToken _zx.Handle, dst string) (int32, error) {
-	req_ := &DirectoryAdminLinkRequest{
+	req_ := &directoryAdminLinkRequest{
 		Src:            src,
 		DstParentToken: dstParentToken,
 		Dst:            dst,
 	}
-	resp_ := &DirectoryAdminLinkResponse{}
+	resp_ := &directoryAdminLinkResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminLinkOrdinal, req_, resp_)
 	return resp_.S, err
 }
@@ -4123,17 +4274,17 @@
 // };
 // Where names are NOT null-terminated.
 //
-// This API is unstable; in the future, watcher will be a "DirectoryWatcher" client.
+// TODO: This API is unstable; in the future, watcher will be a "DirectoryWatcher" client.
 //
 // Mask specifies a bitmask of events to observe.
 // Options must be zero; it is reserved.
 func (p *DirectoryAdminInterface) Watch(mask uint32, options uint32, watcher _zx.Channel) (int32, error) {
-	req_ := &DirectoryAdminWatchRequest{
+	req_ := &directoryAdminWatchRequest{
 		Mask:    mask,
 		Options: options,
 		Watcher: watcher,
 	}
-	resp_ := &DirectoryAdminWatchResponse{}
+	resp_ := &directoryAdminWatchResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminWatchOrdinal, req_, resp_)
 	return resp_.S, err
 }
@@ -4143,10 +4294,10 @@
 // To re-open a node without forwarding to the remote target, the node
 // should be opened with OPEN_FLAG_NO_REMOTE.
 func (p *DirectoryAdminInterface) Mount(remote DirectoryInterface) (int32, error) {
-	req_ := &DirectoryAdminMountRequest{
+	req_ := &directoryAdminMountRequest{
 		Remote: remote,
 	}
-	resp_ := &DirectoryAdminMountResponse{}
+	resp_ := &directoryAdminMountResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminMountOrdinal, req_, resp_)
 	return resp_.S, err
 }
@@ -4154,12 +4305,12 @@
 // Atomically create a directory with a provided path, and mount the
 // remote handle to the newly created directory.
 func (p *DirectoryAdminInterface) MountAndCreate(remote DirectoryInterface, name string, flags uint32) (int32, error) {
-	req_ := &DirectoryAdminMountAndCreateRequest{
+	req_ := &directoryAdminMountAndCreateRequest{
 		Remote: remote,
 		Name:   name,
 		Flags:  flags,
 	}
-	resp_ := &DirectoryAdminMountAndCreateResponse{}
+	resp_ := &directoryAdminMountAndCreateResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminMountAndCreateOrdinal, req_, resp_)
 	return resp_.S, err
 }
@@ -4168,7 +4319,7 @@
 // all connections to the filesystem will be terminated.
 func (p *DirectoryAdminInterface) Unmount() (int32, error) {
 	var req_ _bindings.Payload
-	resp_ := &DirectoryAdminUnmountResponse{}
+	resp_ := &directoryAdminUnmountResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminUnmountOrdinal, req_, resp_)
 	return resp_.S, err
 }
@@ -4177,7 +4328,7 @@
 // with Mount.
 func (p *DirectoryAdminInterface) UnmountNode() (int32, DirectoryInterface, error) {
 	var req_ _bindings.Payload
-	resp_ := &DirectoryAdminUnmountNodeResponse{}
+	resp_ := &directoryAdminUnmountNodeResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminUnmountNodeOrdinal, req_, resp_)
 	return resp_.S, resp_.Remote, err
 }
@@ -4185,7 +4336,7 @@
 // Query the filesystem for filesystem-specific information.
 func (p *DirectoryAdminInterface) QueryFilesystem() (int32, *FilesystemInfo, error) {
 	var req_ _bindings.Payload
-	resp_ := &DirectoryAdminQueryFilesystemResponse{}
+	resp_ := &directoryAdminQueryFilesystemResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminQueryFilesystemOrdinal, req_, resp_)
 	return resp_.S, resp_.Info, err
 }
@@ -4193,7 +4344,7 @@
 // Acquire the path to the device backing this filesystem, if there is one.
 func (p *DirectoryAdminInterface) GetDevicePath() (int32, *string, error) {
 	var req_ _bindings.Payload
-	resp_ := &DirectoryAdminGetDevicePathResponse{}
+	resp_ := &directoryAdminGetDevicePathResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminGetDevicePathOrdinal, req_, resp_)
 	return resp_.S, resp_.Path, err
 }
@@ -4225,7 +4376,7 @@
 	//
 	// This method does not require any rights.
 	Describe() (NodeInfo, error)
-	// An event produced eagerly by a fidl server if requested by |OPEN_FLAG_DESCRIBE|.
+	// An event produced eagerly by a FIDL server if requested by |OPEN_FLAG_DESCRIBE|.
 	//
 	// Indicates the success or failure of the open operation, and optionally describes the
 	// object. If the status is |ZX_OK|, |info| contains descriptive information about the object
@@ -4244,13 +4395,40 @@
 	SetAttr(flags uint32, attributes NodeAttributes) (int32, error)
 	// Deprecated. Only for use with compatibility with devhost.
 	Ioctl(opcode uint32, maxOut uint64, handles []_zx.Handle, in []uint8) (int32, []_zx.Handle, []uint8, error)
-	// Open a new object relative to this directory object.
+	// Opens a new object relative to this directory object.
 	//
 	// Flags may be any of the OPEN_FLAG_* and OPEN_RIGHT_* values, bitwise ORed together.
 	// The OPEN_FLAG_DESCRIBE flag may cause an |OnOpen| event to be transmitted
 	// on the |object| handle, indicating the type of object opened.
+	//
+	// If an unknown value is sent for either flags or mode, the connection should
+	// be closed.
 	Open(flags uint32, mode uint32, path string, object NodeInterfaceRequest) error
-	// Remove an object relative to this directory object.
+	// Detaches an object from this directory object.
+	//
+	// The underlying object may or may not be deleted after this method
+	// completes: although the link will be removed from the containing directory,
+	// objects with multiple references (such as files which are still open)
+	// will not actually be destroyed until all references are removed.
+	//
+	// If a directory is unlinked while it still has an open reference,
+	// it must become read-only, preventing new entries from being created
+	// until all references close and the directory is destroyed.
+	//
+	// |path| identifies the file which should be detached.
+	// If |path| contains multiple segments, separated by "/" characters,
+	// then the directory is traversed, one segment at a time, relative to the
+	// originally accessed Directory.
+	//
+	// Returns:
+	//   ZX_ERR_ACCESS_DENIED if the connection (or the underlying filesystem) does not
+	//     allow writable access.
+	//   ZX_ERR_INVALID_ARGS if |path| contains ".." segments.
+	//   ZX_ERR_NOT_EMPTY if |path| refers to a non-empty directory.
+	//   ZX_ERR_UNAVAILABLE if |path| refers to a mount point, containing a remote channel.
+	//   ZX_ERR_UNAVAILABLE if |path| is ".".
+	//
+	// Other errors may be returned for filesystem-specific reasons.
 	Unlink(path string) (int32, error)
 	// Reads a collection of variably sized dirents into a buffer.
 	// The number of dirents in a directory may be very large: akin to
@@ -4269,17 +4447,17 @@
 	//   // Unterminated name of entry.
 	//   char name[0];
 	// }
+	//
 	ReadDirents(maxBytes uint64) (int32, []uint8, error)
-	// Reset the directory seek offset.
+	// Resets the directory seek offset.
 	Rewind() (int32, error)
-	// Acquire a token to a Directory which can be used to identify
+	// Acquires a token to a Directory which can be used to identify
 	// access to it at a later point in time.
 	GetToken() (int32, _zx.Handle, error)
-	// Within the directory, rename an object named src to the name dst, in
-	// a directory represented by token.
+	// Renames an object named src to the name dst, in a directory represented by token.
 	Rename(src string, dstParentToken _zx.Handle, dst string) (int32, error)
-	// Within the directory, create a link to an object named src by the name
-	// dst, within a directory represented by token.
+	// Creates a link to an object named src by the name dst, within a directory represented by
+	// token.
 	Link(src string, dstParentToken _zx.Handle, dst string) (int32, error)
 	// Watches a directory, receiving events of added messages on the
 	// watcher request channel.
@@ -4292,7 +4470,7 @@
 	// };
 	// Where names are NOT null-terminated.
 	//
-	// This API is unstable; in the future, watcher will be a "DirectoryWatcher" client.
+	// TODO: This API is unstable; in the future, watcher will be a "DirectoryWatcher" client.
 	//
 	// Mask specifies a bitmask of events to observe.
 	// Options must be zero; it is reserved.
@@ -4337,7 +4515,7 @@
 func (s *DirectoryAdminStub) DispatchNew(ord uint32, b_ []byte, h_ []_zx.Handle) (_bindings.Message, error) {
 	switch ord {
 	case DirectoryAdminCloneOrdinal:
-		in_ := DirectoryAdminCloneRequest{}
+		in_ := directoryAdminCloneRequest{}
 		if err_ := _bindings.Unmarshal(b_, h_, &in_); err_ != nil {
 			return nil, err_
 		}
@@ -4345,147 +4523,147 @@
 		return nil, err_
 	case DirectoryAdminCloseOrdinal:
 		s, err_ := s.Impl.Close()
-		out_ := DirectoryAdminCloseResponse{}
+		out_ := directoryAdminCloseResponse{}
 		out_.S = s
 		return &out_, err_
 	case DirectoryAdminDescribeOrdinal:
 		info, err_ := s.Impl.Describe()
-		out_ := DirectoryAdminDescribeResponse{}
+		out_ := directoryAdminDescribeResponse{}
 		out_.Info = info
 		return &out_, err_
 	case DirectoryAdminSyncOrdinal:
 		s, err_ := s.Impl.Sync()
-		out_ := DirectoryAdminSyncResponse{}
+		out_ := directoryAdminSyncResponse{}
 		out_.S = s
 		return &out_, err_
 	case DirectoryAdminGetAttrOrdinal:
 		s, attributes, err_ := s.Impl.GetAttr()
-		out_ := DirectoryAdminGetAttrResponse{}
+		out_ := directoryAdminGetAttrResponse{}
 		out_.S = s
 		out_.Attributes = attributes
 		return &out_, err_
 	case DirectoryAdminSetAttrOrdinal:
-		in_ := DirectoryAdminSetAttrRequest{}
+		in_ := directoryAdminSetAttrRequest{}
 		if err_ := _bindings.Unmarshal(b_, h_, &in_); err_ != nil {
 			return nil, err_
 		}
 		s, err_ := s.Impl.SetAttr(in_.Flags, in_.Attributes)
-		out_ := DirectoryAdminSetAttrResponse{}
+		out_ := directoryAdminSetAttrResponse{}
 		out_.S = s
 		return &out_, err_
 	case DirectoryAdminIoctlOrdinal:
-		in_ := DirectoryAdminIoctlRequest{}
+		in_ := directoryAdminIoctlRequest{}
 		if err_ := _bindings.Unmarshal(b_, h_, &in_); err_ != nil {
 			return nil, err_
 		}
 		s, handles, out, err_ := s.Impl.Ioctl(in_.Opcode, in_.MaxOut, in_.Handles, in_.In)
-		out_ := DirectoryAdminIoctlResponse{}
+		out_ := directoryAdminIoctlResponse{}
 		out_.S = s
 		out_.Handles = handles
 		out_.Out = out
 		return &out_, err_
 	case DirectoryAdminOpenOrdinal:
-		in_ := DirectoryAdminOpenRequest{}
+		in_ := directoryAdminOpenRequest{}
 		if err_ := _bindings.Unmarshal(b_, h_, &in_); err_ != nil {
 			return nil, err_
 		}
 		err_ := s.Impl.Open(in_.Flags, in_.Mode, in_.Path, in_.Object)
 		return nil, err_
 	case DirectoryAdminUnlinkOrdinal:
-		in_ := DirectoryAdminUnlinkRequest{}
+		in_ := directoryAdminUnlinkRequest{}
 		if err_ := _bindings.Unmarshal(b_, h_, &in_); err_ != nil {
 			return nil, err_
 		}
 		s, err_ := s.Impl.Unlink(in_.Path)
-		out_ := DirectoryAdminUnlinkResponse{}
+		out_ := directoryAdminUnlinkResponse{}
 		out_.S = s
 		return &out_, err_
 	case DirectoryAdminReadDirentsOrdinal:
-		in_ := DirectoryAdminReadDirentsRequest{}
+		in_ := directoryAdminReadDirentsRequest{}
 		if err_ := _bindings.Unmarshal(b_, h_, &in_); err_ != nil {
 			return nil, err_
 		}
 		s, dirents, err_ := s.Impl.ReadDirents(in_.MaxBytes)
-		out_ := DirectoryAdminReadDirentsResponse{}
+		out_ := directoryAdminReadDirentsResponse{}
 		out_.S = s
 		out_.Dirents = dirents
 		return &out_, err_
 	case DirectoryAdminRewindOrdinal:
 		s, err_ := s.Impl.Rewind()
-		out_ := DirectoryAdminRewindResponse{}
+		out_ := directoryAdminRewindResponse{}
 		out_.S = s
 		return &out_, err_
 	case DirectoryAdminGetTokenOrdinal:
 		s, token, err_ := s.Impl.GetToken()
-		out_ := DirectoryAdminGetTokenResponse{}
+		out_ := directoryAdminGetTokenResponse{}
 		out_.S = s
 		out_.Token = token
 		return &out_, err_
 	case DirectoryAdminRenameOrdinal:
-		in_ := DirectoryAdminRenameRequest{}
+		in_ := directoryAdminRenameRequest{}
 		if err_ := _bindings.Unmarshal(b_, h_, &in_); err_ != nil {
 			return nil, err_
 		}
 		s, err_ := s.Impl.Rename(in_.Src, in_.DstParentToken, in_.Dst)
-		out_ := DirectoryAdminRenameResponse{}
+		out_ := directoryAdminRenameResponse{}
 		out_.S = s
 		return &out_, err_
 	case DirectoryAdminLinkOrdinal:
-		in_ := DirectoryAdminLinkRequest{}
+		in_ := directoryAdminLinkRequest{}
 		if err_ := _bindings.Unmarshal(b_, h_, &in_); err_ != nil {
 			return nil, err_
 		}
 		s, err_ := s.Impl.Link(in_.Src, in_.DstParentToken, in_.Dst)
-		out_ := DirectoryAdminLinkResponse{}
+		out_ := directoryAdminLinkResponse{}
 		out_.S = s
 		return &out_, err_
 	case DirectoryAdminWatchOrdinal:
-		in_ := DirectoryAdminWatchRequest{}
+		in_ := directoryAdminWatchRequest{}
 		if err_ := _bindings.Unmarshal(b_, h_, &in_); err_ != nil {
 			return nil, err_
 		}
 		s, err_ := s.Impl.Watch(in_.Mask, in_.Options, in_.Watcher)
-		out_ := DirectoryAdminWatchResponse{}
+		out_ := directoryAdminWatchResponse{}
 		out_.S = s
 		return &out_, err_
 	case DirectoryAdminMountOrdinal:
-		in_ := DirectoryAdminMountRequest{}
+		in_ := directoryAdminMountRequest{}
 		if err_ := _bindings.Unmarshal(b_, h_, &in_); err_ != nil {
 			return nil, err_
 		}
 		s, err_ := s.Impl.Mount(in_.Remote)
-		out_ := DirectoryAdminMountResponse{}
+		out_ := directoryAdminMountResponse{}
 		out_.S = s
 		return &out_, err_
 	case DirectoryAdminMountAndCreateOrdinal:
-		in_ := DirectoryAdminMountAndCreateRequest{}
+		in_ := directoryAdminMountAndCreateRequest{}
 		if err_ := _bindings.Unmarshal(b_, h_, &in_); err_ != nil {
 			return nil, err_
 		}
 		s, err_ := s.Impl.MountAndCreate(in_.Remote, in_.Name, in_.Flags)
-		out_ := DirectoryAdminMountAndCreateResponse{}
+		out_ := directoryAdminMountAndCreateResponse{}
 		out_.S = s
 		return &out_, err_
 	case DirectoryAdminUnmountOrdinal:
 		s, err_ := s.Impl.Unmount()
-		out_ := DirectoryAdminUnmountResponse{}
+		out_ := directoryAdminUnmountResponse{}
 		out_.S = s
 		return &out_, err_
 	case DirectoryAdminUnmountNodeOrdinal:
 		s, remote, err_ := s.Impl.UnmountNode()
-		out_ := DirectoryAdminUnmountNodeResponse{}
+		out_ := directoryAdminUnmountNodeResponse{}
 		out_.S = s
 		out_.Remote = remote
 		return &out_, err_
 	case DirectoryAdminQueryFilesystemOrdinal:
 		s, info, err_ := s.Impl.QueryFilesystem()
-		out_ := DirectoryAdminQueryFilesystemResponse{}
+		out_ := directoryAdminQueryFilesystemResponse{}
 		out_.S = s
 		out_.Info = info
 		return &out_, err_
 	case DirectoryAdminGetDevicePathOrdinal:
 		s, path, err_ := s.Impl.GetDevicePath()
-		out_ := DirectoryAdminGetDevicePathResponse{}
+		out_ := directoryAdminGetDevicePathResponse{}
 		out_.S = s
 		out_.Path = path
 		return &out_, err_
@@ -4509,7 +4687,7 @@
 type DirectoryAdminEventProxy _bindings.ChannelProxy
 
 func (p *DirectoryAdminEventProxy) OnOpen(s int32, info *NodeInfo) error {
-	event_ := &DirectoryAdminOnOpenResponse{
+	event_ := &directoryAdminOnOpenResponse{
 		S:    s,
 		Info: info,
 	}
diff --git a/src/syscall/zx/net/impl.go b/src/syscall/zx/net/impl.go
index 4c1193b..6414f19 100644
--- a/src/syscall/zx/net/impl.go
+++ b/src/syscall/zx/net/impl.go
@@ -255,31 +255,31 @@
 	ConnectivityOnNetworkReachableGenOrdinal uint32 = 1703348424
 )
 
-type ConnectivityOnNetworkReachableResponse struct {
+type connectivityOnNetworkReachableResponse struct {
 	_         struct{} `fidl2:"s,8,0"`
 	Reachable bool
 }
 
-var _mConnectivityOnNetworkReachableResponse = _bindings.CreateLazyMarshaler(ConnectivityOnNetworkReachableResponse{})
+var _mconnectivityOnNetworkReachableResponse = _bindings.CreateLazyMarshaler(connectivityOnNetworkReachableResponse{})
 
-func (msg *ConnectivityOnNetworkReachableResponse) Marshaler() _bindings.Marshaler {
-	return _mConnectivityOnNetworkReachableResponse
+func (msg *connectivityOnNetworkReachableResponse) Marshaler() _bindings.Marshaler {
+	return _mconnectivityOnNetworkReachableResponse
 }
 
 // Implements Payload.
-func (_ *ConnectivityOnNetworkReachableResponse) InlineAlignment() int {
+func (_ *connectivityOnNetworkReachableResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *ConnectivityOnNetworkReachableResponse) InlineSize() int {
+func (_ *connectivityOnNetworkReachableResponse) InlineSize() int {
 	return 8
 }
 
 type ConnectivityInterface _bindings.ChannelProxy
 
 func (p *ConnectivityInterface) ExpectOnNetworkReachable() (bool, error) {
-	resp_ := &ConnectivityOnNetworkReachableResponse{}
+	resp_ := &connectivityOnNetworkReachableResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Recv(ConnectivityOnNetworkReachableOrdinal, resp_)
 	return resp_.Reachable, err
 }
@@ -336,7 +336,7 @@
 type ConnectivityEventProxy _bindings.ChannelProxy
 
 func (p *ConnectivityEventProxy) OnNetworkReachable(reachable bool) error {
-	event_ := &ConnectivityOnNetworkReachableResponse{
+	event_ := &connectivityOnNetworkReachableResponse{
 		Reachable: reachable,
 	}
 	return ((*_bindings.ChannelProxy)(p)).Send(ConnectivityOnNetworkReachableOrdinal, event_)
@@ -349,117 +349,117 @@
 	SocketProviderGetAddrInfoGenOrdinal uint32 = 498796293
 )
 
-type SocketProviderSocketRequest struct {
+type socketProviderSocketRequest struct {
 	_        struct{} `fidl2:"s,8,0"`
 	Domain   int16
 	Type     int16
 	Protocol int16
 }
 
-var _mSocketProviderSocketRequest = _bindings.CreateLazyMarshaler(SocketProviderSocketRequest{})
+var _msocketProviderSocketRequest = _bindings.CreateLazyMarshaler(socketProviderSocketRequest{})
 
-func (msg *SocketProviderSocketRequest) Marshaler() _bindings.Marshaler {
-	return _mSocketProviderSocketRequest
+func (msg *socketProviderSocketRequest) Marshaler() _bindings.Marshaler {
+	return _msocketProviderSocketRequest
 }
 
 // Implements Payload.
-func (_ *SocketProviderSocketRequest) InlineAlignment() int {
+func (_ *socketProviderSocketRequest) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *SocketProviderSocketRequest) InlineSize() int {
+func (_ *socketProviderSocketRequest) InlineSize() int {
 	return 8
 }
 
-type SocketProviderSocketResponse struct {
+type socketProviderSocketResponse struct {
 	_    struct{} `fidl2:"s,8,0"`
 	Code int16
 	S    _zx.Socket `fidl:"*" fidl2:"1"`
 }
 
-var _mSocketProviderSocketResponse = _bindings.CreateLazyMarshaler(SocketProviderSocketResponse{})
+var _msocketProviderSocketResponse = _bindings.CreateLazyMarshaler(socketProviderSocketResponse{})
 
-func (msg *SocketProviderSocketResponse) Marshaler() _bindings.Marshaler {
-	return _mSocketProviderSocketResponse
+func (msg *socketProviderSocketResponse) Marshaler() _bindings.Marshaler {
+	return _msocketProviderSocketResponse
 }
 
 // Implements Payload.
-func (_ *SocketProviderSocketResponse) InlineAlignment() int {
+func (_ *socketProviderSocketResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *SocketProviderSocketResponse) InlineSize() int {
+func (_ *socketProviderSocketResponse) InlineSize() int {
 	return 8
 }
 
-type SocketProviderGetAddrInfoRequest struct {
+type socketProviderGetAddrInfoRequest struct {
 	_       struct{} `fidl2:"s,40,0"`
 	Node    *string  `fidl:"256" fidl2:"256"`
 	Service *string  `fidl:"256" fidl2:"256"`
 	Hints   *AddrInfoHints
 }
 
-var _mSocketProviderGetAddrInfoRequest = _bindings.CreateLazyMarshaler(SocketProviderGetAddrInfoRequest{})
+var _msocketProviderGetAddrInfoRequest = _bindings.CreateLazyMarshaler(socketProviderGetAddrInfoRequest{})
 
-func (msg *SocketProviderGetAddrInfoRequest) Marshaler() _bindings.Marshaler {
-	return _mSocketProviderGetAddrInfoRequest
+func (msg *socketProviderGetAddrInfoRequest) Marshaler() _bindings.Marshaler {
+	return _msocketProviderGetAddrInfoRequest
 }
 
 // Implements Payload.
-func (_ *SocketProviderGetAddrInfoRequest) InlineAlignment() int {
+func (_ *socketProviderGetAddrInfoRequest) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *SocketProviderGetAddrInfoRequest) InlineSize() int {
+func (_ *socketProviderGetAddrInfoRequest) InlineSize() int {
 	return 40
 }
 
-type SocketProviderGetAddrInfoResponse struct {
+type socketProviderGetAddrInfoResponse struct {
 	_      struct{} `fidl2:"s,168,0"`
 	Status AddrInfoStatus
 	Nres   uint32
 	Res    [4]AddrInfo
 }
 
-var _mSocketProviderGetAddrInfoResponse = _bindings.CreateLazyMarshaler(SocketProviderGetAddrInfoResponse{})
+var _msocketProviderGetAddrInfoResponse = _bindings.CreateLazyMarshaler(socketProviderGetAddrInfoResponse{})
 
-func (msg *SocketProviderGetAddrInfoResponse) Marshaler() _bindings.Marshaler {
-	return _mSocketProviderGetAddrInfoResponse
+func (msg *socketProviderGetAddrInfoResponse) Marshaler() _bindings.Marshaler {
+	return _msocketProviderGetAddrInfoResponse
 }
 
 // Implements Payload.
-func (_ *SocketProviderGetAddrInfoResponse) InlineAlignment() int {
+func (_ *socketProviderGetAddrInfoResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *SocketProviderGetAddrInfoResponse) InlineSize() int {
+func (_ *socketProviderGetAddrInfoResponse) InlineSize() int {
 	return 168
 }
 
 type SocketProviderInterface _bindings.ChannelProxy
 
 func (p *SocketProviderInterface) Socket(domain int16, type_ int16, protocol int16) (int16, _zx.Socket, error) {
-	req_ := &SocketProviderSocketRequest{
+	req_ := &socketProviderSocketRequest{
 		Domain:   domain,
 		Type:     type_,
 		Protocol: protocol,
 	}
-	resp_ := &SocketProviderSocketResponse{}
+	resp_ := &socketProviderSocketResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(SocketProviderSocketOrdinal, req_, resp_)
 	return resp_.Code, resp_.S, err
 }
 
 func (p *SocketProviderInterface) GetAddrInfo(node *string, service *string, hints *AddrInfoHints) (AddrInfoStatus, uint32, [4]AddrInfo, error) {
-	req_ := &SocketProviderGetAddrInfoRequest{
+	req_ := &socketProviderGetAddrInfoRequest{
 		Node:    node,
 		Service: service,
 		Hints:   hints,
 	}
-	resp_ := &SocketProviderGetAddrInfoResponse{}
+	resp_ := &socketProviderGetAddrInfoResponse{}
 	err := ((*_bindings.ChannelProxy)(p)).Call(SocketProviderGetAddrInfoOrdinal, req_, resp_)
 	return resp_.Status, resp_.Nres, resp_.Res, err
 }
@@ -500,22 +500,22 @@
 func (s *SocketProviderStub) DispatchNew(ord uint32, b_ []byte, h_ []_zx.Handle) (_bindings.Message, error) {
 	switch ord {
 	case SocketProviderSocketOrdinal:
-		in_ := SocketProviderSocketRequest{}
+		in_ := socketProviderSocketRequest{}
 		if err_ := _bindings.Unmarshal(b_, h_, &in_); err_ != nil {
 			return nil, err_
 		}
 		code, s, err_ := s.Impl.Socket(in_.Domain, in_.Type, in_.Protocol)
-		out_ := SocketProviderSocketResponse{}
+		out_ := socketProviderSocketResponse{}
 		out_.Code = code
 		out_.S = s
 		return &out_, err_
 	case SocketProviderGetAddrInfoOrdinal:
-		in_ := SocketProviderGetAddrInfoRequest{}
+		in_ := socketProviderGetAddrInfoRequest{}
 		if err_ := _bindings.Unmarshal(b_, h_, &in_); err_ != nil {
 			return nil, err_
 		}
 		status, nres, res, err_ := s.Impl.GetAddrInfo(in_.Node, in_.Service, in_.Hints)
-		out_ := SocketProviderGetAddrInfoResponse{}
+		out_ := socketProviderGetAddrInfoResponse{}
 		out_.Status = status
 		out_.Nres = nres
 		out_.Res = res
@@ -562,368 +562,368 @@
 	SocketControlGetSockOptGenOrdinal  uint32 = 2132650507
 )
 
-type SocketControlCloseResponse struct {
+type socketControlCloseResponse struct {
 	_    struct{} `fidl2:"s,8,0"`
 	Code int16
 }
 
-var _mSocketControlCloseResponse = _bindings.CreateLazyMarshaler(SocketControlCloseResponse{})
+var _msocketControlCloseResponse = _bindings.CreateLazyMarshaler(socketControlCloseResponse{})
 
-func (msg *SocketControlCloseResponse) Marshaler() _bindings.Marshaler {
-	return _mSocketControlCloseResponse
+func (msg *socketControlCloseResponse) Marshaler() _bindings.Marshaler {
+	return _msocketControlCloseResponse
 }
 
 // Implements Payload.
-func (_ *SocketControlCloseResponse) InlineAlignment() int {
+func (_ *socketControlCloseResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *SocketControlCloseResponse) InlineSize() int {
+func (_ *socketControlCloseResponse) InlineSize() int {
 	return 8
 }
 
-type SocketControlIoctlRequest struct {
+type socketControlIoctlRequest struct {
 	_   struct{} `fidl2:"s,24,0"`
 	Req int16
 	In  []uint8 `fidl:"900" fidl2:"900"`
 }
 
-var _mSocketControlIoctlRequest = _bindings.CreateLazyMarshaler(SocketControlIoctlRequest{})
+var _msocketControlIoctlRequest = _bindings.CreateLazyMarshaler(socketControlIoctlRequest{})
 
-func (msg *SocketControlIoctlRequest) Marshaler() _bindings.Marshaler {
-	return _mSocketControlIoctlRequest
+func (msg *socketControlIoctlRequest) Marshaler() _bindings.Marshaler {
+	return _msocketControlIoctlRequest
 }
 
 // Implements Payload.
-func (_ *SocketControlIoctlRequest) InlineAlignment() int {
+func (_ *socketControlIoctlRequest) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *SocketControlIoctlRequest) InlineSize() int {
+func (_ *socketControlIoctlRequest) InlineSize() int {
 	return 24
 }
 
-type SocketControlIoctlResponse struct {
+type socketControlIoctlResponse struct {
 	_    struct{} `fidl2:"s,24,0"`
 	Code int16
 	Out  []uint8 `fidl:"900" fidl2:"900"`
 }
 
-var _mSocketControlIoctlResponse = _bindings.CreateLazyMarshaler(SocketControlIoctlResponse{})
+var _msocketControlIoctlResponse = _bindings.CreateLazyMarshaler(socketControlIoctlResponse{})
 
-func (msg *SocketControlIoctlResponse) Marshaler() _bindings.Marshaler {
-	return _mSocketControlIoctlResponse
+func (msg *socketControlIoctlResponse) Marshaler() _bindings.Marshaler {
+	return _msocketControlIoctlResponse
 }
 
 // Implements Payload.
-func (_ *SocketControlIoctlResponse) InlineAlignment() int {
+func (_ *socketControlIoctlResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *SocketControlIoctlResponse) InlineSize() int {
+func (_ *socketControlIoctlResponse) InlineSize() int {
 	return 24
 }
 
-type SocketControlConnectRequest struct {
+type socketControlConnectRequest struct {
 	_    struct{} `fidl2:"s,16,0"`
 	Addr []uint8  `fidl:"128" fidl2:"128"`
 }
 
-var _mSocketControlConnectRequest = _bindings.CreateLazyMarshaler(SocketControlConnectRequest{})
+var _msocketControlConnectRequest = _bindings.CreateLazyMarshaler(socketControlConnectRequest{})
 
-func (msg *SocketControlConnectRequest) Marshaler() _bindings.Marshaler {
-	return _mSocketControlConnectRequest
+func (msg *socketControlConnectRequest) Marshaler() _bindings.Marshaler {
+	return _msocketControlConnectRequest
 }
 
 // Implements Payload.
-func (_ *SocketControlConnectRequest) InlineAlignment() int {
+func (_ *socketControlConnectRequest) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *SocketControlConnectRequest) InlineSize() int {
+func (_ *socketControlConnectRequest) InlineSize() int {
 	return 16
 }
 
-type SocketControlConnectResponse struct {
+type socketControlConnectResponse struct {
 	_    struct{} `fidl2:"s,8,0"`
 	Code int16
 }
 
-var _mSocketControlConnectResponse = _bindings.CreateLazyMarshaler(SocketControlConnectResponse{})
+var _msocketControlConnectResponse = _bindings.CreateLazyMarshaler(socketControlConnectResponse{})
 
-func (msg *SocketControlConnectResponse) Marshaler() _bindings.Marshaler {
-	return _mSocketControlConnectResponse
+func (msg *socketControlConnectResponse) Marshaler() _bindings.Marshaler {
+	return _msocketControlConnectResponse
 }
 
 // Implements Payload.
-func (_ *SocketControlConnectResponse) InlineAlignment() int {
+func (_ *socketControlConnectResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *SocketControlConnectResponse) InlineSize() int {
+func (_ *socketControlConnectResponse) InlineSize() int {
 	return 8
 }
 
-type SocketControlAcceptRequest struct {
+type socketControlAcceptRequest struct {
 	_     struct{} `fidl2:"s,8,0"`
 	Flags int16
 }
 
-var _mSocketControlAcceptRequest = _bindings.CreateLazyMarshaler(SocketControlAcceptRequest{})
+var _msocketControlAcceptRequest = _bindings.CreateLazyMarshaler(socketControlAcceptRequest{})
 
-func (msg *SocketControlAcceptRequest) Marshaler() _bindings.Marshaler {
-	return _mSocketControlAcceptRequest
+func (msg *socketControlAcceptRequest) Marshaler() _bindings.Marshaler {
+	return _msocketControlAcceptRequest
 }
 
 // Implements Payload.
-func (_ *SocketControlAcceptRequest) InlineAlignment() int {
+func (_ *socketControlAcceptRequest) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *SocketControlAcceptRequest) InlineSize() int {
+func (_ *socketControlAcceptRequest) InlineSize() int {
 	return 8
 }
 
-type SocketControlAcceptResponse struct {
+type socketControlAcceptResponse struct {
 	_    struct{} `fidl2:"s,8,0"`
 	Code int16
 }
 
-var _mSocketControlAcceptResponse = _bindings.CreateLazyMarshaler(SocketControlAcceptResponse{})
+var _msocketControlAcceptResponse = _bindings.CreateLazyMarshaler(socketControlAcceptResponse{})
 
-func (msg *SocketControlAcceptResponse) Marshaler() _bindings.Marshaler {
-	return _mSocketControlAcceptResponse
+func (msg *socketControlAcceptResponse) Marshaler() _bindings.Marshaler {
+	return _msocketControlAcceptResponse
 }
 
 // Implements Payload.
-func (_ *SocketControlAcceptResponse) InlineAlignment() int {
+func (_ *socketControlAcceptResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *SocketControlAcceptResponse) InlineSize() int {
+func (_ *socketControlAcceptResponse) InlineSize() int {
 	return 8
 }
 
-type SocketControlBindRequest struct {
+type socketControlBindRequest struct {
 	_    struct{} `fidl2:"s,16,0"`
 	Addr []uint8  `fidl:"128" fidl2:"128"`
 }
 
-var _mSocketControlBindRequest = _bindings.CreateLazyMarshaler(SocketControlBindRequest{})
+var _msocketControlBindRequest = _bindings.CreateLazyMarshaler(socketControlBindRequest{})
 
-func (msg *SocketControlBindRequest) Marshaler() _bindings.Marshaler {
-	return _mSocketControlBindRequest
+func (msg *socketControlBindRequest) Marshaler() _bindings.Marshaler {
+	return _msocketControlBindRequest
 }
 
 // Implements Payload.
-func (_ *SocketControlBindRequest) InlineAlignment() int {
+func (_ *socketControlBindRequest) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *SocketControlBindRequest) InlineSize() int {
+func (_ *socketControlBindRequest) InlineSize() int {
 	return 16
 }
 
-type SocketControlBindResponse struct {
+type socketControlBindResponse struct {
 	_    struct{} `fidl2:"s,8,0"`
 	Code int16
 }
 
-var _mSocketControlBindResponse = _bindings.CreateLazyMarshaler(SocketControlBindResponse{})
+var _msocketControlBindResponse = _bindings.CreateLazyMarshaler(socketControlBindResponse{})
 
-func (msg *SocketControlBindResponse) Marshaler() _bindings.Marshaler {
-	return _mSocketControlBindResponse
+func (msg *socketControlBindResponse) Marshaler() _bindings.Marshaler {
+	return _msocketControlBindResponse
 }
 
 // Implements Payload.
-func (_ *SocketControlBindResponse) InlineAlignment() int {
+func (_ *socketControlBindResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *SocketControlBindResponse) InlineSize() int {
+func (_ *socketControlBindResponse) InlineSize() int {
 	return 8
 }
 
-type SocketControlListenRequest struct {
+type socketControlListenRequest struct {
 	_       struct{} `fidl2:"s,8,0"`
 	Backlog int16
 }
 
-var _mSocketControlListenRequest = _bindings.CreateLazyMarshaler(SocketControlListenRequest{})
+var _msocketControlListenRequest = _bindings.CreateLazyMarshaler(socketControlListenRequest{})
 
-func (msg *SocketControlListenRequest) Marshaler() _bindings.Marshaler {
-	return _mSocketControlListenRequest
+func (msg *socketControlListenRequest) Marshaler() _bindings.Marshaler {
+	return _msocketControlListenRequest
 }
 
 // Implements Payload.
-func (_ *SocketControlListenRequest) InlineAlignment() int {
+func (_ *socketControlListenRequest) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *SocketControlListenRequest) InlineSize() int {
+func (_ *socketControlListenRequest) InlineSize() int {
 	return 8
 }
 
-type SocketControlListenResponse struct {
+type socketControlListenResponse struct {
 	_    struct{} `fidl2:"s,8,0"`
 	Code int16
 }
 
-var _mSocketControlListenResponse = _bindings.CreateLazyMarshaler(SocketControlListenResponse{})
+var _msocketControlListenResponse = _bindings.CreateLazyMarshaler(socketControlListenResponse{})
 
-func (msg *SocketControlListenResponse) Marshaler() _bindings.Marshaler {
-	return _mSocketControlListenResponse
+func (msg *socketControlListenResponse) Marshaler() _bindings.Marshaler {
+	return _msocketControlListenResponse
 }
 
 // Implements Payload.
-func (_ *SocketControlListenResponse) InlineAlignment() int {
+func (_ *socketControlListenResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *SocketControlListenResponse) InlineSize() int {
+func (_ *socketControlListenResponse) InlineSize() int {
 	return 8
 }
 
-type SocketControlGetSockNameResponse struct {
+type socketControlGetSockNameResponse struct {
 	_    struct{} `fidl2:"s,24,0"`
 	Code int16
 	Addr []uint8 `fidl:"128" fidl2:"128"`
 }
 
-var _mSocketControlGetSockNameResponse = _bindings.CreateLazyMarshaler(SocketControlGetSockNameResponse{})
+var _msocketControlGetSockNameResponse = _bindings.CreateLazyMarshaler(socketControlGetSockNameResponse{})
 
-func (msg *SocketControlGetSockNameResponse) Marshaler() _bindings.Marshaler {
-	return _mSocketControlGetSockNameResponse
+func (msg *socketControlGetSockNameResponse) Marshaler() _bindings.Marshaler {
+	return _msocketControlGetSockNameResponse
 }
 
 // Implements Payload.
-func (_ *SocketControlGetSockNameResponse) InlineAlignment() int {
+func (_ *socketControlGetSockNameResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *SocketControlGetSockNameResponse) InlineSize() int {
+func (_ *socketControlGetSockNameResponse) InlineSize() int {
 	return 24
 }
 
-type SocketControlGetPeerNameResponse struct {
+type socketControlGetPeerNameResponse struct {
 	_    struct{} `fidl2:"s,24,0"`
 	Code int16
 	Addr []uint8 `fidl:"128" fidl2:"128"`
 }
 
-var _mSocketControlGetPeerNameResponse = _bindings.CreateLazyMarshaler(SocketControlGetPeerNameResponse{})
+var _msocketControlGetPeerNameResponse = _bindings.CreateLazyMarshaler(socketControlGetPeerNameResponse{})
 
-func (msg *SocketControlGetPeerNameResponse) Marshaler() _bindings.Marshaler {
-	return _mSocketControlGetPeerNameResponse
+func (msg *socketControlGetPeerNameResponse) Marshaler() _bindings.Marshaler {
+	return _msocketControlGetPeerNameResponse
 }
 
 // Implements Payload.
-func (_ *SocketControlGetPeerNameResponse) InlineAlignment() int {
+func (_ *socketControlGetPeerNameResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *SocketControlGetPeerNameResponse) InlineSize() int {
+func (_ *socketControlGetPeerNameResponse) InlineSize() int {
 	return 24
 }
 
-type SocketControlSetSockOptRequest struct {
+type socketControlSetSockOptRequest struct {
 	_       struct{} `fidl2:"s,24,0"`
 	Level   int16
 	Optname int16
 	Optval  []uint8 `fidl:"900" fidl2:"900"`
 }
 
-var _mSocketControlSetSockOptRequest = _bindings.CreateLazyMarshaler(SocketControlSetSockOptRequest{})
+var _msocketControlSetSockOptRequest = _bindings.CreateLazyMarshaler(socketControlSetSockOptRequest{})
 
-func (msg *SocketControlSetSockOptRequest) Marshaler() _bindings.Marshaler {
-	return _mSocketControlSetSockOptRequest
+func (msg *socketControlSetSockOptRequest) Marshaler() _bindings.Marshaler {
+	return _msocketControlSetSockOptRequest
 }
 
 // Implements Payload.
-func (_ *SocketControlSetSockOptRequest) InlineAlignment() int {
+func (_ *socketControlSetSockOptRequest) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *SocketControlSetSockOptRequest) InlineSize() int {
+func (_ *socketControlSetSockOptRequest) InlineSize() int {
 	return 24
 }
 
-type SocketControlSetSockOptResponse struct {
+type socketControlSetSockOptResponse struct {
 	_    struct{} `fidl2:"s,8,0"`
 	Code int16
 }
 
-var _mSocketControlSetSockOptResponse = _bindings.CreateLazyMarshaler(SocketControlSetSockOptResponse{})
+var _msocketControlSetSockOptResponse = _bindings.CreateLazyMarshaler(socketControlSetSockOptResponse{})
 
-func (msg *SocketControlSetSockOptResponse) Marshaler() _bindings.Marshaler {
-	return _mSocketControlSetSockOptResponse
+func (msg *socketControlSetSockOptResponse) Marshaler() _bindings.Marshaler {
+	return _msocketControlSetSockOptResponse
 }
 
 // Implements Payload.
-func (_ *SocketControlSetSockOptResponse) InlineAlignment() int {
+func (_ *socketControlSetSockOptResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *SocketControlSetSockOptResponse) InlineSize() int {
+func (_ *socketControlSetSockOptResponse) InlineSize() int {
 	return 8
 }
 
-type SocketControlGetSockOptRequest struct {
+type socketControlGetSockOptRequest struct {
 	_       struct{} `fidl2:"s,8,0"`
 	Level   int16
 	Optname int16
 }
 
-var _mSocketControlGetSockOptRequest = _bindings.CreateLazyMarshaler(SocketControlGetSockOptRequest{})
+var _msocketControlGetSockOptRequest = _bindings.CreateLazyMarshaler(socketControlGetSockOptRequest{})
 
-func (msg *SocketControlGetSockOptRequest) Marshaler() _bindings.Marshaler {
-	return _mSocketControlGetSockOptRequest
+func (msg *socketControlGetSockOptRequest) Marshaler() _bindings.Marshaler {
+	return _msocketControlGetSockOptRequest
 }
 
 // Implements Payload.
-func (_ *SocketControlGetSockOptRequest) InlineAlignment() int {
+func (_ *socketControlGetSockOptRequest) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *SocketControlGetSockOptRequest) InlineSize() int {
+func (_ *socketControlGetSockOptRequest) InlineSize() int {
 	return 8
 }
 
-type SocketControlGetSockOptResponse struct {
+type socketControlGetSockOptResponse struct {
 	_      struct{} `fidl2:"s,24,0"`
 	Code   int16
 	Optval []uint8 `fidl:"900" fidl2:"900"`
 }
 
-var _mSocketControlGetSockOptResponse = _bindings.CreateLazyMarshaler(SocketControlGetSockOptResponse{})
+var _msocketControlGetSockOptResponse = _bindings.CreateLazyMarshaler(socketControlGetSockOptResponse{})
 
-func (msg *SocketControlGetSockOptResponse) Marshaler() _bindings.Marshaler {
-	return _mSocketControlGetSockOptResponse
+func (msg *socketControlGetSockOptResponse) Marshaler() _bindings.Marshaler {
+	return _msocketControlGetSockOptResponse
 }
 
 // Implements Payload.
-func (_ *SocketControlGetSockOptResponse) InlineAlignment() int {
+func (_ *socketControlGetSockOptResponse) InlineAlignment() int {
 	return 0
 }
 
 // Implements Payload.
-func (_ *SocketControlGetSockOptResponse) InlineSize() int {
+func (_ *socketControlGetSockOptResponse) InlineSize() int {
 	return 24
 }
 
@@ -931,88 +931,88 @@
 
 func (p *SocketControlInterface) Close() (int16, error) {
 	var req_ _bindings.Payload
-	resp_ := &SocketControlCloseResponse{}
+	resp_ := &socketControlCloseResponse{}
 	err := ((*_bindings.SocketControlProxy)(p)).Call(SocketControlCloseOrdinal, req_, resp_)
 	return resp_.Code, err
 }
 
 func (p *SocketControlInterface) Ioctl(req int16, in []uint8) (int16, []uint8, error) {
-	req_ := &SocketControlIoctlRequest{
+	req_ := &socketControlIoctlRequest{
 		Req: req,
 		In:  in,
 	}
-	resp_ := &SocketControlIoctlResponse{}
+	resp_ := &socketControlIoctlResponse{}
 	err := ((*_bindings.SocketControlProxy)(p)).Call(SocketControlIoctlOrdinal, req_, resp_)
 	return resp_.Code, resp_.Out, err
 }
 
 func (p *SocketControlInterface) Connect(addr []uint8) (int16, error) {
-	req_ := &SocketControlConnectRequest{
+	req_ := &socketControlConnectRequest{
 		Addr: addr,
 	}
-	resp_ := &SocketControlConnectResponse{}
+	resp_ := &socketControlConnectResponse{}
 	err := ((*_bindings.SocketControlProxy)(p)).Call(SocketControlConnectOrdinal, req_, resp_)
 	return resp_.Code, err
 }
 
 func (p *SocketControlInterface) Accept(flags int16) (int16, error) {
-	req_ := &SocketControlAcceptRequest{
+	req_ := &socketControlAcceptRequest{
 		Flags: flags,
 	}
-	resp_ := &SocketControlAcceptResponse{}
+	resp_ := &socketControlAcceptResponse{}
 	err := ((*_bindings.SocketControlProxy)(p)).Call(SocketControlAcceptOrdinal, req_, resp_)
 	return resp_.Code, err
 }
 
 func (p *SocketControlInterface) Bind(addr []uint8) (int16, error) {
-	req_ := &SocketControlBindRequest{
+	req_ := &socketControlBindRequest{
 		Addr: addr,
 	}
-	resp_ := &SocketControlBindResponse{}
+	resp_ := &socketControlBindResponse{}
 	err := ((*_bindings.SocketControlProxy)(p)).Call(SocketControlBindOrdinal, req_, resp_)
 	return resp_.Code, err
 }
 
 func (p *SocketControlInterface) Listen(backlog int16) (int16, error) {
-	req_ := &SocketControlListenRequest{
+	req_ := &socketControlListenRequest{
 		Backlog: backlog,
 	}
-	resp_ := &SocketControlListenResponse{}
+	resp_ := &socketControlListenResponse{}
 	err := ((*_bindings.SocketControlProxy)(p)).Call(SocketControlListenOrdinal, req_, resp_)
 	return resp_.Code, err
 }
 
 func (p *SocketControlInterface) GetSockName() (int16, []uint8, error) {
 	var req_ _bindings.Payload
-	resp_ := &SocketControlGetSockNameResponse{}
+	resp_ := &socketControlGetSockNameResponse{}
 	err := ((*_bindings.SocketControlProxy)(p)).Call(SocketControlGetSockNameOrdinal, req_, resp_)
 	return resp_.Code, resp_.Addr, err
 }
 
 func (p *SocketControlInterface) GetPeerName() (int16, []uint8, error) {
 	var req_ _bindings.Payload
-	resp_ := &SocketControlGetPeerNameResponse{}
+	resp_ := &socketControlGetPeerNameResponse{}
 	err := ((*_bindings.SocketControlProxy)(p)).Call(SocketControlGetPeerNameOrdinal, req_, resp_)
 	return resp_.Code, resp_.Addr, err
 }
 
 func (p *SocketControlInterface) SetSockOpt(level int16, optname int16, optval []uint8) (int16, error) {
-	req_ := &SocketControlSetSockOptRequest{
+	req_ := &socketControlSetSockOptRequest{
 		Level:   level,
 		Optname: optname,
 		Optval:  optval,
 	}
-	resp_ := &SocketControlSetSockOptResponse{}
+	resp_ := &socketControlSetSockOptResponse{}
 	err := ((*_bindings.SocketControlProxy)(p)).Call(SocketControlSetSockOptOrdinal, req_, resp_)
 	return resp_.Code, err
 }
 
 func (p *SocketControlInterface) GetSockOpt(level int16, optname int16) (int16, []uint8, error) {
-	req_ := &SocketControlGetSockOptRequest{
+	req_ := &socketControlGetSockOptRequest{
 		Level:   level,
 		Optname: optname,
 	}
-	resp_ := &SocketControlGetSockOptResponse{}
+	resp_ := &socketControlGetSockOptResponse{}
 	err := ((*_bindings.SocketControlProxy)(p)).Call(SocketControlGetSockOptOrdinal, req_, resp_)
 	return resp_.Code, resp_.Optval, err
 }
@@ -1044,83 +1044,83 @@
 	switch ord {
 	case SocketControlCloseOrdinal:
 		code, err_ := s.Impl.Close()
-		out_ := SocketControlCloseResponse{}
+		out_ := socketControlCloseResponse{}
 		out_.Code = code
 		return &out_, err_
 	case SocketControlIoctlOrdinal:
-		in_ := SocketControlIoctlRequest{}
+		in_ := socketControlIoctlRequest{}
 		if err_ := _bindings.Unmarshal(b_, h_, &in_); err_ != nil {
 			return nil, err_
 		}
 		code, out, err_ := s.Impl.Ioctl(in_.Req, in_.In)
-		out_ := SocketControlIoctlResponse{}
+		out_ := socketControlIoctlResponse{}
 		out_.Code = code
 		out_.Out = out
 		return &out_, err_
 	case SocketControlConnectOrdinal:
-		in_ := SocketControlConnectRequest{}
+		in_ := socketControlConnectRequest{}
 		if err_ := _bindings.Unmarshal(b_, h_, &in_); err_ != nil {
 			return nil, err_
 		}
 		code, err_ := s.Impl.Connect(in_.Addr)
-		out_ := SocketControlConnectResponse{}
+		out_ := socketControlConnectResponse{}
 		out_.Code = code
 		return &out_, err_
 	case SocketControlAcceptOrdinal:
-		in_ := SocketControlAcceptRequest{}
+		in_ := socketControlAcceptRequest{}
 		if err_ := _bindings.Unmarshal(b_, h_, &in_); err_ != nil {
 			return nil, err_
 		}
 		code, err_ := s.Impl.Accept(in_.Flags)
-		out_ := SocketControlAcceptResponse{}
+		out_ := socketControlAcceptResponse{}
 		out_.Code = code
 		return &out_, err_
 	case SocketControlBindOrdinal:
-		in_ := SocketControlBindRequest{}
+		in_ := socketControlBindRequest{}
 		if err_ := _bindings.Unmarshal(b_, h_, &in_); err_ != nil {
 			return nil, err_
 		}
 		code, err_ := s.Impl.Bind(in_.Addr)
-		out_ := SocketControlBindResponse{}
+		out_ := socketControlBindResponse{}
 		out_.Code = code
 		return &out_, err_
 	case SocketControlListenOrdinal:
-		in_ := SocketControlListenRequest{}
+		in_ := socketControlListenRequest{}
 		if err_ := _bindings.Unmarshal(b_, h_, &in_); err_ != nil {
 			return nil, err_
 		}
 		code, err_ := s.Impl.Listen(in_.Backlog)
-		out_ := SocketControlListenResponse{}
+		out_ := socketControlListenResponse{}
 		out_.Code = code
 		return &out_, err_
 	case SocketControlGetSockNameOrdinal:
 		code, addr, err_ := s.Impl.GetSockName()
-		out_ := SocketControlGetSockNameResponse{}
+		out_ := socketControlGetSockNameResponse{}
 		out_.Code = code
 		out_.Addr = addr
 		return &out_, err_
 	case SocketControlGetPeerNameOrdinal:
 		code, addr, err_ := s.Impl.GetPeerName()
-		out_ := SocketControlGetPeerNameResponse{}
+		out_ := socketControlGetPeerNameResponse{}
 		out_.Code = code
 		out_.Addr = addr
 		return &out_, err_
 	case SocketControlSetSockOptOrdinal:
-		in_ := SocketControlSetSockOptRequest{}
+		in_ := socketControlSetSockOptRequest{}
 		if err_ := _bindings.Unmarshal(b_, h_, &in_); err_ != nil {
 			return nil, err_
 		}
 		code, err_ := s.Impl.SetSockOpt(in_.Level, in_.Optname, in_.Optval)
-		out_ := SocketControlSetSockOptResponse{}
+		out_ := socketControlSetSockOptResponse{}
 		out_.Code = code
 		return &out_, err_
 	case SocketControlGetSockOptOrdinal:
-		in_ := SocketControlGetSockOptRequest{}
+		in_ := socketControlGetSockOptRequest{}
 		if err_ := _bindings.Unmarshal(b_, h_, &in_); err_ != nil {
 			return nil, err_
 		}
 		code, optval, err_ := s.Impl.GetSockOpt(in_.Level, in_.Optname)
-		out_ := SocketControlGetSockOptResponse{}
+		out_ := socketControlGetSockOptResponse{}
 		out_.Code = code
 		out_.Optval = optval
 		return &out_, err_