[fidl] Regen + fix for device eventpair

In
https://fuchsia-review.googlesource.com/c/fuchsia/+/304236
(fuchsia.git 2b1ff45b34013b49c3f2bd109405f99a41215d10)
the type of `event` for devices was changes to be an eventpair.

In Go, we place all these things in a `File` whose `Event` member is
typed `zx.Event`. For now, casting to make regen and build work, though
that's likely incorrect.

Change-Id: I8219a78b7a8761c80bc7b0c4c9a74995fde1bcf6
diff --git a/src/syscall/zx/fdio/node.go b/src/syscall/zx/fdio/node.go
index 68beb56..04f5dc4 100644
--- a/src/syscall/zx/fdio/node.go
+++ b/src/syscall/zx/fdio/node.go
@@ -29,9 +29,10 @@
 			Event: info.File.Event,
 		}
 	case io.NodeInfoDevice:
+		// TODO(35068): Figure out the correct representation of info.Device.Event.
 		result = &File{
 			Node:  Node{NodeInterface: node},
-			Event: info.Device.Event,
+			Event: zx.Event(info.Device.Event),
 		}
 	case io.NodeInfoDirectory:
 		result = &Directory{Node: Node{NodeInterface: node}}
diff --git a/src/syscall/zx/fidl/bindingstest/impl.go b/src/syscall/zx/fidl/bindingstest/impl.go
index c497374..7197d36 100644
--- a/src/syscall/zx/fidl/bindingstest/impl.go
+++ b/src/syscall/zx/fidl/bindingstest/impl.go
@@ -891,10 +891,8 @@
 }
 
 const (
-	Test1EchoOrdinal        uint64 = 1246312959 << 32
-	Test1EchoGenOrdinal     uint64 = 1246312959 << 32
-	Test1SurpriseOrdinal    uint64 = 1272344178 << 32
-	Test1SurpriseGenOrdinal uint64 = 1272344178 << 32
+	Test1EchoGenOrdinal     uint64 = 0x4a4939ff00000000
+	Test1SurpriseGenOrdinal uint64 = 0x4bd66e7200000000
 )
 
 type test1EchoRequest struct {
@@ -937,13 +935,13 @@
 		In: in,
 	}
 	resp_ := &test1EchoResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(Test1EchoOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(Test1EchoGenOrdinal, req_, resp_)
 	return resp_.Out, err
 }
 
 func (p *Test1Interface) ExpectSurprise() (string, error) {
 	resp_ := &test1SurpriseResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Recv(Test1SurpriseOrdinal, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Recv(Test1SurpriseGenOrdinal, resp_)
 	return resp_.Foo, err
 }
 
@@ -966,7 +964,7 @@
 
 func (s_ *Test1Stub) Dispatch(ordinal_ uint64, data_ []byte, handles_ []_zx.Handle) (_bindings.Message, error) {
 	switch ordinal_ {
-	case Test1EchoOrdinal:
+	case Test1EchoGenOrdinal:
 		in_ := test1EchoRequest{}
 		if _, _, err_ := _bindings.Unmarshal(data_, handles_, &in_); err_ != nil {
 			return nil, err_
@@ -998,7 +996,7 @@
 	event_ := &test1SurpriseResponse{
 		Foo: foo,
 	}
-	return ((*_bindings.ChannelProxy)(p)).Send(Test1SurpriseOrdinal, event_)
+	return ((*_bindings.ChannelProxy)(p)).Send(Test1SurpriseGenOrdinal, event_)
 }
 
 type EthernetDeviceInterface _bindings.ChannelProxy
diff --git a/src/syscall/zx/fidl/conformance/impl.go b/src/syscall/zx/fidl/conformance/impl.go
index 87454b8..75f4fcb 100644
--- a/src/syscall/zx/fidl/conformance/impl.go
+++ b/src/syscall/zx/fidl/conformance/impl.go
@@ -2,13 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// Code generated by tools/fidl/gidl-conformance-suite/regen.sh; DO NOT EDIT.
+// GENERATED FILE: Do not edit!
+//
+// To rebuild this file, invoke third_party/go/regen-fidl.
 
 // +build fuchsia
 
-//
-// Code generated by fidlgen; DO NOT EDIT.
-
 package conformance
 
 import (
@@ -16,80 +15,45 @@
 	_bindings "syscall/zx/fidl"
 )
 
-type Int64Struct struct {
-	_ struct{} `fidl2:"s,8,8"`
-	X int64
+type StructWithInt struct {
+	_ struct{} `fidl2:"s,4,4"`
+	X int32
 }
 
-var _mInt64Struct = _bindings.CreateLazyMarshaler(Int64Struct{})
+var _mStructWithInt = _bindings.CreateLazyMarshaler(StructWithInt{})
 
-func (msg *Int64Struct) Marshaler() _bindings.Marshaler {
-	return _mInt64Struct
+func (msg *StructWithInt) Marshaler() _bindings.Marshaler {
+	return _mStructWithInt
 }
 
-type TestInlineXUnionInStruct struct {
-	_      struct{} `fidl2:"s,56,8"`
-	Before string
-	Xu     SampleXUnion
-	After  string
+type StructWithArrays struct {
+	_         struct{} `fidl2:"s,72,8"`
+	ArrEmpty  [0]int32
+	ArrInt    [2]int32
+	ArrString [2]string
+	ArrStruct [2]StructWithInt
+	ArrArrInt [2][3]int32
 }
 
-var _mTestInlineXUnionInStruct = _bindings.CreateLazyMarshaler(TestInlineXUnionInStruct{})
+var _mStructWithArrays = _bindings.CreateLazyMarshaler(StructWithArrays{})
 
-func (msg *TestInlineXUnionInStruct) Marshaler() _bindings.Marshaler {
-	return _mTestInlineXUnionInStruct
+func (msg *StructWithArrays) Marshaler() _bindings.Marshaler {
+	return _mStructWithArrays
 }
 
-type TestOptionalXUnionInStruct struct {
-	_      struct{} `fidl2:"s,56,8"`
-	Before string
-	Xu     *SampleXUnion
-	After  string
+type StructWithVectors struct {
+	_         struct{} `fidl2:"s,80,8"`
+	VecEmpty  []int32
+	VecInt    []int32
+	VecString []string
+	VecStruct []StructWithInt
+	VecVecInt [][]int32
 }
 
-var _mTestOptionalXUnionInStruct = _bindings.CreateLazyMarshaler(TestOptionalXUnionInStruct{})
+var _mStructWithVectors = _bindings.CreateLazyMarshaler(StructWithVectors{})
 
-func (msg *TestOptionalXUnionInStruct) Marshaler() _bindings.Marshaler {
-	return _mTestOptionalXUnionInStruct
-}
-
-type Length2StringWrapper struct {
-	_             struct{} `fidl2:"s,16,8"`
-	Length2String string   `fidl:"2" fidl2:"2"`
-}
-
-var _mLength2StringWrapper = _bindings.CreateLazyMarshaler(Length2StringWrapper{})
-
-func (msg *Length2StringWrapper) Marshaler() _bindings.Marshaler {
-	return _mLength2StringWrapper
-}
-
-type StringWrapper struct {
-	_   struct{} `fidl2:"s,16,8"`
-	Str string
-}
-
-var _mStringWrapper = _bindings.CreateLazyMarshaler(StringWrapper{})
-
-func (msg *StringWrapper) Marshaler() _bindings.Marshaler {
-	return _mStringWrapper
-}
-
-type StructWithOptionals struct {
-	_   struct{} `fidl2:"s,104,8"`
-	S   EmptyStruct
-	S2  *EmptyStruct
-	T   TableWithEmptyStruct
-	Xu  XUnionWithEmptyStruct
-	Xu2 *XUnionWithEmptyStruct
-	U   UnionWithEmptyStruct
-	U2  *UnionWithEmptyStruct
-}
-
-var _mStructWithOptionals = _bindings.CreateLazyMarshaler(StructWithOptionals{})
-
-func (msg *StructWithOptionals) Marshaler() _bindings.Marshaler {
-	return _mStructWithOptionals
+func (msg *StructWithVectors) Marshaler() _bindings.Marshaler {
+	return _mStructWithVectors
 }
 
 type TestXUnionInTable struct {
@@ -157,6 +121,45 @@
 	return _mFileGetAttrResponse
 }
 
+type StructWithOptionals struct {
+	_   struct{} `fidl2:"s,104,8"`
+	S   EmptyStruct
+	S2  *EmptyStruct
+	T   TableWithEmptyStruct
+	Xu  XUnionWithEmptyStruct
+	Xu2 *XUnionWithEmptyStruct
+	U   UnionWithEmptyStruct
+	U2  *UnionWithEmptyStruct
+}
+
+var _mStructWithOptionals = _bindings.CreateLazyMarshaler(StructWithOptionals{})
+
+func (msg *StructWithOptionals) Marshaler() _bindings.Marshaler {
+	return _mStructWithOptionals
+}
+
+type Length2StringWrapper struct {
+	_             struct{} `fidl2:"s,16,8"`
+	Length2String string   `fidl:"2" fidl2:"2"`
+}
+
+var _mLength2StringWrapper = _bindings.CreateLazyMarshaler(Length2StringWrapper{})
+
+func (msg *Length2StringWrapper) Marshaler() _bindings.Marshaler {
+	return _mLength2StringWrapper
+}
+
+type StringWrapper struct {
+	_   struct{} `fidl2:"s,16,8"`
+	Str string
+}
+
+var _mStringWrapper = _bindings.CreateLazyMarshaler(StringWrapper{})
+
+func (msg *StringWrapper) Marshaler() _bindings.Marshaler {
+	return _mStringWrapper
+}
+
 type EmptyStruct struct {
 	_ struct{} `fidl2:"s,1,1"`
 }
@@ -242,6 +245,110 @@
 	return _mStructOfTableWithStringAndVector
 }
 
+type Int64Struct struct {
+	_ struct{} `fidl2:"s,8,8"`
+	X int64
+}
+
+var _mInt64Struct = _bindings.CreateLazyMarshaler(Int64Struct{})
+
+func (msg *Int64Struct) Marshaler() _bindings.Marshaler {
+	return _mInt64Struct
+}
+
+type TestInlineXUnionInStruct struct {
+	_      struct{} `fidl2:"s,56,8"`
+	Before string
+	Xu     SampleXUnion
+	After  string
+}
+
+var _mTestInlineXUnionInStruct = _bindings.CreateLazyMarshaler(TestInlineXUnionInStruct{})
+
+func (msg *TestInlineXUnionInStruct) Marshaler() _bindings.Marshaler {
+	return _mTestInlineXUnionInStruct
+}
+
+type TestOptionalXUnionInStruct struct {
+	_      struct{} `fidl2:"s,56,8"`
+	Before string
+	Xu     *SampleXUnion
+	After  string
+}
+
+var _mTestOptionalXUnionInStruct = _bindings.CreateLazyMarshaler(TestOptionalXUnionInStruct{})
+
+func (msg *TestOptionalXUnionInStruct) Marshaler() _bindings.Marshaler {
+	return _mTestOptionalXUnionInStruct
+}
+
+type TestStrictXUnionInStruct struct {
+	_  struct{} `fidl2:"s,24,8"`
+	Xu SampleStrictXUnion
+}
+
+var _mTestStrictXUnionInStruct = _bindings.CreateLazyMarshaler(TestStrictXUnionInStruct{})
+
+func (msg *TestStrictXUnionInStruct) Marshaler() _bindings.Marshaler {
+	return _mTestStrictXUnionInStruct
+}
+
+type IpAddressConfigTag uint32
+
+const (
+	_ IpAddressConfigTag = iota
+	IpAddressConfigPaddingSize24Align4
+	IpAddressConfigDhcp
+)
+
+type IpAddressConfig struct {
+	IpAddressConfigTag  `fidl:"tag" fidl2:"u,28,4"`
+	PaddingSize24Align4 [6]uint32
+	Dhcp                bool
+}
+
+func (u *IpAddressConfig) Which() IpAddressConfigTag {
+	return u.IpAddressConfigTag
+}
+
+func (u *IpAddressConfig) SetPaddingSize24Align4(paddingSize24Align4 [6]uint32) {
+	u.IpAddressConfigTag = IpAddressConfigPaddingSize24Align4
+	u.PaddingSize24Align4 = paddingSize24Align4
+}
+
+func (u *IpAddressConfig) SetDhcp(dhcp bool) {
+	u.IpAddressConfigTag = IpAddressConfigDhcp
+	u.Dhcp = dhcp
+}
+
+type UnionWithEmptyStructTag uint32
+
+const (
+	_ UnionWithEmptyStructTag = iota
+	UnionWithEmptyStructS
+	UnionWithEmptyStructS2
+)
+
+type UnionWithEmptyStruct struct {
+	UnionWithEmptyStructTag `fidl:"tag" fidl2:"u,16,8"`
+	S                       EmptyStruct
+	S2                      *EmptyStruct
+}
+
+func (u *UnionWithEmptyStruct) Which() UnionWithEmptyStructTag {
+	return u.UnionWithEmptyStructTag
+}
+
+func (u *UnionWithEmptyStruct) SetS(s EmptyStruct) {
+	u.UnionWithEmptyStructTag = UnionWithEmptyStructS
+	u.S = s
+}
+
+func (u *UnionWithEmptyStruct) SetS2(s2 *EmptyStruct) {
+	u.UnionWithEmptyStructTag = UnionWithEmptyStructS2
+	u.S2 = s2
+}
+
 type SimpleUnionTag uint32
 
 const (
@@ -291,60 +398,35 @@
 	u.Str = str
 }
 
-type UnionWithEmptyStructTag uint32
+type XUnionWithEmptyStructTag uint32
 
 const (
-	_ UnionWithEmptyStructTag = iota
-	UnionWithEmptyStructS
-	UnionWithEmptyStructS2
+	XUnionWithEmptyStruct_unknownData = 0          // 0x00000000
+	XUnionWithEmptyStructS            = 1956241662 // 0x7499e0fe
 )
 
-type UnionWithEmptyStruct struct {
-	UnionWithEmptyStructTag `fidl:"tag" fidl2:"u,16,8"`
-	S                       EmptyStruct
-	S2                      *EmptyStruct
+type XUnionWithEmptyStruct struct {
+	XUnionWithEmptyStructTag `fidl2:"x,24,8"`
+	I_unknownData            []byte
+	S                        EmptyStruct `fidl:"1956241662" fidl2:"1956241662"`
 }
 
-func (u *UnionWithEmptyStruct) Which() UnionWithEmptyStructTag {
-	return u.UnionWithEmptyStructTag
+func (_m *XUnionWithEmptyStruct) Which() XUnionWithEmptyStructTag {
+	switch _m.XUnionWithEmptyStructTag {
+	case 1956241662:
+		return XUnionWithEmptyStructS
+	default:
+		return XUnionWithEmptyStruct_unknownData
+	}
 }
 
-func (u *UnionWithEmptyStruct) SetS(s EmptyStruct) {
-	u.UnionWithEmptyStructTag = UnionWithEmptyStructS
-	u.S = s
+func (_m *XUnionWithEmptyStruct) Ordinal() uint32 {
+	return uint32(_m.XUnionWithEmptyStructTag)
 }
 
-func (u *UnionWithEmptyStruct) SetS2(s2 *EmptyStruct) {
-	u.UnionWithEmptyStructTag = UnionWithEmptyStructS2
-	u.S2 = s2
-}
-
-type IpAddressConfigTag uint32
-
-const (
-	_ IpAddressConfigTag = iota
-	IpAddressConfigPaddingSize24Align4
-	IpAddressConfigDhcp
-)
-
-type IpAddressConfig struct {
-	IpAddressConfigTag  `fidl:"tag" fidl2:"u,28,4"`
-	PaddingSize24Align4 [6]uint32
-	Dhcp                bool
-}
-
-func (u *IpAddressConfig) Which() IpAddressConfigTag {
-	return u.IpAddressConfigTag
-}
-
-func (u *IpAddressConfig) SetPaddingSize24Align4(paddingSize24Align4 [6]uint32) {
-	u.IpAddressConfigTag = IpAddressConfigPaddingSize24Align4
-	u.PaddingSize24Align4 = paddingSize24Align4
-}
-
-func (u *IpAddressConfig) SetDhcp(dhcp bool) {
-	u.IpAddressConfigTag = IpAddressConfigDhcp
-	u.Dhcp = dhcp
+func (_m *XUnionWithEmptyStruct) SetS(s EmptyStruct) {
+	_m.XUnionWithEmptyStructTag = XUnionWithEmptyStructS
+	_m.S = s
 }
 
 type SampleXUnionTag uint32
@@ -396,65 +478,43 @@
 	_m.St = st
 }
 
-type XUnionWithEmptyStructTag uint32
+type SampleStrictXUnionTag uint32
 
 const (
-	XUnionWithEmptyStruct_unknownData = 0          // 0x00000000
-	XUnionWithEmptyStructS            = 1956241662 // 0x7499e0fe
+	SampleStrictXUnionU  = 149088882 // 0x08e2ea72
+	SampleStrictXUnionSu = 670279483 // 0x27f3a73b
+	SampleStrictXUnionSt = 925062383 // 0x372354ef
 )
 
-type XUnionWithEmptyStruct struct {
-	XUnionWithEmptyStructTag `fidl2:"x,24,8"`
-	I_unknownData            []byte
-	S                        EmptyStruct `fidl:"1956241662" fidl2:"1956241662"`
+type SampleStrictXUnion struct {
+	SampleStrictXUnionTag `fidl2:"x!,24,8"`
+	I_unknownData         []byte
+	U                     uint32      `fidl:"149088882" fidl2:"149088882"`
+	Su                    SimpleUnion `fidl:"670279483" fidl2:"670279483"`
+	St                    SimpleTable `fidl:"925062383" fidl2:"925062383"`
 }
 
-func (_m *XUnionWithEmptyStruct) Which() XUnionWithEmptyStructTag {
-	switch _m.XUnionWithEmptyStructTag {
-	case 1956241662:
-		return XUnionWithEmptyStructS
-	default:
-		return XUnionWithEmptyStruct_unknownData
-	}
+func (_m *SampleStrictXUnion) Which() SampleStrictXUnionTag {
+	return _m.SampleStrictXUnionTag
 }
 
-func (_m *XUnionWithEmptyStruct) Ordinal() uint32 {
-	return uint32(_m.XUnionWithEmptyStructTag)
+func (_m *SampleStrictXUnion) Ordinal() uint32 {
+	return uint32(_m.SampleStrictXUnionTag)
 }
 
-func (_m *XUnionWithEmptyStruct) SetS(s EmptyStruct) {
-	_m.XUnionWithEmptyStructTag = XUnionWithEmptyStructS
-	_m.S = s
+func (_m *SampleStrictXUnion) SetU(u uint32) {
+	_m.SampleStrictXUnionTag = SampleStrictXUnionU
+	_m.U = u
 }
 
-type TableWithEmptyStruct struct {
-	_        struct{}    `fidl2:"t,16,8"`
-	S        EmptyStruct `fidl:"1" fidl2:"1"`
-	SPresent bool
+func (_m *SampleStrictXUnion) SetSu(su SimpleUnion) {
+	_m.SampleStrictXUnionTag = SampleStrictXUnionSu
+	_m.Su = su
 }
 
-func (u *TableWithEmptyStruct) SetS(s EmptyStruct) {
-	u.S = s
-	u.SPresent = true
-}
-
-func (u *TableWithEmptyStruct) GetS() EmptyStruct {
-	return u.S
-}
-
-func (u *TableWithEmptyStruct) GetSWithDefault(_default EmptyStruct) EmptyStruct {
-	if !u.HasS() {
-		return _default
-	}
-	return u.S
-}
-
-func (u *TableWithEmptyStruct) HasS() bool {
-	return u.SPresent
-}
-
-func (u *TableWithEmptyStruct) ClearS() {
-	u.SPresent = false
+func (_m *SampleStrictXUnion) SetSt(st SimpleTable) {
+	_m.SampleStrictXUnionTag = SampleStrictXUnionSt
+	_m.St = st
 }
 
 type XUnionInTable struct {
@@ -539,6 +599,36 @@
 	u.AfterPresent = false
 }
 
+type TableWithEmptyStruct struct {
+	_        struct{}    `fidl2:"t,16,8"`
+	S        EmptyStruct `fidl:"1" fidl2:"1"`
+	SPresent bool
+}
+
+func (u *TableWithEmptyStruct) SetS(s EmptyStruct) {
+	u.S = s
+	u.SPresent = true
+}
+
+func (u *TableWithEmptyStruct) GetS() EmptyStruct {
+	return u.S
+}
+
+func (u *TableWithEmptyStruct) GetSWithDefault(_default EmptyStruct) EmptyStruct {
+	if !u.HasS() {
+		return _default
+	}
+	return u.S
+}
+
+func (u *TableWithEmptyStruct) HasS() bool {
+	return u.SPresent
+}
+
+func (u *TableWithEmptyStruct) ClearS() {
+	u.SPresent = false
+}
+
 type SimpleTable struct {
 	_        struct{} `fidl2:"t,16,8"`
 	X        int64    `fidl:"1" fidl2:"1"`
diff --git a/src/syscall/zx/io/impl.go b/src/syscall/zx/io/impl.go
index e3f7070..c3685b9 100644
--- a/src/syscall/zx/io/impl.go
+++ b/src/syscall/zx/io/impl.go
@@ -23,14 +23,14 @@
 	FileSignalWritable uint32 = 33554432
 	// Indicates the device is ready for reading.
 	DeviceSignalReadable uint32 = 16777216
-	// Indicates the device is ready for writing.
-	DeviceSignalWritable uint32 = 33554432
-	// Indicates the device has encountered an error state.
-	DeviceSignalError uint32 = 67108864
-	// Indicates the device has hung up on the current connection.
-	DeviceSignalHangup uint32 = 134217728
 	// Indicates an out-of-band state transition has occurred.
-	DeviceSignalOob uint32 = 268435456
+	DeviceSignalOob uint32 = 33554432
+	// Indicates the device is ready for writing.
+	DeviceSignalWritable uint32 = 67108864
+	// Indicates the device has encountered an error state.
+	DeviceSignalError uint32 = 134217728
+	// Indicates the device has hung up on the current connection.
+	DeviceSignalHangup uint32 = 268435456
 	// Can read from target object.
 	OpenRightReadable uint32 = 1
 	// Can write to target object.
@@ -51,18 +51,18 @@
 	// If the object is a mount point, open the local directory.
 	OpenFlagNoRemote uint32 = 2097152
 	// Open a reference to the object, not the object itself.
-	// It is ONLY valid to pass the following flags together with OPEN_FLAG_NODE_REFERENCE:
-	// - OPEN_FLAG_DIRECTORY
-	// - OPEN_FLAG_NOT_DIRECTORY
-	// - OPEN_FLAG_DESCRIBE
+	// It is ONLY valid to pass the following flags together with `OPEN_FLAG_NODE_REFERENCE`:
+	// - `OPEN_FLAG_DIRECTORY`
+	// - `OPEN_FLAG_NOT_DIRECTORY`
+	// - `OPEN_FLAG_DESCRIBE`
 	// otherwise an error is returned.
 	// If an object is opened or cloned using this method, the resulting connection does not carry
 	// any permission flags.
 	// The resulting node allows a limited set of operations: `GetAttr`, `Clone`, `Close`, `Describe`,
 	// and, if the node is a file, these extra operations: `GetFlags`, `SetFlags`.
 	OpenFlagNodeReference uint32 = 4194304
-	// Binary OR of OPEN_FLAG_DIRECTORY, OPEN_FLAG_NOT_DIRECTORY, OPEN_FLAG_DESCRIBE, and
-	// OPEN_FLAG_NODE_REFERENCE. Flags used when opening a node reference must fall within this mask.
+	// Binary OR of `OPEN_FLAG_DIRECTORY`, OPEN_FLAG_NOT_DIRECTORY, OPEN_FLAG_DESCRIBE, and
+	// `OPEN_FLAG_NODE_REFERENCE`. Flags used when opening a node reference must fall within this mask.
 	OpenFlagsAllowedWithNodeReference uint32 = 46661632
 	// Requests that an "OnOpen" event is sent to the interface request.
 	// The event will contain a non-null NodeInfo if the open/clone is successful.
@@ -70,7 +70,7 @@
 	// Specify this flag to request POSIX-compatibility. Currently, it affects permission handling.
 	// During Open:
 	// - If the target path is a directory, the rights on the new connection expands to include
-	//   OPEN_RIGHT_WRITABLE if and only if the current connection and all intermediate mount points
+	//   `OPEN_RIGHT_WRITABLE` if and only if the current connection and all intermediate mount points
 	//   are writable.
 	// - Otherwise, this flag is ignored. It is an access denied error to request more rights
 	//   than those on the current connection, or any intermediate mount points.
@@ -89,16 +89,16 @@
 	OpenFlagNotDirectory uint32 = 33554432
 	// When used during clone, the new connection inherits the rights on the source connection,
 	// regardless if it is a file or directory. Otherwise, clone attempts to use the requested rights.
-	// It is invalid to pass any of the OPEN_RIGHT_* flags together with CLONE_FLAG_SAME_RIGHTS.
+	// It is invalid to pass any of the `OPEN_RIGHT_*` flags together with `CLONE_FLAG_SAME_RIGHTS`.
 	CloneFlagSameRights uint32 = 67108864
 	// Bits reserved for posix protections. Native fuchsia filesystems
-	// are not required to set bits contained within MODE_PROTECTION_MASK,
+	// are not required to set bits contained within `MODE_PROTECTION_MASK`,
 	// but filesystems that wish to do so may refer to sys/stat.h for their
 	// definitions.
 	ModeProtectionMask uint32 = 4095
 	// Bits indicating node type. The canonical mechanism to check
 	// for a node type is to take 'mode', bitwise AND it with the
-	// MODE_TYPE_MASK, and check exact equality against a mode type.
+	// `MODE_TYPE_MASK`, and check exact equality against a mode type.
 	ModeTypeMask        uint32 = 1044480
 	ModeTypeDirectory   uint32 = 16384
 	ModeTypeBlockDevice uint32 = 24576
@@ -125,11 +125,11 @@
 	VmoFlagExec uint32 = 4
 	// Require a copy-on-write clone of the underlying VMO.
 	// The request should fail if the VMO is not cloned.
-	// May not be supplied with fuchsia_io_VMO_FLAG_EXACT.
+	// May not be supplied with fuchsia_io_`VMO_FLAG_EXACT`.
 	VmoFlagPrivate uint32 = 65536
 	// Require an exact (non-cloned) handle to the underlying VMO.
 	// The request should fail if a handle to the exact VMO is not returned.
-	// May not be supplied with VMO_FLAG_PRIVATE.
+	// May not be supplied with `VMO_FLAG_PRIVATE`.
 	VmoFlagExact uint32 = 131072
 	// A dirent with an unknown type.
 	DirentTypeUnknown uint8 = 0
@@ -154,17 +154,17 @@
 	WatchEventRemoved uint8 = 2
 	// Identifies a node already existed in the directory when watching started.
 	WatchEventExisting uint8 = 3
-	// Identifies that no more WATCH_EVENT_EXISTING events will be sent.
+	// Identifies that no more `WATCH_EVENT_EXISTING` events will be sent.
 	WatchEventIdle uint8 = 4
-	// Used by Directory::Watch. Requests transmission of WATCH_EVENT_DELETED.
+	// Used by Directory::Watch. Requests transmission of `WATCH_EVENT_DELETED`.
 	WatchMaskDeleted uint32 = 1
-	// Used by Directory::Watch. Requests transmission of WATCH_EVENT_ADDED.
+	// Used by Directory::Watch. Requests transmission of `WATCH_EVENT_ADDED`.
 	WatchMaskAdded uint32 = 2
-	// Used by Directory::Watch. Requests transmission of WATCH_EVENT_REMOVED.
+	// Used by Directory::Watch. Requests transmission of `WATCH_EVENT_REMOVED`.
 	WatchMaskRemoved uint32 = 4
-	// Used by Directory::Watch. Requests transmission of WATCH_EVENT_EXISTING.
+	// Used by Directory::Watch. Requests transmission of `WATCH_EVENT_EXISTING`.
 	WatchMaskExisting uint32 = 8
-	// Used by Directory::Watch. Requests transmission of WATCH_EVENT_IDLE.
+	// Used by Directory::Watch. Requests transmission of `WATCH_EVENT_IDLE`.
 	WatchMaskIdle uint32 = 16
 	// Used by Directory::Watch. Requests transmission of all watcher events.
 	WatchMaskAll           uint32 = 31
@@ -213,7 +213,7 @@
 	// 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.
+	// The "`FILE_SIGNAL_`" values may be observed on this event.
 	Event _zx.Event `fidl:"*" fidl2:"1"`
 }
 
@@ -283,8 +283,8 @@
 	_ 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"`
+	// The "`DEVICE_SIGNAL_`" values may be observed on this event.
+	Event _zx.Handle `fidl:"*" fidl2:"1"`
 }
 
 var _mDevice = _bindings.CreateLazyMarshaler(Device{})
@@ -295,8 +295,8 @@
 
 // The object may be cast to interface 'Tty'
 type Tty struct {
-	_     struct{}  `fidl2:"s,4,4"`
-	Event _zx.Event `fidl:"*" fidl2:"1"`
+	_     struct{}   `fidl2:"s,4,4"`
+	Event _zx.Handle `fidl:"*" fidl2:"1"`
 }
 
 var _mTty = _bindings.CreateLazyMarshaler(Tty{})
@@ -451,22 +451,14 @@
 }
 
 const (
-	NodeCloneOrdinal       uint64 = 402549324 << 32
-	NodeCloneGenOrdinal    uint64 = 402549324 << 32
-	NodeCloseOrdinal       uint64 = 1387878023 << 32
-	NodeCloseGenOrdinal    uint64 = 1387878023 << 32
-	NodeDescribeOrdinal    uint64 = 526573406 << 32
-	NodeDescribeGenOrdinal uint64 = 526573406 << 32
-	NodeOnOpenOrdinal      uint64 = 1191225277 << 32
-	NodeOnOpenGenOrdinal   uint64 = 1191225277 << 32
-	NodeSyncOrdinal        uint64 = 1648508842 << 32
-	NodeSyncGenOrdinal     uint64 = 1648508842 << 32
-	NodeGetAttrOrdinal     uint64 = 1166403528 << 32
-	NodeGetAttrGenOrdinal  uint64 = 1166403528 << 32
-	NodeSetAttrOrdinal     uint64 = 198530458 << 32
-	NodeSetAttrGenOrdinal  uint64 = 198530458 << 32
-	NodeIoctlOrdinal       uint64 = 905161895 << 32
-	NodeIoctlGenOrdinal    uint64 = 905161895 << 32
+	NodeCloneGenOrdinal    uint64 = 0x17fe6a4c00000000
+	NodeCloseGenOrdinal    uint64 = 0x52b9568700000000
+	NodeDescribeGenOrdinal uint64 = 0x1f62df5e00000000
+	NodeOnOpenGenOrdinal   uint64 = 0x4700a7bd00000000
+	NodeSyncGenOrdinal     uint64 = 0x62423faa00000000
+	NodeGetAttrGenOrdinal  uint64 = 0x4585e7c800000000
+	NodeSetAttrGenOrdinal  uint64 = 0xbd5559a00000000
+	NodeIoctlGenOrdinal    uint64 = 0x35f3aca700000000
 )
 
 type nodeCloneRequest struct {
@@ -593,25 +585,25 @@
 // Create another connection to the same remote object.
 //
 // `flags` may be any of:
-// - OPEN_RIGHT_*
-// - OPEN_FLAG_APPEND
-// - OPEN_FLAG_NO_REMOTE
-// - OPEN_FLAG_DESCRIBE
-// - CLONE_FLAG_SAME_RIGHTS
+// - `OPEN_RIGHT_*`
+// - `OPEN_FLAG_APPEND`
+// - `OPEN_FLAG_NO_REMOTE`
+// - `OPEN_FLAG_DESCRIBE`
+// - `CLONE_FLAG_SAME_RIGHTS`
 //
 // All other flags are ignored.
 //
-// The OPEN_RIGHT_* bits in `flags` request corresponding rights over the resulting
+// The `OPEN_RIGHT_*` bits in `flags` request corresponding rights over the resulting
 // cloned object.
 // The cloned object must have rights less than or equal to the original object.
-// Alternatively, pass CLONE_FLAG_SAME_RIGHTS to inherit the rights on the source connection.
-// It is invalid to pass any of the OPEN_RIGHT_* flags together with CLONE_FLAG_SAME_RIGHTS.
+// Alternatively, pass `CLONE_FLAG_SAME_RIGHTS` to inherit the rights on the source connection.
+// It is invalid to pass any of the `OPEN_RIGHT_*` flags together with `CLONE_FLAG_SAME_RIGHTS`.
 func (p *NodeInterface) Clone(flags uint32, object NodeInterfaceRequest) error {
 	req_ := &nodeCloneRequest{
 		Flags:  flags,
 		Object: object,
 	}
-	err := ((*_bindings.ChannelProxy)(p)).Send(NodeCloneOrdinal, req_)
+	err := ((*_bindings.ChannelProxy)(p)).Send(NodeCloneGenOrdinal, req_)
 	return err
 }
 
@@ -621,7 +613,7 @@
 func (p *NodeInterface) Close() (int32, error) {
 	var req_ _bindings.Message
 	resp_ := &nodeCloseResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(NodeCloseOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(NodeCloseGenOrdinal, req_, resp_)
 	return resp_.S, err
 }
 
@@ -632,7 +624,7 @@
 func (p *NodeInterface) Describe() (NodeInfo, error) {
 	var req_ _bindings.Message
 	resp_ := &nodeDescribeResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(NodeDescribeOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(NodeDescribeGenOrdinal, req_, resp_)
 	return resp_.Info, err
 }
 
@@ -643,7 +635,7 @@
 // (the same as would be returned by `Describe`).
 func (p *NodeInterface) ExpectOnOpen() (int32, *NodeInfo, error) {
 	resp_ := &nodeOnOpenResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Recv(NodeOnOpenOrdinal, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Recv(NodeOnOpenGenOrdinal, resp_)
 	return resp_.S, resp_.Info, err
 }
 
@@ -653,7 +645,7 @@
 func (p *NodeInterface) Sync() (int32, error) {
 	var req_ _bindings.Message
 	resp_ := &nodeSyncResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(NodeSyncOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(NodeSyncGenOrdinal, req_, resp_)
 	return resp_.S, err
 }
 
@@ -663,21 +655,21 @@
 func (p *NodeInterface) GetAttr() (int32, NodeAttributes, error) {
 	var req_ _bindings.Message
 	resp_ := &nodeGetAttrResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(NodeGetAttrOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(NodeGetAttrGenOrdinal, req_, resp_)
 	return resp_.S, resp_.Attributes, err
 }
 
 // Updates information about the node.
-// `flags` may be any of NODE_ATTRIBUTE_FLAG_*.
+// `flags` may be any of `NODE_ATTRIBUTE_FLAG_*`.
 //
-// This method requires following rights: OPEN_RIGHT_WRITABLE.
+// This method requires following rights: `OPEN_RIGHT_WRITABLE`.
 func (p *NodeInterface) SetAttr(flags uint32, attributes NodeAttributes) (int32, error) {
 	req_ := &nodeSetAttrRequest{
 		Flags:      flags,
 		Attributes: attributes,
 	}
 	resp_ := &nodeSetAttrResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(NodeSetAttrOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(NodeSetAttrGenOrdinal, req_, resp_)
 	return resp_.S, err
 }
 
@@ -690,7 +682,7 @@
 		In:      in,
 	}
 	resp_ := &nodeIoctlResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(NodeIoctlOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(NodeIoctlGenOrdinal, req_, resp_)
 	return resp_.S, resp_.Handles, resp_.Out, err
 }
 
@@ -699,19 +691,19 @@
 	// Create another connection to the same remote object.
 	//
 	// `flags` may be any of:
-	// - OPEN_RIGHT_*
-	// - OPEN_FLAG_APPEND
-	// - OPEN_FLAG_NO_REMOTE
-	// - OPEN_FLAG_DESCRIBE
-	// - CLONE_FLAG_SAME_RIGHTS
+	// - `OPEN_RIGHT_*`
+	// - `OPEN_FLAG_APPEND`
+	// - `OPEN_FLAG_NO_REMOTE`
+	// - `OPEN_FLAG_DESCRIBE`
+	// - `CLONE_FLAG_SAME_RIGHTS`
 	//
 	// All other flags are ignored.
 	//
-	// The OPEN_RIGHT_* bits in `flags` request corresponding rights over the resulting
+	// The `OPEN_RIGHT_*` bits in `flags` request corresponding rights over the resulting
 	// cloned object.
 	// The cloned object must have rights less than or equal to the original object.
-	// Alternatively, pass CLONE_FLAG_SAME_RIGHTS to inherit the rights on the source connection.
-	// It is invalid to pass any of the OPEN_RIGHT_* flags together with CLONE_FLAG_SAME_RIGHTS.
+	// Alternatively, pass `CLONE_FLAG_SAME_RIGHTS` to inherit the rights on the source connection.
+	// It is invalid to pass any of the `OPEN_RIGHT_*` flags together with `CLONE_FLAG_SAME_RIGHTS`.
 	Clone(flags uint32, object NodeInterfaceRequest) error
 	// Terminates connection with object.
 	//
@@ -736,9 +728,9 @@
 	// This method does not require any rights.
 	GetAttr() (int32, NodeAttributes, error)
 	// Updates information about the node.
-	// `flags` may be any of NODE_ATTRIBUTE_FLAG_*.
+	// `flags` may be any of `NODE_ATTRIBUTE_FLAG_*`.
 	//
-	// This method requires following rights: OPEN_RIGHT_WRITABLE.
+	// This method requires following rights: `OPEN_RIGHT_WRITABLE`.
 	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)
@@ -759,35 +751,35 @@
 
 func (s_ *NodeStub) Dispatch(ordinal_ uint64, data_ []byte, handles_ []_zx.Handle) (_bindings.Message, error) {
 	switch ordinal_ {
-	case NodeCloneOrdinal:
+	case NodeCloneGenOrdinal:
 		in_ := nodeCloneRequest{}
 		if _, _, err_ := _bindings.Unmarshal(data_, handles_, &in_); err_ != nil {
 			return nil, err_
 		}
 		err_ := s_.Impl.Clone(in_.Flags, in_.Object)
 		return nil, err_
-	case NodeCloseOrdinal:
+	case NodeCloseGenOrdinal:
 		s, err_ := s_.Impl.Close()
 		out_ := nodeCloseResponse{}
 		out_.S = s
 		return &out_, err_
-	case NodeDescribeOrdinal:
+	case NodeDescribeGenOrdinal:
 		info, err_ := s_.Impl.Describe()
 		out_ := nodeDescribeResponse{}
 		out_.Info = info
 		return &out_, err_
-	case NodeSyncOrdinal:
+	case NodeSyncGenOrdinal:
 		s, err_ := s_.Impl.Sync()
 		out_ := nodeSyncResponse{}
 		out_.S = s
 		return &out_, err_
-	case NodeGetAttrOrdinal:
+	case NodeGetAttrGenOrdinal:
 		s, attributes, err_ := s_.Impl.GetAttr()
 		out_ := nodeGetAttrResponse{}
 		out_.S = s
 		out_.Attributes = attributes
 		return &out_, err_
-	case NodeSetAttrOrdinal:
+	case NodeSetAttrGenOrdinal:
 		in_ := nodeSetAttrRequest{}
 		if _, _, err_ := _bindings.Unmarshal(data_, handles_, &in_); err_ != nil {
 			return nil, err_
@@ -796,7 +788,7 @@
 		out_ := nodeSetAttrResponse{}
 		out_.S = s
 		return &out_, err_
-	case NodeIoctlOrdinal:
+	case NodeIoctlGenOrdinal:
 		in_ := nodeIoctlRequest{}
 		if _, _, err_ := _bindings.Unmarshal(data_, handles_, &in_); err_ != nil {
 			return nil, err_
@@ -831,44 +823,27 @@
 		S:    s,
 		Info: info,
 	}
-	return ((*_bindings.ChannelProxy)(p)).Send(NodeOnOpenOrdinal, event_)
+	return ((*_bindings.ChannelProxy)(p)).Send(NodeOnOpenGenOrdinal, event_)
 }
 
 const (
-	FileCloneOrdinal        uint64 = 402549324 << 32
-	FileCloneGenOrdinal     uint64 = 402549324 << 32
-	FileCloseOrdinal        uint64 = 1387878023 << 32
-	FileCloseGenOrdinal     uint64 = 1387878023 << 32
-	FileDescribeOrdinal     uint64 = 526573406 << 32
-	FileDescribeGenOrdinal  uint64 = 526573406 << 32
-	FileOnOpenOrdinal       uint64 = 1191225277 << 32
-	FileOnOpenGenOrdinal    uint64 = 1191225277 << 32
-	FileSyncOrdinal         uint64 = 1648508842 << 32
-	FileSyncGenOrdinal      uint64 = 1648508842 << 32
-	FileGetAttrOrdinal      uint64 = 1166403528 << 32
-	FileGetAttrGenOrdinal   uint64 = 1166403528 << 32
-	FileSetAttrOrdinal      uint64 = 198530458 << 32
-	FileSetAttrGenOrdinal   uint64 = 198530458 << 32
-	FileIoctlOrdinal        uint64 = 905161895 << 32
-	FileIoctlGenOrdinal     uint64 = 905161895 << 32
-	FileReadOrdinal         uint64 = 636961156 << 32
-	FileReadGenOrdinal      uint64 = 636961156 << 32
-	FileReadAtOrdinal       uint64 = 2087865796 << 32
-	FileReadAtGenOrdinal    uint64 = 2087865796 << 32
-	FileWriteOrdinal        uint64 = 85125024 << 32
-	FileWriteGenOrdinal     uint64 = 85125024 << 32
-	FileWriteAtOrdinal      uint64 = 1045766885 << 32
-	FileWriteAtGenOrdinal   uint64 = 1045766885 << 32
-	FileSeekOrdinal         uint64 = 2016048965 << 32
-	FileSeekGenOrdinal      uint64 = 2016048965 << 32
-	FileTruncateOrdinal     uint64 = 1118517818 << 32
-	FileTruncateGenOrdinal  uint64 = 1118517818 << 32
-	FileGetFlagsOrdinal     uint64 = 1679205366 << 32
-	FileGetFlagsGenOrdinal  uint64 = 1679205366 << 32
-	FileSetFlagsOrdinal     uint64 = 1059310710 << 32
-	FileSetFlagsGenOrdinal  uint64 = 1059310710 << 32
-	FileGetBufferOrdinal    uint64 = 1958938995 << 32
-	FileGetBufferGenOrdinal uint64 = 1958938995 << 32
+	FileCloneGenOrdinal     uint64 = 0x17fe6a4c00000000
+	FileCloseGenOrdinal     uint64 = 0x52b9568700000000
+	FileDescribeGenOrdinal  uint64 = 0x1f62df5e00000000
+	FileOnOpenGenOrdinal    uint64 = 0x4700a7bd00000000
+	FileSyncGenOrdinal      uint64 = 0x62423faa00000000
+	FileGetAttrGenOrdinal   uint64 = 0x4585e7c800000000
+	FileSetAttrGenOrdinal   uint64 = 0xbd5559a00000000
+	FileIoctlGenOrdinal     uint64 = 0x35f3aca700000000
+	FileReadGenOrdinal      uint64 = 0x25f7418400000000
+	FileReadAtGenOrdinal    uint64 = 0x7c724dc400000000
+	FileWriteGenOrdinal     uint64 = 0x512e7a000000000
+	FileWriteAtGenOrdinal   uint64 = 0x3e5522e500000000
+	FileSeekGenOrdinal      uint64 = 0x782a774500000000
+	FileTruncateGenOrdinal  uint64 = 0x42ab3a3a00000000
+	FileGetFlagsGenOrdinal  uint64 = 0x6416a3f600000000
+	FileSetFlagsGenOrdinal  uint64 = 0x3f23cc7600000000
+	FileGetBufferGenOrdinal uint64 = 0x74c3097300000000
 )
 
 type fileCloneRequest struct {
@@ -1192,25 +1167,25 @@
 // Create another connection to the same remote object.
 //
 // `flags` may be any of:
-// - OPEN_RIGHT_*
-// - OPEN_FLAG_APPEND
-// - OPEN_FLAG_NO_REMOTE
-// - OPEN_FLAG_DESCRIBE
-// - CLONE_FLAG_SAME_RIGHTS
+// - `OPEN_RIGHT_*`
+// - `OPEN_FLAG_APPEND`
+// - `OPEN_FLAG_NO_REMOTE`
+// - `OPEN_FLAG_DESCRIBE`
+// - `CLONE_FLAG_SAME_RIGHTS`
 //
 // All other flags are ignored.
 //
-// The OPEN_RIGHT_* bits in `flags` request corresponding rights over the resulting
+// The `OPEN_RIGHT_*` bits in `flags` request corresponding rights over the resulting
 // cloned object.
 // The cloned object must have rights less than or equal to the original object.
-// Alternatively, pass CLONE_FLAG_SAME_RIGHTS to inherit the rights on the source connection.
-// It is invalid to pass any of the OPEN_RIGHT_* flags together with CLONE_FLAG_SAME_RIGHTS.
+// Alternatively, pass `CLONE_FLAG_SAME_RIGHTS` to inherit the rights on the source connection.
+// It is invalid to pass any of the `OPEN_RIGHT_*` flags together with `CLONE_FLAG_SAME_RIGHTS`.
 func (p *FileInterface) Clone(flags uint32, object NodeInterfaceRequest) error {
 	req_ := &fileCloneRequest{
 		Flags:  flags,
 		Object: object,
 	}
-	err := ((*_bindings.ChannelProxy)(p)).Send(FileCloneOrdinal, req_)
+	err := ((*_bindings.ChannelProxy)(p)).Send(FileCloneGenOrdinal, req_)
 	return err
 }
 
@@ -1220,7 +1195,7 @@
 func (p *FileInterface) Close() (int32, error) {
 	var req_ _bindings.Message
 	resp_ := &fileCloseResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(FileCloseOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(FileCloseGenOrdinal, req_, resp_)
 	return resp_.S, err
 }
 
@@ -1231,7 +1206,7 @@
 func (p *FileInterface) Describe() (NodeInfo, error) {
 	var req_ _bindings.Message
 	resp_ := &fileDescribeResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(FileDescribeOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(FileDescribeGenOrdinal, req_, resp_)
 	return resp_.Info, err
 }
 
@@ -1242,7 +1217,7 @@
 // (the same as would be returned by `Describe`).
 func (p *FileInterface) ExpectOnOpen() (int32, *NodeInfo, error) {
 	resp_ := &fileOnOpenResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Recv(FileOnOpenOrdinal, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Recv(FileOnOpenGenOrdinal, resp_)
 	return resp_.S, resp_.Info, err
 }
 
@@ -1252,7 +1227,7 @@
 func (p *FileInterface) Sync() (int32, error) {
 	var req_ _bindings.Message
 	resp_ := &fileSyncResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(FileSyncOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(FileSyncGenOrdinal, req_, resp_)
 	return resp_.S, err
 }
 
@@ -1262,21 +1237,21 @@
 func (p *FileInterface) GetAttr() (int32, NodeAttributes, error) {
 	var req_ _bindings.Message
 	resp_ := &fileGetAttrResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(FileGetAttrOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(FileGetAttrGenOrdinal, req_, resp_)
 	return resp_.S, resp_.Attributes, err
 }
 
 // Updates information about the node.
-// `flags` may be any of NODE_ATTRIBUTE_FLAG_*.
+// `flags` may be any of `NODE_ATTRIBUTE_FLAG_*`.
 //
-// This method requires following rights: OPEN_RIGHT_WRITABLE.
+// This method requires following rights: `OPEN_RIGHT_WRITABLE`.
 func (p *FileInterface) SetAttr(flags uint32, attributes NodeAttributes) (int32, error) {
 	req_ := &fileSetAttrRequest{
 		Flags:      flags,
 		Attributes: attributes,
 	}
 	resp_ := &fileSetAttrResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(FileSetAttrOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(FileSetAttrGenOrdinal, req_, resp_)
 	return resp_.S, err
 }
 
@@ -1289,61 +1264,61 @@
 		In:      in,
 	}
 	resp_ := &fileIoctlResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(FileIoctlOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(FileIoctlGenOrdinal, req_, resp_)
 	return resp_.S, resp_.Handles, resp_.Out, err
 }
 
 // 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.
+// This method requires following rights: `OPEN_RIGHT_READABLE`.
 func (p *FileInterface) Read(count uint64) (int32, []uint8, error) {
 	req_ := &fileReadRequest{
 		Count: count,
 	}
 	resp_ := &fileReadResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(FileReadOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(FileReadGenOrdinal, req_, resp_)
 	return resp_.S, resp_.Data, err
 }
 
 // Reads 'count' bytes at the provided offset.
 // Does not affect the seek offset.
 //
-// This method requires following rights: OPEN_RIGHT_READABLE.
+// This method requires following rights: `OPEN_RIGHT_READABLE`.
 func (p *FileInterface) ReadAt(count uint64, offset uint64) (int32, []uint8, error) {
 	req_ := &fileReadAtRequest{
 		Count:  count,
 		Offset: offset,
 	}
 	resp_ := &fileReadAtResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(FileReadAtOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(FileReadAtGenOrdinal, req_, resp_)
 	return resp_.S, resp_.Data, err
 }
 
 // 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.
+// This method requires following rights: `OPEN_RIGHT_WRITABLE`.
 func (p *FileInterface) Write(data []uint8) (int32, uint64, error) {
 	req_ := &fileWriteRequest{
 		Data: data,
 	}
 	resp_ := &fileWriteResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(FileWriteOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(FileWriteGenOrdinal, req_, resp_)
 	return resp_.S, resp_.Actual, err
 }
 
 // Writes data to the provided offset.
 // Does not affect the seek offset.
 //
-// This method requires following rights: OPEN_RIGHT_WRITABLE.
+// This method requires following rights: `OPEN_RIGHT_WRITABLE`.
 func (p *FileInterface) WriteAt(data []uint8, offset uint64) (int32, uint64, error) {
 	req_ := &fileWriteAtRequest{
 		Data:   data,
 		Offset: offset,
 	}
 	resp_ := &fileWriteAtResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(FileWriteAtOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(FileWriteAtGenOrdinal, req_, resp_)
 	return resp_.S, resp_.Actual, err
 }
 
@@ -1357,19 +1332,19 @@
 		Start:  start,
 	}
 	resp_ := &fileSeekResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(FileSeekOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(FileSeekGenOrdinal, req_, resp_)
 	return resp_.S, resp_.Offset, err
 }
 
 // Shrinks the file size to 'length' bytes.
 //
-// This method requires following rights: OPEN_RIGHT_WRITABLE.
+// This method requires following rights: `OPEN_RIGHT_WRITABLE`.
 func (p *FileInterface) Truncate(length uint64) (int32, error) {
 	req_ := &fileTruncateRequest{
 		Length: length,
 	}
 	resp_ := &fileTruncateResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(FileTruncateOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(FileTruncateGenOrdinal, req_, resp_)
 	return resp_.S, err
 }
 
@@ -1379,13 +1354,13 @@
 func (p *FileInterface) GetFlags() (int32, uint32, error) {
 	var req_ _bindings.Message
 	resp_ := &fileGetFlagsResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(FileGetFlagsOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(FileGetFlagsGenOrdinal, req_, resp_)
 	return resp_.S, resp_.Flags, err
 }
 
 // Changes the Directory::Open flags used to access the file.
 // Supported flags which can be turned on / off:
-// - OPEN_FLAG_APPEND
+// - `OPEN_FLAG_APPEND`
 //
 // This method does not require any rights.
 func (p *FileInterface) SetFlags(flags uint32) (int32, error) {
@@ -1393,24 +1368,24 @@
 		Flags: flags,
 	}
 	resp_ := &fileSetFlagsResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(FileSetFlagsOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(FileSetFlagsGenOrdinal, req_, resp_)
 	return resp_.S, err
 }
 
 // Acquires a buffer representing this file, if there is one, with the
 // requested access rights.
 //
-// `flags` may be any of VMO_FLAG_*.
+// `flags` may be any of `VMO_FLAG_*`.
 //
 // This method requires following rights:
-// - OPEN_RIGHT_WRITABLE if `flags` includes VMO_FLAG_WRITE.
-// - OPEN_RIGHT_READABLE if `flags` includes VMO_FLAG_READ or VMO_FLAG_EXEC.
+// - `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{
 		Flags: flags,
 	}
 	resp_ := &fileGetBufferResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(FileGetBufferOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(FileGetBufferGenOrdinal, req_, resp_)
 	return resp_.S, resp_.Buffer, err
 }
 
@@ -1419,19 +1394,19 @@
 	// Create another connection to the same remote object.
 	//
 	// `flags` may be any of:
-	// - OPEN_RIGHT_*
-	// - OPEN_FLAG_APPEND
-	// - OPEN_FLAG_NO_REMOTE
-	// - OPEN_FLAG_DESCRIBE
-	// - CLONE_FLAG_SAME_RIGHTS
+	// - `OPEN_RIGHT_*`
+	// - `OPEN_FLAG_APPEND`
+	// - `OPEN_FLAG_NO_REMOTE`
+	// - `OPEN_FLAG_DESCRIBE`
+	// - `CLONE_FLAG_SAME_RIGHTS`
 	//
 	// All other flags are ignored.
 	//
-	// The OPEN_RIGHT_* bits in `flags` request corresponding rights over the resulting
+	// The `OPEN_RIGHT_*` bits in `flags` request corresponding rights over the resulting
 	// cloned object.
 	// The cloned object must have rights less than or equal to the original object.
-	// Alternatively, pass CLONE_FLAG_SAME_RIGHTS to inherit the rights on the source connection.
-	// It is invalid to pass any of the OPEN_RIGHT_* flags together with CLONE_FLAG_SAME_RIGHTS.
+	// Alternatively, pass `CLONE_FLAG_SAME_RIGHTS` to inherit the rights on the source connection.
+	// It is invalid to pass any of the `OPEN_RIGHT_*` flags together with `CLONE_FLAG_SAME_RIGHTS`.
 	Clone(flags uint32, object NodeInterfaceRequest) error
 	// Terminates connection with object.
 	//
@@ -1456,31 +1431,31 @@
 	// This method does not require any rights.
 	GetAttr() (int32, NodeAttributes, error)
 	// Updates information about the node.
-	// `flags` may be any of NODE_ATTRIBUTE_FLAG_*.
+	// `flags` may be any of `NODE_ATTRIBUTE_FLAG_*`.
 	//
-	// This method requires following rights: OPEN_RIGHT_WRITABLE.
+	// This method requires following rights: `OPEN_RIGHT_WRITABLE`.
 	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)
 	// 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.
+	// This method requires following rights: `OPEN_RIGHT_READABLE`.
 	Read(count uint64) (int32, []uint8, error)
 	// Reads 'count' bytes at the provided offset.
 	// Does not affect the seek offset.
 	//
-	// This method requires following rights: OPEN_RIGHT_READABLE.
+	// This method requires following rights: `OPEN_RIGHT_READABLE`.
 	ReadAt(count uint64, offset uint64) (int32, []uint8, error)
 	// 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.
+	// This method requires following rights: `OPEN_RIGHT_WRITABLE`.
 	Write(data []uint8) (int32, uint64, error)
 	// Writes data to the provided offset.
 	// Does not affect the seek offset.
 	//
-	// This method requires following rights: OPEN_RIGHT_WRITABLE.
+	// This method requires following rights: `OPEN_RIGHT_WRITABLE`.
 	WriteAt(data []uint8, offset uint64) (int32, uint64, error)
 	// Moves the offset at which the next invocation of `Read()` or `Write()` will
 	// occur.
@@ -1489,7 +1464,7 @@
 	Seek(offset int64, start SeekOrigin) (int32, uint64, error)
 	// Shrinks the file size to 'length' bytes.
 	//
-	// This method requires following rights: OPEN_RIGHT_WRITABLE.
+	// This method requires following rights: `OPEN_RIGHT_WRITABLE`.
 	Truncate(length uint64) (int32, error)
 	// Acquires the Directory::Open rights and flags used to access this file.
 	//
@@ -1497,18 +1472,18 @@
 	GetFlags() (int32, uint32, error)
 	// Changes the Directory::Open flags used to access the file.
 	// Supported flags which can be turned on / off:
-	// - OPEN_FLAG_APPEND
+	// - `OPEN_FLAG_APPEND`
 	//
 	// This method does not require any rights.
 	SetFlags(flags uint32) (int32, error)
 	// Acquires a buffer representing this file, if there is one, with the
 	// requested access rights.
 	//
-	// `flags` may be any of VMO_FLAG_*.
+	// `flags` may be any of `VMO_FLAG_*`.
 	//
 	// This method requires following rights:
-	// - OPEN_RIGHT_WRITABLE if `flags` includes VMO_FLAG_WRITE.
-	// - OPEN_RIGHT_READABLE if `flags` includes VMO_FLAG_READ or VMO_FLAG_EXEC.
+	// - `OPEN_RIGHT_WRITABLE` if `flags` includes `VMO_FLAG_WRITE`.
+	// - `OPEN_RIGHT_READABLE` if `flags` includes `VMO_FLAG_READ` or `VMO_FLAG_EXEC`.
 	GetBuffer(flags uint32) (int32, *fuchsiamem.Buffer, error)
 }
 
@@ -1527,35 +1502,35 @@
 
 func (s_ *FileStub) Dispatch(ordinal_ uint64, data_ []byte, handles_ []_zx.Handle) (_bindings.Message, error) {
 	switch ordinal_ {
-	case FileCloneOrdinal:
+	case FileCloneGenOrdinal:
 		in_ := fileCloneRequest{}
 		if _, _, err_ := _bindings.Unmarshal(data_, handles_, &in_); err_ != nil {
 			return nil, err_
 		}
 		err_ := s_.Impl.Clone(in_.Flags, in_.Object)
 		return nil, err_
-	case FileCloseOrdinal:
+	case FileCloseGenOrdinal:
 		s, err_ := s_.Impl.Close()
 		out_ := fileCloseResponse{}
 		out_.S = s
 		return &out_, err_
-	case FileDescribeOrdinal:
+	case FileDescribeGenOrdinal:
 		info, err_ := s_.Impl.Describe()
 		out_ := fileDescribeResponse{}
 		out_.Info = info
 		return &out_, err_
-	case FileSyncOrdinal:
+	case FileSyncGenOrdinal:
 		s, err_ := s_.Impl.Sync()
 		out_ := fileSyncResponse{}
 		out_.S = s
 		return &out_, err_
-	case FileGetAttrOrdinal:
+	case FileGetAttrGenOrdinal:
 		s, attributes, err_ := s_.Impl.GetAttr()
 		out_ := fileGetAttrResponse{}
 		out_.S = s
 		out_.Attributes = attributes
 		return &out_, err_
-	case FileSetAttrOrdinal:
+	case FileSetAttrGenOrdinal:
 		in_ := fileSetAttrRequest{}
 		if _, _, err_ := _bindings.Unmarshal(data_, handles_, &in_); err_ != nil {
 			return nil, err_
@@ -1564,7 +1539,7 @@
 		out_ := fileSetAttrResponse{}
 		out_.S = s
 		return &out_, err_
-	case FileIoctlOrdinal:
+	case FileIoctlGenOrdinal:
 		in_ := fileIoctlRequest{}
 		if _, _, err_ := _bindings.Unmarshal(data_, handles_, &in_); err_ != nil {
 			return nil, err_
@@ -1575,7 +1550,7 @@
 		out_.Handles = handles
 		out_.Out = out
 		return &out_, err_
-	case FileReadOrdinal:
+	case FileReadGenOrdinal:
 		in_ := fileReadRequest{}
 		if _, _, err_ := _bindings.Unmarshal(data_, handles_, &in_); err_ != nil {
 			return nil, err_
@@ -1585,7 +1560,7 @@
 		out_.S = s
 		out_.Data = data
 		return &out_, err_
-	case FileReadAtOrdinal:
+	case FileReadAtGenOrdinal:
 		in_ := fileReadAtRequest{}
 		if _, _, err_ := _bindings.Unmarshal(data_, handles_, &in_); err_ != nil {
 			return nil, err_
@@ -1595,7 +1570,7 @@
 		out_.S = s
 		out_.Data = data
 		return &out_, err_
-	case FileWriteOrdinal:
+	case FileWriteGenOrdinal:
 		in_ := fileWriteRequest{}
 		if _, _, err_ := _bindings.Unmarshal(data_, handles_, &in_); err_ != nil {
 			return nil, err_
@@ -1605,7 +1580,7 @@
 		out_.S = s
 		out_.Actual = actual
 		return &out_, err_
-	case FileWriteAtOrdinal:
+	case FileWriteAtGenOrdinal:
 		in_ := fileWriteAtRequest{}
 		if _, _, err_ := _bindings.Unmarshal(data_, handles_, &in_); err_ != nil {
 			return nil, err_
@@ -1615,7 +1590,7 @@
 		out_.S = s
 		out_.Actual = actual
 		return &out_, err_
-	case FileSeekOrdinal:
+	case FileSeekGenOrdinal:
 		in_ := fileSeekRequest{}
 		if _, _, err_ := _bindings.Unmarshal(data_, handles_, &in_); err_ != nil {
 			return nil, err_
@@ -1625,7 +1600,7 @@
 		out_.S = s
 		out_.Offset = offset
 		return &out_, err_
-	case FileTruncateOrdinal:
+	case FileTruncateGenOrdinal:
 		in_ := fileTruncateRequest{}
 		if _, _, err_ := _bindings.Unmarshal(data_, handles_, &in_); err_ != nil {
 			return nil, err_
@@ -1634,13 +1609,13 @@
 		out_ := fileTruncateResponse{}
 		out_.S = s
 		return &out_, err_
-	case FileGetFlagsOrdinal:
+	case FileGetFlagsGenOrdinal:
 		s, flags, err_ := s_.Impl.GetFlags()
 		out_ := fileGetFlagsResponse{}
 		out_.S = s
 		out_.Flags = flags
 		return &out_, err_
-	case FileSetFlagsOrdinal:
+	case FileSetFlagsGenOrdinal:
 		in_ := fileSetFlagsRequest{}
 		if _, _, err_ := _bindings.Unmarshal(data_, handles_, &in_); err_ != nil {
 			return nil, err_
@@ -1649,7 +1624,7 @@
 		out_ := fileSetFlagsResponse{}
 		out_.S = s
 		return &out_, err_
-	case FileGetBufferOrdinal:
+	case FileGetBufferGenOrdinal:
 		in_ := fileGetBufferRequest{}
 		if _, _, err_ := _bindings.Unmarshal(data_, handles_, &in_); err_ != nil {
 			return nil, err_
@@ -1683,12 +1658,11 @@
 		S:    s,
 		Info: info,
 	}
-	return ((*_bindings.ChannelProxy)(p)).Send(FileOnOpenOrdinal, event_)
+	return ((*_bindings.ChannelProxy)(p)).Send(FileOnOpenGenOrdinal, event_)
 }
 
 const (
-	DirectoryWatcherOnEventOrdinal    uint64 = 546032797 << 32
-	DirectoryWatcherOnEventGenOrdinal uint64 = 546032797 << 32
+	DirectoryWatcherOnEventGenOrdinal uint64 = 0x208bcc9d00000000
 )
 
 type directoryWatcherOnEventRequest struct {
@@ -1708,7 +1682,7 @@
 	req_ := &directoryWatcherOnEventRequest{
 		Events: events,
 	}
-	err := ((*_bindings.ChannelProxy)(p)).Send(DirectoryWatcherOnEventOrdinal, req_)
+	err := ((*_bindings.ChannelProxy)(p)).Send(DirectoryWatcherOnEventGenOrdinal, req_)
 	return err
 }
 
@@ -1735,7 +1709,7 @@
 
 func (s_ *DirectoryWatcherStub) Dispatch(ordinal_ uint64, data_ []byte, handles_ []_zx.Handle) (_bindings.Message, error) {
 	switch ordinal_ {
-	case DirectoryWatcherOnEventOrdinal:
+	case DirectoryWatcherOnEventGenOrdinal:
 		in_ := directoryWatcherOnEventRequest{}
 		if _, _, err_ := _bindings.Unmarshal(data_, handles_, &in_); err_ != nil {
 			return nil, err_
@@ -1762,38 +1736,22 @@
 type DirectoryWatcherEventProxy _bindings.ChannelProxy
 
 const (
-	DirectoryCloneOrdinal          uint64 = 402549324 << 32
-	DirectoryCloneGenOrdinal       uint64 = 402549324 << 32
-	DirectoryCloseOrdinal          uint64 = 1387878023 << 32
-	DirectoryCloseGenOrdinal       uint64 = 1387878023 << 32
-	DirectoryDescribeOrdinal       uint64 = 526573406 << 32
-	DirectoryDescribeGenOrdinal    uint64 = 526573406 << 32
-	DirectoryOnOpenOrdinal         uint64 = 1191225277 << 32
-	DirectoryOnOpenGenOrdinal      uint64 = 1191225277 << 32
-	DirectorySyncOrdinal           uint64 = 1648508842 << 32
-	DirectorySyncGenOrdinal        uint64 = 1648508842 << 32
-	DirectoryGetAttrOrdinal        uint64 = 1166403528 << 32
-	DirectoryGetAttrGenOrdinal     uint64 = 1166403528 << 32
-	DirectorySetAttrOrdinal        uint64 = 198530458 << 32
-	DirectorySetAttrGenOrdinal     uint64 = 198530458 << 32
-	DirectoryIoctlOrdinal          uint64 = 905161895 << 32
-	DirectoryIoctlGenOrdinal       uint64 = 905161895 << 32
-	DirectoryOpenOrdinal           uint64 = 2011483371 << 32
-	DirectoryOpenGenOrdinal        uint64 = 2011483371 << 32
-	DirectoryUnlinkOrdinal         uint64 = 750443289 << 32
-	DirectoryUnlinkGenOrdinal      uint64 = 750443289 << 32
-	DirectoryReadDirentsOrdinal    uint64 = 782580781 << 32
-	DirectoryReadDirentsGenOrdinal uint64 = 782580781 << 32
-	DirectoryRewindOrdinal         uint64 = 1886584199 << 32
-	DirectoryRewindGenOrdinal      uint64 = 1886584199 << 32
-	DirectoryGetTokenOrdinal       uint64 = 840416493 << 32
-	DirectoryGetTokenGenOrdinal    uint64 = 840416493 << 32
-	DirectoryRenameOrdinal         uint64 = 1251258540 << 32
-	DirectoryRenameGenOrdinal      uint64 = 1251258540 << 32
-	DirectoryLinkOrdinal           uint64 = 462052964 << 32
-	DirectoryLinkGenOrdinal        uint64 = 462052964 << 32
-	DirectoryWatchOrdinal          uint64 = 1522700084 << 32
-	DirectoryWatchGenOrdinal       uint64 = 1522700084 << 32
+	DirectoryCloneGenOrdinal       uint64 = 0x17fe6a4c00000000
+	DirectoryCloseGenOrdinal       uint64 = 0x52b9568700000000
+	DirectoryDescribeGenOrdinal    uint64 = 0x1f62df5e00000000
+	DirectoryOnOpenGenOrdinal      uint64 = 0x4700a7bd00000000
+	DirectorySyncGenOrdinal        uint64 = 0x62423faa00000000
+	DirectoryGetAttrGenOrdinal     uint64 = 0x4585e7c800000000
+	DirectorySetAttrGenOrdinal     uint64 = 0xbd5559a00000000
+	DirectoryIoctlGenOrdinal       uint64 = 0x35f3aca700000000
+	DirectoryOpenGenOrdinal        uint64 = 0x77e4cceb00000000
+	DirectoryUnlinkGenOrdinal      uint64 = 0x2cbadb1900000000
+	DirectoryReadDirentsGenOrdinal uint64 = 0x2ea53c2d00000000
+	DirectoryRewindGenOrdinal      uint64 = 0x7072fd8700000000
+	DirectoryGetTokenGenOrdinal    uint64 = 0x3217bced00000000
+	DirectoryRenameGenOrdinal      uint64 = 0x4a94b0ac00000000
+	DirectoryLinkGenOrdinal        uint64 = 0x1b8a5e6400000000
+	DirectoryWatchGenOrdinal       uint64 = 0x5ac28f3400000000
 )
 
 type directoryCloneRequest struct {
@@ -2074,25 +2032,25 @@
 // Create another connection to the same remote object.
 //
 // `flags` may be any of:
-// - OPEN_RIGHT_*
-// - OPEN_FLAG_APPEND
-// - OPEN_FLAG_NO_REMOTE
-// - OPEN_FLAG_DESCRIBE
-// - CLONE_FLAG_SAME_RIGHTS
+// - `OPEN_RIGHT_*`
+// - `OPEN_FLAG_APPEND`
+// - `OPEN_FLAG_NO_REMOTE`
+// - `OPEN_FLAG_DESCRIBE`
+// - `CLONE_FLAG_SAME_RIGHTS`
 //
 // All other flags are ignored.
 //
-// The OPEN_RIGHT_* bits in `flags` request corresponding rights over the resulting
+// The `OPEN_RIGHT_*` bits in `flags` request corresponding rights over the resulting
 // cloned object.
 // The cloned object must have rights less than or equal to the original object.
-// Alternatively, pass CLONE_FLAG_SAME_RIGHTS to inherit the rights on the source connection.
-// It is invalid to pass any of the OPEN_RIGHT_* flags together with CLONE_FLAG_SAME_RIGHTS.
+// Alternatively, pass `CLONE_FLAG_SAME_RIGHTS` to inherit the rights on the source connection.
+// It is invalid to pass any of the `OPEN_RIGHT_*` flags together with `CLONE_FLAG_SAME_RIGHTS`.
 func (p *DirectoryInterface) Clone(flags uint32, object NodeInterfaceRequest) error {
 	req_ := &directoryCloneRequest{
 		Flags:  flags,
 		Object: object,
 	}
-	err := ((*_bindings.ChannelProxy)(p)).Send(DirectoryCloneOrdinal, req_)
+	err := ((*_bindings.ChannelProxy)(p)).Send(DirectoryCloneGenOrdinal, req_)
 	return err
 }
 
@@ -2102,7 +2060,7 @@
 func (p *DirectoryInterface) Close() (int32, error) {
 	var req_ _bindings.Message
 	resp_ := &directoryCloseResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryCloseOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryCloseGenOrdinal, req_, resp_)
 	return resp_.S, err
 }
 
@@ -2113,7 +2071,7 @@
 func (p *DirectoryInterface) Describe() (NodeInfo, error) {
 	var req_ _bindings.Message
 	resp_ := &directoryDescribeResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryDescribeOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryDescribeGenOrdinal, req_, resp_)
 	return resp_.Info, err
 }
 
@@ -2124,7 +2082,7 @@
 // (the same as would be returned by `Describe`).
 func (p *DirectoryInterface) ExpectOnOpen() (int32, *NodeInfo, error) {
 	resp_ := &directoryOnOpenResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Recv(DirectoryOnOpenOrdinal, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Recv(DirectoryOnOpenGenOrdinal, resp_)
 	return resp_.S, resp_.Info, err
 }
 
@@ -2134,7 +2092,7 @@
 func (p *DirectoryInterface) Sync() (int32, error) {
 	var req_ _bindings.Message
 	resp_ := &directorySyncResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectorySyncOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(DirectorySyncGenOrdinal, req_, resp_)
 	return resp_.S, err
 }
 
@@ -2144,21 +2102,21 @@
 func (p *DirectoryInterface) GetAttr() (int32, NodeAttributes, error) {
 	var req_ _bindings.Message
 	resp_ := &directoryGetAttrResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryGetAttrOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryGetAttrGenOrdinal, req_, resp_)
 	return resp_.S, resp_.Attributes, err
 }
 
 // Updates information about the node.
-// `flags` may be any of NODE_ATTRIBUTE_FLAG_*.
+// `flags` may be any of `NODE_ATTRIBUTE_FLAG_*`.
 //
-// This method requires following rights: OPEN_RIGHT_WRITABLE.
+// This method requires following rights: `OPEN_RIGHT_WRITABLE`.
 func (p *DirectoryInterface) SetAttr(flags uint32, attributes NodeAttributes) (int32, error) {
 	req_ := &directorySetAttrRequest{
 		Flags:      flags,
 		Attributes: attributes,
 	}
 	resp_ := &directorySetAttrResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectorySetAttrOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(DirectorySetAttrGenOrdinal, req_, resp_)
 	return resp_.S, err
 }
 
@@ -2171,7 +2129,7 @@
 		In:      in,
 	}
 	resp_ := &directoryIoctlResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryIoctlOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryIoctlGenOrdinal, req_, resp_)
 	return resp_.S, resp_.Handles, resp_.Out, err
 }
 
@@ -2180,14 +2138,14 @@
 // `path` may contain multiple segments, separated by "/" characters,
 // and should never be empty i.e. "" is an invalid path.
 //
-// `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
+// `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_RIGHTS_* flags provided in `flags` will restrict access rights on the `object` channel
+// `OPEN_RIGHTS_*` flags provided in `flags` will restrict access rights on the `object` channel
 // which will be connected to the opened entity.
 //
 // Rights are never increased. When you open a nested entity within a directory, you may only
@@ -2195,8 +2153,8 @@
 // Exceeding those rights causes an access denied error to be transmitted in the
 // `OnOpen` event if applicable, and the `object` connection closed.
 //
-// The caller must specify either one or more of the OPEN_RIGHT_* flags, or
-// the OPEN_FLAG_NODE_REFERENCE flag.
+// The caller must specify either one or more of the `OPEN_RIGHT_*` flags, or
+// the `OPEN_FLAG_NODE_REFERENCE` flag.
 func (p *DirectoryInterface) Open(flags uint32, mode uint32, path string, object NodeInterfaceRequest) error {
 	req_ := &directoryOpenRequest{
 		Flags:  flags,
@@ -2204,7 +2162,7 @@
 		Path:   path,
 		Object: object,
 	}
-	err := ((*_bindings.ChannelProxy)(p)).Send(DirectoryOpenOrdinal, req_)
+	err := ((*_bindings.ChannelProxy)(p)).Send(DirectoryOpenGenOrdinal, req_)
 	return err
 }
 
@@ -2225,22 +2183,22 @@
 // originally accessed Directory.
 //
 // Returns:
-//   ZX_ERR_ACCESS_DENIED if the connection (or the underlying filesystem) does not
+//   `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 ".".
+//   `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.
 //
-// This method requires following rights: OPEN_RIGHT_WRITABLE.
+// This method requires following rights: `OPEN_RIGHT_WRITABLE`.
 func (p *DirectoryInterface) Unlink(path string) (int32, error) {
 	req_ := &directoryUnlinkRequest{
 		Path: path,
 	}
 	resp_ := &directoryUnlinkResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryUnlinkOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryUnlinkGenOrdinal, req_, resp_)
 	return resp_.S, err
 }
 
@@ -2256,7 +2214,7 @@
 //   // Describes the length of the dirent name.
 //   uint8 size;
 //   // Describes the type of the entry. Aligned with the
-//   /// POSIX d_type values. Use DIRENT_TYPE_* constants.
+//   /// POSIX d_type values. Use `DIRENT_TYPE_*` constants.
 //   uint8 type;
 //   // Unterminated name of entry.
 //   char name[0];
@@ -2269,7 +2227,7 @@
 		MaxBytes: maxBytes,
 	}
 	resp_ := &directoryReadDirentsResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryReadDirentsOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryReadDirentsGenOrdinal, req_, resp_)
 	return resp_.S, resp_.Dirents, err
 }
 
@@ -2279,29 +2237,29 @@
 func (p *DirectoryInterface) Rewind() (int32, error) {
 	var req_ _bindings.Message
 	resp_ := &directoryRewindResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryRewindOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryRewindGenOrdinal, req_, resp_)
 	return resp_.S, err
 }
 
 // Acquires a token to a Directory which can be used to identify
 // access to it at a later point in time.
 //
-// This method requires following rights: OPEN_RIGHT_WRITABLE.
+// This method requires following rights: `OPEN_RIGHT_WRITABLE`.
 func (p *DirectoryInterface) GetToken() (int32, _zx.Handle, error) {
 	var req_ _bindings.Message
 	resp_ := &directoryGetTokenResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryGetTokenOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryGetTokenGenOrdinal, req_, resp_)
 	return resp_.S, resp_.Token, err
 }
 
 // Renames an object named src to the name dst, in a directory represented by token.
 //
 // `src/dst` must be resolved object names. Including "/" in any position
-// other than the end of the string will return ZX_ERR_INVALID_ARGS.
+// other than the end of the string will return `ZX_ERR_INVALID_ARGS`.
 // Returning "/" at the end of either string implies that it must be a
-// directory, or else ZX_ERR_NOT_DIR should be returned.
+// directory, or else `ZX_ERR_NOT_DIR` should be returned.
 //
-// This method requires following rights: OPEN_RIGHT_WRITABLE.
+// This method requires following rights: `OPEN_RIGHT_WRITABLE`.
 func (p *DirectoryInterface) Rename(src string, dstParentToken _zx.Handle, dst string) (int32, error) {
 	req_ := &directoryRenameRequest{
 		Src:            src,
@@ -2309,7 +2267,7 @@
 		Dst:            dst,
 	}
 	resp_ := &directoryRenameResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryRenameOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryRenameGenOrdinal, req_, resp_)
 	return resp_.S, err
 }
 
@@ -2317,12 +2275,12 @@
 // token.
 //
 // `src` must be a resolved object name. Including "/" in the string will
-// return ZX_ERR_INVALID_ARGS.
+// return `ZX_ERR_INVALID_ARGS`.
 //
 // `dst` must be a resolved object name. Including "/" in the string will
-// return ZX_ERR_INVALID_ARGS.
+// return `ZX_ERR_INVALID_ARGS`.
 //
-// This method requires following rights: OPEN_RIGHT_WRITABLE.
+// This method requires following rights: `OPEN_RIGHT_WRITABLE`.
 func (p *DirectoryInterface) Link(src string, dstParentToken _zx.Handle, dst string) (int32, error) {
 	req_ := &directoryLinkRequest{
 		Src:            src,
@@ -2330,7 +2288,7 @@
 		Dst:            dst,
 	}
 	resp_ := &directoryLinkResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryLinkOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryLinkGenOrdinal, req_, resp_)
 	return resp_.S, err
 }
 
@@ -2358,7 +2316,7 @@
 		Watcher: watcher,
 	}
 	resp_ := &directoryWatchResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryWatchOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryWatchGenOrdinal, req_, resp_)
 	return resp_.S, err
 }
 
@@ -2367,19 +2325,19 @@
 	// Create another connection to the same remote object.
 	//
 	// `flags` may be any of:
-	// - OPEN_RIGHT_*
-	// - OPEN_FLAG_APPEND
-	// - OPEN_FLAG_NO_REMOTE
-	// - OPEN_FLAG_DESCRIBE
-	// - CLONE_FLAG_SAME_RIGHTS
+	// - `OPEN_RIGHT_*`
+	// - `OPEN_FLAG_APPEND`
+	// - `OPEN_FLAG_NO_REMOTE`
+	// - `OPEN_FLAG_DESCRIBE`
+	// - `CLONE_FLAG_SAME_RIGHTS`
 	//
 	// All other flags are ignored.
 	//
-	// The OPEN_RIGHT_* bits in `flags` request corresponding rights over the resulting
+	// The `OPEN_RIGHT_*` bits in `flags` request corresponding rights over the resulting
 	// cloned object.
 	// The cloned object must have rights less than or equal to the original object.
-	// Alternatively, pass CLONE_FLAG_SAME_RIGHTS to inherit the rights on the source connection.
-	// It is invalid to pass any of the OPEN_RIGHT_* flags together with CLONE_FLAG_SAME_RIGHTS.
+	// Alternatively, pass `CLONE_FLAG_SAME_RIGHTS` to inherit the rights on the source connection.
+	// It is invalid to pass any of the `OPEN_RIGHT_*` flags together with `CLONE_FLAG_SAME_RIGHTS`.
 	Clone(flags uint32, object NodeInterfaceRequest) error
 	// Terminates connection with object.
 	//
@@ -2404,9 +2362,9 @@
 	// This method does not require any rights.
 	GetAttr() (int32, NodeAttributes, error)
 	// Updates information about the node.
-	// `flags` may be any of NODE_ATTRIBUTE_FLAG_*.
+	// `flags` may be any of `NODE_ATTRIBUTE_FLAG_*`.
 	//
-	// This method requires following rights: OPEN_RIGHT_WRITABLE.
+	// This method requires following rights: `OPEN_RIGHT_WRITABLE`.
 	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)
@@ -2415,14 +2373,14 @@
 	// `path` may contain multiple segments, separated by "/" characters,
 	// and should never be empty i.e. "" is an invalid path.
 	//
-	// `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
+	// `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_RIGHTS_* flags provided in `flags` will restrict access rights on the `object` channel
+	// `OPEN_RIGHTS_*` flags provided in `flags` will restrict access rights on the `object` channel
 	// which will be connected to the opened entity.
 	//
 	// Rights are never increased. When you open a nested entity within a directory, you may only
@@ -2430,8 +2388,8 @@
 	// Exceeding those rights causes an access denied error to be transmitted in the
 	// `OnOpen` event if applicable, and the `object` connection closed.
 	//
-	// The caller must specify either one or more of the OPEN_RIGHT_* flags, or
-	// the OPEN_FLAG_NODE_REFERENCE flag.
+	// The caller must specify either one or more of the `OPEN_RIGHT_*` flags, or
+	// the `OPEN_FLAG_NODE_REFERENCE` flag.
 	Open(flags uint32, mode uint32, path string, object NodeInterfaceRequest) error
 	// Detaches an object from this directory object.
 	//
@@ -2450,16 +2408,16 @@
 	// originally accessed Directory.
 	//
 	// Returns:
-	//   ZX_ERR_ACCESS_DENIED if the connection (or the underlying filesystem) does not
+	//   `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 ".".
+	//   `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.
 	//
-	// This method requires following rights: OPEN_RIGHT_WRITABLE.
+	// This method requires following rights: `OPEN_RIGHT_WRITABLE`.
 	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
@@ -2473,7 +2431,7 @@
 	//   // Describes the length of the dirent name.
 	//   uint8 size;
 	//   // Describes the type of the entry. Aligned with the
-	//   /// POSIX d_type values. Use DIRENT_TYPE_* constants.
+	//   /// POSIX d_type values. Use `DIRENT_TYPE_*` constants.
 	//   uint8 type;
 	//   // Unterminated name of entry.
 	//   char name[0];
@@ -2489,27 +2447,27 @@
 	// Acquires a token to a Directory which can be used to identify
 	// access to it at a later point in time.
 	//
-	// This method requires following rights: OPEN_RIGHT_WRITABLE.
+	// This method requires following rights: `OPEN_RIGHT_WRITABLE`.
 	GetToken() (int32, _zx.Handle, error)
 	// Renames an object named src to the name dst, in a directory represented by token.
 	//
 	// `src/dst` must be resolved object names. Including "/" in any position
-	// other than the end of the string will return ZX_ERR_INVALID_ARGS.
+	// other than the end of the string will return `ZX_ERR_INVALID_ARGS`.
 	// Returning "/" at the end of either string implies that it must be a
-	// directory, or else ZX_ERR_NOT_DIR should be returned.
+	// directory, or else `ZX_ERR_NOT_DIR` should be returned.
 	//
-	// This method requires following rights: OPEN_RIGHT_WRITABLE.
+	// This method requires following rights: `OPEN_RIGHT_WRITABLE`.
 	Rename(src string, dstParentToken _zx.Handle, dst string) (int32, error)
 	// Creates a link to an object named src by the name dst, within a directory represented by
 	// token.
 	//
 	// `src` must be a resolved object name. Including "/" in the string will
-	// return ZX_ERR_INVALID_ARGS.
+	// return `ZX_ERR_INVALID_ARGS`.
 	//
 	// `dst` must be a resolved object name. Including "/" in the string will
-	// return ZX_ERR_INVALID_ARGS.
+	// return `ZX_ERR_INVALID_ARGS`.
 	//
-	// This method requires following rights: OPEN_RIGHT_WRITABLE.
+	// This method requires following rights: `OPEN_RIGHT_WRITABLE`.
 	Link(src string, dstParentToken _zx.Handle, dst string) (int32, error)
 	// Watches a directory, receiving events of added messages on the
 	// watcher request channel.
@@ -2546,35 +2504,35 @@
 
 func (s_ *DirectoryStub) Dispatch(ordinal_ uint64, data_ []byte, handles_ []_zx.Handle) (_bindings.Message, error) {
 	switch ordinal_ {
-	case DirectoryCloneOrdinal:
+	case DirectoryCloneGenOrdinal:
 		in_ := directoryCloneRequest{}
 		if _, _, err_ := _bindings.Unmarshal(data_, handles_, &in_); err_ != nil {
 			return nil, err_
 		}
 		err_ := s_.Impl.Clone(in_.Flags, in_.Object)
 		return nil, err_
-	case DirectoryCloseOrdinal:
+	case DirectoryCloseGenOrdinal:
 		s, err_ := s_.Impl.Close()
 		out_ := directoryCloseResponse{}
 		out_.S = s
 		return &out_, err_
-	case DirectoryDescribeOrdinal:
+	case DirectoryDescribeGenOrdinal:
 		info, err_ := s_.Impl.Describe()
 		out_ := directoryDescribeResponse{}
 		out_.Info = info
 		return &out_, err_
-	case DirectorySyncOrdinal:
+	case DirectorySyncGenOrdinal:
 		s, err_ := s_.Impl.Sync()
 		out_ := directorySyncResponse{}
 		out_.S = s
 		return &out_, err_
-	case DirectoryGetAttrOrdinal:
+	case DirectoryGetAttrGenOrdinal:
 		s, attributes, err_ := s_.Impl.GetAttr()
 		out_ := directoryGetAttrResponse{}
 		out_.S = s
 		out_.Attributes = attributes
 		return &out_, err_
-	case DirectorySetAttrOrdinal:
+	case DirectorySetAttrGenOrdinal:
 		in_ := directorySetAttrRequest{}
 		if _, _, err_ := _bindings.Unmarshal(data_, handles_, &in_); err_ != nil {
 			return nil, err_
@@ -2583,7 +2541,7 @@
 		out_ := directorySetAttrResponse{}
 		out_.S = s
 		return &out_, err_
-	case DirectoryIoctlOrdinal:
+	case DirectoryIoctlGenOrdinal:
 		in_ := directoryIoctlRequest{}
 		if _, _, err_ := _bindings.Unmarshal(data_, handles_, &in_); err_ != nil {
 			return nil, err_
@@ -2594,14 +2552,14 @@
 		out_.Handles = handles
 		out_.Out = out
 		return &out_, err_
-	case DirectoryOpenOrdinal:
+	case DirectoryOpenGenOrdinal:
 		in_ := directoryOpenRequest{}
 		if _, _, err_ := _bindings.Unmarshal(data_, handles_, &in_); err_ != nil {
 			return nil, err_
 		}
 		err_ := s_.Impl.Open(in_.Flags, in_.Mode, in_.Path, in_.Object)
 		return nil, err_
-	case DirectoryUnlinkOrdinal:
+	case DirectoryUnlinkGenOrdinal:
 		in_ := directoryUnlinkRequest{}
 		if _, _, err_ := _bindings.Unmarshal(data_, handles_, &in_); err_ != nil {
 			return nil, err_
@@ -2610,7 +2568,7 @@
 		out_ := directoryUnlinkResponse{}
 		out_.S = s
 		return &out_, err_
-	case DirectoryReadDirentsOrdinal:
+	case DirectoryReadDirentsGenOrdinal:
 		in_ := directoryReadDirentsRequest{}
 		if _, _, err_ := _bindings.Unmarshal(data_, handles_, &in_); err_ != nil {
 			return nil, err_
@@ -2620,18 +2578,18 @@
 		out_.S = s
 		out_.Dirents = dirents
 		return &out_, err_
-	case DirectoryRewindOrdinal:
+	case DirectoryRewindGenOrdinal:
 		s, err_ := s_.Impl.Rewind()
 		out_ := directoryRewindResponse{}
 		out_.S = s
 		return &out_, err_
-	case DirectoryGetTokenOrdinal:
+	case DirectoryGetTokenGenOrdinal:
 		s, token, err_ := s_.Impl.GetToken()
 		out_ := directoryGetTokenResponse{}
 		out_.S = s
 		out_.Token = token
 		return &out_, err_
-	case DirectoryRenameOrdinal:
+	case DirectoryRenameGenOrdinal:
 		in_ := directoryRenameRequest{}
 		if _, _, err_ := _bindings.Unmarshal(data_, handles_, &in_); err_ != nil {
 			return nil, err_
@@ -2640,7 +2598,7 @@
 		out_ := directoryRenameResponse{}
 		out_.S = s
 		return &out_, err_
-	case DirectoryLinkOrdinal:
+	case DirectoryLinkGenOrdinal:
 		in_ := directoryLinkRequest{}
 		if _, _, err_ := _bindings.Unmarshal(data_, handles_, &in_); err_ != nil {
 			return nil, err_
@@ -2649,7 +2607,7 @@
 		out_ := directoryLinkResponse{}
 		out_.S = s
 		return &out_, err_
-	case DirectoryWatchOrdinal:
+	case DirectoryWatchGenOrdinal:
 		in_ := directoryWatchRequest{}
 		if _, _, err_ := _bindings.Unmarshal(data_, handles_, &in_); err_ != nil {
 			return nil, err_
@@ -2682,54 +2640,32 @@
 		S:    s,
 		Info: info,
 	}
-	return ((*_bindings.ChannelProxy)(p)).Send(DirectoryOnOpenOrdinal, event_)
+	return ((*_bindings.ChannelProxy)(p)).Send(DirectoryOnOpenGenOrdinal, event_)
 }
 
 const (
-	DirectoryAdminCloneOrdinal              uint64 = 402549324 << 32
-	DirectoryAdminCloneGenOrdinal           uint64 = 402549324 << 32
-	DirectoryAdminCloseOrdinal              uint64 = 1387878023 << 32
-	DirectoryAdminCloseGenOrdinal           uint64 = 1387878023 << 32
-	DirectoryAdminDescribeOrdinal           uint64 = 526573406 << 32
-	DirectoryAdminDescribeGenOrdinal        uint64 = 526573406 << 32
-	DirectoryAdminOnOpenOrdinal             uint64 = 1191225277 << 32
-	DirectoryAdminOnOpenGenOrdinal          uint64 = 1191225277 << 32
-	DirectoryAdminSyncOrdinal               uint64 = 1648508842 << 32
-	DirectoryAdminSyncGenOrdinal            uint64 = 1648508842 << 32
-	DirectoryAdminGetAttrOrdinal            uint64 = 1166403528 << 32
-	DirectoryAdminGetAttrGenOrdinal         uint64 = 1166403528 << 32
-	DirectoryAdminSetAttrOrdinal            uint64 = 198530458 << 32
-	DirectoryAdminSetAttrGenOrdinal         uint64 = 198530458 << 32
-	DirectoryAdminIoctlOrdinal              uint64 = 905161895 << 32
-	DirectoryAdminIoctlGenOrdinal           uint64 = 905161895 << 32
-	DirectoryAdminOpenOrdinal               uint64 = 2011483371 << 32
-	DirectoryAdminOpenGenOrdinal            uint64 = 2011483371 << 32
-	DirectoryAdminUnlinkOrdinal             uint64 = 750443289 << 32
-	DirectoryAdminUnlinkGenOrdinal          uint64 = 750443289 << 32
-	DirectoryAdminReadDirentsOrdinal        uint64 = 782580781 << 32
-	DirectoryAdminReadDirentsGenOrdinal     uint64 = 782580781 << 32
-	DirectoryAdminRewindOrdinal             uint64 = 1886584199 << 32
-	DirectoryAdminRewindGenOrdinal          uint64 = 1886584199 << 32
-	DirectoryAdminGetTokenOrdinal           uint64 = 840416493 << 32
-	DirectoryAdminGetTokenGenOrdinal        uint64 = 840416493 << 32
-	DirectoryAdminRenameOrdinal             uint64 = 1251258540 << 32
-	DirectoryAdminRenameGenOrdinal          uint64 = 1251258540 << 32
-	DirectoryAdminLinkOrdinal               uint64 = 462052964 << 32
-	DirectoryAdminLinkGenOrdinal            uint64 = 462052964 << 32
-	DirectoryAdminWatchOrdinal              uint64 = 1522700084 << 32
-	DirectoryAdminWatchGenOrdinal           uint64 = 1522700084 << 32
-	DirectoryAdminMountOrdinal              uint64 = 2120159974 << 32
-	DirectoryAdminMountGenOrdinal           uint64 = 2120159974 << 32
-	DirectoryAdminMountAndCreateOrdinal     uint64 = 841348753 << 32
-	DirectoryAdminMountAndCreateGenOrdinal  uint64 = 841348753 << 32
-	DirectoryAdminUnmountOrdinal            uint64 = 620898132 << 32
-	DirectoryAdminUnmountGenOrdinal         uint64 = 620898132 << 32
-	DirectoryAdminUnmountNodeOrdinal        uint64 = 383400103 << 32
-	DirectoryAdminUnmountNodeGenOrdinal     uint64 = 383400103 << 32
-	DirectoryAdminQueryFilesystemOrdinal    uint64 = 1713999250 << 32
-	DirectoryAdminQueryFilesystemGenOrdinal uint64 = 1713999250 << 32
-	DirectoryAdminGetDevicePathOrdinal      uint64 = 787943096 << 32
-	DirectoryAdminGetDevicePathGenOrdinal   uint64 = 787943096 << 32
+	DirectoryAdminCloneGenOrdinal           uint64 = 0x17fe6a4c00000000
+	DirectoryAdminCloseGenOrdinal           uint64 = 0x52b9568700000000
+	DirectoryAdminDescribeGenOrdinal        uint64 = 0x1f62df5e00000000
+	DirectoryAdminOnOpenGenOrdinal          uint64 = 0x4700a7bd00000000
+	DirectoryAdminSyncGenOrdinal            uint64 = 0x62423faa00000000
+	DirectoryAdminGetAttrGenOrdinal         uint64 = 0x4585e7c800000000
+	DirectoryAdminSetAttrGenOrdinal         uint64 = 0xbd5559a00000000
+	DirectoryAdminIoctlGenOrdinal           uint64 = 0x35f3aca700000000
+	DirectoryAdminOpenGenOrdinal            uint64 = 0x77e4cceb00000000
+	DirectoryAdminUnlinkGenOrdinal          uint64 = 0x2cbadb1900000000
+	DirectoryAdminReadDirentsGenOrdinal     uint64 = 0x2ea53c2d00000000
+	DirectoryAdminRewindGenOrdinal          uint64 = 0x7072fd8700000000
+	DirectoryAdminGetTokenGenOrdinal        uint64 = 0x3217bced00000000
+	DirectoryAdminRenameGenOrdinal          uint64 = 0x4a94b0ac00000000
+	DirectoryAdminLinkGenOrdinal            uint64 = 0x1b8a5e6400000000
+	DirectoryAdminWatchGenOrdinal           uint64 = 0x5ac28f3400000000
+	DirectoryAdminMountGenOrdinal           uint64 = 0x7e5f12e600000000
+	DirectoryAdminMountAndCreateGenOrdinal  uint64 = 0x3225f69100000000
+	DirectoryAdminUnmountGenOrdinal         uint64 = 0x2502275400000000
+	DirectoryAdminUnmountNodeGenOrdinal     uint64 = 0x16da38a700000000
+	DirectoryAdminQueryFilesystemGenOrdinal uint64 = 0x66298d9200000000
+	DirectoryAdminGetDevicePathGenOrdinal   uint64 = 0x2ef70eb800000000
 )
 
 type directoryAdminCloneRequest struct {
@@ -3103,25 +3039,25 @@
 // Create another connection to the same remote object.
 //
 // `flags` may be any of:
-// - OPEN_RIGHT_*
-// - OPEN_FLAG_APPEND
-// - OPEN_FLAG_NO_REMOTE
-// - OPEN_FLAG_DESCRIBE
-// - CLONE_FLAG_SAME_RIGHTS
+// - `OPEN_RIGHT_*`
+// - `OPEN_FLAG_APPEND`
+// - `OPEN_FLAG_NO_REMOTE`
+// - `OPEN_FLAG_DESCRIBE`
+// - `CLONE_FLAG_SAME_RIGHTS`
 //
 // All other flags are ignored.
 //
-// The OPEN_RIGHT_* bits in `flags` request corresponding rights over the resulting
+// The `OPEN_RIGHT_*` bits in `flags` request corresponding rights over the resulting
 // cloned object.
 // The cloned object must have rights less than or equal to the original object.
-// Alternatively, pass CLONE_FLAG_SAME_RIGHTS to inherit the rights on the source connection.
-// It is invalid to pass any of the OPEN_RIGHT_* flags together with CLONE_FLAG_SAME_RIGHTS.
+// Alternatively, pass `CLONE_FLAG_SAME_RIGHTS` to inherit the rights on the source connection.
+// It is invalid to pass any of the `OPEN_RIGHT_*` flags together with `CLONE_FLAG_SAME_RIGHTS`.
 func (p *DirectoryAdminInterface) Clone(flags uint32, object NodeInterfaceRequest) error {
 	req_ := &directoryAdminCloneRequest{
 		Flags:  flags,
 		Object: object,
 	}
-	err := ((*_bindings.ChannelProxy)(p)).Send(DirectoryAdminCloneOrdinal, req_)
+	err := ((*_bindings.ChannelProxy)(p)).Send(DirectoryAdminCloneGenOrdinal, req_)
 	return err
 }
 
@@ -3131,7 +3067,7 @@
 func (p *DirectoryAdminInterface) Close() (int32, error) {
 	var req_ _bindings.Message
 	resp_ := &directoryAdminCloseResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminCloseOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminCloseGenOrdinal, req_, resp_)
 	return resp_.S, err
 }
 
@@ -3142,7 +3078,7 @@
 func (p *DirectoryAdminInterface) Describe() (NodeInfo, error) {
 	var req_ _bindings.Message
 	resp_ := &directoryAdminDescribeResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminDescribeOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminDescribeGenOrdinal, req_, resp_)
 	return resp_.Info, err
 }
 
@@ -3153,7 +3089,7 @@
 // (the same as would be returned by `Describe`).
 func (p *DirectoryAdminInterface) ExpectOnOpen() (int32, *NodeInfo, error) {
 	resp_ := &directoryAdminOnOpenResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Recv(DirectoryAdminOnOpenOrdinal, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Recv(DirectoryAdminOnOpenGenOrdinal, resp_)
 	return resp_.S, resp_.Info, err
 }
 
@@ -3163,7 +3099,7 @@
 func (p *DirectoryAdminInterface) Sync() (int32, error) {
 	var req_ _bindings.Message
 	resp_ := &directoryAdminSyncResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminSyncOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminSyncGenOrdinal, req_, resp_)
 	return resp_.S, err
 }
 
@@ -3173,21 +3109,21 @@
 func (p *DirectoryAdminInterface) GetAttr() (int32, NodeAttributes, error) {
 	var req_ _bindings.Message
 	resp_ := &directoryAdminGetAttrResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminGetAttrOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminGetAttrGenOrdinal, req_, resp_)
 	return resp_.S, resp_.Attributes, err
 }
 
 // Updates information about the node.
-// `flags` may be any of NODE_ATTRIBUTE_FLAG_*.
+// `flags` may be any of `NODE_ATTRIBUTE_FLAG_*`.
 //
-// This method requires following rights: OPEN_RIGHT_WRITABLE.
+// This method requires following rights: `OPEN_RIGHT_WRITABLE`.
 func (p *DirectoryAdminInterface) SetAttr(flags uint32, attributes NodeAttributes) (int32, error) {
 	req_ := &directoryAdminSetAttrRequest{
 		Flags:      flags,
 		Attributes: attributes,
 	}
 	resp_ := &directoryAdminSetAttrResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminSetAttrOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminSetAttrGenOrdinal, req_, resp_)
 	return resp_.S, err
 }
 
@@ -3200,7 +3136,7 @@
 		In:      in,
 	}
 	resp_ := &directoryAdminIoctlResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminIoctlOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminIoctlGenOrdinal, req_, resp_)
 	return resp_.S, resp_.Handles, resp_.Out, err
 }
 
@@ -3209,14 +3145,14 @@
 // `path` may contain multiple segments, separated by "/" characters,
 // and should never be empty i.e. "" is an invalid path.
 //
-// `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
+// `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_RIGHTS_* flags provided in `flags` will restrict access rights on the `object` channel
+// `OPEN_RIGHTS_*` flags provided in `flags` will restrict access rights on the `object` channel
 // which will be connected to the opened entity.
 //
 // Rights are never increased. When you open a nested entity within a directory, you may only
@@ -3224,8 +3160,8 @@
 // Exceeding those rights causes an access denied error to be transmitted in the
 // `OnOpen` event if applicable, and the `object` connection closed.
 //
-// The caller must specify either one or more of the OPEN_RIGHT_* flags, or
-// the OPEN_FLAG_NODE_REFERENCE flag.
+// The caller must specify either one or more of the `OPEN_RIGHT_*` flags, or
+// the `OPEN_FLAG_NODE_REFERENCE` flag.
 func (p *DirectoryAdminInterface) Open(flags uint32, mode uint32, path string, object NodeInterfaceRequest) error {
 	req_ := &directoryAdminOpenRequest{
 		Flags:  flags,
@@ -3233,7 +3169,7 @@
 		Path:   path,
 		Object: object,
 	}
-	err := ((*_bindings.ChannelProxy)(p)).Send(DirectoryAdminOpenOrdinal, req_)
+	err := ((*_bindings.ChannelProxy)(p)).Send(DirectoryAdminOpenGenOrdinal, req_)
 	return err
 }
 
@@ -3254,22 +3190,22 @@
 // originally accessed Directory.
 //
 // Returns:
-//   ZX_ERR_ACCESS_DENIED if the connection (or the underlying filesystem) does not
+//   `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 ".".
+//   `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.
 //
-// This method requires following rights: OPEN_RIGHT_WRITABLE.
+// This method requires following rights: `OPEN_RIGHT_WRITABLE`.
 func (p *DirectoryAdminInterface) Unlink(path string) (int32, error) {
 	req_ := &directoryAdminUnlinkRequest{
 		Path: path,
 	}
 	resp_ := &directoryAdminUnlinkResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminUnlinkOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminUnlinkGenOrdinal, req_, resp_)
 	return resp_.S, err
 }
 
@@ -3285,7 +3221,7 @@
 //   // Describes the length of the dirent name.
 //   uint8 size;
 //   // Describes the type of the entry. Aligned with the
-//   /// POSIX d_type values. Use DIRENT_TYPE_* constants.
+//   /// POSIX d_type values. Use `DIRENT_TYPE_*` constants.
 //   uint8 type;
 //   // Unterminated name of entry.
 //   char name[0];
@@ -3298,7 +3234,7 @@
 		MaxBytes: maxBytes,
 	}
 	resp_ := &directoryAdminReadDirentsResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminReadDirentsOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminReadDirentsGenOrdinal, req_, resp_)
 	return resp_.S, resp_.Dirents, err
 }
 
@@ -3308,29 +3244,29 @@
 func (p *DirectoryAdminInterface) Rewind() (int32, error) {
 	var req_ _bindings.Message
 	resp_ := &directoryAdminRewindResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminRewindOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminRewindGenOrdinal, req_, resp_)
 	return resp_.S, err
 }
 
 // Acquires a token to a Directory which can be used to identify
 // access to it at a later point in time.
 //
-// This method requires following rights: OPEN_RIGHT_WRITABLE.
+// This method requires following rights: `OPEN_RIGHT_WRITABLE`.
 func (p *DirectoryAdminInterface) GetToken() (int32, _zx.Handle, error) {
 	var req_ _bindings.Message
 	resp_ := &directoryAdminGetTokenResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminGetTokenOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminGetTokenGenOrdinal, req_, resp_)
 	return resp_.S, resp_.Token, err
 }
 
 // Renames an object named src to the name dst, in a directory represented by token.
 //
 // `src/dst` must be resolved object names. Including "/" in any position
-// other than the end of the string will return ZX_ERR_INVALID_ARGS.
+// other than the end of the string will return `ZX_ERR_INVALID_ARGS`.
 // Returning "/" at the end of either string implies that it must be a
-// directory, or else ZX_ERR_NOT_DIR should be returned.
+// directory, or else `ZX_ERR_NOT_DIR` should be returned.
 //
-// This method requires following rights: OPEN_RIGHT_WRITABLE.
+// This method requires following rights: `OPEN_RIGHT_WRITABLE`.
 func (p *DirectoryAdminInterface) Rename(src string, dstParentToken _zx.Handle, dst string) (int32, error) {
 	req_ := &directoryAdminRenameRequest{
 		Src:            src,
@@ -3338,7 +3274,7 @@
 		Dst:            dst,
 	}
 	resp_ := &directoryAdminRenameResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminRenameOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminRenameGenOrdinal, req_, resp_)
 	return resp_.S, err
 }
 
@@ -3346,12 +3282,12 @@
 // token.
 //
 // `src` must be a resolved object name. Including "/" in the string will
-// return ZX_ERR_INVALID_ARGS.
+// return `ZX_ERR_INVALID_ARGS`.
 //
 // `dst` must be a resolved object name. Including "/" in the string will
-// return ZX_ERR_INVALID_ARGS.
+// return `ZX_ERR_INVALID_ARGS`.
 //
-// This method requires following rights: OPEN_RIGHT_WRITABLE.
+// This method requires following rights: `OPEN_RIGHT_WRITABLE`.
 func (p *DirectoryAdminInterface) Link(src string, dstParentToken _zx.Handle, dst string) (int32, error) {
 	req_ := &directoryAdminLinkRequest{
 		Src:            src,
@@ -3359,7 +3295,7 @@
 		Dst:            dst,
 	}
 	resp_ := &directoryAdminLinkResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminLinkOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminLinkGenOrdinal, req_, resp_)
 	return resp_.S, err
 }
 
@@ -3387,20 +3323,20 @@
 		Watcher: watcher,
 	}
 	resp_ := &directoryAdminWatchResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminWatchOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminWatchGenOrdinal, req_, resp_)
 	return resp_.S, err
 }
 
 // Mount a channel representing a remote filesystem onto this directory.
 // All future requests to this node will be forwarded to the remote filesystem.
 // To re-open a node without forwarding to the remote target, the node
-// should be opened with OPEN_FLAG_NO_REMOTE.
+// should be opened with `OPEN_FLAG_NO_REMOTE`.
 func (p *DirectoryAdminInterface) Mount(remote DirectoryInterface) (int32, error) {
 	req_ := &directoryAdminMountRequest{
 		Remote: remote,
 	}
 	resp_ := &directoryAdminMountResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminMountOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminMountGenOrdinal, req_, resp_)
 	return resp_.S, err
 }
 
@@ -3413,7 +3349,7 @@
 		Flags:  flags,
 	}
 	resp_ := &directoryAdminMountAndCreateResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminMountAndCreateOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminMountAndCreateGenOrdinal, req_, resp_)
 	return resp_.S, err
 }
 
@@ -3422,7 +3358,7 @@
 func (p *DirectoryAdminInterface) Unmount() (int32, error) {
 	var req_ _bindings.Message
 	resp_ := &directoryAdminUnmountResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminUnmountOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminUnmountGenOrdinal, req_, resp_)
 	return resp_.S, err
 }
 
@@ -3431,7 +3367,7 @@
 func (p *DirectoryAdminInterface) UnmountNode() (int32, DirectoryInterface, error) {
 	var req_ _bindings.Message
 	resp_ := &directoryAdminUnmountNodeResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminUnmountNodeOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminUnmountNodeGenOrdinal, req_, resp_)
 	return resp_.S, resp_.Remote, err
 }
 
@@ -3439,7 +3375,7 @@
 func (p *DirectoryAdminInterface) QueryFilesystem() (int32, *FilesystemInfo, error) {
 	var req_ _bindings.Message
 	resp_ := &directoryAdminQueryFilesystemResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminQueryFilesystemOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminQueryFilesystemGenOrdinal, req_, resp_)
 	return resp_.S, resp_.Info, err
 }
 
@@ -3447,7 +3383,7 @@
 func (p *DirectoryAdminInterface) GetDevicePath() (int32, *string, error) {
 	var req_ _bindings.Message
 	resp_ := &directoryAdminGetDevicePathResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminGetDevicePathOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminGetDevicePathGenOrdinal, req_, resp_)
 	return resp_.S, resp_.Path, err
 }
 
@@ -3457,19 +3393,19 @@
 	// Create another connection to the same remote object.
 	//
 	// `flags` may be any of:
-	// - OPEN_RIGHT_*
-	// - OPEN_FLAG_APPEND
-	// - OPEN_FLAG_NO_REMOTE
-	// - OPEN_FLAG_DESCRIBE
-	// - CLONE_FLAG_SAME_RIGHTS
+	// - `OPEN_RIGHT_*`
+	// - `OPEN_FLAG_APPEND`
+	// - `OPEN_FLAG_NO_REMOTE`
+	// - `OPEN_FLAG_DESCRIBE`
+	// - `CLONE_FLAG_SAME_RIGHTS`
 	//
 	// All other flags are ignored.
 	//
-	// The OPEN_RIGHT_* bits in `flags` request corresponding rights over the resulting
+	// The `OPEN_RIGHT_*` bits in `flags` request corresponding rights over the resulting
 	// cloned object.
 	// The cloned object must have rights less than or equal to the original object.
-	// Alternatively, pass CLONE_FLAG_SAME_RIGHTS to inherit the rights on the source connection.
-	// It is invalid to pass any of the OPEN_RIGHT_* flags together with CLONE_FLAG_SAME_RIGHTS.
+	// Alternatively, pass `CLONE_FLAG_SAME_RIGHTS` to inherit the rights on the source connection.
+	// It is invalid to pass any of the `OPEN_RIGHT_*` flags together with `CLONE_FLAG_SAME_RIGHTS`.
 	Clone(flags uint32, object NodeInterfaceRequest) error
 	// Terminates connection with object.
 	//
@@ -3494,9 +3430,9 @@
 	// This method does not require any rights.
 	GetAttr() (int32, NodeAttributes, error)
 	// Updates information about the node.
-	// `flags` may be any of NODE_ATTRIBUTE_FLAG_*.
+	// `flags` may be any of `NODE_ATTRIBUTE_FLAG_*`.
 	//
-	// This method requires following rights: OPEN_RIGHT_WRITABLE.
+	// This method requires following rights: `OPEN_RIGHT_WRITABLE`.
 	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)
@@ -3505,14 +3441,14 @@
 	// `path` may contain multiple segments, separated by "/" characters,
 	// and should never be empty i.e. "" is an invalid path.
 	//
-	// `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
+	// `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_RIGHTS_* flags provided in `flags` will restrict access rights on the `object` channel
+	// `OPEN_RIGHTS_*` flags provided in `flags` will restrict access rights on the `object` channel
 	// which will be connected to the opened entity.
 	//
 	// Rights are never increased. When you open a nested entity within a directory, you may only
@@ -3520,8 +3456,8 @@
 	// Exceeding those rights causes an access denied error to be transmitted in the
 	// `OnOpen` event if applicable, and the `object` connection closed.
 	//
-	// The caller must specify either one or more of the OPEN_RIGHT_* flags, or
-	// the OPEN_FLAG_NODE_REFERENCE flag.
+	// The caller must specify either one or more of the `OPEN_RIGHT_*` flags, or
+	// the `OPEN_FLAG_NODE_REFERENCE` flag.
 	Open(flags uint32, mode uint32, path string, object NodeInterfaceRequest) error
 	// Detaches an object from this directory object.
 	//
@@ -3540,16 +3476,16 @@
 	// originally accessed Directory.
 	//
 	// Returns:
-	//   ZX_ERR_ACCESS_DENIED if the connection (or the underlying filesystem) does not
+	//   `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 ".".
+	//   `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.
 	//
-	// This method requires following rights: OPEN_RIGHT_WRITABLE.
+	// This method requires following rights: `OPEN_RIGHT_WRITABLE`.
 	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
@@ -3563,7 +3499,7 @@
 	//   // Describes the length of the dirent name.
 	//   uint8 size;
 	//   // Describes the type of the entry. Aligned with the
-	//   /// POSIX d_type values. Use DIRENT_TYPE_* constants.
+	//   /// POSIX d_type values. Use `DIRENT_TYPE_*` constants.
 	//   uint8 type;
 	//   // Unterminated name of entry.
 	//   char name[0];
@@ -3579,27 +3515,27 @@
 	// Acquires a token to a Directory which can be used to identify
 	// access to it at a later point in time.
 	//
-	// This method requires following rights: OPEN_RIGHT_WRITABLE.
+	// This method requires following rights: `OPEN_RIGHT_WRITABLE`.
 	GetToken() (int32, _zx.Handle, error)
 	// Renames an object named src to the name dst, in a directory represented by token.
 	//
 	// `src/dst` must be resolved object names. Including "/" in any position
-	// other than the end of the string will return ZX_ERR_INVALID_ARGS.
+	// other than the end of the string will return `ZX_ERR_INVALID_ARGS`.
 	// Returning "/" at the end of either string implies that it must be a
-	// directory, or else ZX_ERR_NOT_DIR should be returned.
+	// directory, or else `ZX_ERR_NOT_DIR` should be returned.
 	//
-	// This method requires following rights: OPEN_RIGHT_WRITABLE.
+	// This method requires following rights: `OPEN_RIGHT_WRITABLE`.
 	Rename(src string, dstParentToken _zx.Handle, dst string) (int32, error)
 	// Creates a link to an object named src by the name dst, within a directory represented by
 	// token.
 	//
 	// `src` must be a resolved object name. Including "/" in the string will
-	// return ZX_ERR_INVALID_ARGS.
+	// return `ZX_ERR_INVALID_ARGS`.
 	//
 	// `dst` must be a resolved object name. Including "/" in the string will
-	// return ZX_ERR_INVALID_ARGS.
+	// return `ZX_ERR_INVALID_ARGS`.
 	//
-	// This method requires following rights: OPEN_RIGHT_WRITABLE.
+	// This method requires following rights: `OPEN_RIGHT_WRITABLE`.
 	Link(src string, dstParentToken _zx.Handle, dst string) (int32, error)
 	// Watches a directory, receiving events of added messages on the
 	// watcher request channel.
@@ -3622,7 +3558,7 @@
 	// Mount a channel representing a remote filesystem onto this directory.
 	// All future requests to this node will be forwarded to the remote filesystem.
 	// To re-open a node without forwarding to the remote target, the node
-	// should be opened with OPEN_FLAG_NO_REMOTE.
+	// should be opened with `OPEN_FLAG_NO_REMOTE`.
 	Mount(remote DirectoryInterface) (int32, error)
 	// Atomically create a directory with a provided path, and mount the
 	// remote handle to the newly created directory.
@@ -3654,35 +3590,35 @@
 
 func (s_ *DirectoryAdminStub) Dispatch(ordinal_ uint64, data_ []byte, handles_ []_zx.Handle) (_bindings.Message, error) {
 	switch ordinal_ {
-	case DirectoryAdminCloneOrdinal:
+	case DirectoryAdminCloneGenOrdinal:
 		in_ := directoryAdminCloneRequest{}
 		if _, _, err_ := _bindings.Unmarshal(data_, handles_, &in_); err_ != nil {
 			return nil, err_
 		}
 		err_ := s_.Impl.Clone(in_.Flags, in_.Object)
 		return nil, err_
-	case DirectoryAdminCloseOrdinal:
+	case DirectoryAdminCloseGenOrdinal:
 		s, err_ := s_.Impl.Close()
 		out_ := directoryAdminCloseResponse{}
 		out_.S = s
 		return &out_, err_
-	case DirectoryAdminDescribeOrdinal:
+	case DirectoryAdminDescribeGenOrdinal:
 		info, err_ := s_.Impl.Describe()
 		out_ := directoryAdminDescribeResponse{}
 		out_.Info = info
 		return &out_, err_
-	case DirectoryAdminSyncOrdinal:
+	case DirectoryAdminSyncGenOrdinal:
 		s, err_ := s_.Impl.Sync()
 		out_ := directoryAdminSyncResponse{}
 		out_.S = s
 		return &out_, err_
-	case DirectoryAdminGetAttrOrdinal:
+	case DirectoryAdminGetAttrGenOrdinal:
 		s, attributes, err_ := s_.Impl.GetAttr()
 		out_ := directoryAdminGetAttrResponse{}
 		out_.S = s
 		out_.Attributes = attributes
 		return &out_, err_
-	case DirectoryAdminSetAttrOrdinal:
+	case DirectoryAdminSetAttrGenOrdinal:
 		in_ := directoryAdminSetAttrRequest{}
 		if _, _, err_ := _bindings.Unmarshal(data_, handles_, &in_); err_ != nil {
 			return nil, err_
@@ -3691,7 +3627,7 @@
 		out_ := directoryAdminSetAttrResponse{}
 		out_.S = s
 		return &out_, err_
-	case DirectoryAdminIoctlOrdinal:
+	case DirectoryAdminIoctlGenOrdinal:
 		in_ := directoryAdminIoctlRequest{}
 		if _, _, err_ := _bindings.Unmarshal(data_, handles_, &in_); err_ != nil {
 			return nil, err_
@@ -3702,14 +3638,14 @@
 		out_.Handles = handles
 		out_.Out = out
 		return &out_, err_
-	case DirectoryAdminOpenOrdinal:
+	case DirectoryAdminOpenGenOrdinal:
 		in_ := directoryAdminOpenRequest{}
 		if _, _, err_ := _bindings.Unmarshal(data_, handles_, &in_); err_ != nil {
 			return nil, err_
 		}
 		err_ := s_.Impl.Open(in_.Flags, in_.Mode, in_.Path, in_.Object)
 		return nil, err_
-	case DirectoryAdminUnlinkOrdinal:
+	case DirectoryAdminUnlinkGenOrdinal:
 		in_ := directoryAdminUnlinkRequest{}
 		if _, _, err_ := _bindings.Unmarshal(data_, handles_, &in_); err_ != nil {
 			return nil, err_
@@ -3718,7 +3654,7 @@
 		out_ := directoryAdminUnlinkResponse{}
 		out_.S = s
 		return &out_, err_
-	case DirectoryAdminReadDirentsOrdinal:
+	case DirectoryAdminReadDirentsGenOrdinal:
 		in_ := directoryAdminReadDirentsRequest{}
 		if _, _, err_ := _bindings.Unmarshal(data_, handles_, &in_); err_ != nil {
 			return nil, err_
@@ -3728,18 +3664,18 @@
 		out_.S = s
 		out_.Dirents = dirents
 		return &out_, err_
-	case DirectoryAdminRewindOrdinal:
+	case DirectoryAdminRewindGenOrdinal:
 		s, err_ := s_.Impl.Rewind()
 		out_ := directoryAdminRewindResponse{}
 		out_.S = s
 		return &out_, err_
-	case DirectoryAdminGetTokenOrdinal:
+	case DirectoryAdminGetTokenGenOrdinal:
 		s, token, err_ := s_.Impl.GetToken()
 		out_ := directoryAdminGetTokenResponse{}
 		out_.S = s
 		out_.Token = token
 		return &out_, err_
-	case DirectoryAdminRenameOrdinal:
+	case DirectoryAdminRenameGenOrdinal:
 		in_ := directoryAdminRenameRequest{}
 		if _, _, err_ := _bindings.Unmarshal(data_, handles_, &in_); err_ != nil {
 			return nil, err_
@@ -3748,7 +3684,7 @@
 		out_ := directoryAdminRenameResponse{}
 		out_.S = s
 		return &out_, err_
-	case DirectoryAdminLinkOrdinal:
+	case DirectoryAdminLinkGenOrdinal:
 		in_ := directoryAdminLinkRequest{}
 		if _, _, err_ := _bindings.Unmarshal(data_, handles_, &in_); err_ != nil {
 			return nil, err_
@@ -3757,7 +3693,7 @@
 		out_ := directoryAdminLinkResponse{}
 		out_.S = s
 		return &out_, err_
-	case DirectoryAdminWatchOrdinal:
+	case DirectoryAdminWatchGenOrdinal:
 		in_ := directoryAdminWatchRequest{}
 		if _, _, err_ := _bindings.Unmarshal(data_, handles_, &in_); err_ != nil {
 			return nil, err_
@@ -3766,7 +3702,7 @@
 		out_ := directoryAdminWatchResponse{}
 		out_.S = s
 		return &out_, err_
-	case DirectoryAdminMountOrdinal:
+	case DirectoryAdminMountGenOrdinal:
 		in_ := directoryAdminMountRequest{}
 		if _, _, err_ := _bindings.Unmarshal(data_, handles_, &in_); err_ != nil {
 			return nil, err_
@@ -3775,7 +3711,7 @@
 		out_ := directoryAdminMountResponse{}
 		out_.S = s
 		return &out_, err_
-	case DirectoryAdminMountAndCreateOrdinal:
+	case DirectoryAdminMountAndCreateGenOrdinal:
 		in_ := directoryAdminMountAndCreateRequest{}
 		if _, _, err_ := _bindings.Unmarshal(data_, handles_, &in_); err_ != nil {
 			return nil, err_
@@ -3784,24 +3720,24 @@
 		out_ := directoryAdminMountAndCreateResponse{}
 		out_.S = s
 		return &out_, err_
-	case DirectoryAdminUnmountOrdinal:
+	case DirectoryAdminUnmountGenOrdinal:
 		s, err_ := s_.Impl.Unmount()
 		out_ := directoryAdminUnmountResponse{}
 		out_.S = s
 		return &out_, err_
-	case DirectoryAdminUnmountNodeOrdinal:
+	case DirectoryAdminUnmountNodeGenOrdinal:
 		s, remote, err_ := s_.Impl.UnmountNode()
 		out_ := directoryAdminUnmountNodeResponse{}
 		out_.S = s
 		out_.Remote = remote
 		return &out_, err_
-	case DirectoryAdminQueryFilesystemOrdinal:
+	case DirectoryAdminQueryFilesystemGenOrdinal:
 		s, info, err_ := s_.Impl.QueryFilesystem()
 		out_ := directoryAdminQueryFilesystemResponse{}
 		out_.S = s
 		out_.Info = info
 		return &out_, err_
-	case DirectoryAdminGetDevicePathOrdinal:
+	case DirectoryAdminGetDevicePathGenOrdinal:
 		s, path, err_ := s_.Impl.GetDevicePath()
 		out_ := directoryAdminGetDevicePathResponse{}
 		out_.S = s
@@ -3831,5 +3767,5 @@
 		S:    s,
 		Info: info,
 	}
-	return ((*_bindings.ChannelProxy)(p)).Send(DirectoryAdminOnOpenOrdinal, event_)
+	return ((*_bindings.ChannelProxy)(p)).Send(DirectoryAdminOnOpenGenOrdinal, event_)
 }
diff --git a/src/syscall/zx/net/impl.go b/src/syscall/zx/net/impl.go
index a72a621..b37d74b 100644
--- a/src/syscall/zx/net/impl.go
+++ b/src/syscall/zx/net/impl.go
@@ -17,40 +17,23 @@
 )
 
 const (
-	ControlCloneOrdinal          uint64 = 402549324 << 32
-	ControlCloneGenOrdinal       uint64 = 402549324 << 32
-	ControlCloseOrdinal          uint64 = 1387878023 << 32
-	ControlCloseGenOrdinal       uint64 = 1387878023 << 32
-	ControlDescribeOrdinal       uint64 = 526573406 << 32
-	ControlDescribeGenOrdinal    uint64 = 526573406 << 32
-	ControlOnOpenOrdinal         uint64 = 1191225277 << 32
-	ControlOnOpenGenOrdinal      uint64 = 1191225277 << 32
-	ControlSyncOrdinal           uint64 = 1648508842 << 32
-	ControlSyncGenOrdinal        uint64 = 1648508842 << 32
-	ControlGetAttrOrdinal        uint64 = 1166403528 << 32
-	ControlGetAttrGenOrdinal     uint64 = 1166403528 << 32
-	ControlSetAttrOrdinal        uint64 = 198530458 << 32
-	ControlSetAttrGenOrdinal     uint64 = 198530458 << 32
-	ControlIoctlOrdinal          uint64 = 905161895 << 32
-	ControlIoctlGenOrdinal       uint64 = 905161895 << 32
-	ControlBindOrdinal           uint64 = 343163373 << 32
-	ControlBindGenOrdinal        uint64 = 343163373 << 32
-	ControlConnectOrdinal        uint64 = 595514168 << 32
-	ControlConnectGenOrdinal     uint64 = 595514168 << 32
-	ControlListenOrdinal         uint64 = 778265222 << 32
-	ControlListenGenOrdinal      uint64 = 778265222 << 32
-	ControlAcceptOrdinal         uint64 = 300755315 << 32
-	ControlAcceptGenOrdinal      uint64 = 300755315 << 32
-	ControlGetSockNameOrdinal    uint64 = 1673606786 << 32
-	ControlGetSockNameGenOrdinal uint64 = 1673606786 << 32
-	ControlGetPeerNameOrdinal    uint64 = 1484290998 << 32
-	ControlGetPeerNameGenOrdinal uint64 = 1484290998 << 32
-	ControlSetSockOptOrdinal     uint64 = 1268914087 << 32
-	ControlSetSockOptGenOrdinal  uint64 = 1268914087 << 32
-	ControlGetSockOptOrdinal     uint64 = 914699896 << 32
-	ControlGetSockOptGenOrdinal  uint64 = 914699896 << 32
-	ControlIoctlPosixOrdinal     uint64 = 1353250461 << 32
-	ControlIoctlPosixGenOrdinal  uint64 = 1353250461 << 32
+	ControlCloneGenOrdinal       uint64 = 0x17fe6a4c00000000
+	ControlCloseGenOrdinal       uint64 = 0x52b9568700000000
+	ControlDescribeGenOrdinal    uint64 = 0x1f62df5e00000000
+	ControlOnOpenGenOrdinal      uint64 = 0x4700a7bd00000000
+	ControlSyncGenOrdinal        uint64 = 0x62423faa00000000
+	ControlGetAttrGenOrdinal     uint64 = 0x4585e7c800000000
+	ControlSetAttrGenOrdinal     uint64 = 0xbd5559a00000000
+	ControlIoctlGenOrdinal       uint64 = 0x35f3aca700000000
+	ControlBindGenOrdinal        uint64 = 0x147441ed00000000
+	ControlConnectGenOrdinal     uint64 = 0x237ed33800000000
+	ControlListenGenOrdinal      uint64 = 0x2e63628600000000
+	ControlAcceptGenOrdinal      uint64 = 0x11ed297300000000
+	ControlGetSockNameGenOrdinal uint64 = 0x63c1368200000000
+	ControlGetPeerNameGenOrdinal uint64 = 0x58787bb600000000
+	ControlSetSockOptGenOrdinal  uint64 = 0x4ba217a700000000
+	ControlGetSockOptGenOrdinal  uint64 = 0x3685367800000000
+	ControlIoctlPosixGenOrdinal  uint64 = 0x50a8f69d00000000
 )
 
 type controlCloneRequest struct {
@@ -362,25 +345,25 @@
 // Create another connection to the same remote object.
 //
 // `flags` may be any of:
-// - OPEN_RIGHT_*
-// - OPEN_FLAG_APPEND
-// - OPEN_FLAG_NO_REMOTE
-// - OPEN_FLAG_DESCRIBE
-// - CLONE_FLAG_SAME_RIGHTS
+// - `OPEN_RIGHT_*`
+// - `OPEN_FLAG_APPEND`
+// - `OPEN_FLAG_NO_REMOTE`
+// - `OPEN_FLAG_DESCRIBE`
+// - `CLONE_FLAG_SAME_RIGHTS`
 //
 // All other flags are ignored.
 //
-// The OPEN_RIGHT_* bits in `flags` request corresponding rights over the resulting
+// The `OPEN_RIGHT_*` bits in `flags` request corresponding rights over the resulting
 // cloned object.
 // The cloned object must have rights less than or equal to the original object.
-// Alternatively, pass CLONE_FLAG_SAME_RIGHTS to inherit the rights on the source connection.
-// It is invalid to pass any of the OPEN_RIGHT_* flags together with CLONE_FLAG_SAME_RIGHTS.
+// Alternatively, pass `CLONE_FLAG_SAME_RIGHTS` to inherit the rights on the source connection.
+// It is invalid to pass any of the `OPEN_RIGHT_*` flags together with `CLONE_FLAG_SAME_RIGHTS`.
 func (p *ControlInterface) Clone(flags uint32, object fuchsiaio.NodeInterfaceRequest) error {
 	req_ := &controlCloneRequest{
 		Flags:  flags,
 		Object: object,
 	}
-	err := ((*_bindings.ChannelProxy)(p)).Send(ControlCloneOrdinal, req_)
+	err := ((*_bindings.ChannelProxy)(p)).Send(ControlCloneGenOrdinal, req_)
 	return err
 }
 
@@ -390,7 +373,7 @@
 func (p *ControlInterface) Close() (int32, error) {
 	var req_ _bindings.Message
 	resp_ := &controlCloseResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(ControlCloseOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(ControlCloseGenOrdinal, req_, resp_)
 	return resp_.S, err
 }
 
@@ -401,7 +384,7 @@
 func (p *ControlInterface) Describe() (fuchsiaio.NodeInfo, error) {
 	var req_ _bindings.Message
 	resp_ := &controlDescribeResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(ControlDescribeOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(ControlDescribeGenOrdinal, req_, resp_)
 	return resp_.Info, err
 }
 
@@ -412,7 +395,7 @@
 // (the same as would be returned by `Describe`).
 func (p *ControlInterface) ExpectOnOpen() (int32, *fuchsiaio.NodeInfo, error) {
 	resp_ := &controlOnOpenResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Recv(ControlOnOpenOrdinal, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Recv(ControlOnOpenGenOrdinal, resp_)
 	return resp_.S, resp_.Info, err
 }
 
@@ -422,7 +405,7 @@
 func (p *ControlInterface) Sync() (int32, error) {
 	var req_ _bindings.Message
 	resp_ := &controlSyncResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(ControlSyncOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(ControlSyncGenOrdinal, req_, resp_)
 	return resp_.S, err
 }
 
@@ -432,21 +415,21 @@
 func (p *ControlInterface) GetAttr() (int32, fuchsiaio.NodeAttributes, error) {
 	var req_ _bindings.Message
 	resp_ := &controlGetAttrResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(ControlGetAttrOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(ControlGetAttrGenOrdinal, req_, resp_)
 	return resp_.S, resp_.Attributes, err
 }
 
 // Updates information about the node.
-// `flags` may be any of NODE_ATTRIBUTE_FLAG_*.
+// `flags` may be any of `NODE_ATTRIBUTE_FLAG_*`.
 //
-// This method requires following rights: OPEN_RIGHT_WRITABLE.
+// This method requires following rights: `OPEN_RIGHT_WRITABLE`.
 func (p *ControlInterface) SetAttr(flags uint32, attributes fuchsiaio.NodeAttributes) (int32, error) {
 	req_ := &controlSetAttrRequest{
 		Flags:      flags,
 		Attributes: attributes,
 	}
 	resp_ := &controlSetAttrResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(ControlSetAttrOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(ControlSetAttrGenOrdinal, req_, resp_)
 	return resp_.S, err
 }
 
@@ -459,7 +442,7 @@
 		In:      in,
 	}
 	resp_ := &controlIoctlResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(ControlIoctlOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(ControlIoctlGenOrdinal, req_, resp_)
 	return resp_.S, resp_.Handles, resp_.Out, err
 }
 
@@ -469,7 +452,7 @@
 		Addr: addr,
 	}
 	resp_ := &controlBindResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(ControlBindOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(ControlBindGenOrdinal, req_, resp_)
 	return resp_.Code, err
 }
 
@@ -479,7 +462,7 @@
 		Addr: addr,
 	}
 	resp_ := &controlConnectResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(ControlConnectOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(ControlConnectGenOrdinal, req_, resp_)
 	return resp_.Code, err
 }
 
@@ -490,7 +473,7 @@
 		Backlog: backlog,
 	}
 	resp_ := &controlListenResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(ControlListenOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(ControlListenGenOrdinal, req_, resp_)
 	return resp_.Code, err
 }
 
@@ -500,7 +483,7 @@
 		Flags: flags,
 	}
 	resp_ := &controlAcceptResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(ControlAcceptOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(ControlAcceptGenOrdinal, req_, resp_)
 	return resp_.Code, resp_.S, err
 }
 
@@ -508,7 +491,7 @@
 func (p *ControlInterface) GetSockName() (int16, []uint8, error) {
 	var req_ _bindings.Message
 	resp_ := &controlGetSockNameResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(ControlGetSockNameOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(ControlGetSockNameGenOrdinal, req_, resp_)
 	return resp_.Code, resp_.Addr, err
 }
 
@@ -516,7 +499,7 @@
 func (p *ControlInterface) GetPeerName() (int16, []uint8, error) {
 	var req_ _bindings.Message
 	resp_ := &controlGetPeerNameResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(ControlGetPeerNameOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(ControlGetPeerNameGenOrdinal, req_, resp_)
 	return resp_.Code, resp_.Addr, err
 }
 
@@ -528,7 +511,7 @@
 		Optval:  optval,
 	}
 	resp_ := &controlSetSockOptResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(ControlSetSockOptOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(ControlSetSockOptGenOrdinal, req_, resp_)
 	return resp_.Code, err
 }
 
@@ -539,7 +522,7 @@
 		Optname: optname,
 	}
 	resp_ := &controlGetSockOptResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(ControlGetSockOptOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(ControlGetSockOptGenOrdinal, req_, resp_)
 	return resp_.Code, resp_.Optval, err
 }
 
@@ -550,7 +533,7 @@
 		In:  in,
 	}
 	resp_ := &controlIoctlPosixResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(ControlIoctlPosixOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(ControlIoctlPosixGenOrdinal, req_, resp_)
 	return resp_.Code, resp_.Out, err
 }
 
@@ -562,19 +545,19 @@
 	// Create another connection to the same remote object.
 	//
 	// `flags` may be any of:
-	// - OPEN_RIGHT_*
-	// - OPEN_FLAG_APPEND
-	// - OPEN_FLAG_NO_REMOTE
-	// - OPEN_FLAG_DESCRIBE
-	// - CLONE_FLAG_SAME_RIGHTS
+	// - `OPEN_RIGHT_*`
+	// - `OPEN_FLAG_APPEND`
+	// - `OPEN_FLAG_NO_REMOTE`
+	// - `OPEN_FLAG_DESCRIBE`
+	// - `CLONE_FLAG_SAME_RIGHTS`
 	//
 	// All other flags are ignored.
 	//
-	// The OPEN_RIGHT_* bits in `flags` request corresponding rights over the resulting
+	// The `OPEN_RIGHT_*` bits in `flags` request corresponding rights over the resulting
 	// cloned object.
 	// The cloned object must have rights less than or equal to the original object.
-	// Alternatively, pass CLONE_FLAG_SAME_RIGHTS to inherit the rights on the source connection.
-	// It is invalid to pass any of the OPEN_RIGHT_* flags together with CLONE_FLAG_SAME_RIGHTS.
+	// Alternatively, pass `CLONE_FLAG_SAME_RIGHTS` to inherit the rights on the source connection.
+	// It is invalid to pass any of the `OPEN_RIGHT_*` flags together with `CLONE_FLAG_SAME_RIGHTS`.
 	Clone(flags uint32, object fuchsiaio.NodeInterfaceRequest) error
 	// Terminates connection with object.
 	//
@@ -599,9 +582,9 @@
 	// This method does not require any rights.
 	GetAttr() (int32, fuchsiaio.NodeAttributes, error)
 	// Updates information about the node.
-	// `flags` may be any of NODE_ATTRIBUTE_FLAG_*.
+	// `flags` may be any of `NODE_ATTRIBUTE_FLAG_*`.
 	//
-	// This method requires following rights: OPEN_RIGHT_WRITABLE.
+	// This method requires following rights: `OPEN_RIGHT_WRITABLE`.
 	SetAttr(flags uint32, attributes fuchsiaio.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)
@@ -641,35 +624,35 @@
 
 func (s_ *ControlStub) Dispatch(ordinal_ uint64, data_ []byte, handles_ []_zx.Handle) (_bindings.Message, error) {
 	switch ordinal_ {
-	case ControlCloneOrdinal:
+	case ControlCloneGenOrdinal:
 		in_ := controlCloneRequest{}
 		if _, _, err_ := _bindings.Unmarshal(data_, handles_, &in_); err_ != nil {
 			return nil, err_
 		}
 		err_ := s_.Impl.Clone(in_.Flags, in_.Object)
 		return nil, err_
-	case ControlCloseOrdinal:
+	case ControlCloseGenOrdinal:
 		s, err_ := s_.Impl.Close()
 		out_ := controlCloseResponse{}
 		out_.S = s
 		return &out_, err_
-	case ControlDescribeOrdinal:
+	case ControlDescribeGenOrdinal:
 		info, err_ := s_.Impl.Describe()
 		out_ := controlDescribeResponse{}
 		out_.Info = info
 		return &out_, err_
-	case ControlSyncOrdinal:
+	case ControlSyncGenOrdinal:
 		s, err_ := s_.Impl.Sync()
 		out_ := controlSyncResponse{}
 		out_.S = s
 		return &out_, err_
-	case ControlGetAttrOrdinal:
+	case ControlGetAttrGenOrdinal:
 		s, attributes, err_ := s_.Impl.GetAttr()
 		out_ := controlGetAttrResponse{}
 		out_.S = s
 		out_.Attributes = attributes
 		return &out_, err_
-	case ControlSetAttrOrdinal:
+	case ControlSetAttrGenOrdinal:
 		in_ := controlSetAttrRequest{}
 		if _, _, err_ := _bindings.Unmarshal(data_, handles_, &in_); err_ != nil {
 			return nil, err_
@@ -678,7 +661,7 @@
 		out_ := controlSetAttrResponse{}
 		out_.S = s
 		return &out_, err_
-	case ControlIoctlOrdinal:
+	case ControlIoctlGenOrdinal:
 		in_ := controlIoctlRequest{}
 		if _, _, err_ := _bindings.Unmarshal(data_, handles_, &in_); err_ != nil {
 			return nil, err_
@@ -689,7 +672,7 @@
 		out_.Handles = handles
 		out_.Out = out
 		return &out_, err_
-	case ControlBindOrdinal:
+	case ControlBindGenOrdinal:
 		in_ := controlBindRequest{}
 		if _, _, err_ := _bindings.Unmarshal(data_, handles_, &in_); err_ != nil {
 			return nil, err_
@@ -698,7 +681,7 @@
 		out_ := controlBindResponse{}
 		out_.Code = code
 		return &out_, err_
-	case ControlConnectOrdinal:
+	case ControlConnectGenOrdinal:
 		in_ := controlConnectRequest{}
 		if _, _, err_ := _bindings.Unmarshal(data_, handles_, &in_); err_ != nil {
 			return nil, err_
@@ -707,7 +690,7 @@
 		out_ := controlConnectResponse{}
 		out_.Code = code
 		return &out_, err_
-	case ControlListenOrdinal:
+	case ControlListenGenOrdinal:
 		in_ := controlListenRequest{}
 		if _, _, err_ := _bindings.Unmarshal(data_, handles_, &in_); err_ != nil {
 			return nil, err_
@@ -716,7 +699,7 @@
 		out_ := controlListenResponse{}
 		out_.Code = code
 		return &out_, err_
-	case ControlAcceptOrdinal:
+	case ControlAcceptGenOrdinal:
 		in_ := controlAcceptRequest{}
 		if _, _, err_ := _bindings.Unmarshal(data_, handles_, &in_); err_ != nil {
 			return nil, err_
@@ -726,19 +709,19 @@
 		out_.Code = code
 		out_.S = s
 		return &out_, err_
-	case ControlGetSockNameOrdinal:
+	case ControlGetSockNameGenOrdinal:
 		code, addr, err_ := s_.Impl.GetSockName()
 		out_ := controlGetSockNameResponse{}
 		out_.Code = code
 		out_.Addr = addr
 		return &out_, err_
-	case ControlGetPeerNameOrdinal:
+	case ControlGetPeerNameGenOrdinal:
 		code, addr, err_ := s_.Impl.GetPeerName()
 		out_ := controlGetPeerNameResponse{}
 		out_.Code = code
 		out_.Addr = addr
 		return &out_, err_
-	case ControlSetSockOptOrdinal:
+	case ControlSetSockOptGenOrdinal:
 		in_ := controlSetSockOptRequest{}
 		if _, _, err_ := _bindings.Unmarshal(data_, handles_, &in_); err_ != nil {
 			return nil, err_
@@ -747,7 +730,7 @@
 		out_ := controlSetSockOptResponse{}
 		out_.Code = code
 		return &out_, err_
-	case ControlGetSockOptOrdinal:
+	case ControlGetSockOptGenOrdinal:
 		in_ := controlGetSockOptRequest{}
 		if _, _, err_ := _bindings.Unmarshal(data_, handles_, &in_); err_ != nil {
 			return nil, err_
@@ -757,7 +740,7 @@
 		out_.Code = code
 		out_.Optval = optval
 		return &out_, err_
-	case ControlIoctlPosixOrdinal:
+	case ControlIoctlPosixGenOrdinal:
 		in_ := controlIoctlPosixRequest{}
 		if _, _, err_ := _bindings.Unmarshal(data_, handles_, &in_); err_ != nil {
 			return nil, err_
@@ -791,12 +774,11 @@
 		S:    s,
 		Info: info,
 	}
-	return ((*_bindings.ChannelProxy)(p)).Send(ControlOnOpenOrdinal, event_)
+	return ((*_bindings.ChannelProxy)(p)).Send(ControlOnOpenGenOrdinal, event_)
 }
 
 const (
-	ProviderSocketOrdinal    uint64 = 1292318594 << 32
-	ProviderSocketGenOrdinal uint64 = 1292318594 << 32
+	ProviderSocketGenOrdinal uint64 = 0x4d07378200000000
 )
 
 type providerSocketRequest struct {
@@ -835,7 +817,7 @@
 		Protocol: protocol,
 	}
 	resp_ := &providerSocketResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(ProviderSocketOrdinal, req_, resp_)
+	err := ((*_bindings.ChannelProxy)(p)).Call(ProviderSocketGenOrdinal, req_, resp_)
 	return resp_.Code, resp_.S, err
 }
 
@@ -871,7 +853,7 @@
 
 func (s_ *ProviderStub) Dispatch(ordinal_ uint64, data_ []byte, handles_ []_zx.Handle) (_bindings.Message, error) {
 	switch ordinal_ {
-	case ProviderSocketOrdinal:
+	case ProviderSocketGenOrdinal:
 		in_ := providerSocketRequest{}
 		if _, _, err_ := _bindings.Unmarshal(data_, handles_, &in_); err_ != nil {
 			return nil, err_