diff --git a/capnpc-csharp.tests/Embedded Resources/test.cs b/capnpc-csharp.tests/Embedded Resources/test.cs
index d20da0b..ce514b6 100644
--- a/capnpc-csharp.tests/Embedded Resources/test.cs	
+++ b/capnpc-csharp.tests/Embedded Resources/test.cs	
@@ -21,6 +21,7 @@ namespace Capnproto_test.Capnp.Test
 
     public class TestAllTypes : ICapnpSerializable
     {
+        public const UInt64 TypeId = 0xa0a8f314b80b63fdUL;
         void ICapnpSerializable.Deserialize(DeserializerState arg_)
         {
             var reader = READER.create(arg_);
@@ -544,6 +545,7 @@ namespace Capnproto_test.Capnp.Test
 
     public class TestDefaults : ICapnpSerializable
     {
+        public const UInt64 TypeId = 0xeb3f9ebe98c73cb6UL;
         void ICapnpSerializable.Deserialize(DeserializerState arg_)
         {
             var reader = READER.create(arg_);
@@ -1114,6 +1116,7 @@ namespace Capnproto_test.Capnp.Test
 
     public class TestAnyPointer : ICapnpSerializable
     {
+        public const UInt64 TypeId = 0xe3da5a2ccd28c0d8UL;
         void ICapnpSerializable.Deserialize(DeserializerState arg_)
         {
             var reader = READER.create(arg_);
@@ -1172,6 +1175,7 @@ namespace Capnproto_test.Capnp.Test
 
     public class TestAnyOthers : ICapnpSerializable
     {
+        public const UInt64 TypeId = 0xf49850f63c2bfa59UL;
         void ICapnpSerializable.Deserialize(DeserializerState arg_)
         {
             var reader = READER.create(arg_);
@@ -1260,6 +1264,7 @@ namespace Capnproto_test.Capnp.Test
 
     public class TestOutOfOrder : ICapnpSerializable
     {
+        public const UInt64 TypeId = 0xa9d5f8efe770022bUL;
         void ICapnpSerializable.Deserialize(DeserializerState arg_)
         {
             var reader = READER.create(arg_);
@@ -1438,6 +1443,7 @@ namespace Capnproto_test.Capnp.Test
 
     public class TestUnion : ICapnpSerializable
     {
+        public const UInt64 TypeId = 0xf47697362233ce52UL;
         void ICapnpSerializable.Deserialize(DeserializerState arg_)
         {
             var reader = READER.create(arg_);
@@ -1656,6 +1662,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class @union0 : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xfc76a82eecb7a718UL;
             public enum WHICH : ushort
             {
                 U0f0s0 = 0,
@@ -2074,6 +2081,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class @union1 : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xee0a6b99b7dc7ab2UL;
             public enum WHICH : ushort
             {
                 U1f0s0 = 0,
@@ -2654,6 +2662,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class @union2 : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xafc5fd419f0d66d4UL;
             public enum WHICH : ushort
             {
                 U2f0s1 = 0,
@@ -2867,6 +2876,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class @union3 : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xa2fb022ec7f30053UL;
             public enum WHICH : ushort
             {
                 U3f0s1 = 0,
@@ -3081,6 +3091,7 @@ namespace Capnproto_test.Capnp.Test
 
     public class TestUnnamedUnion : ICapnpSerializable
     {
+        public const UInt64 TypeId = 0x9e2e784c915329b6UL;
         public enum WHICH : ushort
         {
             Foo = 0,
@@ -3260,6 +3271,7 @@ namespace Capnproto_test.Capnp.Test
 
     public class TestUnionInUnion : ICapnpSerializable
     {
+        public const UInt64 TypeId = 0x89a9494f1b900f22UL;
         void ICapnpSerializable.Deserialize(DeserializerState arg_)
         {
             var reader = READER.create(arg_);
@@ -3316,6 +3328,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class @outer : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xd005f6c63707670cUL;
             public enum WHICH : ushort
             {
                 Inner = 0,
@@ -3446,6 +3459,7 @@ namespace Capnproto_test.Capnp.Test
 
             public class @inner : ICapnpSerializable
             {
+                public const UInt64 TypeId = 0xff9ce111c6f8e5dbUL;
                 public enum WHICH : ushort
                 {
                     Foo = 0,
@@ -3580,6 +3594,7 @@ namespace Capnproto_test.Capnp.Test
 
     public class TestGroups : ICapnpSerializable
     {
+        public const UInt64 TypeId = 0xdc841556134c3103UL;
         void ICapnpSerializable.Deserialize(DeserializerState arg_)
         {
             var reader = READER.create(arg_);
@@ -3636,6 +3651,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class @groups : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xe22ae74ff9113268UL;
             public enum WHICH : ushort
             {
                 Foo = 0,
@@ -3791,6 +3807,7 @@ namespace Capnproto_test.Capnp.Test
 
             public class @foo : ICapnpSerializable
             {
+                public const UInt64 TypeId = 0xf5fcba89c0c1196fUL;
                 void ICapnpSerializable.Deserialize(DeserializerState arg_)
                 {
                     var reader = READER.create(arg_);
@@ -3878,6 +3895,7 @@ namespace Capnproto_test.Capnp.Test
 
             public class @baz : ICapnpSerializable
             {
+                public const UInt64 TypeId = 0xf0fa30304066a4b3UL;
                 void ICapnpSerializable.Deserialize(DeserializerState arg_)
                 {
                     var reader = READER.create(arg_);
@@ -3965,6 +3983,7 @@ namespace Capnproto_test.Capnp.Test
 
             public class @bar : ICapnpSerializable
             {
+                public const UInt64 TypeId = 0xb727c0d0091a001dUL;
                 void ICapnpSerializable.Deserialize(DeserializerState arg_)
                 {
                     var reader = READER.create(arg_);
@@ -4054,6 +4073,7 @@ namespace Capnproto_test.Capnp.Test
 
     public class TestInterleavedGroups : ICapnpSerializable
     {
+        public const UInt64 TypeId = 0xf77ed6f7454eec40UL;
         void ICapnpSerializable.Deserialize(DeserializerState arg_)
         {
             var reader = READER.create(arg_);
@@ -4124,6 +4144,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class @group1 : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xc7485a3516c7d3c8UL;
             public enum WHICH : ushort
             {
                 Qux = 0,
@@ -4327,6 +4348,7 @@ namespace Capnproto_test.Capnp.Test
 
             public class @corge : ICapnpSerializable
             {
+                public const UInt64 TypeId = 0xdb0afd413f4a313aUL;
                 void ICapnpSerializable.Deserialize(DeserializerState arg_)
                 {
                     var reader = READER.create(arg_);
@@ -4430,6 +4452,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class @group2 : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xcc85a335569990e9UL;
             public enum WHICH : ushort
             {
                 Qux = 0,
@@ -4633,6 +4656,7 @@ namespace Capnproto_test.Capnp.Test
 
             public class @corge : ICapnpSerializable
             {
+                public const UInt64 TypeId = 0xa017f0366827ee37UL;
                 void ICapnpSerializable.Deserialize(DeserializerState arg_)
                 {
                     var reader = READER.create(arg_);
@@ -4737,6 +4761,7 @@ namespace Capnproto_test.Capnp.Test
 
     public class TestUnionDefaults : ICapnpSerializable
     {
+        public const UInt64 TypeId = 0x94f7e0b103b4b718UL;
         void ICapnpSerializable.Deserialize(DeserializerState arg_)
         {
             var reader = READER.create(arg_);
@@ -4856,6 +4881,7 @@ namespace Capnproto_test.Capnp.Test
 
     public class TestNestedTypes : ICapnpSerializable
     {
+        public const UInt64 TypeId = 0xd9f2b5941a343bcdUL;
         void ICapnpSerializable.Deserialize(DeserializerState arg_)
         {
             var reader = READER.create(arg_);
@@ -4951,6 +4977,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class NestedStruct : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0x82cd03a53b29d76bUL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -5034,6 +5061,7 @@ namespace Capnproto_test.Capnp.Test
 
     public class TestUsing : ICapnpSerializable
     {
+        public const UInt64 TypeId = 0xe78aac389e77b065UL;
         void ICapnpSerializable.Deserialize(DeserializerState arg_)
         {
             var reader = READER.create(arg_);
@@ -5109,6 +5137,7 @@ namespace Capnproto_test.Capnp.Test
 
     public class TestLists : ICapnpSerializable
     {
+        public const UInt64 TypeId = 0xe41885c94393277eUL;
         void ICapnpSerializable.Deserialize(DeserializerState arg_)
         {
             var reader = READER.create(arg_);
@@ -5301,6 +5330,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Struct0 : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0x8412c03b75b2cfeeUL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -5344,6 +5374,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Struct1 : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xe0fe5870b141ad69UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -5402,6 +5433,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Struct8 : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xa6411a353090145bUL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -5460,6 +5492,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Struct16 : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xa8abf7a82928986cUL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -5518,6 +5551,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Struct32 : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xad7beedc4ed30742UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -5576,6 +5610,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Struct64 : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xef9a34f2ff7cc646UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -5634,6 +5669,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class StructP : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xc6abf1b0329e6227UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -5692,6 +5728,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Struct0c : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0x943a234ca336b16aUL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -5750,6 +5787,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Struct1c : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0x8991bc0e74a594cdUL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -5823,6 +5861,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Struct8c : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xed267416528c7a24UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -5896,6 +5935,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Struct16c : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0x9978837b037d58e6UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -5969,6 +6009,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Struct32c : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xed5fa940f54a7904UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -6042,6 +6083,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Struct64c : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xbc743778f2597c7dUL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -6115,6 +6157,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class StructPc : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xc2e364a40182013dUL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -6189,6 +6232,7 @@ namespace Capnproto_test.Capnp.Test
 
     public class TestFieldZeroIsBit : ICapnpSerializable
     {
+        public const UInt64 TypeId = 0x92fc29a80f3ddd5cUL;
         void ICapnpSerializable.Deserialize(DeserializerState arg_)
         {
             var reader = READER.create(arg_);
@@ -6279,6 +6323,7 @@ namespace Capnproto_test.Capnp.Test
 
     public class TestListDefaults : ICapnpSerializable
     {
+        public const UInt64 TypeId = 0xa851ad32cbc2ffeaUL;
         void ICapnpSerializable.Deserialize(DeserializerState arg_)
         {
             var reader = READER.create(arg_);
@@ -6361,6 +6406,7 @@ namespace Capnproto_test.Capnp.Test
 
     public class TestLateUnion : ICapnpSerializable
     {
+        public const UInt64 TypeId = 0xa76e3c9bb7fd56d3UL;
         void ICapnpSerializable.Deserialize(DeserializerState arg_)
         {
             var reader = READER.create(arg_);
@@ -6476,6 +6522,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class @theUnion : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0x807280a2901aa079UL;
             public enum WHICH : ushort
             {
                 Qux = 0,
@@ -6635,6 +6682,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class @anotherUnion : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xc1973984dee98e3aUL;
             public enum WHICH : ushort
             {
                 Qux = 0,
@@ -6795,6 +6843,7 @@ namespace Capnproto_test.Capnp.Test
 
     public class TestOldVersion : ICapnpSerializable
     {
+        public const UInt64 TypeId = 0x95b30dd14e01dda8UL;
         void ICapnpSerializable.Deserialize(DeserializerState arg_)
         {
             var reader = READER.create(arg_);
@@ -6883,6 +6932,7 @@ namespace Capnproto_test.Capnp.Test
 
     public class TestNewVersion : ICapnpSerializable
     {
+        public const UInt64 TypeId = 0x8ed75a7469f04ce3UL;
         void ICapnpSerializable.Deserialize(DeserializerState arg_)
         {
             var reader = READER.create(arg_);
@@ -7003,6 +7053,7 @@ namespace Capnproto_test.Capnp.Test
 
     public class TestOldUnionVersion : ICapnpSerializable
     {
+        public const UInt64 TypeId = 0xbd5fe16e5170c492UL;
         public enum WHICH : ushort
         {
             A = 0,
@@ -7117,6 +7168,7 @@ namespace Capnproto_test.Capnp.Test
 
     public class TestNewUnionVersion : ICapnpSerializable
     {
+        public const UInt64 TypeId = 0xc7e4c513a975492bUL;
         public enum WHICH : ushort
         {
             A = 0,
@@ -7248,6 +7300,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class @a : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0x86232c1de4513e84UL;
             public enum WHICH : ushort
             {
                 A0 = 0,
@@ -7362,6 +7415,7 @@ namespace Capnproto_test.Capnp.Test
 
     public class TestStructUnion : ICapnpSerializable
     {
+        public const UInt64 TypeId = 0xfaf781ef89a00e39UL;
         void ICapnpSerializable.Deserialize(DeserializerState arg_)
         {
             var reader = READER.create(arg_);
@@ -7418,6 +7472,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class @un : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0x992edc677bef5a3cUL;
             public enum WHICH : ushort
             {
                 Struct = 0,
@@ -7550,6 +7605,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class SomeStruct : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0x9daec9823f171085UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -7624,6 +7680,7 @@ namespace Capnproto_test.Capnp.Test
 
     public class TestPrintInlineStructs : ICapnpSerializable
     {
+        public const UInt64 TypeId = 0xdec497819d097c3cUL;
         void ICapnpSerializable.Deserialize(DeserializerState arg_)
         {
             var reader = READER.create(arg_);
@@ -7696,6 +7753,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class InlineStruct : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0x8e4936003708dac2UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -7770,6 +7828,7 @@ namespace Capnproto_test.Capnp.Test
 
     public class TestWholeFloatDefault : ICapnpSerializable
     {
+        public const UInt64 TypeId = 0x91afd4a864dbb030UL;
         void ICapnpSerializable.Deserialize(DeserializerState arg_)
         {
             var reader = READER.create(arg_);
@@ -7845,6 +7904,7 @@ namespace Capnproto_test.Capnp.Test
 
     public class TestGenerics<TFoo, TBar> : ICapnpSerializable where TFoo : class where TBar : class
     {
+        public const UInt64 TypeId = 0x9d5b8cd8de9922ebUL;
         public enum WHICH : ushort
         {
             Uv = 0,
@@ -8003,6 +8063,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class @ug : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xb46a779beaf3384eUL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -8060,6 +8121,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Inner : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xf6a841117e19ac73UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -8133,6 +8195,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Inner2<TBaz> : ICapnpSerializable where TBaz : class
         {
+            public const UInt64 TypeId = 0xa9ab42b118d6d435UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -8235,6 +8298,7 @@ namespace Capnproto_test.Capnp.Test
 
             public class DeepNest<TQux> : ICapnpSerializable where TQux : class
             {
+                public const UInt64 TypeId = 0xb6a0829c762b06f3UL;
                 void ICapnpSerializable.Deserialize(DeserializerState arg_)
                 {
                     var reader = READER.create(arg_);
@@ -8376,6 +8440,7 @@ namespace Capnproto_test.Capnp.Test
                 {
                     public class Params_call : ICapnpSerializable
                     {
+                        public const UInt64 TypeId = 0xb84eecc799437049UL;
                         void ICapnpSerializable.Deserialize(DeserializerState arg_)
                         {
                             var reader = READER.create(arg_);
@@ -8419,6 +8484,7 @@ namespace Capnproto_test.Capnp.Test
 
                     public class Result_call : ICapnpSerializable
                     {
+                        public const UInt64 TypeId = 0xe080f0fc54614f6fUL;
                         void ICapnpSerializable.Deserialize(DeserializerState arg_)
                         {
                             var reader = READER.create(arg_);
@@ -8512,6 +8578,7 @@ namespace Capnproto_test.Capnp.Test
         {
             public class Result_call : ICapnpSerializable
             {
+                public const UInt64 TypeId = 0xa5b46224e33581adUL;
                 void ICapnpSerializable.Deserialize(DeserializerState arg_)
                 {
                     var reader = READER.create(arg_);
@@ -8586,6 +8653,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class UseAliases : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0x8e656edfb45ba6cfUL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -8720,6 +8788,7 @@ namespace Capnproto_test.Capnp.Test
 
     public class TestGenericsWrapper<TFoo, TBar> : ICapnpSerializable where TFoo : class where TBar : class
     {
+        public const UInt64 TypeId = 0xa9b2b1f52dde845dUL;
         void ICapnpSerializable.Deserialize(DeserializerState arg_)
         {
             var reader = READER.create(arg_);
@@ -8778,6 +8847,7 @@ namespace Capnproto_test.Capnp.Test
 
     public class TestGenericsWrapper2 : ICapnpSerializable
     {
+        public const UInt64 TypeId = 0xf28f83667a557a04UL;
         void ICapnpSerializable.Deserialize(DeserializerState arg_)
         {
             var reader = READER.create(arg_);
@@ -8887,6 +8957,7 @@ namespace Capnproto_test.Capnp.Test
     {
         public class Params_call<TT, TU> : ICapnpSerializable where TT : class where TU : class
         {
+            public const UInt64 TypeId = 0xf83f8caf54bdc486UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -9013,6 +9084,7 @@ namespace Capnproto_test.Capnp.Test
     {
         public class Params_call<TT, TU> : ICapnpSerializable where TT : class where TU : class
         {
+            public const UInt64 TypeId = 0x9aab8e25c808d71eUL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -9087,6 +9159,7 @@ namespace Capnproto_test.Capnp.Test
 
     public class TestGenericsUnion<TFoo, TBar> : ICapnpSerializable where TFoo : class where TBar : class
     {
+        public const UInt64 TypeId = 0xa54870440e919063UL;
         public enum WHICH : ushort
         {
             Foo = 0,
@@ -9220,6 +9293,7 @@ namespace Capnproto_test.Capnp.Test
 
     public class TestUseGenerics : ICapnpSerializable
     {
+        public const UInt64 TypeId = 0x9427b2a71030338fUL;
         void ICapnpSerializable.Deserialize(DeserializerState arg_)
         {
             var reader = READER.create(arg_);
@@ -9669,6 +9743,7 @@ namespace Capnproto_test.Capnp.Test
 
     public class TestEmptyStruct : ICapnpSerializable
     {
+        public const UInt64 TypeId = 0xc5598844441096dcUL;
         void ICapnpSerializable.Deserialize(DeserializerState arg_)
         {
             var reader = READER.create(arg_);
@@ -9712,6 +9787,7 @@ namespace Capnproto_test.Capnp.Test
 
     public class TestConstants : ICapnpSerializable
     {
+        public const UInt64 TypeId = 0xabed745cd8c92095UL;
         void ICapnpSerializable.Deserialize(DeserializerState arg_)
         {
             var reader = READER.create(arg_);
@@ -9755,6 +9831,7 @@ namespace Capnproto_test.Capnp.Test
 
     public class TestAnyPointerConstants : ICapnpSerializable
     {
+        public const UInt64 TypeId = 0xddc280dbee9c99b3UL;
         void ICapnpSerializable.Deserialize(DeserializerState arg_)
         {
             var reader = READER.create(arg_);
@@ -9942,6 +10019,7 @@ namespace Capnproto_test.Capnp.Test
     {
         public class Params_foo : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xb874edc0d559b391UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -10015,6 +10093,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Result_foo : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xb04fcaddab714ba4UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -10073,6 +10152,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Params_bar : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xd044893357b42568UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -10116,6 +10196,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Result_bar : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0x9bf141df4247d52fUL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -10159,6 +10240,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Params_baz : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xd9ac8abb2a91cfbcUL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -10217,6 +10299,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Result_baz : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0x9b99d14f2f375b2dUL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -10373,6 +10456,7 @@ namespace Capnproto_test.Capnp.Test
     {
         public class Params_qux : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0x83a4bc5471363f17UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -10416,6 +10500,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Result_qux : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0x8e4b3d1a3e2753ddUL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -10459,6 +10544,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Result_corge : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xacf67532a7e7bad9UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -10502,6 +10588,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Params_grault : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xf3b834e851ea8af6UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -10742,6 +10829,7 @@ namespace Capnproto_test.Capnp.Test
     {
         public class Box : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xb0b29e51db0e26b1UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -10800,6 +10888,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class AnyBox : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0x9442ad5a1d2c8acbUL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -10858,6 +10947,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Params_getCap : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xc7e8df5096257034UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -10931,6 +11021,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Result_getCap : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xb2442a9e0ba28fdfUL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -11004,6 +11095,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Params_testPointers : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xa604ee63cf37819fUL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -11092,6 +11184,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Result_testPointers : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0x8eda54756c6070d6UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -11135,6 +11228,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Params_getAnyCap : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xf8e36b53ab093d4eUL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -11208,6 +11302,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Result_getAnyCap : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xbf44b4c94c26ef79UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -11327,6 +11422,7 @@ namespace Capnproto_test.Capnp.Test
     {
         public class Params_getCallSequence : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0x8f1e8cd56ceb74dcUL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -11385,6 +11481,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Result_getCallSequence : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xdedbb6bf3810eab7UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -11501,6 +11598,7 @@ namespace Capnproto_test.Capnp.Test
     {
         public class TailResult : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xa9ed2e5a9fd53d19UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -11589,6 +11687,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Params_foo : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xc5e1efc325614957UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -11715,6 +11814,7 @@ namespace Capnproto_test.Capnp.Test
     {
         public class Params_foo : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xb07a279515dc8ac5UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -12200,6 +12300,7 @@ namespace Capnproto_test.Capnp.Test
     {
         public class Params_callFoo : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0x931ba418da60f6e4UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -12258,6 +12359,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Result_callFoo : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0x9a28970beccecdd0UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -12316,6 +12418,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Params_callFooWhenResolved : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xfabc700c2ebe6378UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -12374,6 +12477,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Result_callFooWhenResolved : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xa54ce1e9aa822f90UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -12432,6 +12536,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Params_neverReturn : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0x94fe60465c95182bUL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -12490,6 +12595,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Result_neverReturn : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xdef4e5fa6999c5dcUL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -12548,6 +12654,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Params_hold : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xfe7c8fbb769d8e58UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -12606,6 +12713,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Result_hold : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xf839fb1374d003c9UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -12649,6 +12757,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Params_callHeld : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xf8c5e5ef1edf83beUL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -12692,6 +12801,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Result_callHeld : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xe59935f160ac7578UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -12750,6 +12860,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Params_getHeld : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xfeffc025fce317e3UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -12793,6 +12904,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Result_getHeld : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xef4e146185af67ceUL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -12851,6 +12963,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Params_echo : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xc07526f7e2e533b9UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -12909,6 +13022,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Result_echo : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xa6224536593d5b92UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -12967,6 +13081,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Params_expectCancel : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xa1cc32d87f3edeb1UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -13025,6 +13140,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Result_expectCancel : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0x8a3eba1758c0916eUL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -13068,6 +13184,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Params_methodWithDefaults : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0x99160a25fa50fbf1UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -13158,6 +13275,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Result_methodWithDefaults : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0x9c7e066f845a6c56UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -13232,6 +13350,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Params_getHandle : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xead024a301a092a1UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -13275,6 +13394,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Result_getHandle : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xc3490d75420a1fe8UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -13333,6 +13453,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Params_getNull : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xd8493f0e175d61f2UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -13376,6 +13497,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Result_getNull : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xe6955d8ef1023671UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -13434,6 +13556,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Params_getEnormousString : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0x805df436f55dd07aUL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -13477,6 +13600,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Result_getEnormousString : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0x860e7512dc3925b0UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -13535,6 +13659,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Params_methodWithNullDefault : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xfb92899aeb0ee74fUL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -13608,6 +13733,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Result_methodWithNullDefault : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0x8467348247305cf7UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -13875,6 +14001,7 @@ namespace Capnproto_test.Capnp.Test
         {
             public class Params_passThrough : ICapnpSerializable
             {
+                public const UInt64 TypeId = 0xff9bdcd05085d786UL;
                 void ICapnpSerializable.Deserialize(DeserializerState arg_)
                 {
                     var reader = READER.create(arg_);
@@ -13918,6 +14045,7 @@ namespace Capnproto_test.Capnp.Test
 
             public class Params_intercept : ICapnpSerializable
             {
+                public const UInt64 TypeId = 0xee94bed3615ee745UL;
                 void ICapnpSerializable.Deserialize(DeserializerState arg_)
                 {
                     var reader = READER.create(arg_);
@@ -13962,6 +14090,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Result : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xb0c6163faf291965UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -14020,6 +14149,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Params_makeThing : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xd8ac2acc3ece6556UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -14063,6 +14193,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Result_makeThing : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xe5d4904814ccbf29UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -14121,6 +14252,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Params_callPassThrough : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0x945d9f634a6a29daUL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -14194,6 +14326,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Params_callIntercept : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0x8749aac3375c5c71UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -14267,6 +14400,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Params_loopback : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0x869a1b7ab34b42c9UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -14325,6 +14459,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Result_loopback : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xecd19398fd88ab5cUL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -14383,6 +14518,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Params_waitForever : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0x8f6bb30cc62917ffUL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -14426,6 +14562,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Result_waitForever : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xc343a4907280be01UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -14470,6 +14607,7 @@ namespace Capnproto_test.Capnp.Test
 
     public class TestContainMembrane : ICapnpSerializable
     {
+        public const UInt64 TypeId = 0x949449ad7c11fa5cUL;
         void ICapnpSerializable.Deserialize(DeserializerState arg_)
         {
             var reader = READER.create(arg_);
@@ -14543,6 +14681,7 @@ namespace Capnproto_test.Capnp.Test
 
     public class TestTransferCap : ICapnpSerializable
     {
+        public const UInt64 TypeId = 0xdd2b66a791a279f0UL;
         void ICapnpSerializable.Deserialize(DeserializerState arg_)
         {
             var reader = READER.create(arg_);
@@ -14600,6 +14739,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Element : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xc7263e8f88844abcUL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -14769,6 +14909,7 @@ namespace Capnproto_test.Capnp.Test
     {
         public class Params_delete : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xca3a89cdeb6bd6b7UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -14812,6 +14953,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Result_delete : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xeeb5843598307592UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -14855,6 +14997,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Params_class : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0x9cf5a8313c5db036UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -14898,6 +15041,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Result_class : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xc0253868ac12e7d8UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -14941,6 +15085,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Params_void : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xa4a08763833c7757UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -14984,6 +15129,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Result_void : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xde82773089c0aeabUL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -15027,6 +15173,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Params_return : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0x99817360625e8ca3UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -15070,6 +15217,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Result_return : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xb70872e07eaa992fUL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -15163,6 +15311,7 @@ namespace Capnproto_test.Capnp.Test
     {
         public class Params_getCallerId : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0x8ec30e2451f1cffeUL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -15206,6 +15355,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Result_getCallerId : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xc71cf776034a3e67UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -15265,6 +15415,7 @@ namespace Capnproto_test.Capnp.Test
 
     public class TestSturdyRef : ICapnpSerializable
     {
+        public const UInt64 TypeId = 0xceba982cb629f6c2UL;
         void ICapnpSerializable.Deserialize(DeserializerState arg_)
         {
             var reader = READER.create(arg_);
@@ -15338,6 +15489,7 @@ namespace Capnproto_test.Capnp.Test
 
     public class TestSturdyRefHostId : ICapnpSerializable
     {
+        public const UInt64 TypeId = 0xe02d3bbe1010e342UL;
         void ICapnpSerializable.Deserialize(DeserializerState arg_)
         {
             var reader = READER.create(arg_);
@@ -15396,6 +15548,7 @@ namespace Capnproto_test.Capnp.Test
 
     public class TestSturdyRefObjectId : ICapnpSerializable
     {
+        public const UInt64 TypeId = 0xaeb2ad168e2f5697UL;
         void ICapnpSerializable.Deserialize(DeserializerState arg_)
         {
             var reader = READER.create(arg_);
@@ -15464,6 +15617,7 @@ namespace Capnproto_test.Capnp.Test
 
     public class TestProvisionId : ICapnpSerializable
     {
+        public const UInt64 TypeId = 0x9e5c574772b1d462UL;
         void ICapnpSerializable.Deserialize(DeserializerState arg_)
         {
             var reader = READER.create(arg_);
@@ -15507,6 +15661,7 @@ namespace Capnproto_test.Capnp.Test
 
     public class TestRecipientId : ICapnpSerializable
     {
+        public const UInt64 TypeId = 0xea2fb7dca9cdbdeaUL;
         void ICapnpSerializable.Deserialize(DeserializerState arg_)
         {
             var reader = READER.create(arg_);
@@ -15550,6 +15705,7 @@ namespace Capnproto_test.Capnp.Test
 
     public class TestThirdPartyCapId : ICapnpSerializable
     {
+        public const UInt64 TypeId = 0xa805157b98b65469UL;
         void ICapnpSerializable.Deserialize(DeserializerState arg_)
         {
             var reader = READER.create(arg_);
@@ -15593,6 +15749,7 @@ namespace Capnproto_test.Capnp.Test
 
     public class TestJoinResult : ICapnpSerializable
     {
+        public const UInt64 TypeId = 0xf4c58a8ebcd0f600UL;
         void ICapnpSerializable.Deserialize(DeserializerState arg_)
         {
             var reader = READER.create(arg_);
@@ -15636,6 +15793,7 @@ namespace Capnproto_test.Capnp.Test
 
     public class TestNameAnnotation : ICapnpSerializable
     {
+        public const UInt64 TypeId = 0xd1fd8e9caf2a5d58UL;
         public enum WHICH : ushort
         {
             BadFieldName = 0,
@@ -15798,6 +15956,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class @badlyNamedUnion : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0x89d9d1626b34017cUL;
             public enum WHICH : ushort
             {
                 BadlyNamedGroup = 0,
@@ -15928,6 +16087,7 @@ namespace Capnproto_test.Capnp.Test
 
             public class @badlyNamedGroup : ICapnpSerializable
             {
+                public const UInt64 TypeId = 0xc3594bce5b24b722UL;
                 void ICapnpSerializable.Deserialize(DeserializerState arg_)
                 {
                     var reader = READER.create(arg_);
@@ -15978,6 +16138,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class NestedStruct : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xbe406b6341d52284UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -16098,6 +16259,7 @@ namespace Capnproto_test.Capnp.Test
     {
         public class Params_badlyNamedMethod : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xc12efc3b075adfe9UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
@@ -16156,6 +16318,7 @@ namespace Capnproto_test.Capnp.Test
 
         public class Result_badlyNamedMethod : ICapnpSerializable
         {
+            public const UInt64 TypeId = 0xdcc3cdb4b28f6c86UL;
             void ICapnpSerializable.Deserialize(DeserializerState arg_)
             {
                 var reader = READER.create(arg_);
diff --git a/capnpc-csharp/Generator/CodeGenerator.cs b/capnpc-csharp/Generator/CodeGenerator.cs
index e401b3a..c9d608f 100644
--- a/capnpc-csharp/Generator/CodeGenerator.cs
+++ b/capnpc-csharp/Generator/CodeGenerator.cs
@@ -71,6 +71,8 @@
                     .AddConstraintClauses(MakeTypeParameterConstraints(def).ToArray());
             }
 
+            topDecl = topDecl.AddMembers(CommonSnippetGen.MakeTypeIdConst(def.Id, _names));
+
             if (def.UnionInfo != null)
             {
                 topDecl = topDecl.AddMembers(_commonGen.MakeUnionSelectorEnum(def));