diff --git a/__fixtures__/outputv2/akash/audit/v1beta1/audit.ts b/__fixtures__/outputv2/akash/audit/v1beta1/audit.ts
index 7d4f226f4..efaf0ff66 100644
--- a/__fixtures__/outputv2/akash/audit/v1beta1/audit.ts
+++ b/__fixtures__/outputv2/akash/audit/v1beta1/audit.ts
@@ -9,7 +9,7 @@ export interface Provider {
   auditor: string;
   attributes: Attribute[];
 }
-export interface ProviderProtoType {
+export interface ProviderProtoMsg {
   typeUrl: "/akash.audit.v1beta1.Provider";
   value: Uint8Array;
 }
@@ -20,7 +20,7 @@ export interface ProviderAmino {
   auditor: string;
   attributes: AttributeAmino[];
 }
-export interface ProviderAminoType {
+export interface ProviderAminoMsg {
   type: "/akash.audit.v1beta1.Provider";
   value: ProviderAmino;
 }
@@ -38,7 +38,7 @@ export interface AuditedAttributes {
   auditor: string;
   attributes: Attribute[];
 }
-export interface AuditedAttributesProtoType {
+export interface AuditedAttributesProtoMsg {
   typeUrl: "/akash.audit.v1beta1.AuditedAttributes";
   value: Uint8Array;
 }
@@ -49,7 +49,7 @@ export interface AuditedAttributesAmino {
   auditor: string;
   attributes: AttributeAmino[];
 }
-export interface AuditedAttributesAminoType {
+export interface AuditedAttributesAminoMsg {
   type: "/akash.audit.v1beta1.AuditedAttributes";
   value: AuditedAttributesAmino;
 }
@@ -65,7 +65,7 @@ export interface AuditedAttributesSDKType {
 export interface AttributesResponse {
   attributes: AuditedAttributes[];
 }
-export interface AttributesResponseProtoType {
+export interface AttributesResponseProtoMsg {
   typeUrl: "/akash.audit.v1beta1.AttributesResponse";
   value: Uint8Array;
 }
@@ -74,7 +74,7 @@ export interface AttributesResponseProtoType {
 export interface AttributesResponseAmino {
   attributes: AuditedAttributesAmino[];
 }
-export interface AttributesResponseAminoType {
+export interface AttributesResponseAminoMsg {
   type: "/akash.audit.v1beta1.AttributesResponse";
   value: AttributesResponseAmino;
 }
@@ -89,7 +89,7 @@ export interface AttributesFilters {
   auditors: string[];
   owners: string[];
 }
-export interface AttributesFiltersProtoType {
+export interface AttributesFiltersProtoMsg {
   typeUrl: "/akash.audit.v1beta1.AttributesFilters";
   value: Uint8Array;
 }
@@ -99,7 +99,7 @@ export interface AttributesFiltersAmino {
   auditors: string[];
   owners: string[];
 }
-export interface AttributesFiltersAminoType {
+export interface AttributesFiltersAminoMsg {
   type: "/akash.audit.v1beta1.AttributesFilters";
   value: AttributesFiltersAmino;
 }
@@ -116,7 +116,7 @@ export interface MsgSignProviderAttributes {
   auditor: string;
   attributes: Attribute[];
 }
-export interface MsgSignProviderAttributesProtoType {
+export interface MsgSignProviderAttributesProtoMsg {
   typeUrl: "/akash.audit.v1beta1.MsgSignProviderAttributes";
   value: Uint8Array;
 }
@@ -127,7 +127,7 @@ export interface MsgSignProviderAttributesAmino {
   auditor: string;
   attributes: AttributeAmino[];
 }
-export interface MsgSignProviderAttributesAminoType {
+export interface MsgSignProviderAttributesAminoMsg {
   type: "/akash.audit.v1beta1.MsgSignProviderAttributes";
   value: MsgSignProviderAttributesAmino;
 }
@@ -141,14 +141,14 @@ export interface MsgSignProviderAttributesSDKType {
 
 /** MsgSignProviderAttributesResponse defines the Msg/CreateProvider response type. */
 export interface MsgSignProviderAttributesResponse {}
-export interface MsgSignProviderAttributesResponseProtoType {
+export interface MsgSignProviderAttributesResponseProtoMsg {
   typeUrl: "/akash.audit.v1beta1.MsgSignProviderAttributesResponse";
   value: Uint8Array;
 }
 
 /** MsgSignProviderAttributesResponse defines the Msg/CreateProvider response type. */
 export interface MsgSignProviderAttributesResponseAmino {}
-export interface MsgSignProviderAttributesResponseAminoType {
+export interface MsgSignProviderAttributesResponseAminoMsg {
   type: "/akash.audit.v1beta1.MsgSignProviderAttributesResponse";
   value: MsgSignProviderAttributesResponseAmino;
 }
@@ -162,7 +162,7 @@ export interface MsgDeleteProviderAttributes {
   auditor: string;
   keys: string[];
 }
-export interface MsgDeleteProviderAttributesProtoType {
+export interface MsgDeleteProviderAttributesProtoMsg {
   typeUrl: "/akash.audit.v1beta1.MsgDeleteProviderAttributes";
   value: Uint8Array;
 }
@@ -173,7 +173,7 @@ export interface MsgDeleteProviderAttributesAmino {
   auditor: string;
   keys: string[];
 }
-export interface MsgDeleteProviderAttributesAminoType {
+export interface MsgDeleteProviderAttributesAminoMsg {
   type: "/akash.audit.v1beta1.MsgDeleteProviderAttributes";
   value: MsgDeleteProviderAttributesAmino;
 }
@@ -187,14 +187,14 @@ export interface MsgDeleteProviderAttributesSDKType {
 
 /** MsgDeleteProviderAttributesResponse defines the Msg/ProviderAttributes response type. */
 export interface MsgDeleteProviderAttributesResponse {}
-export interface MsgDeleteProviderAttributesResponseProtoType {
+export interface MsgDeleteProviderAttributesResponseProtoMsg {
   typeUrl: "/akash.audit.v1beta1.MsgDeleteProviderAttributesResponse";
   value: Uint8Array;
 }
 
 /** MsgDeleteProviderAttributesResponse defines the Msg/ProviderAttributes response type. */
 export interface MsgDeleteProviderAttributesResponseAmino {}
-export interface MsgDeleteProviderAttributesResponseAminoType {
+export interface MsgDeleteProviderAttributesResponseAminoMsg {
   type: "/akash.audit.v1beta1.MsgDeleteProviderAttributesResponse";
   value: MsgDeleteProviderAttributesResponseAmino;
 }
@@ -211,6 +211,8 @@ function createBaseProvider(): Provider {
 }
 
 export const Provider = {
+  typeUrl: "/akash.audit.v1beta1.Provider",
+
   encode(message: Provider, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.owner !== "") {
       writer.uint32(10).string(message.owner);
@@ -329,6 +331,25 @@ export const Provider = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ProviderAminoMsg): Provider {
+    return Provider.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ProviderProtoMsg): Provider {
+    return Provider.decode(message.value);
+  },
+
+  toProto(message: Provider): Uint8Array {
+    return Provider.encode(message).finish();
+  },
+
+  toProtoMsg(message: Provider): ProviderProtoMsg {
+    return {
+      typeUrl: "/akash.audit.v1beta1.Provider",
+      value: Provider.encode(message).finish()
+    };
   }
 
 };
@@ -342,6 +363,8 @@ function createBaseAuditedAttributes(): AuditedAttributes {
 }
 
 export const AuditedAttributes = {
+  typeUrl: "/akash.audit.v1beta1.AuditedAttributes",
+
   encode(message: AuditedAttributes, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.owner !== "") {
       writer.uint32(10).string(message.owner);
@@ -460,6 +483,25 @@ export const AuditedAttributes = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: AuditedAttributesAminoMsg): AuditedAttributes {
+    return AuditedAttributes.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: AuditedAttributesProtoMsg): AuditedAttributes {
+    return AuditedAttributes.decode(message.value);
+  },
+
+  toProto(message: AuditedAttributes): Uint8Array {
+    return AuditedAttributes.encode(message).finish();
+  },
+
+  toProtoMsg(message: AuditedAttributes): AuditedAttributesProtoMsg {
+    return {
+      typeUrl: "/akash.audit.v1beta1.AuditedAttributes",
+      value: AuditedAttributes.encode(message).finish()
+    };
   }
 
 };
@@ -471,6 +513,8 @@ function createBaseAttributesResponse(): AttributesResponse {
 }
 
 export const AttributesResponse = {
+  typeUrl: "/akash.audit.v1beta1.AttributesResponse",
+
   encode(message: AttributesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.attributes) {
       AuditedAttributes.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -559,6 +603,25 @@ export const AttributesResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: AttributesResponseAminoMsg): AttributesResponse {
+    return AttributesResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: AttributesResponseProtoMsg): AttributesResponse {
+    return AttributesResponse.decode(message.value);
+  },
+
+  toProto(message: AttributesResponse): Uint8Array {
+    return AttributesResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: AttributesResponse): AttributesResponseProtoMsg {
+    return {
+      typeUrl: "/akash.audit.v1beta1.AttributesResponse",
+      value: AttributesResponse.encode(message).finish()
+    };
   }
 
 };
@@ -571,6 +634,8 @@ function createBaseAttributesFilters(): AttributesFilters {
 }
 
 export const AttributesFilters = {
+  typeUrl: "/akash.audit.v1beta1.AttributesFilters",
+
   encode(message: AttributesFilters, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.auditors) {
       writer.uint32(10).string(v!);
@@ -689,6 +754,25 @@ export const AttributesFilters = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: AttributesFiltersAminoMsg): AttributesFilters {
+    return AttributesFilters.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: AttributesFiltersProtoMsg): AttributesFilters {
+    return AttributesFilters.decode(message.value);
+  },
+
+  toProto(message: AttributesFilters): Uint8Array {
+    return AttributesFilters.encode(message).finish();
+  },
+
+  toProtoMsg(message: AttributesFilters): AttributesFiltersProtoMsg {
+    return {
+      typeUrl: "/akash.audit.v1beta1.AttributesFilters",
+      value: AttributesFilters.encode(message).finish()
+    };
   }
 
 };
@@ -702,6 +786,8 @@ function createBaseMsgSignProviderAttributes(): MsgSignProviderAttributes {
 }
 
 export const MsgSignProviderAttributes = {
+  typeUrl: "/akash.audit.v1beta1.MsgSignProviderAttributes",
+
   encode(message: MsgSignProviderAttributes, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.owner !== "") {
       writer.uint32(10).string(message.owner);
@@ -820,6 +906,25 @@ export const MsgSignProviderAttributes = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: MsgSignProviderAttributesAminoMsg): MsgSignProviderAttributes {
+    return MsgSignProviderAttributes.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgSignProviderAttributesProtoMsg): MsgSignProviderAttributes {
+    return MsgSignProviderAttributes.decode(message.value);
+  },
+
+  toProto(message: MsgSignProviderAttributes): Uint8Array {
+    return MsgSignProviderAttributes.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgSignProviderAttributes): MsgSignProviderAttributesProtoMsg {
+    return {
+      typeUrl: "/akash.audit.v1beta1.MsgSignProviderAttributes",
+      value: MsgSignProviderAttributes.encode(message).finish()
+    };
   }
 
 };
@@ -829,6 +934,8 @@ function createBaseMsgSignProviderAttributesResponse(): MsgSignProviderAttribute
 }
 
 export const MsgSignProviderAttributesResponse = {
+  typeUrl: "/akash.audit.v1beta1.MsgSignProviderAttributesResponse",
+
   encode(_: MsgSignProviderAttributesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -881,6 +988,25 @@ export const MsgSignProviderAttributesResponse = {
   toAmino(_: MsgSignProviderAttributesResponse): MsgSignProviderAttributesResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgSignProviderAttributesResponseAminoMsg): MsgSignProviderAttributesResponse {
+    return MsgSignProviderAttributesResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgSignProviderAttributesResponseProtoMsg): MsgSignProviderAttributesResponse {
+    return MsgSignProviderAttributesResponse.decode(message.value);
+  },
+
+  toProto(message: MsgSignProviderAttributesResponse): Uint8Array {
+    return MsgSignProviderAttributesResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgSignProviderAttributesResponse): MsgSignProviderAttributesResponseProtoMsg {
+    return {
+      typeUrl: "/akash.audit.v1beta1.MsgSignProviderAttributesResponse",
+      value: MsgSignProviderAttributesResponse.encode(message).finish()
+    };
   }
 
 };
@@ -894,6 +1020,8 @@ function createBaseMsgDeleteProviderAttributes(): MsgDeleteProviderAttributes {
 }
 
 export const MsgDeleteProviderAttributes = {
+  typeUrl: "/akash.audit.v1beta1.MsgDeleteProviderAttributes",
+
   encode(message: MsgDeleteProviderAttributes, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.owner !== "") {
       writer.uint32(10).string(message.owner);
@@ -1012,6 +1140,25 @@ export const MsgDeleteProviderAttributes = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: MsgDeleteProviderAttributesAminoMsg): MsgDeleteProviderAttributes {
+    return MsgDeleteProviderAttributes.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgDeleteProviderAttributesProtoMsg): MsgDeleteProviderAttributes {
+    return MsgDeleteProviderAttributes.decode(message.value);
+  },
+
+  toProto(message: MsgDeleteProviderAttributes): Uint8Array {
+    return MsgDeleteProviderAttributes.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgDeleteProviderAttributes): MsgDeleteProviderAttributesProtoMsg {
+    return {
+      typeUrl: "/akash.audit.v1beta1.MsgDeleteProviderAttributes",
+      value: MsgDeleteProviderAttributes.encode(message).finish()
+    };
   }
 
 };
@@ -1021,6 +1168,8 @@ function createBaseMsgDeleteProviderAttributesResponse(): MsgDeleteProviderAttri
 }
 
 export const MsgDeleteProviderAttributesResponse = {
+  typeUrl: "/akash.audit.v1beta1.MsgDeleteProviderAttributesResponse",
+
   encode(_: MsgDeleteProviderAttributesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -1073,6 +1222,25 @@ export const MsgDeleteProviderAttributesResponse = {
   toAmino(_: MsgDeleteProviderAttributesResponse): MsgDeleteProviderAttributesResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgDeleteProviderAttributesResponseAminoMsg): MsgDeleteProviderAttributesResponse {
+    return MsgDeleteProviderAttributesResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgDeleteProviderAttributesResponseProtoMsg): MsgDeleteProviderAttributesResponse {
+    return MsgDeleteProviderAttributesResponse.decode(message.value);
+  },
+
+  toProto(message: MsgDeleteProviderAttributesResponse): Uint8Array {
+    return MsgDeleteProviderAttributesResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgDeleteProviderAttributesResponse): MsgDeleteProviderAttributesResponseProtoMsg {
+    return {
+      typeUrl: "/akash.audit.v1beta1.MsgDeleteProviderAttributesResponse",
+      value: MsgDeleteProviderAttributesResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/akash/audit/v1beta2/audit.ts b/__fixtures__/outputv2/akash/audit/v1beta2/audit.ts
index c94ec47fb..fca849b21 100644
--- a/__fixtures__/outputv2/akash/audit/v1beta2/audit.ts
+++ b/__fixtures__/outputv2/akash/audit/v1beta2/audit.ts
@@ -9,7 +9,7 @@ export interface Provider {
   auditor: string;
   attributes: Attribute[];
 }
-export interface ProviderProtoType {
+export interface ProviderProtoMsg {
   typeUrl: "/akash.audit.v1beta2.Provider";
   value: Uint8Array;
 }
@@ -20,7 +20,7 @@ export interface ProviderAmino {
   auditor: string;
   attributes: AttributeAmino[];
 }
-export interface ProviderAminoType {
+export interface ProviderAminoMsg {
   type: "/akash.audit.v1beta2.Provider";
   value: ProviderAmino;
 }
@@ -38,7 +38,7 @@ export interface AuditedAttributes {
   auditor: string;
   attributes: Attribute[];
 }
-export interface AuditedAttributesProtoType {
+export interface AuditedAttributesProtoMsg {
   typeUrl: "/akash.audit.v1beta2.AuditedAttributes";
   value: Uint8Array;
 }
@@ -49,7 +49,7 @@ export interface AuditedAttributesAmino {
   auditor: string;
   attributes: AttributeAmino[];
 }
-export interface AuditedAttributesAminoType {
+export interface AuditedAttributesAminoMsg {
   type: "/akash.audit.v1beta2.AuditedAttributes";
   value: AuditedAttributesAmino;
 }
@@ -65,7 +65,7 @@ export interface AuditedAttributesSDKType {
 export interface AttributesResponse {
   attributes: AuditedAttributes[];
 }
-export interface AttributesResponseProtoType {
+export interface AttributesResponseProtoMsg {
   typeUrl: "/akash.audit.v1beta2.AttributesResponse";
   value: Uint8Array;
 }
@@ -74,7 +74,7 @@ export interface AttributesResponseProtoType {
 export interface AttributesResponseAmino {
   attributes: AuditedAttributesAmino[];
 }
-export interface AttributesResponseAminoType {
+export interface AttributesResponseAminoMsg {
   type: "/akash.audit.v1beta2.AttributesResponse";
   value: AttributesResponseAmino;
 }
@@ -89,7 +89,7 @@ export interface AttributesFilters {
   auditors: string[];
   owners: string[];
 }
-export interface AttributesFiltersProtoType {
+export interface AttributesFiltersProtoMsg {
   typeUrl: "/akash.audit.v1beta2.AttributesFilters";
   value: Uint8Array;
 }
@@ -99,7 +99,7 @@ export interface AttributesFiltersAmino {
   auditors: string[];
   owners: string[];
 }
-export interface AttributesFiltersAminoType {
+export interface AttributesFiltersAminoMsg {
   type: "/akash.audit.v1beta2.AttributesFilters";
   value: AttributesFiltersAmino;
 }
@@ -116,7 +116,7 @@ export interface MsgSignProviderAttributes {
   auditor: string;
   attributes: Attribute[];
 }
-export interface MsgSignProviderAttributesProtoType {
+export interface MsgSignProviderAttributesProtoMsg {
   typeUrl: "/akash.audit.v1beta2.MsgSignProviderAttributes";
   value: Uint8Array;
 }
@@ -127,7 +127,7 @@ export interface MsgSignProviderAttributesAmino {
   auditor: string;
   attributes: AttributeAmino[];
 }
-export interface MsgSignProviderAttributesAminoType {
+export interface MsgSignProviderAttributesAminoMsg {
   type: "/akash.audit.v1beta2.MsgSignProviderAttributes";
   value: MsgSignProviderAttributesAmino;
 }
@@ -141,14 +141,14 @@ export interface MsgSignProviderAttributesSDKType {
 
 /** MsgSignProviderAttributesResponse defines the Msg/CreateProvider response type. */
 export interface MsgSignProviderAttributesResponse {}
-export interface MsgSignProviderAttributesResponseProtoType {
+export interface MsgSignProviderAttributesResponseProtoMsg {
   typeUrl: "/akash.audit.v1beta2.MsgSignProviderAttributesResponse";
   value: Uint8Array;
 }
 
 /** MsgSignProviderAttributesResponse defines the Msg/CreateProvider response type. */
 export interface MsgSignProviderAttributesResponseAmino {}
-export interface MsgSignProviderAttributesResponseAminoType {
+export interface MsgSignProviderAttributesResponseAminoMsg {
   type: "/akash.audit.v1beta2.MsgSignProviderAttributesResponse";
   value: MsgSignProviderAttributesResponseAmino;
 }
@@ -162,7 +162,7 @@ export interface MsgDeleteProviderAttributes {
   auditor: string;
   keys: string[];
 }
-export interface MsgDeleteProviderAttributesProtoType {
+export interface MsgDeleteProviderAttributesProtoMsg {
   typeUrl: "/akash.audit.v1beta2.MsgDeleteProviderAttributes";
   value: Uint8Array;
 }
@@ -173,7 +173,7 @@ export interface MsgDeleteProviderAttributesAmino {
   auditor: string;
   keys: string[];
 }
-export interface MsgDeleteProviderAttributesAminoType {
+export interface MsgDeleteProviderAttributesAminoMsg {
   type: "/akash.audit.v1beta2.MsgDeleteProviderAttributes";
   value: MsgDeleteProviderAttributesAmino;
 }
@@ -187,14 +187,14 @@ export interface MsgDeleteProviderAttributesSDKType {
 
 /** MsgDeleteProviderAttributesResponse defines the Msg/ProviderAttributes response type. */
 export interface MsgDeleteProviderAttributesResponse {}
-export interface MsgDeleteProviderAttributesResponseProtoType {
+export interface MsgDeleteProviderAttributesResponseProtoMsg {
   typeUrl: "/akash.audit.v1beta2.MsgDeleteProviderAttributesResponse";
   value: Uint8Array;
 }
 
 /** MsgDeleteProviderAttributesResponse defines the Msg/ProviderAttributes response type. */
 export interface MsgDeleteProviderAttributesResponseAmino {}
-export interface MsgDeleteProviderAttributesResponseAminoType {
+export interface MsgDeleteProviderAttributesResponseAminoMsg {
   type: "/akash.audit.v1beta2.MsgDeleteProviderAttributesResponse";
   value: MsgDeleteProviderAttributesResponseAmino;
 }
@@ -211,6 +211,8 @@ function createBaseProvider(): Provider {
 }
 
 export const Provider = {
+  typeUrl: "/akash.audit.v1beta2.Provider",
+
   encode(message: Provider, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.owner !== "") {
       writer.uint32(10).string(message.owner);
@@ -329,6 +331,25 @@ export const Provider = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ProviderAminoMsg): Provider {
+    return Provider.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ProviderProtoMsg): Provider {
+    return Provider.decode(message.value);
+  },
+
+  toProto(message: Provider): Uint8Array {
+    return Provider.encode(message).finish();
+  },
+
+  toProtoMsg(message: Provider): ProviderProtoMsg {
+    return {
+      typeUrl: "/akash.audit.v1beta2.Provider",
+      value: Provider.encode(message).finish()
+    };
   }
 
 };
@@ -342,6 +363,8 @@ function createBaseAuditedAttributes(): AuditedAttributes {
 }
 
 export const AuditedAttributes = {
+  typeUrl: "/akash.audit.v1beta2.AuditedAttributes",
+
   encode(message: AuditedAttributes, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.owner !== "") {
       writer.uint32(10).string(message.owner);
@@ -460,6 +483,25 @@ export const AuditedAttributes = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: AuditedAttributesAminoMsg): AuditedAttributes {
+    return AuditedAttributes.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: AuditedAttributesProtoMsg): AuditedAttributes {
+    return AuditedAttributes.decode(message.value);
+  },
+
+  toProto(message: AuditedAttributes): Uint8Array {
+    return AuditedAttributes.encode(message).finish();
+  },
+
+  toProtoMsg(message: AuditedAttributes): AuditedAttributesProtoMsg {
+    return {
+      typeUrl: "/akash.audit.v1beta2.AuditedAttributes",
+      value: AuditedAttributes.encode(message).finish()
+    };
   }
 
 };
@@ -471,6 +513,8 @@ function createBaseAttributesResponse(): AttributesResponse {
 }
 
 export const AttributesResponse = {
+  typeUrl: "/akash.audit.v1beta2.AttributesResponse",
+
   encode(message: AttributesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.attributes) {
       AuditedAttributes.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -559,6 +603,25 @@ export const AttributesResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: AttributesResponseAminoMsg): AttributesResponse {
+    return AttributesResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: AttributesResponseProtoMsg): AttributesResponse {
+    return AttributesResponse.decode(message.value);
+  },
+
+  toProto(message: AttributesResponse): Uint8Array {
+    return AttributesResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: AttributesResponse): AttributesResponseProtoMsg {
+    return {
+      typeUrl: "/akash.audit.v1beta2.AttributesResponse",
+      value: AttributesResponse.encode(message).finish()
+    };
   }
 
 };
@@ -571,6 +634,8 @@ function createBaseAttributesFilters(): AttributesFilters {
 }
 
 export const AttributesFilters = {
+  typeUrl: "/akash.audit.v1beta2.AttributesFilters",
+
   encode(message: AttributesFilters, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.auditors) {
       writer.uint32(10).string(v!);
@@ -689,6 +754,25 @@ export const AttributesFilters = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: AttributesFiltersAminoMsg): AttributesFilters {
+    return AttributesFilters.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: AttributesFiltersProtoMsg): AttributesFilters {
+    return AttributesFilters.decode(message.value);
+  },
+
+  toProto(message: AttributesFilters): Uint8Array {
+    return AttributesFilters.encode(message).finish();
+  },
+
+  toProtoMsg(message: AttributesFilters): AttributesFiltersProtoMsg {
+    return {
+      typeUrl: "/akash.audit.v1beta2.AttributesFilters",
+      value: AttributesFilters.encode(message).finish()
+    };
   }
 
 };
@@ -702,6 +786,8 @@ function createBaseMsgSignProviderAttributes(): MsgSignProviderAttributes {
 }
 
 export const MsgSignProviderAttributes = {
+  typeUrl: "/akash.audit.v1beta2.MsgSignProviderAttributes",
+
   encode(message: MsgSignProviderAttributes, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.owner !== "") {
       writer.uint32(10).string(message.owner);
@@ -820,6 +906,25 @@ export const MsgSignProviderAttributes = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: MsgSignProviderAttributesAminoMsg): MsgSignProviderAttributes {
+    return MsgSignProviderAttributes.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgSignProviderAttributesProtoMsg): MsgSignProviderAttributes {
+    return MsgSignProviderAttributes.decode(message.value);
+  },
+
+  toProto(message: MsgSignProviderAttributes): Uint8Array {
+    return MsgSignProviderAttributes.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgSignProviderAttributes): MsgSignProviderAttributesProtoMsg {
+    return {
+      typeUrl: "/akash.audit.v1beta2.MsgSignProviderAttributes",
+      value: MsgSignProviderAttributes.encode(message).finish()
+    };
   }
 
 };
@@ -829,6 +934,8 @@ function createBaseMsgSignProviderAttributesResponse(): MsgSignProviderAttribute
 }
 
 export const MsgSignProviderAttributesResponse = {
+  typeUrl: "/akash.audit.v1beta2.MsgSignProviderAttributesResponse",
+
   encode(_: MsgSignProviderAttributesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -881,6 +988,25 @@ export const MsgSignProviderAttributesResponse = {
   toAmino(_: MsgSignProviderAttributesResponse): MsgSignProviderAttributesResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgSignProviderAttributesResponseAminoMsg): MsgSignProviderAttributesResponse {
+    return MsgSignProviderAttributesResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgSignProviderAttributesResponseProtoMsg): MsgSignProviderAttributesResponse {
+    return MsgSignProviderAttributesResponse.decode(message.value);
+  },
+
+  toProto(message: MsgSignProviderAttributesResponse): Uint8Array {
+    return MsgSignProviderAttributesResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgSignProviderAttributesResponse): MsgSignProviderAttributesResponseProtoMsg {
+    return {
+      typeUrl: "/akash.audit.v1beta2.MsgSignProviderAttributesResponse",
+      value: MsgSignProviderAttributesResponse.encode(message).finish()
+    };
   }
 
 };
@@ -894,6 +1020,8 @@ function createBaseMsgDeleteProviderAttributes(): MsgDeleteProviderAttributes {
 }
 
 export const MsgDeleteProviderAttributes = {
+  typeUrl: "/akash.audit.v1beta2.MsgDeleteProviderAttributes",
+
   encode(message: MsgDeleteProviderAttributes, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.owner !== "") {
       writer.uint32(10).string(message.owner);
@@ -1012,6 +1140,25 @@ export const MsgDeleteProviderAttributes = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: MsgDeleteProviderAttributesAminoMsg): MsgDeleteProviderAttributes {
+    return MsgDeleteProviderAttributes.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgDeleteProviderAttributesProtoMsg): MsgDeleteProviderAttributes {
+    return MsgDeleteProviderAttributes.decode(message.value);
+  },
+
+  toProto(message: MsgDeleteProviderAttributes): Uint8Array {
+    return MsgDeleteProviderAttributes.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgDeleteProviderAttributes): MsgDeleteProviderAttributesProtoMsg {
+    return {
+      typeUrl: "/akash.audit.v1beta2.MsgDeleteProviderAttributes",
+      value: MsgDeleteProviderAttributes.encode(message).finish()
+    };
   }
 
 };
@@ -1021,6 +1168,8 @@ function createBaseMsgDeleteProviderAttributesResponse(): MsgDeleteProviderAttri
 }
 
 export const MsgDeleteProviderAttributesResponse = {
+  typeUrl: "/akash.audit.v1beta2.MsgDeleteProviderAttributesResponse",
+
   encode(_: MsgDeleteProviderAttributesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -1073,6 +1222,25 @@ export const MsgDeleteProviderAttributesResponse = {
   toAmino(_: MsgDeleteProviderAttributesResponse): MsgDeleteProviderAttributesResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgDeleteProviderAttributesResponseAminoMsg): MsgDeleteProviderAttributesResponse {
+    return MsgDeleteProviderAttributesResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgDeleteProviderAttributesResponseProtoMsg): MsgDeleteProviderAttributesResponse {
+    return MsgDeleteProviderAttributesResponse.decode(message.value);
+  },
+
+  toProto(message: MsgDeleteProviderAttributesResponse): Uint8Array {
+    return MsgDeleteProviderAttributesResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgDeleteProviderAttributesResponse): MsgDeleteProviderAttributesResponseProtoMsg {
+    return {
+      typeUrl: "/akash.audit.v1beta2.MsgDeleteProviderAttributesResponse",
+      value: MsgDeleteProviderAttributesResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/akash/audit/v1beta2/genesis.ts b/__fixtures__/outputv2/akash/audit/v1beta2/genesis.ts
index 600a88601..5500e9ef8 100644
--- a/__fixtures__/outputv2/akash/audit/v1beta2/genesis.ts
+++ b/__fixtures__/outputv2/akash/audit/v1beta2/genesis.ts
@@ -7,7 +7,7 @@ export const protobufPackage = "akash.audit.v1beta2";
 export interface GenesisState {
   attributes: AuditedAttributes[];
 }
-export interface GenesisStateProtoType {
+export interface GenesisStateProtoMsg {
   typeUrl: "/akash.audit.v1beta2.GenesisState";
   value: Uint8Array;
 }
@@ -16,7 +16,7 @@ export interface GenesisStateProtoType {
 export interface GenesisStateAmino {
   attributes: AuditedAttributesAmino[];
 }
-export interface GenesisStateAminoType {
+export interface GenesisStateAminoMsg {
   type: "/akash.audit.v1beta2.GenesisState";
   value: GenesisStateAmino;
 }
@@ -33,6 +33,8 @@ function createBaseGenesisState(): GenesisState {
 }
 
 export const GenesisState = {
+  typeUrl: "/akash.audit.v1beta2.GenesisState",
+
   encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.attributes) {
       AuditedAttributes.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -121,6 +123,25 @@ export const GenesisState = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisStateAminoMsg): GenesisState {
+    return GenesisState.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: GenesisStateProtoMsg): GenesisState {
+    return GenesisState.decode(message.value);
+  },
+
+  toProto(message: GenesisState): Uint8Array {
+    return GenesisState.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisState): GenesisStateProtoMsg {
+    return {
+      typeUrl: "/akash.audit.v1beta2.GenesisState",
+      value: GenesisState.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/akash/audit/v1beta2/query.ts b/__fixtures__/outputv2/akash/audit/v1beta2/query.ts
index f86291e7a..0fdc06b6b 100644
--- a/__fixtures__/outputv2/akash/audit/v1beta2/query.ts
+++ b/__fixtures__/outputv2/akash/audit/v1beta2/query.ts
@@ -9,7 +9,7 @@ export interface QueryProvidersResponse {
   providers: Provider[];
   pagination?: PageResponse;
 }
-export interface QueryProvidersResponseProtoType {
+export interface QueryProvidersResponseProtoMsg {
   typeUrl: "/akash.audit.v1beta2.QueryProvidersResponse";
   value: Uint8Array;
 }
@@ -19,7 +19,7 @@ export interface QueryProvidersResponseAmino {
   providers: ProviderAmino[];
   pagination?: PageResponseAmino;
 }
-export interface QueryProvidersResponseAminoType {
+export interface QueryProvidersResponseAminoMsg {
   type: "/akash.audit.v1beta2.QueryProvidersResponse";
   value: QueryProvidersResponseAmino;
 }
@@ -35,7 +35,7 @@ export interface QueryProviderRequest {
   auditor: string;
   owner: string;
 }
-export interface QueryProviderRequestProtoType {
+export interface QueryProviderRequestProtoMsg {
   typeUrl: "/akash.audit.v1beta2.QueryProviderRequest";
   value: Uint8Array;
 }
@@ -45,7 +45,7 @@ export interface QueryProviderRequestAmino {
   auditor: string;
   owner: string;
 }
-export interface QueryProviderRequestAminoType {
+export interface QueryProviderRequestAminoMsg {
   type: "/akash.audit.v1beta2.QueryProviderRequest";
   value: QueryProviderRequestAmino;
 }
@@ -60,7 +60,7 @@ export interface QueryProviderRequestSDKType {
 export interface QueryAllProvidersAttributesRequest {
   pagination?: PageRequest;
 }
-export interface QueryAllProvidersAttributesRequestProtoType {
+export interface QueryAllProvidersAttributesRequestProtoMsg {
   typeUrl: "/akash.audit.v1beta2.QueryAllProvidersAttributesRequest";
   value: Uint8Array;
 }
@@ -69,7 +69,7 @@ export interface QueryAllProvidersAttributesRequestProtoType {
 export interface QueryAllProvidersAttributesRequestAmino {
   pagination?: PageRequestAmino;
 }
-export interface QueryAllProvidersAttributesRequestAminoType {
+export interface QueryAllProvidersAttributesRequestAminoMsg {
   type: "/akash.audit.v1beta2.QueryAllProvidersAttributesRequest";
   value: QueryAllProvidersAttributesRequestAmino;
 }
@@ -84,7 +84,7 @@ export interface QueryProviderAttributesRequest {
   owner: string;
   pagination?: PageRequest;
 }
-export interface QueryProviderAttributesRequestProtoType {
+export interface QueryProviderAttributesRequestProtoMsg {
   typeUrl: "/akash.audit.v1beta2.QueryProviderAttributesRequest";
   value: Uint8Array;
 }
@@ -94,7 +94,7 @@ export interface QueryProviderAttributesRequestAmino {
   owner: string;
   pagination?: PageRequestAmino;
 }
-export interface QueryProviderAttributesRequestAminoType {
+export interface QueryProviderAttributesRequestAminoMsg {
   type: "/akash.audit.v1beta2.QueryProviderAttributesRequest";
   value: QueryProviderAttributesRequestAmino;
 }
@@ -110,7 +110,7 @@ export interface QueryProviderAuditorRequest {
   auditor: string;
   owner: string;
 }
-export interface QueryProviderAuditorRequestProtoType {
+export interface QueryProviderAuditorRequestProtoMsg {
   typeUrl: "/akash.audit.v1beta2.QueryProviderAuditorRequest";
   value: Uint8Array;
 }
@@ -120,7 +120,7 @@ export interface QueryProviderAuditorRequestAmino {
   auditor: string;
   owner: string;
 }
-export interface QueryProviderAuditorRequestAminoType {
+export interface QueryProviderAuditorRequestAminoMsg {
   type: "/akash.audit.v1beta2.QueryProviderAuditorRequest";
   value: QueryProviderAuditorRequestAmino;
 }
@@ -136,7 +136,7 @@ export interface QueryAuditorAttributesRequest {
   auditor: string;
   pagination?: PageRequest;
 }
-export interface QueryAuditorAttributesRequestProtoType {
+export interface QueryAuditorAttributesRequestProtoMsg {
   typeUrl: "/akash.audit.v1beta2.QueryAuditorAttributesRequest";
   value: Uint8Array;
 }
@@ -146,7 +146,7 @@ export interface QueryAuditorAttributesRequestAmino {
   auditor: string;
   pagination?: PageRequestAmino;
 }
-export interface QueryAuditorAttributesRequestAminoType {
+export interface QueryAuditorAttributesRequestAminoMsg {
   type: "/akash.audit.v1beta2.QueryAuditorAttributesRequest";
   value: QueryAuditorAttributesRequestAmino;
 }
@@ -165,6 +165,8 @@ function createBaseQueryProvidersResponse(): QueryProvidersResponse {
 }
 
 export const QueryProvidersResponse = {
+  typeUrl: "/akash.audit.v1beta2.QueryProvidersResponse",
+
   encode(message: QueryProvidersResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.providers) {
       Provider.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -268,6 +270,25 @@ export const QueryProvidersResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryProvidersResponseAminoMsg): QueryProvidersResponse {
+    return QueryProvidersResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryProvidersResponseProtoMsg): QueryProvidersResponse {
+    return QueryProvidersResponse.decode(message.value);
+  },
+
+  toProto(message: QueryProvidersResponse): Uint8Array {
+    return QueryProvidersResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryProvidersResponse): QueryProvidersResponseProtoMsg {
+    return {
+      typeUrl: "/akash.audit.v1beta2.QueryProvidersResponse",
+      value: QueryProvidersResponse.encode(message).finish()
+    };
   }
 
 };
@@ -280,6 +301,8 @@ function createBaseQueryProviderRequest(): QueryProviderRequest {
 }
 
 export const QueryProviderRequest = {
+  typeUrl: "/akash.audit.v1beta2.QueryProviderRequest",
+
   encode(message: QueryProviderRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.auditor !== "") {
       writer.uint32(10).string(message.auditor);
@@ -365,6 +388,25 @@ export const QueryProviderRequest = {
     obj.auditor = message.auditor;
     obj.owner = message.owner;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryProviderRequestAminoMsg): QueryProviderRequest {
+    return QueryProviderRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryProviderRequestProtoMsg): QueryProviderRequest {
+    return QueryProviderRequest.decode(message.value);
+  },
+
+  toProto(message: QueryProviderRequest): Uint8Array {
+    return QueryProviderRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryProviderRequest): QueryProviderRequestProtoMsg {
+    return {
+      typeUrl: "/akash.audit.v1beta2.QueryProviderRequest",
+      value: QueryProviderRequest.encode(message).finish()
+    };
   }
 
 };
@@ -376,6 +418,8 @@ function createBaseQueryAllProvidersAttributesRequest(): QueryAllProvidersAttrib
 }
 
 export const QueryAllProvidersAttributesRequest = {
+  typeUrl: "/akash.audit.v1beta2.QueryAllProvidersAttributesRequest",
+
   encode(message: QueryAllProvidersAttributesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.pagination !== undefined) {
       PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim();
@@ -446,6 +490,25 @@ export const QueryAllProvidersAttributesRequest = {
     const obj: any = {};
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryAllProvidersAttributesRequestAminoMsg): QueryAllProvidersAttributesRequest {
+    return QueryAllProvidersAttributesRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryAllProvidersAttributesRequestProtoMsg): QueryAllProvidersAttributesRequest {
+    return QueryAllProvidersAttributesRequest.decode(message.value);
+  },
+
+  toProto(message: QueryAllProvidersAttributesRequest): Uint8Array {
+    return QueryAllProvidersAttributesRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryAllProvidersAttributesRequest): QueryAllProvidersAttributesRequestProtoMsg {
+    return {
+      typeUrl: "/akash.audit.v1beta2.QueryAllProvidersAttributesRequest",
+      value: QueryAllProvidersAttributesRequest.encode(message).finish()
+    };
   }
 
 };
@@ -458,6 +521,8 @@ function createBaseQueryProviderAttributesRequest(): QueryProviderAttributesRequ
 }
 
 export const QueryProviderAttributesRequest = {
+  typeUrl: "/akash.audit.v1beta2.QueryProviderAttributesRequest",
+
   encode(message: QueryProviderAttributesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.owner !== "") {
       writer.uint32(10).string(message.owner);
@@ -543,6 +608,25 @@ export const QueryProviderAttributesRequest = {
     obj.owner = message.owner;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryProviderAttributesRequestAminoMsg): QueryProviderAttributesRequest {
+    return QueryProviderAttributesRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryProviderAttributesRequestProtoMsg): QueryProviderAttributesRequest {
+    return QueryProviderAttributesRequest.decode(message.value);
+  },
+
+  toProto(message: QueryProviderAttributesRequest): Uint8Array {
+    return QueryProviderAttributesRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryProviderAttributesRequest): QueryProviderAttributesRequestProtoMsg {
+    return {
+      typeUrl: "/akash.audit.v1beta2.QueryProviderAttributesRequest",
+      value: QueryProviderAttributesRequest.encode(message).finish()
+    };
   }
 
 };
@@ -555,6 +639,8 @@ function createBaseQueryProviderAuditorRequest(): QueryProviderAuditorRequest {
 }
 
 export const QueryProviderAuditorRequest = {
+  typeUrl: "/akash.audit.v1beta2.QueryProviderAuditorRequest",
+
   encode(message: QueryProviderAuditorRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.auditor !== "") {
       writer.uint32(10).string(message.auditor);
@@ -640,6 +726,25 @@ export const QueryProviderAuditorRequest = {
     obj.auditor = message.auditor;
     obj.owner = message.owner;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryProviderAuditorRequestAminoMsg): QueryProviderAuditorRequest {
+    return QueryProviderAuditorRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryProviderAuditorRequestProtoMsg): QueryProviderAuditorRequest {
+    return QueryProviderAuditorRequest.decode(message.value);
+  },
+
+  toProto(message: QueryProviderAuditorRequest): Uint8Array {
+    return QueryProviderAuditorRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryProviderAuditorRequest): QueryProviderAuditorRequestProtoMsg {
+    return {
+      typeUrl: "/akash.audit.v1beta2.QueryProviderAuditorRequest",
+      value: QueryProviderAuditorRequest.encode(message).finish()
+    };
   }
 
 };
@@ -652,6 +757,8 @@ function createBaseQueryAuditorAttributesRequest(): QueryAuditorAttributesReques
 }
 
 export const QueryAuditorAttributesRequest = {
+  typeUrl: "/akash.audit.v1beta2.QueryAuditorAttributesRequest",
+
   encode(message: QueryAuditorAttributesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.auditor !== "") {
       writer.uint32(10).string(message.auditor);
@@ -737,6 +844,25 @@ export const QueryAuditorAttributesRequest = {
     obj.auditor = message.auditor;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryAuditorAttributesRequestAminoMsg): QueryAuditorAttributesRequest {
+    return QueryAuditorAttributesRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryAuditorAttributesRequestProtoMsg): QueryAuditorAttributesRequest {
+    return QueryAuditorAttributesRequest.decode(message.value);
+  },
+
+  toProto(message: QueryAuditorAttributesRequest): Uint8Array {
+    return QueryAuditorAttributesRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryAuditorAttributesRequest): QueryAuditorAttributesRequestProtoMsg {
+    return {
+      typeUrl: "/akash.audit.v1beta2.QueryAuditorAttributesRequest",
+      value: QueryAuditorAttributesRequest.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/akash/base/v1beta1/attribute.ts b/__fixtures__/outputv2/akash/base/v1beta1/attribute.ts
index 76a80cba6..ae9f7042a 100644
--- a/__fixtures__/outputv2/akash/base/v1beta1/attribute.ts
+++ b/__fixtures__/outputv2/akash/base/v1beta1/attribute.ts
@@ -7,7 +7,7 @@ export interface Attribute {
   key: string;
   value: string;
 }
-export interface AttributeProtoType {
+export interface AttributeProtoMsg {
   typeUrl: "/akash.base.v1beta1.Attribute";
   value: Uint8Array;
 }
@@ -17,7 +17,7 @@ export interface AttributeAmino {
   key: string;
   value: string;
 }
-export interface AttributeAminoType {
+export interface AttributeAminoMsg {
   type: "/akash.base.v1beta1.Attribute";
   value: AttributeAmino;
 }
@@ -41,7 +41,7 @@ export interface SignedBy {
   /** any_of at least of of the keys from the list must have signed attributes */
   anyOf: string[];
 }
-export interface SignedByProtoType {
+export interface SignedByProtoMsg {
   typeUrl: "/akash.base.v1beta1.SignedBy";
   value: Uint8Array;
 }
@@ -59,7 +59,7 @@ export interface SignedByAmino {
   /** any_of at least of of the keys from the list must have signed attributes */
   any_of: string[];
 }
-export interface SignedByAminoType {
+export interface SignedByAminoMsg {
   type: "/akash.base.v1beta1.SignedBy";
   value: SignedByAmino;
 }
@@ -83,7 +83,7 @@ export interface PlacementRequirements {
   /** Attribute list of attributes tenant expects from the provider */
   attributes: Attribute[];
 }
-export interface PlacementRequirementsProtoType {
+export interface PlacementRequirementsProtoMsg {
   typeUrl: "/akash.base.v1beta1.PlacementRequirements";
   value: Uint8Array;
 }
@@ -96,7 +96,7 @@ export interface PlacementRequirementsAmino {
   /** Attribute list of attributes tenant expects from the provider */
   attributes: AttributeAmino[];
 }
-export interface PlacementRequirementsAminoType {
+export interface PlacementRequirementsAminoMsg {
   type: "/akash.base.v1beta1.PlacementRequirements";
   value: PlacementRequirementsAmino;
 }
@@ -115,6 +115,8 @@ function createBaseAttribute(): Attribute {
 }
 
 export const Attribute = {
+  typeUrl: "/akash.base.v1beta1.Attribute",
+
   encode(message: Attribute, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.key !== "") {
       writer.uint32(10).string(message.key);
@@ -200,6 +202,25 @@ export const Attribute = {
     obj.key = message.key;
     obj.value = message.value;
     return obj;
+  },
+
+  fromAminoMsg(object: AttributeAminoMsg): Attribute {
+    return Attribute.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: AttributeProtoMsg): Attribute {
+    return Attribute.decode(message.value);
+  },
+
+  toProto(message: Attribute): Uint8Array {
+    return Attribute.encode(message).finish();
+  },
+
+  toProtoMsg(message: Attribute): AttributeProtoMsg {
+    return {
+      typeUrl: "/akash.base.v1beta1.Attribute",
+      value: Attribute.encode(message).finish()
+    };
   }
 
 };
@@ -212,6 +233,8 @@ function createBaseSignedBy(): SignedBy {
 }
 
 export const SignedBy = {
+  typeUrl: "/akash.base.v1beta1.SignedBy",
+
   encode(message: SignedBy, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.allOf) {
       writer.uint32(10).string(v!);
@@ -330,6 +353,25 @@ export const SignedBy = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: SignedByAminoMsg): SignedBy {
+    return SignedBy.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: SignedByProtoMsg): SignedBy {
+    return SignedBy.decode(message.value);
+  },
+
+  toProto(message: SignedBy): Uint8Array {
+    return SignedBy.encode(message).finish();
+  },
+
+  toProtoMsg(message: SignedBy): SignedByProtoMsg {
+    return {
+      typeUrl: "/akash.base.v1beta1.SignedBy",
+      value: SignedBy.encode(message).finish()
+    };
   }
 
 };
@@ -342,6 +384,8 @@ function createBasePlacementRequirements(): PlacementRequirements {
 }
 
 export const PlacementRequirements = {
+  typeUrl: "/akash.base.v1beta1.PlacementRequirements",
+
   encode(message: PlacementRequirements, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.signedBy !== undefined) {
       SignedBy.encode(message.signedBy, writer.uint32(10).fork()).ldelim();
@@ -445,6 +489,25 @@ export const PlacementRequirements = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: PlacementRequirementsAminoMsg): PlacementRequirements {
+    return PlacementRequirements.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: PlacementRequirementsProtoMsg): PlacementRequirements {
+    return PlacementRequirements.decode(message.value);
+  },
+
+  toProto(message: PlacementRequirements): Uint8Array {
+    return PlacementRequirements.encode(message).finish();
+  },
+
+  toProtoMsg(message: PlacementRequirements): PlacementRequirementsProtoMsg {
+    return {
+      typeUrl: "/akash.base.v1beta1.PlacementRequirements",
+      value: PlacementRequirements.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/akash/base/v1beta1/endpoint.ts b/__fixtures__/outputv2/akash/base/v1beta1/endpoint.ts
index 5d5c8570e..0683a8534 100644
--- a/__fixtures__/outputv2/akash/base/v1beta1/endpoint.ts
+++ b/__fixtures__/outputv2/akash/base/v1beta1/endpoint.ts
@@ -47,7 +47,7 @@ export function endpoint_KindToJSON(object: Endpoint_Kind): string {
 export interface Endpoint {
   kind: Endpoint_Kind;
 }
-export interface EndpointProtoType {
+export interface EndpointProtoMsg {
   typeUrl: "/akash.base.v1beta1.Endpoint";
   value: Uint8Array;
 }
@@ -56,7 +56,7 @@ export interface EndpointProtoType {
 export interface EndpointAmino {
   kind: Endpoint_Kind;
 }
-export interface EndpointAminoType {
+export interface EndpointAminoMsg {
   type: "/akash.base.v1beta1.Endpoint";
   value: EndpointAmino;
 }
@@ -73,6 +73,8 @@ function createBaseEndpoint(): Endpoint {
 }
 
 export const Endpoint = {
+  typeUrl: "/akash.base.v1beta1.Endpoint",
+
   encode(message: Endpoint, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.kind !== 0) {
       writer.uint32(8).int32(message.kind);
@@ -143,6 +145,25 @@ export const Endpoint = {
     const obj: any = {};
     obj.kind = message.kind;
     return obj;
+  },
+
+  fromAminoMsg(object: EndpointAminoMsg): Endpoint {
+    return Endpoint.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: EndpointProtoMsg): Endpoint {
+    return Endpoint.decode(message.value);
+  },
+
+  toProto(message: Endpoint): Uint8Array {
+    return Endpoint.encode(message).finish();
+  },
+
+  toProtoMsg(message: Endpoint): EndpointProtoMsg {
+    return {
+      typeUrl: "/akash.base.v1beta1.Endpoint",
+      value: Endpoint.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/akash/base/v1beta1/resource.ts b/__fixtures__/outputv2/akash/base/v1beta1/resource.ts
index 52376ba69..a89a33954 100644
--- a/__fixtures__/outputv2/akash/base/v1beta1/resource.ts
+++ b/__fixtures__/outputv2/akash/base/v1beta1/resource.ts
@@ -10,7 +10,7 @@ export interface CPU {
   units?: ResourceValue;
   attributes: Attribute[];
 }
-export interface CPUProtoType {
+export interface CPUProtoMsg {
   typeUrl: "/akash.base.v1beta1.CPU";
   value: Uint8Array;
 }
@@ -20,7 +20,7 @@ export interface CPUAmino {
   units?: ResourceValueAmino;
   attributes: AttributeAmino[];
 }
-export interface CPUAminoType {
+export interface CPUAminoMsg {
   type: "/akash.base.v1beta1.CPU";
   value: CPUAmino;
 }
@@ -36,7 +36,7 @@ export interface Memory {
   quantity?: ResourceValue;
   attributes: Attribute[];
 }
-export interface MemoryProtoType {
+export interface MemoryProtoMsg {
   typeUrl: "/akash.base.v1beta1.Memory";
   value: Uint8Array;
 }
@@ -46,7 +46,7 @@ export interface MemoryAmino {
   quantity?: ResourceValueAmino;
   attributes: AttributeAmino[];
 }
-export interface MemoryAminoType {
+export interface MemoryAminoMsg {
   type: "/akash.base.v1beta1.Memory";
   value: MemoryAmino;
 }
@@ -62,7 +62,7 @@ export interface Storage {
   quantity?: ResourceValue;
   attributes: Attribute[];
 }
-export interface StorageProtoType {
+export interface StorageProtoMsg {
   typeUrl: "/akash.base.v1beta1.Storage";
   value: Uint8Array;
 }
@@ -72,7 +72,7 @@ export interface StorageAmino {
   quantity?: ResourceValueAmino;
   attributes: AttributeAmino[];
 }
-export interface StorageAminoType {
+export interface StorageAminoMsg {
   type: "/akash.base.v1beta1.Storage";
   value: StorageAmino;
 }
@@ -93,7 +93,7 @@ export interface ResourceUnits {
   storage?: Storage;
   endpoints: Endpoint[];
 }
-export interface ResourceUnitsProtoType {
+export interface ResourceUnitsProtoMsg {
   typeUrl: "/akash.base.v1beta1.ResourceUnits";
   value: Uint8Array;
 }
@@ -108,7 +108,7 @@ export interface ResourceUnitsAmino {
   storage?: StorageAmino;
   endpoints: EndpointAmino[];
 }
-export interface ResourceUnitsAminoType {
+export interface ResourceUnitsAminoMsg {
   type: "/akash.base.v1beta1.ResourceUnits";
   value: ResourceUnitsAmino;
 }
@@ -132,6 +132,8 @@ function createBaseCPU(): CPU {
 }
 
 export const CPU = {
+  typeUrl: "/akash.base.v1beta1.CPU",
+
   encode(message: CPU, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.units !== undefined) {
       ResourceValue.encode(message.units, writer.uint32(10).fork()).ldelim();
@@ -235,6 +237,25 @@ export const CPU = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: CPUAminoMsg): CPU {
+    return CPU.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: CPUProtoMsg): CPU {
+    return CPU.decode(message.value);
+  },
+
+  toProto(message: CPU): Uint8Array {
+    return CPU.encode(message).finish();
+  },
+
+  toProtoMsg(message: CPU): CPUProtoMsg {
+    return {
+      typeUrl: "/akash.base.v1beta1.CPU",
+      value: CPU.encode(message).finish()
+    };
   }
 
 };
@@ -247,6 +268,8 @@ function createBaseMemory(): Memory {
 }
 
 export const Memory = {
+  typeUrl: "/akash.base.v1beta1.Memory",
+
   encode(message: Memory, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.quantity !== undefined) {
       ResourceValue.encode(message.quantity, writer.uint32(10).fork()).ldelim();
@@ -350,6 +373,25 @@ export const Memory = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: MemoryAminoMsg): Memory {
+    return Memory.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MemoryProtoMsg): Memory {
+    return Memory.decode(message.value);
+  },
+
+  toProto(message: Memory): Uint8Array {
+    return Memory.encode(message).finish();
+  },
+
+  toProtoMsg(message: Memory): MemoryProtoMsg {
+    return {
+      typeUrl: "/akash.base.v1beta1.Memory",
+      value: Memory.encode(message).finish()
+    };
   }
 
 };
@@ -362,6 +404,8 @@ function createBaseStorage(): Storage {
 }
 
 export const Storage = {
+  typeUrl: "/akash.base.v1beta1.Storage",
+
   encode(message: Storage, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.quantity !== undefined) {
       ResourceValue.encode(message.quantity, writer.uint32(10).fork()).ldelim();
@@ -465,6 +509,25 @@ export const Storage = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: StorageAminoMsg): Storage {
+    return Storage.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: StorageProtoMsg): Storage {
+    return Storage.decode(message.value);
+  },
+
+  toProto(message: Storage): Uint8Array {
+    return Storage.encode(message).finish();
+  },
+
+  toProtoMsg(message: Storage): StorageProtoMsg {
+    return {
+      typeUrl: "/akash.base.v1beta1.Storage",
+      value: Storage.encode(message).finish()
+    };
   }
 
 };
@@ -479,6 +542,8 @@ function createBaseResourceUnits(): ResourceUnits {
 }
 
 export const ResourceUnits = {
+  typeUrl: "/akash.base.v1beta1.ResourceUnits",
+
   encode(message: ResourceUnits, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.cpu !== undefined) {
       CPU.encode(message.cpu, writer.uint32(10).fork()).ldelim();
@@ -612,6 +677,25 @@ export const ResourceUnits = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ResourceUnitsAminoMsg): ResourceUnits {
+    return ResourceUnits.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ResourceUnitsProtoMsg): ResourceUnits {
+    return ResourceUnits.decode(message.value);
+  },
+
+  toProto(message: ResourceUnits): Uint8Array {
+    return ResourceUnits.encode(message).finish();
+  },
+
+  toProtoMsg(message: ResourceUnits): ResourceUnitsProtoMsg {
+    return {
+      typeUrl: "/akash.base.v1beta1.ResourceUnits",
+      value: ResourceUnits.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/akash/base/v1beta1/resourcevalue.ts b/__fixtures__/outputv2/akash/base/v1beta1/resourcevalue.ts
index 78c5c9087..f9a5c414b 100644
--- a/__fixtures__/outputv2/akash/base/v1beta1/resourcevalue.ts
+++ b/__fixtures__/outputv2/akash/base/v1beta1/resourcevalue.ts
@@ -6,7 +6,7 @@ export const protobufPackage = "akash.base.v1beta1";
 export interface ResourceValue {
   val: Uint8Array;
 }
-export interface ResourceValueProtoType {
+export interface ResourceValueProtoMsg {
   typeUrl: "/akash.base.v1beta1.ResourceValue";
   value: Uint8Array;
 }
@@ -15,7 +15,7 @@ export interface ResourceValueProtoType {
 export interface ResourceValueAmino {
   val: Uint8Array;
 }
-export interface ResourceValueAminoType {
+export interface ResourceValueAminoMsg {
   type: "/akash.base.v1beta1.ResourceValue";
   value: ResourceValueAmino;
 }
@@ -32,6 +32,8 @@ function createBaseResourceValue(): ResourceValue {
 }
 
 export const ResourceValue = {
+  typeUrl: "/akash.base.v1beta1.ResourceValue",
+
   encode(message: ResourceValue, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.val.length !== 0) {
       writer.uint32(10).bytes(message.val);
@@ -102,6 +104,25 @@ export const ResourceValue = {
     const obj: any = {};
     obj.val = message.val;
     return obj;
+  },
+
+  fromAminoMsg(object: ResourceValueAminoMsg): ResourceValue {
+    return ResourceValue.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ResourceValueProtoMsg): ResourceValue {
+    return ResourceValue.decode(message.value);
+  },
+
+  toProto(message: ResourceValue): Uint8Array {
+    return ResourceValue.encode(message).finish();
+  },
+
+  toProtoMsg(message: ResourceValue): ResourceValueProtoMsg {
+    return {
+      typeUrl: "/akash.base.v1beta1.ResourceValue",
+      value: ResourceValue.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/akash/base/v1beta2/attribute.ts b/__fixtures__/outputv2/akash/base/v1beta2/attribute.ts
index 8b5e4a749..863ccf93f 100644
--- a/__fixtures__/outputv2/akash/base/v1beta2/attribute.ts
+++ b/__fixtures__/outputv2/akash/base/v1beta2/attribute.ts
@@ -7,7 +7,7 @@ export interface Attribute {
   key: string;
   value: string;
 }
-export interface AttributeProtoType {
+export interface AttributeProtoMsg {
   typeUrl: "/akash.base.v1beta2.Attribute";
   value: Uint8Array;
 }
@@ -17,7 +17,7 @@ export interface AttributeAmino {
   key: string;
   value: string;
 }
-export interface AttributeAminoType {
+export interface AttributeAminoMsg {
   type: "/akash.base.v1beta2.Attribute";
   value: AttributeAmino;
 }
@@ -41,7 +41,7 @@ export interface SignedBy {
   /** any_of at least of of the keys from the list must have signed attributes */
   anyOf: string[];
 }
-export interface SignedByProtoType {
+export interface SignedByProtoMsg {
   typeUrl: "/akash.base.v1beta2.SignedBy";
   value: Uint8Array;
 }
@@ -59,7 +59,7 @@ export interface SignedByAmino {
   /** any_of at least of of the keys from the list must have signed attributes */
   any_of: string[];
 }
-export interface SignedByAminoType {
+export interface SignedByAminoMsg {
   type: "/akash.base.v1beta2.SignedBy";
   value: SignedByAmino;
 }
@@ -83,7 +83,7 @@ export interface PlacementRequirements {
   /** Attribute list of attributes tenant expects from the provider */
   attributes: Attribute[];
 }
-export interface PlacementRequirementsProtoType {
+export interface PlacementRequirementsProtoMsg {
   typeUrl: "/akash.base.v1beta2.PlacementRequirements";
   value: Uint8Array;
 }
@@ -96,7 +96,7 @@ export interface PlacementRequirementsAmino {
   /** Attribute list of attributes tenant expects from the provider */
   attributes: AttributeAmino[];
 }
-export interface PlacementRequirementsAminoType {
+export interface PlacementRequirementsAminoMsg {
   type: "/akash.base.v1beta2.PlacementRequirements";
   value: PlacementRequirementsAmino;
 }
@@ -115,6 +115,8 @@ function createBaseAttribute(): Attribute {
 }
 
 export const Attribute = {
+  typeUrl: "/akash.base.v1beta2.Attribute",
+
   encode(message: Attribute, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.key !== "") {
       writer.uint32(10).string(message.key);
@@ -200,6 +202,25 @@ export const Attribute = {
     obj.key = message.key;
     obj.value = message.value;
     return obj;
+  },
+
+  fromAminoMsg(object: AttributeAminoMsg): Attribute {
+    return Attribute.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: AttributeProtoMsg): Attribute {
+    return Attribute.decode(message.value);
+  },
+
+  toProto(message: Attribute): Uint8Array {
+    return Attribute.encode(message).finish();
+  },
+
+  toProtoMsg(message: Attribute): AttributeProtoMsg {
+    return {
+      typeUrl: "/akash.base.v1beta2.Attribute",
+      value: Attribute.encode(message).finish()
+    };
   }
 
 };
@@ -212,6 +233,8 @@ function createBaseSignedBy(): SignedBy {
 }
 
 export const SignedBy = {
+  typeUrl: "/akash.base.v1beta2.SignedBy",
+
   encode(message: SignedBy, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.allOf) {
       writer.uint32(10).string(v!);
@@ -330,6 +353,25 @@ export const SignedBy = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: SignedByAminoMsg): SignedBy {
+    return SignedBy.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: SignedByProtoMsg): SignedBy {
+    return SignedBy.decode(message.value);
+  },
+
+  toProto(message: SignedBy): Uint8Array {
+    return SignedBy.encode(message).finish();
+  },
+
+  toProtoMsg(message: SignedBy): SignedByProtoMsg {
+    return {
+      typeUrl: "/akash.base.v1beta2.SignedBy",
+      value: SignedBy.encode(message).finish()
+    };
   }
 
 };
@@ -342,6 +384,8 @@ function createBasePlacementRequirements(): PlacementRequirements {
 }
 
 export const PlacementRequirements = {
+  typeUrl: "/akash.base.v1beta2.PlacementRequirements",
+
   encode(message: PlacementRequirements, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.signedBy !== undefined) {
       SignedBy.encode(message.signedBy, writer.uint32(10).fork()).ldelim();
@@ -445,6 +489,25 @@ export const PlacementRequirements = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: PlacementRequirementsAminoMsg): PlacementRequirements {
+    return PlacementRequirements.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: PlacementRequirementsProtoMsg): PlacementRequirements {
+    return PlacementRequirements.decode(message.value);
+  },
+
+  toProto(message: PlacementRequirements): Uint8Array {
+    return PlacementRequirements.encode(message).finish();
+  },
+
+  toProtoMsg(message: PlacementRequirements): PlacementRequirementsProtoMsg {
+    return {
+      typeUrl: "/akash.base.v1beta2.PlacementRequirements",
+      value: PlacementRequirements.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/akash/base/v1beta2/endpoint.ts b/__fixtures__/outputv2/akash/base/v1beta2/endpoint.ts
index 8a0b38be4..2d8c04d34 100644
--- a/__fixtures__/outputv2/akash/base/v1beta2/endpoint.ts
+++ b/__fixtures__/outputv2/akash/base/v1beta2/endpoint.ts
@@ -58,7 +58,7 @@ export interface Endpoint {
   kind: Endpoint_Kind;
   sequenceNumber: number;
 }
-export interface EndpointProtoType {
+export interface EndpointProtoMsg {
   typeUrl: "/akash.base.v1beta2.Endpoint";
   value: Uint8Array;
 }
@@ -68,7 +68,7 @@ export interface EndpointAmino {
   kind: Endpoint_Kind;
   sequence_number: number;
 }
-export interface EndpointAminoType {
+export interface EndpointAminoMsg {
   type: "/akash.base.v1beta2.Endpoint";
   value: EndpointAmino;
 }
@@ -87,6 +87,8 @@ function createBaseEndpoint(): Endpoint {
 }
 
 export const Endpoint = {
+  typeUrl: "/akash.base.v1beta2.Endpoint",
+
   encode(message: Endpoint, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.kind !== 0) {
       writer.uint32(8).int32(message.kind);
@@ -172,6 +174,25 @@ export const Endpoint = {
     obj.kind = message.kind;
     obj.sequence_number = message.sequenceNumber;
     return obj;
+  },
+
+  fromAminoMsg(object: EndpointAminoMsg): Endpoint {
+    return Endpoint.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: EndpointProtoMsg): Endpoint {
+    return Endpoint.decode(message.value);
+  },
+
+  toProto(message: Endpoint): Uint8Array {
+    return Endpoint.encode(message).finish();
+  },
+
+  toProtoMsg(message: Endpoint): EndpointProtoMsg {
+    return {
+      typeUrl: "/akash.base.v1beta2.Endpoint",
+      value: Endpoint.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/akash/base/v1beta2/resource.ts b/__fixtures__/outputv2/akash/base/v1beta2/resource.ts
index d2fe60b33..1aa79d8dd 100644
--- a/__fixtures__/outputv2/akash/base/v1beta2/resource.ts
+++ b/__fixtures__/outputv2/akash/base/v1beta2/resource.ts
@@ -9,7 +9,7 @@ export interface CPU {
   units?: ResourceValue;
   attributes: Attribute[];
 }
-export interface CPUProtoType {
+export interface CPUProtoMsg {
   typeUrl: "/akash.base.v1beta2.CPU";
   value: Uint8Array;
 }
@@ -19,7 +19,7 @@ export interface CPUAmino {
   units?: ResourceValueAmino;
   attributes: AttributeAmino[];
 }
-export interface CPUAminoType {
+export interface CPUAminoMsg {
   type: "/akash.base.v1beta2.CPU";
   value: CPUAmino;
 }
@@ -35,7 +35,7 @@ export interface Memory {
   quantity?: ResourceValue;
   attributes: Attribute[];
 }
-export interface MemoryProtoType {
+export interface MemoryProtoMsg {
   typeUrl: "/akash.base.v1beta2.Memory";
   value: Uint8Array;
 }
@@ -45,7 +45,7 @@ export interface MemoryAmino {
   quantity?: ResourceValueAmino;
   attributes: AttributeAmino[];
 }
-export interface MemoryAminoType {
+export interface MemoryAminoMsg {
   type: "/akash.base.v1beta2.Memory";
   value: MemoryAmino;
 }
@@ -62,7 +62,7 @@ export interface Storage {
   quantity?: ResourceValue;
   attributes: Attribute[];
 }
-export interface StorageProtoType {
+export interface StorageProtoMsg {
   typeUrl: "/akash.base.v1beta2.Storage";
   value: Uint8Array;
 }
@@ -73,7 +73,7 @@ export interface StorageAmino {
   quantity?: ResourceValueAmino;
   attributes: AttributeAmino[];
 }
-export interface StorageAminoType {
+export interface StorageAminoMsg {
   type: "/akash.base.v1beta2.Storage";
   value: StorageAmino;
 }
@@ -93,6 +93,8 @@ function createBaseCPU(): CPU {
 }
 
 export const CPU = {
+  typeUrl: "/akash.base.v1beta2.CPU",
+
   encode(message: CPU, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.units !== undefined) {
       ResourceValue.encode(message.units, writer.uint32(10).fork()).ldelim();
@@ -196,6 +198,25 @@ export const CPU = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: CPUAminoMsg): CPU {
+    return CPU.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: CPUProtoMsg): CPU {
+    return CPU.decode(message.value);
+  },
+
+  toProto(message: CPU): Uint8Array {
+    return CPU.encode(message).finish();
+  },
+
+  toProtoMsg(message: CPU): CPUProtoMsg {
+    return {
+      typeUrl: "/akash.base.v1beta2.CPU",
+      value: CPU.encode(message).finish()
+    };
   }
 
 };
@@ -208,6 +229,8 @@ function createBaseMemory(): Memory {
 }
 
 export const Memory = {
+  typeUrl: "/akash.base.v1beta2.Memory",
+
   encode(message: Memory, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.quantity !== undefined) {
       ResourceValue.encode(message.quantity, writer.uint32(10).fork()).ldelim();
@@ -311,6 +334,25 @@ export const Memory = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: MemoryAminoMsg): Memory {
+    return Memory.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MemoryProtoMsg): Memory {
+    return Memory.decode(message.value);
+  },
+
+  toProto(message: Memory): Uint8Array {
+    return Memory.encode(message).finish();
+  },
+
+  toProtoMsg(message: Memory): MemoryProtoMsg {
+    return {
+      typeUrl: "/akash.base.v1beta2.Memory",
+      value: Memory.encode(message).finish()
+    };
   }
 
 };
@@ -324,6 +366,8 @@ function createBaseStorage(): Storage {
 }
 
 export const Storage = {
+  typeUrl: "/akash.base.v1beta2.Storage",
+
   encode(message: Storage, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -442,6 +486,25 @@ export const Storage = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: StorageAminoMsg): Storage {
+    return Storage.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: StorageProtoMsg): Storage {
+    return Storage.decode(message.value);
+  },
+
+  toProto(message: Storage): Uint8Array {
+    return Storage.encode(message).finish();
+  },
+
+  toProtoMsg(message: Storage): StorageProtoMsg {
+    return {
+      typeUrl: "/akash.base.v1beta2.Storage",
+      value: Storage.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/akash/base/v1beta2/resourceunits.ts b/__fixtures__/outputv2/akash/base/v1beta2/resourceunits.ts
index a39f9e7bb..628395480 100644
--- a/__fixtures__/outputv2/akash/base/v1beta2/resourceunits.ts
+++ b/__fixtures__/outputv2/akash/base/v1beta2/resourceunits.ts
@@ -14,7 +14,7 @@ export interface ResourceUnits {
   storage: Storage[];
   endpoints: Endpoint[];
 }
-export interface ResourceUnitsProtoType {
+export interface ResourceUnitsProtoMsg {
   typeUrl: "/akash.base.v1beta2.ResourceUnits";
   value: Uint8Array;
 }
@@ -29,7 +29,7 @@ export interface ResourceUnitsAmino {
   storage: StorageAmino[];
   endpoints: EndpointAmino[];
 }
-export interface ResourceUnitsAminoType {
+export interface ResourceUnitsAminoMsg {
   type: "/akash.base.v1beta2.ResourceUnits";
   value: ResourceUnitsAmino;
 }
@@ -55,6 +55,8 @@ function createBaseResourceUnits(): ResourceUnits {
 }
 
 export const ResourceUnits = {
+  typeUrl: "/akash.base.v1beta2.ResourceUnits",
+
   encode(message: ResourceUnits, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.cpu !== undefined) {
       CPU.encode(message.cpu, writer.uint32(10).fork()).ldelim();
@@ -203,6 +205,25 @@ export const ResourceUnits = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ResourceUnitsAminoMsg): ResourceUnits {
+    return ResourceUnits.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ResourceUnitsProtoMsg): ResourceUnits {
+    return ResourceUnits.decode(message.value);
+  },
+
+  toProto(message: ResourceUnits): Uint8Array {
+    return ResourceUnits.encode(message).finish();
+  },
+
+  toProtoMsg(message: ResourceUnits): ResourceUnitsProtoMsg {
+    return {
+      typeUrl: "/akash.base.v1beta2.ResourceUnits",
+      value: ResourceUnits.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/akash/base/v1beta2/resourcevalue.ts b/__fixtures__/outputv2/akash/base/v1beta2/resourcevalue.ts
index e93d6626d..151be1327 100644
--- a/__fixtures__/outputv2/akash/base/v1beta2/resourcevalue.ts
+++ b/__fixtures__/outputv2/akash/base/v1beta2/resourcevalue.ts
@@ -6,7 +6,7 @@ export const protobufPackage = "akash.base.v1beta2";
 export interface ResourceValue {
   val: Uint8Array;
 }
-export interface ResourceValueProtoType {
+export interface ResourceValueProtoMsg {
   typeUrl: "/akash.base.v1beta2.ResourceValue";
   value: Uint8Array;
 }
@@ -15,7 +15,7 @@ export interface ResourceValueProtoType {
 export interface ResourceValueAmino {
   val: Uint8Array;
 }
-export interface ResourceValueAminoType {
+export interface ResourceValueAminoMsg {
   type: "/akash.base.v1beta2.ResourceValue";
   value: ResourceValueAmino;
 }
@@ -32,6 +32,8 @@ function createBaseResourceValue(): ResourceValue {
 }
 
 export const ResourceValue = {
+  typeUrl: "/akash.base.v1beta2.ResourceValue",
+
   encode(message: ResourceValue, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.val.length !== 0) {
       writer.uint32(10).bytes(message.val);
@@ -102,6 +104,25 @@ export const ResourceValue = {
     const obj: any = {};
     obj.val = message.val;
     return obj;
+  },
+
+  fromAminoMsg(object: ResourceValueAminoMsg): ResourceValue {
+    return ResourceValue.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ResourceValueProtoMsg): ResourceValue {
+    return ResourceValue.decode(message.value);
+  },
+
+  toProto(message: ResourceValue): Uint8Array {
+    return ResourceValue.encode(message).finish();
+  },
+
+  toProtoMsg(message: ResourceValue): ResourceValueProtoMsg {
+    return {
+      typeUrl: "/akash.base.v1beta2.ResourceValue",
+      value: ResourceValue.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/akash/cert/v1beta2/cert.ts b/__fixtures__/outputv2/akash/cert/v1beta2/cert.ts
index 53cf5c7a5..a63b6f915 100644
--- a/__fixtures__/outputv2/akash/cert/v1beta2/cert.ts
+++ b/__fixtures__/outputv2/akash/cert/v1beta2/cert.ts
@@ -58,7 +58,7 @@ export interface CertificateID {
   owner: string;
   serial: string;
 }
-export interface CertificateIDProtoType {
+export interface CertificateIDProtoMsg {
   typeUrl: "/akash.cert.v1beta2.CertificateID";
   value: Uint8Array;
 }
@@ -68,7 +68,7 @@ export interface CertificateIDAmino {
   owner: string;
   serial: string;
 }
-export interface CertificateIDAminoType {
+export interface CertificateIDAminoMsg {
   type: "/akash.cert.v1beta2.CertificateID";
   value: CertificateIDAmino;
 }
@@ -85,7 +85,7 @@ export interface Certificate {
   cert: Uint8Array;
   pubkey: Uint8Array;
 }
-export interface CertificateProtoType {
+export interface CertificateProtoMsg {
   typeUrl: "/akash.cert.v1beta2.Certificate";
   value: Uint8Array;
 }
@@ -96,7 +96,7 @@ export interface CertificateAmino {
   cert: Uint8Array;
   pubkey: Uint8Array;
 }
-export interface CertificateAminoType {
+export interface CertificateAminoMsg {
   type: "/akash.cert.v1beta2.Certificate";
   value: CertificateAmino;
 }
@@ -114,7 +114,7 @@ export interface CertificateFilter {
   serial: string;
   state: string;
 }
-export interface CertificateFilterProtoType {
+export interface CertificateFilterProtoMsg {
   typeUrl: "/akash.cert.v1beta2.CertificateFilter";
   value: Uint8Array;
 }
@@ -125,7 +125,7 @@ export interface CertificateFilterAmino {
   serial: string;
   state: string;
 }
-export interface CertificateFilterAminoType {
+export interface CertificateFilterAminoMsg {
   type: "/akash.cert.v1beta2.CertificateFilter";
   value: CertificateFilterAmino;
 }
@@ -143,7 +143,7 @@ export interface MsgCreateCertificate {
   cert: Uint8Array;
   pubkey: Uint8Array;
 }
-export interface MsgCreateCertificateProtoType {
+export interface MsgCreateCertificateProtoMsg {
   typeUrl: "/akash.cert.v1beta2.MsgCreateCertificate";
   value: Uint8Array;
 }
@@ -154,7 +154,7 @@ export interface MsgCreateCertificateAmino {
   cert: Uint8Array;
   pubkey: Uint8Array;
 }
-export interface MsgCreateCertificateAminoType {
+export interface MsgCreateCertificateAminoMsg {
   type: "/akash.cert.v1beta2.MsgCreateCertificate";
   value: MsgCreateCertificateAmino;
 }
@@ -168,14 +168,14 @@ export interface MsgCreateCertificateSDKType {
 
 /** MsgCreateCertificateResponse defines the Msg/CreateCertificate response type. */
 export interface MsgCreateCertificateResponse {}
-export interface MsgCreateCertificateResponseProtoType {
+export interface MsgCreateCertificateResponseProtoMsg {
   typeUrl: "/akash.cert.v1beta2.MsgCreateCertificateResponse";
   value: Uint8Array;
 }
 
 /** MsgCreateCertificateResponse defines the Msg/CreateCertificate response type. */
 export interface MsgCreateCertificateResponseAmino {}
-export interface MsgCreateCertificateResponseAminoType {
+export interface MsgCreateCertificateResponseAminoMsg {
   type: "/akash.cert.v1beta2.MsgCreateCertificateResponse";
   value: MsgCreateCertificateResponseAmino;
 }
@@ -187,7 +187,7 @@ export interface MsgCreateCertificateResponseSDKType {}
 export interface MsgRevokeCertificate {
   id?: CertificateID;
 }
-export interface MsgRevokeCertificateProtoType {
+export interface MsgRevokeCertificateProtoMsg {
   typeUrl: "/akash.cert.v1beta2.MsgRevokeCertificate";
   value: Uint8Array;
 }
@@ -196,7 +196,7 @@ export interface MsgRevokeCertificateProtoType {
 export interface MsgRevokeCertificateAmino {
   id?: CertificateIDAmino;
 }
-export interface MsgRevokeCertificateAminoType {
+export interface MsgRevokeCertificateAminoMsg {
   type: "/akash.cert.v1beta2.MsgRevokeCertificate";
   value: MsgRevokeCertificateAmino;
 }
@@ -208,14 +208,14 @@ export interface MsgRevokeCertificateSDKType {
 
 /** MsgRevokeCertificateResponse defines the Msg/RevokeCertificate response type. */
 export interface MsgRevokeCertificateResponse {}
-export interface MsgRevokeCertificateResponseProtoType {
+export interface MsgRevokeCertificateResponseProtoMsg {
   typeUrl: "/akash.cert.v1beta2.MsgRevokeCertificateResponse";
   value: Uint8Array;
 }
 
 /** MsgRevokeCertificateResponse defines the Msg/RevokeCertificate response type. */
 export interface MsgRevokeCertificateResponseAmino {}
-export interface MsgRevokeCertificateResponseAminoType {
+export interface MsgRevokeCertificateResponseAminoMsg {
   type: "/akash.cert.v1beta2.MsgRevokeCertificateResponse";
   value: MsgRevokeCertificateResponseAmino;
 }
@@ -231,6 +231,8 @@ function createBaseCertificateID(): CertificateID {
 }
 
 export const CertificateID = {
+  typeUrl: "/akash.cert.v1beta2.CertificateID",
+
   encode(message: CertificateID, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.owner !== "") {
       writer.uint32(10).string(message.owner);
@@ -316,6 +318,25 @@ export const CertificateID = {
     obj.owner = message.owner;
     obj.serial = message.serial;
     return obj;
+  },
+
+  fromAminoMsg(object: CertificateIDAminoMsg): CertificateID {
+    return CertificateID.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: CertificateIDProtoMsg): CertificateID {
+    return CertificateID.decode(message.value);
+  },
+
+  toProto(message: CertificateID): Uint8Array {
+    return CertificateID.encode(message).finish();
+  },
+
+  toProtoMsg(message: CertificateID): CertificateIDProtoMsg {
+    return {
+      typeUrl: "/akash.cert.v1beta2.CertificateID",
+      value: CertificateID.encode(message).finish()
+    };
   }
 
 };
@@ -329,6 +350,8 @@ function createBaseCertificate(): Certificate {
 }
 
 export const Certificate = {
+  typeUrl: "/akash.cert.v1beta2.Certificate",
+
   encode(message: Certificate, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.state !== 0) {
       writer.uint32(16).int32(message.state);
@@ -429,6 +452,25 @@ export const Certificate = {
     obj.cert = message.cert;
     obj.pubkey = message.pubkey;
     return obj;
+  },
+
+  fromAminoMsg(object: CertificateAminoMsg): Certificate {
+    return Certificate.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: CertificateProtoMsg): Certificate {
+    return Certificate.decode(message.value);
+  },
+
+  toProto(message: Certificate): Uint8Array {
+    return Certificate.encode(message).finish();
+  },
+
+  toProtoMsg(message: Certificate): CertificateProtoMsg {
+    return {
+      typeUrl: "/akash.cert.v1beta2.Certificate",
+      value: Certificate.encode(message).finish()
+    };
   }
 
 };
@@ -442,6 +484,8 @@ function createBaseCertificateFilter(): CertificateFilter {
 }
 
 export const CertificateFilter = {
+  typeUrl: "/akash.cert.v1beta2.CertificateFilter",
+
   encode(message: CertificateFilter, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.owner !== "") {
       writer.uint32(10).string(message.owner);
@@ -542,6 +586,25 @@ export const CertificateFilter = {
     obj.serial = message.serial;
     obj.state = message.state;
     return obj;
+  },
+
+  fromAminoMsg(object: CertificateFilterAminoMsg): CertificateFilter {
+    return CertificateFilter.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: CertificateFilterProtoMsg): CertificateFilter {
+    return CertificateFilter.decode(message.value);
+  },
+
+  toProto(message: CertificateFilter): Uint8Array {
+    return CertificateFilter.encode(message).finish();
+  },
+
+  toProtoMsg(message: CertificateFilter): CertificateFilterProtoMsg {
+    return {
+      typeUrl: "/akash.cert.v1beta2.CertificateFilter",
+      value: CertificateFilter.encode(message).finish()
+    };
   }
 
 };
@@ -555,6 +618,8 @@ function createBaseMsgCreateCertificate(): MsgCreateCertificate {
 }
 
 export const MsgCreateCertificate = {
+  typeUrl: "/akash.cert.v1beta2.MsgCreateCertificate",
+
   encode(message: MsgCreateCertificate, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.owner !== "") {
       writer.uint32(10).string(message.owner);
@@ -655,6 +720,25 @@ export const MsgCreateCertificate = {
     obj.cert = message.cert;
     obj.pubkey = message.pubkey;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCreateCertificateAminoMsg): MsgCreateCertificate {
+    return MsgCreateCertificate.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgCreateCertificateProtoMsg): MsgCreateCertificate {
+    return MsgCreateCertificate.decode(message.value);
+  },
+
+  toProto(message: MsgCreateCertificate): Uint8Array {
+    return MsgCreateCertificate.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCreateCertificate): MsgCreateCertificateProtoMsg {
+    return {
+      typeUrl: "/akash.cert.v1beta2.MsgCreateCertificate",
+      value: MsgCreateCertificate.encode(message).finish()
+    };
   }
 
 };
@@ -664,6 +748,8 @@ function createBaseMsgCreateCertificateResponse(): MsgCreateCertificateResponse
 }
 
 export const MsgCreateCertificateResponse = {
+  typeUrl: "/akash.cert.v1beta2.MsgCreateCertificateResponse",
+
   encode(_: MsgCreateCertificateResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -716,6 +802,25 @@ export const MsgCreateCertificateResponse = {
   toAmino(_: MsgCreateCertificateResponse): MsgCreateCertificateResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCreateCertificateResponseAminoMsg): MsgCreateCertificateResponse {
+    return MsgCreateCertificateResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgCreateCertificateResponseProtoMsg): MsgCreateCertificateResponse {
+    return MsgCreateCertificateResponse.decode(message.value);
+  },
+
+  toProto(message: MsgCreateCertificateResponse): Uint8Array {
+    return MsgCreateCertificateResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCreateCertificateResponse): MsgCreateCertificateResponseProtoMsg {
+    return {
+      typeUrl: "/akash.cert.v1beta2.MsgCreateCertificateResponse",
+      value: MsgCreateCertificateResponse.encode(message).finish()
+    };
   }
 
 };
@@ -727,6 +832,8 @@ function createBaseMsgRevokeCertificate(): MsgRevokeCertificate {
 }
 
 export const MsgRevokeCertificate = {
+  typeUrl: "/akash.cert.v1beta2.MsgRevokeCertificate",
+
   encode(message: MsgRevokeCertificate, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.id !== undefined) {
       CertificateID.encode(message.id, writer.uint32(10).fork()).ldelim();
@@ -797,6 +904,25 @@ export const MsgRevokeCertificate = {
     const obj: any = {};
     obj.id = message.id ? CertificateID.toAmino(message.id) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgRevokeCertificateAminoMsg): MsgRevokeCertificate {
+    return MsgRevokeCertificate.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgRevokeCertificateProtoMsg): MsgRevokeCertificate {
+    return MsgRevokeCertificate.decode(message.value);
+  },
+
+  toProto(message: MsgRevokeCertificate): Uint8Array {
+    return MsgRevokeCertificate.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgRevokeCertificate): MsgRevokeCertificateProtoMsg {
+    return {
+      typeUrl: "/akash.cert.v1beta2.MsgRevokeCertificate",
+      value: MsgRevokeCertificate.encode(message).finish()
+    };
   }
 
 };
@@ -806,6 +932,8 @@ function createBaseMsgRevokeCertificateResponse(): MsgRevokeCertificateResponse
 }
 
 export const MsgRevokeCertificateResponse = {
+  typeUrl: "/akash.cert.v1beta2.MsgRevokeCertificateResponse",
+
   encode(_: MsgRevokeCertificateResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -858,6 +986,25 @@ export const MsgRevokeCertificateResponse = {
   toAmino(_: MsgRevokeCertificateResponse): MsgRevokeCertificateResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgRevokeCertificateResponseAminoMsg): MsgRevokeCertificateResponse {
+    return MsgRevokeCertificateResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgRevokeCertificateResponseProtoMsg): MsgRevokeCertificateResponse {
+    return MsgRevokeCertificateResponse.decode(message.value);
+  },
+
+  toProto(message: MsgRevokeCertificateResponse): Uint8Array {
+    return MsgRevokeCertificateResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgRevokeCertificateResponse): MsgRevokeCertificateResponseProtoMsg {
+    return {
+      typeUrl: "/akash.cert.v1beta2.MsgRevokeCertificateResponse",
+      value: MsgRevokeCertificateResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/akash/cert/v1beta2/genesis.ts b/__fixtures__/outputv2/akash/cert/v1beta2/genesis.ts
index 6454acee9..847798fa0 100644
--- a/__fixtures__/outputv2/akash/cert/v1beta2/genesis.ts
+++ b/__fixtures__/outputv2/akash/cert/v1beta2/genesis.ts
@@ -8,7 +8,7 @@ export interface GenesisCertificate {
   owner: string;
   certificate?: Certificate;
 }
-export interface GenesisCertificateProtoType {
+export interface GenesisCertificateProtoMsg {
   typeUrl: "/akash.cert.v1beta2.GenesisCertificate";
   value: Uint8Array;
 }
@@ -18,7 +18,7 @@ export interface GenesisCertificateAmino {
   owner: string;
   certificate?: CertificateAmino;
 }
-export interface GenesisCertificateAminoType {
+export interface GenesisCertificateAminoMsg {
   type: "/akash.cert.v1beta2.GenesisCertificate";
   value: GenesisCertificateAmino;
 }
@@ -33,7 +33,7 @@ export interface GenesisCertificateSDKType {
 export interface GenesisState {
   certificates: GenesisCertificate[];
 }
-export interface GenesisStateProtoType {
+export interface GenesisStateProtoMsg {
   typeUrl: "/akash.cert.v1beta2.GenesisState";
   value: Uint8Array;
 }
@@ -42,7 +42,7 @@ export interface GenesisStateProtoType {
 export interface GenesisStateAmino {
   certificates: GenesisCertificateAmino[];
 }
-export interface GenesisStateAminoType {
+export interface GenesisStateAminoMsg {
   type: "/akash.cert.v1beta2.GenesisState";
   value: GenesisStateAmino;
 }
@@ -60,6 +60,8 @@ function createBaseGenesisCertificate(): GenesisCertificate {
 }
 
 export const GenesisCertificate = {
+  typeUrl: "/akash.cert.v1beta2.GenesisCertificate",
+
   encode(message: GenesisCertificate, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.owner !== "") {
       writer.uint32(10).string(message.owner);
@@ -145,6 +147,25 @@ export const GenesisCertificate = {
     obj.owner = message.owner;
     obj.certificate = message.certificate ? Certificate.toAmino(message.certificate) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisCertificateAminoMsg): GenesisCertificate {
+    return GenesisCertificate.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: GenesisCertificateProtoMsg): GenesisCertificate {
+    return GenesisCertificate.decode(message.value);
+  },
+
+  toProto(message: GenesisCertificate): Uint8Array {
+    return GenesisCertificate.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisCertificate): GenesisCertificateProtoMsg {
+    return {
+      typeUrl: "/akash.cert.v1beta2.GenesisCertificate",
+      value: GenesisCertificate.encode(message).finish()
+    };
   }
 
 };
@@ -156,6 +177,8 @@ function createBaseGenesisState(): GenesisState {
 }
 
 export const GenesisState = {
+  typeUrl: "/akash.cert.v1beta2.GenesisState",
+
   encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.certificates) {
       GenesisCertificate.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -244,6 +267,25 @@ export const GenesisState = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisStateAminoMsg): GenesisState {
+    return GenesisState.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: GenesisStateProtoMsg): GenesisState {
+    return GenesisState.decode(message.value);
+  },
+
+  toProto(message: GenesisState): Uint8Array {
+    return GenesisState.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisState): GenesisStateProtoMsg {
+    return {
+      typeUrl: "/akash.cert.v1beta2.GenesisState",
+      value: GenesisState.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/akash/cert/v1beta2/query.ts b/__fixtures__/outputv2/akash/cert/v1beta2/query.ts
index 3681af9d5..c0ea6f1db 100644
--- a/__fixtures__/outputv2/akash/cert/v1beta2/query.ts
+++ b/__fixtures__/outputv2/akash/cert/v1beta2/query.ts
@@ -9,7 +9,7 @@ export interface CertificateResponse {
   certificate?: Certificate;
   serial: string;
 }
-export interface CertificateResponseProtoType {
+export interface CertificateResponseProtoMsg {
   typeUrl: "/akash.cert.v1beta2.CertificateResponse";
   value: Uint8Array;
 }
@@ -19,7 +19,7 @@ export interface CertificateResponseAmino {
   certificate?: CertificateAmino;
   serial: string;
 }
-export interface CertificateResponseAminoType {
+export interface CertificateResponseAminoMsg {
   type: "/akash.cert.v1beta2.CertificateResponse";
   value: CertificateResponseAmino;
 }
@@ -35,7 +35,7 @@ export interface QueryCertificatesRequest {
   filter?: CertificateFilter;
   pagination?: PageRequest;
 }
-export interface QueryCertificatesRequestProtoType {
+export interface QueryCertificatesRequestProtoMsg {
   typeUrl: "/akash.cert.v1beta2.QueryCertificatesRequest";
   value: Uint8Array;
 }
@@ -45,7 +45,7 @@ export interface QueryCertificatesRequestAmino {
   filter?: CertificateFilterAmino;
   pagination?: PageRequestAmino;
 }
-export interface QueryCertificatesRequestAminoType {
+export interface QueryCertificatesRequestAminoMsg {
   type: "/akash.cert.v1beta2.QueryCertificatesRequest";
   value: QueryCertificatesRequestAmino;
 }
@@ -61,7 +61,7 @@ export interface QueryCertificatesResponse {
   certificates: CertificateResponse[];
   pagination?: PageResponse;
 }
-export interface QueryCertificatesResponseProtoType {
+export interface QueryCertificatesResponseProtoMsg {
   typeUrl: "/akash.cert.v1beta2.QueryCertificatesResponse";
   value: Uint8Array;
 }
@@ -71,7 +71,7 @@ export interface QueryCertificatesResponseAmino {
   certificates: CertificateResponseAmino[];
   pagination?: PageResponseAmino;
 }
-export interface QueryCertificatesResponseAminoType {
+export interface QueryCertificatesResponseAminoMsg {
   type: "/akash.cert.v1beta2.QueryCertificatesResponse";
   value: QueryCertificatesResponseAmino;
 }
@@ -90,6 +90,8 @@ function createBaseCertificateResponse(): CertificateResponse {
 }
 
 export const CertificateResponse = {
+  typeUrl: "/akash.cert.v1beta2.CertificateResponse",
+
   encode(message: CertificateResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.certificate !== undefined) {
       Certificate.encode(message.certificate, writer.uint32(10).fork()).ldelim();
@@ -175,6 +177,25 @@ export const CertificateResponse = {
     obj.certificate = message.certificate ? Certificate.toAmino(message.certificate) : undefined;
     obj.serial = message.serial;
     return obj;
+  },
+
+  fromAminoMsg(object: CertificateResponseAminoMsg): CertificateResponse {
+    return CertificateResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: CertificateResponseProtoMsg): CertificateResponse {
+    return CertificateResponse.decode(message.value);
+  },
+
+  toProto(message: CertificateResponse): Uint8Array {
+    return CertificateResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: CertificateResponse): CertificateResponseProtoMsg {
+    return {
+      typeUrl: "/akash.cert.v1beta2.CertificateResponse",
+      value: CertificateResponse.encode(message).finish()
+    };
   }
 
 };
@@ -187,6 +208,8 @@ function createBaseQueryCertificatesRequest(): QueryCertificatesRequest {
 }
 
 export const QueryCertificatesRequest = {
+  typeUrl: "/akash.cert.v1beta2.QueryCertificatesRequest",
+
   encode(message: QueryCertificatesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.filter !== undefined) {
       CertificateFilter.encode(message.filter, writer.uint32(10).fork()).ldelim();
@@ -272,6 +295,25 @@ export const QueryCertificatesRequest = {
     obj.filter = message.filter ? CertificateFilter.toAmino(message.filter) : undefined;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryCertificatesRequestAminoMsg): QueryCertificatesRequest {
+    return QueryCertificatesRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryCertificatesRequestProtoMsg): QueryCertificatesRequest {
+    return QueryCertificatesRequest.decode(message.value);
+  },
+
+  toProto(message: QueryCertificatesRequest): Uint8Array {
+    return QueryCertificatesRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryCertificatesRequest): QueryCertificatesRequestProtoMsg {
+    return {
+      typeUrl: "/akash.cert.v1beta2.QueryCertificatesRequest",
+      value: QueryCertificatesRequest.encode(message).finish()
+    };
   }
 
 };
@@ -284,6 +326,8 @@ function createBaseQueryCertificatesResponse(): QueryCertificatesResponse {
 }
 
 export const QueryCertificatesResponse = {
+  typeUrl: "/akash.cert.v1beta2.QueryCertificatesResponse",
+
   encode(message: QueryCertificatesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.certificates) {
       CertificateResponse.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -387,6 +431,25 @@ export const QueryCertificatesResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryCertificatesResponseAminoMsg): QueryCertificatesResponse {
+    return QueryCertificatesResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryCertificatesResponseProtoMsg): QueryCertificatesResponse {
+    return QueryCertificatesResponse.decode(message.value);
+  },
+
+  toProto(message: QueryCertificatesResponse): Uint8Array {
+    return QueryCertificatesResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryCertificatesResponse): QueryCertificatesResponseProtoMsg {
+    return {
+      typeUrl: "/akash.cert.v1beta2.QueryCertificatesResponse",
+      value: QueryCertificatesResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/akash/deployment/v1beta1/authz.ts b/__fixtures__/outputv2/akash/deployment/v1beta1/authz.ts
index 0bc55777c..585c61563 100644
--- a/__fixtures__/outputv2/akash/deployment/v1beta1/authz.ts
+++ b/__fixtures__/outputv2/akash/deployment/v1beta1/authz.ts
@@ -14,7 +14,7 @@ export interface DepositDeploymentAuthorization {
    */
   spendLimit?: Coin;
 }
-export interface DepositDeploymentAuthorizationProtoType {
+export interface DepositDeploymentAuthorizationProtoMsg {
   typeUrl: "/akash.deployment.v1beta1.DepositDeploymentAuthorization";
   value: Uint8Array;
 }
@@ -30,7 +30,7 @@ export interface DepositDeploymentAuthorizationAmino {
    */
   spend_limit?: CoinAmino;
 }
-export interface DepositDeploymentAuthorizationAminoType {
+export interface DepositDeploymentAuthorizationAminoMsg {
   type: "/akash.deployment.v1beta1.DepositDeploymentAuthorization";
   value: DepositDeploymentAuthorizationAmino;
 }
@@ -50,6 +50,8 @@ function createBaseDepositDeploymentAuthorization(): DepositDeploymentAuthorizat
 }
 
 export const DepositDeploymentAuthorization = {
+  typeUrl: "/akash.deployment.v1beta1.DepositDeploymentAuthorization",
+
   encode(message: DepositDeploymentAuthorization, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.spendLimit !== undefined) {
       Coin.encode(message.spendLimit, writer.uint32(10).fork()).ldelim();
@@ -120,6 +122,25 @@ export const DepositDeploymentAuthorization = {
     const obj: any = {};
     obj.spend_limit = message.spendLimit ? Coin.toAmino(message.spendLimit) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: DepositDeploymentAuthorizationAminoMsg): DepositDeploymentAuthorization {
+    return DepositDeploymentAuthorization.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: DepositDeploymentAuthorizationProtoMsg): DepositDeploymentAuthorization {
+    return DepositDeploymentAuthorization.decode(message.value);
+  },
+
+  toProto(message: DepositDeploymentAuthorization): Uint8Array {
+    return DepositDeploymentAuthorization.encode(message).finish();
+  },
+
+  toProtoMsg(message: DepositDeploymentAuthorization): DepositDeploymentAuthorizationProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta1.DepositDeploymentAuthorization",
+      value: DepositDeploymentAuthorization.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/akash/deployment/v1beta1/deployment.ts b/__fixtures__/outputv2/akash/deployment/v1beta1/deployment.ts
index c4c60c5db..7967e3974 100644
--- a/__fixtures__/outputv2/akash/deployment/v1beta1/deployment.ts
+++ b/__fixtures__/outputv2/akash/deployment/v1beta1/deployment.ts
@@ -64,7 +64,7 @@ export interface MsgCreateDeployment {
   version: Uint8Array;
   deposit?: Coin;
 }
-export interface MsgCreateDeploymentProtoType {
+export interface MsgCreateDeploymentProtoMsg {
   typeUrl: "/akash.deployment.v1beta1.MsgCreateDeployment";
   value: Uint8Array;
 }
@@ -76,7 +76,7 @@ export interface MsgCreateDeploymentAmino {
   version: Uint8Array;
   deposit?: CoinAmino;
 }
-export interface MsgCreateDeploymentAminoType {
+export interface MsgCreateDeploymentAminoMsg {
   type: "/akash.deployment.v1beta1.MsgCreateDeployment";
   value: MsgCreateDeploymentAmino;
 }
@@ -91,14 +91,14 @@ export interface MsgCreateDeploymentSDKType {
 
 /** MsgCreateDeploymentResponse defines the Msg/CreateDeployment response type. */
 export interface MsgCreateDeploymentResponse {}
-export interface MsgCreateDeploymentResponseProtoType {
+export interface MsgCreateDeploymentResponseProtoMsg {
   typeUrl: "/akash.deployment.v1beta1.MsgCreateDeploymentResponse";
   value: Uint8Array;
 }
 
 /** MsgCreateDeploymentResponse defines the Msg/CreateDeployment response type. */
 export interface MsgCreateDeploymentResponseAmino {}
-export interface MsgCreateDeploymentResponseAminoType {
+export interface MsgCreateDeploymentResponseAminoMsg {
   type: "/akash.deployment.v1beta1.MsgCreateDeploymentResponse";
   value: MsgCreateDeploymentResponseAmino;
 }
@@ -111,7 +111,7 @@ export interface MsgDepositDeployment {
   id?: DeploymentID;
   amount?: Coin;
 }
-export interface MsgDepositDeploymentProtoType {
+export interface MsgDepositDeploymentProtoMsg {
   typeUrl: "/akash.deployment.v1beta1.MsgDepositDeployment";
   value: Uint8Array;
 }
@@ -121,7 +121,7 @@ export interface MsgDepositDeploymentAmino {
   id?: DeploymentIDAmino;
   amount?: CoinAmino;
 }
-export interface MsgDepositDeploymentAminoType {
+export interface MsgDepositDeploymentAminoMsg {
   type: "/akash.deployment.v1beta1.MsgDepositDeployment";
   value: MsgDepositDeploymentAmino;
 }
@@ -134,14 +134,14 @@ export interface MsgDepositDeploymentSDKType {
 
 /** MsgCreateDeploymentResponse defines the Msg/CreateDeployment response type. */
 export interface MsgDepositDeploymentResponse {}
-export interface MsgDepositDeploymentResponseProtoType {
+export interface MsgDepositDeploymentResponseProtoMsg {
   typeUrl: "/akash.deployment.v1beta1.MsgDepositDeploymentResponse";
   value: Uint8Array;
 }
 
 /** MsgCreateDeploymentResponse defines the Msg/CreateDeployment response type. */
 export interface MsgDepositDeploymentResponseAmino {}
-export interface MsgDepositDeploymentResponseAminoType {
+export interface MsgDepositDeploymentResponseAminoMsg {
   type: "/akash.deployment.v1beta1.MsgDepositDeploymentResponse";
   value: MsgDepositDeploymentResponseAmino;
 }
@@ -155,7 +155,7 @@ export interface MsgUpdateDeployment {
   groups: GroupSpec[];
   version: Uint8Array;
 }
-export interface MsgUpdateDeploymentProtoType {
+export interface MsgUpdateDeploymentProtoMsg {
   typeUrl: "/akash.deployment.v1beta1.MsgUpdateDeployment";
   value: Uint8Array;
 }
@@ -166,7 +166,7 @@ export interface MsgUpdateDeploymentAmino {
   groups: GroupSpecAmino[];
   version: Uint8Array;
 }
-export interface MsgUpdateDeploymentAminoType {
+export interface MsgUpdateDeploymentAminoMsg {
   type: "/akash.deployment.v1beta1.MsgUpdateDeployment";
   value: MsgUpdateDeploymentAmino;
 }
@@ -180,14 +180,14 @@ export interface MsgUpdateDeploymentSDKType {
 
 /** MsgUpdateDeploymentResponse defines the Msg/UpdateDeployment response type. */
 export interface MsgUpdateDeploymentResponse {}
-export interface MsgUpdateDeploymentResponseProtoType {
+export interface MsgUpdateDeploymentResponseProtoMsg {
   typeUrl: "/akash.deployment.v1beta1.MsgUpdateDeploymentResponse";
   value: Uint8Array;
 }
 
 /** MsgUpdateDeploymentResponse defines the Msg/UpdateDeployment response type. */
 export interface MsgUpdateDeploymentResponseAmino {}
-export interface MsgUpdateDeploymentResponseAminoType {
+export interface MsgUpdateDeploymentResponseAminoMsg {
   type: "/akash.deployment.v1beta1.MsgUpdateDeploymentResponse";
   value: MsgUpdateDeploymentResponseAmino;
 }
@@ -199,7 +199,7 @@ export interface MsgUpdateDeploymentResponseSDKType {}
 export interface MsgCloseDeployment {
   id?: DeploymentID;
 }
-export interface MsgCloseDeploymentProtoType {
+export interface MsgCloseDeploymentProtoMsg {
   typeUrl: "/akash.deployment.v1beta1.MsgCloseDeployment";
   value: Uint8Array;
 }
@@ -208,7 +208,7 @@ export interface MsgCloseDeploymentProtoType {
 export interface MsgCloseDeploymentAmino {
   id?: DeploymentIDAmino;
 }
-export interface MsgCloseDeploymentAminoType {
+export interface MsgCloseDeploymentAminoMsg {
   type: "/akash.deployment.v1beta1.MsgCloseDeployment";
   value: MsgCloseDeploymentAmino;
 }
@@ -220,14 +220,14 @@ export interface MsgCloseDeploymentSDKType {
 
 /** MsgCloseDeploymentResponse defines the Msg/CloseDeployment response type. */
 export interface MsgCloseDeploymentResponse {}
-export interface MsgCloseDeploymentResponseProtoType {
+export interface MsgCloseDeploymentResponseProtoMsg {
   typeUrl: "/akash.deployment.v1beta1.MsgCloseDeploymentResponse";
   value: Uint8Array;
 }
 
 /** MsgCloseDeploymentResponse defines the Msg/CloseDeployment response type. */
 export interface MsgCloseDeploymentResponseAmino {}
-export interface MsgCloseDeploymentResponseAminoType {
+export interface MsgCloseDeploymentResponseAminoMsg {
   type: "/akash.deployment.v1beta1.MsgCloseDeploymentResponse";
   value: MsgCloseDeploymentResponseAmino;
 }
@@ -240,7 +240,7 @@ export interface DeploymentID {
   owner: string;
   dseq: Long;
 }
-export interface DeploymentIDProtoType {
+export interface DeploymentIDProtoMsg {
   typeUrl: "/akash.deployment.v1beta1.DeploymentID";
   value: Uint8Array;
 }
@@ -250,7 +250,7 @@ export interface DeploymentIDAmino {
   owner: string;
   dseq: string;
 }
-export interface DeploymentIDAminoType {
+export interface DeploymentIDAminoMsg {
   type: "/akash.deployment.v1beta1.DeploymentID";
   value: DeploymentIDAmino;
 }
@@ -268,7 +268,7 @@ export interface Deployment {
   version: Uint8Array;
   createdAt: Long;
 }
-export interface DeploymentProtoType {
+export interface DeploymentProtoMsg {
   typeUrl: "/akash.deployment.v1beta1.Deployment";
   value: Uint8Array;
 }
@@ -280,7 +280,7 @@ export interface DeploymentAmino {
   version: Uint8Array;
   created_at: string;
 }
-export interface DeploymentAminoType {
+export interface DeploymentAminoMsg {
   type: "/akash.deployment.v1beta1.Deployment";
   value: DeploymentAmino;
 }
@@ -299,7 +299,7 @@ export interface DeploymentFilters {
   dseq: Long;
   state: string;
 }
-export interface DeploymentFiltersProtoType {
+export interface DeploymentFiltersProtoMsg {
   typeUrl: "/akash.deployment.v1beta1.DeploymentFilters";
   value: Uint8Array;
 }
@@ -310,7 +310,7 @@ export interface DeploymentFiltersAmino {
   dseq: string;
   state: string;
 }
-export interface DeploymentFiltersAminoType {
+export interface DeploymentFiltersAminoMsg {
   type: "/akash.deployment.v1beta1.DeploymentFilters";
   value: DeploymentFiltersAmino;
 }
@@ -332,6 +332,8 @@ function createBaseMsgCreateDeployment(): MsgCreateDeployment {
 }
 
 export const MsgCreateDeployment = {
+  typeUrl: "/akash.deployment.v1beta1.MsgCreateDeployment",
+
   encode(message: MsgCreateDeployment, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.id !== undefined) {
       DeploymentID.encode(message.id, writer.uint32(10).fork()).ldelim();
@@ -465,6 +467,25 @@ export const MsgCreateDeployment = {
     obj.version = message.version;
     obj.deposit = message.deposit ? Coin.toAmino(message.deposit) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCreateDeploymentAminoMsg): MsgCreateDeployment {
+    return MsgCreateDeployment.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgCreateDeploymentProtoMsg): MsgCreateDeployment {
+    return MsgCreateDeployment.decode(message.value);
+  },
+
+  toProto(message: MsgCreateDeployment): Uint8Array {
+    return MsgCreateDeployment.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCreateDeployment): MsgCreateDeploymentProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta1.MsgCreateDeployment",
+      value: MsgCreateDeployment.encode(message).finish()
+    };
   }
 
 };
@@ -474,6 +495,8 @@ function createBaseMsgCreateDeploymentResponse(): MsgCreateDeploymentResponse {
 }
 
 export const MsgCreateDeploymentResponse = {
+  typeUrl: "/akash.deployment.v1beta1.MsgCreateDeploymentResponse",
+
   encode(_: MsgCreateDeploymentResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -526,6 +549,25 @@ export const MsgCreateDeploymentResponse = {
   toAmino(_: MsgCreateDeploymentResponse): MsgCreateDeploymentResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCreateDeploymentResponseAminoMsg): MsgCreateDeploymentResponse {
+    return MsgCreateDeploymentResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgCreateDeploymentResponseProtoMsg): MsgCreateDeploymentResponse {
+    return MsgCreateDeploymentResponse.decode(message.value);
+  },
+
+  toProto(message: MsgCreateDeploymentResponse): Uint8Array {
+    return MsgCreateDeploymentResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCreateDeploymentResponse): MsgCreateDeploymentResponseProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta1.MsgCreateDeploymentResponse",
+      value: MsgCreateDeploymentResponse.encode(message).finish()
+    };
   }
 
 };
@@ -538,6 +580,8 @@ function createBaseMsgDepositDeployment(): MsgDepositDeployment {
 }
 
 export const MsgDepositDeployment = {
+  typeUrl: "/akash.deployment.v1beta1.MsgDepositDeployment",
+
   encode(message: MsgDepositDeployment, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.id !== undefined) {
       DeploymentID.encode(message.id, writer.uint32(10).fork()).ldelim();
@@ -623,6 +667,25 @@ export const MsgDepositDeployment = {
     obj.id = message.id ? DeploymentID.toAmino(message.id) : undefined;
     obj.amount = message.amount ? Coin.toAmino(message.amount) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgDepositDeploymentAminoMsg): MsgDepositDeployment {
+    return MsgDepositDeployment.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgDepositDeploymentProtoMsg): MsgDepositDeployment {
+    return MsgDepositDeployment.decode(message.value);
+  },
+
+  toProto(message: MsgDepositDeployment): Uint8Array {
+    return MsgDepositDeployment.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgDepositDeployment): MsgDepositDeploymentProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta1.MsgDepositDeployment",
+      value: MsgDepositDeployment.encode(message).finish()
+    };
   }
 
 };
@@ -632,6 +695,8 @@ function createBaseMsgDepositDeploymentResponse(): MsgDepositDeploymentResponse
 }
 
 export const MsgDepositDeploymentResponse = {
+  typeUrl: "/akash.deployment.v1beta1.MsgDepositDeploymentResponse",
+
   encode(_: MsgDepositDeploymentResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -684,6 +749,25 @@ export const MsgDepositDeploymentResponse = {
   toAmino(_: MsgDepositDeploymentResponse): MsgDepositDeploymentResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgDepositDeploymentResponseAminoMsg): MsgDepositDeploymentResponse {
+    return MsgDepositDeploymentResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgDepositDeploymentResponseProtoMsg): MsgDepositDeploymentResponse {
+    return MsgDepositDeploymentResponse.decode(message.value);
+  },
+
+  toProto(message: MsgDepositDeploymentResponse): Uint8Array {
+    return MsgDepositDeploymentResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgDepositDeploymentResponse): MsgDepositDeploymentResponseProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta1.MsgDepositDeploymentResponse",
+      value: MsgDepositDeploymentResponse.encode(message).finish()
+    };
   }
 
 };
@@ -697,6 +781,8 @@ function createBaseMsgUpdateDeployment(): MsgUpdateDeployment {
 }
 
 export const MsgUpdateDeployment = {
+  typeUrl: "/akash.deployment.v1beta1.MsgUpdateDeployment",
+
   encode(message: MsgUpdateDeployment, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.id !== undefined) {
       DeploymentID.encode(message.id, writer.uint32(10).fork()).ldelim();
@@ -815,6 +901,25 @@ export const MsgUpdateDeployment = {
 
     obj.version = message.version;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgUpdateDeploymentAminoMsg): MsgUpdateDeployment {
+    return MsgUpdateDeployment.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgUpdateDeploymentProtoMsg): MsgUpdateDeployment {
+    return MsgUpdateDeployment.decode(message.value);
+  },
+
+  toProto(message: MsgUpdateDeployment): Uint8Array {
+    return MsgUpdateDeployment.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgUpdateDeployment): MsgUpdateDeploymentProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta1.MsgUpdateDeployment",
+      value: MsgUpdateDeployment.encode(message).finish()
+    };
   }
 
 };
@@ -824,6 +929,8 @@ function createBaseMsgUpdateDeploymentResponse(): MsgUpdateDeploymentResponse {
 }
 
 export const MsgUpdateDeploymentResponse = {
+  typeUrl: "/akash.deployment.v1beta1.MsgUpdateDeploymentResponse",
+
   encode(_: MsgUpdateDeploymentResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -876,6 +983,25 @@ export const MsgUpdateDeploymentResponse = {
   toAmino(_: MsgUpdateDeploymentResponse): MsgUpdateDeploymentResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgUpdateDeploymentResponseAminoMsg): MsgUpdateDeploymentResponse {
+    return MsgUpdateDeploymentResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgUpdateDeploymentResponseProtoMsg): MsgUpdateDeploymentResponse {
+    return MsgUpdateDeploymentResponse.decode(message.value);
+  },
+
+  toProto(message: MsgUpdateDeploymentResponse): Uint8Array {
+    return MsgUpdateDeploymentResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgUpdateDeploymentResponse): MsgUpdateDeploymentResponseProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta1.MsgUpdateDeploymentResponse",
+      value: MsgUpdateDeploymentResponse.encode(message).finish()
+    };
   }
 
 };
@@ -887,6 +1013,8 @@ function createBaseMsgCloseDeployment(): MsgCloseDeployment {
 }
 
 export const MsgCloseDeployment = {
+  typeUrl: "/akash.deployment.v1beta1.MsgCloseDeployment",
+
   encode(message: MsgCloseDeployment, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.id !== undefined) {
       DeploymentID.encode(message.id, writer.uint32(10).fork()).ldelim();
@@ -957,6 +1085,25 @@ export const MsgCloseDeployment = {
     const obj: any = {};
     obj.id = message.id ? DeploymentID.toAmino(message.id) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCloseDeploymentAminoMsg): MsgCloseDeployment {
+    return MsgCloseDeployment.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgCloseDeploymentProtoMsg): MsgCloseDeployment {
+    return MsgCloseDeployment.decode(message.value);
+  },
+
+  toProto(message: MsgCloseDeployment): Uint8Array {
+    return MsgCloseDeployment.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCloseDeployment): MsgCloseDeploymentProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta1.MsgCloseDeployment",
+      value: MsgCloseDeployment.encode(message).finish()
+    };
   }
 
 };
@@ -966,6 +1113,8 @@ function createBaseMsgCloseDeploymentResponse(): MsgCloseDeploymentResponse {
 }
 
 export const MsgCloseDeploymentResponse = {
+  typeUrl: "/akash.deployment.v1beta1.MsgCloseDeploymentResponse",
+
   encode(_: MsgCloseDeploymentResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -1018,6 +1167,25 @@ export const MsgCloseDeploymentResponse = {
   toAmino(_: MsgCloseDeploymentResponse): MsgCloseDeploymentResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCloseDeploymentResponseAminoMsg): MsgCloseDeploymentResponse {
+    return MsgCloseDeploymentResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgCloseDeploymentResponseProtoMsg): MsgCloseDeploymentResponse {
+    return MsgCloseDeploymentResponse.decode(message.value);
+  },
+
+  toProto(message: MsgCloseDeploymentResponse): Uint8Array {
+    return MsgCloseDeploymentResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCloseDeploymentResponse): MsgCloseDeploymentResponseProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta1.MsgCloseDeploymentResponse",
+      value: MsgCloseDeploymentResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1030,6 +1198,8 @@ function createBaseDeploymentID(): DeploymentID {
 }
 
 export const DeploymentID = {
+  typeUrl: "/akash.deployment.v1beta1.DeploymentID",
+
   encode(message: DeploymentID, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.owner !== "") {
       writer.uint32(10).string(message.owner);
@@ -1115,6 +1285,25 @@ export const DeploymentID = {
     obj.owner = message.owner;
     obj.dseq = message.dseq ? message.dseq.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: DeploymentIDAminoMsg): DeploymentID {
+    return DeploymentID.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: DeploymentIDProtoMsg): DeploymentID {
+    return DeploymentID.decode(message.value);
+  },
+
+  toProto(message: DeploymentID): Uint8Array {
+    return DeploymentID.encode(message).finish();
+  },
+
+  toProtoMsg(message: DeploymentID): DeploymentIDProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta1.DeploymentID",
+      value: DeploymentID.encode(message).finish()
+    };
   }
 
 };
@@ -1129,6 +1318,8 @@ function createBaseDeployment(): Deployment {
 }
 
 export const Deployment = {
+  typeUrl: "/akash.deployment.v1beta1.Deployment",
+
   encode(message: Deployment, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.deploymentId !== undefined) {
       DeploymentID.encode(message.deploymentId, writer.uint32(10).fork()).ldelim();
@@ -1244,6 +1435,25 @@ export const Deployment = {
     obj.version = message.version;
     obj.created_at = message.createdAt ? message.createdAt.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: DeploymentAminoMsg): Deployment {
+    return Deployment.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: DeploymentProtoMsg): Deployment {
+    return Deployment.decode(message.value);
+  },
+
+  toProto(message: Deployment): Uint8Array {
+    return Deployment.encode(message).finish();
+  },
+
+  toProtoMsg(message: Deployment): DeploymentProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta1.Deployment",
+      value: Deployment.encode(message).finish()
+    };
   }
 
 };
@@ -1257,6 +1467,8 @@ function createBaseDeploymentFilters(): DeploymentFilters {
 }
 
 export const DeploymentFilters = {
+  typeUrl: "/akash.deployment.v1beta1.DeploymentFilters",
+
   encode(message: DeploymentFilters, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.owner !== "") {
       writer.uint32(10).string(message.owner);
@@ -1357,6 +1569,25 @@ export const DeploymentFilters = {
     obj.dseq = message.dseq ? message.dseq.toString() : undefined;
     obj.state = message.state;
     return obj;
+  },
+
+  fromAminoMsg(object: DeploymentFiltersAminoMsg): DeploymentFilters {
+    return DeploymentFilters.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: DeploymentFiltersProtoMsg): DeploymentFilters {
+    return DeploymentFilters.decode(message.value);
+  },
+
+  toProto(message: DeploymentFilters): Uint8Array {
+    return DeploymentFilters.encode(message).finish();
+  },
+
+  toProtoMsg(message: DeploymentFilters): DeploymentFiltersProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta1.DeploymentFilters",
+      value: DeploymentFilters.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/akash/deployment/v1beta1/genesis.ts b/__fixtures__/outputv2/akash/deployment/v1beta1/genesis.ts
index 888049f3a..1c5dcc9c7 100644
--- a/__fixtures__/outputv2/akash/deployment/v1beta1/genesis.ts
+++ b/__fixtures__/outputv2/akash/deployment/v1beta1/genesis.ts
@@ -10,7 +10,7 @@ export interface GenesisDeployment {
   deployment?: Deployment;
   groups: Group[];
 }
-export interface GenesisDeploymentProtoType {
+export interface GenesisDeploymentProtoMsg {
   typeUrl: "/akash.deployment.v1beta1.GenesisDeployment";
   value: Uint8Array;
 }
@@ -20,7 +20,7 @@ export interface GenesisDeploymentAmino {
   deployment?: DeploymentAmino;
   groups: GroupAmino[];
 }
-export interface GenesisDeploymentAminoType {
+export interface GenesisDeploymentAminoMsg {
   type: "/akash.deployment.v1beta1.GenesisDeployment";
   value: GenesisDeploymentAmino;
 }
@@ -36,7 +36,7 @@ export interface GenesisState {
   deployments: GenesisDeployment[];
   params?: Params;
 }
-export interface GenesisStateProtoType {
+export interface GenesisStateProtoMsg {
   typeUrl: "/akash.deployment.v1beta1.GenesisState";
   value: Uint8Array;
 }
@@ -46,7 +46,7 @@ export interface GenesisStateAmino {
   deployments: GenesisDeploymentAmino[];
   params?: ParamsAmino;
 }
-export interface GenesisStateAminoType {
+export interface GenesisStateAminoMsg {
   type: "/akash.deployment.v1beta1.GenesisState";
   value: GenesisStateAmino;
 }
@@ -65,6 +65,8 @@ function createBaseGenesisDeployment(): GenesisDeployment {
 }
 
 export const GenesisDeployment = {
+  typeUrl: "/akash.deployment.v1beta1.GenesisDeployment",
+
   encode(message: GenesisDeployment, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.deployment !== undefined) {
       Deployment.encode(message.deployment, writer.uint32(10).fork()).ldelim();
@@ -168,6 +170,25 @@ export const GenesisDeployment = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisDeploymentAminoMsg): GenesisDeployment {
+    return GenesisDeployment.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: GenesisDeploymentProtoMsg): GenesisDeployment {
+    return GenesisDeployment.decode(message.value);
+  },
+
+  toProto(message: GenesisDeployment): Uint8Array {
+    return GenesisDeployment.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisDeployment): GenesisDeploymentProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta1.GenesisDeployment",
+      value: GenesisDeployment.encode(message).finish()
+    };
   }
 
 };
@@ -180,6 +201,8 @@ function createBaseGenesisState(): GenesisState {
 }
 
 export const GenesisState = {
+  typeUrl: "/akash.deployment.v1beta1.GenesisState",
+
   encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.deployments) {
       GenesisDeployment.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -283,6 +306,25 @@ export const GenesisState = {
 
     obj.params = message.params ? Params.toAmino(message.params) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisStateAminoMsg): GenesisState {
+    return GenesisState.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: GenesisStateProtoMsg): GenesisState {
+    return GenesisState.decode(message.value);
+  },
+
+  toProto(message: GenesisState): Uint8Array {
+    return GenesisState.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisState): GenesisStateProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta1.GenesisState",
+      value: GenesisState.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/akash/deployment/v1beta1/group.ts b/__fixtures__/outputv2/akash/deployment/v1beta1/group.ts
index d77e23ed3..b96554e85 100644
--- a/__fixtures__/outputv2/akash/deployment/v1beta1/group.ts
+++ b/__fixtures__/outputv2/akash/deployment/v1beta1/group.ts
@@ -80,7 +80,7 @@ export function group_StateToJSON(object: Group_State): string {
 export interface MsgCloseGroup {
   id?: GroupID;
 }
-export interface MsgCloseGroupProtoType {
+export interface MsgCloseGroupProtoMsg {
   typeUrl: "/akash.deployment.v1beta1.MsgCloseGroup";
   value: Uint8Array;
 }
@@ -89,7 +89,7 @@ export interface MsgCloseGroupProtoType {
 export interface MsgCloseGroupAmino {
   id?: GroupIDAmino;
 }
-export interface MsgCloseGroupAminoType {
+export interface MsgCloseGroupAminoMsg {
   type: "/akash.deployment.v1beta1.MsgCloseGroup";
   value: MsgCloseGroupAmino;
 }
@@ -101,14 +101,14 @@ export interface MsgCloseGroupSDKType {
 
 /** MsgCloseGroupResponse defines the Msg/CloseGroup response type. */
 export interface MsgCloseGroupResponse {}
-export interface MsgCloseGroupResponseProtoType {
+export interface MsgCloseGroupResponseProtoMsg {
   typeUrl: "/akash.deployment.v1beta1.MsgCloseGroupResponse";
   value: Uint8Array;
 }
 
 /** MsgCloseGroupResponse defines the Msg/CloseGroup response type. */
 export interface MsgCloseGroupResponseAmino {}
-export interface MsgCloseGroupResponseAminoType {
+export interface MsgCloseGroupResponseAminoMsg {
   type: "/akash.deployment.v1beta1.MsgCloseGroupResponse";
   value: MsgCloseGroupResponseAmino;
 }
@@ -120,7 +120,7 @@ export interface MsgCloseGroupResponseSDKType {}
 export interface MsgPauseGroup {
   id?: GroupID;
 }
-export interface MsgPauseGroupProtoType {
+export interface MsgPauseGroupProtoMsg {
   typeUrl: "/akash.deployment.v1beta1.MsgPauseGroup";
   value: Uint8Array;
 }
@@ -129,7 +129,7 @@ export interface MsgPauseGroupProtoType {
 export interface MsgPauseGroupAmino {
   id?: GroupIDAmino;
 }
-export interface MsgPauseGroupAminoType {
+export interface MsgPauseGroupAminoMsg {
   type: "/akash.deployment.v1beta1.MsgPauseGroup";
   value: MsgPauseGroupAmino;
 }
@@ -141,14 +141,14 @@ export interface MsgPauseGroupSDKType {
 
 /** MsgPauseGroupResponse defines the Msg/PauseGroup response type. */
 export interface MsgPauseGroupResponse {}
-export interface MsgPauseGroupResponseProtoType {
+export interface MsgPauseGroupResponseProtoMsg {
   typeUrl: "/akash.deployment.v1beta1.MsgPauseGroupResponse";
   value: Uint8Array;
 }
 
 /** MsgPauseGroupResponse defines the Msg/PauseGroup response type. */
 export interface MsgPauseGroupResponseAmino {}
-export interface MsgPauseGroupResponseAminoType {
+export interface MsgPauseGroupResponseAminoMsg {
   type: "/akash.deployment.v1beta1.MsgPauseGroupResponse";
   value: MsgPauseGroupResponseAmino;
 }
@@ -160,7 +160,7 @@ export interface MsgPauseGroupResponseSDKType {}
 export interface MsgStartGroup {
   id?: GroupID;
 }
-export interface MsgStartGroupProtoType {
+export interface MsgStartGroupProtoMsg {
   typeUrl: "/akash.deployment.v1beta1.MsgStartGroup";
   value: Uint8Array;
 }
@@ -169,7 +169,7 @@ export interface MsgStartGroupProtoType {
 export interface MsgStartGroupAmino {
   id?: GroupIDAmino;
 }
-export interface MsgStartGroupAminoType {
+export interface MsgStartGroupAminoMsg {
   type: "/akash.deployment.v1beta1.MsgStartGroup";
   value: MsgStartGroupAmino;
 }
@@ -181,14 +181,14 @@ export interface MsgStartGroupSDKType {
 
 /** MsgStartGroupResponse defines the Msg/StartGroup response type. */
 export interface MsgStartGroupResponse {}
-export interface MsgStartGroupResponseProtoType {
+export interface MsgStartGroupResponseProtoMsg {
   typeUrl: "/akash.deployment.v1beta1.MsgStartGroupResponse";
   value: Uint8Array;
 }
 
 /** MsgStartGroupResponse defines the Msg/StartGroup response type. */
 export interface MsgStartGroupResponseAmino {}
-export interface MsgStartGroupResponseAminoType {
+export interface MsgStartGroupResponseAminoMsg {
   type: "/akash.deployment.v1beta1.MsgStartGroupResponse";
   value: MsgStartGroupResponseAmino;
 }
@@ -202,7 +202,7 @@ export interface GroupID {
   dseq: Long;
   gseq: number;
 }
-export interface GroupIDProtoType {
+export interface GroupIDProtoMsg {
   typeUrl: "/akash.deployment.v1beta1.GroupID";
   value: Uint8Array;
 }
@@ -213,7 +213,7 @@ export interface GroupIDAmino {
   dseq: string;
   gseq: number;
 }
-export interface GroupIDAminoType {
+export interface GroupIDAminoMsg {
   type: "/akash.deployment.v1beta1.GroupID";
   value: GroupIDAmino;
 }
@@ -231,7 +231,7 @@ export interface GroupSpec {
   requirements?: PlacementRequirements;
   resources: Resource[];
 }
-export interface GroupSpecProtoType {
+export interface GroupSpecProtoMsg {
   typeUrl: "/akash.deployment.v1beta1.GroupSpec";
   value: Uint8Array;
 }
@@ -242,7 +242,7 @@ export interface GroupSpecAmino {
   requirements?: PlacementRequirementsAmino;
   resources: ResourceAmino[];
 }
-export interface GroupSpecAminoType {
+export interface GroupSpecAminoMsg {
   type: "/akash.deployment.v1beta1.GroupSpec";
   value: GroupSpecAmino;
 }
@@ -261,7 +261,7 @@ export interface Group {
   groupSpec?: GroupSpec;
   createdAt: Long;
 }
-export interface GroupProtoType {
+export interface GroupProtoMsg {
   typeUrl: "/akash.deployment.v1beta1.Group";
   value: Uint8Array;
 }
@@ -273,7 +273,7 @@ export interface GroupAmino {
   group_spec?: GroupSpecAmino;
   created_at: string;
 }
-export interface GroupAminoType {
+export interface GroupAminoMsg {
   type: "/akash.deployment.v1beta1.Group";
   value: GroupAmino;
 }
@@ -292,7 +292,7 @@ export interface Resource {
   count: number;
   price?: Coin;
 }
-export interface ResourceProtoType {
+export interface ResourceProtoMsg {
   typeUrl: "/akash.deployment.v1beta1.Resource";
   value: Uint8Array;
 }
@@ -303,7 +303,7 @@ export interface ResourceAmino {
   count: number;
   price?: CoinAmino;
 }
-export interface ResourceAminoType {
+export interface ResourceAminoMsg {
   type: "/akash.deployment.v1beta1.Resource";
   value: ResourceAmino;
 }
@@ -322,6 +322,8 @@ function createBaseMsgCloseGroup(): MsgCloseGroup {
 }
 
 export const MsgCloseGroup = {
+  typeUrl: "/akash.deployment.v1beta1.MsgCloseGroup",
+
   encode(message: MsgCloseGroup, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.id !== undefined) {
       GroupID.encode(message.id, writer.uint32(10).fork()).ldelim();
@@ -392,6 +394,25 @@ export const MsgCloseGroup = {
     const obj: any = {};
     obj.id = message.id ? GroupID.toAmino(message.id) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCloseGroupAminoMsg): MsgCloseGroup {
+    return MsgCloseGroup.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgCloseGroupProtoMsg): MsgCloseGroup {
+    return MsgCloseGroup.decode(message.value);
+  },
+
+  toProto(message: MsgCloseGroup): Uint8Array {
+    return MsgCloseGroup.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCloseGroup): MsgCloseGroupProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta1.MsgCloseGroup",
+      value: MsgCloseGroup.encode(message).finish()
+    };
   }
 
 };
@@ -401,6 +422,8 @@ function createBaseMsgCloseGroupResponse(): MsgCloseGroupResponse {
 }
 
 export const MsgCloseGroupResponse = {
+  typeUrl: "/akash.deployment.v1beta1.MsgCloseGroupResponse",
+
   encode(_: MsgCloseGroupResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -453,6 +476,25 @@ export const MsgCloseGroupResponse = {
   toAmino(_: MsgCloseGroupResponse): MsgCloseGroupResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCloseGroupResponseAminoMsg): MsgCloseGroupResponse {
+    return MsgCloseGroupResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgCloseGroupResponseProtoMsg): MsgCloseGroupResponse {
+    return MsgCloseGroupResponse.decode(message.value);
+  },
+
+  toProto(message: MsgCloseGroupResponse): Uint8Array {
+    return MsgCloseGroupResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCloseGroupResponse): MsgCloseGroupResponseProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta1.MsgCloseGroupResponse",
+      value: MsgCloseGroupResponse.encode(message).finish()
+    };
   }
 
 };
@@ -464,6 +506,8 @@ function createBaseMsgPauseGroup(): MsgPauseGroup {
 }
 
 export const MsgPauseGroup = {
+  typeUrl: "/akash.deployment.v1beta1.MsgPauseGroup",
+
   encode(message: MsgPauseGroup, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.id !== undefined) {
       GroupID.encode(message.id, writer.uint32(10).fork()).ldelim();
@@ -534,6 +578,25 @@ export const MsgPauseGroup = {
     const obj: any = {};
     obj.id = message.id ? GroupID.toAmino(message.id) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgPauseGroupAminoMsg): MsgPauseGroup {
+    return MsgPauseGroup.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgPauseGroupProtoMsg): MsgPauseGroup {
+    return MsgPauseGroup.decode(message.value);
+  },
+
+  toProto(message: MsgPauseGroup): Uint8Array {
+    return MsgPauseGroup.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgPauseGroup): MsgPauseGroupProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta1.MsgPauseGroup",
+      value: MsgPauseGroup.encode(message).finish()
+    };
   }
 
 };
@@ -543,6 +606,8 @@ function createBaseMsgPauseGroupResponse(): MsgPauseGroupResponse {
 }
 
 export const MsgPauseGroupResponse = {
+  typeUrl: "/akash.deployment.v1beta1.MsgPauseGroupResponse",
+
   encode(_: MsgPauseGroupResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -595,6 +660,25 @@ export const MsgPauseGroupResponse = {
   toAmino(_: MsgPauseGroupResponse): MsgPauseGroupResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgPauseGroupResponseAminoMsg): MsgPauseGroupResponse {
+    return MsgPauseGroupResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgPauseGroupResponseProtoMsg): MsgPauseGroupResponse {
+    return MsgPauseGroupResponse.decode(message.value);
+  },
+
+  toProto(message: MsgPauseGroupResponse): Uint8Array {
+    return MsgPauseGroupResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgPauseGroupResponse): MsgPauseGroupResponseProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta1.MsgPauseGroupResponse",
+      value: MsgPauseGroupResponse.encode(message).finish()
+    };
   }
 
 };
@@ -606,6 +690,8 @@ function createBaseMsgStartGroup(): MsgStartGroup {
 }
 
 export const MsgStartGroup = {
+  typeUrl: "/akash.deployment.v1beta1.MsgStartGroup",
+
   encode(message: MsgStartGroup, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.id !== undefined) {
       GroupID.encode(message.id, writer.uint32(10).fork()).ldelim();
@@ -676,6 +762,25 @@ export const MsgStartGroup = {
     const obj: any = {};
     obj.id = message.id ? GroupID.toAmino(message.id) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgStartGroupAminoMsg): MsgStartGroup {
+    return MsgStartGroup.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgStartGroupProtoMsg): MsgStartGroup {
+    return MsgStartGroup.decode(message.value);
+  },
+
+  toProto(message: MsgStartGroup): Uint8Array {
+    return MsgStartGroup.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgStartGroup): MsgStartGroupProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta1.MsgStartGroup",
+      value: MsgStartGroup.encode(message).finish()
+    };
   }
 
 };
@@ -685,6 +790,8 @@ function createBaseMsgStartGroupResponse(): MsgStartGroupResponse {
 }
 
 export const MsgStartGroupResponse = {
+  typeUrl: "/akash.deployment.v1beta1.MsgStartGroupResponse",
+
   encode(_: MsgStartGroupResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -737,6 +844,25 @@ export const MsgStartGroupResponse = {
   toAmino(_: MsgStartGroupResponse): MsgStartGroupResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgStartGroupResponseAminoMsg): MsgStartGroupResponse {
+    return MsgStartGroupResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgStartGroupResponseProtoMsg): MsgStartGroupResponse {
+    return MsgStartGroupResponse.decode(message.value);
+  },
+
+  toProto(message: MsgStartGroupResponse): Uint8Array {
+    return MsgStartGroupResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgStartGroupResponse): MsgStartGroupResponseProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta1.MsgStartGroupResponse",
+      value: MsgStartGroupResponse.encode(message).finish()
+    };
   }
 
 };
@@ -750,6 +876,8 @@ function createBaseGroupID(): GroupID {
 }
 
 export const GroupID = {
+  typeUrl: "/akash.deployment.v1beta1.GroupID",
+
   encode(message: GroupID, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.owner !== "") {
       writer.uint32(10).string(message.owner);
@@ -850,6 +978,25 @@ export const GroupID = {
     obj.dseq = message.dseq ? message.dseq.toString() : undefined;
     obj.gseq = message.gseq;
     return obj;
+  },
+
+  fromAminoMsg(object: GroupIDAminoMsg): GroupID {
+    return GroupID.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: GroupIDProtoMsg): GroupID {
+    return GroupID.decode(message.value);
+  },
+
+  toProto(message: GroupID): Uint8Array {
+    return GroupID.encode(message).finish();
+  },
+
+  toProtoMsg(message: GroupID): GroupIDProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta1.GroupID",
+      value: GroupID.encode(message).finish()
+    };
   }
 
 };
@@ -863,6 +1010,8 @@ function createBaseGroupSpec(): GroupSpec {
 }
 
 export const GroupSpec = {
+  typeUrl: "/akash.deployment.v1beta1.GroupSpec",
+
   encode(message: GroupSpec, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -981,6 +1130,25 @@ export const GroupSpec = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: GroupSpecAminoMsg): GroupSpec {
+    return GroupSpec.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: GroupSpecProtoMsg): GroupSpec {
+    return GroupSpec.decode(message.value);
+  },
+
+  toProto(message: GroupSpec): Uint8Array {
+    return GroupSpec.encode(message).finish();
+  },
+
+  toProtoMsg(message: GroupSpec): GroupSpecProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta1.GroupSpec",
+      value: GroupSpec.encode(message).finish()
+    };
   }
 
 };
@@ -995,6 +1163,8 @@ function createBaseGroup(): Group {
 }
 
 export const Group = {
+  typeUrl: "/akash.deployment.v1beta1.Group",
+
   encode(message: Group, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.groupId !== undefined) {
       GroupID.encode(message.groupId, writer.uint32(10).fork()).ldelim();
@@ -1110,6 +1280,25 @@ export const Group = {
     obj.group_spec = message.groupSpec ? GroupSpec.toAmino(message.groupSpec) : undefined;
     obj.created_at = message.createdAt ? message.createdAt.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GroupAminoMsg): Group {
+    return Group.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: GroupProtoMsg): Group {
+    return Group.decode(message.value);
+  },
+
+  toProto(message: Group): Uint8Array {
+    return Group.encode(message).finish();
+  },
+
+  toProtoMsg(message: Group): GroupProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta1.Group",
+      value: Group.encode(message).finish()
+    };
   }
 
 };
@@ -1123,6 +1312,8 @@ function createBaseResource(): Resource {
 }
 
 export const Resource = {
+  typeUrl: "/akash.deployment.v1beta1.Resource",
+
   encode(message: Resource, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.resources !== undefined) {
       ResourceUnits.encode(message.resources, writer.uint32(10).fork()).ldelim();
@@ -1223,6 +1414,25 @@ export const Resource = {
     obj.count = message.count;
     obj.price = message.price ? Coin.toAmino(message.price) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ResourceAminoMsg): Resource {
+    return Resource.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ResourceProtoMsg): Resource {
+    return Resource.decode(message.value);
+  },
+
+  toProto(message: Resource): Uint8Array {
+    return Resource.encode(message).finish();
+  },
+
+  toProtoMsg(message: Resource): ResourceProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta1.Resource",
+      value: Resource.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/akash/deployment/v1beta1/params.ts b/__fixtures__/outputv2/akash/deployment/v1beta1/params.ts
index 8c6b115ac..aed9d4ab4 100644
--- a/__fixtures__/outputv2/akash/deployment/v1beta1/params.ts
+++ b/__fixtures__/outputv2/akash/deployment/v1beta1/params.ts
@@ -7,7 +7,7 @@ export const protobufPackage = "akash.deployment.v1beta1";
 export interface Params {
   deploymentMinDeposit?: Coin;
 }
-export interface ParamsProtoType {
+export interface ParamsProtoMsg {
   typeUrl: "/akash.deployment.v1beta1.Params";
   value: Uint8Array;
 }
@@ -16,7 +16,7 @@ export interface ParamsProtoType {
 export interface ParamsAmino {
   deployment_min_deposit?: CoinAmino;
 }
-export interface ParamsAminoType {
+export interface ParamsAminoMsg {
   type: "/akash.deployment.v1beta1.Params";
   value: ParamsAmino;
 }
@@ -33,6 +33,8 @@ function createBaseParams(): Params {
 }
 
 export const Params = {
+  typeUrl: "/akash.deployment.v1beta1.Params",
+
   encode(message: Params, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.deploymentMinDeposit !== undefined) {
       Coin.encode(message.deploymentMinDeposit, writer.uint32(10).fork()).ldelim();
@@ -103,6 +105,25 @@ export const Params = {
     const obj: any = {};
     obj.deployment_min_deposit = message.deploymentMinDeposit ? Coin.toAmino(message.deploymentMinDeposit) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ParamsAminoMsg): Params {
+    return Params.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ParamsProtoMsg): Params {
+    return Params.decode(message.value);
+  },
+
+  toProto(message: Params): Uint8Array {
+    return Params.encode(message).finish();
+  },
+
+  toProtoMsg(message: Params): ParamsProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta1.Params",
+      value: Params.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/akash/deployment/v1beta1/query.ts b/__fixtures__/outputv2/akash/deployment/v1beta1/query.ts
index 8fd0ec47d..8b913b295 100644
--- a/__fixtures__/outputv2/akash/deployment/v1beta1/query.ts
+++ b/__fixtures__/outputv2/akash/deployment/v1beta1/query.ts
@@ -11,7 +11,7 @@ export interface QueryDeploymentsRequest {
   filters?: DeploymentFilters;
   pagination?: PageRequest;
 }
-export interface QueryDeploymentsRequestProtoType {
+export interface QueryDeploymentsRequestProtoMsg {
   typeUrl: "/akash.deployment.v1beta1.QueryDeploymentsRequest";
   value: Uint8Array;
 }
@@ -21,7 +21,7 @@ export interface QueryDeploymentsRequestAmino {
   filters?: DeploymentFiltersAmino;
   pagination?: PageRequestAmino;
 }
-export interface QueryDeploymentsRequestAminoType {
+export interface QueryDeploymentsRequestAminoMsg {
   type: "/akash.deployment.v1beta1.QueryDeploymentsRequest";
   value: QueryDeploymentsRequestAmino;
 }
@@ -37,7 +37,7 @@ export interface QueryDeploymentsResponse {
   deployments: QueryDeploymentResponse[];
   pagination?: PageResponse;
 }
-export interface QueryDeploymentsResponseProtoType {
+export interface QueryDeploymentsResponseProtoMsg {
   typeUrl: "/akash.deployment.v1beta1.QueryDeploymentsResponse";
   value: Uint8Array;
 }
@@ -47,7 +47,7 @@ export interface QueryDeploymentsResponseAmino {
   deployments: QueryDeploymentResponseAmino[];
   pagination?: PageResponseAmino;
 }
-export interface QueryDeploymentsResponseAminoType {
+export interface QueryDeploymentsResponseAminoMsg {
   type: "/akash.deployment.v1beta1.QueryDeploymentsResponse";
   value: QueryDeploymentsResponseAmino;
 }
@@ -62,7 +62,7 @@ export interface QueryDeploymentsResponseSDKType {
 export interface QueryDeploymentRequest {
   id?: DeploymentID;
 }
-export interface QueryDeploymentRequestProtoType {
+export interface QueryDeploymentRequestProtoMsg {
   typeUrl: "/akash.deployment.v1beta1.QueryDeploymentRequest";
   value: Uint8Array;
 }
@@ -71,7 +71,7 @@ export interface QueryDeploymentRequestProtoType {
 export interface QueryDeploymentRequestAmino {
   id?: DeploymentIDAmino;
 }
-export interface QueryDeploymentRequestAminoType {
+export interface QueryDeploymentRequestAminoMsg {
   type: "/akash.deployment.v1beta1.QueryDeploymentRequest";
   value: QueryDeploymentRequestAmino;
 }
@@ -87,7 +87,7 @@ export interface QueryDeploymentResponse {
   groups: Group[];
   escrowAccount?: Account;
 }
-export interface QueryDeploymentResponseProtoType {
+export interface QueryDeploymentResponseProtoMsg {
   typeUrl: "/akash.deployment.v1beta1.QueryDeploymentResponse";
   value: Uint8Array;
 }
@@ -98,7 +98,7 @@ export interface QueryDeploymentResponseAmino {
   groups: GroupAmino[];
   escrow_account?: AccountAmino;
 }
-export interface QueryDeploymentResponseAminoType {
+export interface QueryDeploymentResponseAminoMsg {
   type: "/akash.deployment.v1beta1.QueryDeploymentResponse";
   value: QueryDeploymentResponseAmino;
 }
@@ -114,7 +114,7 @@ export interface QueryDeploymentResponseSDKType {
 export interface QueryGroupRequest {
   id?: GroupID;
 }
-export interface QueryGroupRequestProtoType {
+export interface QueryGroupRequestProtoMsg {
   typeUrl: "/akash.deployment.v1beta1.QueryGroupRequest";
   value: Uint8Array;
 }
@@ -123,7 +123,7 @@ export interface QueryGroupRequestProtoType {
 export interface QueryGroupRequestAmino {
   id?: GroupIDAmino;
 }
-export interface QueryGroupRequestAminoType {
+export interface QueryGroupRequestAminoMsg {
   type: "/akash.deployment.v1beta1.QueryGroupRequest";
   value: QueryGroupRequestAmino;
 }
@@ -137,7 +137,7 @@ export interface QueryGroupRequestSDKType {
 export interface QueryGroupResponse {
   group?: Group;
 }
-export interface QueryGroupResponseProtoType {
+export interface QueryGroupResponseProtoMsg {
   typeUrl: "/akash.deployment.v1beta1.QueryGroupResponse";
   value: Uint8Array;
 }
@@ -146,7 +146,7 @@ export interface QueryGroupResponseProtoType {
 export interface QueryGroupResponseAmino {
   group?: GroupAmino;
 }
-export interface QueryGroupResponseAminoType {
+export interface QueryGroupResponseAminoMsg {
   type: "/akash.deployment.v1beta1.QueryGroupResponse";
   value: QueryGroupResponseAmino;
 }
@@ -164,6 +164,8 @@ function createBaseQueryDeploymentsRequest(): QueryDeploymentsRequest {
 }
 
 export const QueryDeploymentsRequest = {
+  typeUrl: "/akash.deployment.v1beta1.QueryDeploymentsRequest",
+
   encode(message: QueryDeploymentsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.filters !== undefined) {
       DeploymentFilters.encode(message.filters, writer.uint32(10).fork()).ldelim();
@@ -249,6 +251,25 @@ export const QueryDeploymentsRequest = {
     obj.filters = message.filters ? DeploymentFilters.toAmino(message.filters) : undefined;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDeploymentsRequestAminoMsg): QueryDeploymentsRequest {
+    return QueryDeploymentsRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryDeploymentsRequestProtoMsg): QueryDeploymentsRequest {
+    return QueryDeploymentsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryDeploymentsRequest): Uint8Array {
+    return QueryDeploymentsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDeploymentsRequest): QueryDeploymentsRequestProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta1.QueryDeploymentsRequest",
+      value: QueryDeploymentsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -261,6 +282,8 @@ function createBaseQueryDeploymentsResponse(): QueryDeploymentsResponse {
 }
 
 export const QueryDeploymentsResponse = {
+  typeUrl: "/akash.deployment.v1beta1.QueryDeploymentsResponse",
+
   encode(message: QueryDeploymentsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.deployments) {
       QueryDeploymentResponse.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -364,6 +387,25 @@ export const QueryDeploymentsResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDeploymentsResponseAminoMsg): QueryDeploymentsResponse {
+    return QueryDeploymentsResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryDeploymentsResponseProtoMsg): QueryDeploymentsResponse {
+    return QueryDeploymentsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryDeploymentsResponse): Uint8Array {
+    return QueryDeploymentsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDeploymentsResponse): QueryDeploymentsResponseProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta1.QueryDeploymentsResponse",
+      value: QueryDeploymentsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -375,6 +417,8 @@ function createBaseQueryDeploymentRequest(): QueryDeploymentRequest {
 }
 
 export const QueryDeploymentRequest = {
+  typeUrl: "/akash.deployment.v1beta1.QueryDeploymentRequest",
+
   encode(message: QueryDeploymentRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.id !== undefined) {
       DeploymentID.encode(message.id, writer.uint32(10).fork()).ldelim();
@@ -445,6 +489,25 @@ export const QueryDeploymentRequest = {
     const obj: any = {};
     obj.id = message.id ? DeploymentID.toAmino(message.id) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDeploymentRequestAminoMsg): QueryDeploymentRequest {
+    return QueryDeploymentRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryDeploymentRequestProtoMsg): QueryDeploymentRequest {
+    return QueryDeploymentRequest.decode(message.value);
+  },
+
+  toProto(message: QueryDeploymentRequest): Uint8Array {
+    return QueryDeploymentRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDeploymentRequest): QueryDeploymentRequestProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta1.QueryDeploymentRequest",
+      value: QueryDeploymentRequest.encode(message).finish()
+    };
   }
 
 };
@@ -458,6 +521,8 @@ function createBaseQueryDeploymentResponse(): QueryDeploymentResponse {
 }
 
 export const QueryDeploymentResponse = {
+  typeUrl: "/akash.deployment.v1beta1.QueryDeploymentResponse",
+
   encode(message: QueryDeploymentResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.deployment !== undefined) {
       Deployment.encode(message.deployment, writer.uint32(10).fork()).ldelim();
@@ -576,6 +641,25 @@ export const QueryDeploymentResponse = {
 
     obj.escrow_account = message.escrowAccount ? Account.toAmino(message.escrowAccount) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDeploymentResponseAminoMsg): QueryDeploymentResponse {
+    return QueryDeploymentResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryDeploymentResponseProtoMsg): QueryDeploymentResponse {
+    return QueryDeploymentResponse.decode(message.value);
+  },
+
+  toProto(message: QueryDeploymentResponse): Uint8Array {
+    return QueryDeploymentResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDeploymentResponse): QueryDeploymentResponseProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta1.QueryDeploymentResponse",
+      value: QueryDeploymentResponse.encode(message).finish()
+    };
   }
 
 };
@@ -587,6 +671,8 @@ function createBaseQueryGroupRequest(): QueryGroupRequest {
 }
 
 export const QueryGroupRequest = {
+  typeUrl: "/akash.deployment.v1beta1.QueryGroupRequest",
+
   encode(message: QueryGroupRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.id !== undefined) {
       GroupID.encode(message.id, writer.uint32(10).fork()).ldelim();
@@ -657,6 +743,25 @@ export const QueryGroupRequest = {
     const obj: any = {};
     obj.id = message.id ? GroupID.toAmino(message.id) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryGroupRequestAminoMsg): QueryGroupRequest {
+    return QueryGroupRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryGroupRequestProtoMsg): QueryGroupRequest {
+    return QueryGroupRequest.decode(message.value);
+  },
+
+  toProto(message: QueryGroupRequest): Uint8Array {
+    return QueryGroupRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryGroupRequest): QueryGroupRequestProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta1.QueryGroupRequest",
+      value: QueryGroupRequest.encode(message).finish()
+    };
   }
 
 };
@@ -668,6 +773,8 @@ function createBaseQueryGroupResponse(): QueryGroupResponse {
 }
 
 export const QueryGroupResponse = {
+  typeUrl: "/akash.deployment.v1beta1.QueryGroupResponse",
+
   encode(message: QueryGroupResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.group !== undefined) {
       Group.encode(message.group, writer.uint32(10).fork()).ldelim();
@@ -738,6 +845,25 @@ export const QueryGroupResponse = {
     const obj: any = {};
     obj.group = message.group ? Group.toAmino(message.group) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryGroupResponseAminoMsg): QueryGroupResponse {
+    return QueryGroupResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryGroupResponseProtoMsg): QueryGroupResponse {
+    return QueryGroupResponse.decode(message.value);
+  },
+
+  toProto(message: QueryGroupResponse): Uint8Array {
+    return QueryGroupResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryGroupResponse): QueryGroupResponseProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta1.QueryGroupResponse",
+      value: QueryGroupResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/akash/deployment/v1beta2/authz.ts b/__fixtures__/outputv2/akash/deployment/v1beta2/authz.ts
index 3c9ff20c6..ffae3d213 100644
--- a/__fixtures__/outputv2/akash/deployment/v1beta2/authz.ts
+++ b/__fixtures__/outputv2/akash/deployment/v1beta2/authz.ts
@@ -14,7 +14,7 @@ export interface DepositDeploymentAuthorization {
    */
   spendLimit?: Coin;
 }
-export interface DepositDeploymentAuthorizationProtoType {
+export interface DepositDeploymentAuthorizationProtoMsg {
   typeUrl: "/akash.deployment.v1beta2.DepositDeploymentAuthorization";
   value: Uint8Array;
 }
@@ -30,7 +30,7 @@ export interface DepositDeploymentAuthorizationAmino {
    */
   spend_limit?: CoinAmino;
 }
-export interface DepositDeploymentAuthorizationAminoType {
+export interface DepositDeploymentAuthorizationAminoMsg {
   type: "/akash.deployment.v1beta2.DepositDeploymentAuthorization";
   value: DepositDeploymentAuthorizationAmino;
 }
@@ -50,6 +50,8 @@ function createBaseDepositDeploymentAuthorization(): DepositDeploymentAuthorizat
 }
 
 export const DepositDeploymentAuthorization = {
+  typeUrl: "/akash.deployment.v1beta2.DepositDeploymentAuthorization",
+
   encode(message: DepositDeploymentAuthorization, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.spendLimit !== undefined) {
       Coin.encode(message.spendLimit, writer.uint32(10).fork()).ldelim();
@@ -120,6 +122,25 @@ export const DepositDeploymentAuthorization = {
     const obj: any = {};
     obj.spend_limit = message.spendLimit ? Coin.toAmino(message.spendLimit) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: DepositDeploymentAuthorizationAminoMsg): DepositDeploymentAuthorization {
+    return DepositDeploymentAuthorization.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: DepositDeploymentAuthorizationProtoMsg): DepositDeploymentAuthorization {
+    return DepositDeploymentAuthorization.decode(message.value);
+  },
+
+  toProto(message: DepositDeploymentAuthorization): Uint8Array {
+    return DepositDeploymentAuthorization.encode(message).finish();
+  },
+
+  toProtoMsg(message: DepositDeploymentAuthorization): DepositDeploymentAuthorizationProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta2.DepositDeploymentAuthorization",
+      value: DepositDeploymentAuthorization.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/akash/deployment/v1beta2/deployment.ts b/__fixtures__/outputv2/akash/deployment/v1beta2/deployment.ts
index b1a1cb75f..2f9fe64d0 100644
--- a/__fixtures__/outputv2/akash/deployment/v1beta2/deployment.ts
+++ b/__fixtures__/outputv2/akash/deployment/v1beta2/deployment.ts
@@ -58,7 +58,7 @@ export interface DeploymentID {
   owner: string;
   dseq: Long;
 }
-export interface DeploymentIDProtoType {
+export interface DeploymentIDProtoMsg {
   typeUrl: "/akash.deployment.v1beta2.DeploymentID";
   value: Uint8Array;
 }
@@ -68,7 +68,7 @@ export interface DeploymentIDAmino {
   owner: string;
   dseq: string;
 }
-export interface DeploymentIDAminoType {
+export interface DeploymentIDAminoMsg {
   type: "/akash.deployment.v1beta2.DeploymentID";
   value: DeploymentIDAmino;
 }
@@ -86,7 +86,7 @@ export interface Deployment {
   version: Uint8Array;
   createdAt: Long;
 }
-export interface DeploymentProtoType {
+export interface DeploymentProtoMsg {
   typeUrl: "/akash.deployment.v1beta2.Deployment";
   value: Uint8Array;
 }
@@ -98,7 +98,7 @@ export interface DeploymentAmino {
   version: Uint8Array;
   created_at: string;
 }
-export interface DeploymentAminoType {
+export interface DeploymentAminoMsg {
   type: "/akash.deployment.v1beta2.Deployment";
   value: DeploymentAmino;
 }
@@ -117,7 +117,7 @@ export interface DeploymentFilters {
   dseq: Long;
   state: string;
 }
-export interface DeploymentFiltersProtoType {
+export interface DeploymentFiltersProtoMsg {
   typeUrl: "/akash.deployment.v1beta2.DeploymentFilters";
   value: Uint8Array;
 }
@@ -128,7 +128,7 @@ export interface DeploymentFiltersAmino {
   dseq: string;
   state: string;
 }
-export interface DeploymentFiltersAminoType {
+export interface DeploymentFiltersAminoMsg {
   type: "/akash.deployment.v1beta2.DeploymentFilters";
   value: DeploymentFiltersAmino;
 }
@@ -148,6 +148,8 @@ function createBaseDeploymentID(): DeploymentID {
 }
 
 export const DeploymentID = {
+  typeUrl: "/akash.deployment.v1beta2.DeploymentID",
+
   encode(message: DeploymentID, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.owner !== "") {
       writer.uint32(10).string(message.owner);
@@ -233,6 +235,25 @@ export const DeploymentID = {
     obj.owner = message.owner;
     obj.dseq = message.dseq ? message.dseq.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: DeploymentIDAminoMsg): DeploymentID {
+    return DeploymentID.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: DeploymentIDProtoMsg): DeploymentID {
+    return DeploymentID.decode(message.value);
+  },
+
+  toProto(message: DeploymentID): Uint8Array {
+    return DeploymentID.encode(message).finish();
+  },
+
+  toProtoMsg(message: DeploymentID): DeploymentIDProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta2.DeploymentID",
+      value: DeploymentID.encode(message).finish()
+    };
   }
 
 };
@@ -247,6 +268,8 @@ function createBaseDeployment(): Deployment {
 }
 
 export const Deployment = {
+  typeUrl: "/akash.deployment.v1beta2.Deployment",
+
   encode(message: Deployment, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.deploymentId !== undefined) {
       DeploymentID.encode(message.deploymentId, writer.uint32(10).fork()).ldelim();
@@ -362,6 +385,25 @@ export const Deployment = {
     obj.version = message.version;
     obj.created_at = message.createdAt ? message.createdAt.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: DeploymentAminoMsg): Deployment {
+    return Deployment.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: DeploymentProtoMsg): Deployment {
+    return Deployment.decode(message.value);
+  },
+
+  toProto(message: Deployment): Uint8Array {
+    return Deployment.encode(message).finish();
+  },
+
+  toProtoMsg(message: Deployment): DeploymentProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta2.Deployment",
+      value: Deployment.encode(message).finish()
+    };
   }
 
 };
@@ -375,6 +417,8 @@ function createBaseDeploymentFilters(): DeploymentFilters {
 }
 
 export const DeploymentFilters = {
+  typeUrl: "/akash.deployment.v1beta2.DeploymentFilters",
+
   encode(message: DeploymentFilters, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.owner !== "") {
       writer.uint32(10).string(message.owner);
@@ -475,6 +519,25 @@ export const DeploymentFilters = {
     obj.dseq = message.dseq ? message.dseq.toString() : undefined;
     obj.state = message.state;
     return obj;
+  },
+
+  fromAminoMsg(object: DeploymentFiltersAminoMsg): DeploymentFilters {
+    return DeploymentFilters.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: DeploymentFiltersProtoMsg): DeploymentFilters {
+    return DeploymentFilters.decode(message.value);
+  },
+
+  toProto(message: DeploymentFilters): Uint8Array {
+    return DeploymentFilters.encode(message).finish();
+  },
+
+  toProtoMsg(message: DeploymentFilters): DeploymentFiltersProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta2.DeploymentFilters",
+      value: DeploymentFilters.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/akash/deployment/v1beta2/deploymentmsg.ts b/__fixtures__/outputv2/akash/deployment/v1beta2/deploymentmsg.ts
index 268078d3e..186605133 100644
--- a/__fixtures__/outputv2/akash/deployment/v1beta2/deploymentmsg.ts
+++ b/__fixtures__/outputv2/akash/deployment/v1beta2/deploymentmsg.ts
@@ -15,7 +15,7 @@ export interface MsgCreateDeployment {
   /** Depositor pays for the deposit */
   depositor: string;
 }
-export interface MsgCreateDeploymentProtoType {
+export interface MsgCreateDeploymentProtoMsg {
   typeUrl: "/akash.deployment.v1beta2.MsgCreateDeployment";
   value: Uint8Array;
 }
@@ -30,7 +30,7 @@ export interface MsgCreateDeploymentAmino {
   /** Depositor pays for the deposit */
   depositor: string;
 }
-export interface MsgCreateDeploymentAminoType {
+export interface MsgCreateDeploymentAminoMsg {
   type: "/akash.deployment.v1beta2.MsgCreateDeployment";
   value: MsgCreateDeploymentAmino;
 }
@@ -46,14 +46,14 @@ export interface MsgCreateDeploymentSDKType {
 
 /** MsgCreateDeploymentResponse defines the Msg/CreateDeployment response type. */
 export interface MsgCreateDeploymentResponse {}
-export interface MsgCreateDeploymentResponseProtoType {
+export interface MsgCreateDeploymentResponseProtoMsg {
   typeUrl: "/akash.deployment.v1beta2.MsgCreateDeploymentResponse";
   value: Uint8Array;
 }
 
 /** MsgCreateDeploymentResponse defines the Msg/CreateDeployment response type. */
 export interface MsgCreateDeploymentResponseAmino {}
-export interface MsgCreateDeploymentResponseAminoType {
+export interface MsgCreateDeploymentResponseAminoMsg {
   type: "/akash.deployment.v1beta2.MsgCreateDeploymentResponse";
   value: MsgCreateDeploymentResponseAmino;
 }
@@ -69,7 +69,7 @@ export interface MsgDepositDeployment {
   /** Depositor pays for the deposit */
   depositor: string;
 }
-export interface MsgDepositDeploymentProtoType {
+export interface MsgDepositDeploymentProtoMsg {
   typeUrl: "/akash.deployment.v1beta2.MsgDepositDeployment";
   value: Uint8Array;
 }
@@ -82,7 +82,7 @@ export interface MsgDepositDeploymentAmino {
   /** Depositor pays for the deposit */
   depositor: string;
 }
-export interface MsgDepositDeploymentAminoType {
+export interface MsgDepositDeploymentAminoMsg {
   type: "/akash.deployment.v1beta2.MsgDepositDeployment";
   value: MsgDepositDeploymentAmino;
 }
@@ -96,14 +96,14 @@ export interface MsgDepositDeploymentSDKType {
 
 /** MsgCreateDeploymentResponse defines the Msg/CreateDeployment response type. */
 export interface MsgDepositDeploymentResponse {}
-export interface MsgDepositDeploymentResponseProtoType {
+export interface MsgDepositDeploymentResponseProtoMsg {
   typeUrl: "/akash.deployment.v1beta2.MsgDepositDeploymentResponse";
   value: Uint8Array;
 }
 
 /** MsgCreateDeploymentResponse defines the Msg/CreateDeployment response type. */
 export interface MsgDepositDeploymentResponseAmino {}
-export interface MsgDepositDeploymentResponseAminoType {
+export interface MsgDepositDeploymentResponseAminoMsg {
   type: "/akash.deployment.v1beta2.MsgDepositDeploymentResponse";
   value: MsgDepositDeploymentResponseAmino;
 }
@@ -116,7 +116,7 @@ export interface MsgUpdateDeployment {
   id?: DeploymentID;
   version: Uint8Array;
 }
-export interface MsgUpdateDeploymentProtoType {
+export interface MsgUpdateDeploymentProtoMsg {
   typeUrl: "/akash.deployment.v1beta2.MsgUpdateDeployment";
   value: Uint8Array;
 }
@@ -126,7 +126,7 @@ export interface MsgUpdateDeploymentAmino {
   id?: DeploymentIDAmino;
   version: Uint8Array;
 }
-export interface MsgUpdateDeploymentAminoType {
+export interface MsgUpdateDeploymentAminoMsg {
   type: "/akash.deployment.v1beta2.MsgUpdateDeployment";
   value: MsgUpdateDeploymentAmino;
 }
@@ -139,14 +139,14 @@ export interface MsgUpdateDeploymentSDKType {
 
 /** MsgUpdateDeploymentResponse defines the Msg/UpdateDeployment response type. */
 export interface MsgUpdateDeploymentResponse {}
-export interface MsgUpdateDeploymentResponseProtoType {
+export interface MsgUpdateDeploymentResponseProtoMsg {
   typeUrl: "/akash.deployment.v1beta2.MsgUpdateDeploymentResponse";
   value: Uint8Array;
 }
 
 /** MsgUpdateDeploymentResponse defines the Msg/UpdateDeployment response type. */
 export interface MsgUpdateDeploymentResponseAmino {}
-export interface MsgUpdateDeploymentResponseAminoType {
+export interface MsgUpdateDeploymentResponseAminoMsg {
   type: "/akash.deployment.v1beta2.MsgUpdateDeploymentResponse";
   value: MsgUpdateDeploymentResponseAmino;
 }
@@ -158,7 +158,7 @@ export interface MsgUpdateDeploymentResponseSDKType {}
 export interface MsgCloseDeployment {
   id?: DeploymentID;
 }
-export interface MsgCloseDeploymentProtoType {
+export interface MsgCloseDeploymentProtoMsg {
   typeUrl: "/akash.deployment.v1beta2.MsgCloseDeployment";
   value: Uint8Array;
 }
@@ -167,7 +167,7 @@ export interface MsgCloseDeploymentProtoType {
 export interface MsgCloseDeploymentAmino {
   id?: DeploymentIDAmino;
 }
-export interface MsgCloseDeploymentAminoType {
+export interface MsgCloseDeploymentAminoMsg {
   type: "/akash.deployment.v1beta2.MsgCloseDeployment";
   value: MsgCloseDeploymentAmino;
 }
@@ -179,14 +179,14 @@ export interface MsgCloseDeploymentSDKType {
 
 /** MsgCloseDeploymentResponse defines the Msg/CloseDeployment response type. */
 export interface MsgCloseDeploymentResponse {}
-export interface MsgCloseDeploymentResponseProtoType {
+export interface MsgCloseDeploymentResponseProtoMsg {
   typeUrl: "/akash.deployment.v1beta2.MsgCloseDeploymentResponse";
   value: Uint8Array;
 }
 
 /** MsgCloseDeploymentResponse defines the Msg/CloseDeployment response type. */
 export interface MsgCloseDeploymentResponseAmino {}
-export interface MsgCloseDeploymentResponseAminoType {
+export interface MsgCloseDeploymentResponseAminoMsg {
   type: "/akash.deployment.v1beta2.MsgCloseDeploymentResponse";
   value: MsgCloseDeploymentResponseAmino;
 }
@@ -205,6 +205,8 @@ function createBaseMsgCreateDeployment(): MsgCreateDeployment {
 }
 
 export const MsgCreateDeployment = {
+  typeUrl: "/akash.deployment.v1beta2.MsgCreateDeployment",
+
   encode(message: MsgCreateDeployment, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.id !== undefined) {
       DeploymentID.encode(message.id, writer.uint32(10).fork()).ldelim();
@@ -353,6 +355,25 @@ export const MsgCreateDeployment = {
     obj.deposit = message.deposit ? Coin.toAmino(message.deposit) : undefined;
     obj.depositor = message.depositor;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCreateDeploymentAminoMsg): MsgCreateDeployment {
+    return MsgCreateDeployment.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgCreateDeploymentProtoMsg): MsgCreateDeployment {
+    return MsgCreateDeployment.decode(message.value);
+  },
+
+  toProto(message: MsgCreateDeployment): Uint8Array {
+    return MsgCreateDeployment.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCreateDeployment): MsgCreateDeploymentProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta2.MsgCreateDeployment",
+      value: MsgCreateDeployment.encode(message).finish()
+    };
   }
 
 };
@@ -362,6 +383,8 @@ function createBaseMsgCreateDeploymentResponse(): MsgCreateDeploymentResponse {
 }
 
 export const MsgCreateDeploymentResponse = {
+  typeUrl: "/akash.deployment.v1beta2.MsgCreateDeploymentResponse",
+
   encode(_: MsgCreateDeploymentResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -414,6 +437,25 @@ export const MsgCreateDeploymentResponse = {
   toAmino(_: MsgCreateDeploymentResponse): MsgCreateDeploymentResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCreateDeploymentResponseAminoMsg): MsgCreateDeploymentResponse {
+    return MsgCreateDeploymentResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgCreateDeploymentResponseProtoMsg): MsgCreateDeploymentResponse {
+    return MsgCreateDeploymentResponse.decode(message.value);
+  },
+
+  toProto(message: MsgCreateDeploymentResponse): Uint8Array {
+    return MsgCreateDeploymentResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCreateDeploymentResponse): MsgCreateDeploymentResponseProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta2.MsgCreateDeploymentResponse",
+      value: MsgCreateDeploymentResponse.encode(message).finish()
+    };
   }
 
 };
@@ -427,6 +469,8 @@ function createBaseMsgDepositDeployment(): MsgDepositDeployment {
 }
 
 export const MsgDepositDeployment = {
+  typeUrl: "/akash.deployment.v1beta2.MsgDepositDeployment",
+
   encode(message: MsgDepositDeployment, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.id !== undefined) {
       DeploymentID.encode(message.id, writer.uint32(10).fork()).ldelim();
@@ -527,6 +571,25 @@ export const MsgDepositDeployment = {
     obj.amount = message.amount ? Coin.toAmino(message.amount) : undefined;
     obj.depositor = message.depositor;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgDepositDeploymentAminoMsg): MsgDepositDeployment {
+    return MsgDepositDeployment.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgDepositDeploymentProtoMsg): MsgDepositDeployment {
+    return MsgDepositDeployment.decode(message.value);
+  },
+
+  toProto(message: MsgDepositDeployment): Uint8Array {
+    return MsgDepositDeployment.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgDepositDeployment): MsgDepositDeploymentProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta2.MsgDepositDeployment",
+      value: MsgDepositDeployment.encode(message).finish()
+    };
   }
 
 };
@@ -536,6 +599,8 @@ function createBaseMsgDepositDeploymentResponse(): MsgDepositDeploymentResponse
 }
 
 export const MsgDepositDeploymentResponse = {
+  typeUrl: "/akash.deployment.v1beta2.MsgDepositDeploymentResponse",
+
   encode(_: MsgDepositDeploymentResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -588,6 +653,25 @@ export const MsgDepositDeploymentResponse = {
   toAmino(_: MsgDepositDeploymentResponse): MsgDepositDeploymentResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgDepositDeploymentResponseAminoMsg): MsgDepositDeploymentResponse {
+    return MsgDepositDeploymentResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgDepositDeploymentResponseProtoMsg): MsgDepositDeploymentResponse {
+    return MsgDepositDeploymentResponse.decode(message.value);
+  },
+
+  toProto(message: MsgDepositDeploymentResponse): Uint8Array {
+    return MsgDepositDeploymentResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgDepositDeploymentResponse): MsgDepositDeploymentResponseProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta2.MsgDepositDeploymentResponse",
+      value: MsgDepositDeploymentResponse.encode(message).finish()
+    };
   }
 
 };
@@ -600,6 +684,8 @@ function createBaseMsgUpdateDeployment(): MsgUpdateDeployment {
 }
 
 export const MsgUpdateDeployment = {
+  typeUrl: "/akash.deployment.v1beta2.MsgUpdateDeployment",
+
   encode(message: MsgUpdateDeployment, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.id !== undefined) {
       DeploymentID.encode(message.id, writer.uint32(10).fork()).ldelim();
@@ -685,6 +771,25 @@ export const MsgUpdateDeployment = {
     obj.id = message.id ? DeploymentID.toAmino(message.id) : undefined;
     obj.version = message.version;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgUpdateDeploymentAminoMsg): MsgUpdateDeployment {
+    return MsgUpdateDeployment.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgUpdateDeploymentProtoMsg): MsgUpdateDeployment {
+    return MsgUpdateDeployment.decode(message.value);
+  },
+
+  toProto(message: MsgUpdateDeployment): Uint8Array {
+    return MsgUpdateDeployment.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgUpdateDeployment): MsgUpdateDeploymentProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta2.MsgUpdateDeployment",
+      value: MsgUpdateDeployment.encode(message).finish()
+    };
   }
 
 };
@@ -694,6 +799,8 @@ function createBaseMsgUpdateDeploymentResponse(): MsgUpdateDeploymentResponse {
 }
 
 export const MsgUpdateDeploymentResponse = {
+  typeUrl: "/akash.deployment.v1beta2.MsgUpdateDeploymentResponse",
+
   encode(_: MsgUpdateDeploymentResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -746,6 +853,25 @@ export const MsgUpdateDeploymentResponse = {
   toAmino(_: MsgUpdateDeploymentResponse): MsgUpdateDeploymentResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgUpdateDeploymentResponseAminoMsg): MsgUpdateDeploymentResponse {
+    return MsgUpdateDeploymentResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgUpdateDeploymentResponseProtoMsg): MsgUpdateDeploymentResponse {
+    return MsgUpdateDeploymentResponse.decode(message.value);
+  },
+
+  toProto(message: MsgUpdateDeploymentResponse): Uint8Array {
+    return MsgUpdateDeploymentResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgUpdateDeploymentResponse): MsgUpdateDeploymentResponseProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta2.MsgUpdateDeploymentResponse",
+      value: MsgUpdateDeploymentResponse.encode(message).finish()
+    };
   }
 
 };
@@ -757,6 +883,8 @@ function createBaseMsgCloseDeployment(): MsgCloseDeployment {
 }
 
 export const MsgCloseDeployment = {
+  typeUrl: "/akash.deployment.v1beta2.MsgCloseDeployment",
+
   encode(message: MsgCloseDeployment, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.id !== undefined) {
       DeploymentID.encode(message.id, writer.uint32(10).fork()).ldelim();
@@ -827,6 +955,25 @@ export const MsgCloseDeployment = {
     const obj: any = {};
     obj.id = message.id ? DeploymentID.toAmino(message.id) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCloseDeploymentAminoMsg): MsgCloseDeployment {
+    return MsgCloseDeployment.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgCloseDeploymentProtoMsg): MsgCloseDeployment {
+    return MsgCloseDeployment.decode(message.value);
+  },
+
+  toProto(message: MsgCloseDeployment): Uint8Array {
+    return MsgCloseDeployment.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCloseDeployment): MsgCloseDeploymentProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta2.MsgCloseDeployment",
+      value: MsgCloseDeployment.encode(message).finish()
+    };
   }
 
 };
@@ -836,6 +983,8 @@ function createBaseMsgCloseDeploymentResponse(): MsgCloseDeploymentResponse {
 }
 
 export const MsgCloseDeploymentResponse = {
+  typeUrl: "/akash.deployment.v1beta2.MsgCloseDeploymentResponse",
+
   encode(_: MsgCloseDeploymentResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -888,6 +1037,25 @@ export const MsgCloseDeploymentResponse = {
   toAmino(_: MsgCloseDeploymentResponse): MsgCloseDeploymentResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCloseDeploymentResponseAminoMsg): MsgCloseDeploymentResponse {
+    return MsgCloseDeploymentResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgCloseDeploymentResponseProtoMsg): MsgCloseDeploymentResponse {
+    return MsgCloseDeploymentResponse.decode(message.value);
+  },
+
+  toProto(message: MsgCloseDeploymentResponse): Uint8Array {
+    return MsgCloseDeploymentResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCloseDeploymentResponse): MsgCloseDeploymentResponseProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta2.MsgCloseDeploymentResponse",
+      value: MsgCloseDeploymentResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/akash/deployment/v1beta2/genesis.ts b/__fixtures__/outputv2/akash/deployment/v1beta2/genesis.ts
index b0f8be4a3..6995829c7 100644
--- a/__fixtures__/outputv2/akash/deployment/v1beta2/genesis.ts
+++ b/__fixtures__/outputv2/akash/deployment/v1beta2/genesis.ts
@@ -10,7 +10,7 @@ export interface GenesisDeployment {
   deployment?: Deployment;
   groups: Group[];
 }
-export interface GenesisDeploymentProtoType {
+export interface GenesisDeploymentProtoMsg {
   typeUrl: "/akash.deployment.v1beta2.GenesisDeployment";
   value: Uint8Array;
 }
@@ -20,7 +20,7 @@ export interface GenesisDeploymentAmino {
   deployment?: DeploymentAmino;
   groups: GroupAmino[];
 }
-export interface GenesisDeploymentAminoType {
+export interface GenesisDeploymentAminoMsg {
   type: "/akash.deployment.v1beta2.GenesisDeployment";
   value: GenesisDeploymentAmino;
 }
@@ -36,7 +36,7 @@ export interface GenesisState {
   deployments: GenesisDeployment[];
   params?: Params;
 }
-export interface GenesisStateProtoType {
+export interface GenesisStateProtoMsg {
   typeUrl: "/akash.deployment.v1beta2.GenesisState";
   value: Uint8Array;
 }
@@ -46,7 +46,7 @@ export interface GenesisStateAmino {
   deployments: GenesisDeploymentAmino[];
   params?: ParamsAmino;
 }
-export interface GenesisStateAminoType {
+export interface GenesisStateAminoMsg {
   type: "/akash.deployment.v1beta2.GenesisState";
   value: GenesisStateAmino;
 }
@@ -65,6 +65,8 @@ function createBaseGenesisDeployment(): GenesisDeployment {
 }
 
 export const GenesisDeployment = {
+  typeUrl: "/akash.deployment.v1beta2.GenesisDeployment",
+
   encode(message: GenesisDeployment, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.deployment !== undefined) {
       Deployment.encode(message.deployment, writer.uint32(10).fork()).ldelim();
@@ -168,6 +170,25 @@ export const GenesisDeployment = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisDeploymentAminoMsg): GenesisDeployment {
+    return GenesisDeployment.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: GenesisDeploymentProtoMsg): GenesisDeployment {
+    return GenesisDeployment.decode(message.value);
+  },
+
+  toProto(message: GenesisDeployment): Uint8Array {
+    return GenesisDeployment.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisDeployment): GenesisDeploymentProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta2.GenesisDeployment",
+      value: GenesisDeployment.encode(message).finish()
+    };
   }
 
 };
@@ -180,6 +201,8 @@ function createBaseGenesisState(): GenesisState {
 }
 
 export const GenesisState = {
+  typeUrl: "/akash.deployment.v1beta2.GenesisState",
+
   encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.deployments) {
       GenesisDeployment.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -283,6 +306,25 @@ export const GenesisState = {
 
     obj.params = message.params ? Params.toAmino(message.params) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisStateAminoMsg): GenesisState {
+    return GenesisState.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: GenesisStateProtoMsg): GenesisState {
+    return GenesisState.decode(message.value);
+  },
+
+  toProto(message: GenesisState): Uint8Array {
+    return GenesisState.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisState): GenesisStateProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta2.GenesisState",
+      value: GenesisState.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/akash/deployment/v1beta2/group.ts b/__fixtures__/outputv2/akash/deployment/v1beta2/group.ts
index a00c19953..b57f94e02 100644
--- a/__fixtures__/outputv2/akash/deployment/v1beta2/group.ts
+++ b/__fixtures__/outputv2/akash/deployment/v1beta2/group.ts
@@ -82,7 +82,7 @@ export interface Group {
   groupSpec?: GroupSpec;
   createdAt: Long;
 }
-export interface GroupProtoType {
+export interface GroupProtoMsg {
   typeUrl: "/akash.deployment.v1beta2.Group";
   value: Uint8Array;
 }
@@ -94,7 +94,7 @@ export interface GroupAmino {
   group_spec?: GroupSpecAmino;
   created_at: string;
 }
-export interface GroupAminoType {
+export interface GroupAminoMsg {
   type: "/akash.deployment.v1beta2.Group";
   value: GroupAmino;
 }
@@ -117,6 +117,8 @@ function createBaseGroup(): Group {
 }
 
 export const Group = {
+  typeUrl: "/akash.deployment.v1beta2.Group",
+
   encode(message: Group, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.groupId !== undefined) {
       GroupID.encode(message.groupId, writer.uint32(10).fork()).ldelim();
@@ -232,6 +234,25 @@ export const Group = {
     obj.group_spec = message.groupSpec ? GroupSpec.toAmino(message.groupSpec) : undefined;
     obj.created_at = message.createdAt ? message.createdAt.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GroupAminoMsg): Group {
+    return Group.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: GroupProtoMsg): Group {
+    return Group.decode(message.value);
+  },
+
+  toProto(message: Group): Uint8Array {
+    return Group.encode(message).finish();
+  },
+
+  toProtoMsg(message: Group): GroupProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta2.Group",
+      value: Group.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/akash/deployment/v1beta2/groupid.ts b/__fixtures__/outputv2/akash/deployment/v1beta2/groupid.ts
index 4b2be9f9e..fd7938264 100644
--- a/__fixtures__/outputv2/akash/deployment/v1beta2/groupid.ts
+++ b/__fixtures__/outputv2/akash/deployment/v1beta2/groupid.ts
@@ -8,7 +8,7 @@ export interface GroupID {
   dseq: Long;
   gseq: number;
 }
-export interface GroupIDProtoType {
+export interface GroupIDProtoMsg {
   typeUrl: "/akash.deployment.v1beta2.GroupID";
   value: Uint8Array;
 }
@@ -19,7 +19,7 @@ export interface GroupIDAmino {
   dseq: string;
   gseq: number;
 }
-export interface GroupIDAminoType {
+export interface GroupIDAminoMsg {
   type: "/akash.deployment.v1beta2.GroupID";
   value: GroupIDAmino;
 }
@@ -40,6 +40,8 @@ function createBaseGroupID(): GroupID {
 }
 
 export const GroupID = {
+  typeUrl: "/akash.deployment.v1beta2.GroupID",
+
   encode(message: GroupID, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.owner !== "") {
       writer.uint32(10).string(message.owner);
@@ -140,6 +142,25 @@ export const GroupID = {
     obj.dseq = message.dseq ? message.dseq.toString() : undefined;
     obj.gseq = message.gseq;
     return obj;
+  },
+
+  fromAminoMsg(object: GroupIDAminoMsg): GroupID {
+    return GroupID.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: GroupIDProtoMsg): GroupID {
+    return GroupID.decode(message.value);
+  },
+
+  toProto(message: GroupID): Uint8Array {
+    return GroupID.encode(message).finish();
+  },
+
+  toProtoMsg(message: GroupID): GroupIDProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta2.GroupID",
+      value: GroupID.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/akash/deployment/v1beta2/groupmsg.ts b/__fixtures__/outputv2/akash/deployment/v1beta2/groupmsg.ts
index 090f66d42..358060a95 100644
--- a/__fixtures__/outputv2/akash/deployment/v1beta2/groupmsg.ts
+++ b/__fixtures__/outputv2/akash/deployment/v1beta2/groupmsg.ts
@@ -7,7 +7,7 @@ export const protobufPackage = "akash.deployment.v1beta2";
 export interface MsgCloseGroup {
   id?: GroupID;
 }
-export interface MsgCloseGroupProtoType {
+export interface MsgCloseGroupProtoMsg {
   typeUrl: "/akash.deployment.v1beta2.MsgCloseGroup";
   value: Uint8Array;
 }
@@ -16,7 +16,7 @@ export interface MsgCloseGroupProtoType {
 export interface MsgCloseGroupAmino {
   id?: GroupIDAmino;
 }
-export interface MsgCloseGroupAminoType {
+export interface MsgCloseGroupAminoMsg {
   type: "/akash.deployment.v1beta2.MsgCloseGroup";
   value: MsgCloseGroupAmino;
 }
@@ -28,14 +28,14 @@ export interface MsgCloseGroupSDKType {
 
 /** MsgCloseGroupResponse defines the Msg/CloseGroup response type. */
 export interface MsgCloseGroupResponse {}
-export interface MsgCloseGroupResponseProtoType {
+export interface MsgCloseGroupResponseProtoMsg {
   typeUrl: "/akash.deployment.v1beta2.MsgCloseGroupResponse";
   value: Uint8Array;
 }
 
 /** MsgCloseGroupResponse defines the Msg/CloseGroup response type. */
 export interface MsgCloseGroupResponseAmino {}
-export interface MsgCloseGroupResponseAminoType {
+export interface MsgCloseGroupResponseAminoMsg {
   type: "/akash.deployment.v1beta2.MsgCloseGroupResponse";
   value: MsgCloseGroupResponseAmino;
 }
@@ -47,7 +47,7 @@ export interface MsgCloseGroupResponseSDKType {}
 export interface MsgPauseGroup {
   id?: GroupID;
 }
-export interface MsgPauseGroupProtoType {
+export interface MsgPauseGroupProtoMsg {
   typeUrl: "/akash.deployment.v1beta2.MsgPauseGroup";
   value: Uint8Array;
 }
@@ -56,7 +56,7 @@ export interface MsgPauseGroupProtoType {
 export interface MsgPauseGroupAmino {
   id?: GroupIDAmino;
 }
-export interface MsgPauseGroupAminoType {
+export interface MsgPauseGroupAminoMsg {
   type: "/akash.deployment.v1beta2.MsgPauseGroup";
   value: MsgPauseGroupAmino;
 }
@@ -68,14 +68,14 @@ export interface MsgPauseGroupSDKType {
 
 /** MsgPauseGroupResponse defines the Msg/PauseGroup response type. */
 export interface MsgPauseGroupResponse {}
-export interface MsgPauseGroupResponseProtoType {
+export interface MsgPauseGroupResponseProtoMsg {
   typeUrl: "/akash.deployment.v1beta2.MsgPauseGroupResponse";
   value: Uint8Array;
 }
 
 /** MsgPauseGroupResponse defines the Msg/PauseGroup response type. */
 export interface MsgPauseGroupResponseAmino {}
-export interface MsgPauseGroupResponseAminoType {
+export interface MsgPauseGroupResponseAminoMsg {
   type: "/akash.deployment.v1beta2.MsgPauseGroupResponse";
   value: MsgPauseGroupResponseAmino;
 }
@@ -87,7 +87,7 @@ export interface MsgPauseGroupResponseSDKType {}
 export interface MsgStartGroup {
   id?: GroupID;
 }
-export interface MsgStartGroupProtoType {
+export interface MsgStartGroupProtoMsg {
   typeUrl: "/akash.deployment.v1beta2.MsgStartGroup";
   value: Uint8Array;
 }
@@ -96,7 +96,7 @@ export interface MsgStartGroupProtoType {
 export interface MsgStartGroupAmino {
   id?: GroupIDAmino;
 }
-export interface MsgStartGroupAminoType {
+export interface MsgStartGroupAminoMsg {
   type: "/akash.deployment.v1beta2.MsgStartGroup";
   value: MsgStartGroupAmino;
 }
@@ -108,14 +108,14 @@ export interface MsgStartGroupSDKType {
 
 /** MsgStartGroupResponse defines the Msg/StartGroup response type. */
 export interface MsgStartGroupResponse {}
-export interface MsgStartGroupResponseProtoType {
+export interface MsgStartGroupResponseProtoMsg {
   typeUrl: "/akash.deployment.v1beta2.MsgStartGroupResponse";
   value: Uint8Array;
 }
 
 /** MsgStartGroupResponse defines the Msg/StartGroup response type. */
 export interface MsgStartGroupResponseAmino {}
-export interface MsgStartGroupResponseAminoType {
+export interface MsgStartGroupResponseAminoMsg {
   type: "/akash.deployment.v1beta2.MsgStartGroupResponse";
   value: MsgStartGroupResponseAmino;
 }
@@ -130,6 +130,8 @@ function createBaseMsgCloseGroup(): MsgCloseGroup {
 }
 
 export const MsgCloseGroup = {
+  typeUrl: "/akash.deployment.v1beta2.MsgCloseGroup",
+
   encode(message: MsgCloseGroup, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.id !== undefined) {
       GroupID.encode(message.id, writer.uint32(10).fork()).ldelim();
@@ -200,6 +202,25 @@ export const MsgCloseGroup = {
     const obj: any = {};
     obj.id = message.id ? GroupID.toAmino(message.id) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCloseGroupAminoMsg): MsgCloseGroup {
+    return MsgCloseGroup.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgCloseGroupProtoMsg): MsgCloseGroup {
+    return MsgCloseGroup.decode(message.value);
+  },
+
+  toProto(message: MsgCloseGroup): Uint8Array {
+    return MsgCloseGroup.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCloseGroup): MsgCloseGroupProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta2.MsgCloseGroup",
+      value: MsgCloseGroup.encode(message).finish()
+    };
   }
 
 };
@@ -209,6 +230,8 @@ function createBaseMsgCloseGroupResponse(): MsgCloseGroupResponse {
 }
 
 export const MsgCloseGroupResponse = {
+  typeUrl: "/akash.deployment.v1beta2.MsgCloseGroupResponse",
+
   encode(_: MsgCloseGroupResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -261,6 +284,25 @@ export const MsgCloseGroupResponse = {
   toAmino(_: MsgCloseGroupResponse): MsgCloseGroupResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCloseGroupResponseAminoMsg): MsgCloseGroupResponse {
+    return MsgCloseGroupResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgCloseGroupResponseProtoMsg): MsgCloseGroupResponse {
+    return MsgCloseGroupResponse.decode(message.value);
+  },
+
+  toProto(message: MsgCloseGroupResponse): Uint8Array {
+    return MsgCloseGroupResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCloseGroupResponse): MsgCloseGroupResponseProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta2.MsgCloseGroupResponse",
+      value: MsgCloseGroupResponse.encode(message).finish()
+    };
   }
 
 };
@@ -272,6 +314,8 @@ function createBaseMsgPauseGroup(): MsgPauseGroup {
 }
 
 export const MsgPauseGroup = {
+  typeUrl: "/akash.deployment.v1beta2.MsgPauseGroup",
+
   encode(message: MsgPauseGroup, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.id !== undefined) {
       GroupID.encode(message.id, writer.uint32(10).fork()).ldelim();
@@ -342,6 +386,25 @@ export const MsgPauseGroup = {
     const obj: any = {};
     obj.id = message.id ? GroupID.toAmino(message.id) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgPauseGroupAminoMsg): MsgPauseGroup {
+    return MsgPauseGroup.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgPauseGroupProtoMsg): MsgPauseGroup {
+    return MsgPauseGroup.decode(message.value);
+  },
+
+  toProto(message: MsgPauseGroup): Uint8Array {
+    return MsgPauseGroup.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgPauseGroup): MsgPauseGroupProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta2.MsgPauseGroup",
+      value: MsgPauseGroup.encode(message).finish()
+    };
   }
 
 };
@@ -351,6 +414,8 @@ function createBaseMsgPauseGroupResponse(): MsgPauseGroupResponse {
 }
 
 export const MsgPauseGroupResponse = {
+  typeUrl: "/akash.deployment.v1beta2.MsgPauseGroupResponse",
+
   encode(_: MsgPauseGroupResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -403,6 +468,25 @@ export const MsgPauseGroupResponse = {
   toAmino(_: MsgPauseGroupResponse): MsgPauseGroupResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgPauseGroupResponseAminoMsg): MsgPauseGroupResponse {
+    return MsgPauseGroupResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgPauseGroupResponseProtoMsg): MsgPauseGroupResponse {
+    return MsgPauseGroupResponse.decode(message.value);
+  },
+
+  toProto(message: MsgPauseGroupResponse): Uint8Array {
+    return MsgPauseGroupResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgPauseGroupResponse): MsgPauseGroupResponseProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta2.MsgPauseGroupResponse",
+      value: MsgPauseGroupResponse.encode(message).finish()
+    };
   }
 
 };
@@ -414,6 +498,8 @@ function createBaseMsgStartGroup(): MsgStartGroup {
 }
 
 export const MsgStartGroup = {
+  typeUrl: "/akash.deployment.v1beta2.MsgStartGroup",
+
   encode(message: MsgStartGroup, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.id !== undefined) {
       GroupID.encode(message.id, writer.uint32(10).fork()).ldelim();
@@ -484,6 +570,25 @@ export const MsgStartGroup = {
     const obj: any = {};
     obj.id = message.id ? GroupID.toAmino(message.id) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgStartGroupAminoMsg): MsgStartGroup {
+    return MsgStartGroup.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgStartGroupProtoMsg): MsgStartGroup {
+    return MsgStartGroup.decode(message.value);
+  },
+
+  toProto(message: MsgStartGroup): Uint8Array {
+    return MsgStartGroup.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgStartGroup): MsgStartGroupProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta2.MsgStartGroup",
+      value: MsgStartGroup.encode(message).finish()
+    };
   }
 
 };
@@ -493,6 +598,8 @@ function createBaseMsgStartGroupResponse(): MsgStartGroupResponse {
 }
 
 export const MsgStartGroupResponse = {
+  typeUrl: "/akash.deployment.v1beta2.MsgStartGroupResponse",
+
   encode(_: MsgStartGroupResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -545,6 +652,25 @@ export const MsgStartGroupResponse = {
   toAmino(_: MsgStartGroupResponse): MsgStartGroupResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgStartGroupResponseAminoMsg): MsgStartGroupResponse {
+    return MsgStartGroupResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgStartGroupResponseProtoMsg): MsgStartGroupResponse {
+    return MsgStartGroupResponse.decode(message.value);
+  },
+
+  toProto(message: MsgStartGroupResponse): Uint8Array {
+    return MsgStartGroupResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgStartGroupResponse): MsgStartGroupResponseProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta2.MsgStartGroupResponse",
+      value: MsgStartGroupResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/akash/deployment/v1beta2/groupspec.ts b/__fixtures__/outputv2/akash/deployment/v1beta2/groupspec.ts
index 35a7c54ec..d4a2f2af6 100644
--- a/__fixtures__/outputv2/akash/deployment/v1beta2/groupspec.ts
+++ b/__fixtures__/outputv2/akash/deployment/v1beta2/groupspec.ts
@@ -10,7 +10,7 @@ export interface GroupSpec {
   requirements?: PlacementRequirements;
   resources: Resource[];
 }
-export interface GroupSpecProtoType {
+export interface GroupSpecProtoMsg {
   typeUrl: "/akash.deployment.v1beta2.GroupSpec";
   value: Uint8Array;
 }
@@ -21,7 +21,7 @@ export interface GroupSpecAmino {
   requirements?: PlacementRequirementsAmino;
   resources: ResourceAmino[];
 }
-export interface GroupSpecAminoType {
+export interface GroupSpecAminoMsg {
   type: "/akash.deployment.v1beta2.GroupSpec";
   value: GroupSpecAmino;
 }
@@ -42,6 +42,8 @@ function createBaseGroupSpec(): GroupSpec {
 }
 
 export const GroupSpec = {
+  typeUrl: "/akash.deployment.v1beta2.GroupSpec",
+
   encode(message: GroupSpec, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -160,6 +162,25 @@ export const GroupSpec = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: GroupSpecAminoMsg): GroupSpec {
+    return GroupSpec.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: GroupSpecProtoMsg): GroupSpec {
+    return GroupSpec.decode(message.value);
+  },
+
+  toProto(message: GroupSpec): Uint8Array {
+    return GroupSpec.encode(message).finish();
+  },
+
+  toProtoMsg(message: GroupSpec): GroupSpecProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta2.GroupSpec",
+      value: GroupSpec.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/akash/deployment/v1beta2/params.ts b/__fixtures__/outputv2/akash/deployment/v1beta2/params.ts
index 1069304bc..57666bf8f 100644
--- a/__fixtures__/outputv2/akash/deployment/v1beta2/params.ts
+++ b/__fixtures__/outputv2/akash/deployment/v1beta2/params.ts
@@ -7,7 +7,7 @@ export const protobufPackage = "akash.deployment.v1beta2";
 export interface Params {
   deploymentMinDeposit?: Coin;
 }
-export interface ParamsProtoType {
+export interface ParamsProtoMsg {
   typeUrl: "/akash.deployment.v1beta2.Params";
   value: Uint8Array;
 }
@@ -16,7 +16,7 @@ export interface ParamsProtoType {
 export interface ParamsAmino {
   deployment_min_deposit?: CoinAmino;
 }
-export interface ParamsAminoType {
+export interface ParamsAminoMsg {
   type: "/akash.deployment.v1beta2.Params";
   value: ParamsAmino;
 }
@@ -33,6 +33,8 @@ function createBaseParams(): Params {
 }
 
 export const Params = {
+  typeUrl: "/akash.deployment.v1beta2.Params",
+
   encode(message: Params, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.deploymentMinDeposit !== undefined) {
       Coin.encode(message.deploymentMinDeposit, writer.uint32(10).fork()).ldelim();
@@ -103,6 +105,25 @@ export const Params = {
     const obj: any = {};
     obj.deployment_min_deposit = message.deploymentMinDeposit ? Coin.toAmino(message.deploymentMinDeposit) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ParamsAminoMsg): Params {
+    return Params.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ParamsProtoMsg): Params {
+    return Params.decode(message.value);
+  },
+
+  toProto(message: Params): Uint8Array {
+    return Params.encode(message).finish();
+  },
+
+  toProtoMsg(message: Params): ParamsProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta2.Params",
+      value: Params.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/akash/deployment/v1beta2/query.ts b/__fixtures__/outputv2/akash/deployment/v1beta2/query.ts
index 1c431ab01..8d1caa49a 100644
--- a/__fixtures__/outputv2/akash/deployment/v1beta2/query.ts
+++ b/__fixtures__/outputv2/akash/deployment/v1beta2/query.ts
@@ -12,7 +12,7 @@ export interface QueryDeploymentsRequest {
   filters?: DeploymentFilters;
   pagination?: PageRequest;
 }
-export interface QueryDeploymentsRequestProtoType {
+export interface QueryDeploymentsRequestProtoMsg {
   typeUrl: "/akash.deployment.v1beta2.QueryDeploymentsRequest";
   value: Uint8Array;
 }
@@ -22,7 +22,7 @@ export interface QueryDeploymentsRequestAmino {
   filters?: DeploymentFiltersAmino;
   pagination?: PageRequestAmino;
 }
-export interface QueryDeploymentsRequestAminoType {
+export interface QueryDeploymentsRequestAminoMsg {
   type: "/akash.deployment.v1beta2.QueryDeploymentsRequest";
   value: QueryDeploymentsRequestAmino;
 }
@@ -38,7 +38,7 @@ export interface QueryDeploymentsResponse {
   deployments: QueryDeploymentResponse[];
   pagination?: PageResponse;
 }
-export interface QueryDeploymentsResponseProtoType {
+export interface QueryDeploymentsResponseProtoMsg {
   typeUrl: "/akash.deployment.v1beta2.QueryDeploymentsResponse";
   value: Uint8Array;
 }
@@ -48,7 +48,7 @@ export interface QueryDeploymentsResponseAmino {
   deployments: QueryDeploymentResponseAmino[];
   pagination?: PageResponseAmino;
 }
-export interface QueryDeploymentsResponseAminoType {
+export interface QueryDeploymentsResponseAminoMsg {
   type: "/akash.deployment.v1beta2.QueryDeploymentsResponse";
   value: QueryDeploymentsResponseAmino;
 }
@@ -63,7 +63,7 @@ export interface QueryDeploymentsResponseSDKType {
 export interface QueryDeploymentRequest {
   id?: DeploymentID;
 }
-export interface QueryDeploymentRequestProtoType {
+export interface QueryDeploymentRequestProtoMsg {
   typeUrl: "/akash.deployment.v1beta2.QueryDeploymentRequest";
   value: Uint8Array;
 }
@@ -72,7 +72,7 @@ export interface QueryDeploymentRequestProtoType {
 export interface QueryDeploymentRequestAmino {
   id?: DeploymentIDAmino;
 }
-export interface QueryDeploymentRequestAminoType {
+export interface QueryDeploymentRequestAminoMsg {
   type: "/akash.deployment.v1beta2.QueryDeploymentRequest";
   value: QueryDeploymentRequestAmino;
 }
@@ -88,7 +88,7 @@ export interface QueryDeploymentResponse {
   groups: Group[];
   escrowAccount?: Account;
 }
-export interface QueryDeploymentResponseProtoType {
+export interface QueryDeploymentResponseProtoMsg {
   typeUrl: "/akash.deployment.v1beta2.QueryDeploymentResponse";
   value: Uint8Array;
 }
@@ -99,7 +99,7 @@ export interface QueryDeploymentResponseAmino {
   groups: GroupAmino[];
   escrow_account?: AccountAmino;
 }
-export interface QueryDeploymentResponseAminoType {
+export interface QueryDeploymentResponseAminoMsg {
   type: "/akash.deployment.v1beta2.QueryDeploymentResponse";
   value: QueryDeploymentResponseAmino;
 }
@@ -115,7 +115,7 @@ export interface QueryDeploymentResponseSDKType {
 export interface QueryGroupRequest {
   id?: GroupID;
 }
-export interface QueryGroupRequestProtoType {
+export interface QueryGroupRequestProtoMsg {
   typeUrl: "/akash.deployment.v1beta2.QueryGroupRequest";
   value: Uint8Array;
 }
@@ -124,7 +124,7 @@ export interface QueryGroupRequestProtoType {
 export interface QueryGroupRequestAmino {
   id?: GroupIDAmino;
 }
-export interface QueryGroupRequestAminoType {
+export interface QueryGroupRequestAminoMsg {
   type: "/akash.deployment.v1beta2.QueryGroupRequest";
   value: QueryGroupRequestAmino;
 }
@@ -138,7 +138,7 @@ export interface QueryGroupRequestSDKType {
 export interface QueryGroupResponse {
   group?: Group;
 }
-export interface QueryGroupResponseProtoType {
+export interface QueryGroupResponseProtoMsg {
   typeUrl: "/akash.deployment.v1beta2.QueryGroupResponse";
   value: Uint8Array;
 }
@@ -147,7 +147,7 @@ export interface QueryGroupResponseProtoType {
 export interface QueryGroupResponseAmino {
   group?: GroupAmino;
 }
-export interface QueryGroupResponseAminoType {
+export interface QueryGroupResponseAminoMsg {
   type: "/akash.deployment.v1beta2.QueryGroupResponse";
   value: QueryGroupResponseAmino;
 }
@@ -165,6 +165,8 @@ function createBaseQueryDeploymentsRequest(): QueryDeploymentsRequest {
 }
 
 export const QueryDeploymentsRequest = {
+  typeUrl: "/akash.deployment.v1beta2.QueryDeploymentsRequest",
+
   encode(message: QueryDeploymentsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.filters !== undefined) {
       DeploymentFilters.encode(message.filters, writer.uint32(10).fork()).ldelim();
@@ -250,6 +252,25 @@ export const QueryDeploymentsRequest = {
     obj.filters = message.filters ? DeploymentFilters.toAmino(message.filters) : undefined;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDeploymentsRequestAminoMsg): QueryDeploymentsRequest {
+    return QueryDeploymentsRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryDeploymentsRequestProtoMsg): QueryDeploymentsRequest {
+    return QueryDeploymentsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryDeploymentsRequest): Uint8Array {
+    return QueryDeploymentsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDeploymentsRequest): QueryDeploymentsRequestProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta2.QueryDeploymentsRequest",
+      value: QueryDeploymentsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -262,6 +283,8 @@ function createBaseQueryDeploymentsResponse(): QueryDeploymentsResponse {
 }
 
 export const QueryDeploymentsResponse = {
+  typeUrl: "/akash.deployment.v1beta2.QueryDeploymentsResponse",
+
   encode(message: QueryDeploymentsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.deployments) {
       QueryDeploymentResponse.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -365,6 +388,25 @@ export const QueryDeploymentsResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDeploymentsResponseAminoMsg): QueryDeploymentsResponse {
+    return QueryDeploymentsResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryDeploymentsResponseProtoMsg): QueryDeploymentsResponse {
+    return QueryDeploymentsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryDeploymentsResponse): Uint8Array {
+    return QueryDeploymentsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDeploymentsResponse): QueryDeploymentsResponseProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta2.QueryDeploymentsResponse",
+      value: QueryDeploymentsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -376,6 +418,8 @@ function createBaseQueryDeploymentRequest(): QueryDeploymentRequest {
 }
 
 export const QueryDeploymentRequest = {
+  typeUrl: "/akash.deployment.v1beta2.QueryDeploymentRequest",
+
   encode(message: QueryDeploymentRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.id !== undefined) {
       DeploymentID.encode(message.id, writer.uint32(10).fork()).ldelim();
@@ -446,6 +490,25 @@ export const QueryDeploymentRequest = {
     const obj: any = {};
     obj.id = message.id ? DeploymentID.toAmino(message.id) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDeploymentRequestAminoMsg): QueryDeploymentRequest {
+    return QueryDeploymentRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryDeploymentRequestProtoMsg): QueryDeploymentRequest {
+    return QueryDeploymentRequest.decode(message.value);
+  },
+
+  toProto(message: QueryDeploymentRequest): Uint8Array {
+    return QueryDeploymentRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDeploymentRequest): QueryDeploymentRequestProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta2.QueryDeploymentRequest",
+      value: QueryDeploymentRequest.encode(message).finish()
+    };
   }
 
 };
@@ -459,6 +522,8 @@ function createBaseQueryDeploymentResponse(): QueryDeploymentResponse {
 }
 
 export const QueryDeploymentResponse = {
+  typeUrl: "/akash.deployment.v1beta2.QueryDeploymentResponse",
+
   encode(message: QueryDeploymentResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.deployment !== undefined) {
       Deployment.encode(message.deployment, writer.uint32(10).fork()).ldelim();
@@ -577,6 +642,25 @@ export const QueryDeploymentResponse = {
 
     obj.escrow_account = message.escrowAccount ? Account.toAmino(message.escrowAccount) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDeploymentResponseAminoMsg): QueryDeploymentResponse {
+    return QueryDeploymentResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryDeploymentResponseProtoMsg): QueryDeploymentResponse {
+    return QueryDeploymentResponse.decode(message.value);
+  },
+
+  toProto(message: QueryDeploymentResponse): Uint8Array {
+    return QueryDeploymentResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDeploymentResponse): QueryDeploymentResponseProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta2.QueryDeploymentResponse",
+      value: QueryDeploymentResponse.encode(message).finish()
+    };
   }
 
 };
@@ -588,6 +672,8 @@ function createBaseQueryGroupRequest(): QueryGroupRequest {
 }
 
 export const QueryGroupRequest = {
+  typeUrl: "/akash.deployment.v1beta2.QueryGroupRequest",
+
   encode(message: QueryGroupRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.id !== undefined) {
       GroupID.encode(message.id, writer.uint32(10).fork()).ldelim();
@@ -658,6 +744,25 @@ export const QueryGroupRequest = {
     const obj: any = {};
     obj.id = message.id ? GroupID.toAmino(message.id) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryGroupRequestAminoMsg): QueryGroupRequest {
+    return QueryGroupRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryGroupRequestProtoMsg): QueryGroupRequest {
+    return QueryGroupRequest.decode(message.value);
+  },
+
+  toProto(message: QueryGroupRequest): Uint8Array {
+    return QueryGroupRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryGroupRequest): QueryGroupRequestProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta2.QueryGroupRequest",
+      value: QueryGroupRequest.encode(message).finish()
+    };
   }
 
 };
@@ -669,6 +774,8 @@ function createBaseQueryGroupResponse(): QueryGroupResponse {
 }
 
 export const QueryGroupResponse = {
+  typeUrl: "/akash.deployment.v1beta2.QueryGroupResponse",
+
   encode(message: QueryGroupResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.group !== undefined) {
       Group.encode(message.group, writer.uint32(10).fork()).ldelim();
@@ -739,6 +846,25 @@ export const QueryGroupResponse = {
     const obj: any = {};
     obj.group = message.group ? Group.toAmino(message.group) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryGroupResponseAminoMsg): QueryGroupResponse {
+    return QueryGroupResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryGroupResponseProtoMsg): QueryGroupResponse {
+    return QueryGroupResponse.decode(message.value);
+  },
+
+  toProto(message: QueryGroupResponse): Uint8Array {
+    return QueryGroupResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryGroupResponse): QueryGroupResponseProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta2.QueryGroupResponse",
+      value: QueryGroupResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/akash/deployment/v1beta2/resource.ts b/__fixtures__/outputv2/akash/deployment/v1beta2/resource.ts
index 164a26e38..c84342756 100644
--- a/__fixtures__/outputv2/akash/deployment/v1beta2/resource.ts
+++ b/__fixtures__/outputv2/akash/deployment/v1beta2/resource.ts
@@ -10,7 +10,7 @@ export interface Resource {
   count: number;
   price?: DecCoin;
 }
-export interface ResourceProtoType {
+export interface ResourceProtoMsg {
   typeUrl: "/akash.deployment.v1beta2.Resource";
   value: Uint8Array;
 }
@@ -21,7 +21,7 @@ export interface ResourceAmino {
   count: number;
   price?: DecCoinAmino;
 }
-export interface ResourceAminoType {
+export interface ResourceAminoMsg {
   type: "/akash.deployment.v1beta2.Resource";
   value: ResourceAmino;
 }
@@ -42,6 +42,8 @@ function createBaseResource(): Resource {
 }
 
 export const Resource = {
+  typeUrl: "/akash.deployment.v1beta2.Resource",
+
   encode(message: Resource, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.resources !== undefined) {
       ResourceUnits.encode(message.resources, writer.uint32(10).fork()).ldelim();
@@ -142,6 +144,25 @@ export const Resource = {
     obj.count = message.count;
     obj.price = message.price ? DecCoin.toAmino(message.price) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ResourceAminoMsg): Resource {
+    return Resource.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ResourceProtoMsg): Resource {
+    return Resource.decode(message.value);
+  },
+
+  toProto(message: Resource): Uint8Array {
+    return Resource.encode(message).finish();
+  },
+
+  toProtoMsg(message: Resource): ResourceProtoMsg {
+    return {
+      typeUrl: "/akash.deployment.v1beta2.Resource",
+      value: Resource.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/akash/escrow/v1beta1/genesis.ts b/__fixtures__/outputv2/akash/escrow/v1beta1/genesis.ts
index a5cf3b5c1..bfcf7bb07 100644
--- a/__fixtures__/outputv2/akash/escrow/v1beta1/genesis.ts
+++ b/__fixtures__/outputv2/akash/escrow/v1beta1/genesis.ts
@@ -8,7 +8,7 @@ export interface GenesisState {
   accounts: Account[];
   payments: Payment[];
 }
-export interface GenesisStateProtoType {
+export interface GenesisStateProtoMsg {
   typeUrl: "/akash.escrow.v1beta1.GenesisState";
   value: Uint8Array;
 }
@@ -18,7 +18,7 @@ export interface GenesisStateAmino {
   accounts: AccountAmino[];
   payments: PaymentAmino[];
 }
-export interface GenesisStateAminoType {
+export interface GenesisStateAminoMsg {
   type: "/akash.escrow.v1beta1.GenesisState";
   value: GenesisStateAmino;
 }
@@ -37,6 +37,8 @@ function createBaseGenesisState(): GenesisState {
 }
 
 export const GenesisState = {
+  typeUrl: "/akash.escrow.v1beta1.GenesisState",
+
   encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.accounts) {
       Account.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -155,6 +157,25 @@ export const GenesisState = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisStateAminoMsg): GenesisState {
+    return GenesisState.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: GenesisStateProtoMsg): GenesisState {
+    return GenesisState.decode(message.value);
+  },
+
+  toProto(message: GenesisState): Uint8Array {
+    return GenesisState.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisState): GenesisStateProtoMsg {
+    return {
+      typeUrl: "/akash.escrow.v1beta1.GenesisState",
+      value: GenesisState.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/akash/escrow/v1beta1/query.ts b/__fixtures__/outputv2/akash/escrow/v1beta1/query.ts
index d200ccaa8..e70ad198d 100644
--- a/__fixtures__/outputv2/akash/escrow/v1beta1/query.ts
+++ b/__fixtures__/outputv2/akash/escrow/v1beta1/query.ts
@@ -12,7 +12,7 @@ export interface QueryAccountsRequest {
   state: string;
   pagination?: PageRequest;
 }
-export interface QueryAccountsRequestProtoType {
+export interface QueryAccountsRequestProtoMsg {
   typeUrl: "/akash.escrow.v1beta1.QueryAccountsRequest";
   value: Uint8Array;
 }
@@ -25,7 +25,7 @@ export interface QueryAccountsRequestAmino {
   state: string;
   pagination?: PageRequestAmino;
 }
-export interface QueryAccountsRequestAminoType {
+export interface QueryAccountsRequestAminoMsg {
   type: "/akash.escrow.v1beta1.QueryAccountsRequest";
   value: QueryAccountsRequestAmino;
 }
@@ -44,7 +44,7 @@ export interface QueryAccountsResponse {
   accounts: Account[];
   pagination?: PageResponse;
 }
-export interface QueryAccountsResponseProtoType {
+export interface QueryAccountsResponseProtoMsg {
   typeUrl: "/akash.escrow.v1beta1.QueryAccountsResponse";
   value: Uint8Array;
 }
@@ -54,7 +54,7 @@ export interface QueryAccountsResponseAmino {
   accounts: AccountAmino[];
   pagination?: PageResponseAmino;
 }
-export interface QueryAccountsResponseAminoType {
+export interface QueryAccountsResponseAminoMsg {
   type: "/akash.escrow.v1beta1.QueryAccountsResponse";
   value: QueryAccountsResponseAmino;
 }
@@ -74,7 +74,7 @@ export interface QueryPaymentsRequest {
   state: string;
   pagination?: PageRequest;
 }
-export interface QueryPaymentsRequestProtoType {
+export interface QueryPaymentsRequestProtoMsg {
   typeUrl: "/akash.escrow.v1beta1.QueryPaymentsRequest";
   value: Uint8Array;
 }
@@ -88,7 +88,7 @@ export interface QueryPaymentsRequestAmino {
   state: string;
   pagination?: PageRequestAmino;
 }
-export interface QueryPaymentsRequestAminoType {
+export interface QueryPaymentsRequestAminoMsg {
   type: "/akash.escrow.v1beta1.QueryPaymentsRequest";
   value: QueryPaymentsRequestAmino;
 }
@@ -108,7 +108,7 @@ export interface QueryPaymentsResponse {
   payments: Payment[];
   pagination?: PageResponse;
 }
-export interface QueryPaymentsResponseProtoType {
+export interface QueryPaymentsResponseProtoMsg {
   typeUrl: "/akash.escrow.v1beta1.QueryPaymentsResponse";
   value: Uint8Array;
 }
@@ -118,7 +118,7 @@ export interface QueryPaymentsResponseAmino {
   payments: PaymentAmino[];
   pagination?: PageResponseAmino;
 }
-export interface QueryPaymentsResponseAminoType {
+export interface QueryPaymentsResponseAminoMsg {
   type: "/akash.escrow.v1beta1.QueryPaymentsResponse";
   value: QueryPaymentsResponseAmino;
 }
@@ -140,6 +140,8 @@ function createBaseQueryAccountsRequest(): QueryAccountsRequest {
 }
 
 export const QueryAccountsRequest = {
+  typeUrl: "/akash.escrow.v1beta1.QueryAccountsRequest",
+
   encode(message: QueryAccountsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.scope !== "") {
       writer.uint32(10).string(message.scope);
@@ -270,6 +272,25 @@ export const QueryAccountsRequest = {
     obj.state = message.state;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryAccountsRequestAminoMsg): QueryAccountsRequest {
+    return QueryAccountsRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryAccountsRequestProtoMsg): QueryAccountsRequest {
+    return QueryAccountsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryAccountsRequest): Uint8Array {
+    return QueryAccountsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryAccountsRequest): QueryAccountsRequestProtoMsg {
+    return {
+      typeUrl: "/akash.escrow.v1beta1.QueryAccountsRequest",
+      value: QueryAccountsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -282,6 +303,8 @@ function createBaseQueryAccountsResponse(): QueryAccountsResponse {
 }
 
 export const QueryAccountsResponse = {
+  typeUrl: "/akash.escrow.v1beta1.QueryAccountsResponse",
+
   encode(message: QueryAccountsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.accounts) {
       Account.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -385,6 +408,25 @@ export const QueryAccountsResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryAccountsResponseAminoMsg): QueryAccountsResponse {
+    return QueryAccountsResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryAccountsResponseProtoMsg): QueryAccountsResponse {
+    return QueryAccountsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryAccountsResponse): Uint8Array {
+    return QueryAccountsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryAccountsResponse): QueryAccountsResponseProtoMsg {
+    return {
+      typeUrl: "/akash.escrow.v1beta1.QueryAccountsResponse",
+      value: QueryAccountsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -401,6 +443,8 @@ function createBaseQueryPaymentsRequest(): QueryPaymentsRequest {
 }
 
 export const QueryPaymentsRequest = {
+  typeUrl: "/akash.escrow.v1beta1.QueryPaymentsRequest",
+
   encode(message: QueryPaymentsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.scope !== "") {
       writer.uint32(10).string(message.scope);
@@ -546,6 +590,25 @@ export const QueryPaymentsRequest = {
     obj.state = message.state;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryPaymentsRequestAminoMsg): QueryPaymentsRequest {
+    return QueryPaymentsRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryPaymentsRequestProtoMsg): QueryPaymentsRequest {
+    return QueryPaymentsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryPaymentsRequest): Uint8Array {
+    return QueryPaymentsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryPaymentsRequest): QueryPaymentsRequestProtoMsg {
+    return {
+      typeUrl: "/akash.escrow.v1beta1.QueryPaymentsRequest",
+      value: QueryPaymentsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -558,6 +621,8 @@ function createBaseQueryPaymentsResponse(): QueryPaymentsResponse {
 }
 
 export const QueryPaymentsResponse = {
+  typeUrl: "/akash.escrow.v1beta1.QueryPaymentsResponse",
+
   encode(message: QueryPaymentsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.payments) {
       Payment.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -661,6 +726,25 @@ export const QueryPaymentsResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryPaymentsResponseAminoMsg): QueryPaymentsResponse {
+    return QueryPaymentsResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryPaymentsResponseProtoMsg): QueryPaymentsResponse {
+    return QueryPaymentsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryPaymentsResponse): Uint8Array {
+    return QueryPaymentsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryPaymentsResponse): QueryPaymentsResponseProtoMsg {
+    return {
+      typeUrl: "/akash.escrow.v1beta1.QueryPaymentsResponse",
+      value: QueryPaymentsResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/akash/escrow/v1beta1/types.ts b/__fixtures__/outputv2/akash/escrow/v1beta1/types.ts
index ff5ce0693..479237241 100644
--- a/__fixtures__/outputv2/akash/escrow/v1beta1/types.ts
+++ b/__fixtures__/outputv2/akash/escrow/v1beta1/types.ts
@@ -130,7 +130,7 @@ export interface AccountID {
   scope: string;
   xid: string;
 }
-export interface AccountIDProtoType {
+export interface AccountIDProtoMsg {
   typeUrl: "/akash.escrow.v1beta1.AccountID";
   value: Uint8Array;
 }
@@ -140,7 +140,7 @@ export interface AccountIDAmino {
   scope: string;
   xid: string;
 }
-export interface AccountIDAminoType {
+export interface AccountIDAminoMsg {
   type: "/akash.escrow.v1beta1.AccountID";
   value: AccountIDAmino;
 }
@@ -171,7 +171,7 @@ export interface Account {
   /** block height at which this account was last settled */
   settledAt: Long;
 }
-export interface AccountProtoType {
+export interface AccountProtoMsg {
   typeUrl: "/akash.escrow.v1beta1.Account";
   value: Uint8Array;
 }
@@ -196,7 +196,7 @@ export interface AccountAmino {
   /** block height at which this account was last settled */
   settled_at: string;
 }
-export interface AccountAminoType {
+export interface AccountAminoMsg {
   type: "/akash.escrow.v1beta1.Account";
   value: AccountAmino;
 }
@@ -221,7 +221,7 @@ export interface Payment {
   balance?: Coin;
   withdrawn?: Coin;
 }
-export interface PaymentProtoType {
+export interface PaymentProtoMsg {
   typeUrl: "/akash.escrow.v1beta1.Payment";
   value: Uint8Array;
 }
@@ -236,7 +236,7 @@ export interface PaymentAmino {
   balance?: CoinAmino;
   withdrawn?: CoinAmino;
 }
-export interface PaymentAminoType {
+export interface PaymentAminoMsg {
   type: "/akash.escrow.v1beta1.Payment";
   value: PaymentAmino;
 }
@@ -260,6 +260,8 @@ function createBaseAccountID(): AccountID {
 }
 
 export const AccountID = {
+  typeUrl: "/akash.escrow.v1beta1.AccountID",
+
   encode(message: AccountID, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.scope !== "") {
       writer.uint32(10).string(message.scope);
@@ -345,6 +347,25 @@ export const AccountID = {
     obj.scope = message.scope;
     obj.xid = message.xid;
     return obj;
+  },
+
+  fromAminoMsg(object: AccountIDAminoMsg): AccountID {
+    return AccountID.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: AccountIDProtoMsg): AccountID {
+    return AccountID.decode(message.value);
+  },
+
+  toProto(message: AccountID): Uint8Array {
+    return AccountID.encode(message).finish();
+  },
+
+  toProtoMsg(message: AccountID): AccountIDProtoMsg {
+    return {
+      typeUrl: "/akash.escrow.v1beta1.AccountID",
+      value: AccountID.encode(message).finish()
+    };
   }
 
 };
@@ -361,6 +382,8 @@ function createBaseAccount(): Account {
 }
 
 export const Account = {
+  typeUrl: "/akash.escrow.v1beta1.Account",
+
   encode(message: Account, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.id !== undefined) {
       AccountID.encode(message.id, writer.uint32(10).fork()).ldelim();
@@ -506,6 +529,25 @@ export const Account = {
     obj.transferred = message.transferred ? Coin.toAmino(message.transferred) : undefined;
     obj.settled_at = message.settledAt ? message.settledAt.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: AccountAminoMsg): Account {
+    return Account.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: AccountProtoMsg): Account {
+    return Account.decode(message.value);
+  },
+
+  toProto(message: Account): Uint8Array {
+    return Account.encode(message).finish();
+  },
+
+  toProtoMsg(message: Account): AccountProtoMsg {
+    return {
+      typeUrl: "/akash.escrow.v1beta1.Account",
+      value: Account.encode(message).finish()
+    };
   }
 
 };
@@ -523,6 +565,8 @@ function createBasePayment(): Payment {
 }
 
 export const Payment = {
+  typeUrl: "/akash.escrow.v1beta1.Payment",
+
   encode(message: Payment, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.accountId !== undefined) {
       AccountID.encode(message.accountId, writer.uint32(10).fork()).ldelim();
@@ -683,6 +727,25 @@ export const Payment = {
     obj.balance = message.balance ? Coin.toAmino(message.balance) : undefined;
     obj.withdrawn = message.withdrawn ? Coin.toAmino(message.withdrawn) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: PaymentAminoMsg): Payment {
+    return Payment.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: PaymentProtoMsg): Payment {
+    return Payment.decode(message.value);
+  },
+
+  toProto(message: Payment): Uint8Array {
+    return Payment.encode(message).finish();
+  },
+
+  toProtoMsg(message: Payment): PaymentProtoMsg {
+    return {
+      typeUrl: "/akash.escrow.v1beta1.Payment",
+      value: Payment.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/akash/escrow/v1beta2/genesis.ts b/__fixtures__/outputv2/akash/escrow/v1beta2/genesis.ts
index fa2761b0c..90e995347 100644
--- a/__fixtures__/outputv2/akash/escrow/v1beta2/genesis.ts
+++ b/__fixtures__/outputv2/akash/escrow/v1beta2/genesis.ts
@@ -8,7 +8,7 @@ export interface GenesisState {
   accounts: Account[];
   payments: FractionalPayment[];
 }
-export interface GenesisStateProtoType {
+export interface GenesisStateProtoMsg {
   typeUrl: "/akash.escrow.v1beta2.GenesisState";
   value: Uint8Array;
 }
@@ -18,7 +18,7 @@ export interface GenesisStateAmino {
   accounts: AccountAmino[];
   payments: FractionalPaymentAmino[];
 }
-export interface GenesisStateAminoType {
+export interface GenesisStateAminoMsg {
   type: "/akash.escrow.v1beta2.GenesisState";
   value: GenesisStateAmino;
 }
@@ -37,6 +37,8 @@ function createBaseGenesisState(): GenesisState {
 }
 
 export const GenesisState = {
+  typeUrl: "/akash.escrow.v1beta2.GenesisState",
+
   encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.accounts) {
       Account.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -155,6 +157,25 @@ export const GenesisState = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisStateAminoMsg): GenesisState {
+    return GenesisState.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: GenesisStateProtoMsg): GenesisState {
+    return GenesisState.decode(message.value);
+  },
+
+  toProto(message: GenesisState): Uint8Array {
+    return GenesisState.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisState): GenesisStateProtoMsg {
+    return {
+      typeUrl: "/akash.escrow.v1beta2.GenesisState",
+      value: GenesisState.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/akash/escrow/v1beta2/query.ts b/__fixtures__/outputv2/akash/escrow/v1beta2/query.ts
index 6367b7e9c..fc1cc45b9 100644
--- a/__fixtures__/outputv2/akash/escrow/v1beta2/query.ts
+++ b/__fixtures__/outputv2/akash/escrow/v1beta2/query.ts
@@ -12,7 +12,7 @@ export interface QueryAccountsRequest {
   state: string;
   pagination?: PageRequest;
 }
-export interface QueryAccountsRequestProtoType {
+export interface QueryAccountsRequestProtoMsg {
   typeUrl: "/akash.escrow.v1beta2.QueryAccountsRequest";
   value: Uint8Array;
 }
@@ -25,7 +25,7 @@ export interface QueryAccountsRequestAmino {
   state: string;
   pagination?: PageRequestAmino;
 }
-export interface QueryAccountsRequestAminoType {
+export interface QueryAccountsRequestAminoMsg {
   type: "/akash.escrow.v1beta2.QueryAccountsRequest";
   value: QueryAccountsRequestAmino;
 }
@@ -44,7 +44,7 @@ export interface QueryAccountsResponse {
   accounts: Account[];
   pagination?: PageResponse;
 }
-export interface QueryAccountsResponseProtoType {
+export interface QueryAccountsResponseProtoMsg {
   typeUrl: "/akash.escrow.v1beta2.QueryAccountsResponse";
   value: Uint8Array;
 }
@@ -54,7 +54,7 @@ export interface QueryAccountsResponseAmino {
   accounts: AccountAmino[];
   pagination?: PageResponseAmino;
 }
-export interface QueryAccountsResponseAminoType {
+export interface QueryAccountsResponseAminoMsg {
   type: "/akash.escrow.v1beta2.QueryAccountsResponse";
   value: QueryAccountsResponseAmino;
 }
@@ -74,7 +74,7 @@ export interface QueryPaymentsRequest {
   state: string;
   pagination?: PageRequest;
 }
-export interface QueryPaymentsRequestProtoType {
+export interface QueryPaymentsRequestProtoMsg {
   typeUrl: "/akash.escrow.v1beta2.QueryPaymentsRequest";
   value: Uint8Array;
 }
@@ -88,7 +88,7 @@ export interface QueryPaymentsRequestAmino {
   state: string;
   pagination?: PageRequestAmino;
 }
-export interface QueryPaymentsRequestAminoType {
+export interface QueryPaymentsRequestAminoMsg {
   type: "/akash.escrow.v1beta2.QueryPaymentsRequest";
   value: QueryPaymentsRequestAmino;
 }
@@ -108,7 +108,7 @@ export interface QueryPaymentsResponse {
   payments: FractionalPayment[];
   pagination?: PageResponse;
 }
-export interface QueryPaymentsResponseProtoType {
+export interface QueryPaymentsResponseProtoMsg {
   typeUrl: "/akash.escrow.v1beta2.QueryPaymentsResponse";
   value: Uint8Array;
 }
@@ -118,7 +118,7 @@ export interface QueryPaymentsResponseAmino {
   payments: FractionalPaymentAmino[];
   pagination?: PageResponseAmino;
 }
-export interface QueryPaymentsResponseAminoType {
+export interface QueryPaymentsResponseAminoMsg {
   type: "/akash.escrow.v1beta2.QueryPaymentsResponse";
   value: QueryPaymentsResponseAmino;
 }
@@ -140,6 +140,8 @@ function createBaseQueryAccountsRequest(): QueryAccountsRequest {
 }
 
 export const QueryAccountsRequest = {
+  typeUrl: "/akash.escrow.v1beta2.QueryAccountsRequest",
+
   encode(message: QueryAccountsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.scope !== "") {
       writer.uint32(10).string(message.scope);
@@ -270,6 +272,25 @@ export const QueryAccountsRequest = {
     obj.state = message.state;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryAccountsRequestAminoMsg): QueryAccountsRequest {
+    return QueryAccountsRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryAccountsRequestProtoMsg): QueryAccountsRequest {
+    return QueryAccountsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryAccountsRequest): Uint8Array {
+    return QueryAccountsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryAccountsRequest): QueryAccountsRequestProtoMsg {
+    return {
+      typeUrl: "/akash.escrow.v1beta2.QueryAccountsRequest",
+      value: QueryAccountsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -282,6 +303,8 @@ function createBaseQueryAccountsResponse(): QueryAccountsResponse {
 }
 
 export const QueryAccountsResponse = {
+  typeUrl: "/akash.escrow.v1beta2.QueryAccountsResponse",
+
   encode(message: QueryAccountsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.accounts) {
       Account.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -385,6 +408,25 @@ export const QueryAccountsResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryAccountsResponseAminoMsg): QueryAccountsResponse {
+    return QueryAccountsResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryAccountsResponseProtoMsg): QueryAccountsResponse {
+    return QueryAccountsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryAccountsResponse): Uint8Array {
+    return QueryAccountsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryAccountsResponse): QueryAccountsResponseProtoMsg {
+    return {
+      typeUrl: "/akash.escrow.v1beta2.QueryAccountsResponse",
+      value: QueryAccountsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -401,6 +443,8 @@ function createBaseQueryPaymentsRequest(): QueryPaymentsRequest {
 }
 
 export const QueryPaymentsRequest = {
+  typeUrl: "/akash.escrow.v1beta2.QueryPaymentsRequest",
+
   encode(message: QueryPaymentsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.scope !== "") {
       writer.uint32(10).string(message.scope);
@@ -546,6 +590,25 @@ export const QueryPaymentsRequest = {
     obj.state = message.state;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryPaymentsRequestAminoMsg): QueryPaymentsRequest {
+    return QueryPaymentsRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryPaymentsRequestProtoMsg): QueryPaymentsRequest {
+    return QueryPaymentsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryPaymentsRequest): Uint8Array {
+    return QueryPaymentsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryPaymentsRequest): QueryPaymentsRequestProtoMsg {
+    return {
+      typeUrl: "/akash.escrow.v1beta2.QueryPaymentsRequest",
+      value: QueryPaymentsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -558,6 +621,8 @@ function createBaseQueryPaymentsResponse(): QueryPaymentsResponse {
 }
 
 export const QueryPaymentsResponse = {
+  typeUrl: "/akash.escrow.v1beta2.QueryPaymentsResponse",
+
   encode(message: QueryPaymentsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.payments) {
       FractionalPayment.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -661,6 +726,25 @@ export const QueryPaymentsResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryPaymentsResponseAminoMsg): QueryPaymentsResponse {
+    return QueryPaymentsResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryPaymentsResponseProtoMsg): QueryPaymentsResponse {
+    return QueryPaymentsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryPaymentsResponse): Uint8Array {
+    return QueryPaymentsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryPaymentsResponse): QueryPaymentsResponseProtoMsg {
+    return {
+      typeUrl: "/akash.escrow.v1beta2.QueryPaymentsResponse",
+      value: QueryPaymentsResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/akash/escrow/v1beta2/types.ts b/__fixtures__/outputv2/akash/escrow/v1beta2/types.ts
index b38596123..0237d2119 100644
--- a/__fixtures__/outputv2/akash/escrow/v1beta2/types.ts
+++ b/__fixtures__/outputv2/akash/escrow/v1beta2/types.ts
@@ -130,7 +130,7 @@ export interface AccountID {
   scope: string;
   xid: string;
 }
-export interface AccountIDProtoType {
+export interface AccountIDProtoMsg {
   typeUrl: "/akash.escrow.v1beta2.AccountID";
   value: Uint8Array;
 }
@@ -140,7 +140,7 @@ export interface AccountIDAmino {
   scope: string;
   xid: string;
 }
-export interface AccountIDAminoType {
+export interface AccountIDAminoMsg {
   type: "/akash.escrow.v1beta2.AccountID";
   value: AccountIDAmino;
 }
@@ -184,7 +184,7 @@ export interface Account {
    */
   funds?: DecCoin;
 }
-export interface AccountProtoType {
+export interface AccountProtoMsg {
   typeUrl: "/akash.escrow.v1beta2.Account";
   value: Uint8Array;
 }
@@ -222,7 +222,7 @@ export interface AccountAmino {
    */
   funds?: DecCoinAmino;
 }
-export interface AccountAminoType {
+export interface AccountAminoMsg {
   type: "/akash.escrow.v1beta2.Account";
   value: AccountAmino;
 }
@@ -249,7 +249,7 @@ export interface FractionalPayment {
   balance?: DecCoin;
   withdrawn?: Coin;
 }
-export interface FractionalPaymentProtoType {
+export interface FractionalPaymentProtoMsg {
   typeUrl: "/akash.escrow.v1beta2.FractionalPayment";
   value: Uint8Array;
 }
@@ -264,7 +264,7 @@ export interface FractionalPaymentAmino {
   balance?: DecCoinAmino;
   withdrawn?: CoinAmino;
 }
-export interface FractionalPaymentAminoType {
+export interface FractionalPaymentAminoMsg {
   type: "/akash.escrow.v1beta2.FractionalPayment";
   value: FractionalPaymentAmino;
 }
@@ -288,6 +288,8 @@ function createBaseAccountID(): AccountID {
 }
 
 export const AccountID = {
+  typeUrl: "/akash.escrow.v1beta2.AccountID",
+
   encode(message: AccountID, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.scope !== "") {
       writer.uint32(10).string(message.scope);
@@ -373,6 +375,25 @@ export const AccountID = {
     obj.scope = message.scope;
     obj.xid = message.xid;
     return obj;
+  },
+
+  fromAminoMsg(object: AccountIDAminoMsg): AccountID {
+    return AccountID.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: AccountIDProtoMsg): AccountID {
+    return AccountID.decode(message.value);
+  },
+
+  toProto(message: AccountID): Uint8Array {
+    return AccountID.encode(message).finish();
+  },
+
+  toProtoMsg(message: AccountID): AccountIDProtoMsg {
+    return {
+      typeUrl: "/akash.escrow.v1beta2.AccountID",
+      value: AccountID.encode(message).finish()
+    };
   }
 
 };
@@ -391,6 +412,8 @@ function createBaseAccount(): Account {
 }
 
 export const Account = {
+  typeUrl: "/akash.escrow.v1beta2.Account",
+
   encode(message: Account, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.id !== undefined) {
       AccountID.encode(message.id, writer.uint32(10).fork()).ldelim();
@@ -566,6 +589,25 @@ export const Account = {
     obj.depositor = message.depositor;
     obj.funds = message.funds ? DecCoin.toAmino(message.funds) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: AccountAminoMsg): Account {
+    return Account.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: AccountProtoMsg): Account {
+    return Account.decode(message.value);
+  },
+
+  toProto(message: Account): Uint8Array {
+    return Account.encode(message).finish();
+  },
+
+  toProtoMsg(message: Account): AccountProtoMsg {
+    return {
+      typeUrl: "/akash.escrow.v1beta2.Account",
+      value: Account.encode(message).finish()
+    };
   }
 
 };
@@ -583,6 +625,8 @@ function createBaseFractionalPayment(): FractionalPayment {
 }
 
 export const FractionalPayment = {
+  typeUrl: "/akash.escrow.v1beta2.FractionalPayment",
+
   encode(message: FractionalPayment, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.accountId !== undefined) {
       AccountID.encode(message.accountId, writer.uint32(10).fork()).ldelim();
@@ -743,6 +787,25 @@ export const FractionalPayment = {
     obj.balance = message.balance ? DecCoin.toAmino(message.balance) : undefined;
     obj.withdrawn = message.withdrawn ? Coin.toAmino(message.withdrawn) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: FractionalPaymentAminoMsg): FractionalPayment {
+    return FractionalPayment.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: FractionalPaymentProtoMsg): FractionalPayment {
+    return FractionalPayment.decode(message.value);
+  },
+
+  toProto(message: FractionalPayment): Uint8Array {
+    return FractionalPayment.encode(message).finish();
+  },
+
+  toProtoMsg(message: FractionalPayment): FractionalPaymentProtoMsg {
+    return {
+      typeUrl: "/akash.escrow.v1beta2.FractionalPayment",
+      value: FractionalPayment.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/akash/inflation/v1beta2/genesis.ts b/__fixtures__/outputv2/akash/inflation/v1beta2/genesis.ts
index 7c9c779c1..6a6b33d94 100644
--- a/__fixtures__/outputv2/akash/inflation/v1beta2/genesis.ts
+++ b/__fixtures__/outputv2/akash/inflation/v1beta2/genesis.ts
@@ -7,7 +7,7 @@ export const protobufPackage = "akash.inflation.v1beta2";
 export interface GenesisState {
   params?: Params;
 }
-export interface GenesisStateProtoType {
+export interface GenesisStateProtoMsg {
   typeUrl: "/akash.inflation.v1beta2.GenesisState";
   value: Uint8Array;
 }
@@ -16,7 +16,7 @@ export interface GenesisStateProtoType {
 export interface GenesisStateAmino {
   params?: ParamsAmino;
 }
-export interface GenesisStateAminoType {
+export interface GenesisStateAminoMsg {
   type: "/akash.inflation.v1beta2.GenesisState";
   value: GenesisStateAmino;
 }
@@ -33,6 +33,8 @@ function createBaseGenesisState(): GenesisState {
 }
 
 export const GenesisState = {
+  typeUrl: "/akash.inflation.v1beta2.GenesisState",
+
   encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.params !== undefined) {
       Params.encode(message.params, writer.uint32(10).fork()).ldelim();
@@ -103,6 +105,25 @@ export const GenesisState = {
     const obj: any = {};
     obj.params = message.params ? Params.toAmino(message.params) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisStateAminoMsg): GenesisState {
+    return GenesisState.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: GenesisStateProtoMsg): GenesisState {
+    return GenesisState.decode(message.value);
+  },
+
+  toProto(message: GenesisState): Uint8Array {
+    return GenesisState.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisState): GenesisStateProtoMsg {
+    return {
+      typeUrl: "/akash.inflation.v1beta2.GenesisState",
+      value: GenesisState.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/akash/inflation/v1beta2/params.ts b/__fixtures__/outputv2/akash/inflation/v1beta2/params.ts
index 641ea8bc6..97683e988 100644
--- a/__fixtures__/outputv2/akash/inflation/v1beta2/params.ts
+++ b/__fixtures__/outputv2/akash/inflation/v1beta2/params.ts
@@ -19,7 +19,7 @@ export interface Params {
    */
   variance: string;
 }
-export interface ParamsProtoType {
+export interface ParamsProtoMsg {
   typeUrl: "/akash.inflation.v1beta2.Params";
   value: Uint8Array;
 }
@@ -41,7 +41,7 @@ export interface ParamsAmino {
    */
   variance: string;
 }
-export interface ParamsAminoType {
+export interface ParamsAminoMsg {
   type: "/akash.inflation.v1beta2.Params";
   value: ParamsAmino;
 }
@@ -62,6 +62,8 @@ function createBaseParams(): Params {
 }
 
 export const Params = {
+  typeUrl: "/akash.inflation.v1beta2.Params",
+
   encode(message: Params, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.inflationDecayFactor !== "") {
       writer.uint32(10).string(message.inflationDecayFactor);
@@ -162,6 +164,25 @@ export const Params = {
     obj.initial_inflation = message.initialInflation;
     obj.variance = message.variance;
     return obj;
+  },
+
+  fromAminoMsg(object: ParamsAminoMsg): Params {
+    return Params.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ParamsProtoMsg): Params {
+    return Params.decode(message.value);
+  },
+
+  toProto(message: Params): Uint8Array {
+    return Params.encode(message).finish();
+  },
+
+  toProtoMsg(message: Params): ParamsProtoMsg {
+    return {
+      typeUrl: "/akash.inflation.v1beta2.Params",
+      value: Params.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/akash/market/v1beta2/bid.ts b/__fixtures__/outputv2/akash/market/v1beta2/bid.ts
index 20dc2e41a..927d5b3de 100644
--- a/__fixtures__/outputv2/akash/market/v1beta2/bid.ts
+++ b/__fixtures__/outputv2/akash/market/v1beta2/bid.ts
@@ -82,7 +82,7 @@ export interface MsgCreateBid {
   price?: DecCoin;
   deposit?: Coin;
 }
-export interface MsgCreateBidProtoType {
+export interface MsgCreateBidProtoMsg {
   typeUrl: "/akash.market.v1beta2.MsgCreateBid";
   value: Uint8Array;
 }
@@ -94,7 +94,7 @@ export interface MsgCreateBidAmino {
   price?: DecCoinAmino;
   deposit?: CoinAmino;
 }
-export interface MsgCreateBidAminoType {
+export interface MsgCreateBidAminoMsg {
   type: "/akash.market.v1beta2.MsgCreateBid";
   value: MsgCreateBidAmino;
 }
@@ -109,14 +109,14 @@ export interface MsgCreateBidSDKType {
 
 /** MsgCreateBidResponse defines the Msg/CreateBid response type. */
 export interface MsgCreateBidResponse {}
-export interface MsgCreateBidResponseProtoType {
+export interface MsgCreateBidResponseProtoMsg {
   typeUrl: "/akash.market.v1beta2.MsgCreateBidResponse";
   value: Uint8Array;
 }
 
 /** MsgCreateBidResponse defines the Msg/CreateBid response type. */
 export interface MsgCreateBidResponseAmino {}
-export interface MsgCreateBidResponseAminoType {
+export interface MsgCreateBidResponseAminoMsg {
   type: "/akash.market.v1beta2.MsgCreateBidResponse";
   value: MsgCreateBidResponseAmino;
 }
@@ -128,7 +128,7 @@ export interface MsgCreateBidResponseSDKType {}
 export interface MsgCloseBid {
   bidId?: BidID;
 }
-export interface MsgCloseBidProtoType {
+export interface MsgCloseBidProtoMsg {
   typeUrl: "/akash.market.v1beta2.MsgCloseBid";
   value: Uint8Array;
 }
@@ -137,7 +137,7 @@ export interface MsgCloseBidProtoType {
 export interface MsgCloseBidAmino {
   bid_id?: BidIDAmino;
 }
-export interface MsgCloseBidAminoType {
+export interface MsgCloseBidAminoMsg {
   type: "/akash.market.v1beta2.MsgCloseBid";
   value: MsgCloseBidAmino;
 }
@@ -149,14 +149,14 @@ export interface MsgCloseBidSDKType {
 
 /** MsgCloseBidResponse defines the Msg/CloseBid response type. */
 export interface MsgCloseBidResponse {}
-export interface MsgCloseBidResponseProtoType {
+export interface MsgCloseBidResponseProtoMsg {
   typeUrl: "/akash.market.v1beta2.MsgCloseBidResponse";
   value: Uint8Array;
 }
 
 /** MsgCloseBidResponse defines the Msg/CloseBid response type. */
 export interface MsgCloseBidResponseAmino {}
-export interface MsgCloseBidResponseAminoType {
+export interface MsgCloseBidResponseAminoMsg {
   type: "/akash.market.v1beta2.MsgCloseBidResponse";
   value: MsgCloseBidResponseAmino;
 }
@@ -175,7 +175,7 @@ export interface BidID {
   oseq: number;
   provider: string;
 }
-export interface BidIDProtoType {
+export interface BidIDProtoMsg {
   typeUrl: "/akash.market.v1beta2.BidID";
   value: Uint8Array;
 }
@@ -191,7 +191,7 @@ export interface BidIDAmino {
   oseq: number;
   provider: string;
 }
-export interface BidIDAminoType {
+export interface BidIDAminoMsg {
   type: "/akash.market.v1beta2.BidID";
   value: BidIDAmino;
 }
@@ -215,7 +215,7 @@ export interface Bid {
   price?: DecCoin;
   createdAt: Long;
 }
-export interface BidProtoType {
+export interface BidProtoMsg {
   typeUrl: "/akash.market.v1beta2.Bid";
   value: Uint8Array;
 }
@@ -227,7 +227,7 @@ export interface BidAmino {
   price?: DecCoinAmino;
   created_at: string;
 }
-export interface BidAminoType {
+export interface BidAminoMsg {
   type: "/akash.market.v1beta2.Bid";
   value: BidAmino;
 }
@@ -249,7 +249,7 @@ export interface BidFilters {
   provider: string;
   state: string;
 }
-export interface BidFiltersProtoType {
+export interface BidFiltersProtoMsg {
   typeUrl: "/akash.market.v1beta2.BidFilters";
   value: Uint8Array;
 }
@@ -263,7 +263,7 @@ export interface BidFiltersAmino {
   provider: string;
   state: string;
 }
-export interface BidFiltersAminoType {
+export interface BidFiltersAminoMsg {
   type: "/akash.market.v1beta2.BidFilters";
   value: BidFiltersAmino;
 }
@@ -288,6 +288,8 @@ function createBaseMsgCreateBid(): MsgCreateBid {
 }
 
 export const MsgCreateBid = {
+  typeUrl: "/akash.market.v1beta2.MsgCreateBid",
+
   encode(message: MsgCreateBid, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.order !== undefined) {
       OrderID.encode(message.order, writer.uint32(10).fork()).ldelim();
@@ -403,6 +405,25 @@ export const MsgCreateBid = {
     obj.price = message.price ? DecCoin.toAmino(message.price) : undefined;
     obj.deposit = message.deposit ? Coin.toAmino(message.deposit) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCreateBidAminoMsg): MsgCreateBid {
+    return MsgCreateBid.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgCreateBidProtoMsg): MsgCreateBid {
+    return MsgCreateBid.decode(message.value);
+  },
+
+  toProto(message: MsgCreateBid): Uint8Array {
+    return MsgCreateBid.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCreateBid): MsgCreateBidProtoMsg {
+    return {
+      typeUrl: "/akash.market.v1beta2.MsgCreateBid",
+      value: MsgCreateBid.encode(message).finish()
+    };
   }
 
 };
@@ -412,6 +433,8 @@ function createBaseMsgCreateBidResponse(): MsgCreateBidResponse {
 }
 
 export const MsgCreateBidResponse = {
+  typeUrl: "/akash.market.v1beta2.MsgCreateBidResponse",
+
   encode(_: MsgCreateBidResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -464,6 +487,25 @@ export const MsgCreateBidResponse = {
   toAmino(_: MsgCreateBidResponse): MsgCreateBidResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCreateBidResponseAminoMsg): MsgCreateBidResponse {
+    return MsgCreateBidResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgCreateBidResponseProtoMsg): MsgCreateBidResponse {
+    return MsgCreateBidResponse.decode(message.value);
+  },
+
+  toProto(message: MsgCreateBidResponse): Uint8Array {
+    return MsgCreateBidResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCreateBidResponse): MsgCreateBidResponseProtoMsg {
+    return {
+      typeUrl: "/akash.market.v1beta2.MsgCreateBidResponse",
+      value: MsgCreateBidResponse.encode(message).finish()
+    };
   }
 
 };
@@ -475,6 +517,8 @@ function createBaseMsgCloseBid(): MsgCloseBid {
 }
 
 export const MsgCloseBid = {
+  typeUrl: "/akash.market.v1beta2.MsgCloseBid",
+
   encode(message: MsgCloseBid, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.bidId !== undefined) {
       BidID.encode(message.bidId, writer.uint32(10).fork()).ldelim();
@@ -545,6 +589,25 @@ export const MsgCloseBid = {
     const obj: any = {};
     obj.bid_id = message.bidId ? BidID.toAmino(message.bidId) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCloseBidAminoMsg): MsgCloseBid {
+    return MsgCloseBid.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgCloseBidProtoMsg): MsgCloseBid {
+    return MsgCloseBid.decode(message.value);
+  },
+
+  toProto(message: MsgCloseBid): Uint8Array {
+    return MsgCloseBid.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCloseBid): MsgCloseBidProtoMsg {
+    return {
+      typeUrl: "/akash.market.v1beta2.MsgCloseBid",
+      value: MsgCloseBid.encode(message).finish()
+    };
   }
 
 };
@@ -554,6 +617,8 @@ function createBaseMsgCloseBidResponse(): MsgCloseBidResponse {
 }
 
 export const MsgCloseBidResponse = {
+  typeUrl: "/akash.market.v1beta2.MsgCloseBidResponse",
+
   encode(_: MsgCloseBidResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -606,6 +671,25 @@ export const MsgCloseBidResponse = {
   toAmino(_: MsgCloseBidResponse): MsgCloseBidResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCloseBidResponseAminoMsg): MsgCloseBidResponse {
+    return MsgCloseBidResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgCloseBidResponseProtoMsg): MsgCloseBidResponse {
+    return MsgCloseBidResponse.decode(message.value);
+  },
+
+  toProto(message: MsgCloseBidResponse): Uint8Array {
+    return MsgCloseBidResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCloseBidResponse): MsgCloseBidResponseProtoMsg {
+    return {
+      typeUrl: "/akash.market.v1beta2.MsgCloseBidResponse",
+      value: MsgCloseBidResponse.encode(message).finish()
+    };
   }
 
 };
@@ -621,6 +705,8 @@ function createBaseBidID(): BidID {
 }
 
 export const BidID = {
+  typeUrl: "/akash.market.v1beta2.BidID",
+
   encode(message: BidID, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.owner !== "") {
       writer.uint32(10).string(message.owner);
@@ -751,6 +837,25 @@ export const BidID = {
     obj.oseq = message.oseq;
     obj.provider = message.provider;
     return obj;
+  },
+
+  fromAminoMsg(object: BidIDAminoMsg): BidID {
+    return BidID.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: BidIDProtoMsg): BidID {
+    return BidID.decode(message.value);
+  },
+
+  toProto(message: BidID): Uint8Array {
+    return BidID.encode(message).finish();
+  },
+
+  toProtoMsg(message: BidID): BidIDProtoMsg {
+    return {
+      typeUrl: "/akash.market.v1beta2.BidID",
+      value: BidID.encode(message).finish()
+    };
   }
 
 };
@@ -765,6 +870,8 @@ function createBaseBid(): Bid {
 }
 
 export const Bid = {
+  typeUrl: "/akash.market.v1beta2.Bid",
+
   encode(message: Bid, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.bidId !== undefined) {
       BidID.encode(message.bidId, writer.uint32(10).fork()).ldelim();
@@ -880,6 +987,25 @@ export const Bid = {
     obj.price = message.price ? DecCoin.toAmino(message.price) : undefined;
     obj.created_at = message.createdAt ? message.createdAt.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: BidAminoMsg): Bid {
+    return Bid.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: BidProtoMsg): Bid {
+    return Bid.decode(message.value);
+  },
+
+  toProto(message: Bid): Uint8Array {
+    return Bid.encode(message).finish();
+  },
+
+  toProtoMsg(message: Bid): BidProtoMsg {
+    return {
+      typeUrl: "/akash.market.v1beta2.Bid",
+      value: Bid.encode(message).finish()
+    };
   }
 
 };
@@ -896,6 +1022,8 @@ function createBaseBidFilters(): BidFilters {
 }
 
 export const BidFilters = {
+  typeUrl: "/akash.market.v1beta2.BidFilters",
+
   encode(message: BidFilters, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.owner !== "") {
       writer.uint32(10).string(message.owner);
@@ -1041,6 +1169,25 @@ export const BidFilters = {
     obj.provider = message.provider;
     obj.state = message.state;
     return obj;
+  },
+
+  fromAminoMsg(object: BidFiltersAminoMsg): BidFilters {
+    return BidFilters.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: BidFiltersProtoMsg): BidFilters {
+    return BidFilters.decode(message.value);
+  },
+
+  toProto(message: BidFilters): Uint8Array {
+    return BidFilters.encode(message).finish();
+  },
+
+  toProtoMsg(message: BidFilters): BidFiltersProtoMsg {
+    return {
+      typeUrl: "/akash.market.v1beta2.BidFilters",
+      value: BidFilters.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/akash/market/v1beta2/genesis.ts b/__fixtures__/outputv2/akash/market/v1beta2/genesis.ts
index 855fae740..8945049cf 100644
--- a/__fixtures__/outputv2/akash/market/v1beta2/genesis.ts
+++ b/__fixtures__/outputv2/akash/market/v1beta2/genesis.ts
@@ -11,7 +11,7 @@ export interface GenesisState {
   leases: Lease[];
   params?: Params;
 }
-export interface GenesisStateProtoType {
+export interface GenesisStateProtoMsg {
   typeUrl: "/akash.market.v1beta2.GenesisState";
   value: Uint8Array;
 }
@@ -22,7 +22,7 @@ export interface GenesisStateAmino {
   leases: LeaseAmino[];
   params?: ParamsAmino;
 }
-export interface GenesisStateAminoType {
+export interface GenesisStateAminoMsg {
   type: "/akash.market.v1beta2.GenesisState";
   value: GenesisStateAmino;
 }
@@ -43,6 +43,8 @@ function createBaseGenesisState(): GenesisState {
 }
 
 export const GenesisState = {
+  typeUrl: "/akash.market.v1beta2.GenesisState",
+
   encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.orders) {
       Order.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -176,6 +178,25 @@ export const GenesisState = {
 
     obj.params = message.params ? Params.toAmino(message.params) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisStateAminoMsg): GenesisState {
+    return GenesisState.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: GenesisStateProtoMsg): GenesisState {
+    return GenesisState.decode(message.value);
+  },
+
+  toProto(message: GenesisState): Uint8Array {
+    return GenesisState.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisState): GenesisStateProtoMsg {
+    return {
+      typeUrl: "/akash.market.v1beta2.GenesisState",
+      value: GenesisState.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/akash/market/v1beta2/lease.ts b/__fixtures__/outputv2/akash/market/v1beta2/lease.ts
index 385222595..69dc9e8fd 100644
--- a/__fixtures__/outputv2/akash/market/v1beta2/lease.ts
+++ b/__fixtures__/outputv2/akash/market/v1beta2/lease.ts
@@ -73,7 +73,7 @@ export interface LeaseID {
   oseq: number;
   provider: string;
 }
-export interface LeaseIDProtoType {
+export interface LeaseIDProtoMsg {
   typeUrl: "/akash.market.v1beta2.LeaseID";
   value: Uint8Array;
 }
@@ -86,7 +86,7 @@ export interface LeaseIDAmino {
   oseq: number;
   provider: string;
 }
-export interface LeaseIDAminoType {
+export interface LeaseIDAminoMsg {
   type: "/akash.market.v1beta2.LeaseID";
   value: LeaseIDAmino;
 }
@@ -108,7 +108,7 @@ export interface Lease {
   createdAt: Long;
   closedOn: Long;
 }
-export interface LeaseProtoType {
+export interface LeaseProtoMsg {
   typeUrl: "/akash.market.v1beta2.Lease";
   value: Uint8Array;
 }
@@ -121,7 +121,7 @@ export interface LeaseAmino {
   created_at: string;
   closed_on: string;
 }
-export interface LeaseAminoType {
+export interface LeaseAminoMsg {
   type: "/akash.market.v1beta2.Lease";
   value: LeaseAmino;
 }
@@ -144,7 +144,7 @@ export interface LeaseFilters {
   provider: string;
   state: string;
 }
-export interface LeaseFiltersProtoType {
+export interface LeaseFiltersProtoMsg {
   typeUrl: "/akash.market.v1beta2.LeaseFilters";
   value: Uint8Array;
 }
@@ -158,7 +158,7 @@ export interface LeaseFiltersAmino {
   provider: string;
   state: string;
 }
-export interface LeaseFiltersAminoType {
+export interface LeaseFiltersAminoMsg {
   type: "/akash.market.v1beta2.LeaseFilters";
   value: LeaseFiltersAmino;
 }
@@ -177,7 +177,7 @@ export interface LeaseFiltersSDKType {
 export interface MsgCreateLease {
   bidId?: BidID;
 }
-export interface MsgCreateLeaseProtoType {
+export interface MsgCreateLeaseProtoMsg {
   typeUrl: "/akash.market.v1beta2.MsgCreateLease";
   value: Uint8Array;
 }
@@ -186,7 +186,7 @@ export interface MsgCreateLeaseProtoType {
 export interface MsgCreateLeaseAmino {
   bid_id?: BidIDAmino;
 }
-export interface MsgCreateLeaseAminoType {
+export interface MsgCreateLeaseAminoMsg {
   type: "/akash.market.v1beta2.MsgCreateLease";
   value: MsgCreateLeaseAmino;
 }
@@ -198,14 +198,14 @@ export interface MsgCreateLeaseSDKType {
 
 /** MsgCreateLeaseResponse is the response from creating a lease */
 export interface MsgCreateLeaseResponse {}
-export interface MsgCreateLeaseResponseProtoType {
+export interface MsgCreateLeaseResponseProtoMsg {
   typeUrl: "/akash.market.v1beta2.MsgCreateLeaseResponse";
   value: Uint8Array;
 }
 
 /** MsgCreateLeaseResponse is the response from creating a lease */
 export interface MsgCreateLeaseResponseAmino {}
-export interface MsgCreateLeaseResponseAminoType {
+export interface MsgCreateLeaseResponseAminoMsg {
   type: "/akash.market.v1beta2.MsgCreateLeaseResponse";
   value: MsgCreateLeaseResponseAmino;
 }
@@ -217,7 +217,7 @@ export interface MsgCreateLeaseResponseSDKType {}
 export interface MsgWithdrawLease {
   bidId?: LeaseID;
 }
-export interface MsgWithdrawLeaseProtoType {
+export interface MsgWithdrawLeaseProtoMsg {
   typeUrl: "/akash.market.v1beta2.MsgWithdrawLease";
   value: Uint8Array;
 }
@@ -226,7 +226,7 @@ export interface MsgWithdrawLeaseProtoType {
 export interface MsgWithdrawLeaseAmino {
   bid_id?: LeaseIDAmino;
 }
-export interface MsgWithdrawLeaseAminoType {
+export interface MsgWithdrawLeaseAminoMsg {
   type: "/akash.market.v1beta2.MsgWithdrawLease";
   value: MsgWithdrawLeaseAmino;
 }
@@ -238,14 +238,14 @@ export interface MsgWithdrawLeaseSDKType {
 
 /** MsgWithdrawLeaseResponse defines the Msg/WithdrawLease response type. */
 export interface MsgWithdrawLeaseResponse {}
-export interface MsgWithdrawLeaseResponseProtoType {
+export interface MsgWithdrawLeaseResponseProtoMsg {
   typeUrl: "/akash.market.v1beta2.MsgWithdrawLeaseResponse";
   value: Uint8Array;
 }
 
 /** MsgWithdrawLeaseResponse defines the Msg/WithdrawLease response type. */
 export interface MsgWithdrawLeaseResponseAmino {}
-export interface MsgWithdrawLeaseResponseAminoType {
+export interface MsgWithdrawLeaseResponseAminoMsg {
   type: "/akash.market.v1beta2.MsgWithdrawLeaseResponse";
   value: MsgWithdrawLeaseResponseAmino;
 }
@@ -257,7 +257,7 @@ export interface MsgWithdrawLeaseResponseSDKType {}
 export interface MsgCloseLease {
   leaseId?: LeaseID;
 }
-export interface MsgCloseLeaseProtoType {
+export interface MsgCloseLeaseProtoMsg {
   typeUrl: "/akash.market.v1beta2.MsgCloseLease";
   value: Uint8Array;
 }
@@ -266,7 +266,7 @@ export interface MsgCloseLeaseProtoType {
 export interface MsgCloseLeaseAmino {
   lease_id?: LeaseIDAmino;
 }
-export interface MsgCloseLeaseAminoType {
+export interface MsgCloseLeaseAminoMsg {
   type: "/akash.market.v1beta2.MsgCloseLease";
   value: MsgCloseLeaseAmino;
 }
@@ -278,14 +278,14 @@ export interface MsgCloseLeaseSDKType {
 
 /** MsgCloseLeaseResponse defines the Msg/CloseLease response type. */
 export interface MsgCloseLeaseResponse {}
-export interface MsgCloseLeaseResponseProtoType {
+export interface MsgCloseLeaseResponseProtoMsg {
   typeUrl: "/akash.market.v1beta2.MsgCloseLeaseResponse";
   value: Uint8Array;
 }
 
 /** MsgCloseLeaseResponse defines the Msg/CloseLease response type. */
 export interface MsgCloseLeaseResponseAmino {}
-export interface MsgCloseLeaseResponseAminoType {
+export interface MsgCloseLeaseResponseAminoMsg {
   type: "/akash.market.v1beta2.MsgCloseLeaseResponse";
   value: MsgCloseLeaseResponseAmino;
 }
@@ -304,6 +304,8 @@ function createBaseLeaseID(): LeaseID {
 }
 
 export const LeaseID = {
+  typeUrl: "/akash.market.v1beta2.LeaseID",
+
   encode(message: LeaseID, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.owner !== "") {
       writer.uint32(10).string(message.owner);
@@ -434,6 +436,25 @@ export const LeaseID = {
     obj.oseq = message.oseq;
     obj.provider = message.provider;
     return obj;
+  },
+
+  fromAminoMsg(object: LeaseIDAminoMsg): LeaseID {
+    return LeaseID.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: LeaseIDProtoMsg): LeaseID {
+    return LeaseID.decode(message.value);
+  },
+
+  toProto(message: LeaseID): Uint8Array {
+    return LeaseID.encode(message).finish();
+  },
+
+  toProtoMsg(message: LeaseID): LeaseIDProtoMsg {
+    return {
+      typeUrl: "/akash.market.v1beta2.LeaseID",
+      value: LeaseID.encode(message).finish()
+    };
   }
 
 };
@@ -449,6 +470,8 @@ function createBaseLease(): Lease {
 }
 
 export const Lease = {
+  typeUrl: "/akash.market.v1beta2.Lease",
+
   encode(message: Lease, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.leaseId !== undefined) {
       LeaseID.encode(message.leaseId, writer.uint32(10).fork()).ldelim();
@@ -579,6 +602,25 @@ export const Lease = {
     obj.created_at = message.createdAt ? message.createdAt.toString() : undefined;
     obj.closed_on = message.closedOn ? message.closedOn.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: LeaseAminoMsg): Lease {
+    return Lease.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: LeaseProtoMsg): Lease {
+    return Lease.decode(message.value);
+  },
+
+  toProto(message: Lease): Uint8Array {
+    return Lease.encode(message).finish();
+  },
+
+  toProtoMsg(message: Lease): LeaseProtoMsg {
+    return {
+      typeUrl: "/akash.market.v1beta2.Lease",
+      value: Lease.encode(message).finish()
+    };
   }
 
 };
@@ -595,6 +637,8 @@ function createBaseLeaseFilters(): LeaseFilters {
 }
 
 export const LeaseFilters = {
+  typeUrl: "/akash.market.v1beta2.LeaseFilters",
+
   encode(message: LeaseFilters, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.owner !== "") {
       writer.uint32(10).string(message.owner);
@@ -740,6 +784,25 @@ export const LeaseFilters = {
     obj.provider = message.provider;
     obj.state = message.state;
     return obj;
+  },
+
+  fromAminoMsg(object: LeaseFiltersAminoMsg): LeaseFilters {
+    return LeaseFilters.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: LeaseFiltersProtoMsg): LeaseFilters {
+    return LeaseFilters.decode(message.value);
+  },
+
+  toProto(message: LeaseFilters): Uint8Array {
+    return LeaseFilters.encode(message).finish();
+  },
+
+  toProtoMsg(message: LeaseFilters): LeaseFiltersProtoMsg {
+    return {
+      typeUrl: "/akash.market.v1beta2.LeaseFilters",
+      value: LeaseFilters.encode(message).finish()
+    };
   }
 
 };
@@ -751,6 +814,8 @@ function createBaseMsgCreateLease(): MsgCreateLease {
 }
 
 export const MsgCreateLease = {
+  typeUrl: "/akash.market.v1beta2.MsgCreateLease",
+
   encode(message: MsgCreateLease, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.bidId !== undefined) {
       BidID.encode(message.bidId, writer.uint32(10).fork()).ldelim();
@@ -821,6 +886,25 @@ export const MsgCreateLease = {
     const obj: any = {};
     obj.bid_id = message.bidId ? BidID.toAmino(message.bidId) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCreateLeaseAminoMsg): MsgCreateLease {
+    return MsgCreateLease.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgCreateLeaseProtoMsg): MsgCreateLease {
+    return MsgCreateLease.decode(message.value);
+  },
+
+  toProto(message: MsgCreateLease): Uint8Array {
+    return MsgCreateLease.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCreateLease): MsgCreateLeaseProtoMsg {
+    return {
+      typeUrl: "/akash.market.v1beta2.MsgCreateLease",
+      value: MsgCreateLease.encode(message).finish()
+    };
   }
 
 };
@@ -830,6 +914,8 @@ function createBaseMsgCreateLeaseResponse(): MsgCreateLeaseResponse {
 }
 
 export const MsgCreateLeaseResponse = {
+  typeUrl: "/akash.market.v1beta2.MsgCreateLeaseResponse",
+
   encode(_: MsgCreateLeaseResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -882,6 +968,25 @@ export const MsgCreateLeaseResponse = {
   toAmino(_: MsgCreateLeaseResponse): MsgCreateLeaseResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCreateLeaseResponseAminoMsg): MsgCreateLeaseResponse {
+    return MsgCreateLeaseResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgCreateLeaseResponseProtoMsg): MsgCreateLeaseResponse {
+    return MsgCreateLeaseResponse.decode(message.value);
+  },
+
+  toProto(message: MsgCreateLeaseResponse): Uint8Array {
+    return MsgCreateLeaseResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCreateLeaseResponse): MsgCreateLeaseResponseProtoMsg {
+    return {
+      typeUrl: "/akash.market.v1beta2.MsgCreateLeaseResponse",
+      value: MsgCreateLeaseResponse.encode(message).finish()
+    };
   }
 
 };
@@ -893,6 +998,8 @@ function createBaseMsgWithdrawLease(): MsgWithdrawLease {
 }
 
 export const MsgWithdrawLease = {
+  typeUrl: "/akash.market.v1beta2.MsgWithdrawLease",
+
   encode(message: MsgWithdrawLease, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.bidId !== undefined) {
       LeaseID.encode(message.bidId, writer.uint32(10).fork()).ldelim();
@@ -963,6 +1070,25 @@ export const MsgWithdrawLease = {
     const obj: any = {};
     obj.bid_id = message.bidId ? LeaseID.toAmino(message.bidId) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgWithdrawLeaseAminoMsg): MsgWithdrawLease {
+    return MsgWithdrawLease.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgWithdrawLeaseProtoMsg): MsgWithdrawLease {
+    return MsgWithdrawLease.decode(message.value);
+  },
+
+  toProto(message: MsgWithdrawLease): Uint8Array {
+    return MsgWithdrawLease.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgWithdrawLease): MsgWithdrawLeaseProtoMsg {
+    return {
+      typeUrl: "/akash.market.v1beta2.MsgWithdrawLease",
+      value: MsgWithdrawLease.encode(message).finish()
+    };
   }
 
 };
@@ -972,6 +1098,8 @@ function createBaseMsgWithdrawLeaseResponse(): MsgWithdrawLeaseResponse {
 }
 
 export const MsgWithdrawLeaseResponse = {
+  typeUrl: "/akash.market.v1beta2.MsgWithdrawLeaseResponse",
+
   encode(_: MsgWithdrawLeaseResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -1024,6 +1152,25 @@ export const MsgWithdrawLeaseResponse = {
   toAmino(_: MsgWithdrawLeaseResponse): MsgWithdrawLeaseResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgWithdrawLeaseResponseAminoMsg): MsgWithdrawLeaseResponse {
+    return MsgWithdrawLeaseResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgWithdrawLeaseResponseProtoMsg): MsgWithdrawLeaseResponse {
+    return MsgWithdrawLeaseResponse.decode(message.value);
+  },
+
+  toProto(message: MsgWithdrawLeaseResponse): Uint8Array {
+    return MsgWithdrawLeaseResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgWithdrawLeaseResponse): MsgWithdrawLeaseResponseProtoMsg {
+    return {
+      typeUrl: "/akash.market.v1beta2.MsgWithdrawLeaseResponse",
+      value: MsgWithdrawLeaseResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1035,6 +1182,8 @@ function createBaseMsgCloseLease(): MsgCloseLease {
 }
 
 export const MsgCloseLease = {
+  typeUrl: "/akash.market.v1beta2.MsgCloseLease",
+
   encode(message: MsgCloseLease, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.leaseId !== undefined) {
       LeaseID.encode(message.leaseId, writer.uint32(10).fork()).ldelim();
@@ -1105,6 +1254,25 @@ export const MsgCloseLease = {
     const obj: any = {};
     obj.lease_id = message.leaseId ? LeaseID.toAmino(message.leaseId) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCloseLeaseAminoMsg): MsgCloseLease {
+    return MsgCloseLease.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgCloseLeaseProtoMsg): MsgCloseLease {
+    return MsgCloseLease.decode(message.value);
+  },
+
+  toProto(message: MsgCloseLease): Uint8Array {
+    return MsgCloseLease.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCloseLease): MsgCloseLeaseProtoMsg {
+    return {
+      typeUrl: "/akash.market.v1beta2.MsgCloseLease",
+      value: MsgCloseLease.encode(message).finish()
+    };
   }
 
 };
@@ -1114,6 +1282,8 @@ function createBaseMsgCloseLeaseResponse(): MsgCloseLeaseResponse {
 }
 
 export const MsgCloseLeaseResponse = {
+  typeUrl: "/akash.market.v1beta2.MsgCloseLeaseResponse",
+
   encode(_: MsgCloseLeaseResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -1166,6 +1336,25 @@ export const MsgCloseLeaseResponse = {
   toAmino(_: MsgCloseLeaseResponse): MsgCloseLeaseResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCloseLeaseResponseAminoMsg): MsgCloseLeaseResponse {
+    return MsgCloseLeaseResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgCloseLeaseResponseProtoMsg): MsgCloseLeaseResponse {
+    return MsgCloseLeaseResponse.decode(message.value);
+  },
+
+  toProto(message: MsgCloseLeaseResponse): Uint8Array {
+    return MsgCloseLeaseResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCloseLeaseResponse): MsgCloseLeaseResponseProtoMsg {
+    return {
+      typeUrl: "/akash.market.v1beta2.MsgCloseLeaseResponse",
+      value: MsgCloseLeaseResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/akash/market/v1beta2/order.ts b/__fixtures__/outputv2/akash/market/v1beta2/order.ts
index 343b6b854..01fe2aec5 100644
--- a/__fixtures__/outputv2/akash/market/v1beta2/order.ts
+++ b/__fixtures__/outputv2/akash/market/v1beta2/order.ts
@@ -71,7 +71,7 @@ export interface OrderID {
   gseq: number;
   oseq: number;
 }
-export interface OrderIDProtoType {
+export interface OrderIDProtoMsg {
   typeUrl: "/akash.market.v1beta2.OrderID";
   value: Uint8Array;
 }
@@ -83,7 +83,7 @@ export interface OrderIDAmino {
   gseq: number;
   oseq: number;
 }
-export interface OrderIDAminoType {
+export interface OrderIDAminoMsg {
   type: "/akash.market.v1beta2.OrderID";
   value: OrderIDAmino;
 }
@@ -103,7 +103,7 @@ export interface Order {
   spec?: GroupSpec;
   createdAt: Long;
 }
-export interface OrderProtoType {
+export interface OrderProtoMsg {
   typeUrl: "/akash.market.v1beta2.Order";
   value: Uint8Array;
 }
@@ -115,7 +115,7 @@ export interface OrderAmino {
   spec?: GroupSpecAmino;
   created_at: string;
 }
-export interface OrderAminoType {
+export interface OrderAminoMsg {
   type: "/akash.market.v1beta2.Order";
   value: OrderAmino;
 }
@@ -136,7 +136,7 @@ export interface OrderFilters {
   oseq: number;
   state: string;
 }
-export interface OrderFiltersProtoType {
+export interface OrderFiltersProtoMsg {
   typeUrl: "/akash.market.v1beta2.OrderFilters";
   value: Uint8Array;
 }
@@ -149,7 +149,7 @@ export interface OrderFiltersAmino {
   oseq: number;
   state: string;
 }
-export interface OrderFiltersAminoType {
+export interface OrderFiltersAminoMsg {
   type: "/akash.market.v1beta2.OrderFilters";
   value: OrderFiltersAmino;
 }
@@ -173,6 +173,8 @@ function createBaseOrderID(): OrderID {
 }
 
 export const OrderID = {
+  typeUrl: "/akash.market.v1beta2.OrderID",
+
   encode(message: OrderID, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.owner !== "") {
       writer.uint32(10).string(message.owner);
@@ -288,6 +290,25 @@ export const OrderID = {
     obj.gseq = message.gseq;
     obj.oseq = message.oseq;
     return obj;
+  },
+
+  fromAminoMsg(object: OrderIDAminoMsg): OrderID {
+    return OrderID.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: OrderIDProtoMsg): OrderID {
+    return OrderID.decode(message.value);
+  },
+
+  toProto(message: OrderID): Uint8Array {
+    return OrderID.encode(message).finish();
+  },
+
+  toProtoMsg(message: OrderID): OrderIDProtoMsg {
+    return {
+      typeUrl: "/akash.market.v1beta2.OrderID",
+      value: OrderID.encode(message).finish()
+    };
   }
 
 };
@@ -302,6 +323,8 @@ function createBaseOrder(): Order {
 }
 
 export const Order = {
+  typeUrl: "/akash.market.v1beta2.Order",
+
   encode(message: Order, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.orderId !== undefined) {
       OrderID.encode(message.orderId, writer.uint32(10).fork()).ldelim();
@@ -417,6 +440,25 @@ export const Order = {
     obj.spec = message.spec ? GroupSpec.toAmino(message.spec) : undefined;
     obj.created_at = message.createdAt ? message.createdAt.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: OrderAminoMsg): Order {
+    return Order.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: OrderProtoMsg): Order {
+    return Order.decode(message.value);
+  },
+
+  toProto(message: Order): Uint8Array {
+    return Order.encode(message).finish();
+  },
+
+  toProtoMsg(message: Order): OrderProtoMsg {
+    return {
+      typeUrl: "/akash.market.v1beta2.Order",
+      value: Order.encode(message).finish()
+    };
   }
 
 };
@@ -432,6 +474,8 @@ function createBaseOrderFilters(): OrderFilters {
 }
 
 export const OrderFilters = {
+  typeUrl: "/akash.market.v1beta2.OrderFilters",
+
   encode(message: OrderFilters, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.owner !== "") {
       writer.uint32(10).string(message.owner);
@@ -562,6 +606,25 @@ export const OrderFilters = {
     obj.oseq = message.oseq;
     obj.state = message.state;
     return obj;
+  },
+
+  fromAminoMsg(object: OrderFiltersAminoMsg): OrderFilters {
+    return OrderFilters.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: OrderFiltersProtoMsg): OrderFilters {
+    return OrderFilters.decode(message.value);
+  },
+
+  toProto(message: OrderFilters): Uint8Array {
+    return OrderFilters.encode(message).finish();
+  },
+
+  toProtoMsg(message: OrderFilters): OrderFiltersProtoMsg {
+    return {
+      typeUrl: "/akash.market.v1beta2.OrderFilters",
+      value: OrderFilters.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/akash/market/v1beta2/params.ts b/__fixtures__/outputv2/akash/market/v1beta2/params.ts
index f4175c01f..6839a5251 100644
--- a/__fixtures__/outputv2/akash/market/v1beta2/params.ts
+++ b/__fixtures__/outputv2/akash/market/v1beta2/params.ts
@@ -8,7 +8,7 @@ export interface Params {
   bidMinDeposit?: Coin;
   orderMaxBids: number;
 }
-export interface ParamsProtoType {
+export interface ParamsProtoMsg {
   typeUrl: "/akash.market.v1beta2.Params";
   value: Uint8Array;
 }
@@ -18,7 +18,7 @@ export interface ParamsAmino {
   bid_min_deposit?: CoinAmino;
   order_max_bids: number;
 }
-export interface ParamsAminoType {
+export interface ParamsAminoMsg {
   type: "/akash.market.v1beta2.Params";
   value: ParamsAmino;
 }
@@ -37,6 +37,8 @@ function createBaseParams(): Params {
 }
 
 export const Params = {
+  typeUrl: "/akash.market.v1beta2.Params",
+
   encode(message: Params, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.bidMinDeposit !== undefined) {
       Coin.encode(message.bidMinDeposit, writer.uint32(10).fork()).ldelim();
@@ -122,6 +124,25 @@ export const Params = {
     obj.bid_min_deposit = message.bidMinDeposit ? Coin.toAmino(message.bidMinDeposit) : undefined;
     obj.order_max_bids = message.orderMaxBids;
     return obj;
+  },
+
+  fromAminoMsg(object: ParamsAminoMsg): Params {
+    return Params.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ParamsProtoMsg): Params {
+    return Params.decode(message.value);
+  },
+
+  toProto(message: Params): Uint8Array {
+    return Params.encode(message).finish();
+  },
+
+  toProtoMsg(message: Params): ParamsProtoMsg {
+    return {
+      typeUrl: "/akash.market.v1beta2.Params",
+      value: Params.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/akash/market/v1beta2/query.ts b/__fixtures__/outputv2/akash/market/v1beta2/query.ts
index 73de49dac..5bf465c31 100644
--- a/__fixtures__/outputv2/akash/market/v1beta2/query.ts
+++ b/__fixtures__/outputv2/akash/market/v1beta2/query.ts
@@ -12,7 +12,7 @@ export interface QueryOrdersRequest {
   filters?: OrderFilters;
   pagination?: PageRequest;
 }
-export interface QueryOrdersRequestProtoType {
+export interface QueryOrdersRequestProtoMsg {
   typeUrl: "/akash.market.v1beta2.QueryOrdersRequest";
   value: Uint8Array;
 }
@@ -22,7 +22,7 @@ export interface QueryOrdersRequestAmino {
   filters?: OrderFiltersAmino;
   pagination?: PageRequestAmino;
 }
-export interface QueryOrdersRequestAminoType {
+export interface QueryOrdersRequestAminoMsg {
   type: "/akash.market.v1beta2.QueryOrdersRequest";
   value: QueryOrdersRequestAmino;
 }
@@ -38,7 +38,7 @@ export interface QueryOrdersResponse {
   orders: Order[];
   pagination?: PageResponse;
 }
-export interface QueryOrdersResponseProtoType {
+export interface QueryOrdersResponseProtoMsg {
   typeUrl: "/akash.market.v1beta2.QueryOrdersResponse";
   value: Uint8Array;
 }
@@ -48,7 +48,7 @@ export interface QueryOrdersResponseAmino {
   orders: OrderAmino[];
   pagination?: PageResponseAmino;
 }
-export interface QueryOrdersResponseAminoType {
+export interface QueryOrdersResponseAminoMsg {
   type: "/akash.market.v1beta2.QueryOrdersResponse";
   value: QueryOrdersResponseAmino;
 }
@@ -63,7 +63,7 @@ export interface QueryOrdersResponseSDKType {
 export interface QueryOrderRequest {
   id?: OrderID;
 }
-export interface QueryOrderRequestProtoType {
+export interface QueryOrderRequestProtoMsg {
   typeUrl: "/akash.market.v1beta2.QueryOrderRequest";
   value: Uint8Array;
 }
@@ -72,7 +72,7 @@ export interface QueryOrderRequestProtoType {
 export interface QueryOrderRequestAmino {
   id?: OrderIDAmino;
 }
-export interface QueryOrderRequestAminoType {
+export interface QueryOrderRequestAminoMsg {
   type: "/akash.market.v1beta2.QueryOrderRequest";
   value: QueryOrderRequestAmino;
 }
@@ -86,7 +86,7 @@ export interface QueryOrderRequestSDKType {
 export interface QueryOrderResponse {
   order?: Order;
 }
-export interface QueryOrderResponseProtoType {
+export interface QueryOrderResponseProtoMsg {
   typeUrl: "/akash.market.v1beta2.QueryOrderResponse";
   value: Uint8Array;
 }
@@ -95,7 +95,7 @@ export interface QueryOrderResponseProtoType {
 export interface QueryOrderResponseAmino {
   order?: OrderAmino;
 }
-export interface QueryOrderResponseAminoType {
+export interface QueryOrderResponseAminoMsg {
   type: "/akash.market.v1beta2.QueryOrderResponse";
   value: QueryOrderResponseAmino;
 }
@@ -110,7 +110,7 @@ export interface QueryBidsRequest {
   filters?: BidFilters;
   pagination?: PageRequest;
 }
-export interface QueryBidsRequestProtoType {
+export interface QueryBidsRequestProtoMsg {
   typeUrl: "/akash.market.v1beta2.QueryBidsRequest";
   value: Uint8Array;
 }
@@ -120,7 +120,7 @@ export interface QueryBidsRequestAmino {
   filters?: BidFiltersAmino;
   pagination?: PageRequestAmino;
 }
-export interface QueryBidsRequestAminoType {
+export interface QueryBidsRequestAminoMsg {
   type: "/akash.market.v1beta2.QueryBidsRequest";
   value: QueryBidsRequestAmino;
 }
@@ -136,7 +136,7 @@ export interface QueryBidsResponse {
   bids: QueryBidResponse[];
   pagination?: PageResponse;
 }
-export interface QueryBidsResponseProtoType {
+export interface QueryBidsResponseProtoMsg {
   typeUrl: "/akash.market.v1beta2.QueryBidsResponse";
   value: Uint8Array;
 }
@@ -146,7 +146,7 @@ export interface QueryBidsResponseAmino {
   bids: QueryBidResponseAmino[];
   pagination?: PageResponseAmino;
 }
-export interface QueryBidsResponseAminoType {
+export interface QueryBidsResponseAminoMsg {
   type: "/akash.market.v1beta2.QueryBidsResponse";
   value: QueryBidsResponseAmino;
 }
@@ -161,7 +161,7 @@ export interface QueryBidsResponseSDKType {
 export interface QueryBidRequest {
   id?: BidID;
 }
-export interface QueryBidRequestProtoType {
+export interface QueryBidRequestProtoMsg {
   typeUrl: "/akash.market.v1beta2.QueryBidRequest";
   value: Uint8Array;
 }
@@ -170,7 +170,7 @@ export interface QueryBidRequestProtoType {
 export interface QueryBidRequestAmino {
   id?: BidIDAmino;
 }
-export interface QueryBidRequestAminoType {
+export interface QueryBidRequestAminoMsg {
   type: "/akash.market.v1beta2.QueryBidRequest";
   value: QueryBidRequestAmino;
 }
@@ -185,7 +185,7 @@ export interface QueryBidResponse {
   bid?: Bid;
   escrowAccount?: Account;
 }
-export interface QueryBidResponseProtoType {
+export interface QueryBidResponseProtoMsg {
   typeUrl: "/akash.market.v1beta2.QueryBidResponse";
   value: Uint8Array;
 }
@@ -195,7 +195,7 @@ export interface QueryBidResponseAmino {
   bid?: BidAmino;
   escrow_account?: AccountAmino;
 }
-export interface QueryBidResponseAminoType {
+export interface QueryBidResponseAminoMsg {
   type: "/akash.market.v1beta2.QueryBidResponse";
   value: QueryBidResponseAmino;
 }
@@ -211,7 +211,7 @@ export interface QueryLeasesRequest {
   filters?: LeaseFilters;
   pagination?: PageRequest;
 }
-export interface QueryLeasesRequestProtoType {
+export interface QueryLeasesRequestProtoMsg {
   typeUrl: "/akash.market.v1beta2.QueryLeasesRequest";
   value: Uint8Array;
 }
@@ -221,7 +221,7 @@ export interface QueryLeasesRequestAmino {
   filters?: LeaseFiltersAmino;
   pagination?: PageRequestAmino;
 }
-export interface QueryLeasesRequestAminoType {
+export interface QueryLeasesRequestAminoMsg {
   type: "/akash.market.v1beta2.QueryLeasesRequest";
   value: QueryLeasesRequestAmino;
 }
@@ -237,7 +237,7 @@ export interface QueryLeasesResponse {
   leases: QueryLeaseResponse[];
   pagination?: PageResponse;
 }
-export interface QueryLeasesResponseProtoType {
+export interface QueryLeasesResponseProtoMsg {
   typeUrl: "/akash.market.v1beta2.QueryLeasesResponse";
   value: Uint8Array;
 }
@@ -247,7 +247,7 @@ export interface QueryLeasesResponseAmino {
   leases: QueryLeaseResponseAmino[];
   pagination?: PageResponseAmino;
 }
-export interface QueryLeasesResponseAminoType {
+export interface QueryLeasesResponseAminoMsg {
   type: "/akash.market.v1beta2.QueryLeasesResponse";
   value: QueryLeasesResponseAmino;
 }
@@ -262,7 +262,7 @@ export interface QueryLeasesResponseSDKType {
 export interface QueryLeaseRequest {
   id?: LeaseID;
 }
-export interface QueryLeaseRequestProtoType {
+export interface QueryLeaseRequestProtoMsg {
   typeUrl: "/akash.market.v1beta2.QueryLeaseRequest";
   value: Uint8Array;
 }
@@ -271,7 +271,7 @@ export interface QueryLeaseRequestProtoType {
 export interface QueryLeaseRequestAmino {
   id?: LeaseIDAmino;
 }
-export interface QueryLeaseRequestAminoType {
+export interface QueryLeaseRequestAminoMsg {
   type: "/akash.market.v1beta2.QueryLeaseRequest";
   value: QueryLeaseRequestAmino;
 }
@@ -286,7 +286,7 @@ export interface QueryLeaseResponse {
   lease?: Lease;
   escrowPayment?: FractionalPayment;
 }
-export interface QueryLeaseResponseProtoType {
+export interface QueryLeaseResponseProtoMsg {
   typeUrl: "/akash.market.v1beta2.QueryLeaseResponse";
   value: Uint8Array;
 }
@@ -296,7 +296,7 @@ export interface QueryLeaseResponseAmino {
   lease?: LeaseAmino;
   escrow_payment?: FractionalPaymentAmino;
 }
-export interface QueryLeaseResponseAminoType {
+export interface QueryLeaseResponseAminoMsg {
   type: "/akash.market.v1beta2.QueryLeaseResponse";
   value: QueryLeaseResponseAmino;
 }
@@ -315,6 +315,8 @@ function createBaseQueryOrdersRequest(): QueryOrdersRequest {
 }
 
 export const QueryOrdersRequest = {
+  typeUrl: "/akash.market.v1beta2.QueryOrdersRequest",
+
   encode(message: QueryOrdersRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.filters !== undefined) {
       OrderFilters.encode(message.filters, writer.uint32(10).fork()).ldelim();
@@ -400,6 +402,25 @@ export const QueryOrdersRequest = {
     obj.filters = message.filters ? OrderFilters.toAmino(message.filters) : undefined;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryOrdersRequestAminoMsg): QueryOrdersRequest {
+    return QueryOrdersRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryOrdersRequestProtoMsg): QueryOrdersRequest {
+    return QueryOrdersRequest.decode(message.value);
+  },
+
+  toProto(message: QueryOrdersRequest): Uint8Array {
+    return QueryOrdersRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryOrdersRequest): QueryOrdersRequestProtoMsg {
+    return {
+      typeUrl: "/akash.market.v1beta2.QueryOrdersRequest",
+      value: QueryOrdersRequest.encode(message).finish()
+    };
   }
 
 };
@@ -412,6 +433,8 @@ function createBaseQueryOrdersResponse(): QueryOrdersResponse {
 }
 
 export const QueryOrdersResponse = {
+  typeUrl: "/akash.market.v1beta2.QueryOrdersResponse",
+
   encode(message: QueryOrdersResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.orders) {
       Order.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -515,6 +538,25 @@ export const QueryOrdersResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryOrdersResponseAminoMsg): QueryOrdersResponse {
+    return QueryOrdersResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryOrdersResponseProtoMsg): QueryOrdersResponse {
+    return QueryOrdersResponse.decode(message.value);
+  },
+
+  toProto(message: QueryOrdersResponse): Uint8Array {
+    return QueryOrdersResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryOrdersResponse): QueryOrdersResponseProtoMsg {
+    return {
+      typeUrl: "/akash.market.v1beta2.QueryOrdersResponse",
+      value: QueryOrdersResponse.encode(message).finish()
+    };
   }
 
 };
@@ -526,6 +568,8 @@ function createBaseQueryOrderRequest(): QueryOrderRequest {
 }
 
 export const QueryOrderRequest = {
+  typeUrl: "/akash.market.v1beta2.QueryOrderRequest",
+
   encode(message: QueryOrderRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.id !== undefined) {
       OrderID.encode(message.id, writer.uint32(10).fork()).ldelim();
@@ -596,6 +640,25 @@ export const QueryOrderRequest = {
     const obj: any = {};
     obj.id = message.id ? OrderID.toAmino(message.id) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryOrderRequestAminoMsg): QueryOrderRequest {
+    return QueryOrderRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryOrderRequestProtoMsg): QueryOrderRequest {
+    return QueryOrderRequest.decode(message.value);
+  },
+
+  toProto(message: QueryOrderRequest): Uint8Array {
+    return QueryOrderRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryOrderRequest): QueryOrderRequestProtoMsg {
+    return {
+      typeUrl: "/akash.market.v1beta2.QueryOrderRequest",
+      value: QueryOrderRequest.encode(message).finish()
+    };
   }
 
 };
@@ -607,6 +670,8 @@ function createBaseQueryOrderResponse(): QueryOrderResponse {
 }
 
 export const QueryOrderResponse = {
+  typeUrl: "/akash.market.v1beta2.QueryOrderResponse",
+
   encode(message: QueryOrderResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.order !== undefined) {
       Order.encode(message.order, writer.uint32(10).fork()).ldelim();
@@ -677,6 +742,25 @@ export const QueryOrderResponse = {
     const obj: any = {};
     obj.order = message.order ? Order.toAmino(message.order) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryOrderResponseAminoMsg): QueryOrderResponse {
+    return QueryOrderResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryOrderResponseProtoMsg): QueryOrderResponse {
+    return QueryOrderResponse.decode(message.value);
+  },
+
+  toProto(message: QueryOrderResponse): Uint8Array {
+    return QueryOrderResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryOrderResponse): QueryOrderResponseProtoMsg {
+    return {
+      typeUrl: "/akash.market.v1beta2.QueryOrderResponse",
+      value: QueryOrderResponse.encode(message).finish()
+    };
   }
 
 };
@@ -689,6 +773,8 @@ function createBaseQueryBidsRequest(): QueryBidsRequest {
 }
 
 export const QueryBidsRequest = {
+  typeUrl: "/akash.market.v1beta2.QueryBidsRequest",
+
   encode(message: QueryBidsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.filters !== undefined) {
       BidFilters.encode(message.filters, writer.uint32(10).fork()).ldelim();
@@ -774,6 +860,25 @@ export const QueryBidsRequest = {
     obj.filters = message.filters ? BidFilters.toAmino(message.filters) : undefined;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryBidsRequestAminoMsg): QueryBidsRequest {
+    return QueryBidsRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryBidsRequestProtoMsg): QueryBidsRequest {
+    return QueryBidsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryBidsRequest): Uint8Array {
+    return QueryBidsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryBidsRequest): QueryBidsRequestProtoMsg {
+    return {
+      typeUrl: "/akash.market.v1beta2.QueryBidsRequest",
+      value: QueryBidsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -786,6 +891,8 @@ function createBaseQueryBidsResponse(): QueryBidsResponse {
 }
 
 export const QueryBidsResponse = {
+  typeUrl: "/akash.market.v1beta2.QueryBidsResponse",
+
   encode(message: QueryBidsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.bids) {
       QueryBidResponse.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -889,6 +996,25 @@ export const QueryBidsResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryBidsResponseAminoMsg): QueryBidsResponse {
+    return QueryBidsResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryBidsResponseProtoMsg): QueryBidsResponse {
+    return QueryBidsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryBidsResponse): Uint8Array {
+    return QueryBidsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryBidsResponse): QueryBidsResponseProtoMsg {
+    return {
+      typeUrl: "/akash.market.v1beta2.QueryBidsResponse",
+      value: QueryBidsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -900,6 +1026,8 @@ function createBaseQueryBidRequest(): QueryBidRequest {
 }
 
 export const QueryBidRequest = {
+  typeUrl: "/akash.market.v1beta2.QueryBidRequest",
+
   encode(message: QueryBidRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.id !== undefined) {
       BidID.encode(message.id, writer.uint32(10).fork()).ldelim();
@@ -970,6 +1098,25 @@ export const QueryBidRequest = {
     const obj: any = {};
     obj.id = message.id ? BidID.toAmino(message.id) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryBidRequestAminoMsg): QueryBidRequest {
+    return QueryBidRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryBidRequestProtoMsg): QueryBidRequest {
+    return QueryBidRequest.decode(message.value);
+  },
+
+  toProto(message: QueryBidRequest): Uint8Array {
+    return QueryBidRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryBidRequest): QueryBidRequestProtoMsg {
+    return {
+      typeUrl: "/akash.market.v1beta2.QueryBidRequest",
+      value: QueryBidRequest.encode(message).finish()
+    };
   }
 
 };
@@ -982,6 +1129,8 @@ function createBaseQueryBidResponse(): QueryBidResponse {
 }
 
 export const QueryBidResponse = {
+  typeUrl: "/akash.market.v1beta2.QueryBidResponse",
+
   encode(message: QueryBidResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.bid !== undefined) {
       Bid.encode(message.bid, writer.uint32(10).fork()).ldelim();
@@ -1067,6 +1216,25 @@ export const QueryBidResponse = {
     obj.bid = message.bid ? Bid.toAmino(message.bid) : undefined;
     obj.escrow_account = message.escrowAccount ? Account.toAmino(message.escrowAccount) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryBidResponseAminoMsg): QueryBidResponse {
+    return QueryBidResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryBidResponseProtoMsg): QueryBidResponse {
+    return QueryBidResponse.decode(message.value);
+  },
+
+  toProto(message: QueryBidResponse): Uint8Array {
+    return QueryBidResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryBidResponse): QueryBidResponseProtoMsg {
+    return {
+      typeUrl: "/akash.market.v1beta2.QueryBidResponse",
+      value: QueryBidResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1079,6 +1247,8 @@ function createBaseQueryLeasesRequest(): QueryLeasesRequest {
 }
 
 export const QueryLeasesRequest = {
+  typeUrl: "/akash.market.v1beta2.QueryLeasesRequest",
+
   encode(message: QueryLeasesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.filters !== undefined) {
       LeaseFilters.encode(message.filters, writer.uint32(10).fork()).ldelim();
@@ -1164,6 +1334,25 @@ export const QueryLeasesRequest = {
     obj.filters = message.filters ? LeaseFilters.toAmino(message.filters) : undefined;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryLeasesRequestAminoMsg): QueryLeasesRequest {
+    return QueryLeasesRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryLeasesRequestProtoMsg): QueryLeasesRequest {
+    return QueryLeasesRequest.decode(message.value);
+  },
+
+  toProto(message: QueryLeasesRequest): Uint8Array {
+    return QueryLeasesRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryLeasesRequest): QueryLeasesRequestProtoMsg {
+    return {
+      typeUrl: "/akash.market.v1beta2.QueryLeasesRequest",
+      value: QueryLeasesRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1176,6 +1365,8 @@ function createBaseQueryLeasesResponse(): QueryLeasesResponse {
 }
 
 export const QueryLeasesResponse = {
+  typeUrl: "/akash.market.v1beta2.QueryLeasesResponse",
+
   encode(message: QueryLeasesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.leases) {
       QueryLeaseResponse.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1279,6 +1470,25 @@ export const QueryLeasesResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryLeasesResponseAminoMsg): QueryLeasesResponse {
+    return QueryLeasesResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryLeasesResponseProtoMsg): QueryLeasesResponse {
+    return QueryLeasesResponse.decode(message.value);
+  },
+
+  toProto(message: QueryLeasesResponse): Uint8Array {
+    return QueryLeasesResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryLeasesResponse): QueryLeasesResponseProtoMsg {
+    return {
+      typeUrl: "/akash.market.v1beta2.QueryLeasesResponse",
+      value: QueryLeasesResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1290,6 +1500,8 @@ function createBaseQueryLeaseRequest(): QueryLeaseRequest {
 }
 
 export const QueryLeaseRequest = {
+  typeUrl: "/akash.market.v1beta2.QueryLeaseRequest",
+
   encode(message: QueryLeaseRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.id !== undefined) {
       LeaseID.encode(message.id, writer.uint32(10).fork()).ldelim();
@@ -1360,6 +1572,25 @@ export const QueryLeaseRequest = {
     const obj: any = {};
     obj.id = message.id ? LeaseID.toAmino(message.id) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryLeaseRequestAminoMsg): QueryLeaseRequest {
+    return QueryLeaseRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryLeaseRequestProtoMsg): QueryLeaseRequest {
+    return QueryLeaseRequest.decode(message.value);
+  },
+
+  toProto(message: QueryLeaseRequest): Uint8Array {
+    return QueryLeaseRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryLeaseRequest): QueryLeaseRequestProtoMsg {
+    return {
+      typeUrl: "/akash.market.v1beta2.QueryLeaseRequest",
+      value: QueryLeaseRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1372,6 +1603,8 @@ function createBaseQueryLeaseResponse(): QueryLeaseResponse {
 }
 
 export const QueryLeaseResponse = {
+  typeUrl: "/akash.market.v1beta2.QueryLeaseResponse",
+
   encode(message: QueryLeaseResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.lease !== undefined) {
       Lease.encode(message.lease, writer.uint32(10).fork()).ldelim();
@@ -1457,6 +1690,25 @@ export const QueryLeaseResponse = {
     obj.lease = message.lease ? Lease.toAmino(message.lease) : undefined;
     obj.escrow_payment = message.escrowPayment ? FractionalPayment.toAmino(message.escrowPayment) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryLeaseResponseAminoMsg): QueryLeaseResponse {
+    return QueryLeaseResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryLeaseResponseProtoMsg): QueryLeaseResponse {
+    return QueryLeaseResponse.decode(message.value);
+  },
+
+  toProto(message: QueryLeaseResponse): Uint8Array {
+    return QueryLeaseResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryLeaseResponse): QueryLeaseResponseProtoMsg {
+    return {
+      typeUrl: "/akash.market.v1beta2.QueryLeaseResponse",
+      value: QueryLeaseResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/akash/provider/v1beta1/provider.ts b/__fixtures__/outputv2/akash/provider/v1beta1/provider.ts
index f54958e1c..42f23d1f7 100644
--- a/__fixtures__/outputv2/akash/provider/v1beta1/provider.ts
+++ b/__fixtures__/outputv2/akash/provider/v1beta1/provider.ts
@@ -8,7 +8,7 @@ export interface ProviderInfo {
   email: string;
   website: string;
 }
-export interface ProviderInfoProtoType {
+export interface ProviderInfoProtoMsg {
   typeUrl: "/akash.provider.v1beta1.ProviderInfo";
   value: Uint8Array;
 }
@@ -18,7 +18,7 @@ export interface ProviderInfoAmino {
   email: string;
   website: string;
 }
-export interface ProviderInfoAminoType {
+export interface ProviderInfoAminoMsg {
   type: "/akash.provider.v1beta1.ProviderInfo";
   value: ProviderInfoAmino;
 }
@@ -36,7 +36,7 @@ export interface MsgCreateProvider {
   attributes: Attribute[];
   info?: ProviderInfo;
 }
-export interface MsgCreateProviderProtoType {
+export interface MsgCreateProviderProtoMsg {
   typeUrl: "/akash.provider.v1beta1.MsgCreateProvider";
   value: Uint8Array;
 }
@@ -48,7 +48,7 @@ export interface MsgCreateProviderAmino {
   attributes: AttributeAmino[];
   info?: ProviderInfoAmino;
 }
-export interface MsgCreateProviderAminoType {
+export interface MsgCreateProviderAminoMsg {
   type: "/akash.provider.v1beta1.MsgCreateProvider";
   value: MsgCreateProviderAmino;
 }
@@ -63,14 +63,14 @@ export interface MsgCreateProviderSDKType {
 
 /** MsgCreateProviderResponse defines the Msg/CreateProvider response type. */
 export interface MsgCreateProviderResponse {}
-export interface MsgCreateProviderResponseProtoType {
+export interface MsgCreateProviderResponseProtoMsg {
   typeUrl: "/akash.provider.v1beta1.MsgCreateProviderResponse";
   value: Uint8Array;
 }
 
 /** MsgCreateProviderResponse defines the Msg/CreateProvider response type. */
 export interface MsgCreateProviderResponseAmino {}
-export interface MsgCreateProviderResponseAminoType {
+export interface MsgCreateProviderResponseAminoMsg {
   type: "/akash.provider.v1beta1.MsgCreateProviderResponse";
   value: MsgCreateProviderResponseAmino;
 }
@@ -85,7 +85,7 @@ export interface MsgUpdateProvider {
   attributes: Attribute[];
   info?: ProviderInfo;
 }
-export interface MsgUpdateProviderProtoType {
+export interface MsgUpdateProviderProtoMsg {
   typeUrl: "/akash.provider.v1beta1.MsgUpdateProvider";
   value: Uint8Array;
 }
@@ -97,7 +97,7 @@ export interface MsgUpdateProviderAmino {
   attributes: AttributeAmino[];
   info?: ProviderInfoAmino;
 }
-export interface MsgUpdateProviderAminoType {
+export interface MsgUpdateProviderAminoMsg {
   type: "/akash.provider.v1beta1.MsgUpdateProvider";
   value: MsgUpdateProviderAmino;
 }
@@ -112,14 +112,14 @@ export interface MsgUpdateProviderSDKType {
 
 /** MsgUpdateProviderResponse defines the Msg/UpdateProvider response type. */
 export interface MsgUpdateProviderResponse {}
-export interface MsgUpdateProviderResponseProtoType {
+export interface MsgUpdateProviderResponseProtoMsg {
   typeUrl: "/akash.provider.v1beta1.MsgUpdateProviderResponse";
   value: Uint8Array;
 }
 
 /** MsgUpdateProviderResponse defines the Msg/UpdateProvider response type. */
 export interface MsgUpdateProviderResponseAmino {}
-export interface MsgUpdateProviderResponseAminoType {
+export interface MsgUpdateProviderResponseAminoMsg {
   type: "/akash.provider.v1beta1.MsgUpdateProviderResponse";
   value: MsgUpdateProviderResponseAmino;
 }
@@ -131,7 +131,7 @@ export interface MsgUpdateProviderResponseSDKType {}
 export interface MsgDeleteProvider {
   owner: string;
 }
-export interface MsgDeleteProviderProtoType {
+export interface MsgDeleteProviderProtoMsg {
   typeUrl: "/akash.provider.v1beta1.MsgDeleteProvider";
   value: Uint8Array;
 }
@@ -140,7 +140,7 @@ export interface MsgDeleteProviderProtoType {
 export interface MsgDeleteProviderAmino {
   owner: string;
 }
-export interface MsgDeleteProviderAminoType {
+export interface MsgDeleteProviderAminoMsg {
   type: "/akash.provider.v1beta1.MsgDeleteProvider";
   value: MsgDeleteProviderAmino;
 }
@@ -152,14 +152,14 @@ export interface MsgDeleteProviderSDKType {
 
 /** MsgDeleteProviderResponse defines the Msg/DeleteProvider response type. */
 export interface MsgDeleteProviderResponse {}
-export interface MsgDeleteProviderResponseProtoType {
+export interface MsgDeleteProviderResponseProtoMsg {
   typeUrl: "/akash.provider.v1beta1.MsgDeleteProviderResponse";
   value: Uint8Array;
 }
 
 /** MsgDeleteProviderResponse defines the Msg/DeleteProvider response type. */
 export interface MsgDeleteProviderResponseAmino {}
-export interface MsgDeleteProviderResponseAminoType {
+export interface MsgDeleteProviderResponseAminoMsg {
   type: "/akash.provider.v1beta1.MsgDeleteProviderResponse";
   value: MsgDeleteProviderResponseAmino;
 }
@@ -174,7 +174,7 @@ export interface Provider {
   attributes: Attribute[];
   info?: ProviderInfo;
 }
-export interface ProviderProtoType {
+export interface ProviderProtoMsg {
   typeUrl: "/akash.provider.v1beta1.Provider";
   value: Uint8Array;
 }
@@ -186,7 +186,7 @@ export interface ProviderAmino {
   attributes: AttributeAmino[];
   info?: ProviderInfoAmino;
 }
-export interface ProviderAminoType {
+export interface ProviderAminoMsg {
   type: "/akash.provider.v1beta1.Provider";
   value: ProviderAmino;
 }
@@ -207,6 +207,8 @@ function createBaseProviderInfo(): ProviderInfo {
 }
 
 export const ProviderInfo = {
+  typeUrl: "/akash.provider.v1beta1.ProviderInfo",
+
   encode(message: ProviderInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.email !== "") {
       writer.uint32(10).string(message.email);
@@ -292,6 +294,25 @@ export const ProviderInfo = {
     obj.email = message.email;
     obj.website = message.website;
     return obj;
+  },
+
+  fromAminoMsg(object: ProviderInfoAminoMsg): ProviderInfo {
+    return ProviderInfo.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ProviderInfoProtoMsg): ProviderInfo {
+    return ProviderInfo.decode(message.value);
+  },
+
+  toProto(message: ProviderInfo): Uint8Array {
+    return ProviderInfo.encode(message).finish();
+  },
+
+  toProtoMsg(message: ProviderInfo): ProviderInfoProtoMsg {
+    return {
+      typeUrl: "/akash.provider.v1beta1.ProviderInfo",
+      value: ProviderInfo.encode(message).finish()
+    };
   }
 
 };
@@ -306,6 +327,8 @@ function createBaseMsgCreateProvider(): MsgCreateProvider {
 }
 
 export const MsgCreateProvider = {
+  typeUrl: "/akash.provider.v1beta1.MsgCreateProvider",
+
   encode(message: MsgCreateProvider, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.owner !== "") {
       writer.uint32(10).string(message.owner);
@@ -439,6 +462,25 @@ export const MsgCreateProvider = {
 
     obj.info = message.info ? ProviderInfo.toAmino(message.info) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCreateProviderAminoMsg): MsgCreateProvider {
+    return MsgCreateProvider.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgCreateProviderProtoMsg): MsgCreateProvider {
+    return MsgCreateProvider.decode(message.value);
+  },
+
+  toProto(message: MsgCreateProvider): Uint8Array {
+    return MsgCreateProvider.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCreateProvider): MsgCreateProviderProtoMsg {
+    return {
+      typeUrl: "/akash.provider.v1beta1.MsgCreateProvider",
+      value: MsgCreateProvider.encode(message).finish()
+    };
   }
 
 };
@@ -448,6 +490,8 @@ function createBaseMsgCreateProviderResponse(): MsgCreateProviderResponse {
 }
 
 export const MsgCreateProviderResponse = {
+  typeUrl: "/akash.provider.v1beta1.MsgCreateProviderResponse",
+
   encode(_: MsgCreateProviderResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -500,6 +544,25 @@ export const MsgCreateProviderResponse = {
   toAmino(_: MsgCreateProviderResponse): MsgCreateProviderResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCreateProviderResponseAminoMsg): MsgCreateProviderResponse {
+    return MsgCreateProviderResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgCreateProviderResponseProtoMsg): MsgCreateProviderResponse {
+    return MsgCreateProviderResponse.decode(message.value);
+  },
+
+  toProto(message: MsgCreateProviderResponse): Uint8Array {
+    return MsgCreateProviderResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCreateProviderResponse): MsgCreateProviderResponseProtoMsg {
+    return {
+      typeUrl: "/akash.provider.v1beta1.MsgCreateProviderResponse",
+      value: MsgCreateProviderResponse.encode(message).finish()
+    };
   }
 
 };
@@ -514,6 +577,8 @@ function createBaseMsgUpdateProvider(): MsgUpdateProvider {
 }
 
 export const MsgUpdateProvider = {
+  typeUrl: "/akash.provider.v1beta1.MsgUpdateProvider",
+
   encode(message: MsgUpdateProvider, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.owner !== "") {
       writer.uint32(10).string(message.owner);
@@ -647,6 +712,25 @@ export const MsgUpdateProvider = {
 
     obj.info = message.info ? ProviderInfo.toAmino(message.info) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgUpdateProviderAminoMsg): MsgUpdateProvider {
+    return MsgUpdateProvider.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgUpdateProviderProtoMsg): MsgUpdateProvider {
+    return MsgUpdateProvider.decode(message.value);
+  },
+
+  toProto(message: MsgUpdateProvider): Uint8Array {
+    return MsgUpdateProvider.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgUpdateProvider): MsgUpdateProviderProtoMsg {
+    return {
+      typeUrl: "/akash.provider.v1beta1.MsgUpdateProvider",
+      value: MsgUpdateProvider.encode(message).finish()
+    };
   }
 
 };
@@ -656,6 +740,8 @@ function createBaseMsgUpdateProviderResponse(): MsgUpdateProviderResponse {
 }
 
 export const MsgUpdateProviderResponse = {
+  typeUrl: "/akash.provider.v1beta1.MsgUpdateProviderResponse",
+
   encode(_: MsgUpdateProviderResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -708,6 +794,25 @@ export const MsgUpdateProviderResponse = {
   toAmino(_: MsgUpdateProviderResponse): MsgUpdateProviderResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgUpdateProviderResponseAminoMsg): MsgUpdateProviderResponse {
+    return MsgUpdateProviderResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgUpdateProviderResponseProtoMsg): MsgUpdateProviderResponse {
+    return MsgUpdateProviderResponse.decode(message.value);
+  },
+
+  toProto(message: MsgUpdateProviderResponse): Uint8Array {
+    return MsgUpdateProviderResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgUpdateProviderResponse): MsgUpdateProviderResponseProtoMsg {
+    return {
+      typeUrl: "/akash.provider.v1beta1.MsgUpdateProviderResponse",
+      value: MsgUpdateProviderResponse.encode(message).finish()
+    };
   }
 
 };
@@ -719,6 +824,8 @@ function createBaseMsgDeleteProvider(): MsgDeleteProvider {
 }
 
 export const MsgDeleteProvider = {
+  typeUrl: "/akash.provider.v1beta1.MsgDeleteProvider",
+
   encode(message: MsgDeleteProvider, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.owner !== "") {
       writer.uint32(10).string(message.owner);
@@ -789,6 +896,25 @@ export const MsgDeleteProvider = {
     const obj: any = {};
     obj.owner = message.owner;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgDeleteProviderAminoMsg): MsgDeleteProvider {
+    return MsgDeleteProvider.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgDeleteProviderProtoMsg): MsgDeleteProvider {
+    return MsgDeleteProvider.decode(message.value);
+  },
+
+  toProto(message: MsgDeleteProvider): Uint8Array {
+    return MsgDeleteProvider.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgDeleteProvider): MsgDeleteProviderProtoMsg {
+    return {
+      typeUrl: "/akash.provider.v1beta1.MsgDeleteProvider",
+      value: MsgDeleteProvider.encode(message).finish()
+    };
   }
 
 };
@@ -798,6 +924,8 @@ function createBaseMsgDeleteProviderResponse(): MsgDeleteProviderResponse {
 }
 
 export const MsgDeleteProviderResponse = {
+  typeUrl: "/akash.provider.v1beta1.MsgDeleteProviderResponse",
+
   encode(_: MsgDeleteProviderResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -850,6 +978,25 @@ export const MsgDeleteProviderResponse = {
   toAmino(_: MsgDeleteProviderResponse): MsgDeleteProviderResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgDeleteProviderResponseAminoMsg): MsgDeleteProviderResponse {
+    return MsgDeleteProviderResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgDeleteProviderResponseProtoMsg): MsgDeleteProviderResponse {
+    return MsgDeleteProviderResponse.decode(message.value);
+  },
+
+  toProto(message: MsgDeleteProviderResponse): Uint8Array {
+    return MsgDeleteProviderResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgDeleteProviderResponse): MsgDeleteProviderResponseProtoMsg {
+    return {
+      typeUrl: "/akash.provider.v1beta1.MsgDeleteProviderResponse",
+      value: MsgDeleteProviderResponse.encode(message).finish()
+    };
   }
 
 };
@@ -864,6 +1011,8 @@ function createBaseProvider(): Provider {
 }
 
 export const Provider = {
+  typeUrl: "/akash.provider.v1beta1.Provider",
+
   encode(message: Provider, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.owner !== "") {
       writer.uint32(10).string(message.owner);
@@ -997,6 +1146,25 @@ export const Provider = {
 
     obj.info = message.info ? ProviderInfo.toAmino(message.info) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ProviderAminoMsg): Provider {
+    return Provider.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ProviderProtoMsg): Provider {
+    return Provider.decode(message.value);
+  },
+
+  toProto(message: Provider): Uint8Array {
+    return Provider.encode(message).finish();
+  },
+
+  toProtoMsg(message: Provider): ProviderProtoMsg {
+    return {
+      typeUrl: "/akash.provider.v1beta1.Provider",
+      value: Provider.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/akash/provider/v1beta2/genesis.ts b/__fixtures__/outputv2/akash/provider/v1beta2/genesis.ts
index f45c53de4..ac397f770 100644
--- a/__fixtures__/outputv2/akash/provider/v1beta2/genesis.ts
+++ b/__fixtures__/outputv2/akash/provider/v1beta2/genesis.ts
@@ -7,7 +7,7 @@ export const protobufPackage = "akash.provider.v1beta2";
 export interface GenesisState {
   providers: Provider[];
 }
-export interface GenesisStateProtoType {
+export interface GenesisStateProtoMsg {
   typeUrl: "/akash.provider.v1beta2.GenesisState";
   value: Uint8Array;
 }
@@ -16,7 +16,7 @@ export interface GenesisStateProtoType {
 export interface GenesisStateAmino {
   providers: ProviderAmino[];
 }
-export interface GenesisStateAminoType {
+export interface GenesisStateAminoMsg {
   type: "/akash.provider.v1beta2.GenesisState";
   value: GenesisStateAmino;
 }
@@ -33,6 +33,8 @@ function createBaseGenesisState(): GenesisState {
 }
 
 export const GenesisState = {
+  typeUrl: "/akash.provider.v1beta2.GenesisState",
+
   encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.providers) {
       Provider.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -121,6 +123,25 @@ export const GenesisState = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisStateAminoMsg): GenesisState {
+    return GenesisState.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: GenesisStateProtoMsg): GenesisState {
+    return GenesisState.decode(message.value);
+  },
+
+  toProto(message: GenesisState): Uint8Array {
+    return GenesisState.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisState): GenesisStateProtoMsg {
+    return {
+      typeUrl: "/akash.provider.v1beta2.GenesisState",
+      value: GenesisState.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/akash/provider/v1beta2/provider.ts b/__fixtures__/outputv2/akash/provider/v1beta2/provider.ts
index f48849eda..1308db2a4 100644
--- a/__fixtures__/outputv2/akash/provider/v1beta2/provider.ts
+++ b/__fixtures__/outputv2/akash/provider/v1beta2/provider.ts
@@ -8,7 +8,7 @@ export interface ProviderInfo {
   email: string;
   website: string;
 }
-export interface ProviderInfoProtoType {
+export interface ProviderInfoProtoMsg {
   typeUrl: "/akash.provider.v1beta2.ProviderInfo";
   value: Uint8Array;
 }
@@ -18,7 +18,7 @@ export interface ProviderInfoAmino {
   email: string;
   website: string;
 }
-export interface ProviderInfoAminoType {
+export interface ProviderInfoAminoMsg {
   type: "/akash.provider.v1beta2.ProviderInfo";
   value: ProviderInfoAmino;
 }
@@ -36,7 +36,7 @@ export interface MsgCreateProvider {
   attributes: Attribute[];
   info?: ProviderInfo;
 }
-export interface MsgCreateProviderProtoType {
+export interface MsgCreateProviderProtoMsg {
   typeUrl: "/akash.provider.v1beta2.MsgCreateProvider";
   value: Uint8Array;
 }
@@ -48,7 +48,7 @@ export interface MsgCreateProviderAmino {
   attributes: AttributeAmino[];
   info?: ProviderInfoAmino;
 }
-export interface MsgCreateProviderAminoType {
+export interface MsgCreateProviderAminoMsg {
   type: "/akash.provider.v1beta2.MsgCreateProvider";
   value: MsgCreateProviderAmino;
 }
@@ -63,14 +63,14 @@ export interface MsgCreateProviderSDKType {
 
 /** MsgCreateProviderResponse defines the Msg/CreateProvider response type. */
 export interface MsgCreateProviderResponse {}
-export interface MsgCreateProviderResponseProtoType {
+export interface MsgCreateProviderResponseProtoMsg {
   typeUrl: "/akash.provider.v1beta2.MsgCreateProviderResponse";
   value: Uint8Array;
 }
 
 /** MsgCreateProviderResponse defines the Msg/CreateProvider response type. */
 export interface MsgCreateProviderResponseAmino {}
-export interface MsgCreateProviderResponseAminoType {
+export interface MsgCreateProviderResponseAminoMsg {
   type: "/akash.provider.v1beta2.MsgCreateProviderResponse";
   value: MsgCreateProviderResponseAmino;
 }
@@ -85,7 +85,7 @@ export interface MsgUpdateProvider {
   attributes: Attribute[];
   info?: ProviderInfo;
 }
-export interface MsgUpdateProviderProtoType {
+export interface MsgUpdateProviderProtoMsg {
   typeUrl: "/akash.provider.v1beta2.MsgUpdateProvider";
   value: Uint8Array;
 }
@@ -97,7 +97,7 @@ export interface MsgUpdateProviderAmino {
   attributes: AttributeAmino[];
   info?: ProviderInfoAmino;
 }
-export interface MsgUpdateProviderAminoType {
+export interface MsgUpdateProviderAminoMsg {
   type: "/akash.provider.v1beta2.MsgUpdateProvider";
   value: MsgUpdateProviderAmino;
 }
@@ -112,14 +112,14 @@ export interface MsgUpdateProviderSDKType {
 
 /** MsgUpdateProviderResponse defines the Msg/UpdateProvider response type. */
 export interface MsgUpdateProviderResponse {}
-export interface MsgUpdateProviderResponseProtoType {
+export interface MsgUpdateProviderResponseProtoMsg {
   typeUrl: "/akash.provider.v1beta2.MsgUpdateProviderResponse";
   value: Uint8Array;
 }
 
 /** MsgUpdateProviderResponse defines the Msg/UpdateProvider response type. */
 export interface MsgUpdateProviderResponseAmino {}
-export interface MsgUpdateProviderResponseAminoType {
+export interface MsgUpdateProviderResponseAminoMsg {
   type: "/akash.provider.v1beta2.MsgUpdateProviderResponse";
   value: MsgUpdateProviderResponseAmino;
 }
@@ -131,7 +131,7 @@ export interface MsgUpdateProviderResponseSDKType {}
 export interface MsgDeleteProvider {
   owner: string;
 }
-export interface MsgDeleteProviderProtoType {
+export interface MsgDeleteProviderProtoMsg {
   typeUrl: "/akash.provider.v1beta2.MsgDeleteProvider";
   value: Uint8Array;
 }
@@ -140,7 +140,7 @@ export interface MsgDeleteProviderProtoType {
 export interface MsgDeleteProviderAmino {
   owner: string;
 }
-export interface MsgDeleteProviderAminoType {
+export interface MsgDeleteProviderAminoMsg {
   type: "/akash.provider.v1beta2.MsgDeleteProvider";
   value: MsgDeleteProviderAmino;
 }
@@ -152,14 +152,14 @@ export interface MsgDeleteProviderSDKType {
 
 /** MsgDeleteProviderResponse defines the Msg/DeleteProvider response type. */
 export interface MsgDeleteProviderResponse {}
-export interface MsgDeleteProviderResponseProtoType {
+export interface MsgDeleteProviderResponseProtoMsg {
   typeUrl: "/akash.provider.v1beta2.MsgDeleteProviderResponse";
   value: Uint8Array;
 }
 
 /** MsgDeleteProviderResponse defines the Msg/DeleteProvider response type. */
 export interface MsgDeleteProviderResponseAmino {}
-export interface MsgDeleteProviderResponseAminoType {
+export interface MsgDeleteProviderResponseAminoMsg {
   type: "/akash.provider.v1beta2.MsgDeleteProviderResponse";
   value: MsgDeleteProviderResponseAmino;
 }
@@ -174,7 +174,7 @@ export interface Provider {
   attributes: Attribute[];
   info?: ProviderInfo;
 }
-export interface ProviderProtoType {
+export interface ProviderProtoMsg {
   typeUrl: "/akash.provider.v1beta2.Provider";
   value: Uint8Array;
 }
@@ -186,7 +186,7 @@ export interface ProviderAmino {
   attributes: AttributeAmino[];
   info?: ProviderInfoAmino;
 }
-export interface ProviderAminoType {
+export interface ProviderAminoMsg {
   type: "/akash.provider.v1beta2.Provider";
   value: ProviderAmino;
 }
@@ -207,6 +207,8 @@ function createBaseProviderInfo(): ProviderInfo {
 }
 
 export const ProviderInfo = {
+  typeUrl: "/akash.provider.v1beta2.ProviderInfo",
+
   encode(message: ProviderInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.email !== "") {
       writer.uint32(10).string(message.email);
@@ -292,6 +294,25 @@ export const ProviderInfo = {
     obj.email = message.email;
     obj.website = message.website;
     return obj;
+  },
+
+  fromAminoMsg(object: ProviderInfoAminoMsg): ProviderInfo {
+    return ProviderInfo.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ProviderInfoProtoMsg): ProviderInfo {
+    return ProviderInfo.decode(message.value);
+  },
+
+  toProto(message: ProviderInfo): Uint8Array {
+    return ProviderInfo.encode(message).finish();
+  },
+
+  toProtoMsg(message: ProviderInfo): ProviderInfoProtoMsg {
+    return {
+      typeUrl: "/akash.provider.v1beta2.ProviderInfo",
+      value: ProviderInfo.encode(message).finish()
+    };
   }
 
 };
@@ -306,6 +327,8 @@ function createBaseMsgCreateProvider(): MsgCreateProvider {
 }
 
 export const MsgCreateProvider = {
+  typeUrl: "/akash.provider.v1beta2.MsgCreateProvider",
+
   encode(message: MsgCreateProvider, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.owner !== "") {
       writer.uint32(10).string(message.owner);
@@ -439,6 +462,25 @@ export const MsgCreateProvider = {
 
     obj.info = message.info ? ProviderInfo.toAmino(message.info) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCreateProviderAminoMsg): MsgCreateProvider {
+    return MsgCreateProvider.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgCreateProviderProtoMsg): MsgCreateProvider {
+    return MsgCreateProvider.decode(message.value);
+  },
+
+  toProto(message: MsgCreateProvider): Uint8Array {
+    return MsgCreateProvider.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCreateProvider): MsgCreateProviderProtoMsg {
+    return {
+      typeUrl: "/akash.provider.v1beta2.MsgCreateProvider",
+      value: MsgCreateProvider.encode(message).finish()
+    };
   }
 
 };
@@ -448,6 +490,8 @@ function createBaseMsgCreateProviderResponse(): MsgCreateProviderResponse {
 }
 
 export const MsgCreateProviderResponse = {
+  typeUrl: "/akash.provider.v1beta2.MsgCreateProviderResponse",
+
   encode(_: MsgCreateProviderResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -500,6 +544,25 @@ export const MsgCreateProviderResponse = {
   toAmino(_: MsgCreateProviderResponse): MsgCreateProviderResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCreateProviderResponseAminoMsg): MsgCreateProviderResponse {
+    return MsgCreateProviderResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgCreateProviderResponseProtoMsg): MsgCreateProviderResponse {
+    return MsgCreateProviderResponse.decode(message.value);
+  },
+
+  toProto(message: MsgCreateProviderResponse): Uint8Array {
+    return MsgCreateProviderResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCreateProviderResponse): MsgCreateProviderResponseProtoMsg {
+    return {
+      typeUrl: "/akash.provider.v1beta2.MsgCreateProviderResponse",
+      value: MsgCreateProviderResponse.encode(message).finish()
+    };
   }
 
 };
@@ -514,6 +577,8 @@ function createBaseMsgUpdateProvider(): MsgUpdateProvider {
 }
 
 export const MsgUpdateProvider = {
+  typeUrl: "/akash.provider.v1beta2.MsgUpdateProvider",
+
   encode(message: MsgUpdateProvider, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.owner !== "") {
       writer.uint32(10).string(message.owner);
@@ -647,6 +712,25 @@ export const MsgUpdateProvider = {
 
     obj.info = message.info ? ProviderInfo.toAmino(message.info) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgUpdateProviderAminoMsg): MsgUpdateProvider {
+    return MsgUpdateProvider.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgUpdateProviderProtoMsg): MsgUpdateProvider {
+    return MsgUpdateProvider.decode(message.value);
+  },
+
+  toProto(message: MsgUpdateProvider): Uint8Array {
+    return MsgUpdateProvider.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgUpdateProvider): MsgUpdateProviderProtoMsg {
+    return {
+      typeUrl: "/akash.provider.v1beta2.MsgUpdateProvider",
+      value: MsgUpdateProvider.encode(message).finish()
+    };
   }
 
 };
@@ -656,6 +740,8 @@ function createBaseMsgUpdateProviderResponse(): MsgUpdateProviderResponse {
 }
 
 export const MsgUpdateProviderResponse = {
+  typeUrl: "/akash.provider.v1beta2.MsgUpdateProviderResponse",
+
   encode(_: MsgUpdateProviderResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -708,6 +794,25 @@ export const MsgUpdateProviderResponse = {
   toAmino(_: MsgUpdateProviderResponse): MsgUpdateProviderResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgUpdateProviderResponseAminoMsg): MsgUpdateProviderResponse {
+    return MsgUpdateProviderResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgUpdateProviderResponseProtoMsg): MsgUpdateProviderResponse {
+    return MsgUpdateProviderResponse.decode(message.value);
+  },
+
+  toProto(message: MsgUpdateProviderResponse): Uint8Array {
+    return MsgUpdateProviderResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgUpdateProviderResponse): MsgUpdateProviderResponseProtoMsg {
+    return {
+      typeUrl: "/akash.provider.v1beta2.MsgUpdateProviderResponse",
+      value: MsgUpdateProviderResponse.encode(message).finish()
+    };
   }
 
 };
@@ -719,6 +824,8 @@ function createBaseMsgDeleteProvider(): MsgDeleteProvider {
 }
 
 export const MsgDeleteProvider = {
+  typeUrl: "/akash.provider.v1beta2.MsgDeleteProvider",
+
   encode(message: MsgDeleteProvider, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.owner !== "") {
       writer.uint32(10).string(message.owner);
@@ -789,6 +896,25 @@ export const MsgDeleteProvider = {
     const obj: any = {};
     obj.owner = message.owner;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgDeleteProviderAminoMsg): MsgDeleteProvider {
+    return MsgDeleteProvider.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgDeleteProviderProtoMsg): MsgDeleteProvider {
+    return MsgDeleteProvider.decode(message.value);
+  },
+
+  toProto(message: MsgDeleteProvider): Uint8Array {
+    return MsgDeleteProvider.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgDeleteProvider): MsgDeleteProviderProtoMsg {
+    return {
+      typeUrl: "/akash.provider.v1beta2.MsgDeleteProvider",
+      value: MsgDeleteProvider.encode(message).finish()
+    };
   }
 
 };
@@ -798,6 +924,8 @@ function createBaseMsgDeleteProviderResponse(): MsgDeleteProviderResponse {
 }
 
 export const MsgDeleteProviderResponse = {
+  typeUrl: "/akash.provider.v1beta2.MsgDeleteProviderResponse",
+
   encode(_: MsgDeleteProviderResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -850,6 +978,25 @@ export const MsgDeleteProviderResponse = {
   toAmino(_: MsgDeleteProviderResponse): MsgDeleteProviderResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgDeleteProviderResponseAminoMsg): MsgDeleteProviderResponse {
+    return MsgDeleteProviderResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgDeleteProviderResponseProtoMsg): MsgDeleteProviderResponse {
+    return MsgDeleteProviderResponse.decode(message.value);
+  },
+
+  toProto(message: MsgDeleteProviderResponse): Uint8Array {
+    return MsgDeleteProviderResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgDeleteProviderResponse): MsgDeleteProviderResponseProtoMsg {
+    return {
+      typeUrl: "/akash.provider.v1beta2.MsgDeleteProviderResponse",
+      value: MsgDeleteProviderResponse.encode(message).finish()
+    };
   }
 
 };
@@ -864,6 +1011,8 @@ function createBaseProvider(): Provider {
 }
 
 export const Provider = {
+  typeUrl: "/akash.provider.v1beta2.Provider",
+
   encode(message: Provider, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.owner !== "") {
       writer.uint32(10).string(message.owner);
@@ -997,6 +1146,25 @@ export const Provider = {
 
     obj.info = message.info ? ProviderInfo.toAmino(message.info) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ProviderAminoMsg): Provider {
+    return Provider.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ProviderProtoMsg): Provider {
+    return Provider.decode(message.value);
+  },
+
+  toProto(message: Provider): Uint8Array {
+    return Provider.encode(message).finish();
+  },
+
+  toProtoMsg(message: Provider): ProviderProtoMsg {
+    return {
+      typeUrl: "/akash.provider.v1beta2.Provider",
+      value: Provider.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/akash/provider/v1beta2/query.ts b/__fixtures__/outputv2/akash/provider/v1beta2/query.ts
index f2ebfad82..ca05ccbae 100644
--- a/__fixtures__/outputv2/akash/provider/v1beta2/query.ts
+++ b/__fixtures__/outputv2/akash/provider/v1beta2/query.ts
@@ -8,7 +8,7 @@ export const protobufPackage = "akash.provider.v1beta2";
 export interface QueryProvidersRequest {
   pagination?: PageRequest;
 }
-export interface QueryProvidersRequestProtoType {
+export interface QueryProvidersRequestProtoMsg {
   typeUrl: "/akash.provider.v1beta2.QueryProvidersRequest";
   value: Uint8Array;
 }
@@ -17,7 +17,7 @@ export interface QueryProvidersRequestProtoType {
 export interface QueryProvidersRequestAmino {
   pagination?: PageRequestAmino;
 }
-export interface QueryProvidersRequestAminoType {
+export interface QueryProvidersRequestAminoMsg {
   type: "/akash.provider.v1beta2.QueryProvidersRequest";
   value: QueryProvidersRequestAmino;
 }
@@ -32,7 +32,7 @@ export interface QueryProvidersResponse {
   providers: Provider[];
   pagination?: PageResponse;
 }
-export interface QueryProvidersResponseProtoType {
+export interface QueryProvidersResponseProtoMsg {
   typeUrl: "/akash.provider.v1beta2.QueryProvidersResponse";
   value: Uint8Array;
 }
@@ -42,7 +42,7 @@ export interface QueryProvidersResponseAmino {
   providers: ProviderAmino[];
   pagination?: PageResponseAmino;
 }
-export interface QueryProvidersResponseAminoType {
+export interface QueryProvidersResponseAminoMsg {
   type: "/akash.provider.v1beta2.QueryProvidersResponse";
   value: QueryProvidersResponseAmino;
 }
@@ -57,7 +57,7 @@ export interface QueryProvidersResponseSDKType {
 export interface QueryProviderRequest {
   owner: string;
 }
-export interface QueryProviderRequestProtoType {
+export interface QueryProviderRequestProtoMsg {
   typeUrl: "/akash.provider.v1beta2.QueryProviderRequest";
   value: Uint8Array;
 }
@@ -66,7 +66,7 @@ export interface QueryProviderRequestProtoType {
 export interface QueryProviderRequestAmino {
   owner: string;
 }
-export interface QueryProviderRequestAminoType {
+export interface QueryProviderRequestAminoMsg {
   type: "/akash.provider.v1beta2.QueryProviderRequest";
   value: QueryProviderRequestAmino;
 }
@@ -80,7 +80,7 @@ export interface QueryProviderRequestSDKType {
 export interface QueryProviderResponse {
   provider?: Provider;
 }
-export interface QueryProviderResponseProtoType {
+export interface QueryProviderResponseProtoMsg {
   typeUrl: "/akash.provider.v1beta2.QueryProviderResponse";
   value: Uint8Array;
 }
@@ -89,7 +89,7 @@ export interface QueryProviderResponseProtoType {
 export interface QueryProviderResponseAmino {
   provider?: ProviderAmino;
 }
-export interface QueryProviderResponseAminoType {
+export interface QueryProviderResponseAminoMsg {
   type: "/akash.provider.v1beta2.QueryProviderResponse";
   value: QueryProviderResponseAmino;
 }
@@ -106,6 +106,8 @@ function createBaseQueryProvidersRequest(): QueryProvidersRequest {
 }
 
 export const QueryProvidersRequest = {
+  typeUrl: "/akash.provider.v1beta2.QueryProvidersRequest",
+
   encode(message: QueryProvidersRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.pagination !== undefined) {
       PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim();
@@ -176,6 +178,25 @@ export const QueryProvidersRequest = {
     const obj: any = {};
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryProvidersRequestAminoMsg): QueryProvidersRequest {
+    return QueryProvidersRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryProvidersRequestProtoMsg): QueryProvidersRequest {
+    return QueryProvidersRequest.decode(message.value);
+  },
+
+  toProto(message: QueryProvidersRequest): Uint8Array {
+    return QueryProvidersRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryProvidersRequest): QueryProvidersRequestProtoMsg {
+    return {
+      typeUrl: "/akash.provider.v1beta2.QueryProvidersRequest",
+      value: QueryProvidersRequest.encode(message).finish()
+    };
   }
 
 };
@@ -188,6 +209,8 @@ function createBaseQueryProvidersResponse(): QueryProvidersResponse {
 }
 
 export const QueryProvidersResponse = {
+  typeUrl: "/akash.provider.v1beta2.QueryProvidersResponse",
+
   encode(message: QueryProvidersResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.providers) {
       Provider.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -291,6 +314,25 @@ export const QueryProvidersResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryProvidersResponseAminoMsg): QueryProvidersResponse {
+    return QueryProvidersResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryProvidersResponseProtoMsg): QueryProvidersResponse {
+    return QueryProvidersResponse.decode(message.value);
+  },
+
+  toProto(message: QueryProvidersResponse): Uint8Array {
+    return QueryProvidersResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryProvidersResponse): QueryProvidersResponseProtoMsg {
+    return {
+      typeUrl: "/akash.provider.v1beta2.QueryProvidersResponse",
+      value: QueryProvidersResponse.encode(message).finish()
+    };
   }
 
 };
@@ -302,6 +344,8 @@ function createBaseQueryProviderRequest(): QueryProviderRequest {
 }
 
 export const QueryProviderRequest = {
+  typeUrl: "/akash.provider.v1beta2.QueryProviderRequest",
+
   encode(message: QueryProviderRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.owner !== "") {
       writer.uint32(10).string(message.owner);
@@ -372,6 +416,25 @@ export const QueryProviderRequest = {
     const obj: any = {};
     obj.owner = message.owner;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryProviderRequestAminoMsg): QueryProviderRequest {
+    return QueryProviderRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryProviderRequestProtoMsg): QueryProviderRequest {
+    return QueryProviderRequest.decode(message.value);
+  },
+
+  toProto(message: QueryProviderRequest): Uint8Array {
+    return QueryProviderRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryProviderRequest): QueryProviderRequestProtoMsg {
+    return {
+      typeUrl: "/akash.provider.v1beta2.QueryProviderRequest",
+      value: QueryProviderRequest.encode(message).finish()
+    };
   }
 
 };
@@ -383,6 +446,8 @@ function createBaseQueryProviderResponse(): QueryProviderResponse {
 }
 
 export const QueryProviderResponse = {
+  typeUrl: "/akash.provider.v1beta2.QueryProviderResponse",
+
   encode(message: QueryProviderResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.provider !== undefined) {
       Provider.encode(message.provider, writer.uint32(10).fork()).ldelim();
@@ -453,6 +518,25 @@ export const QueryProviderResponse = {
     const obj: any = {};
     obj.provider = message.provider ? Provider.toAmino(message.provider) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryProviderResponseAminoMsg): QueryProviderResponse {
+    return QueryProviderResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryProviderResponseProtoMsg): QueryProviderResponse {
+    return QueryProviderResponse.decode(message.value);
+  },
+
+  toProto(message: QueryProviderResponse): Uint8Array {
+    return QueryProviderResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryProviderResponse): QueryProviderResponseProtoMsg {
+    return {
+      typeUrl: "/akash.provider.v1beta2.QueryProviderResponse",
+      value: QueryProviderResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/confio/proofs.ts b/__fixtures__/outputv2/confio/proofs.ts
index abe870bb7..9475b111f 100644
--- a/__fixtures__/outputv2/confio/proofs.ts
+++ b/__fixtures__/outputv2/confio/proofs.ts
@@ -216,7 +216,7 @@ export interface ExistenceProof {
   leaf?: LeafOp;
   path: InnerOp[];
 }
-export interface ExistenceProofProtoType {
+export interface ExistenceProofProtoMsg {
   typeUrl: "/ics23.ExistenceProof";
   value: Uint8Array;
 }
@@ -248,7 +248,7 @@ export interface ExistenceProofAmino {
   leaf?: LeafOpAmino;
   path: InnerOpAmino[];
 }
-export interface ExistenceProofAminoType {
+export interface ExistenceProofAminoMsg {
   type: "/ics23.ExistenceProof";
   value: ExistenceProofAmino;
 }
@@ -292,7 +292,7 @@ export interface NonExistenceProof {
   left?: ExistenceProof;
   right?: ExistenceProof;
 }
-export interface NonExistenceProofProtoType {
+export interface NonExistenceProofProtoMsg {
   typeUrl: "/ics23.NonExistenceProof";
   value: Uint8Array;
 }
@@ -308,7 +308,7 @@ export interface NonExistenceProofAmino {
   left?: ExistenceProofAmino;
   right?: ExistenceProofAmino;
 }
-export interface NonExistenceProofAminoType {
+export interface NonExistenceProofAminoMsg {
   type: "/ics23.NonExistenceProof";
   value: NonExistenceProofAmino;
 }
@@ -331,7 +331,7 @@ export interface CommitmentProof {
   batch?: BatchProof;
   compressed?: CompressedBatchProof;
 }
-export interface CommitmentProofProtoType {
+export interface CommitmentProofProtoMsg {
   typeUrl: "/ics23.CommitmentProof";
   value: Uint8Array;
 }
@@ -343,7 +343,7 @@ export interface CommitmentProofAmino {
   batch?: BatchProofAmino;
   compressed?: CompressedBatchProofAmino;
 }
-export interface CommitmentProofAminoType {
+export interface CommitmentProofAminoMsg {
   type: "/ics23.CommitmentProof";
   value: CommitmentProofAmino;
 }
@@ -384,7 +384,7 @@ export interface LeafOp {
    */
   prefix: Uint8Array;
 }
-export interface LeafOpProtoType {
+export interface LeafOpProtoMsg {
   typeUrl: "/ics23.LeafOp";
   value: Uint8Array;
 }
@@ -417,7 +417,7 @@ export interface LeafOpAmino {
    */
   prefix: Uint8Array;
 }
-export interface LeafOpAminoType {
+export interface LeafOpAminoMsg {
   type: "/ics23.LeafOp";
   value: LeafOpAmino;
 }
@@ -468,7 +468,7 @@ export interface InnerOp {
   prefix: Uint8Array;
   suffix: Uint8Array;
 }
-export interface InnerOpProtoType {
+export interface InnerOpProtoMsg {
   typeUrl: "/ics23.InnerOp";
   value: Uint8Array;
 }
@@ -495,7 +495,7 @@ export interface InnerOpAmino {
   prefix: Uint8Array;
   suffix: Uint8Array;
 }
-export interface InnerOpAminoType {
+export interface InnerOpAminoMsg {
   type: "/ics23.InnerOp";
   value: InnerOpAmino;
 }
@@ -549,7 +549,7 @@ export interface ProofSpec {
   /** min_depth (if > 0) is the minimum number of InnerOps allowed (mainly for fixed-depth tries) */
   minDepth: number;
 }
-export interface ProofSpecProtoType {
+export interface ProofSpecProtoMsg {
   typeUrl: "/ics23.ProofSpec";
   value: Uint8Array;
 }
@@ -580,7 +580,7 @@ export interface ProofSpecAmino {
   /** min_depth (if > 0) is the minimum number of InnerOps allowed (mainly for fixed-depth tries) */
   min_depth: number;
 }
-export interface ProofSpecAminoType {
+export interface ProofSpecAminoMsg {
   type: "/ics23.ProofSpec";
   value: ProofSpecAmino;
 }
@@ -631,7 +631,7 @@ export interface InnerSpec {
   /** hash is the algorithm that must be used for each InnerOp */
   hash: HashOp;
 }
-export interface InnerSpecProtoType {
+export interface InnerSpecProtoMsg {
   typeUrl: "/ics23.InnerSpec";
   value: Uint8Array;
 }
@@ -663,7 +663,7 @@ export interface InnerSpecAmino {
   /** hash is the algorithm that must be used for each InnerOp */
   hash: HashOp;
 }
-export interface InnerSpecAminoType {
+export interface InnerSpecAminoMsg {
   type: "/ics23.InnerSpec";
   value: InnerSpecAmino;
 }
@@ -691,7 +691,7 @@ export interface InnerSpecSDKType {
 export interface BatchProof {
   entries: BatchEntry[];
 }
-export interface BatchProofProtoType {
+export interface BatchProofProtoMsg {
   typeUrl: "/ics23.BatchProof";
   value: Uint8Array;
 }
@@ -700,7 +700,7 @@ export interface BatchProofProtoType {
 export interface BatchProofAmino {
   entries: BatchEntryAmino[];
 }
-export interface BatchProofAminoType {
+export interface BatchProofAminoMsg {
   type: "/ics23.BatchProof";
   value: BatchProofAmino;
 }
@@ -715,7 +715,7 @@ export interface BatchEntry {
   exist?: ExistenceProof;
   nonexist?: NonExistenceProof;
 }
-export interface BatchEntryProtoType {
+export interface BatchEntryProtoMsg {
   typeUrl: "/ics23.BatchEntry";
   value: Uint8Array;
 }
@@ -725,7 +725,7 @@ export interface BatchEntryAmino {
   exist?: ExistenceProofAmino;
   nonexist?: NonExistenceProofAmino;
 }
-export interface BatchEntryAminoType {
+export interface BatchEntryAminoMsg {
   type: "/ics23.BatchEntry";
   value: BatchEntryAmino;
 }
@@ -739,7 +739,7 @@ export interface CompressedBatchProof {
   entries: CompressedBatchEntry[];
   lookupInners: InnerOp[];
 }
-export interface CompressedBatchProofProtoType {
+export interface CompressedBatchProofProtoMsg {
   typeUrl: "/ics23.CompressedBatchProof";
   value: Uint8Array;
 }
@@ -747,7 +747,7 @@ export interface CompressedBatchProofAmino {
   entries: CompressedBatchEntryAmino[];
   lookup_inners: InnerOpAmino[];
 }
-export interface CompressedBatchProofAminoType {
+export interface CompressedBatchProofAminoMsg {
   type: "/ics23.CompressedBatchProof";
   value: CompressedBatchProofAmino;
 }
@@ -761,7 +761,7 @@ export interface CompressedBatchEntry {
   exist?: CompressedExistenceProof;
   nonexist?: CompressedNonExistenceProof;
 }
-export interface CompressedBatchEntryProtoType {
+export interface CompressedBatchEntryProtoMsg {
   typeUrl: "/ics23.CompressedBatchEntry";
   value: Uint8Array;
 }
@@ -771,7 +771,7 @@ export interface CompressedBatchEntryAmino {
   exist?: CompressedExistenceProofAmino;
   nonexist?: CompressedNonExistenceProofAmino;
 }
-export interface CompressedBatchEntryAminoType {
+export interface CompressedBatchEntryAminoMsg {
   type: "/ics23.CompressedBatchEntry";
   value: CompressedBatchEntryAmino;
 }
@@ -789,7 +789,7 @@ export interface CompressedExistenceProof {
   /** these are indexes into the lookup_inners table in CompressedBatchProof */
   path: number[];
 }
-export interface CompressedExistenceProofProtoType {
+export interface CompressedExistenceProofProtoMsg {
   typeUrl: "/ics23.CompressedExistenceProof";
   value: Uint8Array;
 }
@@ -801,7 +801,7 @@ export interface CompressedExistenceProofAmino {
   /** these are indexes into the lookup_inners table in CompressedBatchProof */
   path: number[];
 }
-export interface CompressedExistenceProofAminoType {
+export interface CompressedExistenceProofAminoMsg {
   type: "/ics23.CompressedExistenceProof";
   value: CompressedExistenceProofAmino;
 }
@@ -817,7 +817,7 @@ export interface CompressedNonExistenceProof {
   left?: CompressedExistenceProof;
   right?: CompressedExistenceProof;
 }
-export interface CompressedNonExistenceProofProtoType {
+export interface CompressedNonExistenceProofProtoMsg {
   typeUrl: "/ics23.CompressedNonExistenceProof";
   value: Uint8Array;
 }
@@ -827,7 +827,7 @@ export interface CompressedNonExistenceProofAmino {
   left?: CompressedExistenceProofAmino;
   right?: CompressedExistenceProofAmino;
 }
-export interface CompressedNonExistenceProofAminoType {
+export interface CompressedNonExistenceProofAminoMsg {
   type: "/ics23.CompressedNonExistenceProof";
   value: CompressedNonExistenceProofAmino;
 }
@@ -847,6 +847,8 @@ function createBaseExistenceProof(): ExistenceProof {
 }
 
 export const ExistenceProof = {
+  typeUrl: "/ics23.ExistenceProof",
+
   encode(message: ExistenceProof, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.key.length !== 0) {
       writer.uint32(10).bytes(message.key);
@@ -980,6 +982,25 @@ export const ExistenceProof = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ExistenceProofAminoMsg): ExistenceProof {
+    return ExistenceProof.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ExistenceProofProtoMsg): ExistenceProof {
+    return ExistenceProof.decode(message.value);
+  },
+
+  toProto(message: ExistenceProof): Uint8Array {
+    return ExistenceProof.encode(message).finish();
+  },
+
+  toProtoMsg(message: ExistenceProof): ExistenceProofProtoMsg {
+    return {
+      typeUrl: "/ics23.ExistenceProof",
+      value: ExistenceProof.encode(message).finish()
+    };
   }
 
 };
@@ -993,6 +1014,8 @@ function createBaseNonExistenceProof(): NonExistenceProof {
 }
 
 export const NonExistenceProof = {
+  typeUrl: "/ics23.NonExistenceProof",
+
   encode(message: NonExistenceProof, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.key.length !== 0) {
       writer.uint32(10).bytes(message.key);
@@ -1093,6 +1116,25 @@ export const NonExistenceProof = {
     obj.left = message.left ? ExistenceProof.toAmino(message.left) : undefined;
     obj.right = message.right ? ExistenceProof.toAmino(message.right) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: NonExistenceProofAminoMsg): NonExistenceProof {
+    return NonExistenceProof.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: NonExistenceProofProtoMsg): NonExistenceProof {
+    return NonExistenceProof.decode(message.value);
+  },
+
+  toProto(message: NonExistenceProof): Uint8Array {
+    return NonExistenceProof.encode(message).finish();
+  },
+
+  toProtoMsg(message: NonExistenceProof): NonExistenceProofProtoMsg {
+    return {
+      typeUrl: "/ics23.NonExistenceProof",
+      value: NonExistenceProof.encode(message).finish()
+    };
   }
 
 };
@@ -1107,6 +1149,8 @@ function createBaseCommitmentProof(): CommitmentProof {
 }
 
 export const CommitmentProof = {
+  typeUrl: "/ics23.CommitmentProof",
+
   encode(message: CommitmentProof, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.exist !== undefined) {
       ExistenceProof.encode(message.exist, writer.uint32(10).fork()).ldelim();
@@ -1222,6 +1266,25 @@ export const CommitmentProof = {
     obj.batch = message.batch ? BatchProof.toAmino(message.batch) : undefined;
     obj.compressed = message.compressed ? CompressedBatchProof.toAmino(message.compressed) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: CommitmentProofAminoMsg): CommitmentProof {
+    return CommitmentProof.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: CommitmentProofProtoMsg): CommitmentProof {
+    return CommitmentProof.decode(message.value);
+  },
+
+  toProto(message: CommitmentProof): Uint8Array {
+    return CommitmentProof.encode(message).finish();
+  },
+
+  toProtoMsg(message: CommitmentProof): CommitmentProofProtoMsg {
+    return {
+      typeUrl: "/ics23.CommitmentProof",
+      value: CommitmentProof.encode(message).finish()
+    };
   }
 
 };
@@ -1237,6 +1300,8 @@ function createBaseLeafOp(): LeafOp {
 }
 
 export const LeafOp = {
+  typeUrl: "/ics23.LeafOp",
+
   encode(message: LeafOp, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.hash !== 0) {
       writer.uint32(8).int32(message.hash);
@@ -1367,6 +1432,25 @@ export const LeafOp = {
     obj.length = message.length;
     obj.prefix = message.prefix;
     return obj;
+  },
+
+  fromAminoMsg(object: LeafOpAminoMsg): LeafOp {
+    return LeafOp.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: LeafOpProtoMsg): LeafOp {
+    return LeafOp.decode(message.value);
+  },
+
+  toProto(message: LeafOp): Uint8Array {
+    return LeafOp.encode(message).finish();
+  },
+
+  toProtoMsg(message: LeafOp): LeafOpProtoMsg {
+    return {
+      typeUrl: "/ics23.LeafOp",
+      value: LeafOp.encode(message).finish()
+    };
   }
 
 };
@@ -1380,6 +1464,8 @@ function createBaseInnerOp(): InnerOp {
 }
 
 export const InnerOp = {
+  typeUrl: "/ics23.InnerOp",
+
   encode(message: InnerOp, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.hash !== 0) {
       writer.uint32(8).int32(message.hash);
@@ -1480,6 +1566,25 @@ export const InnerOp = {
     obj.prefix = message.prefix;
     obj.suffix = message.suffix;
     return obj;
+  },
+
+  fromAminoMsg(object: InnerOpAminoMsg): InnerOp {
+    return InnerOp.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: InnerOpProtoMsg): InnerOp {
+    return InnerOp.decode(message.value);
+  },
+
+  toProto(message: InnerOp): Uint8Array {
+    return InnerOp.encode(message).finish();
+  },
+
+  toProtoMsg(message: InnerOp): InnerOpProtoMsg {
+    return {
+      typeUrl: "/ics23.InnerOp",
+      value: InnerOp.encode(message).finish()
+    };
   }
 
 };
@@ -1494,6 +1599,8 @@ function createBaseProofSpec(): ProofSpec {
 }
 
 export const ProofSpec = {
+  typeUrl: "/ics23.ProofSpec",
+
   encode(message: ProofSpec, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.leafSpec !== undefined) {
       LeafOp.encode(message.leafSpec, writer.uint32(10).fork()).ldelim();
@@ -1609,6 +1716,25 @@ export const ProofSpec = {
     obj.max_depth = message.maxDepth;
     obj.min_depth = message.minDepth;
     return obj;
+  },
+
+  fromAminoMsg(object: ProofSpecAminoMsg): ProofSpec {
+    return ProofSpec.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ProofSpecProtoMsg): ProofSpec {
+    return ProofSpec.decode(message.value);
+  },
+
+  toProto(message: ProofSpec): Uint8Array {
+    return ProofSpec.encode(message).finish();
+  },
+
+  toProtoMsg(message: ProofSpec): ProofSpecProtoMsg {
+    return {
+      typeUrl: "/ics23.ProofSpec",
+      value: ProofSpec.encode(message).finish()
+    };
   }
 
 };
@@ -1625,6 +1751,8 @@ function createBaseInnerSpec(): InnerSpec {
 }
 
 export const InnerSpec = {
+  typeUrl: "/ics23.InnerSpec",
+
   encode(message: InnerSpec, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     writer.uint32(10).fork();
 
@@ -1801,6 +1929,25 @@ export const InnerSpec = {
     obj.empty_child = message.emptyChild;
     obj.hash = message.hash;
     return obj;
+  },
+
+  fromAminoMsg(object: InnerSpecAminoMsg): InnerSpec {
+    return InnerSpec.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: InnerSpecProtoMsg): InnerSpec {
+    return InnerSpec.decode(message.value);
+  },
+
+  toProto(message: InnerSpec): Uint8Array {
+    return InnerSpec.encode(message).finish();
+  },
+
+  toProtoMsg(message: InnerSpec): InnerSpecProtoMsg {
+    return {
+      typeUrl: "/ics23.InnerSpec",
+      value: InnerSpec.encode(message).finish()
+    };
   }
 
 };
@@ -1812,6 +1959,8 @@ function createBaseBatchProof(): BatchProof {
 }
 
 export const BatchProof = {
+  typeUrl: "/ics23.BatchProof",
+
   encode(message: BatchProof, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.entries) {
       BatchEntry.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1900,6 +2049,25 @@ export const BatchProof = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: BatchProofAminoMsg): BatchProof {
+    return BatchProof.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: BatchProofProtoMsg): BatchProof {
+    return BatchProof.decode(message.value);
+  },
+
+  toProto(message: BatchProof): Uint8Array {
+    return BatchProof.encode(message).finish();
+  },
+
+  toProtoMsg(message: BatchProof): BatchProofProtoMsg {
+    return {
+      typeUrl: "/ics23.BatchProof",
+      value: BatchProof.encode(message).finish()
+    };
   }
 
 };
@@ -1912,6 +2080,8 @@ function createBaseBatchEntry(): BatchEntry {
 }
 
 export const BatchEntry = {
+  typeUrl: "/ics23.BatchEntry",
+
   encode(message: BatchEntry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.exist !== undefined) {
       ExistenceProof.encode(message.exist, writer.uint32(10).fork()).ldelim();
@@ -1997,6 +2167,25 @@ export const BatchEntry = {
     obj.exist = message.exist ? ExistenceProof.toAmino(message.exist) : undefined;
     obj.nonexist = message.nonexist ? NonExistenceProof.toAmino(message.nonexist) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: BatchEntryAminoMsg): BatchEntry {
+    return BatchEntry.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: BatchEntryProtoMsg): BatchEntry {
+    return BatchEntry.decode(message.value);
+  },
+
+  toProto(message: BatchEntry): Uint8Array {
+    return BatchEntry.encode(message).finish();
+  },
+
+  toProtoMsg(message: BatchEntry): BatchEntryProtoMsg {
+    return {
+      typeUrl: "/ics23.BatchEntry",
+      value: BatchEntry.encode(message).finish()
+    };
   }
 
 };
@@ -2009,6 +2198,8 @@ function createBaseCompressedBatchProof(): CompressedBatchProof {
 }
 
 export const CompressedBatchProof = {
+  typeUrl: "/ics23.CompressedBatchProof",
+
   encode(message: CompressedBatchProof, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.entries) {
       CompressedBatchEntry.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -2127,6 +2318,25 @@ export const CompressedBatchProof = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: CompressedBatchProofAminoMsg): CompressedBatchProof {
+    return CompressedBatchProof.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: CompressedBatchProofProtoMsg): CompressedBatchProof {
+    return CompressedBatchProof.decode(message.value);
+  },
+
+  toProto(message: CompressedBatchProof): Uint8Array {
+    return CompressedBatchProof.encode(message).finish();
+  },
+
+  toProtoMsg(message: CompressedBatchProof): CompressedBatchProofProtoMsg {
+    return {
+      typeUrl: "/ics23.CompressedBatchProof",
+      value: CompressedBatchProof.encode(message).finish()
+    };
   }
 
 };
@@ -2139,6 +2349,8 @@ function createBaseCompressedBatchEntry(): CompressedBatchEntry {
 }
 
 export const CompressedBatchEntry = {
+  typeUrl: "/ics23.CompressedBatchEntry",
+
   encode(message: CompressedBatchEntry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.exist !== undefined) {
       CompressedExistenceProof.encode(message.exist, writer.uint32(10).fork()).ldelim();
@@ -2224,6 +2436,25 @@ export const CompressedBatchEntry = {
     obj.exist = message.exist ? CompressedExistenceProof.toAmino(message.exist) : undefined;
     obj.nonexist = message.nonexist ? CompressedNonExistenceProof.toAmino(message.nonexist) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: CompressedBatchEntryAminoMsg): CompressedBatchEntry {
+    return CompressedBatchEntry.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: CompressedBatchEntryProtoMsg): CompressedBatchEntry {
+    return CompressedBatchEntry.decode(message.value);
+  },
+
+  toProto(message: CompressedBatchEntry): Uint8Array {
+    return CompressedBatchEntry.encode(message).finish();
+  },
+
+  toProtoMsg(message: CompressedBatchEntry): CompressedBatchEntryProtoMsg {
+    return {
+      typeUrl: "/ics23.CompressedBatchEntry",
+      value: CompressedBatchEntry.encode(message).finish()
+    };
   }
 
 };
@@ -2238,6 +2469,8 @@ function createBaseCompressedExistenceProof(): CompressedExistenceProof {
 }
 
 export const CompressedExistenceProof = {
+  typeUrl: "/ics23.CompressedExistenceProof",
+
   encode(message: CompressedExistenceProof, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.key.length !== 0) {
       writer.uint32(10).bytes(message.key);
@@ -2383,6 +2616,25 @@ export const CompressedExistenceProof = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: CompressedExistenceProofAminoMsg): CompressedExistenceProof {
+    return CompressedExistenceProof.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: CompressedExistenceProofProtoMsg): CompressedExistenceProof {
+    return CompressedExistenceProof.decode(message.value);
+  },
+
+  toProto(message: CompressedExistenceProof): Uint8Array {
+    return CompressedExistenceProof.encode(message).finish();
+  },
+
+  toProtoMsg(message: CompressedExistenceProof): CompressedExistenceProofProtoMsg {
+    return {
+      typeUrl: "/ics23.CompressedExistenceProof",
+      value: CompressedExistenceProof.encode(message).finish()
+    };
   }
 
 };
@@ -2396,6 +2648,8 @@ function createBaseCompressedNonExistenceProof(): CompressedNonExistenceProof {
 }
 
 export const CompressedNonExistenceProof = {
+  typeUrl: "/ics23.CompressedNonExistenceProof",
+
   encode(message: CompressedNonExistenceProof, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.key.length !== 0) {
       writer.uint32(10).bytes(message.key);
@@ -2496,6 +2750,25 @@ export const CompressedNonExistenceProof = {
     obj.left = message.left ? CompressedExistenceProof.toAmino(message.left) : undefined;
     obj.right = message.right ? CompressedExistenceProof.toAmino(message.right) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: CompressedNonExistenceProofAminoMsg): CompressedNonExistenceProof {
+    return CompressedNonExistenceProof.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: CompressedNonExistenceProofProtoMsg): CompressedNonExistenceProof {
+    return CompressedNonExistenceProof.decode(message.value);
+  },
+
+  toProto(message: CompressedNonExistenceProof): Uint8Array {
+    return CompressedNonExistenceProof.encode(message).finish();
+  },
+
+  toProtoMsg(message: CompressedNonExistenceProof): CompressedNonExistenceProofProtoMsg {
+    return {
+      typeUrl: "/ics23.CompressedNonExistenceProof",
+      value: CompressedNonExistenceProof.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/app/v1alpha1/config.ts b/__fixtures__/outputv2/cosmos/app/v1alpha1/config.ts
index 782c527da..f28e8dd43 100644
--- a/__fixtures__/outputv2/cosmos/app/v1alpha1/config.ts
+++ b/__fixtures__/outputv2/cosmos/app/v1alpha1/config.ts
@@ -16,7 +16,7 @@ export interface Config {
   /** modules are the module configurations for the app. */
   modules: ModuleConfig[];
 }
-export interface ConfigProtoType {
+export interface ConfigProtoMsg {
   typeUrl: "/cosmos.app.v1alpha1.Config";
   value: Uint8Array;
 }
@@ -34,7 +34,7 @@ export interface ConfigAmino {
   /** modules are the module configurations for the app. */
   modules: ModuleConfigAmino[];
 }
-export interface ConfigAminoType {
+export interface ConfigAminoMsg {
   type: "cosmos-sdk/Config";
   value: ConfigAmino;
 }
@@ -74,7 +74,7 @@ export interface ModuleConfig {
    */
   config?: Any;
 }
-export interface ModuleConfigProtoType {
+export interface ModuleConfigProtoMsg {
   typeUrl: "/cosmos.app.v1alpha1.ModuleConfig";
   value: Uint8Array;
 }
@@ -101,7 +101,7 @@ export interface ModuleConfigAmino {
    */
   config?: AnyAmino;
 }
-export interface ModuleConfigAminoType {
+export interface ModuleConfigAminoMsg {
   type: "cosmos-sdk/ModuleConfig";
   value: ModuleConfigAmino;
 }
@@ -119,6 +119,9 @@ function createBaseConfig(): Config {
 }
 
 export const Config = {
+  typeUrl: "/cosmos.app.v1alpha1.Config",
+  aminoType: "cosmos-sdk/Config",
+
   encode(message: Config, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.modules) {
       ModuleConfig.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -207,6 +210,32 @@ export const Config = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ConfigAminoMsg): Config {
+    return Config.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Config): ConfigAminoMsg {
+    return {
+      type: "cosmos-sdk/Config",
+      value: Config.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ConfigProtoMsg): Config {
+    return Config.decode(message.value);
+  },
+
+  toProto(message: Config): Uint8Array {
+    return Config.encode(message).finish();
+  },
+
+  toProtoMsg(message: Config): ConfigProtoMsg {
+    return {
+      typeUrl: "/cosmos.app.v1alpha1.Config",
+      value: Config.encode(message).finish()
+    };
   }
 
 };
@@ -219,6 +248,9 @@ function createBaseModuleConfig(): ModuleConfig {
 }
 
 export const ModuleConfig = {
+  typeUrl: "/cosmos.app.v1alpha1.ModuleConfig",
+  aminoType: "cosmos-sdk/ModuleConfig",
+
   encode(message: ModuleConfig, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -304,6 +336,32 @@ export const ModuleConfig = {
     obj.name = message.name;
     obj.config = message.config ? Any.toAmino(message.config) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ModuleConfigAminoMsg): ModuleConfig {
+    return ModuleConfig.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ModuleConfig): ModuleConfigAminoMsg {
+    return {
+      type: "cosmos-sdk/ModuleConfig",
+      value: ModuleConfig.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ModuleConfigProtoMsg): ModuleConfig {
+    return ModuleConfig.decode(message.value);
+  },
+
+  toProto(message: ModuleConfig): Uint8Array {
+    return ModuleConfig.encode(message).finish();
+  },
+
+  toProtoMsg(message: ModuleConfig): ModuleConfigProtoMsg {
+    return {
+      typeUrl: "/cosmos.app.v1alpha1.ModuleConfig",
+      value: ModuleConfig.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/app/v1alpha1/module.ts b/__fixtures__/outputv2/cosmos/app/v1alpha1/module.ts
index f46049c19..283952812 100644
--- a/__fixtures__/outputv2/cosmos/app/v1alpha1/module.ts
+++ b/__fixtures__/outputv2/cosmos/app/v1alpha1/module.ts
@@ -32,7 +32,7 @@ export interface ModuleDescriptor {
    */
   canMigrateFrom: MigrateFromInfo[];
 }
-export interface ModuleDescriptorProtoType {
+export interface ModuleDescriptorProtoMsg {
   typeUrl: "/cosmos.app.v1alpha1.ModuleDescriptor";
   value: Uint8Array;
 }
@@ -67,7 +67,7 @@ export interface ModuleDescriptorAmino {
    */
   can_migrate_from: MigrateFromInfoAmino[];
 }
-export interface ModuleDescriptorAminoType {
+export interface ModuleDescriptorAminoMsg {
   type: "cosmos-sdk/ModuleDescriptor";
   value: ModuleDescriptorAmino;
 }
@@ -123,7 +123,7 @@ export interface PackageReference {
    */
   revision: number;
 }
-export interface PackageReferenceProtoType {
+export interface PackageReferenceProtoMsg {
   typeUrl: "/cosmos.app.v1alpha1.PackageReference";
   value: Uint8Array;
 }
@@ -172,7 +172,7 @@ export interface PackageReferenceAmino {
    */
   revision: number;
 }
-export interface PackageReferenceAminoType {
+export interface PackageReferenceAminoMsg {
   type: "cosmos-sdk/PackageReference";
   value: PackageReferenceAmino;
 }
@@ -194,7 +194,7 @@ export interface MigrateFromInfo {
    */
   module: string;
 }
-export interface MigrateFromInfoProtoType {
+export interface MigrateFromInfoProtoMsg {
   typeUrl: "/cosmos.app.v1alpha1.MigrateFromInfo";
   value: Uint8Array;
 }
@@ -210,7 +210,7 @@ export interface MigrateFromInfoAmino {
    */
   module: string;
 }
-export interface MigrateFromInfoAminoType {
+export interface MigrateFromInfoAminoMsg {
   type: "cosmos-sdk/MigrateFromInfo";
   value: MigrateFromInfoAmino;
 }
@@ -232,6 +232,9 @@ function createBaseModuleDescriptor(): ModuleDescriptor {
 }
 
 export const ModuleDescriptor = {
+  typeUrl: "/cosmos.app.v1alpha1.ModuleDescriptor",
+  aminoType: "cosmos-sdk/ModuleDescriptor",
+
   encode(message: ModuleDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.goImport !== "") {
       writer.uint32(10).string(message.goImport);
@@ -365,6 +368,32 @@ export const ModuleDescriptor = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ModuleDescriptorAminoMsg): ModuleDescriptor {
+    return ModuleDescriptor.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ModuleDescriptor): ModuleDescriptorAminoMsg {
+    return {
+      type: "cosmos-sdk/ModuleDescriptor",
+      value: ModuleDescriptor.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ModuleDescriptorProtoMsg): ModuleDescriptor {
+    return ModuleDescriptor.decode(message.value);
+  },
+
+  toProto(message: ModuleDescriptor): Uint8Array {
+    return ModuleDescriptor.encode(message).finish();
+  },
+
+  toProtoMsg(message: ModuleDescriptor): ModuleDescriptorProtoMsg {
+    return {
+      typeUrl: "/cosmos.app.v1alpha1.ModuleDescriptor",
+      value: ModuleDescriptor.encode(message).finish()
+    };
   }
 
 };
@@ -377,6 +406,9 @@ function createBasePackageReference(): PackageReference {
 }
 
 export const PackageReference = {
+  typeUrl: "/cosmos.app.v1alpha1.PackageReference",
+  aminoType: "cosmos-sdk/PackageReference",
+
   encode(message: PackageReference, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -462,6 +494,32 @@ export const PackageReference = {
     obj.name = message.name;
     obj.revision = message.revision;
     return obj;
+  },
+
+  fromAminoMsg(object: PackageReferenceAminoMsg): PackageReference {
+    return PackageReference.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: PackageReference): PackageReferenceAminoMsg {
+    return {
+      type: "cosmos-sdk/PackageReference",
+      value: PackageReference.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: PackageReferenceProtoMsg): PackageReference {
+    return PackageReference.decode(message.value);
+  },
+
+  toProto(message: PackageReference): Uint8Array {
+    return PackageReference.encode(message).finish();
+  },
+
+  toProtoMsg(message: PackageReference): PackageReferenceProtoMsg {
+    return {
+      typeUrl: "/cosmos.app.v1alpha1.PackageReference",
+      value: PackageReference.encode(message).finish()
+    };
   }
 
 };
@@ -473,6 +531,9 @@ function createBaseMigrateFromInfo(): MigrateFromInfo {
 }
 
 export const MigrateFromInfo = {
+  typeUrl: "/cosmos.app.v1alpha1.MigrateFromInfo",
+  aminoType: "cosmos-sdk/MigrateFromInfo",
+
   encode(message: MigrateFromInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.module !== "") {
       writer.uint32(10).string(message.module);
@@ -543,6 +604,32 @@ export const MigrateFromInfo = {
     const obj: any = {};
     obj.module = message.module;
     return obj;
+  },
+
+  fromAminoMsg(object: MigrateFromInfoAminoMsg): MigrateFromInfo {
+    return MigrateFromInfo.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MigrateFromInfo): MigrateFromInfoAminoMsg {
+    return {
+      type: "cosmos-sdk/MigrateFromInfo",
+      value: MigrateFromInfo.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MigrateFromInfoProtoMsg): MigrateFromInfo {
+    return MigrateFromInfo.decode(message.value);
+  },
+
+  toProto(message: MigrateFromInfo): Uint8Array {
+    return MigrateFromInfo.encode(message).finish();
+  },
+
+  toProtoMsg(message: MigrateFromInfo): MigrateFromInfoProtoMsg {
+    return {
+      typeUrl: "/cosmos.app.v1alpha1.MigrateFromInfo",
+      value: MigrateFromInfo.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/app/v1alpha1/query.ts b/__fixtures__/outputv2/cosmos/app/v1alpha1/query.ts
index d48b76ac8..a76d4a377 100644
--- a/__fixtures__/outputv2/cosmos/app/v1alpha1/query.ts
+++ b/__fixtures__/outputv2/cosmos/app/v1alpha1/query.ts
@@ -5,14 +5,14 @@ export const protobufPackage = "cosmos.app.v1alpha1";
 
 /** QueryConfigRequest is the Query/Config request type. */
 export interface QueryConfigRequest {}
-export interface QueryConfigRequestProtoType {
+export interface QueryConfigRequestProtoMsg {
   typeUrl: "/cosmos.app.v1alpha1.QueryConfigRequest";
   value: Uint8Array;
 }
 
 /** QueryConfigRequest is the Query/Config request type. */
 export interface QueryConfigRequestAmino {}
-export interface QueryConfigRequestAminoType {
+export interface QueryConfigRequestAminoMsg {
   type: "cosmos-sdk/QueryConfigRequest";
   value: QueryConfigRequestAmino;
 }
@@ -25,7 +25,7 @@ export interface QueryConfigResponse {
   /** config is the current app config. */
   config?: Config;
 }
-export interface QueryConfigResponseProtoType {
+export interface QueryConfigResponseProtoMsg {
   typeUrl: "/cosmos.app.v1alpha1.QueryConfigResponse";
   value: Uint8Array;
 }
@@ -35,7 +35,7 @@ export interface QueryConfigResponseAmino {
   /** config is the current app config. */
   config?: ConfigAmino;
 }
-export interface QueryConfigResponseAminoType {
+export interface QueryConfigResponseAminoMsg {
   type: "cosmos-sdk/QueryConfigResponse";
   value: QueryConfigResponseAmino;
 }
@@ -50,6 +50,9 @@ function createBaseQueryConfigRequest(): QueryConfigRequest {
 }
 
 export const QueryConfigRequest = {
+  typeUrl: "/cosmos.app.v1alpha1.QueryConfigRequest",
+  aminoType: "cosmos-sdk/QueryConfigRequest",
+
   encode(_: QueryConfigRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -102,6 +105,32 @@ export const QueryConfigRequest = {
   toAmino(_: QueryConfigRequest): QueryConfigRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryConfigRequestAminoMsg): QueryConfigRequest {
+    return QueryConfigRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryConfigRequest): QueryConfigRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryConfigRequest",
+      value: QueryConfigRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryConfigRequestProtoMsg): QueryConfigRequest {
+    return QueryConfigRequest.decode(message.value);
+  },
+
+  toProto(message: QueryConfigRequest): Uint8Array {
+    return QueryConfigRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryConfigRequest): QueryConfigRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.app.v1alpha1.QueryConfigRequest",
+      value: QueryConfigRequest.encode(message).finish()
+    };
   }
 
 };
@@ -113,6 +142,9 @@ function createBaseQueryConfigResponse(): QueryConfigResponse {
 }
 
 export const QueryConfigResponse = {
+  typeUrl: "/cosmos.app.v1alpha1.QueryConfigResponse",
+  aminoType: "cosmos-sdk/QueryConfigResponse",
+
   encode(message: QueryConfigResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.config !== undefined) {
       Config.encode(message.config, writer.uint32(10).fork()).ldelim();
@@ -183,6 +215,32 @@ export const QueryConfigResponse = {
     const obj: any = {};
     obj.config = message.config ? Config.toAmino(message.config) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryConfigResponseAminoMsg): QueryConfigResponse {
+    return QueryConfigResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryConfigResponse): QueryConfigResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryConfigResponse",
+      value: QueryConfigResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryConfigResponseProtoMsg): QueryConfigResponse {
+    return QueryConfigResponse.decode(message.value);
+  },
+
+  toProto(message: QueryConfigResponse): Uint8Array {
+    return QueryConfigResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryConfigResponse): QueryConfigResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.app.v1alpha1.QueryConfigResponse",
+      value: QueryConfigResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/auth/v1beta1/auth.ts b/__fixtures__/outputv2/cosmos/auth/v1beta1/auth.ts
index 94be0f84f..822499844 100644
--- a/__fixtures__/outputv2/cosmos/auth/v1beta1/auth.ts
+++ b/__fixtures__/outputv2/cosmos/auth/v1beta1/auth.ts
@@ -14,7 +14,7 @@ export interface BaseAccount {
   accountNumber: Long;
   sequence: Long;
 }
-export interface BaseAccountProtoType {
+export interface BaseAccountProtoMsg {
   typeUrl: "/cosmos.auth.v1beta1.BaseAccount";
   value: Uint8Array;
 }
@@ -30,7 +30,7 @@ export interface BaseAccountAmino {
   account_number: string;
   sequence: string;
 }
-export interface BaseAccountAminoType {
+export interface BaseAccountAminoMsg {
   type: "cosmos-sdk/BaseAccount";
   value: BaseAccountAmino;
 }
@@ -53,7 +53,7 @@ export interface ModuleAccount {
   name: string;
   permissions: string[];
 }
-export interface ModuleAccountProtoType {
+export interface ModuleAccountProtoMsg {
   typeUrl: "/cosmos.auth.v1beta1.ModuleAccount";
   value: Uint8Array;
 }
@@ -64,7 +64,7 @@ export interface ModuleAccountAmino {
   name: string;
   permissions: string[];
 }
-export interface ModuleAccountAminoType {
+export interface ModuleAccountAminoMsg {
   type: "cosmos-sdk/ModuleAccount";
   value: ModuleAccountAmino;
 }
@@ -84,7 +84,7 @@ export interface Params {
   sigVerifyCostEd25519: Long;
   sigVerifyCostSecp256k1: Long;
 }
-export interface ParamsProtoType {
+export interface ParamsProtoMsg {
   typeUrl: "/cosmos.auth.v1beta1.Params";
   value: Uint8Array;
 }
@@ -97,7 +97,7 @@ export interface ParamsAmino {
   sig_verify_cost_ed25519: string;
   sig_verify_cost_secp256k1: string;
 }
-export interface ParamsAminoType {
+export interface ParamsAminoMsg {
   type: "cosmos-sdk/Params";
   value: ParamsAmino;
 }
@@ -121,6 +121,9 @@ function createBaseBaseAccount(): BaseAccount {
 }
 
 export const BaseAccount = {
+  typeUrl: "/cosmos.auth.v1beta1.BaseAccount",
+  aminoType: "cosmos-sdk/BaseAccount",
+
   encode(message: BaseAccount, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.address !== "") {
       writer.uint32(10).string(message.address);
@@ -236,6 +239,32 @@ export const BaseAccount = {
     obj.account_number = message.accountNumber ? message.accountNumber.toString() : undefined;
     obj.sequence = message.sequence ? message.sequence.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: BaseAccountAminoMsg): BaseAccount {
+    return BaseAccount.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: BaseAccount): BaseAccountAminoMsg {
+    return {
+      type: "cosmos-sdk/BaseAccount",
+      value: BaseAccount.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: BaseAccountProtoMsg): BaseAccount {
+    return BaseAccount.decode(message.value);
+  },
+
+  toProto(message: BaseAccount): Uint8Array {
+    return BaseAccount.encode(message).finish();
+  },
+
+  toProtoMsg(message: BaseAccount): BaseAccountProtoMsg {
+    return {
+      typeUrl: "/cosmos.auth.v1beta1.BaseAccount",
+      value: BaseAccount.encode(message).finish()
+    };
   }
 
 };
@@ -249,6 +278,9 @@ function createBaseModuleAccount(): ModuleAccount {
 }
 
 export const ModuleAccount = {
+  typeUrl: "/cosmos.auth.v1beta1.ModuleAccount",
+  aminoType: "cosmos-sdk/ModuleAccount",
+
   encode(message: ModuleAccount, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.baseAccount !== undefined) {
       BaseAccount.encode(message.baseAccount, writer.uint32(10).fork()).ldelim();
@@ -367,6 +399,32 @@ export const ModuleAccount = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ModuleAccountAminoMsg): ModuleAccount {
+    return ModuleAccount.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ModuleAccount): ModuleAccountAminoMsg {
+    return {
+      type: "cosmos-sdk/ModuleAccount",
+      value: ModuleAccount.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ModuleAccountProtoMsg): ModuleAccount {
+    return ModuleAccount.decode(message.value);
+  },
+
+  toProto(message: ModuleAccount): Uint8Array {
+    return ModuleAccount.encode(message).finish();
+  },
+
+  toProtoMsg(message: ModuleAccount): ModuleAccountProtoMsg {
+    return {
+      typeUrl: "/cosmos.auth.v1beta1.ModuleAccount",
+      value: ModuleAccount.encode(message).finish()
+    };
   }
 
 };
@@ -382,6 +440,9 @@ function createBaseParams(): Params {
 }
 
 export const Params = {
+  typeUrl: "/cosmos.auth.v1beta1.Params",
+  aminoType: "cosmos-sdk/Params",
+
   encode(message: Params, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.maxMemoCharacters.isZero()) {
       writer.uint32(8).uint64(message.maxMemoCharacters);
@@ -512,6 +573,32 @@ export const Params = {
     obj.sig_verify_cost_ed25519 = message.sigVerifyCostEd25519 ? message.sigVerifyCostEd25519.toString() : undefined;
     obj.sig_verify_cost_secp256k1 = message.sigVerifyCostSecp256k1 ? message.sigVerifyCostSecp256k1.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ParamsAminoMsg): Params {
+    return Params.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Params): ParamsAminoMsg {
+    return {
+      type: "cosmos-sdk/Params",
+      value: Params.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ParamsProtoMsg): Params {
+    return Params.decode(message.value);
+  },
+
+  toProto(message: Params): Uint8Array {
+    return Params.encode(message).finish();
+  },
+
+  toProtoMsg(message: Params): ParamsProtoMsg {
+    return {
+      typeUrl: "/cosmos.auth.v1beta1.Params",
+      value: Params.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/auth/v1beta1/genesis.ts b/__fixtures__/outputv2/cosmos/auth/v1beta1/genesis.ts
index 013221bd0..75113169e 100644
--- a/__fixtures__/outputv2/cosmos/auth/v1beta1/genesis.ts
+++ b/__fixtures__/outputv2/cosmos/auth/v1beta1/genesis.ts
@@ -12,7 +12,7 @@ export interface GenesisState {
   /** accounts are the accounts present at genesis. */
   accounts: Any[];
 }
-export interface GenesisStateProtoType {
+export interface GenesisStateProtoMsg {
   typeUrl: "/cosmos.auth.v1beta1.GenesisState";
   value: Uint8Array;
 }
@@ -25,7 +25,7 @@ export interface GenesisStateAmino {
   /** accounts are the accounts present at genesis. */
   accounts: AnyAmino[];
 }
-export interface GenesisStateAminoType {
+export interface GenesisStateAminoMsg {
   type: "cosmos-sdk/GenesisState";
   value: GenesisStateAmino;
 }
@@ -44,6 +44,9 @@ function createBaseGenesisState(): GenesisState {
 }
 
 export const GenesisState = {
+  typeUrl: "/cosmos.auth.v1beta1.GenesisState",
+  aminoType: "cosmos-sdk/GenesisState",
+
   encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.params !== undefined) {
       Params.encode(message.params, writer.uint32(10).fork()).ldelim();
@@ -147,6 +150,32 @@ export const GenesisState = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisStateAminoMsg): GenesisState {
+    return GenesisState.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GenesisState): GenesisStateAminoMsg {
+    return {
+      type: "cosmos-sdk/GenesisState",
+      value: GenesisState.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GenesisStateProtoMsg): GenesisState {
+    return GenesisState.decode(message.value);
+  },
+
+  toProto(message: GenesisState): Uint8Array {
+    return GenesisState.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisState): GenesisStateProtoMsg {
+    return {
+      typeUrl: "/cosmos.auth.v1beta1.GenesisState",
+      value: GenesisState.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/auth/v1beta1/query.ts b/__fixtures__/outputv2/cosmos/auth/v1beta1/query.ts
index 1481d3ce7..06d28e43d 100644
--- a/__fixtures__/outputv2/cosmos/auth/v1beta1/query.ts
+++ b/__fixtures__/outputv2/cosmos/auth/v1beta1/query.ts
@@ -14,7 +14,7 @@ export interface QueryAccountsRequest {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequest;
 }
-export interface QueryAccountsRequestProtoType {
+export interface QueryAccountsRequestProtoMsg {
   typeUrl: "/cosmos.auth.v1beta1.QueryAccountsRequest";
   value: Uint8Array;
 }
@@ -28,7 +28,7 @@ export interface QueryAccountsRequestAmino {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequestAmino;
 }
-export interface QueryAccountsRequestAminoType {
+export interface QueryAccountsRequestAminoMsg {
   type: "cosmos-sdk/QueryAccountsRequest";
   value: QueryAccountsRequestAmino;
 }
@@ -54,7 +54,7 @@ export interface QueryAccountsResponse {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponse;
 }
-export interface QueryAccountsResponseProtoType {
+export interface QueryAccountsResponseProtoMsg {
   typeUrl: "/cosmos.auth.v1beta1.QueryAccountsResponse";
   value: Uint8Array;
 }
@@ -71,7 +71,7 @@ export interface QueryAccountsResponseAmino {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponseAmino;
 }
-export interface QueryAccountsResponseAminoType {
+export interface QueryAccountsResponseAminoMsg {
   type: "cosmos-sdk/QueryAccountsResponse";
   value: QueryAccountsResponseAmino;
 }
@@ -91,7 +91,7 @@ export interface QueryAccountRequest {
   /** address defines the address to query for. */
   address: string;
 }
-export interface QueryAccountRequestProtoType {
+export interface QueryAccountRequestProtoMsg {
   typeUrl: "/cosmos.auth.v1beta1.QueryAccountRequest";
   value: Uint8Array;
 }
@@ -101,7 +101,7 @@ export interface QueryAccountRequestAmino {
   /** address defines the address to query for. */
   address: string;
 }
-export interface QueryAccountRequestAminoType {
+export interface QueryAccountRequestAminoMsg {
   type: "cosmos-sdk/QueryAccountRequest";
   value: QueryAccountRequestAmino;
 }
@@ -113,14 +113,14 @@ export interface QueryAccountRequestSDKType {
 
 /** QueryModuleAccountsRequest is the request type for the Query/ModuleAccounts RPC method. */
 export interface QueryModuleAccountsRequest {}
-export interface QueryModuleAccountsRequestProtoType {
+export interface QueryModuleAccountsRequestProtoMsg {
   typeUrl: "/cosmos.auth.v1beta1.QueryModuleAccountsRequest";
   value: Uint8Array;
 }
 
 /** QueryModuleAccountsRequest is the request type for the Query/ModuleAccounts RPC method. */
 export interface QueryModuleAccountsRequestAmino {}
-export interface QueryModuleAccountsRequestAminoType {
+export interface QueryModuleAccountsRequestAminoMsg {
   type: "cosmos-sdk/QueryModuleAccountsRequest";
   value: QueryModuleAccountsRequestAmino;
 }
@@ -133,7 +133,7 @@ export interface QueryParamsResponse {
   /** params defines the parameters of the module. */
   params?: Params;
 }
-export interface QueryParamsResponseProtoType {
+export interface QueryParamsResponseProtoMsg {
   typeUrl: "/cosmos.auth.v1beta1.QueryParamsResponse";
   value: Uint8Array;
 }
@@ -143,7 +143,7 @@ export interface QueryParamsResponseAmino {
   /** params defines the parameters of the module. */
   params?: ParamsAmino;
 }
-export interface QueryParamsResponseAminoType {
+export interface QueryParamsResponseAminoMsg {
   type: "cosmos-sdk/QueryParamsResponse";
   value: QueryParamsResponseAmino;
 }
@@ -158,7 +158,7 @@ export interface QueryAccountResponse {
   /** account defines the account of the corresponding address. */
   account?: (BaseAccount & Any) | undefined;
 }
-export interface QueryAccountResponseProtoType {
+export interface QueryAccountResponseProtoMsg {
   typeUrl: "/cosmos.auth.v1beta1.QueryAccountResponse";
   value: Uint8Array;
 }
@@ -168,7 +168,7 @@ export interface QueryAccountResponseAmino {
   /** account defines the account of the corresponding address. */
   account?: AnyAmino;
 }
-export interface QueryAccountResponseAminoType {
+export interface QueryAccountResponseAminoMsg {
   type: "cosmos-sdk/QueryAccountResponse";
   value: QueryAccountResponseAmino;
 }
@@ -180,14 +180,14 @@ export interface QueryAccountResponseSDKType {
 
 /** QueryParamsRequest is the request type for the Query/Params RPC method. */
 export interface QueryParamsRequest {}
-export interface QueryParamsRequestProtoType {
+export interface QueryParamsRequestProtoMsg {
   typeUrl: "/cosmos.auth.v1beta1.QueryParamsRequest";
   value: Uint8Array;
 }
 
 /** QueryParamsRequest is the request type for the Query/Params RPC method. */
 export interface QueryParamsRequestAmino {}
-export interface QueryParamsRequestAminoType {
+export interface QueryParamsRequestAminoMsg {
   type: "cosmos-sdk/QueryParamsRequest";
   value: QueryParamsRequestAmino;
 }
@@ -199,7 +199,7 @@ export interface QueryParamsRequestSDKType {}
 export interface QueryModuleAccountsResponse {
   accounts: (ModuleAccount & Any)[] | Any[];
 }
-export interface QueryModuleAccountsResponseProtoType {
+export interface QueryModuleAccountsResponseProtoMsg {
   typeUrl: "/cosmos.auth.v1beta1.QueryModuleAccountsResponse";
   value: Uint8Array;
 }
@@ -208,7 +208,7 @@ export interface QueryModuleAccountsResponseProtoType {
 export interface QueryModuleAccountsResponseAmino {
   accounts: AnyAmino[];
 }
-export interface QueryModuleAccountsResponseAminoType {
+export interface QueryModuleAccountsResponseAminoMsg {
   type: "cosmos-sdk/QueryModuleAccountsResponse";
   value: QueryModuleAccountsResponseAmino;
 }
@@ -220,14 +220,14 @@ export interface QueryModuleAccountsResponseSDKType {
 
 /** Bech32PrefixRequest is the request type for Bech32Prefix rpc method */
 export interface Bech32PrefixRequest {}
-export interface Bech32PrefixRequestProtoType {
+export interface Bech32PrefixRequestProtoMsg {
   typeUrl: "/cosmos.auth.v1beta1.Bech32PrefixRequest";
   value: Uint8Array;
 }
 
 /** Bech32PrefixRequest is the request type for Bech32Prefix rpc method */
 export interface Bech32PrefixRequestAmino {}
-export interface Bech32PrefixRequestAminoType {
+export interface Bech32PrefixRequestAminoMsg {
   type: "cosmos-sdk/Bech32PrefixRequest";
   value: Bech32PrefixRequestAmino;
 }
@@ -239,7 +239,7 @@ export interface Bech32PrefixRequestSDKType {}
 export interface Bech32PrefixResponse {
   bech32Prefix: string;
 }
-export interface Bech32PrefixResponseProtoType {
+export interface Bech32PrefixResponseProtoMsg {
   typeUrl: "/cosmos.auth.v1beta1.Bech32PrefixResponse";
   value: Uint8Array;
 }
@@ -248,7 +248,7 @@ export interface Bech32PrefixResponseProtoType {
 export interface Bech32PrefixResponseAmino {
   bech32_prefix: string;
 }
-export interface Bech32PrefixResponseAminoType {
+export interface Bech32PrefixResponseAminoMsg {
   type: "cosmos-sdk/Bech32PrefixResponse";
   value: Bech32PrefixResponseAmino;
 }
@@ -262,7 +262,7 @@ export interface Bech32PrefixResponseSDKType {
 export interface AddressBytesToStringRequest {
   addressBytes: Uint8Array;
 }
-export interface AddressBytesToStringRequestProtoType {
+export interface AddressBytesToStringRequestProtoMsg {
   typeUrl: "/cosmos.auth.v1beta1.AddressBytesToStringRequest";
   value: Uint8Array;
 }
@@ -271,7 +271,7 @@ export interface AddressBytesToStringRequestProtoType {
 export interface AddressBytesToStringRequestAmino {
   address_bytes: Uint8Array;
 }
-export interface AddressBytesToStringRequestAminoType {
+export interface AddressBytesToStringRequestAminoMsg {
   type: "cosmos-sdk/AddressBytesToStringRequest";
   value: AddressBytesToStringRequestAmino;
 }
@@ -285,7 +285,7 @@ export interface AddressBytesToStringRequestSDKType {
 export interface AddressBytesToStringResponse {
   addressString: string;
 }
-export interface AddressBytesToStringResponseProtoType {
+export interface AddressBytesToStringResponseProtoMsg {
   typeUrl: "/cosmos.auth.v1beta1.AddressBytesToStringResponse";
   value: Uint8Array;
 }
@@ -294,7 +294,7 @@ export interface AddressBytesToStringResponseProtoType {
 export interface AddressBytesToStringResponseAmino {
   address_string: string;
 }
-export interface AddressBytesToStringResponseAminoType {
+export interface AddressBytesToStringResponseAminoMsg {
   type: "cosmos-sdk/AddressBytesToStringResponse";
   value: AddressBytesToStringResponseAmino;
 }
@@ -308,7 +308,7 @@ export interface AddressBytesToStringResponseSDKType {
 export interface AddressStringToBytesRequest {
   addressString: string;
 }
-export interface AddressStringToBytesRequestProtoType {
+export interface AddressStringToBytesRequestProtoMsg {
   typeUrl: "/cosmos.auth.v1beta1.AddressStringToBytesRequest";
   value: Uint8Array;
 }
@@ -317,7 +317,7 @@ export interface AddressStringToBytesRequestProtoType {
 export interface AddressStringToBytesRequestAmino {
   address_string: string;
 }
-export interface AddressStringToBytesRequestAminoType {
+export interface AddressStringToBytesRequestAminoMsg {
   type: "cosmos-sdk/AddressStringToBytesRequest";
   value: AddressStringToBytesRequestAmino;
 }
@@ -331,7 +331,7 @@ export interface AddressStringToBytesRequestSDKType {
 export interface AddressStringToBytesResponse {
   addressBytes: Uint8Array;
 }
-export interface AddressStringToBytesResponseProtoType {
+export interface AddressStringToBytesResponseProtoMsg {
   typeUrl: "/cosmos.auth.v1beta1.AddressStringToBytesResponse";
   value: Uint8Array;
 }
@@ -340,7 +340,7 @@ export interface AddressStringToBytesResponseProtoType {
 export interface AddressStringToBytesResponseAmino {
   address_bytes: Uint8Array;
 }
-export interface AddressStringToBytesResponseAminoType {
+export interface AddressStringToBytesResponseAminoMsg {
   type: "cosmos-sdk/AddressStringToBytesResponse";
   value: AddressStringToBytesResponseAmino;
 }
@@ -357,6 +357,9 @@ function createBaseQueryAccountsRequest(): QueryAccountsRequest {
 }
 
 export const QueryAccountsRequest = {
+  typeUrl: "/cosmos.auth.v1beta1.QueryAccountsRequest",
+  aminoType: "cosmos-sdk/QueryAccountsRequest",
+
   encode(message: QueryAccountsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.pagination !== undefined) {
       PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim();
@@ -427,6 +430,32 @@ export const QueryAccountsRequest = {
     const obj: any = {};
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryAccountsRequestAminoMsg): QueryAccountsRequest {
+    return QueryAccountsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryAccountsRequest): QueryAccountsRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryAccountsRequest",
+      value: QueryAccountsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryAccountsRequestProtoMsg): QueryAccountsRequest {
+    return QueryAccountsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryAccountsRequest): Uint8Array {
+    return QueryAccountsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryAccountsRequest): QueryAccountsRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.auth.v1beta1.QueryAccountsRequest",
+      value: QueryAccountsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -439,6 +468,9 @@ function createBaseQueryAccountsResponse(): QueryAccountsResponse {
 }
 
 export const QueryAccountsResponse = {
+  typeUrl: "/cosmos.auth.v1beta1.QueryAccountsResponse",
+  aminoType: "cosmos-sdk/QueryAccountsResponse",
+
   encode(message: QueryAccountsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.accounts) {
       Any.encode((v! as Any), writer.uint32(10).fork()).ldelim();
@@ -542,6 +574,32 @@ export const QueryAccountsResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryAccountsResponseAminoMsg): QueryAccountsResponse {
+    return QueryAccountsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryAccountsResponse): QueryAccountsResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryAccountsResponse",
+      value: QueryAccountsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryAccountsResponseProtoMsg): QueryAccountsResponse {
+    return QueryAccountsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryAccountsResponse): Uint8Array {
+    return QueryAccountsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryAccountsResponse): QueryAccountsResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.auth.v1beta1.QueryAccountsResponse",
+      value: QueryAccountsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -553,6 +611,9 @@ function createBaseQueryAccountRequest(): QueryAccountRequest {
 }
 
 export const QueryAccountRequest = {
+  typeUrl: "/cosmos.auth.v1beta1.QueryAccountRequest",
+  aminoType: "cosmos-sdk/QueryAccountRequest",
+
   encode(message: QueryAccountRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.address !== "") {
       writer.uint32(10).string(message.address);
@@ -623,6 +684,32 @@ export const QueryAccountRequest = {
     const obj: any = {};
     obj.address = message.address;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryAccountRequestAminoMsg): QueryAccountRequest {
+    return QueryAccountRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryAccountRequest): QueryAccountRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryAccountRequest",
+      value: QueryAccountRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryAccountRequestProtoMsg): QueryAccountRequest {
+    return QueryAccountRequest.decode(message.value);
+  },
+
+  toProto(message: QueryAccountRequest): Uint8Array {
+    return QueryAccountRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryAccountRequest): QueryAccountRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.auth.v1beta1.QueryAccountRequest",
+      value: QueryAccountRequest.encode(message).finish()
+    };
   }
 
 };
@@ -632,6 +719,9 @@ function createBaseQueryModuleAccountsRequest(): QueryModuleAccountsRequest {
 }
 
 export const QueryModuleAccountsRequest = {
+  typeUrl: "/cosmos.auth.v1beta1.QueryModuleAccountsRequest",
+  aminoType: "cosmos-sdk/QueryModuleAccountsRequest",
+
   encode(_: QueryModuleAccountsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -684,6 +774,32 @@ export const QueryModuleAccountsRequest = {
   toAmino(_: QueryModuleAccountsRequest): QueryModuleAccountsRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryModuleAccountsRequestAminoMsg): QueryModuleAccountsRequest {
+    return QueryModuleAccountsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryModuleAccountsRequest): QueryModuleAccountsRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryModuleAccountsRequest",
+      value: QueryModuleAccountsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryModuleAccountsRequestProtoMsg): QueryModuleAccountsRequest {
+    return QueryModuleAccountsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryModuleAccountsRequest): Uint8Array {
+    return QueryModuleAccountsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryModuleAccountsRequest): QueryModuleAccountsRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.auth.v1beta1.QueryModuleAccountsRequest",
+      value: QueryModuleAccountsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -695,6 +811,9 @@ function createBaseQueryParamsResponse(): QueryParamsResponse {
 }
 
 export const QueryParamsResponse = {
+  typeUrl: "/cosmos.auth.v1beta1.QueryParamsResponse",
+  aminoType: "cosmos-sdk/QueryParamsResponse",
+
   encode(message: QueryParamsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.params !== undefined) {
       Params.encode(message.params, writer.uint32(10).fork()).ldelim();
@@ -765,6 +884,32 @@ export const QueryParamsResponse = {
     const obj: any = {};
     obj.params = message.params ? Params.toAmino(message.params) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryParamsResponseAminoMsg): QueryParamsResponse {
+    return QueryParamsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryParamsResponse): QueryParamsResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryParamsResponse",
+      value: QueryParamsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryParamsResponseProtoMsg): QueryParamsResponse {
+    return QueryParamsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryParamsResponse): Uint8Array {
+    return QueryParamsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryParamsResponse): QueryParamsResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.auth.v1beta1.QueryParamsResponse",
+      value: QueryParamsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -776,6 +921,9 @@ function createBaseQueryAccountResponse(): QueryAccountResponse {
 }
 
 export const QueryAccountResponse = {
+  typeUrl: "/cosmos.auth.v1beta1.QueryAccountResponse",
+  aminoType: "cosmos-sdk/QueryAccountResponse",
+
   encode(message: QueryAccountResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.account !== undefined) {
       Any.encode((message.account as Any), writer.uint32(10).fork()).ldelim();
@@ -846,6 +994,32 @@ export const QueryAccountResponse = {
     const obj: any = {};
     obj.account = message.account ? AccountI_ToAmino((message.account as Any)) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryAccountResponseAminoMsg): QueryAccountResponse {
+    return QueryAccountResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryAccountResponse): QueryAccountResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryAccountResponse",
+      value: QueryAccountResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryAccountResponseProtoMsg): QueryAccountResponse {
+    return QueryAccountResponse.decode(message.value);
+  },
+
+  toProto(message: QueryAccountResponse): Uint8Array {
+    return QueryAccountResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryAccountResponse): QueryAccountResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.auth.v1beta1.QueryAccountResponse",
+      value: QueryAccountResponse.encode(message).finish()
+    };
   }
 
 };
@@ -855,6 +1029,9 @@ function createBaseQueryParamsRequest(): QueryParamsRequest {
 }
 
 export const QueryParamsRequest = {
+  typeUrl: "/cosmos.auth.v1beta1.QueryParamsRequest",
+  aminoType: "cosmos-sdk/QueryParamsRequest",
+
   encode(_: QueryParamsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -907,6 +1084,32 @@ export const QueryParamsRequest = {
   toAmino(_: QueryParamsRequest): QueryParamsRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest {
+    return QueryParamsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryParamsRequest): QueryParamsRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryParamsRequest",
+      value: QueryParamsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryParamsRequestProtoMsg): QueryParamsRequest {
+    return QueryParamsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryParamsRequest): Uint8Array {
+    return QueryParamsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryParamsRequest): QueryParamsRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.auth.v1beta1.QueryParamsRequest",
+      value: QueryParamsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -918,6 +1121,9 @@ function createBaseQueryModuleAccountsResponse(): QueryModuleAccountsResponse {
 }
 
 export const QueryModuleAccountsResponse = {
+  typeUrl: "/cosmos.auth.v1beta1.QueryModuleAccountsResponse",
+  aminoType: "cosmos-sdk/QueryModuleAccountsResponse",
+
   encode(message: QueryModuleAccountsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.accounts) {
       Any.encode((v! as Any), writer.uint32(10).fork()).ldelim();
@@ -1006,6 +1212,32 @@ export const QueryModuleAccountsResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: QueryModuleAccountsResponseAminoMsg): QueryModuleAccountsResponse {
+    return QueryModuleAccountsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryModuleAccountsResponse): QueryModuleAccountsResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryModuleAccountsResponse",
+      value: QueryModuleAccountsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryModuleAccountsResponseProtoMsg): QueryModuleAccountsResponse {
+    return QueryModuleAccountsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryModuleAccountsResponse): Uint8Array {
+    return QueryModuleAccountsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryModuleAccountsResponse): QueryModuleAccountsResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.auth.v1beta1.QueryModuleAccountsResponse",
+      value: QueryModuleAccountsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1015,6 +1247,9 @@ function createBaseBech32PrefixRequest(): Bech32PrefixRequest {
 }
 
 export const Bech32PrefixRequest = {
+  typeUrl: "/cosmos.auth.v1beta1.Bech32PrefixRequest",
+  aminoType: "cosmos-sdk/Bech32PrefixRequest",
+
   encode(_: Bech32PrefixRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -1067,6 +1302,32 @@ export const Bech32PrefixRequest = {
   toAmino(_: Bech32PrefixRequest): Bech32PrefixRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: Bech32PrefixRequestAminoMsg): Bech32PrefixRequest {
+    return Bech32PrefixRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Bech32PrefixRequest): Bech32PrefixRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/Bech32PrefixRequest",
+      value: Bech32PrefixRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: Bech32PrefixRequestProtoMsg): Bech32PrefixRequest {
+    return Bech32PrefixRequest.decode(message.value);
+  },
+
+  toProto(message: Bech32PrefixRequest): Uint8Array {
+    return Bech32PrefixRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: Bech32PrefixRequest): Bech32PrefixRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.auth.v1beta1.Bech32PrefixRequest",
+      value: Bech32PrefixRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1078,6 +1339,9 @@ function createBaseBech32PrefixResponse(): Bech32PrefixResponse {
 }
 
 export const Bech32PrefixResponse = {
+  typeUrl: "/cosmos.auth.v1beta1.Bech32PrefixResponse",
+  aminoType: "cosmos-sdk/Bech32PrefixResponse",
+
   encode(message: Bech32PrefixResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.bech32Prefix !== "") {
       writer.uint32(10).string(message.bech32Prefix);
@@ -1148,6 +1412,32 @@ export const Bech32PrefixResponse = {
     const obj: any = {};
     obj.bech32_prefix = message.bech32Prefix;
     return obj;
+  },
+
+  fromAminoMsg(object: Bech32PrefixResponseAminoMsg): Bech32PrefixResponse {
+    return Bech32PrefixResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Bech32PrefixResponse): Bech32PrefixResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/Bech32PrefixResponse",
+      value: Bech32PrefixResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: Bech32PrefixResponseProtoMsg): Bech32PrefixResponse {
+    return Bech32PrefixResponse.decode(message.value);
+  },
+
+  toProto(message: Bech32PrefixResponse): Uint8Array {
+    return Bech32PrefixResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: Bech32PrefixResponse): Bech32PrefixResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.auth.v1beta1.Bech32PrefixResponse",
+      value: Bech32PrefixResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1159,6 +1449,9 @@ function createBaseAddressBytesToStringRequest(): AddressBytesToStringRequest {
 }
 
 export const AddressBytesToStringRequest = {
+  typeUrl: "/cosmos.auth.v1beta1.AddressBytesToStringRequest",
+  aminoType: "cosmos-sdk/AddressBytesToStringRequest",
+
   encode(message: AddressBytesToStringRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.addressBytes.length !== 0) {
       writer.uint32(10).bytes(message.addressBytes);
@@ -1229,6 +1522,32 @@ export const AddressBytesToStringRequest = {
     const obj: any = {};
     obj.address_bytes = message.addressBytes;
     return obj;
+  },
+
+  fromAminoMsg(object: AddressBytesToStringRequestAminoMsg): AddressBytesToStringRequest {
+    return AddressBytesToStringRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: AddressBytesToStringRequest): AddressBytesToStringRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/AddressBytesToStringRequest",
+      value: AddressBytesToStringRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: AddressBytesToStringRequestProtoMsg): AddressBytesToStringRequest {
+    return AddressBytesToStringRequest.decode(message.value);
+  },
+
+  toProto(message: AddressBytesToStringRequest): Uint8Array {
+    return AddressBytesToStringRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: AddressBytesToStringRequest): AddressBytesToStringRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.auth.v1beta1.AddressBytesToStringRequest",
+      value: AddressBytesToStringRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1240,6 +1559,9 @@ function createBaseAddressBytesToStringResponse(): AddressBytesToStringResponse
 }
 
 export const AddressBytesToStringResponse = {
+  typeUrl: "/cosmos.auth.v1beta1.AddressBytesToStringResponse",
+  aminoType: "cosmos-sdk/AddressBytesToStringResponse",
+
   encode(message: AddressBytesToStringResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.addressString !== "") {
       writer.uint32(10).string(message.addressString);
@@ -1310,6 +1632,32 @@ export const AddressBytesToStringResponse = {
     const obj: any = {};
     obj.address_string = message.addressString;
     return obj;
+  },
+
+  fromAminoMsg(object: AddressBytesToStringResponseAminoMsg): AddressBytesToStringResponse {
+    return AddressBytesToStringResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: AddressBytesToStringResponse): AddressBytesToStringResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/AddressBytesToStringResponse",
+      value: AddressBytesToStringResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: AddressBytesToStringResponseProtoMsg): AddressBytesToStringResponse {
+    return AddressBytesToStringResponse.decode(message.value);
+  },
+
+  toProto(message: AddressBytesToStringResponse): Uint8Array {
+    return AddressBytesToStringResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: AddressBytesToStringResponse): AddressBytesToStringResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.auth.v1beta1.AddressBytesToStringResponse",
+      value: AddressBytesToStringResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1321,6 +1669,9 @@ function createBaseAddressStringToBytesRequest(): AddressStringToBytesRequest {
 }
 
 export const AddressStringToBytesRequest = {
+  typeUrl: "/cosmos.auth.v1beta1.AddressStringToBytesRequest",
+  aminoType: "cosmos-sdk/AddressStringToBytesRequest",
+
   encode(message: AddressStringToBytesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.addressString !== "") {
       writer.uint32(10).string(message.addressString);
@@ -1391,6 +1742,32 @@ export const AddressStringToBytesRequest = {
     const obj: any = {};
     obj.address_string = message.addressString;
     return obj;
+  },
+
+  fromAminoMsg(object: AddressStringToBytesRequestAminoMsg): AddressStringToBytesRequest {
+    return AddressStringToBytesRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: AddressStringToBytesRequest): AddressStringToBytesRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/AddressStringToBytesRequest",
+      value: AddressStringToBytesRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: AddressStringToBytesRequestProtoMsg): AddressStringToBytesRequest {
+    return AddressStringToBytesRequest.decode(message.value);
+  },
+
+  toProto(message: AddressStringToBytesRequest): Uint8Array {
+    return AddressStringToBytesRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: AddressStringToBytesRequest): AddressStringToBytesRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.auth.v1beta1.AddressStringToBytesRequest",
+      value: AddressStringToBytesRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1402,6 +1779,9 @@ function createBaseAddressStringToBytesResponse(): AddressStringToBytesResponse
 }
 
 export const AddressStringToBytesResponse = {
+  typeUrl: "/cosmos.auth.v1beta1.AddressStringToBytesResponse",
+  aminoType: "cosmos-sdk/AddressStringToBytesResponse",
+
   encode(message: AddressStringToBytesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.addressBytes.length !== 0) {
       writer.uint32(10).bytes(message.addressBytes);
@@ -1472,6 +1852,32 @@ export const AddressStringToBytesResponse = {
     const obj: any = {};
     obj.address_bytes = message.addressBytes;
     return obj;
+  },
+
+  fromAminoMsg(object: AddressStringToBytesResponseAminoMsg): AddressStringToBytesResponse {
+    return AddressStringToBytesResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: AddressStringToBytesResponse): AddressStringToBytesResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/AddressStringToBytesResponse",
+      value: AddressStringToBytesResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: AddressStringToBytesResponseProtoMsg): AddressStringToBytesResponse {
+    return AddressStringToBytesResponse.decode(message.value);
+  },
+
+  toProto(message: AddressStringToBytesResponse): Uint8Array {
+    return AddressStringToBytesResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: AddressStringToBytesResponse): AddressStringToBytesResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.auth.v1beta1.AddressStringToBytesResponse",
+      value: AddressStringToBytesResponse.encode(message).finish()
+    };
   }
 
 };
diff --git a/__fixtures__/outputv2/cosmos/authz/v1beta1/authz.ts b/__fixtures__/outputv2/cosmos/authz/v1beta1/authz.ts
index 66b74b276..c63205ccb 100644
--- a/__fixtures__/outputv2/cosmos/authz/v1beta1/authz.ts
+++ b/__fixtures__/outputv2/cosmos/authz/v1beta1/authz.ts
@@ -20,7 +20,7 @@ export interface GenericAuthorization {
   /** Msg, identified by it's type URL, to grant unrestricted permissions to execute */
   msg: string;
 }
-export interface GenericAuthorizationProtoType {
+export interface GenericAuthorizationProtoMsg {
   typeUrl: "/cosmos.authz.v1beta1.GenericAuthorization";
   value: Uint8Array;
 }
@@ -33,7 +33,7 @@ export interface GenericAuthorizationAmino {
   /** Msg, identified by it's type URL, to grant unrestricted permissions to execute */
   msg: string;
 }
-export interface GenericAuthorizationAminoType {
+export interface GenericAuthorizationAminoMsg {
   type: "cosmos-sdk/GenericAuthorization";
   value: GenericAuthorizationAmino;
 }
@@ -60,7 +60,7 @@ export interface Grant {
    */
   expiration?: Date;
 }
-export interface GrantProtoType {
+export interface GrantProtoMsg {
   typeUrl: "/cosmos.authz.v1beta1.Grant";
   value: Uint8Array;
 }
@@ -79,7 +79,7 @@ export interface GrantAmino {
    */
   expiration?: Date;
 }
-export interface GrantAminoType {
+export interface GrantAminoMsg {
   type: "cosmos-sdk/Grant";
   value: GrantAmino;
 }
@@ -103,7 +103,7 @@ export interface GrantAuthorization {
   authorization?: (GenericAuthorization & DepositDeploymentAuthorization1 & DepositDeploymentAuthorization2 & SendAuthorization & StakeAuthorization & Any) | undefined;
   expiration?: Date;
 }
-export interface GrantAuthorizationProtoType {
+export interface GrantAuthorizationProtoMsg {
   typeUrl: "/cosmos.authz.v1beta1.GrantAuthorization";
   value: Uint8Array;
 }
@@ -118,7 +118,7 @@ export interface GrantAuthorizationAmino {
   authorization?: AnyAmino;
   expiration?: Date;
 }
-export interface GrantAuthorizationAminoType {
+export interface GrantAuthorizationAminoMsg {
   type: "cosmos-sdk/GrantAuthorization";
   value: GrantAuthorizationAmino;
 }
@@ -139,7 +139,7 @@ export interface GrantQueueItem {
   /** msg_type_urls contains the list of TypeURL of a sdk.Msg. */
   msgTypeUrls: string[];
 }
-export interface GrantQueueItemProtoType {
+export interface GrantQueueItemProtoMsg {
   typeUrl: "/cosmos.authz.v1beta1.GrantQueueItem";
   value: Uint8Array;
 }
@@ -149,7 +149,7 @@ export interface GrantQueueItemAmino {
   /** msg_type_urls contains the list of TypeURL of a sdk.Msg. */
   msg_type_urls: string[];
 }
-export interface GrantQueueItemAminoType {
+export interface GrantQueueItemAminoMsg {
   type: "cosmos-sdk/GrantQueueItem";
   value: GrantQueueItemAmino;
 }
@@ -166,6 +166,9 @@ function createBaseGenericAuthorization(): GenericAuthorization {
 }
 
 export const GenericAuthorization = {
+  typeUrl: "/cosmos.authz.v1beta1.GenericAuthorization",
+  aminoType: "cosmos-sdk/GenericAuthorization",
+
   encode(message: GenericAuthorization, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.msg !== "") {
       writer.uint32(10).string(message.msg);
@@ -236,6 +239,32 @@ export const GenericAuthorization = {
     const obj: any = {};
     obj.msg = message.msg;
     return obj;
+  },
+
+  fromAminoMsg(object: GenericAuthorizationAminoMsg): GenericAuthorization {
+    return GenericAuthorization.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GenericAuthorization): GenericAuthorizationAminoMsg {
+    return {
+      type: "cosmos-sdk/GenericAuthorization",
+      value: GenericAuthorization.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GenericAuthorizationProtoMsg): GenericAuthorization {
+    return GenericAuthorization.decode(message.value);
+  },
+
+  toProto(message: GenericAuthorization): Uint8Array {
+    return GenericAuthorization.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenericAuthorization): GenericAuthorizationProtoMsg {
+    return {
+      typeUrl: "/cosmos.authz.v1beta1.GenericAuthorization",
+      value: GenericAuthorization.encode(message).finish()
+    };
   }
 
 };
@@ -248,6 +277,9 @@ function createBaseGrant(): Grant {
 }
 
 export const Grant = {
+  typeUrl: "/cosmos.authz.v1beta1.Grant",
+  aminoType: "cosmos-sdk/Grant",
+
   encode(message: Grant, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.authorization !== undefined) {
       Any.encode((message.authorization as Any), writer.uint32(10).fork()).ldelim();
@@ -333,6 +365,32 @@ export const Grant = {
     obj.authorization = message.authorization ? Authorization_ToAmino((message.authorization as Any)) : undefined;
     obj.expiration = message.expiration ? Timestamp.toAmino(message.expiration) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GrantAminoMsg): Grant {
+    return Grant.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Grant): GrantAminoMsg {
+    return {
+      type: "cosmos-sdk/Grant",
+      value: Grant.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GrantProtoMsg): Grant {
+    return Grant.decode(message.value);
+  },
+
+  toProto(message: Grant): Uint8Array {
+    return Grant.encode(message).finish();
+  },
+
+  toProtoMsg(message: Grant): GrantProtoMsg {
+    return {
+      typeUrl: "/cosmos.authz.v1beta1.Grant",
+      value: Grant.encode(message).finish()
+    };
   }
 
 };
@@ -347,6 +405,9 @@ function createBaseGrantAuthorization(): GrantAuthorization {
 }
 
 export const GrantAuthorization = {
+  typeUrl: "/cosmos.authz.v1beta1.GrantAuthorization",
+  aminoType: "cosmos-sdk/GrantAuthorization",
+
   encode(message: GrantAuthorization, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.granter !== "") {
       writer.uint32(10).string(message.granter);
@@ -462,6 +523,32 @@ export const GrantAuthorization = {
     obj.authorization = message.authorization ? Authorization_ToAmino((message.authorization as Any)) : undefined;
     obj.expiration = message.expiration ? Timestamp.toAmino(message.expiration) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GrantAuthorizationAminoMsg): GrantAuthorization {
+    return GrantAuthorization.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GrantAuthorization): GrantAuthorizationAminoMsg {
+    return {
+      type: "cosmos-sdk/GrantAuthorization",
+      value: GrantAuthorization.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GrantAuthorizationProtoMsg): GrantAuthorization {
+    return GrantAuthorization.decode(message.value);
+  },
+
+  toProto(message: GrantAuthorization): Uint8Array {
+    return GrantAuthorization.encode(message).finish();
+  },
+
+  toProtoMsg(message: GrantAuthorization): GrantAuthorizationProtoMsg {
+    return {
+      typeUrl: "/cosmos.authz.v1beta1.GrantAuthorization",
+      value: GrantAuthorization.encode(message).finish()
+    };
   }
 
 };
@@ -473,6 +560,9 @@ function createBaseGrantQueueItem(): GrantQueueItem {
 }
 
 export const GrantQueueItem = {
+  typeUrl: "/cosmos.authz.v1beta1.GrantQueueItem",
+  aminoType: "cosmos-sdk/GrantQueueItem",
+
   encode(message: GrantQueueItem, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.msgTypeUrls) {
       writer.uint32(10).string(v!);
@@ -561,6 +651,32 @@ export const GrantQueueItem = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: GrantQueueItemAminoMsg): GrantQueueItem {
+    return GrantQueueItem.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GrantQueueItem): GrantQueueItemAminoMsg {
+    return {
+      type: "cosmos-sdk/GrantQueueItem",
+      value: GrantQueueItem.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GrantQueueItemProtoMsg): GrantQueueItem {
+    return GrantQueueItem.decode(message.value);
+  },
+
+  toProto(message: GrantQueueItem): Uint8Array {
+    return GrantQueueItem.encode(message).finish();
+  },
+
+  toProtoMsg(message: GrantQueueItem): GrantQueueItemProtoMsg {
+    return {
+      typeUrl: "/cosmos.authz.v1beta1.GrantQueueItem",
+      value: GrantQueueItem.encode(message).finish()
+    };
   }
 
 };
diff --git a/__fixtures__/outputv2/cosmos/authz/v1beta1/genesis.ts b/__fixtures__/outputv2/cosmos/authz/v1beta1/genesis.ts
index ea6e02ef4..b8f7e785c 100644
--- a/__fixtures__/outputv2/cosmos/authz/v1beta1/genesis.ts
+++ b/__fixtures__/outputv2/cosmos/authz/v1beta1/genesis.ts
@@ -7,7 +7,7 @@ export const protobufPackage = "cosmos.authz.v1beta1";
 export interface GenesisState {
   authorization: GrantAuthorization[];
 }
-export interface GenesisStateProtoType {
+export interface GenesisStateProtoMsg {
   typeUrl: "/cosmos.authz.v1beta1.GenesisState";
   value: Uint8Array;
 }
@@ -16,7 +16,7 @@ export interface GenesisStateProtoType {
 export interface GenesisStateAmino {
   authorization: GrantAuthorizationAmino[];
 }
-export interface GenesisStateAminoType {
+export interface GenesisStateAminoMsg {
   type: "cosmos-sdk/GenesisState";
   value: GenesisStateAmino;
 }
@@ -33,6 +33,9 @@ function createBaseGenesisState(): GenesisState {
 }
 
 export const GenesisState = {
+  typeUrl: "/cosmos.authz.v1beta1.GenesisState",
+  aminoType: "cosmos-sdk/GenesisState",
+
   encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.authorization) {
       GrantAuthorization.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -121,6 +124,32 @@ export const GenesisState = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisStateAminoMsg): GenesisState {
+    return GenesisState.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GenesisState): GenesisStateAminoMsg {
+    return {
+      type: "cosmos-sdk/GenesisState",
+      value: GenesisState.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GenesisStateProtoMsg): GenesisState {
+    return GenesisState.decode(message.value);
+  },
+
+  toProto(message: GenesisState): Uint8Array {
+    return GenesisState.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisState): GenesisStateProtoMsg {
+    return {
+      typeUrl: "/cosmos.authz.v1beta1.GenesisState",
+      value: GenesisState.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/authz/v1beta1/query.ts b/__fixtures__/outputv2/cosmos/authz/v1beta1/query.ts
index 9b15b87ff..ca96f8a99 100644
--- a/__fixtures__/outputv2/cosmos/authz/v1beta1/query.ts
+++ b/__fixtures__/outputv2/cosmos/authz/v1beta1/query.ts
@@ -15,7 +15,7 @@ export interface QueryGrantsRequest {
   /** pagination defines an pagination for the request. */
   pagination?: PageRequest;
 }
-export interface QueryGrantsRequestProtoType {
+export interface QueryGrantsRequestProtoMsg {
   typeUrl: "/cosmos.authz.v1beta1.QueryGrantsRequest";
   value: Uint8Array;
 }
@@ -31,7 +31,7 @@ export interface QueryGrantsRequestAmino {
   /** pagination defines an pagination for the request. */
   pagination?: PageRequestAmino;
 }
-export interface QueryGrantsRequestAminoType {
+export interface QueryGrantsRequestAminoMsg {
   type: "cosmos-sdk/QueryGrantsRequest";
   value: QueryGrantsRequestAmino;
 }
@@ -52,7 +52,7 @@ export interface QueryGrantsResponse {
   /** pagination defines an pagination for the response. */
   pagination?: PageResponse;
 }
-export interface QueryGrantsResponseProtoType {
+export interface QueryGrantsResponseProtoMsg {
   typeUrl: "/cosmos.authz.v1beta1.QueryGrantsResponse";
   value: Uint8Array;
 }
@@ -65,7 +65,7 @@ export interface QueryGrantsResponseAmino {
   /** pagination defines an pagination for the response. */
   pagination?: PageResponseAmino;
 }
-export interface QueryGrantsResponseAminoType {
+export interface QueryGrantsResponseAminoMsg {
   type: "cosmos-sdk/QueryGrantsResponse";
   value: QueryGrantsResponseAmino;
 }
@@ -83,7 +83,7 @@ export interface QueryGranterGrantsRequest {
   /** pagination defines an pagination for the request. */
   pagination?: PageRequest;
 }
-export interface QueryGranterGrantsRequestProtoType {
+export interface QueryGranterGrantsRequestProtoMsg {
   typeUrl: "/cosmos.authz.v1beta1.QueryGranterGrantsRequest";
   value: Uint8Array;
 }
@@ -95,7 +95,7 @@ export interface QueryGranterGrantsRequestAmino {
   /** pagination defines an pagination for the request. */
   pagination?: PageRequestAmino;
 }
-export interface QueryGranterGrantsRequestAminoType {
+export interface QueryGranterGrantsRequestAminoMsg {
   type: "cosmos-sdk/QueryGranterGrantsRequest";
   value: QueryGranterGrantsRequestAmino;
 }
@@ -114,7 +114,7 @@ export interface QueryGranterGrantsResponse {
   /** pagination defines an pagination for the response. */
   pagination?: PageResponse;
 }
-export interface QueryGranterGrantsResponseProtoType {
+export interface QueryGranterGrantsResponseProtoMsg {
   typeUrl: "/cosmos.authz.v1beta1.QueryGranterGrantsResponse";
   value: Uint8Array;
 }
@@ -127,7 +127,7 @@ export interface QueryGranterGrantsResponseAmino {
   /** pagination defines an pagination for the response. */
   pagination?: PageResponseAmino;
 }
-export interface QueryGranterGrantsResponseAminoType {
+export interface QueryGranterGrantsResponseAminoMsg {
   type: "cosmos-sdk/QueryGranterGrantsResponse";
   value: QueryGranterGrantsResponseAmino;
 }
@@ -145,7 +145,7 @@ export interface QueryGranteeGrantsRequest {
   /** pagination defines an pagination for the request. */
   pagination?: PageRequest;
 }
-export interface QueryGranteeGrantsRequestProtoType {
+export interface QueryGranteeGrantsRequestProtoMsg {
   typeUrl: "/cosmos.authz.v1beta1.QueryGranteeGrantsRequest";
   value: Uint8Array;
 }
@@ -157,7 +157,7 @@ export interface QueryGranteeGrantsRequestAmino {
   /** pagination defines an pagination for the request. */
   pagination?: PageRequestAmino;
 }
-export interface QueryGranteeGrantsRequestAminoType {
+export interface QueryGranteeGrantsRequestAminoMsg {
   type: "cosmos-sdk/QueryGranteeGrantsRequest";
   value: QueryGranteeGrantsRequestAmino;
 }
@@ -176,7 +176,7 @@ export interface QueryGranteeGrantsResponse {
   /** pagination defines an pagination for the response. */
   pagination?: PageResponse;
 }
-export interface QueryGranteeGrantsResponseProtoType {
+export interface QueryGranteeGrantsResponseProtoMsg {
   typeUrl: "/cosmos.authz.v1beta1.QueryGranteeGrantsResponse";
   value: Uint8Array;
 }
@@ -189,7 +189,7 @@ export interface QueryGranteeGrantsResponseAmino {
   /** pagination defines an pagination for the response. */
   pagination?: PageResponseAmino;
 }
-export interface QueryGranteeGrantsResponseAminoType {
+export interface QueryGranteeGrantsResponseAminoMsg {
   type: "cosmos-sdk/QueryGranteeGrantsResponse";
   value: QueryGranteeGrantsResponseAmino;
 }
@@ -210,6 +210,9 @@ function createBaseQueryGrantsRequest(): QueryGrantsRequest {
 }
 
 export const QueryGrantsRequest = {
+  typeUrl: "/cosmos.authz.v1beta1.QueryGrantsRequest",
+  aminoType: "cosmos-sdk/QueryGrantsRequest",
+
   encode(message: QueryGrantsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.granter !== "") {
       writer.uint32(10).string(message.granter);
@@ -325,6 +328,32 @@ export const QueryGrantsRequest = {
     obj.msg_type_url = message.msgTypeUrl;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryGrantsRequestAminoMsg): QueryGrantsRequest {
+    return QueryGrantsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryGrantsRequest): QueryGrantsRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryGrantsRequest",
+      value: QueryGrantsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryGrantsRequestProtoMsg): QueryGrantsRequest {
+    return QueryGrantsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryGrantsRequest): Uint8Array {
+    return QueryGrantsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryGrantsRequest): QueryGrantsRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.authz.v1beta1.QueryGrantsRequest",
+      value: QueryGrantsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -337,6 +366,9 @@ function createBaseQueryGrantsResponse(): QueryGrantsResponse {
 }
 
 export const QueryGrantsResponse = {
+  typeUrl: "/cosmos.authz.v1beta1.QueryGrantsResponse",
+  aminoType: "cosmos-sdk/QueryGrantsResponse",
+
   encode(message: QueryGrantsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.grants) {
       Grant.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -440,6 +472,32 @@ export const QueryGrantsResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryGrantsResponseAminoMsg): QueryGrantsResponse {
+    return QueryGrantsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryGrantsResponse): QueryGrantsResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryGrantsResponse",
+      value: QueryGrantsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryGrantsResponseProtoMsg): QueryGrantsResponse {
+    return QueryGrantsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryGrantsResponse): Uint8Array {
+    return QueryGrantsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryGrantsResponse): QueryGrantsResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.authz.v1beta1.QueryGrantsResponse",
+      value: QueryGrantsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -452,6 +510,9 @@ function createBaseQueryGranterGrantsRequest(): QueryGranterGrantsRequest {
 }
 
 export const QueryGranterGrantsRequest = {
+  typeUrl: "/cosmos.authz.v1beta1.QueryGranterGrantsRequest",
+  aminoType: "cosmos-sdk/QueryGranterGrantsRequest",
+
   encode(message: QueryGranterGrantsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.granter !== "") {
       writer.uint32(10).string(message.granter);
@@ -537,6 +598,32 @@ export const QueryGranterGrantsRequest = {
     obj.granter = message.granter;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryGranterGrantsRequestAminoMsg): QueryGranterGrantsRequest {
+    return QueryGranterGrantsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryGranterGrantsRequest): QueryGranterGrantsRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryGranterGrantsRequest",
+      value: QueryGranterGrantsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryGranterGrantsRequestProtoMsg): QueryGranterGrantsRequest {
+    return QueryGranterGrantsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryGranterGrantsRequest): Uint8Array {
+    return QueryGranterGrantsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryGranterGrantsRequest): QueryGranterGrantsRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.authz.v1beta1.QueryGranterGrantsRequest",
+      value: QueryGranterGrantsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -549,6 +636,9 @@ function createBaseQueryGranterGrantsResponse(): QueryGranterGrantsResponse {
 }
 
 export const QueryGranterGrantsResponse = {
+  typeUrl: "/cosmos.authz.v1beta1.QueryGranterGrantsResponse",
+  aminoType: "cosmos-sdk/QueryGranterGrantsResponse",
+
   encode(message: QueryGranterGrantsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.grants) {
       GrantAuthorization.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -652,6 +742,32 @@ export const QueryGranterGrantsResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryGranterGrantsResponseAminoMsg): QueryGranterGrantsResponse {
+    return QueryGranterGrantsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryGranterGrantsResponse): QueryGranterGrantsResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryGranterGrantsResponse",
+      value: QueryGranterGrantsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryGranterGrantsResponseProtoMsg): QueryGranterGrantsResponse {
+    return QueryGranterGrantsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryGranterGrantsResponse): Uint8Array {
+    return QueryGranterGrantsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryGranterGrantsResponse): QueryGranterGrantsResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.authz.v1beta1.QueryGranterGrantsResponse",
+      value: QueryGranterGrantsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -664,6 +780,9 @@ function createBaseQueryGranteeGrantsRequest(): QueryGranteeGrantsRequest {
 }
 
 export const QueryGranteeGrantsRequest = {
+  typeUrl: "/cosmos.authz.v1beta1.QueryGranteeGrantsRequest",
+  aminoType: "cosmos-sdk/QueryGranteeGrantsRequest",
+
   encode(message: QueryGranteeGrantsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.grantee !== "") {
       writer.uint32(10).string(message.grantee);
@@ -749,6 +868,32 @@ export const QueryGranteeGrantsRequest = {
     obj.grantee = message.grantee;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryGranteeGrantsRequestAminoMsg): QueryGranteeGrantsRequest {
+    return QueryGranteeGrantsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryGranteeGrantsRequest): QueryGranteeGrantsRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryGranteeGrantsRequest",
+      value: QueryGranteeGrantsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryGranteeGrantsRequestProtoMsg): QueryGranteeGrantsRequest {
+    return QueryGranteeGrantsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryGranteeGrantsRequest): Uint8Array {
+    return QueryGranteeGrantsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryGranteeGrantsRequest): QueryGranteeGrantsRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.authz.v1beta1.QueryGranteeGrantsRequest",
+      value: QueryGranteeGrantsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -761,6 +906,9 @@ function createBaseQueryGranteeGrantsResponse(): QueryGranteeGrantsResponse {
 }
 
 export const QueryGranteeGrantsResponse = {
+  typeUrl: "/cosmos.authz.v1beta1.QueryGranteeGrantsResponse",
+  aminoType: "cosmos-sdk/QueryGranteeGrantsResponse",
+
   encode(message: QueryGranteeGrantsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.grants) {
       GrantAuthorization.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -864,6 +1012,32 @@ export const QueryGranteeGrantsResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryGranteeGrantsResponseAminoMsg): QueryGranteeGrantsResponse {
+    return QueryGranteeGrantsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryGranteeGrantsResponse): QueryGranteeGrantsResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryGranteeGrantsResponse",
+      value: QueryGranteeGrantsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryGranteeGrantsResponseProtoMsg): QueryGranteeGrantsResponse {
+    return QueryGranteeGrantsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryGranteeGrantsResponse): Uint8Array {
+    return QueryGranteeGrantsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryGranteeGrantsResponse): QueryGranteeGrantsResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.authz.v1beta1.QueryGranteeGrantsResponse",
+      value: QueryGranteeGrantsResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/authz/v1beta1/tx.ts b/__fixtures__/outputv2/cosmos/authz/v1beta1/tx.ts
index 79893bb87..546e977dd 100644
--- a/__fixtures__/outputv2/cosmos/authz/v1beta1/tx.ts
+++ b/__fixtures__/outputv2/cosmos/authz/v1beta1/tx.ts
@@ -13,7 +13,7 @@ export interface MsgGrant {
   grantee: string;
   grant?: Grant;
 }
-export interface MsgGrantProtoType {
+export interface MsgGrantProtoMsg {
   typeUrl: "/cosmos.authz.v1beta1.MsgGrant";
   value: Uint8Array;
 }
@@ -27,7 +27,7 @@ export interface MsgGrantAmino {
   grantee: string;
   grant?: GrantAmino;
 }
-export interface MsgGrantAminoType {
+export interface MsgGrantAminoMsg {
   type: "cosmos-sdk/MsgGrant";
   value: MsgGrantAmino;
 }
@@ -46,7 +46,7 @@ export interface MsgGrantSDKType {
 export interface MsgExecResponse {
   results: Uint8Array[];
 }
-export interface MsgExecResponseProtoType {
+export interface MsgExecResponseProtoMsg {
   typeUrl: "/cosmos.authz.v1beta1.MsgExecResponse";
   value: Uint8Array;
 }
@@ -55,7 +55,7 @@ export interface MsgExecResponseProtoType {
 export interface MsgExecResponseAmino {
   results: Uint8Array[];
 }
-export interface MsgExecResponseAminoType {
+export interface MsgExecResponseAminoMsg {
   type: "cosmos-sdk/MsgExecResponse";
   value: MsgExecResponseAmino;
 }
@@ -80,7 +80,7 @@ export interface MsgExec {
    */
   msgs: (Any)[] | Any[];
 }
-export interface MsgExecProtoType {
+export interface MsgExecProtoMsg {
   typeUrl: "/cosmos.authz.v1beta1.MsgExec";
   value: Uint8Array;
 }
@@ -100,7 +100,7 @@ export interface MsgExecAmino {
    */
   msgs: AnyAmino[];
 }
-export interface MsgExecAminoType {
+export interface MsgExecAminoMsg {
   type: "cosmos-sdk/MsgExec";
   value: MsgExecAmino;
 }
@@ -117,14 +117,14 @@ export interface MsgExecSDKType {
 
 /** MsgGrantResponse defines the Msg/MsgGrant response type. */
 export interface MsgGrantResponse {}
-export interface MsgGrantResponseProtoType {
+export interface MsgGrantResponseProtoMsg {
   typeUrl: "/cosmos.authz.v1beta1.MsgGrantResponse";
   value: Uint8Array;
 }
 
 /** MsgGrantResponse defines the Msg/MsgGrant response type. */
 export interface MsgGrantResponseAmino {}
-export interface MsgGrantResponseAminoType {
+export interface MsgGrantResponseAminoMsg {
   type: "cosmos-sdk/MsgGrantResponse";
   value: MsgGrantResponseAmino;
 }
@@ -141,7 +141,7 @@ export interface MsgRevoke {
   grantee: string;
   msgTypeUrl: string;
 }
-export interface MsgRevokeProtoType {
+export interface MsgRevokeProtoMsg {
   typeUrl: "/cosmos.authz.v1beta1.MsgRevoke";
   value: Uint8Array;
 }
@@ -155,7 +155,7 @@ export interface MsgRevokeAmino {
   grantee: string;
   msg_type_url: string;
 }
-export interface MsgRevokeAminoType {
+export interface MsgRevokeAminoMsg {
   type: "cosmos-sdk/MsgRevoke";
   value: MsgRevokeAmino;
 }
@@ -172,14 +172,14 @@ export interface MsgRevokeSDKType {
 
 /** MsgRevokeResponse defines the Msg/MsgRevokeResponse response type. */
 export interface MsgRevokeResponse {}
-export interface MsgRevokeResponseProtoType {
+export interface MsgRevokeResponseProtoMsg {
   typeUrl: "/cosmos.authz.v1beta1.MsgRevokeResponse";
   value: Uint8Array;
 }
 
 /** MsgRevokeResponse defines the Msg/MsgRevokeResponse response type. */
 export interface MsgRevokeResponseAmino {}
-export interface MsgRevokeResponseAminoType {
+export interface MsgRevokeResponseAminoMsg {
   type: "cosmos-sdk/MsgRevokeResponse";
   value: MsgRevokeResponseAmino;
 }
@@ -196,6 +196,9 @@ function createBaseMsgGrant(): MsgGrant {
 }
 
 export const MsgGrant = {
+  typeUrl: "/cosmos.authz.v1beta1.MsgGrant",
+  aminoType: "cosmos-sdk/MsgGrant",
+
   encode(message: MsgGrant, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.granter !== "") {
       writer.uint32(10).string(message.granter);
@@ -296,6 +299,32 @@ export const MsgGrant = {
     obj.grantee = message.grantee;
     obj.grant = message.grant ? Grant.toAmino(message.grant) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgGrantAminoMsg): MsgGrant {
+    return MsgGrant.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgGrant): MsgGrantAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgGrant",
+      value: MsgGrant.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgGrantProtoMsg): MsgGrant {
+    return MsgGrant.decode(message.value);
+  },
+
+  toProto(message: MsgGrant): Uint8Array {
+    return MsgGrant.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgGrant): MsgGrantProtoMsg {
+    return {
+      typeUrl: "/cosmos.authz.v1beta1.MsgGrant",
+      value: MsgGrant.encode(message).finish()
+    };
   }
 
 };
@@ -307,6 +336,9 @@ function createBaseMsgExecResponse(): MsgExecResponse {
 }
 
 export const MsgExecResponse = {
+  typeUrl: "/cosmos.authz.v1beta1.MsgExecResponse",
+  aminoType: "cosmos-sdk/MsgExecResponse",
+
   encode(message: MsgExecResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.results) {
       writer.uint32(10).bytes(v!);
@@ -395,6 +427,32 @@ export const MsgExecResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: MsgExecResponseAminoMsg): MsgExecResponse {
+    return MsgExecResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgExecResponse): MsgExecResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgExecResponse",
+      value: MsgExecResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgExecResponseProtoMsg): MsgExecResponse {
+    return MsgExecResponse.decode(message.value);
+  },
+
+  toProto(message: MsgExecResponse): Uint8Array {
+    return MsgExecResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgExecResponse): MsgExecResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.authz.v1beta1.MsgExecResponse",
+      value: MsgExecResponse.encode(message).finish()
+    };
   }
 
 };
@@ -407,6 +465,9 @@ function createBaseMsgExec(): MsgExec {
 }
 
 export const MsgExec = {
+  typeUrl: "/cosmos.authz.v1beta1.MsgExec",
+  aminoType: "cosmos-sdk/MsgExec",
+
   encode(message: MsgExec, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.grantee !== "") {
       writer.uint32(10).string(message.grantee);
@@ -510,6 +571,32 @@ export const MsgExec = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: MsgExecAminoMsg): MsgExec {
+    return MsgExec.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgExec): MsgExecAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgExec",
+      value: MsgExec.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgExecProtoMsg): MsgExec {
+    return MsgExec.decode(message.value);
+  },
+
+  toProto(message: MsgExec): Uint8Array {
+    return MsgExec.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgExec): MsgExecProtoMsg {
+    return {
+      typeUrl: "/cosmos.authz.v1beta1.MsgExec",
+      value: MsgExec.encode(message).finish()
+    };
   }
 
 };
@@ -519,6 +606,9 @@ function createBaseMsgGrantResponse(): MsgGrantResponse {
 }
 
 export const MsgGrantResponse = {
+  typeUrl: "/cosmos.authz.v1beta1.MsgGrantResponse",
+  aminoType: "cosmos-sdk/MsgGrantResponse",
+
   encode(_: MsgGrantResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -571,6 +661,32 @@ export const MsgGrantResponse = {
   toAmino(_: MsgGrantResponse): MsgGrantResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgGrantResponseAminoMsg): MsgGrantResponse {
+    return MsgGrantResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgGrantResponse): MsgGrantResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgGrantResponse",
+      value: MsgGrantResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgGrantResponseProtoMsg): MsgGrantResponse {
+    return MsgGrantResponse.decode(message.value);
+  },
+
+  toProto(message: MsgGrantResponse): Uint8Array {
+    return MsgGrantResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgGrantResponse): MsgGrantResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.authz.v1beta1.MsgGrantResponse",
+      value: MsgGrantResponse.encode(message).finish()
+    };
   }
 
 };
@@ -584,6 +700,9 @@ function createBaseMsgRevoke(): MsgRevoke {
 }
 
 export const MsgRevoke = {
+  typeUrl: "/cosmos.authz.v1beta1.MsgRevoke",
+  aminoType: "cosmos-sdk/MsgRevoke",
+
   encode(message: MsgRevoke, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.granter !== "") {
       writer.uint32(10).string(message.granter);
@@ -684,6 +803,32 @@ export const MsgRevoke = {
     obj.grantee = message.grantee;
     obj.msg_type_url = message.msgTypeUrl;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgRevokeAminoMsg): MsgRevoke {
+    return MsgRevoke.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgRevoke): MsgRevokeAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgRevoke",
+      value: MsgRevoke.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgRevokeProtoMsg): MsgRevoke {
+    return MsgRevoke.decode(message.value);
+  },
+
+  toProto(message: MsgRevoke): Uint8Array {
+    return MsgRevoke.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgRevoke): MsgRevokeProtoMsg {
+    return {
+      typeUrl: "/cosmos.authz.v1beta1.MsgRevoke",
+      value: MsgRevoke.encode(message).finish()
+    };
   }
 
 };
@@ -693,6 +838,9 @@ function createBaseMsgRevokeResponse(): MsgRevokeResponse {
 }
 
 export const MsgRevokeResponse = {
+  typeUrl: "/cosmos.authz.v1beta1.MsgRevokeResponse",
+  aminoType: "cosmos-sdk/MsgRevokeResponse",
+
   encode(_: MsgRevokeResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -745,6 +893,32 @@ export const MsgRevokeResponse = {
   toAmino(_: MsgRevokeResponse): MsgRevokeResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgRevokeResponseAminoMsg): MsgRevokeResponse {
+    return MsgRevokeResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgRevokeResponse): MsgRevokeResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgRevokeResponse",
+      value: MsgRevokeResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgRevokeResponseProtoMsg): MsgRevokeResponse {
+    return MsgRevokeResponse.decode(message.value);
+  },
+
+  toProto(message: MsgRevokeResponse): Uint8Array {
+    return MsgRevokeResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgRevokeResponse): MsgRevokeResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.authz.v1beta1.MsgRevokeResponse",
+      value: MsgRevokeResponse.encode(message).finish()
+    };
   }
 
 };
diff --git a/__fixtures__/outputv2/cosmos/bank/v1beta1/authz.ts b/__fixtures__/outputv2/cosmos/bank/v1beta1/authz.ts
index 335a4652b..ae60fe182 100644
--- a/__fixtures__/outputv2/cosmos/bank/v1beta1/authz.ts
+++ b/__fixtures__/outputv2/cosmos/bank/v1beta1/authz.ts
@@ -12,7 +12,7 @@ export const protobufPackage = "cosmos.bank.v1beta1";
 export interface SendAuthorization {
   spendLimit: Coin[];
 }
-export interface SendAuthorizationProtoType {
+export interface SendAuthorizationProtoMsg {
   typeUrl: "/cosmos.bank.v1beta1.SendAuthorization";
   value: Uint8Array;
 }
@@ -26,7 +26,7 @@ export interface SendAuthorizationProtoType {
 export interface SendAuthorizationAmino {
   spend_limit: CoinAmino[];
 }
-export interface SendAuthorizationAminoType {
+export interface SendAuthorizationAminoMsg {
   type: "cosmos-sdk/SendAuthorization";
   value: SendAuthorizationAmino;
 }
@@ -48,6 +48,9 @@ function createBaseSendAuthorization(): SendAuthorization {
 }
 
 export const SendAuthorization = {
+  typeUrl: "/cosmos.bank.v1beta1.SendAuthorization",
+  aminoType: "cosmos-sdk/SendAuthorization",
+
   encode(message: SendAuthorization, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.spendLimit) {
       Coin.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -136,6 +139,32 @@ export const SendAuthorization = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: SendAuthorizationAminoMsg): SendAuthorization {
+    return SendAuthorization.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: SendAuthorization): SendAuthorizationAminoMsg {
+    return {
+      type: "cosmos-sdk/SendAuthorization",
+      value: SendAuthorization.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: SendAuthorizationProtoMsg): SendAuthorization {
+    return SendAuthorization.decode(message.value);
+  },
+
+  toProto(message: SendAuthorization): Uint8Array {
+    return SendAuthorization.encode(message).finish();
+  },
+
+  toProtoMsg(message: SendAuthorization): SendAuthorizationProtoMsg {
+    return {
+      typeUrl: "/cosmos.bank.v1beta1.SendAuthorization",
+      value: SendAuthorization.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/bank/v1beta1/bank.ts b/__fixtures__/outputv2/cosmos/bank/v1beta1/bank.ts
index 9007256a7..100da1794 100644
--- a/__fixtures__/outputv2/cosmos/bank/v1beta1/bank.ts
+++ b/__fixtures__/outputv2/cosmos/bank/v1beta1/bank.ts
@@ -8,7 +8,7 @@ export interface Params {
   sendEnabled: SendEnabled[];
   defaultSendEnabled: boolean;
 }
-export interface ParamsProtoType {
+export interface ParamsProtoMsg {
   typeUrl: "/cosmos.bank.v1beta1.Params";
   value: Uint8Array;
 }
@@ -18,7 +18,7 @@ export interface ParamsAmino {
   send_enabled: SendEnabledAmino[];
   default_send_enabled: boolean;
 }
-export interface ParamsAminoType {
+export interface ParamsAminoMsg {
   type: "cosmos-sdk/Params";
   value: ParamsAmino;
 }
@@ -37,7 +37,7 @@ export interface SendEnabled {
   denom: string;
   enabled: boolean;
 }
-export interface SendEnabledProtoType {
+export interface SendEnabledProtoMsg {
   typeUrl: "/cosmos.bank.v1beta1.SendEnabled";
   value: Uint8Array;
 }
@@ -50,7 +50,7 @@ export interface SendEnabledAmino {
   denom: string;
   enabled: boolean;
 }
-export interface SendEnabledAminoType {
+export interface SendEnabledAminoMsg {
   type: "cosmos-sdk/SendEnabled";
   value: SendEnabledAmino;
 }
@@ -69,7 +69,7 @@ export interface Input {
   address: string;
   coins: Coin[];
 }
-export interface InputProtoType {
+export interface InputProtoMsg {
   typeUrl: "/cosmos.bank.v1beta1.Input";
   value: Uint8Array;
 }
@@ -79,7 +79,7 @@ export interface InputAmino {
   address: string;
   coins: CoinAmino[];
 }
-export interface InputAminoType {
+export interface InputAminoMsg {
   type: "cosmos-sdk/Input";
   value: InputAmino;
 }
@@ -95,7 +95,7 @@ export interface Output {
   address: string;
   coins: Coin[];
 }
-export interface OutputProtoType {
+export interface OutputProtoMsg {
   typeUrl: "/cosmos.bank.v1beta1.Output";
   value: Uint8Array;
 }
@@ -105,7 +105,7 @@ export interface OutputAmino {
   address: string;
   coins: CoinAmino[];
 }
-export interface OutputAminoType {
+export interface OutputAminoMsg {
   type: "cosmos-sdk/Output";
   value: OutputAmino;
 }
@@ -126,7 +126,7 @@ export interface OutputSDKType {
 export interface Supply {
   total: Coin[];
 }
-export interface SupplyProtoType {
+export interface SupplyProtoMsg {
   typeUrl: "/cosmos.bank.v1beta1.Supply";
   value: Uint8Array;
 }
@@ -141,7 +141,7 @@ export interface SupplyProtoType {
 export interface SupplyAmino {
   total: CoinAmino[];
 }
-export interface SupplyAminoType {
+export interface SupplyAminoMsg {
   type: "cosmos-sdk/Supply";
   value: SupplyAmino;
 }
@@ -177,7 +177,7 @@ export interface DenomUnit {
   /** aliases is a list of string aliases for the given denom */
   aliases: string[];
 }
-export interface DenomUnitProtoType {
+export interface DenomUnitProtoMsg {
   typeUrl: "/cosmos.bank.v1beta1.DenomUnit";
   value: Uint8Array;
 }
@@ -202,7 +202,7 @@ export interface DenomUnitAmino {
   /** aliases is a list of string aliases for the given denom */
   aliases: string[];
 }
-export interface DenomUnitAminoType {
+export interface DenomUnitAminoMsg {
   type: "cosmos-sdk/DenomUnit";
   value: DenomUnitAmino;
 }
@@ -266,7 +266,7 @@ export interface Metadata {
    */
   uriHash: string;
 }
-export interface MetadataProtoType {
+export interface MetadataProtoMsg {
   typeUrl: "/cosmos.bank.v1beta1.Metadata";
   value: Uint8Array;
 }
@@ -320,7 +320,7 @@ export interface MetadataAmino {
    */
   uri_hash: string;
 }
-export interface MetadataAminoType {
+export interface MetadataAminoMsg {
   type: "cosmos-sdk/Metadata";
   value: MetadataAmino;
 }
@@ -348,6 +348,9 @@ function createBaseParams(): Params {
 }
 
 export const Params = {
+  typeUrl: "/cosmos.bank.v1beta1.Params",
+  aminoType: "cosmos-sdk/Params",
+
   encode(message: Params, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.sendEnabled) {
       SendEnabled.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -451,6 +454,32 @@ export const Params = {
 
     obj.default_send_enabled = message.defaultSendEnabled;
     return obj;
+  },
+
+  fromAminoMsg(object: ParamsAminoMsg): Params {
+    return Params.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Params): ParamsAminoMsg {
+    return {
+      type: "cosmos-sdk/Params",
+      value: Params.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ParamsProtoMsg): Params {
+    return Params.decode(message.value);
+  },
+
+  toProto(message: Params): Uint8Array {
+    return Params.encode(message).finish();
+  },
+
+  toProtoMsg(message: Params): ParamsProtoMsg {
+    return {
+      typeUrl: "/cosmos.bank.v1beta1.Params",
+      value: Params.encode(message).finish()
+    };
   }
 
 };
@@ -463,6 +492,9 @@ function createBaseSendEnabled(): SendEnabled {
 }
 
 export const SendEnabled = {
+  typeUrl: "/cosmos.bank.v1beta1.SendEnabled",
+  aminoType: "cosmos-sdk/SendEnabled",
+
   encode(message: SendEnabled, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.denom !== "") {
       writer.uint32(10).string(message.denom);
@@ -548,6 +580,32 @@ export const SendEnabled = {
     obj.denom = message.denom;
     obj.enabled = message.enabled;
     return obj;
+  },
+
+  fromAminoMsg(object: SendEnabledAminoMsg): SendEnabled {
+    return SendEnabled.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: SendEnabled): SendEnabledAminoMsg {
+    return {
+      type: "cosmos-sdk/SendEnabled",
+      value: SendEnabled.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: SendEnabledProtoMsg): SendEnabled {
+    return SendEnabled.decode(message.value);
+  },
+
+  toProto(message: SendEnabled): Uint8Array {
+    return SendEnabled.encode(message).finish();
+  },
+
+  toProtoMsg(message: SendEnabled): SendEnabledProtoMsg {
+    return {
+      typeUrl: "/cosmos.bank.v1beta1.SendEnabled",
+      value: SendEnabled.encode(message).finish()
+    };
   }
 
 };
@@ -560,6 +618,9 @@ function createBaseInput(): Input {
 }
 
 export const Input = {
+  typeUrl: "/cosmos.bank.v1beta1.Input",
+  aminoType: "cosmos-sdk/Input",
+
   encode(message: Input, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.address !== "") {
       writer.uint32(10).string(message.address);
@@ -663,6 +724,32 @@ export const Input = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: InputAminoMsg): Input {
+    return Input.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Input): InputAminoMsg {
+    return {
+      type: "cosmos-sdk/Input",
+      value: Input.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: InputProtoMsg): Input {
+    return Input.decode(message.value);
+  },
+
+  toProto(message: Input): Uint8Array {
+    return Input.encode(message).finish();
+  },
+
+  toProtoMsg(message: Input): InputProtoMsg {
+    return {
+      typeUrl: "/cosmos.bank.v1beta1.Input",
+      value: Input.encode(message).finish()
+    };
   }
 
 };
@@ -675,6 +762,9 @@ function createBaseOutput(): Output {
 }
 
 export const Output = {
+  typeUrl: "/cosmos.bank.v1beta1.Output",
+  aminoType: "cosmos-sdk/Output",
+
   encode(message: Output, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.address !== "") {
       writer.uint32(10).string(message.address);
@@ -778,6 +868,32 @@ export const Output = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: OutputAminoMsg): Output {
+    return Output.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Output): OutputAminoMsg {
+    return {
+      type: "cosmos-sdk/Output",
+      value: Output.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: OutputProtoMsg): Output {
+    return Output.decode(message.value);
+  },
+
+  toProto(message: Output): Uint8Array {
+    return Output.encode(message).finish();
+  },
+
+  toProtoMsg(message: Output): OutputProtoMsg {
+    return {
+      typeUrl: "/cosmos.bank.v1beta1.Output",
+      value: Output.encode(message).finish()
+    };
   }
 
 };
@@ -789,6 +905,9 @@ function createBaseSupply(): Supply {
 }
 
 export const Supply = {
+  typeUrl: "/cosmos.bank.v1beta1.Supply",
+  aminoType: "cosmos-sdk/Supply",
+
   encode(message: Supply, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.total) {
       Coin.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -877,6 +996,32 @@ export const Supply = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: SupplyAminoMsg): Supply {
+    return Supply.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Supply): SupplyAminoMsg {
+    return {
+      type: "cosmos-sdk/Supply",
+      value: Supply.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: SupplyProtoMsg): Supply {
+    return Supply.decode(message.value);
+  },
+
+  toProto(message: Supply): Uint8Array {
+    return Supply.encode(message).finish();
+  },
+
+  toProtoMsg(message: Supply): SupplyProtoMsg {
+    return {
+      typeUrl: "/cosmos.bank.v1beta1.Supply",
+      value: Supply.encode(message).finish()
+    };
   }
 
 };
@@ -890,6 +1035,9 @@ function createBaseDenomUnit(): DenomUnit {
 }
 
 export const DenomUnit = {
+  typeUrl: "/cosmos.bank.v1beta1.DenomUnit",
+  aminoType: "cosmos-sdk/DenomUnit",
+
   encode(message: DenomUnit, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.denom !== "") {
       writer.uint32(10).string(message.denom);
@@ -1008,6 +1156,32 @@ export const DenomUnit = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: DenomUnitAminoMsg): DenomUnit {
+    return DenomUnit.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: DenomUnit): DenomUnitAminoMsg {
+    return {
+      type: "cosmos-sdk/DenomUnit",
+      value: DenomUnit.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: DenomUnitProtoMsg): DenomUnit {
+    return DenomUnit.decode(message.value);
+  },
+
+  toProto(message: DenomUnit): Uint8Array {
+    return DenomUnit.encode(message).finish();
+  },
+
+  toProtoMsg(message: DenomUnit): DenomUnitProtoMsg {
+    return {
+      typeUrl: "/cosmos.bank.v1beta1.DenomUnit",
+      value: DenomUnit.encode(message).finish()
+    };
   }
 
 };
@@ -1026,6 +1200,9 @@ function createBaseMetadata(): Metadata {
 }
 
 export const Metadata = {
+  typeUrl: "/cosmos.bank.v1beta1.Metadata",
+  aminoType: "cosmos-sdk/Metadata",
+
   encode(message: Metadata, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.description !== "") {
       writer.uint32(10).string(message.description);
@@ -1219,6 +1396,32 @@ export const Metadata = {
     obj.uri = message.uri;
     obj.uri_hash = message.uriHash;
     return obj;
+  },
+
+  fromAminoMsg(object: MetadataAminoMsg): Metadata {
+    return Metadata.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Metadata): MetadataAminoMsg {
+    return {
+      type: "cosmos-sdk/Metadata",
+      value: Metadata.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MetadataProtoMsg): Metadata {
+    return Metadata.decode(message.value);
+  },
+
+  toProto(message: Metadata): Uint8Array {
+    return Metadata.encode(message).finish();
+  },
+
+  toProtoMsg(message: Metadata): MetadataProtoMsg {
+    return {
+      typeUrl: "/cosmos.bank.v1beta1.Metadata",
+      value: Metadata.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/bank/v1beta1/genesis.ts b/__fixtures__/outputv2/cosmos/bank/v1beta1/genesis.ts
index 9c49ee1fb..7c3b07f17 100644
--- a/__fixtures__/outputv2/cosmos/bank/v1beta1/genesis.ts
+++ b/__fixtures__/outputv2/cosmos/bank/v1beta1/genesis.ts
@@ -21,7 +21,7 @@ export interface GenesisState {
   /** denom_metadata defines the metadata of the differents coins. */
   denomMetadata: Metadata[];
 }
-export interface GenesisStateProtoType {
+export interface GenesisStateProtoMsg {
   typeUrl: "/cosmos.bank.v1beta1.GenesisState";
   value: Uint8Array;
 }
@@ -43,7 +43,7 @@ export interface GenesisStateAmino {
   /** denom_metadata defines the metadata of the differents coins. */
   denom_metadata: MetadataAmino[];
 }
-export interface GenesisStateAminoType {
+export interface GenesisStateAminoMsg {
   type: "cosmos-sdk/GenesisState";
   value: GenesisStateAmino;
 }
@@ -67,7 +67,7 @@ export interface Balance {
   /** coins defines the different coins this balance holds. */
   coins: Coin[];
 }
-export interface BalanceProtoType {
+export interface BalanceProtoMsg {
   typeUrl: "/cosmos.bank.v1beta1.Balance";
   value: Uint8Array;
 }
@@ -83,7 +83,7 @@ export interface BalanceAmino {
   /** coins defines the different coins this balance holds. */
   coins: CoinAmino[];
 }
-export interface BalanceAminoType {
+export interface BalanceAminoMsg {
   type: "cosmos-sdk/Balance";
   value: BalanceAmino;
 }
@@ -107,6 +107,9 @@ function createBaseGenesisState(): GenesisState {
 }
 
 export const GenesisState = {
+  typeUrl: "/cosmos.bank.v1beta1.GenesisState",
+  aminoType: "cosmos-sdk/GenesisState",
+
   encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.params !== undefined) {
       Params.encode(message.params, writer.uint32(10).fork()).ldelim();
@@ -270,6 +273,32 @@ export const GenesisState = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisStateAminoMsg): GenesisState {
+    return GenesisState.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GenesisState): GenesisStateAminoMsg {
+    return {
+      type: "cosmos-sdk/GenesisState",
+      value: GenesisState.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GenesisStateProtoMsg): GenesisState {
+    return GenesisState.decode(message.value);
+  },
+
+  toProto(message: GenesisState): Uint8Array {
+    return GenesisState.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisState): GenesisStateProtoMsg {
+    return {
+      typeUrl: "/cosmos.bank.v1beta1.GenesisState",
+      value: GenesisState.encode(message).finish()
+    };
   }
 
 };
@@ -282,6 +311,9 @@ function createBaseBalance(): Balance {
 }
 
 export const Balance = {
+  typeUrl: "/cosmos.bank.v1beta1.Balance",
+  aminoType: "cosmos-sdk/Balance",
+
   encode(message: Balance, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.address !== "") {
       writer.uint32(10).string(message.address);
@@ -385,6 +417,32 @@ export const Balance = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: BalanceAminoMsg): Balance {
+    return Balance.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Balance): BalanceAminoMsg {
+    return {
+      type: "cosmos-sdk/Balance",
+      value: Balance.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: BalanceProtoMsg): Balance {
+    return Balance.decode(message.value);
+  },
+
+  toProto(message: Balance): Uint8Array {
+    return Balance.encode(message).finish();
+  },
+
+  toProtoMsg(message: Balance): BalanceProtoMsg {
+    return {
+      typeUrl: "/cosmos.bank.v1beta1.Balance",
+      value: Balance.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/bank/v1beta1/query.ts b/__fixtures__/outputv2/cosmos/bank/v1beta1/query.ts
index c85d1d745..bf00e8af4 100644
--- a/__fixtures__/outputv2/cosmos/bank/v1beta1/query.ts
+++ b/__fixtures__/outputv2/cosmos/bank/v1beta1/query.ts
@@ -13,7 +13,7 @@ export interface QueryBalanceRequest {
   /** denom is the coin denom to query balances for. */
   denom: string;
 }
-export interface QueryBalanceRequestProtoType {
+export interface QueryBalanceRequestProtoMsg {
   typeUrl: "/cosmos.bank.v1beta1.QueryBalanceRequest";
   value: Uint8Array;
 }
@@ -26,7 +26,7 @@ export interface QueryBalanceRequestAmino {
   /** denom is the coin denom to query balances for. */
   denom: string;
 }
-export interface QueryBalanceRequestAminoType {
+export interface QueryBalanceRequestAminoMsg {
   type: "cosmos-sdk/QueryBalanceRequest";
   value: QueryBalanceRequestAmino;
 }
@@ -42,7 +42,7 @@ export interface QueryBalanceResponse {
   /** balance is the balance of the coin. */
   balance?: Coin;
 }
-export interface QueryBalanceResponseProtoType {
+export interface QueryBalanceResponseProtoMsg {
   typeUrl: "/cosmos.bank.v1beta1.QueryBalanceResponse";
   value: Uint8Array;
 }
@@ -52,7 +52,7 @@ export interface QueryBalanceResponseAmino {
   /** balance is the balance of the coin. */
   balance?: CoinAmino;
 }
-export interface QueryBalanceResponseAminoType {
+export interface QueryBalanceResponseAminoMsg {
   type: "cosmos-sdk/QueryBalanceResponse";
   value: QueryBalanceResponseAmino;
 }
@@ -70,7 +70,7 @@ export interface QueryAllBalancesRequest {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequest;
 }
-export interface QueryAllBalancesRequestProtoType {
+export interface QueryAllBalancesRequestProtoMsg {
   typeUrl: "/cosmos.bank.v1beta1.QueryAllBalancesRequest";
   value: Uint8Array;
 }
@@ -83,7 +83,7 @@ export interface QueryAllBalancesRequestAmino {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequestAmino;
 }
-export interface QueryAllBalancesRequestAminoType {
+export interface QueryAllBalancesRequestAminoMsg {
   type: "cosmos-sdk/QueryAllBalancesRequest";
   value: QueryAllBalancesRequestAmino;
 }
@@ -105,7 +105,7 @@ export interface QueryAllBalancesResponse {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponse;
 }
-export interface QueryAllBalancesResponseProtoType {
+export interface QueryAllBalancesResponseProtoMsg {
   typeUrl: "/cosmos.bank.v1beta1.QueryAllBalancesResponse";
   value: Uint8Array;
 }
@@ -121,7 +121,7 @@ export interface QueryAllBalancesResponseAmino {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponseAmino;
 }
-export interface QueryAllBalancesResponseAminoType {
+export interface QueryAllBalancesResponseAminoMsg {
   type: "cosmos-sdk/QueryAllBalancesResponse";
   value: QueryAllBalancesResponseAmino;
 }
@@ -146,7 +146,7 @@ export interface QuerySpendableBalancesRequest {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequest;
 }
-export interface QuerySpendableBalancesRequestProtoType {
+export interface QuerySpendableBalancesRequestProtoMsg {
   typeUrl: "/cosmos.bank.v1beta1.QuerySpendableBalancesRequest";
   value: Uint8Array;
 }
@@ -162,7 +162,7 @@ export interface QuerySpendableBalancesRequestAmino {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequestAmino;
 }
-export interface QuerySpendableBalancesRequestAminoType {
+export interface QuerySpendableBalancesRequestAminoMsg {
   type: "cosmos-sdk/QuerySpendableBalancesRequest";
   value: QuerySpendableBalancesRequestAmino;
 }
@@ -187,7 +187,7 @@ export interface QuerySpendableBalancesResponse {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponse;
 }
-export interface QuerySpendableBalancesResponseProtoType {
+export interface QuerySpendableBalancesResponseProtoMsg {
   typeUrl: "/cosmos.bank.v1beta1.QuerySpendableBalancesResponse";
   value: Uint8Array;
 }
@@ -203,7 +203,7 @@ export interface QuerySpendableBalancesResponseAmino {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponseAmino;
 }
-export interface QuerySpendableBalancesResponseAminoType {
+export interface QuerySpendableBalancesResponseAminoMsg {
   type: "cosmos-sdk/QuerySpendableBalancesResponse";
   value: QuerySpendableBalancesResponseAmino;
 }
@@ -229,7 +229,7 @@ export interface QueryTotalSupplyRequest {
    */
   pagination?: PageRequest;
 }
-export interface QueryTotalSupplyRequestProtoType {
+export interface QueryTotalSupplyRequestProtoMsg {
   typeUrl: "/cosmos.bank.v1beta1.QueryTotalSupplyRequest";
   value: Uint8Array;
 }
@@ -246,7 +246,7 @@ export interface QueryTotalSupplyRequestAmino {
    */
   pagination?: PageRequestAmino;
 }
-export interface QueryTotalSupplyRequestAminoType {
+export interface QueryTotalSupplyRequestAminoMsg {
   type: "cosmos-sdk/QueryTotalSupplyRequest";
   value: QueryTotalSupplyRequestAmino;
 }
@@ -274,7 +274,7 @@ export interface QueryTotalSupplyResponse {
    */
   pagination?: PageResponse;
 }
-export interface QueryTotalSupplyResponseProtoType {
+export interface QueryTotalSupplyResponseProtoMsg {
   typeUrl: "/cosmos.bank.v1beta1.QueryTotalSupplyResponse";
   value: Uint8Array;
 }
@@ -294,7 +294,7 @@ export interface QueryTotalSupplyResponseAmino {
    */
   pagination?: PageResponseAmino;
 }
-export interface QueryTotalSupplyResponseAminoType {
+export interface QueryTotalSupplyResponseAminoMsg {
   type: "cosmos-sdk/QueryTotalSupplyResponse";
   value: QueryTotalSupplyResponseAmino;
 }
@@ -313,7 +313,7 @@ export interface QuerySupplyOfRequest {
   /** denom is the coin denom to query balances for. */
   denom: string;
 }
-export interface QuerySupplyOfRequestProtoType {
+export interface QuerySupplyOfRequestProtoMsg {
   typeUrl: "/cosmos.bank.v1beta1.QuerySupplyOfRequest";
   value: Uint8Array;
 }
@@ -323,7 +323,7 @@ export interface QuerySupplyOfRequestAmino {
   /** denom is the coin denom to query balances for. */
   denom: string;
 }
-export interface QuerySupplyOfRequestAminoType {
+export interface QuerySupplyOfRequestAminoMsg {
   type: "cosmos-sdk/QuerySupplyOfRequest";
   value: QuerySupplyOfRequestAmino;
 }
@@ -338,7 +338,7 @@ export interface QuerySupplyOfResponse {
   /** amount is the supply of the coin. */
   amount?: Coin;
 }
-export interface QuerySupplyOfResponseProtoType {
+export interface QuerySupplyOfResponseProtoMsg {
   typeUrl: "/cosmos.bank.v1beta1.QuerySupplyOfResponse";
   value: Uint8Array;
 }
@@ -348,7 +348,7 @@ export interface QuerySupplyOfResponseAmino {
   /** amount is the supply of the coin. */
   amount?: CoinAmino;
 }
-export interface QuerySupplyOfResponseAminoType {
+export interface QuerySupplyOfResponseAminoMsg {
   type: "cosmos-sdk/QuerySupplyOfResponse";
   value: QuerySupplyOfResponseAmino;
 }
@@ -360,14 +360,14 @@ export interface QuerySupplyOfResponseSDKType {
 
 /** QueryParamsRequest defines the request type for querying x/bank parameters. */
 export interface QueryParamsRequest {}
-export interface QueryParamsRequestProtoType {
+export interface QueryParamsRequestProtoMsg {
   typeUrl: "/cosmos.bank.v1beta1.QueryParamsRequest";
   value: Uint8Array;
 }
 
 /** QueryParamsRequest defines the request type for querying x/bank parameters. */
 export interface QueryParamsRequestAmino {}
-export interface QueryParamsRequestAminoType {
+export interface QueryParamsRequestAminoMsg {
   type: "cosmos-sdk/QueryParamsRequest";
   value: QueryParamsRequestAmino;
 }
@@ -379,7 +379,7 @@ export interface QueryParamsRequestSDKType {}
 export interface QueryParamsResponse {
   params?: Params;
 }
-export interface QueryParamsResponseProtoType {
+export interface QueryParamsResponseProtoMsg {
   typeUrl: "/cosmos.bank.v1beta1.QueryParamsResponse";
   value: Uint8Array;
 }
@@ -388,7 +388,7 @@ export interface QueryParamsResponseProtoType {
 export interface QueryParamsResponseAmino {
   params?: ParamsAmino;
 }
-export interface QueryParamsResponseAminoType {
+export interface QueryParamsResponseAminoMsg {
   type: "cosmos-sdk/QueryParamsResponse";
   value: QueryParamsResponseAmino;
 }
@@ -403,7 +403,7 @@ export interface QueryDenomsMetadataRequest {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequest;
 }
-export interface QueryDenomsMetadataRequestProtoType {
+export interface QueryDenomsMetadataRequestProtoMsg {
   typeUrl: "/cosmos.bank.v1beta1.QueryDenomsMetadataRequest";
   value: Uint8Array;
 }
@@ -413,7 +413,7 @@ export interface QueryDenomsMetadataRequestAmino {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequestAmino;
 }
-export interface QueryDenomsMetadataRequestAminoType {
+export interface QueryDenomsMetadataRequestAminoMsg {
   type: "cosmos-sdk/QueryDenomsMetadataRequest";
   value: QueryDenomsMetadataRequestAmino;
 }
@@ -434,7 +434,7 @@ export interface QueryDenomsMetadataResponse {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponse;
 }
-export interface QueryDenomsMetadataResponseProtoType {
+export interface QueryDenomsMetadataResponseProtoMsg {
   typeUrl: "/cosmos.bank.v1beta1.QueryDenomsMetadataResponse";
   value: Uint8Array;
 }
@@ -450,7 +450,7 @@ export interface QueryDenomsMetadataResponseAmino {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponseAmino;
 }
-export interface QueryDenomsMetadataResponseAminoType {
+export interface QueryDenomsMetadataResponseAminoMsg {
   type: "cosmos-sdk/QueryDenomsMetadataResponse";
   value: QueryDenomsMetadataResponseAmino;
 }
@@ -469,7 +469,7 @@ export interface QueryDenomMetadataRequest {
   /** denom is the coin denom to query the metadata for. */
   denom: string;
 }
-export interface QueryDenomMetadataRequestProtoType {
+export interface QueryDenomMetadataRequestProtoMsg {
   typeUrl: "/cosmos.bank.v1beta1.QueryDenomMetadataRequest";
   value: Uint8Array;
 }
@@ -479,7 +479,7 @@ export interface QueryDenomMetadataRequestAmino {
   /** denom is the coin denom to query the metadata for. */
   denom: string;
 }
-export interface QueryDenomMetadataRequestAminoType {
+export interface QueryDenomMetadataRequestAminoMsg {
   type: "cosmos-sdk/QueryDenomMetadataRequest";
   value: QueryDenomMetadataRequestAmino;
 }
@@ -497,7 +497,7 @@ export interface QueryDenomMetadataResponse {
   /** metadata describes and provides all the client information for the requested token. */
   metadata?: Metadata;
 }
-export interface QueryDenomMetadataResponseProtoType {
+export interface QueryDenomMetadataResponseProtoMsg {
   typeUrl: "/cosmos.bank.v1beta1.QueryDenomMetadataResponse";
   value: Uint8Array;
 }
@@ -510,7 +510,7 @@ export interface QueryDenomMetadataResponseAmino {
   /** metadata describes and provides all the client information for the requested token. */
   metadata?: MetadataAmino;
 }
-export interface QueryDenomMetadataResponseAminoType {
+export interface QueryDenomMetadataResponseAminoMsg {
   type: "cosmos-sdk/QueryDenomMetadataResponse";
   value: QueryDenomMetadataResponseAmino;
 }
@@ -535,7 +535,7 @@ export interface QueryDenomOwnersRequest {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequest;
 }
-export interface QueryDenomOwnersRequestProtoType {
+export interface QueryDenomOwnersRequestProtoMsg {
   typeUrl: "/cosmos.bank.v1beta1.QueryDenomOwnersRequest";
   value: Uint8Array;
 }
@@ -552,7 +552,7 @@ export interface QueryDenomOwnersRequestAmino {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequestAmino;
 }
-export interface QueryDenomOwnersRequestAminoType {
+export interface QueryDenomOwnersRequestAminoMsg {
   type: "cosmos-sdk/QueryDenomOwnersRequest";
   value: QueryDenomOwnersRequestAmino;
 }
@@ -579,7 +579,7 @@ export interface DenomOwner {
   /** balance is the balance of the denominated coin for an account. */
   balance?: Coin;
 }
-export interface DenomOwnerProtoType {
+export interface DenomOwnerProtoMsg {
   typeUrl: "/cosmos.bank.v1beta1.DenomOwner";
   value: Uint8Array;
 }
@@ -596,7 +596,7 @@ export interface DenomOwnerAmino {
   /** balance is the balance of the denominated coin for an account. */
   balance?: CoinAmino;
 }
-export interface DenomOwnerAminoType {
+export interface DenomOwnerAminoMsg {
   type: "cosmos-sdk/DenomOwner";
   value: DenomOwnerAmino;
 }
@@ -618,7 +618,7 @@ export interface QueryDenomOwnersResponse {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponse;
 }
-export interface QueryDenomOwnersResponseProtoType {
+export interface QueryDenomOwnersResponseProtoMsg {
   typeUrl: "/cosmos.bank.v1beta1.QueryDenomOwnersResponse";
   value: Uint8Array;
 }
@@ -630,7 +630,7 @@ export interface QueryDenomOwnersResponseAmino {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponseAmino;
 }
-export interface QueryDenomOwnersResponseAminoType {
+export interface QueryDenomOwnersResponseAminoMsg {
   type: "cosmos-sdk/QueryDenomOwnersResponse";
   value: QueryDenomOwnersResponseAmino;
 }
@@ -649,6 +649,9 @@ function createBaseQueryBalanceRequest(): QueryBalanceRequest {
 }
 
 export const QueryBalanceRequest = {
+  typeUrl: "/cosmos.bank.v1beta1.QueryBalanceRequest",
+  aminoType: "cosmos-sdk/QueryBalanceRequest",
+
   encode(message: QueryBalanceRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.address !== "") {
       writer.uint32(10).string(message.address);
@@ -734,6 +737,32 @@ export const QueryBalanceRequest = {
     obj.address = message.address;
     obj.denom = message.denom;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryBalanceRequestAminoMsg): QueryBalanceRequest {
+    return QueryBalanceRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryBalanceRequest): QueryBalanceRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryBalanceRequest",
+      value: QueryBalanceRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryBalanceRequestProtoMsg): QueryBalanceRequest {
+    return QueryBalanceRequest.decode(message.value);
+  },
+
+  toProto(message: QueryBalanceRequest): Uint8Array {
+    return QueryBalanceRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryBalanceRequest): QueryBalanceRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.bank.v1beta1.QueryBalanceRequest",
+      value: QueryBalanceRequest.encode(message).finish()
+    };
   }
 
 };
@@ -745,6 +774,9 @@ function createBaseQueryBalanceResponse(): QueryBalanceResponse {
 }
 
 export const QueryBalanceResponse = {
+  typeUrl: "/cosmos.bank.v1beta1.QueryBalanceResponse",
+  aminoType: "cosmos-sdk/QueryBalanceResponse",
+
   encode(message: QueryBalanceResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.balance !== undefined) {
       Coin.encode(message.balance, writer.uint32(10).fork()).ldelim();
@@ -815,6 +847,32 @@ export const QueryBalanceResponse = {
     const obj: any = {};
     obj.balance = message.balance ? Coin.toAmino(message.balance) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryBalanceResponseAminoMsg): QueryBalanceResponse {
+    return QueryBalanceResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryBalanceResponse): QueryBalanceResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryBalanceResponse",
+      value: QueryBalanceResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryBalanceResponseProtoMsg): QueryBalanceResponse {
+    return QueryBalanceResponse.decode(message.value);
+  },
+
+  toProto(message: QueryBalanceResponse): Uint8Array {
+    return QueryBalanceResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryBalanceResponse): QueryBalanceResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.bank.v1beta1.QueryBalanceResponse",
+      value: QueryBalanceResponse.encode(message).finish()
+    };
   }
 
 };
@@ -827,6 +885,9 @@ function createBaseQueryAllBalancesRequest(): QueryAllBalancesRequest {
 }
 
 export const QueryAllBalancesRequest = {
+  typeUrl: "/cosmos.bank.v1beta1.QueryAllBalancesRequest",
+  aminoType: "cosmos-sdk/QueryAllBalancesRequest",
+
   encode(message: QueryAllBalancesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.address !== "") {
       writer.uint32(10).string(message.address);
@@ -912,6 +973,32 @@ export const QueryAllBalancesRequest = {
     obj.address = message.address;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryAllBalancesRequestAminoMsg): QueryAllBalancesRequest {
+    return QueryAllBalancesRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryAllBalancesRequest): QueryAllBalancesRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryAllBalancesRequest",
+      value: QueryAllBalancesRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryAllBalancesRequestProtoMsg): QueryAllBalancesRequest {
+    return QueryAllBalancesRequest.decode(message.value);
+  },
+
+  toProto(message: QueryAllBalancesRequest): Uint8Array {
+    return QueryAllBalancesRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryAllBalancesRequest): QueryAllBalancesRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.bank.v1beta1.QueryAllBalancesRequest",
+      value: QueryAllBalancesRequest.encode(message).finish()
+    };
   }
 
 };
@@ -924,6 +1011,9 @@ function createBaseQueryAllBalancesResponse(): QueryAllBalancesResponse {
 }
 
 export const QueryAllBalancesResponse = {
+  typeUrl: "/cosmos.bank.v1beta1.QueryAllBalancesResponse",
+  aminoType: "cosmos-sdk/QueryAllBalancesResponse",
+
   encode(message: QueryAllBalancesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.balances) {
       Coin.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1027,6 +1117,32 @@ export const QueryAllBalancesResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryAllBalancesResponseAminoMsg): QueryAllBalancesResponse {
+    return QueryAllBalancesResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryAllBalancesResponse): QueryAllBalancesResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryAllBalancesResponse",
+      value: QueryAllBalancesResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryAllBalancesResponseProtoMsg): QueryAllBalancesResponse {
+    return QueryAllBalancesResponse.decode(message.value);
+  },
+
+  toProto(message: QueryAllBalancesResponse): Uint8Array {
+    return QueryAllBalancesResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryAllBalancesResponse): QueryAllBalancesResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.bank.v1beta1.QueryAllBalancesResponse",
+      value: QueryAllBalancesResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1039,6 +1155,9 @@ function createBaseQuerySpendableBalancesRequest(): QuerySpendableBalancesReques
 }
 
 export const QuerySpendableBalancesRequest = {
+  typeUrl: "/cosmos.bank.v1beta1.QuerySpendableBalancesRequest",
+  aminoType: "cosmos-sdk/QuerySpendableBalancesRequest",
+
   encode(message: QuerySpendableBalancesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.address !== "") {
       writer.uint32(10).string(message.address);
@@ -1124,6 +1243,32 @@ export const QuerySpendableBalancesRequest = {
     obj.address = message.address;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QuerySpendableBalancesRequestAminoMsg): QuerySpendableBalancesRequest {
+    return QuerySpendableBalancesRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QuerySpendableBalancesRequest): QuerySpendableBalancesRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QuerySpendableBalancesRequest",
+      value: QuerySpendableBalancesRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QuerySpendableBalancesRequestProtoMsg): QuerySpendableBalancesRequest {
+    return QuerySpendableBalancesRequest.decode(message.value);
+  },
+
+  toProto(message: QuerySpendableBalancesRequest): Uint8Array {
+    return QuerySpendableBalancesRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QuerySpendableBalancesRequest): QuerySpendableBalancesRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.bank.v1beta1.QuerySpendableBalancesRequest",
+      value: QuerySpendableBalancesRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1136,6 +1281,9 @@ function createBaseQuerySpendableBalancesResponse(): QuerySpendableBalancesRespo
 }
 
 export const QuerySpendableBalancesResponse = {
+  typeUrl: "/cosmos.bank.v1beta1.QuerySpendableBalancesResponse",
+  aminoType: "cosmos-sdk/QuerySpendableBalancesResponse",
+
   encode(message: QuerySpendableBalancesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.balances) {
       Coin.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1239,6 +1387,32 @@ export const QuerySpendableBalancesResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QuerySpendableBalancesResponseAminoMsg): QuerySpendableBalancesResponse {
+    return QuerySpendableBalancesResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QuerySpendableBalancesResponse): QuerySpendableBalancesResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QuerySpendableBalancesResponse",
+      value: QuerySpendableBalancesResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QuerySpendableBalancesResponseProtoMsg): QuerySpendableBalancesResponse {
+    return QuerySpendableBalancesResponse.decode(message.value);
+  },
+
+  toProto(message: QuerySpendableBalancesResponse): Uint8Array {
+    return QuerySpendableBalancesResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QuerySpendableBalancesResponse): QuerySpendableBalancesResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.bank.v1beta1.QuerySpendableBalancesResponse",
+      value: QuerySpendableBalancesResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1250,6 +1424,9 @@ function createBaseQueryTotalSupplyRequest(): QueryTotalSupplyRequest {
 }
 
 export const QueryTotalSupplyRequest = {
+  typeUrl: "/cosmos.bank.v1beta1.QueryTotalSupplyRequest",
+  aminoType: "cosmos-sdk/QueryTotalSupplyRequest",
+
   encode(message: QueryTotalSupplyRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.pagination !== undefined) {
       PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim();
@@ -1320,6 +1497,32 @@ export const QueryTotalSupplyRequest = {
     const obj: any = {};
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryTotalSupplyRequestAminoMsg): QueryTotalSupplyRequest {
+    return QueryTotalSupplyRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryTotalSupplyRequest): QueryTotalSupplyRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryTotalSupplyRequest",
+      value: QueryTotalSupplyRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryTotalSupplyRequestProtoMsg): QueryTotalSupplyRequest {
+    return QueryTotalSupplyRequest.decode(message.value);
+  },
+
+  toProto(message: QueryTotalSupplyRequest): Uint8Array {
+    return QueryTotalSupplyRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryTotalSupplyRequest): QueryTotalSupplyRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.bank.v1beta1.QueryTotalSupplyRequest",
+      value: QueryTotalSupplyRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1332,6 +1535,9 @@ function createBaseQueryTotalSupplyResponse(): QueryTotalSupplyResponse {
 }
 
 export const QueryTotalSupplyResponse = {
+  typeUrl: "/cosmos.bank.v1beta1.QueryTotalSupplyResponse",
+  aminoType: "cosmos-sdk/QueryTotalSupplyResponse",
+
   encode(message: QueryTotalSupplyResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.supply) {
       Coin.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1435,6 +1641,32 @@ export const QueryTotalSupplyResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryTotalSupplyResponseAminoMsg): QueryTotalSupplyResponse {
+    return QueryTotalSupplyResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryTotalSupplyResponse): QueryTotalSupplyResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryTotalSupplyResponse",
+      value: QueryTotalSupplyResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryTotalSupplyResponseProtoMsg): QueryTotalSupplyResponse {
+    return QueryTotalSupplyResponse.decode(message.value);
+  },
+
+  toProto(message: QueryTotalSupplyResponse): Uint8Array {
+    return QueryTotalSupplyResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryTotalSupplyResponse): QueryTotalSupplyResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.bank.v1beta1.QueryTotalSupplyResponse",
+      value: QueryTotalSupplyResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1446,6 +1678,9 @@ function createBaseQuerySupplyOfRequest(): QuerySupplyOfRequest {
 }
 
 export const QuerySupplyOfRequest = {
+  typeUrl: "/cosmos.bank.v1beta1.QuerySupplyOfRequest",
+  aminoType: "cosmos-sdk/QuerySupplyOfRequest",
+
   encode(message: QuerySupplyOfRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.denom !== "") {
       writer.uint32(10).string(message.denom);
@@ -1516,6 +1751,32 @@ export const QuerySupplyOfRequest = {
     const obj: any = {};
     obj.denom = message.denom;
     return obj;
+  },
+
+  fromAminoMsg(object: QuerySupplyOfRequestAminoMsg): QuerySupplyOfRequest {
+    return QuerySupplyOfRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QuerySupplyOfRequest): QuerySupplyOfRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QuerySupplyOfRequest",
+      value: QuerySupplyOfRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QuerySupplyOfRequestProtoMsg): QuerySupplyOfRequest {
+    return QuerySupplyOfRequest.decode(message.value);
+  },
+
+  toProto(message: QuerySupplyOfRequest): Uint8Array {
+    return QuerySupplyOfRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QuerySupplyOfRequest): QuerySupplyOfRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.bank.v1beta1.QuerySupplyOfRequest",
+      value: QuerySupplyOfRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1527,6 +1788,9 @@ function createBaseQuerySupplyOfResponse(): QuerySupplyOfResponse {
 }
 
 export const QuerySupplyOfResponse = {
+  typeUrl: "/cosmos.bank.v1beta1.QuerySupplyOfResponse",
+  aminoType: "cosmos-sdk/QuerySupplyOfResponse",
+
   encode(message: QuerySupplyOfResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.amount !== undefined) {
       Coin.encode(message.amount, writer.uint32(10).fork()).ldelim();
@@ -1597,6 +1861,32 @@ export const QuerySupplyOfResponse = {
     const obj: any = {};
     obj.amount = message.amount ? Coin.toAmino(message.amount) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QuerySupplyOfResponseAminoMsg): QuerySupplyOfResponse {
+    return QuerySupplyOfResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QuerySupplyOfResponse): QuerySupplyOfResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QuerySupplyOfResponse",
+      value: QuerySupplyOfResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QuerySupplyOfResponseProtoMsg): QuerySupplyOfResponse {
+    return QuerySupplyOfResponse.decode(message.value);
+  },
+
+  toProto(message: QuerySupplyOfResponse): Uint8Array {
+    return QuerySupplyOfResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QuerySupplyOfResponse): QuerySupplyOfResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.bank.v1beta1.QuerySupplyOfResponse",
+      value: QuerySupplyOfResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1606,6 +1896,9 @@ function createBaseQueryParamsRequest(): QueryParamsRequest {
 }
 
 export const QueryParamsRequest = {
+  typeUrl: "/cosmos.bank.v1beta1.QueryParamsRequest",
+  aminoType: "cosmos-sdk/QueryParamsRequest",
+
   encode(_: QueryParamsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -1658,6 +1951,32 @@ export const QueryParamsRequest = {
   toAmino(_: QueryParamsRequest): QueryParamsRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest {
+    return QueryParamsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryParamsRequest): QueryParamsRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryParamsRequest",
+      value: QueryParamsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryParamsRequestProtoMsg): QueryParamsRequest {
+    return QueryParamsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryParamsRequest): Uint8Array {
+    return QueryParamsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryParamsRequest): QueryParamsRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.bank.v1beta1.QueryParamsRequest",
+      value: QueryParamsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1669,6 +1988,9 @@ function createBaseQueryParamsResponse(): QueryParamsResponse {
 }
 
 export const QueryParamsResponse = {
+  typeUrl: "/cosmos.bank.v1beta1.QueryParamsResponse",
+  aminoType: "cosmos-sdk/QueryParamsResponse",
+
   encode(message: QueryParamsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.params !== undefined) {
       Params.encode(message.params, writer.uint32(10).fork()).ldelim();
@@ -1739,6 +2061,32 @@ export const QueryParamsResponse = {
     const obj: any = {};
     obj.params = message.params ? Params.toAmino(message.params) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryParamsResponseAminoMsg): QueryParamsResponse {
+    return QueryParamsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryParamsResponse): QueryParamsResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryParamsResponse",
+      value: QueryParamsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryParamsResponseProtoMsg): QueryParamsResponse {
+    return QueryParamsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryParamsResponse): Uint8Array {
+    return QueryParamsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryParamsResponse): QueryParamsResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.bank.v1beta1.QueryParamsResponse",
+      value: QueryParamsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1750,6 +2098,9 @@ function createBaseQueryDenomsMetadataRequest(): QueryDenomsMetadataRequest {
 }
 
 export const QueryDenomsMetadataRequest = {
+  typeUrl: "/cosmos.bank.v1beta1.QueryDenomsMetadataRequest",
+  aminoType: "cosmos-sdk/QueryDenomsMetadataRequest",
+
   encode(message: QueryDenomsMetadataRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.pagination !== undefined) {
       PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim();
@@ -1820,6 +2171,32 @@ export const QueryDenomsMetadataRequest = {
     const obj: any = {};
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDenomsMetadataRequestAminoMsg): QueryDenomsMetadataRequest {
+    return QueryDenomsMetadataRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryDenomsMetadataRequest): QueryDenomsMetadataRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryDenomsMetadataRequest",
+      value: QueryDenomsMetadataRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryDenomsMetadataRequestProtoMsg): QueryDenomsMetadataRequest {
+    return QueryDenomsMetadataRequest.decode(message.value);
+  },
+
+  toProto(message: QueryDenomsMetadataRequest): Uint8Array {
+    return QueryDenomsMetadataRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDenomsMetadataRequest): QueryDenomsMetadataRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.bank.v1beta1.QueryDenomsMetadataRequest",
+      value: QueryDenomsMetadataRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1832,6 +2209,9 @@ function createBaseQueryDenomsMetadataResponse(): QueryDenomsMetadataResponse {
 }
 
 export const QueryDenomsMetadataResponse = {
+  typeUrl: "/cosmos.bank.v1beta1.QueryDenomsMetadataResponse",
+  aminoType: "cosmos-sdk/QueryDenomsMetadataResponse",
+
   encode(message: QueryDenomsMetadataResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.metadatas) {
       Metadata.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1935,6 +2315,32 @@ export const QueryDenomsMetadataResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDenomsMetadataResponseAminoMsg): QueryDenomsMetadataResponse {
+    return QueryDenomsMetadataResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryDenomsMetadataResponse): QueryDenomsMetadataResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryDenomsMetadataResponse",
+      value: QueryDenomsMetadataResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryDenomsMetadataResponseProtoMsg): QueryDenomsMetadataResponse {
+    return QueryDenomsMetadataResponse.decode(message.value);
+  },
+
+  toProto(message: QueryDenomsMetadataResponse): Uint8Array {
+    return QueryDenomsMetadataResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDenomsMetadataResponse): QueryDenomsMetadataResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.bank.v1beta1.QueryDenomsMetadataResponse",
+      value: QueryDenomsMetadataResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1946,6 +2352,9 @@ function createBaseQueryDenomMetadataRequest(): QueryDenomMetadataRequest {
 }
 
 export const QueryDenomMetadataRequest = {
+  typeUrl: "/cosmos.bank.v1beta1.QueryDenomMetadataRequest",
+  aminoType: "cosmos-sdk/QueryDenomMetadataRequest",
+
   encode(message: QueryDenomMetadataRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.denom !== "") {
       writer.uint32(10).string(message.denom);
@@ -2016,6 +2425,32 @@ export const QueryDenomMetadataRequest = {
     const obj: any = {};
     obj.denom = message.denom;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDenomMetadataRequestAminoMsg): QueryDenomMetadataRequest {
+    return QueryDenomMetadataRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryDenomMetadataRequest): QueryDenomMetadataRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryDenomMetadataRequest",
+      value: QueryDenomMetadataRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryDenomMetadataRequestProtoMsg): QueryDenomMetadataRequest {
+    return QueryDenomMetadataRequest.decode(message.value);
+  },
+
+  toProto(message: QueryDenomMetadataRequest): Uint8Array {
+    return QueryDenomMetadataRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDenomMetadataRequest): QueryDenomMetadataRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.bank.v1beta1.QueryDenomMetadataRequest",
+      value: QueryDenomMetadataRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2027,6 +2462,9 @@ function createBaseQueryDenomMetadataResponse(): QueryDenomMetadataResponse {
 }
 
 export const QueryDenomMetadataResponse = {
+  typeUrl: "/cosmos.bank.v1beta1.QueryDenomMetadataResponse",
+  aminoType: "cosmos-sdk/QueryDenomMetadataResponse",
+
   encode(message: QueryDenomMetadataResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.metadata !== undefined) {
       Metadata.encode(message.metadata, writer.uint32(10).fork()).ldelim();
@@ -2097,6 +2535,32 @@ export const QueryDenomMetadataResponse = {
     const obj: any = {};
     obj.metadata = message.metadata ? Metadata.toAmino(message.metadata) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDenomMetadataResponseAminoMsg): QueryDenomMetadataResponse {
+    return QueryDenomMetadataResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryDenomMetadataResponse): QueryDenomMetadataResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryDenomMetadataResponse",
+      value: QueryDenomMetadataResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryDenomMetadataResponseProtoMsg): QueryDenomMetadataResponse {
+    return QueryDenomMetadataResponse.decode(message.value);
+  },
+
+  toProto(message: QueryDenomMetadataResponse): Uint8Array {
+    return QueryDenomMetadataResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDenomMetadataResponse): QueryDenomMetadataResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.bank.v1beta1.QueryDenomMetadataResponse",
+      value: QueryDenomMetadataResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2109,6 +2573,9 @@ function createBaseQueryDenomOwnersRequest(): QueryDenomOwnersRequest {
 }
 
 export const QueryDenomOwnersRequest = {
+  typeUrl: "/cosmos.bank.v1beta1.QueryDenomOwnersRequest",
+  aminoType: "cosmos-sdk/QueryDenomOwnersRequest",
+
   encode(message: QueryDenomOwnersRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.denom !== "") {
       writer.uint32(10).string(message.denom);
@@ -2194,6 +2661,32 @@ export const QueryDenomOwnersRequest = {
     obj.denom = message.denom;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDenomOwnersRequestAminoMsg): QueryDenomOwnersRequest {
+    return QueryDenomOwnersRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryDenomOwnersRequest): QueryDenomOwnersRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryDenomOwnersRequest",
+      value: QueryDenomOwnersRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryDenomOwnersRequestProtoMsg): QueryDenomOwnersRequest {
+    return QueryDenomOwnersRequest.decode(message.value);
+  },
+
+  toProto(message: QueryDenomOwnersRequest): Uint8Array {
+    return QueryDenomOwnersRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDenomOwnersRequest): QueryDenomOwnersRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.bank.v1beta1.QueryDenomOwnersRequest",
+      value: QueryDenomOwnersRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2206,6 +2699,9 @@ function createBaseDenomOwner(): DenomOwner {
 }
 
 export const DenomOwner = {
+  typeUrl: "/cosmos.bank.v1beta1.DenomOwner",
+  aminoType: "cosmos-sdk/DenomOwner",
+
   encode(message: DenomOwner, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.address !== "") {
       writer.uint32(10).string(message.address);
@@ -2291,6 +2787,32 @@ export const DenomOwner = {
     obj.address = message.address;
     obj.balance = message.balance ? Coin.toAmino(message.balance) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: DenomOwnerAminoMsg): DenomOwner {
+    return DenomOwner.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: DenomOwner): DenomOwnerAminoMsg {
+    return {
+      type: "cosmos-sdk/DenomOwner",
+      value: DenomOwner.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: DenomOwnerProtoMsg): DenomOwner {
+    return DenomOwner.decode(message.value);
+  },
+
+  toProto(message: DenomOwner): Uint8Array {
+    return DenomOwner.encode(message).finish();
+  },
+
+  toProtoMsg(message: DenomOwner): DenomOwnerProtoMsg {
+    return {
+      typeUrl: "/cosmos.bank.v1beta1.DenomOwner",
+      value: DenomOwner.encode(message).finish()
+    };
   }
 
 };
@@ -2303,6 +2825,9 @@ function createBaseQueryDenomOwnersResponse(): QueryDenomOwnersResponse {
 }
 
 export const QueryDenomOwnersResponse = {
+  typeUrl: "/cosmos.bank.v1beta1.QueryDenomOwnersResponse",
+  aminoType: "cosmos-sdk/QueryDenomOwnersResponse",
+
   encode(message: QueryDenomOwnersResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.denomOwners) {
       DenomOwner.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -2406,6 +2931,32 @@ export const QueryDenomOwnersResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDenomOwnersResponseAminoMsg): QueryDenomOwnersResponse {
+    return QueryDenomOwnersResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryDenomOwnersResponse): QueryDenomOwnersResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryDenomOwnersResponse",
+      value: QueryDenomOwnersResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryDenomOwnersResponseProtoMsg): QueryDenomOwnersResponse {
+    return QueryDenomOwnersResponse.decode(message.value);
+  },
+
+  toProto(message: QueryDenomOwnersResponse): Uint8Array {
+    return QueryDenomOwnersResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDenomOwnersResponse): QueryDenomOwnersResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.bank.v1beta1.QueryDenomOwnersResponse",
+      value: QueryDenomOwnersResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/bank/v1beta1/tx.ts b/__fixtures__/outputv2/cosmos/bank/v1beta1/tx.ts
index 2629f2db8..1cbd5f133 100644
--- a/__fixtures__/outputv2/cosmos/bank/v1beta1/tx.ts
+++ b/__fixtures__/outputv2/cosmos/bank/v1beta1/tx.ts
@@ -10,7 +10,7 @@ export interface MsgSend {
   toAddress: string;
   amount: Coin[];
 }
-export interface MsgSendProtoType {
+export interface MsgSendProtoMsg {
   typeUrl: "/cosmos.bank.v1beta1.MsgSend";
   value: Uint8Array;
 }
@@ -21,7 +21,7 @@ export interface MsgSendAmino {
   to_address: string;
   amount: CoinAmino[];
 }
-export interface MsgSendAminoType {
+export interface MsgSendAminoMsg {
   type: "cosmos-sdk/MsgSend";
   value: MsgSendAmino;
 }
@@ -35,14 +35,14 @@ export interface MsgSendSDKType {
 
 /** MsgSendResponse defines the Msg/Send response type. */
 export interface MsgSendResponse {}
-export interface MsgSendResponseProtoType {
+export interface MsgSendResponseProtoMsg {
   typeUrl: "/cosmos.bank.v1beta1.MsgSendResponse";
   value: Uint8Array;
 }
 
 /** MsgSendResponse defines the Msg/Send response type. */
 export interface MsgSendResponseAmino {}
-export interface MsgSendResponseAminoType {
+export interface MsgSendResponseAminoMsg {
   type: "cosmos-sdk/MsgSendResponse";
   value: MsgSendResponseAmino;
 }
@@ -55,7 +55,7 @@ export interface MsgMultiSend {
   inputs: Input[];
   outputs: Output[];
 }
-export interface MsgMultiSendProtoType {
+export interface MsgMultiSendProtoMsg {
   typeUrl: "/cosmos.bank.v1beta1.MsgMultiSend";
   value: Uint8Array;
 }
@@ -65,7 +65,7 @@ export interface MsgMultiSendAmino {
   inputs: InputAmino[];
   outputs: OutputAmino[];
 }
-export interface MsgMultiSendAminoType {
+export interface MsgMultiSendAminoMsg {
   type: "cosmos-sdk/MsgMultiSend";
   value: MsgMultiSendAmino;
 }
@@ -78,14 +78,14 @@ export interface MsgMultiSendSDKType {
 
 /** MsgMultiSendResponse defines the Msg/MultiSend response type. */
 export interface MsgMultiSendResponse {}
-export interface MsgMultiSendResponseProtoType {
+export interface MsgMultiSendResponseProtoMsg {
   typeUrl: "/cosmos.bank.v1beta1.MsgMultiSendResponse";
   value: Uint8Array;
 }
 
 /** MsgMultiSendResponse defines the Msg/MultiSend response type. */
 export interface MsgMultiSendResponseAmino {}
-export interface MsgMultiSendResponseAminoType {
+export interface MsgMultiSendResponseAminoMsg {
   type: "cosmos-sdk/MsgMultiSendResponse";
   value: MsgMultiSendResponseAmino;
 }
@@ -102,6 +102,9 @@ function createBaseMsgSend(): MsgSend {
 }
 
 export const MsgSend = {
+  typeUrl: "/cosmos.bank.v1beta1.MsgSend",
+  aminoType: "cosmos-sdk/MsgSend",
+
   encode(message: MsgSend, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.fromAddress !== "") {
       writer.uint32(10).string(message.fromAddress);
@@ -220,6 +223,32 @@ export const MsgSend = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: MsgSendAminoMsg): MsgSend {
+    return MsgSend.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgSend): MsgSendAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgSend",
+      value: MsgSend.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgSendProtoMsg): MsgSend {
+    return MsgSend.decode(message.value);
+  },
+
+  toProto(message: MsgSend): Uint8Array {
+    return MsgSend.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgSend): MsgSendProtoMsg {
+    return {
+      typeUrl: "/cosmos.bank.v1beta1.MsgSend",
+      value: MsgSend.encode(message).finish()
+    };
   }
 
 };
@@ -229,6 +258,9 @@ function createBaseMsgSendResponse(): MsgSendResponse {
 }
 
 export const MsgSendResponse = {
+  typeUrl: "/cosmos.bank.v1beta1.MsgSendResponse",
+  aminoType: "cosmos-sdk/MsgSendResponse",
+
   encode(_: MsgSendResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -281,6 +313,32 @@ export const MsgSendResponse = {
   toAmino(_: MsgSendResponse): MsgSendResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgSendResponseAminoMsg): MsgSendResponse {
+    return MsgSendResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgSendResponse): MsgSendResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgSendResponse",
+      value: MsgSendResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgSendResponseProtoMsg): MsgSendResponse {
+    return MsgSendResponse.decode(message.value);
+  },
+
+  toProto(message: MsgSendResponse): Uint8Array {
+    return MsgSendResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgSendResponse): MsgSendResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.bank.v1beta1.MsgSendResponse",
+      value: MsgSendResponse.encode(message).finish()
+    };
   }
 
 };
@@ -293,6 +351,9 @@ function createBaseMsgMultiSend(): MsgMultiSend {
 }
 
 export const MsgMultiSend = {
+  typeUrl: "/cosmos.bank.v1beta1.MsgMultiSend",
+  aminoType: "cosmos-sdk/MsgMultiSend",
+
   encode(message: MsgMultiSend, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.inputs) {
       Input.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -411,6 +472,32 @@ export const MsgMultiSend = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: MsgMultiSendAminoMsg): MsgMultiSend {
+    return MsgMultiSend.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgMultiSend): MsgMultiSendAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgMultiSend",
+      value: MsgMultiSend.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgMultiSendProtoMsg): MsgMultiSend {
+    return MsgMultiSend.decode(message.value);
+  },
+
+  toProto(message: MsgMultiSend): Uint8Array {
+    return MsgMultiSend.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgMultiSend): MsgMultiSendProtoMsg {
+    return {
+      typeUrl: "/cosmos.bank.v1beta1.MsgMultiSend",
+      value: MsgMultiSend.encode(message).finish()
+    };
   }
 
 };
@@ -420,6 +507,9 @@ function createBaseMsgMultiSendResponse(): MsgMultiSendResponse {
 }
 
 export const MsgMultiSendResponse = {
+  typeUrl: "/cosmos.bank.v1beta1.MsgMultiSendResponse",
+  aminoType: "cosmos-sdk/MsgMultiSendResponse",
+
   encode(_: MsgMultiSendResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -472,6 +562,32 @@ export const MsgMultiSendResponse = {
   toAmino(_: MsgMultiSendResponse): MsgMultiSendResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgMultiSendResponseAminoMsg): MsgMultiSendResponse {
+    return MsgMultiSendResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgMultiSendResponse): MsgMultiSendResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgMultiSendResponse",
+      value: MsgMultiSendResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgMultiSendResponseProtoMsg): MsgMultiSendResponse {
+    return MsgMultiSendResponse.decode(message.value);
+  },
+
+  toProto(message: MsgMultiSendResponse): Uint8Array {
+    return MsgMultiSendResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgMultiSendResponse): MsgMultiSendResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.bank.v1beta1.MsgMultiSendResponse",
+      value: MsgMultiSendResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/base/abci/v1beta1/abci.ts b/__fixtures__/outputv2/cosmos/base/abci/v1beta1/abci.ts
index 8ad63019c..6a29f1484 100644
--- a/__fixtures__/outputv2/cosmos/base/abci/v1beta1/abci.ts
+++ b/__fixtures__/outputv2/cosmos/base/abci/v1beta1/abci.ts
@@ -62,7 +62,7 @@ export interface TxResponse {
    */
   events: Event[];
 }
-export interface TxResponseProtoType {
+export interface TxResponseProtoMsg {
   typeUrl: "/cosmos.base.abci.v1beta1.TxResponse";
   value: Uint8Array;
 }
@@ -125,7 +125,7 @@ export interface TxResponseAmino {
    */
   events: EventAmino[];
 }
-export interface TxResponseAminoType {
+export interface TxResponseAminoMsg {
   type: "cosmos-sdk/TxResponse";
   value: TxResponseAmino;
 }
@@ -161,7 +161,7 @@ export interface ABCIMessageLog {
    */
   events: StringEvent[];
 }
-export interface ABCIMessageLogProtoType {
+export interface ABCIMessageLogProtoMsg {
   typeUrl: "/cosmos.base.abci.v1beta1.ABCIMessageLog";
   value: Uint8Array;
 }
@@ -177,7 +177,7 @@ export interface ABCIMessageLogAmino {
    */
   events: StringEventAmino[];
 }
-export interface ABCIMessageLogAminoType {
+export interface ABCIMessageLogAminoMsg {
   type: "cosmos-sdk/ABCIMessageLog";
   value: ABCIMessageLogAmino;
 }
@@ -197,7 +197,7 @@ export interface StringEvent {
   type: string;
   attributes: Attribute[];
 }
-export interface StringEventProtoType {
+export interface StringEventProtoMsg {
   typeUrl: "/cosmos.base.abci.v1beta1.StringEvent";
   value: Uint8Array;
 }
@@ -210,7 +210,7 @@ export interface StringEventAmino {
   type: string;
   attributes: AttributeAmino[];
 }
-export interface StringEventAminoType {
+export interface StringEventAminoMsg {
   type: "cosmos-sdk/StringEvent";
   value: StringEventAmino;
 }
@@ -232,7 +232,7 @@ export interface Attribute {
   key: string;
   value: string;
 }
-export interface AttributeProtoType {
+export interface AttributeProtoMsg {
   typeUrl: "/cosmos.base.abci.v1beta1.Attribute";
   value: Uint8Array;
 }
@@ -245,7 +245,7 @@ export interface AttributeAmino {
   key: string;
   value: string;
 }
-export interface AttributeAminoType {
+export interface AttributeAminoMsg {
   type: "cosmos-sdk/Attribute";
   value: AttributeAmino;
 }
@@ -267,7 +267,7 @@ export interface GasInfo {
   /** GasUsed is the amount of gas actually consumed. */
   gasUsed: Long;
 }
-export interface GasInfoProtoType {
+export interface GasInfoProtoMsg {
   typeUrl: "/cosmos.base.abci.v1beta1.GasInfo";
   value: Uint8Array;
 }
@@ -280,7 +280,7 @@ export interface GasInfoAmino {
   /** GasUsed is the amount of gas actually consumed. */
   gas_used: string;
 }
-export interface GasInfoAminoType {
+export interface GasInfoAminoMsg {
   type: "cosmos-sdk/GasInfo";
   value: GasInfoAmino;
 }
@@ -319,7 +319,7 @@ export interface Result {
    */
   msgResponses: Any[];
 }
-export interface ResultProtoType {
+export interface ResultProtoMsg {
   typeUrl: "/cosmos.base.abci.v1beta1.Result";
   value: Uint8Array;
 }
@@ -352,7 +352,7 @@ export interface ResultAmino {
    */
   msg_responses: AnyAmino[];
 }
-export interface ResultAminoType {
+export interface ResultAminoMsg {
   type: "cosmos-sdk/Result";
   value: ResultAmino;
 }
@@ -374,7 +374,7 @@ export interface SimulationResponse {
   gasInfo?: GasInfo;
   result?: Result;
 }
-export interface SimulationResponseProtoType {
+export interface SimulationResponseProtoMsg {
   typeUrl: "/cosmos.base.abci.v1beta1.SimulationResponse";
   value: Uint8Array;
 }
@@ -387,7 +387,7 @@ export interface SimulationResponseAmino {
   gas_info?: GasInfoAmino;
   result?: ResultAmino;
 }
-export interface SimulationResponseAminoType {
+export interface SimulationResponseAminoMsg {
   type: "cosmos-sdk/SimulationResponse";
   value: SimulationResponseAmino;
 }
@@ -411,7 +411,7 @@ export interface MsgData {
   msgType: string;
   data: Uint8Array;
 }
-export interface MsgDataProtoType {
+export interface MsgDataProtoMsg {
   typeUrl: "/cosmos.base.abci.v1beta1.MsgData";
   value: Uint8Array;
 }
@@ -426,7 +426,7 @@ export interface MsgDataAmino {
   msg_type: string;
   data: Uint8Array;
 }
-export interface MsgDataAminoType {
+export interface MsgDataAminoMsg {
   type: "cosmos-sdk/MsgData";
   value: MsgDataAmino;
 }
@@ -459,7 +459,7 @@ export interface TxMsgData {
    */
   msgResponses: Any[];
 }
-export interface TxMsgDataProtoType {
+export interface TxMsgDataProtoMsg {
   typeUrl: "/cosmos.base.abci.v1beta1.TxMsgData";
   value: Uint8Array;
 }
@@ -481,7 +481,7 @@ export interface TxMsgDataAmino {
    */
   msg_responses: AnyAmino[];
 }
-export interface TxMsgDataAminoType {
+export interface TxMsgDataAminoMsg {
   type: "cosmos-sdk/TxMsgData";
   value: TxMsgDataAmino;
 }
@@ -516,7 +516,7 @@ export interface SearchTxsResult {
   /** List of txs in current page */
   txs: TxResponse[];
 }
-export interface SearchTxsResultProtoType {
+export interface SearchTxsResultProtoMsg {
   typeUrl: "/cosmos.base.abci.v1beta1.SearchTxsResult";
   value: Uint8Array;
 }
@@ -541,7 +541,7 @@ export interface SearchTxsResultAmino {
   /** List of txs in current page */
   txs: TxResponseAmino[];
 }
-export interface SearchTxsResultAminoType {
+export interface SearchTxsResultAminoMsg {
   type: "cosmos-sdk/SearchTxsResult";
   value: SearchTxsResultAmino;
 }
@@ -575,6 +575,9 @@ function createBaseTxResponse(): TxResponse {
 }
 
 export const TxResponse = {
+  typeUrl: "/cosmos.base.abci.v1beta1.TxResponse",
+  aminoType: "cosmos-sdk/TxResponse",
+
   encode(message: TxResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.height.isZero()) {
       writer.uint32(8).int64(message.height);
@@ -861,6 +864,32 @@ export const TxResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: TxResponseAminoMsg): TxResponse {
+    return TxResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: TxResponse): TxResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/TxResponse",
+      value: TxResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: TxResponseProtoMsg): TxResponse {
+    return TxResponse.decode(message.value);
+  },
+
+  toProto(message: TxResponse): Uint8Array {
+    return TxResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: TxResponse): TxResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.abci.v1beta1.TxResponse",
+      value: TxResponse.encode(message).finish()
+    };
   }
 
 };
@@ -874,6 +903,9 @@ function createBaseABCIMessageLog(): ABCIMessageLog {
 }
 
 export const ABCIMessageLog = {
+  typeUrl: "/cosmos.base.abci.v1beta1.ABCIMessageLog",
+  aminoType: "cosmos-sdk/ABCIMessageLog",
+
   encode(message: ABCIMessageLog, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.msgIndex !== 0) {
       writer.uint32(8).uint32(message.msgIndex);
@@ -992,6 +1024,32 @@ export const ABCIMessageLog = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ABCIMessageLogAminoMsg): ABCIMessageLog {
+    return ABCIMessageLog.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ABCIMessageLog): ABCIMessageLogAminoMsg {
+    return {
+      type: "cosmos-sdk/ABCIMessageLog",
+      value: ABCIMessageLog.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ABCIMessageLogProtoMsg): ABCIMessageLog {
+    return ABCIMessageLog.decode(message.value);
+  },
+
+  toProto(message: ABCIMessageLog): Uint8Array {
+    return ABCIMessageLog.encode(message).finish();
+  },
+
+  toProtoMsg(message: ABCIMessageLog): ABCIMessageLogProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.abci.v1beta1.ABCIMessageLog",
+      value: ABCIMessageLog.encode(message).finish()
+    };
   }
 
 };
@@ -1004,6 +1062,9 @@ function createBaseStringEvent(): StringEvent {
 }
 
 export const StringEvent = {
+  typeUrl: "/cosmos.base.abci.v1beta1.StringEvent",
+  aminoType: "cosmos-sdk/StringEvent",
+
   encode(message: StringEvent, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.type !== "") {
       writer.uint32(10).string(message.type);
@@ -1107,6 +1168,32 @@ export const StringEvent = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: StringEventAminoMsg): StringEvent {
+    return StringEvent.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: StringEvent): StringEventAminoMsg {
+    return {
+      type: "cosmos-sdk/StringEvent",
+      value: StringEvent.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: StringEventProtoMsg): StringEvent {
+    return StringEvent.decode(message.value);
+  },
+
+  toProto(message: StringEvent): Uint8Array {
+    return StringEvent.encode(message).finish();
+  },
+
+  toProtoMsg(message: StringEvent): StringEventProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.abci.v1beta1.StringEvent",
+      value: StringEvent.encode(message).finish()
+    };
   }
 
 };
@@ -1119,6 +1206,9 @@ function createBaseAttribute(): Attribute {
 }
 
 export const Attribute = {
+  typeUrl: "/cosmos.base.abci.v1beta1.Attribute",
+  aminoType: "cosmos-sdk/Attribute",
+
   encode(message: Attribute, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.key !== "") {
       writer.uint32(10).string(message.key);
@@ -1204,6 +1294,32 @@ export const Attribute = {
     obj.key = message.key;
     obj.value = message.value;
     return obj;
+  },
+
+  fromAminoMsg(object: AttributeAminoMsg): Attribute {
+    return Attribute.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Attribute): AttributeAminoMsg {
+    return {
+      type: "cosmos-sdk/Attribute",
+      value: Attribute.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: AttributeProtoMsg): Attribute {
+    return Attribute.decode(message.value);
+  },
+
+  toProto(message: Attribute): Uint8Array {
+    return Attribute.encode(message).finish();
+  },
+
+  toProtoMsg(message: Attribute): AttributeProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.abci.v1beta1.Attribute",
+      value: Attribute.encode(message).finish()
+    };
   }
 
 };
@@ -1216,6 +1332,9 @@ function createBaseGasInfo(): GasInfo {
 }
 
 export const GasInfo = {
+  typeUrl: "/cosmos.base.abci.v1beta1.GasInfo",
+  aminoType: "cosmos-sdk/GasInfo",
+
   encode(message: GasInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.gasWanted.isZero()) {
       writer.uint32(8).uint64(message.gasWanted);
@@ -1301,6 +1420,32 @@ export const GasInfo = {
     obj.gas_wanted = message.gasWanted ? message.gasWanted.toString() : undefined;
     obj.gas_used = message.gasUsed ? message.gasUsed.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GasInfoAminoMsg): GasInfo {
+    return GasInfo.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GasInfo): GasInfoAminoMsg {
+    return {
+      type: "cosmos-sdk/GasInfo",
+      value: GasInfo.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GasInfoProtoMsg): GasInfo {
+    return GasInfo.decode(message.value);
+  },
+
+  toProto(message: GasInfo): Uint8Array {
+    return GasInfo.encode(message).finish();
+  },
+
+  toProtoMsg(message: GasInfo): GasInfoProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.abci.v1beta1.GasInfo",
+      value: GasInfo.encode(message).finish()
+    };
   }
 
 };
@@ -1315,6 +1460,9 @@ function createBaseResult(): Result {
 }
 
 export const Result = {
+  typeUrl: "/cosmos.base.abci.v1beta1.Result",
+  aminoType: "cosmos-sdk/Result",
+
   encode(message: Result, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.data.length !== 0) {
       writer.uint32(10).bytes(message.data);
@@ -1463,6 +1611,32 @@ export const Result = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ResultAminoMsg): Result {
+    return Result.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Result): ResultAminoMsg {
+    return {
+      type: "cosmos-sdk/Result",
+      value: Result.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ResultProtoMsg): Result {
+    return Result.decode(message.value);
+  },
+
+  toProto(message: Result): Uint8Array {
+    return Result.encode(message).finish();
+  },
+
+  toProtoMsg(message: Result): ResultProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.abci.v1beta1.Result",
+      value: Result.encode(message).finish()
+    };
   }
 
 };
@@ -1475,6 +1649,9 @@ function createBaseSimulationResponse(): SimulationResponse {
 }
 
 export const SimulationResponse = {
+  typeUrl: "/cosmos.base.abci.v1beta1.SimulationResponse",
+  aminoType: "cosmos-sdk/SimulationResponse",
+
   encode(message: SimulationResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.gasInfo !== undefined) {
       GasInfo.encode(message.gasInfo, writer.uint32(10).fork()).ldelim();
@@ -1560,6 +1737,32 @@ export const SimulationResponse = {
     obj.gas_info = message.gasInfo ? GasInfo.toAmino(message.gasInfo) : undefined;
     obj.result = message.result ? Result.toAmino(message.result) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: SimulationResponseAminoMsg): SimulationResponse {
+    return SimulationResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: SimulationResponse): SimulationResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/SimulationResponse",
+      value: SimulationResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: SimulationResponseProtoMsg): SimulationResponse {
+    return SimulationResponse.decode(message.value);
+  },
+
+  toProto(message: SimulationResponse): Uint8Array {
+    return SimulationResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: SimulationResponse): SimulationResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.abci.v1beta1.SimulationResponse",
+      value: SimulationResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1572,6 +1775,9 @@ function createBaseMsgData(): MsgData {
 }
 
 export const MsgData = {
+  typeUrl: "/cosmos.base.abci.v1beta1.MsgData",
+  aminoType: "cosmos-sdk/MsgData",
+
   encode(message: MsgData, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.msgType !== "") {
       writer.uint32(10).string(message.msgType);
@@ -1657,6 +1863,32 @@ export const MsgData = {
     obj.msg_type = message.msgType;
     obj.data = message.data;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgDataAminoMsg): MsgData {
+    return MsgData.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgData): MsgDataAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgData",
+      value: MsgData.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgDataProtoMsg): MsgData {
+    return MsgData.decode(message.value);
+  },
+
+  toProto(message: MsgData): Uint8Array {
+    return MsgData.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgData): MsgDataProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.abci.v1beta1.MsgData",
+      value: MsgData.encode(message).finish()
+    };
   }
 
 };
@@ -1669,6 +1901,9 @@ function createBaseTxMsgData(): TxMsgData {
 }
 
 export const TxMsgData = {
+  typeUrl: "/cosmos.base.abci.v1beta1.TxMsgData",
+  aminoType: "cosmos-sdk/TxMsgData",
+
   encode(message: TxMsgData, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.data) {
       MsgData.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1787,6 +2022,32 @@ export const TxMsgData = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: TxMsgDataAminoMsg): TxMsgData {
+    return TxMsgData.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: TxMsgData): TxMsgDataAminoMsg {
+    return {
+      type: "cosmos-sdk/TxMsgData",
+      value: TxMsgData.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: TxMsgDataProtoMsg): TxMsgData {
+    return TxMsgData.decode(message.value);
+  },
+
+  toProto(message: TxMsgData): Uint8Array {
+    return TxMsgData.encode(message).finish();
+  },
+
+  toProtoMsg(message: TxMsgData): TxMsgDataProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.abci.v1beta1.TxMsgData",
+      value: TxMsgData.encode(message).finish()
+    };
   }
 
 };
@@ -1803,6 +2064,9 @@ function createBaseSearchTxsResult(): SearchTxsResult {
 }
 
 export const SearchTxsResult = {
+  typeUrl: "/cosmos.base.abci.v1beta1.SearchTxsResult",
+  aminoType: "cosmos-sdk/SearchTxsResult",
+
   encode(message: SearchTxsResult, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.totalCount.isZero()) {
       writer.uint32(8).uint64(message.totalCount);
@@ -1966,6 +2230,32 @@ export const SearchTxsResult = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: SearchTxsResultAminoMsg): SearchTxsResult {
+    return SearchTxsResult.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: SearchTxsResult): SearchTxsResultAminoMsg {
+    return {
+      type: "cosmos-sdk/SearchTxsResult",
+      value: SearchTxsResult.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: SearchTxsResultProtoMsg): SearchTxsResult {
+    return SearchTxsResult.decode(message.value);
+  },
+
+  toProto(message: SearchTxsResult): Uint8Array {
+    return SearchTxsResult.encode(message).finish();
+  },
+
+  toProtoMsg(message: SearchTxsResult): SearchTxsResultProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.abci.v1beta1.SearchTxsResult",
+      value: SearchTxsResult.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/base/kv/v1beta1/kv.ts b/__fixtures__/outputv2/cosmos/base/kv/v1beta1/kv.ts
index a73ec068a..829f1e774 100644
--- a/__fixtures__/outputv2/cosmos/base/kv/v1beta1/kv.ts
+++ b/__fixtures__/outputv2/cosmos/base/kv/v1beta1/kv.ts
@@ -6,7 +6,7 @@ export const protobufPackage = "cosmos.base.kv.v1beta1";
 export interface Pairs {
   pairs: Pair[];
 }
-export interface PairsProtoType {
+export interface PairsProtoMsg {
   typeUrl: "/cosmos.base.kv.v1beta1.Pairs";
   value: Uint8Array;
 }
@@ -15,7 +15,7 @@ export interface PairsProtoType {
 export interface PairsAmino {
   pairs: PairAmino[];
 }
-export interface PairsAminoType {
+export interface PairsAminoMsg {
   type: "cosmos-sdk/Pairs";
   value: PairsAmino;
 }
@@ -30,7 +30,7 @@ export interface Pair {
   key: Uint8Array;
   value: Uint8Array;
 }
-export interface PairProtoType {
+export interface PairProtoMsg {
   typeUrl: "/cosmos.base.kv.v1beta1.Pair";
   value: Uint8Array;
 }
@@ -40,7 +40,7 @@ export interface PairAmino {
   key: Uint8Array;
   value: Uint8Array;
 }
-export interface PairAminoType {
+export interface PairAminoMsg {
   type: "cosmos-sdk/Pair";
   value: PairAmino;
 }
@@ -58,6 +58,9 @@ function createBasePairs(): Pairs {
 }
 
 export const Pairs = {
+  typeUrl: "/cosmos.base.kv.v1beta1.Pairs",
+  aminoType: "cosmos-sdk/Pairs",
+
   encode(message: Pairs, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.pairs) {
       Pair.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -146,6 +149,32 @@ export const Pairs = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: PairsAminoMsg): Pairs {
+    return Pairs.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Pairs): PairsAminoMsg {
+    return {
+      type: "cosmos-sdk/Pairs",
+      value: Pairs.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: PairsProtoMsg): Pairs {
+    return Pairs.decode(message.value);
+  },
+
+  toProto(message: Pairs): Uint8Array {
+    return Pairs.encode(message).finish();
+  },
+
+  toProtoMsg(message: Pairs): PairsProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.kv.v1beta1.Pairs",
+      value: Pairs.encode(message).finish()
+    };
   }
 
 };
@@ -158,6 +187,9 @@ function createBasePair(): Pair {
 }
 
 export const Pair = {
+  typeUrl: "/cosmos.base.kv.v1beta1.Pair",
+  aminoType: "cosmos-sdk/Pair",
+
   encode(message: Pair, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.key.length !== 0) {
       writer.uint32(10).bytes(message.key);
@@ -243,6 +275,32 @@ export const Pair = {
     obj.key = message.key;
     obj.value = message.value;
     return obj;
+  },
+
+  fromAminoMsg(object: PairAminoMsg): Pair {
+    return Pair.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Pair): PairAminoMsg {
+    return {
+      type: "cosmos-sdk/Pair",
+      value: Pair.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: PairProtoMsg): Pair {
+    return Pair.decode(message.value);
+  },
+
+  toProto(message: Pair): Uint8Array {
+    return Pair.encode(message).finish();
+  },
+
+  toProtoMsg(message: Pair): PairProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.kv.v1beta1.Pair",
+      value: Pair.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/base/query/v1beta1/pagination.ts b/__fixtures__/outputv2/cosmos/base/query/v1beta1/pagination.ts
index 8f4db1725..777dfeb82 100644
--- a/__fixtures__/outputv2/cosmos/base/query/v1beta1/pagination.ts
+++ b/__fixtures__/outputv2/cosmos/base/query/v1beta1/pagination.ts
@@ -47,7 +47,7 @@ export interface PageRequest {
    */
   reverse: boolean;
 }
-export interface PageRequestProtoType {
+export interface PageRequestProtoMsg {
   typeUrl: "/cosmos.base.query.v1beta1.PageRequest";
   value: Uint8Array;
 }
@@ -97,7 +97,7 @@ export interface PageRequestAmino {
    */
   reverse: boolean;
 }
-export interface PageRequestAminoType {
+export interface PageRequestAminoMsg {
   type: "cosmos-sdk/PageRequest";
   value: PageRequestAmino;
 }
@@ -142,7 +142,7 @@ export interface PageResponse {
    */
   total: Long;
 }
-export interface PageResponseProtoType {
+export interface PageResponseProtoMsg {
   typeUrl: "/cosmos.base.query.v1beta1.PageResponse";
   value: Uint8Array;
 }
@@ -170,7 +170,7 @@ export interface PageResponseAmino {
    */
   total: string;
 }
-export interface PageResponseAminoType {
+export interface PageResponseAminoMsg {
   type: "cosmos-sdk/PageResponse";
   value: PageResponseAmino;
 }
@@ -200,6 +200,9 @@ function createBasePageRequest(): PageRequest {
 }
 
 export const PageRequest = {
+  typeUrl: "/cosmos.base.query.v1beta1.PageRequest",
+  aminoType: "cosmos-sdk/PageRequest",
+
   encode(message: PageRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.key.length !== 0) {
       writer.uint32(10).bytes(message.key);
@@ -330,6 +333,32 @@ export const PageRequest = {
     obj.count_total = message.countTotal;
     obj.reverse = message.reverse;
     return obj;
+  },
+
+  fromAminoMsg(object: PageRequestAminoMsg): PageRequest {
+    return PageRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: PageRequest): PageRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/PageRequest",
+      value: PageRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: PageRequestProtoMsg): PageRequest {
+    return PageRequest.decode(message.value);
+  },
+
+  toProto(message: PageRequest): Uint8Array {
+    return PageRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: PageRequest): PageRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.query.v1beta1.PageRequest",
+      value: PageRequest.encode(message).finish()
+    };
   }
 
 };
@@ -342,6 +371,9 @@ function createBasePageResponse(): PageResponse {
 }
 
 export const PageResponse = {
+  typeUrl: "/cosmos.base.query.v1beta1.PageResponse",
+  aminoType: "cosmos-sdk/PageResponse",
+
   encode(message: PageResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.nextKey.length !== 0) {
       writer.uint32(10).bytes(message.nextKey);
@@ -427,6 +459,32 @@ export const PageResponse = {
     obj.next_key = message.nextKey;
     obj.total = message.total ? message.total.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: PageResponseAminoMsg): PageResponse {
+    return PageResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: PageResponse): PageResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/PageResponse",
+      value: PageResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: PageResponseProtoMsg): PageResponse {
+    return PageResponse.decode(message.value);
+  },
+
+  toProto(message: PageResponse): Uint8Array {
+    return PageResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: PageResponse): PageResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.query.v1beta1.PageResponse",
+      value: PageResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/base/reflection/v1beta1/reflection.ts b/__fixtures__/outputv2/cosmos/base/reflection/v1beta1/reflection.ts
index f7120799e..4b7a951e5 100644
--- a/__fixtures__/outputv2/cosmos/base/reflection/v1beta1/reflection.ts
+++ b/__fixtures__/outputv2/cosmos/base/reflection/v1beta1/reflection.ts
@@ -4,14 +4,14 @@ export const protobufPackage = "cosmos.base.reflection.v1beta1";
 
 /** ListAllInterfacesRequest is the request type of the ListAllInterfaces RPC. */
 export interface ListAllInterfacesRequest {}
-export interface ListAllInterfacesRequestProtoType {
+export interface ListAllInterfacesRequestProtoMsg {
   typeUrl: "/cosmos.base.reflection.v1beta1.ListAllInterfacesRequest";
   value: Uint8Array;
 }
 
 /** ListAllInterfacesRequest is the request type of the ListAllInterfaces RPC. */
 export interface ListAllInterfacesRequestAmino {}
-export interface ListAllInterfacesRequestAminoType {
+export interface ListAllInterfacesRequestAminoMsg {
   type: "cosmos-sdk/ListAllInterfacesRequest";
   value: ListAllInterfacesRequestAmino;
 }
@@ -24,7 +24,7 @@ export interface ListAllInterfacesResponse {
   /** interface_names is an array of all the registered interfaces. */
   interfaceNames: string[];
 }
-export interface ListAllInterfacesResponseProtoType {
+export interface ListAllInterfacesResponseProtoMsg {
   typeUrl: "/cosmos.base.reflection.v1beta1.ListAllInterfacesResponse";
   value: Uint8Array;
 }
@@ -34,7 +34,7 @@ export interface ListAllInterfacesResponseAmino {
   /** interface_names is an array of all the registered interfaces. */
   interface_names: string[];
 }
-export interface ListAllInterfacesResponseAminoType {
+export interface ListAllInterfacesResponseAminoMsg {
   type: "cosmos-sdk/ListAllInterfacesResponse";
   value: ListAllInterfacesResponseAmino;
 }
@@ -52,7 +52,7 @@ export interface ListImplementationsRequest {
   /** interface_name defines the interface to query the implementations for. */
   interfaceName: string;
 }
-export interface ListImplementationsRequestProtoType {
+export interface ListImplementationsRequestProtoMsg {
   typeUrl: "/cosmos.base.reflection.v1beta1.ListImplementationsRequest";
   value: Uint8Array;
 }
@@ -65,7 +65,7 @@ export interface ListImplementationsRequestAmino {
   /** interface_name defines the interface to query the implementations for. */
   interface_name: string;
 }
-export interface ListImplementationsRequestAminoType {
+export interface ListImplementationsRequestAminoMsg {
   type: "cosmos-sdk/ListImplementationsRequest";
   value: ListImplementationsRequestAmino;
 }
@@ -85,7 +85,7 @@ export interface ListImplementationsRequestSDKType {
 export interface ListImplementationsResponse {
   implementationMessageNames: string[];
 }
-export interface ListImplementationsResponseProtoType {
+export interface ListImplementationsResponseProtoMsg {
   typeUrl: "/cosmos.base.reflection.v1beta1.ListImplementationsResponse";
   value: Uint8Array;
 }
@@ -97,7 +97,7 @@ export interface ListImplementationsResponseProtoType {
 export interface ListImplementationsResponseAmino {
   implementation_message_names: string[];
 }
-export interface ListImplementationsResponseAminoType {
+export interface ListImplementationsResponseAminoMsg {
   type: "cosmos-sdk/ListImplementationsResponse";
   value: ListImplementationsResponseAmino;
 }
@@ -115,6 +115,9 @@ function createBaseListAllInterfacesRequest(): ListAllInterfacesRequest {
 }
 
 export const ListAllInterfacesRequest = {
+  typeUrl: "/cosmos.base.reflection.v1beta1.ListAllInterfacesRequest",
+  aminoType: "cosmos-sdk/ListAllInterfacesRequest",
+
   encode(_: ListAllInterfacesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -167,6 +170,32 @@ export const ListAllInterfacesRequest = {
   toAmino(_: ListAllInterfacesRequest): ListAllInterfacesRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: ListAllInterfacesRequestAminoMsg): ListAllInterfacesRequest {
+    return ListAllInterfacesRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ListAllInterfacesRequest): ListAllInterfacesRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/ListAllInterfacesRequest",
+      value: ListAllInterfacesRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ListAllInterfacesRequestProtoMsg): ListAllInterfacesRequest {
+    return ListAllInterfacesRequest.decode(message.value);
+  },
+
+  toProto(message: ListAllInterfacesRequest): Uint8Array {
+    return ListAllInterfacesRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: ListAllInterfacesRequest): ListAllInterfacesRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.reflection.v1beta1.ListAllInterfacesRequest",
+      value: ListAllInterfacesRequest.encode(message).finish()
+    };
   }
 
 };
@@ -178,6 +207,9 @@ function createBaseListAllInterfacesResponse(): ListAllInterfacesResponse {
 }
 
 export const ListAllInterfacesResponse = {
+  typeUrl: "/cosmos.base.reflection.v1beta1.ListAllInterfacesResponse",
+  aminoType: "cosmos-sdk/ListAllInterfacesResponse",
+
   encode(message: ListAllInterfacesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.interfaceNames) {
       writer.uint32(10).string(v!);
@@ -266,6 +298,32 @@ export const ListAllInterfacesResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ListAllInterfacesResponseAminoMsg): ListAllInterfacesResponse {
+    return ListAllInterfacesResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ListAllInterfacesResponse): ListAllInterfacesResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/ListAllInterfacesResponse",
+      value: ListAllInterfacesResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ListAllInterfacesResponseProtoMsg): ListAllInterfacesResponse {
+    return ListAllInterfacesResponse.decode(message.value);
+  },
+
+  toProto(message: ListAllInterfacesResponse): Uint8Array {
+    return ListAllInterfacesResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: ListAllInterfacesResponse): ListAllInterfacesResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.reflection.v1beta1.ListAllInterfacesResponse",
+      value: ListAllInterfacesResponse.encode(message).finish()
+    };
   }
 
 };
@@ -277,6 +335,9 @@ function createBaseListImplementationsRequest(): ListImplementationsRequest {
 }
 
 export const ListImplementationsRequest = {
+  typeUrl: "/cosmos.base.reflection.v1beta1.ListImplementationsRequest",
+  aminoType: "cosmos-sdk/ListImplementationsRequest",
+
   encode(message: ListImplementationsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.interfaceName !== "") {
       writer.uint32(10).string(message.interfaceName);
@@ -347,6 +408,32 @@ export const ListImplementationsRequest = {
     const obj: any = {};
     obj.interface_name = message.interfaceName;
     return obj;
+  },
+
+  fromAminoMsg(object: ListImplementationsRequestAminoMsg): ListImplementationsRequest {
+    return ListImplementationsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ListImplementationsRequest): ListImplementationsRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/ListImplementationsRequest",
+      value: ListImplementationsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ListImplementationsRequestProtoMsg): ListImplementationsRequest {
+    return ListImplementationsRequest.decode(message.value);
+  },
+
+  toProto(message: ListImplementationsRequest): Uint8Array {
+    return ListImplementationsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: ListImplementationsRequest): ListImplementationsRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.reflection.v1beta1.ListImplementationsRequest",
+      value: ListImplementationsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -358,6 +445,9 @@ function createBaseListImplementationsResponse(): ListImplementationsResponse {
 }
 
 export const ListImplementationsResponse = {
+  typeUrl: "/cosmos.base.reflection.v1beta1.ListImplementationsResponse",
+  aminoType: "cosmos-sdk/ListImplementationsResponse",
+
   encode(message: ListImplementationsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.implementationMessageNames) {
       writer.uint32(10).string(v!);
@@ -446,6 +536,32 @@ export const ListImplementationsResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ListImplementationsResponseAminoMsg): ListImplementationsResponse {
+    return ListImplementationsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ListImplementationsResponse): ListImplementationsResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/ListImplementationsResponse",
+      value: ListImplementationsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ListImplementationsResponseProtoMsg): ListImplementationsResponse {
+    return ListImplementationsResponse.decode(message.value);
+  },
+
+  toProto(message: ListImplementationsResponse): Uint8Array {
+    return ListImplementationsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: ListImplementationsResponse): ListImplementationsResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.reflection.v1beta1.ListImplementationsResponse",
+      value: ListImplementationsResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/base/reflection/v2alpha1/reflection.ts b/__fixtures__/outputv2/cosmos/base/reflection/v2alpha1/reflection.ts
index 5fa43d934..9144fdf84 100644
--- a/__fixtures__/outputv2/cosmos/base/reflection/v2alpha1/reflection.ts
+++ b/__fixtures__/outputv2/cosmos/base/reflection/v2alpha1/reflection.ts
@@ -25,7 +25,7 @@ export interface AppDescriptor {
   /** tx provides metadata information regarding how to send transactions to the given application */
   tx?: TxDescriptor;
 }
-export interface AppDescriptorProtoType {
+export interface AppDescriptorProtoMsg {
   typeUrl: "/cosmos.base.reflection.v2alpha1.AppDescriptor";
   value: Uint8Array;
 }
@@ -53,7 +53,7 @@ export interface AppDescriptorAmino {
   /** tx provides metadata information regarding how to send transactions to the given application */
   tx?: TxDescriptorAmino;
 }
-export interface AppDescriptorAminoType {
+export interface AppDescriptorAminoMsg {
   type: "cosmos-sdk/AppDescriptor";
   value: AppDescriptorAmino;
 }
@@ -80,7 +80,7 @@ export interface TxDescriptor {
   /** msgs lists the accepted application messages (sdk.Msg) */
   msgs: MsgDescriptor[];
 }
-export interface TxDescriptorProtoType {
+export interface TxDescriptorProtoMsg {
   typeUrl: "/cosmos.base.reflection.v2alpha1.TxDescriptor";
   value: Uint8Array;
 }
@@ -97,7 +97,7 @@ export interface TxDescriptorAmino {
   /** msgs lists the accepted application messages (sdk.Msg) */
   msgs: MsgDescriptorAmino[];
 }
-export interface TxDescriptorAminoType {
+export interface TxDescriptorAminoMsg {
   type: "cosmos-sdk/TxDescriptor";
   value: TxDescriptorAmino;
 }
@@ -116,7 +116,7 @@ export interface AuthnDescriptor {
   /** sign_modes defines the supported signature algorithm */
   signModes: SigningModeDescriptor[];
 }
-export interface AuthnDescriptorProtoType {
+export interface AuthnDescriptorProtoMsg {
   typeUrl: "/cosmos.base.reflection.v2alpha1.AuthnDescriptor";
   value: Uint8Array;
 }
@@ -129,7 +129,7 @@ export interface AuthnDescriptorAmino {
   /** sign_modes defines the supported signature algorithm */
   sign_modes: SigningModeDescriptorAmino[];
 }
-export interface AuthnDescriptorAminoType {
+export interface AuthnDescriptorAminoMsg {
   type: "cosmos-sdk/AuthnDescriptor";
   value: AuthnDescriptorAmino;
 }
@@ -161,7 +161,7 @@ export interface SigningModeDescriptor {
    */
   authnInfoProviderMethodFullname: string;
 }
-export interface SigningModeDescriptorProtoType {
+export interface SigningModeDescriptorProtoMsg {
   typeUrl: "/cosmos.base.reflection.v2alpha1.SigningModeDescriptor";
   value: Uint8Array;
 }
@@ -185,7 +185,7 @@ export interface SigningModeDescriptorAmino {
    */
   authn_info_provider_method_fullname: string;
 }
-export interface SigningModeDescriptorAminoType {
+export interface SigningModeDescriptorAminoMsg {
   type: "cosmos-sdk/SigningModeDescriptor";
   value: SigningModeDescriptorAmino;
 }
@@ -207,7 +207,7 @@ export interface ChainDescriptor {
   /** id is the chain id */
   id: string;
 }
-export interface ChainDescriptorProtoType {
+export interface ChainDescriptorProtoMsg {
   typeUrl: "/cosmos.base.reflection.v2alpha1.ChainDescriptor";
   value: Uint8Array;
 }
@@ -217,7 +217,7 @@ export interface ChainDescriptorAmino {
   /** id is the chain id */
   id: string;
 }
-export interface ChainDescriptorAminoType {
+export interface ChainDescriptorAminoMsg {
   type: "cosmos-sdk/ChainDescriptor";
   value: ChainDescriptorAmino;
 }
@@ -232,7 +232,7 @@ export interface CodecDescriptor {
   /** interfaces is a list of the registerted interfaces descriptors */
   interfaces: InterfaceDescriptor[];
 }
-export interface CodecDescriptorProtoType {
+export interface CodecDescriptorProtoMsg {
   typeUrl: "/cosmos.base.reflection.v2alpha1.CodecDescriptor";
   value: Uint8Array;
 }
@@ -242,7 +242,7 @@ export interface CodecDescriptorAmino {
   /** interfaces is a list of the registerted interfaces descriptors */
   interfaces: InterfaceDescriptorAmino[];
 }
-export interface CodecDescriptorAminoType {
+export interface CodecDescriptorAminoMsg {
   type: "cosmos-sdk/CodecDescriptor";
   value: CodecDescriptorAmino;
 }
@@ -266,7 +266,7 @@ export interface InterfaceDescriptor {
   /** interface_implementers is a list of the descriptors of the interface implementers */
   interfaceImplementers: InterfaceImplementerDescriptor[];
 }
-export interface InterfaceDescriptorProtoType {
+export interface InterfaceDescriptorProtoMsg {
   typeUrl: "/cosmos.base.reflection.v2alpha1.InterfaceDescriptor";
   value: Uint8Array;
 }
@@ -285,7 +285,7 @@ export interface InterfaceDescriptorAmino {
   /** interface_implementers is a list of the descriptors of the interface implementers */
   interface_implementers: InterfaceImplementerDescriptorAmino[];
 }
-export interface InterfaceDescriptorAminoType {
+export interface InterfaceDescriptorAminoMsg {
   type: "cosmos-sdk/InterfaceDescriptor";
   value: InterfaceDescriptorAmino;
 }
@@ -310,7 +310,7 @@ export interface InterfaceImplementerDescriptor {
    */
   typeUrl: string;
 }
-export interface InterfaceImplementerDescriptorProtoType {
+export interface InterfaceImplementerDescriptorProtoMsg {
   typeUrl: "/cosmos.base.reflection.v2alpha1.InterfaceImplementerDescriptor";
   value: Uint8Array;
 }
@@ -328,7 +328,7 @@ export interface InterfaceImplementerDescriptorAmino {
    */
   type_url: string;
 }
-export interface InterfaceImplementerDescriptorAminoType {
+export interface InterfaceImplementerDescriptorAminoMsg {
   type: "cosmos-sdk/InterfaceImplementerDescriptor";
   value: InterfaceImplementerDescriptorAmino;
 }
@@ -354,7 +354,7 @@ export interface InterfaceAcceptingMessageDescriptor {
    */
   fieldDescriptorNames: string[];
 }
-export interface InterfaceAcceptingMessageDescriptorProtoType {
+export interface InterfaceAcceptingMessageDescriptorProtoMsg {
   typeUrl: "/cosmos.base.reflection.v2alpha1.InterfaceAcceptingMessageDescriptor";
   value: Uint8Array;
 }
@@ -374,7 +374,7 @@ export interface InterfaceAcceptingMessageDescriptorAmino {
    */
   field_descriptor_names: string[];
 }
-export interface InterfaceAcceptingMessageDescriptorAminoType {
+export interface InterfaceAcceptingMessageDescriptorAminoMsg {
   type: "cosmos-sdk/InterfaceAcceptingMessageDescriptor";
   value: InterfaceAcceptingMessageDescriptorAmino;
 }
@@ -393,7 +393,7 @@ export interface ConfigurationDescriptor {
   /** bech32_account_address_prefix is the account address prefix */
   bech32AccountAddressPrefix: string;
 }
-export interface ConfigurationDescriptorProtoType {
+export interface ConfigurationDescriptorProtoMsg {
   typeUrl: "/cosmos.base.reflection.v2alpha1.ConfigurationDescriptor";
   value: Uint8Array;
 }
@@ -403,7 +403,7 @@ export interface ConfigurationDescriptorAmino {
   /** bech32_account_address_prefix is the account address prefix */
   bech32_account_address_prefix: string;
 }
-export interface ConfigurationDescriptorAminoType {
+export interface ConfigurationDescriptorAminoMsg {
   type: "cosmos-sdk/ConfigurationDescriptor";
   value: ConfigurationDescriptorAmino;
 }
@@ -418,7 +418,7 @@ export interface MsgDescriptor {
   /** msg_type_url contains the TypeURL of a sdk.Msg. */
   msgTypeUrl: string;
 }
-export interface MsgDescriptorProtoType {
+export interface MsgDescriptorProtoMsg {
   typeUrl: "/cosmos.base.reflection.v2alpha1.MsgDescriptor";
   value: Uint8Array;
 }
@@ -428,7 +428,7 @@ export interface MsgDescriptorAmino {
   /** msg_type_url contains the TypeURL of a sdk.Msg. */
   msg_type_url: string;
 }
-export interface MsgDescriptorAminoType {
+export interface MsgDescriptorAminoMsg {
   type: "cosmos-sdk/MsgDescriptor";
   value: MsgDescriptorAmino;
 }
@@ -440,14 +440,14 @@ export interface MsgDescriptorSDKType {
 
 /** GetAuthnDescriptorRequest is the request used for the GetAuthnDescriptor RPC */
 export interface GetAuthnDescriptorRequest {}
-export interface GetAuthnDescriptorRequestProtoType {
+export interface GetAuthnDescriptorRequestProtoMsg {
   typeUrl: "/cosmos.base.reflection.v2alpha1.GetAuthnDescriptorRequest";
   value: Uint8Array;
 }
 
 /** GetAuthnDescriptorRequest is the request used for the GetAuthnDescriptor RPC */
 export interface GetAuthnDescriptorRequestAmino {}
-export interface GetAuthnDescriptorRequestAminoType {
+export interface GetAuthnDescriptorRequestAminoMsg {
   type: "cosmos-sdk/GetAuthnDescriptorRequest";
   value: GetAuthnDescriptorRequestAmino;
 }
@@ -460,7 +460,7 @@ export interface GetAuthnDescriptorResponse {
   /** authn describes how to authenticate to the application when sending transactions */
   authn?: AuthnDescriptor;
 }
-export interface GetAuthnDescriptorResponseProtoType {
+export interface GetAuthnDescriptorResponseProtoMsg {
   typeUrl: "/cosmos.base.reflection.v2alpha1.GetAuthnDescriptorResponse";
   value: Uint8Array;
 }
@@ -470,7 +470,7 @@ export interface GetAuthnDescriptorResponseAmino {
   /** authn describes how to authenticate to the application when sending transactions */
   authn?: AuthnDescriptorAmino;
 }
-export interface GetAuthnDescriptorResponseAminoType {
+export interface GetAuthnDescriptorResponseAminoMsg {
   type: "cosmos-sdk/GetAuthnDescriptorResponse";
   value: GetAuthnDescriptorResponseAmino;
 }
@@ -482,14 +482,14 @@ export interface GetAuthnDescriptorResponseSDKType {
 
 /** GetChainDescriptorRequest is the request used for the GetChainDescriptor RPC */
 export interface GetChainDescriptorRequest {}
-export interface GetChainDescriptorRequestProtoType {
+export interface GetChainDescriptorRequestProtoMsg {
   typeUrl: "/cosmos.base.reflection.v2alpha1.GetChainDescriptorRequest";
   value: Uint8Array;
 }
 
 /** GetChainDescriptorRequest is the request used for the GetChainDescriptor RPC */
 export interface GetChainDescriptorRequestAmino {}
-export interface GetChainDescriptorRequestAminoType {
+export interface GetChainDescriptorRequestAminoMsg {
   type: "cosmos-sdk/GetChainDescriptorRequest";
   value: GetChainDescriptorRequestAmino;
 }
@@ -502,7 +502,7 @@ export interface GetChainDescriptorResponse {
   /** chain describes application chain information */
   chain?: ChainDescriptor;
 }
-export interface GetChainDescriptorResponseProtoType {
+export interface GetChainDescriptorResponseProtoMsg {
   typeUrl: "/cosmos.base.reflection.v2alpha1.GetChainDescriptorResponse";
   value: Uint8Array;
 }
@@ -512,7 +512,7 @@ export interface GetChainDescriptorResponseAmino {
   /** chain describes application chain information */
   chain?: ChainDescriptorAmino;
 }
-export interface GetChainDescriptorResponseAminoType {
+export interface GetChainDescriptorResponseAminoMsg {
   type: "cosmos-sdk/GetChainDescriptorResponse";
   value: GetChainDescriptorResponseAmino;
 }
@@ -524,14 +524,14 @@ export interface GetChainDescriptorResponseSDKType {
 
 /** GetCodecDescriptorRequest is the request used for the GetCodecDescriptor RPC */
 export interface GetCodecDescriptorRequest {}
-export interface GetCodecDescriptorRequestProtoType {
+export interface GetCodecDescriptorRequestProtoMsg {
   typeUrl: "/cosmos.base.reflection.v2alpha1.GetCodecDescriptorRequest";
   value: Uint8Array;
 }
 
 /** GetCodecDescriptorRequest is the request used for the GetCodecDescriptor RPC */
 export interface GetCodecDescriptorRequestAmino {}
-export interface GetCodecDescriptorRequestAminoType {
+export interface GetCodecDescriptorRequestAminoMsg {
   type: "cosmos-sdk/GetCodecDescriptorRequest";
   value: GetCodecDescriptorRequestAmino;
 }
@@ -544,7 +544,7 @@ export interface GetCodecDescriptorResponse {
   /** codec describes the application codec such as registered interfaces and implementations */
   codec?: CodecDescriptor;
 }
-export interface GetCodecDescriptorResponseProtoType {
+export interface GetCodecDescriptorResponseProtoMsg {
   typeUrl: "/cosmos.base.reflection.v2alpha1.GetCodecDescriptorResponse";
   value: Uint8Array;
 }
@@ -554,7 +554,7 @@ export interface GetCodecDescriptorResponseAmino {
   /** codec describes the application codec such as registered interfaces and implementations */
   codec?: CodecDescriptorAmino;
 }
-export interface GetCodecDescriptorResponseAminoType {
+export interface GetCodecDescriptorResponseAminoMsg {
   type: "cosmos-sdk/GetCodecDescriptorResponse";
   value: GetCodecDescriptorResponseAmino;
 }
@@ -566,14 +566,14 @@ export interface GetCodecDescriptorResponseSDKType {
 
 /** GetConfigurationDescriptorRequest is the request used for the GetConfigurationDescriptor RPC */
 export interface GetConfigurationDescriptorRequest {}
-export interface GetConfigurationDescriptorRequestProtoType {
+export interface GetConfigurationDescriptorRequestProtoMsg {
   typeUrl: "/cosmos.base.reflection.v2alpha1.GetConfigurationDescriptorRequest";
   value: Uint8Array;
 }
 
 /** GetConfigurationDescriptorRequest is the request used for the GetConfigurationDescriptor RPC */
 export interface GetConfigurationDescriptorRequestAmino {}
-export interface GetConfigurationDescriptorRequestAminoType {
+export interface GetConfigurationDescriptorRequestAminoMsg {
   type: "cosmos-sdk/GetConfigurationDescriptorRequest";
   value: GetConfigurationDescriptorRequestAmino;
 }
@@ -586,7 +586,7 @@ export interface GetConfigurationDescriptorResponse {
   /** config describes the application's sdk.Config */
   config?: ConfigurationDescriptor;
 }
-export interface GetConfigurationDescriptorResponseProtoType {
+export interface GetConfigurationDescriptorResponseProtoMsg {
   typeUrl: "/cosmos.base.reflection.v2alpha1.GetConfigurationDescriptorResponse";
   value: Uint8Array;
 }
@@ -596,7 +596,7 @@ export interface GetConfigurationDescriptorResponseAmino {
   /** config describes the application's sdk.Config */
   config?: ConfigurationDescriptorAmino;
 }
-export interface GetConfigurationDescriptorResponseAminoType {
+export interface GetConfigurationDescriptorResponseAminoMsg {
   type: "cosmos-sdk/GetConfigurationDescriptorResponse";
   value: GetConfigurationDescriptorResponseAmino;
 }
@@ -608,14 +608,14 @@ export interface GetConfigurationDescriptorResponseSDKType {
 
 /** GetQueryServicesDescriptorRequest is the request used for the GetQueryServicesDescriptor RPC */
 export interface GetQueryServicesDescriptorRequest {}
-export interface GetQueryServicesDescriptorRequestProtoType {
+export interface GetQueryServicesDescriptorRequestProtoMsg {
   typeUrl: "/cosmos.base.reflection.v2alpha1.GetQueryServicesDescriptorRequest";
   value: Uint8Array;
 }
 
 /** GetQueryServicesDescriptorRequest is the request used for the GetQueryServicesDescriptor RPC */
 export interface GetQueryServicesDescriptorRequestAmino {}
-export interface GetQueryServicesDescriptorRequestAminoType {
+export interface GetQueryServicesDescriptorRequestAminoMsg {
   type: "cosmos-sdk/GetQueryServicesDescriptorRequest";
   value: GetQueryServicesDescriptorRequestAmino;
 }
@@ -628,7 +628,7 @@ export interface GetQueryServicesDescriptorResponse {
   /** queries provides information on the available queryable services */
   queries?: QueryServicesDescriptor;
 }
-export interface GetQueryServicesDescriptorResponseProtoType {
+export interface GetQueryServicesDescriptorResponseProtoMsg {
   typeUrl: "/cosmos.base.reflection.v2alpha1.GetQueryServicesDescriptorResponse";
   value: Uint8Array;
 }
@@ -638,7 +638,7 @@ export interface GetQueryServicesDescriptorResponseAmino {
   /** queries provides information on the available queryable services */
   queries?: QueryServicesDescriptorAmino;
 }
-export interface GetQueryServicesDescriptorResponseAminoType {
+export interface GetQueryServicesDescriptorResponseAminoMsg {
   type: "cosmos-sdk/GetQueryServicesDescriptorResponse";
   value: GetQueryServicesDescriptorResponseAmino;
 }
@@ -650,14 +650,14 @@ export interface GetQueryServicesDescriptorResponseSDKType {
 
 /** GetTxDescriptorRequest is the request used for the GetTxDescriptor RPC */
 export interface GetTxDescriptorRequest {}
-export interface GetTxDescriptorRequestProtoType {
+export interface GetTxDescriptorRequestProtoMsg {
   typeUrl: "/cosmos.base.reflection.v2alpha1.GetTxDescriptorRequest";
   value: Uint8Array;
 }
 
 /** GetTxDescriptorRequest is the request used for the GetTxDescriptor RPC */
 export interface GetTxDescriptorRequestAmino {}
-export interface GetTxDescriptorRequestAminoType {
+export interface GetTxDescriptorRequestAminoMsg {
   type: "cosmos-sdk/GetTxDescriptorRequest";
   value: GetTxDescriptorRequestAmino;
 }
@@ -673,7 +673,7 @@ export interface GetTxDescriptorResponse {
    */
   tx?: TxDescriptor;
 }
-export interface GetTxDescriptorResponseProtoType {
+export interface GetTxDescriptorResponseProtoMsg {
   typeUrl: "/cosmos.base.reflection.v2alpha1.GetTxDescriptorResponse";
   value: Uint8Array;
 }
@@ -686,7 +686,7 @@ export interface GetTxDescriptorResponseAmino {
    */
   tx?: TxDescriptorAmino;
 }
-export interface GetTxDescriptorResponseAminoType {
+export interface GetTxDescriptorResponseAminoMsg {
   type: "cosmos-sdk/GetTxDescriptorResponse";
   value: GetTxDescriptorResponseAmino;
 }
@@ -701,7 +701,7 @@ export interface QueryServicesDescriptor {
   /** query_services is a list of cosmos-sdk QueryServiceDescriptor */
   queryServices: QueryServiceDescriptor[];
 }
-export interface QueryServicesDescriptorProtoType {
+export interface QueryServicesDescriptorProtoMsg {
   typeUrl: "/cosmos.base.reflection.v2alpha1.QueryServicesDescriptor";
   value: Uint8Array;
 }
@@ -711,7 +711,7 @@ export interface QueryServicesDescriptorAmino {
   /** query_services is a list of cosmos-sdk QueryServiceDescriptor */
   query_services: QueryServiceDescriptorAmino[];
 }
-export interface QueryServicesDescriptorAminoType {
+export interface QueryServicesDescriptorAminoMsg {
   type: "cosmos-sdk/QueryServicesDescriptor";
   value: QueryServicesDescriptorAmino;
 }
@@ -732,7 +732,7 @@ export interface QueryServiceDescriptor {
   /** methods provides a list of query service methods */
   methods: QueryMethodDescriptor[];
 }
-export interface QueryServiceDescriptorProtoType {
+export interface QueryServiceDescriptorProtoMsg {
   typeUrl: "/cosmos.base.reflection.v2alpha1.QueryServiceDescriptor";
   value: Uint8Array;
 }
@@ -748,7 +748,7 @@ export interface QueryServiceDescriptorAmino {
   /** methods provides a list of query service methods */
   methods: QueryMethodDescriptorAmino[];
 }
-export interface QueryServiceDescriptorAminoType {
+export interface QueryServiceDescriptorAminoMsg {
   type: "cosmos-sdk/QueryServiceDescriptor";
   value: QueryServiceDescriptorAmino;
 }
@@ -775,7 +775,7 @@ export interface QueryMethodDescriptor {
    */
   fullQueryPath: string;
 }
-export interface QueryMethodDescriptorProtoType {
+export interface QueryMethodDescriptorProtoMsg {
   typeUrl: "/cosmos.base.reflection.v2alpha1.QueryMethodDescriptor";
   value: Uint8Array;
 }
@@ -795,7 +795,7 @@ export interface QueryMethodDescriptorAmino {
    */
   full_query_path: string;
 }
-export interface QueryMethodDescriptorAminoType {
+export interface QueryMethodDescriptorAminoMsg {
   type: "cosmos-sdk/QueryMethodDescriptor";
   value: QueryMethodDescriptorAmino;
 }
@@ -822,6 +822,9 @@ function createBaseAppDescriptor(): AppDescriptor {
 }
 
 export const AppDescriptor = {
+  typeUrl: "/cosmos.base.reflection.v2alpha1.AppDescriptor",
+  aminoType: "cosmos-sdk/AppDescriptor",
+
   encode(message: AppDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.authn !== undefined) {
       AuthnDescriptor.encode(message.authn, writer.uint32(10).fork()).ldelim();
@@ -967,6 +970,32 @@ export const AppDescriptor = {
     obj.query_services = message.queryServices ? QueryServicesDescriptor.toAmino(message.queryServices) : undefined;
     obj.tx = message.tx ? TxDescriptor.toAmino(message.tx) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: AppDescriptorAminoMsg): AppDescriptor {
+    return AppDescriptor.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: AppDescriptor): AppDescriptorAminoMsg {
+    return {
+      type: "cosmos-sdk/AppDescriptor",
+      value: AppDescriptor.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: AppDescriptorProtoMsg): AppDescriptor {
+    return AppDescriptor.decode(message.value);
+  },
+
+  toProto(message: AppDescriptor): Uint8Array {
+    return AppDescriptor.encode(message).finish();
+  },
+
+  toProtoMsg(message: AppDescriptor): AppDescriptorProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.reflection.v2alpha1.AppDescriptor",
+      value: AppDescriptor.encode(message).finish()
+    };
   }
 
 };
@@ -979,6 +1008,9 @@ function createBaseTxDescriptor(): TxDescriptor {
 }
 
 export const TxDescriptor = {
+  typeUrl: "/cosmos.base.reflection.v2alpha1.TxDescriptor",
+  aminoType: "cosmos-sdk/TxDescriptor",
+
   encode(message: TxDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.fullname !== "") {
       writer.uint32(10).string(message.fullname);
@@ -1082,6 +1114,32 @@ export const TxDescriptor = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: TxDescriptorAminoMsg): TxDescriptor {
+    return TxDescriptor.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: TxDescriptor): TxDescriptorAminoMsg {
+    return {
+      type: "cosmos-sdk/TxDescriptor",
+      value: TxDescriptor.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: TxDescriptorProtoMsg): TxDescriptor {
+    return TxDescriptor.decode(message.value);
+  },
+
+  toProto(message: TxDescriptor): Uint8Array {
+    return TxDescriptor.encode(message).finish();
+  },
+
+  toProtoMsg(message: TxDescriptor): TxDescriptorProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.reflection.v2alpha1.TxDescriptor",
+      value: TxDescriptor.encode(message).finish()
+    };
   }
 
 };
@@ -1093,6 +1151,9 @@ function createBaseAuthnDescriptor(): AuthnDescriptor {
 }
 
 export const AuthnDescriptor = {
+  typeUrl: "/cosmos.base.reflection.v2alpha1.AuthnDescriptor",
+  aminoType: "cosmos-sdk/AuthnDescriptor",
+
   encode(message: AuthnDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.signModes) {
       SigningModeDescriptor.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1181,6 +1242,32 @@ export const AuthnDescriptor = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: AuthnDescriptorAminoMsg): AuthnDescriptor {
+    return AuthnDescriptor.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: AuthnDescriptor): AuthnDescriptorAminoMsg {
+    return {
+      type: "cosmos-sdk/AuthnDescriptor",
+      value: AuthnDescriptor.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: AuthnDescriptorProtoMsg): AuthnDescriptor {
+    return AuthnDescriptor.decode(message.value);
+  },
+
+  toProto(message: AuthnDescriptor): Uint8Array {
+    return AuthnDescriptor.encode(message).finish();
+  },
+
+  toProtoMsg(message: AuthnDescriptor): AuthnDescriptorProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.reflection.v2alpha1.AuthnDescriptor",
+      value: AuthnDescriptor.encode(message).finish()
+    };
   }
 
 };
@@ -1194,6 +1281,9 @@ function createBaseSigningModeDescriptor(): SigningModeDescriptor {
 }
 
 export const SigningModeDescriptor = {
+  typeUrl: "/cosmos.base.reflection.v2alpha1.SigningModeDescriptor",
+  aminoType: "cosmos-sdk/SigningModeDescriptor",
+
   encode(message: SigningModeDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -1294,6 +1384,32 @@ export const SigningModeDescriptor = {
     obj.number = message.number;
     obj.authn_info_provider_method_fullname = message.authnInfoProviderMethodFullname;
     return obj;
+  },
+
+  fromAminoMsg(object: SigningModeDescriptorAminoMsg): SigningModeDescriptor {
+    return SigningModeDescriptor.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: SigningModeDescriptor): SigningModeDescriptorAminoMsg {
+    return {
+      type: "cosmos-sdk/SigningModeDescriptor",
+      value: SigningModeDescriptor.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: SigningModeDescriptorProtoMsg): SigningModeDescriptor {
+    return SigningModeDescriptor.decode(message.value);
+  },
+
+  toProto(message: SigningModeDescriptor): Uint8Array {
+    return SigningModeDescriptor.encode(message).finish();
+  },
+
+  toProtoMsg(message: SigningModeDescriptor): SigningModeDescriptorProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.reflection.v2alpha1.SigningModeDescriptor",
+      value: SigningModeDescriptor.encode(message).finish()
+    };
   }
 
 };
@@ -1305,6 +1421,9 @@ function createBaseChainDescriptor(): ChainDescriptor {
 }
 
 export const ChainDescriptor = {
+  typeUrl: "/cosmos.base.reflection.v2alpha1.ChainDescriptor",
+  aminoType: "cosmos-sdk/ChainDescriptor",
+
   encode(message: ChainDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.id !== "") {
       writer.uint32(10).string(message.id);
@@ -1375,6 +1494,32 @@ export const ChainDescriptor = {
     const obj: any = {};
     obj.id = message.id;
     return obj;
+  },
+
+  fromAminoMsg(object: ChainDescriptorAminoMsg): ChainDescriptor {
+    return ChainDescriptor.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ChainDescriptor): ChainDescriptorAminoMsg {
+    return {
+      type: "cosmos-sdk/ChainDescriptor",
+      value: ChainDescriptor.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ChainDescriptorProtoMsg): ChainDescriptor {
+    return ChainDescriptor.decode(message.value);
+  },
+
+  toProto(message: ChainDescriptor): Uint8Array {
+    return ChainDescriptor.encode(message).finish();
+  },
+
+  toProtoMsg(message: ChainDescriptor): ChainDescriptorProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.reflection.v2alpha1.ChainDescriptor",
+      value: ChainDescriptor.encode(message).finish()
+    };
   }
 
 };
@@ -1386,6 +1531,9 @@ function createBaseCodecDescriptor(): CodecDescriptor {
 }
 
 export const CodecDescriptor = {
+  typeUrl: "/cosmos.base.reflection.v2alpha1.CodecDescriptor",
+  aminoType: "cosmos-sdk/CodecDescriptor",
+
   encode(message: CodecDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.interfaces) {
       InterfaceDescriptor.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1474,6 +1622,32 @@ export const CodecDescriptor = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: CodecDescriptorAminoMsg): CodecDescriptor {
+    return CodecDescriptor.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: CodecDescriptor): CodecDescriptorAminoMsg {
+    return {
+      type: "cosmos-sdk/CodecDescriptor",
+      value: CodecDescriptor.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: CodecDescriptorProtoMsg): CodecDescriptor {
+    return CodecDescriptor.decode(message.value);
+  },
+
+  toProto(message: CodecDescriptor): Uint8Array {
+    return CodecDescriptor.encode(message).finish();
+  },
+
+  toProtoMsg(message: CodecDescriptor): CodecDescriptorProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.reflection.v2alpha1.CodecDescriptor",
+      value: CodecDescriptor.encode(message).finish()
+    };
   }
 
 };
@@ -1487,6 +1661,9 @@ function createBaseInterfaceDescriptor(): InterfaceDescriptor {
 }
 
 export const InterfaceDescriptor = {
+  typeUrl: "/cosmos.base.reflection.v2alpha1.InterfaceDescriptor",
+  aminoType: "cosmos-sdk/InterfaceDescriptor",
+
   encode(message: InterfaceDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.fullname !== "") {
       writer.uint32(10).string(message.fullname);
@@ -1620,6 +1797,32 @@ export const InterfaceDescriptor = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: InterfaceDescriptorAminoMsg): InterfaceDescriptor {
+    return InterfaceDescriptor.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: InterfaceDescriptor): InterfaceDescriptorAminoMsg {
+    return {
+      type: "cosmos-sdk/InterfaceDescriptor",
+      value: InterfaceDescriptor.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: InterfaceDescriptorProtoMsg): InterfaceDescriptor {
+    return InterfaceDescriptor.decode(message.value);
+  },
+
+  toProto(message: InterfaceDescriptor): Uint8Array {
+    return InterfaceDescriptor.encode(message).finish();
+  },
+
+  toProtoMsg(message: InterfaceDescriptor): InterfaceDescriptorProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.reflection.v2alpha1.InterfaceDescriptor",
+      value: InterfaceDescriptor.encode(message).finish()
+    };
   }
 
 };
@@ -1632,6 +1835,9 @@ function createBaseInterfaceImplementerDescriptor(): InterfaceImplementerDescrip
 }
 
 export const InterfaceImplementerDescriptor = {
+  typeUrl: "/cosmos.base.reflection.v2alpha1.InterfaceImplementerDescriptor",
+  aminoType: "cosmos-sdk/InterfaceImplementerDescriptor",
+
   encode(message: InterfaceImplementerDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.fullname !== "") {
       writer.uint32(10).string(message.fullname);
@@ -1717,6 +1923,32 @@ export const InterfaceImplementerDescriptor = {
     obj.fullname = message.fullname;
     obj.type_url = message.typeUrl;
     return obj;
+  },
+
+  fromAminoMsg(object: InterfaceImplementerDescriptorAminoMsg): InterfaceImplementerDescriptor {
+    return InterfaceImplementerDescriptor.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: InterfaceImplementerDescriptor): InterfaceImplementerDescriptorAminoMsg {
+    return {
+      type: "cosmos-sdk/InterfaceImplementerDescriptor",
+      value: InterfaceImplementerDescriptor.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: InterfaceImplementerDescriptorProtoMsg): InterfaceImplementerDescriptor {
+    return InterfaceImplementerDescriptor.decode(message.value);
+  },
+
+  toProto(message: InterfaceImplementerDescriptor): Uint8Array {
+    return InterfaceImplementerDescriptor.encode(message).finish();
+  },
+
+  toProtoMsg(message: InterfaceImplementerDescriptor): InterfaceImplementerDescriptorProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.reflection.v2alpha1.InterfaceImplementerDescriptor",
+      value: InterfaceImplementerDescriptor.encode(message).finish()
+    };
   }
 
 };
@@ -1729,6 +1961,9 @@ function createBaseInterfaceAcceptingMessageDescriptor(): InterfaceAcceptingMess
 }
 
 export const InterfaceAcceptingMessageDescriptor = {
+  typeUrl: "/cosmos.base.reflection.v2alpha1.InterfaceAcceptingMessageDescriptor",
+  aminoType: "cosmos-sdk/InterfaceAcceptingMessageDescriptor",
+
   encode(message: InterfaceAcceptingMessageDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.fullname !== "") {
       writer.uint32(10).string(message.fullname);
@@ -1832,6 +2067,32 @@ export const InterfaceAcceptingMessageDescriptor = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: InterfaceAcceptingMessageDescriptorAminoMsg): InterfaceAcceptingMessageDescriptor {
+    return InterfaceAcceptingMessageDescriptor.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: InterfaceAcceptingMessageDescriptor): InterfaceAcceptingMessageDescriptorAminoMsg {
+    return {
+      type: "cosmos-sdk/InterfaceAcceptingMessageDescriptor",
+      value: InterfaceAcceptingMessageDescriptor.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: InterfaceAcceptingMessageDescriptorProtoMsg): InterfaceAcceptingMessageDescriptor {
+    return InterfaceAcceptingMessageDescriptor.decode(message.value);
+  },
+
+  toProto(message: InterfaceAcceptingMessageDescriptor): Uint8Array {
+    return InterfaceAcceptingMessageDescriptor.encode(message).finish();
+  },
+
+  toProtoMsg(message: InterfaceAcceptingMessageDescriptor): InterfaceAcceptingMessageDescriptorProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.reflection.v2alpha1.InterfaceAcceptingMessageDescriptor",
+      value: InterfaceAcceptingMessageDescriptor.encode(message).finish()
+    };
   }
 
 };
@@ -1843,6 +2104,9 @@ function createBaseConfigurationDescriptor(): ConfigurationDescriptor {
 }
 
 export const ConfigurationDescriptor = {
+  typeUrl: "/cosmos.base.reflection.v2alpha1.ConfigurationDescriptor",
+  aminoType: "cosmos-sdk/ConfigurationDescriptor",
+
   encode(message: ConfigurationDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.bech32AccountAddressPrefix !== "") {
       writer.uint32(10).string(message.bech32AccountAddressPrefix);
@@ -1913,6 +2177,32 @@ export const ConfigurationDescriptor = {
     const obj: any = {};
     obj.bech32_account_address_prefix = message.bech32AccountAddressPrefix;
     return obj;
+  },
+
+  fromAminoMsg(object: ConfigurationDescriptorAminoMsg): ConfigurationDescriptor {
+    return ConfigurationDescriptor.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ConfigurationDescriptor): ConfigurationDescriptorAminoMsg {
+    return {
+      type: "cosmos-sdk/ConfigurationDescriptor",
+      value: ConfigurationDescriptor.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ConfigurationDescriptorProtoMsg): ConfigurationDescriptor {
+    return ConfigurationDescriptor.decode(message.value);
+  },
+
+  toProto(message: ConfigurationDescriptor): Uint8Array {
+    return ConfigurationDescriptor.encode(message).finish();
+  },
+
+  toProtoMsg(message: ConfigurationDescriptor): ConfigurationDescriptorProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.reflection.v2alpha1.ConfigurationDescriptor",
+      value: ConfigurationDescriptor.encode(message).finish()
+    };
   }
 
 };
@@ -1924,6 +2214,9 @@ function createBaseMsgDescriptor(): MsgDescriptor {
 }
 
 export const MsgDescriptor = {
+  typeUrl: "/cosmos.base.reflection.v2alpha1.MsgDescriptor",
+  aminoType: "cosmos-sdk/MsgDescriptor",
+
   encode(message: MsgDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.msgTypeUrl !== "") {
       writer.uint32(10).string(message.msgTypeUrl);
@@ -1994,6 +2287,32 @@ export const MsgDescriptor = {
     const obj: any = {};
     obj.msg_type_url = message.msgTypeUrl;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgDescriptorAminoMsg): MsgDescriptor {
+    return MsgDescriptor.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgDescriptor): MsgDescriptorAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgDescriptor",
+      value: MsgDescriptor.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgDescriptorProtoMsg): MsgDescriptor {
+    return MsgDescriptor.decode(message.value);
+  },
+
+  toProto(message: MsgDescriptor): Uint8Array {
+    return MsgDescriptor.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgDescriptor): MsgDescriptorProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.reflection.v2alpha1.MsgDescriptor",
+      value: MsgDescriptor.encode(message).finish()
+    };
   }
 
 };
@@ -2003,6 +2322,9 @@ function createBaseGetAuthnDescriptorRequest(): GetAuthnDescriptorRequest {
 }
 
 export const GetAuthnDescriptorRequest = {
+  typeUrl: "/cosmos.base.reflection.v2alpha1.GetAuthnDescriptorRequest",
+  aminoType: "cosmos-sdk/GetAuthnDescriptorRequest",
+
   encode(_: GetAuthnDescriptorRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -2055,6 +2377,32 @@ export const GetAuthnDescriptorRequest = {
   toAmino(_: GetAuthnDescriptorRequest): GetAuthnDescriptorRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: GetAuthnDescriptorRequestAminoMsg): GetAuthnDescriptorRequest {
+    return GetAuthnDescriptorRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GetAuthnDescriptorRequest): GetAuthnDescriptorRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/GetAuthnDescriptorRequest",
+      value: GetAuthnDescriptorRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GetAuthnDescriptorRequestProtoMsg): GetAuthnDescriptorRequest {
+    return GetAuthnDescriptorRequest.decode(message.value);
+  },
+
+  toProto(message: GetAuthnDescriptorRequest): Uint8Array {
+    return GetAuthnDescriptorRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: GetAuthnDescriptorRequest): GetAuthnDescriptorRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.reflection.v2alpha1.GetAuthnDescriptorRequest",
+      value: GetAuthnDescriptorRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2066,6 +2414,9 @@ function createBaseGetAuthnDescriptorResponse(): GetAuthnDescriptorResponse {
 }
 
 export const GetAuthnDescriptorResponse = {
+  typeUrl: "/cosmos.base.reflection.v2alpha1.GetAuthnDescriptorResponse",
+  aminoType: "cosmos-sdk/GetAuthnDescriptorResponse",
+
   encode(message: GetAuthnDescriptorResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.authn !== undefined) {
       AuthnDescriptor.encode(message.authn, writer.uint32(10).fork()).ldelim();
@@ -2136,6 +2487,32 @@ export const GetAuthnDescriptorResponse = {
     const obj: any = {};
     obj.authn = message.authn ? AuthnDescriptor.toAmino(message.authn) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GetAuthnDescriptorResponseAminoMsg): GetAuthnDescriptorResponse {
+    return GetAuthnDescriptorResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GetAuthnDescriptorResponse): GetAuthnDescriptorResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/GetAuthnDescriptorResponse",
+      value: GetAuthnDescriptorResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GetAuthnDescriptorResponseProtoMsg): GetAuthnDescriptorResponse {
+    return GetAuthnDescriptorResponse.decode(message.value);
+  },
+
+  toProto(message: GetAuthnDescriptorResponse): Uint8Array {
+    return GetAuthnDescriptorResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: GetAuthnDescriptorResponse): GetAuthnDescriptorResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.reflection.v2alpha1.GetAuthnDescriptorResponse",
+      value: GetAuthnDescriptorResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2145,6 +2522,9 @@ function createBaseGetChainDescriptorRequest(): GetChainDescriptorRequest {
 }
 
 export const GetChainDescriptorRequest = {
+  typeUrl: "/cosmos.base.reflection.v2alpha1.GetChainDescriptorRequest",
+  aminoType: "cosmos-sdk/GetChainDescriptorRequest",
+
   encode(_: GetChainDescriptorRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -2197,6 +2577,32 @@ export const GetChainDescriptorRequest = {
   toAmino(_: GetChainDescriptorRequest): GetChainDescriptorRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: GetChainDescriptorRequestAminoMsg): GetChainDescriptorRequest {
+    return GetChainDescriptorRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GetChainDescriptorRequest): GetChainDescriptorRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/GetChainDescriptorRequest",
+      value: GetChainDescriptorRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GetChainDescriptorRequestProtoMsg): GetChainDescriptorRequest {
+    return GetChainDescriptorRequest.decode(message.value);
+  },
+
+  toProto(message: GetChainDescriptorRequest): Uint8Array {
+    return GetChainDescriptorRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: GetChainDescriptorRequest): GetChainDescriptorRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.reflection.v2alpha1.GetChainDescriptorRequest",
+      value: GetChainDescriptorRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2208,6 +2614,9 @@ function createBaseGetChainDescriptorResponse(): GetChainDescriptorResponse {
 }
 
 export const GetChainDescriptorResponse = {
+  typeUrl: "/cosmos.base.reflection.v2alpha1.GetChainDescriptorResponse",
+  aminoType: "cosmos-sdk/GetChainDescriptorResponse",
+
   encode(message: GetChainDescriptorResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.chain !== undefined) {
       ChainDescriptor.encode(message.chain, writer.uint32(10).fork()).ldelim();
@@ -2278,6 +2687,32 @@ export const GetChainDescriptorResponse = {
     const obj: any = {};
     obj.chain = message.chain ? ChainDescriptor.toAmino(message.chain) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GetChainDescriptorResponseAminoMsg): GetChainDescriptorResponse {
+    return GetChainDescriptorResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GetChainDescriptorResponse): GetChainDescriptorResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/GetChainDescriptorResponse",
+      value: GetChainDescriptorResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GetChainDescriptorResponseProtoMsg): GetChainDescriptorResponse {
+    return GetChainDescriptorResponse.decode(message.value);
+  },
+
+  toProto(message: GetChainDescriptorResponse): Uint8Array {
+    return GetChainDescriptorResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: GetChainDescriptorResponse): GetChainDescriptorResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.reflection.v2alpha1.GetChainDescriptorResponse",
+      value: GetChainDescriptorResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2287,6 +2722,9 @@ function createBaseGetCodecDescriptorRequest(): GetCodecDescriptorRequest {
 }
 
 export const GetCodecDescriptorRequest = {
+  typeUrl: "/cosmos.base.reflection.v2alpha1.GetCodecDescriptorRequest",
+  aminoType: "cosmos-sdk/GetCodecDescriptorRequest",
+
   encode(_: GetCodecDescriptorRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -2339,6 +2777,32 @@ export const GetCodecDescriptorRequest = {
   toAmino(_: GetCodecDescriptorRequest): GetCodecDescriptorRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: GetCodecDescriptorRequestAminoMsg): GetCodecDescriptorRequest {
+    return GetCodecDescriptorRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GetCodecDescriptorRequest): GetCodecDescriptorRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/GetCodecDescriptorRequest",
+      value: GetCodecDescriptorRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GetCodecDescriptorRequestProtoMsg): GetCodecDescriptorRequest {
+    return GetCodecDescriptorRequest.decode(message.value);
+  },
+
+  toProto(message: GetCodecDescriptorRequest): Uint8Array {
+    return GetCodecDescriptorRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: GetCodecDescriptorRequest): GetCodecDescriptorRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.reflection.v2alpha1.GetCodecDescriptorRequest",
+      value: GetCodecDescriptorRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2350,6 +2814,9 @@ function createBaseGetCodecDescriptorResponse(): GetCodecDescriptorResponse {
 }
 
 export const GetCodecDescriptorResponse = {
+  typeUrl: "/cosmos.base.reflection.v2alpha1.GetCodecDescriptorResponse",
+  aminoType: "cosmos-sdk/GetCodecDescriptorResponse",
+
   encode(message: GetCodecDescriptorResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.codec !== undefined) {
       CodecDescriptor.encode(message.codec, writer.uint32(10).fork()).ldelim();
@@ -2420,6 +2887,32 @@ export const GetCodecDescriptorResponse = {
     const obj: any = {};
     obj.codec = message.codec ? CodecDescriptor.toAmino(message.codec) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GetCodecDescriptorResponseAminoMsg): GetCodecDescriptorResponse {
+    return GetCodecDescriptorResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GetCodecDescriptorResponse): GetCodecDescriptorResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/GetCodecDescriptorResponse",
+      value: GetCodecDescriptorResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GetCodecDescriptorResponseProtoMsg): GetCodecDescriptorResponse {
+    return GetCodecDescriptorResponse.decode(message.value);
+  },
+
+  toProto(message: GetCodecDescriptorResponse): Uint8Array {
+    return GetCodecDescriptorResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: GetCodecDescriptorResponse): GetCodecDescriptorResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.reflection.v2alpha1.GetCodecDescriptorResponse",
+      value: GetCodecDescriptorResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2429,6 +2922,9 @@ function createBaseGetConfigurationDescriptorRequest(): GetConfigurationDescript
 }
 
 export const GetConfigurationDescriptorRequest = {
+  typeUrl: "/cosmos.base.reflection.v2alpha1.GetConfigurationDescriptorRequest",
+  aminoType: "cosmos-sdk/GetConfigurationDescriptorRequest",
+
   encode(_: GetConfigurationDescriptorRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -2481,6 +2977,32 @@ export const GetConfigurationDescriptorRequest = {
   toAmino(_: GetConfigurationDescriptorRequest): GetConfigurationDescriptorRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: GetConfigurationDescriptorRequestAminoMsg): GetConfigurationDescriptorRequest {
+    return GetConfigurationDescriptorRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GetConfigurationDescriptorRequest): GetConfigurationDescriptorRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/GetConfigurationDescriptorRequest",
+      value: GetConfigurationDescriptorRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GetConfigurationDescriptorRequestProtoMsg): GetConfigurationDescriptorRequest {
+    return GetConfigurationDescriptorRequest.decode(message.value);
+  },
+
+  toProto(message: GetConfigurationDescriptorRequest): Uint8Array {
+    return GetConfigurationDescriptorRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: GetConfigurationDescriptorRequest): GetConfigurationDescriptorRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.reflection.v2alpha1.GetConfigurationDescriptorRequest",
+      value: GetConfigurationDescriptorRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2492,6 +3014,9 @@ function createBaseGetConfigurationDescriptorResponse(): GetConfigurationDescrip
 }
 
 export const GetConfigurationDescriptorResponse = {
+  typeUrl: "/cosmos.base.reflection.v2alpha1.GetConfigurationDescriptorResponse",
+  aminoType: "cosmos-sdk/GetConfigurationDescriptorResponse",
+
   encode(message: GetConfigurationDescriptorResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.config !== undefined) {
       ConfigurationDescriptor.encode(message.config, writer.uint32(10).fork()).ldelim();
@@ -2562,6 +3087,32 @@ export const GetConfigurationDescriptorResponse = {
     const obj: any = {};
     obj.config = message.config ? ConfigurationDescriptor.toAmino(message.config) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GetConfigurationDescriptorResponseAminoMsg): GetConfigurationDescriptorResponse {
+    return GetConfigurationDescriptorResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GetConfigurationDescriptorResponse): GetConfigurationDescriptorResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/GetConfigurationDescriptorResponse",
+      value: GetConfigurationDescriptorResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GetConfigurationDescriptorResponseProtoMsg): GetConfigurationDescriptorResponse {
+    return GetConfigurationDescriptorResponse.decode(message.value);
+  },
+
+  toProto(message: GetConfigurationDescriptorResponse): Uint8Array {
+    return GetConfigurationDescriptorResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: GetConfigurationDescriptorResponse): GetConfigurationDescriptorResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.reflection.v2alpha1.GetConfigurationDescriptorResponse",
+      value: GetConfigurationDescriptorResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2571,6 +3122,9 @@ function createBaseGetQueryServicesDescriptorRequest(): GetQueryServicesDescript
 }
 
 export const GetQueryServicesDescriptorRequest = {
+  typeUrl: "/cosmos.base.reflection.v2alpha1.GetQueryServicesDescriptorRequest",
+  aminoType: "cosmos-sdk/GetQueryServicesDescriptorRequest",
+
   encode(_: GetQueryServicesDescriptorRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -2623,6 +3177,32 @@ export const GetQueryServicesDescriptorRequest = {
   toAmino(_: GetQueryServicesDescriptorRequest): GetQueryServicesDescriptorRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: GetQueryServicesDescriptorRequestAminoMsg): GetQueryServicesDescriptorRequest {
+    return GetQueryServicesDescriptorRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GetQueryServicesDescriptorRequest): GetQueryServicesDescriptorRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/GetQueryServicesDescriptorRequest",
+      value: GetQueryServicesDescriptorRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GetQueryServicesDescriptorRequestProtoMsg): GetQueryServicesDescriptorRequest {
+    return GetQueryServicesDescriptorRequest.decode(message.value);
+  },
+
+  toProto(message: GetQueryServicesDescriptorRequest): Uint8Array {
+    return GetQueryServicesDescriptorRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: GetQueryServicesDescriptorRequest): GetQueryServicesDescriptorRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.reflection.v2alpha1.GetQueryServicesDescriptorRequest",
+      value: GetQueryServicesDescriptorRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2634,6 +3214,9 @@ function createBaseGetQueryServicesDescriptorResponse(): GetQueryServicesDescrip
 }
 
 export const GetQueryServicesDescriptorResponse = {
+  typeUrl: "/cosmos.base.reflection.v2alpha1.GetQueryServicesDescriptorResponse",
+  aminoType: "cosmos-sdk/GetQueryServicesDescriptorResponse",
+
   encode(message: GetQueryServicesDescriptorResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.queries !== undefined) {
       QueryServicesDescriptor.encode(message.queries, writer.uint32(10).fork()).ldelim();
@@ -2704,6 +3287,32 @@ export const GetQueryServicesDescriptorResponse = {
     const obj: any = {};
     obj.queries = message.queries ? QueryServicesDescriptor.toAmino(message.queries) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GetQueryServicesDescriptorResponseAminoMsg): GetQueryServicesDescriptorResponse {
+    return GetQueryServicesDescriptorResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GetQueryServicesDescriptorResponse): GetQueryServicesDescriptorResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/GetQueryServicesDescriptorResponse",
+      value: GetQueryServicesDescriptorResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GetQueryServicesDescriptorResponseProtoMsg): GetQueryServicesDescriptorResponse {
+    return GetQueryServicesDescriptorResponse.decode(message.value);
+  },
+
+  toProto(message: GetQueryServicesDescriptorResponse): Uint8Array {
+    return GetQueryServicesDescriptorResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: GetQueryServicesDescriptorResponse): GetQueryServicesDescriptorResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.reflection.v2alpha1.GetQueryServicesDescriptorResponse",
+      value: GetQueryServicesDescriptorResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2713,6 +3322,9 @@ function createBaseGetTxDescriptorRequest(): GetTxDescriptorRequest {
 }
 
 export const GetTxDescriptorRequest = {
+  typeUrl: "/cosmos.base.reflection.v2alpha1.GetTxDescriptorRequest",
+  aminoType: "cosmos-sdk/GetTxDescriptorRequest",
+
   encode(_: GetTxDescriptorRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -2765,6 +3377,32 @@ export const GetTxDescriptorRequest = {
   toAmino(_: GetTxDescriptorRequest): GetTxDescriptorRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: GetTxDescriptorRequestAminoMsg): GetTxDescriptorRequest {
+    return GetTxDescriptorRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GetTxDescriptorRequest): GetTxDescriptorRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/GetTxDescriptorRequest",
+      value: GetTxDescriptorRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GetTxDescriptorRequestProtoMsg): GetTxDescriptorRequest {
+    return GetTxDescriptorRequest.decode(message.value);
+  },
+
+  toProto(message: GetTxDescriptorRequest): Uint8Array {
+    return GetTxDescriptorRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: GetTxDescriptorRequest): GetTxDescriptorRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.reflection.v2alpha1.GetTxDescriptorRequest",
+      value: GetTxDescriptorRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2776,6 +3414,9 @@ function createBaseGetTxDescriptorResponse(): GetTxDescriptorResponse {
 }
 
 export const GetTxDescriptorResponse = {
+  typeUrl: "/cosmos.base.reflection.v2alpha1.GetTxDescriptorResponse",
+  aminoType: "cosmos-sdk/GetTxDescriptorResponse",
+
   encode(message: GetTxDescriptorResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.tx !== undefined) {
       TxDescriptor.encode(message.tx, writer.uint32(10).fork()).ldelim();
@@ -2846,6 +3487,32 @@ export const GetTxDescriptorResponse = {
     const obj: any = {};
     obj.tx = message.tx ? TxDescriptor.toAmino(message.tx) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GetTxDescriptorResponseAminoMsg): GetTxDescriptorResponse {
+    return GetTxDescriptorResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GetTxDescriptorResponse): GetTxDescriptorResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/GetTxDescriptorResponse",
+      value: GetTxDescriptorResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GetTxDescriptorResponseProtoMsg): GetTxDescriptorResponse {
+    return GetTxDescriptorResponse.decode(message.value);
+  },
+
+  toProto(message: GetTxDescriptorResponse): Uint8Array {
+    return GetTxDescriptorResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: GetTxDescriptorResponse): GetTxDescriptorResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.reflection.v2alpha1.GetTxDescriptorResponse",
+      value: GetTxDescriptorResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2857,6 +3524,9 @@ function createBaseQueryServicesDescriptor(): QueryServicesDescriptor {
 }
 
 export const QueryServicesDescriptor = {
+  typeUrl: "/cosmos.base.reflection.v2alpha1.QueryServicesDescriptor",
+  aminoType: "cosmos-sdk/QueryServicesDescriptor",
+
   encode(message: QueryServicesDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.queryServices) {
       QueryServiceDescriptor.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -2945,6 +3615,32 @@ export const QueryServicesDescriptor = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: QueryServicesDescriptorAminoMsg): QueryServicesDescriptor {
+    return QueryServicesDescriptor.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryServicesDescriptor): QueryServicesDescriptorAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryServicesDescriptor",
+      value: QueryServicesDescriptor.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryServicesDescriptorProtoMsg): QueryServicesDescriptor {
+    return QueryServicesDescriptor.decode(message.value);
+  },
+
+  toProto(message: QueryServicesDescriptor): Uint8Array {
+    return QueryServicesDescriptor.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryServicesDescriptor): QueryServicesDescriptorProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.reflection.v2alpha1.QueryServicesDescriptor",
+      value: QueryServicesDescriptor.encode(message).finish()
+    };
   }
 
 };
@@ -2958,6 +3654,9 @@ function createBaseQueryServiceDescriptor(): QueryServiceDescriptor {
 }
 
 export const QueryServiceDescriptor = {
+  typeUrl: "/cosmos.base.reflection.v2alpha1.QueryServiceDescriptor",
+  aminoType: "cosmos-sdk/QueryServiceDescriptor",
+
   encode(message: QueryServiceDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.fullname !== "") {
       writer.uint32(10).string(message.fullname);
@@ -3076,6 +3775,32 @@ export const QueryServiceDescriptor = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: QueryServiceDescriptorAminoMsg): QueryServiceDescriptor {
+    return QueryServiceDescriptor.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryServiceDescriptor): QueryServiceDescriptorAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryServiceDescriptor",
+      value: QueryServiceDescriptor.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryServiceDescriptorProtoMsg): QueryServiceDescriptor {
+    return QueryServiceDescriptor.decode(message.value);
+  },
+
+  toProto(message: QueryServiceDescriptor): Uint8Array {
+    return QueryServiceDescriptor.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryServiceDescriptor): QueryServiceDescriptorProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.reflection.v2alpha1.QueryServiceDescriptor",
+      value: QueryServiceDescriptor.encode(message).finish()
+    };
   }
 
 };
@@ -3088,6 +3813,9 @@ function createBaseQueryMethodDescriptor(): QueryMethodDescriptor {
 }
 
 export const QueryMethodDescriptor = {
+  typeUrl: "/cosmos.base.reflection.v2alpha1.QueryMethodDescriptor",
+  aminoType: "cosmos-sdk/QueryMethodDescriptor",
+
   encode(message: QueryMethodDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -3173,6 +3901,32 @@ export const QueryMethodDescriptor = {
     obj.name = message.name;
     obj.full_query_path = message.fullQueryPath;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryMethodDescriptorAminoMsg): QueryMethodDescriptor {
+    return QueryMethodDescriptor.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryMethodDescriptor): QueryMethodDescriptorAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryMethodDescriptor",
+      value: QueryMethodDescriptor.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryMethodDescriptorProtoMsg): QueryMethodDescriptor {
+    return QueryMethodDescriptor.decode(message.value);
+  },
+
+  toProto(message: QueryMethodDescriptor): Uint8Array {
+    return QueryMethodDescriptor.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryMethodDescriptor): QueryMethodDescriptorProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.reflection.v2alpha1.QueryMethodDescriptor",
+      value: QueryMethodDescriptor.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/base/snapshots/v1beta1/snapshot.ts b/__fixtures__/outputv2/cosmos/base/snapshots/v1beta1/snapshot.ts
index c9e14ba04..06d86ec35 100644
--- a/__fixtures__/outputv2/cosmos/base/snapshots/v1beta1/snapshot.ts
+++ b/__fixtures__/outputv2/cosmos/base/snapshots/v1beta1/snapshot.ts
@@ -10,7 +10,7 @@ export interface Snapshot {
   hash: Uint8Array;
   metadata?: Metadata;
 }
-export interface SnapshotProtoType {
+export interface SnapshotProtoMsg {
   typeUrl: "/cosmos.base.snapshots.v1beta1.Snapshot";
   value: Uint8Array;
 }
@@ -23,7 +23,7 @@ export interface SnapshotAmino {
   hash: Uint8Array;
   metadata?: MetadataAmino;
 }
-export interface SnapshotAminoType {
+export interface SnapshotAminoMsg {
   type: "cosmos-sdk/Snapshot";
   value: SnapshotAmino;
 }
@@ -42,7 +42,7 @@ export interface Metadata {
   /** SHA-256 chunk hashes */
   chunkHashes: Uint8Array[];
 }
-export interface MetadataProtoType {
+export interface MetadataProtoMsg {
   typeUrl: "/cosmos.base.snapshots.v1beta1.Metadata";
   value: Uint8Array;
 }
@@ -52,7 +52,7 @@ export interface MetadataAmino {
   /** SHA-256 chunk hashes */
   chunk_hashes: Uint8Array[];
 }
-export interface MetadataAminoType {
+export interface MetadataAminoMsg {
   type: "cosmos-sdk/Metadata";
   value: MetadataAmino;
 }
@@ -71,7 +71,7 @@ export interface SnapshotItem {
   kv?: SnapshotKVItem;
   schema?: SnapshotSchema;
 }
-export interface SnapshotItemProtoType {
+export interface SnapshotItemProtoMsg {
   typeUrl: "/cosmos.base.snapshots.v1beta1.SnapshotItem";
   value: Uint8Array;
 }
@@ -85,7 +85,7 @@ export interface SnapshotItemAmino {
   kv?: SnapshotKVItemAmino;
   schema?: SnapshotSchemaAmino;
 }
-export interface SnapshotItemAminoType {
+export interface SnapshotItemAminoMsg {
   type: "cosmos-sdk/SnapshotItem";
   value: SnapshotItemAmino;
 }
@@ -104,7 +104,7 @@ export interface SnapshotItemSDKType {
 export interface SnapshotStoreItem {
   name: string;
 }
-export interface SnapshotStoreItemProtoType {
+export interface SnapshotStoreItemProtoMsg {
   typeUrl: "/cosmos.base.snapshots.v1beta1.SnapshotStoreItem";
   value: Uint8Array;
 }
@@ -113,7 +113,7 @@ export interface SnapshotStoreItemProtoType {
 export interface SnapshotStoreItemAmino {
   name: string;
 }
-export interface SnapshotStoreItemAminoType {
+export interface SnapshotStoreItemAminoMsg {
   type: "cosmos-sdk/SnapshotStoreItem";
   value: SnapshotStoreItemAmino;
 }
@@ -134,7 +134,7 @@ export interface SnapshotIAVLItem {
   /** height is depth of the tree. */
   height: number;
 }
-export interface SnapshotIAVLItemProtoType {
+export interface SnapshotIAVLItemProtoMsg {
   typeUrl: "/cosmos.base.snapshots.v1beta1.SnapshotIAVLItem";
   value: Uint8Array;
 }
@@ -150,7 +150,7 @@ export interface SnapshotIAVLItemAmino {
   /** height is depth of the tree. */
   height: number;
 }
-export interface SnapshotIAVLItemAminoType {
+export interface SnapshotIAVLItemAminoMsg {
   type: "cosmos-sdk/SnapshotIAVLItem";
   value: SnapshotIAVLItemAmino;
 }
@@ -168,7 +168,7 @@ export interface SnapshotExtensionMeta {
   name: string;
   format: number;
 }
-export interface SnapshotExtensionMetaProtoType {
+export interface SnapshotExtensionMetaProtoMsg {
   typeUrl: "/cosmos.base.snapshots.v1beta1.SnapshotExtensionMeta";
   value: Uint8Array;
 }
@@ -178,7 +178,7 @@ export interface SnapshotExtensionMetaAmino {
   name: string;
   format: number;
 }
-export interface SnapshotExtensionMetaAminoType {
+export interface SnapshotExtensionMetaAminoMsg {
   type: "cosmos-sdk/SnapshotExtensionMeta";
   value: SnapshotExtensionMetaAmino;
 }
@@ -193,7 +193,7 @@ export interface SnapshotExtensionMetaSDKType {
 export interface SnapshotExtensionPayload {
   payload: Uint8Array;
 }
-export interface SnapshotExtensionPayloadProtoType {
+export interface SnapshotExtensionPayloadProtoMsg {
   typeUrl: "/cosmos.base.snapshots.v1beta1.SnapshotExtensionPayload";
   value: Uint8Array;
 }
@@ -202,7 +202,7 @@ export interface SnapshotExtensionPayloadProtoType {
 export interface SnapshotExtensionPayloadAmino {
   payload: Uint8Array;
 }
-export interface SnapshotExtensionPayloadAminoType {
+export interface SnapshotExtensionPayloadAminoMsg {
   type: "cosmos-sdk/SnapshotExtensionPayload";
   value: SnapshotExtensionPayloadAmino;
 }
@@ -217,7 +217,7 @@ export interface SnapshotKVItem {
   key: Uint8Array;
   value: Uint8Array;
 }
-export interface SnapshotKVItemProtoType {
+export interface SnapshotKVItemProtoMsg {
   typeUrl: "/cosmos.base.snapshots.v1beta1.SnapshotKVItem";
   value: Uint8Array;
 }
@@ -227,7 +227,7 @@ export interface SnapshotKVItemAmino {
   key: Uint8Array;
   value: Uint8Array;
 }
-export interface SnapshotKVItemAminoType {
+export interface SnapshotKVItemAminoMsg {
   type: "cosmos-sdk/SnapshotKVItem";
   value: SnapshotKVItemAmino;
 }
@@ -242,7 +242,7 @@ export interface SnapshotKVItemSDKType {
 export interface SnapshotSchema {
   keys: Uint8Array[];
 }
-export interface SnapshotSchemaProtoType {
+export interface SnapshotSchemaProtoMsg {
   typeUrl: "/cosmos.base.snapshots.v1beta1.SnapshotSchema";
   value: Uint8Array;
 }
@@ -251,7 +251,7 @@ export interface SnapshotSchemaProtoType {
 export interface SnapshotSchemaAmino {
   keys: Uint8Array[];
 }
-export interface SnapshotSchemaAminoType {
+export interface SnapshotSchemaAminoMsg {
   type: "cosmos-sdk/SnapshotSchema";
   value: SnapshotSchemaAmino;
 }
@@ -272,6 +272,9 @@ function createBaseSnapshot(): Snapshot {
 }
 
 export const Snapshot = {
+  typeUrl: "/cosmos.base.snapshots.v1beta1.Snapshot",
+  aminoType: "cosmos-sdk/Snapshot",
+
   encode(message: Snapshot, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.height.isZero()) {
       writer.uint32(8).uint64(message.height);
@@ -402,6 +405,32 @@ export const Snapshot = {
     obj.hash = message.hash;
     obj.metadata = message.metadata ? Metadata.toAmino(message.metadata) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: SnapshotAminoMsg): Snapshot {
+    return Snapshot.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Snapshot): SnapshotAminoMsg {
+    return {
+      type: "cosmos-sdk/Snapshot",
+      value: Snapshot.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: SnapshotProtoMsg): Snapshot {
+    return Snapshot.decode(message.value);
+  },
+
+  toProto(message: Snapshot): Uint8Array {
+    return Snapshot.encode(message).finish();
+  },
+
+  toProtoMsg(message: Snapshot): SnapshotProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.snapshots.v1beta1.Snapshot",
+      value: Snapshot.encode(message).finish()
+    };
   }
 
 };
@@ -413,6 +442,9 @@ function createBaseMetadata(): Metadata {
 }
 
 export const Metadata = {
+  typeUrl: "/cosmos.base.snapshots.v1beta1.Metadata",
+  aminoType: "cosmos-sdk/Metadata",
+
   encode(message: Metadata, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.chunkHashes) {
       writer.uint32(10).bytes(v!);
@@ -501,6 +533,32 @@ export const Metadata = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: MetadataAminoMsg): Metadata {
+    return Metadata.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Metadata): MetadataAminoMsg {
+    return {
+      type: "cosmos-sdk/Metadata",
+      value: Metadata.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MetadataProtoMsg): Metadata {
+    return Metadata.decode(message.value);
+  },
+
+  toProto(message: Metadata): Uint8Array {
+    return Metadata.encode(message).finish();
+  },
+
+  toProtoMsg(message: Metadata): MetadataProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.snapshots.v1beta1.Metadata",
+      value: Metadata.encode(message).finish()
+    };
   }
 
 };
@@ -517,6 +575,9 @@ function createBaseSnapshotItem(): SnapshotItem {
 }
 
 export const SnapshotItem = {
+  typeUrl: "/cosmos.base.snapshots.v1beta1.SnapshotItem",
+  aminoType: "cosmos-sdk/SnapshotItem",
+
   encode(message: SnapshotItem, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.store !== undefined) {
       SnapshotStoreItem.encode(message.store, writer.uint32(10).fork()).ldelim();
@@ -662,6 +723,32 @@ export const SnapshotItem = {
     obj.kv = message.kv ? SnapshotKVItem.toAmino(message.kv) : undefined;
     obj.schema = message.schema ? SnapshotSchema.toAmino(message.schema) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: SnapshotItemAminoMsg): SnapshotItem {
+    return SnapshotItem.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: SnapshotItem): SnapshotItemAminoMsg {
+    return {
+      type: "cosmos-sdk/SnapshotItem",
+      value: SnapshotItem.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: SnapshotItemProtoMsg): SnapshotItem {
+    return SnapshotItem.decode(message.value);
+  },
+
+  toProto(message: SnapshotItem): Uint8Array {
+    return SnapshotItem.encode(message).finish();
+  },
+
+  toProtoMsg(message: SnapshotItem): SnapshotItemProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.snapshots.v1beta1.SnapshotItem",
+      value: SnapshotItem.encode(message).finish()
+    };
   }
 
 };
@@ -673,6 +760,9 @@ function createBaseSnapshotStoreItem(): SnapshotStoreItem {
 }
 
 export const SnapshotStoreItem = {
+  typeUrl: "/cosmos.base.snapshots.v1beta1.SnapshotStoreItem",
+  aminoType: "cosmos-sdk/SnapshotStoreItem",
+
   encode(message: SnapshotStoreItem, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -743,6 +833,32 @@ export const SnapshotStoreItem = {
     const obj: any = {};
     obj.name = message.name;
     return obj;
+  },
+
+  fromAminoMsg(object: SnapshotStoreItemAminoMsg): SnapshotStoreItem {
+    return SnapshotStoreItem.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: SnapshotStoreItem): SnapshotStoreItemAminoMsg {
+    return {
+      type: "cosmos-sdk/SnapshotStoreItem",
+      value: SnapshotStoreItem.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: SnapshotStoreItemProtoMsg): SnapshotStoreItem {
+    return SnapshotStoreItem.decode(message.value);
+  },
+
+  toProto(message: SnapshotStoreItem): Uint8Array {
+    return SnapshotStoreItem.encode(message).finish();
+  },
+
+  toProtoMsg(message: SnapshotStoreItem): SnapshotStoreItemProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.snapshots.v1beta1.SnapshotStoreItem",
+      value: SnapshotStoreItem.encode(message).finish()
+    };
   }
 
 };
@@ -757,6 +873,9 @@ function createBaseSnapshotIAVLItem(): SnapshotIAVLItem {
 }
 
 export const SnapshotIAVLItem = {
+  typeUrl: "/cosmos.base.snapshots.v1beta1.SnapshotIAVLItem",
+  aminoType: "cosmos-sdk/SnapshotIAVLItem",
+
   encode(message: SnapshotIAVLItem, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.key.length !== 0) {
       writer.uint32(10).bytes(message.key);
@@ -872,6 +991,32 @@ export const SnapshotIAVLItem = {
     obj.version = message.version ? message.version.toString() : undefined;
     obj.height = message.height;
     return obj;
+  },
+
+  fromAminoMsg(object: SnapshotIAVLItemAminoMsg): SnapshotIAVLItem {
+    return SnapshotIAVLItem.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: SnapshotIAVLItem): SnapshotIAVLItemAminoMsg {
+    return {
+      type: "cosmos-sdk/SnapshotIAVLItem",
+      value: SnapshotIAVLItem.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: SnapshotIAVLItemProtoMsg): SnapshotIAVLItem {
+    return SnapshotIAVLItem.decode(message.value);
+  },
+
+  toProto(message: SnapshotIAVLItem): Uint8Array {
+    return SnapshotIAVLItem.encode(message).finish();
+  },
+
+  toProtoMsg(message: SnapshotIAVLItem): SnapshotIAVLItemProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.snapshots.v1beta1.SnapshotIAVLItem",
+      value: SnapshotIAVLItem.encode(message).finish()
+    };
   }
 
 };
@@ -884,6 +1029,9 @@ function createBaseSnapshotExtensionMeta(): SnapshotExtensionMeta {
 }
 
 export const SnapshotExtensionMeta = {
+  typeUrl: "/cosmos.base.snapshots.v1beta1.SnapshotExtensionMeta",
+  aminoType: "cosmos-sdk/SnapshotExtensionMeta",
+
   encode(message: SnapshotExtensionMeta, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -969,6 +1117,32 @@ export const SnapshotExtensionMeta = {
     obj.name = message.name;
     obj.format = message.format;
     return obj;
+  },
+
+  fromAminoMsg(object: SnapshotExtensionMetaAminoMsg): SnapshotExtensionMeta {
+    return SnapshotExtensionMeta.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: SnapshotExtensionMeta): SnapshotExtensionMetaAminoMsg {
+    return {
+      type: "cosmos-sdk/SnapshotExtensionMeta",
+      value: SnapshotExtensionMeta.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: SnapshotExtensionMetaProtoMsg): SnapshotExtensionMeta {
+    return SnapshotExtensionMeta.decode(message.value);
+  },
+
+  toProto(message: SnapshotExtensionMeta): Uint8Array {
+    return SnapshotExtensionMeta.encode(message).finish();
+  },
+
+  toProtoMsg(message: SnapshotExtensionMeta): SnapshotExtensionMetaProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.snapshots.v1beta1.SnapshotExtensionMeta",
+      value: SnapshotExtensionMeta.encode(message).finish()
+    };
   }
 
 };
@@ -980,6 +1154,9 @@ function createBaseSnapshotExtensionPayload(): SnapshotExtensionPayload {
 }
 
 export const SnapshotExtensionPayload = {
+  typeUrl: "/cosmos.base.snapshots.v1beta1.SnapshotExtensionPayload",
+  aminoType: "cosmos-sdk/SnapshotExtensionPayload",
+
   encode(message: SnapshotExtensionPayload, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.payload.length !== 0) {
       writer.uint32(10).bytes(message.payload);
@@ -1050,6 +1227,32 @@ export const SnapshotExtensionPayload = {
     const obj: any = {};
     obj.payload = message.payload;
     return obj;
+  },
+
+  fromAminoMsg(object: SnapshotExtensionPayloadAminoMsg): SnapshotExtensionPayload {
+    return SnapshotExtensionPayload.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: SnapshotExtensionPayload): SnapshotExtensionPayloadAminoMsg {
+    return {
+      type: "cosmos-sdk/SnapshotExtensionPayload",
+      value: SnapshotExtensionPayload.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: SnapshotExtensionPayloadProtoMsg): SnapshotExtensionPayload {
+    return SnapshotExtensionPayload.decode(message.value);
+  },
+
+  toProto(message: SnapshotExtensionPayload): Uint8Array {
+    return SnapshotExtensionPayload.encode(message).finish();
+  },
+
+  toProtoMsg(message: SnapshotExtensionPayload): SnapshotExtensionPayloadProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.snapshots.v1beta1.SnapshotExtensionPayload",
+      value: SnapshotExtensionPayload.encode(message).finish()
+    };
   }
 
 };
@@ -1062,6 +1265,9 @@ function createBaseSnapshotKVItem(): SnapshotKVItem {
 }
 
 export const SnapshotKVItem = {
+  typeUrl: "/cosmos.base.snapshots.v1beta1.SnapshotKVItem",
+  aminoType: "cosmos-sdk/SnapshotKVItem",
+
   encode(message: SnapshotKVItem, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.key.length !== 0) {
       writer.uint32(10).bytes(message.key);
@@ -1147,6 +1353,32 @@ export const SnapshotKVItem = {
     obj.key = message.key;
     obj.value = message.value;
     return obj;
+  },
+
+  fromAminoMsg(object: SnapshotKVItemAminoMsg): SnapshotKVItem {
+    return SnapshotKVItem.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: SnapshotKVItem): SnapshotKVItemAminoMsg {
+    return {
+      type: "cosmos-sdk/SnapshotKVItem",
+      value: SnapshotKVItem.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: SnapshotKVItemProtoMsg): SnapshotKVItem {
+    return SnapshotKVItem.decode(message.value);
+  },
+
+  toProto(message: SnapshotKVItem): Uint8Array {
+    return SnapshotKVItem.encode(message).finish();
+  },
+
+  toProtoMsg(message: SnapshotKVItem): SnapshotKVItemProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.snapshots.v1beta1.SnapshotKVItem",
+      value: SnapshotKVItem.encode(message).finish()
+    };
   }
 
 };
@@ -1158,6 +1390,9 @@ function createBaseSnapshotSchema(): SnapshotSchema {
 }
 
 export const SnapshotSchema = {
+  typeUrl: "/cosmos.base.snapshots.v1beta1.SnapshotSchema",
+  aminoType: "cosmos-sdk/SnapshotSchema",
+
   encode(message: SnapshotSchema, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.keys) {
       writer.uint32(10).bytes(v!);
@@ -1246,6 +1481,32 @@ export const SnapshotSchema = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: SnapshotSchemaAminoMsg): SnapshotSchema {
+    return SnapshotSchema.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: SnapshotSchema): SnapshotSchemaAminoMsg {
+    return {
+      type: "cosmos-sdk/SnapshotSchema",
+      value: SnapshotSchema.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: SnapshotSchemaProtoMsg): SnapshotSchema {
+    return SnapshotSchema.decode(message.value);
+  },
+
+  toProto(message: SnapshotSchema): Uint8Array {
+    return SnapshotSchema.encode(message).finish();
+  },
+
+  toProtoMsg(message: SnapshotSchema): SnapshotSchemaProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.snapshots.v1beta1.SnapshotSchema",
+      value: SnapshotSchema.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/base/store/v1beta1/commit_info.ts b/__fixtures__/outputv2/cosmos/base/store/v1beta1/commit_info.ts
index 81f03d667..4523e4c57 100644
--- a/__fixtures__/outputv2/cosmos/base/store/v1beta1/commit_info.ts
+++ b/__fixtures__/outputv2/cosmos/base/store/v1beta1/commit_info.ts
@@ -10,7 +10,7 @@ export interface CommitInfo {
   version: Long;
   storeInfos: StoreInfo[];
 }
-export interface CommitInfoProtoType {
+export interface CommitInfoProtoMsg {
   typeUrl: "/cosmos.base.store.v1beta1.CommitInfo";
   value: Uint8Array;
 }
@@ -23,7 +23,7 @@ export interface CommitInfoAmino {
   version: string;
   store_infos: StoreInfoAmino[];
 }
-export interface CommitInfoAminoType {
+export interface CommitInfoAminoMsg {
   type: "cosmos-sdk/CommitInfo";
   value: CommitInfoAmino;
 }
@@ -45,7 +45,7 @@ export interface StoreInfo {
   name: string;
   commitId?: CommitID;
 }
-export interface StoreInfoProtoType {
+export interface StoreInfoProtoMsg {
   typeUrl: "/cosmos.base.store.v1beta1.StoreInfo";
   value: Uint8Array;
 }
@@ -58,7 +58,7 @@ export interface StoreInfoAmino {
   name: string;
   commit_id?: CommitIDAmino;
 }
-export interface StoreInfoAminoType {
+export interface StoreInfoAminoMsg {
   type: "cosmos-sdk/StoreInfo";
   value: StoreInfoAmino;
 }
@@ -80,7 +80,7 @@ export interface CommitID {
   version: Long;
   hash: Uint8Array;
 }
-export interface CommitIDProtoType {
+export interface CommitIDProtoMsg {
   typeUrl: "/cosmos.base.store.v1beta1.CommitID";
   value: Uint8Array;
 }
@@ -93,7 +93,7 @@ export interface CommitIDAmino {
   version: string;
   hash: Uint8Array;
 }
-export interface CommitIDAminoType {
+export interface CommitIDAminoMsg {
   type: "cosmos-sdk/CommitID";
   value: CommitIDAmino;
 }
@@ -115,6 +115,9 @@ function createBaseCommitInfo(): CommitInfo {
 }
 
 export const CommitInfo = {
+  typeUrl: "/cosmos.base.store.v1beta1.CommitInfo",
+  aminoType: "cosmos-sdk/CommitInfo",
+
   encode(message: CommitInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.version.isZero()) {
       writer.uint32(8).int64(message.version);
@@ -218,6 +221,32 @@ export const CommitInfo = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: CommitInfoAminoMsg): CommitInfo {
+    return CommitInfo.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: CommitInfo): CommitInfoAminoMsg {
+    return {
+      type: "cosmos-sdk/CommitInfo",
+      value: CommitInfo.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: CommitInfoProtoMsg): CommitInfo {
+    return CommitInfo.decode(message.value);
+  },
+
+  toProto(message: CommitInfo): Uint8Array {
+    return CommitInfo.encode(message).finish();
+  },
+
+  toProtoMsg(message: CommitInfo): CommitInfoProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.store.v1beta1.CommitInfo",
+      value: CommitInfo.encode(message).finish()
+    };
   }
 
 };
@@ -230,6 +259,9 @@ function createBaseStoreInfo(): StoreInfo {
 }
 
 export const StoreInfo = {
+  typeUrl: "/cosmos.base.store.v1beta1.StoreInfo",
+  aminoType: "cosmos-sdk/StoreInfo",
+
   encode(message: StoreInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -315,6 +347,32 @@ export const StoreInfo = {
     obj.name = message.name;
     obj.commit_id = message.commitId ? CommitID.toAmino(message.commitId) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: StoreInfoAminoMsg): StoreInfo {
+    return StoreInfo.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: StoreInfo): StoreInfoAminoMsg {
+    return {
+      type: "cosmos-sdk/StoreInfo",
+      value: StoreInfo.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: StoreInfoProtoMsg): StoreInfo {
+    return StoreInfo.decode(message.value);
+  },
+
+  toProto(message: StoreInfo): Uint8Array {
+    return StoreInfo.encode(message).finish();
+  },
+
+  toProtoMsg(message: StoreInfo): StoreInfoProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.store.v1beta1.StoreInfo",
+      value: StoreInfo.encode(message).finish()
+    };
   }
 
 };
@@ -327,6 +385,9 @@ function createBaseCommitID(): CommitID {
 }
 
 export const CommitID = {
+  typeUrl: "/cosmos.base.store.v1beta1.CommitID",
+  aminoType: "cosmos-sdk/CommitID",
+
   encode(message: CommitID, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.version.isZero()) {
       writer.uint32(8).int64(message.version);
@@ -412,6 +473,32 @@ export const CommitID = {
     obj.version = message.version ? message.version.toString() : undefined;
     obj.hash = message.hash;
     return obj;
+  },
+
+  fromAminoMsg(object: CommitIDAminoMsg): CommitID {
+    return CommitID.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: CommitID): CommitIDAminoMsg {
+    return {
+      type: "cosmos-sdk/CommitID",
+      value: CommitID.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: CommitIDProtoMsg): CommitID {
+    return CommitID.decode(message.value);
+  },
+
+  toProto(message: CommitID): Uint8Array {
+    return CommitID.encode(message).finish();
+  },
+
+  toProtoMsg(message: CommitID): CommitIDProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.store.v1beta1.CommitID",
+      value: CommitID.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/base/store/v1beta1/listening.ts b/__fixtures__/outputv2/cosmos/base/store/v1beta1/listening.ts
index 023c22774..6acce0250 100644
--- a/__fixtures__/outputv2/cosmos/base/store/v1beta1/listening.ts
+++ b/__fixtures__/outputv2/cosmos/base/store/v1beta1/listening.ts
@@ -18,7 +18,7 @@ export interface StoreKVPair {
   key: Uint8Array;
   value: Uint8Array;
 }
-export interface StoreKVPairProtoType {
+export interface StoreKVPairProtoMsg {
   typeUrl: "/cosmos.base.store.v1beta1.StoreKVPair";
   value: Uint8Array;
 }
@@ -39,7 +39,7 @@ export interface StoreKVPairAmino {
   key: Uint8Array;
   value: Uint8Array;
 }
-export interface StoreKVPairAminoType {
+export interface StoreKVPairAminoMsg {
   type: "cosmos-sdk/StoreKVPair";
   value: StoreKVPairAmino;
 }
@@ -68,6 +68,9 @@ function createBaseStoreKVPair(): StoreKVPair {
 }
 
 export const StoreKVPair = {
+  typeUrl: "/cosmos.base.store.v1beta1.StoreKVPair",
+  aminoType: "cosmos-sdk/StoreKVPair",
+
   encode(message: StoreKVPair, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.storeKey !== "") {
       writer.uint32(10).string(message.storeKey);
@@ -183,6 +186,32 @@ export const StoreKVPair = {
     obj.key = message.key;
     obj.value = message.value;
     return obj;
+  },
+
+  fromAminoMsg(object: StoreKVPairAminoMsg): StoreKVPair {
+    return StoreKVPair.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: StoreKVPair): StoreKVPairAminoMsg {
+    return {
+      type: "cosmos-sdk/StoreKVPair",
+      value: StoreKVPair.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: StoreKVPairProtoMsg): StoreKVPair {
+    return StoreKVPair.decode(message.value);
+  },
+
+  toProto(message: StoreKVPair): Uint8Array {
+    return StoreKVPair.encode(message).finish();
+  },
+
+  toProtoMsg(message: StoreKVPair): StoreKVPairProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.store.v1beta1.StoreKVPair",
+      value: StoreKVPair.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/base/tendermint/v1beta1/query.ts b/__fixtures__/outputv2/cosmos/base/tendermint/v1beta1/query.ts
index 9e145ab85..515a37edc 100644
--- a/__fixtures__/outputv2/cosmos/base/tendermint/v1beta1/query.ts
+++ b/__fixtures__/outputv2/cosmos/base/tendermint/v1beta1/query.ts
@@ -14,7 +14,7 @@ export interface GetValidatorSetByHeightRequest {
   /** pagination defines an pagination for the request. */
   pagination?: PageRequest;
 }
-export interface GetValidatorSetByHeightRequestProtoType {
+export interface GetValidatorSetByHeightRequestProtoMsg {
   typeUrl: "/cosmos.base.tendermint.v1beta1.GetValidatorSetByHeightRequest";
   value: Uint8Array;
 }
@@ -26,7 +26,7 @@ export interface GetValidatorSetByHeightRequestAmino {
   /** pagination defines an pagination for the request. */
   pagination?: PageRequestAmino;
 }
-export interface GetValidatorSetByHeightRequestAminoType {
+export interface GetValidatorSetByHeightRequestAminoMsg {
   type: "cosmos-sdk/GetValidatorSetByHeightRequest";
   value: GetValidatorSetByHeightRequestAmino;
 }
@@ -45,7 +45,7 @@ export interface GetValidatorSetByHeightResponse {
   /** pagination defines an pagination for the response. */
   pagination?: PageResponse;
 }
-export interface GetValidatorSetByHeightResponseProtoType {
+export interface GetValidatorSetByHeightResponseProtoMsg {
   typeUrl: "/cosmos.base.tendermint.v1beta1.GetValidatorSetByHeightResponse";
   value: Uint8Array;
 }
@@ -58,7 +58,7 @@ export interface GetValidatorSetByHeightResponseAmino {
   /** pagination defines an pagination for the response. */
   pagination?: PageResponseAmino;
 }
-export interface GetValidatorSetByHeightResponseAminoType {
+export interface GetValidatorSetByHeightResponseAminoMsg {
   type: "cosmos-sdk/GetValidatorSetByHeightResponse";
   value: GetValidatorSetByHeightResponseAmino;
 }
@@ -75,7 +75,7 @@ export interface GetLatestValidatorSetRequest {
   /** pagination defines an pagination for the request. */
   pagination?: PageRequest;
 }
-export interface GetLatestValidatorSetRequestProtoType {
+export interface GetLatestValidatorSetRequestProtoMsg {
   typeUrl: "/cosmos.base.tendermint.v1beta1.GetLatestValidatorSetRequest";
   value: Uint8Array;
 }
@@ -85,7 +85,7 @@ export interface GetLatestValidatorSetRequestAmino {
   /** pagination defines an pagination for the request. */
   pagination?: PageRequestAmino;
 }
-export interface GetLatestValidatorSetRequestAminoType {
+export interface GetLatestValidatorSetRequestAminoMsg {
   type: "cosmos-sdk/GetLatestValidatorSetRequest";
   value: GetLatestValidatorSetRequestAmino;
 }
@@ -103,7 +103,7 @@ export interface GetLatestValidatorSetResponse {
   /** pagination defines an pagination for the response. */
   pagination?: PageResponse;
 }
-export interface GetLatestValidatorSetResponseProtoType {
+export interface GetLatestValidatorSetResponseProtoMsg {
   typeUrl: "/cosmos.base.tendermint.v1beta1.GetLatestValidatorSetResponse";
   value: Uint8Array;
 }
@@ -116,7 +116,7 @@ export interface GetLatestValidatorSetResponseAmino {
   /** pagination defines an pagination for the response. */
   pagination?: PageResponseAmino;
 }
-export interface GetLatestValidatorSetResponseAminoType {
+export interface GetLatestValidatorSetResponseAminoMsg {
   type: "cosmos-sdk/GetLatestValidatorSetResponse";
   value: GetLatestValidatorSetResponseAmino;
 }
@@ -135,7 +135,7 @@ export interface Validator {
   votingPower: Long;
   proposerPriority: Long;
 }
-export interface ValidatorProtoType {
+export interface ValidatorProtoMsg {
   typeUrl: "/cosmos.base.tendermint.v1beta1.Validator";
   value: Uint8Array;
 }
@@ -147,7 +147,7 @@ export interface ValidatorAmino {
   voting_power: string;
   proposer_priority: string;
 }
-export interface ValidatorAminoType {
+export interface ValidatorAminoMsg {
   type: "cosmos-sdk/Validator";
   value: ValidatorAmino;
 }
@@ -164,7 +164,7 @@ export interface ValidatorSDKType {
 export interface GetBlockByHeightRequest {
   height: Long;
 }
-export interface GetBlockByHeightRequestProtoType {
+export interface GetBlockByHeightRequestProtoMsg {
   typeUrl: "/cosmos.base.tendermint.v1beta1.GetBlockByHeightRequest";
   value: Uint8Array;
 }
@@ -173,7 +173,7 @@ export interface GetBlockByHeightRequestProtoType {
 export interface GetBlockByHeightRequestAmino {
   height: string;
 }
-export interface GetBlockByHeightRequestAminoType {
+export interface GetBlockByHeightRequestAminoMsg {
   type: "cosmos-sdk/GetBlockByHeightRequest";
   value: GetBlockByHeightRequestAmino;
 }
@@ -188,7 +188,7 @@ export interface GetBlockByHeightResponse {
   blockId?: BlockID;
   block?: Block;
 }
-export interface GetBlockByHeightResponseProtoType {
+export interface GetBlockByHeightResponseProtoMsg {
   typeUrl: "/cosmos.base.tendermint.v1beta1.GetBlockByHeightResponse";
   value: Uint8Array;
 }
@@ -198,7 +198,7 @@ export interface GetBlockByHeightResponseAmino {
   block_id?: BlockIDAmino;
   block?: BlockAmino;
 }
-export interface GetBlockByHeightResponseAminoType {
+export interface GetBlockByHeightResponseAminoMsg {
   type: "cosmos-sdk/GetBlockByHeightResponse";
   value: GetBlockByHeightResponseAmino;
 }
@@ -211,14 +211,14 @@ export interface GetBlockByHeightResponseSDKType {
 
 /** GetLatestBlockRequest is the request type for the Query/GetLatestBlock RPC method. */
 export interface GetLatestBlockRequest {}
-export interface GetLatestBlockRequestProtoType {
+export interface GetLatestBlockRequestProtoMsg {
   typeUrl: "/cosmos.base.tendermint.v1beta1.GetLatestBlockRequest";
   value: Uint8Array;
 }
 
 /** GetLatestBlockRequest is the request type for the Query/GetLatestBlock RPC method. */
 export interface GetLatestBlockRequestAmino {}
-export interface GetLatestBlockRequestAminoType {
+export interface GetLatestBlockRequestAminoMsg {
   type: "cosmos-sdk/GetLatestBlockRequest";
   value: GetLatestBlockRequestAmino;
 }
@@ -231,7 +231,7 @@ export interface GetLatestBlockResponse {
   blockId?: BlockID;
   block?: Block;
 }
-export interface GetLatestBlockResponseProtoType {
+export interface GetLatestBlockResponseProtoMsg {
   typeUrl: "/cosmos.base.tendermint.v1beta1.GetLatestBlockResponse";
   value: Uint8Array;
 }
@@ -241,7 +241,7 @@ export interface GetLatestBlockResponseAmino {
   block_id?: BlockIDAmino;
   block?: BlockAmino;
 }
-export interface GetLatestBlockResponseAminoType {
+export interface GetLatestBlockResponseAminoMsg {
   type: "cosmos-sdk/GetLatestBlockResponse";
   value: GetLatestBlockResponseAmino;
 }
@@ -254,14 +254,14 @@ export interface GetLatestBlockResponseSDKType {
 
 /** GetSyncingRequest is the request type for the Query/GetSyncing RPC method. */
 export interface GetSyncingRequest {}
-export interface GetSyncingRequestProtoType {
+export interface GetSyncingRequestProtoMsg {
   typeUrl: "/cosmos.base.tendermint.v1beta1.GetSyncingRequest";
   value: Uint8Array;
 }
 
 /** GetSyncingRequest is the request type for the Query/GetSyncing RPC method. */
 export interface GetSyncingRequestAmino {}
-export interface GetSyncingRequestAminoType {
+export interface GetSyncingRequestAminoMsg {
   type: "cosmos-sdk/GetSyncingRequest";
   value: GetSyncingRequestAmino;
 }
@@ -273,7 +273,7 @@ export interface GetSyncingRequestSDKType {}
 export interface GetSyncingResponse {
   syncing: boolean;
 }
-export interface GetSyncingResponseProtoType {
+export interface GetSyncingResponseProtoMsg {
   typeUrl: "/cosmos.base.tendermint.v1beta1.GetSyncingResponse";
   value: Uint8Array;
 }
@@ -282,7 +282,7 @@ export interface GetSyncingResponseProtoType {
 export interface GetSyncingResponseAmino {
   syncing: boolean;
 }
-export interface GetSyncingResponseAminoType {
+export interface GetSyncingResponseAminoMsg {
   type: "cosmos-sdk/GetSyncingResponse";
   value: GetSyncingResponseAmino;
 }
@@ -294,14 +294,14 @@ export interface GetSyncingResponseSDKType {
 
 /** GetNodeInfoRequest is the request type for the Query/GetNodeInfo RPC method. */
 export interface GetNodeInfoRequest {}
-export interface GetNodeInfoRequestProtoType {
+export interface GetNodeInfoRequestProtoMsg {
   typeUrl: "/cosmos.base.tendermint.v1beta1.GetNodeInfoRequest";
   value: Uint8Array;
 }
 
 /** GetNodeInfoRequest is the request type for the Query/GetNodeInfo RPC method. */
 export interface GetNodeInfoRequestAmino {}
-export interface GetNodeInfoRequestAminoType {
+export interface GetNodeInfoRequestAminoMsg {
   type: "cosmos-sdk/GetNodeInfoRequest";
   value: GetNodeInfoRequestAmino;
 }
@@ -314,7 +314,7 @@ export interface GetNodeInfoResponse {
   nodeInfo?: NodeInfo;
   applicationVersion?: VersionInfo;
 }
-export interface GetNodeInfoResponseProtoType {
+export interface GetNodeInfoResponseProtoMsg {
   typeUrl: "/cosmos.base.tendermint.v1beta1.GetNodeInfoResponse";
   value: Uint8Array;
 }
@@ -324,7 +324,7 @@ export interface GetNodeInfoResponseAmino {
   node_info?: NodeInfoAmino;
   application_version?: VersionInfoAmino;
 }
-export interface GetNodeInfoResponseAminoType {
+export interface GetNodeInfoResponseAminoMsg {
   type: "cosmos-sdk/GetNodeInfoResponse";
   value: GetNodeInfoResponseAmino;
 }
@@ -348,7 +348,7 @@ export interface VersionInfo {
   /** Since: cosmos-sdk 0.43 */
   cosmosSdkVersion: string;
 }
-export interface VersionInfoProtoType {
+export interface VersionInfoProtoMsg {
   typeUrl: "/cosmos.base.tendermint.v1beta1.VersionInfo";
   value: Uint8Array;
 }
@@ -366,7 +366,7 @@ export interface VersionInfoAmino {
   /** Since: cosmos-sdk 0.43 */
   cosmos_sdk_version: string;
 }
-export interface VersionInfoAminoType {
+export interface VersionInfoAminoMsg {
   type: "cosmos-sdk/VersionInfo";
   value: VersionInfoAmino;
 }
@@ -394,7 +394,7 @@ export interface Module {
   /** checksum */
   sum: string;
 }
-export interface ModuleProtoType {
+export interface ModuleProtoMsg {
   typeUrl: "/cosmos.base.tendermint.v1beta1.Module";
   value: Uint8Array;
 }
@@ -410,7 +410,7 @@ export interface ModuleAmino {
   /** checksum */
   sum: string;
 }
-export interface ModuleAminoType {
+export interface ModuleAminoMsg {
   type: "cosmos-sdk/Module";
   value: ModuleAmino;
 }
@@ -430,6 +430,9 @@ function createBaseGetValidatorSetByHeightRequest(): GetValidatorSetByHeightRequ
 }
 
 export const GetValidatorSetByHeightRequest = {
+  typeUrl: "/cosmos.base.tendermint.v1beta1.GetValidatorSetByHeightRequest",
+  aminoType: "cosmos-sdk/GetValidatorSetByHeightRequest",
+
   encode(message: GetValidatorSetByHeightRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.height.isZero()) {
       writer.uint32(8).int64(message.height);
@@ -515,6 +518,32 @@ export const GetValidatorSetByHeightRequest = {
     obj.height = message.height ? message.height.toString() : undefined;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GetValidatorSetByHeightRequestAminoMsg): GetValidatorSetByHeightRequest {
+    return GetValidatorSetByHeightRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GetValidatorSetByHeightRequest): GetValidatorSetByHeightRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/GetValidatorSetByHeightRequest",
+      value: GetValidatorSetByHeightRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GetValidatorSetByHeightRequestProtoMsg): GetValidatorSetByHeightRequest {
+    return GetValidatorSetByHeightRequest.decode(message.value);
+  },
+
+  toProto(message: GetValidatorSetByHeightRequest): Uint8Array {
+    return GetValidatorSetByHeightRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: GetValidatorSetByHeightRequest): GetValidatorSetByHeightRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.tendermint.v1beta1.GetValidatorSetByHeightRequest",
+      value: GetValidatorSetByHeightRequest.encode(message).finish()
+    };
   }
 
 };
@@ -528,6 +557,9 @@ function createBaseGetValidatorSetByHeightResponse(): GetValidatorSetByHeightRes
 }
 
 export const GetValidatorSetByHeightResponse = {
+  typeUrl: "/cosmos.base.tendermint.v1beta1.GetValidatorSetByHeightResponse",
+  aminoType: "cosmos-sdk/GetValidatorSetByHeightResponse",
+
   encode(message: GetValidatorSetByHeightResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.blockHeight.isZero()) {
       writer.uint32(8).int64(message.blockHeight);
@@ -646,6 +678,32 @@ export const GetValidatorSetByHeightResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GetValidatorSetByHeightResponseAminoMsg): GetValidatorSetByHeightResponse {
+    return GetValidatorSetByHeightResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GetValidatorSetByHeightResponse): GetValidatorSetByHeightResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/GetValidatorSetByHeightResponse",
+      value: GetValidatorSetByHeightResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GetValidatorSetByHeightResponseProtoMsg): GetValidatorSetByHeightResponse {
+    return GetValidatorSetByHeightResponse.decode(message.value);
+  },
+
+  toProto(message: GetValidatorSetByHeightResponse): Uint8Array {
+    return GetValidatorSetByHeightResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: GetValidatorSetByHeightResponse): GetValidatorSetByHeightResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.tendermint.v1beta1.GetValidatorSetByHeightResponse",
+      value: GetValidatorSetByHeightResponse.encode(message).finish()
+    };
   }
 
 };
@@ -657,6 +715,9 @@ function createBaseGetLatestValidatorSetRequest(): GetLatestValidatorSetRequest
 }
 
 export const GetLatestValidatorSetRequest = {
+  typeUrl: "/cosmos.base.tendermint.v1beta1.GetLatestValidatorSetRequest",
+  aminoType: "cosmos-sdk/GetLatestValidatorSetRequest",
+
   encode(message: GetLatestValidatorSetRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.pagination !== undefined) {
       PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim();
@@ -727,6 +788,32 @@ export const GetLatestValidatorSetRequest = {
     const obj: any = {};
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GetLatestValidatorSetRequestAminoMsg): GetLatestValidatorSetRequest {
+    return GetLatestValidatorSetRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GetLatestValidatorSetRequest): GetLatestValidatorSetRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/GetLatestValidatorSetRequest",
+      value: GetLatestValidatorSetRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GetLatestValidatorSetRequestProtoMsg): GetLatestValidatorSetRequest {
+    return GetLatestValidatorSetRequest.decode(message.value);
+  },
+
+  toProto(message: GetLatestValidatorSetRequest): Uint8Array {
+    return GetLatestValidatorSetRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: GetLatestValidatorSetRequest): GetLatestValidatorSetRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.tendermint.v1beta1.GetLatestValidatorSetRequest",
+      value: GetLatestValidatorSetRequest.encode(message).finish()
+    };
   }
 
 };
@@ -740,6 +827,9 @@ function createBaseGetLatestValidatorSetResponse(): GetLatestValidatorSetRespons
 }
 
 export const GetLatestValidatorSetResponse = {
+  typeUrl: "/cosmos.base.tendermint.v1beta1.GetLatestValidatorSetResponse",
+  aminoType: "cosmos-sdk/GetLatestValidatorSetResponse",
+
   encode(message: GetLatestValidatorSetResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.blockHeight.isZero()) {
       writer.uint32(8).int64(message.blockHeight);
@@ -858,6 +948,32 @@ export const GetLatestValidatorSetResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GetLatestValidatorSetResponseAminoMsg): GetLatestValidatorSetResponse {
+    return GetLatestValidatorSetResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GetLatestValidatorSetResponse): GetLatestValidatorSetResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/GetLatestValidatorSetResponse",
+      value: GetLatestValidatorSetResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GetLatestValidatorSetResponseProtoMsg): GetLatestValidatorSetResponse {
+    return GetLatestValidatorSetResponse.decode(message.value);
+  },
+
+  toProto(message: GetLatestValidatorSetResponse): Uint8Array {
+    return GetLatestValidatorSetResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: GetLatestValidatorSetResponse): GetLatestValidatorSetResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.tendermint.v1beta1.GetLatestValidatorSetResponse",
+      value: GetLatestValidatorSetResponse.encode(message).finish()
+    };
   }
 
 };
@@ -872,6 +988,9 @@ function createBaseValidator(): Validator {
 }
 
 export const Validator = {
+  typeUrl: "/cosmos.base.tendermint.v1beta1.Validator",
+  aminoType: "cosmos-sdk/Validator",
+
   encode(message: Validator, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.address !== "") {
       writer.uint32(10).string(message.address);
@@ -987,6 +1106,32 @@ export const Validator = {
     obj.voting_power = message.votingPower ? message.votingPower.toString() : undefined;
     obj.proposer_priority = message.proposerPriority ? message.proposerPriority.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ValidatorAminoMsg): Validator {
+    return Validator.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Validator): ValidatorAminoMsg {
+    return {
+      type: "cosmos-sdk/Validator",
+      value: Validator.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ValidatorProtoMsg): Validator {
+    return Validator.decode(message.value);
+  },
+
+  toProto(message: Validator): Uint8Array {
+    return Validator.encode(message).finish();
+  },
+
+  toProtoMsg(message: Validator): ValidatorProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.tendermint.v1beta1.Validator",
+      value: Validator.encode(message).finish()
+    };
   }
 
 };
@@ -998,6 +1143,9 @@ function createBaseGetBlockByHeightRequest(): GetBlockByHeightRequest {
 }
 
 export const GetBlockByHeightRequest = {
+  typeUrl: "/cosmos.base.tendermint.v1beta1.GetBlockByHeightRequest",
+  aminoType: "cosmos-sdk/GetBlockByHeightRequest",
+
   encode(message: GetBlockByHeightRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.height.isZero()) {
       writer.uint32(8).int64(message.height);
@@ -1068,6 +1216,32 @@ export const GetBlockByHeightRequest = {
     const obj: any = {};
     obj.height = message.height ? message.height.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GetBlockByHeightRequestAminoMsg): GetBlockByHeightRequest {
+    return GetBlockByHeightRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GetBlockByHeightRequest): GetBlockByHeightRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/GetBlockByHeightRequest",
+      value: GetBlockByHeightRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GetBlockByHeightRequestProtoMsg): GetBlockByHeightRequest {
+    return GetBlockByHeightRequest.decode(message.value);
+  },
+
+  toProto(message: GetBlockByHeightRequest): Uint8Array {
+    return GetBlockByHeightRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: GetBlockByHeightRequest): GetBlockByHeightRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.tendermint.v1beta1.GetBlockByHeightRequest",
+      value: GetBlockByHeightRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1080,6 +1254,9 @@ function createBaseGetBlockByHeightResponse(): GetBlockByHeightResponse {
 }
 
 export const GetBlockByHeightResponse = {
+  typeUrl: "/cosmos.base.tendermint.v1beta1.GetBlockByHeightResponse",
+  aminoType: "cosmos-sdk/GetBlockByHeightResponse",
+
   encode(message: GetBlockByHeightResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.blockId !== undefined) {
       BlockID.encode(message.blockId, writer.uint32(10).fork()).ldelim();
@@ -1165,6 +1342,32 @@ export const GetBlockByHeightResponse = {
     obj.block_id = message.blockId ? BlockID.toAmino(message.blockId) : undefined;
     obj.block = message.block ? Block.toAmino(message.block) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GetBlockByHeightResponseAminoMsg): GetBlockByHeightResponse {
+    return GetBlockByHeightResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GetBlockByHeightResponse): GetBlockByHeightResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/GetBlockByHeightResponse",
+      value: GetBlockByHeightResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GetBlockByHeightResponseProtoMsg): GetBlockByHeightResponse {
+    return GetBlockByHeightResponse.decode(message.value);
+  },
+
+  toProto(message: GetBlockByHeightResponse): Uint8Array {
+    return GetBlockByHeightResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: GetBlockByHeightResponse): GetBlockByHeightResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.tendermint.v1beta1.GetBlockByHeightResponse",
+      value: GetBlockByHeightResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1174,6 +1377,9 @@ function createBaseGetLatestBlockRequest(): GetLatestBlockRequest {
 }
 
 export const GetLatestBlockRequest = {
+  typeUrl: "/cosmos.base.tendermint.v1beta1.GetLatestBlockRequest",
+  aminoType: "cosmos-sdk/GetLatestBlockRequest",
+
   encode(_: GetLatestBlockRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -1226,6 +1432,32 @@ export const GetLatestBlockRequest = {
   toAmino(_: GetLatestBlockRequest): GetLatestBlockRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: GetLatestBlockRequestAminoMsg): GetLatestBlockRequest {
+    return GetLatestBlockRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GetLatestBlockRequest): GetLatestBlockRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/GetLatestBlockRequest",
+      value: GetLatestBlockRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GetLatestBlockRequestProtoMsg): GetLatestBlockRequest {
+    return GetLatestBlockRequest.decode(message.value);
+  },
+
+  toProto(message: GetLatestBlockRequest): Uint8Array {
+    return GetLatestBlockRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: GetLatestBlockRequest): GetLatestBlockRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.tendermint.v1beta1.GetLatestBlockRequest",
+      value: GetLatestBlockRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1238,6 +1470,9 @@ function createBaseGetLatestBlockResponse(): GetLatestBlockResponse {
 }
 
 export const GetLatestBlockResponse = {
+  typeUrl: "/cosmos.base.tendermint.v1beta1.GetLatestBlockResponse",
+  aminoType: "cosmos-sdk/GetLatestBlockResponse",
+
   encode(message: GetLatestBlockResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.blockId !== undefined) {
       BlockID.encode(message.blockId, writer.uint32(10).fork()).ldelim();
@@ -1323,6 +1558,32 @@ export const GetLatestBlockResponse = {
     obj.block_id = message.blockId ? BlockID.toAmino(message.blockId) : undefined;
     obj.block = message.block ? Block.toAmino(message.block) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GetLatestBlockResponseAminoMsg): GetLatestBlockResponse {
+    return GetLatestBlockResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GetLatestBlockResponse): GetLatestBlockResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/GetLatestBlockResponse",
+      value: GetLatestBlockResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GetLatestBlockResponseProtoMsg): GetLatestBlockResponse {
+    return GetLatestBlockResponse.decode(message.value);
+  },
+
+  toProto(message: GetLatestBlockResponse): Uint8Array {
+    return GetLatestBlockResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: GetLatestBlockResponse): GetLatestBlockResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.tendermint.v1beta1.GetLatestBlockResponse",
+      value: GetLatestBlockResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1332,6 +1593,9 @@ function createBaseGetSyncingRequest(): GetSyncingRequest {
 }
 
 export const GetSyncingRequest = {
+  typeUrl: "/cosmos.base.tendermint.v1beta1.GetSyncingRequest",
+  aminoType: "cosmos-sdk/GetSyncingRequest",
+
   encode(_: GetSyncingRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -1384,6 +1648,32 @@ export const GetSyncingRequest = {
   toAmino(_: GetSyncingRequest): GetSyncingRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: GetSyncingRequestAminoMsg): GetSyncingRequest {
+    return GetSyncingRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GetSyncingRequest): GetSyncingRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/GetSyncingRequest",
+      value: GetSyncingRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GetSyncingRequestProtoMsg): GetSyncingRequest {
+    return GetSyncingRequest.decode(message.value);
+  },
+
+  toProto(message: GetSyncingRequest): Uint8Array {
+    return GetSyncingRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: GetSyncingRequest): GetSyncingRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.tendermint.v1beta1.GetSyncingRequest",
+      value: GetSyncingRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1395,6 +1685,9 @@ function createBaseGetSyncingResponse(): GetSyncingResponse {
 }
 
 export const GetSyncingResponse = {
+  typeUrl: "/cosmos.base.tendermint.v1beta1.GetSyncingResponse",
+  aminoType: "cosmos-sdk/GetSyncingResponse",
+
   encode(message: GetSyncingResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.syncing === true) {
       writer.uint32(8).bool(message.syncing);
@@ -1465,6 +1758,32 @@ export const GetSyncingResponse = {
     const obj: any = {};
     obj.syncing = message.syncing;
     return obj;
+  },
+
+  fromAminoMsg(object: GetSyncingResponseAminoMsg): GetSyncingResponse {
+    return GetSyncingResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GetSyncingResponse): GetSyncingResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/GetSyncingResponse",
+      value: GetSyncingResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GetSyncingResponseProtoMsg): GetSyncingResponse {
+    return GetSyncingResponse.decode(message.value);
+  },
+
+  toProto(message: GetSyncingResponse): Uint8Array {
+    return GetSyncingResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: GetSyncingResponse): GetSyncingResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.tendermint.v1beta1.GetSyncingResponse",
+      value: GetSyncingResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1474,6 +1793,9 @@ function createBaseGetNodeInfoRequest(): GetNodeInfoRequest {
 }
 
 export const GetNodeInfoRequest = {
+  typeUrl: "/cosmos.base.tendermint.v1beta1.GetNodeInfoRequest",
+  aminoType: "cosmos-sdk/GetNodeInfoRequest",
+
   encode(_: GetNodeInfoRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -1526,6 +1848,32 @@ export const GetNodeInfoRequest = {
   toAmino(_: GetNodeInfoRequest): GetNodeInfoRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: GetNodeInfoRequestAminoMsg): GetNodeInfoRequest {
+    return GetNodeInfoRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GetNodeInfoRequest): GetNodeInfoRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/GetNodeInfoRequest",
+      value: GetNodeInfoRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GetNodeInfoRequestProtoMsg): GetNodeInfoRequest {
+    return GetNodeInfoRequest.decode(message.value);
+  },
+
+  toProto(message: GetNodeInfoRequest): Uint8Array {
+    return GetNodeInfoRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: GetNodeInfoRequest): GetNodeInfoRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.tendermint.v1beta1.GetNodeInfoRequest",
+      value: GetNodeInfoRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1538,6 +1886,9 @@ function createBaseGetNodeInfoResponse(): GetNodeInfoResponse {
 }
 
 export const GetNodeInfoResponse = {
+  typeUrl: "/cosmos.base.tendermint.v1beta1.GetNodeInfoResponse",
+  aminoType: "cosmos-sdk/GetNodeInfoResponse",
+
   encode(message: GetNodeInfoResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.nodeInfo !== undefined) {
       NodeInfo.encode(message.nodeInfo, writer.uint32(10).fork()).ldelim();
@@ -1623,6 +1974,32 @@ export const GetNodeInfoResponse = {
     obj.node_info = message.nodeInfo ? NodeInfo.toAmino(message.nodeInfo) : undefined;
     obj.application_version = message.applicationVersion ? VersionInfo.toAmino(message.applicationVersion) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GetNodeInfoResponseAminoMsg): GetNodeInfoResponse {
+    return GetNodeInfoResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GetNodeInfoResponse): GetNodeInfoResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/GetNodeInfoResponse",
+      value: GetNodeInfoResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GetNodeInfoResponseProtoMsg): GetNodeInfoResponse {
+    return GetNodeInfoResponse.decode(message.value);
+  },
+
+  toProto(message: GetNodeInfoResponse): Uint8Array {
+    return GetNodeInfoResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: GetNodeInfoResponse): GetNodeInfoResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.tendermint.v1beta1.GetNodeInfoResponse",
+      value: GetNodeInfoResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1641,6 +2018,9 @@ function createBaseVersionInfo(): VersionInfo {
 }
 
 export const VersionInfo = {
+  typeUrl: "/cosmos.base.tendermint.v1beta1.VersionInfo",
+  aminoType: "cosmos-sdk/VersionInfo",
+
   encode(message: VersionInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -1834,6 +2214,32 @@ export const VersionInfo = {
 
     obj.cosmos_sdk_version = message.cosmosSdkVersion;
     return obj;
+  },
+
+  fromAminoMsg(object: VersionInfoAminoMsg): VersionInfo {
+    return VersionInfo.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: VersionInfo): VersionInfoAminoMsg {
+    return {
+      type: "cosmos-sdk/VersionInfo",
+      value: VersionInfo.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: VersionInfoProtoMsg): VersionInfo {
+    return VersionInfo.decode(message.value);
+  },
+
+  toProto(message: VersionInfo): Uint8Array {
+    return VersionInfo.encode(message).finish();
+  },
+
+  toProtoMsg(message: VersionInfo): VersionInfoProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.tendermint.v1beta1.VersionInfo",
+      value: VersionInfo.encode(message).finish()
+    };
   }
 
 };
@@ -1847,6 +2253,9 @@ function createBaseModule(): Module {
 }
 
 export const Module = {
+  typeUrl: "/cosmos.base.tendermint.v1beta1.Module",
+  aminoType: "cosmos-sdk/Module",
+
   encode(message: Module, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.path !== "") {
       writer.uint32(10).string(message.path);
@@ -1947,6 +2356,32 @@ export const Module = {
     obj.version = message.version;
     obj.sum = message.sum;
     return obj;
+  },
+
+  fromAminoMsg(object: ModuleAminoMsg): Module {
+    return Module.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Module): ModuleAminoMsg {
+    return {
+      type: "cosmos-sdk/Module",
+      value: Module.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ModuleProtoMsg): Module {
+    return Module.decode(message.value);
+  },
+
+  toProto(message: Module): Uint8Array {
+    return Module.encode(message).finish();
+  },
+
+  toProtoMsg(message: Module): ModuleProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.tendermint.v1beta1.Module",
+      value: Module.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/base/v1beta1/coin.ts b/__fixtures__/outputv2/cosmos/base/v1beta1/coin.ts
index 44133a6d3..7590d1e93 100644
--- a/__fixtures__/outputv2/cosmos/base/v1beta1/coin.ts
+++ b/__fixtures__/outputv2/cosmos/base/v1beta1/coin.ts
@@ -12,7 +12,7 @@ export interface Coin {
   denom: string;
   amount: string;
 }
-export interface CoinProtoType {
+export interface CoinProtoMsg {
   typeUrl: "/cosmos.base.v1beta1.Coin";
   value: Uint8Array;
 }
@@ -27,7 +27,7 @@ export interface CoinAmino {
   denom: string;
   amount: string;
 }
-export interface CoinAminoType {
+export interface CoinAminoMsg {
   type: "cosmos-sdk/Coin";
   value: CoinAmino;
 }
@@ -53,7 +53,7 @@ export interface DecCoin {
   denom: string;
   amount: string;
 }
-export interface DecCoinProtoType {
+export interface DecCoinProtoMsg {
   typeUrl: "/cosmos.base.v1beta1.DecCoin";
   value: Uint8Array;
 }
@@ -68,7 +68,7 @@ export interface DecCoinAmino {
   denom: string;
   amount: string;
 }
-export interface DecCoinAminoType {
+export interface DecCoinAminoMsg {
   type: "cosmos-sdk/DecCoin";
   value: DecCoinAmino;
 }
@@ -88,7 +88,7 @@ export interface DecCoinSDKType {
 export interface IntProto {
   int: string;
 }
-export interface IntProtoProtoType {
+export interface IntProtoProtoMsg {
   typeUrl: "/cosmos.base.v1beta1.IntProto";
   value: Uint8Array;
 }
@@ -97,7 +97,7 @@ export interface IntProtoProtoType {
 export interface IntProtoAmino {
   int: string;
 }
-export interface IntProtoAminoType {
+export interface IntProtoAminoMsg {
   type: "cosmos-sdk/IntProto";
   value: IntProtoAmino;
 }
@@ -111,7 +111,7 @@ export interface IntProtoSDKType {
 export interface DecProto {
   dec: string;
 }
-export interface DecProtoProtoType {
+export interface DecProtoProtoMsg {
   typeUrl: "/cosmos.base.v1beta1.DecProto";
   value: Uint8Array;
 }
@@ -120,7 +120,7 @@ export interface DecProtoProtoType {
 export interface DecProtoAmino {
   dec: string;
 }
-export interface DecProtoAminoType {
+export interface DecProtoAminoMsg {
   type: "cosmos-sdk/DecProto";
   value: DecProtoAmino;
 }
@@ -138,6 +138,9 @@ function createBaseCoin(): Coin {
 }
 
 export const Coin = {
+  typeUrl: "/cosmos.base.v1beta1.Coin",
+  aminoType: "cosmos-sdk/Coin",
+
   encode(message: Coin, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.denom !== "") {
       writer.uint32(10).string(message.denom);
@@ -223,6 +226,32 @@ export const Coin = {
     obj.denom = message.denom;
     obj.amount = message.amount;
     return obj;
+  },
+
+  fromAminoMsg(object: CoinAminoMsg): Coin {
+    return Coin.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Coin): CoinAminoMsg {
+    return {
+      type: "cosmos-sdk/Coin",
+      value: Coin.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: CoinProtoMsg): Coin {
+    return Coin.decode(message.value);
+  },
+
+  toProto(message: Coin): Uint8Array {
+    return Coin.encode(message).finish();
+  },
+
+  toProtoMsg(message: Coin): CoinProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.v1beta1.Coin",
+      value: Coin.encode(message).finish()
+    };
   }
 
 };
@@ -235,6 +264,9 @@ function createBaseDecCoin(): DecCoin {
 }
 
 export const DecCoin = {
+  typeUrl: "/cosmos.base.v1beta1.DecCoin",
+  aminoType: "cosmos-sdk/DecCoin",
+
   encode(message: DecCoin, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.denom !== "") {
       writer.uint32(10).string(message.denom);
@@ -320,6 +352,32 @@ export const DecCoin = {
     obj.denom = message.denom;
     obj.amount = message.amount;
     return obj;
+  },
+
+  fromAminoMsg(object: DecCoinAminoMsg): DecCoin {
+    return DecCoin.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: DecCoin): DecCoinAminoMsg {
+    return {
+      type: "cosmos-sdk/DecCoin",
+      value: DecCoin.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: DecCoinProtoMsg): DecCoin {
+    return DecCoin.decode(message.value);
+  },
+
+  toProto(message: DecCoin): Uint8Array {
+    return DecCoin.encode(message).finish();
+  },
+
+  toProtoMsg(message: DecCoin): DecCoinProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.v1beta1.DecCoin",
+      value: DecCoin.encode(message).finish()
+    };
   }
 
 };
@@ -331,6 +389,9 @@ function createBaseIntProto(): IntProto {
 }
 
 export const IntProto = {
+  typeUrl: "/cosmos.base.v1beta1.IntProto",
+  aminoType: "cosmos-sdk/IntProto",
+
   encode(message: IntProto, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.int !== "") {
       writer.uint32(10).string(message.int);
@@ -401,6 +462,32 @@ export const IntProto = {
     const obj: any = {};
     obj.int = message.int;
     return obj;
+  },
+
+  fromAminoMsg(object: IntProtoAminoMsg): IntProto {
+    return IntProto.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: IntProto): IntProtoAminoMsg {
+    return {
+      type: "cosmos-sdk/IntProto",
+      value: IntProto.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: IntProtoProtoMsg): IntProto {
+    return IntProto.decode(message.value);
+  },
+
+  toProto(message: IntProto): Uint8Array {
+    return IntProto.encode(message).finish();
+  },
+
+  toProtoMsg(message: IntProto): IntProtoProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.v1beta1.IntProto",
+      value: IntProto.encode(message).finish()
+    };
   }
 
 };
@@ -412,6 +499,9 @@ function createBaseDecProto(): DecProto {
 }
 
 export const DecProto = {
+  typeUrl: "/cosmos.base.v1beta1.DecProto",
+  aminoType: "cosmos-sdk/DecProto",
+
   encode(message: DecProto, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.dec !== "") {
       writer.uint32(10).string(message.dec);
@@ -482,6 +572,32 @@ export const DecProto = {
     const obj: any = {};
     obj.dec = message.dec;
     return obj;
+  },
+
+  fromAminoMsg(object: DecProtoAminoMsg): DecProto {
+    return DecProto.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: DecProto): DecProtoAminoMsg {
+    return {
+      type: "cosmos-sdk/DecProto",
+      value: DecProto.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: DecProtoProtoMsg): DecProto {
+    return DecProto.decode(message.value);
+  },
+
+  toProto(message: DecProto): Uint8Array {
+    return DecProto.encode(message).finish();
+  },
+
+  toProtoMsg(message: DecProto): DecProtoProtoMsg {
+    return {
+      typeUrl: "/cosmos.base.v1beta1.DecProto",
+      value: DecProto.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/capability/v1beta1/capability.ts b/__fixtures__/outputv2/cosmos/capability/v1beta1/capability.ts
index 7f75896c3..fa0e20fd3 100644
--- a/__fixtures__/outputv2/cosmos/capability/v1beta1/capability.ts
+++ b/__fixtures__/outputv2/cosmos/capability/v1beta1/capability.ts
@@ -9,7 +9,7 @@ export const protobufPackage = "cosmos.capability.v1beta1";
 export interface Capability {
   index: Long;
 }
-export interface CapabilityProtoType {
+export interface CapabilityProtoMsg {
   typeUrl: "/cosmos.capability.v1beta1.Capability";
   value: Uint8Array;
 }
@@ -21,7 +21,7 @@ export interface CapabilityProtoType {
 export interface CapabilityAmino {
   index: string;
 }
-export interface CapabilityAminoType {
+export interface CapabilityAminoMsg {
   type: "cosmos-sdk/Capability";
   value: CapabilityAmino;
 }
@@ -42,7 +42,7 @@ export interface Owner {
   module: string;
   name: string;
 }
-export interface OwnerProtoType {
+export interface OwnerProtoMsg {
   typeUrl: "/cosmos.capability.v1beta1.Owner";
   value: Uint8Array;
 }
@@ -55,7 +55,7 @@ export interface OwnerAmino {
   module: string;
   name: string;
 }
-export interface OwnerAminoType {
+export interface OwnerAminoMsg {
   type: "cosmos-sdk/Owner";
   value: OwnerAmino;
 }
@@ -76,7 +76,7 @@ export interface OwnerSDKType {
 export interface CapabilityOwners {
   owners: Owner[];
 }
-export interface CapabilityOwnersProtoType {
+export interface CapabilityOwnersProtoMsg {
   typeUrl: "/cosmos.capability.v1beta1.CapabilityOwners";
   value: Uint8Array;
 }
@@ -88,7 +88,7 @@ export interface CapabilityOwnersProtoType {
 export interface CapabilityOwnersAmino {
   owners: OwnerAmino[];
 }
-export interface CapabilityOwnersAminoType {
+export interface CapabilityOwnersAminoMsg {
   type: "cosmos-sdk/CapabilityOwners";
   value: CapabilityOwnersAmino;
 }
@@ -108,6 +108,9 @@ function createBaseCapability(): Capability {
 }
 
 export const Capability = {
+  typeUrl: "/cosmos.capability.v1beta1.Capability",
+  aminoType: "cosmos-sdk/Capability",
+
   encode(message: Capability, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.index.isZero()) {
       writer.uint32(8).uint64(message.index);
@@ -178,6 +181,32 @@ export const Capability = {
     const obj: any = {};
     obj.index = message.index ? message.index.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: CapabilityAminoMsg): Capability {
+    return Capability.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Capability): CapabilityAminoMsg {
+    return {
+      type: "cosmos-sdk/Capability",
+      value: Capability.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: CapabilityProtoMsg): Capability {
+    return Capability.decode(message.value);
+  },
+
+  toProto(message: Capability): Uint8Array {
+    return Capability.encode(message).finish();
+  },
+
+  toProtoMsg(message: Capability): CapabilityProtoMsg {
+    return {
+      typeUrl: "/cosmos.capability.v1beta1.Capability",
+      value: Capability.encode(message).finish()
+    };
   }
 
 };
@@ -190,6 +219,9 @@ function createBaseOwner(): Owner {
 }
 
 export const Owner = {
+  typeUrl: "/cosmos.capability.v1beta1.Owner",
+  aminoType: "cosmos-sdk/Owner",
+
   encode(message: Owner, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.module !== "") {
       writer.uint32(10).string(message.module);
@@ -275,6 +307,32 @@ export const Owner = {
     obj.module = message.module;
     obj.name = message.name;
     return obj;
+  },
+
+  fromAminoMsg(object: OwnerAminoMsg): Owner {
+    return Owner.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Owner): OwnerAminoMsg {
+    return {
+      type: "cosmos-sdk/Owner",
+      value: Owner.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: OwnerProtoMsg): Owner {
+    return Owner.decode(message.value);
+  },
+
+  toProto(message: Owner): Uint8Array {
+    return Owner.encode(message).finish();
+  },
+
+  toProtoMsg(message: Owner): OwnerProtoMsg {
+    return {
+      typeUrl: "/cosmos.capability.v1beta1.Owner",
+      value: Owner.encode(message).finish()
+    };
   }
 
 };
@@ -286,6 +344,9 @@ function createBaseCapabilityOwners(): CapabilityOwners {
 }
 
 export const CapabilityOwners = {
+  typeUrl: "/cosmos.capability.v1beta1.CapabilityOwners",
+  aminoType: "cosmos-sdk/CapabilityOwners",
+
   encode(message: CapabilityOwners, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.owners) {
       Owner.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -374,6 +435,32 @@ export const CapabilityOwners = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: CapabilityOwnersAminoMsg): CapabilityOwners {
+    return CapabilityOwners.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: CapabilityOwners): CapabilityOwnersAminoMsg {
+    return {
+      type: "cosmos-sdk/CapabilityOwners",
+      value: CapabilityOwners.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: CapabilityOwnersProtoMsg): CapabilityOwners {
+    return CapabilityOwners.decode(message.value);
+  },
+
+  toProto(message: CapabilityOwners): Uint8Array {
+    return CapabilityOwners.encode(message).finish();
+  },
+
+  toProtoMsg(message: CapabilityOwners): CapabilityOwnersProtoMsg {
+    return {
+      typeUrl: "/cosmos.capability.v1beta1.CapabilityOwners",
+      value: CapabilityOwners.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/capability/v1beta1/genesis.ts b/__fixtures__/outputv2/cosmos/capability/v1beta1/genesis.ts
index 97853db09..35f0199a8 100644
--- a/__fixtures__/outputv2/cosmos/capability/v1beta1/genesis.ts
+++ b/__fixtures__/outputv2/cosmos/capability/v1beta1/genesis.ts
@@ -11,7 +11,7 @@ export interface GenesisOwners {
   /** index_owners are the owners at the given index. */
   indexOwners?: CapabilityOwners;
 }
-export interface GenesisOwnersProtoType {
+export interface GenesisOwnersProtoMsg {
   typeUrl: "/cosmos.capability.v1beta1.GenesisOwners";
   value: Uint8Array;
 }
@@ -24,7 +24,7 @@ export interface GenesisOwnersAmino {
   /** index_owners are the owners at the given index. */
   index_owners?: CapabilityOwnersAmino;
 }
-export interface GenesisOwnersAminoType {
+export interface GenesisOwnersAminoMsg {
   type: "cosmos-sdk/GenesisOwners";
   value: GenesisOwnersAmino;
 }
@@ -46,7 +46,7 @@ export interface GenesisState {
    */
   owners: GenesisOwners[];
 }
-export interface GenesisStateProtoType {
+export interface GenesisStateProtoMsg {
   typeUrl: "/cosmos.capability.v1beta1.GenesisState";
   value: Uint8Array;
 }
@@ -62,7 +62,7 @@ export interface GenesisStateAmino {
    */
   owners: GenesisOwnersAmino[];
 }
-export interface GenesisStateAminoType {
+export interface GenesisStateAminoMsg {
   type: "cosmos-sdk/GenesisState";
   value: GenesisStateAmino;
 }
@@ -81,6 +81,9 @@ function createBaseGenesisOwners(): GenesisOwners {
 }
 
 export const GenesisOwners = {
+  typeUrl: "/cosmos.capability.v1beta1.GenesisOwners",
+  aminoType: "cosmos-sdk/GenesisOwners",
+
   encode(message: GenesisOwners, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.index.isZero()) {
       writer.uint32(8).uint64(message.index);
@@ -166,6 +169,32 @@ export const GenesisOwners = {
     obj.index = message.index ? message.index.toString() : undefined;
     obj.index_owners = message.indexOwners ? CapabilityOwners.toAmino(message.indexOwners) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisOwnersAminoMsg): GenesisOwners {
+    return GenesisOwners.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GenesisOwners): GenesisOwnersAminoMsg {
+    return {
+      type: "cosmos-sdk/GenesisOwners",
+      value: GenesisOwners.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GenesisOwnersProtoMsg): GenesisOwners {
+    return GenesisOwners.decode(message.value);
+  },
+
+  toProto(message: GenesisOwners): Uint8Array {
+    return GenesisOwners.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisOwners): GenesisOwnersProtoMsg {
+    return {
+      typeUrl: "/cosmos.capability.v1beta1.GenesisOwners",
+      value: GenesisOwners.encode(message).finish()
+    };
   }
 
 };
@@ -178,6 +207,9 @@ function createBaseGenesisState(): GenesisState {
 }
 
 export const GenesisState = {
+  typeUrl: "/cosmos.capability.v1beta1.GenesisState",
+  aminoType: "cosmos-sdk/GenesisState",
+
   encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.index.isZero()) {
       writer.uint32(8).uint64(message.index);
@@ -281,6 +313,32 @@ export const GenesisState = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisStateAminoMsg): GenesisState {
+    return GenesisState.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GenesisState): GenesisStateAminoMsg {
+    return {
+      type: "cosmos-sdk/GenesisState",
+      value: GenesisState.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GenesisStateProtoMsg): GenesisState {
+    return GenesisState.decode(message.value);
+  },
+
+  toProto(message: GenesisState): Uint8Array {
+    return GenesisState.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisState): GenesisStateProtoMsg {
+    return {
+      typeUrl: "/cosmos.capability.v1beta1.GenesisState",
+      value: GenesisState.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/crisis/v1beta1/genesis.ts b/__fixtures__/outputv2/cosmos/crisis/v1beta1/genesis.ts
index 816c8e4c6..ed390181d 100644
--- a/__fixtures__/outputv2/cosmos/crisis/v1beta1/genesis.ts
+++ b/__fixtures__/outputv2/cosmos/crisis/v1beta1/genesis.ts
@@ -11,7 +11,7 @@ export interface GenesisState {
    */
   constantFee?: Coin;
 }
-export interface GenesisStateProtoType {
+export interface GenesisStateProtoMsg {
   typeUrl: "/cosmos.crisis.v1beta1.GenesisState";
   value: Uint8Array;
 }
@@ -24,7 +24,7 @@ export interface GenesisStateAmino {
    */
   constant_fee?: CoinAmino;
 }
-export interface GenesisStateAminoType {
+export interface GenesisStateAminoMsg {
   type: "cosmos-sdk/GenesisState";
   value: GenesisStateAmino;
 }
@@ -41,6 +41,9 @@ function createBaseGenesisState(): GenesisState {
 }
 
 export const GenesisState = {
+  typeUrl: "/cosmos.crisis.v1beta1.GenesisState",
+  aminoType: "cosmos-sdk/GenesisState",
+
   encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.constantFee !== undefined) {
       Coin.encode(message.constantFee, writer.uint32(26).fork()).ldelim();
@@ -111,6 +114,32 @@ export const GenesisState = {
     const obj: any = {};
     obj.constant_fee = message.constantFee ? Coin.toAmino(message.constantFee) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisStateAminoMsg): GenesisState {
+    return GenesisState.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GenesisState): GenesisStateAminoMsg {
+    return {
+      type: "cosmos-sdk/GenesisState",
+      value: GenesisState.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GenesisStateProtoMsg): GenesisState {
+    return GenesisState.decode(message.value);
+  },
+
+  toProto(message: GenesisState): Uint8Array {
+    return GenesisState.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisState): GenesisStateProtoMsg {
+    return {
+      typeUrl: "/cosmos.crisis.v1beta1.GenesisState",
+      value: GenesisState.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/crisis/v1beta1/tx.ts b/__fixtures__/outputv2/cosmos/crisis/v1beta1/tx.ts
index 09972464a..6646efaee 100644
--- a/__fixtures__/outputv2/cosmos/crisis/v1beta1/tx.ts
+++ b/__fixtures__/outputv2/cosmos/crisis/v1beta1/tx.ts
@@ -8,7 +8,7 @@ export interface MsgVerifyInvariant {
   invariantModuleName: string;
   invariantRoute: string;
 }
-export interface MsgVerifyInvariantProtoType {
+export interface MsgVerifyInvariantProtoMsg {
   typeUrl: "/cosmos.crisis.v1beta1.MsgVerifyInvariant";
   value: Uint8Array;
 }
@@ -19,7 +19,7 @@ export interface MsgVerifyInvariantAmino {
   invariant_module_name: string;
   invariant_route: string;
 }
-export interface MsgVerifyInvariantAminoType {
+export interface MsgVerifyInvariantAminoMsg {
   type: "cosmos-sdk/MsgVerifyInvariant";
   value: MsgVerifyInvariantAmino;
 }
@@ -33,14 +33,14 @@ export interface MsgVerifyInvariantSDKType {
 
 /** MsgVerifyInvariantResponse defines the Msg/VerifyInvariant response type. */
 export interface MsgVerifyInvariantResponse {}
-export interface MsgVerifyInvariantResponseProtoType {
+export interface MsgVerifyInvariantResponseProtoMsg {
   typeUrl: "/cosmos.crisis.v1beta1.MsgVerifyInvariantResponse";
   value: Uint8Array;
 }
 
 /** MsgVerifyInvariantResponse defines the Msg/VerifyInvariant response type. */
 export interface MsgVerifyInvariantResponseAmino {}
-export interface MsgVerifyInvariantResponseAminoType {
+export interface MsgVerifyInvariantResponseAminoMsg {
   type: "cosmos-sdk/MsgVerifyInvariantResponse";
   value: MsgVerifyInvariantResponseAmino;
 }
@@ -57,6 +57,9 @@ function createBaseMsgVerifyInvariant(): MsgVerifyInvariant {
 }
 
 export const MsgVerifyInvariant = {
+  typeUrl: "/cosmos.crisis.v1beta1.MsgVerifyInvariant",
+  aminoType: "cosmos-sdk/MsgVerifyInvariant",
+
   encode(message: MsgVerifyInvariant, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.sender !== "") {
       writer.uint32(10).string(message.sender);
@@ -157,6 +160,32 @@ export const MsgVerifyInvariant = {
     obj.invariant_module_name = message.invariantModuleName;
     obj.invariant_route = message.invariantRoute;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgVerifyInvariantAminoMsg): MsgVerifyInvariant {
+    return MsgVerifyInvariant.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgVerifyInvariant): MsgVerifyInvariantAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgVerifyInvariant",
+      value: MsgVerifyInvariant.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgVerifyInvariantProtoMsg): MsgVerifyInvariant {
+    return MsgVerifyInvariant.decode(message.value);
+  },
+
+  toProto(message: MsgVerifyInvariant): Uint8Array {
+    return MsgVerifyInvariant.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgVerifyInvariant): MsgVerifyInvariantProtoMsg {
+    return {
+      typeUrl: "/cosmos.crisis.v1beta1.MsgVerifyInvariant",
+      value: MsgVerifyInvariant.encode(message).finish()
+    };
   }
 
 };
@@ -166,6 +195,9 @@ function createBaseMsgVerifyInvariantResponse(): MsgVerifyInvariantResponse {
 }
 
 export const MsgVerifyInvariantResponse = {
+  typeUrl: "/cosmos.crisis.v1beta1.MsgVerifyInvariantResponse",
+  aminoType: "cosmos-sdk/MsgVerifyInvariantResponse",
+
   encode(_: MsgVerifyInvariantResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -218,6 +250,32 @@ export const MsgVerifyInvariantResponse = {
   toAmino(_: MsgVerifyInvariantResponse): MsgVerifyInvariantResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgVerifyInvariantResponseAminoMsg): MsgVerifyInvariantResponse {
+    return MsgVerifyInvariantResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgVerifyInvariantResponse): MsgVerifyInvariantResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgVerifyInvariantResponse",
+      value: MsgVerifyInvariantResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgVerifyInvariantResponseProtoMsg): MsgVerifyInvariantResponse {
+    return MsgVerifyInvariantResponse.decode(message.value);
+  },
+
+  toProto(message: MsgVerifyInvariantResponse): Uint8Array {
+    return MsgVerifyInvariantResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgVerifyInvariantResponse): MsgVerifyInvariantResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.crisis.v1beta1.MsgVerifyInvariantResponse",
+      value: MsgVerifyInvariantResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/crypto/ed25519/keys.ts b/__fixtures__/outputv2/cosmos/crypto/ed25519/keys.ts
index 7220e7aa7..d9660caa1 100644
--- a/__fixtures__/outputv2/cosmos/crypto/ed25519/keys.ts
+++ b/__fixtures__/outputv2/cosmos/crypto/ed25519/keys.ts
@@ -12,7 +12,7 @@ export const protobufPackage = "cosmos.crypto.ed25519";
 export interface PubKey {
   key: Uint8Array;
 }
-export interface PubKeyProtoType {
+export interface PubKeyProtoMsg {
   typeUrl: "/cosmos.crypto.ed25519.PubKey";
   value: Uint8Array;
 }
@@ -27,7 +27,7 @@ export interface PubKeyProtoType {
 export interface PubKeyAmino {
   key: Uint8Array;
 }
-export interface PubKeyAminoType {
+export interface PubKeyAminoMsg {
   type: "cosmos-sdk/PubKey";
   value: PubKeyAmino;
 }
@@ -50,7 +50,7 @@ export interface PubKeySDKType {
 export interface PrivKey {
   key: Uint8Array;
 }
-export interface PrivKeyProtoType {
+export interface PrivKeyProtoMsg {
   typeUrl: "/cosmos.crypto.ed25519.PrivKey";
   value: Uint8Array;
 }
@@ -62,7 +62,7 @@ export interface PrivKeyProtoType {
 export interface PrivKeyAmino {
   key: Uint8Array;
 }
-export interface PrivKeyAminoType {
+export interface PrivKeyAminoMsg {
   type: "cosmos-sdk/PrivKey";
   value: PrivKeyAmino;
 }
@@ -82,6 +82,9 @@ function createBasePubKey(): PubKey {
 }
 
 export const PubKey = {
+  typeUrl: "/cosmos.crypto.ed25519.PubKey",
+  aminoType: "cosmos-sdk/PubKey",
+
   encode(message: PubKey, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.key.length !== 0) {
       writer.uint32(10).bytes(message.key);
@@ -152,6 +155,32 @@ export const PubKey = {
     const obj: any = {};
     obj.key = message.key;
     return obj;
+  },
+
+  fromAminoMsg(object: PubKeyAminoMsg): PubKey {
+    return PubKey.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: PubKey): PubKeyAminoMsg {
+    return {
+      type: "cosmos-sdk/PubKey",
+      value: PubKey.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: PubKeyProtoMsg): PubKey {
+    return PubKey.decode(message.value);
+  },
+
+  toProto(message: PubKey): Uint8Array {
+    return PubKey.encode(message).finish();
+  },
+
+  toProtoMsg(message: PubKey): PubKeyProtoMsg {
+    return {
+      typeUrl: "/cosmos.crypto.ed25519.PubKey",
+      value: PubKey.encode(message).finish()
+    };
   }
 
 };
@@ -163,6 +192,9 @@ function createBasePrivKey(): PrivKey {
 }
 
 export const PrivKey = {
+  typeUrl: "/cosmos.crypto.ed25519.PrivKey",
+  aminoType: "cosmos-sdk/PrivKey",
+
   encode(message: PrivKey, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.key.length !== 0) {
       writer.uint32(10).bytes(message.key);
@@ -233,6 +265,32 @@ export const PrivKey = {
     const obj: any = {};
     obj.key = message.key;
     return obj;
+  },
+
+  fromAminoMsg(object: PrivKeyAminoMsg): PrivKey {
+    return PrivKey.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: PrivKey): PrivKeyAminoMsg {
+    return {
+      type: "cosmos-sdk/PrivKey",
+      value: PrivKey.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: PrivKeyProtoMsg): PrivKey {
+    return PrivKey.decode(message.value);
+  },
+
+  toProto(message: PrivKey): Uint8Array {
+    return PrivKey.encode(message).finish();
+  },
+
+  toProtoMsg(message: PrivKey): PrivKeyProtoMsg {
+    return {
+      typeUrl: "/cosmos.crypto.ed25519.PrivKey",
+      value: PrivKey.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/crypto/hd/v1/hd.ts b/__fixtures__/outputv2/cosmos/crypto/hd/v1/hd.ts
index fd327f029..14b9a5e39 100644
--- a/__fixtures__/outputv2/cosmos/crypto/hd/v1/hd.ts
+++ b/__fixtures__/outputv2/cosmos/crypto/hd/v1/hd.ts
@@ -22,7 +22,7 @@ export interface BIP44Params {
   /** address_index is used as child index in BIP32 derivation */
   addressIndex: number;
 }
-export interface BIP44ParamsProtoType {
+export interface BIP44ParamsProtoMsg {
   typeUrl: "/cosmos.crypto.hd.v1.BIP44Params";
   value: Uint8Array;
 }
@@ -47,7 +47,7 @@ export interface BIP44ParamsAmino {
   /** address_index is used as child index in BIP32 derivation */
   address_index: number;
 }
-export interface BIP44ParamsAminoType {
+export interface BIP44ParamsAminoMsg {
   type: "cosmos-sdk/BIP44Params";
   value: BIP44ParamsAmino;
 }
@@ -72,6 +72,9 @@ function createBaseBIP44Params(): BIP44Params {
 }
 
 export const BIP44Params = {
+  typeUrl: "/cosmos.crypto.hd.v1.BIP44Params",
+  aminoType: "cosmos-sdk/BIP44Params",
+
   encode(message: BIP44Params, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.purpose !== 0) {
       writer.uint32(8).uint32(message.purpose);
@@ -202,6 +205,32 @@ export const BIP44Params = {
     obj.change = message.change;
     obj.address_index = message.addressIndex;
     return obj;
+  },
+
+  fromAminoMsg(object: BIP44ParamsAminoMsg): BIP44Params {
+    return BIP44Params.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: BIP44Params): BIP44ParamsAminoMsg {
+    return {
+      type: "cosmos-sdk/BIP44Params",
+      value: BIP44Params.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: BIP44ParamsProtoMsg): BIP44Params {
+    return BIP44Params.decode(message.value);
+  },
+
+  toProto(message: BIP44Params): Uint8Array {
+    return BIP44Params.encode(message).finish();
+  },
+
+  toProtoMsg(message: BIP44Params): BIP44ParamsProtoMsg {
+    return {
+      typeUrl: "/cosmos.crypto.hd.v1.BIP44Params",
+      value: BIP44Params.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/crypto/keyring/v1/record.ts b/__fixtures__/outputv2/cosmos/crypto/keyring/v1/record.ts
index bb839f5fb..fd67c76aa 100644
--- a/__fixtures__/outputv2/cosmos/crypto/keyring/v1/record.ts
+++ b/__fixtures__/outputv2/cosmos/crypto/keyring/v1/record.ts
@@ -24,7 +24,7 @@ export interface Record {
   /** Offline does not store any information. */
   offline?: Record_Offline;
 }
-export interface RecordProtoType {
+export interface RecordProtoMsg {
   typeUrl: "/cosmos.crypto.keyring.v1.Record";
   value: Uint8Array;
 }
@@ -49,7 +49,7 @@ export interface RecordAmino {
   /** Offline does not store any information. */
   offline?: Record_OfflineAmino;
 }
-export interface RecordAminoType {
+export interface RecordAminoMsg {
   type: "cosmos-sdk/Record";
   value: RecordAmino;
 }
@@ -72,7 +72,7 @@ export interface Record_Local {
   privKey?: Any;
   privKeyType: string;
 }
-export interface Record_LocalProtoType {
+export interface Record_LocalProtoMsg {
   typeUrl: "/cosmos.crypto.keyring.v1.Local";
   value: Uint8Array;
 }
@@ -85,7 +85,7 @@ export interface Record_LocalAmino {
   priv_key?: AnyAmino;
   priv_key_type: string;
 }
-export interface Record_LocalAminoType {
+export interface Record_LocalAminoMsg {
   type: "cosmos-sdk/Local";
   value: Record_LocalAmino;
 }
@@ -103,7 +103,7 @@ export interface Record_LocalSDKType {
 export interface Record_Ledger {
   path?: BIP44Params;
 }
-export interface Record_LedgerProtoType {
+export interface Record_LedgerProtoMsg {
   typeUrl: "/cosmos.crypto.keyring.v1.Ledger";
   value: Uint8Array;
 }
@@ -112,7 +112,7 @@ export interface Record_LedgerProtoType {
 export interface Record_LedgerAmino {
   path?: BIP44ParamsAmino;
 }
-export interface Record_LedgerAminoType {
+export interface Record_LedgerAminoMsg {
   type: "cosmos-sdk/Ledger";
   value: Record_LedgerAmino;
 }
@@ -124,14 +124,14 @@ export interface Record_LedgerSDKType {
 
 /** Multi item */
 export interface Record_Multi {}
-export interface Record_MultiProtoType {
+export interface Record_MultiProtoMsg {
   typeUrl: "/cosmos.crypto.keyring.v1.Multi";
   value: Uint8Array;
 }
 
 /** Multi item */
 export interface Record_MultiAmino {}
-export interface Record_MultiAminoType {
+export interface Record_MultiAminoMsg {
   type: "cosmos-sdk/Multi";
   value: Record_MultiAmino;
 }
@@ -141,14 +141,14 @@ export interface Record_MultiSDKType {}
 
 /** Offline item */
 export interface Record_Offline {}
-export interface Record_OfflineProtoType {
+export interface Record_OfflineProtoMsg {
   typeUrl: "/cosmos.crypto.keyring.v1.Offline";
   value: Uint8Array;
 }
 
 /** Offline item */
 export interface Record_OfflineAmino {}
-export interface Record_OfflineAminoType {
+export interface Record_OfflineAminoMsg {
   type: "cosmos-sdk/Offline";
   value: Record_OfflineAmino;
 }
@@ -168,6 +168,9 @@ function createBaseRecord(): Record {
 }
 
 export const Record = {
+  typeUrl: "/cosmos.crypto.keyring.v1.Record",
+  aminoType: "cosmos-sdk/Record",
+
   encode(message: Record, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -313,6 +316,32 @@ export const Record = {
     obj.multi = message.multi ? Record_Multi.toAmino(message.multi) : undefined;
     obj.offline = message.offline ? Record_Offline.toAmino(message.offline) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: RecordAminoMsg): Record {
+    return Record.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Record): RecordAminoMsg {
+    return {
+      type: "cosmos-sdk/Record",
+      value: Record.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: RecordProtoMsg): Record {
+    return Record.decode(message.value);
+  },
+
+  toProto(message: Record): Uint8Array {
+    return Record.encode(message).finish();
+  },
+
+  toProtoMsg(message: Record): RecordProtoMsg {
+    return {
+      typeUrl: "/cosmos.crypto.keyring.v1.Record",
+      value: Record.encode(message).finish()
+    };
   }
 
 };
@@ -325,6 +354,9 @@ function createBaseRecord_Local(): Record_Local {
 }
 
 export const Record_Local = {
+  typeUrl: "/cosmos.crypto.keyring.v1.Local",
+  aminoType: "cosmos-sdk/Local",
+
   encode(message: Record_Local, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.privKey !== undefined) {
       Any.encode(message.privKey, writer.uint32(10).fork()).ldelim();
@@ -410,6 +442,32 @@ export const Record_Local = {
     obj.priv_key = message.privKey ? Any.toAmino(message.privKey) : undefined;
     obj.priv_key_type = message.privKeyType;
     return obj;
+  },
+
+  fromAminoMsg(object: Record_LocalAminoMsg): Record_Local {
+    return Record_Local.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Record_Local): Record_LocalAminoMsg {
+    return {
+      type: "cosmos-sdk/Local",
+      value: Record_Local.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: Record_LocalProtoMsg): Record_Local {
+    return Record_Local.decode(message.value);
+  },
+
+  toProto(message: Record_Local): Uint8Array {
+    return Record_Local.encode(message).finish();
+  },
+
+  toProtoMsg(message: Record_Local): Record_LocalProtoMsg {
+    return {
+      typeUrl: "/cosmos.crypto.keyring.v1.Local",
+      value: Record_Local.encode(message).finish()
+    };
   }
 
 };
@@ -421,6 +479,9 @@ function createBaseRecord_Ledger(): Record_Ledger {
 }
 
 export const Record_Ledger = {
+  typeUrl: "/cosmos.crypto.keyring.v1.Ledger",
+  aminoType: "cosmos-sdk/Ledger",
+
   encode(message: Record_Ledger, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.path !== undefined) {
       BIP44Params.encode(message.path, writer.uint32(10).fork()).ldelim();
@@ -491,6 +552,32 @@ export const Record_Ledger = {
     const obj: any = {};
     obj.path = message.path ? BIP44Params.toAmino(message.path) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: Record_LedgerAminoMsg): Record_Ledger {
+    return Record_Ledger.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Record_Ledger): Record_LedgerAminoMsg {
+    return {
+      type: "cosmos-sdk/Ledger",
+      value: Record_Ledger.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: Record_LedgerProtoMsg): Record_Ledger {
+    return Record_Ledger.decode(message.value);
+  },
+
+  toProto(message: Record_Ledger): Uint8Array {
+    return Record_Ledger.encode(message).finish();
+  },
+
+  toProtoMsg(message: Record_Ledger): Record_LedgerProtoMsg {
+    return {
+      typeUrl: "/cosmos.crypto.keyring.v1.Ledger",
+      value: Record_Ledger.encode(message).finish()
+    };
   }
 
 };
@@ -500,6 +587,9 @@ function createBaseRecord_Multi(): Record_Multi {
 }
 
 export const Record_Multi = {
+  typeUrl: "/cosmos.crypto.keyring.v1.Multi",
+  aminoType: "cosmos-sdk/Multi",
+
   encode(_: Record_Multi, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -552,6 +642,32 @@ export const Record_Multi = {
   toAmino(_: Record_Multi): Record_MultiAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: Record_MultiAminoMsg): Record_Multi {
+    return Record_Multi.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Record_Multi): Record_MultiAminoMsg {
+    return {
+      type: "cosmos-sdk/Multi",
+      value: Record_Multi.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: Record_MultiProtoMsg): Record_Multi {
+    return Record_Multi.decode(message.value);
+  },
+
+  toProto(message: Record_Multi): Uint8Array {
+    return Record_Multi.encode(message).finish();
+  },
+
+  toProtoMsg(message: Record_Multi): Record_MultiProtoMsg {
+    return {
+      typeUrl: "/cosmos.crypto.keyring.v1.Multi",
+      value: Record_Multi.encode(message).finish()
+    };
   }
 
 };
@@ -561,6 +677,9 @@ function createBaseRecord_Offline(): Record_Offline {
 }
 
 export const Record_Offline = {
+  typeUrl: "/cosmos.crypto.keyring.v1.Offline",
+  aminoType: "cosmos-sdk/Offline",
+
   encode(_: Record_Offline, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -613,6 +732,32 @@ export const Record_Offline = {
   toAmino(_: Record_Offline): Record_OfflineAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: Record_OfflineAminoMsg): Record_Offline {
+    return Record_Offline.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Record_Offline): Record_OfflineAminoMsg {
+    return {
+      type: "cosmos-sdk/Offline",
+      value: Record_Offline.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: Record_OfflineProtoMsg): Record_Offline {
+    return Record_Offline.decode(message.value);
+  },
+
+  toProto(message: Record_Offline): Uint8Array {
+    return Record_Offline.encode(message).finish();
+  },
+
+  toProtoMsg(message: Record_Offline): Record_OfflineProtoMsg {
+    return {
+      typeUrl: "/cosmos.crypto.keyring.v1.Offline",
+      value: Record_Offline.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/crypto/multisig/keys.ts b/__fixtures__/outputv2/cosmos/crypto/multisig/keys.ts
index 5611416e7..1d4d7f48d 100644
--- a/__fixtures__/outputv2/cosmos/crypto/multisig/keys.ts
+++ b/__fixtures__/outputv2/cosmos/crypto/multisig/keys.ts
@@ -12,7 +12,7 @@ export interface LegacyAminoPubKey {
   threshold: number;
   publicKeys: Any[];
 }
-export interface LegacyAminoPubKeyProtoType {
+export interface LegacyAminoPubKeyProtoMsg {
   typeUrl: "/cosmos.crypto.multisig.LegacyAminoPubKey";
   value: Uint8Array;
 }
@@ -26,7 +26,7 @@ export interface LegacyAminoPubKeyAmino {
   threshold: number;
   public_keys: AnyAmino[];
 }
-export interface LegacyAminoPubKeyAminoType {
+export interface LegacyAminoPubKeyAminoMsg {
   type: "cosmos-sdk/LegacyAminoPubKey";
   value: LegacyAminoPubKeyAmino;
 }
@@ -49,6 +49,9 @@ function createBaseLegacyAminoPubKey(): LegacyAminoPubKey {
 }
 
 export const LegacyAminoPubKey = {
+  typeUrl: "/cosmos.crypto.multisig.LegacyAminoPubKey",
+  aminoType: "cosmos-sdk/LegacyAminoPubKey",
+
   encode(message: LegacyAminoPubKey, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.threshold !== 0) {
       writer.uint32(8).uint32(message.threshold);
@@ -152,6 +155,32 @@ export const LegacyAminoPubKey = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: LegacyAminoPubKeyAminoMsg): LegacyAminoPubKey {
+    return LegacyAminoPubKey.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: LegacyAminoPubKey): LegacyAminoPubKeyAminoMsg {
+    return {
+      type: "cosmos-sdk/LegacyAminoPubKey",
+      value: LegacyAminoPubKey.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: LegacyAminoPubKeyProtoMsg): LegacyAminoPubKey {
+    return LegacyAminoPubKey.decode(message.value);
+  },
+
+  toProto(message: LegacyAminoPubKey): Uint8Array {
+    return LegacyAminoPubKey.encode(message).finish();
+  },
+
+  toProtoMsg(message: LegacyAminoPubKey): LegacyAminoPubKeyProtoMsg {
+    return {
+      typeUrl: "/cosmos.crypto.multisig.LegacyAminoPubKey",
+      value: LegacyAminoPubKey.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/crypto/multisig/v1beta1/multisig.ts b/__fixtures__/outputv2/cosmos/crypto/multisig/v1beta1/multisig.ts
index bb26eb34b..7fc631c8f 100644
--- a/__fixtures__/outputv2/cosmos/crypto/multisig/v1beta1/multisig.ts
+++ b/__fixtures__/outputv2/cosmos/crypto/multisig/v1beta1/multisig.ts
@@ -10,7 +10,7 @@ export const protobufPackage = "cosmos.crypto.multisig.v1beta1";
 export interface MultiSignature {
   signatures: Uint8Array[];
 }
-export interface MultiSignatureProtoType {
+export interface MultiSignatureProtoMsg {
   typeUrl: "/cosmos.crypto.multisig.v1beta1.MultiSignature";
   value: Uint8Array;
 }
@@ -23,7 +23,7 @@ export interface MultiSignatureProtoType {
 export interface MultiSignatureAmino {
   signatures: Uint8Array[];
 }
-export interface MultiSignatureAminoType {
+export interface MultiSignatureAminoMsg {
   type: "cosmos-sdk/MultiSignature";
   value: MultiSignatureAmino;
 }
@@ -47,7 +47,7 @@ export interface CompactBitArray {
   extraBitsStored: number;
   elems: Uint8Array;
 }
-export interface CompactBitArrayProtoType {
+export interface CompactBitArrayProtoMsg {
   typeUrl: "/cosmos.crypto.multisig.v1beta1.CompactBitArray";
   value: Uint8Array;
 }
@@ -62,7 +62,7 @@ export interface CompactBitArrayAmino {
   extra_bits_stored: number;
   elems: Uint8Array;
 }
-export interface CompactBitArrayAminoType {
+export interface CompactBitArrayAminoMsg {
   type: "cosmos-sdk/CompactBitArray";
   value: CompactBitArrayAmino;
 }
@@ -85,6 +85,9 @@ function createBaseMultiSignature(): MultiSignature {
 }
 
 export const MultiSignature = {
+  typeUrl: "/cosmos.crypto.multisig.v1beta1.MultiSignature",
+  aminoType: "cosmos-sdk/MultiSignature",
+
   encode(message: MultiSignature, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.signatures) {
       writer.uint32(10).bytes(v!);
@@ -173,6 +176,32 @@ export const MultiSignature = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: MultiSignatureAminoMsg): MultiSignature {
+    return MultiSignature.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MultiSignature): MultiSignatureAminoMsg {
+    return {
+      type: "cosmos-sdk/MultiSignature",
+      value: MultiSignature.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MultiSignatureProtoMsg): MultiSignature {
+    return MultiSignature.decode(message.value);
+  },
+
+  toProto(message: MultiSignature): Uint8Array {
+    return MultiSignature.encode(message).finish();
+  },
+
+  toProtoMsg(message: MultiSignature): MultiSignatureProtoMsg {
+    return {
+      typeUrl: "/cosmos.crypto.multisig.v1beta1.MultiSignature",
+      value: MultiSignature.encode(message).finish()
+    };
   }
 
 };
@@ -185,6 +214,9 @@ function createBaseCompactBitArray(): CompactBitArray {
 }
 
 export const CompactBitArray = {
+  typeUrl: "/cosmos.crypto.multisig.v1beta1.CompactBitArray",
+  aminoType: "cosmos-sdk/CompactBitArray",
+
   encode(message: CompactBitArray, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.extraBitsStored !== 0) {
       writer.uint32(8).uint32(message.extraBitsStored);
@@ -270,6 +302,32 @@ export const CompactBitArray = {
     obj.extra_bits_stored = message.extraBitsStored;
     obj.elems = message.elems;
     return obj;
+  },
+
+  fromAminoMsg(object: CompactBitArrayAminoMsg): CompactBitArray {
+    return CompactBitArray.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: CompactBitArray): CompactBitArrayAminoMsg {
+    return {
+      type: "cosmos-sdk/CompactBitArray",
+      value: CompactBitArray.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: CompactBitArrayProtoMsg): CompactBitArray {
+    return CompactBitArray.decode(message.value);
+  },
+
+  toProto(message: CompactBitArray): Uint8Array {
+    return CompactBitArray.encode(message).finish();
+  },
+
+  toProtoMsg(message: CompactBitArray): CompactBitArrayProtoMsg {
+    return {
+      typeUrl: "/cosmos.crypto.multisig.v1beta1.CompactBitArray",
+      value: CompactBitArray.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/crypto/secp256k1/keys.ts b/__fixtures__/outputv2/cosmos/crypto/secp256k1/keys.ts
index d7f42cfa1..45aa3b689 100644
--- a/__fixtures__/outputv2/cosmos/crypto/secp256k1/keys.ts
+++ b/__fixtures__/outputv2/cosmos/crypto/secp256k1/keys.ts
@@ -12,7 +12,7 @@ export const protobufPackage = "cosmos.crypto.secp256k1";
 export interface PubKey {
   key: Uint8Array;
 }
-export interface PubKeyProtoType {
+export interface PubKeyProtoMsg {
   typeUrl: "/cosmos.crypto.secp256k1.PubKey";
   value: Uint8Array;
 }
@@ -27,7 +27,7 @@ export interface PubKeyProtoType {
 export interface PubKeyAmino {
   key: Uint8Array;
 }
-export interface PubKeyAminoType {
+export interface PubKeyAminoMsg {
   type: "cosmos-sdk/PubKey";
   value: PubKeyAmino;
 }
@@ -47,7 +47,7 @@ export interface PubKeySDKType {
 export interface PrivKey {
   key: Uint8Array;
 }
-export interface PrivKeyProtoType {
+export interface PrivKeyProtoMsg {
   typeUrl: "/cosmos.crypto.secp256k1.PrivKey";
   value: Uint8Array;
 }
@@ -56,7 +56,7 @@ export interface PrivKeyProtoType {
 export interface PrivKeyAmino {
   key: Uint8Array;
 }
-export interface PrivKeyAminoType {
+export interface PrivKeyAminoMsg {
   type: "cosmos-sdk/PrivKey";
   value: PrivKeyAmino;
 }
@@ -73,6 +73,9 @@ function createBasePubKey(): PubKey {
 }
 
 export const PubKey = {
+  typeUrl: "/cosmos.crypto.secp256k1.PubKey",
+  aminoType: "cosmos-sdk/PubKey",
+
   encode(message: PubKey, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.key.length !== 0) {
       writer.uint32(10).bytes(message.key);
@@ -143,6 +146,32 @@ export const PubKey = {
     const obj: any = {};
     obj.key = message.key;
     return obj;
+  },
+
+  fromAminoMsg(object: PubKeyAminoMsg): PubKey {
+    return PubKey.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: PubKey): PubKeyAminoMsg {
+    return {
+      type: "cosmos-sdk/PubKey",
+      value: PubKey.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: PubKeyProtoMsg): PubKey {
+    return PubKey.decode(message.value);
+  },
+
+  toProto(message: PubKey): Uint8Array {
+    return PubKey.encode(message).finish();
+  },
+
+  toProtoMsg(message: PubKey): PubKeyProtoMsg {
+    return {
+      typeUrl: "/cosmos.crypto.secp256k1.PubKey",
+      value: PubKey.encode(message).finish()
+    };
   }
 
 };
@@ -154,6 +183,9 @@ function createBasePrivKey(): PrivKey {
 }
 
 export const PrivKey = {
+  typeUrl: "/cosmos.crypto.secp256k1.PrivKey",
+  aminoType: "cosmos-sdk/PrivKey",
+
   encode(message: PrivKey, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.key.length !== 0) {
       writer.uint32(10).bytes(message.key);
@@ -224,6 +256,32 @@ export const PrivKey = {
     const obj: any = {};
     obj.key = message.key;
     return obj;
+  },
+
+  fromAminoMsg(object: PrivKeyAminoMsg): PrivKey {
+    return PrivKey.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: PrivKey): PrivKeyAminoMsg {
+    return {
+      type: "cosmos-sdk/PrivKey",
+      value: PrivKey.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: PrivKeyProtoMsg): PrivKey {
+    return PrivKey.decode(message.value);
+  },
+
+  toProto(message: PrivKey): Uint8Array {
+    return PrivKey.encode(message).finish();
+  },
+
+  toProtoMsg(message: PrivKey): PrivKeyProtoMsg {
+    return {
+      typeUrl: "/cosmos.crypto.secp256k1.PrivKey",
+      value: PrivKey.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/crypto/secp256r1/keys.ts b/__fixtures__/outputv2/cosmos/crypto/secp256r1/keys.ts
index c972ca0e0..3de32fe43 100644
--- a/__fixtures__/outputv2/cosmos/crypto/secp256r1/keys.ts
+++ b/__fixtures__/outputv2/cosmos/crypto/secp256r1/keys.ts
@@ -10,7 +10,7 @@ export interface PubKey {
    */
   key: Uint8Array;
 }
-export interface PubKeyProtoType {
+export interface PubKeyProtoMsg {
   typeUrl: "/cosmos.crypto.secp256r1.PubKey";
   value: Uint8Array;
 }
@@ -23,7 +23,7 @@ export interface PubKeyAmino {
    */
   key: Uint8Array;
 }
-export interface PubKeyAminoType {
+export interface PubKeyAminoMsg {
   type: "cosmos-sdk/PubKey";
   value: PubKeyAmino;
 }
@@ -38,7 +38,7 @@ export interface PrivKey {
   /** secret number serialized using big-endian encoding */
   secret: Uint8Array;
 }
-export interface PrivKeyProtoType {
+export interface PrivKeyProtoMsg {
   typeUrl: "/cosmos.crypto.secp256r1.PrivKey";
   value: Uint8Array;
 }
@@ -48,7 +48,7 @@ export interface PrivKeyAmino {
   /** secret number serialized using big-endian encoding */
   secret: Uint8Array;
 }
-export interface PrivKeyAminoType {
+export interface PrivKeyAminoMsg {
   type: "cosmos-sdk/PrivKey";
   value: PrivKeyAmino;
 }
@@ -65,6 +65,9 @@ function createBasePubKey(): PubKey {
 }
 
 export const PubKey = {
+  typeUrl: "/cosmos.crypto.secp256r1.PubKey",
+  aminoType: "cosmos-sdk/PubKey",
+
   encode(message: PubKey, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.key.length !== 0) {
       writer.uint32(10).bytes(message.key);
@@ -135,6 +138,32 @@ export const PubKey = {
     const obj: any = {};
     obj.key = message.key;
     return obj;
+  },
+
+  fromAminoMsg(object: PubKeyAminoMsg): PubKey {
+    return PubKey.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: PubKey): PubKeyAminoMsg {
+    return {
+      type: "cosmos-sdk/PubKey",
+      value: PubKey.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: PubKeyProtoMsg): PubKey {
+    return PubKey.decode(message.value);
+  },
+
+  toProto(message: PubKey): Uint8Array {
+    return PubKey.encode(message).finish();
+  },
+
+  toProtoMsg(message: PubKey): PubKeyProtoMsg {
+    return {
+      typeUrl: "/cosmos.crypto.secp256r1.PubKey",
+      value: PubKey.encode(message).finish()
+    };
   }
 
 };
@@ -146,6 +175,9 @@ function createBasePrivKey(): PrivKey {
 }
 
 export const PrivKey = {
+  typeUrl: "/cosmos.crypto.secp256r1.PrivKey",
+  aminoType: "cosmos-sdk/PrivKey",
+
   encode(message: PrivKey, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.secret.length !== 0) {
       writer.uint32(10).bytes(message.secret);
@@ -216,6 +248,32 @@ export const PrivKey = {
     const obj: any = {};
     obj.secret = message.secret;
     return obj;
+  },
+
+  fromAminoMsg(object: PrivKeyAminoMsg): PrivKey {
+    return PrivKey.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: PrivKey): PrivKeyAminoMsg {
+    return {
+      type: "cosmos-sdk/PrivKey",
+      value: PrivKey.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: PrivKeyProtoMsg): PrivKey {
+    return PrivKey.decode(message.value);
+  },
+
+  toProto(message: PrivKey): Uint8Array {
+    return PrivKey.encode(message).finish();
+  },
+
+  toProtoMsg(message: PrivKey): PrivKeyProtoMsg {
+    return {
+      typeUrl: "/cosmos.crypto.secp256r1.PrivKey",
+      value: PrivKey.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/distribution/v1beta1/distribution.ts b/__fixtures__/outputv2/cosmos/distribution/v1beta1/distribution.ts
index df3e19f52..dc592326b 100644
--- a/__fixtures__/outputv2/cosmos/distribution/v1beta1/distribution.ts
+++ b/__fixtures__/outputv2/cosmos/distribution/v1beta1/distribution.ts
@@ -10,7 +10,7 @@ export interface Params {
   bonusProposerReward: string;
   withdrawAddrEnabled: boolean;
 }
-export interface ParamsProtoType {
+export interface ParamsProtoMsg {
   typeUrl: "/cosmos.distribution.v1beta1.Params";
   value: Uint8Array;
 }
@@ -22,7 +22,7 @@ export interface ParamsAmino {
   bonus_proposer_reward: string;
   withdraw_addr_enabled: boolean;
 }
-export interface ParamsAminoType {
+export interface ParamsAminoMsg {
   type: "cosmos-sdk/Params";
   value: ParamsAmino;
 }
@@ -53,7 +53,7 @@ export interface ValidatorHistoricalRewards {
   cumulativeRewardRatio: DecCoin[];
   referenceCount: number;
 }
-export interface ValidatorHistoricalRewardsProtoType {
+export interface ValidatorHistoricalRewardsProtoMsg {
   typeUrl: "/cosmos.distribution.v1beta1.ValidatorHistoricalRewards";
   value: Uint8Array;
 }
@@ -76,7 +76,7 @@ export interface ValidatorHistoricalRewardsAmino {
   cumulative_reward_ratio: DecCoinAmino[];
   reference_count: number;
 }
-export interface ValidatorHistoricalRewardsAminoType {
+export interface ValidatorHistoricalRewardsAminoMsg {
   type: "cosmos-sdk/ValidatorHistoricalRewards";
   value: ValidatorHistoricalRewardsAmino;
 }
@@ -109,7 +109,7 @@ export interface ValidatorCurrentRewards {
   rewards: DecCoin[];
   period: Long;
 }
-export interface ValidatorCurrentRewardsProtoType {
+export interface ValidatorCurrentRewardsProtoMsg {
   typeUrl: "/cosmos.distribution.v1beta1.ValidatorCurrentRewards";
   value: Uint8Array;
 }
@@ -123,7 +123,7 @@ export interface ValidatorCurrentRewardsAmino {
   rewards: DecCoinAmino[];
   period: string;
 }
-export interface ValidatorCurrentRewardsAminoType {
+export interface ValidatorCurrentRewardsAminoMsg {
   type: "cosmos-sdk/ValidatorCurrentRewards";
   value: ValidatorCurrentRewardsAmino;
 }
@@ -145,7 +145,7 @@ export interface ValidatorCurrentRewardsSDKType {
 export interface ValidatorAccumulatedCommission {
   commission: DecCoin[];
 }
-export interface ValidatorAccumulatedCommissionProtoType {
+export interface ValidatorAccumulatedCommissionProtoMsg {
   typeUrl: "/cosmos.distribution.v1beta1.ValidatorAccumulatedCommission";
   value: Uint8Array;
 }
@@ -157,7 +157,7 @@ export interface ValidatorAccumulatedCommissionProtoType {
 export interface ValidatorAccumulatedCommissionAmino {
   commission: DecCoinAmino[];
 }
-export interface ValidatorAccumulatedCommissionAminoType {
+export interface ValidatorAccumulatedCommissionAminoMsg {
   type: "cosmos-sdk/ValidatorAccumulatedCommission";
   value: ValidatorAccumulatedCommissionAmino;
 }
@@ -177,7 +177,7 @@ export interface ValidatorAccumulatedCommissionSDKType {
 export interface ValidatorOutstandingRewards {
   rewards: DecCoin[];
 }
-export interface ValidatorOutstandingRewardsProtoType {
+export interface ValidatorOutstandingRewardsProtoMsg {
   typeUrl: "/cosmos.distribution.v1beta1.ValidatorOutstandingRewards";
   value: Uint8Array;
 }
@@ -189,7 +189,7 @@ export interface ValidatorOutstandingRewardsProtoType {
 export interface ValidatorOutstandingRewardsAmino {
   rewards: DecCoinAmino[];
 }
-export interface ValidatorOutstandingRewardsAminoType {
+export interface ValidatorOutstandingRewardsAminoMsg {
   type: "cosmos-sdk/ValidatorOutstandingRewards";
   value: ValidatorOutstandingRewardsAmino;
 }
@@ -212,7 +212,7 @@ export interface ValidatorSlashEvent {
   validatorPeriod: Long;
   fraction: string;
 }
-export interface ValidatorSlashEventProtoType {
+export interface ValidatorSlashEventProtoMsg {
   typeUrl: "/cosmos.distribution.v1beta1.ValidatorSlashEvent";
   value: Uint8Array;
 }
@@ -227,7 +227,7 @@ export interface ValidatorSlashEventAmino {
   validator_period: string;
   fraction: string;
 }
-export interface ValidatorSlashEventAminoType {
+export interface ValidatorSlashEventAminoMsg {
   type: "cosmos-sdk/ValidatorSlashEvent";
   value: ValidatorSlashEventAmino;
 }
@@ -247,7 +247,7 @@ export interface ValidatorSlashEventSDKType {
 export interface ValidatorSlashEvents {
   validatorSlashEvents: ValidatorSlashEvent[];
 }
-export interface ValidatorSlashEventsProtoType {
+export interface ValidatorSlashEventsProtoMsg {
   typeUrl: "/cosmos.distribution.v1beta1.ValidatorSlashEvents";
   value: Uint8Array;
 }
@@ -256,7 +256,7 @@ export interface ValidatorSlashEventsProtoType {
 export interface ValidatorSlashEventsAmino {
   validator_slash_events: ValidatorSlashEventAmino[];
 }
-export interface ValidatorSlashEventsAminoType {
+export interface ValidatorSlashEventsAminoMsg {
   type: "cosmos-sdk/ValidatorSlashEvents";
   value: ValidatorSlashEventsAmino;
 }
@@ -270,7 +270,7 @@ export interface ValidatorSlashEventsSDKType {
 export interface FeePool {
   communityPool: DecCoin[];
 }
-export interface FeePoolProtoType {
+export interface FeePoolProtoMsg {
   typeUrl: "/cosmos.distribution.v1beta1.FeePool";
   value: Uint8Array;
 }
@@ -279,7 +279,7 @@ export interface FeePoolProtoType {
 export interface FeePoolAmino {
   community_pool: DecCoinAmino[];
 }
-export interface FeePoolAminoType {
+export interface FeePoolAminoMsg {
   type: "cosmos-sdk/FeePool";
   value: FeePoolAmino;
 }
@@ -300,7 +300,7 @@ export interface CommunityPoolSpendProposal {
   recipient: string;
   amount: Coin[];
 }
-export interface CommunityPoolSpendProposalProtoType {
+export interface CommunityPoolSpendProposalProtoMsg {
   typeUrl: "/cosmos.distribution.v1beta1.CommunityPoolSpendProposal";
   value: Uint8Array;
 }
@@ -316,7 +316,7 @@ export interface CommunityPoolSpendProposalAmino {
   recipient: string;
   amount: CoinAmino[];
 }
-export interface CommunityPoolSpendProposalAminoType {
+export interface CommunityPoolSpendProposalAminoMsg {
   type: "cosmos-sdk/CommunityPoolSpendProposal";
   value: CommunityPoolSpendProposalAmino;
 }
@@ -346,7 +346,7 @@ export interface DelegatorStartingInfo {
   stake: string;
   height: Long;
 }
-export interface DelegatorStartingInfoProtoType {
+export interface DelegatorStartingInfoProtoMsg {
   typeUrl: "/cosmos.distribution.v1beta1.DelegatorStartingInfo";
   value: Uint8Array;
 }
@@ -364,7 +364,7 @@ export interface DelegatorStartingInfoAmino {
   stake: string;
   height: string;
 }
-export interface DelegatorStartingInfoAminoType {
+export interface DelegatorStartingInfoAminoMsg {
   type: "cosmos-sdk/DelegatorStartingInfo";
   value: DelegatorStartingInfoAmino;
 }
@@ -391,7 +391,7 @@ export interface DelegationDelegatorReward {
   validatorAddress: string;
   reward: DecCoin[];
 }
-export interface DelegationDelegatorRewardProtoType {
+export interface DelegationDelegatorRewardProtoMsg {
   typeUrl: "/cosmos.distribution.v1beta1.DelegationDelegatorReward";
   value: Uint8Array;
 }
@@ -404,7 +404,7 @@ export interface DelegationDelegatorRewardAmino {
   validator_address: string;
   reward: DecCoinAmino[];
 }
-export interface DelegationDelegatorRewardAminoType {
+export interface DelegationDelegatorRewardAminoMsg {
   type: "cosmos-sdk/DelegationDelegatorReward";
   value: DelegationDelegatorRewardAmino;
 }
@@ -429,7 +429,7 @@ export interface CommunityPoolSpendProposalWithDeposit {
   amount: string;
   deposit: string;
 }
-export interface CommunityPoolSpendProposalWithDepositProtoType {
+export interface CommunityPoolSpendProposalWithDepositProtoMsg {
   typeUrl: "/cosmos.distribution.v1beta1.CommunityPoolSpendProposalWithDeposit";
   value: Uint8Array;
 }
@@ -445,7 +445,7 @@ export interface CommunityPoolSpendProposalWithDepositAmino {
   amount: string;
   deposit: string;
 }
-export interface CommunityPoolSpendProposalWithDepositAminoType {
+export interface CommunityPoolSpendProposalWithDepositAminoMsg {
   type: "cosmos-sdk/CommunityPoolSpendProposalWithDeposit";
   value: CommunityPoolSpendProposalWithDepositAmino;
 }
@@ -472,6 +472,9 @@ function createBaseParams(): Params {
 }
 
 export const Params = {
+  typeUrl: "/cosmos.distribution.v1beta1.Params",
+  aminoType: "cosmos-sdk/Params",
+
   encode(message: Params, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.communityTax !== "") {
       writer.uint32(10).string(message.communityTax);
@@ -587,6 +590,32 @@ export const Params = {
     obj.bonus_proposer_reward = message.bonusProposerReward;
     obj.withdraw_addr_enabled = message.withdrawAddrEnabled;
     return obj;
+  },
+
+  fromAminoMsg(object: ParamsAminoMsg): Params {
+    return Params.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Params): ParamsAminoMsg {
+    return {
+      type: "cosmos-sdk/Params",
+      value: Params.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ParamsProtoMsg): Params {
+    return Params.decode(message.value);
+  },
+
+  toProto(message: Params): Uint8Array {
+    return Params.encode(message).finish();
+  },
+
+  toProtoMsg(message: Params): ParamsProtoMsg {
+    return {
+      typeUrl: "/cosmos.distribution.v1beta1.Params",
+      value: Params.encode(message).finish()
+    };
   }
 
 };
@@ -599,6 +628,9 @@ function createBaseValidatorHistoricalRewards(): ValidatorHistoricalRewards {
 }
 
 export const ValidatorHistoricalRewards = {
+  typeUrl: "/cosmos.distribution.v1beta1.ValidatorHistoricalRewards",
+  aminoType: "cosmos-sdk/ValidatorHistoricalRewards",
+
   encode(message: ValidatorHistoricalRewards, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.cumulativeRewardRatio) {
       DecCoin.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -702,6 +734,32 @@ export const ValidatorHistoricalRewards = {
 
     obj.reference_count = message.referenceCount;
     return obj;
+  },
+
+  fromAminoMsg(object: ValidatorHistoricalRewardsAminoMsg): ValidatorHistoricalRewards {
+    return ValidatorHistoricalRewards.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ValidatorHistoricalRewards): ValidatorHistoricalRewardsAminoMsg {
+    return {
+      type: "cosmos-sdk/ValidatorHistoricalRewards",
+      value: ValidatorHistoricalRewards.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ValidatorHistoricalRewardsProtoMsg): ValidatorHistoricalRewards {
+    return ValidatorHistoricalRewards.decode(message.value);
+  },
+
+  toProto(message: ValidatorHistoricalRewards): Uint8Array {
+    return ValidatorHistoricalRewards.encode(message).finish();
+  },
+
+  toProtoMsg(message: ValidatorHistoricalRewards): ValidatorHistoricalRewardsProtoMsg {
+    return {
+      typeUrl: "/cosmos.distribution.v1beta1.ValidatorHistoricalRewards",
+      value: ValidatorHistoricalRewards.encode(message).finish()
+    };
   }
 
 };
@@ -714,6 +772,9 @@ function createBaseValidatorCurrentRewards(): ValidatorCurrentRewards {
 }
 
 export const ValidatorCurrentRewards = {
+  typeUrl: "/cosmos.distribution.v1beta1.ValidatorCurrentRewards",
+  aminoType: "cosmos-sdk/ValidatorCurrentRewards",
+
   encode(message: ValidatorCurrentRewards, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.rewards) {
       DecCoin.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -817,6 +878,32 @@ export const ValidatorCurrentRewards = {
 
     obj.period = message.period ? message.period.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ValidatorCurrentRewardsAminoMsg): ValidatorCurrentRewards {
+    return ValidatorCurrentRewards.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ValidatorCurrentRewards): ValidatorCurrentRewardsAminoMsg {
+    return {
+      type: "cosmos-sdk/ValidatorCurrentRewards",
+      value: ValidatorCurrentRewards.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ValidatorCurrentRewardsProtoMsg): ValidatorCurrentRewards {
+    return ValidatorCurrentRewards.decode(message.value);
+  },
+
+  toProto(message: ValidatorCurrentRewards): Uint8Array {
+    return ValidatorCurrentRewards.encode(message).finish();
+  },
+
+  toProtoMsg(message: ValidatorCurrentRewards): ValidatorCurrentRewardsProtoMsg {
+    return {
+      typeUrl: "/cosmos.distribution.v1beta1.ValidatorCurrentRewards",
+      value: ValidatorCurrentRewards.encode(message).finish()
+    };
   }
 
 };
@@ -828,6 +915,9 @@ function createBaseValidatorAccumulatedCommission(): ValidatorAccumulatedCommiss
 }
 
 export const ValidatorAccumulatedCommission = {
+  typeUrl: "/cosmos.distribution.v1beta1.ValidatorAccumulatedCommission",
+  aminoType: "cosmos-sdk/ValidatorAccumulatedCommission",
+
   encode(message: ValidatorAccumulatedCommission, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.commission) {
       DecCoin.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -916,6 +1006,32 @@ export const ValidatorAccumulatedCommission = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ValidatorAccumulatedCommissionAminoMsg): ValidatorAccumulatedCommission {
+    return ValidatorAccumulatedCommission.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ValidatorAccumulatedCommission): ValidatorAccumulatedCommissionAminoMsg {
+    return {
+      type: "cosmos-sdk/ValidatorAccumulatedCommission",
+      value: ValidatorAccumulatedCommission.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ValidatorAccumulatedCommissionProtoMsg): ValidatorAccumulatedCommission {
+    return ValidatorAccumulatedCommission.decode(message.value);
+  },
+
+  toProto(message: ValidatorAccumulatedCommission): Uint8Array {
+    return ValidatorAccumulatedCommission.encode(message).finish();
+  },
+
+  toProtoMsg(message: ValidatorAccumulatedCommission): ValidatorAccumulatedCommissionProtoMsg {
+    return {
+      typeUrl: "/cosmos.distribution.v1beta1.ValidatorAccumulatedCommission",
+      value: ValidatorAccumulatedCommission.encode(message).finish()
+    };
   }
 
 };
@@ -927,6 +1043,9 @@ function createBaseValidatorOutstandingRewards(): ValidatorOutstandingRewards {
 }
 
 export const ValidatorOutstandingRewards = {
+  typeUrl: "/cosmos.distribution.v1beta1.ValidatorOutstandingRewards",
+  aminoType: "cosmos-sdk/ValidatorOutstandingRewards",
+
   encode(message: ValidatorOutstandingRewards, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.rewards) {
       DecCoin.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1015,6 +1134,32 @@ export const ValidatorOutstandingRewards = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ValidatorOutstandingRewardsAminoMsg): ValidatorOutstandingRewards {
+    return ValidatorOutstandingRewards.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ValidatorOutstandingRewards): ValidatorOutstandingRewardsAminoMsg {
+    return {
+      type: "cosmos-sdk/ValidatorOutstandingRewards",
+      value: ValidatorOutstandingRewards.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ValidatorOutstandingRewardsProtoMsg): ValidatorOutstandingRewards {
+    return ValidatorOutstandingRewards.decode(message.value);
+  },
+
+  toProto(message: ValidatorOutstandingRewards): Uint8Array {
+    return ValidatorOutstandingRewards.encode(message).finish();
+  },
+
+  toProtoMsg(message: ValidatorOutstandingRewards): ValidatorOutstandingRewardsProtoMsg {
+    return {
+      typeUrl: "/cosmos.distribution.v1beta1.ValidatorOutstandingRewards",
+      value: ValidatorOutstandingRewards.encode(message).finish()
+    };
   }
 
 };
@@ -1027,6 +1172,9 @@ function createBaseValidatorSlashEvent(): ValidatorSlashEvent {
 }
 
 export const ValidatorSlashEvent = {
+  typeUrl: "/cosmos.distribution.v1beta1.ValidatorSlashEvent",
+  aminoType: "cosmos-sdk/ValidatorSlashEvent",
+
   encode(message: ValidatorSlashEvent, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.validatorPeriod.isZero()) {
       writer.uint32(8).uint64(message.validatorPeriod);
@@ -1112,6 +1260,32 @@ export const ValidatorSlashEvent = {
     obj.validator_period = message.validatorPeriod ? message.validatorPeriod.toString() : undefined;
     obj.fraction = message.fraction;
     return obj;
+  },
+
+  fromAminoMsg(object: ValidatorSlashEventAminoMsg): ValidatorSlashEvent {
+    return ValidatorSlashEvent.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ValidatorSlashEvent): ValidatorSlashEventAminoMsg {
+    return {
+      type: "cosmos-sdk/ValidatorSlashEvent",
+      value: ValidatorSlashEvent.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ValidatorSlashEventProtoMsg): ValidatorSlashEvent {
+    return ValidatorSlashEvent.decode(message.value);
+  },
+
+  toProto(message: ValidatorSlashEvent): Uint8Array {
+    return ValidatorSlashEvent.encode(message).finish();
+  },
+
+  toProtoMsg(message: ValidatorSlashEvent): ValidatorSlashEventProtoMsg {
+    return {
+      typeUrl: "/cosmos.distribution.v1beta1.ValidatorSlashEvent",
+      value: ValidatorSlashEvent.encode(message).finish()
+    };
   }
 
 };
@@ -1123,6 +1297,9 @@ function createBaseValidatorSlashEvents(): ValidatorSlashEvents {
 }
 
 export const ValidatorSlashEvents = {
+  typeUrl: "/cosmos.distribution.v1beta1.ValidatorSlashEvents",
+  aminoType: "cosmos-sdk/ValidatorSlashEvents",
+
   encode(message: ValidatorSlashEvents, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.validatorSlashEvents) {
       ValidatorSlashEvent.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1211,6 +1388,32 @@ export const ValidatorSlashEvents = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ValidatorSlashEventsAminoMsg): ValidatorSlashEvents {
+    return ValidatorSlashEvents.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ValidatorSlashEvents): ValidatorSlashEventsAminoMsg {
+    return {
+      type: "cosmos-sdk/ValidatorSlashEvents",
+      value: ValidatorSlashEvents.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ValidatorSlashEventsProtoMsg): ValidatorSlashEvents {
+    return ValidatorSlashEvents.decode(message.value);
+  },
+
+  toProto(message: ValidatorSlashEvents): Uint8Array {
+    return ValidatorSlashEvents.encode(message).finish();
+  },
+
+  toProtoMsg(message: ValidatorSlashEvents): ValidatorSlashEventsProtoMsg {
+    return {
+      typeUrl: "/cosmos.distribution.v1beta1.ValidatorSlashEvents",
+      value: ValidatorSlashEvents.encode(message).finish()
+    };
   }
 
 };
@@ -1222,6 +1425,9 @@ function createBaseFeePool(): FeePool {
 }
 
 export const FeePool = {
+  typeUrl: "/cosmos.distribution.v1beta1.FeePool",
+  aminoType: "cosmos-sdk/FeePool",
+
   encode(message: FeePool, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.communityPool) {
       DecCoin.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1310,6 +1516,32 @@ export const FeePool = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: FeePoolAminoMsg): FeePool {
+    return FeePool.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: FeePool): FeePoolAminoMsg {
+    return {
+      type: "cosmos-sdk/FeePool",
+      value: FeePool.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: FeePoolProtoMsg): FeePool {
+    return FeePool.decode(message.value);
+  },
+
+  toProto(message: FeePool): Uint8Array {
+    return FeePool.encode(message).finish();
+  },
+
+  toProtoMsg(message: FeePool): FeePoolProtoMsg {
+    return {
+      typeUrl: "/cosmos.distribution.v1beta1.FeePool",
+      value: FeePool.encode(message).finish()
+    };
   }
 
 };
@@ -1324,6 +1556,9 @@ function createBaseCommunityPoolSpendProposal(): CommunityPoolSpendProposal {
 }
 
 export const CommunityPoolSpendProposal = {
+  typeUrl: "/cosmos.distribution.v1beta1.CommunityPoolSpendProposal",
+  aminoType: "cosmos-sdk/CommunityPoolSpendProposal",
+
   encode(message: CommunityPoolSpendProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.title !== "") {
       writer.uint32(10).string(message.title);
@@ -1457,6 +1692,32 @@ export const CommunityPoolSpendProposal = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: CommunityPoolSpendProposalAminoMsg): CommunityPoolSpendProposal {
+    return CommunityPoolSpendProposal.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: CommunityPoolSpendProposal): CommunityPoolSpendProposalAminoMsg {
+    return {
+      type: "cosmos-sdk/CommunityPoolSpendProposal",
+      value: CommunityPoolSpendProposal.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: CommunityPoolSpendProposalProtoMsg): CommunityPoolSpendProposal {
+    return CommunityPoolSpendProposal.decode(message.value);
+  },
+
+  toProto(message: CommunityPoolSpendProposal): Uint8Array {
+    return CommunityPoolSpendProposal.encode(message).finish();
+  },
+
+  toProtoMsg(message: CommunityPoolSpendProposal): CommunityPoolSpendProposalProtoMsg {
+    return {
+      typeUrl: "/cosmos.distribution.v1beta1.CommunityPoolSpendProposal",
+      value: CommunityPoolSpendProposal.encode(message).finish()
+    };
   }
 
 };
@@ -1470,6 +1731,9 @@ function createBaseDelegatorStartingInfo(): DelegatorStartingInfo {
 }
 
 export const DelegatorStartingInfo = {
+  typeUrl: "/cosmos.distribution.v1beta1.DelegatorStartingInfo",
+  aminoType: "cosmos-sdk/DelegatorStartingInfo",
+
   encode(message: DelegatorStartingInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.previousPeriod.isZero()) {
       writer.uint32(8).uint64(message.previousPeriod);
@@ -1570,6 +1834,32 @@ export const DelegatorStartingInfo = {
     obj.stake = message.stake;
     obj.height = message.height ? message.height.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: DelegatorStartingInfoAminoMsg): DelegatorStartingInfo {
+    return DelegatorStartingInfo.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: DelegatorStartingInfo): DelegatorStartingInfoAminoMsg {
+    return {
+      type: "cosmos-sdk/DelegatorStartingInfo",
+      value: DelegatorStartingInfo.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: DelegatorStartingInfoProtoMsg): DelegatorStartingInfo {
+    return DelegatorStartingInfo.decode(message.value);
+  },
+
+  toProto(message: DelegatorStartingInfo): Uint8Array {
+    return DelegatorStartingInfo.encode(message).finish();
+  },
+
+  toProtoMsg(message: DelegatorStartingInfo): DelegatorStartingInfoProtoMsg {
+    return {
+      typeUrl: "/cosmos.distribution.v1beta1.DelegatorStartingInfo",
+      value: DelegatorStartingInfo.encode(message).finish()
+    };
   }
 
 };
@@ -1582,6 +1872,9 @@ function createBaseDelegationDelegatorReward(): DelegationDelegatorReward {
 }
 
 export const DelegationDelegatorReward = {
+  typeUrl: "/cosmos.distribution.v1beta1.DelegationDelegatorReward",
+  aminoType: "cosmos-sdk/DelegationDelegatorReward",
+
   encode(message: DelegationDelegatorReward, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.validatorAddress !== "") {
       writer.uint32(10).string(message.validatorAddress);
@@ -1685,6 +1978,32 @@ export const DelegationDelegatorReward = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: DelegationDelegatorRewardAminoMsg): DelegationDelegatorReward {
+    return DelegationDelegatorReward.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: DelegationDelegatorReward): DelegationDelegatorRewardAminoMsg {
+    return {
+      type: "cosmos-sdk/DelegationDelegatorReward",
+      value: DelegationDelegatorReward.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: DelegationDelegatorRewardProtoMsg): DelegationDelegatorReward {
+    return DelegationDelegatorReward.decode(message.value);
+  },
+
+  toProto(message: DelegationDelegatorReward): Uint8Array {
+    return DelegationDelegatorReward.encode(message).finish();
+  },
+
+  toProtoMsg(message: DelegationDelegatorReward): DelegationDelegatorRewardProtoMsg {
+    return {
+      typeUrl: "/cosmos.distribution.v1beta1.DelegationDelegatorReward",
+      value: DelegationDelegatorReward.encode(message).finish()
+    };
   }
 
 };
@@ -1700,6 +2019,9 @@ function createBaseCommunityPoolSpendProposalWithDeposit(): CommunityPoolSpendPr
 }
 
 export const CommunityPoolSpendProposalWithDeposit = {
+  typeUrl: "/cosmos.distribution.v1beta1.CommunityPoolSpendProposalWithDeposit",
+  aminoType: "cosmos-sdk/CommunityPoolSpendProposalWithDeposit",
+
   encode(message: CommunityPoolSpendProposalWithDeposit, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.title !== "") {
       writer.uint32(10).string(message.title);
@@ -1830,6 +2152,32 @@ export const CommunityPoolSpendProposalWithDeposit = {
     obj.amount = message.amount;
     obj.deposit = message.deposit;
     return obj;
+  },
+
+  fromAminoMsg(object: CommunityPoolSpendProposalWithDepositAminoMsg): CommunityPoolSpendProposalWithDeposit {
+    return CommunityPoolSpendProposalWithDeposit.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: CommunityPoolSpendProposalWithDeposit): CommunityPoolSpendProposalWithDepositAminoMsg {
+    return {
+      type: "cosmos-sdk/CommunityPoolSpendProposalWithDeposit",
+      value: CommunityPoolSpendProposalWithDeposit.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: CommunityPoolSpendProposalWithDepositProtoMsg): CommunityPoolSpendProposalWithDeposit {
+    return CommunityPoolSpendProposalWithDeposit.decode(message.value);
+  },
+
+  toProto(message: CommunityPoolSpendProposalWithDeposit): Uint8Array {
+    return CommunityPoolSpendProposalWithDeposit.encode(message).finish();
+  },
+
+  toProtoMsg(message: CommunityPoolSpendProposalWithDeposit): CommunityPoolSpendProposalWithDepositProtoMsg {
+    return {
+      typeUrl: "/cosmos.distribution.v1beta1.CommunityPoolSpendProposalWithDeposit",
+      value: CommunityPoolSpendProposalWithDeposit.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/distribution/v1beta1/genesis.ts b/__fixtures__/outputv2/cosmos/distribution/v1beta1/genesis.ts
index f290de8d7..878cb8161 100644
--- a/__fixtures__/outputv2/cosmos/distribution/v1beta1/genesis.ts
+++ b/__fixtures__/outputv2/cosmos/distribution/v1beta1/genesis.ts
@@ -16,7 +16,7 @@ export interface DelegatorWithdrawInfo {
   /** withdraw_address is the address to withdraw the delegation rewards to. */
   withdrawAddress: string;
 }
-export interface DelegatorWithdrawInfoProtoType {
+export interface DelegatorWithdrawInfoProtoMsg {
   typeUrl: "/cosmos.distribution.v1beta1.DelegatorWithdrawInfo";
   value: Uint8Array;
 }
@@ -33,7 +33,7 @@ export interface DelegatorWithdrawInfoAmino {
   /** withdraw_address is the address to withdraw the delegation rewards to. */
   withdraw_address: string;
 }
-export interface DelegatorWithdrawInfoAminoType {
+export interface DelegatorWithdrawInfoAminoMsg {
   type: "cosmos-sdk/DelegatorWithdrawInfo";
   value: DelegatorWithdrawInfoAmino;
 }
@@ -56,7 +56,7 @@ export interface ValidatorOutstandingRewardsRecord {
   /** outstanding_rewards represents the oustanding rewards of a validator. */
   outstandingRewards: DecCoin[];
 }
-export interface ValidatorOutstandingRewardsRecordProtoType {
+export interface ValidatorOutstandingRewardsRecordProtoMsg {
   typeUrl: "/cosmos.distribution.v1beta1.ValidatorOutstandingRewardsRecord";
   value: Uint8Array;
 }
@@ -69,7 +69,7 @@ export interface ValidatorOutstandingRewardsRecordAmino {
   /** outstanding_rewards represents the oustanding rewards of a validator. */
   outstanding_rewards: DecCoinAmino[];
 }
-export interface ValidatorOutstandingRewardsRecordAminoType {
+export interface ValidatorOutstandingRewardsRecordAminoMsg {
   type: "cosmos-sdk/ValidatorOutstandingRewardsRecord";
   value: ValidatorOutstandingRewardsRecordAmino;
 }
@@ -91,7 +91,7 @@ export interface ValidatorAccumulatedCommissionRecord {
   /** accumulated is the accumulated commission of a validator. */
   accumulated?: ValidatorAccumulatedCommission;
 }
-export interface ValidatorAccumulatedCommissionRecordProtoType {
+export interface ValidatorAccumulatedCommissionRecordProtoMsg {
   typeUrl: "/cosmos.distribution.v1beta1.ValidatorAccumulatedCommissionRecord";
   value: Uint8Array;
 }
@@ -107,7 +107,7 @@ export interface ValidatorAccumulatedCommissionRecordAmino {
   /** accumulated is the accumulated commission of a validator. */
   accumulated?: ValidatorAccumulatedCommissionAmino;
 }
-export interface ValidatorAccumulatedCommissionRecordAminoType {
+export interface ValidatorAccumulatedCommissionRecordAminoMsg {
   type: "cosmos-sdk/ValidatorAccumulatedCommissionRecord";
   value: ValidatorAccumulatedCommissionRecordAmino;
 }
@@ -135,7 +135,7 @@ export interface ValidatorHistoricalRewardsRecord {
   /** rewards defines the historical rewards of a validator. */
   rewards?: ValidatorHistoricalRewards;
 }
-export interface ValidatorHistoricalRewardsRecordProtoType {
+export interface ValidatorHistoricalRewardsRecordProtoMsg {
   typeUrl: "/cosmos.distribution.v1beta1.ValidatorHistoricalRewardsRecord";
   value: Uint8Array;
 }
@@ -154,7 +154,7 @@ export interface ValidatorHistoricalRewardsRecordAmino {
   /** rewards defines the historical rewards of a validator. */
   rewards?: ValidatorHistoricalRewardsAmino;
 }
-export interface ValidatorHistoricalRewardsRecordAminoType {
+export interface ValidatorHistoricalRewardsRecordAminoMsg {
   type: "cosmos-sdk/ValidatorHistoricalRewardsRecord";
   value: ValidatorHistoricalRewardsRecordAmino;
 }
@@ -177,7 +177,7 @@ export interface ValidatorCurrentRewardsRecord {
   /** rewards defines the current rewards of a validator. */
   rewards?: ValidatorCurrentRewards;
 }
-export interface ValidatorCurrentRewardsRecordProtoType {
+export interface ValidatorCurrentRewardsRecordProtoMsg {
   typeUrl: "/cosmos.distribution.v1beta1.ValidatorCurrentRewardsRecord";
   value: Uint8Array;
 }
@@ -190,7 +190,7 @@ export interface ValidatorCurrentRewardsRecordAmino {
   /** rewards defines the current rewards of a validator. */
   rewards?: ValidatorCurrentRewardsAmino;
 }
-export interface ValidatorCurrentRewardsRecordAminoType {
+export interface ValidatorCurrentRewardsRecordAminoMsg {
   type: "cosmos-sdk/ValidatorCurrentRewardsRecord";
   value: ValidatorCurrentRewardsRecordAmino;
 }
@@ -212,7 +212,7 @@ export interface DelegatorStartingInfoRecord {
   /** starting_info defines the starting info of a delegator. */
   startingInfo?: DelegatorStartingInfo;
 }
-export interface DelegatorStartingInfoRecordProtoType {
+export interface DelegatorStartingInfoRecordProtoMsg {
   typeUrl: "/cosmos.distribution.v1beta1.DelegatorStartingInfoRecord";
   value: Uint8Array;
 }
@@ -228,7 +228,7 @@ export interface DelegatorStartingInfoRecordAmino {
   /** starting_info defines the starting info of a delegator. */
   starting_info?: DelegatorStartingInfoAmino;
 }
-export interface DelegatorStartingInfoRecordAminoType {
+export interface DelegatorStartingInfoRecordAminoMsg {
   type: "cosmos-sdk/DelegatorStartingInfoRecord";
   value: DelegatorStartingInfoRecordAmino;
 }
@@ -254,7 +254,7 @@ export interface ValidatorSlashEventRecord {
   /** validator_slash_event describes the slash event. */
   validatorSlashEvent?: ValidatorSlashEvent;
 }
-export interface ValidatorSlashEventRecordProtoType {
+export interface ValidatorSlashEventRecordProtoMsg {
   typeUrl: "/cosmos.distribution.v1beta1.ValidatorSlashEventRecord";
   value: Uint8Array;
 }
@@ -273,7 +273,7 @@ export interface ValidatorSlashEventRecordAmino {
   /** validator_slash_event describes the slash event. */
   validator_slash_event?: ValidatorSlashEventAmino;
 }
-export interface ValidatorSlashEventRecordAminoType {
+export interface ValidatorSlashEventRecordAminoMsg {
   type: "cosmos-sdk/ValidatorSlashEventRecord";
   value: ValidatorSlashEventRecordAmino;
 }
@@ -318,7 +318,7 @@ export interface GenesisState {
   /** fee_pool defines the validator slash events at genesis. */
   validatorSlashEvents: ValidatorSlashEventRecord[];
 }
-export interface GenesisStateProtoType {
+export interface GenesisStateProtoMsg {
   typeUrl: "/cosmos.distribution.v1beta1.GenesisState";
   value: Uint8Array;
 }
@@ -355,7 +355,7 @@ export interface GenesisStateAmino {
   /** fee_pool defines the validator slash events at genesis. */
   validator_slash_events: ValidatorSlashEventRecordAmino[];
 }
-export interface GenesisStateAminoType {
+export interface GenesisStateAminoMsg {
   type: "cosmos-sdk/GenesisState";
   value: GenesisStateAmino;
 }
@@ -382,6 +382,9 @@ function createBaseDelegatorWithdrawInfo(): DelegatorWithdrawInfo {
 }
 
 export const DelegatorWithdrawInfo = {
+  typeUrl: "/cosmos.distribution.v1beta1.DelegatorWithdrawInfo",
+  aminoType: "cosmos-sdk/DelegatorWithdrawInfo",
+
   encode(message: DelegatorWithdrawInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.delegatorAddress !== "") {
       writer.uint32(10).string(message.delegatorAddress);
@@ -467,6 +470,32 @@ export const DelegatorWithdrawInfo = {
     obj.delegator_address = message.delegatorAddress;
     obj.withdraw_address = message.withdrawAddress;
     return obj;
+  },
+
+  fromAminoMsg(object: DelegatorWithdrawInfoAminoMsg): DelegatorWithdrawInfo {
+    return DelegatorWithdrawInfo.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: DelegatorWithdrawInfo): DelegatorWithdrawInfoAminoMsg {
+    return {
+      type: "cosmos-sdk/DelegatorWithdrawInfo",
+      value: DelegatorWithdrawInfo.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: DelegatorWithdrawInfoProtoMsg): DelegatorWithdrawInfo {
+    return DelegatorWithdrawInfo.decode(message.value);
+  },
+
+  toProto(message: DelegatorWithdrawInfo): Uint8Array {
+    return DelegatorWithdrawInfo.encode(message).finish();
+  },
+
+  toProtoMsg(message: DelegatorWithdrawInfo): DelegatorWithdrawInfoProtoMsg {
+    return {
+      typeUrl: "/cosmos.distribution.v1beta1.DelegatorWithdrawInfo",
+      value: DelegatorWithdrawInfo.encode(message).finish()
+    };
   }
 
 };
@@ -479,6 +508,9 @@ function createBaseValidatorOutstandingRewardsRecord(): ValidatorOutstandingRewa
 }
 
 export const ValidatorOutstandingRewardsRecord = {
+  typeUrl: "/cosmos.distribution.v1beta1.ValidatorOutstandingRewardsRecord",
+  aminoType: "cosmos-sdk/ValidatorOutstandingRewardsRecord",
+
   encode(message: ValidatorOutstandingRewardsRecord, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.validatorAddress !== "") {
       writer.uint32(10).string(message.validatorAddress);
@@ -582,6 +614,32 @@ export const ValidatorOutstandingRewardsRecord = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ValidatorOutstandingRewardsRecordAminoMsg): ValidatorOutstandingRewardsRecord {
+    return ValidatorOutstandingRewardsRecord.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ValidatorOutstandingRewardsRecord): ValidatorOutstandingRewardsRecordAminoMsg {
+    return {
+      type: "cosmos-sdk/ValidatorOutstandingRewardsRecord",
+      value: ValidatorOutstandingRewardsRecord.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ValidatorOutstandingRewardsRecordProtoMsg): ValidatorOutstandingRewardsRecord {
+    return ValidatorOutstandingRewardsRecord.decode(message.value);
+  },
+
+  toProto(message: ValidatorOutstandingRewardsRecord): Uint8Array {
+    return ValidatorOutstandingRewardsRecord.encode(message).finish();
+  },
+
+  toProtoMsg(message: ValidatorOutstandingRewardsRecord): ValidatorOutstandingRewardsRecordProtoMsg {
+    return {
+      typeUrl: "/cosmos.distribution.v1beta1.ValidatorOutstandingRewardsRecord",
+      value: ValidatorOutstandingRewardsRecord.encode(message).finish()
+    };
   }
 
 };
@@ -594,6 +652,9 @@ function createBaseValidatorAccumulatedCommissionRecord(): ValidatorAccumulatedC
 }
 
 export const ValidatorAccumulatedCommissionRecord = {
+  typeUrl: "/cosmos.distribution.v1beta1.ValidatorAccumulatedCommissionRecord",
+  aminoType: "cosmos-sdk/ValidatorAccumulatedCommissionRecord",
+
   encode(message: ValidatorAccumulatedCommissionRecord, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.validatorAddress !== "") {
       writer.uint32(10).string(message.validatorAddress);
@@ -679,6 +740,32 @@ export const ValidatorAccumulatedCommissionRecord = {
     obj.validator_address = message.validatorAddress;
     obj.accumulated = message.accumulated ? ValidatorAccumulatedCommission.toAmino(message.accumulated) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ValidatorAccumulatedCommissionRecordAminoMsg): ValidatorAccumulatedCommissionRecord {
+    return ValidatorAccumulatedCommissionRecord.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ValidatorAccumulatedCommissionRecord): ValidatorAccumulatedCommissionRecordAminoMsg {
+    return {
+      type: "cosmos-sdk/ValidatorAccumulatedCommissionRecord",
+      value: ValidatorAccumulatedCommissionRecord.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ValidatorAccumulatedCommissionRecordProtoMsg): ValidatorAccumulatedCommissionRecord {
+    return ValidatorAccumulatedCommissionRecord.decode(message.value);
+  },
+
+  toProto(message: ValidatorAccumulatedCommissionRecord): Uint8Array {
+    return ValidatorAccumulatedCommissionRecord.encode(message).finish();
+  },
+
+  toProtoMsg(message: ValidatorAccumulatedCommissionRecord): ValidatorAccumulatedCommissionRecordProtoMsg {
+    return {
+      typeUrl: "/cosmos.distribution.v1beta1.ValidatorAccumulatedCommissionRecord",
+      value: ValidatorAccumulatedCommissionRecord.encode(message).finish()
+    };
   }
 
 };
@@ -692,6 +779,9 @@ function createBaseValidatorHistoricalRewardsRecord(): ValidatorHistoricalReward
 }
 
 export const ValidatorHistoricalRewardsRecord = {
+  typeUrl: "/cosmos.distribution.v1beta1.ValidatorHistoricalRewardsRecord",
+  aminoType: "cosmos-sdk/ValidatorHistoricalRewardsRecord",
+
   encode(message: ValidatorHistoricalRewardsRecord, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.validatorAddress !== "") {
       writer.uint32(10).string(message.validatorAddress);
@@ -792,6 +882,32 @@ export const ValidatorHistoricalRewardsRecord = {
     obj.period = message.period ? message.period.toString() : undefined;
     obj.rewards = message.rewards ? ValidatorHistoricalRewards.toAmino(message.rewards) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ValidatorHistoricalRewardsRecordAminoMsg): ValidatorHistoricalRewardsRecord {
+    return ValidatorHistoricalRewardsRecord.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ValidatorHistoricalRewardsRecord): ValidatorHistoricalRewardsRecordAminoMsg {
+    return {
+      type: "cosmos-sdk/ValidatorHistoricalRewardsRecord",
+      value: ValidatorHistoricalRewardsRecord.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ValidatorHistoricalRewardsRecordProtoMsg): ValidatorHistoricalRewardsRecord {
+    return ValidatorHistoricalRewardsRecord.decode(message.value);
+  },
+
+  toProto(message: ValidatorHistoricalRewardsRecord): Uint8Array {
+    return ValidatorHistoricalRewardsRecord.encode(message).finish();
+  },
+
+  toProtoMsg(message: ValidatorHistoricalRewardsRecord): ValidatorHistoricalRewardsRecordProtoMsg {
+    return {
+      typeUrl: "/cosmos.distribution.v1beta1.ValidatorHistoricalRewardsRecord",
+      value: ValidatorHistoricalRewardsRecord.encode(message).finish()
+    };
   }
 
 };
@@ -804,6 +920,9 @@ function createBaseValidatorCurrentRewardsRecord(): ValidatorCurrentRewardsRecor
 }
 
 export const ValidatorCurrentRewardsRecord = {
+  typeUrl: "/cosmos.distribution.v1beta1.ValidatorCurrentRewardsRecord",
+  aminoType: "cosmos-sdk/ValidatorCurrentRewardsRecord",
+
   encode(message: ValidatorCurrentRewardsRecord, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.validatorAddress !== "") {
       writer.uint32(10).string(message.validatorAddress);
@@ -889,6 +1008,32 @@ export const ValidatorCurrentRewardsRecord = {
     obj.validator_address = message.validatorAddress;
     obj.rewards = message.rewards ? ValidatorCurrentRewards.toAmino(message.rewards) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ValidatorCurrentRewardsRecordAminoMsg): ValidatorCurrentRewardsRecord {
+    return ValidatorCurrentRewardsRecord.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ValidatorCurrentRewardsRecord): ValidatorCurrentRewardsRecordAminoMsg {
+    return {
+      type: "cosmos-sdk/ValidatorCurrentRewardsRecord",
+      value: ValidatorCurrentRewardsRecord.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ValidatorCurrentRewardsRecordProtoMsg): ValidatorCurrentRewardsRecord {
+    return ValidatorCurrentRewardsRecord.decode(message.value);
+  },
+
+  toProto(message: ValidatorCurrentRewardsRecord): Uint8Array {
+    return ValidatorCurrentRewardsRecord.encode(message).finish();
+  },
+
+  toProtoMsg(message: ValidatorCurrentRewardsRecord): ValidatorCurrentRewardsRecordProtoMsg {
+    return {
+      typeUrl: "/cosmos.distribution.v1beta1.ValidatorCurrentRewardsRecord",
+      value: ValidatorCurrentRewardsRecord.encode(message).finish()
+    };
   }
 
 };
@@ -902,6 +1047,9 @@ function createBaseDelegatorStartingInfoRecord(): DelegatorStartingInfoRecord {
 }
 
 export const DelegatorStartingInfoRecord = {
+  typeUrl: "/cosmos.distribution.v1beta1.DelegatorStartingInfoRecord",
+  aminoType: "cosmos-sdk/DelegatorStartingInfoRecord",
+
   encode(message: DelegatorStartingInfoRecord, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.delegatorAddress !== "") {
       writer.uint32(10).string(message.delegatorAddress);
@@ -1002,6 +1150,32 @@ export const DelegatorStartingInfoRecord = {
     obj.validator_address = message.validatorAddress;
     obj.starting_info = message.startingInfo ? DelegatorStartingInfo.toAmino(message.startingInfo) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: DelegatorStartingInfoRecordAminoMsg): DelegatorStartingInfoRecord {
+    return DelegatorStartingInfoRecord.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: DelegatorStartingInfoRecord): DelegatorStartingInfoRecordAminoMsg {
+    return {
+      type: "cosmos-sdk/DelegatorStartingInfoRecord",
+      value: DelegatorStartingInfoRecord.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: DelegatorStartingInfoRecordProtoMsg): DelegatorStartingInfoRecord {
+    return DelegatorStartingInfoRecord.decode(message.value);
+  },
+
+  toProto(message: DelegatorStartingInfoRecord): Uint8Array {
+    return DelegatorStartingInfoRecord.encode(message).finish();
+  },
+
+  toProtoMsg(message: DelegatorStartingInfoRecord): DelegatorStartingInfoRecordProtoMsg {
+    return {
+      typeUrl: "/cosmos.distribution.v1beta1.DelegatorStartingInfoRecord",
+      value: DelegatorStartingInfoRecord.encode(message).finish()
+    };
   }
 
 };
@@ -1016,6 +1190,9 @@ function createBaseValidatorSlashEventRecord(): ValidatorSlashEventRecord {
 }
 
 export const ValidatorSlashEventRecord = {
+  typeUrl: "/cosmos.distribution.v1beta1.ValidatorSlashEventRecord",
+  aminoType: "cosmos-sdk/ValidatorSlashEventRecord",
+
   encode(message: ValidatorSlashEventRecord, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.validatorAddress !== "") {
       writer.uint32(10).string(message.validatorAddress);
@@ -1131,6 +1308,32 @@ export const ValidatorSlashEventRecord = {
     obj.period = message.period ? message.period.toString() : undefined;
     obj.validator_slash_event = message.validatorSlashEvent ? ValidatorSlashEvent.toAmino(message.validatorSlashEvent) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ValidatorSlashEventRecordAminoMsg): ValidatorSlashEventRecord {
+    return ValidatorSlashEventRecord.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ValidatorSlashEventRecord): ValidatorSlashEventRecordAminoMsg {
+    return {
+      type: "cosmos-sdk/ValidatorSlashEventRecord",
+      value: ValidatorSlashEventRecord.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ValidatorSlashEventRecordProtoMsg): ValidatorSlashEventRecord {
+    return ValidatorSlashEventRecord.decode(message.value);
+  },
+
+  toProto(message: ValidatorSlashEventRecord): Uint8Array {
+    return ValidatorSlashEventRecord.encode(message).finish();
+  },
+
+  toProtoMsg(message: ValidatorSlashEventRecord): ValidatorSlashEventRecordProtoMsg {
+    return {
+      typeUrl: "/cosmos.distribution.v1beta1.ValidatorSlashEventRecord",
+      value: ValidatorSlashEventRecord.encode(message).finish()
+    };
   }
 
 };
@@ -1151,6 +1354,9 @@ function createBaseGenesisState(): GenesisState {
 }
 
 export const GenesisState = {
+  typeUrl: "/cosmos.distribution.v1beta1.GenesisState",
+  aminoType: "cosmos-sdk/GenesisState",
+
   encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.params !== undefined) {
       Params.encode(message.params, writer.uint32(10).fork()).ldelim();
@@ -1467,6 +1673,32 @@ export const GenesisState = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisStateAminoMsg): GenesisState {
+    return GenesisState.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GenesisState): GenesisStateAminoMsg {
+    return {
+      type: "cosmos-sdk/GenesisState",
+      value: GenesisState.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GenesisStateProtoMsg): GenesisState {
+    return GenesisState.decode(message.value);
+  },
+
+  toProto(message: GenesisState): Uint8Array {
+    return GenesisState.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisState): GenesisStateProtoMsg {
+    return {
+      typeUrl: "/cosmos.distribution.v1beta1.GenesisState",
+      value: GenesisState.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/distribution/v1beta1/query.ts b/__fixtures__/outputv2/cosmos/distribution/v1beta1/query.ts
index a504ce1b3..650733704 100644
--- a/__fixtures__/outputv2/cosmos/distribution/v1beta1/query.ts
+++ b/__fixtures__/outputv2/cosmos/distribution/v1beta1/query.ts
@@ -7,14 +7,14 @@ export const protobufPackage = "cosmos.distribution.v1beta1";
 
 /** QueryParamsRequest is the request type for the Query/Params RPC method. */
 export interface QueryParamsRequest {}
-export interface QueryParamsRequestProtoType {
+export interface QueryParamsRequestProtoMsg {
   typeUrl: "/cosmos.distribution.v1beta1.QueryParamsRequest";
   value: Uint8Array;
 }
 
 /** QueryParamsRequest is the request type for the Query/Params RPC method. */
 export interface QueryParamsRequestAmino {}
-export interface QueryParamsRequestAminoType {
+export interface QueryParamsRequestAminoMsg {
   type: "cosmos-sdk/QueryParamsRequest";
   value: QueryParamsRequestAmino;
 }
@@ -27,7 +27,7 @@ export interface QueryParamsResponse {
   /** params defines the parameters of the module. */
   params?: Params;
 }
-export interface QueryParamsResponseProtoType {
+export interface QueryParamsResponseProtoMsg {
   typeUrl: "/cosmos.distribution.v1beta1.QueryParamsResponse";
   value: Uint8Array;
 }
@@ -37,7 +37,7 @@ export interface QueryParamsResponseAmino {
   /** params defines the parameters of the module. */
   params?: ParamsAmino;
 }
-export interface QueryParamsResponseAminoType {
+export interface QueryParamsResponseAminoMsg {
   type: "cosmos-sdk/QueryParamsResponse";
   value: QueryParamsResponseAmino;
 }
@@ -55,7 +55,7 @@ export interface QueryValidatorOutstandingRewardsRequest {
   /** validator_address defines the validator address to query for. */
   validatorAddress: string;
 }
-export interface QueryValidatorOutstandingRewardsRequestProtoType {
+export interface QueryValidatorOutstandingRewardsRequestProtoMsg {
   typeUrl: "/cosmos.distribution.v1beta1.QueryValidatorOutstandingRewardsRequest";
   value: Uint8Array;
 }
@@ -68,7 +68,7 @@ export interface QueryValidatorOutstandingRewardsRequestAmino {
   /** validator_address defines the validator address to query for. */
   validator_address: string;
 }
-export interface QueryValidatorOutstandingRewardsRequestAminoType {
+export interface QueryValidatorOutstandingRewardsRequestAminoMsg {
   type: "cosmos-sdk/QueryValidatorOutstandingRewardsRequest";
   value: QueryValidatorOutstandingRewardsRequestAmino;
 }
@@ -88,7 +88,7 @@ export interface QueryValidatorOutstandingRewardsRequestSDKType {
 export interface QueryValidatorOutstandingRewardsResponse {
   rewards?: ValidatorOutstandingRewards;
 }
-export interface QueryValidatorOutstandingRewardsResponseProtoType {
+export interface QueryValidatorOutstandingRewardsResponseProtoMsg {
   typeUrl: "/cosmos.distribution.v1beta1.QueryValidatorOutstandingRewardsResponse";
   value: Uint8Array;
 }
@@ -100,7 +100,7 @@ export interface QueryValidatorOutstandingRewardsResponseProtoType {
 export interface QueryValidatorOutstandingRewardsResponseAmino {
   rewards?: ValidatorOutstandingRewardsAmino;
 }
-export interface QueryValidatorOutstandingRewardsResponseAminoType {
+export interface QueryValidatorOutstandingRewardsResponseAminoMsg {
   type: "cosmos-sdk/QueryValidatorOutstandingRewardsResponse";
   value: QueryValidatorOutstandingRewardsResponseAmino;
 }
@@ -121,7 +121,7 @@ export interface QueryValidatorCommissionRequest {
   /** validator_address defines the validator address to query for. */
   validatorAddress: string;
 }
-export interface QueryValidatorCommissionRequestProtoType {
+export interface QueryValidatorCommissionRequestProtoMsg {
   typeUrl: "/cosmos.distribution.v1beta1.QueryValidatorCommissionRequest";
   value: Uint8Array;
 }
@@ -134,7 +134,7 @@ export interface QueryValidatorCommissionRequestAmino {
   /** validator_address defines the validator address to query for. */
   validator_address: string;
 }
-export interface QueryValidatorCommissionRequestAminoType {
+export interface QueryValidatorCommissionRequestAminoMsg {
   type: "cosmos-sdk/QueryValidatorCommissionRequest";
   value: QueryValidatorCommissionRequestAmino;
 }
@@ -155,7 +155,7 @@ export interface QueryValidatorCommissionResponse {
   /** commission defines the commision the validator received. */
   commission?: ValidatorAccumulatedCommission;
 }
-export interface QueryValidatorCommissionResponseProtoType {
+export interface QueryValidatorCommissionResponseProtoMsg {
   typeUrl: "/cosmos.distribution.v1beta1.QueryValidatorCommissionResponse";
   value: Uint8Array;
 }
@@ -168,7 +168,7 @@ export interface QueryValidatorCommissionResponseAmino {
   /** commission defines the commision the validator received. */
   commission?: ValidatorAccumulatedCommissionAmino;
 }
-export interface QueryValidatorCommissionResponseAminoType {
+export interface QueryValidatorCommissionResponseAminoMsg {
   type: "cosmos-sdk/QueryValidatorCommissionResponse";
   value: QueryValidatorCommissionResponseAmino;
 }
@@ -198,7 +198,7 @@ export interface QueryValidatorSlashesRequest {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequest;
 }
-export interface QueryValidatorSlashesRequestProtoType {
+export interface QueryValidatorSlashesRequestProtoMsg {
   typeUrl: "/cosmos.distribution.v1beta1.QueryValidatorSlashesRequest";
   value: Uint8Array;
 }
@@ -220,7 +220,7 @@ export interface QueryValidatorSlashesRequestAmino {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequestAmino;
 }
-export interface QueryValidatorSlashesRequestAminoType {
+export interface QueryValidatorSlashesRequestAminoMsg {
   type: "cosmos-sdk/QueryValidatorSlashesRequest";
   value: QueryValidatorSlashesRequestAmino;
 }
@@ -247,7 +247,7 @@ export interface QueryValidatorSlashesResponse {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponse;
 }
-export interface QueryValidatorSlashesResponseProtoType {
+export interface QueryValidatorSlashesResponseProtoMsg {
   typeUrl: "/cosmos.distribution.v1beta1.QueryValidatorSlashesResponse";
   value: Uint8Array;
 }
@@ -263,7 +263,7 @@ export interface QueryValidatorSlashesResponseAmino {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponseAmino;
 }
-export interface QueryValidatorSlashesResponseAminoType {
+export interface QueryValidatorSlashesResponseAminoMsg {
   type: "cosmos-sdk/QueryValidatorSlashesResponse";
   value: QueryValidatorSlashesResponseAmino;
 }
@@ -288,7 +288,7 @@ export interface QueryDelegationRewardsRequest {
   /** validator_address defines the validator address to query for. */
   validatorAddress: string;
 }
-export interface QueryDelegationRewardsRequestProtoType {
+export interface QueryDelegationRewardsRequestProtoMsg {
   typeUrl: "/cosmos.distribution.v1beta1.QueryDelegationRewardsRequest";
   value: Uint8Array;
 }
@@ -304,7 +304,7 @@ export interface QueryDelegationRewardsRequestAmino {
   /** validator_address defines the validator address to query for. */
   validator_address: string;
 }
-export interface QueryDelegationRewardsRequestAminoType {
+export interface QueryDelegationRewardsRequestAminoMsg {
   type: "cosmos-sdk/QueryDelegationRewardsRequest";
   value: QueryDelegationRewardsRequestAmino;
 }
@@ -326,7 +326,7 @@ export interface QueryDelegationRewardsResponse {
   /** rewards defines the rewards accrued by a delegation. */
   rewards: DecCoin[];
 }
-export interface QueryDelegationRewardsResponseProtoType {
+export interface QueryDelegationRewardsResponseProtoMsg {
   typeUrl: "/cosmos.distribution.v1beta1.QueryDelegationRewardsResponse";
   value: Uint8Array;
 }
@@ -339,7 +339,7 @@ export interface QueryDelegationRewardsResponseAmino {
   /** rewards defines the rewards accrued by a delegation. */
   rewards: DecCoinAmino[];
 }
-export interface QueryDelegationRewardsResponseAminoType {
+export interface QueryDelegationRewardsResponseAminoMsg {
   type: "cosmos-sdk/QueryDelegationRewardsResponse";
   value: QueryDelegationRewardsResponseAmino;
 }
@@ -360,7 +360,7 @@ export interface QueryDelegationTotalRewardsRequest {
   /** delegator_address defines the delegator address to query for. */
   delegatorAddress: string;
 }
-export interface QueryDelegationTotalRewardsRequestProtoType {
+export interface QueryDelegationTotalRewardsRequestProtoMsg {
   typeUrl: "/cosmos.distribution.v1beta1.QueryDelegationTotalRewardsRequest";
   value: Uint8Array;
 }
@@ -373,7 +373,7 @@ export interface QueryDelegationTotalRewardsRequestAmino {
   /** delegator_address defines the delegator address to query for. */
   delegator_address: string;
 }
-export interface QueryDelegationTotalRewardsRequestAminoType {
+export interface QueryDelegationTotalRewardsRequestAminoMsg {
   type: "cosmos-sdk/QueryDelegationTotalRewardsRequest";
   value: QueryDelegationTotalRewardsRequestAmino;
 }
@@ -397,7 +397,7 @@ export interface QueryDelegationTotalRewardsResponse {
   /** total defines the sum of all the rewards. */
   total: DecCoin[];
 }
-export interface QueryDelegationTotalRewardsResponseProtoType {
+export interface QueryDelegationTotalRewardsResponseProtoMsg {
   typeUrl: "/cosmos.distribution.v1beta1.QueryDelegationTotalRewardsResponse";
   value: Uint8Array;
 }
@@ -413,7 +413,7 @@ export interface QueryDelegationTotalRewardsResponseAmino {
   /** total defines the sum of all the rewards. */
   total: DecCoinAmino[];
 }
-export interface QueryDelegationTotalRewardsResponseAminoType {
+export interface QueryDelegationTotalRewardsResponseAminoMsg {
   type: "cosmos-sdk/QueryDelegationTotalRewardsResponse";
   value: QueryDelegationTotalRewardsResponseAmino;
 }
@@ -435,7 +435,7 @@ export interface QueryDelegatorValidatorsRequest {
   /** delegator_address defines the delegator address to query for. */
   delegatorAddress: string;
 }
-export interface QueryDelegatorValidatorsRequestProtoType {
+export interface QueryDelegatorValidatorsRequestProtoMsg {
   typeUrl: "/cosmos.distribution.v1beta1.QueryDelegatorValidatorsRequest";
   value: Uint8Array;
 }
@@ -448,7 +448,7 @@ export interface QueryDelegatorValidatorsRequestAmino {
   /** delegator_address defines the delegator address to query for. */
   delegator_address: string;
 }
-export interface QueryDelegatorValidatorsRequestAminoType {
+export interface QueryDelegatorValidatorsRequestAminoMsg {
   type: "cosmos-sdk/QueryDelegatorValidatorsRequest";
   value: QueryDelegatorValidatorsRequestAmino;
 }
@@ -469,7 +469,7 @@ export interface QueryDelegatorValidatorsResponse {
   /** validators defines the validators a delegator is delegating for. */
   validators: string[];
 }
-export interface QueryDelegatorValidatorsResponseProtoType {
+export interface QueryDelegatorValidatorsResponseProtoMsg {
   typeUrl: "/cosmos.distribution.v1beta1.QueryDelegatorValidatorsResponse";
   value: Uint8Array;
 }
@@ -482,7 +482,7 @@ export interface QueryDelegatorValidatorsResponseAmino {
   /** validators defines the validators a delegator is delegating for. */
   validators: string[];
 }
-export interface QueryDelegatorValidatorsResponseAminoType {
+export interface QueryDelegatorValidatorsResponseAminoMsg {
   type: "cosmos-sdk/QueryDelegatorValidatorsResponse";
   value: QueryDelegatorValidatorsResponseAmino;
 }
@@ -503,7 +503,7 @@ export interface QueryDelegatorWithdrawAddressRequest {
   /** delegator_address defines the delegator address to query for. */
   delegatorAddress: string;
 }
-export interface QueryDelegatorWithdrawAddressRequestProtoType {
+export interface QueryDelegatorWithdrawAddressRequestProtoMsg {
   typeUrl: "/cosmos.distribution.v1beta1.QueryDelegatorWithdrawAddressRequest";
   value: Uint8Array;
 }
@@ -516,7 +516,7 @@ export interface QueryDelegatorWithdrawAddressRequestAmino {
   /** delegator_address defines the delegator address to query for. */
   delegator_address: string;
 }
-export interface QueryDelegatorWithdrawAddressRequestAminoType {
+export interface QueryDelegatorWithdrawAddressRequestAminoMsg {
   type: "cosmos-sdk/QueryDelegatorWithdrawAddressRequest";
   value: QueryDelegatorWithdrawAddressRequestAmino;
 }
@@ -537,7 +537,7 @@ export interface QueryDelegatorWithdrawAddressResponse {
   /** withdraw_address defines the delegator address to query for. */
   withdrawAddress: string;
 }
-export interface QueryDelegatorWithdrawAddressResponseProtoType {
+export interface QueryDelegatorWithdrawAddressResponseProtoMsg {
   typeUrl: "/cosmos.distribution.v1beta1.QueryDelegatorWithdrawAddressResponse";
   value: Uint8Array;
 }
@@ -550,7 +550,7 @@ export interface QueryDelegatorWithdrawAddressResponseAmino {
   /** withdraw_address defines the delegator address to query for. */
   withdraw_address: string;
 }
-export interface QueryDelegatorWithdrawAddressResponseAminoType {
+export interface QueryDelegatorWithdrawAddressResponseAminoMsg {
   type: "cosmos-sdk/QueryDelegatorWithdrawAddressResponse";
   value: QueryDelegatorWithdrawAddressResponseAmino;
 }
@@ -568,7 +568,7 @@ export interface QueryDelegatorWithdrawAddressResponseSDKType {
  * method.
  */
 export interface QueryCommunityPoolRequest {}
-export interface QueryCommunityPoolRequestProtoType {
+export interface QueryCommunityPoolRequestProtoMsg {
   typeUrl: "/cosmos.distribution.v1beta1.QueryCommunityPoolRequest";
   value: Uint8Array;
 }
@@ -578,7 +578,7 @@ export interface QueryCommunityPoolRequestProtoType {
  * method.
  */
 export interface QueryCommunityPoolRequestAmino {}
-export interface QueryCommunityPoolRequestAminoType {
+export interface QueryCommunityPoolRequestAminoMsg {
   type: "cosmos-sdk/QueryCommunityPoolRequest";
   value: QueryCommunityPoolRequestAmino;
 }
@@ -597,7 +597,7 @@ export interface QueryCommunityPoolResponse {
   /** pool defines community pool's coins. */
   pool: DecCoin[];
 }
-export interface QueryCommunityPoolResponseProtoType {
+export interface QueryCommunityPoolResponseProtoMsg {
   typeUrl: "/cosmos.distribution.v1beta1.QueryCommunityPoolResponse";
   value: Uint8Array;
 }
@@ -610,7 +610,7 @@ export interface QueryCommunityPoolResponseAmino {
   /** pool defines community pool's coins. */
   pool: DecCoinAmino[];
 }
-export interface QueryCommunityPoolResponseAminoType {
+export interface QueryCommunityPoolResponseAminoMsg {
   type: "cosmos-sdk/QueryCommunityPoolResponse";
   value: QueryCommunityPoolResponseAmino;
 }
@@ -628,6 +628,9 @@ function createBaseQueryParamsRequest(): QueryParamsRequest {
 }
 
 export const QueryParamsRequest = {
+  typeUrl: "/cosmos.distribution.v1beta1.QueryParamsRequest",
+  aminoType: "cosmos-sdk/QueryParamsRequest",
+
   encode(_: QueryParamsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -680,6 +683,32 @@ export const QueryParamsRequest = {
   toAmino(_: QueryParamsRequest): QueryParamsRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest {
+    return QueryParamsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryParamsRequest): QueryParamsRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryParamsRequest",
+      value: QueryParamsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryParamsRequestProtoMsg): QueryParamsRequest {
+    return QueryParamsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryParamsRequest): Uint8Array {
+    return QueryParamsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryParamsRequest): QueryParamsRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.distribution.v1beta1.QueryParamsRequest",
+      value: QueryParamsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -691,6 +720,9 @@ function createBaseQueryParamsResponse(): QueryParamsResponse {
 }
 
 export const QueryParamsResponse = {
+  typeUrl: "/cosmos.distribution.v1beta1.QueryParamsResponse",
+  aminoType: "cosmos-sdk/QueryParamsResponse",
+
   encode(message: QueryParamsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.params !== undefined) {
       Params.encode(message.params, writer.uint32(10).fork()).ldelim();
@@ -761,6 +793,32 @@ export const QueryParamsResponse = {
     const obj: any = {};
     obj.params = message.params ? Params.toAmino(message.params) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryParamsResponseAminoMsg): QueryParamsResponse {
+    return QueryParamsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryParamsResponse): QueryParamsResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryParamsResponse",
+      value: QueryParamsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryParamsResponseProtoMsg): QueryParamsResponse {
+    return QueryParamsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryParamsResponse): Uint8Array {
+    return QueryParamsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryParamsResponse): QueryParamsResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.distribution.v1beta1.QueryParamsResponse",
+      value: QueryParamsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -772,6 +830,9 @@ function createBaseQueryValidatorOutstandingRewardsRequest(): QueryValidatorOuts
 }
 
 export const QueryValidatorOutstandingRewardsRequest = {
+  typeUrl: "/cosmos.distribution.v1beta1.QueryValidatorOutstandingRewardsRequest",
+  aminoType: "cosmos-sdk/QueryValidatorOutstandingRewardsRequest",
+
   encode(message: QueryValidatorOutstandingRewardsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.validatorAddress !== "") {
       writer.uint32(10).string(message.validatorAddress);
@@ -842,6 +903,32 @@ export const QueryValidatorOutstandingRewardsRequest = {
     const obj: any = {};
     obj.validator_address = message.validatorAddress;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryValidatorOutstandingRewardsRequestAminoMsg): QueryValidatorOutstandingRewardsRequest {
+    return QueryValidatorOutstandingRewardsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryValidatorOutstandingRewardsRequest): QueryValidatorOutstandingRewardsRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryValidatorOutstandingRewardsRequest",
+      value: QueryValidatorOutstandingRewardsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryValidatorOutstandingRewardsRequestProtoMsg): QueryValidatorOutstandingRewardsRequest {
+    return QueryValidatorOutstandingRewardsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryValidatorOutstandingRewardsRequest): Uint8Array {
+    return QueryValidatorOutstandingRewardsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryValidatorOutstandingRewardsRequest): QueryValidatorOutstandingRewardsRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.distribution.v1beta1.QueryValidatorOutstandingRewardsRequest",
+      value: QueryValidatorOutstandingRewardsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -853,6 +940,9 @@ function createBaseQueryValidatorOutstandingRewardsResponse(): QueryValidatorOut
 }
 
 export const QueryValidatorOutstandingRewardsResponse = {
+  typeUrl: "/cosmos.distribution.v1beta1.QueryValidatorOutstandingRewardsResponse",
+  aminoType: "cosmos-sdk/QueryValidatorOutstandingRewardsResponse",
+
   encode(message: QueryValidatorOutstandingRewardsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.rewards !== undefined) {
       ValidatorOutstandingRewards.encode(message.rewards, writer.uint32(10).fork()).ldelim();
@@ -923,6 +1013,32 @@ export const QueryValidatorOutstandingRewardsResponse = {
     const obj: any = {};
     obj.rewards = message.rewards ? ValidatorOutstandingRewards.toAmino(message.rewards) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryValidatorOutstandingRewardsResponseAminoMsg): QueryValidatorOutstandingRewardsResponse {
+    return QueryValidatorOutstandingRewardsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryValidatorOutstandingRewardsResponse): QueryValidatorOutstandingRewardsResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryValidatorOutstandingRewardsResponse",
+      value: QueryValidatorOutstandingRewardsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryValidatorOutstandingRewardsResponseProtoMsg): QueryValidatorOutstandingRewardsResponse {
+    return QueryValidatorOutstandingRewardsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryValidatorOutstandingRewardsResponse): Uint8Array {
+    return QueryValidatorOutstandingRewardsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryValidatorOutstandingRewardsResponse): QueryValidatorOutstandingRewardsResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.distribution.v1beta1.QueryValidatorOutstandingRewardsResponse",
+      value: QueryValidatorOutstandingRewardsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -934,6 +1050,9 @@ function createBaseQueryValidatorCommissionRequest(): QueryValidatorCommissionRe
 }
 
 export const QueryValidatorCommissionRequest = {
+  typeUrl: "/cosmos.distribution.v1beta1.QueryValidatorCommissionRequest",
+  aminoType: "cosmos-sdk/QueryValidatorCommissionRequest",
+
   encode(message: QueryValidatorCommissionRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.validatorAddress !== "") {
       writer.uint32(10).string(message.validatorAddress);
@@ -1004,6 +1123,32 @@ export const QueryValidatorCommissionRequest = {
     const obj: any = {};
     obj.validator_address = message.validatorAddress;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryValidatorCommissionRequestAminoMsg): QueryValidatorCommissionRequest {
+    return QueryValidatorCommissionRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryValidatorCommissionRequest): QueryValidatorCommissionRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryValidatorCommissionRequest",
+      value: QueryValidatorCommissionRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryValidatorCommissionRequestProtoMsg): QueryValidatorCommissionRequest {
+    return QueryValidatorCommissionRequest.decode(message.value);
+  },
+
+  toProto(message: QueryValidatorCommissionRequest): Uint8Array {
+    return QueryValidatorCommissionRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryValidatorCommissionRequest): QueryValidatorCommissionRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.distribution.v1beta1.QueryValidatorCommissionRequest",
+      value: QueryValidatorCommissionRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1015,6 +1160,9 @@ function createBaseQueryValidatorCommissionResponse(): QueryValidatorCommissionR
 }
 
 export const QueryValidatorCommissionResponse = {
+  typeUrl: "/cosmos.distribution.v1beta1.QueryValidatorCommissionResponse",
+  aminoType: "cosmos-sdk/QueryValidatorCommissionResponse",
+
   encode(message: QueryValidatorCommissionResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.commission !== undefined) {
       ValidatorAccumulatedCommission.encode(message.commission, writer.uint32(10).fork()).ldelim();
@@ -1085,6 +1233,32 @@ export const QueryValidatorCommissionResponse = {
     const obj: any = {};
     obj.commission = message.commission ? ValidatorAccumulatedCommission.toAmino(message.commission) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryValidatorCommissionResponseAminoMsg): QueryValidatorCommissionResponse {
+    return QueryValidatorCommissionResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryValidatorCommissionResponse): QueryValidatorCommissionResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryValidatorCommissionResponse",
+      value: QueryValidatorCommissionResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryValidatorCommissionResponseProtoMsg): QueryValidatorCommissionResponse {
+    return QueryValidatorCommissionResponse.decode(message.value);
+  },
+
+  toProto(message: QueryValidatorCommissionResponse): Uint8Array {
+    return QueryValidatorCommissionResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryValidatorCommissionResponse): QueryValidatorCommissionResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.distribution.v1beta1.QueryValidatorCommissionResponse",
+      value: QueryValidatorCommissionResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1099,6 +1273,9 @@ function createBaseQueryValidatorSlashesRequest(): QueryValidatorSlashesRequest
 }
 
 export const QueryValidatorSlashesRequest = {
+  typeUrl: "/cosmos.distribution.v1beta1.QueryValidatorSlashesRequest",
+  aminoType: "cosmos-sdk/QueryValidatorSlashesRequest",
+
   encode(message: QueryValidatorSlashesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.validatorAddress !== "") {
       writer.uint32(10).string(message.validatorAddress);
@@ -1214,6 +1391,32 @@ export const QueryValidatorSlashesRequest = {
     obj.ending_height = message.endingHeight ? message.endingHeight.toString() : undefined;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryValidatorSlashesRequestAminoMsg): QueryValidatorSlashesRequest {
+    return QueryValidatorSlashesRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryValidatorSlashesRequest): QueryValidatorSlashesRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryValidatorSlashesRequest",
+      value: QueryValidatorSlashesRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryValidatorSlashesRequestProtoMsg): QueryValidatorSlashesRequest {
+    return QueryValidatorSlashesRequest.decode(message.value);
+  },
+
+  toProto(message: QueryValidatorSlashesRequest): Uint8Array {
+    return QueryValidatorSlashesRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryValidatorSlashesRequest): QueryValidatorSlashesRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.distribution.v1beta1.QueryValidatorSlashesRequest",
+      value: QueryValidatorSlashesRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1226,6 +1429,9 @@ function createBaseQueryValidatorSlashesResponse(): QueryValidatorSlashesRespons
 }
 
 export const QueryValidatorSlashesResponse = {
+  typeUrl: "/cosmos.distribution.v1beta1.QueryValidatorSlashesResponse",
+  aminoType: "cosmos-sdk/QueryValidatorSlashesResponse",
+
   encode(message: QueryValidatorSlashesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.slashes) {
       ValidatorSlashEvent.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1329,6 +1535,32 @@ export const QueryValidatorSlashesResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryValidatorSlashesResponseAminoMsg): QueryValidatorSlashesResponse {
+    return QueryValidatorSlashesResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryValidatorSlashesResponse): QueryValidatorSlashesResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryValidatorSlashesResponse",
+      value: QueryValidatorSlashesResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryValidatorSlashesResponseProtoMsg): QueryValidatorSlashesResponse {
+    return QueryValidatorSlashesResponse.decode(message.value);
+  },
+
+  toProto(message: QueryValidatorSlashesResponse): Uint8Array {
+    return QueryValidatorSlashesResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryValidatorSlashesResponse): QueryValidatorSlashesResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.distribution.v1beta1.QueryValidatorSlashesResponse",
+      value: QueryValidatorSlashesResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1341,6 +1573,9 @@ function createBaseQueryDelegationRewardsRequest(): QueryDelegationRewardsReques
 }
 
 export const QueryDelegationRewardsRequest = {
+  typeUrl: "/cosmos.distribution.v1beta1.QueryDelegationRewardsRequest",
+  aminoType: "cosmos-sdk/QueryDelegationRewardsRequest",
+
   encode(message: QueryDelegationRewardsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.delegatorAddress !== "") {
       writer.uint32(10).string(message.delegatorAddress);
@@ -1426,6 +1661,32 @@ export const QueryDelegationRewardsRequest = {
     obj.delegator_address = message.delegatorAddress;
     obj.validator_address = message.validatorAddress;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDelegationRewardsRequestAminoMsg): QueryDelegationRewardsRequest {
+    return QueryDelegationRewardsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryDelegationRewardsRequest): QueryDelegationRewardsRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryDelegationRewardsRequest",
+      value: QueryDelegationRewardsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryDelegationRewardsRequestProtoMsg): QueryDelegationRewardsRequest {
+    return QueryDelegationRewardsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryDelegationRewardsRequest): Uint8Array {
+    return QueryDelegationRewardsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDelegationRewardsRequest): QueryDelegationRewardsRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.distribution.v1beta1.QueryDelegationRewardsRequest",
+      value: QueryDelegationRewardsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1437,6 +1698,9 @@ function createBaseQueryDelegationRewardsResponse(): QueryDelegationRewardsRespo
 }
 
 export const QueryDelegationRewardsResponse = {
+  typeUrl: "/cosmos.distribution.v1beta1.QueryDelegationRewardsResponse",
+  aminoType: "cosmos-sdk/QueryDelegationRewardsResponse",
+
   encode(message: QueryDelegationRewardsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.rewards) {
       DecCoin.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1525,6 +1789,32 @@ export const QueryDelegationRewardsResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDelegationRewardsResponseAminoMsg): QueryDelegationRewardsResponse {
+    return QueryDelegationRewardsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryDelegationRewardsResponse): QueryDelegationRewardsResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryDelegationRewardsResponse",
+      value: QueryDelegationRewardsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryDelegationRewardsResponseProtoMsg): QueryDelegationRewardsResponse {
+    return QueryDelegationRewardsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryDelegationRewardsResponse): Uint8Array {
+    return QueryDelegationRewardsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDelegationRewardsResponse): QueryDelegationRewardsResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.distribution.v1beta1.QueryDelegationRewardsResponse",
+      value: QueryDelegationRewardsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1536,6 +1826,9 @@ function createBaseQueryDelegationTotalRewardsRequest(): QueryDelegationTotalRew
 }
 
 export const QueryDelegationTotalRewardsRequest = {
+  typeUrl: "/cosmos.distribution.v1beta1.QueryDelegationTotalRewardsRequest",
+  aminoType: "cosmos-sdk/QueryDelegationTotalRewardsRequest",
+
   encode(message: QueryDelegationTotalRewardsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.delegatorAddress !== "") {
       writer.uint32(10).string(message.delegatorAddress);
@@ -1606,6 +1899,32 @@ export const QueryDelegationTotalRewardsRequest = {
     const obj: any = {};
     obj.delegator_address = message.delegatorAddress;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDelegationTotalRewardsRequestAminoMsg): QueryDelegationTotalRewardsRequest {
+    return QueryDelegationTotalRewardsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryDelegationTotalRewardsRequest): QueryDelegationTotalRewardsRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryDelegationTotalRewardsRequest",
+      value: QueryDelegationTotalRewardsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryDelegationTotalRewardsRequestProtoMsg): QueryDelegationTotalRewardsRequest {
+    return QueryDelegationTotalRewardsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryDelegationTotalRewardsRequest): Uint8Array {
+    return QueryDelegationTotalRewardsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDelegationTotalRewardsRequest): QueryDelegationTotalRewardsRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.distribution.v1beta1.QueryDelegationTotalRewardsRequest",
+      value: QueryDelegationTotalRewardsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1618,6 +1937,9 @@ function createBaseQueryDelegationTotalRewardsResponse(): QueryDelegationTotalRe
 }
 
 export const QueryDelegationTotalRewardsResponse = {
+  typeUrl: "/cosmos.distribution.v1beta1.QueryDelegationTotalRewardsResponse",
+  aminoType: "cosmos-sdk/QueryDelegationTotalRewardsResponse",
+
   encode(message: QueryDelegationTotalRewardsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.rewards) {
       DelegationDelegatorReward.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1736,6 +2058,32 @@ export const QueryDelegationTotalRewardsResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDelegationTotalRewardsResponseAminoMsg): QueryDelegationTotalRewardsResponse {
+    return QueryDelegationTotalRewardsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryDelegationTotalRewardsResponse): QueryDelegationTotalRewardsResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryDelegationTotalRewardsResponse",
+      value: QueryDelegationTotalRewardsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryDelegationTotalRewardsResponseProtoMsg): QueryDelegationTotalRewardsResponse {
+    return QueryDelegationTotalRewardsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryDelegationTotalRewardsResponse): Uint8Array {
+    return QueryDelegationTotalRewardsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDelegationTotalRewardsResponse): QueryDelegationTotalRewardsResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.distribution.v1beta1.QueryDelegationTotalRewardsResponse",
+      value: QueryDelegationTotalRewardsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1747,6 +2095,9 @@ function createBaseQueryDelegatorValidatorsRequest(): QueryDelegatorValidatorsRe
 }
 
 export const QueryDelegatorValidatorsRequest = {
+  typeUrl: "/cosmos.distribution.v1beta1.QueryDelegatorValidatorsRequest",
+  aminoType: "cosmos-sdk/QueryDelegatorValidatorsRequest",
+
   encode(message: QueryDelegatorValidatorsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.delegatorAddress !== "") {
       writer.uint32(10).string(message.delegatorAddress);
@@ -1817,6 +2168,32 @@ export const QueryDelegatorValidatorsRequest = {
     const obj: any = {};
     obj.delegator_address = message.delegatorAddress;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDelegatorValidatorsRequestAminoMsg): QueryDelegatorValidatorsRequest {
+    return QueryDelegatorValidatorsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryDelegatorValidatorsRequest): QueryDelegatorValidatorsRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryDelegatorValidatorsRequest",
+      value: QueryDelegatorValidatorsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryDelegatorValidatorsRequestProtoMsg): QueryDelegatorValidatorsRequest {
+    return QueryDelegatorValidatorsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryDelegatorValidatorsRequest): Uint8Array {
+    return QueryDelegatorValidatorsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDelegatorValidatorsRequest): QueryDelegatorValidatorsRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.distribution.v1beta1.QueryDelegatorValidatorsRequest",
+      value: QueryDelegatorValidatorsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1828,6 +2205,9 @@ function createBaseQueryDelegatorValidatorsResponse(): QueryDelegatorValidatorsR
 }
 
 export const QueryDelegatorValidatorsResponse = {
+  typeUrl: "/cosmos.distribution.v1beta1.QueryDelegatorValidatorsResponse",
+  aminoType: "cosmos-sdk/QueryDelegatorValidatorsResponse",
+
   encode(message: QueryDelegatorValidatorsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.validators) {
       writer.uint32(10).string(v!);
@@ -1916,6 +2296,32 @@ export const QueryDelegatorValidatorsResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDelegatorValidatorsResponseAminoMsg): QueryDelegatorValidatorsResponse {
+    return QueryDelegatorValidatorsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryDelegatorValidatorsResponse): QueryDelegatorValidatorsResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryDelegatorValidatorsResponse",
+      value: QueryDelegatorValidatorsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryDelegatorValidatorsResponseProtoMsg): QueryDelegatorValidatorsResponse {
+    return QueryDelegatorValidatorsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryDelegatorValidatorsResponse): Uint8Array {
+    return QueryDelegatorValidatorsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDelegatorValidatorsResponse): QueryDelegatorValidatorsResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.distribution.v1beta1.QueryDelegatorValidatorsResponse",
+      value: QueryDelegatorValidatorsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1927,6 +2333,9 @@ function createBaseQueryDelegatorWithdrawAddressRequest(): QueryDelegatorWithdra
 }
 
 export const QueryDelegatorWithdrawAddressRequest = {
+  typeUrl: "/cosmos.distribution.v1beta1.QueryDelegatorWithdrawAddressRequest",
+  aminoType: "cosmos-sdk/QueryDelegatorWithdrawAddressRequest",
+
   encode(message: QueryDelegatorWithdrawAddressRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.delegatorAddress !== "") {
       writer.uint32(10).string(message.delegatorAddress);
@@ -1997,6 +2406,32 @@ export const QueryDelegatorWithdrawAddressRequest = {
     const obj: any = {};
     obj.delegator_address = message.delegatorAddress;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDelegatorWithdrawAddressRequestAminoMsg): QueryDelegatorWithdrawAddressRequest {
+    return QueryDelegatorWithdrawAddressRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryDelegatorWithdrawAddressRequest): QueryDelegatorWithdrawAddressRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryDelegatorWithdrawAddressRequest",
+      value: QueryDelegatorWithdrawAddressRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryDelegatorWithdrawAddressRequestProtoMsg): QueryDelegatorWithdrawAddressRequest {
+    return QueryDelegatorWithdrawAddressRequest.decode(message.value);
+  },
+
+  toProto(message: QueryDelegatorWithdrawAddressRequest): Uint8Array {
+    return QueryDelegatorWithdrawAddressRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDelegatorWithdrawAddressRequest): QueryDelegatorWithdrawAddressRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.distribution.v1beta1.QueryDelegatorWithdrawAddressRequest",
+      value: QueryDelegatorWithdrawAddressRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2008,6 +2443,9 @@ function createBaseQueryDelegatorWithdrawAddressResponse(): QueryDelegatorWithdr
 }
 
 export const QueryDelegatorWithdrawAddressResponse = {
+  typeUrl: "/cosmos.distribution.v1beta1.QueryDelegatorWithdrawAddressResponse",
+  aminoType: "cosmos-sdk/QueryDelegatorWithdrawAddressResponse",
+
   encode(message: QueryDelegatorWithdrawAddressResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.withdrawAddress !== "") {
       writer.uint32(10).string(message.withdrawAddress);
@@ -2078,6 +2516,32 @@ export const QueryDelegatorWithdrawAddressResponse = {
     const obj: any = {};
     obj.withdraw_address = message.withdrawAddress;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDelegatorWithdrawAddressResponseAminoMsg): QueryDelegatorWithdrawAddressResponse {
+    return QueryDelegatorWithdrawAddressResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryDelegatorWithdrawAddressResponse): QueryDelegatorWithdrawAddressResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryDelegatorWithdrawAddressResponse",
+      value: QueryDelegatorWithdrawAddressResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryDelegatorWithdrawAddressResponseProtoMsg): QueryDelegatorWithdrawAddressResponse {
+    return QueryDelegatorWithdrawAddressResponse.decode(message.value);
+  },
+
+  toProto(message: QueryDelegatorWithdrawAddressResponse): Uint8Array {
+    return QueryDelegatorWithdrawAddressResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDelegatorWithdrawAddressResponse): QueryDelegatorWithdrawAddressResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.distribution.v1beta1.QueryDelegatorWithdrawAddressResponse",
+      value: QueryDelegatorWithdrawAddressResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2087,6 +2551,9 @@ function createBaseQueryCommunityPoolRequest(): QueryCommunityPoolRequest {
 }
 
 export const QueryCommunityPoolRequest = {
+  typeUrl: "/cosmos.distribution.v1beta1.QueryCommunityPoolRequest",
+  aminoType: "cosmos-sdk/QueryCommunityPoolRequest",
+
   encode(_: QueryCommunityPoolRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -2139,6 +2606,32 @@ export const QueryCommunityPoolRequest = {
   toAmino(_: QueryCommunityPoolRequest): QueryCommunityPoolRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryCommunityPoolRequestAminoMsg): QueryCommunityPoolRequest {
+    return QueryCommunityPoolRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryCommunityPoolRequest): QueryCommunityPoolRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryCommunityPoolRequest",
+      value: QueryCommunityPoolRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryCommunityPoolRequestProtoMsg): QueryCommunityPoolRequest {
+    return QueryCommunityPoolRequest.decode(message.value);
+  },
+
+  toProto(message: QueryCommunityPoolRequest): Uint8Array {
+    return QueryCommunityPoolRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryCommunityPoolRequest): QueryCommunityPoolRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.distribution.v1beta1.QueryCommunityPoolRequest",
+      value: QueryCommunityPoolRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2150,6 +2643,9 @@ function createBaseQueryCommunityPoolResponse(): QueryCommunityPoolResponse {
 }
 
 export const QueryCommunityPoolResponse = {
+  typeUrl: "/cosmos.distribution.v1beta1.QueryCommunityPoolResponse",
+  aminoType: "cosmos-sdk/QueryCommunityPoolResponse",
+
   encode(message: QueryCommunityPoolResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.pool) {
       DecCoin.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -2238,6 +2734,32 @@ export const QueryCommunityPoolResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: QueryCommunityPoolResponseAminoMsg): QueryCommunityPoolResponse {
+    return QueryCommunityPoolResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryCommunityPoolResponse): QueryCommunityPoolResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryCommunityPoolResponse",
+      value: QueryCommunityPoolResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryCommunityPoolResponseProtoMsg): QueryCommunityPoolResponse {
+    return QueryCommunityPoolResponse.decode(message.value);
+  },
+
+  toProto(message: QueryCommunityPoolResponse): Uint8Array {
+    return QueryCommunityPoolResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryCommunityPoolResponse): QueryCommunityPoolResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.distribution.v1beta1.QueryCommunityPoolResponse",
+      value: QueryCommunityPoolResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/distribution/v1beta1/tx.ts b/__fixtures__/outputv2/cosmos/distribution/v1beta1/tx.ts
index 69c1e2fea..fe054ad00 100644
--- a/__fixtures__/outputv2/cosmos/distribution/v1beta1/tx.ts
+++ b/__fixtures__/outputv2/cosmos/distribution/v1beta1/tx.ts
@@ -11,7 +11,7 @@ export interface MsgSetWithdrawAddress {
   delegatorAddress: string;
   withdrawAddress: string;
 }
-export interface MsgSetWithdrawAddressProtoType {
+export interface MsgSetWithdrawAddressProtoMsg {
   typeUrl: "/cosmos.distribution.v1beta1.MsgSetWithdrawAddress";
   value: Uint8Array;
 }
@@ -24,7 +24,7 @@ export interface MsgSetWithdrawAddressAmino {
   delegator_address: string;
   withdraw_address: string;
 }
-export interface MsgSetWithdrawAddressAminoType {
+export interface MsgSetWithdrawAddressAminoMsg {
   type: "cosmos-sdk/MsgModifyWithdrawAddress";
   value: MsgSetWithdrawAddressAmino;
 }
@@ -40,14 +40,14 @@ export interface MsgSetWithdrawAddressSDKType {
 
 /** MsgSetWithdrawAddressResponse defines the Msg/SetWithdrawAddress response type. */
 export interface MsgSetWithdrawAddressResponse {}
-export interface MsgSetWithdrawAddressResponseProtoType {
+export interface MsgSetWithdrawAddressResponseProtoMsg {
   typeUrl: "/cosmos.distribution.v1beta1.MsgSetWithdrawAddressResponse";
   value: Uint8Array;
 }
 
 /** MsgSetWithdrawAddressResponse defines the Msg/SetWithdrawAddress response type. */
 export interface MsgSetWithdrawAddressResponseAmino {}
-export interface MsgSetWithdrawAddressResponseAminoType {
+export interface MsgSetWithdrawAddressResponseAminoMsg {
   type: "cosmos-sdk/MsgSetWithdrawAddressResponse";
   value: MsgSetWithdrawAddressResponseAmino;
 }
@@ -63,7 +63,7 @@ export interface MsgWithdrawDelegatorReward {
   delegatorAddress: string;
   validatorAddress: string;
 }
-export interface MsgWithdrawDelegatorRewardProtoType {
+export interface MsgWithdrawDelegatorRewardProtoMsg {
   typeUrl: "/cosmos.distribution.v1beta1.MsgWithdrawDelegatorReward";
   value: Uint8Array;
 }
@@ -76,7 +76,7 @@ export interface MsgWithdrawDelegatorRewardAmino {
   delegator_address: string;
   validator_address: string;
 }
-export interface MsgWithdrawDelegatorRewardAminoType {
+export interface MsgWithdrawDelegatorRewardAminoMsg {
   type: "cosmos-sdk/MsgWithdrawDelegationReward";
   value: MsgWithdrawDelegatorRewardAmino;
 }
@@ -94,7 +94,7 @@ export interface MsgWithdrawDelegatorRewardSDKType {
 export interface MsgWithdrawDelegatorRewardResponse {
   amount: Coin[];
 }
-export interface MsgWithdrawDelegatorRewardResponseProtoType {
+export interface MsgWithdrawDelegatorRewardResponseProtoMsg {
   typeUrl: "/cosmos.distribution.v1beta1.MsgWithdrawDelegatorRewardResponse";
   value: Uint8Array;
 }
@@ -103,7 +103,7 @@ export interface MsgWithdrawDelegatorRewardResponseProtoType {
 export interface MsgWithdrawDelegatorRewardResponseAmino {
   amount: CoinAmino[];
 }
-export interface MsgWithdrawDelegatorRewardResponseAminoType {
+export interface MsgWithdrawDelegatorRewardResponseAminoMsg {
   type: "cosmos-sdk/MsgWithdrawDelegatorRewardResponse";
   value: MsgWithdrawDelegatorRewardResponseAmino;
 }
@@ -120,7 +120,7 @@ export interface MsgWithdrawDelegatorRewardResponseSDKType {
 export interface MsgWithdrawValidatorCommission {
   validatorAddress: string;
 }
-export interface MsgWithdrawValidatorCommissionProtoType {
+export interface MsgWithdrawValidatorCommissionProtoMsg {
   typeUrl: "/cosmos.distribution.v1beta1.MsgWithdrawValidatorCommission";
   value: Uint8Array;
 }
@@ -132,7 +132,7 @@ export interface MsgWithdrawValidatorCommissionProtoType {
 export interface MsgWithdrawValidatorCommissionAmino {
   validator_address: string;
 }
-export interface MsgWithdrawValidatorCommissionAminoType {
+export interface MsgWithdrawValidatorCommissionAminoMsg {
   type: "cosmos-sdk/MsgWithdrawValidatorCommission";
   value: MsgWithdrawValidatorCommissionAmino;
 }
@@ -149,7 +149,7 @@ export interface MsgWithdrawValidatorCommissionSDKType {
 export interface MsgWithdrawValidatorCommissionResponse {
   amount: Coin[];
 }
-export interface MsgWithdrawValidatorCommissionResponseProtoType {
+export interface MsgWithdrawValidatorCommissionResponseProtoMsg {
   typeUrl: "/cosmos.distribution.v1beta1.MsgWithdrawValidatorCommissionResponse";
   value: Uint8Array;
 }
@@ -158,7 +158,7 @@ export interface MsgWithdrawValidatorCommissionResponseProtoType {
 export interface MsgWithdrawValidatorCommissionResponseAmino {
   amount: CoinAmino[];
 }
-export interface MsgWithdrawValidatorCommissionResponseAminoType {
+export interface MsgWithdrawValidatorCommissionResponseAminoMsg {
   type: "cosmos-sdk/MsgWithdrawValidatorCommissionResponse";
   value: MsgWithdrawValidatorCommissionResponseAmino;
 }
@@ -176,7 +176,7 @@ export interface MsgFundCommunityPool {
   amount: Coin[];
   depositor: string;
 }
-export interface MsgFundCommunityPoolProtoType {
+export interface MsgFundCommunityPoolProtoMsg {
   typeUrl: "/cosmos.distribution.v1beta1.MsgFundCommunityPool";
   value: Uint8Array;
 }
@@ -189,7 +189,7 @@ export interface MsgFundCommunityPoolAmino {
   amount: CoinAmino[];
   depositor: string;
 }
-export interface MsgFundCommunityPoolAminoType {
+export interface MsgFundCommunityPoolAminoMsg {
   type: "cosmos-sdk/MsgFundCommunityPool";
   value: MsgFundCommunityPoolAmino;
 }
@@ -205,14 +205,14 @@ export interface MsgFundCommunityPoolSDKType {
 
 /** MsgFundCommunityPoolResponse defines the Msg/FundCommunityPool response type. */
 export interface MsgFundCommunityPoolResponse {}
-export interface MsgFundCommunityPoolResponseProtoType {
+export interface MsgFundCommunityPoolResponseProtoMsg {
   typeUrl: "/cosmos.distribution.v1beta1.MsgFundCommunityPoolResponse";
   value: Uint8Array;
 }
 
 /** MsgFundCommunityPoolResponse defines the Msg/FundCommunityPool response type. */
 export interface MsgFundCommunityPoolResponseAmino {}
-export interface MsgFundCommunityPoolResponseAminoType {
+export interface MsgFundCommunityPoolResponseAminoMsg {
   type: "cosmos-sdk/MsgFundCommunityPoolResponse";
   value: MsgFundCommunityPoolResponseAmino;
 }
@@ -228,6 +228,9 @@ function createBaseMsgSetWithdrawAddress(): MsgSetWithdrawAddress {
 }
 
 export const MsgSetWithdrawAddress = {
+  typeUrl: "/cosmos.distribution.v1beta1.MsgSetWithdrawAddress",
+  aminoType: "cosmos-sdk/MsgModifyWithdrawAddress",
+
   encode(message: MsgSetWithdrawAddress, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.delegatorAddress !== "") {
       writer.uint32(10).string(message.delegatorAddress);
@@ -313,6 +316,32 @@ export const MsgSetWithdrawAddress = {
     obj.delegator_address = message.delegatorAddress;
     obj.withdraw_address = message.withdrawAddress;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgSetWithdrawAddressAminoMsg): MsgSetWithdrawAddress {
+    return MsgSetWithdrawAddress.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgSetWithdrawAddress): MsgSetWithdrawAddressAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgModifyWithdrawAddress",
+      value: MsgSetWithdrawAddress.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgSetWithdrawAddressProtoMsg): MsgSetWithdrawAddress {
+    return MsgSetWithdrawAddress.decode(message.value);
+  },
+
+  toProto(message: MsgSetWithdrawAddress): Uint8Array {
+    return MsgSetWithdrawAddress.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgSetWithdrawAddress): MsgSetWithdrawAddressProtoMsg {
+    return {
+      typeUrl: "/cosmos.distribution.v1beta1.MsgSetWithdrawAddress",
+      value: MsgSetWithdrawAddress.encode(message).finish()
+    };
   }
 
 };
@@ -322,6 +351,9 @@ function createBaseMsgSetWithdrawAddressResponse(): MsgSetWithdrawAddressRespons
 }
 
 export const MsgSetWithdrawAddressResponse = {
+  typeUrl: "/cosmos.distribution.v1beta1.MsgSetWithdrawAddressResponse",
+  aminoType: "cosmos-sdk/MsgSetWithdrawAddressResponse",
+
   encode(_: MsgSetWithdrawAddressResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -374,6 +406,32 @@ export const MsgSetWithdrawAddressResponse = {
   toAmino(_: MsgSetWithdrawAddressResponse): MsgSetWithdrawAddressResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgSetWithdrawAddressResponseAminoMsg): MsgSetWithdrawAddressResponse {
+    return MsgSetWithdrawAddressResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgSetWithdrawAddressResponse): MsgSetWithdrawAddressResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgSetWithdrawAddressResponse",
+      value: MsgSetWithdrawAddressResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgSetWithdrawAddressResponseProtoMsg): MsgSetWithdrawAddressResponse {
+    return MsgSetWithdrawAddressResponse.decode(message.value);
+  },
+
+  toProto(message: MsgSetWithdrawAddressResponse): Uint8Array {
+    return MsgSetWithdrawAddressResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgSetWithdrawAddressResponse): MsgSetWithdrawAddressResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.distribution.v1beta1.MsgSetWithdrawAddressResponse",
+      value: MsgSetWithdrawAddressResponse.encode(message).finish()
+    };
   }
 
 };
@@ -386,6 +444,9 @@ function createBaseMsgWithdrawDelegatorReward(): MsgWithdrawDelegatorReward {
 }
 
 export const MsgWithdrawDelegatorReward = {
+  typeUrl: "/cosmos.distribution.v1beta1.MsgWithdrawDelegatorReward",
+  aminoType: "cosmos-sdk/MsgWithdrawDelegationReward",
+
   encode(message: MsgWithdrawDelegatorReward, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.delegatorAddress !== "") {
       writer.uint32(10).string(message.delegatorAddress);
@@ -471,6 +532,32 @@ export const MsgWithdrawDelegatorReward = {
     obj.delegator_address = message.delegatorAddress;
     obj.validator_address = message.validatorAddress;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgWithdrawDelegatorRewardAminoMsg): MsgWithdrawDelegatorReward {
+    return MsgWithdrawDelegatorReward.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgWithdrawDelegatorReward): MsgWithdrawDelegatorRewardAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgWithdrawDelegationReward",
+      value: MsgWithdrawDelegatorReward.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgWithdrawDelegatorRewardProtoMsg): MsgWithdrawDelegatorReward {
+    return MsgWithdrawDelegatorReward.decode(message.value);
+  },
+
+  toProto(message: MsgWithdrawDelegatorReward): Uint8Array {
+    return MsgWithdrawDelegatorReward.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgWithdrawDelegatorReward): MsgWithdrawDelegatorRewardProtoMsg {
+    return {
+      typeUrl: "/cosmos.distribution.v1beta1.MsgWithdrawDelegatorReward",
+      value: MsgWithdrawDelegatorReward.encode(message).finish()
+    };
   }
 
 };
@@ -482,6 +569,9 @@ function createBaseMsgWithdrawDelegatorRewardResponse(): MsgWithdrawDelegatorRew
 }
 
 export const MsgWithdrawDelegatorRewardResponse = {
+  typeUrl: "/cosmos.distribution.v1beta1.MsgWithdrawDelegatorRewardResponse",
+  aminoType: "cosmos-sdk/MsgWithdrawDelegatorRewardResponse",
+
   encode(message: MsgWithdrawDelegatorRewardResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.amount) {
       Coin.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -570,6 +660,32 @@ export const MsgWithdrawDelegatorRewardResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: MsgWithdrawDelegatorRewardResponseAminoMsg): MsgWithdrawDelegatorRewardResponse {
+    return MsgWithdrawDelegatorRewardResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgWithdrawDelegatorRewardResponse): MsgWithdrawDelegatorRewardResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgWithdrawDelegatorRewardResponse",
+      value: MsgWithdrawDelegatorRewardResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgWithdrawDelegatorRewardResponseProtoMsg): MsgWithdrawDelegatorRewardResponse {
+    return MsgWithdrawDelegatorRewardResponse.decode(message.value);
+  },
+
+  toProto(message: MsgWithdrawDelegatorRewardResponse): Uint8Array {
+    return MsgWithdrawDelegatorRewardResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgWithdrawDelegatorRewardResponse): MsgWithdrawDelegatorRewardResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.distribution.v1beta1.MsgWithdrawDelegatorRewardResponse",
+      value: MsgWithdrawDelegatorRewardResponse.encode(message).finish()
+    };
   }
 
 };
@@ -581,6 +697,9 @@ function createBaseMsgWithdrawValidatorCommission(): MsgWithdrawValidatorCommiss
 }
 
 export const MsgWithdrawValidatorCommission = {
+  typeUrl: "/cosmos.distribution.v1beta1.MsgWithdrawValidatorCommission",
+  aminoType: "cosmos-sdk/MsgWithdrawValidatorCommission",
+
   encode(message: MsgWithdrawValidatorCommission, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.validatorAddress !== "") {
       writer.uint32(10).string(message.validatorAddress);
@@ -651,6 +770,32 @@ export const MsgWithdrawValidatorCommission = {
     const obj: any = {};
     obj.validator_address = message.validatorAddress;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgWithdrawValidatorCommissionAminoMsg): MsgWithdrawValidatorCommission {
+    return MsgWithdrawValidatorCommission.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgWithdrawValidatorCommission): MsgWithdrawValidatorCommissionAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgWithdrawValidatorCommission",
+      value: MsgWithdrawValidatorCommission.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgWithdrawValidatorCommissionProtoMsg): MsgWithdrawValidatorCommission {
+    return MsgWithdrawValidatorCommission.decode(message.value);
+  },
+
+  toProto(message: MsgWithdrawValidatorCommission): Uint8Array {
+    return MsgWithdrawValidatorCommission.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgWithdrawValidatorCommission): MsgWithdrawValidatorCommissionProtoMsg {
+    return {
+      typeUrl: "/cosmos.distribution.v1beta1.MsgWithdrawValidatorCommission",
+      value: MsgWithdrawValidatorCommission.encode(message).finish()
+    };
   }
 
 };
@@ -662,6 +807,9 @@ function createBaseMsgWithdrawValidatorCommissionResponse(): MsgWithdrawValidato
 }
 
 export const MsgWithdrawValidatorCommissionResponse = {
+  typeUrl: "/cosmos.distribution.v1beta1.MsgWithdrawValidatorCommissionResponse",
+  aminoType: "cosmos-sdk/MsgWithdrawValidatorCommissionResponse",
+
   encode(message: MsgWithdrawValidatorCommissionResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.amount) {
       Coin.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -750,6 +898,32 @@ export const MsgWithdrawValidatorCommissionResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: MsgWithdrawValidatorCommissionResponseAminoMsg): MsgWithdrawValidatorCommissionResponse {
+    return MsgWithdrawValidatorCommissionResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgWithdrawValidatorCommissionResponse): MsgWithdrawValidatorCommissionResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgWithdrawValidatorCommissionResponse",
+      value: MsgWithdrawValidatorCommissionResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgWithdrawValidatorCommissionResponseProtoMsg): MsgWithdrawValidatorCommissionResponse {
+    return MsgWithdrawValidatorCommissionResponse.decode(message.value);
+  },
+
+  toProto(message: MsgWithdrawValidatorCommissionResponse): Uint8Array {
+    return MsgWithdrawValidatorCommissionResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgWithdrawValidatorCommissionResponse): MsgWithdrawValidatorCommissionResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.distribution.v1beta1.MsgWithdrawValidatorCommissionResponse",
+      value: MsgWithdrawValidatorCommissionResponse.encode(message).finish()
+    };
   }
 
 };
@@ -762,6 +936,9 @@ function createBaseMsgFundCommunityPool(): MsgFundCommunityPool {
 }
 
 export const MsgFundCommunityPool = {
+  typeUrl: "/cosmos.distribution.v1beta1.MsgFundCommunityPool",
+  aminoType: "cosmos-sdk/MsgFundCommunityPool",
+
   encode(message: MsgFundCommunityPool, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.amount) {
       Coin.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -865,6 +1042,32 @@ export const MsgFundCommunityPool = {
 
     obj.depositor = message.depositor;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgFundCommunityPoolAminoMsg): MsgFundCommunityPool {
+    return MsgFundCommunityPool.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgFundCommunityPool): MsgFundCommunityPoolAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgFundCommunityPool",
+      value: MsgFundCommunityPool.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgFundCommunityPoolProtoMsg): MsgFundCommunityPool {
+    return MsgFundCommunityPool.decode(message.value);
+  },
+
+  toProto(message: MsgFundCommunityPool): Uint8Array {
+    return MsgFundCommunityPool.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgFundCommunityPool): MsgFundCommunityPoolProtoMsg {
+    return {
+      typeUrl: "/cosmos.distribution.v1beta1.MsgFundCommunityPool",
+      value: MsgFundCommunityPool.encode(message).finish()
+    };
   }
 
 };
@@ -874,6 +1077,9 @@ function createBaseMsgFundCommunityPoolResponse(): MsgFundCommunityPoolResponse
 }
 
 export const MsgFundCommunityPoolResponse = {
+  typeUrl: "/cosmos.distribution.v1beta1.MsgFundCommunityPoolResponse",
+  aminoType: "cosmos-sdk/MsgFundCommunityPoolResponse",
+
   encode(_: MsgFundCommunityPoolResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -926,6 +1132,32 @@ export const MsgFundCommunityPoolResponse = {
   toAmino(_: MsgFundCommunityPoolResponse): MsgFundCommunityPoolResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgFundCommunityPoolResponseAminoMsg): MsgFundCommunityPoolResponse {
+    return MsgFundCommunityPoolResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgFundCommunityPoolResponse): MsgFundCommunityPoolResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgFundCommunityPoolResponse",
+      value: MsgFundCommunityPoolResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgFundCommunityPoolResponseProtoMsg): MsgFundCommunityPoolResponse {
+    return MsgFundCommunityPoolResponse.decode(message.value);
+  },
+
+  toProto(message: MsgFundCommunityPoolResponse): Uint8Array {
+    return MsgFundCommunityPoolResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgFundCommunityPoolResponse): MsgFundCommunityPoolResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.distribution.v1beta1.MsgFundCommunityPoolResponse",
+      value: MsgFundCommunityPoolResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/evidence/v1beta1/evidence.ts b/__fixtures__/outputv2/cosmos/evidence/v1beta1/evidence.ts
index c09133064..b423386d5 100644
--- a/__fixtures__/outputv2/cosmos/evidence/v1beta1/evidence.ts
+++ b/__fixtures__/outputv2/cosmos/evidence/v1beta1/evidence.ts
@@ -13,7 +13,7 @@ export interface Equivocation {
   power: Long;
   consensusAddress: string;
 }
-export interface EquivocationProtoType {
+export interface EquivocationProtoMsg {
   typeUrl: "/cosmos.evidence.v1beta1.Equivocation";
   value: Uint8Array;
 }
@@ -28,7 +28,7 @@ export interface EquivocationAmino {
   power: string;
   consensus_address: string;
 }
-export interface EquivocationAminoType {
+export interface EquivocationAminoMsg {
   type: "cosmos-sdk/Equivocation";
   value: EquivocationAmino;
 }
@@ -54,6 +54,9 @@ function createBaseEquivocation(): Equivocation {
 }
 
 export const Equivocation = {
+  typeUrl: "/cosmos.evidence.v1beta1.Equivocation",
+  aminoType: "cosmos-sdk/Equivocation",
+
   encode(message: Equivocation, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.height.isZero()) {
       writer.uint32(8).int64(message.height);
@@ -169,6 +172,32 @@ export const Equivocation = {
     obj.power = message.power ? message.power.toString() : undefined;
     obj.consensus_address = message.consensusAddress;
     return obj;
+  },
+
+  fromAminoMsg(object: EquivocationAminoMsg): Equivocation {
+    return Equivocation.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Equivocation): EquivocationAminoMsg {
+    return {
+      type: "cosmos-sdk/Equivocation",
+      value: Equivocation.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: EquivocationProtoMsg): Equivocation {
+    return Equivocation.decode(message.value);
+  },
+
+  toProto(message: Equivocation): Uint8Array {
+    return Equivocation.encode(message).finish();
+  },
+
+  toProtoMsg(message: Equivocation): EquivocationProtoMsg {
+    return {
+      typeUrl: "/cosmos.evidence.v1beta1.Equivocation",
+      value: Equivocation.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/evidence/v1beta1/genesis.ts b/__fixtures__/outputv2/cosmos/evidence/v1beta1/genesis.ts
index 3519adab3..7b90bd76f 100644
--- a/__fixtures__/outputv2/cosmos/evidence/v1beta1/genesis.ts
+++ b/__fixtures__/outputv2/cosmos/evidence/v1beta1/genesis.ts
@@ -8,7 +8,7 @@ export interface GenesisState {
   /** evidence defines all the evidence at genesis. */
   evidence: Any[];
 }
-export interface GenesisStateProtoType {
+export interface GenesisStateProtoMsg {
   typeUrl: "/cosmos.evidence.v1beta1.GenesisState";
   value: Uint8Array;
 }
@@ -18,7 +18,7 @@ export interface GenesisStateAmino {
   /** evidence defines all the evidence at genesis. */
   evidence: AnyAmino[];
 }
-export interface GenesisStateAminoType {
+export interface GenesisStateAminoMsg {
   type: "cosmos-sdk/GenesisState";
   value: GenesisStateAmino;
 }
@@ -35,6 +35,9 @@ function createBaseGenesisState(): GenesisState {
 }
 
 export const GenesisState = {
+  typeUrl: "/cosmos.evidence.v1beta1.GenesisState",
+  aminoType: "cosmos-sdk/GenesisState",
+
   encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.evidence) {
       Any.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -123,6 +126,32 @@ export const GenesisState = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisStateAminoMsg): GenesisState {
+    return GenesisState.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GenesisState): GenesisStateAminoMsg {
+    return {
+      type: "cosmos-sdk/GenesisState",
+      value: GenesisState.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GenesisStateProtoMsg): GenesisState {
+    return GenesisState.decode(message.value);
+  },
+
+  toProto(message: GenesisState): Uint8Array {
+    return GenesisState.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisState): GenesisStateProtoMsg {
+    return {
+      typeUrl: "/cosmos.evidence.v1beta1.GenesisState",
+      value: GenesisState.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/evidence/v1beta1/query.ts b/__fixtures__/outputv2/cosmos/evidence/v1beta1/query.ts
index 4c360190c..945993297 100644
--- a/__fixtures__/outputv2/cosmos/evidence/v1beta1/query.ts
+++ b/__fixtures__/outputv2/cosmos/evidence/v1beta1/query.ts
@@ -9,7 +9,7 @@ export interface QueryEvidenceRequest {
   /** evidence_hash defines the hash of the requested evidence. */
   evidenceHash: Uint8Array;
 }
-export interface QueryEvidenceRequestProtoType {
+export interface QueryEvidenceRequestProtoMsg {
   typeUrl: "/cosmos.evidence.v1beta1.QueryEvidenceRequest";
   value: Uint8Array;
 }
@@ -19,7 +19,7 @@ export interface QueryEvidenceRequestAmino {
   /** evidence_hash defines the hash of the requested evidence. */
   evidence_hash: Uint8Array;
 }
-export interface QueryEvidenceRequestAminoType {
+export interface QueryEvidenceRequestAminoMsg {
   type: "cosmos-sdk/QueryEvidenceRequest";
   value: QueryEvidenceRequestAmino;
 }
@@ -34,7 +34,7 @@ export interface QueryEvidenceResponse {
   /** evidence returns the requested evidence. */
   evidence?: Any;
 }
-export interface QueryEvidenceResponseProtoType {
+export interface QueryEvidenceResponseProtoMsg {
   typeUrl: "/cosmos.evidence.v1beta1.QueryEvidenceResponse";
   value: Uint8Array;
 }
@@ -44,7 +44,7 @@ export interface QueryEvidenceResponseAmino {
   /** evidence returns the requested evidence. */
   evidence?: AnyAmino;
 }
-export interface QueryEvidenceResponseAminoType {
+export interface QueryEvidenceResponseAminoMsg {
   type: "cosmos-sdk/QueryEvidenceResponse";
   value: QueryEvidenceResponseAmino;
 }
@@ -62,7 +62,7 @@ export interface QueryAllEvidenceRequest {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequest;
 }
-export interface QueryAllEvidenceRequestProtoType {
+export interface QueryAllEvidenceRequestProtoMsg {
   typeUrl: "/cosmos.evidence.v1beta1.QueryAllEvidenceRequest";
   value: Uint8Array;
 }
@@ -75,7 +75,7 @@ export interface QueryAllEvidenceRequestAmino {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequestAmino;
 }
-export interface QueryAllEvidenceRequestAminoType {
+export interface QueryAllEvidenceRequestAminoMsg {
   type: "cosmos-sdk/QueryAllEvidenceRequest";
   value: QueryAllEvidenceRequestAmino;
 }
@@ -99,7 +99,7 @@ export interface QueryAllEvidenceResponse {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponse;
 }
-export interface QueryAllEvidenceResponseProtoType {
+export interface QueryAllEvidenceResponseProtoMsg {
   typeUrl: "/cosmos.evidence.v1beta1.QueryAllEvidenceResponse";
   value: Uint8Array;
 }
@@ -115,7 +115,7 @@ export interface QueryAllEvidenceResponseAmino {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponseAmino;
 }
-export interface QueryAllEvidenceResponseAminoType {
+export interface QueryAllEvidenceResponseAminoMsg {
   type: "cosmos-sdk/QueryAllEvidenceResponse";
   value: QueryAllEvidenceResponseAmino;
 }
@@ -136,6 +136,9 @@ function createBaseQueryEvidenceRequest(): QueryEvidenceRequest {
 }
 
 export const QueryEvidenceRequest = {
+  typeUrl: "/cosmos.evidence.v1beta1.QueryEvidenceRequest",
+  aminoType: "cosmos-sdk/QueryEvidenceRequest",
+
   encode(message: QueryEvidenceRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.evidenceHash.length !== 0) {
       writer.uint32(10).bytes(message.evidenceHash);
@@ -206,6 +209,32 @@ export const QueryEvidenceRequest = {
     const obj: any = {};
     obj.evidence_hash = message.evidenceHash;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryEvidenceRequestAminoMsg): QueryEvidenceRequest {
+    return QueryEvidenceRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryEvidenceRequest): QueryEvidenceRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryEvidenceRequest",
+      value: QueryEvidenceRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryEvidenceRequestProtoMsg): QueryEvidenceRequest {
+    return QueryEvidenceRequest.decode(message.value);
+  },
+
+  toProto(message: QueryEvidenceRequest): Uint8Array {
+    return QueryEvidenceRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryEvidenceRequest): QueryEvidenceRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.evidence.v1beta1.QueryEvidenceRequest",
+      value: QueryEvidenceRequest.encode(message).finish()
+    };
   }
 
 };
@@ -217,6 +246,9 @@ function createBaseQueryEvidenceResponse(): QueryEvidenceResponse {
 }
 
 export const QueryEvidenceResponse = {
+  typeUrl: "/cosmos.evidence.v1beta1.QueryEvidenceResponse",
+  aminoType: "cosmos-sdk/QueryEvidenceResponse",
+
   encode(message: QueryEvidenceResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.evidence !== undefined) {
       Any.encode(message.evidence, writer.uint32(10).fork()).ldelim();
@@ -287,6 +319,32 @@ export const QueryEvidenceResponse = {
     const obj: any = {};
     obj.evidence = message.evidence ? Any.toAmino(message.evidence) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryEvidenceResponseAminoMsg): QueryEvidenceResponse {
+    return QueryEvidenceResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryEvidenceResponse): QueryEvidenceResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryEvidenceResponse",
+      value: QueryEvidenceResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryEvidenceResponseProtoMsg): QueryEvidenceResponse {
+    return QueryEvidenceResponse.decode(message.value);
+  },
+
+  toProto(message: QueryEvidenceResponse): Uint8Array {
+    return QueryEvidenceResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryEvidenceResponse): QueryEvidenceResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.evidence.v1beta1.QueryEvidenceResponse",
+      value: QueryEvidenceResponse.encode(message).finish()
+    };
   }
 
 };
@@ -298,6 +356,9 @@ function createBaseQueryAllEvidenceRequest(): QueryAllEvidenceRequest {
 }
 
 export const QueryAllEvidenceRequest = {
+  typeUrl: "/cosmos.evidence.v1beta1.QueryAllEvidenceRequest",
+  aminoType: "cosmos-sdk/QueryAllEvidenceRequest",
+
   encode(message: QueryAllEvidenceRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.pagination !== undefined) {
       PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim();
@@ -368,6 +429,32 @@ export const QueryAllEvidenceRequest = {
     const obj: any = {};
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryAllEvidenceRequestAminoMsg): QueryAllEvidenceRequest {
+    return QueryAllEvidenceRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryAllEvidenceRequest): QueryAllEvidenceRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryAllEvidenceRequest",
+      value: QueryAllEvidenceRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryAllEvidenceRequestProtoMsg): QueryAllEvidenceRequest {
+    return QueryAllEvidenceRequest.decode(message.value);
+  },
+
+  toProto(message: QueryAllEvidenceRequest): Uint8Array {
+    return QueryAllEvidenceRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryAllEvidenceRequest): QueryAllEvidenceRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.evidence.v1beta1.QueryAllEvidenceRequest",
+      value: QueryAllEvidenceRequest.encode(message).finish()
+    };
   }
 
 };
@@ -380,6 +467,9 @@ function createBaseQueryAllEvidenceResponse(): QueryAllEvidenceResponse {
 }
 
 export const QueryAllEvidenceResponse = {
+  typeUrl: "/cosmos.evidence.v1beta1.QueryAllEvidenceResponse",
+  aminoType: "cosmos-sdk/QueryAllEvidenceResponse",
+
   encode(message: QueryAllEvidenceResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.evidence) {
       Any.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -483,6 +573,32 @@ export const QueryAllEvidenceResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryAllEvidenceResponseAminoMsg): QueryAllEvidenceResponse {
+    return QueryAllEvidenceResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryAllEvidenceResponse): QueryAllEvidenceResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryAllEvidenceResponse",
+      value: QueryAllEvidenceResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryAllEvidenceResponseProtoMsg): QueryAllEvidenceResponse {
+    return QueryAllEvidenceResponse.decode(message.value);
+  },
+
+  toProto(message: QueryAllEvidenceResponse): Uint8Array {
+    return QueryAllEvidenceResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryAllEvidenceResponse): QueryAllEvidenceResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.evidence.v1beta1.QueryAllEvidenceResponse",
+      value: QueryAllEvidenceResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/evidence/v1beta1/tx.ts b/__fixtures__/outputv2/cosmos/evidence/v1beta1/tx.ts
index e66912bde..f050c08d6 100644
--- a/__fixtures__/outputv2/cosmos/evidence/v1beta1/tx.ts
+++ b/__fixtures__/outputv2/cosmos/evidence/v1beta1/tx.ts
@@ -11,7 +11,7 @@ export interface MsgSubmitEvidence {
   submitter: string;
   evidence?: (Any) | undefined;
 }
-export interface MsgSubmitEvidenceProtoType {
+export interface MsgSubmitEvidenceProtoMsg {
   typeUrl: "/cosmos.evidence.v1beta1.MsgSubmitEvidence";
   value: Uint8Array;
 }
@@ -24,7 +24,7 @@ export interface MsgSubmitEvidenceAmino {
   submitter: string;
   evidence?: AnyAmino;
 }
-export interface MsgSubmitEvidenceAminoType {
+export interface MsgSubmitEvidenceAminoMsg {
   type: "cosmos-sdk/MsgSubmitEvidence";
   value: MsgSubmitEvidenceAmino;
 }
@@ -43,7 +43,7 @@ export interface MsgSubmitEvidenceResponse {
   /** hash defines the hash of the evidence. */
   hash: Uint8Array;
 }
-export interface MsgSubmitEvidenceResponseProtoType {
+export interface MsgSubmitEvidenceResponseProtoMsg {
   typeUrl: "/cosmos.evidence.v1beta1.MsgSubmitEvidenceResponse";
   value: Uint8Array;
 }
@@ -53,7 +53,7 @@ export interface MsgSubmitEvidenceResponseAmino {
   /** hash defines the hash of the evidence. */
   hash: Uint8Array;
 }
-export interface MsgSubmitEvidenceResponseAminoType {
+export interface MsgSubmitEvidenceResponseAminoMsg {
   type: "cosmos-sdk/MsgSubmitEvidenceResponse";
   value: MsgSubmitEvidenceResponseAmino;
 }
@@ -71,6 +71,9 @@ function createBaseMsgSubmitEvidence(): MsgSubmitEvidence {
 }
 
 export const MsgSubmitEvidence = {
+  typeUrl: "/cosmos.evidence.v1beta1.MsgSubmitEvidence",
+  aminoType: "cosmos-sdk/MsgSubmitEvidence",
+
   encode(message: MsgSubmitEvidence, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.submitter !== "") {
       writer.uint32(10).string(message.submitter);
@@ -156,6 +159,32 @@ export const MsgSubmitEvidence = {
     obj.submitter = message.submitter;
     obj.evidence = message.evidence ? Evidence_ToAmino((message.evidence as Any)) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgSubmitEvidenceAminoMsg): MsgSubmitEvidence {
+    return MsgSubmitEvidence.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgSubmitEvidence): MsgSubmitEvidenceAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgSubmitEvidence",
+      value: MsgSubmitEvidence.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgSubmitEvidenceProtoMsg): MsgSubmitEvidence {
+    return MsgSubmitEvidence.decode(message.value);
+  },
+
+  toProto(message: MsgSubmitEvidence): Uint8Array {
+    return MsgSubmitEvidence.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgSubmitEvidence): MsgSubmitEvidenceProtoMsg {
+    return {
+      typeUrl: "/cosmos.evidence.v1beta1.MsgSubmitEvidence",
+      value: MsgSubmitEvidence.encode(message).finish()
+    };
   }
 
 };
@@ -167,6 +196,9 @@ function createBaseMsgSubmitEvidenceResponse(): MsgSubmitEvidenceResponse {
 }
 
 export const MsgSubmitEvidenceResponse = {
+  typeUrl: "/cosmos.evidence.v1beta1.MsgSubmitEvidenceResponse",
+  aminoType: "cosmos-sdk/MsgSubmitEvidenceResponse",
+
   encode(message: MsgSubmitEvidenceResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.hash.length !== 0) {
       writer.uint32(34).bytes(message.hash);
@@ -237,6 +269,32 @@ export const MsgSubmitEvidenceResponse = {
     const obj: any = {};
     obj.hash = message.hash;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgSubmitEvidenceResponseAminoMsg): MsgSubmitEvidenceResponse {
+    return MsgSubmitEvidenceResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgSubmitEvidenceResponse): MsgSubmitEvidenceResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgSubmitEvidenceResponse",
+      value: MsgSubmitEvidenceResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgSubmitEvidenceResponseProtoMsg): MsgSubmitEvidenceResponse {
+    return MsgSubmitEvidenceResponse.decode(message.value);
+  },
+
+  toProto(message: MsgSubmitEvidenceResponse): Uint8Array {
+    return MsgSubmitEvidenceResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgSubmitEvidenceResponse): MsgSubmitEvidenceResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.evidence.v1beta1.MsgSubmitEvidenceResponse",
+      value: MsgSubmitEvidenceResponse.encode(message).finish()
+    };
   }
 
 };
diff --git a/__fixtures__/outputv2/cosmos/feegrant/v1beta1/feegrant.ts b/__fixtures__/outputv2/cosmos/feegrant/v1beta1/feegrant.ts
index ad3e76679..2b998e115 100644
--- a/__fixtures__/outputv2/cosmos/feegrant/v1beta1/feegrant.ts
+++ b/__fixtures__/outputv2/cosmos/feegrant/v1beta1/feegrant.ts
@@ -21,7 +21,7 @@ export interface BasicAllowance {
   /** expiration specifies an optional time when this allowance expires */
   expiration?: Date;
 }
-export interface BasicAllowanceProtoType {
+export interface BasicAllowanceProtoMsg {
   typeUrl: "/cosmos.feegrant.v1beta1.BasicAllowance";
   value: Uint8Array;
 }
@@ -41,7 +41,7 @@ export interface BasicAllowanceAmino {
   /** expiration specifies an optional time when this allowance expires */
   expiration?: Date;
 }
-export interface BasicAllowanceAminoType {
+export interface BasicAllowanceAminoMsg {
   type: "cosmos-sdk/BasicAllowance";
   value: BasicAllowanceAmino;
 }
@@ -85,7 +85,7 @@ export interface PeriodicAllowance {
    */
   periodReset?: Date;
 }
-export interface PeriodicAllowanceProtoType {
+export interface PeriodicAllowanceProtoMsg {
   typeUrl: "/cosmos.feegrant.v1beta1.PeriodicAllowance";
   value: Uint8Array;
 }
@@ -120,7 +120,7 @@ export interface PeriodicAllowanceAmino {
    */
   period_reset?: Date;
 }
-export interface PeriodicAllowanceAminoType {
+export interface PeriodicAllowanceAminoMsg {
   type: "cosmos-sdk/PeriodicAllowance";
   value: PeriodicAllowanceAmino;
 }
@@ -145,7 +145,7 @@ export interface AllowedMsgAllowance {
   /** allowed_messages are the messages for which the grantee has the access. */
   allowedMessages: string[];
 }
-export interface AllowedMsgAllowanceProtoType {
+export interface AllowedMsgAllowanceProtoMsg {
   typeUrl: "/cosmos.feegrant.v1beta1.AllowedMsgAllowance";
   value: Uint8Array;
 }
@@ -158,7 +158,7 @@ export interface AllowedMsgAllowanceAmino {
   /** allowed_messages are the messages for which the grantee has the access. */
   allowed_messages: string[];
 }
-export interface AllowedMsgAllowanceAminoType {
+export interface AllowedMsgAllowanceAminoMsg {
   type: "cosmos-sdk/AllowedMsgAllowance";
   value: AllowedMsgAllowanceAmino;
 }
@@ -180,7 +180,7 @@ export interface Grant {
   /** allowance can be any of basic, periodic, allowed fee allowance. */
   allowance?: (BasicAllowance & PeriodicAllowance & AllowedMsgAllowance & Any) | undefined;
 }
-export interface GrantProtoType {
+export interface GrantProtoMsg {
   typeUrl: "/cosmos.feegrant.v1beta1.Grant";
   value: Uint8Array;
 }
@@ -196,7 +196,7 @@ export interface GrantAmino {
   /** allowance can be any of basic, periodic, allowed fee allowance. */
   allowance?: AnyAmino;
 }
-export interface GrantAminoType {
+export interface GrantAminoMsg {
   type: "cosmos-sdk/Grant";
   value: GrantAmino;
 }
@@ -216,6 +216,9 @@ function createBaseBasicAllowance(): BasicAllowance {
 }
 
 export const BasicAllowance = {
+  typeUrl: "/cosmos.feegrant.v1beta1.BasicAllowance",
+  aminoType: "cosmos-sdk/BasicAllowance",
+
   encode(message: BasicAllowance, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.spendLimit) {
       Coin.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -319,6 +322,32 @@ export const BasicAllowance = {
 
     obj.expiration = message.expiration ? Timestamp.toAmino(message.expiration) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: BasicAllowanceAminoMsg): BasicAllowance {
+    return BasicAllowance.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: BasicAllowance): BasicAllowanceAminoMsg {
+    return {
+      type: "cosmos-sdk/BasicAllowance",
+      value: BasicAllowance.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: BasicAllowanceProtoMsg): BasicAllowance {
+    return BasicAllowance.decode(message.value);
+  },
+
+  toProto(message: BasicAllowance): Uint8Array {
+    return BasicAllowance.encode(message).finish();
+  },
+
+  toProtoMsg(message: BasicAllowance): BasicAllowanceProtoMsg {
+    return {
+      typeUrl: "/cosmos.feegrant.v1beta1.BasicAllowance",
+      value: BasicAllowance.encode(message).finish()
+    };
   }
 
 };
@@ -334,6 +363,9 @@ function createBasePeriodicAllowance(): PeriodicAllowance {
 }
 
 export const PeriodicAllowance = {
+  typeUrl: "/cosmos.feegrant.v1beta1.PeriodicAllowance",
+  aminoType: "cosmos-sdk/PeriodicAllowance",
+
   encode(message: PeriodicAllowance, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.basic !== undefined) {
       BasicAllowance.encode(message.basic, writer.uint32(10).fork()).ldelim();
@@ -497,6 +529,32 @@ export const PeriodicAllowance = {
 
     obj.period_reset = message.periodReset ? Timestamp.toAmino(message.periodReset) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: PeriodicAllowanceAminoMsg): PeriodicAllowance {
+    return PeriodicAllowance.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: PeriodicAllowance): PeriodicAllowanceAminoMsg {
+    return {
+      type: "cosmos-sdk/PeriodicAllowance",
+      value: PeriodicAllowance.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: PeriodicAllowanceProtoMsg): PeriodicAllowance {
+    return PeriodicAllowance.decode(message.value);
+  },
+
+  toProto(message: PeriodicAllowance): Uint8Array {
+    return PeriodicAllowance.encode(message).finish();
+  },
+
+  toProtoMsg(message: PeriodicAllowance): PeriodicAllowanceProtoMsg {
+    return {
+      typeUrl: "/cosmos.feegrant.v1beta1.PeriodicAllowance",
+      value: PeriodicAllowance.encode(message).finish()
+    };
   }
 
 };
@@ -509,6 +567,9 @@ function createBaseAllowedMsgAllowance(): AllowedMsgAllowance {
 }
 
 export const AllowedMsgAllowance = {
+  typeUrl: "/cosmos.feegrant.v1beta1.AllowedMsgAllowance",
+  aminoType: "cosmos-sdk/AllowedMsgAllowance",
+
   encode(message: AllowedMsgAllowance, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.allowance !== undefined) {
       Any.encode((message.allowance as Any), writer.uint32(10).fork()).ldelim();
@@ -612,6 +673,32 @@ export const AllowedMsgAllowance = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: AllowedMsgAllowanceAminoMsg): AllowedMsgAllowance {
+    return AllowedMsgAllowance.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: AllowedMsgAllowance): AllowedMsgAllowanceAminoMsg {
+    return {
+      type: "cosmos-sdk/AllowedMsgAllowance",
+      value: AllowedMsgAllowance.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: AllowedMsgAllowanceProtoMsg): AllowedMsgAllowance {
+    return AllowedMsgAllowance.decode(message.value);
+  },
+
+  toProto(message: AllowedMsgAllowance): Uint8Array {
+    return AllowedMsgAllowance.encode(message).finish();
+  },
+
+  toProtoMsg(message: AllowedMsgAllowance): AllowedMsgAllowanceProtoMsg {
+    return {
+      typeUrl: "/cosmos.feegrant.v1beta1.AllowedMsgAllowance",
+      value: AllowedMsgAllowance.encode(message).finish()
+    };
   }
 
 };
@@ -625,6 +712,9 @@ function createBaseGrant(): Grant {
 }
 
 export const Grant = {
+  typeUrl: "/cosmos.feegrant.v1beta1.Grant",
+  aminoType: "cosmos-sdk/Grant",
+
   encode(message: Grant, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.granter !== "") {
       writer.uint32(10).string(message.granter);
@@ -725,6 +815,32 @@ export const Grant = {
     obj.grantee = message.grantee;
     obj.allowance = message.allowance ? FeeAllowanceI_ToAmino((message.allowance as Any)) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GrantAminoMsg): Grant {
+    return Grant.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Grant): GrantAminoMsg {
+    return {
+      type: "cosmos-sdk/Grant",
+      value: Grant.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GrantProtoMsg): Grant {
+    return Grant.decode(message.value);
+  },
+
+  toProto(message: Grant): Uint8Array {
+    return Grant.encode(message).finish();
+  },
+
+  toProtoMsg(message: Grant): GrantProtoMsg {
+    return {
+      typeUrl: "/cosmos.feegrant.v1beta1.Grant",
+      value: Grant.encode(message).finish()
+    };
   }
 
 };
diff --git a/__fixtures__/outputv2/cosmos/feegrant/v1beta1/genesis.ts b/__fixtures__/outputv2/cosmos/feegrant/v1beta1/genesis.ts
index 551b253fc..7133aad87 100644
--- a/__fixtures__/outputv2/cosmos/feegrant/v1beta1/genesis.ts
+++ b/__fixtures__/outputv2/cosmos/feegrant/v1beta1/genesis.ts
@@ -7,7 +7,7 @@ export const protobufPackage = "cosmos.feegrant.v1beta1";
 export interface GenesisState {
   allowances: Grant[];
 }
-export interface GenesisStateProtoType {
+export interface GenesisStateProtoMsg {
   typeUrl: "/cosmos.feegrant.v1beta1.GenesisState";
   value: Uint8Array;
 }
@@ -16,7 +16,7 @@ export interface GenesisStateProtoType {
 export interface GenesisStateAmino {
   allowances: GrantAmino[];
 }
-export interface GenesisStateAminoType {
+export interface GenesisStateAminoMsg {
   type: "cosmos-sdk/GenesisState";
   value: GenesisStateAmino;
 }
@@ -33,6 +33,9 @@ function createBaseGenesisState(): GenesisState {
 }
 
 export const GenesisState = {
+  typeUrl: "/cosmos.feegrant.v1beta1.GenesisState",
+  aminoType: "cosmos-sdk/GenesisState",
+
   encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.allowances) {
       Grant.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -121,6 +124,32 @@ export const GenesisState = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisStateAminoMsg): GenesisState {
+    return GenesisState.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GenesisState): GenesisStateAminoMsg {
+    return {
+      type: "cosmos-sdk/GenesisState",
+      value: GenesisState.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GenesisStateProtoMsg): GenesisState {
+    return GenesisState.decode(message.value);
+  },
+
+  toProto(message: GenesisState): Uint8Array {
+    return GenesisState.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisState): GenesisStateProtoMsg {
+    return {
+      typeUrl: "/cosmos.feegrant.v1beta1.GenesisState",
+      value: GenesisState.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/feegrant/v1beta1/query.ts b/__fixtures__/outputv2/cosmos/feegrant/v1beta1/query.ts
index f13ff1a7f..b729c4ca2 100644
--- a/__fixtures__/outputv2/cosmos/feegrant/v1beta1/query.ts
+++ b/__fixtures__/outputv2/cosmos/feegrant/v1beta1/query.ts
@@ -12,7 +12,7 @@ export interface QueryAllowanceRequest {
   /** grantee is the address of the user being granted an allowance of another user's funds. */
   grantee: string;
 }
-export interface QueryAllowanceRequestProtoType {
+export interface QueryAllowanceRequestProtoMsg {
   typeUrl: "/cosmos.feegrant.v1beta1.QueryAllowanceRequest";
   value: Uint8Array;
 }
@@ -25,7 +25,7 @@ export interface QueryAllowanceRequestAmino {
   /** grantee is the address of the user being granted an allowance of another user's funds. */
   grantee: string;
 }
-export interface QueryAllowanceRequestAminoType {
+export interface QueryAllowanceRequestAminoMsg {
   type: "cosmos-sdk/QueryAllowanceRequest";
   value: QueryAllowanceRequestAmino;
 }
@@ -41,7 +41,7 @@ export interface QueryAllowanceResponse {
   /** allowance is a allowance granted for grantee by granter. */
   allowance?: Grant;
 }
-export interface QueryAllowanceResponseProtoType {
+export interface QueryAllowanceResponseProtoMsg {
   typeUrl: "/cosmos.feegrant.v1beta1.QueryAllowanceResponse";
   value: Uint8Array;
 }
@@ -51,7 +51,7 @@ export interface QueryAllowanceResponseAmino {
   /** allowance is a allowance granted for grantee by granter. */
   allowance?: GrantAmino;
 }
-export interface QueryAllowanceResponseAminoType {
+export interface QueryAllowanceResponseAminoMsg {
   type: "cosmos-sdk/QueryAllowanceResponse";
   value: QueryAllowanceResponseAmino;
 }
@@ -68,7 +68,7 @@ export interface QueryAllowancesRequest {
   /** pagination defines an pagination for the request. */
   pagination?: PageRequest;
 }
-export interface QueryAllowancesRequestProtoType {
+export interface QueryAllowancesRequestProtoMsg {
   typeUrl: "/cosmos.feegrant.v1beta1.QueryAllowancesRequest";
   value: Uint8Array;
 }
@@ -80,7 +80,7 @@ export interface QueryAllowancesRequestAmino {
   /** pagination defines an pagination for the request. */
   pagination?: PageRequestAmino;
 }
-export interface QueryAllowancesRequestAminoType {
+export interface QueryAllowancesRequestAminoMsg {
   type: "cosmos-sdk/QueryAllowancesRequest";
   value: QueryAllowancesRequestAmino;
 }
@@ -99,7 +99,7 @@ export interface QueryAllowancesResponse {
   /** pagination defines an pagination for the response. */
   pagination?: PageResponse;
 }
-export interface QueryAllowancesResponseProtoType {
+export interface QueryAllowancesResponseProtoMsg {
   typeUrl: "/cosmos.feegrant.v1beta1.QueryAllowancesResponse";
   value: Uint8Array;
 }
@@ -112,7 +112,7 @@ export interface QueryAllowancesResponseAmino {
   /** pagination defines an pagination for the response. */
   pagination?: PageResponseAmino;
 }
-export interface QueryAllowancesResponseAminoType {
+export interface QueryAllowancesResponseAminoMsg {
   type: "cosmos-sdk/QueryAllowancesResponse";
   value: QueryAllowancesResponseAmino;
 }
@@ -130,7 +130,7 @@ export interface QueryAllowancesByGranterRequest {
   /** pagination defines an pagination for the request. */
   pagination?: PageRequest;
 }
-export interface QueryAllowancesByGranterRequestProtoType {
+export interface QueryAllowancesByGranterRequestProtoMsg {
   typeUrl: "/cosmos.feegrant.v1beta1.QueryAllowancesByGranterRequest";
   value: Uint8Array;
 }
@@ -142,7 +142,7 @@ export interface QueryAllowancesByGranterRequestAmino {
   /** pagination defines an pagination for the request. */
   pagination?: PageRequestAmino;
 }
-export interface QueryAllowancesByGranterRequestAminoType {
+export interface QueryAllowancesByGranterRequestAminoMsg {
   type: "cosmos-sdk/QueryAllowancesByGranterRequest";
   value: QueryAllowancesByGranterRequestAmino;
 }
@@ -161,7 +161,7 @@ export interface QueryAllowancesByGranterResponse {
   /** pagination defines an pagination for the response. */
   pagination?: PageResponse;
 }
-export interface QueryAllowancesByGranterResponseProtoType {
+export interface QueryAllowancesByGranterResponseProtoMsg {
   typeUrl: "/cosmos.feegrant.v1beta1.QueryAllowancesByGranterResponse";
   value: Uint8Array;
 }
@@ -174,7 +174,7 @@ export interface QueryAllowancesByGranterResponseAmino {
   /** pagination defines an pagination for the response. */
   pagination?: PageResponseAmino;
 }
-export interface QueryAllowancesByGranterResponseAminoType {
+export interface QueryAllowancesByGranterResponseAminoMsg {
   type: "cosmos-sdk/QueryAllowancesByGranterResponse";
   value: QueryAllowancesByGranterResponseAmino;
 }
@@ -193,6 +193,9 @@ function createBaseQueryAllowanceRequest(): QueryAllowanceRequest {
 }
 
 export const QueryAllowanceRequest = {
+  typeUrl: "/cosmos.feegrant.v1beta1.QueryAllowanceRequest",
+  aminoType: "cosmos-sdk/QueryAllowanceRequest",
+
   encode(message: QueryAllowanceRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.granter !== "") {
       writer.uint32(10).string(message.granter);
@@ -278,6 +281,32 @@ export const QueryAllowanceRequest = {
     obj.granter = message.granter;
     obj.grantee = message.grantee;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryAllowanceRequestAminoMsg): QueryAllowanceRequest {
+    return QueryAllowanceRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryAllowanceRequest): QueryAllowanceRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryAllowanceRequest",
+      value: QueryAllowanceRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryAllowanceRequestProtoMsg): QueryAllowanceRequest {
+    return QueryAllowanceRequest.decode(message.value);
+  },
+
+  toProto(message: QueryAllowanceRequest): Uint8Array {
+    return QueryAllowanceRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryAllowanceRequest): QueryAllowanceRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.feegrant.v1beta1.QueryAllowanceRequest",
+      value: QueryAllowanceRequest.encode(message).finish()
+    };
   }
 
 };
@@ -289,6 +318,9 @@ function createBaseQueryAllowanceResponse(): QueryAllowanceResponse {
 }
 
 export const QueryAllowanceResponse = {
+  typeUrl: "/cosmos.feegrant.v1beta1.QueryAllowanceResponse",
+  aminoType: "cosmos-sdk/QueryAllowanceResponse",
+
   encode(message: QueryAllowanceResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.allowance !== undefined) {
       Grant.encode(message.allowance, writer.uint32(10).fork()).ldelim();
@@ -359,6 +391,32 @@ export const QueryAllowanceResponse = {
     const obj: any = {};
     obj.allowance = message.allowance ? Grant.toAmino(message.allowance) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryAllowanceResponseAminoMsg): QueryAllowanceResponse {
+    return QueryAllowanceResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryAllowanceResponse): QueryAllowanceResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryAllowanceResponse",
+      value: QueryAllowanceResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryAllowanceResponseProtoMsg): QueryAllowanceResponse {
+    return QueryAllowanceResponse.decode(message.value);
+  },
+
+  toProto(message: QueryAllowanceResponse): Uint8Array {
+    return QueryAllowanceResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryAllowanceResponse): QueryAllowanceResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.feegrant.v1beta1.QueryAllowanceResponse",
+      value: QueryAllowanceResponse.encode(message).finish()
+    };
   }
 
 };
@@ -371,6 +429,9 @@ function createBaseQueryAllowancesRequest(): QueryAllowancesRequest {
 }
 
 export const QueryAllowancesRequest = {
+  typeUrl: "/cosmos.feegrant.v1beta1.QueryAllowancesRequest",
+  aminoType: "cosmos-sdk/QueryAllowancesRequest",
+
   encode(message: QueryAllowancesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.grantee !== "") {
       writer.uint32(10).string(message.grantee);
@@ -456,6 +517,32 @@ export const QueryAllowancesRequest = {
     obj.grantee = message.grantee;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryAllowancesRequestAminoMsg): QueryAllowancesRequest {
+    return QueryAllowancesRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryAllowancesRequest): QueryAllowancesRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryAllowancesRequest",
+      value: QueryAllowancesRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryAllowancesRequestProtoMsg): QueryAllowancesRequest {
+    return QueryAllowancesRequest.decode(message.value);
+  },
+
+  toProto(message: QueryAllowancesRequest): Uint8Array {
+    return QueryAllowancesRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryAllowancesRequest): QueryAllowancesRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.feegrant.v1beta1.QueryAllowancesRequest",
+      value: QueryAllowancesRequest.encode(message).finish()
+    };
   }
 
 };
@@ -468,6 +555,9 @@ function createBaseQueryAllowancesResponse(): QueryAllowancesResponse {
 }
 
 export const QueryAllowancesResponse = {
+  typeUrl: "/cosmos.feegrant.v1beta1.QueryAllowancesResponse",
+  aminoType: "cosmos-sdk/QueryAllowancesResponse",
+
   encode(message: QueryAllowancesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.allowances) {
       Grant.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -571,6 +661,32 @@ export const QueryAllowancesResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryAllowancesResponseAminoMsg): QueryAllowancesResponse {
+    return QueryAllowancesResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryAllowancesResponse): QueryAllowancesResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryAllowancesResponse",
+      value: QueryAllowancesResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryAllowancesResponseProtoMsg): QueryAllowancesResponse {
+    return QueryAllowancesResponse.decode(message.value);
+  },
+
+  toProto(message: QueryAllowancesResponse): Uint8Array {
+    return QueryAllowancesResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryAllowancesResponse): QueryAllowancesResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.feegrant.v1beta1.QueryAllowancesResponse",
+      value: QueryAllowancesResponse.encode(message).finish()
+    };
   }
 
 };
@@ -583,6 +699,9 @@ function createBaseQueryAllowancesByGranterRequest(): QueryAllowancesByGranterRe
 }
 
 export const QueryAllowancesByGranterRequest = {
+  typeUrl: "/cosmos.feegrant.v1beta1.QueryAllowancesByGranterRequest",
+  aminoType: "cosmos-sdk/QueryAllowancesByGranterRequest",
+
   encode(message: QueryAllowancesByGranterRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.granter !== "") {
       writer.uint32(10).string(message.granter);
@@ -668,6 +787,32 @@ export const QueryAllowancesByGranterRequest = {
     obj.granter = message.granter;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryAllowancesByGranterRequestAminoMsg): QueryAllowancesByGranterRequest {
+    return QueryAllowancesByGranterRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryAllowancesByGranterRequest): QueryAllowancesByGranterRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryAllowancesByGranterRequest",
+      value: QueryAllowancesByGranterRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryAllowancesByGranterRequestProtoMsg): QueryAllowancesByGranterRequest {
+    return QueryAllowancesByGranterRequest.decode(message.value);
+  },
+
+  toProto(message: QueryAllowancesByGranterRequest): Uint8Array {
+    return QueryAllowancesByGranterRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryAllowancesByGranterRequest): QueryAllowancesByGranterRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.feegrant.v1beta1.QueryAllowancesByGranterRequest",
+      value: QueryAllowancesByGranterRequest.encode(message).finish()
+    };
   }
 
 };
@@ -680,6 +825,9 @@ function createBaseQueryAllowancesByGranterResponse(): QueryAllowancesByGranterR
 }
 
 export const QueryAllowancesByGranterResponse = {
+  typeUrl: "/cosmos.feegrant.v1beta1.QueryAllowancesByGranterResponse",
+  aminoType: "cosmos-sdk/QueryAllowancesByGranterResponse",
+
   encode(message: QueryAllowancesByGranterResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.allowances) {
       Grant.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -783,6 +931,32 @@ export const QueryAllowancesByGranterResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryAllowancesByGranterResponseAminoMsg): QueryAllowancesByGranterResponse {
+    return QueryAllowancesByGranterResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryAllowancesByGranterResponse): QueryAllowancesByGranterResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryAllowancesByGranterResponse",
+      value: QueryAllowancesByGranterResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryAllowancesByGranterResponseProtoMsg): QueryAllowancesByGranterResponse {
+    return QueryAllowancesByGranterResponse.decode(message.value);
+  },
+
+  toProto(message: QueryAllowancesByGranterResponse): Uint8Array {
+    return QueryAllowancesByGranterResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryAllowancesByGranterResponse): QueryAllowancesByGranterResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.feegrant.v1beta1.QueryAllowancesByGranterResponse",
+      value: QueryAllowancesByGranterResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/feegrant/v1beta1/tx.ts b/__fixtures__/outputv2/cosmos/feegrant/v1beta1/tx.ts
index 33caf0f84..b63d9168d 100644
--- a/__fixtures__/outputv2/cosmos/feegrant/v1beta1/tx.ts
+++ b/__fixtures__/outputv2/cosmos/feegrant/v1beta1/tx.ts
@@ -18,7 +18,7 @@ export interface MsgGrantAllowance {
   /** allowance can be any of basic, periodic, allowed fee allowance. */
   allowance?: (BasicAllowance & PeriodicAllowance & AllowedMsgAllowance & Any) | undefined;
 }
-export interface MsgGrantAllowanceProtoType {
+export interface MsgGrantAllowanceProtoMsg {
   typeUrl: "/cosmos.feegrant.v1beta1.MsgGrantAllowance";
   value: Uint8Array;
 }
@@ -37,7 +37,7 @@ export interface MsgGrantAllowanceAmino {
   /** allowance can be any of basic, periodic, allowed fee allowance. */
   allowance?: AnyAmino;
 }
-export interface MsgGrantAllowanceAminoType {
+export interface MsgGrantAllowanceAminoMsg {
   type: "cosmos-sdk/MsgGrantAllowance";
   value: MsgGrantAllowanceAmino;
 }
@@ -54,14 +54,14 @@ export interface MsgGrantAllowanceSDKType {
 
 /** MsgGrantAllowanceResponse defines the Msg/GrantAllowanceResponse response type. */
 export interface MsgGrantAllowanceResponse {}
-export interface MsgGrantAllowanceResponseProtoType {
+export interface MsgGrantAllowanceResponseProtoMsg {
   typeUrl: "/cosmos.feegrant.v1beta1.MsgGrantAllowanceResponse";
   value: Uint8Array;
 }
 
 /** MsgGrantAllowanceResponse defines the Msg/GrantAllowanceResponse response type. */
 export interface MsgGrantAllowanceResponseAmino {}
-export interface MsgGrantAllowanceResponseAminoType {
+export interface MsgGrantAllowanceResponseAminoMsg {
   type: "cosmos-sdk/MsgGrantAllowanceResponse";
   value: MsgGrantAllowanceResponseAmino;
 }
@@ -77,7 +77,7 @@ export interface MsgRevokeAllowance {
   /** grantee is the address of the user being granted an allowance of another user's funds. */
   grantee: string;
 }
-export interface MsgRevokeAllowanceProtoType {
+export interface MsgRevokeAllowanceProtoMsg {
   typeUrl: "/cosmos.feegrant.v1beta1.MsgRevokeAllowance";
   value: Uint8Array;
 }
@@ -90,7 +90,7 @@ export interface MsgRevokeAllowanceAmino {
   /** grantee is the address of the user being granted an allowance of another user's funds. */
   grantee: string;
 }
-export interface MsgRevokeAllowanceAminoType {
+export interface MsgRevokeAllowanceAminoMsg {
   type: "cosmos-sdk/MsgRevokeAllowance";
   value: MsgRevokeAllowanceAmino;
 }
@@ -103,14 +103,14 @@ export interface MsgRevokeAllowanceSDKType {
 
 /** MsgRevokeAllowanceResponse defines the Msg/RevokeAllowanceResponse response type. */
 export interface MsgRevokeAllowanceResponse {}
-export interface MsgRevokeAllowanceResponseProtoType {
+export interface MsgRevokeAllowanceResponseProtoMsg {
   typeUrl: "/cosmos.feegrant.v1beta1.MsgRevokeAllowanceResponse";
   value: Uint8Array;
 }
 
 /** MsgRevokeAllowanceResponse defines the Msg/RevokeAllowanceResponse response type. */
 export interface MsgRevokeAllowanceResponseAmino {}
-export interface MsgRevokeAllowanceResponseAminoType {
+export interface MsgRevokeAllowanceResponseAminoMsg {
   type: "cosmos-sdk/MsgRevokeAllowanceResponse";
   value: MsgRevokeAllowanceResponseAmino;
 }
@@ -127,6 +127,9 @@ function createBaseMsgGrantAllowance(): MsgGrantAllowance {
 }
 
 export const MsgGrantAllowance = {
+  typeUrl: "/cosmos.feegrant.v1beta1.MsgGrantAllowance",
+  aminoType: "cosmos-sdk/MsgGrantAllowance",
+
   encode(message: MsgGrantAllowance, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.granter !== "") {
       writer.uint32(10).string(message.granter);
@@ -227,6 +230,32 @@ export const MsgGrantAllowance = {
     obj.grantee = message.grantee;
     obj.allowance = message.allowance ? FeeAllowanceI_ToAmino((message.allowance as Any)) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgGrantAllowanceAminoMsg): MsgGrantAllowance {
+    return MsgGrantAllowance.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgGrantAllowance): MsgGrantAllowanceAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgGrantAllowance",
+      value: MsgGrantAllowance.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgGrantAllowanceProtoMsg): MsgGrantAllowance {
+    return MsgGrantAllowance.decode(message.value);
+  },
+
+  toProto(message: MsgGrantAllowance): Uint8Array {
+    return MsgGrantAllowance.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgGrantAllowance): MsgGrantAllowanceProtoMsg {
+    return {
+      typeUrl: "/cosmos.feegrant.v1beta1.MsgGrantAllowance",
+      value: MsgGrantAllowance.encode(message).finish()
+    };
   }
 
 };
@@ -236,6 +265,9 @@ function createBaseMsgGrantAllowanceResponse(): MsgGrantAllowanceResponse {
 }
 
 export const MsgGrantAllowanceResponse = {
+  typeUrl: "/cosmos.feegrant.v1beta1.MsgGrantAllowanceResponse",
+  aminoType: "cosmos-sdk/MsgGrantAllowanceResponse",
+
   encode(_: MsgGrantAllowanceResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -288,6 +320,32 @@ export const MsgGrantAllowanceResponse = {
   toAmino(_: MsgGrantAllowanceResponse): MsgGrantAllowanceResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgGrantAllowanceResponseAminoMsg): MsgGrantAllowanceResponse {
+    return MsgGrantAllowanceResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgGrantAllowanceResponse): MsgGrantAllowanceResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgGrantAllowanceResponse",
+      value: MsgGrantAllowanceResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgGrantAllowanceResponseProtoMsg): MsgGrantAllowanceResponse {
+    return MsgGrantAllowanceResponse.decode(message.value);
+  },
+
+  toProto(message: MsgGrantAllowanceResponse): Uint8Array {
+    return MsgGrantAllowanceResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgGrantAllowanceResponse): MsgGrantAllowanceResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.feegrant.v1beta1.MsgGrantAllowanceResponse",
+      value: MsgGrantAllowanceResponse.encode(message).finish()
+    };
   }
 
 };
@@ -300,6 +358,9 @@ function createBaseMsgRevokeAllowance(): MsgRevokeAllowance {
 }
 
 export const MsgRevokeAllowance = {
+  typeUrl: "/cosmos.feegrant.v1beta1.MsgRevokeAllowance",
+  aminoType: "cosmos-sdk/MsgRevokeAllowance",
+
   encode(message: MsgRevokeAllowance, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.granter !== "") {
       writer.uint32(10).string(message.granter);
@@ -385,6 +446,32 @@ export const MsgRevokeAllowance = {
     obj.granter = message.granter;
     obj.grantee = message.grantee;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgRevokeAllowanceAminoMsg): MsgRevokeAllowance {
+    return MsgRevokeAllowance.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgRevokeAllowance): MsgRevokeAllowanceAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgRevokeAllowance",
+      value: MsgRevokeAllowance.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgRevokeAllowanceProtoMsg): MsgRevokeAllowance {
+    return MsgRevokeAllowance.decode(message.value);
+  },
+
+  toProto(message: MsgRevokeAllowance): Uint8Array {
+    return MsgRevokeAllowance.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgRevokeAllowance): MsgRevokeAllowanceProtoMsg {
+    return {
+      typeUrl: "/cosmos.feegrant.v1beta1.MsgRevokeAllowance",
+      value: MsgRevokeAllowance.encode(message).finish()
+    };
   }
 
 };
@@ -394,6 +481,9 @@ function createBaseMsgRevokeAllowanceResponse(): MsgRevokeAllowanceResponse {
 }
 
 export const MsgRevokeAllowanceResponse = {
+  typeUrl: "/cosmos.feegrant.v1beta1.MsgRevokeAllowanceResponse",
+  aminoType: "cosmos-sdk/MsgRevokeAllowanceResponse",
+
   encode(_: MsgRevokeAllowanceResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -446,6 +536,32 @@ export const MsgRevokeAllowanceResponse = {
   toAmino(_: MsgRevokeAllowanceResponse): MsgRevokeAllowanceResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgRevokeAllowanceResponseAminoMsg): MsgRevokeAllowanceResponse {
+    return MsgRevokeAllowanceResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgRevokeAllowanceResponse): MsgRevokeAllowanceResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgRevokeAllowanceResponse",
+      value: MsgRevokeAllowanceResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgRevokeAllowanceResponseProtoMsg): MsgRevokeAllowanceResponse {
+    return MsgRevokeAllowanceResponse.decode(message.value);
+  },
+
+  toProto(message: MsgRevokeAllowanceResponse): Uint8Array {
+    return MsgRevokeAllowanceResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgRevokeAllowanceResponse): MsgRevokeAllowanceResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.feegrant.v1beta1.MsgRevokeAllowanceResponse",
+      value: MsgRevokeAllowanceResponse.encode(message).finish()
+    };
   }
 
 };
diff --git a/__fixtures__/outputv2/cosmos/genutil/v1beta1/genesis.ts b/__fixtures__/outputv2/cosmos/genutil/v1beta1/genesis.ts
index 44161434d..121791256 100644
--- a/__fixtures__/outputv2/cosmos/genutil/v1beta1/genesis.ts
+++ b/__fixtures__/outputv2/cosmos/genutil/v1beta1/genesis.ts
@@ -7,7 +7,7 @@ export interface GenesisState {
   /** gen_txs defines the genesis transactions. */
   genTxs: Uint8Array[];
 }
-export interface GenesisStateProtoType {
+export interface GenesisStateProtoMsg {
   typeUrl: "/cosmos.genutil.v1beta1.GenesisState";
   value: Uint8Array;
 }
@@ -17,7 +17,7 @@ export interface GenesisStateAmino {
   /** gen_txs defines the genesis transactions. */
   gen_txs: Uint8Array[];
 }
-export interface GenesisStateAminoType {
+export interface GenesisStateAminoMsg {
   type: "cosmos-sdk/GenesisState";
   value: GenesisStateAmino;
 }
@@ -34,6 +34,9 @@ function createBaseGenesisState(): GenesisState {
 }
 
 export const GenesisState = {
+  typeUrl: "/cosmos.genutil.v1beta1.GenesisState",
+  aminoType: "cosmos-sdk/GenesisState",
+
   encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.genTxs) {
       writer.uint32(10).bytes(v!);
@@ -122,6 +125,32 @@ export const GenesisState = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisStateAminoMsg): GenesisState {
+    return GenesisState.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GenesisState): GenesisStateAminoMsg {
+    return {
+      type: "cosmos-sdk/GenesisState",
+      value: GenesisState.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GenesisStateProtoMsg): GenesisState {
+    return GenesisState.decode(message.value);
+  },
+
+  toProto(message: GenesisState): Uint8Array {
+    return GenesisState.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisState): GenesisStateProtoMsg {
+    return {
+      typeUrl: "/cosmos.genutil.v1beta1.GenesisState",
+      value: GenesisState.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/gov/v1/genesis.ts b/__fixtures__/outputv2/cosmos/gov/v1/genesis.ts
index 85ae62835..92412bedd 100644
--- a/__fixtures__/outputv2/cosmos/gov/v1/genesis.ts
+++ b/__fixtures__/outputv2/cosmos/gov/v1/genesis.ts
@@ -26,7 +26,7 @@ export interface GenesisState {
   /** params defines all the paramaters of related to tally. */
   tallyParams?: TallyParams;
 }
-export interface GenesisStateProtoType {
+export interface GenesisStateProtoMsg {
   typeUrl: "/cosmos.gov.v1.GenesisState";
   value: Uint8Array;
 }
@@ -54,7 +54,7 @@ export interface GenesisStateAmino {
   /** params defines all the paramaters of related to tally. */
   tally_params?: TallyParamsAmino;
 }
-export interface GenesisStateAminoType {
+export interface GenesisStateAminoMsg {
   type: "cosmos-sdk/v1/GenesisState";
   value: GenesisStateAmino;
 }
@@ -83,6 +83,9 @@ function createBaseGenesisState(): GenesisState {
 }
 
 export const GenesisState = {
+  typeUrl: "/cosmos.gov.v1.GenesisState",
+  aminoType: "cosmos-sdk/v1/GenesisState",
+
   encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.startingProposalId.isZero()) {
       writer.uint32(8).uint64(message.startingProposalId);
@@ -291,6 +294,32 @@ export const GenesisState = {
     obj.voting_params = message.votingParams ? VotingParams.toAmino(message.votingParams) : undefined;
     obj.tally_params = message.tallyParams ? TallyParams.toAmino(message.tallyParams) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisStateAminoMsg): GenesisState {
+    return GenesisState.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GenesisState): GenesisStateAminoMsg {
+    return {
+      type: "cosmos-sdk/v1/GenesisState",
+      value: GenesisState.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GenesisStateProtoMsg): GenesisState {
+    return GenesisState.decode(message.value);
+  },
+
+  toProto(message: GenesisState): Uint8Array {
+    return GenesisState.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisState): GenesisStateProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1.GenesisState",
+      value: GenesisState.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/gov/v1/gov.ts b/__fixtures__/outputv2/cosmos/gov/v1/gov.ts
index 860b5e695..d55f0b28a 100644
--- a/__fixtures__/outputv2/cosmos/gov/v1/gov.ts
+++ b/__fixtures__/outputv2/cosmos/gov/v1/gov.ts
@@ -178,7 +178,7 @@ export interface WeightedVoteOption {
   option: VoteOption;
   weight: string;
 }
-export interface WeightedVoteOptionProtoType {
+export interface WeightedVoteOptionProtoMsg {
   typeUrl: "/cosmos.gov.v1.WeightedVoteOption";
   value: Uint8Array;
 }
@@ -188,7 +188,7 @@ export interface WeightedVoteOptionAmino {
   option: VoteOption;
   weight: string;
 }
-export interface WeightedVoteOptionAminoType {
+export interface WeightedVoteOptionAminoMsg {
   type: "cosmos-sdk/v1/WeightedVoteOption";
   value: WeightedVoteOptionAmino;
 }
@@ -208,7 +208,7 @@ export interface Deposit {
   depositor: string;
   amount: Coin[];
 }
-export interface DepositProtoType {
+export interface DepositProtoMsg {
   typeUrl: "/cosmos.gov.v1.Deposit";
   value: Uint8Array;
 }
@@ -222,7 +222,7 @@ export interface DepositAmino {
   depositor: string;
   amount: CoinAmino[];
 }
-export interface DepositAminoType {
+export interface DepositAminoMsg {
   type: "cosmos-sdk/v1/Deposit";
   value: DepositAmino;
 }
@@ -258,7 +258,7 @@ export interface Proposal {
   /** metadata is any arbitrary metadata attached to the proposal. */
   metadata: string;
 }
-export interface ProposalProtoType {
+export interface ProposalProtoMsg {
   typeUrl: "/cosmos.gov.v1.Proposal";
   value: Uint8Array;
 }
@@ -284,7 +284,7 @@ export interface ProposalAmino {
   /** metadata is any arbitrary metadata attached to the proposal. */
   metadata: string;
 }
-export interface ProposalAminoType {
+export interface ProposalAminoMsg {
   type: "cosmos-sdk/v1/Proposal";
   value: ProposalAmino;
 }
@@ -310,7 +310,7 @@ export interface TallyResult {
   noCount: string;
   noWithVetoCount: string;
 }
-export interface TallyResultProtoType {
+export interface TallyResultProtoMsg {
   typeUrl: "/cosmos.gov.v1.TallyResult";
   value: Uint8Array;
 }
@@ -322,7 +322,7 @@ export interface TallyResultAmino {
   no_count: string;
   no_with_veto_count: string;
 }
-export interface TallyResultAminoType {
+export interface TallyResultAminoMsg {
   type: "cosmos-sdk/v1/TallyResult";
   value: TallyResultAmino;
 }
@@ -347,7 +347,7 @@ export interface Vote {
   /** metadata is any  arbitrary metadata to attached to the vote. */
   metadata: string;
 }
-export interface VoteProtoType {
+export interface VoteProtoMsg {
   typeUrl: "/cosmos.gov.v1.Vote";
   value: Uint8Array;
 }
@@ -364,7 +364,7 @@ export interface VoteAmino {
   /** metadata is any  arbitrary metadata to attached to the vote. */
   metadata: string;
 }
-export interface VoteAminoType {
+export interface VoteAminoMsg {
   type: "cosmos-sdk/v1/Vote";
   value: VoteAmino;
 }
@@ -391,7 +391,7 @@ export interface DepositParams {
    */
   maxDepositPeriod?: Duration;
 }
-export interface DepositParamsProtoType {
+export interface DepositParamsProtoMsg {
   typeUrl: "/cosmos.gov.v1.DepositParams";
   value: Uint8Array;
 }
@@ -407,7 +407,7 @@ export interface DepositParamsAmino {
    */
   max_deposit_period?: DurationAmino;
 }
-export interface DepositParamsAminoType {
+export interface DepositParamsAminoMsg {
   type: "cosmos-sdk/v1/DepositParams";
   value: DepositParamsAmino;
 }
@@ -423,7 +423,7 @@ export interface VotingParams {
   /** Length of the voting period. */
   votingPeriod?: Duration;
 }
-export interface VotingParamsProtoType {
+export interface VotingParamsProtoMsg {
   typeUrl: "/cosmos.gov.v1.VotingParams";
   value: Uint8Array;
 }
@@ -433,7 +433,7 @@ export interface VotingParamsAmino {
   /** Length of the voting period. */
   voting_period?: DurationAmino;
 }
-export interface VotingParamsAminoType {
+export interface VotingParamsAminoMsg {
   type: "cosmos-sdk/v1/VotingParams";
   value: VotingParamsAmino;
 }
@@ -460,7 +460,7 @@ export interface TallyParams {
    */
   vetoThreshold: string;
 }
-export interface TallyParamsProtoType {
+export interface TallyParamsProtoMsg {
   typeUrl: "/cosmos.gov.v1.TallyParams";
   value: Uint8Array;
 }
@@ -482,7 +482,7 @@ export interface TallyParamsAmino {
    */
   veto_threshold: string;
 }
-export interface TallyParamsAminoType {
+export interface TallyParamsAminoMsg {
   type: "cosmos-sdk/v1/TallyParams";
   value: TallyParamsAmino;
 }
@@ -502,6 +502,9 @@ function createBaseWeightedVoteOption(): WeightedVoteOption {
 }
 
 export const WeightedVoteOption = {
+  typeUrl: "/cosmos.gov.v1.WeightedVoteOption",
+  aminoType: "cosmos-sdk/v1/WeightedVoteOption",
+
   encode(message: WeightedVoteOption, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.option !== 0) {
       writer.uint32(8).int32(message.option);
@@ -587,6 +590,32 @@ export const WeightedVoteOption = {
     obj.option = message.option;
     obj.weight = message.weight;
     return obj;
+  },
+
+  fromAminoMsg(object: WeightedVoteOptionAminoMsg): WeightedVoteOption {
+    return WeightedVoteOption.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: WeightedVoteOption): WeightedVoteOptionAminoMsg {
+    return {
+      type: "cosmos-sdk/v1/WeightedVoteOption",
+      value: WeightedVoteOption.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: WeightedVoteOptionProtoMsg): WeightedVoteOption {
+    return WeightedVoteOption.decode(message.value);
+  },
+
+  toProto(message: WeightedVoteOption): Uint8Array {
+    return WeightedVoteOption.encode(message).finish();
+  },
+
+  toProtoMsg(message: WeightedVoteOption): WeightedVoteOptionProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1.WeightedVoteOption",
+      value: WeightedVoteOption.encode(message).finish()
+    };
   }
 
 };
@@ -600,6 +629,9 @@ function createBaseDeposit(): Deposit {
 }
 
 export const Deposit = {
+  typeUrl: "/cosmos.gov.v1.Deposit",
+  aminoType: "cosmos-sdk/v1/Deposit",
+
   encode(message: Deposit, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.proposalId.isZero()) {
       writer.uint32(8).uint64(message.proposalId);
@@ -718,6 +750,32 @@ export const Deposit = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: DepositAminoMsg): Deposit {
+    return Deposit.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Deposit): DepositAminoMsg {
+    return {
+      type: "cosmos-sdk/v1/Deposit",
+      value: Deposit.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: DepositProtoMsg): Deposit {
+    return Deposit.decode(message.value);
+  },
+
+  toProto(message: Deposit): Uint8Array {
+    return Deposit.encode(message).finish();
+  },
+
+  toProtoMsg(message: Deposit): DepositProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1.Deposit",
+      value: Deposit.encode(message).finish()
+    };
   }
 
 };
@@ -738,6 +796,9 @@ function createBaseProposal(): Proposal {
 }
 
 export const Proposal = {
+  typeUrl: "/cosmos.gov.v1.Proposal",
+  aminoType: "cosmos-sdk/v1/Proposal",
+
   encode(message: Proposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.id.isZero()) {
       writer.uint32(8).uint64(message.id);
@@ -979,6 +1040,32 @@ export const Proposal = {
     obj.voting_end_time = message.votingEndTime ? Timestamp.toAmino(message.votingEndTime) : undefined;
     obj.metadata = message.metadata;
     return obj;
+  },
+
+  fromAminoMsg(object: ProposalAminoMsg): Proposal {
+    return Proposal.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Proposal): ProposalAminoMsg {
+    return {
+      type: "cosmos-sdk/v1/Proposal",
+      value: Proposal.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ProposalProtoMsg): Proposal {
+    return Proposal.decode(message.value);
+  },
+
+  toProto(message: Proposal): Uint8Array {
+    return Proposal.encode(message).finish();
+  },
+
+  toProtoMsg(message: Proposal): ProposalProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1.Proposal",
+      value: Proposal.encode(message).finish()
+    };
   }
 
 };
@@ -993,6 +1080,9 @@ function createBaseTallyResult(): TallyResult {
 }
 
 export const TallyResult = {
+  typeUrl: "/cosmos.gov.v1.TallyResult",
+  aminoType: "cosmos-sdk/v1/TallyResult",
+
   encode(message: TallyResult, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.yesCount !== "") {
       writer.uint32(10).string(message.yesCount);
@@ -1108,6 +1198,32 @@ export const TallyResult = {
     obj.no_count = message.noCount;
     obj.no_with_veto_count = message.noWithVetoCount;
     return obj;
+  },
+
+  fromAminoMsg(object: TallyResultAminoMsg): TallyResult {
+    return TallyResult.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: TallyResult): TallyResultAminoMsg {
+    return {
+      type: "cosmos-sdk/v1/TallyResult",
+      value: TallyResult.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: TallyResultProtoMsg): TallyResult {
+    return TallyResult.decode(message.value);
+  },
+
+  toProto(message: TallyResult): Uint8Array {
+    return TallyResult.encode(message).finish();
+  },
+
+  toProtoMsg(message: TallyResult): TallyResultProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1.TallyResult",
+      value: TallyResult.encode(message).finish()
+    };
   }
 
 };
@@ -1122,6 +1238,9 @@ function createBaseVote(): Vote {
 }
 
 export const Vote = {
+  typeUrl: "/cosmos.gov.v1.Vote",
+  aminoType: "cosmos-sdk/v1/Vote",
+
   encode(message: Vote, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.proposalId.isZero()) {
       writer.uint32(8).uint64(message.proposalId);
@@ -1255,6 +1374,32 @@ export const Vote = {
 
     obj.metadata = message.metadata;
     return obj;
+  },
+
+  fromAminoMsg(object: VoteAminoMsg): Vote {
+    return Vote.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Vote): VoteAminoMsg {
+    return {
+      type: "cosmos-sdk/v1/Vote",
+      value: Vote.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: VoteProtoMsg): Vote {
+    return Vote.decode(message.value);
+  },
+
+  toProto(message: Vote): Uint8Array {
+    return Vote.encode(message).finish();
+  },
+
+  toProtoMsg(message: Vote): VoteProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1.Vote",
+      value: Vote.encode(message).finish()
+    };
   }
 
 };
@@ -1267,6 +1412,9 @@ function createBaseDepositParams(): DepositParams {
 }
 
 export const DepositParams = {
+  typeUrl: "/cosmos.gov.v1.DepositParams",
+  aminoType: "cosmos-sdk/v1/DepositParams",
+
   encode(message: DepositParams, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.minDeposit) {
       Coin.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1370,6 +1518,32 @@ export const DepositParams = {
 
     obj.max_deposit_period = message.maxDepositPeriod ? Duration.toAmino(message.maxDepositPeriod) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: DepositParamsAminoMsg): DepositParams {
+    return DepositParams.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: DepositParams): DepositParamsAminoMsg {
+    return {
+      type: "cosmos-sdk/v1/DepositParams",
+      value: DepositParams.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: DepositParamsProtoMsg): DepositParams {
+    return DepositParams.decode(message.value);
+  },
+
+  toProto(message: DepositParams): Uint8Array {
+    return DepositParams.encode(message).finish();
+  },
+
+  toProtoMsg(message: DepositParams): DepositParamsProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1.DepositParams",
+      value: DepositParams.encode(message).finish()
+    };
   }
 
 };
@@ -1381,6 +1555,9 @@ function createBaseVotingParams(): VotingParams {
 }
 
 export const VotingParams = {
+  typeUrl: "/cosmos.gov.v1.VotingParams",
+  aminoType: "cosmos-sdk/v1/VotingParams",
+
   encode(message: VotingParams, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.votingPeriod !== undefined) {
       Duration.encode(message.votingPeriod, writer.uint32(10).fork()).ldelim();
@@ -1451,6 +1628,32 @@ export const VotingParams = {
     const obj: any = {};
     obj.voting_period = message.votingPeriod ? Duration.toAmino(message.votingPeriod) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: VotingParamsAminoMsg): VotingParams {
+    return VotingParams.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: VotingParams): VotingParamsAminoMsg {
+    return {
+      type: "cosmos-sdk/v1/VotingParams",
+      value: VotingParams.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: VotingParamsProtoMsg): VotingParams {
+    return VotingParams.decode(message.value);
+  },
+
+  toProto(message: VotingParams): Uint8Array {
+    return VotingParams.encode(message).finish();
+  },
+
+  toProtoMsg(message: VotingParams): VotingParamsProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1.VotingParams",
+      value: VotingParams.encode(message).finish()
+    };
   }
 
 };
@@ -1464,6 +1667,9 @@ function createBaseTallyParams(): TallyParams {
 }
 
 export const TallyParams = {
+  typeUrl: "/cosmos.gov.v1.TallyParams",
+  aminoType: "cosmos-sdk/v1/TallyParams",
+
   encode(message: TallyParams, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.quorum !== "") {
       writer.uint32(10).string(message.quorum);
@@ -1564,6 +1770,32 @@ export const TallyParams = {
     obj.threshold = message.threshold;
     obj.veto_threshold = message.vetoThreshold;
     return obj;
+  },
+
+  fromAminoMsg(object: TallyParamsAminoMsg): TallyParams {
+    return TallyParams.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: TallyParams): TallyParamsAminoMsg {
+    return {
+      type: "cosmos-sdk/v1/TallyParams",
+      value: TallyParams.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: TallyParamsProtoMsg): TallyParams {
+    return TallyParams.decode(message.value);
+  },
+
+  toProto(message: TallyParams): Uint8Array {
+    return TallyParams.encode(message).finish();
+  },
+
+  toProtoMsg(message: TallyParams): TallyParamsProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1.TallyParams",
+      value: TallyParams.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/gov/v1/query.ts b/__fixtures__/outputv2/cosmos/gov/v1/query.ts
index 604f8decd..6c409776b 100644
--- a/__fixtures__/outputv2/cosmos/gov/v1/query.ts
+++ b/__fixtures__/outputv2/cosmos/gov/v1/query.ts
@@ -9,7 +9,7 @@ export interface QueryProposalRequest {
   /** proposal_id defines the unique id of the proposal. */
   proposalId: Long;
 }
-export interface QueryProposalRequestProtoType {
+export interface QueryProposalRequestProtoMsg {
   typeUrl: "/cosmos.gov.v1.QueryProposalRequest";
   value: Uint8Array;
 }
@@ -19,7 +19,7 @@ export interface QueryProposalRequestAmino {
   /** proposal_id defines the unique id of the proposal. */
   proposal_id: string;
 }
-export interface QueryProposalRequestAminoType {
+export interface QueryProposalRequestAminoMsg {
   type: "cosmos-sdk/v1/QueryProposalRequest";
   value: QueryProposalRequestAmino;
 }
@@ -33,7 +33,7 @@ export interface QueryProposalRequestSDKType {
 export interface QueryProposalResponse {
   proposal?: Proposal;
 }
-export interface QueryProposalResponseProtoType {
+export interface QueryProposalResponseProtoMsg {
   typeUrl: "/cosmos.gov.v1.QueryProposalResponse";
   value: Uint8Array;
 }
@@ -42,7 +42,7 @@ export interface QueryProposalResponseProtoType {
 export interface QueryProposalResponseAmino {
   proposal?: ProposalAmino;
 }
-export interface QueryProposalResponseAminoType {
+export interface QueryProposalResponseAminoMsg {
   type: "cosmos-sdk/v1/QueryProposalResponse";
   value: QueryProposalResponseAmino;
 }
@@ -66,7 +66,7 @@ export interface QueryProposalsRequest {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequest;
 }
-export interface QueryProposalsRequestProtoType {
+export interface QueryProposalsRequestProtoMsg {
   typeUrl: "/cosmos.gov.v1.QueryProposalsRequest";
   value: Uint8Array;
 }
@@ -85,7 +85,7 @@ export interface QueryProposalsRequestAmino {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequestAmino;
 }
-export interface QueryProposalsRequestAminoType {
+export interface QueryProposalsRequestAminoMsg {
   type: "cosmos-sdk/v1/QueryProposalsRequest";
   value: QueryProposalsRequestAmino;
 }
@@ -108,7 +108,7 @@ export interface QueryProposalsResponse {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponse;
 }
-export interface QueryProposalsResponseProtoType {
+export interface QueryProposalsResponseProtoMsg {
   typeUrl: "/cosmos.gov.v1.QueryProposalsResponse";
   value: Uint8Array;
 }
@@ -123,7 +123,7 @@ export interface QueryProposalsResponseAmino {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponseAmino;
 }
-export interface QueryProposalsResponseAminoType {
+export interface QueryProposalsResponseAminoMsg {
   type: "cosmos-sdk/v1/QueryProposalsResponse";
   value: QueryProposalsResponseAmino;
 }
@@ -145,7 +145,7 @@ export interface QueryVoteRequest {
   /** voter defines the oter address for the proposals. */
   voter: string;
 }
-export interface QueryVoteRequestProtoType {
+export interface QueryVoteRequestProtoMsg {
   typeUrl: "/cosmos.gov.v1.QueryVoteRequest";
   value: Uint8Array;
 }
@@ -158,7 +158,7 @@ export interface QueryVoteRequestAmino {
   /** voter defines the oter address for the proposals. */
   voter: string;
 }
-export interface QueryVoteRequestAminoType {
+export interface QueryVoteRequestAminoMsg {
   type: "cosmos-sdk/v1/QueryVoteRequest";
   value: QueryVoteRequestAmino;
 }
@@ -174,7 +174,7 @@ export interface QueryVoteResponse {
   /** vote defined the queried vote. */
   vote?: Vote;
 }
-export interface QueryVoteResponseProtoType {
+export interface QueryVoteResponseProtoMsg {
   typeUrl: "/cosmos.gov.v1.QueryVoteResponse";
   value: Uint8Array;
 }
@@ -184,7 +184,7 @@ export interface QueryVoteResponseAmino {
   /** vote defined the queried vote. */
   vote?: VoteAmino;
 }
-export interface QueryVoteResponseAminoType {
+export interface QueryVoteResponseAminoMsg {
   type: "cosmos-sdk/v1/QueryVoteResponse";
   value: QueryVoteResponseAmino;
 }
@@ -202,7 +202,7 @@ export interface QueryVotesRequest {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequest;
 }
-export interface QueryVotesRequestProtoType {
+export interface QueryVotesRequestProtoMsg {
   typeUrl: "/cosmos.gov.v1.QueryVotesRequest";
   value: Uint8Array;
 }
@@ -215,7 +215,7 @@ export interface QueryVotesRequestAmino {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequestAmino;
 }
-export interface QueryVotesRequestAminoType {
+export interface QueryVotesRequestAminoMsg {
   type: "cosmos-sdk/v1/QueryVotesRequest";
   value: QueryVotesRequestAmino;
 }
@@ -234,7 +234,7 @@ export interface QueryVotesResponse {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponse;
 }
-export interface QueryVotesResponseProtoType {
+export interface QueryVotesResponseProtoMsg {
   typeUrl: "/cosmos.gov.v1.QueryVotesResponse";
   value: Uint8Array;
 }
@@ -247,7 +247,7 @@ export interface QueryVotesResponseAmino {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponseAmino;
 }
-export interface QueryVotesResponseAminoType {
+export interface QueryVotesResponseAminoMsg {
   type: "cosmos-sdk/v1/QueryVotesResponse";
   value: QueryVotesResponseAmino;
 }
@@ -266,7 +266,7 @@ export interface QueryParamsRequest {
    */
   paramsType: string;
 }
-export interface QueryParamsRequestProtoType {
+export interface QueryParamsRequestProtoMsg {
   typeUrl: "/cosmos.gov.v1.QueryParamsRequest";
   value: Uint8Array;
 }
@@ -279,7 +279,7 @@ export interface QueryParamsRequestAmino {
    */
   params_type: string;
 }
-export interface QueryParamsRequestAminoType {
+export interface QueryParamsRequestAminoMsg {
   type: "cosmos-sdk/v1/QueryParamsRequest";
   value: QueryParamsRequestAmino;
 }
@@ -300,7 +300,7 @@ export interface QueryParamsResponse {
   /** tally_params defines the parameters related to tally. */
   tallyParams?: TallyParams;
 }
-export interface QueryParamsResponseProtoType {
+export interface QueryParamsResponseProtoMsg {
   typeUrl: "/cosmos.gov.v1.QueryParamsResponse";
   value: Uint8Array;
 }
@@ -316,7 +316,7 @@ export interface QueryParamsResponseAmino {
   /** tally_params defines the parameters related to tally. */
   tally_params?: TallyParamsAmino;
 }
-export interface QueryParamsResponseAminoType {
+export interface QueryParamsResponseAminoMsg {
   type: "cosmos-sdk/v1/QueryParamsResponse";
   value: QueryParamsResponseAmino;
 }
@@ -336,7 +336,7 @@ export interface QueryDepositRequest {
   /** depositor defines the deposit addresses from the proposals. */
   depositor: string;
 }
-export interface QueryDepositRequestProtoType {
+export interface QueryDepositRequestProtoMsg {
   typeUrl: "/cosmos.gov.v1.QueryDepositRequest";
   value: Uint8Array;
 }
@@ -349,7 +349,7 @@ export interface QueryDepositRequestAmino {
   /** depositor defines the deposit addresses from the proposals. */
   depositor: string;
 }
-export interface QueryDepositRequestAminoType {
+export interface QueryDepositRequestAminoMsg {
   type: "cosmos-sdk/v1/QueryDepositRequest";
   value: QueryDepositRequestAmino;
 }
@@ -365,7 +365,7 @@ export interface QueryDepositResponse {
   /** deposit defines the requested deposit. */
   deposit?: Deposit;
 }
-export interface QueryDepositResponseProtoType {
+export interface QueryDepositResponseProtoMsg {
   typeUrl: "/cosmos.gov.v1.QueryDepositResponse";
   value: Uint8Array;
 }
@@ -375,7 +375,7 @@ export interface QueryDepositResponseAmino {
   /** deposit defines the requested deposit. */
   deposit?: DepositAmino;
 }
-export interface QueryDepositResponseAminoType {
+export interface QueryDepositResponseAminoMsg {
   type: "cosmos-sdk/v1/QueryDepositResponse";
   value: QueryDepositResponseAmino;
 }
@@ -393,7 +393,7 @@ export interface QueryDepositsRequest {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequest;
 }
-export interface QueryDepositsRequestProtoType {
+export interface QueryDepositsRequestProtoMsg {
   typeUrl: "/cosmos.gov.v1.QueryDepositsRequest";
   value: Uint8Array;
 }
@@ -406,7 +406,7 @@ export interface QueryDepositsRequestAmino {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequestAmino;
 }
-export interface QueryDepositsRequestAminoType {
+export interface QueryDepositsRequestAminoMsg {
   type: "cosmos-sdk/v1/QueryDepositsRequest";
   value: QueryDepositsRequestAmino;
 }
@@ -424,7 +424,7 @@ export interface QueryDepositsResponse {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponse;
 }
-export interface QueryDepositsResponseProtoType {
+export interface QueryDepositsResponseProtoMsg {
   typeUrl: "/cosmos.gov.v1.QueryDepositsResponse";
   value: Uint8Array;
 }
@@ -436,7 +436,7 @@ export interface QueryDepositsResponseAmino {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponseAmino;
 }
-export interface QueryDepositsResponseAminoType {
+export interface QueryDepositsResponseAminoMsg {
   type: "cosmos-sdk/v1/QueryDepositsResponse";
   value: QueryDepositsResponseAmino;
 }
@@ -452,7 +452,7 @@ export interface QueryTallyResultRequest {
   /** proposal_id defines the unique id of the proposal. */
   proposalId: Long;
 }
-export interface QueryTallyResultRequestProtoType {
+export interface QueryTallyResultRequestProtoMsg {
   typeUrl: "/cosmos.gov.v1.QueryTallyResultRequest";
   value: Uint8Array;
 }
@@ -462,7 +462,7 @@ export interface QueryTallyResultRequestAmino {
   /** proposal_id defines the unique id of the proposal. */
   proposal_id: string;
 }
-export interface QueryTallyResultRequestAminoType {
+export interface QueryTallyResultRequestAminoMsg {
   type: "cosmos-sdk/v1/QueryTallyResultRequest";
   value: QueryTallyResultRequestAmino;
 }
@@ -477,7 +477,7 @@ export interface QueryTallyResultResponse {
   /** tally defines the requested tally. */
   tally?: TallyResult;
 }
-export interface QueryTallyResultResponseProtoType {
+export interface QueryTallyResultResponseProtoMsg {
   typeUrl: "/cosmos.gov.v1.QueryTallyResultResponse";
   value: Uint8Array;
 }
@@ -487,7 +487,7 @@ export interface QueryTallyResultResponseAmino {
   /** tally defines the requested tally. */
   tally?: TallyResultAmino;
 }
-export interface QueryTallyResultResponseAminoType {
+export interface QueryTallyResultResponseAminoMsg {
   type: "cosmos-sdk/v1/QueryTallyResultResponse";
   value: QueryTallyResultResponseAmino;
 }
@@ -504,6 +504,9 @@ function createBaseQueryProposalRequest(): QueryProposalRequest {
 }
 
 export const QueryProposalRequest = {
+  typeUrl: "/cosmos.gov.v1.QueryProposalRequest",
+  aminoType: "cosmos-sdk/v1/QueryProposalRequest",
+
   encode(message: QueryProposalRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.proposalId.isZero()) {
       writer.uint32(8).uint64(message.proposalId);
@@ -574,6 +577,32 @@ export const QueryProposalRequest = {
     const obj: any = {};
     obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryProposalRequestAminoMsg): QueryProposalRequest {
+    return QueryProposalRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryProposalRequest): QueryProposalRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/v1/QueryProposalRequest",
+      value: QueryProposalRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryProposalRequestProtoMsg): QueryProposalRequest {
+    return QueryProposalRequest.decode(message.value);
+  },
+
+  toProto(message: QueryProposalRequest): Uint8Array {
+    return QueryProposalRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryProposalRequest): QueryProposalRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1.QueryProposalRequest",
+      value: QueryProposalRequest.encode(message).finish()
+    };
   }
 
 };
@@ -585,6 +614,9 @@ function createBaseQueryProposalResponse(): QueryProposalResponse {
 }
 
 export const QueryProposalResponse = {
+  typeUrl: "/cosmos.gov.v1.QueryProposalResponse",
+  aminoType: "cosmos-sdk/v1/QueryProposalResponse",
+
   encode(message: QueryProposalResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.proposal !== undefined) {
       Proposal.encode(message.proposal, writer.uint32(10).fork()).ldelim();
@@ -655,6 +687,32 @@ export const QueryProposalResponse = {
     const obj: any = {};
     obj.proposal = message.proposal ? Proposal.toAmino(message.proposal) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryProposalResponseAminoMsg): QueryProposalResponse {
+    return QueryProposalResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryProposalResponse): QueryProposalResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/v1/QueryProposalResponse",
+      value: QueryProposalResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryProposalResponseProtoMsg): QueryProposalResponse {
+    return QueryProposalResponse.decode(message.value);
+  },
+
+  toProto(message: QueryProposalResponse): Uint8Array {
+    return QueryProposalResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryProposalResponse): QueryProposalResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1.QueryProposalResponse",
+      value: QueryProposalResponse.encode(message).finish()
+    };
   }
 
 };
@@ -669,6 +727,9 @@ function createBaseQueryProposalsRequest(): QueryProposalsRequest {
 }
 
 export const QueryProposalsRequest = {
+  typeUrl: "/cosmos.gov.v1.QueryProposalsRequest",
+  aminoType: "cosmos-sdk/v1/QueryProposalsRequest",
+
   encode(message: QueryProposalsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.proposalStatus !== 0) {
       writer.uint32(8).int32(message.proposalStatus);
@@ -784,6 +845,32 @@ export const QueryProposalsRequest = {
     obj.depositor = message.depositor;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryProposalsRequestAminoMsg): QueryProposalsRequest {
+    return QueryProposalsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryProposalsRequest): QueryProposalsRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/v1/QueryProposalsRequest",
+      value: QueryProposalsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryProposalsRequestProtoMsg): QueryProposalsRequest {
+    return QueryProposalsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryProposalsRequest): Uint8Array {
+    return QueryProposalsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryProposalsRequest): QueryProposalsRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1.QueryProposalsRequest",
+      value: QueryProposalsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -796,6 +883,9 @@ function createBaseQueryProposalsResponse(): QueryProposalsResponse {
 }
 
 export const QueryProposalsResponse = {
+  typeUrl: "/cosmos.gov.v1.QueryProposalsResponse",
+  aminoType: "cosmos-sdk/v1/QueryProposalsResponse",
+
   encode(message: QueryProposalsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.proposals) {
       Proposal.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -899,6 +989,32 @@ export const QueryProposalsResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryProposalsResponseAminoMsg): QueryProposalsResponse {
+    return QueryProposalsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryProposalsResponse): QueryProposalsResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/v1/QueryProposalsResponse",
+      value: QueryProposalsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryProposalsResponseProtoMsg): QueryProposalsResponse {
+    return QueryProposalsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryProposalsResponse): Uint8Array {
+    return QueryProposalsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryProposalsResponse): QueryProposalsResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1.QueryProposalsResponse",
+      value: QueryProposalsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -911,6 +1027,9 @@ function createBaseQueryVoteRequest(): QueryVoteRequest {
 }
 
 export const QueryVoteRequest = {
+  typeUrl: "/cosmos.gov.v1.QueryVoteRequest",
+  aminoType: "cosmos-sdk/v1/QueryVoteRequest",
+
   encode(message: QueryVoteRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.proposalId.isZero()) {
       writer.uint32(8).uint64(message.proposalId);
@@ -996,6 +1115,32 @@ export const QueryVoteRequest = {
     obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined;
     obj.voter = message.voter;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryVoteRequestAminoMsg): QueryVoteRequest {
+    return QueryVoteRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryVoteRequest): QueryVoteRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/v1/QueryVoteRequest",
+      value: QueryVoteRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryVoteRequestProtoMsg): QueryVoteRequest {
+    return QueryVoteRequest.decode(message.value);
+  },
+
+  toProto(message: QueryVoteRequest): Uint8Array {
+    return QueryVoteRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryVoteRequest): QueryVoteRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1.QueryVoteRequest",
+      value: QueryVoteRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1007,6 +1152,9 @@ function createBaseQueryVoteResponse(): QueryVoteResponse {
 }
 
 export const QueryVoteResponse = {
+  typeUrl: "/cosmos.gov.v1.QueryVoteResponse",
+  aminoType: "cosmos-sdk/v1/QueryVoteResponse",
+
   encode(message: QueryVoteResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.vote !== undefined) {
       Vote.encode(message.vote, writer.uint32(10).fork()).ldelim();
@@ -1077,6 +1225,32 @@ export const QueryVoteResponse = {
     const obj: any = {};
     obj.vote = message.vote ? Vote.toAmino(message.vote) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryVoteResponseAminoMsg): QueryVoteResponse {
+    return QueryVoteResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryVoteResponse): QueryVoteResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/v1/QueryVoteResponse",
+      value: QueryVoteResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryVoteResponseProtoMsg): QueryVoteResponse {
+    return QueryVoteResponse.decode(message.value);
+  },
+
+  toProto(message: QueryVoteResponse): Uint8Array {
+    return QueryVoteResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryVoteResponse): QueryVoteResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1.QueryVoteResponse",
+      value: QueryVoteResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1089,6 +1263,9 @@ function createBaseQueryVotesRequest(): QueryVotesRequest {
 }
 
 export const QueryVotesRequest = {
+  typeUrl: "/cosmos.gov.v1.QueryVotesRequest",
+  aminoType: "cosmos-sdk/v1/QueryVotesRequest",
+
   encode(message: QueryVotesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.proposalId.isZero()) {
       writer.uint32(8).uint64(message.proposalId);
@@ -1174,6 +1351,32 @@ export const QueryVotesRequest = {
     obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryVotesRequestAminoMsg): QueryVotesRequest {
+    return QueryVotesRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryVotesRequest): QueryVotesRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/v1/QueryVotesRequest",
+      value: QueryVotesRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryVotesRequestProtoMsg): QueryVotesRequest {
+    return QueryVotesRequest.decode(message.value);
+  },
+
+  toProto(message: QueryVotesRequest): Uint8Array {
+    return QueryVotesRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryVotesRequest): QueryVotesRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1.QueryVotesRequest",
+      value: QueryVotesRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1186,6 +1389,9 @@ function createBaseQueryVotesResponse(): QueryVotesResponse {
 }
 
 export const QueryVotesResponse = {
+  typeUrl: "/cosmos.gov.v1.QueryVotesResponse",
+  aminoType: "cosmos-sdk/v1/QueryVotesResponse",
+
   encode(message: QueryVotesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.votes) {
       Vote.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1289,6 +1495,32 @@ export const QueryVotesResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryVotesResponseAminoMsg): QueryVotesResponse {
+    return QueryVotesResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryVotesResponse): QueryVotesResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/v1/QueryVotesResponse",
+      value: QueryVotesResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryVotesResponseProtoMsg): QueryVotesResponse {
+    return QueryVotesResponse.decode(message.value);
+  },
+
+  toProto(message: QueryVotesResponse): Uint8Array {
+    return QueryVotesResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryVotesResponse): QueryVotesResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1.QueryVotesResponse",
+      value: QueryVotesResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1300,6 +1532,9 @@ function createBaseQueryParamsRequest(): QueryParamsRequest {
 }
 
 export const QueryParamsRequest = {
+  typeUrl: "/cosmos.gov.v1.QueryParamsRequest",
+  aminoType: "cosmos-sdk/v1/QueryParamsRequest",
+
   encode(message: QueryParamsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.paramsType !== "") {
       writer.uint32(10).string(message.paramsType);
@@ -1370,6 +1605,32 @@ export const QueryParamsRequest = {
     const obj: any = {};
     obj.params_type = message.paramsType;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest {
+    return QueryParamsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryParamsRequest): QueryParamsRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/v1/QueryParamsRequest",
+      value: QueryParamsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryParamsRequestProtoMsg): QueryParamsRequest {
+    return QueryParamsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryParamsRequest): Uint8Array {
+    return QueryParamsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryParamsRequest): QueryParamsRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1.QueryParamsRequest",
+      value: QueryParamsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1383,6 +1644,9 @@ function createBaseQueryParamsResponse(): QueryParamsResponse {
 }
 
 export const QueryParamsResponse = {
+  typeUrl: "/cosmos.gov.v1.QueryParamsResponse",
+  aminoType: "cosmos-sdk/v1/QueryParamsResponse",
+
   encode(message: QueryParamsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.votingParams !== undefined) {
       VotingParams.encode(message.votingParams, writer.uint32(10).fork()).ldelim();
@@ -1483,6 +1747,32 @@ export const QueryParamsResponse = {
     obj.deposit_params = message.depositParams ? DepositParams.toAmino(message.depositParams) : undefined;
     obj.tally_params = message.tallyParams ? TallyParams.toAmino(message.tallyParams) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryParamsResponseAminoMsg): QueryParamsResponse {
+    return QueryParamsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryParamsResponse): QueryParamsResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/v1/QueryParamsResponse",
+      value: QueryParamsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryParamsResponseProtoMsg): QueryParamsResponse {
+    return QueryParamsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryParamsResponse): Uint8Array {
+    return QueryParamsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryParamsResponse): QueryParamsResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1.QueryParamsResponse",
+      value: QueryParamsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1495,6 +1785,9 @@ function createBaseQueryDepositRequest(): QueryDepositRequest {
 }
 
 export const QueryDepositRequest = {
+  typeUrl: "/cosmos.gov.v1.QueryDepositRequest",
+  aminoType: "cosmos-sdk/v1/QueryDepositRequest",
+
   encode(message: QueryDepositRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.proposalId.isZero()) {
       writer.uint32(8).uint64(message.proposalId);
@@ -1580,6 +1873,32 @@ export const QueryDepositRequest = {
     obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined;
     obj.depositor = message.depositor;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDepositRequestAminoMsg): QueryDepositRequest {
+    return QueryDepositRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryDepositRequest): QueryDepositRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/v1/QueryDepositRequest",
+      value: QueryDepositRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryDepositRequestProtoMsg): QueryDepositRequest {
+    return QueryDepositRequest.decode(message.value);
+  },
+
+  toProto(message: QueryDepositRequest): Uint8Array {
+    return QueryDepositRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDepositRequest): QueryDepositRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1.QueryDepositRequest",
+      value: QueryDepositRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1591,6 +1910,9 @@ function createBaseQueryDepositResponse(): QueryDepositResponse {
 }
 
 export const QueryDepositResponse = {
+  typeUrl: "/cosmos.gov.v1.QueryDepositResponse",
+  aminoType: "cosmos-sdk/v1/QueryDepositResponse",
+
   encode(message: QueryDepositResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.deposit !== undefined) {
       Deposit.encode(message.deposit, writer.uint32(10).fork()).ldelim();
@@ -1661,6 +1983,32 @@ export const QueryDepositResponse = {
     const obj: any = {};
     obj.deposit = message.deposit ? Deposit.toAmino(message.deposit) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDepositResponseAminoMsg): QueryDepositResponse {
+    return QueryDepositResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryDepositResponse): QueryDepositResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/v1/QueryDepositResponse",
+      value: QueryDepositResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryDepositResponseProtoMsg): QueryDepositResponse {
+    return QueryDepositResponse.decode(message.value);
+  },
+
+  toProto(message: QueryDepositResponse): Uint8Array {
+    return QueryDepositResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDepositResponse): QueryDepositResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1.QueryDepositResponse",
+      value: QueryDepositResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1673,6 +2021,9 @@ function createBaseQueryDepositsRequest(): QueryDepositsRequest {
 }
 
 export const QueryDepositsRequest = {
+  typeUrl: "/cosmos.gov.v1.QueryDepositsRequest",
+  aminoType: "cosmos-sdk/v1/QueryDepositsRequest",
+
   encode(message: QueryDepositsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.proposalId.isZero()) {
       writer.uint32(8).uint64(message.proposalId);
@@ -1758,6 +2109,32 @@ export const QueryDepositsRequest = {
     obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDepositsRequestAminoMsg): QueryDepositsRequest {
+    return QueryDepositsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryDepositsRequest): QueryDepositsRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/v1/QueryDepositsRequest",
+      value: QueryDepositsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryDepositsRequestProtoMsg): QueryDepositsRequest {
+    return QueryDepositsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryDepositsRequest): Uint8Array {
+    return QueryDepositsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDepositsRequest): QueryDepositsRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1.QueryDepositsRequest",
+      value: QueryDepositsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1770,6 +2147,9 @@ function createBaseQueryDepositsResponse(): QueryDepositsResponse {
 }
 
 export const QueryDepositsResponse = {
+  typeUrl: "/cosmos.gov.v1.QueryDepositsResponse",
+  aminoType: "cosmos-sdk/v1/QueryDepositsResponse",
+
   encode(message: QueryDepositsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.deposits) {
       Deposit.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1873,6 +2253,32 @@ export const QueryDepositsResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDepositsResponseAminoMsg): QueryDepositsResponse {
+    return QueryDepositsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryDepositsResponse): QueryDepositsResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/v1/QueryDepositsResponse",
+      value: QueryDepositsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryDepositsResponseProtoMsg): QueryDepositsResponse {
+    return QueryDepositsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryDepositsResponse): Uint8Array {
+    return QueryDepositsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDepositsResponse): QueryDepositsResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1.QueryDepositsResponse",
+      value: QueryDepositsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1884,6 +2290,9 @@ function createBaseQueryTallyResultRequest(): QueryTallyResultRequest {
 }
 
 export const QueryTallyResultRequest = {
+  typeUrl: "/cosmos.gov.v1.QueryTallyResultRequest",
+  aminoType: "cosmos-sdk/v1/QueryTallyResultRequest",
+
   encode(message: QueryTallyResultRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.proposalId.isZero()) {
       writer.uint32(8).uint64(message.proposalId);
@@ -1954,6 +2363,32 @@ export const QueryTallyResultRequest = {
     const obj: any = {};
     obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryTallyResultRequestAminoMsg): QueryTallyResultRequest {
+    return QueryTallyResultRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryTallyResultRequest): QueryTallyResultRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/v1/QueryTallyResultRequest",
+      value: QueryTallyResultRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryTallyResultRequestProtoMsg): QueryTallyResultRequest {
+    return QueryTallyResultRequest.decode(message.value);
+  },
+
+  toProto(message: QueryTallyResultRequest): Uint8Array {
+    return QueryTallyResultRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryTallyResultRequest): QueryTallyResultRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1.QueryTallyResultRequest",
+      value: QueryTallyResultRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1965,6 +2400,9 @@ function createBaseQueryTallyResultResponse(): QueryTallyResultResponse {
 }
 
 export const QueryTallyResultResponse = {
+  typeUrl: "/cosmos.gov.v1.QueryTallyResultResponse",
+  aminoType: "cosmos-sdk/v1/QueryTallyResultResponse",
+
   encode(message: QueryTallyResultResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.tally !== undefined) {
       TallyResult.encode(message.tally, writer.uint32(10).fork()).ldelim();
@@ -2035,6 +2473,32 @@ export const QueryTallyResultResponse = {
     const obj: any = {};
     obj.tally = message.tally ? TallyResult.toAmino(message.tally) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryTallyResultResponseAminoMsg): QueryTallyResultResponse {
+    return QueryTallyResultResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryTallyResultResponse): QueryTallyResultResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/v1/QueryTallyResultResponse",
+      value: QueryTallyResultResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryTallyResultResponseProtoMsg): QueryTallyResultResponse {
+    return QueryTallyResultResponse.decode(message.value);
+  },
+
+  toProto(message: QueryTallyResultResponse): Uint8Array {
+    return QueryTallyResultResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryTallyResultResponse): QueryTallyResultResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1.QueryTallyResultResponse",
+      value: QueryTallyResultResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/gov/v1/tx.ts b/__fixtures__/outputv2/cosmos/gov/v1/tx.ts
index eab570d9a..b7855287d 100644
--- a/__fixtures__/outputv2/cosmos/gov/v1/tx.ts
+++ b/__fixtures__/outputv2/cosmos/gov/v1/tx.ts
@@ -23,7 +23,7 @@ export interface MsgSubmitProposal {
   /** metadata is any arbitrary metadata attached to the proposal. */
   metadata: string;
 }
-export interface MsgSubmitProposalProtoType {
+export interface MsgSubmitProposalProtoMsg {
   typeUrl: "/cosmos.gov.v1.MsgSubmitProposal";
   value: Uint8Array;
 }
@@ -40,7 +40,7 @@ export interface MsgSubmitProposalAmino {
   /** metadata is any arbitrary metadata attached to the proposal. */
   metadata: string;
 }
-export interface MsgSubmitProposalAminoType {
+export interface MsgSubmitProposalAminoMsg {
   type: "cosmos-sdk/v1/MsgSubmitProposal";
   value: MsgSubmitProposalAmino;
 }
@@ -60,7 +60,7 @@ export interface MsgSubmitProposalSDKType {
 export interface MsgSubmitProposalResponse {
   proposalId: Long;
 }
-export interface MsgSubmitProposalResponseProtoType {
+export interface MsgSubmitProposalResponseProtoMsg {
   typeUrl: "/cosmos.gov.v1.MsgSubmitProposalResponse";
   value: Uint8Array;
 }
@@ -69,7 +69,7 @@ export interface MsgSubmitProposalResponseProtoType {
 export interface MsgSubmitProposalResponseAmino {
   proposal_id: string;
 }
-export interface MsgSubmitProposalResponseAminoType {
+export interface MsgSubmitProposalResponseAminoMsg {
   type: "cosmos-sdk/v1/MsgSubmitProposalResponse";
   value: MsgSubmitProposalResponseAmino;
 }
@@ -90,7 +90,7 @@ export interface MsgExecLegacyContent {
   /** authority must be the gov module address. */
   authority: string;
 }
-export interface MsgExecLegacyContentProtoType {
+export interface MsgExecLegacyContentProtoMsg {
   typeUrl: "/cosmos.gov.v1.MsgExecLegacyContent";
   value: Uint8Array;
 }
@@ -106,7 +106,7 @@ export interface MsgExecLegacyContentAmino {
   /** authority must be the gov module address. */
   authority: string;
 }
-export interface MsgExecLegacyContentAminoType {
+export interface MsgExecLegacyContentAminoMsg {
   type: "cosmos-sdk/v1/MsgExecLegacyContent";
   value: MsgExecLegacyContentAmino;
 }
@@ -122,14 +122,14 @@ export interface MsgExecLegacyContentSDKType {
 
 /** MsgExecLegacyContentResponse defines the Msg/ExecLegacyContent response type. */
 export interface MsgExecLegacyContentResponse {}
-export interface MsgExecLegacyContentResponseProtoType {
+export interface MsgExecLegacyContentResponseProtoMsg {
   typeUrl: "/cosmos.gov.v1.MsgExecLegacyContentResponse";
   value: Uint8Array;
 }
 
 /** MsgExecLegacyContentResponse defines the Msg/ExecLegacyContent response type. */
 export interface MsgExecLegacyContentResponseAmino {}
-export interface MsgExecLegacyContentResponseAminoType {
+export interface MsgExecLegacyContentResponseAminoMsg {
   type: "cosmos-sdk/v1/MsgExecLegacyContentResponse";
   value: MsgExecLegacyContentResponseAmino;
 }
@@ -144,7 +144,7 @@ export interface MsgVote {
   option: VoteOption;
   metadata: string;
 }
-export interface MsgVoteProtoType {
+export interface MsgVoteProtoMsg {
   typeUrl: "/cosmos.gov.v1.MsgVote";
   value: Uint8Array;
 }
@@ -156,7 +156,7 @@ export interface MsgVoteAmino {
   option: VoteOption;
   metadata: string;
 }
-export interface MsgVoteAminoType {
+export interface MsgVoteAminoMsg {
   type: "cosmos-sdk/v1/MsgVote";
   value: MsgVoteAmino;
 }
@@ -171,14 +171,14 @@ export interface MsgVoteSDKType {
 
 /** MsgVoteResponse defines the Msg/Vote response type. */
 export interface MsgVoteResponse {}
-export interface MsgVoteResponseProtoType {
+export interface MsgVoteResponseProtoMsg {
   typeUrl: "/cosmos.gov.v1.MsgVoteResponse";
   value: Uint8Array;
 }
 
 /** MsgVoteResponse defines the Msg/Vote response type. */
 export interface MsgVoteResponseAmino {}
-export interface MsgVoteResponseAminoType {
+export interface MsgVoteResponseAminoMsg {
   type: "cosmos-sdk/v1/MsgVoteResponse";
   value: MsgVoteResponseAmino;
 }
@@ -193,7 +193,7 @@ export interface MsgVoteWeighted {
   options: WeightedVoteOption[];
   metadata: string;
 }
-export interface MsgVoteWeightedProtoType {
+export interface MsgVoteWeightedProtoMsg {
   typeUrl: "/cosmos.gov.v1.MsgVoteWeighted";
   value: Uint8Array;
 }
@@ -205,7 +205,7 @@ export interface MsgVoteWeightedAmino {
   options: WeightedVoteOptionAmino[];
   metadata: string;
 }
-export interface MsgVoteWeightedAminoType {
+export interface MsgVoteWeightedAminoMsg {
   type: "cosmos-sdk/v1/MsgVoteWeighted";
   value: MsgVoteWeightedAmino;
 }
@@ -220,14 +220,14 @@ export interface MsgVoteWeightedSDKType {
 
 /** MsgVoteWeightedResponse defines the Msg/VoteWeighted response type. */
 export interface MsgVoteWeightedResponse {}
-export interface MsgVoteWeightedResponseProtoType {
+export interface MsgVoteWeightedResponseProtoMsg {
   typeUrl: "/cosmos.gov.v1.MsgVoteWeightedResponse";
   value: Uint8Array;
 }
 
 /** MsgVoteWeightedResponse defines the Msg/VoteWeighted response type. */
 export interface MsgVoteWeightedResponseAmino {}
-export interface MsgVoteWeightedResponseAminoType {
+export interface MsgVoteWeightedResponseAminoMsg {
   type: "cosmos-sdk/v1/MsgVoteWeightedResponse";
   value: MsgVoteWeightedResponseAmino;
 }
@@ -241,7 +241,7 @@ export interface MsgDeposit {
   depositor: string;
   amount: Coin[];
 }
-export interface MsgDepositProtoType {
+export interface MsgDepositProtoMsg {
   typeUrl: "/cosmos.gov.v1.MsgDeposit";
   value: Uint8Array;
 }
@@ -252,7 +252,7 @@ export interface MsgDepositAmino {
   depositor: string;
   amount: CoinAmino[];
 }
-export interface MsgDepositAminoType {
+export interface MsgDepositAminoMsg {
   type: "cosmos-sdk/v1/MsgDeposit";
   value: MsgDepositAmino;
 }
@@ -266,14 +266,14 @@ export interface MsgDepositSDKType {
 
 /** MsgDepositResponse defines the Msg/Deposit response type. */
 export interface MsgDepositResponse {}
-export interface MsgDepositResponseProtoType {
+export interface MsgDepositResponseProtoMsg {
   typeUrl: "/cosmos.gov.v1.MsgDepositResponse";
   value: Uint8Array;
 }
 
 /** MsgDepositResponse defines the Msg/Deposit response type. */
 export interface MsgDepositResponseAmino {}
-export interface MsgDepositResponseAminoType {
+export interface MsgDepositResponseAminoMsg {
   type: "cosmos-sdk/v1/MsgDepositResponse";
   value: MsgDepositResponseAmino;
 }
@@ -291,6 +291,9 @@ function createBaseMsgSubmitProposal(): MsgSubmitProposal {
 }
 
 export const MsgSubmitProposal = {
+  typeUrl: "/cosmos.gov.v1.MsgSubmitProposal",
+  aminoType: "cosmos-sdk/v1/MsgSubmitProposal",
+
   encode(message: MsgSubmitProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.messages) {
       Any.encode((v! as Any), writer.uint32(10).fork()).ldelim();
@@ -439,6 +442,32 @@ export const MsgSubmitProposal = {
     obj.proposer = message.proposer;
     obj.metadata = message.metadata;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgSubmitProposalAminoMsg): MsgSubmitProposal {
+    return MsgSubmitProposal.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgSubmitProposal): MsgSubmitProposalAminoMsg {
+    return {
+      type: "cosmos-sdk/v1/MsgSubmitProposal",
+      value: MsgSubmitProposal.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgSubmitProposalProtoMsg): MsgSubmitProposal {
+    return MsgSubmitProposal.decode(message.value);
+  },
+
+  toProto(message: MsgSubmitProposal): Uint8Array {
+    return MsgSubmitProposal.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgSubmitProposal): MsgSubmitProposalProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1.MsgSubmitProposal",
+      value: MsgSubmitProposal.encode(message).finish()
+    };
   }
 
 };
@@ -450,6 +479,9 @@ function createBaseMsgSubmitProposalResponse(): MsgSubmitProposalResponse {
 }
 
 export const MsgSubmitProposalResponse = {
+  typeUrl: "/cosmos.gov.v1.MsgSubmitProposalResponse",
+  aminoType: "cosmos-sdk/v1/MsgSubmitProposalResponse",
+
   encode(message: MsgSubmitProposalResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.proposalId.isZero()) {
       writer.uint32(8).uint64(message.proposalId);
@@ -520,6 +552,32 @@ export const MsgSubmitProposalResponse = {
     const obj: any = {};
     obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgSubmitProposalResponseAminoMsg): MsgSubmitProposalResponse {
+    return MsgSubmitProposalResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgSubmitProposalResponse): MsgSubmitProposalResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/v1/MsgSubmitProposalResponse",
+      value: MsgSubmitProposalResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgSubmitProposalResponseProtoMsg): MsgSubmitProposalResponse {
+    return MsgSubmitProposalResponse.decode(message.value);
+  },
+
+  toProto(message: MsgSubmitProposalResponse): Uint8Array {
+    return MsgSubmitProposalResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgSubmitProposalResponse): MsgSubmitProposalResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1.MsgSubmitProposalResponse",
+      value: MsgSubmitProposalResponse.encode(message).finish()
+    };
   }
 
 };
@@ -532,6 +590,9 @@ function createBaseMsgExecLegacyContent(): MsgExecLegacyContent {
 }
 
 export const MsgExecLegacyContent = {
+  typeUrl: "/cosmos.gov.v1.MsgExecLegacyContent",
+  aminoType: "cosmos-sdk/v1/MsgExecLegacyContent",
+
   encode(message: MsgExecLegacyContent, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.content !== undefined) {
       Any.encode((message.content as Any), writer.uint32(10).fork()).ldelim();
@@ -617,6 +678,32 @@ export const MsgExecLegacyContent = {
     obj.content = message.content ? ProposalContentI_ToAmino((message.content as Any)) : undefined;
     obj.authority = message.authority;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgExecLegacyContentAminoMsg): MsgExecLegacyContent {
+    return MsgExecLegacyContent.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgExecLegacyContent): MsgExecLegacyContentAminoMsg {
+    return {
+      type: "cosmos-sdk/v1/MsgExecLegacyContent",
+      value: MsgExecLegacyContent.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgExecLegacyContentProtoMsg): MsgExecLegacyContent {
+    return MsgExecLegacyContent.decode(message.value);
+  },
+
+  toProto(message: MsgExecLegacyContent): Uint8Array {
+    return MsgExecLegacyContent.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgExecLegacyContent): MsgExecLegacyContentProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1.MsgExecLegacyContent",
+      value: MsgExecLegacyContent.encode(message).finish()
+    };
   }
 
 };
@@ -626,6 +713,9 @@ function createBaseMsgExecLegacyContentResponse(): MsgExecLegacyContentResponse
 }
 
 export const MsgExecLegacyContentResponse = {
+  typeUrl: "/cosmos.gov.v1.MsgExecLegacyContentResponse",
+  aminoType: "cosmos-sdk/v1/MsgExecLegacyContentResponse",
+
   encode(_: MsgExecLegacyContentResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -678,6 +768,32 @@ export const MsgExecLegacyContentResponse = {
   toAmino(_: MsgExecLegacyContentResponse): MsgExecLegacyContentResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgExecLegacyContentResponseAminoMsg): MsgExecLegacyContentResponse {
+    return MsgExecLegacyContentResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgExecLegacyContentResponse): MsgExecLegacyContentResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/v1/MsgExecLegacyContentResponse",
+      value: MsgExecLegacyContentResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgExecLegacyContentResponseProtoMsg): MsgExecLegacyContentResponse {
+    return MsgExecLegacyContentResponse.decode(message.value);
+  },
+
+  toProto(message: MsgExecLegacyContentResponse): Uint8Array {
+    return MsgExecLegacyContentResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgExecLegacyContentResponse): MsgExecLegacyContentResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1.MsgExecLegacyContentResponse",
+      value: MsgExecLegacyContentResponse.encode(message).finish()
+    };
   }
 
 };
@@ -692,6 +808,9 @@ function createBaseMsgVote(): MsgVote {
 }
 
 export const MsgVote = {
+  typeUrl: "/cosmos.gov.v1.MsgVote",
+  aminoType: "cosmos-sdk/v1/MsgVote",
+
   encode(message: MsgVote, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.proposalId.isZero()) {
       writer.uint32(8).uint64(message.proposalId);
@@ -807,6 +926,32 @@ export const MsgVote = {
     obj.option = message.option;
     obj.metadata = message.metadata;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgVoteAminoMsg): MsgVote {
+    return MsgVote.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgVote): MsgVoteAminoMsg {
+    return {
+      type: "cosmos-sdk/v1/MsgVote",
+      value: MsgVote.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgVoteProtoMsg): MsgVote {
+    return MsgVote.decode(message.value);
+  },
+
+  toProto(message: MsgVote): Uint8Array {
+    return MsgVote.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgVote): MsgVoteProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1.MsgVote",
+      value: MsgVote.encode(message).finish()
+    };
   }
 
 };
@@ -816,6 +961,9 @@ function createBaseMsgVoteResponse(): MsgVoteResponse {
 }
 
 export const MsgVoteResponse = {
+  typeUrl: "/cosmos.gov.v1.MsgVoteResponse",
+  aminoType: "cosmos-sdk/v1/MsgVoteResponse",
+
   encode(_: MsgVoteResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -868,6 +1016,32 @@ export const MsgVoteResponse = {
   toAmino(_: MsgVoteResponse): MsgVoteResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgVoteResponseAminoMsg): MsgVoteResponse {
+    return MsgVoteResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgVoteResponse): MsgVoteResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/v1/MsgVoteResponse",
+      value: MsgVoteResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgVoteResponseProtoMsg): MsgVoteResponse {
+    return MsgVoteResponse.decode(message.value);
+  },
+
+  toProto(message: MsgVoteResponse): Uint8Array {
+    return MsgVoteResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgVoteResponse): MsgVoteResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1.MsgVoteResponse",
+      value: MsgVoteResponse.encode(message).finish()
+    };
   }
 
 };
@@ -882,6 +1056,9 @@ function createBaseMsgVoteWeighted(): MsgVoteWeighted {
 }
 
 export const MsgVoteWeighted = {
+  typeUrl: "/cosmos.gov.v1.MsgVoteWeighted",
+  aminoType: "cosmos-sdk/v1/MsgVoteWeighted",
+
   encode(message: MsgVoteWeighted, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.proposalId.isZero()) {
       writer.uint32(8).uint64(message.proposalId);
@@ -1015,6 +1192,32 @@ export const MsgVoteWeighted = {
 
     obj.metadata = message.metadata;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgVoteWeightedAminoMsg): MsgVoteWeighted {
+    return MsgVoteWeighted.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgVoteWeighted): MsgVoteWeightedAminoMsg {
+    return {
+      type: "cosmos-sdk/v1/MsgVoteWeighted",
+      value: MsgVoteWeighted.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgVoteWeightedProtoMsg): MsgVoteWeighted {
+    return MsgVoteWeighted.decode(message.value);
+  },
+
+  toProto(message: MsgVoteWeighted): Uint8Array {
+    return MsgVoteWeighted.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgVoteWeighted): MsgVoteWeightedProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1.MsgVoteWeighted",
+      value: MsgVoteWeighted.encode(message).finish()
+    };
   }
 
 };
@@ -1024,6 +1227,9 @@ function createBaseMsgVoteWeightedResponse(): MsgVoteWeightedResponse {
 }
 
 export const MsgVoteWeightedResponse = {
+  typeUrl: "/cosmos.gov.v1.MsgVoteWeightedResponse",
+  aminoType: "cosmos-sdk/v1/MsgVoteWeightedResponse",
+
   encode(_: MsgVoteWeightedResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -1076,6 +1282,32 @@ export const MsgVoteWeightedResponse = {
   toAmino(_: MsgVoteWeightedResponse): MsgVoteWeightedResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgVoteWeightedResponseAminoMsg): MsgVoteWeightedResponse {
+    return MsgVoteWeightedResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgVoteWeightedResponse): MsgVoteWeightedResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/v1/MsgVoteWeightedResponse",
+      value: MsgVoteWeightedResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgVoteWeightedResponseProtoMsg): MsgVoteWeightedResponse {
+    return MsgVoteWeightedResponse.decode(message.value);
+  },
+
+  toProto(message: MsgVoteWeightedResponse): Uint8Array {
+    return MsgVoteWeightedResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgVoteWeightedResponse): MsgVoteWeightedResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1.MsgVoteWeightedResponse",
+      value: MsgVoteWeightedResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1089,6 +1321,9 @@ function createBaseMsgDeposit(): MsgDeposit {
 }
 
 export const MsgDeposit = {
+  typeUrl: "/cosmos.gov.v1.MsgDeposit",
+  aminoType: "cosmos-sdk/v1/MsgDeposit",
+
   encode(message: MsgDeposit, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.proposalId.isZero()) {
       writer.uint32(8).uint64(message.proposalId);
@@ -1207,6 +1442,32 @@ export const MsgDeposit = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: MsgDepositAminoMsg): MsgDeposit {
+    return MsgDeposit.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgDeposit): MsgDepositAminoMsg {
+    return {
+      type: "cosmos-sdk/v1/MsgDeposit",
+      value: MsgDeposit.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgDepositProtoMsg): MsgDeposit {
+    return MsgDeposit.decode(message.value);
+  },
+
+  toProto(message: MsgDeposit): Uint8Array {
+    return MsgDeposit.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgDeposit): MsgDepositProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1.MsgDeposit",
+      value: MsgDeposit.encode(message).finish()
+    };
   }
 
 };
@@ -1216,6 +1477,9 @@ function createBaseMsgDepositResponse(): MsgDepositResponse {
 }
 
 export const MsgDepositResponse = {
+  typeUrl: "/cosmos.gov.v1.MsgDepositResponse",
+  aminoType: "cosmos-sdk/v1/MsgDepositResponse",
+
   encode(_: MsgDepositResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -1268,6 +1532,32 @@ export const MsgDepositResponse = {
   toAmino(_: MsgDepositResponse): MsgDepositResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgDepositResponseAminoMsg): MsgDepositResponse {
+    return MsgDepositResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgDepositResponse): MsgDepositResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/v1/MsgDepositResponse",
+      value: MsgDepositResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgDepositResponseProtoMsg): MsgDepositResponse {
+    return MsgDepositResponse.decode(message.value);
+  },
+
+  toProto(message: MsgDepositResponse): Uint8Array {
+    return MsgDepositResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgDepositResponse): MsgDepositResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1.MsgDepositResponse",
+      value: MsgDepositResponse.encode(message).finish()
+    };
   }
 
 };
diff --git a/__fixtures__/outputv2/cosmos/gov/v1beta1/genesis.ts b/__fixtures__/outputv2/cosmos/gov/v1beta1/genesis.ts
index a7df92308..54c241bac 100644
--- a/__fixtures__/outputv2/cosmos/gov/v1beta1/genesis.ts
+++ b/__fixtures__/outputv2/cosmos/gov/v1beta1/genesis.ts
@@ -26,7 +26,7 @@ export interface GenesisState {
   /** params defines all the paramaters of related to tally. */
   tallyParams?: TallyParams;
 }
-export interface GenesisStateProtoType {
+export interface GenesisStateProtoMsg {
   typeUrl: "/cosmos.gov.v1beta1.GenesisState";
   value: Uint8Array;
 }
@@ -54,7 +54,7 @@ export interface GenesisStateAmino {
   /** params defines all the paramaters of related to tally. */
   tally_params?: TallyParamsAmino;
 }
-export interface GenesisStateAminoType {
+export interface GenesisStateAminoMsg {
   type: "cosmos-sdk/GenesisState";
   value: GenesisStateAmino;
 }
@@ -83,6 +83,9 @@ function createBaseGenesisState(): GenesisState {
 }
 
 export const GenesisState = {
+  typeUrl: "/cosmos.gov.v1beta1.GenesisState",
+  aminoType: "cosmos-sdk/GenesisState",
+
   encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.startingProposalId.isZero()) {
       writer.uint32(8).uint64(message.startingProposalId);
@@ -291,6 +294,32 @@ export const GenesisState = {
     obj.voting_params = message.votingParams ? VotingParams.toAmino(message.votingParams) : undefined;
     obj.tally_params = message.tallyParams ? TallyParams.toAmino(message.tallyParams) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisStateAminoMsg): GenesisState {
+    return GenesisState.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GenesisState): GenesisStateAminoMsg {
+    return {
+      type: "cosmos-sdk/GenesisState",
+      value: GenesisState.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GenesisStateProtoMsg): GenesisState {
+    return GenesisState.decode(message.value);
+  },
+
+  toProto(message: GenesisState): Uint8Array {
+    return GenesisState.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisState): GenesisStateProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1beta1.GenesisState",
+      value: GenesisState.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/gov/v1beta1/gov.ts b/__fixtures__/outputv2/cosmos/gov/v1beta1/gov.ts
index f99cf4ab1..9fae9a153 100644
--- a/__fixtures__/outputv2/cosmos/gov/v1beta1/gov.ts
+++ b/__fixtures__/outputv2/cosmos/gov/v1beta1/gov.ts
@@ -187,7 +187,7 @@ export interface WeightedVoteOption {
   option: VoteOption;
   weight: string;
 }
-export interface WeightedVoteOptionProtoType {
+export interface WeightedVoteOptionProtoMsg {
   typeUrl: "/cosmos.gov.v1beta1.WeightedVoteOption";
   value: Uint8Array;
 }
@@ -201,7 +201,7 @@ export interface WeightedVoteOptionAmino {
   option: VoteOption;
   weight: string;
 }
-export interface WeightedVoteOptionAminoType {
+export interface WeightedVoteOptionAminoMsg {
   type: "cosmos-sdk/WeightedVoteOption";
   value: WeightedVoteOptionAmino;
 }
@@ -224,7 +224,7 @@ export interface TextProposal {
   title: string;
   description: string;
 }
-export interface TextProposalProtoType {
+export interface TextProposalProtoMsg {
   typeUrl: "/cosmos.gov.v1beta1.TextProposal";
   value: Uint8Array;
 }
@@ -237,7 +237,7 @@ export interface TextProposalAmino {
   title: string;
   description: string;
 }
-export interface TextProposalAminoType {
+export interface TextProposalAminoMsg {
   type: "cosmos-sdk/TextProposal";
   value: TextProposalAmino;
 }
@@ -260,7 +260,7 @@ export interface Deposit {
   depositor: string;
   amount: Coin[];
 }
-export interface DepositProtoType {
+export interface DepositProtoMsg {
   typeUrl: "/cosmos.gov.v1beta1.Deposit";
   value: Uint8Array;
 }
@@ -274,7 +274,7 @@ export interface DepositAmino {
   depositor: string;
   amount: CoinAmino[];
 }
-export interface DepositAminoType {
+export interface DepositAminoMsg {
   type: "cosmos-sdk/Deposit";
   value: DepositAmino;
 }
@@ -307,7 +307,7 @@ export interface Proposal {
   votingStartTime?: Date;
   votingEndTime?: Date;
 }
-export interface ProposalProtoType {
+export interface ProposalProtoMsg {
   typeUrl: "/cosmos.gov.v1beta1.Proposal";
   value: Uint8Array;
 }
@@ -330,7 +330,7 @@ export interface ProposalAmino {
   voting_start_time?: Date;
   voting_end_time?: Date;
 }
-export interface ProposalAminoType {
+export interface ProposalAminoMsg {
   type: "cosmos-sdk/Proposal";
   value: ProposalAmino;
 }
@@ -355,7 +355,7 @@ export interface TallyResult {
   no: string;
   noWithVeto: string;
 }
-export interface TallyResultProtoType {
+export interface TallyResultProtoMsg {
   typeUrl: "/cosmos.gov.v1beta1.TallyResult";
   value: Uint8Array;
 }
@@ -367,7 +367,7 @@ export interface TallyResultAmino {
   no: string;
   no_with_veto: string;
 }
-export interface TallyResultAminoType {
+export interface TallyResultAminoMsg {
   type: "cosmos-sdk/TallyResult";
   value: TallyResultAmino;
 }
@@ -400,7 +400,7 @@ export interface Vote {
   /** Since: cosmos-sdk 0.43 */
   options: WeightedVoteOption[];
 }
-export interface VoteProtoType {
+export interface VoteProtoMsg {
   typeUrl: "/cosmos.gov.v1beta1.Vote";
   value: Uint8Array;
 }
@@ -425,7 +425,7 @@ export interface VoteAmino {
   /** Since: cosmos-sdk 0.43 */
   options: WeightedVoteOptionAmino[];
 }
-export interface VoteAminoType {
+export interface VoteAminoMsg {
   type: "cosmos-sdk/Vote";
   value: VoteAmino;
 }
@@ -454,7 +454,7 @@ export interface DepositParams {
    */
   maxDepositPeriod?: Duration;
 }
-export interface DepositParamsProtoType {
+export interface DepositParamsProtoMsg {
   typeUrl: "/cosmos.gov.v1beta1.DepositParams";
   value: Uint8Array;
 }
@@ -470,7 +470,7 @@ export interface DepositParamsAmino {
    */
   max_deposit_period?: DurationAmino;
 }
-export interface DepositParamsAminoType {
+export interface DepositParamsAminoMsg {
   type: "cosmos-sdk/DepositParams";
   value: DepositParamsAmino;
 }
@@ -486,7 +486,7 @@ export interface VotingParams {
   /** Length of the voting period. */
   votingPeriod?: Duration;
 }
-export interface VotingParamsProtoType {
+export interface VotingParamsProtoMsg {
   typeUrl: "/cosmos.gov.v1beta1.VotingParams";
   value: Uint8Array;
 }
@@ -496,7 +496,7 @@ export interface VotingParamsAmino {
   /** Length of the voting period. */
   voting_period?: DurationAmino;
 }
-export interface VotingParamsAminoType {
+export interface VotingParamsAminoMsg {
   type: "cosmos-sdk/VotingParams";
   value: VotingParamsAmino;
 }
@@ -523,7 +523,7 @@ export interface TallyParams {
    */
   vetoThreshold: Uint8Array;
 }
-export interface TallyParamsProtoType {
+export interface TallyParamsProtoMsg {
   typeUrl: "/cosmos.gov.v1beta1.TallyParams";
   value: Uint8Array;
 }
@@ -545,7 +545,7 @@ export interface TallyParamsAmino {
    */
   veto_threshold: Uint8Array;
 }
-export interface TallyParamsAminoType {
+export interface TallyParamsAminoMsg {
   type: "cosmos-sdk/TallyParams";
   value: TallyParamsAmino;
 }
@@ -565,6 +565,9 @@ function createBaseWeightedVoteOption(): WeightedVoteOption {
 }
 
 export const WeightedVoteOption = {
+  typeUrl: "/cosmos.gov.v1beta1.WeightedVoteOption",
+  aminoType: "cosmos-sdk/WeightedVoteOption",
+
   encode(message: WeightedVoteOption, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.option !== 0) {
       writer.uint32(8).int32(message.option);
@@ -650,6 +653,32 @@ export const WeightedVoteOption = {
     obj.option = message.option;
     obj.weight = message.weight;
     return obj;
+  },
+
+  fromAminoMsg(object: WeightedVoteOptionAminoMsg): WeightedVoteOption {
+    return WeightedVoteOption.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: WeightedVoteOption): WeightedVoteOptionAminoMsg {
+    return {
+      type: "cosmos-sdk/WeightedVoteOption",
+      value: WeightedVoteOption.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: WeightedVoteOptionProtoMsg): WeightedVoteOption {
+    return WeightedVoteOption.decode(message.value);
+  },
+
+  toProto(message: WeightedVoteOption): Uint8Array {
+    return WeightedVoteOption.encode(message).finish();
+  },
+
+  toProtoMsg(message: WeightedVoteOption): WeightedVoteOptionProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1beta1.WeightedVoteOption",
+      value: WeightedVoteOption.encode(message).finish()
+    };
   }
 
 };
@@ -662,6 +691,9 @@ function createBaseTextProposal(): TextProposal {
 }
 
 export const TextProposal = {
+  typeUrl: "/cosmos.gov.v1beta1.TextProposal",
+  aminoType: "cosmos-sdk/TextProposal",
+
   encode(message: TextProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.title !== "") {
       writer.uint32(10).string(message.title);
@@ -747,6 +779,32 @@ export const TextProposal = {
     obj.title = message.title;
     obj.description = message.description;
     return obj;
+  },
+
+  fromAminoMsg(object: TextProposalAminoMsg): TextProposal {
+    return TextProposal.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: TextProposal): TextProposalAminoMsg {
+    return {
+      type: "cosmos-sdk/TextProposal",
+      value: TextProposal.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: TextProposalProtoMsg): TextProposal {
+    return TextProposal.decode(message.value);
+  },
+
+  toProto(message: TextProposal): Uint8Array {
+    return TextProposal.encode(message).finish();
+  },
+
+  toProtoMsg(message: TextProposal): TextProposalProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1beta1.TextProposal",
+      value: TextProposal.encode(message).finish()
+    };
   }
 
 };
@@ -760,6 +818,9 @@ function createBaseDeposit(): Deposit {
 }
 
 export const Deposit = {
+  typeUrl: "/cosmos.gov.v1beta1.Deposit",
+  aminoType: "cosmos-sdk/Deposit",
+
   encode(message: Deposit, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.proposalId.isZero()) {
       writer.uint32(8).uint64(message.proposalId);
@@ -878,6 +939,32 @@ export const Deposit = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: DepositAminoMsg): Deposit {
+    return Deposit.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Deposit): DepositAminoMsg {
+    return {
+      type: "cosmos-sdk/Deposit",
+      value: Deposit.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: DepositProtoMsg): Deposit {
+    return Deposit.decode(message.value);
+  },
+
+  toProto(message: Deposit): Uint8Array {
+    return Deposit.encode(message).finish();
+  },
+
+  toProtoMsg(message: Deposit): DepositProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1beta1.Deposit",
+      value: Deposit.encode(message).finish()
+    };
   }
 
 };
@@ -897,6 +984,9 @@ function createBaseProposal(): Proposal {
 }
 
 export const Proposal = {
+  typeUrl: "/cosmos.gov.v1beta1.Proposal",
+  aminoType: "cosmos-sdk/Proposal",
+
   encode(message: Proposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.proposalId.isZero()) {
       writer.uint32(8).uint64(message.proposalId);
@@ -1105,6 +1195,32 @@ export const Proposal = {
     obj.voting_start_time = message.votingStartTime ? Timestamp.toAmino(message.votingStartTime) : undefined;
     obj.voting_end_time = message.votingEndTime ? Timestamp.toAmino(message.votingEndTime) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ProposalAminoMsg): Proposal {
+    return Proposal.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Proposal): ProposalAminoMsg {
+    return {
+      type: "cosmos-sdk/Proposal",
+      value: Proposal.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ProposalProtoMsg): Proposal {
+    return Proposal.decode(message.value);
+  },
+
+  toProto(message: Proposal): Uint8Array {
+    return Proposal.encode(message).finish();
+  },
+
+  toProtoMsg(message: Proposal): ProposalProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1beta1.Proposal",
+      value: Proposal.encode(message).finish()
+    };
   }
 
 };
@@ -1119,6 +1235,9 @@ function createBaseTallyResult(): TallyResult {
 }
 
 export const TallyResult = {
+  typeUrl: "/cosmos.gov.v1beta1.TallyResult",
+  aminoType: "cosmos-sdk/TallyResult",
+
   encode(message: TallyResult, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.yes !== "") {
       writer.uint32(10).string(message.yes);
@@ -1234,6 +1353,32 @@ export const TallyResult = {
     obj.no = message.no;
     obj.no_with_veto = message.noWithVeto;
     return obj;
+  },
+
+  fromAminoMsg(object: TallyResultAminoMsg): TallyResult {
+    return TallyResult.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: TallyResult): TallyResultAminoMsg {
+    return {
+      type: "cosmos-sdk/TallyResult",
+      value: TallyResult.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: TallyResultProtoMsg): TallyResult {
+    return TallyResult.decode(message.value);
+  },
+
+  toProto(message: TallyResult): Uint8Array {
+    return TallyResult.encode(message).finish();
+  },
+
+  toProtoMsg(message: TallyResult): TallyResultProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1beta1.TallyResult",
+      value: TallyResult.encode(message).finish()
+    };
   }
 
 };
@@ -1248,6 +1393,9 @@ function createBaseVote(): Vote {
 }
 
 export const Vote = {
+  typeUrl: "/cosmos.gov.v1beta1.Vote",
+  aminoType: "cosmos-sdk/Vote",
+
   encode(message: Vote, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.proposalId.isZero()) {
       writer.uint32(8).uint64(message.proposalId);
@@ -1381,6 +1529,32 @@ export const Vote = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: VoteAminoMsg): Vote {
+    return Vote.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Vote): VoteAminoMsg {
+    return {
+      type: "cosmos-sdk/Vote",
+      value: Vote.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: VoteProtoMsg): Vote {
+    return Vote.decode(message.value);
+  },
+
+  toProto(message: Vote): Uint8Array {
+    return Vote.encode(message).finish();
+  },
+
+  toProtoMsg(message: Vote): VoteProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1beta1.Vote",
+      value: Vote.encode(message).finish()
+    };
   }
 
 };
@@ -1393,6 +1567,9 @@ function createBaseDepositParams(): DepositParams {
 }
 
 export const DepositParams = {
+  typeUrl: "/cosmos.gov.v1beta1.DepositParams",
+  aminoType: "cosmos-sdk/DepositParams",
+
   encode(message: DepositParams, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.minDeposit) {
       Coin.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1496,6 +1673,32 @@ export const DepositParams = {
 
     obj.max_deposit_period = message.maxDepositPeriod ? Duration.toAmino(message.maxDepositPeriod) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: DepositParamsAminoMsg): DepositParams {
+    return DepositParams.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: DepositParams): DepositParamsAminoMsg {
+    return {
+      type: "cosmos-sdk/DepositParams",
+      value: DepositParams.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: DepositParamsProtoMsg): DepositParams {
+    return DepositParams.decode(message.value);
+  },
+
+  toProto(message: DepositParams): Uint8Array {
+    return DepositParams.encode(message).finish();
+  },
+
+  toProtoMsg(message: DepositParams): DepositParamsProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1beta1.DepositParams",
+      value: DepositParams.encode(message).finish()
+    };
   }
 
 };
@@ -1507,6 +1710,9 @@ function createBaseVotingParams(): VotingParams {
 }
 
 export const VotingParams = {
+  typeUrl: "/cosmos.gov.v1beta1.VotingParams",
+  aminoType: "cosmos-sdk/VotingParams",
+
   encode(message: VotingParams, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.votingPeriod !== undefined) {
       Duration.encode(message.votingPeriod, writer.uint32(10).fork()).ldelim();
@@ -1577,6 +1783,32 @@ export const VotingParams = {
     const obj: any = {};
     obj.voting_period = message.votingPeriod ? Duration.toAmino(message.votingPeriod) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: VotingParamsAminoMsg): VotingParams {
+    return VotingParams.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: VotingParams): VotingParamsAminoMsg {
+    return {
+      type: "cosmos-sdk/VotingParams",
+      value: VotingParams.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: VotingParamsProtoMsg): VotingParams {
+    return VotingParams.decode(message.value);
+  },
+
+  toProto(message: VotingParams): Uint8Array {
+    return VotingParams.encode(message).finish();
+  },
+
+  toProtoMsg(message: VotingParams): VotingParamsProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1beta1.VotingParams",
+      value: VotingParams.encode(message).finish()
+    };
   }
 
 };
@@ -1590,6 +1822,9 @@ function createBaseTallyParams(): TallyParams {
 }
 
 export const TallyParams = {
+  typeUrl: "/cosmos.gov.v1beta1.TallyParams",
+  aminoType: "cosmos-sdk/TallyParams",
+
   encode(message: TallyParams, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.quorum.length !== 0) {
       writer.uint32(10).bytes(message.quorum);
@@ -1690,6 +1925,32 @@ export const TallyParams = {
     obj.threshold = message.threshold;
     obj.veto_threshold = message.vetoThreshold;
     return obj;
+  },
+
+  fromAminoMsg(object: TallyParamsAminoMsg): TallyParams {
+    return TallyParams.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: TallyParams): TallyParamsAminoMsg {
+    return {
+      type: "cosmos-sdk/TallyParams",
+      value: TallyParams.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: TallyParamsProtoMsg): TallyParams {
+    return TallyParams.decode(message.value);
+  },
+
+  toProto(message: TallyParams): Uint8Array {
+    return TallyParams.encode(message).finish();
+  },
+
+  toProtoMsg(message: TallyParams): TallyParamsProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1beta1.TallyParams",
+      value: TallyParams.encode(message).finish()
+    };
   }
 
 };
diff --git a/__fixtures__/outputv2/cosmos/gov/v1beta1/query.ts b/__fixtures__/outputv2/cosmos/gov/v1beta1/query.ts
index 86f5b6f40..b85bef9ac 100644
--- a/__fixtures__/outputv2/cosmos/gov/v1beta1/query.ts
+++ b/__fixtures__/outputv2/cosmos/gov/v1beta1/query.ts
@@ -9,7 +9,7 @@ export interface QueryProposalRequest {
   /** proposal_id defines the unique id of the proposal. */
   proposalId: Long;
 }
-export interface QueryProposalRequestProtoType {
+export interface QueryProposalRequestProtoMsg {
   typeUrl: "/cosmos.gov.v1beta1.QueryProposalRequest";
   value: Uint8Array;
 }
@@ -19,7 +19,7 @@ export interface QueryProposalRequestAmino {
   /** proposal_id defines the unique id of the proposal. */
   proposal_id: string;
 }
-export interface QueryProposalRequestAminoType {
+export interface QueryProposalRequestAminoMsg {
   type: "cosmos-sdk/QueryProposalRequest";
   value: QueryProposalRequestAmino;
 }
@@ -33,7 +33,7 @@ export interface QueryProposalRequestSDKType {
 export interface QueryProposalResponse {
   proposal?: Proposal;
 }
-export interface QueryProposalResponseProtoType {
+export interface QueryProposalResponseProtoMsg {
   typeUrl: "/cosmos.gov.v1beta1.QueryProposalResponse";
   value: Uint8Array;
 }
@@ -42,7 +42,7 @@ export interface QueryProposalResponseProtoType {
 export interface QueryProposalResponseAmino {
   proposal?: ProposalAmino;
 }
-export interface QueryProposalResponseAminoType {
+export interface QueryProposalResponseAminoMsg {
   type: "cosmos-sdk/QueryProposalResponse";
   value: QueryProposalResponseAmino;
 }
@@ -66,7 +66,7 @@ export interface QueryProposalsRequest {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequest;
 }
-export interface QueryProposalsRequestProtoType {
+export interface QueryProposalsRequestProtoMsg {
   typeUrl: "/cosmos.gov.v1beta1.QueryProposalsRequest";
   value: Uint8Array;
 }
@@ -85,7 +85,7 @@ export interface QueryProposalsRequestAmino {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequestAmino;
 }
-export interface QueryProposalsRequestAminoType {
+export interface QueryProposalsRequestAminoMsg {
   type: "cosmos-sdk/QueryProposalsRequest";
   value: QueryProposalsRequestAmino;
 }
@@ -108,7 +108,7 @@ export interface QueryProposalsResponse {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponse;
 }
-export interface QueryProposalsResponseProtoType {
+export interface QueryProposalsResponseProtoMsg {
   typeUrl: "/cosmos.gov.v1beta1.QueryProposalsResponse";
   value: Uint8Array;
 }
@@ -123,7 +123,7 @@ export interface QueryProposalsResponseAmino {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponseAmino;
 }
-export interface QueryProposalsResponseAminoType {
+export interface QueryProposalsResponseAminoMsg {
   type: "cosmos-sdk/QueryProposalsResponse";
   value: QueryProposalsResponseAmino;
 }
@@ -145,7 +145,7 @@ export interface QueryVoteRequest {
   /** voter defines the oter address for the proposals. */
   voter: string;
 }
-export interface QueryVoteRequestProtoType {
+export interface QueryVoteRequestProtoMsg {
   typeUrl: "/cosmos.gov.v1beta1.QueryVoteRequest";
   value: Uint8Array;
 }
@@ -158,7 +158,7 @@ export interface QueryVoteRequestAmino {
   /** voter defines the oter address for the proposals. */
   voter: string;
 }
-export interface QueryVoteRequestAminoType {
+export interface QueryVoteRequestAminoMsg {
   type: "cosmos-sdk/QueryVoteRequest";
   value: QueryVoteRequestAmino;
 }
@@ -174,7 +174,7 @@ export interface QueryVoteResponse {
   /** vote defined the queried vote. */
   vote?: Vote;
 }
-export interface QueryVoteResponseProtoType {
+export interface QueryVoteResponseProtoMsg {
   typeUrl: "/cosmos.gov.v1beta1.QueryVoteResponse";
   value: Uint8Array;
 }
@@ -184,7 +184,7 @@ export interface QueryVoteResponseAmino {
   /** vote defined the queried vote. */
   vote?: VoteAmino;
 }
-export interface QueryVoteResponseAminoType {
+export interface QueryVoteResponseAminoMsg {
   type: "cosmos-sdk/QueryVoteResponse";
   value: QueryVoteResponseAmino;
 }
@@ -202,7 +202,7 @@ export interface QueryVotesRequest {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequest;
 }
-export interface QueryVotesRequestProtoType {
+export interface QueryVotesRequestProtoMsg {
   typeUrl: "/cosmos.gov.v1beta1.QueryVotesRequest";
   value: Uint8Array;
 }
@@ -215,7 +215,7 @@ export interface QueryVotesRequestAmino {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequestAmino;
 }
-export interface QueryVotesRequestAminoType {
+export interface QueryVotesRequestAminoMsg {
   type: "cosmos-sdk/QueryVotesRequest";
   value: QueryVotesRequestAmino;
 }
@@ -234,7 +234,7 @@ export interface QueryVotesResponse {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponse;
 }
-export interface QueryVotesResponseProtoType {
+export interface QueryVotesResponseProtoMsg {
   typeUrl: "/cosmos.gov.v1beta1.QueryVotesResponse";
   value: Uint8Array;
 }
@@ -247,7 +247,7 @@ export interface QueryVotesResponseAmino {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponseAmino;
 }
-export interface QueryVotesResponseAminoType {
+export interface QueryVotesResponseAminoMsg {
   type: "cosmos-sdk/QueryVotesResponse";
   value: QueryVotesResponseAmino;
 }
@@ -266,7 +266,7 @@ export interface QueryParamsRequest {
    */
   paramsType: string;
 }
-export interface QueryParamsRequestProtoType {
+export interface QueryParamsRequestProtoMsg {
   typeUrl: "/cosmos.gov.v1beta1.QueryParamsRequest";
   value: Uint8Array;
 }
@@ -279,7 +279,7 @@ export interface QueryParamsRequestAmino {
    */
   params_type: string;
 }
-export interface QueryParamsRequestAminoType {
+export interface QueryParamsRequestAminoMsg {
   type: "cosmos-sdk/QueryParamsRequest";
   value: QueryParamsRequestAmino;
 }
@@ -300,7 +300,7 @@ export interface QueryParamsResponse {
   /** tally_params defines the parameters related to tally. */
   tallyParams?: TallyParams;
 }
-export interface QueryParamsResponseProtoType {
+export interface QueryParamsResponseProtoMsg {
   typeUrl: "/cosmos.gov.v1beta1.QueryParamsResponse";
   value: Uint8Array;
 }
@@ -316,7 +316,7 @@ export interface QueryParamsResponseAmino {
   /** tally_params defines the parameters related to tally. */
   tally_params?: TallyParamsAmino;
 }
-export interface QueryParamsResponseAminoType {
+export interface QueryParamsResponseAminoMsg {
   type: "cosmos-sdk/QueryParamsResponse";
   value: QueryParamsResponseAmino;
 }
@@ -336,7 +336,7 @@ export interface QueryDepositRequest {
   /** depositor defines the deposit addresses from the proposals. */
   depositor: string;
 }
-export interface QueryDepositRequestProtoType {
+export interface QueryDepositRequestProtoMsg {
   typeUrl: "/cosmos.gov.v1beta1.QueryDepositRequest";
   value: Uint8Array;
 }
@@ -349,7 +349,7 @@ export interface QueryDepositRequestAmino {
   /** depositor defines the deposit addresses from the proposals. */
   depositor: string;
 }
-export interface QueryDepositRequestAminoType {
+export interface QueryDepositRequestAminoMsg {
   type: "cosmos-sdk/QueryDepositRequest";
   value: QueryDepositRequestAmino;
 }
@@ -365,7 +365,7 @@ export interface QueryDepositResponse {
   /** deposit defines the requested deposit. */
   deposit?: Deposit;
 }
-export interface QueryDepositResponseProtoType {
+export interface QueryDepositResponseProtoMsg {
   typeUrl: "/cosmos.gov.v1beta1.QueryDepositResponse";
   value: Uint8Array;
 }
@@ -375,7 +375,7 @@ export interface QueryDepositResponseAmino {
   /** deposit defines the requested deposit. */
   deposit?: DepositAmino;
 }
-export interface QueryDepositResponseAminoType {
+export interface QueryDepositResponseAminoMsg {
   type: "cosmos-sdk/QueryDepositResponse";
   value: QueryDepositResponseAmino;
 }
@@ -393,7 +393,7 @@ export interface QueryDepositsRequest {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequest;
 }
-export interface QueryDepositsRequestProtoType {
+export interface QueryDepositsRequestProtoMsg {
   typeUrl: "/cosmos.gov.v1beta1.QueryDepositsRequest";
   value: Uint8Array;
 }
@@ -406,7 +406,7 @@ export interface QueryDepositsRequestAmino {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequestAmino;
 }
-export interface QueryDepositsRequestAminoType {
+export interface QueryDepositsRequestAminoMsg {
   type: "cosmos-sdk/QueryDepositsRequest";
   value: QueryDepositsRequestAmino;
 }
@@ -424,7 +424,7 @@ export interface QueryDepositsResponse {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponse;
 }
-export interface QueryDepositsResponseProtoType {
+export interface QueryDepositsResponseProtoMsg {
   typeUrl: "/cosmos.gov.v1beta1.QueryDepositsResponse";
   value: Uint8Array;
 }
@@ -436,7 +436,7 @@ export interface QueryDepositsResponseAmino {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponseAmino;
 }
-export interface QueryDepositsResponseAminoType {
+export interface QueryDepositsResponseAminoMsg {
   type: "cosmos-sdk/QueryDepositsResponse";
   value: QueryDepositsResponseAmino;
 }
@@ -452,7 +452,7 @@ export interface QueryTallyResultRequest {
   /** proposal_id defines the unique id of the proposal. */
   proposalId: Long;
 }
-export interface QueryTallyResultRequestProtoType {
+export interface QueryTallyResultRequestProtoMsg {
   typeUrl: "/cosmos.gov.v1beta1.QueryTallyResultRequest";
   value: Uint8Array;
 }
@@ -462,7 +462,7 @@ export interface QueryTallyResultRequestAmino {
   /** proposal_id defines the unique id of the proposal. */
   proposal_id: string;
 }
-export interface QueryTallyResultRequestAminoType {
+export interface QueryTallyResultRequestAminoMsg {
   type: "cosmos-sdk/QueryTallyResultRequest";
   value: QueryTallyResultRequestAmino;
 }
@@ -477,7 +477,7 @@ export interface QueryTallyResultResponse {
   /** tally defines the requested tally. */
   tally?: TallyResult;
 }
-export interface QueryTallyResultResponseProtoType {
+export interface QueryTallyResultResponseProtoMsg {
   typeUrl: "/cosmos.gov.v1beta1.QueryTallyResultResponse";
   value: Uint8Array;
 }
@@ -487,7 +487,7 @@ export interface QueryTallyResultResponseAmino {
   /** tally defines the requested tally. */
   tally?: TallyResultAmino;
 }
-export interface QueryTallyResultResponseAminoType {
+export interface QueryTallyResultResponseAminoMsg {
   type: "cosmos-sdk/QueryTallyResultResponse";
   value: QueryTallyResultResponseAmino;
 }
@@ -504,6 +504,9 @@ function createBaseQueryProposalRequest(): QueryProposalRequest {
 }
 
 export const QueryProposalRequest = {
+  typeUrl: "/cosmos.gov.v1beta1.QueryProposalRequest",
+  aminoType: "cosmos-sdk/QueryProposalRequest",
+
   encode(message: QueryProposalRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.proposalId.isZero()) {
       writer.uint32(8).uint64(message.proposalId);
@@ -574,6 +577,32 @@ export const QueryProposalRequest = {
     const obj: any = {};
     obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryProposalRequestAminoMsg): QueryProposalRequest {
+    return QueryProposalRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryProposalRequest): QueryProposalRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryProposalRequest",
+      value: QueryProposalRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryProposalRequestProtoMsg): QueryProposalRequest {
+    return QueryProposalRequest.decode(message.value);
+  },
+
+  toProto(message: QueryProposalRequest): Uint8Array {
+    return QueryProposalRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryProposalRequest): QueryProposalRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1beta1.QueryProposalRequest",
+      value: QueryProposalRequest.encode(message).finish()
+    };
   }
 
 };
@@ -585,6 +614,9 @@ function createBaseQueryProposalResponse(): QueryProposalResponse {
 }
 
 export const QueryProposalResponse = {
+  typeUrl: "/cosmos.gov.v1beta1.QueryProposalResponse",
+  aminoType: "cosmos-sdk/QueryProposalResponse",
+
   encode(message: QueryProposalResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.proposal !== undefined) {
       Proposal.encode(message.proposal, writer.uint32(10).fork()).ldelim();
@@ -655,6 +687,32 @@ export const QueryProposalResponse = {
     const obj: any = {};
     obj.proposal = message.proposal ? Proposal.toAmino(message.proposal) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryProposalResponseAminoMsg): QueryProposalResponse {
+    return QueryProposalResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryProposalResponse): QueryProposalResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryProposalResponse",
+      value: QueryProposalResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryProposalResponseProtoMsg): QueryProposalResponse {
+    return QueryProposalResponse.decode(message.value);
+  },
+
+  toProto(message: QueryProposalResponse): Uint8Array {
+    return QueryProposalResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryProposalResponse): QueryProposalResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1beta1.QueryProposalResponse",
+      value: QueryProposalResponse.encode(message).finish()
+    };
   }
 
 };
@@ -669,6 +727,9 @@ function createBaseQueryProposalsRequest(): QueryProposalsRequest {
 }
 
 export const QueryProposalsRequest = {
+  typeUrl: "/cosmos.gov.v1beta1.QueryProposalsRequest",
+  aminoType: "cosmos-sdk/QueryProposalsRequest",
+
   encode(message: QueryProposalsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.proposalStatus !== 0) {
       writer.uint32(8).int32(message.proposalStatus);
@@ -784,6 +845,32 @@ export const QueryProposalsRequest = {
     obj.depositor = message.depositor;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryProposalsRequestAminoMsg): QueryProposalsRequest {
+    return QueryProposalsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryProposalsRequest): QueryProposalsRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryProposalsRequest",
+      value: QueryProposalsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryProposalsRequestProtoMsg): QueryProposalsRequest {
+    return QueryProposalsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryProposalsRequest): Uint8Array {
+    return QueryProposalsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryProposalsRequest): QueryProposalsRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1beta1.QueryProposalsRequest",
+      value: QueryProposalsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -796,6 +883,9 @@ function createBaseQueryProposalsResponse(): QueryProposalsResponse {
 }
 
 export const QueryProposalsResponse = {
+  typeUrl: "/cosmos.gov.v1beta1.QueryProposalsResponse",
+  aminoType: "cosmos-sdk/QueryProposalsResponse",
+
   encode(message: QueryProposalsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.proposals) {
       Proposal.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -899,6 +989,32 @@ export const QueryProposalsResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryProposalsResponseAminoMsg): QueryProposalsResponse {
+    return QueryProposalsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryProposalsResponse): QueryProposalsResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryProposalsResponse",
+      value: QueryProposalsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryProposalsResponseProtoMsg): QueryProposalsResponse {
+    return QueryProposalsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryProposalsResponse): Uint8Array {
+    return QueryProposalsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryProposalsResponse): QueryProposalsResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1beta1.QueryProposalsResponse",
+      value: QueryProposalsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -911,6 +1027,9 @@ function createBaseQueryVoteRequest(): QueryVoteRequest {
 }
 
 export const QueryVoteRequest = {
+  typeUrl: "/cosmos.gov.v1beta1.QueryVoteRequest",
+  aminoType: "cosmos-sdk/QueryVoteRequest",
+
   encode(message: QueryVoteRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.proposalId.isZero()) {
       writer.uint32(8).uint64(message.proposalId);
@@ -996,6 +1115,32 @@ export const QueryVoteRequest = {
     obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined;
     obj.voter = message.voter;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryVoteRequestAminoMsg): QueryVoteRequest {
+    return QueryVoteRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryVoteRequest): QueryVoteRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryVoteRequest",
+      value: QueryVoteRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryVoteRequestProtoMsg): QueryVoteRequest {
+    return QueryVoteRequest.decode(message.value);
+  },
+
+  toProto(message: QueryVoteRequest): Uint8Array {
+    return QueryVoteRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryVoteRequest): QueryVoteRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1beta1.QueryVoteRequest",
+      value: QueryVoteRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1007,6 +1152,9 @@ function createBaseQueryVoteResponse(): QueryVoteResponse {
 }
 
 export const QueryVoteResponse = {
+  typeUrl: "/cosmos.gov.v1beta1.QueryVoteResponse",
+  aminoType: "cosmos-sdk/QueryVoteResponse",
+
   encode(message: QueryVoteResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.vote !== undefined) {
       Vote.encode(message.vote, writer.uint32(10).fork()).ldelim();
@@ -1077,6 +1225,32 @@ export const QueryVoteResponse = {
     const obj: any = {};
     obj.vote = message.vote ? Vote.toAmino(message.vote) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryVoteResponseAminoMsg): QueryVoteResponse {
+    return QueryVoteResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryVoteResponse): QueryVoteResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryVoteResponse",
+      value: QueryVoteResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryVoteResponseProtoMsg): QueryVoteResponse {
+    return QueryVoteResponse.decode(message.value);
+  },
+
+  toProto(message: QueryVoteResponse): Uint8Array {
+    return QueryVoteResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryVoteResponse): QueryVoteResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1beta1.QueryVoteResponse",
+      value: QueryVoteResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1089,6 +1263,9 @@ function createBaseQueryVotesRequest(): QueryVotesRequest {
 }
 
 export const QueryVotesRequest = {
+  typeUrl: "/cosmos.gov.v1beta1.QueryVotesRequest",
+  aminoType: "cosmos-sdk/QueryVotesRequest",
+
   encode(message: QueryVotesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.proposalId.isZero()) {
       writer.uint32(8).uint64(message.proposalId);
@@ -1174,6 +1351,32 @@ export const QueryVotesRequest = {
     obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryVotesRequestAminoMsg): QueryVotesRequest {
+    return QueryVotesRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryVotesRequest): QueryVotesRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryVotesRequest",
+      value: QueryVotesRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryVotesRequestProtoMsg): QueryVotesRequest {
+    return QueryVotesRequest.decode(message.value);
+  },
+
+  toProto(message: QueryVotesRequest): Uint8Array {
+    return QueryVotesRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryVotesRequest): QueryVotesRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1beta1.QueryVotesRequest",
+      value: QueryVotesRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1186,6 +1389,9 @@ function createBaseQueryVotesResponse(): QueryVotesResponse {
 }
 
 export const QueryVotesResponse = {
+  typeUrl: "/cosmos.gov.v1beta1.QueryVotesResponse",
+  aminoType: "cosmos-sdk/QueryVotesResponse",
+
   encode(message: QueryVotesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.votes) {
       Vote.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1289,6 +1495,32 @@ export const QueryVotesResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryVotesResponseAminoMsg): QueryVotesResponse {
+    return QueryVotesResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryVotesResponse): QueryVotesResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryVotesResponse",
+      value: QueryVotesResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryVotesResponseProtoMsg): QueryVotesResponse {
+    return QueryVotesResponse.decode(message.value);
+  },
+
+  toProto(message: QueryVotesResponse): Uint8Array {
+    return QueryVotesResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryVotesResponse): QueryVotesResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1beta1.QueryVotesResponse",
+      value: QueryVotesResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1300,6 +1532,9 @@ function createBaseQueryParamsRequest(): QueryParamsRequest {
 }
 
 export const QueryParamsRequest = {
+  typeUrl: "/cosmos.gov.v1beta1.QueryParamsRequest",
+  aminoType: "cosmos-sdk/QueryParamsRequest",
+
   encode(message: QueryParamsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.paramsType !== "") {
       writer.uint32(10).string(message.paramsType);
@@ -1370,6 +1605,32 @@ export const QueryParamsRequest = {
     const obj: any = {};
     obj.params_type = message.paramsType;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest {
+    return QueryParamsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryParamsRequest): QueryParamsRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryParamsRequest",
+      value: QueryParamsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryParamsRequestProtoMsg): QueryParamsRequest {
+    return QueryParamsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryParamsRequest): Uint8Array {
+    return QueryParamsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryParamsRequest): QueryParamsRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1beta1.QueryParamsRequest",
+      value: QueryParamsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1383,6 +1644,9 @@ function createBaseQueryParamsResponse(): QueryParamsResponse {
 }
 
 export const QueryParamsResponse = {
+  typeUrl: "/cosmos.gov.v1beta1.QueryParamsResponse",
+  aminoType: "cosmos-sdk/QueryParamsResponse",
+
   encode(message: QueryParamsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.votingParams !== undefined) {
       VotingParams.encode(message.votingParams, writer.uint32(10).fork()).ldelim();
@@ -1483,6 +1747,32 @@ export const QueryParamsResponse = {
     obj.deposit_params = message.depositParams ? DepositParams.toAmino(message.depositParams) : undefined;
     obj.tally_params = message.tallyParams ? TallyParams.toAmino(message.tallyParams) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryParamsResponseAminoMsg): QueryParamsResponse {
+    return QueryParamsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryParamsResponse): QueryParamsResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryParamsResponse",
+      value: QueryParamsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryParamsResponseProtoMsg): QueryParamsResponse {
+    return QueryParamsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryParamsResponse): Uint8Array {
+    return QueryParamsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryParamsResponse): QueryParamsResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1beta1.QueryParamsResponse",
+      value: QueryParamsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1495,6 +1785,9 @@ function createBaseQueryDepositRequest(): QueryDepositRequest {
 }
 
 export const QueryDepositRequest = {
+  typeUrl: "/cosmos.gov.v1beta1.QueryDepositRequest",
+  aminoType: "cosmos-sdk/QueryDepositRequest",
+
   encode(message: QueryDepositRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.proposalId.isZero()) {
       writer.uint32(8).uint64(message.proposalId);
@@ -1580,6 +1873,32 @@ export const QueryDepositRequest = {
     obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined;
     obj.depositor = message.depositor;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDepositRequestAminoMsg): QueryDepositRequest {
+    return QueryDepositRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryDepositRequest): QueryDepositRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryDepositRequest",
+      value: QueryDepositRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryDepositRequestProtoMsg): QueryDepositRequest {
+    return QueryDepositRequest.decode(message.value);
+  },
+
+  toProto(message: QueryDepositRequest): Uint8Array {
+    return QueryDepositRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDepositRequest): QueryDepositRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1beta1.QueryDepositRequest",
+      value: QueryDepositRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1591,6 +1910,9 @@ function createBaseQueryDepositResponse(): QueryDepositResponse {
 }
 
 export const QueryDepositResponse = {
+  typeUrl: "/cosmos.gov.v1beta1.QueryDepositResponse",
+  aminoType: "cosmos-sdk/QueryDepositResponse",
+
   encode(message: QueryDepositResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.deposit !== undefined) {
       Deposit.encode(message.deposit, writer.uint32(10).fork()).ldelim();
@@ -1661,6 +1983,32 @@ export const QueryDepositResponse = {
     const obj: any = {};
     obj.deposit = message.deposit ? Deposit.toAmino(message.deposit) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDepositResponseAminoMsg): QueryDepositResponse {
+    return QueryDepositResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryDepositResponse): QueryDepositResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryDepositResponse",
+      value: QueryDepositResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryDepositResponseProtoMsg): QueryDepositResponse {
+    return QueryDepositResponse.decode(message.value);
+  },
+
+  toProto(message: QueryDepositResponse): Uint8Array {
+    return QueryDepositResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDepositResponse): QueryDepositResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1beta1.QueryDepositResponse",
+      value: QueryDepositResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1673,6 +2021,9 @@ function createBaseQueryDepositsRequest(): QueryDepositsRequest {
 }
 
 export const QueryDepositsRequest = {
+  typeUrl: "/cosmos.gov.v1beta1.QueryDepositsRequest",
+  aminoType: "cosmos-sdk/QueryDepositsRequest",
+
   encode(message: QueryDepositsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.proposalId.isZero()) {
       writer.uint32(8).uint64(message.proposalId);
@@ -1758,6 +2109,32 @@ export const QueryDepositsRequest = {
     obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDepositsRequestAminoMsg): QueryDepositsRequest {
+    return QueryDepositsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryDepositsRequest): QueryDepositsRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryDepositsRequest",
+      value: QueryDepositsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryDepositsRequestProtoMsg): QueryDepositsRequest {
+    return QueryDepositsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryDepositsRequest): Uint8Array {
+    return QueryDepositsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDepositsRequest): QueryDepositsRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1beta1.QueryDepositsRequest",
+      value: QueryDepositsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1770,6 +2147,9 @@ function createBaseQueryDepositsResponse(): QueryDepositsResponse {
 }
 
 export const QueryDepositsResponse = {
+  typeUrl: "/cosmos.gov.v1beta1.QueryDepositsResponse",
+  aminoType: "cosmos-sdk/QueryDepositsResponse",
+
   encode(message: QueryDepositsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.deposits) {
       Deposit.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1873,6 +2253,32 @@ export const QueryDepositsResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDepositsResponseAminoMsg): QueryDepositsResponse {
+    return QueryDepositsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryDepositsResponse): QueryDepositsResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryDepositsResponse",
+      value: QueryDepositsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryDepositsResponseProtoMsg): QueryDepositsResponse {
+    return QueryDepositsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryDepositsResponse): Uint8Array {
+    return QueryDepositsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDepositsResponse): QueryDepositsResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1beta1.QueryDepositsResponse",
+      value: QueryDepositsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1884,6 +2290,9 @@ function createBaseQueryTallyResultRequest(): QueryTallyResultRequest {
 }
 
 export const QueryTallyResultRequest = {
+  typeUrl: "/cosmos.gov.v1beta1.QueryTallyResultRequest",
+  aminoType: "cosmos-sdk/QueryTallyResultRequest",
+
   encode(message: QueryTallyResultRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.proposalId.isZero()) {
       writer.uint32(8).uint64(message.proposalId);
@@ -1954,6 +2363,32 @@ export const QueryTallyResultRequest = {
     const obj: any = {};
     obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryTallyResultRequestAminoMsg): QueryTallyResultRequest {
+    return QueryTallyResultRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryTallyResultRequest): QueryTallyResultRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryTallyResultRequest",
+      value: QueryTallyResultRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryTallyResultRequestProtoMsg): QueryTallyResultRequest {
+    return QueryTallyResultRequest.decode(message.value);
+  },
+
+  toProto(message: QueryTallyResultRequest): Uint8Array {
+    return QueryTallyResultRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryTallyResultRequest): QueryTallyResultRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1beta1.QueryTallyResultRequest",
+      value: QueryTallyResultRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1965,6 +2400,9 @@ function createBaseQueryTallyResultResponse(): QueryTallyResultResponse {
 }
 
 export const QueryTallyResultResponse = {
+  typeUrl: "/cosmos.gov.v1beta1.QueryTallyResultResponse",
+  aminoType: "cosmos-sdk/QueryTallyResultResponse",
+
   encode(message: QueryTallyResultResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.tally !== undefined) {
       TallyResult.encode(message.tally, writer.uint32(10).fork()).ldelim();
@@ -2035,6 +2473,32 @@ export const QueryTallyResultResponse = {
     const obj: any = {};
     obj.tally = message.tally ? TallyResult.toAmino(message.tally) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryTallyResultResponseAminoMsg): QueryTallyResultResponse {
+    return QueryTallyResultResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryTallyResultResponse): QueryTallyResultResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryTallyResultResponse",
+      value: QueryTallyResultResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryTallyResultResponseProtoMsg): QueryTallyResultResponse {
+    return QueryTallyResultResponse.decode(message.value);
+  },
+
+  toProto(message: QueryTallyResultResponse): Uint8Array {
+    return QueryTallyResultResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryTallyResultResponse): QueryTallyResultResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1beta1.QueryTallyResultResponse",
+      value: QueryTallyResultResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/gov/v1beta1/tx.ts b/__fixtures__/outputv2/cosmos/gov/v1beta1/tx.ts
index bf27ab46c..001d45ff1 100644
--- a/__fixtures__/outputv2/cosmos/gov/v1beta1/tx.ts
+++ b/__fixtures__/outputv2/cosmos/gov/v1beta1/tx.ts
@@ -19,7 +19,7 @@ export interface MsgSubmitProposal {
   initialDeposit: Coin[];
   proposer: string;
 }
-export interface MsgSubmitProposalProtoType {
+export interface MsgSubmitProposalProtoMsg {
   typeUrl: "/cosmos.gov.v1beta1.MsgSubmitProposal";
   value: Uint8Array;
 }
@@ -33,7 +33,7 @@ export interface MsgSubmitProposalAmino {
   initial_deposit: CoinAmino[];
   proposer: string;
 }
-export interface MsgSubmitProposalAminoType {
+export interface MsgSubmitProposalAminoMsg {
   type: "cosmos-sdk/MsgSubmitProposal";
   value: MsgSubmitProposalAmino;
 }
@@ -52,7 +52,7 @@ export interface MsgSubmitProposalSDKType {
 export interface MsgSubmitProposalResponse {
   proposalId: Long;
 }
-export interface MsgSubmitProposalResponseProtoType {
+export interface MsgSubmitProposalResponseProtoMsg {
   typeUrl: "/cosmos.gov.v1beta1.MsgSubmitProposalResponse";
   value: Uint8Array;
 }
@@ -61,7 +61,7 @@ export interface MsgSubmitProposalResponseProtoType {
 export interface MsgSubmitProposalResponseAmino {
   proposal_id: string;
 }
-export interface MsgSubmitProposalResponseAminoType {
+export interface MsgSubmitProposalResponseAminoMsg {
   type: "cosmos-sdk/MsgSubmitProposalResponse";
   value: MsgSubmitProposalResponseAmino;
 }
@@ -77,7 +77,7 @@ export interface MsgVote {
   voter: string;
   option: VoteOption;
 }
-export interface MsgVoteProtoType {
+export interface MsgVoteProtoMsg {
   typeUrl: "/cosmos.gov.v1beta1.MsgVote";
   value: Uint8Array;
 }
@@ -88,7 +88,7 @@ export interface MsgVoteAmino {
   voter: string;
   option: VoteOption;
 }
-export interface MsgVoteAminoType {
+export interface MsgVoteAminoMsg {
   type: "cosmos-sdk/MsgVote";
   value: MsgVoteAmino;
 }
@@ -102,14 +102,14 @@ export interface MsgVoteSDKType {
 
 /** MsgVoteResponse defines the Msg/Vote response type. */
 export interface MsgVoteResponse {}
-export interface MsgVoteResponseProtoType {
+export interface MsgVoteResponseProtoMsg {
   typeUrl: "/cosmos.gov.v1beta1.MsgVoteResponse";
   value: Uint8Array;
 }
 
 /** MsgVoteResponse defines the Msg/Vote response type. */
 export interface MsgVoteResponseAmino {}
-export interface MsgVoteResponseAminoType {
+export interface MsgVoteResponseAminoMsg {
   type: "cosmos-sdk/MsgVoteResponse";
   value: MsgVoteResponseAmino;
 }
@@ -127,7 +127,7 @@ export interface MsgVoteWeighted {
   voter: string;
   options: WeightedVoteOption[];
 }
-export interface MsgVoteWeightedProtoType {
+export interface MsgVoteWeightedProtoMsg {
   typeUrl: "/cosmos.gov.v1beta1.MsgVoteWeighted";
   value: Uint8Array;
 }
@@ -142,7 +142,7 @@ export interface MsgVoteWeightedAmino {
   voter: string;
   options: WeightedVoteOptionAmino[];
 }
-export interface MsgVoteWeightedAminoType {
+export interface MsgVoteWeightedAminoMsg {
   type: "cosmos-sdk/MsgVoteWeighted";
   value: MsgVoteWeightedAmino;
 }
@@ -164,7 +164,7 @@ export interface MsgVoteWeightedSDKType {
  * Since: cosmos-sdk 0.43
  */
 export interface MsgVoteWeightedResponse {}
-export interface MsgVoteWeightedResponseProtoType {
+export interface MsgVoteWeightedResponseProtoMsg {
   typeUrl: "/cosmos.gov.v1beta1.MsgVoteWeightedResponse";
   value: Uint8Array;
 }
@@ -175,7 +175,7 @@ export interface MsgVoteWeightedResponseProtoType {
  * Since: cosmos-sdk 0.43
  */
 export interface MsgVoteWeightedResponseAmino {}
-export interface MsgVoteWeightedResponseAminoType {
+export interface MsgVoteWeightedResponseAminoMsg {
   type: "cosmos-sdk/MsgVoteWeightedResponse";
   value: MsgVoteWeightedResponseAmino;
 }
@@ -193,7 +193,7 @@ export interface MsgDeposit {
   depositor: string;
   amount: Coin[];
 }
-export interface MsgDepositProtoType {
+export interface MsgDepositProtoMsg {
   typeUrl: "/cosmos.gov.v1beta1.MsgDeposit";
   value: Uint8Array;
 }
@@ -204,7 +204,7 @@ export interface MsgDepositAmino {
   depositor: string;
   amount: CoinAmino[];
 }
-export interface MsgDepositAminoType {
+export interface MsgDepositAminoMsg {
   type: "cosmos-sdk/MsgDeposit";
   value: MsgDepositAmino;
 }
@@ -218,14 +218,14 @@ export interface MsgDepositSDKType {
 
 /** MsgDepositResponse defines the Msg/Deposit response type. */
 export interface MsgDepositResponse {}
-export interface MsgDepositResponseProtoType {
+export interface MsgDepositResponseProtoMsg {
   typeUrl: "/cosmos.gov.v1beta1.MsgDepositResponse";
   value: Uint8Array;
 }
 
 /** MsgDepositResponse defines the Msg/Deposit response type. */
 export interface MsgDepositResponseAmino {}
-export interface MsgDepositResponseAminoType {
+export interface MsgDepositResponseAminoMsg {
   type: "cosmos-sdk/MsgDepositResponse";
   value: MsgDepositResponseAmino;
 }
@@ -242,6 +242,9 @@ function createBaseMsgSubmitProposal(): MsgSubmitProposal {
 }
 
 export const MsgSubmitProposal = {
+  typeUrl: "/cosmos.gov.v1beta1.MsgSubmitProposal",
+  aminoType: "cosmos-sdk/MsgSubmitProposal",
+
   encode(message: MsgSubmitProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.content !== undefined) {
       Any.encode((message.content as Any), writer.uint32(10).fork()).ldelim();
@@ -360,6 +363,32 @@ export const MsgSubmitProposal = {
 
     obj.proposer = message.proposer;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgSubmitProposalAminoMsg): MsgSubmitProposal {
+    return MsgSubmitProposal.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgSubmitProposal): MsgSubmitProposalAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgSubmitProposal",
+      value: MsgSubmitProposal.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgSubmitProposalProtoMsg): MsgSubmitProposal {
+    return MsgSubmitProposal.decode(message.value);
+  },
+
+  toProto(message: MsgSubmitProposal): Uint8Array {
+    return MsgSubmitProposal.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgSubmitProposal): MsgSubmitProposalProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1beta1.MsgSubmitProposal",
+      value: MsgSubmitProposal.encode(message).finish()
+    };
   }
 
 };
@@ -371,6 +400,9 @@ function createBaseMsgSubmitProposalResponse(): MsgSubmitProposalResponse {
 }
 
 export const MsgSubmitProposalResponse = {
+  typeUrl: "/cosmos.gov.v1beta1.MsgSubmitProposalResponse",
+  aminoType: "cosmos-sdk/MsgSubmitProposalResponse",
+
   encode(message: MsgSubmitProposalResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.proposalId.isZero()) {
       writer.uint32(8).uint64(message.proposalId);
@@ -441,6 +473,32 @@ export const MsgSubmitProposalResponse = {
     const obj: any = {};
     obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgSubmitProposalResponseAminoMsg): MsgSubmitProposalResponse {
+    return MsgSubmitProposalResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgSubmitProposalResponse): MsgSubmitProposalResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgSubmitProposalResponse",
+      value: MsgSubmitProposalResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgSubmitProposalResponseProtoMsg): MsgSubmitProposalResponse {
+    return MsgSubmitProposalResponse.decode(message.value);
+  },
+
+  toProto(message: MsgSubmitProposalResponse): Uint8Array {
+    return MsgSubmitProposalResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgSubmitProposalResponse): MsgSubmitProposalResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1beta1.MsgSubmitProposalResponse",
+      value: MsgSubmitProposalResponse.encode(message).finish()
+    };
   }
 
 };
@@ -454,6 +512,9 @@ function createBaseMsgVote(): MsgVote {
 }
 
 export const MsgVote = {
+  typeUrl: "/cosmos.gov.v1beta1.MsgVote",
+  aminoType: "cosmos-sdk/MsgVote",
+
   encode(message: MsgVote, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.proposalId.isZero()) {
       writer.uint32(8).uint64(message.proposalId);
@@ -554,6 +615,32 @@ export const MsgVote = {
     obj.voter = message.voter;
     obj.option = message.option;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgVoteAminoMsg): MsgVote {
+    return MsgVote.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgVote): MsgVoteAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgVote",
+      value: MsgVote.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgVoteProtoMsg): MsgVote {
+    return MsgVote.decode(message.value);
+  },
+
+  toProto(message: MsgVote): Uint8Array {
+    return MsgVote.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgVote): MsgVoteProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1beta1.MsgVote",
+      value: MsgVote.encode(message).finish()
+    };
   }
 
 };
@@ -563,6 +650,9 @@ function createBaseMsgVoteResponse(): MsgVoteResponse {
 }
 
 export const MsgVoteResponse = {
+  typeUrl: "/cosmos.gov.v1beta1.MsgVoteResponse",
+  aminoType: "cosmos-sdk/MsgVoteResponse",
+
   encode(_: MsgVoteResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -615,6 +705,32 @@ export const MsgVoteResponse = {
   toAmino(_: MsgVoteResponse): MsgVoteResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgVoteResponseAminoMsg): MsgVoteResponse {
+    return MsgVoteResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgVoteResponse): MsgVoteResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgVoteResponse",
+      value: MsgVoteResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgVoteResponseProtoMsg): MsgVoteResponse {
+    return MsgVoteResponse.decode(message.value);
+  },
+
+  toProto(message: MsgVoteResponse): Uint8Array {
+    return MsgVoteResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgVoteResponse): MsgVoteResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1beta1.MsgVoteResponse",
+      value: MsgVoteResponse.encode(message).finish()
+    };
   }
 
 };
@@ -628,6 +744,9 @@ function createBaseMsgVoteWeighted(): MsgVoteWeighted {
 }
 
 export const MsgVoteWeighted = {
+  typeUrl: "/cosmos.gov.v1beta1.MsgVoteWeighted",
+  aminoType: "cosmos-sdk/MsgVoteWeighted",
+
   encode(message: MsgVoteWeighted, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.proposalId.isZero()) {
       writer.uint32(8).uint64(message.proposalId);
@@ -746,6 +865,32 @@ export const MsgVoteWeighted = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: MsgVoteWeightedAminoMsg): MsgVoteWeighted {
+    return MsgVoteWeighted.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgVoteWeighted): MsgVoteWeightedAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgVoteWeighted",
+      value: MsgVoteWeighted.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgVoteWeightedProtoMsg): MsgVoteWeighted {
+    return MsgVoteWeighted.decode(message.value);
+  },
+
+  toProto(message: MsgVoteWeighted): Uint8Array {
+    return MsgVoteWeighted.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgVoteWeighted): MsgVoteWeightedProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1beta1.MsgVoteWeighted",
+      value: MsgVoteWeighted.encode(message).finish()
+    };
   }
 
 };
@@ -755,6 +900,9 @@ function createBaseMsgVoteWeightedResponse(): MsgVoteWeightedResponse {
 }
 
 export const MsgVoteWeightedResponse = {
+  typeUrl: "/cosmos.gov.v1beta1.MsgVoteWeightedResponse",
+  aminoType: "cosmos-sdk/MsgVoteWeightedResponse",
+
   encode(_: MsgVoteWeightedResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -807,6 +955,32 @@ export const MsgVoteWeightedResponse = {
   toAmino(_: MsgVoteWeightedResponse): MsgVoteWeightedResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgVoteWeightedResponseAminoMsg): MsgVoteWeightedResponse {
+    return MsgVoteWeightedResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgVoteWeightedResponse): MsgVoteWeightedResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgVoteWeightedResponse",
+      value: MsgVoteWeightedResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgVoteWeightedResponseProtoMsg): MsgVoteWeightedResponse {
+    return MsgVoteWeightedResponse.decode(message.value);
+  },
+
+  toProto(message: MsgVoteWeightedResponse): Uint8Array {
+    return MsgVoteWeightedResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgVoteWeightedResponse): MsgVoteWeightedResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1beta1.MsgVoteWeightedResponse",
+      value: MsgVoteWeightedResponse.encode(message).finish()
+    };
   }
 
 };
@@ -820,6 +994,9 @@ function createBaseMsgDeposit(): MsgDeposit {
 }
 
 export const MsgDeposit = {
+  typeUrl: "/cosmos.gov.v1beta1.MsgDeposit",
+  aminoType: "cosmos-sdk/MsgDeposit",
+
   encode(message: MsgDeposit, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.proposalId.isZero()) {
       writer.uint32(8).uint64(message.proposalId);
@@ -938,6 +1115,32 @@ export const MsgDeposit = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: MsgDepositAminoMsg): MsgDeposit {
+    return MsgDeposit.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgDeposit): MsgDepositAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgDeposit",
+      value: MsgDeposit.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgDepositProtoMsg): MsgDeposit {
+    return MsgDeposit.decode(message.value);
+  },
+
+  toProto(message: MsgDeposit): Uint8Array {
+    return MsgDeposit.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgDeposit): MsgDepositProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1beta1.MsgDeposit",
+      value: MsgDeposit.encode(message).finish()
+    };
   }
 
 };
@@ -947,6 +1150,9 @@ function createBaseMsgDepositResponse(): MsgDepositResponse {
 }
 
 export const MsgDepositResponse = {
+  typeUrl: "/cosmos.gov.v1beta1.MsgDepositResponse",
+  aminoType: "cosmos-sdk/MsgDepositResponse",
+
   encode(_: MsgDepositResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -999,6 +1205,32 @@ export const MsgDepositResponse = {
   toAmino(_: MsgDepositResponse): MsgDepositResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgDepositResponseAminoMsg): MsgDepositResponse {
+    return MsgDepositResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgDepositResponse): MsgDepositResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgDepositResponse",
+      value: MsgDepositResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgDepositResponseProtoMsg): MsgDepositResponse {
+    return MsgDepositResponse.decode(message.value);
+  },
+
+  toProto(message: MsgDepositResponse): Uint8Array {
+    return MsgDepositResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgDepositResponse): MsgDepositResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1beta1.MsgDepositResponse",
+      value: MsgDepositResponse.encode(message).finish()
+    };
   }
 
 };
diff --git a/__fixtures__/outputv2/cosmos/group/v1/events.ts b/__fixtures__/outputv2/cosmos/group/v1/events.ts
index 5d105b0e6..43f506958 100644
--- a/__fixtures__/outputv2/cosmos/group/v1/events.ts
+++ b/__fixtures__/outputv2/cosmos/group/v1/events.ts
@@ -8,7 +8,7 @@ export interface EventCreateGroup {
   /** group_id is the unique ID of the group. */
   groupId: Long;
 }
-export interface EventCreateGroupProtoType {
+export interface EventCreateGroupProtoMsg {
   typeUrl: "/cosmos.group.v1.EventCreateGroup";
   value: Uint8Array;
 }
@@ -18,7 +18,7 @@ export interface EventCreateGroupAmino {
   /** group_id is the unique ID of the group. */
   group_id: string;
 }
-export interface EventCreateGroupAminoType {
+export interface EventCreateGroupAminoMsg {
   type: "cosmos-sdk/EventCreateGroup";
   value: EventCreateGroupAmino;
 }
@@ -33,7 +33,7 @@ export interface EventUpdateGroup {
   /** group_id is the unique ID of the group. */
   groupId: Long;
 }
-export interface EventUpdateGroupProtoType {
+export interface EventUpdateGroupProtoMsg {
   typeUrl: "/cosmos.group.v1.EventUpdateGroup";
   value: Uint8Array;
 }
@@ -43,7 +43,7 @@ export interface EventUpdateGroupAmino {
   /** group_id is the unique ID of the group. */
   group_id: string;
 }
-export interface EventUpdateGroupAminoType {
+export interface EventUpdateGroupAminoMsg {
   type: "cosmos-sdk/EventUpdateGroup";
   value: EventUpdateGroupAmino;
 }
@@ -58,7 +58,7 @@ export interface EventCreateGroupPolicy {
   /** address is the account address of the group policy. */
   address: string;
 }
-export interface EventCreateGroupPolicyProtoType {
+export interface EventCreateGroupPolicyProtoMsg {
   typeUrl: "/cosmos.group.v1.EventCreateGroupPolicy";
   value: Uint8Array;
 }
@@ -68,7 +68,7 @@ export interface EventCreateGroupPolicyAmino {
   /** address is the account address of the group policy. */
   address: string;
 }
-export interface EventCreateGroupPolicyAminoType {
+export interface EventCreateGroupPolicyAminoMsg {
   type: "cosmos-sdk/EventCreateGroupPolicy";
   value: EventCreateGroupPolicyAmino;
 }
@@ -83,7 +83,7 @@ export interface EventUpdateGroupPolicy {
   /** address is the account address of the group policy. */
   address: string;
 }
-export interface EventUpdateGroupPolicyProtoType {
+export interface EventUpdateGroupPolicyProtoMsg {
   typeUrl: "/cosmos.group.v1.EventUpdateGroupPolicy";
   value: Uint8Array;
 }
@@ -93,7 +93,7 @@ export interface EventUpdateGroupPolicyAmino {
   /** address is the account address of the group policy. */
   address: string;
 }
-export interface EventUpdateGroupPolicyAminoType {
+export interface EventUpdateGroupPolicyAminoMsg {
   type: "cosmos-sdk/EventUpdateGroupPolicy";
   value: EventUpdateGroupPolicyAmino;
 }
@@ -108,7 +108,7 @@ export interface EventSubmitProposal {
   /** proposal_id is the unique ID of the proposal. */
   proposalId: Long;
 }
-export interface EventSubmitProposalProtoType {
+export interface EventSubmitProposalProtoMsg {
   typeUrl: "/cosmos.group.v1.EventSubmitProposal";
   value: Uint8Array;
 }
@@ -118,7 +118,7 @@ export interface EventSubmitProposalAmino {
   /** proposal_id is the unique ID of the proposal. */
   proposal_id: string;
 }
-export interface EventSubmitProposalAminoType {
+export interface EventSubmitProposalAminoMsg {
   type: "cosmos-sdk/EventSubmitProposal";
   value: EventSubmitProposalAmino;
 }
@@ -133,7 +133,7 @@ export interface EventWithdrawProposal {
   /** proposal_id is the unique ID of the proposal. */
   proposalId: Long;
 }
-export interface EventWithdrawProposalProtoType {
+export interface EventWithdrawProposalProtoMsg {
   typeUrl: "/cosmos.group.v1.EventWithdrawProposal";
   value: Uint8Array;
 }
@@ -143,7 +143,7 @@ export interface EventWithdrawProposalAmino {
   /** proposal_id is the unique ID of the proposal. */
   proposal_id: string;
 }
-export interface EventWithdrawProposalAminoType {
+export interface EventWithdrawProposalAminoMsg {
   type: "cosmos-sdk/EventWithdrawProposal";
   value: EventWithdrawProposalAmino;
 }
@@ -158,7 +158,7 @@ export interface EventVote {
   /** proposal_id is the unique ID of the proposal. */
   proposalId: Long;
 }
-export interface EventVoteProtoType {
+export interface EventVoteProtoMsg {
   typeUrl: "/cosmos.group.v1.EventVote";
   value: Uint8Array;
 }
@@ -168,7 +168,7 @@ export interface EventVoteAmino {
   /** proposal_id is the unique ID of the proposal. */
   proposal_id: string;
 }
-export interface EventVoteAminoType {
+export interface EventVoteAminoMsg {
   type: "cosmos-sdk/EventVote";
   value: EventVoteAmino;
 }
@@ -186,7 +186,7 @@ export interface EventExec {
   /** result is the proposal execution result. */
   result: ProposalExecutorResult;
 }
-export interface EventExecProtoType {
+export interface EventExecProtoMsg {
   typeUrl: "/cosmos.group.v1.EventExec";
   value: Uint8Array;
 }
@@ -199,7 +199,7 @@ export interface EventExecAmino {
   /** result is the proposal execution result. */
   result: ProposalExecutorResult;
 }
-export interface EventExecAminoType {
+export interface EventExecAminoMsg {
   type: "cosmos-sdk/EventExec";
   value: EventExecAmino;
 }
@@ -218,7 +218,7 @@ export interface EventLeaveGroup {
   /** address is the account address of the group member. */
   address: string;
 }
-export interface EventLeaveGroupProtoType {
+export interface EventLeaveGroupProtoMsg {
   typeUrl: "/cosmos.group.v1.EventLeaveGroup";
   value: Uint8Array;
 }
@@ -231,7 +231,7 @@ export interface EventLeaveGroupAmino {
   /** address is the account address of the group member. */
   address: string;
 }
-export interface EventLeaveGroupAminoType {
+export interface EventLeaveGroupAminoMsg {
   type: "cosmos-sdk/EventLeaveGroup";
   value: EventLeaveGroupAmino;
 }
@@ -249,6 +249,9 @@ function createBaseEventCreateGroup(): EventCreateGroup {
 }
 
 export const EventCreateGroup = {
+  typeUrl: "/cosmos.group.v1.EventCreateGroup",
+  aminoType: "cosmos-sdk/EventCreateGroup",
+
   encode(message: EventCreateGroup, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.groupId.isZero()) {
       writer.uint32(8).uint64(message.groupId);
@@ -319,6 +322,32 @@ export const EventCreateGroup = {
     const obj: any = {};
     obj.group_id = message.groupId ? message.groupId.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: EventCreateGroupAminoMsg): EventCreateGroup {
+    return EventCreateGroup.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: EventCreateGroup): EventCreateGroupAminoMsg {
+    return {
+      type: "cosmos-sdk/EventCreateGroup",
+      value: EventCreateGroup.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: EventCreateGroupProtoMsg): EventCreateGroup {
+    return EventCreateGroup.decode(message.value);
+  },
+
+  toProto(message: EventCreateGroup): Uint8Array {
+    return EventCreateGroup.encode(message).finish();
+  },
+
+  toProtoMsg(message: EventCreateGroup): EventCreateGroupProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.EventCreateGroup",
+      value: EventCreateGroup.encode(message).finish()
+    };
   }
 
 };
@@ -330,6 +359,9 @@ function createBaseEventUpdateGroup(): EventUpdateGroup {
 }
 
 export const EventUpdateGroup = {
+  typeUrl: "/cosmos.group.v1.EventUpdateGroup",
+  aminoType: "cosmos-sdk/EventUpdateGroup",
+
   encode(message: EventUpdateGroup, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.groupId.isZero()) {
       writer.uint32(8).uint64(message.groupId);
@@ -400,6 +432,32 @@ export const EventUpdateGroup = {
     const obj: any = {};
     obj.group_id = message.groupId ? message.groupId.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: EventUpdateGroupAminoMsg): EventUpdateGroup {
+    return EventUpdateGroup.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: EventUpdateGroup): EventUpdateGroupAminoMsg {
+    return {
+      type: "cosmos-sdk/EventUpdateGroup",
+      value: EventUpdateGroup.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: EventUpdateGroupProtoMsg): EventUpdateGroup {
+    return EventUpdateGroup.decode(message.value);
+  },
+
+  toProto(message: EventUpdateGroup): Uint8Array {
+    return EventUpdateGroup.encode(message).finish();
+  },
+
+  toProtoMsg(message: EventUpdateGroup): EventUpdateGroupProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.EventUpdateGroup",
+      value: EventUpdateGroup.encode(message).finish()
+    };
   }
 
 };
@@ -411,6 +469,9 @@ function createBaseEventCreateGroupPolicy(): EventCreateGroupPolicy {
 }
 
 export const EventCreateGroupPolicy = {
+  typeUrl: "/cosmos.group.v1.EventCreateGroupPolicy",
+  aminoType: "cosmos-sdk/EventCreateGroupPolicy",
+
   encode(message: EventCreateGroupPolicy, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.address !== "") {
       writer.uint32(10).string(message.address);
@@ -481,6 +542,32 @@ export const EventCreateGroupPolicy = {
     const obj: any = {};
     obj.address = message.address;
     return obj;
+  },
+
+  fromAminoMsg(object: EventCreateGroupPolicyAminoMsg): EventCreateGroupPolicy {
+    return EventCreateGroupPolicy.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: EventCreateGroupPolicy): EventCreateGroupPolicyAminoMsg {
+    return {
+      type: "cosmos-sdk/EventCreateGroupPolicy",
+      value: EventCreateGroupPolicy.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: EventCreateGroupPolicyProtoMsg): EventCreateGroupPolicy {
+    return EventCreateGroupPolicy.decode(message.value);
+  },
+
+  toProto(message: EventCreateGroupPolicy): Uint8Array {
+    return EventCreateGroupPolicy.encode(message).finish();
+  },
+
+  toProtoMsg(message: EventCreateGroupPolicy): EventCreateGroupPolicyProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.EventCreateGroupPolicy",
+      value: EventCreateGroupPolicy.encode(message).finish()
+    };
   }
 
 };
@@ -492,6 +579,9 @@ function createBaseEventUpdateGroupPolicy(): EventUpdateGroupPolicy {
 }
 
 export const EventUpdateGroupPolicy = {
+  typeUrl: "/cosmos.group.v1.EventUpdateGroupPolicy",
+  aminoType: "cosmos-sdk/EventUpdateGroupPolicy",
+
   encode(message: EventUpdateGroupPolicy, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.address !== "") {
       writer.uint32(10).string(message.address);
@@ -562,6 +652,32 @@ export const EventUpdateGroupPolicy = {
     const obj: any = {};
     obj.address = message.address;
     return obj;
+  },
+
+  fromAminoMsg(object: EventUpdateGroupPolicyAminoMsg): EventUpdateGroupPolicy {
+    return EventUpdateGroupPolicy.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: EventUpdateGroupPolicy): EventUpdateGroupPolicyAminoMsg {
+    return {
+      type: "cosmos-sdk/EventUpdateGroupPolicy",
+      value: EventUpdateGroupPolicy.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: EventUpdateGroupPolicyProtoMsg): EventUpdateGroupPolicy {
+    return EventUpdateGroupPolicy.decode(message.value);
+  },
+
+  toProto(message: EventUpdateGroupPolicy): Uint8Array {
+    return EventUpdateGroupPolicy.encode(message).finish();
+  },
+
+  toProtoMsg(message: EventUpdateGroupPolicy): EventUpdateGroupPolicyProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.EventUpdateGroupPolicy",
+      value: EventUpdateGroupPolicy.encode(message).finish()
+    };
   }
 
 };
@@ -573,6 +689,9 @@ function createBaseEventSubmitProposal(): EventSubmitProposal {
 }
 
 export const EventSubmitProposal = {
+  typeUrl: "/cosmos.group.v1.EventSubmitProposal",
+  aminoType: "cosmos-sdk/EventSubmitProposal",
+
   encode(message: EventSubmitProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.proposalId.isZero()) {
       writer.uint32(8).uint64(message.proposalId);
@@ -643,6 +762,32 @@ export const EventSubmitProposal = {
     const obj: any = {};
     obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: EventSubmitProposalAminoMsg): EventSubmitProposal {
+    return EventSubmitProposal.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: EventSubmitProposal): EventSubmitProposalAminoMsg {
+    return {
+      type: "cosmos-sdk/EventSubmitProposal",
+      value: EventSubmitProposal.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: EventSubmitProposalProtoMsg): EventSubmitProposal {
+    return EventSubmitProposal.decode(message.value);
+  },
+
+  toProto(message: EventSubmitProposal): Uint8Array {
+    return EventSubmitProposal.encode(message).finish();
+  },
+
+  toProtoMsg(message: EventSubmitProposal): EventSubmitProposalProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.EventSubmitProposal",
+      value: EventSubmitProposal.encode(message).finish()
+    };
   }
 
 };
@@ -654,6 +799,9 @@ function createBaseEventWithdrawProposal(): EventWithdrawProposal {
 }
 
 export const EventWithdrawProposal = {
+  typeUrl: "/cosmos.group.v1.EventWithdrawProposal",
+  aminoType: "cosmos-sdk/EventWithdrawProposal",
+
   encode(message: EventWithdrawProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.proposalId.isZero()) {
       writer.uint32(8).uint64(message.proposalId);
@@ -724,6 +872,32 @@ export const EventWithdrawProposal = {
     const obj: any = {};
     obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: EventWithdrawProposalAminoMsg): EventWithdrawProposal {
+    return EventWithdrawProposal.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: EventWithdrawProposal): EventWithdrawProposalAminoMsg {
+    return {
+      type: "cosmos-sdk/EventWithdrawProposal",
+      value: EventWithdrawProposal.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: EventWithdrawProposalProtoMsg): EventWithdrawProposal {
+    return EventWithdrawProposal.decode(message.value);
+  },
+
+  toProto(message: EventWithdrawProposal): Uint8Array {
+    return EventWithdrawProposal.encode(message).finish();
+  },
+
+  toProtoMsg(message: EventWithdrawProposal): EventWithdrawProposalProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.EventWithdrawProposal",
+      value: EventWithdrawProposal.encode(message).finish()
+    };
   }
 
 };
@@ -735,6 +909,9 @@ function createBaseEventVote(): EventVote {
 }
 
 export const EventVote = {
+  typeUrl: "/cosmos.group.v1.EventVote",
+  aminoType: "cosmos-sdk/EventVote",
+
   encode(message: EventVote, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.proposalId.isZero()) {
       writer.uint32(8).uint64(message.proposalId);
@@ -805,6 +982,32 @@ export const EventVote = {
     const obj: any = {};
     obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: EventVoteAminoMsg): EventVote {
+    return EventVote.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: EventVote): EventVoteAminoMsg {
+    return {
+      type: "cosmos-sdk/EventVote",
+      value: EventVote.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: EventVoteProtoMsg): EventVote {
+    return EventVote.decode(message.value);
+  },
+
+  toProto(message: EventVote): Uint8Array {
+    return EventVote.encode(message).finish();
+  },
+
+  toProtoMsg(message: EventVote): EventVoteProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.EventVote",
+      value: EventVote.encode(message).finish()
+    };
   }
 
 };
@@ -817,6 +1020,9 @@ function createBaseEventExec(): EventExec {
 }
 
 export const EventExec = {
+  typeUrl: "/cosmos.group.v1.EventExec",
+  aminoType: "cosmos-sdk/EventExec",
+
   encode(message: EventExec, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.proposalId.isZero()) {
       writer.uint32(8).uint64(message.proposalId);
@@ -902,6 +1108,32 @@ export const EventExec = {
     obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined;
     obj.result = message.result;
     return obj;
+  },
+
+  fromAminoMsg(object: EventExecAminoMsg): EventExec {
+    return EventExec.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: EventExec): EventExecAminoMsg {
+    return {
+      type: "cosmos-sdk/EventExec",
+      value: EventExec.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: EventExecProtoMsg): EventExec {
+    return EventExec.decode(message.value);
+  },
+
+  toProto(message: EventExec): Uint8Array {
+    return EventExec.encode(message).finish();
+  },
+
+  toProtoMsg(message: EventExec): EventExecProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.EventExec",
+      value: EventExec.encode(message).finish()
+    };
   }
 
 };
@@ -914,6 +1146,9 @@ function createBaseEventLeaveGroup(): EventLeaveGroup {
 }
 
 export const EventLeaveGroup = {
+  typeUrl: "/cosmos.group.v1.EventLeaveGroup",
+  aminoType: "cosmos-sdk/EventLeaveGroup",
+
   encode(message: EventLeaveGroup, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.groupId.isZero()) {
       writer.uint32(8).uint64(message.groupId);
@@ -999,6 +1234,32 @@ export const EventLeaveGroup = {
     obj.group_id = message.groupId ? message.groupId.toString() : undefined;
     obj.address = message.address;
     return obj;
+  },
+
+  fromAminoMsg(object: EventLeaveGroupAminoMsg): EventLeaveGroup {
+    return EventLeaveGroup.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: EventLeaveGroup): EventLeaveGroupAminoMsg {
+    return {
+      type: "cosmos-sdk/EventLeaveGroup",
+      value: EventLeaveGroup.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: EventLeaveGroupProtoMsg): EventLeaveGroup {
+    return EventLeaveGroup.decode(message.value);
+  },
+
+  toProto(message: EventLeaveGroup): Uint8Array {
+    return EventLeaveGroup.encode(message).finish();
+  },
+
+  toProtoMsg(message: EventLeaveGroup): EventLeaveGroupProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.EventLeaveGroup",
+      value: EventLeaveGroup.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/group/v1/genesis.ts b/__fixtures__/outputv2/cosmos/group/v1/genesis.ts
index 19ac24916..dcd879c46 100644
--- a/__fixtures__/outputv2/cosmos/group/v1/genesis.ts
+++ b/__fixtures__/outputv2/cosmos/group/v1/genesis.ts
@@ -38,7 +38,7 @@ export interface GenesisState {
   /** votes is the list of votes. */
   votes: Vote[];
 }
-export interface GenesisStateProtoType {
+export interface GenesisStateProtoMsg {
   typeUrl: "/cosmos.group.v1.GenesisState";
   value: Uint8Array;
 }
@@ -78,7 +78,7 @@ export interface GenesisStateAmino {
   /** votes is the list of votes. */
   votes: VoteAmino[];
 }
-export interface GenesisStateAminoType {
+export interface GenesisStateAminoMsg {
   type: "cosmos-sdk/GenesisState";
   value: GenesisStateAmino;
 }
@@ -109,6 +109,9 @@ function createBaseGenesisState(): GenesisState {
 }
 
 export const GenesisState = {
+  typeUrl: "/cosmos.group.v1.GenesisState",
+  aminoType: "cosmos-sdk/GenesisState",
+
   encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.groupSeq.isZero()) {
       writer.uint32(8).uint64(message.groupSeq);
@@ -368,6 +371,32 @@ export const GenesisState = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisStateAminoMsg): GenesisState {
+    return GenesisState.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GenesisState): GenesisStateAminoMsg {
+    return {
+      type: "cosmos-sdk/GenesisState",
+      value: GenesisState.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GenesisStateProtoMsg): GenesisState {
+    return GenesisState.decode(message.value);
+  },
+
+  toProto(message: GenesisState): Uint8Array {
+    return GenesisState.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisState): GenesisStateProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.GenesisState",
+      value: GenesisState.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/group/v1/query.ts b/__fixtures__/outputv2/cosmos/group/v1/query.ts
index 9b10d9c48..203673426 100644
--- a/__fixtures__/outputv2/cosmos/group/v1/query.ts
+++ b/__fixtures__/outputv2/cosmos/group/v1/query.ts
@@ -9,7 +9,7 @@ export interface QueryGroupInfoRequest {
   /** group_id is the unique ID of the group. */
   groupId: Long;
 }
-export interface QueryGroupInfoRequestProtoType {
+export interface QueryGroupInfoRequestProtoMsg {
   typeUrl: "/cosmos.group.v1.QueryGroupInfoRequest";
   value: Uint8Array;
 }
@@ -19,7 +19,7 @@ export interface QueryGroupInfoRequestAmino {
   /** group_id is the unique ID of the group. */
   group_id: string;
 }
-export interface QueryGroupInfoRequestAminoType {
+export interface QueryGroupInfoRequestAminoMsg {
   type: "cosmos-sdk/QueryGroupInfoRequest";
   value: QueryGroupInfoRequestAmino;
 }
@@ -34,7 +34,7 @@ export interface QueryGroupInfoResponse {
   /** info is the GroupInfo for the group. */
   info?: GroupInfo;
 }
-export interface QueryGroupInfoResponseProtoType {
+export interface QueryGroupInfoResponseProtoMsg {
   typeUrl: "/cosmos.group.v1.QueryGroupInfoResponse";
   value: Uint8Array;
 }
@@ -44,7 +44,7 @@ export interface QueryGroupInfoResponseAmino {
   /** info is the GroupInfo for the group. */
   info?: GroupInfoAmino;
 }
-export interface QueryGroupInfoResponseAminoType {
+export interface QueryGroupInfoResponseAminoMsg {
   type: "cosmos-sdk/QueryGroupInfoResponse";
   value: QueryGroupInfoResponseAmino;
 }
@@ -59,7 +59,7 @@ export interface QueryGroupPolicyInfoRequest {
   /** address is the account address of the group policy. */
   address: string;
 }
-export interface QueryGroupPolicyInfoRequestProtoType {
+export interface QueryGroupPolicyInfoRequestProtoMsg {
   typeUrl: "/cosmos.group.v1.QueryGroupPolicyInfoRequest";
   value: Uint8Array;
 }
@@ -69,7 +69,7 @@ export interface QueryGroupPolicyInfoRequestAmino {
   /** address is the account address of the group policy. */
   address: string;
 }
-export interface QueryGroupPolicyInfoRequestAminoType {
+export interface QueryGroupPolicyInfoRequestAminoMsg {
   type: "cosmos-sdk/QueryGroupPolicyInfoRequest";
   value: QueryGroupPolicyInfoRequestAmino;
 }
@@ -84,7 +84,7 @@ export interface QueryGroupPolicyInfoResponse {
   /** info is the GroupPolicyInfo for the group policy. */
   info?: GroupPolicyInfo;
 }
-export interface QueryGroupPolicyInfoResponseProtoType {
+export interface QueryGroupPolicyInfoResponseProtoMsg {
   typeUrl: "/cosmos.group.v1.QueryGroupPolicyInfoResponse";
   value: Uint8Array;
 }
@@ -94,7 +94,7 @@ export interface QueryGroupPolicyInfoResponseAmino {
   /** info is the GroupPolicyInfo for the group policy. */
   info?: GroupPolicyInfoAmino;
 }
-export interface QueryGroupPolicyInfoResponseAminoType {
+export interface QueryGroupPolicyInfoResponseAminoMsg {
   type: "cosmos-sdk/QueryGroupPolicyInfoResponse";
   value: QueryGroupPolicyInfoResponseAmino;
 }
@@ -112,7 +112,7 @@ export interface QueryGroupMembersRequest {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequest;
 }
-export interface QueryGroupMembersRequestProtoType {
+export interface QueryGroupMembersRequestProtoMsg {
   typeUrl: "/cosmos.group.v1.QueryGroupMembersRequest";
   value: Uint8Array;
 }
@@ -125,7 +125,7 @@ export interface QueryGroupMembersRequestAmino {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequestAmino;
 }
-export interface QueryGroupMembersRequestAminoType {
+export interface QueryGroupMembersRequestAminoMsg {
   type: "cosmos-sdk/QueryGroupMembersRequest";
   value: QueryGroupMembersRequestAmino;
 }
@@ -144,7 +144,7 @@ export interface QueryGroupMembersResponse {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponse;
 }
-export interface QueryGroupMembersResponseProtoType {
+export interface QueryGroupMembersResponseProtoMsg {
   typeUrl: "/cosmos.group.v1.QueryGroupMembersResponse";
   value: Uint8Array;
 }
@@ -157,7 +157,7 @@ export interface QueryGroupMembersResponseAmino {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponseAmino;
 }
-export interface QueryGroupMembersResponseAminoType {
+export interface QueryGroupMembersResponseAminoMsg {
   type: "cosmos-sdk/QueryGroupMembersResponse";
   value: QueryGroupMembersResponseAmino;
 }
@@ -176,7 +176,7 @@ export interface QueryGroupsByAdminRequest {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequest;
 }
-export interface QueryGroupsByAdminRequestProtoType {
+export interface QueryGroupsByAdminRequestProtoMsg {
   typeUrl: "/cosmos.group.v1.QueryGroupsByAdminRequest";
   value: Uint8Array;
 }
@@ -189,7 +189,7 @@ export interface QueryGroupsByAdminRequestAmino {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequestAmino;
 }
-export interface QueryGroupsByAdminRequestAminoType {
+export interface QueryGroupsByAdminRequestAminoMsg {
   type: "cosmos-sdk/QueryGroupsByAdminRequest";
   value: QueryGroupsByAdminRequestAmino;
 }
@@ -208,7 +208,7 @@ export interface QueryGroupsByAdminResponse {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponse;
 }
-export interface QueryGroupsByAdminResponseProtoType {
+export interface QueryGroupsByAdminResponseProtoMsg {
   typeUrl: "/cosmos.group.v1.QueryGroupsByAdminResponse";
   value: Uint8Array;
 }
@@ -221,7 +221,7 @@ export interface QueryGroupsByAdminResponseAmino {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponseAmino;
 }
-export interface QueryGroupsByAdminResponseAminoType {
+export interface QueryGroupsByAdminResponseAminoMsg {
   type: "cosmos-sdk/QueryGroupsByAdminResponse";
   value: QueryGroupsByAdminResponseAmino;
 }
@@ -240,7 +240,7 @@ export interface QueryGroupPoliciesByGroupRequest {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequest;
 }
-export interface QueryGroupPoliciesByGroupRequestProtoType {
+export interface QueryGroupPoliciesByGroupRequestProtoMsg {
   typeUrl: "/cosmos.group.v1.QueryGroupPoliciesByGroupRequest";
   value: Uint8Array;
 }
@@ -253,7 +253,7 @@ export interface QueryGroupPoliciesByGroupRequestAmino {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequestAmino;
 }
-export interface QueryGroupPoliciesByGroupRequestAminoType {
+export interface QueryGroupPoliciesByGroupRequestAminoMsg {
   type: "cosmos-sdk/QueryGroupPoliciesByGroupRequest";
   value: QueryGroupPoliciesByGroupRequestAmino;
 }
@@ -272,7 +272,7 @@ export interface QueryGroupPoliciesByGroupResponse {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponse;
 }
-export interface QueryGroupPoliciesByGroupResponseProtoType {
+export interface QueryGroupPoliciesByGroupResponseProtoMsg {
   typeUrl: "/cosmos.group.v1.QueryGroupPoliciesByGroupResponse";
   value: Uint8Array;
 }
@@ -285,7 +285,7 @@ export interface QueryGroupPoliciesByGroupResponseAmino {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponseAmino;
 }
-export interface QueryGroupPoliciesByGroupResponseAminoType {
+export interface QueryGroupPoliciesByGroupResponseAminoMsg {
   type: "cosmos-sdk/QueryGroupPoliciesByGroupResponse";
   value: QueryGroupPoliciesByGroupResponseAmino;
 }
@@ -304,7 +304,7 @@ export interface QueryGroupPoliciesByAdminRequest {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequest;
 }
-export interface QueryGroupPoliciesByAdminRequestProtoType {
+export interface QueryGroupPoliciesByAdminRequestProtoMsg {
   typeUrl: "/cosmos.group.v1.QueryGroupPoliciesByAdminRequest";
   value: Uint8Array;
 }
@@ -317,7 +317,7 @@ export interface QueryGroupPoliciesByAdminRequestAmino {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequestAmino;
 }
-export interface QueryGroupPoliciesByAdminRequestAminoType {
+export interface QueryGroupPoliciesByAdminRequestAminoMsg {
   type: "cosmos-sdk/QueryGroupPoliciesByAdminRequest";
   value: QueryGroupPoliciesByAdminRequestAmino;
 }
@@ -336,7 +336,7 @@ export interface QueryGroupPoliciesByAdminResponse {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponse;
 }
-export interface QueryGroupPoliciesByAdminResponseProtoType {
+export interface QueryGroupPoliciesByAdminResponseProtoMsg {
   typeUrl: "/cosmos.group.v1.QueryGroupPoliciesByAdminResponse";
   value: Uint8Array;
 }
@@ -349,7 +349,7 @@ export interface QueryGroupPoliciesByAdminResponseAmino {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponseAmino;
 }
-export interface QueryGroupPoliciesByAdminResponseAminoType {
+export interface QueryGroupPoliciesByAdminResponseAminoMsg {
   type: "cosmos-sdk/QueryGroupPoliciesByAdminResponse";
   value: QueryGroupPoliciesByAdminResponseAmino;
 }
@@ -365,7 +365,7 @@ export interface QueryProposalRequest {
   /** proposal_id is the unique ID of a proposal. */
   proposalId: Long;
 }
-export interface QueryProposalRequestProtoType {
+export interface QueryProposalRequestProtoMsg {
   typeUrl: "/cosmos.group.v1.QueryProposalRequest";
   value: Uint8Array;
 }
@@ -375,7 +375,7 @@ export interface QueryProposalRequestAmino {
   /** proposal_id is the unique ID of a proposal. */
   proposal_id: string;
 }
-export interface QueryProposalRequestAminoType {
+export interface QueryProposalRequestAminoMsg {
   type: "cosmos-sdk/QueryProposalRequest";
   value: QueryProposalRequestAmino;
 }
@@ -390,7 +390,7 @@ export interface QueryProposalResponse {
   /** proposal is the proposal info. */
   proposal?: Proposal;
 }
-export interface QueryProposalResponseProtoType {
+export interface QueryProposalResponseProtoMsg {
   typeUrl: "/cosmos.group.v1.QueryProposalResponse";
   value: Uint8Array;
 }
@@ -400,7 +400,7 @@ export interface QueryProposalResponseAmino {
   /** proposal is the proposal info. */
   proposal?: ProposalAmino;
 }
-export interface QueryProposalResponseAminoType {
+export interface QueryProposalResponseAminoMsg {
   type: "cosmos-sdk/QueryProposalResponse";
   value: QueryProposalResponseAmino;
 }
@@ -418,7 +418,7 @@ export interface QueryProposalsByGroupPolicyRequest {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequest;
 }
-export interface QueryProposalsByGroupPolicyRequestProtoType {
+export interface QueryProposalsByGroupPolicyRequestProtoMsg {
   typeUrl: "/cosmos.group.v1.QueryProposalsByGroupPolicyRequest";
   value: Uint8Array;
 }
@@ -431,7 +431,7 @@ export interface QueryProposalsByGroupPolicyRequestAmino {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequestAmino;
 }
-export interface QueryProposalsByGroupPolicyRequestAminoType {
+export interface QueryProposalsByGroupPolicyRequestAminoMsg {
   type: "cosmos-sdk/QueryProposalsByGroupPolicyRequest";
   value: QueryProposalsByGroupPolicyRequestAmino;
 }
@@ -450,7 +450,7 @@ export interface QueryProposalsByGroupPolicyResponse {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponse;
 }
-export interface QueryProposalsByGroupPolicyResponseProtoType {
+export interface QueryProposalsByGroupPolicyResponseProtoMsg {
   typeUrl: "/cosmos.group.v1.QueryProposalsByGroupPolicyResponse";
   value: Uint8Array;
 }
@@ -463,7 +463,7 @@ export interface QueryProposalsByGroupPolicyResponseAmino {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponseAmino;
 }
-export interface QueryProposalsByGroupPolicyResponseAminoType {
+export interface QueryProposalsByGroupPolicyResponseAminoMsg {
   type: "cosmos-sdk/QueryProposalsByGroupPolicyResponse";
   value: QueryProposalsByGroupPolicyResponseAmino;
 }
@@ -482,7 +482,7 @@ export interface QueryVoteByProposalVoterRequest {
   /** voter is a proposal voter account address. */
   voter: string;
 }
-export interface QueryVoteByProposalVoterRequestProtoType {
+export interface QueryVoteByProposalVoterRequestProtoMsg {
   typeUrl: "/cosmos.group.v1.QueryVoteByProposalVoterRequest";
   value: Uint8Array;
 }
@@ -495,7 +495,7 @@ export interface QueryVoteByProposalVoterRequestAmino {
   /** voter is a proposal voter account address. */
   voter: string;
 }
-export interface QueryVoteByProposalVoterRequestAminoType {
+export interface QueryVoteByProposalVoterRequestAminoMsg {
   type: "cosmos-sdk/QueryVoteByProposalVoterRequest";
   value: QueryVoteByProposalVoterRequestAmino;
 }
@@ -511,7 +511,7 @@ export interface QueryVoteByProposalVoterResponse {
   /** vote is the vote with given proposal_id and voter. */
   vote?: Vote;
 }
-export interface QueryVoteByProposalVoterResponseProtoType {
+export interface QueryVoteByProposalVoterResponseProtoMsg {
   typeUrl: "/cosmos.group.v1.QueryVoteByProposalVoterResponse";
   value: Uint8Array;
 }
@@ -521,7 +521,7 @@ export interface QueryVoteByProposalVoterResponseAmino {
   /** vote is the vote with given proposal_id and voter. */
   vote?: VoteAmino;
 }
-export interface QueryVoteByProposalVoterResponseAminoType {
+export interface QueryVoteByProposalVoterResponseAminoMsg {
   type: "cosmos-sdk/QueryVoteByProposalVoterResponse";
   value: QueryVoteByProposalVoterResponseAmino;
 }
@@ -539,7 +539,7 @@ export interface QueryVotesByProposalRequest {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequest;
 }
-export interface QueryVotesByProposalRequestProtoType {
+export interface QueryVotesByProposalRequestProtoMsg {
   typeUrl: "/cosmos.group.v1.QueryVotesByProposalRequest";
   value: Uint8Array;
 }
@@ -552,7 +552,7 @@ export interface QueryVotesByProposalRequestAmino {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequestAmino;
 }
-export interface QueryVotesByProposalRequestAminoType {
+export interface QueryVotesByProposalRequestAminoMsg {
   type: "cosmos-sdk/QueryVotesByProposalRequest";
   value: QueryVotesByProposalRequestAmino;
 }
@@ -571,7 +571,7 @@ export interface QueryVotesByProposalResponse {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponse;
 }
-export interface QueryVotesByProposalResponseProtoType {
+export interface QueryVotesByProposalResponseProtoMsg {
   typeUrl: "/cosmos.group.v1.QueryVotesByProposalResponse";
   value: Uint8Array;
 }
@@ -584,7 +584,7 @@ export interface QueryVotesByProposalResponseAmino {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponseAmino;
 }
-export interface QueryVotesByProposalResponseAminoType {
+export interface QueryVotesByProposalResponseAminoMsg {
   type: "cosmos-sdk/QueryVotesByProposalResponse";
   value: QueryVotesByProposalResponseAmino;
 }
@@ -603,7 +603,7 @@ export interface QueryVotesByVoterRequest {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequest;
 }
-export interface QueryVotesByVoterRequestProtoType {
+export interface QueryVotesByVoterRequestProtoMsg {
   typeUrl: "/cosmos.group.v1.QueryVotesByVoterRequest";
   value: Uint8Array;
 }
@@ -616,7 +616,7 @@ export interface QueryVotesByVoterRequestAmino {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequestAmino;
 }
-export interface QueryVotesByVoterRequestAminoType {
+export interface QueryVotesByVoterRequestAminoMsg {
   type: "cosmos-sdk/QueryVotesByVoterRequest";
   value: QueryVotesByVoterRequestAmino;
 }
@@ -635,7 +635,7 @@ export interface QueryVotesByVoterResponse {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponse;
 }
-export interface QueryVotesByVoterResponseProtoType {
+export interface QueryVotesByVoterResponseProtoMsg {
   typeUrl: "/cosmos.group.v1.QueryVotesByVoterResponse";
   value: Uint8Array;
 }
@@ -648,7 +648,7 @@ export interface QueryVotesByVoterResponseAmino {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponseAmino;
 }
-export interface QueryVotesByVoterResponseAminoType {
+export interface QueryVotesByVoterResponseAminoMsg {
   type: "cosmos-sdk/QueryVotesByVoterResponse";
   value: QueryVotesByVoterResponseAmino;
 }
@@ -667,7 +667,7 @@ export interface QueryGroupsByMemberRequest {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequest;
 }
-export interface QueryGroupsByMemberRequestProtoType {
+export interface QueryGroupsByMemberRequestProtoMsg {
   typeUrl: "/cosmos.group.v1.QueryGroupsByMemberRequest";
   value: Uint8Array;
 }
@@ -680,7 +680,7 @@ export interface QueryGroupsByMemberRequestAmino {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequestAmino;
 }
-export interface QueryGroupsByMemberRequestAminoType {
+export interface QueryGroupsByMemberRequestAminoMsg {
   type: "cosmos-sdk/QueryGroupsByMemberRequest";
   value: QueryGroupsByMemberRequestAmino;
 }
@@ -699,7 +699,7 @@ export interface QueryGroupsByMemberResponse {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponse;
 }
-export interface QueryGroupsByMemberResponseProtoType {
+export interface QueryGroupsByMemberResponseProtoMsg {
   typeUrl: "/cosmos.group.v1.QueryGroupsByMemberResponse";
   value: Uint8Array;
 }
@@ -712,7 +712,7 @@ export interface QueryGroupsByMemberResponseAmino {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponseAmino;
 }
-export interface QueryGroupsByMemberResponseAminoType {
+export interface QueryGroupsByMemberResponseAminoMsg {
   type: "cosmos-sdk/QueryGroupsByMemberResponse";
   value: QueryGroupsByMemberResponseAmino;
 }
@@ -728,7 +728,7 @@ export interface QueryTallyResultRequest {
   /** proposal_id is the unique id of a proposal. */
   proposalId: Long;
 }
-export interface QueryTallyResultRequestProtoType {
+export interface QueryTallyResultRequestProtoMsg {
   typeUrl: "/cosmos.group.v1.QueryTallyResultRequest";
   value: Uint8Array;
 }
@@ -738,7 +738,7 @@ export interface QueryTallyResultRequestAmino {
   /** proposal_id is the unique id of a proposal. */
   proposal_id: string;
 }
-export interface QueryTallyResultRequestAminoType {
+export interface QueryTallyResultRequestAminoMsg {
   type: "cosmos-sdk/QueryTallyResultRequest";
   value: QueryTallyResultRequestAmino;
 }
@@ -753,7 +753,7 @@ export interface QueryTallyResultResponse {
   /** tally defines the requested tally. */
   tally?: TallyResult;
 }
-export interface QueryTallyResultResponseProtoType {
+export interface QueryTallyResultResponseProtoMsg {
   typeUrl: "/cosmos.group.v1.QueryTallyResultResponse";
   value: Uint8Array;
 }
@@ -763,7 +763,7 @@ export interface QueryTallyResultResponseAmino {
   /** tally defines the requested tally. */
   tally?: TallyResultAmino;
 }
-export interface QueryTallyResultResponseAminoType {
+export interface QueryTallyResultResponseAminoMsg {
   type: "cosmos-sdk/QueryTallyResultResponse";
   value: QueryTallyResultResponseAmino;
 }
@@ -780,6 +780,9 @@ function createBaseQueryGroupInfoRequest(): QueryGroupInfoRequest {
 }
 
 export const QueryGroupInfoRequest = {
+  typeUrl: "/cosmos.group.v1.QueryGroupInfoRequest",
+  aminoType: "cosmos-sdk/QueryGroupInfoRequest",
+
   encode(message: QueryGroupInfoRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.groupId.isZero()) {
       writer.uint32(8).uint64(message.groupId);
@@ -850,6 +853,32 @@ export const QueryGroupInfoRequest = {
     const obj: any = {};
     obj.group_id = message.groupId ? message.groupId.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryGroupInfoRequestAminoMsg): QueryGroupInfoRequest {
+    return QueryGroupInfoRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryGroupInfoRequest): QueryGroupInfoRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryGroupInfoRequest",
+      value: QueryGroupInfoRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryGroupInfoRequestProtoMsg): QueryGroupInfoRequest {
+    return QueryGroupInfoRequest.decode(message.value);
+  },
+
+  toProto(message: QueryGroupInfoRequest): Uint8Array {
+    return QueryGroupInfoRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryGroupInfoRequest): QueryGroupInfoRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.QueryGroupInfoRequest",
+      value: QueryGroupInfoRequest.encode(message).finish()
+    };
   }
 
 };
@@ -861,6 +890,9 @@ function createBaseQueryGroupInfoResponse(): QueryGroupInfoResponse {
 }
 
 export const QueryGroupInfoResponse = {
+  typeUrl: "/cosmos.group.v1.QueryGroupInfoResponse",
+  aminoType: "cosmos-sdk/QueryGroupInfoResponse",
+
   encode(message: QueryGroupInfoResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.info !== undefined) {
       GroupInfo.encode(message.info, writer.uint32(10).fork()).ldelim();
@@ -931,6 +963,32 @@ export const QueryGroupInfoResponse = {
     const obj: any = {};
     obj.info = message.info ? GroupInfo.toAmino(message.info) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryGroupInfoResponseAminoMsg): QueryGroupInfoResponse {
+    return QueryGroupInfoResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryGroupInfoResponse): QueryGroupInfoResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryGroupInfoResponse",
+      value: QueryGroupInfoResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryGroupInfoResponseProtoMsg): QueryGroupInfoResponse {
+    return QueryGroupInfoResponse.decode(message.value);
+  },
+
+  toProto(message: QueryGroupInfoResponse): Uint8Array {
+    return QueryGroupInfoResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryGroupInfoResponse): QueryGroupInfoResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.QueryGroupInfoResponse",
+      value: QueryGroupInfoResponse.encode(message).finish()
+    };
   }
 
 };
@@ -942,6 +1000,9 @@ function createBaseQueryGroupPolicyInfoRequest(): QueryGroupPolicyInfoRequest {
 }
 
 export const QueryGroupPolicyInfoRequest = {
+  typeUrl: "/cosmos.group.v1.QueryGroupPolicyInfoRequest",
+  aminoType: "cosmos-sdk/QueryGroupPolicyInfoRequest",
+
   encode(message: QueryGroupPolicyInfoRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.address !== "") {
       writer.uint32(10).string(message.address);
@@ -1012,6 +1073,32 @@ export const QueryGroupPolicyInfoRequest = {
     const obj: any = {};
     obj.address = message.address;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryGroupPolicyInfoRequestAminoMsg): QueryGroupPolicyInfoRequest {
+    return QueryGroupPolicyInfoRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryGroupPolicyInfoRequest): QueryGroupPolicyInfoRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryGroupPolicyInfoRequest",
+      value: QueryGroupPolicyInfoRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryGroupPolicyInfoRequestProtoMsg): QueryGroupPolicyInfoRequest {
+    return QueryGroupPolicyInfoRequest.decode(message.value);
+  },
+
+  toProto(message: QueryGroupPolicyInfoRequest): Uint8Array {
+    return QueryGroupPolicyInfoRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryGroupPolicyInfoRequest): QueryGroupPolicyInfoRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.QueryGroupPolicyInfoRequest",
+      value: QueryGroupPolicyInfoRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1023,6 +1110,9 @@ function createBaseQueryGroupPolicyInfoResponse(): QueryGroupPolicyInfoResponse
 }
 
 export const QueryGroupPolicyInfoResponse = {
+  typeUrl: "/cosmos.group.v1.QueryGroupPolicyInfoResponse",
+  aminoType: "cosmos-sdk/QueryGroupPolicyInfoResponse",
+
   encode(message: QueryGroupPolicyInfoResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.info !== undefined) {
       GroupPolicyInfo.encode(message.info, writer.uint32(10).fork()).ldelim();
@@ -1093,6 +1183,32 @@ export const QueryGroupPolicyInfoResponse = {
     const obj: any = {};
     obj.info = message.info ? GroupPolicyInfo.toAmino(message.info) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryGroupPolicyInfoResponseAminoMsg): QueryGroupPolicyInfoResponse {
+    return QueryGroupPolicyInfoResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryGroupPolicyInfoResponse): QueryGroupPolicyInfoResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryGroupPolicyInfoResponse",
+      value: QueryGroupPolicyInfoResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryGroupPolicyInfoResponseProtoMsg): QueryGroupPolicyInfoResponse {
+    return QueryGroupPolicyInfoResponse.decode(message.value);
+  },
+
+  toProto(message: QueryGroupPolicyInfoResponse): Uint8Array {
+    return QueryGroupPolicyInfoResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryGroupPolicyInfoResponse): QueryGroupPolicyInfoResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.QueryGroupPolicyInfoResponse",
+      value: QueryGroupPolicyInfoResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1105,6 +1221,9 @@ function createBaseQueryGroupMembersRequest(): QueryGroupMembersRequest {
 }
 
 export const QueryGroupMembersRequest = {
+  typeUrl: "/cosmos.group.v1.QueryGroupMembersRequest",
+  aminoType: "cosmos-sdk/QueryGroupMembersRequest",
+
   encode(message: QueryGroupMembersRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.groupId.isZero()) {
       writer.uint32(8).uint64(message.groupId);
@@ -1190,6 +1309,32 @@ export const QueryGroupMembersRequest = {
     obj.group_id = message.groupId ? message.groupId.toString() : undefined;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryGroupMembersRequestAminoMsg): QueryGroupMembersRequest {
+    return QueryGroupMembersRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryGroupMembersRequest): QueryGroupMembersRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryGroupMembersRequest",
+      value: QueryGroupMembersRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryGroupMembersRequestProtoMsg): QueryGroupMembersRequest {
+    return QueryGroupMembersRequest.decode(message.value);
+  },
+
+  toProto(message: QueryGroupMembersRequest): Uint8Array {
+    return QueryGroupMembersRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryGroupMembersRequest): QueryGroupMembersRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.QueryGroupMembersRequest",
+      value: QueryGroupMembersRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1202,6 +1347,9 @@ function createBaseQueryGroupMembersResponse(): QueryGroupMembersResponse {
 }
 
 export const QueryGroupMembersResponse = {
+  typeUrl: "/cosmos.group.v1.QueryGroupMembersResponse",
+  aminoType: "cosmos-sdk/QueryGroupMembersResponse",
+
   encode(message: QueryGroupMembersResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.members) {
       GroupMember.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1305,6 +1453,32 @@ export const QueryGroupMembersResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryGroupMembersResponseAminoMsg): QueryGroupMembersResponse {
+    return QueryGroupMembersResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryGroupMembersResponse): QueryGroupMembersResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryGroupMembersResponse",
+      value: QueryGroupMembersResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryGroupMembersResponseProtoMsg): QueryGroupMembersResponse {
+    return QueryGroupMembersResponse.decode(message.value);
+  },
+
+  toProto(message: QueryGroupMembersResponse): Uint8Array {
+    return QueryGroupMembersResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryGroupMembersResponse): QueryGroupMembersResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.QueryGroupMembersResponse",
+      value: QueryGroupMembersResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1317,6 +1491,9 @@ function createBaseQueryGroupsByAdminRequest(): QueryGroupsByAdminRequest {
 }
 
 export const QueryGroupsByAdminRequest = {
+  typeUrl: "/cosmos.group.v1.QueryGroupsByAdminRequest",
+  aminoType: "cosmos-sdk/QueryGroupsByAdminRequest",
+
   encode(message: QueryGroupsByAdminRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.admin !== "") {
       writer.uint32(10).string(message.admin);
@@ -1402,6 +1579,32 @@ export const QueryGroupsByAdminRequest = {
     obj.admin = message.admin;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryGroupsByAdminRequestAminoMsg): QueryGroupsByAdminRequest {
+    return QueryGroupsByAdminRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryGroupsByAdminRequest): QueryGroupsByAdminRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryGroupsByAdminRequest",
+      value: QueryGroupsByAdminRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryGroupsByAdminRequestProtoMsg): QueryGroupsByAdminRequest {
+    return QueryGroupsByAdminRequest.decode(message.value);
+  },
+
+  toProto(message: QueryGroupsByAdminRequest): Uint8Array {
+    return QueryGroupsByAdminRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryGroupsByAdminRequest): QueryGroupsByAdminRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.QueryGroupsByAdminRequest",
+      value: QueryGroupsByAdminRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1414,6 +1617,9 @@ function createBaseQueryGroupsByAdminResponse(): QueryGroupsByAdminResponse {
 }
 
 export const QueryGroupsByAdminResponse = {
+  typeUrl: "/cosmos.group.v1.QueryGroupsByAdminResponse",
+  aminoType: "cosmos-sdk/QueryGroupsByAdminResponse",
+
   encode(message: QueryGroupsByAdminResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.groups) {
       GroupInfo.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1517,6 +1723,32 @@ export const QueryGroupsByAdminResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryGroupsByAdminResponseAminoMsg): QueryGroupsByAdminResponse {
+    return QueryGroupsByAdminResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryGroupsByAdminResponse): QueryGroupsByAdminResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryGroupsByAdminResponse",
+      value: QueryGroupsByAdminResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryGroupsByAdminResponseProtoMsg): QueryGroupsByAdminResponse {
+    return QueryGroupsByAdminResponse.decode(message.value);
+  },
+
+  toProto(message: QueryGroupsByAdminResponse): Uint8Array {
+    return QueryGroupsByAdminResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryGroupsByAdminResponse): QueryGroupsByAdminResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.QueryGroupsByAdminResponse",
+      value: QueryGroupsByAdminResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1529,6 +1761,9 @@ function createBaseQueryGroupPoliciesByGroupRequest(): QueryGroupPoliciesByGroup
 }
 
 export const QueryGroupPoliciesByGroupRequest = {
+  typeUrl: "/cosmos.group.v1.QueryGroupPoliciesByGroupRequest",
+  aminoType: "cosmos-sdk/QueryGroupPoliciesByGroupRequest",
+
   encode(message: QueryGroupPoliciesByGroupRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.groupId.isZero()) {
       writer.uint32(8).uint64(message.groupId);
@@ -1614,6 +1849,32 @@ export const QueryGroupPoliciesByGroupRequest = {
     obj.group_id = message.groupId ? message.groupId.toString() : undefined;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryGroupPoliciesByGroupRequestAminoMsg): QueryGroupPoliciesByGroupRequest {
+    return QueryGroupPoliciesByGroupRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryGroupPoliciesByGroupRequest): QueryGroupPoliciesByGroupRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryGroupPoliciesByGroupRequest",
+      value: QueryGroupPoliciesByGroupRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryGroupPoliciesByGroupRequestProtoMsg): QueryGroupPoliciesByGroupRequest {
+    return QueryGroupPoliciesByGroupRequest.decode(message.value);
+  },
+
+  toProto(message: QueryGroupPoliciesByGroupRequest): Uint8Array {
+    return QueryGroupPoliciesByGroupRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryGroupPoliciesByGroupRequest): QueryGroupPoliciesByGroupRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.QueryGroupPoliciesByGroupRequest",
+      value: QueryGroupPoliciesByGroupRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1626,6 +1887,9 @@ function createBaseQueryGroupPoliciesByGroupResponse(): QueryGroupPoliciesByGrou
 }
 
 export const QueryGroupPoliciesByGroupResponse = {
+  typeUrl: "/cosmos.group.v1.QueryGroupPoliciesByGroupResponse",
+  aminoType: "cosmos-sdk/QueryGroupPoliciesByGroupResponse",
+
   encode(message: QueryGroupPoliciesByGroupResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.groupPolicies) {
       GroupPolicyInfo.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1729,6 +1993,32 @@ export const QueryGroupPoliciesByGroupResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryGroupPoliciesByGroupResponseAminoMsg): QueryGroupPoliciesByGroupResponse {
+    return QueryGroupPoliciesByGroupResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryGroupPoliciesByGroupResponse): QueryGroupPoliciesByGroupResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryGroupPoliciesByGroupResponse",
+      value: QueryGroupPoliciesByGroupResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryGroupPoliciesByGroupResponseProtoMsg): QueryGroupPoliciesByGroupResponse {
+    return QueryGroupPoliciesByGroupResponse.decode(message.value);
+  },
+
+  toProto(message: QueryGroupPoliciesByGroupResponse): Uint8Array {
+    return QueryGroupPoliciesByGroupResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryGroupPoliciesByGroupResponse): QueryGroupPoliciesByGroupResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.QueryGroupPoliciesByGroupResponse",
+      value: QueryGroupPoliciesByGroupResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1741,6 +2031,9 @@ function createBaseQueryGroupPoliciesByAdminRequest(): QueryGroupPoliciesByAdmin
 }
 
 export const QueryGroupPoliciesByAdminRequest = {
+  typeUrl: "/cosmos.group.v1.QueryGroupPoliciesByAdminRequest",
+  aminoType: "cosmos-sdk/QueryGroupPoliciesByAdminRequest",
+
   encode(message: QueryGroupPoliciesByAdminRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.admin !== "") {
       writer.uint32(10).string(message.admin);
@@ -1826,6 +2119,32 @@ export const QueryGroupPoliciesByAdminRequest = {
     obj.admin = message.admin;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryGroupPoliciesByAdminRequestAminoMsg): QueryGroupPoliciesByAdminRequest {
+    return QueryGroupPoliciesByAdminRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryGroupPoliciesByAdminRequest): QueryGroupPoliciesByAdminRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryGroupPoliciesByAdminRequest",
+      value: QueryGroupPoliciesByAdminRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryGroupPoliciesByAdminRequestProtoMsg): QueryGroupPoliciesByAdminRequest {
+    return QueryGroupPoliciesByAdminRequest.decode(message.value);
+  },
+
+  toProto(message: QueryGroupPoliciesByAdminRequest): Uint8Array {
+    return QueryGroupPoliciesByAdminRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryGroupPoliciesByAdminRequest): QueryGroupPoliciesByAdminRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.QueryGroupPoliciesByAdminRequest",
+      value: QueryGroupPoliciesByAdminRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1838,6 +2157,9 @@ function createBaseQueryGroupPoliciesByAdminResponse(): QueryGroupPoliciesByAdmi
 }
 
 export const QueryGroupPoliciesByAdminResponse = {
+  typeUrl: "/cosmos.group.v1.QueryGroupPoliciesByAdminResponse",
+  aminoType: "cosmos-sdk/QueryGroupPoliciesByAdminResponse",
+
   encode(message: QueryGroupPoliciesByAdminResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.groupPolicies) {
       GroupPolicyInfo.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1941,6 +2263,32 @@ export const QueryGroupPoliciesByAdminResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryGroupPoliciesByAdminResponseAminoMsg): QueryGroupPoliciesByAdminResponse {
+    return QueryGroupPoliciesByAdminResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryGroupPoliciesByAdminResponse): QueryGroupPoliciesByAdminResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryGroupPoliciesByAdminResponse",
+      value: QueryGroupPoliciesByAdminResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryGroupPoliciesByAdminResponseProtoMsg): QueryGroupPoliciesByAdminResponse {
+    return QueryGroupPoliciesByAdminResponse.decode(message.value);
+  },
+
+  toProto(message: QueryGroupPoliciesByAdminResponse): Uint8Array {
+    return QueryGroupPoliciesByAdminResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryGroupPoliciesByAdminResponse): QueryGroupPoliciesByAdminResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.QueryGroupPoliciesByAdminResponse",
+      value: QueryGroupPoliciesByAdminResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1952,6 +2300,9 @@ function createBaseQueryProposalRequest(): QueryProposalRequest {
 }
 
 export const QueryProposalRequest = {
+  typeUrl: "/cosmos.group.v1.QueryProposalRequest",
+  aminoType: "cosmos-sdk/QueryProposalRequest",
+
   encode(message: QueryProposalRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.proposalId.isZero()) {
       writer.uint32(8).uint64(message.proposalId);
@@ -2022,6 +2373,32 @@ export const QueryProposalRequest = {
     const obj: any = {};
     obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryProposalRequestAminoMsg): QueryProposalRequest {
+    return QueryProposalRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryProposalRequest): QueryProposalRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryProposalRequest",
+      value: QueryProposalRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryProposalRequestProtoMsg): QueryProposalRequest {
+    return QueryProposalRequest.decode(message.value);
+  },
+
+  toProto(message: QueryProposalRequest): Uint8Array {
+    return QueryProposalRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryProposalRequest): QueryProposalRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.QueryProposalRequest",
+      value: QueryProposalRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2033,6 +2410,9 @@ function createBaseQueryProposalResponse(): QueryProposalResponse {
 }
 
 export const QueryProposalResponse = {
+  typeUrl: "/cosmos.group.v1.QueryProposalResponse",
+  aminoType: "cosmos-sdk/QueryProposalResponse",
+
   encode(message: QueryProposalResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.proposal !== undefined) {
       Proposal.encode(message.proposal, writer.uint32(10).fork()).ldelim();
@@ -2103,6 +2483,32 @@ export const QueryProposalResponse = {
     const obj: any = {};
     obj.proposal = message.proposal ? Proposal.toAmino(message.proposal) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryProposalResponseAminoMsg): QueryProposalResponse {
+    return QueryProposalResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryProposalResponse): QueryProposalResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryProposalResponse",
+      value: QueryProposalResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryProposalResponseProtoMsg): QueryProposalResponse {
+    return QueryProposalResponse.decode(message.value);
+  },
+
+  toProto(message: QueryProposalResponse): Uint8Array {
+    return QueryProposalResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryProposalResponse): QueryProposalResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.QueryProposalResponse",
+      value: QueryProposalResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2115,6 +2521,9 @@ function createBaseQueryProposalsByGroupPolicyRequest(): QueryProposalsByGroupPo
 }
 
 export const QueryProposalsByGroupPolicyRequest = {
+  typeUrl: "/cosmos.group.v1.QueryProposalsByGroupPolicyRequest",
+  aminoType: "cosmos-sdk/QueryProposalsByGroupPolicyRequest",
+
   encode(message: QueryProposalsByGroupPolicyRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.address !== "") {
       writer.uint32(10).string(message.address);
@@ -2200,6 +2609,32 @@ export const QueryProposalsByGroupPolicyRequest = {
     obj.address = message.address;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryProposalsByGroupPolicyRequestAminoMsg): QueryProposalsByGroupPolicyRequest {
+    return QueryProposalsByGroupPolicyRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryProposalsByGroupPolicyRequest): QueryProposalsByGroupPolicyRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryProposalsByGroupPolicyRequest",
+      value: QueryProposalsByGroupPolicyRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryProposalsByGroupPolicyRequestProtoMsg): QueryProposalsByGroupPolicyRequest {
+    return QueryProposalsByGroupPolicyRequest.decode(message.value);
+  },
+
+  toProto(message: QueryProposalsByGroupPolicyRequest): Uint8Array {
+    return QueryProposalsByGroupPolicyRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryProposalsByGroupPolicyRequest): QueryProposalsByGroupPolicyRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.QueryProposalsByGroupPolicyRequest",
+      value: QueryProposalsByGroupPolicyRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2212,6 +2647,9 @@ function createBaseQueryProposalsByGroupPolicyResponse(): QueryProposalsByGroupP
 }
 
 export const QueryProposalsByGroupPolicyResponse = {
+  typeUrl: "/cosmos.group.v1.QueryProposalsByGroupPolicyResponse",
+  aminoType: "cosmos-sdk/QueryProposalsByGroupPolicyResponse",
+
   encode(message: QueryProposalsByGroupPolicyResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.proposals) {
       Proposal.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -2315,6 +2753,32 @@ export const QueryProposalsByGroupPolicyResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryProposalsByGroupPolicyResponseAminoMsg): QueryProposalsByGroupPolicyResponse {
+    return QueryProposalsByGroupPolicyResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryProposalsByGroupPolicyResponse): QueryProposalsByGroupPolicyResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryProposalsByGroupPolicyResponse",
+      value: QueryProposalsByGroupPolicyResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryProposalsByGroupPolicyResponseProtoMsg): QueryProposalsByGroupPolicyResponse {
+    return QueryProposalsByGroupPolicyResponse.decode(message.value);
+  },
+
+  toProto(message: QueryProposalsByGroupPolicyResponse): Uint8Array {
+    return QueryProposalsByGroupPolicyResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryProposalsByGroupPolicyResponse): QueryProposalsByGroupPolicyResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.QueryProposalsByGroupPolicyResponse",
+      value: QueryProposalsByGroupPolicyResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2327,6 +2791,9 @@ function createBaseQueryVoteByProposalVoterRequest(): QueryVoteByProposalVoterRe
 }
 
 export const QueryVoteByProposalVoterRequest = {
+  typeUrl: "/cosmos.group.v1.QueryVoteByProposalVoterRequest",
+  aminoType: "cosmos-sdk/QueryVoteByProposalVoterRequest",
+
   encode(message: QueryVoteByProposalVoterRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.proposalId.isZero()) {
       writer.uint32(8).uint64(message.proposalId);
@@ -2412,6 +2879,32 @@ export const QueryVoteByProposalVoterRequest = {
     obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined;
     obj.voter = message.voter;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryVoteByProposalVoterRequestAminoMsg): QueryVoteByProposalVoterRequest {
+    return QueryVoteByProposalVoterRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryVoteByProposalVoterRequest): QueryVoteByProposalVoterRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryVoteByProposalVoterRequest",
+      value: QueryVoteByProposalVoterRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryVoteByProposalVoterRequestProtoMsg): QueryVoteByProposalVoterRequest {
+    return QueryVoteByProposalVoterRequest.decode(message.value);
+  },
+
+  toProto(message: QueryVoteByProposalVoterRequest): Uint8Array {
+    return QueryVoteByProposalVoterRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryVoteByProposalVoterRequest): QueryVoteByProposalVoterRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.QueryVoteByProposalVoterRequest",
+      value: QueryVoteByProposalVoterRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2423,6 +2916,9 @@ function createBaseQueryVoteByProposalVoterResponse(): QueryVoteByProposalVoterR
 }
 
 export const QueryVoteByProposalVoterResponse = {
+  typeUrl: "/cosmos.group.v1.QueryVoteByProposalVoterResponse",
+  aminoType: "cosmos-sdk/QueryVoteByProposalVoterResponse",
+
   encode(message: QueryVoteByProposalVoterResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.vote !== undefined) {
       Vote.encode(message.vote, writer.uint32(10).fork()).ldelim();
@@ -2493,6 +2989,32 @@ export const QueryVoteByProposalVoterResponse = {
     const obj: any = {};
     obj.vote = message.vote ? Vote.toAmino(message.vote) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryVoteByProposalVoterResponseAminoMsg): QueryVoteByProposalVoterResponse {
+    return QueryVoteByProposalVoterResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryVoteByProposalVoterResponse): QueryVoteByProposalVoterResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryVoteByProposalVoterResponse",
+      value: QueryVoteByProposalVoterResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryVoteByProposalVoterResponseProtoMsg): QueryVoteByProposalVoterResponse {
+    return QueryVoteByProposalVoterResponse.decode(message.value);
+  },
+
+  toProto(message: QueryVoteByProposalVoterResponse): Uint8Array {
+    return QueryVoteByProposalVoterResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryVoteByProposalVoterResponse): QueryVoteByProposalVoterResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.QueryVoteByProposalVoterResponse",
+      value: QueryVoteByProposalVoterResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2505,6 +3027,9 @@ function createBaseQueryVotesByProposalRequest(): QueryVotesByProposalRequest {
 }
 
 export const QueryVotesByProposalRequest = {
+  typeUrl: "/cosmos.group.v1.QueryVotesByProposalRequest",
+  aminoType: "cosmos-sdk/QueryVotesByProposalRequest",
+
   encode(message: QueryVotesByProposalRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.proposalId.isZero()) {
       writer.uint32(8).uint64(message.proposalId);
@@ -2590,6 +3115,32 @@ export const QueryVotesByProposalRequest = {
     obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryVotesByProposalRequestAminoMsg): QueryVotesByProposalRequest {
+    return QueryVotesByProposalRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryVotesByProposalRequest): QueryVotesByProposalRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryVotesByProposalRequest",
+      value: QueryVotesByProposalRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryVotesByProposalRequestProtoMsg): QueryVotesByProposalRequest {
+    return QueryVotesByProposalRequest.decode(message.value);
+  },
+
+  toProto(message: QueryVotesByProposalRequest): Uint8Array {
+    return QueryVotesByProposalRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryVotesByProposalRequest): QueryVotesByProposalRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.QueryVotesByProposalRequest",
+      value: QueryVotesByProposalRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2602,6 +3153,9 @@ function createBaseQueryVotesByProposalResponse(): QueryVotesByProposalResponse
 }
 
 export const QueryVotesByProposalResponse = {
+  typeUrl: "/cosmos.group.v1.QueryVotesByProposalResponse",
+  aminoType: "cosmos-sdk/QueryVotesByProposalResponse",
+
   encode(message: QueryVotesByProposalResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.votes) {
       Vote.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -2705,6 +3259,32 @@ export const QueryVotesByProposalResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryVotesByProposalResponseAminoMsg): QueryVotesByProposalResponse {
+    return QueryVotesByProposalResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryVotesByProposalResponse): QueryVotesByProposalResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryVotesByProposalResponse",
+      value: QueryVotesByProposalResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryVotesByProposalResponseProtoMsg): QueryVotesByProposalResponse {
+    return QueryVotesByProposalResponse.decode(message.value);
+  },
+
+  toProto(message: QueryVotesByProposalResponse): Uint8Array {
+    return QueryVotesByProposalResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryVotesByProposalResponse): QueryVotesByProposalResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.QueryVotesByProposalResponse",
+      value: QueryVotesByProposalResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2717,6 +3297,9 @@ function createBaseQueryVotesByVoterRequest(): QueryVotesByVoterRequest {
 }
 
 export const QueryVotesByVoterRequest = {
+  typeUrl: "/cosmos.group.v1.QueryVotesByVoterRequest",
+  aminoType: "cosmos-sdk/QueryVotesByVoterRequest",
+
   encode(message: QueryVotesByVoterRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.voter !== "") {
       writer.uint32(10).string(message.voter);
@@ -2802,6 +3385,32 @@ export const QueryVotesByVoterRequest = {
     obj.voter = message.voter;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryVotesByVoterRequestAminoMsg): QueryVotesByVoterRequest {
+    return QueryVotesByVoterRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryVotesByVoterRequest): QueryVotesByVoterRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryVotesByVoterRequest",
+      value: QueryVotesByVoterRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryVotesByVoterRequestProtoMsg): QueryVotesByVoterRequest {
+    return QueryVotesByVoterRequest.decode(message.value);
+  },
+
+  toProto(message: QueryVotesByVoterRequest): Uint8Array {
+    return QueryVotesByVoterRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryVotesByVoterRequest): QueryVotesByVoterRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.QueryVotesByVoterRequest",
+      value: QueryVotesByVoterRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2814,6 +3423,9 @@ function createBaseQueryVotesByVoterResponse(): QueryVotesByVoterResponse {
 }
 
 export const QueryVotesByVoterResponse = {
+  typeUrl: "/cosmos.group.v1.QueryVotesByVoterResponse",
+  aminoType: "cosmos-sdk/QueryVotesByVoterResponse",
+
   encode(message: QueryVotesByVoterResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.votes) {
       Vote.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -2917,6 +3529,32 @@ export const QueryVotesByVoterResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryVotesByVoterResponseAminoMsg): QueryVotesByVoterResponse {
+    return QueryVotesByVoterResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryVotesByVoterResponse): QueryVotesByVoterResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryVotesByVoterResponse",
+      value: QueryVotesByVoterResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryVotesByVoterResponseProtoMsg): QueryVotesByVoterResponse {
+    return QueryVotesByVoterResponse.decode(message.value);
+  },
+
+  toProto(message: QueryVotesByVoterResponse): Uint8Array {
+    return QueryVotesByVoterResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryVotesByVoterResponse): QueryVotesByVoterResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.QueryVotesByVoterResponse",
+      value: QueryVotesByVoterResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2929,6 +3567,9 @@ function createBaseQueryGroupsByMemberRequest(): QueryGroupsByMemberRequest {
 }
 
 export const QueryGroupsByMemberRequest = {
+  typeUrl: "/cosmos.group.v1.QueryGroupsByMemberRequest",
+  aminoType: "cosmos-sdk/QueryGroupsByMemberRequest",
+
   encode(message: QueryGroupsByMemberRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.address !== "") {
       writer.uint32(10).string(message.address);
@@ -3014,6 +3655,32 @@ export const QueryGroupsByMemberRequest = {
     obj.address = message.address;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryGroupsByMemberRequestAminoMsg): QueryGroupsByMemberRequest {
+    return QueryGroupsByMemberRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryGroupsByMemberRequest): QueryGroupsByMemberRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryGroupsByMemberRequest",
+      value: QueryGroupsByMemberRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryGroupsByMemberRequestProtoMsg): QueryGroupsByMemberRequest {
+    return QueryGroupsByMemberRequest.decode(message.value);
+  },
+
+  toProto(message: QueryGroupsByMemberRequest): Uint8Array {
+    return QueryGroupsByMemberRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryGroupsByMemberRequest): QueryGroupsByMemberRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.QueryGroupsByMemberRequest",
+      value: QueryGroupsByMemberRequest.encode(message).finish()
+    };
   }
 
 };
@@ -3026,6 +3693,9 @@ function createBaseQueryGroupsByMemberResponse(): QueryGroupsByMemberResponse {
 }
 
 export const QueryGroupsByMemberResponse = {
+  typeUrl: "/cosmos.group.v1.QueryGroupsByMemberResponse",
+  aminoType: "cosmos-sdk/QueryGroupsByMemberResponse",
+
   encode(message: QueryGroupsByMemberResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.groups) {
       GroupInfo.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -3129,6 +3799,32 @@ export const QueryGroupsByMemberResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryGroupsByMemberResponseAminoMsg): QueryGroupsByMemberResponse {
+    return QueryGroupsByMemberResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryGroupsByMemberResponse): QueryGroupsByMemberResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryGroupsByMemberResponse",
+      value: QueryGroupsByMemberResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryGroupsByMemberResponseProtoMsg): QueryGroupsByMemberResponse {
+    return QueryGroupsByMemberResponse.decode(message.value);
+  },
+
+  toProto(message: QueryGroupsByMemberResponse): Uint8Array {
+    return QueryGroupsByMemberResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryGroupsByMemberResponse): QueryGroupsByMemberResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.QueryGroupsByMemberResponse",
+      value: QueryGroupsByMemberResponse.encode(message).finish()
+    };
   }
 
 };
@@ -3140,6 +3836,9 @@ function createBaseQueryTallyResultRequest(): QueryTallyResultRequest {
 }
 
 export const QueryTallyResultRequest = {
+  typeUrl: "/cosmos.group.v1.QueryTallyResultRequest",
+  aminoType: "cosmos-sdk/QueryTallyResultRequest",
+
   encode(message: QueryTallyResultRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.proposalId.isZero()) {
       writer.uint32(8).uint64(message.proposalId);
@@ -3210,6 +3909,32 @@ export const QueryTallyResultRequest = {
     const obj: any = {};
     obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryTallyResultRequestAminoMsg): QueryTallyResultRequest {
+    return QueryTallyResultRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryTallyResultRequest): QueryTallyResultRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryTallyResultRequest",
+      value: QueryTallyResultRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryTallyResultRequestProtoMsg): QueryTallyResultRequest {
+    return QueryTallyResultRequest.decode(message.value);
+  },
+
+  toProto(message: QueryTallyResultRequest): Uint8Array {
+    return QueryTallyResultRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryTallyResultRequest): QueryTallyResultRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.QueryTallyResultRequest",
+      value: QueryTallyResultRequest.encode(message).finish()
+    };
   }
 
 };
@@ -3221,6 +3946,9 @@ function createBaseQueryTallyResultResponse(): QueryTallyResultResponse {
 }
 
 export const QueryTallyResultResponse = {
+  typeUrl: "/cosmos.group.v1.QueryTallyResultResponse",
+  aminoType: "cosmos-sdk/QueryTallyResultResponse",
+
   encode(message: QueryTallyResultResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.tally !== undefined) {
       TallyResult.encode(message.tally, writer.uint32(10).fork()).ldelim();
@@ -3291,6 +4019,32 @@ export const QueryTallyResultResponse = {
     const obj: any = {};
     obj.tally = message.tally ? TallyResult.toAmino(message.tally) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryTallyResultResponseAminoMsg): QueryTallyResultResponse {
+    return QueryTallyResultResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryTallyResultResponse): QueryTallyResultResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryTallyResultResponse",
+      value: QueryTallyResultResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryTallyResultResponseProtoMsg): QueryTallyResultResponse {
+    return QueryTallyResultResponse.decode(message.value);
+  },
+
+  toProto(message: QueryTallyResultResponse): Uint8Array {
+    return QueryTallyResultResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryTallyResultResponse): QueryTallyResultResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.QueryTallyResultResponse",
+      value: QueryTallyResultResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/group/v1/tx.ts b/__fixtures__/outputv2/cosmos/group/v1/tx.ts
index 412a9de14..fd0ec52ed 100644
--- a/__fixtures__/outputv2/cosmos/group/v1/tx.ts
+++ b/__fixtures__/outputv2/cosmos/group/v1/tx.ts
@@ -64,7 +64,7 @@ export interface MsgCreateGroup {
   /** metadata is any arbitrary metadata to attached to the group. */
   metadata: string;
 }
-export interface MsgCreateGroupProtoType {
+export interface MsgCreateGroupProtoMsg {
   typeUrl: "/cosmos.group.v1.MsgCreateGroup";
   value: Uint8Array;
 }
@@ -80,7 +80,7 @@ export interface MsgCreateGroupAmino {
   /** metadata is any arbitrary metadata to attached to the group. */
   metadata: string;
 }
-export interface MsgCreateGroupAminoType {
+export interface MsgCreateGroupAminoMsg {
   type: "cosmos-sdk/MsgCreateGroup";
   value: MsgCreateGroupAmino;
 }
@@ -97,7 +97,7 @@ export interface MsgCreateGroupResponse {
   /** group_id is the unique ID of the newly created group. */
   groupId: Long;
 }
-export interface MsgCreateGroupResponseProtoType {
+export interface MsgCreateGroupResponseProtoMsg {
   typeUrl: "/cosmos.group.v1.MsgCreateGroupResponse";
   value: Uint8Array;
 }
@@ -107,7 +107,7 @@ export interface MsgCreateGroupResponseAmino {
   /** group_id is the unique ID of the newly created group. */
   group_id: string;
 }
-export interface MsgCreateGroupResponseAminoType {
+export interface MsgCreateGroupResponseAminoMsg {
   type: "cosmos-sdk/MsgCreateGroupResponse";
   value: MsgCreateGroupResponseAmino;
 }
@@ -131,7 +131,7 @@ export interface MsgUpdateGroupMembers {
    */
   memberUpdates: Member[];
 }
-export interface MsgUpdateGroupMembersProtoType {
+export interface MsgUpdateGroupMembersProtoMsg {
   typeUrl: "/cosmos.group.v1.MsgUpdateGroupMembers";
   value: Uint8Array;
 }
@@ -150,7 +150,7 @@ export interface MsgUpdateGroupMembersAmino {
    */
   member_updates: MemberAmino[];
 }
-export interface MsgUpdateGroupMembersAminoType {
+export interface MsgUpdateGroupMembersAminoMsg {
   type: "cosmos-sdk/MsgUpdateGroupMembers";
   value: MsgUpdateGroupMembersAmino;
 }
@@ -164,14 +164,14 @@ export interface MsgUpdateGroupMembersSDKType {
 
 /** MsgUpdateGroupMembersResponse is the Msg/UpdateGroupMembers response type. */
 export interface MsgUpdateGroupMembersResponse {}
-export interface MsgUpdateGroupMembersResponseProtoType {
+export interface MsgUpdateGroupMembersResponseProtoMsg {
   typeUrl: "/cosmos.group.v1.MsgUpdateGroupMembersResponse";
   value: Uint8Array;
 }
 
 /** MsgUpdateGroupMembersResponse is the Msg/UpdateGroupMembers response type. */
 export interface MsgUpdateGroupMembersResponseAmino {}
-export interface MsgUpdateGroupMembersResponseAminoType {
+export interface MsgUpdateGroupMembersResponseAminoMsg {
   type: "cosmos-sdk/MsgUpdateGroupMembersResponse";
   value: MsgUpdateGroupMembersResponseAmino;
 }
@@ -190,7 +190,7 @@ export interface MsgUpdateGroupAdmin {
   /** new_admin is the group new admin account address. */
   newAdmin: string;
 }
-export interface MsgUpdateGroupAdminProtoType {
+export interface MsgUpdateGroupAdminProtoMsg {
   typeUrl: "/cosmos.group.v1.MsgUpdateGroupAdmin";
   value: Uint8Array;
 }
@@ -206,7 +206,7 @@ export interface MsgUpdateGroupAdminAmino {
   /** new_admin is the group new admin account address. */
   new_admin: string;
 }
-export interface MsgUpdateGroupAdminAminoType {
+export interface MsgUpdateGroupAdminAminoMsg {
   type: "cosmos-sdk/MsgUpdateGroupAdmin";
   value: MsgUpdateGroupAdminAmino;
 }
@@ -220,14 +220,14 @@ export interface MsgUpdateGroupAdminSDKType {
 
 /** MsgUpdateGroupAdminResponse is the Msg/UpdateGroupAdmin response type. */
 export interface MsgUpdateGroupAdminResponse {}
-export interface MsgUpdateGroupAdminResponseProtoType {
+export interface MsgUpdateGroupAdminResponseProtoMsg {
   typeUrl: "/cosmos.group.v1.MsgUpdateGroupAdminResponse";
   value: Uint8Array;
 }
 
 /** MsgUpdateGroupAdminResponse is the Msg/UpdateGroupAdmin response type. */
 export interface MsgUpdateGroupAdminResponseAmino {}
-export interface MsgUpdateGroupAdminResponseAminoType {
+export interface MsgUpdateGroupAdminResponseAminoMsg {
   type: "cosmos-sdk/MsgUpdateGroupAdminResponse";
   value: MsgUpdateGroupAdminResponseAmino;
 }
@@ -246,7 +246,7 @@ export interface MsgUpdateGroupMetadata {
   /** metadata is the updated group's metadata. */
   metadata: string;
 }
-export interface MsgUpdateGroupMetadataProtoType {
+export interface MsgUpdateGroupMetadataProtoMsg {
   typeUrl: "/cosmos.group.v1.MsgUpdateGroupMetadata";
   value: Uint8Array;
 }
@@ -262,7 +262,7 @@ export interface MsgUpdateGroupMetadataAmino {
   /** metadata is the updated group's metadata. */
   metadata: string;
 }
-export interface MsgUpdateGroupMetadataAminoType {
+export interface MsgUpdateGroupMetadataAminoMsg {
   type: "cosmos-sdk/MsgUpdateGroupMetadata";
   value: MsgUpdateGroupMetadataAmino;
 }
@@ -276,14 +276,14 @@ export interface MsgUpdateGroupMetadataSDKType {
 
 /** MsgUpdateGroupMetadataResponse is the Msg/UpdateGroupMetadata response type. */
 export interface MsgUpdateGroupMetadataResponse {}
-export interface MsgUpdateGroupMetadataResponseProtoType {
+export interface MsgUpdateGroupMetadataResponseProtoMsg {
   typeUrl: "/cosmos.group.v1.MsgUpdateGroupMetadataResponse";
   value: Uint8Array;
 }
 
 /** MsgUpdateGroupMetadataResponse is the Msg/UpdateGroupMetadata response type. */
 export interface MsgUpdateGroupMetadataResponseAmino {}
-export interface MsgUpdateGroupMetadataResponseAminoType {
+export interface MsgUpdateGroupMetadataResponseAminoMsg {
   type: "cosmos-sdk/MsgUpdateGroupMetadataResponse";
   value: MsgUpdateGroupMetadataResponseAmino;
 }
@@ -305,7 +305,7 @@ export interface MsgCreateGroupPolicy {
   /** decision_policy specifies the group policy's decision policy. */
   decisionPolicy?: (ThresholdDecisionPolicy & PercentageDecisionPolicy & Any) | undefined;
 }
-export interface MsgCreateGroupPolicyProtoType {
+export interface MsgCreateGroupPolicyProtoMsg {
   typeUrl: "/cosmos.group.v1.MsgCreateGroupPolicy";
   value: Uint8Array;
 }
@@ -324,7 +324,7 @@ export interface MsgCreateGroupPolicyAmino {
   /** decision_policy specifies the group policy's decision policy. */
   decision_policy?: AnyAmino;
 }
-export interface MsgCreateGroupPolicyAminoType {
+export interface MsgCreateGroupPolicyAminoMsg {
   type: "cosmos-sdk/MsgCreateGroupPolicy";
   value: MsgCreateGroupPolicyAmino;
 }
@@ -342,7 +342,7 @@ export interface MsgCreateGroupPolicyResponse {
   /** address is the account address of the newly created group policy. */
   address: string;
 }
-export interface MsgCreateGroupPolicyResponseProtoType {
+export interface MsgCreateGroupPolicyResponseProtoMsg {
   typeUrl: "/cosmos.group.v1.MsgCreateGroupPolicyResponse";
   value: Uint8Array;
 }
@@ -352,7 +352,7 @@ export interface MsgCreateGroupPolicyResponseAmino {
   /** address is the account address of the newly created group policy. */
   address: string;
 }
-export interface MsgCreateGroupPolicyResponseAminoType {
+export interface MsgCreateGroupPolicyResponseAminoMsg {
   type: "cosmos-sdk/MsgCreateGroupPolicyResponse";
   value: MsgCreateGroupPolicyResponseAmino;
 }
@@ -373,7 +373,7 @@ export interface MsgUpdateGroupPolicyAdmin {
   /** new_admin is the new group policy admin. */
   newAdmin: string;
 }
-export interface MsgUpdateGroupPolicyAdminProtoType {
+export interface MsgUpdateGroupPolicyAdminProtoMsg {
   typeUrl: "/cosmos.group.v1.MsgUpdateGroupPolicyAdmin";
   value: Uint8Array;
 }
@@ -389,7 +389,7 @@ export interface MsgUpdateGroupPolicyAdminAmino {
   /** new_admin is the new group policy admin. */
   new_admin: string;
 }
-export interface MsgUpdateGroupPolicyAdminAminoType {
+export interface MsgUpdateGroupPolicyAdminAminoMsg {
   type: "cosmos-sdk/MsgUpdateGroupPolicyAdmin";
   value: MsgUpdateGroupPolicyAdminAmino;
 }
@@ -421,7 +421,7 @@ export interface MsgCreateGroupWithPolicy {
   /** decision_policy specifies the group policy's decision policy. */
   decisionPolicy?: (ThresholdDecisionPolicy & PercentageDecisionPolicy & Any) | undefined;
 }
-export interface MsgCreateGroupWithPolicyProtoType {
+export interface MsgCreateGroupWithPolicyProtoMsg {
   typeUrl: "/cosmos.group.v1.MsgCreateGroupWithPolicy";
   value: Uint8Array;
 }
@@ -446,7 +446,7 @@ export interface MsgCreateGroupWithPolicyAmino {
   /** decision_policy specifies the group policy's decision policy. */
   decision_policy?: AnyAmino;
 }
-export interface MsgCreateGroupWithPolicyAminoType {
+export interface MsgCreateGroupWithPolicyAminoMsg {
   type: "cosmos-sdk/MsgCreateGroupWithPolicy";
   value: MsgCreateGroupWithPolicyAmino;
 }
@@ -469,7 +469,7 @@ export interface MsgCreateGroupWithPolicyResponse {
   /** group_policy_address is the account address of the newly created group policy. */
   groupPolicyAddress: string;
 }
-export interface MsgCreateGroupWithPolicyResponseProtoType {
+export interface MsgCreateGroupWithPolicyResponseProtoMsg {
   typeUrl: "/cosmos.group.v1.MsgCreateGroupWithPolicyResponse";
   value: Uint8Array;
 }
@@ -482,7 +482,7 @@ export interface MsgCreateGroupWithPolicyResponseAmino {
   /** group_policy_address is the account address of the newly created group policy. */
   group_policy_address: string;
 }
-export interface MsgCreateGroupWithPolicyResponseAminoType {
+export interface MsgCreateGroupWithPolicyResponseAminoMsg {
   type: "cosmos-sdk/MsgCreateGroupWithPolicyResponse";
   value: MsgCreateGroupWithPolicyResponseAmino;
 }
@@ -495,14 +495,14 @@ export interface MsgCreateGroupWithPolicyResponseSDKType {
 
 /** MsgUpdateGroupPolicyAdminResponse is the Msg/UpdateGroupPolicyAdmin response type. */
 export interface MsgUpdateGroupPolicyAdminResponse {}
-export interface MsgUpdateGroupPolicyAdminResponseProtoType {
+export interface MsgUpdateGroupPolicyAdminResponseProtoMsg {
   typeUrl: "/cosmos.group.v1.MsgUpdateGroupPolicyAdminResponse";
   value: Uint8Array;
 }
 
 /** MsgUpdateGroupPolicyAdminResponse is the Msg/UpdateGroupPolicyAdmin response type. */
 export interface MsgUpdateGroupPolicyAdminResponseAmino {}
-export interface MsgUpdateGroupPolicyAdminResponseAminoType {
+export interface MsgUpdateGroupPolicyAdminResponseAminoMsg {
   type: "cosmos-sdk/MsgUpdateGroupPolicyAdminResponse";
   value: MsgUpdateGroupPolicyAdminResponseAmino;
 }
@@ -521,7 +521,7 @@ export interface MsgUpdateGroupPolicyDecisionPolicy {
   /** decision_policy is the updated group policy's decision policy. */
   decisionPolicy?: (ThresholdDecisionPolicy & PercentageDecisionPolicy & Any) | undefined;
 }
-export interface MsgUpdateGroupPolicyDecisionPolicyProtoType {
+export interface MsgUpdateGroupPolicyDecisionPolicyProtoMsg {
   typeUrl: "/cosmos.group.v1.MsgUpdateGroupPolicyDecisionPolicy";
   value: Uint8Array;
 }
@@ -537,7 +537,7 @@ export interface MsgUpdateGroupPolicyDecisionPolicyAmino {
   /** decision_policy is the updated group policy's decision policy. */
   decision_policy?: AnyAmino;
 }
-export interface MsgUpdateGroupPolicyDecisionPolicyAminoType {
+export interface MsgUpdateGroupPolicyDecisionPolicyAminoMsg {
   type: "cosmos-sdk/MsgUpdateGroupPolicyDecisionPolicy";
   value: MsgUpdateGroupPolicyDecisionPolicyAmino;
 }
@@ -551,14 +551,14 @@ export interface MsgUpdateGroupPolicyDecisionPolicySDKType {
 
 /** MsgUpdateGroupPolicyDecisionPolicyResponse is the Msg/UpdateGroupPolicyDecisionPolicy response type. */
 export interface MsgUpdateGroupPolicyDecisionPolicyResponse {}
-export interface MsgUpdateGroupPolicyDecisionPolicyResponseProtoType {
+export interface MsgUpdateGroupPolicyDecisionPolicyResponseProtoMsg {
   typeUrl: "/cosmos.group.v1.MsgUpdateGroupPolicyDecisionPolicyResponse";
   value: Uint8Array;
 }
 
 /** MsgUpdateGroupPolicyDecisionPolicyResponse is the Msg/UpdateGroupPolicyDecisionPolicy response type. */
 export interface MsgUpdateGroupPolicyDecisionPolicyResponseAmino {}
-export interface MsgUpdateGroupPolicyDecisionPolicyResponseAminoType {
+export interface MsgUpdateGroupPolicyDecisionPolicyResponseAminoMsg {
   type: "cosmos-sdk/MsgUpdateGroupPolicyDecisionPolicyResponse";
   value: MsgUpdateGroupPolicyDecisionPolicyResponseAmino;
 }
@@ -577,7 +577,7 @@ export interface MsgUpdateGroupPolicyMetadata {
   /** metadata is the updated group policy metadata. */
   metadata: string;
 }
-export interface MsgUpdateGroupPolicyMetadataProtoType {
+export interface MsgUpdateGroupPolicyMetadataProtoMsg {
   typeUrl: "/cosmos.group.v1.MsgUpdateGroupPolicyMetadata";
   value: Uint8Array;
 }
@@ -593,7 +593,7 @@ export interface MsgUpdateGroupPolicyMetadataAmino {
   /** metadata is the updated group policy metadata. */
   metadata: string;
 }
-export interface MsgUpdateGroupPolicyMetadataAminoType {
+export interface MsgUpdateGroupPolicyMetadataAminoMsg {
   type: "cosmos-sdk/MsgUpdateGroupPolicyMetadata";
   value: MsgUpdateGroupPolicyMetadataAmino;
 }
@@ -607,14 +607,14 @@ export interface MsgUpdateGroupPolicyMetadataSDKType {
 
 /** MsgUpdateGroupPolicyMetadataResponse is the Msg/UpdateGroupPolicyMetadata response type. */
 export interface MsgUpdateGroupPolicyMetadataResponse {}
-export interface MsgUpdateGroupPolicyMetadataResponseProtoType {
+export interface MsgUpdateGroupPolicyMetadataResponseProtoMsg {
   typeUrl: "/cosmos.group.v1.MsgUpdateGroupPolicyMetadataResponse";
   value: Uint8Array;
 }
 
 /** MsgUpdateGroupPolicyMetadataResponse is the Msg/UpdateGroupPolicyMetadata response type. */
 export interface MsgUpdateGroupPolicyMetadataResponseAmino {}
-export interface MsgUpdateGroupPolicyMetadataResponseAminoType {
+export interface MsgUpdateGroupPolicyMetadataResponseAminoMsg {
   type: "cosmos-sdk/MsgUpdateGroupPolicyMetadataResponse";
   value: MsgUpdateGroupPolicyMetadataResponseAmino;
 }
@@ -646,7 +646,7 @@ export interface MsgSubmitProposal {
    */
   exec: Exec;
 }
-export interface MsgSubmitProposalProtoType {
+export interface MsgSubmitProposalProtoMsg {
   typeUrl: "/cosmos.group.v1.MsgSubmitProposal";
   value: Uint8Array;
 }
@@ -675,7 +675,7 @@ export interface MsgSubmitProposalAmino {
    */
   exec: Exec;
 }
-export interface MsgSubmitProposalAminoType {
+export interface MsgSubmitProposalAminoMsg {
   type: "cosmos-sdk/group/MsgSubmitProposal";
   value: MsgSubmitProposalAmino;
 }
@@ -694,7 +694,7 @@ export interface MsgSubmitProposalResponse {
   /** proposal is the unique ID of the proposal. */
   proposalId: Long;
 }
-export interface MsgSubmitProposalResponseProtoType {
+export interface MsgSubmitProposalResponseProtoMsg {
   typeUrl: "/cosmos.group.v1.MsgSubmitProposalResponse";
   value: Uint8Array;
 }
@@ -704,7 +704,7 @@ export interface MsgSubmitProposalResponseAmino {
   /** proposal is the unique ID of the proposal. */
   proposal_id: string;
 }
-export interface MsgSubmitProposalResponseAminoType {
+export interface MsgSubmitProposalResponseAminoMsg {
   type: "cosmos-sdk/MsgSubmitProposalResponse";
   value: MsgSubmitProposalResponseAmino;
 }
@@ -722,7 +722,7 @@ export interface MsgWithdrawProposal {
   /** address is the admin of the group policy or one of the proposer of the proposal. */
   address: string;
 }
-export interface MsgWithdrawProposalProtoType {
+export interface MsgWithdrawProposalProtoMsg {
   typeUrl: "/cosmos.group.v1.MsgWithdrawProposal";
   value: Uint8Array;
 }
@@ -735,7 +735,7 @@ export interface MsgWithdrawProposalAmino {
   /** address is the admin of the group policy or one of the proposer of the proposal. */
   address: string;
 }
-export interface MsgWithdrawProposalAminoType {
+export interface MsgWithdrawProposalAminoMsg {
   type: "cosmos-sdk/group/MsgWithdrawProposal";
   value: MsgWithdrawProposalAmino;
 }
@@ -748,14 +748,14 @@ export interface MsgWithdrawProposalSDKType {
 
 /** MsgWithdrawProposalResponse is the Msg/WithdrawProposal response type. */
 export interface MsgWithdrawProposalResponse {}
-export interface MsgWithdrawProposalResponseProtoType {
+export interface MsgWithdrawProposalResponseProtoMsg {
   typeUrl: "/cosmos.group.v1.MsgWithdrawProposalResponse";
   value: Uint8Array;
 }
 
 /** MsgWithdrawProposalResponse is the Msg/WithdrawProposal response type. */
 export interface MsgWithdrawProposalResponseAmino {}
-export interface MsgWithdrawProposalResponseAminoType {
+export interface MsgWithdrawProposalResponseAminoMsg {
   type: "cosmos-sdk/MsgWithdrawProposalResponse";
   value: MsgWithdrawProposalResponseAmino;
 }
@@ -783,7 +783,7 @@ export interface MsgVote {
    */
   exec: Exec;
 }
-export interface MsgVoteProtoType {
+export interface MsgVoteProtoMsg {
   typeUrl: "/cosmos.group.v1.MsgVote";
   value: Uint8Array;
 }
@@ -808,7 +808,7 @@ export interface MsgVoteAmino {
    */
   exec: Exec;
 }
-export interface MsgVoteAminoType {
+export interface MsgVoteAminoMsg {
   type: "cosmos-sdk/group/MsgVote";
   value: MsgVoteAmino;
 }
@@ -824,14 +824,14 @@ export interface MsgVoteSDKType {
 
 /** MsgVoteResponse is the Msg/Vote response type. */
 export interface MsgVoteResponse {}
-export interface MsgVoteResponseProtoType {
+export interface MsgVoteResponseProtoMsg {
   typeUrl: "/cosmos.group.v1.MsgVoteResponse";
   value: Uint8Array;
 }
 
 /** MsgVoteResponse is the Msg/Vote response type. */
 export interface MsgVoteResponseAmino {}
-export interface MsgVoteResponseAminoType {
+export interface MsgVoteResponseAminoMsg {
   type: "cosmos-sdk/MsgVoteResponse";
   value: MsgVoteResponseAmino;
 }
@@ -847,7 +847,7 @@ export interface MsgExec {
   /** signer is the account address used to execute the proposal. */
   signer: string;
 }
-export interface MsgExecProtoType {
+export interface MsgExecProtoMsg {
   typeUrl: "/cosmos.group.v1.MsgExec";
   value: Uint8Array;
 }
@@ -860,7 +860,7 @@ export interface MsgExecAmino {
   /** signer is the account address used to execute the proposal. */
   signer: string;
 }
-export interface MsgExecAminoType {
+export interface MsgExecAminoMsg {
   type: "cosmos-sdk/group/MsgExec";
   value: MsgExecAmino;
 }
@@ -873,14 +873,14 @@ export interface MsgExecSDKType {
 
 /** MsgExecResponse is the Msg/Exec request type. */
 export interface MsgExecResponse {}
-export interface MsgExecResponseProtoType {
+export interface MsgExecResponseProtoMsg {
   typeUrl: "/cosmos.group.v1.MsgExecResponse";
   value: Uint8Array;
 }
 
 /** MsgExecResponse is the Msg/Exec request type. */
 export interface MsgExecResponseAmino {}
-export interface MsgExecResponseAminoType {
+export interface MsgExecResponseAminoMsg {
   type: "cosmos-sdk/MsgExecResponse";
   value: MsgExecResponseAmino;
 }
@@ -896,7 +896,7 @@ export interface MsgLeaveGroup {
   /** group_id is the unique ID of the group. */
   groupId: Long;
 }
-export interface MsgLeaveGroupProtoType {
+export interface MsgLeaveGroupProtoMsg {
   typeUrl: "/cosmos.group.v1.MsgLeaveGroup";
   value: Uint8Array;
 }
@@ -909,7 +909,7 @@ export interface MsgLeaveGroupAmino {
   /** group_id is the unique ID of the group. */
   group_id: string;
 }
-export interface MsgLeaveGroupAminoType {
+export interface MsgLeaveGroupAminoMsg {
   type: "cosmos-sdk/group/MsgLeaveGroup";
   value: MsgLeaveGroupAmino;
 }
@@ -922,14 +922,14 @@ export interface MsgLeaveGroupSDKType {
 
 /** MsgLeaveGroupResponse is the Msg/LeaveGroup response type. */
 export interface MsgLeaveGroupResponse {}
-export interface MsgLeaveGroupResponseProtoType {
+export interface MsgLeaveGroupResponseProtoMsg {
   typeUrl: "/cosmos.group.v1.MsgLeaveGroupResponse";
   value: Uint8Array;
 }
 
 /** MsgLeaveGroupResponse is the Msg/LeaveGroup response type. */
 export interface MsgLeaveGroupResponseAmino {}
-export interface MsgLeaveGroupResponseAminoType {
+export interface MsgLeaveGroupResponseAminoMsg {
   type: "cosmos-sdk/MsgLeaveGroupResponse";
   value: MsgLeaveGroupResponseAmino;
 }
@@ -946,6 +946,9 @@ function createBaseMsgCreateGroup(): MsgCreateGroup {
 }
 
 export const MsgCreateGroup = {
+  typeUrl: "/cosmos.group.v1.MsgCreateGroup",
+  aminoType: "cosmos-sdk/MsgCreateGroup",
+
   encode(message: MsgCreateGroup, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.admin !== "") {
       writer.uint32(10).string(message.admin);
@@ -1064,6 +1067,32 @@ export const MsgCreateGroup = {
 
     obj.metadata = message.metadata;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCreateGroupAminoMsg): MsgCreateGroup {
+    return MsgCreateGroup.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgCreateGroup): MsgCreateGroupAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgCreateGroup",
+      value: MsgCreateGroup.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgCreateGroupProtoMsg): MsgCreateGroup {
+    return MsgCreateGroup.decode(message.value);
+  },
+
+  toProto(message: MsgCreateGroup): Uint8Array {
+    return MsgCreateGroup.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCreateGroup): MsgCreateGroupProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.MsgCreateGroup",
+      value: MsgCreateGroup.encode(message).finish()
+    };
   }
 
 };
@@ -1075,6 +1104,9 @@ function createBaseMsgCreateGroupResponse(): MsgCreateGroupResponse {
 }
 
 export const MsgCreateGroupResponse = {
+  typeUrl: "/cosmos.group.v1.MsgCreateGroupResponse",
+  aminoType: "cosmos-sdk/MsgCreateGroupResponse",
+
   encode(message: MsgCreateGroupResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.groupId.isZero()) {
       writer.uint32(8).uint64(message.groupId);
@@ -1145,6 +1177,32 @@ export const MsgCreateGroupResponse = {
     const obj: any = {};
     obj.group_id = message.groupId ? message.groupId.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCreateGroupResponseAminoMsg): MsgCreateGroupResponse {
+    return MsgCreateGroupResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgCreateGroupResponse): MsgCreateGroupResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgCreateGroupResponse",
+      value: MsgCreateGroupResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgCreateGroupResponseProtoMsg): MsgCreateGroupResponse {
+    return MsgCreateGroupResponse.decode(message.value);
+  },
+
+  toProto(message: MsgCreateGroupResponse): Uint8Array {
+    return MsgCreateGroupResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCreateGroupResponse): MsgCreateGroupResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.MsgCreateGroupResponse",
+      value: MsgCreateGroupResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1158,6 +1216,9 @@ function createBaseMsgUpdateGroupMembers(): MsgUpdateGroupMembers {
 }
 
 export const MsgUpdateGroupMembers = {
+  typeUrl: "/cosmos.group.v1.MsgUpdateGroupMembers",
+  aminoType: "cosmos-sdk/MsgUpdateGroupMembers",
+
   encode(message: MsgUpdateGroupMembers, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.admin !== "") {
       writer.uint32(10).string(message.admin);
@@ -1276,6 +1337,32 @@ export const MsgUpdateGroupMembers = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: MsgUpdateGroupMembersAminoMsg): MsgUpdateGroupMembers {
+    return MsgUpdateGroupMembers.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgUpdateGroupMembers): MsgUpdateGroupMembersAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgUpdateGroupMembers",
+      value: MsgUpdateGroupMembers.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgUpdateGroupMembersProtoMsg): MsgUpdateGroupMembers {
+    return MsgUpdateGroupMembers.decode(message.value);
+  },
+
+  toProto(message: MsgUpdateGroupMembers): Uint8Array {
+    return MsgUpdateGroupMembers.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgUpdateGroupMembers): MsgUpdateGroupMembersProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.MsgUpdateGroupMembers",
+      value: MsgUpdateGroupMembers.encode(message).finish()
+    };
   }
 
 };
@@ -1285,6 +1372,9 @@ function createBaseMsgUpdateGroupMembersResponse(): MsgUpdateGroupMembersRespons
 }
 
 export const MsgUpdateGroupMembersResponse = {
+  typeUrl: "/cosmos.group.v1.MsgUpdateGroupMembersResponse",
+  aminoType: "cosmos-sdk/MsgUpdateGroupMembersResponse",
+
   encode(_: MsgUpdateGroupMembersResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -1337,6 +1427,32 @@ export const MsgUpdateGroupMembersResponse = {
   toAmino(_: MsgUpdateGroupMembersResponse): MsgUpdateGroupMembersResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgUpdateGroupMembersResponseAminoMsg): MsgUpdateGroupMembersResponse {
+    return MsgUpdateGroupMembersResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgUpdateGroupMembersResponse): MsgUpdateGroupMembersResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgUpdateGroupMembersResponse",
+      value: MsgUpdateGroupMembersResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgUpdateGroupMembersResponseProtoMsg): MsgUpdateGroupMembersResponse {
+    return MsgUpdateGroupMembersResponse.decode(message.value);
+  },
+
+  toProto(message: MsgUpdateGroupMembersResponse): Uint8Array {
+    return MsgUpdateGroupMembersResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgUpdateGroupMembersResponse): MsgUpdateGroupMembersResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.MsgUpdateGroupMembersResponse",
+      value: MsgUpdateGroupMembersResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1350,6 +1466,9 @@ function createBaseMsgUpdateGroupAdmin(): MsgUpdateGroupAdmin {
 }
 
 export const MsgUpdateGroupAdmin = {
+  typeUrl: "/cosmos.group.v1.MsgUpdateGroupAdmin",
+  aminoType: "cosmos-sdk/MsgUpdateGroupAdmin",
+
   encode(message: MsgUpdateGroupAdmin, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.admin !== "") {
       writer.uint32(10).string(message.admin);
@@ -1450,6 +1569,32 @@ export const MsgUpdateGroupAdmin = {
     obj.group_id = message.groupId ? message.groupId.toString() : undefined;
     obj.new_admin = message.newAdmin;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgUpdateGroupAdminAminoMsg): MsgUpdateGroupAdmin {
+    return MsgUpdateGroupAdmin.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgUpdateGroupAdmin): MsgUpdateGroupAdminAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgUpdateGroupAdmin",
+      value: MsgUpdateGroupAdmin.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgUpdateGroupAdminProtoMsg): MsgUpdateGroupAdmin {
+    return MsgUpdateGroupAdmin.decode(message.value);
+  },
+
+  toProto(message: MsgUpdateGroupAdmin): Uint8Array {
+    return MsgUpdateGroupAdmin.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgUpdateGroupAdmin): MsgUpdateGroupAdminProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.MsgUpdateGroupAdmin",
+      value: MsgUpdateGroupAdmin.encode(message).finish()
+    };
   }
 
 };
@@ -1459,6 +1604,9 @@ function createBaseMsgUpdateGroupAdminResponse(): MsgUpdateGroupAdminResponse {
 }
 
 export const MsgUpdateGroupAdminResponse = {
+  typeUrl: "/cosmos.group.v1.MsgUpdateGroupAdminResponse",
+  aminoType: "cosmos-sdk/MsgUpdateGroupAdminResponse",
+
   encode(_: MsgUpdateGroupAdminResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -1511,6 +1659,32 @@ export const MsgUpdateGroupAdminResponse = {
   toAmino(_: MsgUpdateGroupAdminResponse): MsgUpdateGroupAdminResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgUpdateGroupAdminResponseAminoMsg): MsgUpdateGroupAdminResponse {
+    return MsgUpdateGroupAdminResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgUpdateGroupAdminResponse): MsgUpdateGroupAdminResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgUpdateGroupAdminResponse",
+      value: MsgUpdateGroupAdminResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgUpdateGroupAdminResponseProtoMsg): MsgUpdateGroupAdminResponse {
+    return MsgUpdateGroupAdminResponse.decode(message.value);
+  },
+
+  toProto(message: MsgUpdateGroupAdminResponse): Uint8Array {
+    return MsgUpdateGroupAdminResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgUpdateGroupAdminResponse): MsgUpdateGroupAdminResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.MsgUpdateGroupAdminResponse",
+      value: MsgUpdateGroupAdminResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1524,6 +1698,9 @@ function createBaseMsgUpdateGroupMetadata(): MsgUpdateGroupMetadata {
 }
 
 export const MsgUpdateGroupMetadata = {
+  typeUrl: "/cosmos.group.v1.MsgUpdateGroupMetadata",
+  aminoType: "cosmos-sdk/MsgUpdateGroupMetadata",
+
   encode(message: MsgUpdateGroupMetadata, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.admin !== "") {
       writer.uint32(10).string(message.admin);
@@ -1624,6 +1801,32 @@ export const MsgUpdateGroupMetadata = {
     obj.group_id = message.groupId ? message.groupId.toString() : undefined;
     obj.metadata = message.metadata;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgUpdateGroupMetadataAminoMsg): MsgUpdateGroupMetadata {
+    return MsgUpdateGroupMetadata.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgUpdateGroupMetadata): MsgUpdateGroupMetadataAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgUpdateGroupMetadata",
+      value: MsgUpdateGroupMetadata.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgUpdateGroupMetadataProtoMsg): MsgUpdateGroupMetadata {
+    return MsgUpdateGroupMetadata.decode(message.value);
+  },
+
+  toProto(message: MsgUpdateGroupMetadata): Uint8Array {
+    return MsgUpdateGroupMetadata.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgUpdateGroupMetadata): MsgUpdateGroupMetadataProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.MsgUpdateGroupMetadata",
+      value: MsgUpdateGroupMetadata.encode(message).finish()
+    };
   }
 
 };
@@ -1633,6 +1836,9 @@ function createBaseMsgUpdateGroupMetadataResponse(): MsgUpdateGroupMetadataRespo
 }
 
 export const MsgUpdateGroupMetadataResponse = {
+  typeUrl: "/cosmos.group.v1.MsgUpdateGroupMetadataResponse",
+  aminoType: "cosmos-sdk/MsgUpdateGroupMetadataResponse",
+
   encode(_: MsgUpdateGroupMetadataResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -1685,6 +1891,32 @@ export const MsgUpdateGroupMetadataResponse = {
   toAmino(_: MsgUpdateGroupMetadataResponse): MsgUpdateGroupMetadataResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgUpdateGroupMetadataResponseAminoMsg): MsgUpdateGroupMetadataResponse {
+    return MsgUpdateGroupMetadataResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgUpdateGroupMetadataResponse): MsgUpdateGroupMetadataResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgUpdateGroupMetadataResponse",
+      value: MsgUpdateGroupMetadataResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgUpdateGroupMetadataResponseProtoMsg): MsgUpdateGroupMetadataResponse {
+    return MsgUpdateGroupMetadataResponse.decode(message.value);
+  },
+
+  toProto(message: MsgUpdateGroupMetadataResponse): Uint8Array {
+    return MsgUpdateGroupMetadataResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgUpdateGroupMetadataResponse): MsgUpdateGroupMetadataResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.MsgUpdateGroupMetadataResponse",
+      value: MsgUpdateGroupMetadataResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1699,6 +1931,9 @@ function createBaseMsgCreateGroupPolicy(): MsgCreateGroupPolicy {
 }
 
 export const MsgCreateGroupPolicy = {
+  typeUrl: "/cosmos.group.v1.MsgCreateGroupPolicy",
+  aminoType: "cosmos-sdk/MsgCreateGroupPolicy",
+
   encode(message: MsgCreateGroupPolicy, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.admin !== "") {
       writer.uint32(10).string(message.admin);
@@ -1814,6 +2049,32 @@ export const MsgCreateGroupPolicy = {
     obj.metadata = message.metadata;
     obj.decision_policy = message.decisionPolicy ? DecisionPolicy_ToAmino((message.decisionPolicy as Any)) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCreateGroupPolicyAminoMsg): MsgCreateGroupPolicy {
+    return MsgCreateGroupPolicy.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgCreateGroupPolicy): MsgCreateGroupPolicyAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgCreateGroupPolicy",
+      value: MsgCreateGroupPolicy.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgCreateGroupPolicyProtoMsg): MsgCreateGroupPolicy {
+    return MsgCreateGroupPolicy.decode(message.value);
+  },
+
+  toProto(message: MsgCreateGroupPolicy): Uint8Array {
+    return MsgCreateGroupPolicy.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCreateGroupPolicy): MsgCreateGroupPolicyProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.MsgCreateGroupPolicy",
+      value: MsgCreateGroupPolicy.encode(message).finish()
+    };
   }
 
 };
@@ -1825,6 +2086,9 @@ function createBaseMsgCreateGroupPolicyResponse(): MsgCreateGroupPolicyResponse
 }
 
 export const MsgCreateGroupPolicyResponse = {
+  typeUrl: "/cosmos.group.v1.MsgCreateGroupPolicyResponse",
+  aminoType: "cosmos-sdk/MsgCreateGroupPolicyResponse",
+
   encode(message: MsgCreateGroupPolicyResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.address !== "") {
       writer.uint32(10).string(message.address);
@@ -1895,6 +2159,32 @@ export const MsgCreateGroupPolicyResponse = {
     const obj: any = {};
     obj.address = message.address;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCreateGroupPolicyResponseAminoMsg): MsgCreateGroupPolicyResponse {
+    return MsgCreateGroupPolicyResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgCreateGroupPolicyResponse): MsgCreateGroupPolicyResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgCreateGroupPolicyResponse",
+      value: MsgCreateGroupPolicyResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgCreateGroupPolicyResponseProtoMsg): MsgCreateGroupPolicyResponse {
+    return MsgCreateGroupPolicyResponse.decode(message.value);
+  },
+
+  toProto(message: MsgCreateGroupPolicyResponse): Uint8Array {
+    return MsgCreateGroupPolicyResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCreateGroupPolicyResponse): MsgCreateGroupPolicyResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.MsgCreateGroupPolicyResponse",
+      value: MsgCreateGroupPolicyResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1908,6 +2198,9 @@ function createBaseMsgUpdateGroupPolicyAdmin(): MsgUpdateGroupPolicyAdmin {
 }
 
 export const MsgUpdateGroupPolicyAdmin = {
+  typeUrl: "/cosmos.group.v1.MsgUpdateGroupPolicyAdmin",
+  aminoType: "cosmos-sdk/MsgUpdateGroupPolicyAdmin",
+
   encode(message: MsgUpdateGroupPolicyAdmin, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.admin !== "") {
       writer.uint32(10).string(message.admin);
@@ -2008,6 +2301,32 @@ export const MsgUpdateGroupPolicyAdmin = {
     obj.address = message.address;
     obj.new_admin = message.newAdmin;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgUpdateGroupPolicyAdminAminoMsg): MsgUpdateGroupPolicyAdmin {
+    return MsgUpdateGroupPolicyAdmin.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgUpdateGroupPolicyAdmin): MsgUpdateGroupPolicyAdminAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgUpdateGroupPolicyAdmin",
+      value: MsgUpdateGroupPolicyAdmin.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgUpdateGroupPolicyAdminProtoMsg): MsgUpdateGroupPolicyAdmin {
+    return MsgUpdateGroupPolicyAdmin.decode(message.value);
+  },
+
+  toProto(message: MsgUpdateGroupPolicyAdmin): Uint8Array {
+    return MsgUpdateGroupPolicyAdmin.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgUpdateGroupPolicyAdmin): MsgUpdateGroupPolicyAdminProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.MsgUpdateGroupPolicyAdmin",
+      value: MsgUpdateGroupPolicyAdmin.encode(message).finish()
+    };
   }
 
 };
@@ -2024,6 +2343,9 @@ function createBaseMsgCreateGroupWithPolicy(): MsgCreateGroupWithPolicy {
 }
 
 export const MsgCreateGroupWithPolicy = {
+  typeUrl: "/cosmos.group.v1.MsgCreateGroupWithPolicy",
+  aminoType: "cosmos-sdk/MsgCreateGroupWithPolicy",
+
   encode(message: MsgCreateGroupWithPolicy, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.admin !== "") {
       writer.uint32(10).string(message.admin);
@@ -2187,6 +2509,32 @@ export const MsgCreateGroupWithPolicy = {
     obj.group_policy_as_admin = message.groupPolicyAsAdmin;
     obj.decision_policy = message.decisionPolicy ? DecisionPolicy_ToAmino((message.decisionPolicy as Any)) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCreateGroupWithPolicyAminoMsg): MsgCreateGroupWithPolicy {
+    return MsgCreateGroupWithPolicy.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgCreateGroupWithPolicy): MsgCreateGroupWithPolicyAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgCreateGroupWithPolicy",
+      value: MsgCreateGroupWithPolicy.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgCreateGroupWithPolicyProtoMsg): MsgCreateGroupWithPolicy {
+    return MsgCreateGroupWithPolicy.decode(message.value);
+  },
+
+  toProto(message: MsgCreateGroupWithPolicy): Uint8Array {
+    return MsgCreateGroupWithPolicy.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCreateGroupWithPolicy): MsgCreateGroupWithPolicyProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.MsgCreateGroupWithPolicy",
+      value: MsgCreateGroupWithPolicy.encode(message).finish()
+    };
   }
 
 };
@@ -2199,6 +2547,9 @@ function createBaseMsgCreateGroupWithPolicyResponse(): MsgCreateGroupWithPolicyR
 }
 
 export const MsgCreateGroupWithPolicyResponse = {
+  typeUrl: "/cosmos.group.v1.MsgCreateGroupWithPolicyResponse",
+  aminoType: "cosmos-sdk/MsgCreateGroupWithPolicyResponse",
+
   encode(message: MsgCreateGroupWithPolicyResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.groupId.isZero()) {
       writer.uint32(8).uint64(message.groupId);
@@ -2284,6 +2635,32 @@ export const MsgCreateGroupWithPolicyResponse = {
     obj.group_id = message.groupId ? message.groupId.toString() : undefined;
     obj.group_policy_address = message.groupPolicyAddress;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCreateGroupWithPolicyResponseAminoMsg): MsgCreateGroupWithPolicyResponse {
+    return MsgCreateGroupWithPolicyResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgCreateGroupWithPolicyResponse): MsgCreateGroupWithPolicyResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgCreateGroupWithPolicyResponse",
+      value: MsgCreateGroupWithPolicyResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgCreateGroupWithPolicyResponseProtoMsg): MsgCreateGroupWithPolicyResponse {
+    return MsgCreateGroupWithPolicyResponse.decode(message.value);
+  },
+
+  toProto(message: MsgCreateGroupWithPolicyResponse): Uint8Array {
+    return MsgCreateGroupWithPolicyResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCreateGroupWithPolicyResponse): MsgCreateGroupWithPolicyResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.MsgCreateGroupWithPolicyResponse",
+      value: MsgCreateGroupWithPolicyResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2293,6 +2670,9 @@ function createBaseMsgUpdateGroupPolicyAdminResponse(): MsgUpdateGroupPolicyAdmi
 }
 
 export const MsgUpdateGroupPolicyAdminResponse = {
+  typeUrl: "/cosmos.group.v1.MsgUpdateGroupPolicyAdminResponse",
+  aminoType: "cosmos-sdk/MsgUpdateGroupPolicyAdminResponse",
+
   encode(_: MsgUpdateGroupPolicyAdminResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -2345,6 +2725,32 @@ export const MsgUpdateGroupPolicyAdminResponse = {
   toAmino(_: MsgUpdateGroupPolicyAdminResponse): MsgUpdateGroupPolicyAdminResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgUpdateGroupPolicyAdminResponseAminoMsg): MsgUpdateGroupPolicyAdminResponse {
+    return MsgUpdateGroupPolicyAdminResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgUpdateGroupPolicyAdminResponse): MsgUpdateGroupPolicyAdminResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgUpdateGroupPolicyAdminResponse",
+      value: MsgUpdateGroupPolicyAdminResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgUpdateGroupPolicyAdminResponseProtoMsg): MsgUpdateGroupPolicyAdminResponse {
+    return MsgUpdateGroupPolicyAdminResponse.decode(message.value);
+  },
+
+  toProto(message: MsgUpdateGroupPolicyAdminResponse): Uint8Array {
+    return MsgUpdateGroupPolicyAdminResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgUpdateGroupPolicyAdminResponse): MsgUpdateGroupPolicyAdminResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.MsgUpdateGroupPolicyAdminResponse",
+      value: MsgUpdateGroupPolicyAdminResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2358,6 +2764,9 @@ function createBaseMsgUpdateGroupPolicyDecisionPolicy(): MsgUpdateGroupPolicyDec
 }
 
 export const MsgUpdateGroupPolicyDecisionPolicy = {
+  typeUrl: "/cosmos.group.v1.MsgUpdateGroupPolicyDecisionPolicy",
+  aminoType: "cosmos-sdk/MsgUpdateGroupPolicyDecisionPolicy",
+
   encode(message: MsgUpdateGroupPolicyDecisionPolicy, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.admin !== "") {
       writer.uint32(10).string(message.admin);
@@ -2458,6 +2867,32 @@ export const MsgUpdateGroupPolicyDecisionPolicy = {
     obj.address = message.address;
     obj.decision_policy = message.decisionPolicy ? DecisionPolicy_ToAmino((message.decisionPolicy as Any)) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgUpdateGroupPolicyDecisionPolicyAminoMsg): MsgUpdateGroupPolicyDecisionPolicy {
+    return MsgUpdateGroupPolicyDecisionPolicy.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgUpdateGroupPolicyDecisionPolicy): MsgUpdateGroupPolicyDecisionPolicyAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgUpdateGroupPolicyDecisionPolicy",
+      value: MsgUpdateGroupPolicyDecisionPolicy.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgUpdateGroupPolicyDecisionPolicyProtoMsg): MsgUpdateGroupPolicyDecisionPolicy {
+    return MsgUpdateGroupPolicyDecisionPolicy.decode(message.value);
+  },
+
+  toProto(message: MsgUpdateGroupPolicyDecisionPolicy): Uint8Array {
+    return MsgUpdateGroupPolicyDecisionPolicy.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgUpdateGroupPolicyDecisionPolicy): MsgUpdateGroupPolicyDecisionPolicyProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.MsgUpdateGroupPolicyDecisionPolicy",
+      value: MsgUpdateGroupPolicyDecisionPolicy.encode(message).finish()
+    };
   }
 
 };
@@ -2467,6 +2902,9 @@ function createBaseMsgUpdateGroupPolicyDecisionPolicyResponse(): MsgUpdateGroupP
 }
 
 export const MsgUpdateGroupPolicyDecisionPolicyResponse = {
+  typeUrl: "/cosmos.group.v1.MsgUpdateGroupPolicyDecisionPolicyResponse",
+  aminoType: "cosmos-sdk/MsgUpdateGroupPolicyDecisionPolicyResponse",
+
   encode(_: MsgUpdateGroupPolicyDecisionPolicyResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -2519,6 +2957,32 @@ export const MsgUpdateGroupPolicyDecisionPolicyResponse = {
   toAmino(_: MsgUpdateGroupPolicyDecisionPolicyResponse): MsgUpdateGroupPolicyDecisionPolicyResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgUpdateGroupPolicyDecisionPolicyResponseAminoMsg): MsgUpdateGroupPolicyDecisionPolicyResponse {
+    return MsgUpdateGroupPolicyDecisionPolicyResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgUpdateGroupPolicyDecisionPolicyResponse): MsgUpdateGroupPolicyDecisionPolicyResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgUpdateGroupPolicyDecisionPolicyResponse",
+      value: MsgUpdateGroupPolicyDecisionPolicyResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgUpdateGroupPolicyDecisionPolicyResponseProtoMsg): MsgUpdateGroupPolicyDecisionPolicyResponse {
+    return MsgUpdateGroupPolicyDecisionPolicyResponse.decode(message.value);
+  },
+
+  toProto(message: MsgUpdateGroupPolicyDecisionPolicyResponse): Uint8Array {
+    return MsgUpdateGroupPolicyDecisionPolicyResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgUpdateGroupPolicyDecisionPolicyResponse): MsgUpdateGroupPolicyDecisionPolicyResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.MsgUpdateGroupPolicyDecisionPolicyResponse",
+      value: MsgUpdateGroupPolicyDecisionPolicyResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2532,6 +2996,9 @@ function createBaseMsgUpdateGroupPolicyMetadata(): MsgUpdateGroupPolicyMetadata
 }
 
 export const MsgUpdateGroupPolicyMetadata = {
+  typeUrl: "/cosmos.group.v1.MsgUpdateGroupPolicyMetadata",
+  aminoType: "cosmos-sdk/MsgUpdateGroupPolicyMetadata",
+
   encode(message: MsgUpdateGroupPolicyMetadata, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.admin !== "") {
       writer.uint32(10).string(message.admin);
@@ -2632,6 +3099,32 @@ export const MsgUpdateGroupPolicyMetadata = {
     obj.address = message.address;
     obj.metadata = message.metadata;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgUpdateGroupPolicyMetadataAminoMsg): MsgUpdateGroupPolicyMetadata {
+    return MsgUpdateGroupPolicyMetadata.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgUpdateGroupPolicyMetadata): MsgUpdateGroupPolicyMetadataAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgUpdateGroupPolicyMetadata",
+      value: MsgUpdateGroupPolicyMetadata.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgUpdateGroupPolicyMetadataProtoMsg): MsgUpdateGroupPolicyMetadata {
+    return MsgUpdateGroupPolicyMetadata.decode(message.value);
+  },
+
+  toProto(message: MsgUpdateGroupPolicyMetadata): Uint8Array {
+    return MsgUpdateGroupPolicyMetadata.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgUpdateGroupPolicyMetadata): MsgUpdateGroupPolicyMetadataProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.MsgUpdateGroupPolicyMetadata",
+      value: MsgUpdateGroupPolicyMetadata.encode(message).finish()
+    };
   }
 
 };
@@ -2641,6 +3134,9 @@ function createBaseMsgUpdateGroupPolicyMetadataResponse(): MsgUpdateGroupPolicyM
 }
 
 export const MsgUpdateGroupPolicyMetadataResponse = {
+  typeUrl: "/cosmos.group.v1.MsgUpdateGroupPolicyMetadataResponse",
+  aminoType: "cosmos-sdk/MsgUpdateGroupPolicyMetadataResponse",
+
   encode(_: MsgUpdateGroupPolicyMetadataResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -2693,6 +3189,32 @@ export const MsgUpdateGroupPolicyMetadataResponse = {
   toAmino(_: MsgUpdateGroupPolicyMetadataResponse): MsgUpdateGroupPolicyMetadataResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgUpdateGroupPolicyMetadataResponseAminoMsg): MsgUpdateGroupPolicyMetadataResponse {
+    return MsgUpdateGroupPolicyMetadataResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgUpdateGroupPolicyMetadataResponse): MsgUpdateGroupPolicyMetadataResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgUpdateGroupPolicyMetadataResponse",
+      value: MsgUpdateGroupPolicyMetadataResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgUpdateGroupPolicyMetadataResponseProtoMsg): MsgUpdateGroupPolicyMetadataResponse {
+    return MsgUpdateGroupPolicyMetadataResponse.decode(message.value);
+  },
+
+  toProto(message: MsgUpdateGroupPolicyMetadataResponse): Uint8Array {
+    return MsgUpdateGroupPolicyMetadataResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgUpdateGroupPolicyMetadataResponse): MsgUpdateGroupPolicyMetadataResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.MsgUpdateGroupPolicyMetadataResponse",
+      value: MsgUpdateGroupPolicyMetadataResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2708,6 +3230,9 @@ function createBaseMsgSubmitProposal(): MsgSubmitProposal {
 }
 
 export const MsgSubmitProposal = {
+  typeUrl: "/cosmos.group.v1.MsgSubmitProposal",
+  aminoType: "cosmos-sdk/group/MsgSubmitProposal",
+
   encode(message: MsgSubmitProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.address !== "") {
       writer.uint32(10).string(message.address);
@@ -2874,6 +3399,32 @@ export const MsgSubmitProposal = {
 
     obj.exec = message.exec;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgSubmitProposalAminoMsg): MsgSubmitProposal {
+    return MsgSubmitProposal.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgSubmitProposal): MsgSubmitProposalAminoMsg {
+    return {
+      type: "cosmos-sdk/group/MsgSubmitProposal",
+      value: MsgSubmitProposal.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgSubmitProposalProtoMsg): MsgSubmitProposal {
+    return MsgSubmitProposal.decode(message.value);
+  },
+
+  toProto(message: MsgSubmitProposal): Uint8Array {
+    return MsgSubmitProposal.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgSubmitProposal): MsgSubmitProposalProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.MsgSubmitProposal",
+      value: MsgSubmitProposal.encode(message).finish()
+    };
   }
 
 };
@@ -2885,6 +3436,9 @@ function createBaseMsgSubmitProposalResponse(): MsgSubmitProposalResponse {
 }
 
 export const MsgSubmitProposalResponse = {
+  typeUrl: "/cosmos.group.v1.MsgSubmitProposalResponse",
+  aminoType: "cosmos-sdk/MsgSubmitProposalResponse",
+
   encode(message: MsgSubmitProposalResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.proposalId.isZero()) {
       writer.uint32(8).uint64(message.proposalId);
@@ -2955,6 +3509,32 @@ export const MsgSubmitProposalResponse = {
     const obj: any = {};
     obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgSubmitProposalResponseAminoMsg): MsgSubmitProposalResponse {
+    return MsgSubmitProposalResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgSubmitProposalResponse): MsgSubmitProposalResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgSubmitProposalResponse",
+      value: MsgSubmitProposalResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgSubmitProposalResponseProtoMsg): MsgSubmitProposalResponse {
+    return MsgSubmitProposalResponse.decode(message.value);
+  },
+
+  toProto(message: MsgSubmitProposalResponse): Uint8Array {
+    return MsgSubmitProposalResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgSubmitProposalResponse): MsgSubmitProposalResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.MsgSubmitProposalResponse",
+      value: MsgSubmitProposalResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2967,6 +3547,9 @@ function createBaseMsgWithdrawProposal(): MsgWithdrawProposal {
 }
 
 export const MsgWithdrawProposal = {
+  typeUrl: "/cosmos.group.v1.MsgWithdrawProposal",
+  aminoType: "cosmos-sdk/group/MsgWithdrawProposal",
+
   encode(message: MsgWithdrawProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.proposalId.isZero()) {
       writer.uint32(8).uint64(message.proposalId);
@@ -3052,6 +3635,32 @@ export const MsgWithdrawProposal = {
     obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined;
     obj.address = message.address;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgWithdrawProposalAminoMsg): MsgWithdrawProposal {
+    return MsgWithdrawProposal.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgWithdrawProposal): MsgWithdrawProposalAminoMsg {
+    return {
+      type: "cosmos-sdk/group/MsgWithdrawProposal",
+      value: MsgWithdrawProposal.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgWithdrawProposalProtoMsg): MsgWithdrawProposal {
+    return MsgWithdrawProposal.decode(message.value);
+  },
+
+  toProto(message: MsgWithdrawProposal): Uint8Array {
+    return MsgWithdrawProposal.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgWithdrawProposal): MsgWithdrawProposalProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.MsgWithdrawProposal",
+      value: MsgWithdrawProposal.encode(message).finish()
+    };
   }
 
 };
@@ -3061,6 +3670,9 @@ function createBaseMsgWithdrawProposalResponse(): MsgWithdrawProposalResponse {
 }
 
 export const MsgWithdrawProposalResponse = {
+  typeUrl: "/cosmos.group.v1.MsgWithdrawProposalResponse",
+  aminoType: "cosmos-sdk/MsgWithdrawProposalResponse",
+
   encode(_: MsgWithdrawProposalResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -3113,6 +3725,32 @@ export const MsgWithdrawProposalResponse = {
   toAmino(_: MsgWithdrawProposalResponse): MsgWithdrawProposalResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgWithdrawProposalResponseAminoMsg): MsgWithdrawProposalResponse {
+    return MsgWithdrawProposalResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgWithdrawProposalResponse): MsgWithdrawProposalResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgWithdrawProposalResponse",
+      value: MsgWithdrawProposalResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgWithdrawProposalResponseProtoMsg): MsgWithdrawProposalResponse {
+    return MsgWithdrawProposalResponse.decode(message.value);
+  },
+
+  toProto(message: MsgWithdrawProposalResponse): Uint8Array {
+    return MsgWithdrawProposalResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgWithdrawProposalResponse): MsgWithdrawProposalResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.MsgWithdrawProposalResponse",
+      value: MsgWithdrawProposalResponse.encode(message).finish()
+    };
   }
 
 };
@@ -3128,6 +3766,9 @@ function createBaseMsgVote(): MsgVote {
 }
 
 export const MsgVote = {
+  typeUrl: "/cosmos.group.v1.MsgVote",
+  aminoType: "cosmos-sdk/group/MsgVote",
+
   encode(message: MsgVote, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.proposalId.isZero()) {
       writer.uint32(8).uint64(message.proposalId);
@@ -3258,6 +3899,32 @@ export const MsgVote = {
     obj.metadata = message.metadata;
     obj.exec = message.exec;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgVoteAminoMsg): MsgVote {
+    return MsgVote.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgVote): MsgVoteAminoMsg {
+    return {
+      type: "cosmos-sdk/group/MsgVote",
+      value: MsgVote.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgVoteProtoMsg): MsgVote {
+    return MsgVote.decode(message.value);
+  },
+
+  toProto(message: MsgVote): Uint8Array {
+    return MsgVote.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgVote): MsgVoteProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.MsgVote",
+      value: MsgVote.encode(message).finish()
+    };
   }
 
 };
@@ -3267,6 +3934,9 @@ function createBaseMsgVoteResponse(): MsgVoteResponse {
 }
 
 export const MsgVoteResponse = {
+  typeUrl: "/cosmos.group.v1.MsgVoteResponse",
+  aminoType: "cosmos-sdk/MsgVoteResponse",
+
   encode(_: MsgVoteResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -3319,6 +3989,32 @@ export const MsgVoteResponse = {
   toAmino(_: MsgVoteResponse): MsgVoteResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgVoteResponseAminoMsg): MsgVoteResponse {
+    return MsgVoteResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgVoteResponse): MsgVoteResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgVoteResponse",
+      value: MsgVoteResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgVoteResponseProtoMsg): MsgVoteResponse {
+    return MsgVoteResponse.decode(message.value);
+  },
+
+  toProto(message: MsgVoteResponse): Uint8Array {
+    return MsgVoteResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgVoteResponse): MsgVoteResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.MsgVoteResponse",
+      value: MsgVoteResponse.encode(message).finish()
+    };
   }
 
 };
@@ -3331,6 +4027,9 @@ function createBaseMsgExec(): MsgExec {
 }
 
 export const MsgExec = {
+  typeUrl: "/cosmos.group.v1.MsgExec",
+  aminoType: "cosmos-sdk/group/MsgExec",
+
   encode(message: MsgExec, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.proposalId.isZero()) {
       writer.uint32(8).uint64(message.proposalId);
@@ -3416,6 +4115,32 @@ export const MsgExec = {
     obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined;
     obj.signer = message.signer;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgExecAminoMsg): MsgExec {
+    return MsgExec.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgExec): MsgExecAminoMsg {
+    return {
+      type: "cosmos-sdk/group/MsgExec",
+      value: MsgExec.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgExecProtoMsg): MsgExec {
+    return MsgExec.decode(message.value);
+  },
+
+  toProto(message: MsgExec): Uint8Array {
+    return MsgExec.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgExec): MsgExecProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.MsgExec",
+      value: MsgExec.encode(message).finish()
+    };
   }
 
 };
@@ -3425,6 +4150,9 @@ function createBaseMsgExecResponse(): MsgExecResponse {
 }
 
 export const MsgExecResponse = {
+  typeUrl: "/cosmos.group.v1.MsgExecResponse",
+  aminoType: "cosmos-sdk/MsgExecResponse",
+
   encode(_: MsgExecResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -3477,6 +4205,32 @@ export const MsgExecResponse = {
   toAmino(_: MsgExecResponse): MsgExecResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgExecResponseAminoMsg): MsgExecResponse {
+    return MsgExecResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgExecResponse): MsgExecResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgExecResponse",
+      value: MsgExecResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgExecResponseProtoMsg): MsgExecResponse {
+    return MsgExecResponse.decode(message.value);
+  },
+
+  toProto(message: MsgExecResponse): Uint8Array {
+    return MsgExecResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgExecResponse): MsgExecResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.MsgExecResponse",
+      value: MsgExecResponse.encode(message).finish()
+    };
   }
 
 };
@@ -3489,6 +4243,9 @@ function createBaseMsgLeaveGroup(): MsgLeaveGroup {
 }
 
 export const MsgLeaveGroup = {
+  typeUrl: "/cosmos.group.v1.MsgLeaveGroup",
+  aminoType: "cosmos-sdk/group/MsgLeaveGroup",
+
   encode(message: MsgLeaveGroup, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.address !== "") {
       writer.uint32(10).string(message.address);
@@ -3574,6 +4331,32 @@ export const MsgLeaveGroup = {
     obj.address = message.address;
     obj.group_id = message.groupId ? message.groupId.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgLeaveGroupAminoMsg): MsgLeaveGroup {
+    return MsgLeaveGroup.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgLeaveGroup): MsgLeaveGroupAminoMsg {
+    return {
+      type: "cosmos-sdk/group/MsgLeaveGroup",
+      value: MsgLeaveGroup.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgLeaveGroupProtoMsg): MsgLeaveGroup {
+    return MsgLeaveGroup.decode(message.value);
+  },
+
+  toProto(message: MsgLeaveGroup): Uint8Array {
+    return MsgLeaveGroup.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgLeaveGroup): MsgLeaveGroupProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.MsgLeaveGroup",
+      value: MsgLeaveGroup.encode(message).finish()
+    };
   }
 
 };
@@ -3583,6 +4366,9 @@ function createBaseMsgLeaveGroupResponse(): MsgLeaveGroupResponse {
 }
 
 export const MsgLeaveGroupResponse = {
+  typeUrl: "/cosmos.group.v1.MsgLeaveGroupResponse",
+  aminoType: "cosmos-sdk/MsgLeaveGroupResponse",
+
   encode(_: MsgLeaveGroupResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -3635,6 +4421,32 @@ export const MsgLeaveGroupResponse = {
   toAmino(_: MsgLeaveGroupResponse): MsgLeaveGroupResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgLeaveGroupResponseAminoMsg): MsgLeaveGroupResponse {
+    return MsgLeaveGroupResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgLeaveGroupResponse): MsgLeaveGroupResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgLeaveGroupResponse",
+      value: MsgLeaveGroupResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgLeaveGroupResponseProtoMsg): MsgLeaveGroupResponse {
+    return MsgLeaveGroupResponse.decode(message.value);
+  },
+
+  toProto(message: MsgLeaveGroupResponse): Uint8Array {
+    return MsgLeaveGroupResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgLeaveGroupResponse): MsgLeaveGroupResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.MsgLeaveGroupResponse",
+      value: MsgLeaveGroupResponse.encode(message).finish()
+    };
   }
 
 };
diff --git a/__fixtures__/outputv2/cosmos/group/v1/types.ts b/__fixtures__/outputv2/cosmos/group/v1/types.ts
index ac027a63d..c302e62f8 100644
--- a/__fixtures__/outputv2/cosmos/group/v1/types.ts
+++ b/__fixtures__/outputv2/cosmos/group/v1/types.ts
@@ -289,7 +289,7 @@ export interface Member {
   /** added_at is a timestamp specifying when a member was added. */
   addedAt?: Date;
 }
-export interface MemberProtoType {
+export interface MemberProtoMsg {
   typeUrl: "/cosmos.group.v1.Member";
   value: Uint8Array;
 }
@@ -311,7 +311,7 @@ export interface MemberAmino {
   /** added_at is a timestamp specifying when a member was added. */
   added_at?: Date;
 }
-export interface MemberAminoType {
+export interface MemberAminoMsg {
   type: "cosmos-sdk/Member";
   value: MemberAmino;
 }
@@ -332,7 +332,7 @@ export interface Members {
   /** members is the list of members. */
   members: Member[];
 }
-export interface MembersProtoType {
+export interface MembersProtoMsg {
   typeUrl: "/cosmos.group.v1.Members";
   value: Uint8Array;
 }
@@ -342,7 +342,7 @@ export interface MembersAmino {
   /** members is the list of members. */
   members: MemberAmino[];
 }
-export interface MembersAminoType {
+export interface MembersAminoMsg {
   type: "cosmos-sdk/Members";
   value: MembersAmino;
 }
@@ -360,7 +360,7 @@ export interface ThresholdDecisionPolicy {
   /** windows defines the different windows for voting and execution. */
   windows?: DecisionPolicyWindows;
 }
-export interface ThresholdDecisionPolicyProtoType {
+export interface ThresholdDecisionPolicyProtoMsg {
   typeUrl: "/cosmos.group.v1.ThresholdDecisionPolicy";
   value: Uint8Array;
 }
@@ -373,7 +373,7 @@ export interface ThresholdDecisionPolicyAmino {
   /** windows defines the different windows for voting and execution. */
   windows?: DecisionPolicyWindowsAmino;
 }
-export interface ThresholdDecisionPolicyAminoType {
+export interface ThresholdDecisionPolicyAminoMsg {
   type: "cosmos-sdk/ThresholdDecisionPolicy";
   value: ThresholdDecisionPolicyAmino;
 }
@@ -392,7 +392,7 @@ export interface PercentageDecisionPolicy {
   /** windows defines the different windows for voting and execution. */
   windows?: DecisionPolicyWindows;
 }
-export interface PercentageDecisionPolicyProtoType {
+export interface PercentageDecisionPolicyProtoMsg {
   typeUrl: "/cosmos.group.v1.PercentageDecisionPolicy";
   value: Uint8Array;
 }
@@ -405,7 +405,7 @@ export interface PercentageDecisionPolicyAmino {
   /** windows defines the different windows for voting and execution. */
   windows?: DecisionPolicyWindowsAmino;
 }
-export interface PercentageDecisionPolicyAminoType {
+export interface PercentageDecisionPolicyAminoMsg {
   type: "cosmos-sdk/PercentageDecisionPolicy";
   value: PercentageDecisionPolicyAmino;
 }
@@ -439,7 +439,7 @@ export interface DecisionPolicyWindows {
    */
   minExecutionPeriod?: Duration;
 }
-export interface DecisionPolicyWindowsProtoType {
+export interface DecisionPolicyWindowsProtoMsg {
   typeUrl: "/cosmos.group.v1.DecisionPolicyWindows";
   value: Uint8Array;
 }
@@ -467,7 +467,7 @@ export interface DecisionPolicyWindowsAmino {
    */
   min_execution_period?: DurationAmino;
 }
-export interface DecisionPolicyWindowsAminoType {
+export interface DecisionPolicyWindowsAminoMsg {
   type: "cosmos-sdk/DecisionPolicyWindows";
   value: DecisionPolicyWindowsAmino;
 }
@@ -503,7 +503,7 @@ export interface GroupInfo {
   /** created_at is a timestamp specifying when a group was created. */
   createdAt?: Date;
 }
-export interface GroupInfoProtoType {
+export interface GroupInfoProtoMsg {
   typeUrl: "/cosmos.group.v1.GroupInfo";
   value: Uint8Array;
 }
@@ -533,7 +533,7 @@ export interface GroupInfoAmino {
   /** created_at is a timestamp specifying when a group was created. */
   created_at?: Date;
 }
-export interface GroupInfoAminoType {
+export interface GroupInfoAminoMsg {
   type: "cosmos-sdk/GroupInfo";
   value: GroupInfoAmino;
 }
@@ -556,7 +556,7 @@ export interface GroupMember {
   /** member is the member data. */
   member?: Member;
 }
-export interface GroupMemberProtoType {
+export interface GroupMemberProtoMsg {
   typeUrl: "/cosmos.group.v1.GroupMember";
   value: Uint8Array;
 }
@@ -569,7 +569,7 @@ export interface GroupMemberAmino {
   /** member is the member data. */
   member?: MemberAmino;
 }
-export interface GroupMemberAminoType {
+export interface GroupMemberAminoMsg {
   type: "cosmos-sdk/GroupMember";
   value: GroupMemberAmino;
 }
@@ -606,7 +606,7 @@ export interface GroupPolicyInfo {
   /** created_at is a timestamp specifying when a group policy was created. */
   createdAt?: Date;
 }
-export interface GroupPolicyInfoProtoType {
+export interface GroupPolicyInfoProtoMsg {
   typeUrl: "/cosmos.group.v1.GroupPolicyInfo";
   value: Uint8Array;
 }
@@ -637,7 +637,7 @@ export interface GroupPolicyInfoAmino {
   /** created_at is a timestamp specifying when a group policy was created. */
   created_at?: Date;
 }
-export interface GroupPolicyInfoAminoType {
+export interface GroupPolicyInfoAminoMsg {
   type: "cosmos-sdk/GroupPolicyInfo";
   value: GroupPolicyInfoAmino;
 }
@@ -719,7 +719,7 @@ export interface Proposal {
   /** messages is a list of Msgs that will be executed if the proposal passes. */
   messages: Any[];
 }
-export interface ProposalProtoType {
+export interface ProposalProtoMsg {
   typeUrl: "/cosmos.group.v1.Proposal";
   value: Uint8Array;
 }
@@ -790,7 +790,7 @@ export interface ProposalAmino {
   /** messages is a list of Msgs that will be executed if the proposal passes. */
   messages: AnyAmino[];
 }
-export interface ProposalAminoType {
+export interface ProposalAminoMsg {
   type: "cosmos-sdk/Proposal";
   value: ProposalAmino;
 }
@@ -831,7 +831,7 @@ export interface TallyResult {
   /** no_with_veto_count is the weighted sum of veto. */
   noWithVetoCount: string;
 }
-export interface TallyResultProtoType {
+export interface TallyResultProtoMsg {
   typeUrl: "/cosmos.group.v1.TallyResult";
   value: Uint8Array;
 }
@@ -850,7 +850,7 @@ export interface TallyResultAmino {
   /** no_with_veto_count is the weighted sum of veto. */
   no_with_veto_count: string;
 }
-export interface TallyResultAminoType {
+export interface TallyResultAminoMsg {
   type: "cosmos-sdk/TallyResult";
   value: TallyResultAmino;
 }
@@ -880,7 +880,7 @@ export interface Vote {
   /** submit_time is the timestamp when the vote was submitted. */
   submitTime?: Date;
 }
-export interface VoteProtoType {
+export interface VoteProtoMsg {
   typeUrl: "/cosmos.group.v1.Vote";
   value: Uint8Array;
 }
@@ -902,7 +902,7 @@ export interface VoteAmino {
   /** submit_time is the timestamp when the vote was submitted. */
   submit_time?: Date;
 }
-export interface VoteAminoType {
+export interface VoteAminoMsg {
   type: "cosmos-sdk/Vote";
   value: VoteAmino;
 }
@@ -926,6 +926,9 @@ function createBaseMember(): Member {
 }
 
 export const Member = {
+  typeUrl: "/cosmos.group.v1.Member",
+  aminoType: "cosmos-sdk/Member",
+
   encode(message: Member, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.address !== "") {
       writer.uint32(10).string(message.address);
@@ -1041,6 +1044,32 @@ export const Member = {
     obj.metadata = message.metadata;
     obj.added_at = message.addedAt ? Timestamp.toAmino(message.addedAt) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MemberAminoMsg): Member {
+    return Member.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Member): MemberAminoMsg {
+    return {
+      type: "cosmos-sdk/Member",
+      value: Member.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MemberProtoMsg): Member {
+    return Member.decode(message.value);
+  },
+
+  toProto(message: Member): Uint8Array {
+    return Member.encode(message).finish();
+  },
+
+  toProtoMsg(message: Member): MemberProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.Member",
+      value: Member.encode(message).finish()
+    };
   }
 
 };
@@ -1052,6 +1081,9 @@ function createBaseMembers(): Members {
 }
 
 export const Members = {
+  typeUrl: "/cosmos.group.v1.Members",
+  aminoType: "cosmos-sdk/Members",
+
   encode(message: Members, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.members) {
       Member.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1140,6 +1172,32 @@ export const Members = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: MembersAminoMsg): Members {
+    return Members.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Members): MembersAminoMsg {
+    return {
+      type: "cosmos-sdk/Members",
+      value: Members.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MembersProtoMsg): Members {
+    return Members.decode(message.value);
+  },
+
+  toProto(message: Members): Uint8Array {
+    return Members.encode(message).finish();
+  },
+
+  toProtoMsg(message: Members): MembersProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.Members",
+      value: Members.encode(message).finish()
+    };
   }
 
 };
@@ -1152,6 +1210,9 @@ function createBaseThresholdDecisionPolicy(): ThresholdDecisionPolicy {
 }
 
 export const ThresholdDecisionPolicy = {
+  typeUrl: "/cosmos.group.v1.ThresholdDecisionPolicy",
+  aminoType: "cosmos-sdk/ThresholdDecisionPolicy",
+
   encode(message: ThresholdDecisionPolicy, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.threshold !== "") {
       writer.uint32(10).string(message.threshold);
@@ -1237,6 +1298,32 @@ export const ThresholdDecisionPolicy = {
     obj.threshold = message.threshold;
     obj.windows = message.windows ? DecisionPolicyWindows.toAmino(message.windows) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ThresholdDecisionPolicyAminoMsg): ThresholdDecisionPolicy {
+    return ThresholdDecisionPolicy.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ThresholdDecisionPolicy): ThresholdDecisionPolicyAminoMsg {
+    return {
+      type: "cosmos-sdk/ThresholdDecisionPolicy",
+      value: ThresholdDecisionPolicy.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ThresholdDecisionPolicyProtoMsg): ThresholdDecisionPolicy {
+    return ThresholdDecisionPolicy.decode(message.value);
+  },
+
+  toProto(message: ThresholdDecisionPolicy): Uint8Array {
+    return ThresholdDecisionPolicy.encode(message).finish();
+  },
+
+  toProtoMsg(message: ThresholdDecisionPolicy): ThresholdDecisionPolicyProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.ThresholdDecisionPolicy",
+      value: ThresholdDecisionPolicy.encode(message).finish()
+    };
   }
 
 };
@@ -1249,6 +1336,9 @@ function createBasePercentageDecisionPolicy(): PercentageDecisionPolicy {
 }
 
 export const PercentageDecisionPolicy = {
+  typeUrl: "/cosmos.group.v1.PercentageDecisionPolicy",
+  aminoType: "cosmos-sdk/PercentageDecisionPolicy",
+
   encode(message: PercentageDecisionPolicy, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.percentage !== "") {
       writer.uint32(10).string(message.percentage);
@@ -1334,6 +1424,32 @@ export const PercentageDecisionPolicy = {
     obj.percentage = message.percentage;
     obj.windows = message.windows ? DecisionPolicyWindows.toAmino(message.windows) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: PercentageDecisionPolicyAminoMsg): PercentageDecisionPolicy {
+    return PercentageDecisionPolicy.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: PercentageDecisionPolicy): PercentageDecisionPolicyAminoMsg {
+    return {
+      type: "cosmos-sdk/PercentageDecisionPolicy",
+      value: PercentageDecisionPolicy.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: PercentageDecisionPolicyProtoMsg): PercentageDecisionPolicy {
+    return PercentageDecisionPolicy.decode(message.value);
+  },
+
+  toProto(message: PercentageDecisionPolicy): Uint8Array {
+    return PercentageDecisionPolicy.encode(message).finish();
+  },
+
+  toProtoMsg(message: PercentageDecisionPolicy): PercentageDecisionPolicyProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.PercentageDecisionPolicy",
+      value: PercentageDecisionPolicy.encode(message).finish()
+    };
   }
 
 };
@@ -1346,6 +1462,9 @@ function createBaseDecisionPolicyWindows(): DecisionPolicyWindows {
 }
 
 export const DecisionPolicyWindows = {
+  typeUrl: "/cosmos.group.v1.DecisionPolicyWindows",
+  aminoType: "cosmos-sdk/DecisionPolicyWindows",
+
   encode(message: DecisionPolicyWindows, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.votingPeriod !== undefined) {
       Duration.encode(message.votingPeriod, writer.uint32(10).fork()).ldelim();
@@ -1431,6 +1550,32 @@ export const DecisionPolicyWindows = {
     obj.voting_period = message.votingPeriod ? Duration.toAmino(message.votingPeriod) : undefined;
     obj.min_execution_period = message.minExecutionPeriod ? Duration.toAmino(message.minExecutionPeriod) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: DecisionPolicyWindowsAminoMsg): DecisionPolicyWindows {
+    return DecisionPolicyWindows.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: DecisionPolicyWindows): DecisionPolicyWindowsAminoMsg {
+    return {
+      type: "cosmos-sdk/DecisionPolicyWindows",
+      value: DecisionPolicyWindows.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: DecisionPolicyWindowsProtoMsg): DecisionPolicyWindows {
+    return DecisionPolicyWindows.decode(message.value);
+  },
+
+  toProto(message: DecisionPolicyWindows): Uint8Array {
+    return DecisionPolicyWindows.encode(message).finish();
+  },
+
+  toProtoMsg(message: DecisionPolicyWindows): DecisionPolicyWindowsProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.DecisionPolicyWindows",
+      value: DecisionPolicyWindows.encode(message).finish()
+    };
   }
 
 };
@@ -1447,6 +1592,9 @@ function createBaseGroupInfo(): GroupInfo {
 }
 
 export const GroupInfo = {
+  typeUrl: "/cosmos.group.v1.GroupInfo",
+  aminoType: "cosmos-sdk/GroupInfo",
+
   encode(message: GroupInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.id.isZero()) {
       writer.uint32(8).uint64(message.id);
@@ -1592,6 +1740,32 @@ export const GroupInfo = {
     obj.total_weight = message.totalWeight;
     obj.created_at = message.createdAt ? Timestamp.toAmino(message.createdAt) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GroupInfoAminoMsg): GroupInfo {
+    return GroupInfo.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GroupInfo): GroupInfoAminoMsg {
+    return {
+      type: "cosmos-sdk/GroupInfo",
+      value: GroupInfo.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GroupInfoProtoMsg): GroupInfo {
+    return GroupInfo.decode(message.value);
+  },
+
+  toProto(message: GroupInfo): Uint8Array {
+    return GroupInfo.encode(message).finish();
+  },
+
+  toProtoMsg(message: GroupInfo): GroupInfoProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.GroupInfo",
+      value: GroupInfo.encode(message).finish()
+    };
   }
 
 };
@@ -1604,6 +1778,9 @@ function createBaseGroupMember(): GroupMember {
 }
 
 export const GroupMember = {
+  typeUrl: "/cosmos.group.v1.GroupMember",
+  aminoType: "cosmos-sdk/GroupMember",
+
   encode(message: GroupMember, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.groupId.isZero()) {
       writer.uint32(8).uint64(message.groupId);
@@ -1689,6 +1866,32 @@ export const GroupMember = {
     obj.group_id = message.groupId ? message.groupId.toString() : undefined;
     obj.member = message.member ? Member.toAmino(message.member) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GroupMemberAminoMsg): GroupMember {
+    return GroupMember.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GroupMember): GroupMemberAminoMsg {
+    return {
+      type: "cosmos-sdk/GroupMember",
+      value: GroupMember.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GroupMemberProtoMsg): GroupMember {
+    return GroupMember.decode(message.value);
+  },
+
+  toProto(message: GroupMember): Uint8Array {
+    return GroupMember.encode(message).finish();
+  },
+
+  toProtoMsg(message: GroupMember): GroupMemberProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.GroupMember",
+      value: GroupMember.encode(message).finish()
+    };
   }
 
 };
@@ -1706,6 +1909,9 @@ function createBaseGroupPolicyInfo(): GroupPolicyInfo {
 }
 
 export const GroupPolicyInfo = {
+  typeUrl: "/cosmos.group.v1.GroupPolicyInfo",
+  aminoType: "cosmos-sdk/GroupPolicyInfo",
+
   encode(message: GroupPolicyInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.address !== "") {
       writer.uint32(10).string(message.address);
@@ -1866,6 +2072,32 @@ export const GroupPolicyInfo = {
     obj.decision_policy = message.decisionPolicy ? DecisionPolicy_ToAmino((message.decisionPolicy as Any)) : undefined;
     obj.created_at = message.createdAt ? Timestamp.toAmino(message.createdAt) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GroupPolicyInfoAminoMsg): GroupPolicyInfo {
+    return GroupPolicyInfo.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GroupPolicyInfo): GroupPolicyInfoAminoMsg {
+    return {
+      type: "cosmos-sdk/GroupPolicyInfo",
+      value: GroupPolicyInfo.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GroupPolicyInfoProtoMsg): GroupPolicyInfo {
+    return GroupPolicyInfo.decode(message.value);
+  },
+
+  toProto(message: GroupPolicyInfo): Uint8Array {
+    return GroupPolicyInfo.encode(message).finish();
+  },
+
+  toProtoMsg(message: GroupPolicyInfo): GroupPolicyInfoProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.GroupPolicyInfo",
+      value: GroupPolicyInfo.encode(message).finish()
+    };
   }
 
 };
@@ -1889,6 +2121,9 @@ function createBaseProposal(): Proposal {
 }
 
 export const Proposal = {
+  typeUrl: "/cosmos.group.v1.Proposal",
+  aminoType: "cosmos-sdk/Proposal",
+
   encode(message: Proposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.id.isZero()) {
       writer.uint32(8).uint64(message.id);
@@ -2175,6 +2410,32 @@ export const Proposal = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ProposalAminoMsg): Proposal {
+    return Proposal.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Proposal): ProposalAminoMsg {
+    return {
+      type: "cosmos-sdk/Proposal",
+      value: Proposal.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ProposalProtoMsg): Proposal {
+    return Proposal.decode(message.value);
+  },
+
+  toProto(message: Proposal): Uint8Array {
+    return Proposal.encode(message).finish();
+  },
+
+  toProtoMsg(message: Proposal): ProposalProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.Proposal",
+      value: Proposal.encode(message).finish()
+    };
   }
 
 };
@@ -2189,6 +2450,9 @@ function createBaseTallyResult(): TallyResult {
 }
 
 export const TallyResult = {
+  typeUrl: "/cosmos.group.v1.TallyResult",
+  aminoType: "cosmos-sdk/TallyResult",
+
   encode(message: TallyResult, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.yesCount !== "") {
       writer.uint32(10).string(message.yesCount);
@@ -2304,6 +2568,32 @@ export const TallyResult = {
     obj.no_count = message.noCount;
     obj.no_with_veto_count = message.noWithVetoCount;
     return obj;
+  },
+
+  fromAminoMsg(object: TallyResultAminoMsg): TallyResult {
+    return TallyResult.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: TallyResult): TallyResultAminoMsg {
+    return {
+      type: "cosmos-sdk/TallyResult",
+      value: TallyResult.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: TallyResultProtoMsg): TallyResult {
+    return TallyResult.decode(message.value);
+  },
+
+  toProto(message: TallyResult): Uint8Array {
+    return TallyResult.encode(message).finish();
+  },
+
+  toProtoMsg(message: TallyResult): TallyResultProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.TallyResult",
+      value: TallyResult.encode(message).finish()
+    };
   }
 
 };
@@ -2319,6 +2609,9 @@ function createBaseVote(): Vote {
 }
 
 export const Vote = {
+  typeUrl: "/cosmos.group.v1.Vote",
+  aminoType: "cosmos-sdk/Vote",
+
   encode(message: Vote, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.proposalId.isZero()) {
       writer.uint32(8).uint64(message.proposalId);
@@ -2449,6 +2742,32 @@ export const Vote = {
     obj.metadata = message.metadata;
     obj.submit_time = message.submitTime ? Timestamp.toAmino(message.submitTime) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: VoteAminoMsg): Vote {
+    return Vote.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Vote): VoteAminoMsg {
+    return {
+      type: "cosmos-sdk/Vote",
+      value: Vote.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: VoteProtoMsg): Vote {
+    return Vote.decode(message.value);
+  },
+
+  toProto(message: Vote): Uint8Array {
+    return Vote.encode(message).finish();
+  },
+
+  toProtoMsg(message: Vote): VoteProtoMsg {
+    return {
+      typeUrl: "/cosmos.group.v1.Vote",
+      value: Vote.encode(message).finish()
+    };
   }
 
 };
diff --git a/__fixtures__/outputv2/cosmos/mint/v1beta1/genesis.ts b/__fixtures__/outputv2/cosmos/mint/v1beta1/genesis.ts
index 50bea2b7c..a03bd04c8 100644
--- a/__fixtures__/outputv2/cosmos/mint/v1beta1/genesis.ts
+++ b/__fixtures__/outputv2/cosmos/mint/v1beta1/genesis.ts
@@ -11,7 +11,7 @@ export interface GenesisState {
   /** params defines all the paramaters of the module. */
   params?: Params;
 }
-export interface GenesisStateProtoType {
+export interface GenesisStateProtoMsg {
   typeUrl: "/cosmos.mint.v1beta1.GenesisState";
   value: Uint8Array;
 }
@@ -24,7 +24,7 @@ export interface GenesisStateAmino {
   /** params defines all the paramaters of the module. */
   params?: ParamsAmino;
 }
-export interface GenesisStateAminoType {
+export interface GenesisStateAminoMsg {
   type: "cosmos-sdk/GenesisState";
   value: GenesisStateAmino;
 }
@@ -43,6 +43,9 @@ function createBaseGenesisState(): GenesisState {
 }
 
 export const GenesisState = {
+  typeUrl: "/cosmos.mint.v1beta1.GenesisState",
+  aminoType: "cosmos-sdk/GenesisState",
+
   encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.minter !== undefined) {
       Minter.encode(message.minter, writer.uint32(10).fork()).ldelim();
@@ -128,6 +131,32 @@ export const GenesisState = {
     obj.minter = message.minter ? Minter.toAmino(message.minter) : undefined;
     obj.params = message.params ? Params.toAmino(message.params) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisStateAminoMsg): GenesisState {
+    return GenesisState.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GenesisState): GenesisStateAminoMsg {
+    return {
+      type: "cosmos-sdk/GenesisState",
+      value: GenesisState.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GenesisStateProtoMsg): GenesisState {
+    return GenesisState.decode(message.value);
+  },
+
+  toProto(message: GenesisState): Uint8Array {
+    return GenesisState.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisState): GenesisStateProtoMsg {
+    return {
+      typeUrl: "/cosmos.mint.v1beta1.GenesisState",
+      value: GenesisState.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/mint/v1beta1/mint.ts b/__fixtures__/outputv2/cosmos/mint/v1beta1/mint.ts
index 8f127027e..680cb3f55 100644
--- a/__fixtures__/outputv2/cosmos/mint/v1beta1/mint.ts
+++ b/__fixtures__/outputv2/cosmos/mint/v1beta1/mint.ts
@@ -10,7 +10,7 @@ export interface Minter {
   /** current annual expected provisions */
   annualProvisions: string;
 }
-export interface MinterProtoType {
+export interface MinterProtoMsg {
   typeUrl: "/cosmos.mint.v1beta1.Minter";
   value: Uint8Array;
 }
@@ -23,7 +23,7 @@ export interface MinterAmino {
   /** current annual expected provisions */
   annual_provisions: string;
 }
-export interface MinterAminoType {
+export interface MinterAminoMsg {
   type: "cosmos-sdk/Minter";
   value: MinterAmino;
 }
@@ -54,7 +54,7 @@ export interface Params {
   /** expected blocks per year */
   blocksPerYear: Long;
 }
-export interface ParamsProtoType {
+export interface ParamsProtoMsg {
   typeUrl: "/cosmos.mint.v1beta1.Params";
   value: Uint8Array;
 }
@@ -79,7 +79,7 @@ export interface ParamsAmino {
   /** expected blocks per year */
   blocks_per_year: string;
 }
-export interface ParamsAminoType {
+export interface ParamsAminoMsg {
   type: "cosmos-sdk/Params";
   value: ParamsAmino;
 }
@@ -102,6 +102,9 @@ function createBaseMinter(): Minter {
 }
 
 export const Minter = {
+  typeUrl: "/cosmos.mint.v1beta1.Minter",
+  aminoType: "cosmos-sdk/Minter",
+
   encode(message: Minter, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.inflation !== "") {
       writer.uint32(10).string(message.inflation);
@@ -187,6 +190,32 @@ export const Minter = {
     obj.inflation = message.inflation;
     obj.annual_provisions = message.annualProvisions;
     return obj;
+  },
+
+  fromAminoMsg(object: MinterAminoMsg): Minter {
+    return Minter.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Minter): MinterAminoMsg {
+    return {
+      type: "cosmos-sdk/Minter",
+      value: Minter.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MinterProtoMsg): Minter {
+    return Minter.decode(message.value);
+  },
+
+  toProto(message: Minter): Uint8Array {
+    return Minter.encode(message).finish();
+  },
+
+  toProtoMsg(message: Minter): MinterProtoMsg {
+    return {
+      typeUrl: "/cosmos.mint.v1beta1.Minter",
+      value: Minter.encode(message).finish()
+    };
   }
 
 };
@@ -203,6 +232,9 @@ function createBaseParams(): Params {
 }
 
 export const Params = {
+  typeUrl: "/cosmos.mint.v1beta1.Params",
+  aminoType: "cosmos-sdk/Params",
+
   encode(message: Params, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.mintDenom !== "") {
       writer.uint32(10).string(message.mintDenom);
@@ -348,6 +380,32 @@ export const Params = {
     obj.goal_bonded = message.goalBonded;
     obj.blocks_per_year = message.blocksPerYear ? message.blocksPerYear.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ParamsAminoMsg): Params {
+    return Params.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Params): ParamsAminoMsg {
+    return {
+      type: "cosmos-sdk/Params",
+      value: Params.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ParamsProtoMsg): Params {
+    return Params.decode(message.value);
+  },
+
+  toProto(message: Params): Uint8Array {
+    return Params.encode(message).finish();
+  },
+
+  toProtoMsg(message: Params): ParamsProtoMsg {
+    return {
+      typeUrl: "/cosmos.mint.v1beta1.Params",
+      value: Params.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/mint/v1beta1/query.ts b/__fixtures__/outputv2/cosmos/mint/v1beta1/query.ts
index 85f4b4f22..4e3289cb6 100644
--- a/__fixtures__/outputv2/cosmos/mint/v1beta1/query.ts
+++ b/__fixtures__/outputv2/cosmos/mint/v1beta1/query.ts
@@ -5,14 +5,14 @@ export const protobufPackage = "cosmos.mint.v1beta1";
 
 /** QueryParamsRequest is the request type for the Query/Params RPC method. */
 export interface QueryParamsRequest {}
-export interface QueryParamsRequestProtoType {
+export interface QueryParamsRequestProtoMsg {
   typeUrl: "/cosmos.mint.v1beta1.QueryParamsRequest";
   value: Uint8Array;
 }
 
 /** QueryParamsRequest is the request type for the Query/Params RPC method. */
 export interface QueryParamsRequestAmino {}
-export interface QueryParamsRequestAminoType {
+export interface QueryParamsRequestAminoMsg {
   type: "cosmos-sdk/QueryParamsRequest";
   value: QueryParamsRequestAmino;
 }
@@ -25,7 +25,7 @@ export interface QueryParamsResponse {
   /** params defines the parameters of the module. */
   params?: Params;
 }
-export interface QueryParamsResponseProtoType {
+export interface QueryParamsResponseProtoMsg {
   typeUrl: "/cosmos.mint.v1beta1.QueryParamsResponse";
   value: Uint8Array;
 }
@@ -35,7 +35,7 @@ export interface QueryParamsResponseAmino {
   /** params defines the parameters of the module. */
   params?: ParamsAmino;
 }
-export interface QueryParamsResponseAminoType {
+export interface QueryParamsResponseAminoMsg {
   type: "cosmos-sdk/QueryParamsResponse";
   value: QueryParamsResponseAmino;
 }
@@ -47,14 +47,14 @@ export interface QueryParamsResponseSDKType {
 
 /** QueryInflationRequest is the request type for the Query/Inflation RPC method. */
 export interface QueryInflationRequest {}
-export interface QueryInflationRequestProtoType {
+export interface QueryInflationRequestProtoMsg {
   typeUrl: "/cosmos.mint.v1beta1.QueryInflationRequest";
   value: Uint8Array;
 }
 
 /** QueryInflationRequest is the request type for the Query/Inflation RPC method. */
 export interface QueryInflationRequestAmino {}
-export interface QueryInflationRequestAminoType {
+export interface QueryInflationRequestAminoMsg {
   type: "cosmos-sdk/QueryInflationRequest";
   value: QueryInflationRequestAmino;
 }
@@ -70,7 +70,7 @@ export interface QueryInflationResponse {
   /** inflation is the current minting inflation value. */
   inflation: Uint8Array;
 }
-export interface QueryInflationResponseProtoType {
+export interface QueryInflationResponseProtoMsg {
   typeUrl: "/cosmos.mint.v1beta1.QueryInflationResponse";
   value: Uint8Array;
 }
@@ -83,7 +83,7 @@ export interface QueryInflationResponseAmino {
   /** inflation is the current minting inflation value. */
   inflation: Uint8Array;
 }
-export interface QueryInflationResponseAminoType {
+export interface QueryInflationResponseAminoMsg {
   type: "cosmos-sdk/QueryInflationResponse";
   value: QueryInflationResponseAmino;
 }
@@ -101,7 +101,7 @@ export interface QueryInflationResponseSDKType {
  * Query/AnnualProvisions RPC method.
  */
 export interface QueryAnnualProvisionsRequest {}
-export interface QueryAnnualProvisionsRequestProtoType {
+export interface QueryAnnualProvisionsRequestProtoMsg {
   typeUrl: "/cosmos.mint.v1beta1.QueryAnnualProvisionsRequest";
   value: Uint8Array;
 }
@@ -111,7 +111,7 @@ export interface QueryAnnualProvisionsRequestProtoType {
  * Query/AnnualProvisions RPC method.
  */
 export interface QueryAnnualProvisionsRequestAmino {}
-export interface QueryAnnualProvisionsRequestAminoType {
+export interface QueryAnnualProvisionsRequestAminoMsg {
   type: "cosmos-sdk/QueryAnnualProvisionsRequest";
   value: QueryAnnualProvisionsRequestAmino;
 }
@@ -130,7 +130,7 @@ export interface QueryAnnualProvisionsResponse {
   /** annual_provisions is the current minting annual provisions value. */
   annualProvisions: Uint8Array;
 }
-export interface QueryAnnualProvisionsResponseProtoType {
+export interface QueryAnnualProvisionsResponseProtoMsg {
   typeUrl: "/cosmos.mint.v1beta1.QueryAnnualProvisionsResponse";
   value: Uint8Array;
 }
@@ -143,7 +143,7 @@ export interface QueryAnnualProvisionsResponseAmino {
   /** annual_provisions is the current minting annual provisions value. */
   annual_provisions: Uint8Array;
 }
-export interface QueryAnnualProvisionsResponseAminoType {
+export interface QueryAnnualProvisionsResponseAminoMsg {
   type: "cosmos-sdk/QueryAnnualProvisionsResponse";
   value: QueryAnnualProvisionsResponseAmino;
 }
@@ -161,6 +161,9 @@ function createBaseQueryParamsRequest(): QueryParamsRequest {
 }
 
 export const QueryParamsRequest = {
+  typeUrl: "/cosmos.mint.v1beta1.QueryParamsRequest",
+  aminoType: "cosmos-sdk/QueryParamsRequest",
+
   encode(_: QueryParamsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -213,6 +216,32 @@ export const QueryParamsRequest = {
   toAmino(_: QueryParamsRequest): QueryParamsRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest {
+    return QueryParamsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryParamsRequest): QueryParamsRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryParamsRequest",
+      value: QueryParamsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryParamsRequestProtoMsg): QueryParamsRequest {
+    return QueryParamsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryParamsRequest): Uint8Array {
+    return QueryParamsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryParamsRequest): QueryParamsRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.mint.v1beta1.QueryParamsRequest",
+      value: QueryParamsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -224,6 +253,9 @@ function createBaseQueryParamsResponse(): QueryParamsResponse {
 }
 
 export const QueryParamsResponse = {
+  typeUrl: "/cosmos.mint.v1beta1.QueryParamsResponse",
+  aminoType: "cosmos-sdk/QueryParamsResponse",
+
   encode(message: QueryParamsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.params !== undefined) {
       Params.encode(message.params, writer.uint32(10).fork()).ldelim();
@@ -294,6 +326,32 @@ export const QueryParamsResponse = {
     const obj: any = {};
     obj.params = message.params ? Params.toAmino(message.params) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryParamsResponseAminoMsg): QueryParamsResponse {
+    return QueryParamsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryParamsResponse): QueryParamsResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryParamsResponse",
+      value: QueryParamsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryParamsResponseProtoMsg): QueryParamsResponse {
+    return QueryParamsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryParamsResponse): Uint8Array {
+    return QueryParamsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryParamsResponse): QueryParamsResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.mint.v1beta1.QueryParamsResponse",
+      value: QueryParamsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -303,6 +361,9 @@ function createBaseQueryInflationRequest(): QueryInflationRequest {
 }
 
 export const QueryInflationRequest = {
+  typeUrl: "/cosmos.mint.v1beta1.QueryInflationRequest",
+  aminoType: "cosmos-sdk/QueryInflationRequest",
+
   encode(_: QueryInflationRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -355,6 +416,32 @@ export const QueryInflationRequest = {
   toAmino(_: QueryInflationRequest): QueryInflationRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryInflationRequestAminoMsg): QueryInflationRequest {
+    return QueryInflationRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryInflationRequest): QueryInflationRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryInflationRequest",
+      value: QueryInflationRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryInflationRequestProtoMsg): QueryInflationRequest {
+    return QueryInflationRequest.decode(message.value);
+  },
+
+  toProto(message: QueryInflationRequest): Uint8Array {
+    return QueryInflationRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryInflationRequest): QueryInflationRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.mint.v1beta1.QueryInflationRequest",
+      value: QueryInflationRequest.encode(message).finish()
+    };
   }
 
 };
@@ -366,6 +453,9 @@ function createBaseQueryInflationResponse(): QueryInflationResponse {
 }
 
 export const QueryInflationResponse = {
+  typeUrl: "/cosmos.mint.v1beta1.QueryInflationResponse",
+  aminoType: "cosmos-sdk/QueryInflationResponse",
+
   encode(message: QueryInflationResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.inflation.length !== 0) {
       writer.uint32(10).bytes(message.inflation);
@@ -436,6 +526,32 @@ export const QueryInflationResponse = {
     const obj: any = {};
     obj.inflation = message.inflation;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryInflationResponseAminoMsg): QueryInflationResponse {
+    return QueryInflationResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryInflationResponse): QueryInflationResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryInflationResponse",
+      value: QueryInflationResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryInflationResponseProtoMsg): QueryInflationResponse {
+    return QueryInflationResponse.decode(message.value);
+  },
+
+  toProto(message: QueryInflationResponse): Uint8Array {
+    return QueryInflationResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryInflationResponse): QueryInflationResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.mint.v1beta1.QueryInflationResponse",
+      value: QueryInflationResponse.encode(message).finish()
+    };
   }
 
 };
@@ -445,6 +561,9 @@ function createBaseQueryAnnualProvisionsRequest(): QueryAnnualProvisionsRequest
 }
 
 export const QueryAnnualProvisionsRequest = {
+  typeUrl: "/cosmos.mint.v1beta1.QueryAnnualProvisionsRequest",
+  aminoType: "cosmos-sdk/QueryAnnualProvisionsRequest",
+
   encode(_: QueryAnnualProvisionsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -497,6 +616,32 @@ export const QueryAnnualProvisionsRequest = {
   toAmino(_: QueryAnnualProvisionsRequest): QueryAnnualProvisionsRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryAnnualProvisionsRequestAminoMsg): QueryAnnualProvisionsRequest {
+    return QueryAnnualProvisionsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryAnnualProvisionsRequest): QueryAnnualProvisionsRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryAnnualProvisionsRequest",
+      value: QueryAnnualProvisionsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryAnnualProvisionsRequestProtoMsg): QueryAnnualProvisionsRequest {
+    return QueryAnnualProvisionsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryAnnualProvisionsRequest): Uint8Array {
+    return QueryAnnualProvisionsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryAnnualProvisionsRequest): QueryAnnualProvisionsRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.mint.v1beta1.QueryAnnualProvisionsRequest",
+      value: QueryAnnualProvisionsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -508,6 +653,9 @@ function createBaseQueryAnnualProvisionsResponse(): QueryAnnualProvisionsRespons
 }
 
 export const QueryAnnualProvisionsResponse = {
+  typeUrl: "/cosmos.mint.v1beta1.QueryAnnualProvisionsResponse",
+  aminoType: "cosmos-sdk/QueryAnnualProvisionsResponse",
+
   encode(message: QueryAnnualProvisionsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.annualProvisions.length !== 0) {
       writer.uint32(10).bytes(message.annualProvisions);
@@ -578,6 +726,32 @@ export const QueryAnnualProvisionsResponse = {
     const obj: any = {};
     obj.annual_provisions = message.annualProvisions;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryAnnualProvisionsResponseAminoMsg): QueryAnnualProvisionsResponse {
+    return QueryAnnualProvisionsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryAnnualProvisionsResponse): QueryAnnualProvisionsResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryAnnualProvisionsResponse",
+      value: QueryAnnualProvisionsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryAnnualProvisionsResponseProtoMsg): QueryAnnualProvisionsResponse {
+    return QueryAnnualProvisionsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryAnnualProvisionsResponse): Uint8Array {
+    return QueryAnnualProvisionsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryAnnualProvisionsResponse): QueryAnnualProvisionsResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.mint.v1beta1.QueryAnnualProvisionsResponse",
+      value: QueryAnnualProvisionsResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/nft/v1beta1/event.ts b/__fixtures__/outputv2/cosmos/nft/v1beta1/event.ts
index ac3e4443c..c7a77ec77 100644
--- a/__fixtures__/outputv2/cosmos/nft/v1beta1/event.ts
+++ b/__fixtures__/outputv2/cosmos/nft/v1beta1/event.ts
@@ -9,7 +9,7 @@ export interface EventSend {
   sender: string;
   receiver: string;
 }
-export interface EventSendProtoType {
+export interface EventSendProtoMsg {
   typeUrl: "/cosmos.nft.v1beta1.EventSend";
   value: Uint8Array;
 }
@@ -21,7 +21,7 @@ export interface EventSendAmino {
   sender: string;
   receiver: string;
 }
-export interface EventSendAminoType {
+export interface EventSendAminoMsg {
   type: "cosmos-sdk/EventSend";
   value: EventSendAmino;
 }
@@ -40,7 +40,7 @@ export interface EventMint {
   id: string;
   owner: string;
 }
-export interface EventMintProtoType {
+export interface EventMintProtoMsg {
   typeUrl: "/cosmos.nft.v1beta1.EventMint";
   value: Uint8Array;
 }
@@ -51,7 +51,7 @@ export interface EventMintAmino {
   id: string;
   owner: string;
 }
-export interface EventMintAminoType {
+export interface EventMintAminoMsg {
   type: "cosmos-sdk/EventMint";
   value: EventMintAmino;
 }
@@ -69,7 +69,7 @@ export interface EventBurn {
   id: string;
   owner: string;
 }
-export interface EventBurnProtoType {
+export interface EventBurnProtoMsg {
   typeUrl: "/cosmos.nft.v1beta1.EventBurn";
   value: Uint8Array;
 }
@@ -80,7 +80,7 @@ export interface EventBurnAmino {
   id: string;
   owner: string;
 }
-export interface EventBurnAminoType {
+export interface EventBurnAminoMsg {
   type: "cosmos-sdk/EventBurn";
   value: EventBurnAmino;
 }
@@ -102,6 +102,9 @@ function createBaseEventSend(): EventSend {
 }
 
 export const EventSend = {
+  typeUrl: "/cosmos.nft.v1beta1.EventSend",
+  aminoType: "cosmos-sdk/EventSend",
+
   encode(message: EventSend, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.classId !== "") {
       writer.uint32(10).string(message.classId);
@@ -217,6 +220,32 @@ export const EventSend = {
     obj.sender = message.sender;
     obj.receiver = message.receiver;
     return obj;
+  },
+
+  fromAminoMsg(object: EventSendAminoMsg): EventSend {
+    return EventSend.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: EventSend): EventSendAminoMsg {
+    return {
+      type: "cosmos-sdk/EventSend",
+      value: EventSend.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: EventSendProtoMsg): EventSend {
+    return EventSend.decode(message.value);
+  },
+
+  toProto(message: EventSend): Uint8Array {
+    return EventSend.encode(message).finish();
+  },
+
+  toProtoMsg(message: EventSend): EventSendProtoMsg {
+    return {
+      typeUrl: "/cosmos.nft.v1beta1.EventSend",
+      value: EventSend.encode(message).finish()
+    };
   }
 
 };
@@ -230,6 +259,9 @@ function createBaseEventMint(): EventMint {
 }
 
 export const EventMint = {
+  typeUrl: "/cosmos.nft.v1beta1.EventMint",
+  aminoType: "cosmos-sdk/EventMint",
+
   encode(message: EventMint, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.classId !== "") {
       writer.uint32(10).string(message.classId);
@@ -330,6 +362,32 @@ export const EventMint = {
     obj.id = message.id;
     obj.owner = message.owner;
     return obj;
+  },
+
+  fromAminoMsg(object: EventMintAminoMsg): EventMint {
+    return EventMint.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: EventMint): EventMintAminoMsg {
+    return {
+      type: "cosmos-sdk/EventMint",
+      value: EventMint.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: EventMintProtoMsg): EventMint {
+    return EventMint.decode(message.value);
+  },
+
+  toProto(message: EventMint): Uint8Array {
+    return EventMint.encode(message).finish();
+  },
+
+  toProtoMsg(message: EventMint): EventMintProtoMsg {
+    return {
+      typeUrl: "/cosmos.nft.v1beta1.EventMint",
+      value: EventMint.encode(message).finish()
+    };
   }
 
 };
@@ -343,6 +401,9 @@ function createBaseEventBurn(): EventBurn {
 }
 
 export const EventBurn = {
+  typeUrl: "/cosmos.nft.v1beta1.EventBurn",
+  aminoType: "cosmos-sdk/EventBurn",
+
   encode(message: EventBurn, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.classId !== "") {
       writer.uint32(10).string(message.classId);
@@ -443,6 +504,32 @@ export const EventBurn = {
     obj.id = message.id;
     obj.owner = message.owner;
     return obj;
+  },
+
+  fromAminoMsg(object: EventBurnAminoMsg): EventBurn {
+    return EventBurn.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: EventBurn): EventBurnAminoMsg {
+    return {
+      type: "cosmos-sdk/EventBurn",
+      value: EventBurn.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: EventBurnProtoMsg): EventBurn {
+    return EventBurn.decode(message.value);
+  },
+
+  toProto(message: EventBurn): Uint8Array {
+    return EventBurn.encode(message).finish();
+  },
+
+  toProtoMsg(message: EventBurn): EventBurnProtoMsg {
+    return {
+      typeUrl: "/cosmos.nft.v1beta1.EventBurn",
+      value: EventBurn.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/nft/v1beta1/genesis.ts b/__fixtures__/outputv2/cosmos/nft/v1beta1/genesis.ts
index cd607012d..3c494fad4 100644
--- a/__fixtures__/outputv2/cosmos/nft/v1beta1/genesis.ts
+++ b/__fixtures__/outputv2/cosmos/nft/v1beta1/genesis.ts
@@ -9,7 +9,7 @@ export interface GenesisState {
   classes: Class[];
   entries: Entry[];
 }
-export interface GenesisStateProtoType {
+export interface GenesisStateProtoMsg {
   typeUrl: "/cosmos.nft.v1beta1.GenesisState";
   value: Uint8Array;
 }
@@ -20,7 +20,7 @@ export interface GenesisStateAmino {
   classes: ClassAmino[];
   entries: EntryAmino[];
 }
-export interface GenesisStateAminoType {
+export interface GenesisStateAminoMsg {
   type: "cosmos-sdk/GenesisState";
   value: GenesisStateAmino;
 }
@@ -39,7 +39,7 @@ export interface Entry {
   /** nfts is a group of nfts of the same owner */
   nfts: NFT[];
 }
-export interface EntryProtoType {
+export interface EntryProtoMsg {
   typeUrl: "/cosmos.nft.v1beta1.Entry";
   value: Uint8Array;
 }
@@ -52,7 +52,7 @@ export interface EntryAmino {
   /** nfts is a group of nfts of the same owner */
   nfts: NFTAmino[];
 }
-export interface EntryAminoType {
+export interface EntryAminoMsg {
   type: "cosmos-sdk/Entry";
   value: EntryAmino;
 }
@@ -71,6 +71,9 @@ function createBaseGenesisState(): GenesisState {
 }
 
 export const GenesisState = {
+  typeUrl: "/cosmos.nft.v1beta1.GenesisState",
+  aminoType: "cosmos-sdk/GenesisState",
+
   encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.classes) {
       Class.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -189,6 +192,32 @@ export const GenesisState = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisStateAminoMsg): GenesisState {
+    return GenesisState.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GenesisState): GenesisStateAminoMsg {
+    return {
+      type: "cosmos-sdk/GenesisState",
+      value: GenesisState.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GenesisStateProtoMsg): GenesisState {
+    return GenesisState.decode(message.value);
+  },
+
+  toProto(message: GenesisState): Uint8Array {
+    return GenesisState.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisState): GenesisStateProtoMsg {
+    return {
+      typeUrl: "/cosmos.nft.v1beta1.GenesisState",
+      value: GenesisState.encode(message).finish()
+    };
   }
 
 };
@@ -201,6 +230,9 @@ function createBaseEntry(): Entry {
 }
 
 export const Entry = {
+  typeUrl: "/cosmos.nft.v1beta1.Entry",
+  aminoType: "cosmos-sdk/Entry",
+
   encode(message: Entry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.owner !== "") {
       writer.uint32(10).string(message.owner);
@@ -304,6 +336,32 @@ export const Entry = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: EntryAminoMsg): Entry {
+    return Entry.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Entry): EntryAminoMsg {
+    return {
+      type: "cosmos-sdk/Entry",
+      value: Entry.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: EntryProtoMsg): Entry {
+    return Entry.decode(message.value);
+  },
+
+  toProto(message: Entry): Uint8Array {
+    return Entry.encode(message).finish();
+  },
+
+  toProtoMsg(message: Entry): EntryProtoMsg {
+    return {
+      typeUrl: "/cosmos.nft.v1beta1.Entry",
+      value: Entry.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/nft/v1beta1/nft.ts b/__fixtures__/outputv2/cosmos/nft/v1beta1/nft.ts
index 5106d5f79..0e34b3893 100644
--- a/__fixtures__/outputv2/cosmos/nft/v1beta1/nft.ts
+++ b/__fixtures__/outputv2/cosmos/nft/v1beta1/nft.ts
@@ -26,7 +26,7 @@ export interface Class {
   /** data is the app specific metadata of the NFT class. Optional */
   data?: Any;
 }
-export interface ClassProtoType {
+export interface ClassProtoMsg {
   typeUrl: "/cosmos.nft.v1beta1.Class";
   value: Uint8Array;
 }
@@ -54,7 +54,7 @@ export interface ClassAmino {
   /** data is the app specific metadata of the NFT class. Optional */
   data?: AnyAmino;
 }
-export interface ClassAminoType {
+export interface ClassAminoMsg {
   type: "cosmos-sdk/Class";
   value: ClassAmino;
 }
@@ -87,7 +87,7 @@ export interface NFT {
   /** data is an app specific data of the NFT. Optional */
   data?: Any;
 }
-export interface NFTProtoType {
+export interface NFTProtoMsg {
   typeUrl: "/cosmos.nft.v1beta1.NFT";
   value: Uint8Array;
 }
@@ -109,7 +109,7 @@ export interface NFTAmino {
   /** data is an app specific data of the NFT. Optional */
   data?: AnyAmino;
 }
-export interface NFTAminoType {
+export interface NFTAminoMsg {
   type: "cosmos-sdk/NFT";
   value: NFTAmino;
 }
@@ -136,6 +136,9 @@ function createBaseClass(): Class {
 }
 
 export const Class = {
+  typeUrl: "/cosmos.nft.v1beta1.Class",
+  aminoType: "cosmos-sdk/Class",
+
   encode(message: Class, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.id !== "") {
       writer.uint32(10).string(message.id);
@@ -296,6 +299,32 @@ export const Class = {
     obj.uri_hash = message.uriHash;
     obj.data = message.data ? Any.toAmino(message.data) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ClassAminoMsg): Class {
+    return Class.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Class): ClassAminoMsg {
+    return {
+      type: "cosmos-sdk/Class",
+      value: Class.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ClassProtoMsg): Class {
+    return Class.decode(message.value);
+  },
+
+  toProto(message: Class): Uint8Array {
+    return Class.encode(message).finish();
+  },
+
+  toProtoMsg(message: Class): ClassProtoMsg {
+    return {
+      typeUrl: "/cosmos.nft.v1beta1.Class",
+      value: Class.encode(message).finish()
+    };
   }
 
 };
@@ -311,6 +340,9 @@ function createBaseNFT(): NFT {
 }
 
 export const NFT = {
+  typeUrl: "/cosmos.nft.v1beta1.NFT",
+  aminoType: "cosmos-sdk/NFT",
+
   encode(message: NFT, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.classId !== "") {
       writer.uint32(10).string(message.classId);
@@ -441,6 +473,32 @@ export const NFT = {
     obj.uri_hash = message.uriHash;
     obj.data = message.data ? Any.toAmino(message.data) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: NFTAminoMsg): NFT {
+    return NFT.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: NFT): NFTAminoMsg {
+    return {
+      type: "cosmos-sdk/NFT",
+      value: NFT.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: NFTProtoMsg): NFT {
+    return NFT.decode(message.value);
+  },
+
+  toProto(message: NFT): Uint8Array {
+    return NFT.encode(message).finish();
+  },
+
+  toProtoMsg(message: NFT): NFTProtoMsg {
+    return {
+      typeUrl: "/cosmos.nft.v1beta1.NFT",
+      value: NFT.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/nft/v1beta1/query.ts b/__fixtures__/outputv2/cosmos/nft/v1beta1/query.ts
index 637d43251..3999d35da 100644
--- a/__fixtures__/outputv2/cosmos/nft/v1beta1/query.ts
+++ b/__fixtures__/outputv2/cosmos/nft/v1beta1/query.ts
@@ -9,7 +9,7 @@ export interface QueryBalanceRequest {
   classId: string;
   owner: string;
 }
-export interface QueryBalanceRequestProtoType {
+export interface QueryBalanceRequestProtoMsg {
   typeUrl: "/cosmos.nft.v1beta1.QueryBalanceRequest";
   value: Uint8Array;
 }
@@ -19,7 +19,7 @@ export interface QueryBalanceRequestAmino {
   class_id: string;
   owner: string;
 }
-export interface QueryBalanceRequestAminoType {
+export interface QueryBalanceRequestAminoMsg {
   type: "cosmos-sdk/QueryBalanceRequest";
   value: QueryBalanceRequestAmino;
 }
@@ -34,7 +34,7 @@ export interface QueryBalanceRequestSDKType {
 export interface QueryBalanceResponse {
   amount: Long;
 }
-export interface QueryBalanceResponseProtoType {
+export interface QueryBalanceResponseProtoMsg {
   typeUrl: "/cosmos.nft.v1beta1.QueryBalanceResponse";
   value: Uint8Array;
 }
@@ -43,7 +43,7 @@ export interface QueryBalanceResponseProtoType {
 export interface QueryBalanceResponseAmino {
   amount: string;
 }
-export interface QueryBalanceResponseAminoType {
+export interface QueryBalanceResponseAminoMsg {
   type: "cosmos-sdk/QueryBalanceResponse";
   value: QueryBalanceResponseAmino;
 }
@@ -58,7 +58,7 @@ export interface QueryOwnerRequest {
   classId: string;
   id: string;
 }
-export interface QueryOwnerRequestProtoType {
+export interface QueryOwnerRequestProtoMsg {
   typeUrl: "/cosmos.nft.v1beta1.QueryOwnerRequest";
   value: Uint8Array;
 }
@@ -68,7 +68,7 @@ export interface QueryOwnerRequestAmino {
   class_id: string;
   id: string;
 }
-export interface QueryOwnerRequestAminoType {
+export interface QueryOwnerRequestAminoMsg {
   type: "cosmos-sdk/QueryOwnerRequest";
   value: QueryOwnerRequestAmino;
 }
@@ -83,7 +83,7 @@ export interface QueryOwnerRequestSDKType {
 export interface QueryOwnerResponse {
   owner: string;
 }
-export interface QueryOwnerResponseProtoType {
+export interface QueryOwnerResponseProtoMsg {
   typeUrl: "/cosmos.nft.v1beta1.QueryOwnerResponse";
   value: Uint8Array;
 }
@@ -92,7 +92,7 @@ export interface QueryOwnerResponseProtoType {
 export interface QueryOwnerResponseAmino {
   owner: string;
 }
-export interface QueryOwnerResponseAminoType {
+export interface QueryOwnerResponseAminoMsg {
   type: "cosmos-sdk/QueryOwnerResponse";
   value: QueryOwnerResponseAmino;
 }
@@ -106,7 +106,7 @@ export interface QueryOwnerResponseSDKType {
 export interface QuerySupplyRequest {
   classId: string;
 }
-export interface QuerySupplyRequestProtoType {
+export interface QuerySupplyRequestProtoMsg {
   typeUrl: "/cosmos.nft.v1beta1.QuerySupplyRequest";
   value: Uint8Array;
 }
@@ -115,7 +115,7 @@ export interface QuerySupplyRequestProtoType {
 export interface QuerySupplyRequestAmino {
   class_id: string;
 }
-export interface QuerySupplyRequestAminoType {
+export interface QuerySupplyRequestAminoMsg {
   type: "cosmos-sdk/QuerySupplyRequest";
   value: QuerySupplyRequestAmino;
 }
@@ -129,7 +129,7 @@ export interface QuerySupplyRequestSDKType {
 export interface QuerySupplyResponse {
   amount: Long;
 }
-export interface QuerySupplyResponseProtoType {
+export interface QuerySupplyResponseProtoMsg {
   typeUrl: "/cosmos.nft.v1beta1.QuerySupplyResponse";
   value: Uint8Array;
 }
@@ -138,7 +138,7 @@ export interface QuerySupplyResponseProtoType {
 export interface QuerySupplyResponseAmino {
   amount: string;
 }
-export interface QuerySupplyResponseAminoType {
+export interface QuerySupplyResponseAminoMsg {
   type: "cosmos-sdk/QuerySupplyResponse";
   value: QuerySupplyResponseAmino;
 }
@@ -154,7 +154,7 @@ export interface QueryNFTsRequest {
   owner: string;
   pagination?: PageRequest;
 }
-export interface QueryNFTsRequestProtoType {
+export interface QueryNFTsRequestProtoMsg {
   typeUrl: "/cosmos.nft.v1beta1.QueryNFTsRequest";
   value: Uint8Array;
 }
@@ -165,7 +165,7 @@ export interface QueryNFTsRequestAmino {
   owner: string;
   pagination?: PageRequestAmino;
 }
-export interface QueryNFTsRequestAminoType {
+export interface QueryNFTsRequestAminoMsg {
   type: "cosmos-sdk/QueryNFTsRequest";
   value: QueryNFTsRequestAmino;
 }
@@ -182,7 +182,7 @@ export interface QueryNFTsResponse {
   nfts: NFT[];
   pagination?: PageResponse;
 }
-export interface QueryNFTsResponseProtoType {
+export interface QueryNFTsResponseProtoMsg {
   typeUrl: "/cosmos.nft.v1beta1.QueryNFTsResponse";
   value: Uint8Array;
 }
@@ -192,7 +192,7 @@ export interface QueryNFTsResponseAmino {
   nfts: NFTAmino[];
   pagination?: PageResponseAmino;
 }
-export interface QueryNFTsResponseAminoType {
+export interface QueryNFTsResponseAminoMsg {
   type: "cosmos-sdk/QueryNFTsResponse";
   value: QueryNFTsResponseAmino;
 }
@@ -208,7 +208,7 @@ export interface QueryNFTRequest {
   classId: string;
   id: string;
 }
-export interface QueryNFTRequestProtoType {
+export interface QueryNFTRequestProtoMsg {
   typeUrl: "/cosmos.nft.v1beta1.QueryNFTRequest";
   value: Uint8Array;
 }
@@ -218,7 +218,7 @@ export interface QueryNFTRequestAmino {
   class_id: string;
   id: string;
 }
-export interface QueryNFTRequestAminoType {
+export interface QueryNFTRequestAminoMsg {
   type: "cosmos-sdk/QueryNFTRequest";
   value: QueryNFTRequestAmino;
 }
@@ -233,7 +233,7 @@ export interface QueryNFTRequestSDKType {
 export interface QueryNFTResponse {
   nft?: NFT;
 }
-export interface QueryNFTResponseProtoType {
+export interface QueryNFTResponseProtoMsg {
   typeUrl: "/cosmos.nft.v1beta1.QueryNFTResponse";
   value: Uint8Array;
 }
@@ -242,7 +242,7 @@ export interface QueryNFTResponseProtoType {
 export interface QueryNFTResponseAmino {
   nft?: NFTAmino;
 }
-export interface QueryNFTResponseAminoType {
+export interface QueryNFTResponseAminoMsg {
   type: "cosmos-sdk/QueryNFTResponse";
   value: QueryNFTResponseAmino;
 }
@@ -256,7 +256,7 @@ export interface QueryNFTResponseSDKType {
 export interface QueryClassRequest {
   classId: string;
 }
-export interface QueryClassRequestProtoType {
+export interface QueryClassRequestProtoMsg {
   typeUrl: "/cosmos.nft.v1beta1.QueryClassRequest";
   value: Uint8Array;
 }
@@ -265,7 +265,7 @@ export interface QueryClassRequestProtoType {
 export interface QueryClassRequestAmino {
   class_id: string;
 }
-export interface QueryClassRequestAminoType {
+export interface QueryClassRequestAminoMsg {
   type: "cosmos-sdk/QueryClassRequest";
   value: QueryClassRequestAmino;
 }
@@ -279,7 +279,7 @@ export interface QueryClassRequestSDKType {
 export interface QueryClassResponse {
   class?: Class;
 }
-export interface QueryClassResponseProtoType {
+export interface QueryClassResponseProtoMsg {
   typeUrl: "/cosmos.nft.v1beta1.QueryClassResponse";
   value: Uint8Array;
 }
@@ -288,7 +288,7 @@ export interface QueryClassResponseProtoType {
 export interface QueryClassResponseAmino {
   class?: ClassAmino;
 }
-export interface QueryClassResponseAminoType {
+export interface QueryClassResponseAminoMsg {
   type: "cosmos-sdk/QueryClassResponse";
   value: QueryClassResponseAmino;
 }
@@ -303,7 +303,7 @@ export interface QueryClassesRequest {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequest;
 }
-export interface QueryClassesRequestProtoType {
+export interface QueryClassesRequestProtoMsg {
   typeUrl: "/cosmos.nft.v1beta1.QueryClassesRequest";
   value: Uint8Array;
 }
@@ -313,7 +313,7 @@ export interface QueryClassesRequestAmino {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequestAmino;
 }
-export interface QueryClassesRequestAminoType {
+export interface QueryClassesRequestAminoMsg {
   type: "cosmos-sdk/QueryClassesRequest";
   value: QueryClassesRequestAmino;
 }
@@ -328,7 +328,7 @@ export interface QueryClassesResponse {
   classes: Class[];
   pagination?: PageResponse;
 }
-export interface QueryClassesResponseProtoType {
+export interface QueryClassesResponseProtoMsg {
   typeUrl: "/cosmos.nft.v1beta1.QueryClassesResponse";
   value: Uint8Array;
 }
@@ -338,7 +338,7 @@ export interface QueryClassesResponseAmino {
   classes: ClassAmino[];
   pagination?: PageResponseAmino;
 }
-export interface QueryClassesResponseAminoType {
+export interface QueryClassesResponseAminoMsg {
   type: "cosmos-sdk/QueryClassesResponse";
   value: QueryClassesResponseAmino;
 }
@@ -357,6 +357,9 @@ function createBaseQueryBalanceRequest(): QueryBalanceRequest {
 }
 
 export const QueryBalanceRequest = {
+  typeUrl: "/cosmos.nft.v1beta1.QueryBalanceRequest",
+  aminoType: "cosmos-sdk/QueryBalanceRequest",
+
   encode(message: QueryBalanceRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.classId !== "") {
       writer.uint32(10).string(message.classId);
@@ -442,6 +445,32 @@ export const QueryBalanceRequest = {
     obj.class_id = message.classId;
     obj.owner = message.owner;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryBalanceRequestAminoMsg): QueryBalanceRequest {
+    return QueryBalanceRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryBalanceRequest): QueryBalanceRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryBalanceRequest",
+      value: QueryBalanceRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryBalanceRequestProtoMsg): QueryBalanceRequest {
+    return QueryBalanceRequest.decode(message.value);
+  },
+
+  toProto(message: QueryBalanceRequest): Uint8Array {
+    return QueryBalanceRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryBalanceRequest): QueryBalanceRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.nft.v1beta1.QueryBalanceRequest",
+      value: QueryBalanceRequest.encode(message).finish()
+    };
   }
 
 };
@@ -453,6 +482,9 @@ function createBaseQueryBalanceResponse(): QueryBalanceResponse {
 }
 
 export const QueryBalanceResponse = {
+  typeUrl: "/cosmos.nft.v1beta1.QueryBalanceResponse",
+  aminoType: "cosmos-sdk/QueryBalanceResponse",
+
   encode(message: QueryBalanceResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.amount.isZero()) {
       writer.uint32(8).uint64(message.amount);
@@ -523,6 +555,32 @@ export const QueryBalanceResponse = {
     const obj: any = {};
     obj.amount = message.amount ? message.amount.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryBalanceResponseAminoMsg): QueryBalanceResponse {
+    return QueryBalanceResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryBalanceResponse): QueryBalanceResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryBalanceResponse",
+      value: QueryBalanceResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryBalanceResponseProtoMsg): QueryBalanceResponse {
+    return QueryBalanceResponse.decode(message.value);
+  },
+
+  toProto(message: QueryBalanceResponse): Uint8Array {
+    return QueryBalanceResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryBalanceResponse): QueryBalanceResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.nft.v1beta1.QueryBalanceResponse",
+      value: QueryBalanceResponse.encode(message).finish()
+    };
   }
 
 };
@@ -535,6 +593,9 @@ function createBaseQueryOwnerRequest(): QueryOwnerRequest {
 }
 
 export const QueryOwnerRequest = {
+  typeUrl: "/cosmos.nft.v1beta1.QueryOwnerRequest",
+  aminoType: "cosmos-sdk/QueryOwnerRequest",
+
   encode(message: QueryOwnerRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.classId !== "") {
       writer.uint32(10).string(message.classId);
@@ -620,6 +681,32 @@ export const QueryOwnerRequest = {
     obj.class_id = message.classId;
     obj.id = message.id;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryOwnerRequestAminoMsg): QueryOwnerRequest {
+    return QueryOwnerRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryOwnerRequest): QueryOwnerRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryOwnerRequest",
+      value: QueryOwnerRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryOwnerRequestProtoMsg): QueryOwnerRequest {
+    return QueryOwnerRequest.decode(message.value);
+  },
+
+  toProto(message: QueryOwnerRequest): Uint8Array {
+    return QueryOwnerRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryOwnerRequest): QueryOwnerRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.nft.v1beta1.QueryOwnerRequest",
+      value: QueryOwnerRequest.encode(message).finish()
+    };
   }
 
 };
@@ -631,6 +718,9 @@ function createBaseQueryOwnerResponse(): QueryOwnerResponse {
 }
 
 export const QueryOwnerResponse = {
+  typeUrl: "/cosmos.nft.v1beta1.QueryOwnerResponse",
+  aminoType: "cosmos-sdk/QueryOwnerResponse",
+
   encode(message: QueryOwnerResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.owner !== "") {
       writer.uint32(10).string(message.owner);
@@ -701,6 +791,32 @@ export const QueryOwnerResponse = {
     const obj: any = {};
     obj.owner = message.owner;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryOwnerResponseAminoMsg): QueryOwnerResponse {
+    return QueryOwnerResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryOwnerResponse): QueryOwnerResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryOwnerResponse",
+      value: QueryOwnerResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryOwnerResponseProtoMsg): QueryOwnerResponse {
+    return QueryOwnerResponse.decode(message.value);
+  },
+
+  toProto(message: QueryOwnerResponse): Uint8Array {
+    return QueryOwnerResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryOwnerResponse): QueryOwnerResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.nft.v1beta1.QueryOwnerResponse",
+      value: QueryOwnerResponse.encode(message).finish()
+    };
   }
 
 };
@@ -712,6 +828,9 @@ function createBaseQuerySupplyRequest(): QuerySupplyRequest {
 }
 
 export const QuerySupplyRequest = {
+  typeUrl: "/cosmos.nft.v1beta1.QuerySupplyRequest",
+  aminoType: "cosmos-sdk/QuerySupplyRequest",
+
   encode(message: QuerySupplyRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.classId !== "") {
       writer.uint32(10).string(message.classId);
@@ -782,6 +901,32 @@ export const QuerySupplyRequest = {
     const obj: any = {};
     obj.class_id = message.classId;
     return obj;
+  },
+
+  fromAminoMsg(object: QuerySupplyRequestAminoMsg): QuerySupplyRequest {
+    return QuerySupplyRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QuerySupplyRequest): QuerySupplyRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QuerySupplyRequest",
+      value: QuerySupplyRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QuerySupplyRequestProtoMsg): QuerySupplyRequest {
+    return QuerySupplyRequest.decode(message.value);
+  },
+
+  toProto(message: QuerySupplyRequest): Uint8Array {
+    return QuerySupplyRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QuerySupplyRequest): QuerySupplyRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.nft.v1beta1.QuerySupplyRequest",
+      value: QuerySupplyRequest.encode(message).finish()
+    };
   }
 
 };
@@ -793,6 +938,9 @@ function createBaseQuerySupplyResponse(): QuerySupplyResponse {
 }
 
 export const QuerySupplyResponse = {
+  typeUrl: "/cosmos.nft.v1beta1.QuerySupplyResponse",
+  aminoType: "cosmos-sdk/QuerySupplyResponse",
+
   encode(message: QuerySupplyResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.amount.isZero()) {
       writer.uint32(8).uint64(message.amount);
@@ -863,6 +1011,32 @@ export const QuerySupplyResponse = {
     const obj: any = {};
     obj.amount = message.amount ? message.amount.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QuerySupplyResponseAminoMsg): QuerySupplyResponse {
+    return QuerySupplyResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QuerySupplyResponse): QuerySupplyResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QuerySupplyResponse",
+      value: QuerySupplyResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QuerySupplyResponseProtoMsg): QuerySupplyResponse {
+    return QuerySupplyResponse.decode(message.value);
+  },
+
+  toProto(message: QuerySupplyResponse): Uint8Array {
+    return QuerySupplyResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QuerySupplyResponse): QuerySupplyResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.nft.v1beta1.QuerySupplyResponse",
+      value: QuerySupplyResponse.encode(message).finish()
+    };
   }
 
 };
@@ -876,6 +1050,9 @@ function createBaseQueryNFTsRequest(): QueryNFTsRequest {
 }
 
 export const QueryNFTsRequest = {
+  typeUrl: "/cosmos.nft.v1beta1.QueryNFTsRequest",
+  aminoType: "cosmos-sdk/QueryNFTsRequest",
+
   encode(message: QueryNFTsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.classId !== "") {
       writer.uint32(10).string(message.classId);
@@ -976,6 +1153,32 @@ export const QueryNFTsRequest = {
     obj.owner = message.owner;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryNFTsRequestAminoMsg): QueryNFTsRequest {
+    return QueryNFTsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryNFTsRequest): QueryNFTsRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryNFTsRequest",
+      value: QueryNFTsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryNFTsRequestProtoMsg): QueryNFTsRequest {
+    return QueryNFTsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryNFTsRequest): Uint8Array {
+    return QueryNFTsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryNFTsRequest): QueryNFTsRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.nft.v1beta1.QueryNFTsRequest",
+      value: QueryNFTsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -988,6 +1191,9 @@ function createBaseQueryNFTsResponse(): QueryNFTsResponse {
 }
 
 export const QueryNFTsResponse = {
+  typeUrl: "/cosmos.nft.v1beta1.QueryNFTsResponse",
+  aminoType: "cosmos-sdk/QueryNFTsResponse",
+
   encode(message: QueryNFTsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.nfts) {
       NFT.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1091,6 +1297,32 @@ export const QueryNFTsResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryNFTsResponseAminoMsg): QueryNFTsResponse {
+    return QueryNFTsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryNFTsResponse): QueryNFTsResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryNFTsResponse",
+      value: QueryNFTsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryNFTsResponseProtoMsg): QueryNFTsResponse {
+    return QueryNFTsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryNFTsResponse): Uint8Array {
+    return QueryNFTsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryNFTsResponse): QueryNFTsResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.nft.v1beta1.QueryNFTsResponse",
+      value: QueryNFTsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1103,6 +1335,9 @@ function createBaseQueryNFTRequest(): QueryNFTRequest {
 }
 
 export const QueryNFTRequest = {
+  typeUrl: "/cosmos.nft.v1beta1.QueryNFTRequest",
+  aminoType: "cosmos-sdk/QueryNFTRequest",
+
   encode(message: QueryNFTRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.classId !== "") {
       writer.uint32(10).string(message.classId);
@@ -1188,6 +1423,32 @@ export const QueryNFTRequest = {
     obj.class_id = message.classId;
     obj.id = message.id;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryNFTRequestAminoMsg): QueryNFTRequest {
+    return QueryNFTRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryNFTRequest): QueryNFTRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryNFTRequest",
+      value: QueryNFTRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryNFTRequestProtoMsg): QueryNFTRequest {
+    return QueryNFTRequest.decode(message.value);
+  },
+
+  toProto(message: QueryNFTRequest): Uint8Array {
+    return QueryNFTRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryNFTRequest): QueryNFTRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.nft.v1beta1.QueryNFTRequest",
+      value: QueryNFTRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1199,6 +1460,9 @@ function createBaseQueryNFTResponse(): QueryNFTResponse {
 }
 
 export const QueryNFTResponse = {
+  typeUrl: "/cosmos.nft.v1beta1.QueryNFTResponse",
+  aminoType: "cosmos-sdk/QueryNFTResponse",
+
   encode(message: QueryNFTResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.nft !== undefined) {
       NFT.encode(message.nft, writer.uint32(10).fork()).ldelim();
@@ -1269,6 +1533,32 @@ export const QueryNFTResponse = {
     const obj: any = {};
     obj.nft = message.nft ? NFT.toAmino(message.nft) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryNFTResponseAminoMsg): QueryNFTResponse {
+    return QueryNFTResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryNFTResponse): QueryNFTResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryNFTResponse",
+      value: QueryNFTResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryNFTResponseProtoMsg): QueryNFTResponse {
+    return QueryNFTResponse.decode(message.value);
+  },
+
+  toProto(message: QueryNFTResponse): Uint8Array {
+    return QueryNFTResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryNFTResponse): QueryNFTResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.nft.v1beta1.QueryNFTResponse",
+      value: QueryNFTResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1280,6 +1570,9 @@ function createBaseQueryClassRequest(): QueryClassRequest {
 }
 
 export const QueryClassRequest = {
+  typeUrl: "/cosmos.nft.v1beta1.QueryClassRequest",
+  aminoType: "cosmos-sdk/QueryClassRequest",
+
   encode(message: QueryClassRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.classId !== "") {
       writer.uint32(10).string(message.classId);
@@ -1350,6 +1643,32 @@ export const QueryClassRequest = {
     const obj: any = {};
     obj.class_id = message.classId;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryClassRequestAminoMsg): QueryClassRequest {
+    return QueryClassRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryClassRequest): QueryClassRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryClassRequest",
+      value: QueryClassRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryClassRequestProtoMsg): QueryClassRequest {
+    return QueryClassRequest.decode(message.value);
+  },
+
+  toProto(message: QueryClassRequest): Uint8Array {
+    return QueryClassRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryClassRequest): QueryClassRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.nft.v1beta1.QueryClassRequest",
+      value: QueryClassRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1361,6 +1680,9 @@ function createBaseQueryClassResponse(): QueryClassResponse {
 }
 
 export const QueryClassResponse = {
+  typeUrl: "/cosmos.nft.v1beta1.QueryClassResponse",
+  aminoType: "cosmos-sdk/QueryClassResponse",
+
   encode(message: QueryClassResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.class !== undefined) {
       Class.encode(message.class, writer.uint32(10).fork()).ldelim();
@@ -1431,6 +1753,32 @@ export const QueryClassResponse = {
     const obj: any = {};
     obj.class = message.class ? Class.toAmino(message.class) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryClassResponseAminoMsg): QueryClassResponse {
+    return QueryClassResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryClassResponse): QueryClassResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryClassResponse",
+      value: QueryClassResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryClassResponseProtoMsg): QueryClassResponse {
+    return QueryClassResponse.decode(message.value);
+  },
+
+  toProto(message: QueryClassResponse): Uint8Array {
+    return QueryClassResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryClassResponse): QueryClassResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.nft.v1beta1.QueryClassResponse",
+      value: QueryClassResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1442,6 +1790,9 @@ function createBaseQueryClassesRequest(): QueryClassesRequest {
 }
 
 export const QueryClassesRequest = {
+  typeUrl: "/cosmos.nft.v1beta1.QueryClassesRequest",
+  aminoType: "cosmos-sdk/QueryClassesRequest",
+
   encode(message: QueryClassesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.pagination !== undefined) {
       PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim();
@@ -1512,6 +1863,32 @@ export const QueryClassesRequest = {
     const obj: any = {};
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryClassesRequestAminoMsg): QueryClassesRequest {
+    return QueryClassesRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryClassesRequest): QueryClassesRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryClassesRequest",
+      value: QueryClassesRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryClassesRequestProtoMsg): QueryClassesRequest {
+    return QueryClassesRequest.decode(message.value);
+  },
+
+  toProto(message: QueryClassesRequest): Uint8Array {
+    return QueryClassesRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryClassesRequest): QueryClassesRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.nft.v1beta1.QueryClassesRequest",
+      value: QueryClassesRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1524,6 +1901,9 @@ function createBaseQueryClassesResponse(): QueryClassesResponse {
 }
 
 export const QueryClassesResponse = {
+  typeUrl: "/cosmos.nft.v1beta1.QueryClassesResponse",
+  aminoType: "cosmos-sdk/QueryClassesResponse",
+
   encode(message: QueryClassesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.classes) {
       Class.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1627,6 +2007,32 @@ export const QueryClassesResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryClassesResponseAminoMsg): QueryClassesResponse {
+    return QueryClassesResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryClassesResponse): QueryClassesResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryClassesResponse",
+      value: QueryClassesResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryClassesResponseProtoMsg): QueryClassesResponse {
+    return QueryClassesResponse.decode(message.value);
+  },
+
+  toProto(message: QueryClassesResponse): Uint8Array {
+    return QueryClassesResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryClassesResponse): QueryClassesResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.nft.v1beta1.QueryClassesResponse",
+      value: QueryClassesResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/nft/v1beta1/tx.ts b/__fixtures__/outputv2/cosmos/nft/v1beta1/tx.ts
index 08ea323b4..831a81cdc 100644
--- a/__fixtures__/outputv2/cosmos/nft/v1beta1/tx.ts
+++ b/__fixtures__/outputv2/cosmos/nft/v1beta1/tx.ts
@@ -16,7 +16,7 @@ export interface MsgSend {
   /** receiver is the receiver address of nft */
   receiver: string;
 }
-export interface MsgSendProtoType {
+export interface MsgSendProtoMsg {
   typeUrl: "/cosmos.nft.v1beta1.MsgSend";
   value: Uint8Array;
 }
@@ -35,7 +35,7 @@ export interface MsgSendAmino {
   /** receiver is the receiver address of nft */
   receiver: string;
 }
-export interface MsgSendAminoType {
+export interface MsgSendAminoMsg {
   type: "cosmos-sdk/MsgNFTSend";
   value: MsgSendAmino;
 }
@@ -50,14 +50,14 @@ export interface MsgSendSDKType {
 
 /** MsgSendResponse defines the Msg/Send response type. */
 export interface MsgSendResponse {}
-export interface MsgSendResponseProtoType {
+export interface MsgSendResponseProtoMsg {
   typeUrl: "/cosmos.nft.v1beta1.MsgSendResponse";
   value: Uint8Array;
 }
 
 /** MsgSendResponse defines the Msg/Send response type. */
 export interface MsgSendResponseAmino {}
-export interface MsgSendResponseAminoType {
+export interface MsgSendResponseAminoMsg {
   type: "cosmos-sdk/MsgSendResponse";
   value: MsgSendResponseAmino;
 }
@@ -75,6 +75,9 @@ function createBaseMsgSend(): MsgSend {
 }
 
 export const MsgSend = {
+  typeUrl: "/cosmos.nft.v1beta1.MsgSend",
+  aminoType: "cosmos-sdk/MsgNFTSend",
+
   encode(message: MsgSend, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.classId !== "") {
       writer.uint32(10).string(message.classId);
@@ -190,6 +193,32 @@ export const MsgSend = {
     obj.sender = message.sender;
     obj.receiver = message.receiver;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgSendAminoMsg): MsgSend {
+    return MsgSend.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgSend): MsgSendAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgNFTSend",
+      value: MsgSend.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgSendProtoMsg): MsgSend {
+    return MsgSend.decode(message.value);
+  },
+
+  toProto(message: MsgSend): Uint8Array {
+    return MsgSend.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgSend): MsgSendProtoMsg {
+    return {
+      typeUrl: "/cosmos.nft.v1beta1.MsgSend",
+      value: MsgSend.encode(message).finish()
+    };
   }
 
 };
@@ -199,6 +228,9 @@ function createBaseMsgSendResponse(): MsgSendResponse {
 }
 
 export const MsgSendResponse = {
+  typeUrl: "/cosmos.nft.v1beta1.MsgSendResponse",
+  aminoType: "cosmos-sdk/MsgSendResponse",
+
   encode(_: MsgSendResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -251,6 +283,32 @@ export const MsgSendResponse = {
   toAmino(_: MsgSendResponse): MsgSendResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgSendResponseAminoMsg): MsgSendResponse {
+    return MsgSendResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgSendResponse): MsgSendResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgSendResponse",
+      value: MsgSendResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgSendResponseProtoMsg): MsgSendResponse {
+    return MsgSendResponse.decode(message.value);
+  },
+
+  toProto(message: MsgSendResponse): Uint8Array {
+    return MsgSendResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgSendResponse): MsgSendResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.nft.v1beta1.MsgSendResponse",
+      value: MsgSendResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/orm/module/v1alpha1/module.ts b/__fixtures__/outputv2/cosmos/orm/module/v1alpha1/module.ts
index 41763f569..6e182ec5c 100644
--- a/__fixtures__/outputv2/cosmos/orm/module/v1alpha1/module.ts
+++ b/__fixtures__/outputv2/cosmos/orm/module/v1alpha1/module.ts
@@ -8,7 +8,7 @@ export const protobufPackage = "cosmos.orm.module.v1alpha1";
  * with ORM data.
  */
 export interface Module {}
-export interface ModuleProtoType {
+export interface ModuleProtoMsg {
   typeUrl: "/cosmos.orm.module.v1alpha1.Module";
   value: Uint8Array;
 }
@@ -19,7 +19,7 @@ export interface ModuleProtoType {
  * with ORM data.
  */
 export interface ModuleAmino {}
-export interface ModuleAminoType {
+export interface ModuleAminoMsg {
   type: "cosmos-sdk/Module";
   value: ModuleAmino;
 }
@@ -36,6 +36,9 @@ function createBaseModule(): Module {
 }
 
 export const Module = {
+  typeUrl: "/cosmos.orm.module.v1alpha1.Module",
+  aminoType: "cosmos-sdk/Module",
+
   encode(_: Module, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -88,6 +91,32 @@ export const Module = {
   toAmino(_: Module): ModuleAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: ModuleAminoMsg): Module {
+    return Module.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Module): ModuleAminoMsg {
+    return {
+      type: "cosmos-sdk/Module",
+      value: Module.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ModuleProtoMsg): Module {
+    return Module.decode(message.value);
+  },
+
+  toProto(message: Module): Uint8Array {
+    return Module.encode(message).finish();
+  },
+
+  toProtoMsg(message: Module): ModuleProtoMsg {
+    return {
+      typeUrl: "/cosmos.orm.module.v1alpha1.Module",
+      value: Module.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/orm/v1/orm.ts b/__fixtures__/outputv2/cosmos/orm/v1/orm.ts
index efd5c7b56..42a7006da 100644
--- a/__fixtures__/outputv2/cosmos/orm/v1/orm.ts
+++ b/__fixtures__/outputv2/cosmos/orm/v1/orm.ts
@@ -17,7 +17,7 @@ export interface TableDescriptor {
    */
   id: number;
 }
-export interface TableDescriptorProtoType {
+export interface TableDescriptorProtoMsg {
   typeUrl: "/cosmos.orm.v1.TableDescriptor";
   value: Uint8Array;
 }
@@ -37,7 +37,7 @@ export interface TableDescriptorAmino {
    */
   id: number;
 }
-export interface TableDescriptorAminoType {
+export interface TableDescriptorAminoMsg {
   type: "cosmos-sdk/TableDescriptor";
   value: TableDescriptorAmino;
 }
@@ -92,7 +92,7 @@ export interface PrimaryKeyDescriptor {
    */
   autoIncrement: boolean;
 }
-export interface PrimaryKeyDescriptorProtoType {
+export interface PrimaryKeyDescriptorProtoMsg {
   typeUrl: "/cosmos.orm.v1.PrimaryKeyDescriptor";
   value: Uint8Array;
 }
@@ -140,7 +140,7 @@ export interface PrimaryKeyDescriptorAmino {
    */
   auto_increment: boolean;
 }
-export interface PrimaryKeyDescriptorAminoType {
+export interface PrimaryKeyDescriptorAminoMsg {
   type: "cosmos-sdk/PrimaryKeyDescriptor";
   value: PrimaryKeyDescriptorAmino;
 }
@@ -176,7 +176,7 @@ export interface SecondaryIndexDescriptor {
   /** unique specifies that this an unique index. */
   unique: boolean;
 }
-export interface SecondaryIndexDescriptorProtoType {
+export interface SecondaryIndexDescriptorProtoMsg {
   typeUrl: "/cosmos.orm.v1.SecondaryIndexDescriptor";
   value: Uint8Array;
 }
@@ -206,7 +206,7 @@ export interface SecondaryIndexDescriptorAmino {
   /** unique specifies that this an unique index. */
   unique: boolean;
 }
-export interface SecondaryIndexDescriptorAminoType {
+export interface SecondaryIndexDescriptorAminoMsg {
   type: "cosmos-sdk/SecondaryIndexDescriptor";
   value: SecondaryIndexDescriptorAmino;
 }
@@ -227,7 +227,7 @@ export interface SingletonDescriptor {
    */
   id: number;
 }
-export interface SingletonDescriptorProtoType {
+export interface SingletonDescriptorProtoMsg {
   typeUrl: "/cosmos.orm.v1.SingletonDescriptor";
   value: Uint8Array;
 }
@@ -241,7 +241,7 @@ export interface SingletonDescriptorAmino {
    */
   id: number;
 }
-export interface SingletonDescriptorAminoType {
+export interface SingletonDescriptorAminoMsg {
   type: "cosmos-sdk/SingletonDescriptor";
   value: SingletonDescriptorAmino;
 }
@@ -260,6 +260,9 @@ function createBaseTableDescriptor(): TableDescriptor {
 }
 
 export const TableDescriptor = {
+  typeUrl: "/cosmos.orm.v1.TableDescriptor",
+  aminoType: "cosmos-sdk/TableDescriptor",
+
   encode(message: TableDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.primaryKey !== undefined) {
       PrimaryKeyDescriptor.encode(message.primaryKey, writer.uint32(10).fork()).ldelim();
@@ -378,6 +381,32 @@ export const TableDescriptor = {
 
     obj.id = message.id;
     return obj;
+  },
+
+  fromAminoMsg(object: TableDescriptorAminoMsg): TableDescriptor {
+    return TableDescriptor.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: TableDescriptor): TableDescriptorAminoMsg {
+    return {
+      type: "cosmos-sdk/TableDescriptor",
+      value: TableDescriptor.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: TableDescriptorProtoMsg): TableDescriptor {
+    return TableDescriptor.decode(message.value);
+  },
+
+  toProto(message: TableDescriptor): Uint8Array {
+    return TableDescriptor.encode(message).finish();
+  },
+
+  toProtoMsg(message: TableDescriptor): TableDescriptorProtoMsg {
+    return {
+      typeUrl: "/cosmos.orm.v1.TableDescriptor",
+      value: TableDescriptor.encode(message).finish()
+    };
   }
 
 };
@@ -390,6 +419,9 @@ function createBasePrimaryKeyDescriptor(): PrimaryKeyDescriptor {
 }
 
 export const PrimaryKeyDescriptor = {
+  typeUrl: "/cosmos.orm.v1.PrimaryKeyDescriptor",
+  aminoType: "cosmos-sdk/PrimaryKeyDescriptor",
+
   encode(message: PrimaryKeyDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.fields !== "") {
       writer.uint32(10).string(message.fields);
@@ -475,6 +507,32 @@ export const PrimaryKeyDescriptor = {
     obj.fields = message.fields;
     obj.auto_increment = message.autoIncrement;
     return obj;
+  },
+
+  fromAminoMsg(object: PrimaryKeyDescriptorAminoMsg): PrimaryKeyDescriptor {
+    return PrimaryKeyDescriptor.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: PrimaryKeyDescriptor): PrimaryKeyDescriptorAminoMsg {
+    return {
+      type: "cosmos-sdk/PrimaryKeyDescriptor",
+      value: PrimaryKeyDescriptor.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: PrimaryKeyDescriptorProtoMsg): PrimaryKeyDescriptor {
+    return PrimaryKeyDescriptor.decode(message.value);
+  },
+
+  toProto(message: PrimaryKeyDescriptor): Uint8Array {
+    return PrimaryKeyDescriptor.encode(message).finish();
+  },
+
+  toProtoMsg(message: PrimaryKeyDescriptor): PrimaryKeyDescriptorProtoMsg {
+    return {
+      typeUrl: "/cosmos.orm.v1.PrimaryKeyDescriptor",
+      value: PrimaryKeyDescriptor.encode(message).finish()
+    };
   }
 
 };
@@ -488,6 +546,9 @@ function createBaseSecondaryIndexDescriptor(): SecondaryIndexDescriptor {
 }
 
 export const SecondaryIndexDescriptor = {
+  typeUrl: "/cosmos.orm.v1.SecondaryIndexDescriptor",
+  aminoType: "cosmos-sdk/SecondaryIndexDescriptor",
+
   encode(message: SecondaryIndexDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.fields !== "") {
       writer.uint32(10).string(message.fields);
@@ -588,6 +649,32 @@ export const SecondaryIndexDescriptor = {
     obj.id = message.id;
     obj.unique = message.unique;
     return obj;
+  },
+
+  fromAminoMsg(object: SecondaryIndexDescriptorAminoMsg): SecondaryIndexDescriptor {
+    return SecondaryIndexDescriptor.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: SecondaryIndexDescriptor): SecondaryIndexDescriptorAminoMsg {
+    return {
+      type: "cosmos-sdk/SecondaryIndexDescriptor",
+      value: SecondaryIndexDescriptor.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: SecondaryIndexDescriptorProtoMsg): SecondaryIndexDescriptor {
+    return SecondaryIndexDescriptor.decode(message.value);
+  },
+
+  toProto(message: SecondaryIndexDescriptor): Uint8Array {
+    return SecondaryIndexDescriptor.encode(message).finish();
+  },
+
+  toProtoMsg(message: SecondaryIndexDescriptor): SecondaryIndexDescriptorProtoMsg {
+    return {
+      typeUrl: "/cosmos.orm.v1.SecondaryIndexDescriptor",
+      value: SecondaryIndexDescriptor.encode(message).finish()
+    };
   }
 
 };
@@ -599,6 +686,9 @@ function createBaseSingletonDescriptor(): SingletonDescriptor {
 }
 
 export const SingletonDescriptor = {
+  typeUrl: "/cosmos.orm.v1.SingletonDescriptor",
+  aminoType: "cosmos-sdk/SingletonDescriptor",
+
   encode(message: SingletonDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.id !== 0) {
       writer.uint32(8).uint32(message.id);
@@ -669,6 +759,32 @@ export const SingletonDescriptor = {
     const obj: any = {};
     obj.id = message.id;
     return obj;
+  },
+
+  fromAminoMsg(object: SingletonDescriptorAminoMsg): SingletonDescriptor {
+    return SingletonDescriptor.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: SingletonDescriptor): SingletonDescriptorAminoMsg {
+    return {
+      type: "cosmos-sdk/SingletonDescriptor",
+      value: SingletonDescriptor.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: SingletonDescriptorProtoMsg): SingletonDescriptor {
+    return SingletonDescriptor.decode(message.value);
+  },
+
+  toProto(message: SingletonDescriptor): Uint8Array {
+    return SingletonDescriptor.encode(message).finish();
+  },
+
+  toProtoMsg(message: SingletonDescriptor): SingletonDescriptorProtoMsg {
+    return {
+      typeUrl: "/cosmos.orm.v1.SingletonDescriptor",
+      value: SingletonDescriptor.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/orm/v1alpha1/schema.ts b/__fixtures__/outputv2/cosmos/orm/v1alpha1/schema.ts
index 086e2cd0c..fa0c6b34a 100644
--- a/__fixtures__/outputv2/cosmos/orm/v1alpha1/schema.ts
+++ b/__fixtures__/outputv2/cosmos/orm/v1alpha1/schema.ts
@@ -112,7 +112,7 @@ export interface ModuleSchemaDescriptor {
    */
   prefix: Uint8Array;
 }
-export interface ModuleSchemaDescriptorProtoType {
+export interface ModuleSchemaDescriptorProtoMsg {
   typeUrl: "/cosmos.orm.v1alpha1.ModuleSchemaDescriptor";
   value: Uint8Array;
 }
@@ -127,7 +127,7 @@ export interface ModuleSchemaDescriptorAmino {
    */
   prefix: Uint8Array;
 }
-export interface ModuleSchemaDescriptorAminoType {
+export interface ModuleSchemaDescriptorAminoMsg {
   type: "cosmos-sdk/ModuleSchemaDescriptor";
   value: ModuleSchemaDescriptorAmino;
 }
@@ -160,7 +160,7 @@ export interface ModuleSchemaDescriptor_FileEntry {
    */
   storageType: StorageType;
 }
-export interface ModuleSchemaDescriptor_FileEntryProtoType {
+export interface ModuleSchemaDescriptor_FileEntryProtoMsg {
   typeUrl: "/cosmos.orm.v1alpha1.FileEntry";
   value: Uint8Array;
 }
@@ -187,7 +187,7 @@ export interface ModuleSchemaDescriptor_FileEntryAmino {
    */
   storage_type: StorageType;
 }
-export interface ModuleSchemaDescriptor_FileEntryAminoType {
+export interface ModuleSchemaDescriptor_FileEntryAminoMsg {
   type: "cosmos-sdk/FileEntry";
   value: ModuleSchemaDescriptor_FileEntryAmino;
 }
@@ -207,6 +207,9 @@ function createBaseModuleSchemaDescriptor(): ModuleSchemaDescriptor {
 }
 
 export const ModuleSchemaDescriptor = {
+  typeUrl: "/cosmos.orm.v1alpha1.ModuleSchemaDescriptor",
+  aminoType: "cosmos-sdk/ModuleSchemaDescriptor",
+
   encode(message: ModuleSchemaDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.schemaFile) {
       ModuleSchemaDescriptor_FileEntry.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -310,6 +313,32 @@ export const ModuleSchemaDescriptor = {
 
     obj.prefix = message.prefix;
     return obj;
+  },
+
+  fromAminoMsg(object: ModuleSchemaDescriptorAminoMsg): ModuleSchemaDescriptor {
+    return ModuleSchemaDescriptor.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ModuleSchemaDescriptor): ModuleSchemaDescriptorAminoMsg {
+    return {
+      type: "cosmos-sdk/ModuleSchemaDescriptor",
+      value: ModuleSchemaDescriptor.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ModuleSchemaDescriptorProtoMsg): ModuleSchemaDescriptor {
+    return ModuleSchemaDescriptor.decode(message.value);
+  },
+
+  toProto(message: ModuleSchemaDescriptor): Uint8Array {
+    return ModuleSchemaDescriptor.encode(message).finish();
+  },
+
+  toProtoMsg(message: ModuleSchemaDescriptor): ModuleSchemaDescriptorProtoMsg {
+    return {
+      typeUrl: "/cosmos.orm.v1alpha1.ModuleSchemaDescriptor",
+      value: ModuleSchemaDescriptor.encode(message).finish()
+    };
   }
 
 };
@@ -323,6 +352,9 @@ function createBaseModuleSchemaDescriptor_FileEntry(): ModuleSchemaDescriptor_Fi
 }
 
 export const ModuleSchemaDescriptor_FileEntry = {
+  typeUrl: "/cosmos.orm.v1alpha1.FileEntry",
+  aminoType: "cosmos-sdk/FileEntry",
+
   encode(message: ModuleSchemaDescriptor_FileEntry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.id !== 0) {
       writer.uint32(8).uint32(message.id);
@@ -423,6 +455,32 @@ export const ModuleSchemaDescriptor_FileEntry = {
     obj.proto_file_name = message.protoFileName;
     obj.storage_type = message.storageType;
     return obj;
+  },
+
+  fromAminoMsg(object: ModuleSchemaDescriptor_FileEntryAminoMsg): ModuleSchemaDescriptor_FileEntry {
+    return ModuleSchemaDescriptor_FileEntry.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ModuleSchemaDescriptor_FileEntry): ModuleSchemaDescriptor_FileEntryAminoMsg {
+    return {
+      type: "cosmos-sdk/FileEntry",
+      value: ModuleSchemaDescriptor_FileEntry.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ModuleSchemaDescriptor_FileEntryProtoMsg): ModuleSchemaDescriptor_FileEntry {
+    return ModuleSchemaDescriptor_FileEntry.decode(message.value);
+  },
+
+  toProto(message: ModuleSchemaDescriptor_FileEntry): Uint8Array {
+    return ModuleSchemaDescriptor_FileEntry.encode(message).finish();
+  },
+
+  toProtoMsg(message: ModuleSchemaDescriptor_FileEntry): ModuleSchemaDescriptor_FileEntryProtoMsg {
+    return {
+      typeUrl: "/cosmos.orm.v1alpha1.FileEntry",
+      value: ModuleSchemaDescriptor_FileEntry.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/params/v1beta1/params.ts b/__fixtures__/outputv2/cosmos/params/v1beta1/params.ts
index 43f15f8c7..43aa2111e 100644
--- a/__fixtures__/outputv2/cosmos/params/v1beta1/params.ts
+++ b/__fixtures__/outputv2/cosmos/params/v1beta1/params.ts
@@ -8,7 +8,7 @@ export interface ParameterChangeProposal {
   description: string;
   changes: ParamChange[];
 }
-export interface ParameterChangeProposalProtoType {
+export interface ParameterChangeProposalProtoMsg {
   typeUrl: "/cosmos.params.v1beta1.ParameterChangeProposal";
   value: Uint8Array;
 }
@@ -19,7 +19,7 @@ export interface ParameterChangeProposalAmino {
   description: string;
   changes: ParamChangeAmino[];
 }
-export interface ParameterChangeProposalAminoType {
+export interface ParameterChangeProposalAminoMsg {
   type: "cosmos-sdk/ParameterChangeProposal";
   value: ParameterChangeProposalAmino;
 }
@@ -40,7 +40,7 @@ export interface ParamChange {
   key: string;
   value: string;
 }
-export interface ParamChangeProtoType {
+export interface ParamChangeProtoMsg {
   typeUrl: "/cosmos.params.v1beta1.ParamChange";
   value: Uint8Array;
 }
@@ -54,7 +54,7 @@ export interface ParamChangeAmino {
   key: string;
   value: string;
 }
-export interface ParamChangeAminoType {
+export interface ParamChangeAminoMsg {
   type: "cosmos-sdk/ParamChange";
   value: ParamChangeAmino;
 }
@@ -78,6 +78,9 @@ function createBaseParameterChangeProposal(): ParameterChangeProposal {
 }
 
 export const ParameterChangeProposal = {
+  typeUrl: "/cosmos.params.v1beta1.ParameterChangeProposal",
+  aminoType: "cosmos-sdk/ParameterChangeProposal",
+
   encode(message: ParameterChangeProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.title !== "") {
       writer.uint32(10).string(message.title);
@@ -196,6 +199,32 @@ export const ParameterChangeProposal = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ParameterChangeProposalAminoMsg): ParameterChangeProposal {
+    return ParameterChangeProposal.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ParameterChangeProposal): ParameterChangeProposalAminoMsg {
+    return {
+      type: "cosmos-sdk/ParameterChangeProposal",
+      value: ParameterChangeProposal.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ParameterChangeProposalProtoMsg): ParameterChangeProposal {
+    return ParameterChangeProposal.decode(message.value);
+  },
+
+  toProto(message: ParameterChangeProposal): Uint8Array {
+    return ParameterChangeProposal.encode(message).finish();
+  },
+
+  toProtoMsg(message: ParameterChangeProposal): ParameterChangeProposalProtoMsg {
+    return {
+      typeUrl: "/cosmos.params.v1beta1.ParameterChangeProposal",
+      value: ParameterChangeProposal.encode(message).finish()
+    };
   }
 
 };
@@ -209,6 +238,9 @@ function createBaseParamChange(): ParamChange {
 }
 
 export const ParamChange = {
+  typeUrl: "/cosmos.params.v1beta1.ParamChange",
+  aminoType: "cosmos-sdk/ParamChange",
+
   encode(message: ParamChange, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.subspace !== "") {
       writer.uint32(10).string(message.subspace);
@@ -309,6 +341,32 @@ export const ParamChange = {
     obj.key = message.key;
     obj.value = message.value;
     return obj;
+  },
+
+  fromAminoMsg(object: ParamChangeAminoMsg): ParamChange {
+    return ParamChange.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ParamChange): ParamChangeAminoMsg {
+    return {
+      type: "cosmos-sdk/ParamChange",
+      value: ParamChange.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ParamChangeProtoMsg): ParamChange {
+    return ParamChange.decode(message.value);
+  },
+
+  toProto(message: ParamChange): Uint8Array {
+    return ParamChange.encode(message).finish();
+  },
+
+  toProtoMsg(message: ParamChange): ParamChangeProtoMsg {
+    return {
+      typeUrl: "/cosmos.params.v1beta1.ParamChange",
+      value: ParamChange.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/params/v1beta1/query.ts b/__fixtures__/outputv2/cosmos/params/v1beta1/query.ts
index 667b59e80..af6d63d21 100644
--- a/__fixtures__/outputv2/cosmos/params/v1beta1/query.ts
+++ b/__fixtures__/outputv2/cosmos/params/v1beta1/query.ts
@@ -11,7 +11,7 @@ export interface QueryParamsRequest {
   /** key defines the key of the parameter in the subspace. */
   key: string;
 }
-export interface QueryParamsRequestProtoType {
+export interface QueryParamsRequestProtoMsg {
   typeUrl: "/cosmos.params.v1beta1.QueryParamsRequest";
   value: Uint8Array;
 }
@@ -24,7 +24,7 @@ export interface QueryParamsRequestAmino {
   /** key defines the key of the parameter in the subspace. */
   key: string;
 }
-export interface QueryParamsRequestAminoType {
+export interface QueryParamsRequestAminoMsg {
   type: "cosmos-sdk/QueryParamsRequest";
   value: QueryParamsRequestAmino;
 }
@@ -40,7 +40,7 @@ export interface QueryParamsResponse {
   /** param defines the queried parameter. */
   param?: ParamChange;
 }
-export interface QueryParamsResponseProtoType {
+export interface QueryParamsResponseProtoMsg {
   typeUrl: "/cosmos.params.v1beta1.QueryParamsResponse";
   value: Uint8Array;
 }
@@ -50,7 +50,7 @@ export interface QueryParamsResponseAmino {
   /** param defines the queried parameter. */
   param?: ParamChangeAmino;
 }
-export interface QueryParamsResponseAminoType {
+export interface QueryParamsResponseAminoMsg {
   type: "cosmos-sdk/QueryParamsResponse";
   value: QueryParamsResponseAmino;
 }
@@ -65,7 +65,7 @@ export interface QueryParamsResponseSDKType {
  * subspaces and all keys for a subspace.
  */
 export interface QuerySubspacesRequest {}
-export interface QuerySubspacesRequestProtoType {
+export interface QuerySubspacesRequestProtoMsg {
   typeUrl: "/cosmos.params.v1beta1.QuerySubspacesRequest";
   value: Uint8Array;
 }
@@ -75,7 +75,7 @@ export interface QuerySubspacesRequestProtoType {
  * subspaces and all keys for a subspace.
  */
 export interface QuerySubspacesRequestAmino {}
-export interface QuerySubspacesRequestAminoType {
+export interface QuerySubspacesRequestAminoMsg {
   type: "cosmos-sdk/QuerySubspacesRequest";
   value: QuerySubspacesRequestAmino;
 }
@@ -93,7 +93,7 @@ export interface QuerySubspacesRequestSDKType {}
 export interface QuerySubspacesResponse {
   subspaces: Subspace[];
 }
-export interface QuerySubspacesResponseProtoType {
+export interface QuerySubspacesResponseProtoMsg {
   typeUrl: "/cosmos.params.v1beta1.QuerySubspacesResponse";
   value: Uint8Array;
 }
@@ -105,7 +105,7 @@ export interface QuerySubspacesResponseProtoType {
 export interface QuerySubspacesResponseAmino {
   subspaces: SubspaceAmino[];
 }
-export interface QuerySubspacesResponseAminoType {
+export interface QuerySubspacesResponseAminoMsg {
   type: "cosmos-sdk/QuerySubspacesResponse";
   value: QuerySubspacesResponseAmino;
 }
@@ -126,7 +126,7 @@ export interface Subspace {
   subspace: string;
   keys: string[];
 }
-export interface SubspaceProtoType {
+export interface SubspaceProtoMsg {
   typeUrl: "/cosmos.params.v1beta1.Subspace";
   value: Uint8Array;
 }
@@ -139,7 +139,7 @@ export interface SubspaceAmino {
   subspace: string;
   keys: string[];
 }
-export interface SubspaceAminoType {
+export interface SubspaceAminoMsg {
   type: "cosmos-sdk/Subspace";
   value: SubspaceAmino;
 }
@@ -161,6 +161,9 @@ function createBaseQueryParamsRequest(): QueryParamsRequest {
 }
 
 export const QueryParamsRequest = {
+  typeUrl: "/cosmos.params.v1beta1.QueryParamsRequest",
+  aminoType: "cosmos-sdk/QueryParamsRequest",
+
   encode(message: QueryParamsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.subspace !== "") {
       writer.uint32(10).string(message.subspace);
@@ -246,6 +249,32 @@ export const QueryParamsRequest = {
     obj.subspace = message.subspace;
     obj.key = message.key;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest {
+    return QueryParamsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryParamsRequest): QueryParamsRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryParamsRequest",
+      value: QueryParamsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryParamsRequestProtoMsg): QueryParamsRequest {
+    return QueryParamsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryParamsRequest): Uint8Array {
+    return QueryParamsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryParamsRequest): QueryParamsRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.params.v1beta1.QueryParamsRequest",
+      value: QueryParamsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -257,6 +286,9 @@ function createBaseQueryParamsResponse(): QueryParamsResponse {
 }
 
 export const QueryParamsResponse = {
+  typeUrl: "/cosmos.params.v1beta1.QueryParamsResponse",
+  aminoType: "cosmos-sdk/QueryParamsResponse",
+
   encode(message: QueryParamsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.param !== undefined) {
       ParamChange.encode(message.param, writer.uint32(10).fork()).ldelim();
@@ -327,6 +359,32 @@ export const QueryParamsResponse = {
     const obj: any = {};
     obj.param = message.param ? ParamChange.toAmino(message.param) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryParamsResponseAminoMsg): QueryParamsResponse {
+    return QueryParamsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryParamsResponse): QueryParamsResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryParamsResponse",
+      value: QueryParamsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryParamsResponseProtoMsg): QueryParamsResponse {
+    return QueryParamsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryParamsResponse): Uint8Array {
+    return QueryParamsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryParamsResponse): QueryParamsResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.params.v1beta1.QueryParamsResponse",
+      value: QueryParamsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -336,6 +394,9 @@ function createBaseQuerySubspacesRequest(): QuerySubspacesRequest {
 }
 
 export const QuerySubspacesRequest = {
+  typeUrl: "/cosmos.params.v1beta1.QuerySubspacesRequest",
+  aminoType: "cosmos-sdk/QuerySubspacesRequest",
+
   encode(_: QuerySubspacesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -388,6 +449,32 @@ export const QuerySubspacesRequest = {
   toAmino(_: QuerySubspacesRequest): QuerySubspacesRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: QuerySubspacesRequestAminoMsg): QuerySubspacesRequest {
+    return QuerySubspacesRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QuerySubspacesRequest): QuerySubspacesRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QuerySubspacesRequest",
+      value: QuerySubspacesRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QuerySubspacesRequestProtoMsg): QuerySubspacesRequest {
+    return QuerySubspacesRequest.decode(message.value);
+  },
+
+  toProto(message: QuerySubspacesRequest): Uint8Array {
+    return QuerySubspacesRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QuerySubspacesRequest): QuerySubspacesRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.params.v1beta1.QuerySubspacesRequest",
+      value: QuerySubspacesRequest.encode(message).finish()
+    };
   }
 
 };
@@ -399,6 +486,9 @@ function createBaseQuerySubspacesResponse(): QuerySubspacesResponse {
 }
 
 export const QuerySubspacesResponse = {
+  typeUrl: "/cosmos.params.v1beta1.QuerySubspacesResponse",
+  aminoType: "cosmos-sdk/QuerySubspacesResponse",
+
   encode(message: QuerySubspacesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.subspaces) {
       Subspace.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -487,6 +577,32 @@ export const QuerySubspacesResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: QuerySubspacesResponseAminoMsg): QuerySubspacesResponse {
+    return QuerySubspacesResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QuerySubspacesResponse): QuerySubspacesResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QuerySubspacesResponse",
+      value: QuerySubspacesResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QuerySubspacesResponseProtoMsg): QuerySubspacesResponse {
+    return QuerySubspacesResponse.decode(message.value);
+  },
+
+  toProto(message: QuerySubspacesResponse): Uint8Array {
+    return QuerySubspacesResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QuerySubspacesResponse): QuerySubspacesResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.params.v1beta1.QuerySubspacesResponse",
+      value: QuerySubspacesResponse.encode(message).finish()
+    };
   }
 
 };
@@ -499,6 +615,9 @@ function createBaseSubspace(): Subspace {
 }
 
 export const Subspace = {
+  typeUrl: "/cosmos.params.v1beta1.Subspace",
+  aminoType: "cosmos-sdk/Subspace",
+
   encode(message: Subspace, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.subspace !== "") {
       writer.uint32(10).string(message.subspace);
@@ -602,6 +721,32 @@ export const Subspace = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: SubspaceAminoMsg): Subspace {
+    return Subspace.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Subspace): SubspaceAminoMsg {
+    return {
+      type: "cosmos-sdk/Subspace",
+      value: Subspace.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: SubspaceProtoMsg): Subspace {
+    return Subspace.decode(message.value);
+  },
+
+  toProto(message: Subspace): Uint8Array {
+    return Subspace.encode(message).finish();
+  },
+
+  toProtoMsg(message: Subspace): SubspaceProtoMsg {
+    return {
+      typeUrl: "/cosmos.params.v1beta1.Subspace",
+      value: Subspace.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/slashing/v1beta1/genesis.ts b/__fixtures__/outputv2/cosmos/slashing/v1beta1/genesis.ts
index a14a0613a..a556428ae 100644
--- a/__fixtures__/outputv2/cosmos/slashing/v1beta1/genesis.ts
+++ b/__fixtures__/outputv2/cosmos/slashing/v1beta1/genesis.ts
@@ -20,7 +20,7 @@ export interface GenesisState {
    */
   missedBlocks: ValidatorMissedBlocks[];
 }
-export interface GenesisStateProtoType {
+export interface GenesisStateProtoMsg {
   typeUrl: "/cosmos.slashing.v1beta1.GenesisState";
   value: Uint8Array;
 }
@@ -42,7 +42,7 @@ export interface GenesisStateAmino {
    */
   missed_blocks: ValidatorMissedBlocksAmino[];
 }
-export interface GenesisStateAminoType {
+export interface GenesisStateAminoMsg {
   type: "cosmos-sdk/GenesisState";
   value: GenesisStateAmino;
 }
@@ -62,7 +62,7 @@ export interface SigningInfo {
   /** validator_signing_info represents the signing info of this validator. */
   validatorSigningInfo?: ValidatorSigningInfo;
 }
-export interface SigningInfoProtoType {
+export interface SigningInfoProtoMsg {
   typeUrl: "/cosmos.slashing.v1beta1.SigningInfo";
   value: Uint8Array;
 }
@@ -75,7 +75,7 @@ export interface SigningInfoAmino {
   /** validator_signing_info represents the signing info of this validator. */
   validator_signing_info?: ValidatorSigningInfoAmino;
 }
-export interface SigningInfoAminoType {
+export interface SigningInfoAminoMsg {
   type: "cosmos-sdk/SigningInfo";
   value: SigningInfoAmino;
 }
@@ -97,7 +97,7 @@ export interface ValidatorMissedBlocks {
   /** missed_blocks is an array of missed blocks by the validator. */
   missedBlocks: MissedBlock[];
 }
-export interface ValidatorMissedBlocksProtoType {
+export interface ValidatorMissedBlocksProtoMsg {
   typeUrl: "/cosmos.slashing.v1beta1.ValidatorMissedBlocks";
   value: Uint8Array;
 }
@@ -113,7 +113,7 @@ export interface ValidatorMissedBlocksAmino {
   /** missed_blocks is an array of missed blocks by the validator. */
   missed_blocks: MissedBlockAmino[];
 }
-export interface ValidatorMissedBlocksAminoType {
+export interface ValidatorMissedBlocksAminoMsg {
   type: "cosmos-sdk/ValidatorMissedBlocks";
   value: ValidatorMissedBlocksAmino;
 }
@@ -135,7 +135,7 @@ export interface MissedBlock {
   /** missed is the missed status. */
   missed: boolean;
 }
-export interface MissedBlockProtoType {
+export interface MissedBlockProtoMsg {
   typeUrl: "/cosmos.slashing.v1beta1.MissedBlock";
   value: Uint8Array;
 }
@@ -148,7 +148,7 @@ export interface MissedBlockAmino {
   /** missed is the missed status. */
   missed: boolean;
 }
-export interface MissedBlockAminoType {
+export interface MissedBlockAminoMsg {
   type: "cosmos-sdk/MissedBlock";
   value: MissedBlockAmino;
 }
@@ -168,6 +168,9 @@ function createBaseGenesisState(): GenesisState {
 }
 
 export const GenesisState = {
+  typeUrl: "/cosmos.slashing.v1beta1.GenesisState",
+  aminoType: "cosmos-sdk/GenesisState",
+
   encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.params !== undefined) {
       Params.encode(message.params, writer.uint32(10).fork()).ldelim();
@@ -301,6 +304,32 @@ export const GenesisState = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisStateAminoMsg): GenesisState {
+    return GenesisState.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GenesisState): GenesisStateAminoMsg {
+    return {
+      type: "cosmos-sdk/GenesisState",
+      value: GenesisState.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GenesisStateProtoMsg): GenesisState {
+    return GenesisState.decode(message.value);
+  },
+
+  toProto(message: GenesisState): Uint8Array {
+    return GenesisState.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisState): GenesisStateProtoMsg {
+    return {
+      typeUrl: "/cosmos.slashing.v1beta1.GenesisState",
+      value: GenesisState.encode(message).finish()
+    };
   }
 
 };
@@ -313,6 +342,9 @@ function createBaseSigningInfo(): SigningInfo {
 }
 
 export const SigningInfo = {
+  typeUrl: "/cosmos.slashing.v1beta1.SigningInfo",
+  aminoType: "cosmos-sdk/SigningInfo",
+
   encode(message: SigningInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.address !== "") {
       writer.uint32(10).string(message.address);
@@ -398,6 +430,32 @@ export const SigningInfo = {
     obj.address = message.address;
     obj.validator_signing_info = message.validatorSigningInfo ? ValidatorSigningInfo.toAmino(message.validatorSigningInfo) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: SigningInfoAminoMsg): SigningInfo {
+    return SigningInfo.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: SigningInfo): SigningInfoAminoMsg {
+    return {
+      type: "cosmos-sdk/SigningInfo",
+      value: SigningInfo.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: SigningInfoProtoMsg): SigningInfo {
+    return SigningInfo.decode(message.value);
+  },
+
+  toProto(message: SigningInfo): Uint8Array {
+    return SigningInfo.encode(message).finish();
+  },
+
+  toProtoMsg(message: SigningInfo): SigningInfoProtoMsg {
+    return {
+      typeUrl: "/cosmos.slashing.v1beta1.SigningInfo",
+      value: SigningInfo.encode(message).finish()
+    };
   }
 
 };
@@ -410,6 +468,9 @@ function createBaseValidatorMissedBlocks(): ValidatorMissedBlocks {
 }
 
 export const ValidatorMissedBlocks = {
+  typeUrl: "/cosmos.slashing.v1beta1.ValidatorMissedBlocks",
+  aminoType: "cosmos-sdk/ValidatorMissedBlocks",
+
   encode(message: ValidatorMissedBlocks, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.address !== "") {
       writer.uint32(10).string(message.address);
@@ -513,6 +574,32 @@ export const ValidatorMissedBlocks = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ValidatorMissedBlocksAminoMsg): ValidatorMissedBlocks {
+    return ValidatorMissedBlocks.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ValidatorMissedBlocks): ValidatorMissedBlocksAminoMsg {
+    return {
+      type: "cosmos-sdk/ValidatorMissedBlocks",
+      value: ValidatorMissedBlocks.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ValidatorMissedBlocksProtoMsg): ValidatorMissedBlocks {
+    return ValidatorMissedBlocks.decode(message.value);
+  },
+
+  toProto(message: ValidatorMissedBlocks): Uint8Array {
+    return ValidatorMissedBlocks.encode(message).finish();
+  },
+
+  toProtoMsg(message: ValidatorMissedBlocks): ValidatorMissedBlocksProtoMsg {
+    return {
+      typeUrl: "/cosmos.slashing.v1beta1.ValidatorMissedBlocks",
+      value: ValidatorMissedBlocks.encode(message).finish()
+    };
   }
 
 };
@@ -525,6 +612,9 @@ function createBaseMissedBlock(): MissedBlock {
 }
 
 export const MissedBlock = {
+  typeUrl: "/cosmos.slashing.v1beta1.MissedBlock",
+  aminoType: "cosmos-sdk/MissedBlock",
+
   encode(message: MissedBlock, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.index.isZero()) {
       writer.uint32(8).int64(message.index);
@@ -610,6 +700,32 @@ export const MissedBlock = {
     obj.index = message.index ? message.index.toString() : undefined;
     obj.missed = message.missed;
     return obj;
+  },
+
+  fromAminoMsg(object: MissedBlockAminoMsg): MissedBlock {
+    return MissedBlock.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MissedBlock): MissedBlockAminoMsg {
+    return {
+      type: "cosmos-sdk/MissedBlock",
+      value: MissedBlock.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MissedBlockProtoMsg): MissedBlock {
+    return MissedBlock.decode(message.value);
+  },
+
+  toProto(message: MissedBlock): Uint8Array {
+    return MissedBlock.encode(message).finish();
+  },
+
+  toProtoMsg(message: MissedBlock): MissedBlockProtoMsg {
+    return {
+      typeUrl: "/cosmos.slashing.v1beta1.MissedBlock",
+      value: MissedBlock.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/slashing/v1beta1/query.ts b/__fixtures__/outputv2/cosmos/slashing/v1beta1/query.ts
index 2042a112f..6e0d5543d 100644
--- a/__fixtures__/outputv2/cosmos/slashing/v1beta1/query.ts
+++ b/__fixtures__/outputv2/cosmos/slashing/v1beta1/query.ts
@@ -6,14 +6,14 @@ export const protobufPackage = "cosmos.slashing.v1beta1";
 
 /** QueryParamsRequest is the request type for the Query/Params RPC method */
 export interface QueryParamsRequest {}
-export interface QueryParamsRequestProtoType {
+export interface QueryParamsRequestProtoMsg {
   typeUrl: "/cosmos.slashing.v1beta1.QueryParamsRequest";
   value: Uint8Array;
 }
 
 /** QueryParamsRequest is the request type for the Query/Params RPC method */
 export interface QueryParamsRequestAmino {}
-export interface QueryParamsRequestAminoType {
+export interface QueryParamsRequestAminoMsg {
   type: "cosmos-sdk/QueryParamsRequest";
   value: QueryParamsRequestAmino;
 }
@@ -25,7 +25,7 @@ export interface QueryParamsRequestSDKType {}
 export interface QueryParamsResponse {
   params?: Params;
 }
-export interface QueryParamsResponseProtoType {
+export interface QueryParamsResponseProtoMsg {
   typeUrl: "/cosmos.slashing.v1beta1.QueryParamsResponse";
   value: Uint8Array;
 }
@@ -34,7 +34,7 @@ export interface QueryParamsResponseProtoType {
 export interface QueryParamsResponseAmino {
   params?: ParamsAmino;
 }
-export interface QueryParamsResponseAminoType {
+export interface QueryParamsResponseAminoMsg {
   type: "cosmos-sdk/QueryParamsResponse";
   value: QueryParamsResponseAmino;
 }
@@ -52,7 +52,7 @@ export interface QuerySigningInfoRequest {
   /** cons_address is the address to query signing info of */
   consAddress: string;
 }
-export interface QuerySigningInfoRequestProtoType {
+export interface QuerySigningInfoRequestProtoMsg {
   typeUrl: "/cosmos.slashing.v1beta1.QuerySigningInfoRequest";
   value: Uint8Array;
 }
@@ -65,7 +65,7 @@ export interface QuerySigningInfoRequestAmino {
   /** cons_address is the address to query signing info of */
   cons_address: string;
 }
-export interface QuerySigningInfoRequestAminoType {
+export interface QuerySigningInfoRequestAminoMsg {
   type: "cosmos-sdk/QuerySigningInfoRequest";
   value: QuerySigningInfoRequestAmino;
 }
@@ -86,7 +86,7 @@ export interface QuerySigningInfoResponse {
   /** val_signing_info is the signing info of requested val cons address */
   valSigningInfo?: ValidatorSigningInfo;
 }
-export interface QuerySigningInfoResponseProtoType {
+export interface QuerySigningInfoResponseProtoMsg {
   typeUrl: "/cosmos.slashing.v1beta1.QuerySigningInfoResponse";
   value: Uint8Array;
 }
@@ -99,7 +99,7 @@ export interface QuerySigningInfoResponseAmino {
   /** val_signing_info is the signing info of requested val cons address */
   val_signing_info?: ValidatorSigningInfoAmino;
 }
-export interface QuerySigningInfoResponseAminoType {
+export interface QuerySigningInfoResponseAminoMsg {
   type: "cosmos-sdk/QuerySigningInfoResponse";
   value: QuerySigningInfoResponseAmino;
 }
@@ -119,7 +119,7 @@ export interface QuerySigningInfoResponseSDKType {
 export interface QuerySigningInfosRequest {
   pagination?: PageRequest;
 }
-export interface QuerySigningInfosRequestProtoType {
+export interface QuerySigningInfosRequestProtoMsg {
   typeUrl: "/cosmos.slashing.v1beta1.QuerySigningInfosRequest";
   value: Uint8Array;
 }
@@ -131,7 +131,7 @@ export interface QuerySigningInfosRequestProtoType {
 export interface QuerySigningInfosRequestAmino {
   pagination?: PageRequestAmino;
 }
-export interface QuerySigningInfosRequestAminoType {
+export interface QuerySigningInfosRequestAminoMsg {
   type: "cosmos-sdk/QuerySigningInfosRequest";
   value: QuerySigningInfosRequestAmino;
 }
@@ -153,7 +153,7 @@ export interface QuerySigningInfosResponse {
   info: ValidatorSigningInfo[];
   pagination?: PageResponse;
 }
-export interface QuerySigningInfosResponseProtoType {
+export interface QuerySigningInfosResponseProtoMsg {
   typeUrl: "/cosmos.slashing.v1beta1.QuerySigningInfosResponse";
   value: Uint8Array;
 }
@@ -167,7 +167,7 @@ export interface QuerySigningInfosResponseAmino {
   info: ValidatorSigningInfoAmino[];
   pagination?: PageResponseAmino;
 }
-export interface QuerySigningInfosResponseAminoType {
+export interface QuerySigningInfosResponseAminoMsg {
   type: "cosmos-sdk/QuerySigningInfosResponse";
   value: QuerySigningInfosResponseAmino;
 }
@@ -186,6 +186,9 @@ function createBaseQueryParamsRequest(): QueryParamsRequest {
 }
 
 export const QueryParamsRequest = {
+  typeUrl: "/cosmos.slashing.v1beta1.QueryParamsRequest",
+  aminoType: "cosmos-sdk/QueryParamsRequest",
+
   encode(_: QueryParamsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -238,6 +241,32 @@ export const QueryParamsRequest = {
   toAmino(_: QueryParamsRequest): QueryParamsRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest {
+    return QueryParamsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryParamsRequest): QueryParamsRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryParamsRequest",
+      value: QueryParamsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryParamsRequestProtoMsg): QueryParamsRequest {
+    return QueryParamsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryParamsRequest): Uint8Array {
+    return QueryParamsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryParamsRequest): QueryParamsRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.slashing.v1beta1.QueryParamsRequest",
+      value: QueryParamsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -249,6 +278,9 @@ function createBaseQueryParamsResponse(): QueryParamsResponse {
 }
 
 export const QueryParamsResponse = {
+  typeUrl: "/cosmos.slashing.v1beta1.QueryParamsResponse",
+  aminoType: "cosmos-sdk/QueryParamsResponse",
+
   encode(message: QueryParamsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.params !== undefined) {
       Params.encode(message.params, writer.uint32(10).fork()).ldelim();
@@ -319,6 +351,32 @@ export const QueryParamsResponse = {
     const obj: any = {};
     obj.params = message.params ? Params.toAmino(message.params) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryParamsResponseAminoMsg): QueryParamsResponse {
+    return QueryParamsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryParamsResponse): QueryParamsResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryParamsResponse",
+      value: QueryParamsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryParamsResponseProtoMsg): QueryParamsResponse {
+    return QueryParamsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryParamsResponse): Uint8Array {
+    return QueryParamsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryParamsResponse): QueryParamsResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.slashing.v1beta1.QueryParamsResponse",
+      value: QueryParamsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -330,6 +388,9 @@ function createBaseQuerySigningInfoRequest(): QuerySigningInfoRequest {
 }
 
 export const QuerySigningInfoRequest = {
+  typeUrl: "/cosmos.slashing.v1beta1.QuerySigningInfoRequest",
+  aminoType: "cosmos-sdk/QuerySigningInfoRequest",
+
   encode(message: QuerySigningInfoRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.consAddress !== "") {
       writer.uint32(10).string(message.consAddress);
@@ -400,6 +461,32 @@ export const QuerySigningInfoRequest = {
     const obj: any = {};
     obj.cons_address = message.consAddress;
     return obj;
+  },
+
+  fromAminoMsg(object: QuerySigningInfoRequestAminoMsg): QuerySigningInfoRequest {
+    return QuerySigningInfoRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QuerySigningInfoRequest): QuerySigningInfoRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QuerySigningInfoRequest",
+      value: QuerySigningInfoRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QuerySigningInfoRequestProtoMsg): QuerySigningInfoRequest {
+    return QuerySigningInfoRequest.decode(message.value);
+  },
+
+  toProto(message: QuerySigningInfoRequest): Uint8Array {
+    return QuerySigningInfoRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QuerySigningInfoRequest): QuerySigningInfoRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.slashing.v1beta1.QuerySigningInfoRequest",
+      value: QuerySigningInfoRequest.encode(message).finish()
+    };
   }
 
 };
@@ -411,6 +498,9 @@ function createBaseQuerySigningInfoResponse(): QuerySigningInfoResponse {
 }
 
 export const QuerySigningInfoResponse = {
+  typeUrl: "/cosmos.slashing.v1beta1.QuerySigningInfoResponse",
+  aminoType: "cosmos-sdk/QuerySigningInfoResponse",
+
   encode(message: QuerySigningInfoResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.valSigningInfo !== undefined) {
       ValidatorSigningInfo.encode(message.valSigningInfo, writer.uint32(10).fork()).ldelim();
@@ -481,6 +571,32 @@ export const QuerySigningInfoResponse = {
     const obj: any = {};
     obj.val_signing_info = message.valSigningInfo ? ValidatorSigningInfo.toAmino(message.valSigningInfo) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QuerySigningInfoResponseAminoMsg): QuerySigningInfoResponse {
+    return QuerySigningInfoResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QuerySigningInfoResponse): QuerySigningInfoResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QuerySigningInfoResponse",
+      value: QuerySigningInfoResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QuerySigningInfoResponseProtoMsg): QuerySigningInfoResponse {
+    return QuerySigningInfoResponse.decode(message.value);
+  },
+
+  toProto(message: QuerySigningInfoResponse): Uint8Array {
+    return QuerySigningInfoResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QuerySigningInfoResponse): QuerySigningInfoResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.slashing.v1beta1.QuerySigningInfoResponse",
+      value: QuerySigningInfoResponse.encode(message).finish()
+    };
   }
 
 };
@@ -492,6 +608,9 @@ function createBaseQuerySigningInfosRequest(): QuerySigningInfosRequest {
 }
 
 export const QuerySigningInfosRequest = {
+  typeUrl: "/cosmos.slashing.v1beta1.QuerySigningInfosRequest",
+  aminoType: "cosmos-sdk/QuerySigningInfosRequest",
+
   encode(message: QuerySigningInfosRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.pagination !== undefined) {
       PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim();
@@ -562,6 +681,32 @@ export const QuerySigningInfosRequest = {
     const obj: any = {};
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QuerySigningInfosRequestAminoMsg): QuerySigningInfosRequest {
+    return QuerySigningInfosRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QuerySigningInfosRequest): QuerySigningInfosRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QuerySigningInfosRequest",
+      value: QuerySigningInfosRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QuerySigningInfosRequestProtoMsg): QuerySigningInfosRequest {
+    return QuerySigningInfosRequest.decode(message.value);
+  },
+
+  toProto(message: QuerySigningInfosRequest): Uint8Array {
+    return QuerySigningInfosRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QuerySigningInfosRequest): QuerySigningInfosRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.slashing.v1beta1.QuerySigningInfosRequest",
+      value: QuerySigningInfosRequest.encode(message).finish()
+    };
   }
 
 };
@@ -574,6 +719,9 @@ function createBaseQuerySigningInfosResponse(): QuerySigningInfosResponse {
 }
 
 export const QuerySigningInfosResponse = {
+  typeUrl: "/cosmos.slashing.v1beta1.QuerySigningInfosResponse",
+  aminoType: "cosmos-sdk/QuerySigningInfosResponse",
+
   encode(message: QuerySigningInfosResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.info) {
       ValidatorSigningInfo.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -677,6 +825,32 @@ export const QuerySigningInfosResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QuerySigningInfosResponseAminoMsg): QuerySigningInfosResponse {
+    return QuerySigningInfosResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QuerySigningInfosResponse): QuerySigningInfosResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QuerySigningInfosResponse",
+      value: QuerySigningInfosResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QuerySigningInfosResponseProtoMsg): QuerySigningInfosResponse {
+    return QuerySigningInfosResponse.decode(message.value);
+  },
+
+  toProto(message: QuerySigningInfosResponse): Uint8Array {
+    return QuerySigningInfosResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QuerySigningInfosResponse): QuerySigningInfosResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.slashing.v1beta1.QuerySigningInfosResponse",
+      value: QuerySigningInfosResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/slashing/v1beta1/slashing.ts b/__fixtures__/outputv2/cosmos/slashing/v1beta1/slashing.ts
index e8e40f0cf..29a5446b7 100644
--- a/__fixtures__/outputv2/cosmos/slashing/v1beta1/slashing.ts
+++ b/__fixtures__/outputv2/cosmos/slashing/v1beta1/slashing.ts
@@ -36,7 +36,7 @@ export interface ValidatorSigningInfo {
    */
   missedBlocksCounter: Long;
 }
-export interface ValidatorSigningInfoProtoType {
+export interface ValidatorSigningInfoProtoMsg {
   typeUrl: "/cosmos.slashing.v1beta1.ValidatorSigningInfo";
   value: Uint8Array;
 }
@@ -73,7 +73,7 @@ export interface ValidatorSigningInfoAmino {
    */
   missed_blocks_counter: string;
 }
-export interface ValidatorSigningInfoAminoType {
+export interface ValidatorSigningInfoAminoMsg {
   type: "cosmos-sdk/ValidatorSigningInfo";
   value: ValidatorSigningInfoAmino;
 }
@@ -99,7 +99,7 @@ export interface Params {
   slashFractionDoubleSign: Uint8Array;
   slashFractionDowntime: Uint8Array;
 }
-export interface ParamsProtoType {
+export interface ParamsProtoMsg {
   typeUrl: "/cosmos.slashing.v1beta1.Params";
   value: Uint8Array;
 }
@@ -112,7 +112,7 @@ export interface ParamsAmino {
   slash_fraction_double_sign: Uint8Array;
   slash_fraction_downtime: Uint8Array;
 }
-export interface ParamsAminoType {
+export interface ParamsAminoMsg {
   type: "cosmos-sdk/Params";
   value: ParamsAmino;
 }
@@ -138,6 +138,9 @@ function createBaseValidatorSigningInfo(): ValidatorSigningInfo {
 }
 
 export const ValidatorSigningInfo = {
+  typeUrl: "/cosmos.slashing.v1beta1.ValidatorSigningInfo",
+  aminoType: "cosmos-sdk/ValidatorSigningInfo",
+
   encode(message: ValidatorSigningInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.address !== "") {
       writer.uint32(10).string(message.address);
@@ -283,6 +286,32 @@ export const ValidatorSigningInfo = {
     obj.tombstoned = message.tombstoned;
     obj.missed_blocks_counter = message.missedBlocksCounter ? message.missedBlocksCounter.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ValidatorSigningInfoAminoMsg): ValidatorSigningInfo {
+    return ValidatorSigningInfo.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ValidatorSigningInfo): ValidatorSigningInfoAminoMsg {
+    return {
+      type: "cosmos-sdk/ValidatorSigningInfo",
+      value: ValidatorSigningInfo.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ValidatorSigningInfoProtoMsg): ValidatorSigningInfo {
+    return ValidatorSigningInfo.decode(message.value);
+  },
+
+  toProto(message: ValidatorSigningInfo): Uint8Array {
+    return ValidatorSigningInfo.encode(message).finish();
+  },
+
+  toProtoMsg(message: ValidatorSigningInfo): ValidatorSigningInfoProtoMsg {
+    return {
+      typeUrl: "/cosmos.slashing.v1beta1.ValidatorSigningInfo",
+      value: ValidatorSigningInfo.encode(message).finish()
+    };
   }
 
 };
@@ -298,6 +327,9 @@ function createBaseParams(): Params {
 }
 
 export const Params = {
+  typeUrl: "/cosmos.slashing.v1beta1.Params",
+  aminoType: "cosmos-sdk/Params",
+
   encode(message: Params, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.signedBlocksWindow.isZero()) {
       writer.uint32(8).int64(message.signedBlocksWindow);
@@ -428,6 +460,32 @@ export const Params = {
     obj.slash_fraction_double_sign = message.slashFractionDoubleSign;
     obj.slash_fraction_downtime = message.slashFractionDowntime;
     return obj;
+  },
+
+  fromAminoMsg(object: ParamsAminoMsg): Params {
+    return Params.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Params): ParamsAminoMsg {
+    return {
+      type: "cosmos-sdk/Params",
+      value: Params.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ParamsProtoMsg): Params {
+    return Params.decode(message.value);
+  },
+
+  toProto(message: Params): Uint8Array {
+    return Params.encode(message).finish();
+  },
+
+  toProtoMsg(message: Params): ParamsProtoMsg {
+    return {
+      typeUrl: "/cosmos.slashing.v1beta1.Params",
+      value: Params.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/slashing/v1beta1/tx.ts b/__fixtures__/outputv2/cosmos/slashing/v1beta1/tx.ts
index 2d3e246ec..990eea7f5 100644
--- a/__fixtures__/outputv2/cosmos/slashing/v1beta1/tx.ts
+++ b/__fixtures__/outputv2/cosmos/slashing/v1beta1/tx.ts
@@ -6,7 +6,7 @@ export const protobufPackage = "cosmos.slashing.v1beta1";
 export interface MsgUnjail {
   validatorAddr: string;
 }
-export interface MsgUnjailProtoType {
+export interface MsgUnjailProtoMsg {
   typeUrl: "/cosmos.slashing.v1beta1.MsgUnjail";
   value: Uint8Array;
 }
@@ -15,7 +15,7 @@ export interface MsgUnjailProtoType {
 export interface MsgUnjailAmino {
   validator_addr: string;
 }
-export interface MsgUnjailAminoType {
+export interface MsgUnjailAminoMsg {
   type: "cosmos-sdk/MsgUnjail";
   value: MsgUnjailAmino;
 }
@@ -27,14 +27,14 @@ export interface MsgUnjailSDKType {
 
 /** MsgUnjailResponse defines the Msg/Unjail response type */
 export interface MsgUnjailResponse {}
-export interface MsgUnjailResponseProtoType {
+export interface MsgUnjailResponseProtoMsg {
   typeUrl: "/cosmos.slashing.v1beta1.MsgUnjailResponse";
   value: Uint8Array;
 }
 
 /** MsgUnjailResponse defines the Msg/Unjail response type */
 export interface MsgUnjailResponseAmino {}
-export interface MsgUnjailResponseAminoType {
+export interface MsgUnjailResponseAminoMsg {
   type: "cosmos-sdk/MsgUnjailResponse";
   value: MsgUnjailResponseAmino;
 }
@@ -49,6 +49,9 @@ function createBaseMsgUnjail(): MsgUnjail {
 }
 
 export const MsgUnjail = {
+  typeUrl: "/cosmos.slashing.v1beta1.MsgUnjail",
+  aminoType: "cosmos-sdk/MsgUnjail",
+
   encode(message: MsgUnjail, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.validatorAddr !== "") {
       writer.uint32(10).string(message.validatorAddr);
@@ -119,6 +122,32 @@ export const MsgUnjail = {
     const obj: any = {};
     obj.validator_addr = message.validatorAddr;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgUnjailAminoMsg): MsgUnjail {
+    return MsgUnjail.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgUnjail): MsgUnjailAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgUnjail",
+      value: MsgUnjail.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgUnjailProtoMsg): MsgUnjail {
+    return MsgUnjail.decode(message.value);
+  },
+
+  toProto(message: MsgUnjail): Uint8Array {
+    return MsgUnjail.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgUnjail): MsgUnjailProtoMsg {
+    return {
+      typeUrl: "/cosmos.slashing.v1beta1.MsgUnjail",
+      value: MsgUnjail.encode(message).finish()
+    };
   }
 
 };
@@ -128,6 +157,9 @@ function createBaseMsgUnjailResponse(): MsgUnjailResponse {
 }
 
 export const MsgUnjailResponse = {
+  typeUrl: "/cosmos.slashing.v1beta1.MsgUnjailResponse",
+  aminoType: "cosmos-sdk/MsgUnjailResponse",
+
   encode(_: MsgUnjailResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -180,6 +212,32 @@ export const MsgUnjailResponse = {
   toAmino(_: MsgUnjailResponse): MsgUnjailResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgUnjailResponseAminoMsg): MsgUnjailResponse {
+    return MsgUnjailResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgUnjailResponse): MsgUnjailResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgUnjailResponse",
+      value: MsgUnjailResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgUnjailResponseProtoMsg): MsgUnjailResponse {
+    return MsgUnjailResponse.decode(message.value);
+  },
+
+  toProto(message: MsgUnjailResponse): Uint8Array {
+    return MsgUnjailResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgUnjailResponse): MsgUnjailResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.slashing.v1beta1.MsgUnjailResponse",
+      value: MsgUnjailResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/staking/v1beta1/authz.ts b/__fixtures__/outputv2/cosmos/staking/v1beta1/authz.ts
index 343e478d8..4f6ad3cc2 100644
--- a/__fixtures__/outputv2/cosmos/staking/v1beta1/authz.ts
+++ b/__fixtures__/outputv2/cosmos/staking/v1beta1/authz.ts
@@ -92,7 +92,7 @@ export interface StakeAuthorization {
   /** authorization_type defines one of AuthorizationType. */
   authorizationType: AuthorizationType;
 }
-export interface StakeAuthorizationProtoType {
+export interface StakeAuthorizationProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.StakeAuthorization";
   value: Uint8Array;
 }
@@ -121,7 +121,7 @@ export interface StakeAuthorizationAmino {
   /** authorization_type defines one of AuthorizationType. */
   authorization_type: AuthorizationType;
 }
-export interface StakeAuthorizationAminoType {
+export interface StakeAuthorizationAminoMsg {
   type: "cosmos-sdk/StakeAuthorization";
   value: StakeAuthorizationAmino;
 }
@@ -142,7 +142,7 @@ export interface StakeAuthorizationSDKType {
 export interface StakeAuthorization_Validators {
   address: string[];
 }
-export interface StakeAuthorization_ValidatorsProtoType {
+export interface StakeAuthorization_ValidatorsProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.Validators";
   value: Uint8Array;
 }
@@ -151,7 +151,7 @@ export interface StakeAuthorization_ValidatorsProtoType {
 export interface StakeAuthorization_ValidatorsAmino {
   address: string[];
 }
-export interface StakeAuthorization_ValidatorsAminoType {
+export interface StakeAuthorization_ValidatorsAminoMsg {
   type: "cosmos-sdk/Validators";
   value: StakeAuthorization_ValidatorsAmino;
 }
@@ -171,6 +171,9 @@ function createBaseStakeAuthorization(): StakeAuthorization {
 }
 
 export const StakeAuthorization = {
+  typeUrl: "/cosmos.staking.v1beta1.StakeAuthorization",
+  aminoType: "cosmos-sdk/StakeAuthorization",
+
   encode(message: StakeAuthorization, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.maxTokens !== undefined) {
       Coin.encode(message.maxTokens, writer.uint32(10).fork()).ldelim();
@@ -286,6 +289,32 @@ export const StakeAuthorization = {
     obj.deny_list = message.denyList ? StakeAuthorization_Validators.toAmino(message.denyList) : undefined;
     obj.authorization_type = message.authorizationType;
     return obj;
+  },
+
+  fromAminoMsg(object: StakeAuthorizationAminoMsg): StakeAuthorization {
+    return StakeAuthorization.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: StakeAuthorization): StakeAuthorizationAminoMsg {
+    return {
+      type: "cosmos-sdk/StakeAuthorization",
+      value: StakeAuthorization.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: StakeAuthorizationProtoMsg): StakeAuthorization {
+    return StakeAuthorization.decode(message.value);
+  },
+
+  toProto(message: StakeAuthorization): Uint8Array {
+    return StakeAuthorization.encode(message).finish();
+  },
+
+  toProtoMsg(message: StakeAuthorization): StakeAuthorizationProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.StakeAuthorization",
+      value: StakeAuthorization.encode(message).finish()
+    };
   }
 
 };
@@ -297,6 +326,9 @@ function createBaseStakeAuthorization_Validators(): StakeAuthorization_Validator
 }
 
 export const StakeAuthorization_Validators = {
+  typeUrl: "/cosmos.staking.v1beta1.Validators",
+  aminoType: "cosmos-sdk/Validators",
+
   encode(message: StakeAuthorization_Validators, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.address) {
       writer.uint32(10).string(v!);
@@ -385,6 +417,32 @@ export const StakeAuthorization_Validators = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: StakeAuthorization_ValidatorsAminoMsg): StakeAuthorization_Validators {
+    return StakeAuthorization_Validators.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: StakeAuthorization_Validators): StakeAuthorization_ValidatorsAminoMsg {
+    return {
+      type: "cosmos-sdk/Validators",
+      value: StakeAuthorization_Validators.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: StakeAuthorization_ValidatorsProtoMsg): StakeAuthorization_Validators {
+    return StakeAuthorization_Validators.decode(message.value);
+  },
+
+  toProto(message: StakeAuthorization_Validators): Uint8Array {
+    return StakeAuthorization_Validators.encode(message).finish();
+  },
+
+  toProtoMsg(message: StakeAuthorization_Validators): StakeAuthorization_ValidatorsProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.Validators",
+      value: StakeAuthorization_Validators.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/staking/v1beta1/genesis.ts b/__fixtures__/outputv2/cosmos/staking/v1beta1/genesis.ts
index 000a79226..2afb02f2e 100644
--- a/__fixtures__/outputv2/cosmos/staking/v1beta1/genesis.ts
+++ b/__fixtures__/outputv2/cosmos/staking/v1beta1/genesis.ts
@@ -33,7 +33,7 @@ export interface GenesisState {
   redelegations: Redelegation[];
   exported: boolean;
 }
-export interface GenesisStateProtoType {
+export interface GenesisStateProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.GenesisState";
   value: Uint8Array;
 }
@@ -68,7 +68,7 @@ export interface GenesisStateAmino {
   redelegations: RedelegationAmino[];
   exported: boolean;
 }
-export interface GenesisStateAminoType {
+export interface GenesisStateAminoMsg {
   type: "cosmos-sdk/GenesisState";
   value: GenesisStateAmino;
 }
@@ -93,7 +93,7 @@ export interface LastValidatorPower {
   /** power defines the power of the validator. */
   power: Long;
 }
-export interface LastValidatorPowerProtoType {
+export interface LastValidatorPowerProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.LastValidatorPower";
   value: Uint8Array;
 }
@@ -106,7 +106,7 @@ export interface LastValidatorPowerAmino {
   /** power defines the power of the validator. */
   power: string;
 }
-export interface LastValidatorPowerAminoType {
+export interface LastValidatorPowerAminoMsg {
   type: "cosmos-sdk/LastValidatorPower";
   value: LastValidatorPowerAmino;
 }
@@ -131,6 +131,9 @@ function createBaseGenesisState(): GenesisState {
 }
 
 export const GenesisState = {
+  typeUrl: "/cosmos.staking.v1beta1.GenesisState",
+  aminoType: "cosmos-sdk/GenesisState",
+
   encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.params !== undefined) {
       Params.encode(message.params, writer.uint32(10).fork()).ldelim();
@@ -384,6 +387,32 @@ export const GenesisState = {
 
     obj.exported = message.exported;
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisStateAminoMsg): GenesisState {
+    return GenesisState.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GenesisState): GenesisStateAminoMsg {
+    return {
+      type: "cosmos-sdk/GenesisState",
+      value: GenesisState.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GenesisStateProtoMsg): GenesisState {
+    return GenesisState.decode(message.value);
+  },
+
+  toProto(message: GenesisState): Uint8Array {
+    return GenesisState.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisState): GenesisStateProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.GenesisState",
+      value: GenesisState.encode(message).finish()
+    };
   }
 
 };
@@ -396,6 +425,9 @@ function createBaseLastValidatorPower(): LastValidatorPower {
 }
 
 export const LastValidatorPower = {
+  typeUrl: "/cosmos.staking.v1beta1.LastValidatorPower",
+  aminoType: "cosmos-sdk/LastValidatorPower",
+
   encode(message: LastValidatorPower, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.address !== "") {
       writer.uint32(10).string(message.address);
@@ -481,6 +513,32 @@ export const LastValidatorPower = {
     obj.address = message.address;
     obj.power = message.power ? message.power.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: LastValidatorPowerAminoMsg): LastValidatorPower {
+    return LastValidatorPower.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: LastValidatorPower): LastValidatorPowerAminoMsg {
+    return {
+      type: "cosmos-sdk/LastValidatorPower",
+      value: LastValidatorPower.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: LastValidatorPowerProtoMsg): LastValidatorPower {
+    return LastValidatorPower.decode(message.value);
+  },
+
+  toProto(message: LastValidatorPower): Uint8Array {
+    return LastValidatorPower.encode(message).finish();
+  },
+
+  toProtoMsg(message: LastValidatorPower): LastValidatorPowerProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.LastValidatorPower",
+      value: LastValidatorPower.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/staking/v1beta1/query.ts b/__fixtures__/outputv2/cosmos/staking/v1beta1/query.ts
index 1878e86bb..b71a0bf68 100644
--- a/__fixtures__/outputv2/cosmos/staking/v1beta1/query.ts
+++ b/__fixtures__/outputv2/cosmos/staking/v1beta1/query.ts
@@ -12,7 +12,7 @@ export interface QueryValidatorsRequest {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequest;
 }
-export interface QueryValidatorsRequestProtoType {
+export interface QueryValidatorsRequestProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.QueryValidatorsRequest";
   value: Uint8Array;
 }
@@ -25,7 +25,7 @@ export interface QueryValidatorsRequestAmino {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequestAmino;
 }
-export interface QueryValidatorsRequestAminoType {
+export interface QueryValidatorsRequestAminoMsg {
   type: "cosmos-sdk/QueryValidatorsRequest";
   value: QueryValidatorsRequestAmino;
 }
@@ -44,7 +44,7 @@ export interface QueryValidatorsResponse {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponse;
 }
-export interface QueryValidatorsResponseProtoType {
+export interface QueryValidatorsResponseProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.QueryValidatorsResponse";
   value: Uint8Array;
 }
@@ -57,7 +57,7 @@ export interface QueryValidatorsResponseAmino {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponseAmino;
 }
-export interface QueryValidatorsResponseAminoType {
+export interface QueryValidatorsResponseAminoMsg {
   type: "cosmos-sdk/QueryValidatorsResponse";
   value: QueryValidatorsResponseAmino;
 }
@@ -73,7 +73,7 @@ export interface QueryValidatorRequest {
   /** validator_addr defines the validator address to query for. */
   validatorAddr: string;
 }
-export interface QueryValidatorRequestProtoType {
+export interface QueryValidatorRequestProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.QueryValidatorRequest";
   value: Uint8Array;
 }
@@ -83,7 +83,7 @@ export interface QueryValidatorRequestAmino {
   /** validator_addr defines the validator address to query for. */
   validator_addr: string;
 }
-export interface QueryValidatorRequestAminoType {
+export interface QueryValidatorRequestAminoMsg {
   type: "cosmos-sdk/QueryValidatorRequest";
   value: QueryValidatorRequestAmino;
 }
@@ -98,7 +98,7 @@ export interface QueryValidatorResponse {
   /** validator defines the the validator info. */
   validator?: Validator;
 }
-export interface QueryValidatorResponseProtoType {
+export interface QueryValidatorResponseProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.QueryValidatorResponse";
   value: Uint8Array;
 }
@@ -108,7 +108,7 @@ export interface QueryValidatorResponseAmino {
   /** validator defines the the validator info. */
   validator?: ValidatorAmino;
 }
-export interface QueryValidatorResponseAminoType {
+export interface QueryValidatorResponseAminoMsg {
   type: "cosmos-sdk/QueryValidatorResponse";
   value: QueryValidatorResponseAmino;
 }
@@ -129,7 +129,7 @@ export interface QueryValidatorDelegationsRequest {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequest;
 }
-export interface QueryValidatorDelegationsRequestProtoType {
+export interface QueryValidatorDelegationsRequestProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.QueryValidatorDelegationsRequest";
   value: Uint8Array;
 }
@@ -145,7 +145,7 @@ export interface QueryValidatorDelegationsRequestAmino {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequestAmino;
 }
-export interface QueryValidatorDelegationsRequestAminoType {
+export interface QueryValidatorDelegationsRequestAminoMsg {
   type: "cosmos-sdk/QueryValidatorDelegationsRequest";
   value: QueryValidatorDelegationsRequestAmino;
 }
@@ -169,7 +169,7 @@ export interface QueryValidatorDelegationsResponse {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponse;
 }
-export interface QueryValidatorDelegationsResponseProtoType {
+export interface QueryValidatorDelegationsResponseProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.QueryValidatorDelegationsResponse";
   value: Uint8Array;
 }
@@ -184,7 +184,7 @@ export interface QueryValidatorDelegationsResponseAmino {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponseAmino;
 }
-export interface QueryValidatorDelegationsResponseAminoType {
+export interface QueryValidatorDelegationsResponseAminoMsg {
   type: "cosmos-sdk/QueryValidatorDelegationsResponse";
   value: QueryValidatorDelegationsResponseAmino;
 }
@@ -209,7 +209,7 @@ export interface QueryValidatorUnbondingDelegationsRequest {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequest;
 }
-export interface QueryValidatorUnbondingDelegationsRequestProtoType {
+export interface QueryValidatorUnbondingDelegationsRequestProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.QueryValidatorUnbondingDelegationsRequest";
   value: Uint8Array;
 }
@@ -225,7 +225,7 @@ export interface QueryValidatorUnbondingDelegationsRequestAmino {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequestAmino;
 }
-export interface QueryValidatorUnbondingDelegationsRequestAminoType {
+export interface QueryValidatorUnbondingDelegationsRequestAminoMsg {
   type: "cosmos-sdk/QueryValidatorUnbondingDelegationsRequest";
   value: QueryValidatorUnbondingDelegationsRequestAmino;
 }
@@ -249,7 +249,7 @@ export interface QueryValidatorUnbondingDelegationsResponse {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponse;
 }
-export interface QueryValidatorUnbondingDelegationsResponseProtoType {
+export interface QueryValidatorUnbondingDelegationsResponseProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.QueryValidatorUnbondingDelegationsResponse";
   value: Uint8Array;
 }
@@ -264,7 +264,7 @@ export interface QueryValidatorUnbondingDelegationsResponseAmino {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponseAmino;
 }
-export interface QueryValidatorUnbondingDelegationsResponseAminoType {
+export interface QueryValidatorUnbondingDelegationsResponseAminoMsg {
   type: "cosmos-sdk/QueryValidatorUnbondingDelegationsResponse";
   value: QueryValidatorUnbondingDelegationsResponseAmino;
 }
@@ -286,7 +286,7 @@ export interface QueryDelegationRequest {
   /** validator_addr defines the validator address to query for. */
   validatorAddr: string;
 }
-export interface QueryDelegationRequestProtoType {
+export interface QueryDelegationRequestProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.QueryDelegationRequest";
   value: Uint8Array;
 }
@@ -299,7 +299,7 @@ export interface QueryDelegationRequestAmino {
   /** validator_addr defines the validator address to query for. */
   validator_addr: string;
 }
-export interface QueryDelegationRequestAminoType {
+export interface QueryDelegationRequestAminoMsg {
   type: "cosmos-sdk/QueryDelegationRequest";
   value: QueryDelegationRequestAmino;
 }
@@ -315,7 +315,7 @@ export interface QueryDelegationResponse {
   /** delegation_responses defines the delegation info of a delegation. */
   delegationResponse?: DelegationResponse;
 }
-export interface QueryDelegationResponseProtoType {
+export interface QueryDelegationResponseProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.QueryDelegationResponse";
   value: Uint8Array;
 }
@@ -325,7 +325,7 @@ export interface QueryDelegationResponseAmino {
   /** delegation_responses defines the delegation info of a delegation. */
   delegation_response?: DelegationResponseAmino;
 }
-export interface QueryDelegationResponseAminoType {
+export interface QueryDelegationResponseAminoMsg {
   type: "cosmos-sdk/QueryDelegationResponse";
   value: QueryDelegationResponseAmino;
 }
@@ -346,7 +346,7 @@ export interface QueryUnbondingDelegationRequest {
   /** validator_addr defines the validator address to query for. */
   validatorAddr: string;
 }
-export interface QueryUnbondingDelegationRequestProtoType {
+export interface QueryUnbondingDelegationRequestProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.QueryUnbondingDelegationRequest";
   value: Uint8Array;
 }
@@ -362,7 +362,7 @@ export interface QueryUnbondingDelegationRequestAmino {
   /** validator_addr defines the validator address to query for. */
   validator_addr: string;
 }
-export interface QueryUnbondingDelegationRequestAminoType {
+export interface QueryUnbondingDelegationRequestAminoMsg {
   type: "cosmos-sdk/QueryUnbondingDelegationRequest";
   value: QueryUnbondingDelegationRequestAmino;
 }
@@ -384,7 +384,7 @@ export interface QueryUnbondingDelegationResponse {
   /** unbond defines the unbonding information of a delegation. */
   unbond?: UnbondingDelegation;
 }
-export interface QueryUnbondingDelegationResponseProtoType {
+export interface QueryUnbondingDelegationResponseProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.QueryUnbondingDelegationResponse";
   value: Uint8Array;
 }
@@ -397,7 +397,7 @@ export interface QueryUnbondingDelegationResponseAmino {
   /** unbond defines the unbonding information of a delegation. */
   unbond?: UnbondingDelegationAmino;
 }
-export interface QueryUnbondingDelegationResponseAminoType {
+export interface QueryUnbondingDelegationResponseAminoMsg {
   type: "cosmos-sdk/QueryUnbondingDelegationResponse";
   value: QueryUnbondingDelegationResponseAmino;
 }
@@ -421,7 +421,7 @@ export interface QueryDelegatorDelegationsRequest {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequest;
 }
-export interface QueryDelegatorDelegationsRequestProtoType {
+export interface QueryDelegatorDelegationsRequestProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.QueryDelegatorDelegationsRequest";
   value: Uint8Array;
 }
@@ -437,7 +437,7 @@ export interface QueryDelegatorDelegationsRequestAmino {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequestAmino;
 }
-export interface QueryDelegatorDelegationsRequestAminoType {
+export interface QueryDelegatorDelegationsRequestAminoMsg {
   type: "cosmos-sdk/QueryDelegatorDelegationsRequest";
   value: QueryDelegatorDelegationsRequestAmino;
 }
@@ -462,7 +462,7 @@ export interface QueryDelegatorDelegationsResponse {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponse;
 }
-export interface QueryDelegatorDelegationsResponseProtoType {
+export interface QueryDelegatorDelegationsResponseProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.QueryDelegatorDelegationsResponse";
   value: Uint8Array;
 }
@@ -478,7 +478,7 @@ export interface QueryDelegatorDelegationsResponseAmino {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponseAmino;
 }
-export interface QueryDelegatorDelegationsResponseAminoType {
+export interface QueryDelegatorDelegationsResponseAminoMsg {
   type: "cosmos-sdk/QueryDelegatorDelegationsResponse";
   value: QueryDelegatorDelegationsResponseAmino;
 }
@@ -503,7 +503,7 @@ export interface QueryDelegatorUnbondingDelegationsRequest {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequest;
 }
-export interface QueryDelegatorUnbondingDelegationsRequestProtoType {
+export interface QueryDelegatorUnbondingDelegationsRequestProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.QueryDelegatorUnbondingDelegationsRequest";
   value: Uint8Array;
 }
@@ -519,7 +519,7 @@ export interface QueryDelegatorUnbondingDelegationsRequestAmino {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequestAmino;
 }
-export interface QueryDelegatorUnbondingDelegationsRequestAminoType {
+export interface QueryDelegatorUnbondingDelegationsRequestAminoMsg {
   type: "cosmos-sdk/QueryDelegatorUnbondingDelegationsRequest";
   value: QueryDelegatorUnbondingDelegationsRequestAmino;
 }
@@ -543,7 +543,7 @@ export interface QueryDelegatorUnbondingDelegationsResponse {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponse;
 }
-export interface QueryDelegatorUnbondingDelegationsResponseProtoType {
+export interface QueryDelegatorUnbondingDelegationsResponseProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.QueryDelegatorUnbondingDelegationsResponse";
   value: Uint8Array;
 }
@@ -558,7 +558,7 @@ export interface QueryDelegatorUnbondingDelegationsResponseAmino {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponseAmino;
 }
-export interface QueryDelegatorUnbondingDelegationsResponseAminoType {
+export interface QueryDelegatorUnbondingDelegationsResponseAminoMsg {
   type: "cosmos-sdk/QueryDelegatorUnbondingDelegationsResponse";
   value: QueryDelegatorUnbondingDelegationsResponseAmino;
 }
@@ -589,7 +589,7 @@ export interface QueryRedelegationsRequest {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequest;
 }
-export interface QueryRedelegationsRequestProtoType {
+export interface QueryRedelegationsRequestProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.QueryRedelegationsRequest";
   value: Uint8Array;
 }
@@ -611,7 +611,7 @@ export interface QueryRedelegationsRequestAmino {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequestAmino;
 }
-export interface QueryRedelegationsRequestAminoType {
+export interface QueryRedelegationsRequestAminoMsg {
   type: "cosmos-sdk/QueryRedelegationsRequest";
   value: QueryRedelegationsRequestAmino;
 }
@@ -637,7 +637,7 @@ export interface QueryRedelegationsResponse {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponse;
 }
-export interface QueryRedelegationsResponseProtoType {
+export interface QueryRedelegationsResponseProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.QueryRedelegationsResponse";
   value: Uint8Array;
 }
@@ -652,7 +652,7 @@ export interface QueryRedelegationsResponseAmino {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponseAmino;
 }
-export interface QueryRedelegationsResponseAminoType {
+export interface QueryRedelegationsResponseAminoMsg {
   type: "cosmos-sdk/QueryRedelegationsResponse";
   value: QueryRedelegationsResponseAmino;
 }
@@ -677,7 +677,7 @@ export interface QueryDelegatorValidatorsRequest {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequest;
 }
-export interface QueryDelegatorValidatorsRequestProtoType {
+export interface QueryDelegatorValidatorsRequestProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.QueryDelegatorValidatorsRequest";
   value: Uint8Array;
 }
@@ -693,7 +693,7 @@ export interface QueryDelegatorValidatorsRequestAmino {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequestAmino;
 }
-export interface QueryDelegatorValidatorsRequestAminoType {
+export interface QueryDelegatorValidatorsRequestAminoMsg {
   type: "cosmos-sdk/QueryDelegatorValidatorsRequest";
   value: QueryDelegatorValidatorsRequestAmino;
 }
@@ -718,7 +718,7 @@ export interface QueryDelegatorValidatorsResponse {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponse;
 }
-export interface QueryDelegatorValidatorsResponseProtoType {
+export interface QueryDelegatorValidatorsResponseProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.QueryDelegatorValidatorsResponse";
   value: Uint8Array;
 }
@@ -734,7 +734,7 @@ export interface QueryDelegatorValidatorsResponseAmino {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponseAmino;
 }
-export interface QueryDelegatorValidatorsResponseAminoType {
+export interface QueryDelegatorValidatorsResponseAminoMsg {
   type: "cosmos-sdk/QueryDelegatorValidatorsResponse";
   value: QueryDelegatorValidatorsResponseAmino;
 }
@@ -759,7 +759,7 @@ export interface QueryDelegatorValidatorRequest {
   /** validator_addr defines the validator address to query for. */
   validatorAddr: string;
 }
-export interface QueryDelegatorValidatorRequestProtoType {
+export interface QueryDelegatorValidatorRequestProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.QueryDelegatorValidatorRequest";
   value: Uint8Array;
 }
@@ -775,7 +775,7 @@ export interface QueryDelegatorValidatorRequestAmino {
   /** validator_addr defines the validator address to query for. */
   validator_addr: string;
 }
-export interface QueryDelegatorValidatorRequestAminoType {
+export interface QueryDelegatorValidatorRequestAminoMsg {
   type: "cosmos-sdk/QueryDelegatorValidatorRequest";
   value: QueryDelegatorValidatorRequestAmino;
 }
@@ -797,7 +797,7 @@ export interface QueryDelegatorValidatorResponse {
   /** validator defines the the validator info. */
   validator?: Validator;
 }
-export interface QueryDelegatorValidatorResponseProtoType {
+export interface QueryDelegatorValidatorResponseProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.QueryDelegatorValidatorResponse";
   value: Uint8Array;
 }
@@ -810,7 +810,7 @@ export interface QueryDelegatorValidatorResponseAmino {
   /** validator defines the the validator info. */
   validator?: ValidatorAmino;
 }
-export interface QueryDelegatorValidatorResponseAminoType {
+export interface QueryDelegatorValidatorResponseAminoMsg {
   type: "cosmos-sdk/QueryDelegatorValidatorResponse";
   value: QueryDelegatorValidatorResponseAmino;
 }
@@ -831,7 +831,7 @@ export interface QueryHistoricalInfoRequest {
   /** height defines at which height to query the historical info. */
   height: Long;
 }
-export interface QueryHistoricalInfoRequestProtoType {
+export interface QueryHistoricalInfoRequestProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.QueryHistoricalInfoRequest";
   value: Uint8Array;
 }
@@ -844,7 +844,7 @@ export interface QueryHistoricalInfoRequestAmino {
   /** height defines at which height to query the historical info. */
   height: string;
 }
-export interface QueryHistoricalInfoRequestAminoType {
+export interface QueryHistoricalInfoRequestAminoMsg {
   type: "cosmos-sdk/QueryHistoricalInfoRequest";
   value: QueryHistoricalInfoRequestAmino;
 }
@@ -865,7 +865,7 @@ export interface QueryHistoricalInfoResponse {
   /** hist defines the historical info at the given height. */
   hist?: HistoricalInfo;
 }
-export interface QueryHistoricalInfoResponseProtoType {
+export interface QueryHistoricalInfoResponseProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.QueryHistoricalInfoResponse";
   value: Uint8Array;
 }
@@ -878,7 +878,7 @@ export interface QueryHistoricalInfoResponseAmino {
   /** hist defines the historical info at the given height. */
   hist?: HistoricalInfoAmino;
 }
-export interface QueryHistoricalInfoResponseAminoType {
+export interface QueryHistoricalInfoResponseAminoMsg {
   type: "cosmos-sdk/QueryHistoricalInfoResponse";
   value: QueryHistoricalInfoResponseAmino;
 }
@@ -893,14 +893,14 @@ export interface QueryHistoricalInfoResponseSDKType {
 
 /** QueryPoolRequest is request type for the Query/Pool RPC method. */
 export interface QueryPoolRequest {}
-export interface QueryPoolRequestProtoType {
+export interface QueryPoolRequestProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.QueryPoolRequest";
   value: Uint8Array;
 }
 
 /** QueryPoolRequest is request type for the Query/Pool RPC method. */
 export interface QueryPoolRequestAmino {}
-export interface QueryPoolRequestAminoType {
+export interface QueryPoolRequestAminoMsg {
   type: "cosmos-sdk/QueryPoolRequest";
   value: QueryPoolRequestAmino;
 }
@@ -913,7 +913,7 @@ export interface QueryPoolResponse {
   /** pool defines the pool info. */
   pool?: Pool;
 }
-export interface QueryPoolResponseProtoType {
+export interface QueryPoolResponseProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.QueryPoolResponse";
   value: Uint8Array;
 }
@@ -923,7 +923,7 @@ export interface QueryPoolResponseAmino {
   /** pool defines the pool info. */
   pool?: PoolAmino;
 }
-export interface QueryPoolResponseAminoType {
+export interface QueryPoolResponseAminoMsg {
   type: "cosmos-sdk/QueryPoolResponse";
   value: QueryPoolResponseAmino;
 }
@@ -935,14 +935,14 @@ export interface QueryPoolResponseSDKType {
 
 /** QueryParamsRequest is request type for the Query/Params RPC method. */
 export interface QueryParamsRequest {}
-export interface QueryParamsRequestProtoType {
+export interface QueryParamsRequestProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.QueryParamsRequest";
   value: Uint8Array;
 }
 
 /** QueryParamsRequest is request type for the Query/Params RPC method. */
 export interface QueryParamsRequestAmino {}
-export interface QueryParamsRequestAminoType {
+export interface QueryParamsRequestAminoMsg {
   type: "cosmos-sdk/QueryParamsRequest";
   value: QueryParamsRequestAmino;
 }
@@ -955,7 +955,7 @@ export interface QueryParamsResponse {
   /** params holds all the parameters of this module. */
   params?: Params;
 }
-export interface QueryParamsResponseProtoType {
+export interface QueryParamsResponseProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.QueryParamsResponse";
   value: Uint8Array;
 }
@@ -965,7 +965,7 @@ export interface QueryParamsResponseAmino {
   /** params holds all the parameters of this module. */
   params?: ParamsAmino;
 }
-export interface QueryParamsResponseAminoType {
+export interface QueryParamsResponseAminoMsg {
   type: "cosmos-sdk/QueryParamsResponse";
   value: QueryParamsResponseAmino;
 }
@@ -983,6 +983,9 @@ function createBaseQueryValidatorsRequest(): QueryValidatorsRequest {
 }
 
 export const QueryValidatorsRequest = {
+  typeUrl: "/cosmos.staking.v1beta1.QueryValidatorsRequest",
+  aminoType: "cosmos-sdk/QueryValidatorsRequest",
+
   encode(message: QueryValidatorsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.status !== "") {
       writer.uint32(10).string(message.status);
@@ -1068,6 +1071,32 @@ export const QueryValidatorsRequest = {
     obj.status = message.status;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryValidatorsRequestAminoMsg): QueryValidatorsRequest {
+    return QueryValidatorsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryValidatorsRequest): QueryValidatorsRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryValidatorsRequest",
+      value: QueryValidatorsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryValidatorsRequestProtoMsg): QueryValidatorsRequest {
+    return QueryValidatorsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryValidatorsRequest): Uint8Array {
+    return QueryValidatorsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryValidatorsRequest): QueryValidatorsRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.QueryValidatorsRequest",
+      value: QueryValidatorsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1080,6 +1109,9 @@ function createBaseQueryValidatorsResponse(): QueryValidatorsResponse {
 }
 
 export const QueryValidatorsResponse = {
+  typeUrl: "/cosmos.staking.v1beta1.QueryValidatorsResponse",
+  aminoType: "cosmos-sdk/QueryValidatorsResponse",
+
   encode(message: QueryValidatorsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.validators) {
       Validator.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1183,6 +1215,32 @@ export const QueryValidatorsResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryValidatorsResponseAminoMsg): QueryValidatorsResponse {
+    return QueryValidatorsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryValidatorsResponse): QueryValidatorsResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryValidatorsResponse",
+      value: QueryValidatorsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryValidatorsResponseProtoMsg): QueryValidatorsResponse {
+    return QueryValidatorsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryValidatorsResponse): Uint8Array {
+    return QueryValidatorsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryValidatorsResponse): QueryValidatorsResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.QueryValidatorsResponse",
+      value: QueryValidatorsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1194,6 +1252,9 @@ function createBaseQueryValidatorRequest(): QueryValidatorRequest {
 }
 
 export const QueryValidatorRequest = {
+  typeUrl: "/cosmos.staking.v1beta1.QueryValidatorRequest",
+  aminoType: "cosmos-sdk/QueryValidatorRequest",
+
   encode(message: QueryValidatorRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.validatorAddr !== "") {
       writer.uint32(10).string(message.validatorAddr);
@@ -1264,6 +1325,32 @@ export const QueryValidatorRequest = {
     const obj: any = {};
     obj.validator_addr = message.validatorAddr;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryValidatorRequestAminoMsg): QueryValidatorRequest {
+    return QueryValidatorRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryValidatorRequest): QueryValidatorRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryValidatorRequest",
+      value: QueryValidatorRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryValidatorRequestProtoMsg): QueryValidatorRequest {
+    return QueryValidatorRequest.decode(message.value);
+  },
+
+  toProto(message: QueryValidatorRequest): Uint8Array {
+    return QueryValidatorRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryValidatorRequest): QueryValidatorRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.QueryValidatorRequest",
+      value: QueryValidatorRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1275,6 +1362,9 @@ function createBaseQueryValidatorResponse(): QueryValidatorResponse {
 }
 
 export const QueryValidatorResponse = {
+  typeUrl: "/cosmos.staking.v1beta1.QueryValidatorResponse",
+  aminoType: "cosmos-sdk/QueryValidatorResponse",
+
   encode(message: QueryValidatorResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.validator !== undefined) {
       Validator.encode(message.validator, writer.uint32(10).fork()).ldelim();
@@ -1345,6 +1435,32 @@ export const QueryValidatorResponse = {
     const obj: any = {};
     obj.validator = message.validator ? Validator.toAmino(message.validator) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryValidatorResponseAminoMsg): QueryValidatorResponse {
+    return QueryValidatorResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryValidatorResponse): QueryValidatorResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryValidatorResponse",
+      value: QueryValidatorResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryValidatorResponseProtoMsg): QueryValidatorResponse {
+    return QueryValidatorResponse.decode(message.value);
+  },
+
+  toProto(message: QueryValidatorResponse): Uint8Array {
+    return QueryValidatorResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryValidatorResponse): QueryValidatorResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.QueryValidatorResponse",
+      value: QueryValidatorResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1357,6 +1473,9 @@ function createBaseQueryValidatorDelegationsRequest(): QueryValidatorDelegations
 }
 
 export const QueryValidatorDelegationsRequest = {
+  typeUrl: "/cosmos.staking.v1beta1.QueryValidatorDelegationsRequest",
+  aminoType: "cosmos-sdk/QueryValidatorDelegationsRequest",
+
   encode(message: QueryValidatorDelegationsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.validatorAddr !== "") {
       writer.uint32(10).string(message.validatorAddr);
@@ -1442,6 +1561,32 @@ export const QueryValidatorDelegationsRequest = {
     obj.validator_addr = message.validatorAddr;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryValidatorDelegationsRequestAminoMsg): QueryValidatorDelegationsRequest {
+    return QueryValidatorDelegationsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryValidatorDelegationsRequest): QueryValidatorDelegationsRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryValidatorDelegationsRequest",
+      value: QueryValidatorDelegationsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryValidatorDelegationsRequestProtoMsg): QueryValidatorDelegationsRequest {
+    return QueryValidatorDelegationsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryValidatorDelegationsRequest): Uint8Array {
+    return QueryValidatorDelegationsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryValidatorDelegationsRequest): QueryValidatorDelegationsRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.QueryValidatorDelegationsRequest",
+      value: QueryValidatorDelegationsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1454,6 +1599,9 @@ function createBaseQueryValidatorDelegationsResponse(): QueryValidatorDelegation
 }
 
 export const QueryValidatorDelegationsResponse = {
+  typeUrl: "/cosmos.staking.v1beta1.QueryValidatorDelegationsResponse",
+  aminoType: "cosmos-sdk/QueryValidatorDelegationsResponse",
+
   encode(message: QueryValidatorDelegationsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.delegationResponses) {
       DelegationResponse.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1557,6 +1705,32 @@ export const QueryValidatorDelegationsResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryValidatorDelegationsResponseAminoMsg): QueryValidatorDelegationsResponse {
+    return QueryValidatorDelegationsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryValidatorDelegationsResponse): QueryValidatorDelegationsResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryValidatorDelegationsResponse",
+      value: QueryValidatorDelegationsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryValidatorDelegationsResponseProtoMsg): QueryValidatorDelegationsResponse {
+    return QueryValidatorDelegationsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryValidatorDelegationsResponse): Uint8Array {
+    return QueryValidatorDelegationsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryValidatorDelegationsResponse): QueryValidatorDelegationsResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.QueryValidatorDelegationsResponse",
+      value: QueryValidatorDelegationsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1569,6 +1743,9 @@ function createBaseQueryValidatorUnbondingDelegationsRequest(): QueryValidatorUn
 }
 
 export const QueryValidatorUnbondingDelegationsRequest = {
+  typeUrl: "/cosmos.staking.v1beta1.QueryValidatorUnbondingDelegationsRequest",
+  aminoType: "cosmos-sdk/QueryValidatorUnbondingDelegationsRequest",
+
   encode(message: QueryValidatorUnbondingDelegationsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.validatorAddr !== "") {
       writer.uint32(10).string(message.validatorAddr);
@@ -1654,6 +1831,32 @@ export const QueryValidatorUnbondingDelegationsRequest = {
     obj.validator_addr = message.validatorAddr;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryValidatorUnbondingDelegationsRequestAminoMsg): QueryValidatorUnbondingDelegationsRequest {
+    return QueryValidatorUnbondingDelegationsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryValidatorUnbondingDelegationsRequest): QueryValidatorUnbondingDelegationsRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryValidatorUnbondingDelegationsRequest",
+      value: QueryValidatorUnbondingDelegationsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryValidatorUnbondingDelegationsRequestProtoMsg): QueryValidatorUnbondingDelegationsRequest {
+    return QueryValidatorUnbondingDelegationsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryValidatorUnbondingDelegationsRequest): Uint8Array {
+    return QueryValidatorUnbondingDelegationsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryValidatorUnbondingDelegationsRequest): QueryValidatorUnbondingDelegationsRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.QueryValidatorUnbondingDelegationsRequest",
+      value: QueryValidatorUnbondingDelegationsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1666,6 +1869,9 @@ function createBaseQueryValidatorUnbondingDelegationsResponse(): QueryValidatorU
 }
 
 export const QueryValidatorUnbondingDelegationsResponse = {
+  typeUrl: "/cosmos.staking.v1beta1.QueryValidatorUnbondingDelegationsResponse",
+  aminoType: "cosmos-sdk/QueryValidatorUnbondingDelegationsResponse",
+
   encode(message: QueryValidatorUnbondingDelegationsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.unbondingResponses) {
       UnbondingDelegation.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1769,6 +1975,32 @@ export const QueryValidatorUnbondingDelegationsResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryValidatorUnbondingDelegationsResponseAminoMsg): QueryValidatorUnbondingDelegationsResponse {
+    return QueryValidatorUnbondingDelegationsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryValidatorUnbondingDelegationsResponse): QueryValidatorUnbondingDelegationsResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryValidatorUnbondingDelegationsResponse",
+      value: QueryValidatorUnbondingDelegationsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryValidatorUnbondingDelegationsResponseProtoMsg): QueryValidatorUnbondingDelegationsResponse {
+    return QueryValidatorUnbondingDelegationsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryValidatorUnbondingDelegationsResponse): Uint8Array {
+    return QueryValidatorUnbondingDelegationsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryValidatorUnbondingDelegationsResponse): QueryValidatorUnbondingDelegationsResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.QueryValidatorUnbondingDelegationsResponse",
+      value: QueryValidatorUnbondingDelegationsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1781,6 +2013,9 @@ function createBaseQueryDelegationRequest(): QueryDelegationRequest {
 }
 
 export const QueryDelegationRequest = {
+  typeUrl: "/cosmos.staking.v1beta1.QueryDelegationRequest",
+  aminoType: "cosmos-sdk/QueryDelegationRequest",
+
   encode(message: QueryDelegationRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.delegatorAddr !== "") {
       writer.uint32(10).string(message.delegatorAddr);
@@ -1866,6 +2101,32 @@ export const QueryDelegationRequest = {
     obj.delegator_addr = message.delegatorAddr;
     obj.validator_addr = message.validatorAddr;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDelegationRequestAminoMsg): QueryDelegationRequest {
+    return QueryDelegationRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryDelegationRequest): QueryDelegationRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryDelegationRequest",
+      value: QueryDelegationRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryDelegationRequestProtoMsg): QueryDelegationRequest {
+    return QueryDelegationRequest.decode(message.value);
+  },
+
+  toProto(message: QueryDelegationRequest): Uint8Array {
+    return QueryDelegationRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDelegationRequest): QueryDelegationRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.QueryDelegationRequest",
+      value: QueryDelegationRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1877,6 +2138,9 @@ function createBaseQueryDelegationResponse(): QueryDelegationResponse {
 }
 
 export const QueryDelegationResponse = {
+  typeUrl: "/cosmos.staking.v1beta1.QueryDelegationResponse",
+  aminoType: "cosmos-sdk/QueryDelegationResponse",
+
   encode(message: QueryDelegationResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.delegationResponse !== undefined) {
       DelegationResponse.encode(message.delegationResponse, writer.uint32(10).fork()).ldelim();
@@ -1947,6 +2211,32 @@ export const QueryDelegationResponse = {
     const obj: any = {};
     obj.delegation_response = message.delegationResponse ? DelegationResponse.toAmino(message.delegationResponse) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDelegationResponseAminoMsg): QueryDelegationResponse {
+    return QueryDelegationResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryDelegationResponse): QueryDelegationResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryDelegationResponse",
+      value: QueryDelegationResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryDelegationResponseProtoMsg): QueryDelegationResponse {
+    return QueryDelegationResponse.decode(message.value);
+  },
+
+  toProto(message: QueryDelegationResponse): Uint8Array {
+    return QueryDelegationResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDelegationResponse): QueryDelegationResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.QueryDelegationResponse",
+      value: QueryDelegationResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1959,6 +2249,9 @@ function createBaseQueryUnbondingDelegationRequest(): QueryUnbondingDelegationRe
 }
 
 export const QueryUnbondingDelegationRequest = {
+  typeUrl: "/cosmos.staking.v1beta1.QueryUnbondingDelegationRequest",
+  aminoType: "cosmos-sdk/QueryUnbondingDelegationRequest",
+
   encode(message: QueryUnbondingDelegationRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.delegatorAddr !== "") {
       writer.uint32(10).string(message.delegatorAddr);
@@ -2044,6 +2337,32 @@ export const QueryUnbondingDelegationRequest = {
     obj.delegator_addr = message.delegatorAddr;
     obj.validator_addr = message.validatorAddr;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryUnbondingDelegationRequestAminoMsg): QueryUnbondingDelegationRequest {
+    return QueryUnbondingDelegationRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryUnbondingDelegationRequest): QueryUnbondingDelegationRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryUnbondingDelegationRequest",
+      value: QueryUnbondingDelegationRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryUnbondingDelegationRequestProtoMsg): QueryUnbondingDelegationRequest {
+    return QueryUnbondingDelegationRequest.decode(message.value);
+  },
+
+  toProto(message: QueryUnbondingDelegationRequest): Uint8Array {
+    return QueryUnbondingDelegationRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryUnbondingDelegationRequest): QueryUnbondingDelegationRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.QueryUnbondingDelegationRequest",
+      value: QueryUnbondingDelegationRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2055,6 +2374,9 @@ function createBaseQueryUnbondingDelegationResponse(): QueryUnbondingDelegationR
 }
 
 export const QueryUnbondingDelegationResponse = {
+  typeUrl: "/cosmos.staking.v1beta1.QueryUnbondingDelegationResponse",
+  aminoType: "cosmos-sdk/QueryUnbondingDelegationResponse",
+
   encode(message: QueryUnbondingDelegationResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.unbond !== undefined) {
       UnbondingDelegation.encode(message.unbond, writer.uint32(10).fork()).ldelim();
@@ -2125,6 +2447,32 @@ export const QueryUnbondingDelegationResponse = {
     const obj: any = {};
     obj.unbond = message.unbond ? UnbondingDelegation.toAmino(message.unbond) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryUnbondingDelegationResponseAminoMsg): QueryUnbondingDelegationResponse {
+    return QueryUnbondingDelegationResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryUnbondingDelegationResponse): QueryUnbondingDelegationResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryUnbondingDelegationResponse",
+      value: QueryUnbondingDelegationResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryUnbondingDelegationResponseProtoMsg): QueryUnbondingDelegationResponse {
+    return QueryUnbondingDelegationResponse.decode(message.value);
+  },
+
+  toProto(message: QueryUnbondingDelegationResponse): Uint8Array {
+    return QueryUnbondingDelegationResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryUnbondingDelegationResponse): QueryUnbondingDelegationResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.QueryUnbondingDelegationResponse",
+      value: QueryUnbondingDelegationResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2137,6 +2485,9 @@ function createBaseQueryDelegatorDelegationsRequest(): QueryDelegatorDelegations
 }
 
 export const QueryDelegatorDelegationsRequest = {
+  typeUrl: "/cosmos.staking.v1beta1.QueryDelegatorDelegationsRequest",
+  aminoType: "cosmos-sdk/QueryDelegatorDelegationsRequest",
+
   encode(message: QueryDelegatorDelegationsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.delegatorAddr !== "") {
       writer.uint32(10).string(message.delegatorAddr);
@@ -2222,6 +2573,32 @@ export const QueryDelegatorDelegationsRequest = {
     obj.delegator_addr = message.delegatorAddr;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDelegatorDelegationsRequestAminoMsg): QueryDelegatorDelegationsRequest {
+    return QueryDelegatorDelegationsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryDelegatorDelegationsRequest): QueryDelegatorDelegationsRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryDelegatorDelegationsRequest",
+      value: QueryDelegatorDelegationsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryDelegatorDelegationsRequestProtoMsg): QueryDelegatorDelegationsRequest {
+    return QueryDelegatorDelegationsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryDelegatorDelegationsRequest): Uint8Array {
+    return QueryDelegatorDelegationsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDelegatorDelegationsRequest): QueryDelegatorDelegationsRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.QueryDelegatorDelegationsRequest",
+      value: QueryDelegatorDelegationsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2234,6 +2611,9 @@ function createBaseQueryDelegatorDelegationsResponse(): QueryDelegatorDelegation
 }
 
 export const QueryDelegatorDelegationsResponse = {
+  typeUrl: "/cosmos.staking.v1beta1.QueryDelegatorDelegationsResponse",
+  aminoType: "cosmos-sdk/QueryDelegatorDelegationsResponse",
+
   encode(message: QueryDelegatorDelegationsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.delegationResponses) {
       DelegationResponse.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -2337,6 +2717,32 @@ export const QueryDelegatorDelegationsResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDelegatorDelegationsResponseAminoMsg): QueryDelegatorDelegationsResponse {
+    return QueryDelegatorDelegationsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryDelegatorDelegationsResponse): QueryDelegatorDelegationsResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryDelegatorDelegationsResponse",
+      value: QueryDelegatorDelegationsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryDelegatorDelegationsResponseProtoMsg): QueryDelegatorDelegationsResponse {
+    return QueryDelegatorDelegationsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryDelegatorDelegationsResponse): Uint8Array {
+    return QueryDelegatorDelegationsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDelegatorDelegationsResponse): QueryDelegatorDelegationsResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.QueryDelegatorDelegationsResponse",
+      value: QueryDelegatorDelegationsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2349,6 +2755,9 @@ function createBaseQueryDelegatorUnbondingDelegationsRequest(): QueryDelegatorUn
 }
 
 export const QueryDelegatorUnbondingDelegationsRequest = {
+  typeUrl: "/cosmos.staking.v1beta1.QueryDelegatorUnbondingDelegationsRequest",
+  aminoType: "cosmos-sdk/QueryDelegatorUnbondingDelegationsRequest",
+
   encode(message: QueryDelegatorUnbondingDelegationsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.delegatorAddr !== "") {
       writer.uint32(10).string(message.delegatorAddr);
@@ -2434,6 +2843,32 @@ export const QueryDelegatorUnbondingDelegationsRequest = {
     obj.delegator_addr = message.delegatorAddr;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDelegatorUnbondingDelegationsRequestAminoMsg): QueryDelegatorUnbondingDelegationsRequest {
+    return QueryDelegatorUnbondingDelegationsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryDelegatorUnbondingDelegationsRequest): QueryDelegatorUnbondingDelegationsRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryDelegatorUnbondingDelegationsRequest",
+      value: QueryDelegatorUnbondingDelegationsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryDelegatorUnbondingDelegationsRequestProtoMsg): QueryDelegatorUnbondingDelegationsRequest {
+    return QueryDelegatorUnbondingDelegationsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryDelegatorUnbondingDelegationsRequest): Uint8Array {
+    return QueryDelegatorUnbondingDelegationsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDelegatorUnbondingDelegationsRequest): QueryDelegatorUnbondingDelegationsRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.QueryDelegatorUnbondingDelegationsRequest",
+      value: QueryDelegatorUnbondingDelegationsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2446,6 +2881,9 @@ function createBaseQueryDelegatorUnbondingDelegationsResponse(): QueryDelegatorU
 }
 
 export const QueryDelegatorUnbondingDelegationsResponse = {
+  typeUrl: "/cosmos.staking.v1beta1.QueryDelegatorUnbondingDelegationsResponse",
+  aminoType: "cosmos-sdk/QueryDelegatorUnbondingDelegationsResponse",
+
   encode(message: QueryDelegatorUnbondingDelegationsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.unbondingResponses) {
       UnbondingDelegation.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -2549,6 +2987,32 @@ export const QueryDelegatorUnbondingDelegationsResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDelegatorUnbondingDelegationsResponseAminoMsg): QueryDelegatorUnbondingDelegationsResponse {
+    return QueryDelegatorUnbondingDelegationsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryDelegatorUnbondingDelegationsResponse): QueryDelegatorUnbondingDelegationsResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryDelegatorUnbondingDelegationsResponse",
+      value: QueryDelegatorUnbondingDelegationsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryDelegatorUnbondingDelegationsResponseProtoMsg): QueryDelegatorUnbondingDelegationsResponse {
+    return QueryDelegatorUnbondingDelegationsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryDelegatorUnbondingDelegationsResponse): Uint8Array {
+    return QueryDelegatorUnbondingDelegationsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDelegatorUnbondingDelegationsResponse): QueryDelegatorUnbondingDelegationsResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.QueryDelegatorUnbondingDelegationsResponse",
+      value: QueryDelegatorUnbondingDelegationsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2563,6 +3027,9 @@ function createBaseQueryRedelegationsRequest(): QueryRedelegationsRequest {
 }
 
 export const QueryRedelegationsRequest = {
+  typeUrl: "/cosmos.staking.v1beta1.QueryRedelegationsRequest",
+  aminoType: "cosmos-sdk/QueryRedelegationsRequest",
+
   encode(message: QueryRedelegationsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.delegatorAddr !== "") {
       writer.uint32(10).string(message.delegatorAddr);
@@ -2678,6 +3145,32 @@ export const QueryRedelegationsRequest = {
     obj.dst_validator_addr = message.dstValidatorAddr;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryRedelegationsRequestAminoMsg): QueryRedelegationsRequest {
+    return QueryRedelegationsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryRedelegationsRequest): QueryRedelegationsRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryRedelegationsRequest",
+      value: QueryRedelegationsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryRedelegationsRequestProtoMsg): QueryRedelegationsRequest {
+    return QueryRedelegationsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryRedelegationsRequest): Uint8Array {
+    return QueryRedelegationsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryRedelegationsRequest): QueryRedelegationsRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.QueryRedelegationsRequest",
+      value: QueryRedelegationsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2690,6 +3183,9 @@ function createBaseQueryRedelegationsResponse(): QueryRedelegationsResponse {
 }
 
 export const QueryRedelegationsResponse = {
+  typeUrl: "/cosmos.staking.v1beta1.QueryRedelegationsResponse",
+  aminoType: "cosmos-sdk/QueryRedelegationsResponse",
+
   encode(message: QueryRedelegationsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.redelegationResponses) {
       RedelegationResponse.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -2793,6 +3289,32 @@ export const QueryRedelegationsResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryRedelegationsResponseAminoMsg): QueryRedelegationsResponse {
+    return QueryRedelegationsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryRedelegationsResponse): QueryRedelegationsResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryRedelegationsResponse",
+      value: QueryRedelegationsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryRedelegationsResponseProtoMsg): QueryRedelegationsResponse {
+    return QueryRedelegationsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryRedelegationsResponse): Uint8Array {
+    return QueryRedelegationsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryRedelegationsResponse): QueryRedelegationsResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.QueryRedelegationsResponse",
+      value: QueryRedelegationsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2805,6 +3327,9 @@ function createBaseQueryDelegatorValidatorsRequest(): QueryDelegatorValidatorsRe
 }
 
 export const QueryDelegatorValidatorsRequest = {
+  typeUrl: "/cosmos.staking.v1beta1.QueryDelegatorValidatorsRequest",
+  aminoType: "cosmos-sdk/QueryDelegatorValidatorsRequest",
+
   encode(message: QueryDelegatorValidatorsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.delegatorAddr !== "") {
       writer.uint32(10).string(message.delegatorAddr);
@@ -2890,6 +3415,32 @@ export const QueryDelegatorValidatorsRequest = {
     obj.delegator_addr = message.delegatorAddr;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDelegatorValidatorsRequestAminoMsg): QueryDelegatorValidatorsRequest {
+    return QueryDelegatorValidatorsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryDelegatorValidatorsRequest): QueryDelegatorValidatorsRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryDelegatorValidatorsRequest",
+      value: QueryDelegatorValidatorsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryDelegatorValidatorsRequestProtoMsg): QueryDelegatorValidatorsRequest {
+    return QueryDelegatorValidatorsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryDelegatorValidatorsRequest): Uint8Array {
+    return QueryDelegatorValidatorsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDelegatorValidatorsRequest): QueryDelegatorValidatorsRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.QueryDelegatorValidatorsRequest",
+      value: QueryDelegatorValidatorsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2902,6 +3453,9 @@ function createBaseQueryDelegatorValidatorsResponse(): QueryDelegatorValidatorsR
 }
 
 export const QueryDelegatorValidatorsResponse = {
+  typeUrl: "/cosmos.staking.v1beta1.QueryDelegatorValidatorsResponse",
+  aminoType: "cosmos-sdk/QueryDelegatorValidatorsResponse",
+
   encode(message: QueryDelegatorValidatorsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.validators) {
       Validator.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -3005,6 +3559,32 @@ export const QueryDelegatorValidatorsResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDelegatorValidatorsResponseAminoMsg): QueryDelegatorValidatorsResponse {
+    return QueryDelegatorValidatorsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryDelegatorValidatorsResponse): QueryDelegatorValidatorsResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryDelegatorValidatorsResponse",
+      value: QueryDelegatorValidatorsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryDelegatorValidatorsResponseProtoMsg): QueryDelegatorValidatorsResponse {
+    return QueryDelegatorValidatorsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryDelegatorValidatorsResponse): Uint8Array {
+    return QueryDelegatorValidatorsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDelegatorValidatorsResponse): QueryDelegatorValidatorsResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.QueryDelegatorValidatorsResponse",
+      value: QueryDelegatorValidatorsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -3017,6 +3597,9 @@ function createBaseQueryDelegatorValidatorRequest(): QueryDelegatorValidatorRequ
 }
 
 export const QueryDelegatorValidatorRequest = {
+  typeUrl: "/cosmos.staking.v1beta1.QueryDelegatorValidatorRequest",
+  aminoType: "cosmos-sdk/QueryDelegatorValidatorRequest",
+
   encode(message: QueryDelegatorValidatorRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.delegatorAddr !== "") {
       writer.uint32(10).string(message.delegatorAddr);
@@ -3102,6 +3685,32 @@ export const QueryDelegatorValidatorRequest = {
     obj.delegator_addr = message.delegatorAddr;
     obj.validator_addr = message.validatorAddr;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDelegatorValidatorRequestAminoMsg): QueryDelegatorValidatorRequest {
+    return QueryDelegatorValidatorRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryDelegatorValidatorRequest): QueryDelegatorValidatorRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryDelegatorValidatorRequest",
+      value: QueryDelegatorValidatorRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryDelegatorValidatorRequestProtoMsg): QueryDelegatorValidatorRequest {
+    return QueryDelegatorValidatorRequest.decode(message.value);
+  },
+
+  toProto(message: QueryDelegatorValidatorRequest): Uint8Array {
+    return QueryDelegatorValidatorRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDelegatorValidatorRequest): QueryDelegatorValidatorRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.QueryDelegatorValidatorRequest",
+      value: QueryDelegatorValidatorRequest.encode(message).finish()
+    };
   }
 
 };
@@ -3113,6 +3722,9 @@ function createBaseQueryDelegatorValidatorResponse(): QueryDelegatorValidatorRes
 }
 
 export const QueryDelegatorValidatorResponse = {
+  typeUrl: "/cosmos.staking.v1beta1.QueryDelegatorValidatorResponse",
+  aminoType: "cosmos-sdk/QueryDelegatorValidatorResponse",
+
   encode(message: QueryDelegatorValidatorResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.validator !== undefined) {
       Validator.encode(message.validator, writer.uint32(10).fork()).ldelim();
@@ -3183,6 +3795,32 @@ export const QueryDelegatorValidatorResponse = {
     const obj: any = {};
     obj.validator = message.validator ? Validator.toAmino(message.validator) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDelegatorValidatorResponseAminoMsg): QueryDelegatorValidatorResponse {
+    return QueryDelegatorValidatorResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryDelegatorValidatorResponse): QueryDelegatorValidatorResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryDelegatorValidatorResponse",
+      value: QueryDelegatorValidatorResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryDelegatorValidatorResponseProtoMsg): QueryDelegatorValidatorResponse {
+    return QueryDelegatorValidatorResponse.decode(message.value);
+  },
+
+  toProto(message: QueryDelegatorValidatorResponse): Uint8Array {
+    return QueryDelegatorValidatorResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDelegatorValidatorResponse): QueryDelegatorValidatorResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.QueryDelegatorValidatorResponse",
+      value: QueryDelegatorValidatorResponse.encode(message).finish()
+    };
   }
 
 };
@@ -3194,6 +3832,9 @@ function createBaseQueryHistoricalInfoRequest(): QueryHistoricalInfoRequest {
 }
 
 export const QueryHistoricalInfoRequest = {
+  typeUrl: "/cosmos.staking.v1beta1.QueryHistoricalInfoRequest",
+  aminoType: "cosmos-sdk/QueryHistoricalInfoRequest",
+
   encode(message: QueryHistoricalInfoRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.height.isZero()) {
       writer.uint32(8).int64(message.height);
@@ -3264,6 +3905,32 @@ export const QueryHistoricalInfoRequest = {
     const obj: any = {};
     obj.height = message.height ? message.height.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryHistoricalInfoRequestAminoMsg): QueryHistoricalInfoRequest {
+    return QueryHistoricalInfoRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryHistoricalInfoRequest): QueryHistoricalInfoRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryHistoricalInfoRequest",
+      value: QueryHistoricalInfoRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryHistoricalInfoRequestProtoMsg): QueryHistoricalInfoRequest {
+    return QueryHistoricalInfoRequest.decode(message.value);
+  },
+
+  toProto(message: QueryHistoricalInfoRequest): Uint8Array {
+    return QueryHistoricalInfoRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryHistoricalInfoRequest): QueryHistoricalInfoRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.QueryHistoricalInfoRequest",
+      value: QueryHistoricalInfoRequest.encode(message).finish()
+    };
   }
 
 };
@@ -3275,6 +3942,9 @@ function createBaseQueryHistoricalInfoResponse(): QueryHistoricalInfoResponse {
 }
 
 export const QueryHistoricalInfoResponse = {
+  typeUrl: "/cosmos.staking.v1beta1.QueryHistoricalInfoResponse",
+  aminoType: "cosmos-sdk/QueryHistoricalInfoResponse",
+
   encode(message: QueryHistoricalInfoResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.hist !== undefined) {
       HistoricalInfo.encode(message.hist, writer.uint32(10).fork()).ldelim();
@@ -3345,6 +4015,32 @@ export const QueryHistoricalInfoResponse = {
     const obj: any = {};
     obj.hist = message.hist ? HistoricalInfo.toAmino(message.hist) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryHistoricalInfoResponseAminoMsg): QueryHistoricalInfoResponse {
+    return QueryHistoricalInfoResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryHistoricalInfoResponse): QueryHistoricalInfoResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryHistoricalInfoResponse",
+      value: QueryHistoricalInfoResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryHistoricalInfoResponseProtoMsg): QueryHistoricalInfoResponse {
+    return QueryHistoricalInfoResponse.decode(message.value);
+  },
+
+  toProto(message: QueryHistoricalInfoResponse): Uint8Array {
+    return QueryHistoricalInfoResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryHistoricalInfoResponse): QueryHistoricalInfoResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.QueryHistoricalInfoResponse",
+      value: QueryHistoricalInfoResponse.encode(message).finish()
+    };
   }
 
 };
@@ -3354,6 +4050,9 @@ function createBaseQueryPoolRequest(): QueryPoolRequest {
 }
 
 export const QueryPoolRequest = {
+  typeUrl: "/cosmos.staking.v1beta1.QueryPoolRequest",
+  aminoType: "cosmos-sdk/QueryPoolRequest",
+
   encode(_: QueryPoolRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -3406,6 +4105,32 @@ export const QueryPoolRequest = {
   toAmino(_: QueryPoolRequest): QueryPoolRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryPoolRequestAminoMsg): QueryPoolRequest {
+    return QueryPoolRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryPoolRequest): QueryPoolRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryPoolRequest",
+      value: QueryPoolRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryPoolRequestProtoMsg): QueryPoolRequest {
+    return QueryPoolRequest.decode(message.value);
+  },
+
+  toProto(message: QueryPoolRequest): Uint8Array {
+    return QueryPoolRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryPoolRequest): QueryPoolRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.QueryPoolRequest",
+      value: QueryPoolRequest.encode(message).finish()
+    };
   }
 
 };
@@ -3417,6 +4142,9 @@ function createBaseQueryPoolResponse(): QueryPoolResponse {
 }
 
 export const QueryPoolResponse = {
+  typeUrl: "/cosmos.staking.v1beta1.QueryPoolResponse",
+  aminoType: "cosmos-sdk/QueryPoolResponse",
+
   encode(message: QueryPoolResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.pool !== undefined) {
       Pool.encode(message.pool, writer.uint32(10).fork()).ldelim();
@@ -3487,6 +4215,32 @@ export const QueryPoolResponse = {
     const obj: any = {};
     obj.pool = message.pool ? Pool.toAmino(message.pool) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryPoolResponseAminoMsg): QueryPoolResponse {
+    return QueryPoolResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryPoolResponse): QueryPoolResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryPoolResponse",
+      value: QueryPoolResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryPoolResponseProtoMsg): QueryPoolResponse {
+    return QueryPoolResponse.decode(message.value);
+  },
+
+  toProto(message: QueryPoolResponse): Uint8Array {
+    return QueryPoolResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryPoolResponse): QueryPoolResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.QueryPoolResponse",
+      value: QueryPoolResponse.encode(message).finish()
+    };
   }
 
 };
@@ -3496,6 +4250,9 @@ function createBaseQueryParamsRequest(): QueryParamsRequest {
 }
 
 export const QueryParamsRequest = {
+  typeUrl: "/cosmos.staking.v1beta1.QueryParamsRequest",
+  aminoType: "cosmos-sdk/QueryParamsRequest",
+
   encode(_: QueryParamsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -3548,6 +4305,32 @@ export const QueryParamsRequest = {
   toAmino(_: QueryParamsRequest): QueryParamsRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest {
+    return QueryParamsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryParamsRequest): QueryParamsRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryParamsRequest",
+      value: QueryParamsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryParamsRequestProtoMsg): QueryParamsRequest {
+    return QueryParamsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryParamsRequest): Uint8Array {
+    return QueryParamsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryParamsRequest): QueryParamsRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.QueryParamsRequest",
+      value: QueryParamsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -3559,6 +4342,9 @@ function createBaseQueryParamsResponse(): QueryParamsResponse {
 }
 
 export const QueryParamsResponse = {
+  typeUrl: "/cosmos.staking.v1beta1.QueryParamsResponse",
+  aminoType: "cosmos-sdk/QueryParamsResponse",
+
   encode(message: QueryParamsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.params !== undefined) {
       Params.encode(message.params, writer.uint32(10).fork()).ldelim();
@@ -3629,6 +4415,32 @@ export const QueryParamsResponse = {
     const obj: any = {};
     obj.params = message.params ? Params.toAmino(message.params) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryParamsResponseAminoMsg): QueryParamsResponse {
+    return QueryParamsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryParamsResponse): QueryParamsResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryParamsResponse",
+      value: QueryParamsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryParamsResponseProtoMsg): QueryParamsResponse {
+    return QueryParamsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryParamsResponse): Uint8Array {
+    return QueryParamsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryParamsResponse): QueryParamsResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.QueryParamsResponse",
+      value: QueryParamsResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/staking/v1beta1/staking.ts b/__fixtures__/outputv2/cosmos/staking/v1beta1/staking.ts
index 505d8ad87..0546aff48 100644
--- a/__fixtures__/outputv2/cosmos/staking/v1beta1/staking.ts
+++ b/__fixtures__/outputv2/cosmos/staking/v1beta1/staking.ts
@@ -80,7 +80,7 @@ export interface HistoricalInfo {
   header?: Header;
   valset: Validator[];
 }
-export interface HistoricalInfoProtoType {
+export interface HistoricalInfoProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.HistoricalInfo";
   value: Uint8Array;
 }
@@ -95,7 +95,7 @@ export interface HistoricalInfoAmino {
   header?: HeaderAmino;
   valset: ValidatorAmino[];
 }
-export interface HistoricalInfoAminoType {
+export interface HistoricalInfoAminoMsg {
   type: "cosmos-sdk/HistoricalInfo";
   value: HistoricalInfoAmino;
 }
@@ -125,7 +125,7 @@ export interface CommissionRates {
   /** max_change_rate defines the maximum daily increase of the validator commission, as a fraction. */
   maxChangeRate: string;
 }
-export interface CommissionRatesProtoType {
+export interface CommissionRatesProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.CommissionRates";
   value: Uint8Array;
 }
@@ -144,7 +144,7 @@ export interface CommissionRatesAmino {
   /** max_change_rate defines the maximum daily increase of the validator commission, as a fraction. */
   max_change_rate: string;
 }
-export interface CommissionRatesAminoType {
+export interface CommissionRatesAminoMsg {
   type: "cosmos-sdk/CommissionRates";
   value: CommissionRatesAmino;
 }
@@ -167,7 +167,7 @@ export interface Commission {
   /** update_time is the last time the commission rate was changed. */
   updateTime?: Date;
 }
-export interface CommissionProtoType {
+export interface CommissionProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.Commission";
   value: Uint8Array;
 }
@@ -180,7 +180,7 @@ export interface CommissionAmino {
   /** update_time is the last time the commission rate was changed. */
   update_time?: Date;
 }
-export interface CommissionAminoType {
+export interface CommissionAminoMsg {
   type: "cosmos-sdk/Commission";
   value: CommissionAmino;
 }
@@ -208,7 +208,7 @@ export interface Description {
   /** details define other optional details. */
   details: string;
 }
-export interface DescriptionProtoType {
+export interface DescriptionProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.Description";
   value: Uint8Array;
 }
@@ -230,7 +230,7 @@ export interface DescriptionAmino {
   /** details define other optional details. */
   details: string;
 }
-export interface DescriptionAminoType {
+export interface DescriptionAminoMsg {
   type: "cosmos-sdk/Description";
   value: DescriptionAmino;
 }
@@ -288,7 +288,7 @@ export interface Validator {
   /** min_self_delegation is the validator's self declared minimum self delegation. */
   minSelfDelegation: string;
 }
-export interface ValidatorProtoType {
+export interface ValidatorProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.Validator";
   value: Uint8Array;
 }
@@ -337,7 +337,7 @@ export interface ValidatorAmino {
   /** min_self_delegation is the validator's self declared minimum self delegation. */
   min_self_delegation: string;
 }
-export interface ValidatorAminoType {
+export interface ValidatorAminoMsg {
   type: "cosmos-sdk/Validator";
   value: ValidatorAmino;
 }
@@ -370,7 +370,7 @@ export interface ValidatorSDKType {
 export interface ValAddresses {
   addresses: string[];
 }
-export interface ValAddressesProtoType {
+export interface ValAddressesProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.ValAddresses";
   value: Uint8Array;
 }
@@ -379,7 +379,7 @@ export interface ValAddressesProtoType {
 export interface ValAddressesAmino {
   addresses: string[];
 }
-export interface ValAddressesAminoType {
+export interface ValAddressesAminoMsg {
   type: "cosmos-sdk/ValAddresses";
   value: ValAddressesAmino;
 }
@@ -398,7 +398,7 @@ export interface DVPair {
   delegatorAddress: string;
   validatorAddress: string;
 }
-export interface DVPairProtoType {
+export interface DVPairProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.DVPair";
   value: Uint8Array;
 }
@@ -412,7 +412,7 @@ export interface DVPairAmino {
   delegator_address: string;
   validator_address: string;
 }
-export interface DVPairAminoType {
+export interface DVPairAminoMsg {
   type: "cosmos-sdk/DVPair";
   value: DVPairAmino;
 }
@@ -431,7 +431,7 @@ export interface DVPairSDKType {
 export interface DVPairs {
   pairs: DVPair[];
 }
-export interface DVPairsProtoType {
+export interface DVPairsProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.DVPairs";
   value: Uint8Array;
 }
@@ -440,7 +440,7 @@ export interface DVPairsProtoType {
 export interface DVPairsAmino {
   pairs: DVPairAmino[];
 }
-export interface DVPairsAminoType {
+export interface DVPairsAminoMsg {
   type: "cosmos-sdk/DVPairs";
   value: DVPairsAmino;
 }
@@ -461,7 +461,7 @@ export interface DVVTriplet {
   validatorSrcAddress: string;
   validatorDstAddress: string;
 }
-export interface DVVTripletProtoType {
+export interface DVVTripletProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.DVVTriplet";
   value: Uint8Array;
 }
@@ -477,7 +477,7 @@ export interface DVVTripletAmino {
   validator_src_address: string;
   validator_dst_address: string;
 }
-export interface DVVTripletAminoType {
+export interface DVVTripletAminoMsg {
   type: "cosmos-sdk/DVVTriplet";
   value: DVVTripletAmino;
 }
@@ -498,7 +498,7 @@ export interface DVVTripletSDKType {
 export interface DVVTriplets {
   triplets: DVVTriplet[];
 }
-export interface DVVTripletsProtoType {
+export interface DVVTripletsProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.DVVTriplets";
   value: Uint8Array;
 }
@@ -507,7 +507,7 @@ export interface DVVTripletsProtoType {
 export interface DVVTripletsAmino {
   triplets: DVVTripletAmino[];
 }
-export interface DVVTripletsAminoType {
+export interface DVVTripletsAminoMsg {
   type: "cosmos-sdk/DVVTriplets";
   value: DVVTripletsAmino;
 }
@@ -532,7 +532,7 @@ export interface Delegation {
   /** shares define the delegation shares received. */
   shares: string;
 }
-export interface DelegationProtoType {
+export interface DelegationProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.Delegation";
   value: Uint8Array;
 }
@@ -552,7 +552,7 @@ export interface DelegationAmino {
   /** shares define the delegation shares received. */
   shares: string;
 }
-export interface DelegationAminoType {
+export interface DelegationAminoMsg {
   type: "cosmos-sdk/Delegation";
   value: DelegationAmino;
 }
@@ -582,7 +582,7 @@ export interface UnbondingDelegation {
   /** entries are the unbonding delegation entries. */
   entries: UnbondingDelegationEntry[];
 }
-export interface UnbondingDelegationProtoType {
+export interface UnbondingDelegationProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.UnbondingDelegation";
   value: Uint8Array;
 }
@@ -601,7 +601,7 @@ export interface UnbondingDelegationAmino {
   /** entries are the unbonding delegation entries. */
   entries: UnbondingDelegationEntryAmino[];
 }
-export interface UnbondingDelegationAminoType {
+export interface UnbondingDelegationAminoMsg {
   type: "cosmos-sdk/UnbondingDelegation";
   value: UnbondingDelegationAmino;
 }
@@ -630,7 +630,7 @@ export interface UnbondingDelegationEntry {
   /** balance defines the tokens to receive at completion. */
   balance: string;
 }
-export interface UnbondingDelegationEntryProtoType {
+export interface UnbondingDelegationEntryProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.UnbondingDelegationEntry";
   value: Uint8Array;
 }
@@ -649,7 +649,7 @@ export interface UnbondingDelegationEntryAmino {
   /** balance defines the tokens to receive at completion. */
   balance: string;
 }
-export interface UnbondingDelegationEntryAminoType {
+export interface UnbondingDelegationEntryAminoMsg {
   type: "cosmos-sdk/UnbondingDelegationEntry";
   value: UnbondingDelegationEntryAmino;
 }
@@ -676,7 +676,7 @@ export interface RedelegationEntry {
   /** shares_dst is the amount of destination-validator shares created by redelegation. */
   sharesDst: string;
 }
-export interface RedelegationEntryProtoType {
+export interface RedelegationEntryProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.RedelegationEntry";
   value: Uint8Array;
 }
@@ -695,7 +695,7 @@ export interface RedelegationEntryAmino {
   /** shares_dst is the amount of destination-validator shares created by redelegation. */
   shares_dst: string;
 }
-export interface RedelegationEntryAminoType {
+export interface RedelegationEntryAminoMsg {
   type: "cosmos-sdk/RedelegationEntry";
   value: RedelegationEntryAmino;
 }
@@ -725,7 +725,7 @@ export interface Redelegation {
   /** entries are the redelegation entries. */
   entries: RedelegationEntry[];
 }
-export interface RedelegationProtoType {
+export interface RedelegationProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.Redelegation";
   value: Uint8Array;
 }
@@ -747,7 +747,7 @@ export interface RedelegationAmino {
   /** entries are the redelegation entries. */
   entries: RedelegationEntryAmino[];
 }
-export interface RedelegationAminoType {
+export interface RedelegationAminoMsg {
   type: "cosmos-sdk/Redelegation";
   value: RedelegationAmino;
 }
@@ -783,7 +783,7 @@ export interface Params {
   /** min_commission_rate is the chain-wide minimum commission rate that a validator can charge their delegators */
   minCommissionRate: string;
 }
-export interface ParamsProtoType {
+export interface ParamsProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.Params";
   value: Uint8Array;
 }
@@ -808,7 +808,7 @@ export interface ParamsAmino {
   /** min_commission_rate is the chain-wide minimum commission rate that a validator can charge their delegators */
   min_commission_rate: string;
 }
-export interface ParamsAminoType {
+export interface ParamsAminoMsg {
   type: "cosmos-sdk/Params";
   value: ParamsAmino;
 }
@@ -831,7 +831,7 @@ export interface DelegationResponse {
   delegation?: Delegation;
   balance?: Coin;
 }
-export interface DelegationResponseProtoType {
+export interface DelegationResponseProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.DelegationResponse";
   value: Uint8Array;
 }
@@ -844,7 +844,7 @@ export interface DelegationResponseAmino {
   delegation?: DelegationAmino;
   balance?: CoinAmino;
 }
-export interface DelegationResponseAminoType {
+export interface DelegationResponseAminoMsg {
   type: "cosmos-sdk/DelegationResponse";
   value: DelegationResponseAmino;
 }
@@ -867,7 +867,7 @@ export interface RedelegationEntryResponse {
   redelegationEntry?: RedelegationEntry;
   balance: string;
 }
-export interface RedelegationEntryResponseProtoType {
+export interface RedelegationEntryResponseProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.RedelegationEntryResponse";
   value: Uint8Array;
 }
@@ -881,7 +881,7 @@ export interface RedelegationEntryResponseAmino {
   redelegation_entry?: RedelegationEntryAmino;
   balance: string;
 }
-export interface RedelegationEntryResponseAminoType {
+export interface RedelegationEntryResponseAminoMsg {
   type: "cosmos-sdk/RedelegationEntryResponse";
   value: RedelegationEntryResponseAmino;
 }
@@ -905,7 +905,7 @@ export interface RedelegationResponse {
   redelegation?: Redelegation;
   entries: RedelegationEntryResponse[];
 }
-export interface RedelegationResponseProtoType {
+export interface RedelegationResponseProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.RedelegationResponse";
   value: Uint8Array;
 }
@@ -919,7 +919,7 @@ export interface RedelegationResponseAmino {
   redelegation?: RedelegationAmino;
   entries: RedelegationEntryResponseAmino[];
 }
-export interface RedelegationResponseAminoType {
+export interface RedelegationResponseAminoMsg {
   type: "cosmos-sdk/RedelegationResponse";
   value: RedelegationResponseAmino;
 }
@@ -942,7 +942,7 @@ export interface Pool {
   notBondedTokens: string;
   bondedTokens: string;
 }
-export interface PoolProtoType {
+export interface PoolProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.Pool";
   value: Uint8Array;
 }
@@ -955,7 +955,7 @@ export interface PoolAmino {
   not_bonded_tokens: string;
   bonded_tokens: string;
 }
-export interface PoolAminoType {
+export interface PoolAminoMsg {
   type: "cosmos-sdk/Pool";
   value: PoolAmino;
 }
@@ -977,6 +977,9 @@ function createBaseHistoricalInfo(): HistoricalInfo {
 }
 
 export const HistoricalInfo = {
+  typeUrl: "/cosmos.staking.v1beta1.HistoricalInfo",
+  aminoType: "cosmos-sdk/HistoricalInfo",
+
   encode(message: HistoricalInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.header !== undefined) {
       Header.encode(message.header, writer.uint32(10).fork()).ldelim();
@@ -1080,6 +1083,32 @@ export const HistoricalInfo = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: HistoricalInfoAminoMsg): HistoricalInfo {
+    return HistoricalInfo.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: HistoricalInfo): HistoricalInfoAminoMsg {
+    return {
+      type: "cosmos-sdk/HistoricalInfo",
+      value: HistoricalInfo.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: HistoricalInfoProtoMsg): HistoricalInfo {
+    return HistoricalInfo.decode(message.value);
+  },
+
+  toProto(message: HistoricalInfo): Uint8Array {
+    return HistoricalInfo.encode(message).finish();
+  },
+
+  toProtoMsg(message: HistoricalInfo): HistoricalInfoProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.HistoricalInfo",
+      value: HistoricalInfo.encode(message).finish()
+    };
   }
 
 };
@@ -1093,6 +1122,9 @@ function createBaseCommissionRates(): CommissionRates {
 }
 
 export const CommissionRates = {
+  typeUrl: "/cosmos.staking.v1beta1.CommissionRates",
+  aminoType: "cosmos-sdk/CommissionRates",
+
   encode(message: CommissionRates, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.rate !== "") {
       writer.uint32(10).string(message.rate);
@@ -1193,6 +1225,32 @@ export const CommissionRates = {
     obj.max_rate = message.maxRate;
     obj.max_change_rate = message.maxChangeRate;
     return obj;
+  },
+
+  fromAminoMsg(object: CommissionRatesAminoMsg): CommissionRates {
+    return CommissionRates.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: CommissionRates): CommissionRatesAminoMsg {
+    return {
+      type: "cosmos-sdk/CommissionRates",
+      value: CommissionRates.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: CommissionRatesProtoMsg): CommissionRates {
+    return CommissionRates.decode(message.value);
+  },
+
+  toProto(message: CommissionRates): Uint8Array {
+    return CommissionRates.encode(message).finish();
+  },
+
+  toProtoMsg(message: CommissionRates): CommissionRatesProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.CommissionRates",
+      value: CommissionRates.encode(message).finish()
+    };
   }
 
 };
@@ -1205,6 +1263,9 @@ function createBaseCommission(): Commission {
 }
 
 export const Commission = {
+  typeUrl: "/cosmos.staking.v1beta1.Commission",
+  aminoType: "cosmos-sdk/Commission",
+
   encode(message: Commission, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.commissionRates !== undefined) {
       CommissionRates.encode(message.commissionRates, writer.uint32(10).fork()).ldelim();
@@ -1290,6 +1351,32 @@ export const Commission = {
     obj.commission_rates = message.commissionRates ? CommissionRates.toAmino(message.commissionRates) : undefined;
     obj.update_time = message.updateTime ? Timestamp.toAmino(message.updateTime) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: CommissionAminoMsg): Commission {
+    return Commission.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Commission): CommissionAminoMsg {
+    return {
+      type: "cosmos-sdk/Commission",
+      value: Commission.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: CommissionProtoMsg): Commission {
+    return Commission.decode(message.value);
+  },
+
+  toProto(message: Commission): Uint8Array {
+    return Commission.encode(message).finish();
+  },
+
+  toProtoMsg(message: Commission): CommissionProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.Commission",
+      value: Commission.encode(message).finish()
+    };
   }
 
 };
@@ -1305,6 +1392,9 @@ function createBaseDescription(): Description {
 }
 
 export const Description = {
+  typeUrl: "/cosmos.staking.v1beta1.Description",
+  aminoType: "cosmos-sdk/Description",
+
   encode(message: Description, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.moniker !== "") {
       writer.uint32(10).string(message.moniker);
@@ -1435,6 +1525,32 @@ export const Description = {
     obj.security_contact = message.securityContact;
     obj.details = message.details;
     return obj;
+  },
+
+  fromAminoMsg(object: DescriptionAminoMsg): Description {
+    return Description.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Description): DescriptionAminoMsg {
+    return {
+      type: "cosmos-sdk/Description",
+      value: Description.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: DescriptionProtoMsg): Description {
+    return Description.decode(message.value);
+  },
+
+  toProto(message: Description): Uint8Array {
+    return Description.encode(message).finish();
+  },
+
+  toProtoMsg(message: Description): DescriptionProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.Description",
+      value: Description.encode(message).finish()
+    };
   }
 
 };
@@ -1456,6 +1572,9 @@ function createBaseValidator(): Validator {
 }
 
 export const Validator = {
+  typeUrl: "/cosmos.staking.v1beta1.Validator",
+  aminoType: "cosmos-sdk/Validator",
+
   encode(message: Validator, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.operatorAddress !== "") {
       writer.uint32(10).string(message.operatorAddress);
@@ -1682,6 +1801,32 @@ export const Validator = {
     obj.commission = message.commission ? Commission.toAmino(message.commission) : undefined;
     obj.min_self_delegation = message.minSelfDelegation;
     return obj;
+  },
+
+  fromAminoMsg(object: ValidatorAminoMsg): Validator {
+    return Validator.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Validator): ValidatorAminoMsg {
+    return {
+      type: "cosmos-sdk/Validator",
+      value: Validator.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ValidatorProtoMsg): Validator {
+    return Validator.decode(message.value);
+  },
+
+  toProto(message: Validator): Uint8Array {
+    return Validator.encode(message).finish();
+  },
+
+  toProtoMsg(message: Validator): ValidatorProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.Validator",
+      value: Validator.encode(message).finish()
+    };
   }
 
 };
@@ -1693,6 +1838,9 @@ function createBaseValAddresses(): ValAddresses {
 }
 
 export const ValAddresses = {
+  typeUrl: "/cosmos.staking.v1beta1.ValAddresses",
+  aminoType: "cosmos-sdk/ValAddresses",
+
   encode(message: ValAddresses, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.addresses) {
       writer.uint32(10).string(v!);
@@ -1781,6 +1929,32 @@ export const ValAddresses = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ValAddressesAminoMsg): ValAddresses {
+    return ValAddresses.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ValAddresses): ValAddressesAminoMsg {
+    return {
+      type: "cosmos-sdk/ValAddresses",
+      value: ValAddresses.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ValAddressesProtoMsg): ValAddresses {
+    return ValAddresses.decode(message.value);
+  },
+
+  toProto(message: ValAddresses): Uint8Array {
+    return ValAddresses.encode(message).finish();
+  },
+
+  toProtoMsg(message: ValAddresses): ValAddressesProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.ValAddresses",
+      value: ValAddresses.encode(message).finish()
+    };
   }
 
 };
@@ -1793,6 +1967,9 @@ function createBaseDVPair(): DVPair {
 }
 
 export const DVPair = {
+  typeUrl: "/cosmos.staking.v1beta1.DVPair",
+  aminoType: "cosmos-sdk/DVPair",
+
   encode(message: DVPair, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.delegatorAddress !== "") {
       writer.uint32(10).string(message.delegatorAddress);
@@ -1878,6 +2055,32 @@ export const DVPair = {
     obj.delegator_address = message.delegatorAddress;
     obj.validator_address = message.validatorAddress;
     return obj;
+  },
+
+  fromAminoMsg(object: DVPairAminoMsg): DVPair {
+    return DVPair.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: DVPair): DVPairAminoMsg {
+    return {
+      type: "cosmos-sdk/DVPair",
+      value: DVPair.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: DVPairProtoMsg): DVPair {
+    return DVPair.decode(message.value);
+  },
+
+  toProto(message: DVPair): Uint8Array {
+    return DVPair.encode(message).finish();
+  },
+
+  toProtoMsg(message: DVPair): DVPairProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.DVPair",
+      value: DVPair.encode(message).finish()
+    };
   }
 
 };
@@ -1889,6 +2092,9 @@ function createBaseDVPairs(): DVPairs {
 }
 
 export const DVPairs = {
+  typeUrl: "/cosmos.staking.v1beta1.DVPairs",
+  aminoType: "cosmos-sdk/DVPairs",
+
   encode(message: DVPairs, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.pairs) {
       DVPair.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1977,6 +2183,32 @@ export const DVPairs = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: DVPairsAminoMsg): DVPairs {
+    return DVPairs.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: DVPairs): DVPairsAminoMsg {
+    return {
+      type: "cosmos-sdk/DVPairs",
+      value: DVPairs.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: DVPairsProtoMsg): DVPairs {
+    return DVPairs.decode(message.value);
+  },
+
+  toProto(message: DVPairs): Uint8Array {
+    return DVPairs.encode(message).finish();
+  },
+
+  toProtoMsg(message: DVPairs): DVPairsProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.DVPairs",
+      value: DVPairs.encode(message).finish()
+    };
   }
 
 };
@@ -1990,6 +2222,9 @@ function createBaseDVVTriplet(): DVVTriplet {
 }
 
 export const DVVTriplet = {
+  typeUrl: "/cosmos.staking.v1beta1.DVVTriplet",
+  aminoType: "cosmos-sdk/DVVTriplet",
+
   encode(message: DVVTriplet, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.delegatorAddress !== "") {
       writer.uint32(10).string(message.delegatorAddress);
@@ -2090,6 +2325,32 @@ export const DVVTriplet = {
     obj.validator_src_address = message.validatorSrcAddress;
     obj.validator_dst_address = message.validatorDstAddress;
     return obj;
+  },
+
+  fromAminoMsg(object: DVVTripletAminoMsg): DVVTriplet {
+    return DVVTriplet.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: DVVTriplet): DVVTripletAminoMsg {
+    return {
+      type: "cosmos-sdk/DVVTriplet",
+      value: DVVTriplet.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: DVVTripletProtoMsg): DVVTriplet {
+    return DVVTriplet.decode(message.value);
+  },
+
+  toProto(message: DVVTriplet): Uint8Array {
+    return DVVTriplet.encode(message).finish();
+  },
+
+  toProtoMsg(message: DVVTriplet): DVVTripletProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.DVVTriplet",
+      value: DVVTriplet.encode(message).finish()
+    };
   }
 
 };
@@ -2101,6 +2362,9 @@ function createBaseDVVTriplets(): DVVTriplets {
 }
 
 export const DVVTriplets = {
+  typeUrl: "/cosmos.staking.v1beta1.DVVTriplets",
+  aminoType: "cosmos-sdk/DVVTriplets",
+
   encode(message: DVVTriplets, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.triplets) {
       DVVTriplet.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -2189,6 +2453,32 @@ export const DVVTriplets = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: DVVTripletsAminoMsg): DVVTriplets {
+    return DVVTriplets.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: DVVTriplets): DVVTripletsAminoMsg {
+    return {
+      type: "cosmos-sdk/DVVTriplets",
+      value: DVVTriplets.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: DVVTripletsProtoMsg): DVVTriplets {
+    return DVVTriplets.decode(message.value);
+  },
+
+  toProto(message: DVVTriplets): Uint8Array {
+    return DVVTriplets.encode(message).finish();
+  },
+
+  toProtoMsg(message: DVVTriplets): DVVTripletsProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.DVVTriplets",
+      value: DVVTriplets.encode(message).finish()
+    };
   }
 
 };
@@ -2202,6 +2492,9 @@ function createBaseDelegation(): Delegation {
 }
 
 export const Delegation = {
+  typeUrl: "/cosmos.staking.v1beta1.Delegation",
+  aminoType: "cosmos-sdk/Delegation",
+
   encode(message: Delegation, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.delegatorAddress !== "") {
       writer.uint32(10).string(message.delegatorAddress);
@@ -2302,6 +2595,32 @@ export const Delegation = {
     obj.validator_address = message.validatorAddress;
     obj.shares = message.shares;
     return obj;
+  },
+
+  fromAminoMsg(object: DelegationAminoMsg): Delegation {
+    return Delegation.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Delegation): DelegationAminoMsg {
+    return {
+      type: "cosmos-sdk/Delegation",
+      value: Delegation.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: DelegationProtoMsg): Delegation {
+    return Delegation.decode(message.value);
+  },
+
+  toProto(message: Delegation): Uint8Array {
+    return Delegation.encode(message).finish();
+  },
+
+  toProtoMsg(message: Delegation): DelegationProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.Delegation",
+      value: Delegation.encode(message).finish()
+    };
   }
 
 };
@@ -2315,6 +2634,9 @@ function createBaseUnbondingDelegation(): UnbondingDelegation {
 }
 
 export const UnbondingDelegation = {
+  typeUrl: "/cosmos.staking.v1beta1.UnbondingDelegation",
+  aminoType: "cosmos-sdk/UnbondingDelegation",
+
   encode(message: UnbondingDelegation, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.delegatorAddress !== "") {
       writer.uint32(10).string(message.delegatorAddress);
@@ -2433,6 +2755,32 @@ export const UnbondingDelegation = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: UnbondingDelegationAminoMsg): UnbondingDelegation {
+    return UnbondingDelegation.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: UnbondingDelegation): UnbondingDelegationAminoMsg {
+    return {
+      type: "cosmos-sdk/UnbondingDelegation",
+      value: UnbondingDelegation.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: UnbondingDelegationProtoMsg): UnbondingDelegation {
+    return UnbondingDelegation.decode(message.value);
+  },
+
+  toProto(message: UnbondingDelegation): Uint8Array {
+    return UnbondingDelegation.encode(message).finish();
+  },
+
+  toProtoMsg(message: UnbondingDelegation): UnbondingDelegationProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.UnbondingDelegation",
+      value: UnbondingDelegation.encode(message).finish()
+    };
   }
 
 };
@@ -2447,6 +2795,9 @@ function createBaseUnbondingDelegationEntry(): UnbondingDelegationEntry {
 }
 
 export const UnbondingDelegationEntry = {
+  typeUrl: "/cosmos.staking.v1beta1.UnbondingDelegationEntry",
+  aminoType: "cosmos-sdk/UnbondingDelegationEntry",
+
   encode(message: UnbondingDelegationEntry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.creationHeight.isZero()) {
       writer.uint32(8).int64(message.creationHeight);
@@ -2562,6 +2913,32 @@ export const UnbondingDelegationEntry = {
     obj.initial_balance = message.initialBalance;
     obj.balance = message.balance;
     return obj;
+  },
+
+  fromAminoMsg(object: UnbondingDelegationEntryAminoMsg): UnbondingDelegationEntry {
+    return UnbondingDelegationEntry.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: UnbondingDelegationEntry): UnbondingDelegationEntryAminoMsg {
+    return {
+      type: "cosmos-sdk/UnbondingDelegationEntry",
+      value: UnbondingDelegationEntry.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: UnbondingDelegationEntryProtoMsg): UnbondingDelegationEntry {
+    return UnbondingDelegationEntry.decode(message.value);
+  },
+
+  toProto(message: UnbondingDelegationEntry): Uint8Array {
+    return UnbondingDelegationEntry.encode(message).finish();
+  },
+
+  toProtoMsg(message: UnbondingDelegationEntry): UnbondingDelegationEntryProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.UnbondingDelegationEntry",
+      value: UnbondingDelegationEntry.encode(message).finish()
+    };
   }
 
 };
@@ -2576,6 +2953,9 @@ function createBaseRedelegationEntry(): RedelegationEntry {
 }
 
 export const RedelegationEntry = {
+  typeUrl: "/cosmos.staking.v1beta1.RedelegationEntry",
+  aminoType: "cosmos-sdk/RedelegationEntry",
+
   encode(message: RedelegationEntry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.creationHeight.isZero()) {
       writer.uint32(8).int64(message.creationHeight);
@@ -2691,6 +3071,32 @@ export const RedelegationEntry = {
     obj.initial_balance = message.initialBalance;
     obj.shares_dst = message.sharesDst;
     return obj;
+  },
+
+  fromAminoMsg(object: RedelegationEntryAminoMsg): RedelegationEntry {
+    return RedelegationEntry.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: RedelegationEntry): RedelegationEntryAminoMsg {
+    return {
+      type: "cosmos-sdk/RedelegationEntry",
+      value: RedelegationEntry.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: RedelegationEntryProtoMsg): RedelegationEntry {
+    return RedelegationEntry.decode(message.value);
+  },
+
+  toProto(message: RedelegationEntry): Uint8Array {
+    return RedelegationEntry.encode(message).finish();
+  },
+
+  toProtoMsg(message: RedelegationEntry): RedelegationEntryProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.RedelegationEntry",
+      value: RedelegationEntry.encode(message).finish()
+    };
   }
 
 };
@@ -2705,6 +3111,9 @@ function createBaseRedelegation(): Redelegation {
 }
 
 export const Redelegation = {
+  typeUrl: "/cosmos.staking.v1beta1.Redelegation",
+  aminoType: "cosmos-sdk/Redelegation",
+
   encode(message: Redelegation, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.delegatorAddress !== "") {
       writer.uint32(10).string(message.delegatorAddress);
@@ -2838,6 +3247,32 @@ export const Redelegation = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: RedelegationAminoMsg): Redelegation {
+    return Redelegation.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Redelegation): RedelegationAminoMsg {
+    return {
+      type: "cosmos-sdk/Redelegation",
+      value: Redelegation.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: RedelegationProtoMsg): Redelegation {
+    return Redelegation.decode(message.value);
+  },
+
+  toProto(message: Redelegation): Uint8Array {
+    return Redelegation.encode(message).finish();
+  },
+
+  toProtoMsg(message: Redelegation): RedelegationProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.Redelegation",
+      value: Redelegation.encode(message).finish()
+    };
   }
 
 };
@@ -2854,6 +3289,9 @@ function createBaseParams(): Params {
 }
 
 export const Params = {
+  typeUrl: "/cosmos.staking.v1beta1.Params",
+  aminoType: "cosmos-sdk/Params",
+
   encode(message: Params, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.unbondingTime !== undefined) {
       Duration.encode(message.unbondingTime, writer.uint32(10).fork()).ldelim();
@@ -2999,6 +3437,32 @@ export const Params = {
     obj.bond_denom = message.bondDenom;
     obj.min_commission_rate = message.minCommissionRate;
     return obj;
+  },
+
+  fromAminoMsg(object: ParamsAminoMsg): Params {
+    return Params.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Params): ParamsAminoMsg {
+    return {
+      type: "cosmos-sdk/Params",
+      value: Params.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ParamsProtoMsg): Params {
+    return Params.decode(message.value);
+  },
+
+  toProto(message: Params): Uint8Array {
+    return Params.encode(message).finish();
+  },
+
+  toProtoMsg(message: Params): ParamsProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.Params",
+      value: Params.encode(message).finish()
+    };
   }
 
 };
@@ -3011,6 +3475,9 @@ function createBaseDelegationResponse(): DelegationResponse {
 }
 
 export const DelegationResponse = {
+  typeUrl: "/cosmos.staking.v1beta1.DelegationResponse",
+  aminoType: "cosmos-sdk/DelegationResponse",
+
   encode(message: DelegationResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.delegation !== undefined) {
       Delegation.encode(message.delegation, writer.uint32(10).fork()).ldelim();
@@ -3096,6 +3563,32 @@ export const DelegationResponse = {
     obj.delegation = message.delegation ? Delegation.toAmino(message.delegation) : undefined;
     obj.balance = message.balance ? Coin.toAmino(message.balance) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: DelegationResponseAminoMsg): DelegationResponse {
+    return DelegationResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: DelegationResponse): DelegationResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/DelegationResponse",
+      value: DelegationResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: DelegationResponseProtoMsg): DelegationResponse {
+    return DelegationResponse.decode(message.value);
+  },
+
+  toProto(message: DelegationResponse): Uint8Array {
+    return DelegationResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: DelegationResponse): DelegationResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.DelegationResponse",
+      value: DelegationResponse.encode(message).finish()
+    };
   }
 
 };
@@ -3108,6 +3601,9 @@ function createBaseRedelegationEntryResponse(): RedelegationEntryResponse {
 }
 
 export const RedelegationEntryResponse = {
+  typeUrl: "/cosmos.staking.v1beta1.RedelegationEntryResponse",
+  aminoType: "cosmos-sdk/RedelegationEntryResponse",
+
   encode(message: RedelegationEntryResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.redelegationEntry !== undefined) {
       RedelegationEntry.encode(message.redelegationEntry, writer.uint32(10).fork()).ldelim();
@@ -3193,6 +3689,32 @@ export const RedelegationEntryResponse = {
     obj.redelegation_entry = message.redelegationEntry ? RedelegationEntry.toAmino(message.redelegationEntry) : undefined;
     obj.balance = message.balance;
     return obj;
+  },
+
+  fromAminoMsg(object: RedelegationEntryResponseAminoMsg): RedelegationEntryResponse {
+    return RedelegationEntryResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: RedelegationEntryResponse): RedelegationEntryResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/RedelegationEntryResponse",
+      value: RedelegationEntryResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: RedelegationEntryResponseProtoMsg): RedelegationEntryResponse {
+    return RedelegationEntryResponse.decode(message.value);
+  },
+
+  toProto(message: RedelegationEntryResponse): Uint8Array {
+    return RedelegationEntryResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: RedelegationEntryResponse): RedelegationEntryResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.RedelegationEntryResponse",
+      value: RedelegationEntryResponse.encode(message).finish()
+    };
   }
 
 };
@@ -3205,6 +3727,9 @@ function createBaseRedelegationResponse(): RedelegationResponse {
 }
 
 export const RedelegationResponse = {
+  typeUrl: "/cosmos.staking.v1beta1.RedelegationResponse",
+  aminoType: "cosmos-sdk/RedelegationResponse",
+
   encode(message: RedelegationResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.redelegation !== undefined) {
       Redelegation.encode(message.redelegation, writer.uint32(10).fork()).ldelim();
@@ -3308,6 +3833,32 @@ export const RedelegationResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: RedelegationResponseAminoMsg): RedelegationResponse {
+    return RedelegationResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: RedelegationResponse): RedelegationResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/RedelegationResponse",
+      value: RedelegationResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: RedelegationResponseProtoMsg): RedelegationResponse {
+    return RedelegationResponse.decode(message.value);
+  },
+
+  toProto(message: RedelegationResponse): Uint8Array {
+    return RedelegationResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: RedelegationResponse): RedelegationResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.RedelegationResponse",
+      value: RedelegationResponse.encode(message).finish()
+    };
   }
 
 };
@@ -3320,6 +3871,9 @@ function createBasePool(): Pool {
 }
 
 export const Pool = {
+  typeUrl: "/cosmos.staking.v1beta1.Pool",
+  aminoType: "cosmos-sdk/Pool",
+
   encode(message: Pool, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.notBondedTokens !== "") {
       writer.uint32(10).string(message.notBondedTokens);
@@ -3405,6 +3959,32 @@ export const Pool = {
     obj.not_bonded_tokens = message.notBondedTokens;
     obj.bonded_tokens = message.bondedTokens;
     return obj;
+  },
+
+  fromAminoMsg(object: PoolAminoMsg): Pool {
+    return Pool.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Pool): PoolAminoMsg {
+    return {
+      type: "cosmos-sdk/Pool",
+      value: Pool.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: PoolProtoMsg): Pool {
+    return Pool.decode(message.value);
+  },
+
+  toProto(message: Pool): Uint8Array {
+    return Pool.encode(message).finish();
+  },
+
+  toProtoMsg(message: Pool): PoolProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.Pool",
+      value: Pool.encode(message).finish()
+    };
   }
 
 };
diff --git a/__fixtures__/outputv2/cosmos/staking/v1beta1/tx.ts b/__fixtures__/outputv2/cosmos/staking/v1beta1/tx.ts
index bcabfae69..3ccd89c15 100644
--- a/__fixtures__/outputv2/cosmos/staking/v1beta1/tx.ts
+++ b/__fixtures__/outputv2/cosmos/staking/v1beta1/tx.ts
@@ -18,7 +18,7 @@ export interface MsgCreateValidator {
   pubkey?: (Any) | undefined;
   value?: Coin;
 }
-export interface MsgCreateValidatorProtoType {
+export interface MsgCreateValidatorProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.MsgCreateValidator";
   value: Uint8Array;
 }
@@ -33,7 +33,7 @@ export interface MsgCreateValidatorAmino {
   pubkey?: AnyAmino;
   value?: CoinAmino;
 }
-export interface MsgCreateValidatorAminoType {
+export interface MsgCreateValidatorAminoMsg {
   type: "cosmos-sdk/MsgCreateValidator";
   value: MsgCreateValidatorAmino;
 }
@@ -51,14 +51,14 @@ export interface MsgCreateValidatorSDKType {
 
 /** MsgCreateValidatorResponse defines the Msg/CreateValidator response type. */
 export interface MsgCreateValidatorResponse {}
-export interface MsgCreateValidatorResponseProtoType {
+export interface MsgCreateValidatorResponseProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.MsgCreateValidatorResponse";
   value: Uint8Array;
 }
 
 /** MsgCreateValidatorResponse defines the Msg/CreateValidator response type. */
 export interface MsgCreateValidatorResponseAmino {}
-export interface MsgCreateValidatorResponseAminoType {
+export interface MsgCreateValidatorResponseAminoMsg {
   type: "cosmos-sdk/MsgCreateValidatorResponse";
   value: MsgCreateValidatorResponseAmino;
 }
@@ -80,7 +80,7 @@ export interface MsgEditValidator {
   commissionRate: string;
   minSelfDelegation: string;
 }
-export interface MsgEditValidatorProtoType {
+export interface MsgEditValidatorProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.MsgEditValidator";
   value: Uint8Array;
 }
@@ -99,7 +99,7 @@ export interface MsgEditValidatorAmino {
   commission_rate: string;
   min_self_delegation: string;
 }
-export interface MsgEditValidatorAminoType {
+export interface MsgEditValidatorAminoMsg {
   type: "cosmos-sdk/MsgEditValidator";
   value: MsgEditValidatorAmino;
 }
@@ -114,14 +114,14 @@ export interface MsgEditValidatorSDKType {
 
 /** MsgEditValidatorResponse defines the Msg/EditValidator response type. */
 export interface MsgEditValidatorResponse {}
-export interface MsgEditValidatorResponseProtoType {
+export interface MsgEditValidatorResponseProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.MsgEditValidatorResponse";
   value: Uint8Array;
 }
 
 /** MsgEditValidatorResponse defines the Msg/EditValidator response type. */
 export interface MsgEditValidatorResponseAmino {}
-export interface MsgEditValidatorResponseAminoType {
+export interface MsgEditValidatorResponseAminoMsg {
   type: "cosmos-sdk/MsgEditValidatorResponse";
   value: MsgEditValidatorResponseAmino;
 }
@@ -138,7 +138,7 @@ export interface MsgDelegate {
   validatorAddress: string;
   amount?: Coin;
 }
-export interface MsgDelegateProtoType {
+export interface MsgDelegateProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.MsgDelegate";
   value: Uint8Array;
 }
@@ -152,7 +152,7 @@ export interface MsgDelegateAmino {
   validator_address: string;
   amount?: CoinAmino;
 }
-export interface MsgDelegateAminoType {
+export interface MsgDelegateAminoMsg {
   type: "cosmos-sdk/MsgDelegate";
   value: MsgDelegateAmino;
 }
@@ -169,14 +169,14 @@ export interface MsgDelegateSDKType {
 
 /** MsgDelegateResponse defines the Msg/Delegate response type. */
 export interface MsgDelegateResponse {}
-export interface MsgDelegateResponseProtoType {
+export interface MsgDelegateResponseProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.MsgDelegateResponse";
   value: Uint8Array;
 }
 
 /** MsgDelegateResponse defines the Msg/Delegate response type. */
 export interface MsgDelegateResponseAmino {}
-export interface MsgDelegateResponseAminoType {
+export interface MsgDelegateResponseAminoMsg {
   type: "cosmos-sdk/MsgDelegateResponse";
   value: MsgDelegateResponseAmino;
 }
@@ -194,7 +194,7 @@ export interface MsgBeginRedelegate {
   validatorDstAddress: string;
   amount?: Coin;
 }
-export interface MsgBeginRedelegateProtoType {
+export interface MsgBeginRedelegateProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.MsgBeginRedelegate";
   value: Uint8Array;
 }
@@ -209,7 +209,7 @@ export interface MsgBeginRedelegateAmino {
   validator_dst_address: string;
   amount?: CoinAmino;
 }
-export interface MsgBeginRedelegateAminoType {
+export interface MsgBeginRedelegateAminoMsg {
   type: "cosmos-sdk/MsgBeginRedelegate";
   value: MsgBeginRedelegateAmino;
 }
@@ -229,7 +229,7 @@ export interface MsgBeginRedelegateSDKType {
 export interface MsgBeginRedelegateResponse {
   completionTime?: Date;
 }
-export interface MsgBeginRedelegateResponseProtoType {
+export interface MsgBeginRedelegateResponseProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.MsgBeginRedelegateResponse";
   value: Uint8Array;
 }
@@ -238,7 +238,7 @@ export interface MsgBeginRedelegateResponseProtoType {
 export interface MsgBeginRedelegateResponseAmino {
   completion_time?: Date;
 }
-export interface MsgBeginRedelegateResponseAminoType {
+export interface MsgBeginRedelegateResponseAminoMsg {
   type: "cosmos-sdk/MsgBeginRedelegateResponse";
   value: MsgBeginRedelegateResponseAmino;
 }
@@ -257,7 +257,7 @@ export interface MsgUndelegate {
   validatorAddress: string;
   amount?: Coin;
 }
-export interface MsgUndelegateProtoType {
+export interface MsgUndelegateProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.MsgUndelegate";
   value: Uint8Array;
 }
@@ -271,7 +271,7 @@ export interface MsgUndelegateAmino {
   validator_address: string;
   amount?: CoinAmino;
 }
-export interface MsgUndelegateAminoType {
+export interface MsgUndelegateAminoMsg {
   type: "cosmos-sdk/MsgUndelegate";
   value: MsgUndelegateAmino;
 }
@@ -290,7 +290,7 @@ export interface MsgUndelegateSDKType {
 export interface MsgUndelegateResponse {
   completionTime?: Date;
 }
-export interface MsgUndelegateResponseProtoType {
+export interface MsgUndelegateResponseProtoMsg {
   typeUrl: "/cosmos.staking.v1beta1.MsgUndelegateResponse";
   value: Uint8Array;
 }
@@ -299,7 +299,7 @@ export interface MsgUndelegateResponseProtoType {
 export interface MsgUndelegateResponseAmino {
   completion_time?: Date;
 }
-export interface MsgUndelegateResponseAminoType {
+export interface MsgUndelegateResponseAminoMsg {
   type: "cosmos-sdk/MsgUndelegateResponse";
   value: MsgUndelegateResponseAmino;
 }
@@ -322,6 +322,9 @@ function createBaseMsgCreateValidator(): MsgCreateValidator {
 }
 
 export const MsgCreateValidator = {
+  typeUrl: "/cosmos.staking.v1beta1.MsgCreateValidator",
+  aminoType: "cosmos-sdk/MsgCreateValidator",
+
   encode(message: MsgCreateValidator, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.description !== undefined) {
       Description.encode(message.description, writer.uint32(10).fork()).ldelim();
@@ -488,6 +491,32 @@ export const MsgCreateValidator = {
     } : undefined;
     obj.value = message.value ? Coin.toAmino(message.value) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCreateValidatorAminoMsg): MsgCreateValidator {
+    return MsgCreateValidator.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgCreateValidator): MsgCreateValidatorAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgCreateValidator",
+      value: MsgCreateValidator.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgCreateValidatorProtoMsg): MsgCreateValidator {
+    return MsgCreateValidator.decode(message.value);
+  },
+
+  toProto(message: MsgCreateValidator): Uint8Array {
+    return MsgCreateValidator.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCreateValidator): MsgCreateValidatorProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.MsgCreateValidator",
+      value: MsgCreateValidator.encode(message).finish()
+    };
   }
 
 };
@@ -497,6 +526,9 @@ function createBaseMsgCreateValidatorResponse(): MsgCreateValidatorResponse {
 }
 
 export const MsgCreateValidatorResponse = {
+  typeUrl: "/cosmos.staking.v1beta1.MsgCreateValidatorResponse",
+  aminoType: "cosmos-sdk/MsgCreateValidatorResponse",
+
   encode(_: MsgCreateValidatorResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -549,6 +581,32 @@ export const MsgCreateValidatorResponse = {
   toAmino(_: MsgCreateValidatorResponse): MsgCreateValidatorResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCreateValidatorResponseAminoMsg): MsgCreateValidatorResponse {
+    return MsgCreateValidatorResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgCreateValidatorResponse): MsgCreateValidatorResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgCreateValidatorResponse",
+      value: MsgCreateValidatorResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgCreateValidatorResponseProtoMsg): MsgCreateValidatorResponse {
+    return MsgCreateValidatorResponse.decode(message.value);
+  },
+
+  toProto(message: MsgCreateValidatorResponse): Uint8Array {
+    return MsgCreateValidatorResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCreateValidatorResponse): MsgCreateValidatorResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.MsgCreateValidatorResponse",
+      value: MsgCreateValidatorResponse.encode(message).finish()
+    };
   }
 
 };
@@ -563,6 +621,9 @@ function createBaseMsgEditValidator(): MsgEditValidator {
 }
 
 export const MsgEditValidator = {
+  typeUrl: "/cosmos.staking.v1beta1.MsgEditValidator",
+  aminoType: "cosmos-sdk/MsgEditValidator",
+
   encode(message: MsgEditValidator, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.description !== undefined) {
       Description.encode(message.description, writer.uint32(10).fork()).ldelim();
@@ -678,6 +739,32 @@ export const MsgEditValidator = {
     obj.commission_rate = message.commissionRate;
     obj.min_self_delegation = message.minSelfDelegation;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgEditValidatorAminoMsg): MsgEditValidator {
+    return MsgEditValidator.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgEditValidator): MsgEditValidatorAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgEditValidator",
+      value: MsgEditValidator.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgEditValidatorProtoMsg): MsgEditValidator {
+    return MsgEditValidator.decode(message.value);
+  },
+
+  toProto(message: MsgEditValidator): Uint8Array {
+    return MsgEditValidator.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgEditValidator): MsgEditValidatorProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.MsgEditValidator",
+      value: MsgEditValidator.encode(message).finish()
+    };
   }
 
 };
@@ -687,6 +774,9 @@ function createBaseMsgEditValidatorResponse(): MsgEditValidatorResponse {
 }
 
 export const MsgEditValidatorResponse = {
+  typeUrl: "/cosmos.staking.v1beta1.MsgEditValidatorResponse",
+  aminoType: "cosmos-sdk/MsgEditValidatorResponse",
+
   encode(_: MsgEditValidatorResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -739,6 +829,32 @@ export const MsgEditValidatorResponse = {
   toAmino(_: MsgEditValidatorResponse): MsgEditValidatorResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgEditValidatorResponseAminoMsg): MsgEditValidatorResponse {
+    return MsgEditValidatorResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgEditValidatorResponse): MsgEditValidatorResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgEditValidatorResponse",
+      value: MsgEditValidatorResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgEditValidatorResponseProtoMsg): MsgEditValidatorResponse {
+    return MsgEditValidatorResponse.decode(message.value);
+  },
+
+  toProto(message: MsgEditValidatorResponse): Uint8Array {
+    return MsgEditValidatorResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgEditValidatorResponse): MsgEditValidatorResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.MsgEditValidatorResponse",
+      value: MsgEditValidatorResponse.encode(message).finish()
+    };
   }
 
 };
@@ -752,6 +868,9 @@ function createBaseMsgDelegate(): MsgDelegate {
 }
 
 export const MsgDelegate = {
+  typeUrl: "/cosmos.staking.v1beta1.MsgDelegate",
+  aminoType: "cosmos-sdk/MsgDelegate",
+
   encode(message: MsgDelegate, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.delegatorAddress !== "") {
       writer.uint32(10).string(message.delegatorAddress);
@@ -852,6 +971,32 @@ export const MsgDelegate = {
     obj.validator_address = message.validatorAddress;
     obj.amount = message.amount ? Coin.toAmino(message.amount) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgDelegateAminoMsg): MsgDelegate {
+    return MsgDelegate.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgDelegate): MsgDelegateAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgDelegate",
+      value: MsgDelegate.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgDelegateProtoMsg): MsgDelegate {
+    return MsgDelegate.decode(message.value);
+  },
+
+  toProto(message: MsgDelegate): Uint8Array {
+    return MsgDelegate.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgDelegate): MsgDelegateProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.MsgDelegate",
+      value: MsgDelegate.encode(message).finish()
+    };
   }
 
 };
@@ -861,6 +1006,9 @@ function createBaseMsgDelegateResponse(): MsgDelegateResponse {
 }
 
 export const MsgDelegateResponse = {
+  typeUrl: "/cosmos.staking.v1beta1.MsgDelegateResponse",
+  aminoType: "cosmos-sdk/MsgDelegateResponse",
+
   encode(_: MsgDelegateResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -913,6 +1061,32 @@ export const MsgDelegateResponse = {
   toAmino(_: MsgDelegateResponse): MsgDelegateResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgDelegateResponseAminoMsg): MsgDelegateResponse {
+    return MsgDelegateResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgDelegateResponse): MsgDelegateResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgDelegateResponse",
+      value: MsgDelegateResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgDelegateResponseProtoMsg): MsgDelegateResponse {
+    return MsgDelegateResponse.decode(message.value);
+  },
+
+  toProto(message: MsgDelegateResponse): Uint8Array {
+    return MsgDelegateResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgDelegateResponse): MsgDelegateResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.MsgDelegateResponse",
+      value: MsgDelegateResponse.encode(message).finish()
+    };
   }
 
 };
@@ -927,6 +1101,9 @@ function createBaseMsgBeginRedelegate(): MsgBeginRedelegate {
 }
 
 export const MsgBeginRedelegate = {
+  typeUrl: "/cosmos.staking.v1beta1.MsgBeginRedelegate",
+  aminoType: "cosmos-sdk/MsgBeginRedelegate",
+
   encode(message: MsgBeginRedelegate, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.delegatorAddress !== "") {
       writer.uint32(10).string(message.delegatorAddress);
@@ -1042,6 +1219,32 @@ export const MsgBeginRedelegate = {
     obj.validator_dst_address = message.validatorDstAddress;
     obj.amount = message.amount ? Coin.toAmino(message.amount) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgBeginRedelegateAminoMsg): MsgBeginRedelegate {
+    return MsgBeginRedelegate.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgBeginRedelegate): MsgBeginRedelegateAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgBeginRedelegate",
+      value: MsgBeginRedelegate.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgBeginRedelegateProtoMsg): MsgBeginRedelegate {
+    return MsgBeginRedelegate.decode(message.value);
+  },
+
+  toProto(message: MsgBeginRedelegate): Uint8Array {
+    return MsgBeginRedelegate.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgBeginRedelegate): MsgBeginRedelegateProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.MsgBeginRedelegate",
+      value: MsgBeginRedelegate.encode(message).finish()
+    };
   }
 
 };
@@ -1053,6 +1256,9 @@ function createBaseMsgBeginRedelegateResponse(): MsgBeginRedelegateResponse {
 }
 
 export const MsgBeginRedelegateResponse = {
+  typeUrl: "/cosmos.staking.v1beta1.MsgBeginRedelegateResponse",
+  aminoType: "cosmos-sdk/MsgBeginRedelegateResponse",
+
   encode(message: MsgBeginRedelegateResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.completionTime !== undefined) {
       Timestamp.encode(toTimestamp(message.completionTime), writer.uint32(10).fork()).ldelim();
@@ -1123,6 +1329,32 @@ export const MsgBeginRedelegateResponse = {
     const obj: any = {};
     obj.completion_time = message.completionTime ? Timestamp.toAmino(message.completionTime) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgBeginRedelegateResponseAminoMsg): MsgBeginRedelegateResponse {
+    return MsgBeginRedelegateResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgBeginRedelegateResponse): MsgBeginRedelegateResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgBeginRedelegateResponse",
+      value: MsgBeginRedelegateResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgBeginRedelegateResponseProtoMsg): MsgBeginRedelegateResponse {
+    return MsgBeginRedelegateResponse.decode(message.value);
+  },
+
+  toProto(message: MsgBeginRedelegateResponse): Uint8Array {
+    return MsgBeginRedelegateResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgBeginRedelegateResponse): MsgBeginRedelegateResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.MsgBeginRedelegateResponse",
+      value: MsgBeginRedelegateResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1136,6 +1368,9 @@ function createBaseMsgUndelegate(): MsgUndelegate {
 }
 
 export const MsgUndelegate = {
+  typeUrl: "/cosmos.staking.v1beta1.MsgUndelegate",
+  aminoType: "cosmos-sdk/MsgUndelegate",
+
   encode(message: MsgUndelegate, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.delegatorAddress !== "") {
       writer.uint32(10).string(message.delegatorAddress);
@@ -1236,6 +1471,32 @@ export const MsgUndelegate = {
     obj.validator_address = message.validatorAddress;
     obj.amount = message.amount ? Coin.toAmino(message.amount) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgUndelegateAminoMsg): MsgUndelegate {
+    return MsgUndelegate.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgUndelegate): MsgUndelegateAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgUndelegate",
+      value: MsgUndelegate.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgUndelegateProtoMsg): MsgUndelegate {
+    return MsgUndelegate.decode(message.value);
+  },
+
+  toProto(message: MsgUndelegate): Uint8Array {
+    return MsgUndelegate.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgUndelegate): MsgUndelegateProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.MsgUndelegate",
+      value: MsgUndelegate.encode(message).finish()
+    };
   }
 
 };
@@ -1247,6 +1508,9 @@ function createBaseMsgUndelegateResponse(): MsgUndelegateResponse {
 }
 
 export const MsgUndelegateResponse = {
+  typeUrl: "/cosmos.staking.v1beta1.MsgUndelegateResponse",
+  aminoType: "cosmos-sdk/MsgUndelegateResponse",
+
   encode(message: MsgUndelegateResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.completionTime !== undefined) {
       Timestamp.encode(toTimestamp(message.completionTime), writer.uint32(10).fork()).ldelim();
@@ -1317,6 +1581,32 @@ export const MsgUndelegateResponse = {
     const obj: any = {};
     obj.completion_time = message.completionTime ? Timestamp.toAmino(message.completionTime) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgUndelegateResponseAminoMsg): MsgUndelegateResponse {
+    return MsgUndelegateResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgUndelegateResponse): MsgUndelegateResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgUndelegateResponse",
+      value: MsgUndelegateResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgUndelegateResponseProtoMsg): MsgUndelegateResponse {
+    return MsgUndelegateResponse.decode(message.value);
+  },
+
+  toProto(message: MsgUndelegateResponse): Uint8Array {
+    return MsgUndelegateResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgUndelegateResponse): MsgUndelegateResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.MsgUndelegateResponse",
+      value: MsgUndelegateResponse.encode(message).finish()
+    };
   }
 
 };
diff --git a/__fixtures__/outputv2/cosmos/tx/signing/v1beta1/signing.ts b/__fixtures__/outputv2/cosmos/tx/signing/v1beta1/signing.ts
index a8bf7ba38..8836aaf54 100644
--- a/__fixtures__/outputv2/cosmos/tx/signing/v1beta1/signing.ts
+++ b/__fixtures__/outputv2/cosmos/tx/signing/v1beta1/signing.ts
@@ -109,7 +109,7 @@ export interface SignatureDescriptors {
   /** signatures are the signature descriptors */
   signatures: SignatureDescriptor[];
 }
-export interface SignatureDescriptorsProtoType {
+export interface SignatureDescriptorsProtoMsg {
   typeUrl: "/cosmos.tx.signing.v1beta1.SignatureDescriptors";
   value: Uint8Array;
 }
@@ -119,7 +119,7 @@ export interface SignatureDescriptorsAmino {
   /** signatures are the signature descriptors */
   signatures: SignatureDescriptorAmino[];
 }
-export interface SignatureDescriptorsAminoType {
+export interface SignatureDescriptorsAminoMsg {
   type: "cosmos-sdk/SignatureDescriptors";
   value: SignatureDescriptorsAmino;
 }
@@ -147,7 +147,7 @@ export interface SignatureDescriptor {
    */
   sequence: Long;
 }
-export interface SignatureDescriptorProtoType {
+export interface SignatureDescriptorProtoMsg {
   typeUrl: "/cosmos.tx.signing.v1beta1.SignatureDescriptor";
   value: Uint8Array;
 }
@@ -170,7 +170,7 @@ export interface SignatureDescriptorAmino {
    */
   sequence: string;
 }
-export interface SignatureDescriptorAminoType {
+export interface SignatureDescriptorAminoMsg {
   type: "cosmos-sdk/SignatureDescriptor";
   value: SignatureDescriptorAmino;
 }
@@ -195,7 +195,7 @@ export interface SignatureDescriptor_Data {
   /** multi represents a multisig signer */
   multi?: SignatureDescriptor_Data_Multi;
 }
-export interface SignatureDescriptor_DataProtoType {
+export interface SignatureDescriptor_DataProtoMsg {
   typeUrl: "/cosmos.tx.signing.v1beta1.Data";
   value: Uint8Array;
 }
@@ -208,7 +208,7 @@ export interface SignatureDescriptor_DataAmino {
   /** multi represents a multisig signer */
   multi?: SignatureDescriptor_Data_MultiAmino;
 }
-export interface SignatureDescriptor_DataAminoType {
+export interface SignatureDescriptor_DataAminoMsg {
   type: "cosmos-sdk/Data";
   value: SignatureDescriptor_DataAmino;
 }
@@ -227,7 +227,7 @@ export interface SignatureDescriptor_Data_Single {
   /** signature is the raw signature bytes */
   signature: Uint8Array;
 }
-export interface SignatureDescriptor_Data_SingleProtoType {
+export interface SignatureDescriptor_Data_SingleProtoMsg {
   typeUrl: "/cosmos.tx.signing.v1beta1.Single";
   value: Uint8Array;
 }
@@ -240,7 +240,7 @@ export interface SignatureDescriptor_Data_SingleAmino {
   /** signature is the raw signature bytes */
   signature: Uint8Array;
 }
-export interface SignatureDescriptor_Data_SingleAminoType {
+export interface SignatureDescriptor_Data_SingleAminoMsg {
   type: "cosmos-sdk/Single";
   value: SignatureDescriptor_Data_SingleAmino;
 }
@@ -259,7 +259,7 @@ export interface SignatureDescriptor_Data_Multi {
   /** signatures is the signatures of the multi-signature */
   signatures: SignatureDescriptor_Data[];
 }
-export interface SignatureDescriptor_Data_MultiProtoType {
+export interface SignatureDescriptor_Data_MultiProtoMsg {
   typeUrl: "/cosmos.tx.signing.v1beta1.Multi";
   value: Uint8Array;
 }
@@ -272,7 +272,7 @@ export interface SignatureDescriptor_Data_MultiAmino {
   /** signatures is the signatures of the multi-signature */
   signatures: SignatureDescriptor_DataAmino[];
 }
-export interface SignatureDescriptor_Data_MultiAminoType {
+export interface SignatureDescriptor_Data_MultiAminoMsg {
   type: "cosmos-sdk/Multi";
   value: SignatureDescriptor_Data_MultiAmino;
 }
@@ -290,6 +290,9 @@ function createBaseSignatureDescriptors(): SignatureDescriptors {
 }
 
 export const SignatureDescriptors = {
+  typeUrl: "/cosmos.tx.signing.v1beta1.SignatureDescriptors",
+  aminoType: "cosmos-sdk/SignatureDescriptors",
+
   encode(message: SignatureDescriptors, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.signatures) {
       SignatureDescriptor.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -378,6 +381,32 @@ export const SignatureDescriptors = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: SignatureDescriptorsAminoMsg): SignatureDescriptors {
+    return SignatureDescriptors.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: SignatureDescriptors): SignatureDescriptorsAminoMsg {
+    return {
+      type: "cosmos-sdk/SignatureDescriptors",
+      value: SignatureDescriptors.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: SignatureDescriptorsProtoMsg): SignatureDescriptors {
+    return SignatureDescriptors.decode(message.value);
+  },
+
+  toProto(message: SignatureDescriptors): Uint8Array {
+    return SignatureDescriptors.encode(message).finish();
+  },
+
+  toProtoMsg(message: SignatureDescriptors): SignatureDescriptorsProtoMsg {
+    return {
+      typeUrl: "/cosmos.tx.signing.v1beta1.SignatureDescriptors",
+      value: SignatureDescriptors.encode(message).finish()
+    };
   }
 
 };
@@ -391,6 +420,9 @@ function createBaseSignatureDescriptor(): SignatureDescriptor {
 }
 
 export const SignatureDescriptor = {
+  typeUrl: "/cosmos.tx.signing.v1beta1.SignatureDescriptor",
+  aminoType: "cosmos-sdk/SignatureDescriptor",
+
   encode(message: SignatureDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.publicKey !== undefined) {
       Any.encode(message.publicKey, writer.uint32(10).fork()).ldelim();
@@ -491,6 +523,32 @@ export const SignatureDescriptor = {
     obj.data = message.data ? SignatureDescriptor_Data.toAmino(message.data) : undefined;
     obj.sequence = message.sequence ? message.sequence.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: SignatureDescriptorAminoMsg): SignatureDescriptor {
+    return SignatureDescriptor.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: SignatureDescriptor): SignatureDescriptorAminoMsg {
+    return {
+      type: "cosmos-sdk/SignatureDescriptor",
+      value: SignatureDescriptor.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: SignatureDescriptorProtoMsg): SignatureDescriptor {
+    return SignatureDescriptor.decode(message.value);
+  },
+
+  toProto(message: SignatureDescriptor): Uint8Array {
+    return SignatureDescriptor.encode(message).finish();
+  },
+
+  toProtoMsg(message: SignatureDescriptor): SignatureDescriptorProtoMsg {
+    return {
+      typeUrl: "/cosmos.tx.signing.v1beta1.SignatureDescriptor",
+      value: SignatureDescriptor.encode(message).finish()
+    };
   }
 
 };
@@ -503,6 +561,9 @@ function createBaseSignatureDescriptor_Data(): SignatureDescriptor_Data {
 }
 
 export const SignatureDescriptor_Data = {
+  typeUrl: "/cosmos.tx.signing.v1beta1.Data",
+  aminoType: "cosmos-sdk/Data",
+
   encode(message: SignatureDescriptor_Data, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.single !== undefined) {
       SignatureDescriptor_Data_Single.encode(message.single, writer.uint32(10).fork()).ldelim();
@@ -588,6 +649,32 @@ export const SignatureDescriptor_Data = {
     obj.single = message.single ? SignatureDescriptor_Data_Single.toAmino(message.single) : undefined;
     obj.multi = message.multi ? SignatureDescriptor_Data_Multi.toAmino(message.multi) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: SignatureDescriptor_DataAminoMsg): SignatureDescriptor_Data {
+    return SignatureDescriptor_Data.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: SignatureDescriptor_Data): SignatureDescriptor_DataAminoMsg {
+    return {
+      type: "cosmos-sdk/Data",
+      value: SignatureDescriptor_Data.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: SignatureDescriptor_DataProtoMsg): SignatureDescriptor_Data {
+    return SignatureDescriptor_Data.decode(message.value);
+  },
+
+  toProto(message: SignatureDescriptor_Data): Uint8Array {
+    return SignatureDescriptor_Data.encode(message).finish();
+  },
+
+  toProtoMsg(message: SignatureDescriptor_Data): SignatureDescriptor_DataProtoMsg {
+    return {
+      typeUrl: "/cosmos.tx.signing.v1beta1.Data",
+      value: SignatureDescriptor_Data.encode(message).finish()
+    };
   }
 
 };
@@ -600,6 +687,9 @@ function createBaseSignatureDescriptor_Data_Single(): SignatureDescriptor_Data_S
 }
 
 export const SignatureDescriptor_Data_Single = {
+  typeUrl: "/cosmos.tx.signing.v1beta1.Single",
+  aminoType: "cosmos-sdk/Single",
+
   encode(message: SignatureDescriptor_Data_Single, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.mode !== 0) {
       writer.uint32(8).int32(message.mode);
@@ -685,6 +775,32 @@ export const SignatureDescriptor_Data_Single = {
     obj.mode = message.mode;
     obj.signature = message.signature;
     return obj;
+  },
+
+  fromAminoMsg(object: SignatureDescriptor_Data_SingleAminoMsg): SignatureDescriptor_Data_Single {
+    return SignatureDescriptor_Data_Single.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: SignatureDescriptor_Data_Single): SignatureDescriptor_Data_SingleAminoMsg {
+    return {
+      type: "cosmos-sdk/Single",
+      value: SignatureDescriptor_Data_Single.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: SignatureDescriptor_Data_SingleProtoMsg): SignatureDescriptor_Data_Single {
+    return SignatureDescriptor_Data_Single.decode(message.value);
+  },
+
+  toProto(message: SignatureDescriptor_Data_Single): Uint8Array {
+    return SignatureDescriptor_Data_Single.encode(message).finish();
+  },
+
+  toProtoMsg(message: SignatureDescriptor_Data_Single): SignatureDescriptor_Data_SingleProtoMsg {
+    return {
+      typeUrl: "/cosmos.tx.signing.v1beta1.Single",
+      value: SignatureDescriptor_Data_Single.encode(message).finish()
+    };
   }
 
 };
@@ -697,6 +813,9 @@ function createBaseSignatureDescriptor_Data_Multi(): SignatureDescriptor_Data_Mu
 }
 
 export const SignatureDescriptor_Data_Multi = {
+  typeUrl: "/cosmos.tx.signing.v1beta1.Multi",
+  aminoType: "cosmos-sdk/Multi",
+
   encode(message: SignatureDescriptor_Data_Multi, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.bitarray !== undefined) {
       CompactBitArray.encode(message.bitarray, writer.uint32(10).fork()).ldelim();
@@ -800,6 +919,32 @@ export const SignatureDescriptor_Data_Multi = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: SignatureDescriptor_Data_MultiAminoMsg): SignatureDescriptor_Data_Multi {
+    return SignatureDescriptor_Data_Multi.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: SignatureDescriptor_Data_Multi): SignatureDescriptor_Data_MultiAminoMsg {
+    return {
+      type: "cosmos-sdk/Multi",
+      value: SignatureDescriptor_Data_Multi.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: SignatureDescriptor_Data_MultiProtoMsg): SignatureDescriptor_Data_Multi {
+    return SignatureDescriptor_Data_Multi.decode(message.value);
+  },
+
+  toProto(message: SignatureDescriptor_Data_Multi): Uint8Array {
+    return SignatureDescriptor_Data_Multi.encode(message).finish();
+  },
+
+  toProtoMsg(message: SignatureDescriptor_Data_Multi): SignatureDescriptor_Data_MultiProtoMsg {
+    return {
+      typeUrl: "/cosmos.tx.signing.v1beta1.Multi",
+      value: SignatureDescriptor_Data_Multi.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/tx/v1beta1/service.ts b/__fixtures__/outputv2/cosmos/tx/v1beta1/service.ts
index f456a87ad..1f5c9674d 100644
--- a/__fixtures__/outputv2/cosmos/tx/v1beta1/service.ts
+++ b/__fixtures__/outputv2/cosmos/tx/v1beta1/service.ts
@@ -140,7 +140,7 @@ export interface GetTxsEventRequest {
   pagination?: PageRequest;
   orderBy: OrderBy;
 }
-export interface GetTxsEventRequestProtoType {
+export interface GetTxsEventRequestProtoMsg {
   typeUrl: "/cosmos.tx.v1beta1.GetTxsEventRequest";
   value: Uint8Array;
 }
@@ -157,7 +157,7 @@ export interface GetTxsEventRequestAmino {
   pagination?: PageRequestAmino;
   order_by: OrderBy;
 }
-export interface GetTxsEventRequestAminoType {
+export interface GetTxsEventRequestAminoMsg {
   type: "cosmos-sdk/GetTxsEventRequest";
   value: GetTxsEventRequestAmino;
 }
@@ -186,7 +186,7 @@ export interface GetTxsEventResponse {
   /** pagination defines a pagination for the response. */
   pagination?: PageResponse;
 }
-export interface GetTxsEventResponseProtoType {
+export interface GetTxsEventResponseProtoMsg {
   typeUrl: "/cosmos.tx.v1beta1.GetTxsEventResponse";
   value: Uint8Array;
 }
@@ -205,7 +205,7 @@ export interface GetTxsEventResponseAmino {
   /** pagination defines a pagination for the response. */
   pagination?: PageResponseAmino;
 }
-export interface GetTxsEventResponseAminoType {
+export interface GetTxsEventResponseAminoMsg {
   type: "cosmos-sdk/GetTxsEventResponse";
   value: GetTxsEventResponseAmino;
 }
@@ -229,7 +229,7 @@ export interface BroadcastTxRequest {
   txBytes: Uint8Array;
   mode: BroadcastMode;
 }
-export interface BroadcastTxRequestProtoType {
+export interface BroadcastTxRequestProtoMsg {
   typeUrl: "/cosmos.tx.v1beta1.BroadcastTxRequest";
   value: Uint8Array;
 }
@@ -243,7 +243,7 @@ export interface BroadcastTxRequestAmino {
   tx_bytes: Uint8Array;
   mode: BroadcastMode;
 }
-export interface BroadcastTxRequestAminoType {
+export interface BroadcastTxRequestAminoMsg {
   type: "cosmos-sdk/BroadcastTxRequest";
   value: BroadcastTxRequestAmino;
 }
@@ -265,7 +265,7 @@ export interface BroadcastTxResponse {
   /** tx_response is the queried TxResponses. */
   txResponse?: TxResponse;
 }
-export interface BroadcastTxResponseProtoType {
+export interface BroadcastTxResponseProtoMsg {
   typeUrl: "/cosmos.tx.v1beta1.BroadcastTxResponse";
   value: Uint8Array;
 }
@@ -278,7 +278,7 @@ export interface BroadcastTxResponseAmino {
   /** tx_response is the queried TxResponses. */
   tx_response?: TxResponseAmino;
 }
-export interface BroadcastTxResponseAminoType {
+export interface BroadcastTxResponseAminoMsg {
   type: "cosmos-sdk/BroadcastTxResponse";
   value: BroadcastTxResponseAmino;
 }
@@ -311,7 +311,7 @@ export interface SimulateRequest {
    */
   txBytes: Uint8Array;
 }
-export interface SimulateRequestProtoType {
+export interface SimulateRequestProtoMsg {
   typeUrl: "/cosmos.tx.v1beta1.SimulateRequest";
   value: Uint8Array;
 }
@@ -336,7 +336,7 @@ export interface SimulateRequestAmino {
    */
   tx_bytes: Uint8Array;
 }
-export interface SimulateRequestAminoType {
+export interface SimulateRequestAminoMsg {
   type: "cosmos-sdk/SimulateRequest";
   value: SimulateRequestAmino;
 }
@@ -362,7 +362,7 @@ export interface SimulateResponse {
   /** result is the result of the simulation. */
   result?: Result;
 }
-export interface SimulateResponseProtoType {
+export interface SimulateResponseProtoMsg {
   typeUrl: "/cosmos.tx.v1beta1.SimulateResponse";
   value: Uint8Array;
 }
@@ -378,7 +378,7 @@ export interface SimulateResponseAmino {
   /** result is the result of the simulation. */
   result?: ResultAmino;
 }
-export interface SimulateResponseAminoType {
+export interface SimulateResponseAminoMsg {
   type: "cosmos-sdk/SimulateResponse";
   value: SimulateResponseAmino;
 }
@@ -400,7 +400,7 @@ export interface GetTxRequest {
   /** hash is the tx hash to query, encoded as a hex string. */
   hash: string;
 }
-export interface GetTxRequestProtoType {
+export interface GetTxRequestProtoMsg {
   typeUrl: "/cosmos.tx.v1beta1.GetTxRequest";
   value: Uint8Array;
 }
@@ -413,7 +413,7 @@ export interface GetTxRequestAmino {
   /** hash is the tx hash to query, encoded as a hex string. */
   hash: string;
 }
-export interface GetTxRequestAminoType {
+export interface GetTxRequestAminoMsg {
   type: "cosmos-sdk/GetTxRequest";
   value: GetTxRequestAmino;
 }
@@ -434,7 +434,7 @@ export interface GetTxResponse {
   /** tx_response is the queried TxResponses. */
   txResponse?: TxResponse;
 }
-export interface GetTxResponseProtoType {
+export interface GetTxResponseProtoMsg {
   typeUrl: "/cosmos.tx.v1beta1.GetTxResponse";
   value: Uint8Array;
 }
@@ -447,7 +447,7 @@ export interface GetTxResponseAmino {
   /** tx_response is the queried TxResponses. */
   tx_response?: TxResponseAmino;
 }
-export interface GetTxResponseAminoType {
+export interface GetTxResponseAminoMsg {
   type: "cosmos-sdk/GetTxResponse";
   value: GetTxResponseAmino;
 }
@@ -471,7 +471,7 @@ export interface GetBlockWithTxsRequest {
   /** pagination defines a pagination for the request. */
   pagination?: PageRequest;
 }
-export interface GetBlockWithTxsRequestProtoType {
+export interface GetBlockWithTxsRequestProtoMsg {
   typeUrl: "/cosmos.tx.v1beta1.GetBlockWithTxsRequest";
   value: Uint8Array;
 }
@@ -489,7 +489,7 @@ export interface GetBlockWithTxsRequestAmino {
   /** pagination defines a pagination for the request. */
   pagination?: PageRequestAmino;
 }
-export interface GetBlockWithTxsRequestAminoType {
+export interface GetBlockWithTxsRequestAminoMsg {
   type: "cosmos-sdk/GetBlockWithTxsRequest";
   value: GetBlockWithTxsRequestAmino;
 }
@@ -519,7 +519,7 @@ export interface GetBlockWithTxsResponse {
   /** pagination defines a pagination for the response. */
   pagination?: PageResponse;
 }
-export interface GetBlockWithTxsResponseProtoType {
+export interface GetBlockWithTxsResponseProtoMsg {
   typeUrl: "/cosmos.tx.v1beta1.GetBlockWithTxsResponse";
   value: Uint8Array;
 }
@@ -538,7 +538,7 @@ export interface GetBlockWithTxsResponseAmino {
   /** pagination defines a pagination for the response. */
   pagination?: PageResponseAmino;
 }
-export interface GetBlockWithTxsResponseAminoType {
+export interface GetBlockWithTxsResponseAminoMsg {
   type: "cosmos-sdk/GetBlockWithTxsResponse";
   value: GetBlockWithTxsResponseAmino;
 }
@@ -564,6 +564,9 @@ function createBaseGetTxsEventRequest(): GetTxsEventRequest {
 }
 
 export const GetTxsEventRequest = {
+  typeUrl: "/cosmos.tx.v1beta1.GetTxsEventRequest",
+  aminoType: "cosmos-sdk/GetTxsEventRequest",
+
   encode(message: GetTxsEventRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.events) {
       writer.uint32(10).string(v!);
@@ -682,6 +685,32 @@ export const GetTxsEventRequest = {
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     obj.order_by = message.orderBy;
     return obj;
+  },
+
+  fromAminoMsg(object: GetTxsEventRequestAminoMsg): GetTxsEventRequest {
+    return GetTxsEventRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GetTxsEventRequest): GetTxsEventRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/GetTxsEventRequest",
+      value: GetTxsEventRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GetTxsEventRequestProtoMsg): GetTxsEventRequest {
+    return GetTxsEventRequest.decode(message.value);
+  },
+
+  toProto(message: GetTxsEventRequest): Uint8Array {
+    return GetTxsEventRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: GetTxsEventRequest): GetTxsEventRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.tx.v1beta1.GetTxsEventRequest",
+      value: GetTxsEventRequest.encode(message).finish()
+    };
   }
 
 };
@@ -695,6 +724,9 @@ function createBaseGetTxsEventResponse(): GetTxsEventResponse {
 }
 
 export const GetTxsEventResponse = {
+  typeUrl: "/cosmos.tx.v1beta1.GetTxsEventResponse",
+  aminoType: "cosmos-sdk/GetTxsEventResponse",
+
   encode(message: GetTxsEventResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.txs) {
       Tx.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -828,6 +860,32 @@ export const GetTxsEventResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GetTxsEventResponseAminoMsg): GetTxsEventResponse {
+    return GetTxsEventResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GetTxsEventResponse): GetTxsEventResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/GetTxsEventResponse",
+      value: GetTxsEventResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GetTxsEventResponseProtoMsg): GetTxsEventResponse {
+    return GetTxsEventResponse.decode(message.value);
+  },
+
+  toProto(message: GetTxsEventResponse): Uint8Array {
+    return GetTxsEventResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: GetTxsEventResponse): GetTxsEventResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.tx.v1beta1.GetTxsEventResponse",
+      value: GetTxsEventResponse.encode(message).finish()
+    };
   }
 
 };
@@ -840,6 +898,9 @@ function createBaseBroadcastTxRequest(): BroadcastTxRequest {
 }
 
 export const BroadcastTxRequest = {
+  typeUrl: "/cosmos.tx.v1beta1.BroadcastTxRequest",
+  aminoType: "cosmos-sdk/BroadcastTxRequest",
+
   encode(message: BroadcastTxRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.txBytes.length !== 0) {
       writer.uint32(10).bytes(message.txBytes);
@@ -925,6 +986,32 @@ export const BroadcastTxRequest = {
     obj.tx_bytes = message.txBytes;
     obj.mode = message.mode;
     return obj;
+  },
+
+  fromAminoMsg(object: BroadcastTxRequestAminoMsg): BroadcastTxRequest {
+    return BroadcastTxRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: BroadcastTxRequest): BroadcastTxRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/BroadcastTxRequest",
+      value: BroadcastTxRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: BroadcastTxRequestProtoMsg): BroadcastTxRequest {
+    return BroadcastTxRequest.decode(message.value);
+  },
+
+  toProto(message: BroadcastTxRequest): Uint8Array {
+    return BroadcastTxRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: BroadcastTxRequest): BroadcastTxRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.tx.v1beta1.BroadcastTxRequest",
+      value: BroadcastTxRequest.encode(message).finish()
+    };
   }
 
 };
@@ -936,6 +1023,9 @@ function createBaseBroadcastTxResponse(): BroadcastTxResponse {
 }
 
 export const BroadcastTxResponse = {
+  typeUrl: "/cosmos.tx.v1beta1.BroadcastTxResponse",
+  aminoType: "cosmos-sdk/BroadcastTxResponse",
+
   encode(message: BroadcastTxResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.txResponse !== undefined) {
       TxResponse.encode(message.txResponse, writer.uint32(10).fork()).ldelim();
@@ -1006,6 +1096,32 @@ export const BroadcastTxResponse = {
     const obj: any = {};
     obj.tx_response = message.txResponse ? TxResponse.toAmino(message.txResponse) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: BroadcastTxResponseAminoMsg): BroadcastTxResponse {
+    return BroadcastTxResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: BroadcastTxResponse): BroadcastTxResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/BroadcastTxResponse",
+      value: BroadcastTxResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: BroadcastTxResponseProtoMsg): BroadcastTxResponse {
+    return BroadcastTxResponse.decode(message.value);
+  },
+
+  toProto(message: BroadcastTxResponse): Uint8Array {
+    return BroadcastTxResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: BroadcastTxResponse): BroadcastTxResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.tx.v1beta1.BroadcastTxResponse",
+      value: BroadcastTxResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1018,6 +1134,9 @@ function createBaseSimulateRequest(): SimulateRequest {
 }
 
 export const SimulateRequest = {
+  typeUrl: "/cosmos.tx.v1beta1.SimulateRequest",
+  aminoType: "cosmos-sdk/SimulateRequest",
+
   encode(message: SimulateRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.tx !== undefined) {
       Tx.encode(message.tx, writer.uint32(10).fork()).ldelim();
@@ -1103,6 +1222,32 @@ export const SimulateRequest = {
     obj.tx = message.tx ? Tx.toAmino(message.tx) : undefined;
     obj.tx_bytes = message.txBytes;
     return obj;
+  },
+
+  fromAminoMsg(object: SimulateRequestAminoMsg): SimulateRequest {
+    return SimulateRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: SimulateRequest): SimulateRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/SimulateRequest",
+      value: SimulateRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: SimulateRequestProtoMsg): SimulateRequest {
+    return SimulateRequest.decode(message.value);
+  },
+
+  toProto(message: SimulateRequest): Uint8Array {
+    return SimulateRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: SimulateRequest): SimulateRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.tx.v1beta1.SimulateRequest",
+      value: SimulateRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1115,6 +1260,9 @@ function createBaseSimulateResponse(): SimulateResponse {
 }
 
 export const SimulateResponse = {
+  typeUrl: "/cosmos.tx.v1beta1.SimulateResponse",
+  aminoType: "cosmos-sdk/SimulateResponse",
+
   encode(message: SimulateResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.gasInfo !== undefined) {
       GasInfo.encode(message.gasInfo, writer.uint32(10).fork()).ldelim();
@@ -1200,6 +1348,32 @@ export const SimulateResponse = {
     obj.gas_info = message.gasInfo ? GasInfo.toAmino(message.gasInfo) : undefined;
     obj.result = message.result ? Result.toAmino(message.result) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: SimulateResponseAminoMsg): SimulateResponse {
+    return SimulateResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: SimulateResponse): SimulateResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/SimulateResponse",
+      value: SimulateResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: SimulateResponseProtoMsg): SimulateResponse {
+    return SimulateResponse.decode(message.value);
+  },
+
+  toProto(message: SimulateResponse): Uint8Array {
+    return SimulateResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: SimulateResponse): SimulateResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.tx.v1beta1.SimulateResponse",
+      value: SimulateResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1211,6 +1385,9 @@ function createBaseGetTxRequest(): GetTxRequest {
 }
 
 export const GetTxRequest = {
+  typeUrl: "/cosmos.tx.v1beta1.GetTxRequest",
+  aminoType: "cosmos-sdk/GetTxRequest",
+
   encode(message: GetTxRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.hash !== "") {
       writer.uint32(10).string(message.hash);
@@ -1281,6 +1458,32 @@ export const GetTxRequest = {
     const obj: any = {};
     obj.hash = message.hash;
     return obj;
+  },
+
+  fromAminoMsg(object: GetTxRequestAminoMsg): GetTxRequest {
+    return GetTxRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GetTxRequest): GetTxRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/GetTxRequest",
+      value: GetTxRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GetTxRequestProtoMsg): GetTxRequest {
+    return GetTxRequest.decode(message.value);
+  },
+
+  toProto(message: GetTxRequest): Uint8Array {
+    return GetTxRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: GetTxRequest): GetTxRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.tx.v1beta1.GetTxRequest",
+      value: GetTxRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1293,6 +1496,9 @@ function createBaseGetTxResponse(): GetTxResponse {
 }
 
 export const GetTxResponse = {
+  typeUrl: "/cosmos.tx.v1beta1.GetTxResponse",
+  aminoType: "cosmos-sdk/GetTxResponse",
+
   encode(message: GetTxResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.tx !== undefined) {
       Tx.encode(message.tx, writer.uint32(10).fork()).ldelim();
@@ -1378,6 +1584,32 @@ export const GetTxResponse = {
     obj.tx = message.tx ? Tx.toAmino(message.tx) : undefined;
     obj.tx_response = message.txResponse ? TxResponse.toAmino(message.txResponse) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GetTxResponseAminoMsg): GetTxResponse {
+    return GetTxResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GetTxResponse): GetTxResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/GetTxResponse",
+      value: GetTxResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GetTxResponseProtoMsg): GetTxResponse {
+    return GetTxResponse.decode(message.value);
+  },
+
+  toProto(message: GetTxResponse): Uint8Array {
+    return GetTxResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: GetTxResponse): GetTxResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.tx.v1beta1.GetTxResponse",
+      value: GetTxResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1390,6 +1622,9 @@ function createBaseGetBlockWithTxsRequest(): GetBlockWithTxsRequest {
 }
 
 export const GetBlockWithTxsRequest = {
+  typeUrl: "/cosmos.tx.v1beta1.GetBlockWithTxsRequest",
+  aminoType: "cosmos-sdk/GetBlockWithTxsRequest",
+
   encode(message: GetBlockWithTxsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.height.isZero()) {
       writer.uint32(8).int64(message.height);
@@ -1475,6 +1710,32 @@ export const GetBlockWithTxsRequest = {
     obj.height = message.height ? message.height.toString() : undefined;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GetBlockWithTxsRequestAminoMsg): GetBlockWithTxsRequest {
+    return GetBlockWithTxsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GetBlockWithTxsRequest): GetBlockWithTxsRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/GetBlockWithTxsRequest",
+      value: GetBlockWithTxsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GetBlockWithTxsRequestProtoMsg): GetBlockWithTxsRequest {
+    return GetBlockWithTxsRequest.decode(message.value);
+  },
+
+  toProto(message: GetBlockWithTxsRequest): Uint8Array {
+    return GetBlockWithTxsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: GetBlockWithTxsRequest): GetBlockWithTxsRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.tx.v1beta1.GetBlockWithTxsRequest",
+      value: GetBlockWithTxsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1489,6 +1750,9 @@ function createBaseGetBlockWithTxsResponse(): GetBlockWithTxsResponse {
 }
 
 export const GetBlockWithTxsResponse = {
+  typeUrl: "/cosmos.tx.v1beta1.GetBlockWithTxsResponse",
+  aminoType: "cosmos-sdk/GetBlockWithTxsResponse",
+
   encode(message: GetBlockWithTxsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.txs) {
       Tx.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1622,6 +1886,32 @@ export const GetBlockWithTxsResponse = {
     obj.block = message.block ? Block.toAmino(message.block) : undefined;
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GetBlockWithTxsResponseAminoMsg): GetBlockWithTxsResponse {
+    return GetBlockWithTxsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GetBlockWithTxsResponse): GetBlockWithTxsResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/GetBlockWithTxsResponse",
+      value: GetBlockWithTxsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GetBlockWithTxsResponseProtoMsg): GetBlockWithTxsResponse {
+    return GetBlockWithTxsResponse.decode(message.value);
+  },
+
+  toProto(message: GetBlockWithTxsResponse): Uint8Array {
+    return GetBlockWithTxsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: GetBlockWithTxsResponse): GetBlockWithTxsResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.tx.v1beta1.GetBlockWithTxsResponse",
+      value: GetBlockWithTxsResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/tx/v1beta1/tx.ts b/__fixtures__/outputv2/cosmos/tx/v1beta1/tx.ts
index ccb089d9f..16f1984c0 100644
--- a/__fixtures__/outputv2/cosmos/tx/v1beta1/tx.ts
+++ b/__fixtures__/outputv2/cosmos/tx/v1beta1/tx.ts
@@ -24,7 +24,7 @@ export interface Tx {
    */
   signatures: Uint8Array[];
 }
-export interface TxProtoType {
+export interface TxProtoMsg {
   typeUrl: "/cosmos.tx.v1beta1.Tx";
   value: Uint8Array;
 }
@@ -47,7 +47,7 @@ export interface TxAmino {
    */
   signatures: Uint8Array[];
 }
-export interface TxAminoType {
+export interface TxAminoMsg {
   type: "cosmos-sdk/Tx";
   value: TxAmino;
 }
@@ -86,7 +86,7 @@ export interface TxRaw {
    */
   signatures: Uint8Array[];
 }
-export interface TxRawProtoType {
+export interface TxRawProtoMsg {
   typeUrl: "/cosmos.tx.v1beta1.TxRaw";
   value: Uint8Array;
 }
@@ -118,7 +118,7 @@ export interface TxRawAmino {
    */
   signatures: Uint8Array[];
 }
-export interface TxRawAminoType {
+export interface TxRawAminoMsg {
   type: "cosmos-sdk/TxRaw";
   value: TxRawAmino;
 }
@@ -160,7 +160,7 @@ export interface SignDoc {
   /** account_number is the account number of the account in state */
   accountNumber: Long;
 }
-export interface SignDocProtoType {
+export interface SignDocProtoMsg {
   typeUrl: "/cosmos.tx.v1beta1.SignDoc";
   value: Uint8Array;
 }
@@ -189,7 +189,7 @@ export interface SignDocAmino {
   /** account_number is the account number of the account in state */
   account_number: string;
 }
-export interface SignDocAminoType {
+export interface SignDocAminoMsg {
   type: "cosmos-sdk/SignDoc";
   value: SignDocAmino;
 }
@@ -237,7 +237,7 @@ export interface SignDocDirectAux {
    */
   tip?: Tip;
 }
-export interface SignDocDirectAuxProtoType {
+export interface SignDocDirectAuxProtoMsg {
   typeUrl: "/cosmos.tx.v1beta1.SignDocDirectAux";
   value: Uint8Array;
 }
@@ -277,7 +277,7 @@ export interface SignDocDirectAuxAmino {
    */
   tip?: TipAmino;
 }
-export interface SignDocDirectAuxAminoType {
+export interface SignDocDirectAuxAminoMsg {
   type: "cosmos-sdk/SignDocDirectAux";
   value: SignDocDirectAuxAmino;
 }
@@ -337,7 +337,7 @@ export interface TxBody {
    */
   nonCriticalExtensionOptions: Any[];
 }
-export interface TxBodyProtoType {
+export interface TxBodyProtoMsg {
   typeUrl: "/cosmos.tx.v1beta1.TxBody";
   value: Uint8Array;
 }
@@ -382,7 +382,7 @@ export interface TxBodyAmino {
    */
   non_critical_extension_options: AnyAmino[];
 }
-export interface TxBodyAminoType {
+export interface TxBodyAminoMsg {
   type: "cosmos-sdk/TxBody";
   value: TxBodyAmino;
 }
@@ -424,7 +424,7 @@ export interface AuthInfo {
    */
   tip?: Tip;
 }
-export interface AuthInfoProtoType {
+export interface AuthInfoProtoMsg {
   typeUrl: "/cosmos.tx.v1beta1.AuthInfo";
   value: Uint8Array;
 }
@@ -457,7 +457,7 @@ export interface AuthInfoAmino {
    */
   tip?: TipAmino;
 }
-export interface AuthInfoAminoType {
+export interface AuthInfoAminoMsg {
   type: "cosmos-sdk/AuthInfo";
   value: AuthInfoAmino;
 }
@@ -497,7 +497,7 @@ export interface SignerInfo {
    */
   sequence: Long;
 }
-export interface SignerInfoProtoType {
+export interface SignerInfoProtoMsg {
   typeUrl: "/cosmos.tx.v1beta1.SignerInfo";
   value: Uint8Array;
 }
@@ -527,7 +527,7 @@ export interface SignerInfoAmino {
    */
   sequence: string;
 }
-export interface SignerInfoAminoType {
+export interface SignerInfoAminoMsg {
   type: "cosmos-sdk/SignerInfo";
   value: SignerInfoAmino;
 }
@@ -550,7 +550,7 @@ export interface ModeInfo {
   /** multi represents a nested multisig signer */
   multi?: ModeInfo_Multi;
 }
-export interface ModeInfoProtoType {
+export interface ModeInfoProtoMsg {
   typeUrl: "/cosmos.tx.v1beta1.ModeInfo";
   value: Uint8Array;
 }
@@ -563,7 +563,7 @@ export interface ModeInfoAmino {
   /** multi represents a nested multisig signer */
   multi?: ModeInfo_MultiAmino;
 }
-export interface ModeInfoAminoType {
+export interface ModeInfoAminoMsg {
   type: "cosmos-sdk/ModeInfo";
   value: ModeInfoAmino;
 }
@@ -583,7 +583,7 @@ export interface ModeInfo_Single {
   /** mode is the signing mode of the single signer */
   mode: SignMode;
 }
-export interface ModeInfo_SingleProtoType {
+export interface ModeInfo_SingleProtoMsg {
   typeUrl: "/cosmos.tx.v1beta1.Single";
   value: Uint8Array;
 }
@@ -597,7 +597,7 @@ export interface ModeInfo_SingleAmino {
   /** mode is the signing mode of the single signer */
   mode: SignMode;
 }
-export interface ModeInfo_SingleAminoType {
+export interface ModeInfo_SingleAminoMsg {
   type: "cosmos-sdk/Single";
   value: ModeInfo_SingleAmino;
 }
@@ -622,7 +622,7 @@ export interface ModeInfo_Multi {
    */
   modeInfos: ModeInfo[];
 }
-export interface ModeInfo_MultiProtoType {
+export interface ModeInfo_MultiProtoMsg {
   typeUrl: "/cosmos.tx.v1beta1.Multi";
   value: Uint8Array;
 }
@@ -638,7 +638,7 @@ export interface ModeInfo_MultiAmino {
    */
   mode_infos: ModeInfoAmino[];
 }
-export interface ModeInfo_MultiAminoType {
+export interface ModeInfo_MultiAminoMsg {
   type: "cosmos-sdk/Multi";
   value: ModeInfo_MultiAmino;
 }
@@ -678,7 +678,7 @@ export interface Fee {
    */
   granter: string;
 }
-export interface FeeProtoType {
+export interface FeeProtoMsg {
   typeUrl: "/cosmos.tx.v1beta1.Fee";
   value: Uint8Array;
 }
@@ -712,7 +712,7 @@ export interface FeeAmino {
    */
   granter: string;
 }
-export interface FeeAminoType {
+export interface FeeAminoMsg {
   type: "cosmos-sdk/Fee";
   value: FeeAmino;
 }
@@ -741,7 +741,7 @@ export interface Tip {
   /** tipper is the address of the account paying for the tip */
   tipper: string;
 }
-export interface TipProtoType {
+export interface TipProtoMsg {
   typeUrl: "/cosmos.tx.v1beta1.Tip";
   value: Uint8Array;
 }
@@ -758,7 +758,7 @@ export interface TipAmino {
   /** tipper is the address of the account paying for the tip */
   tipper: string;
 }
-export interface TipAminoType {
+export interface TipAminoMsg {
   type: "cosmos-sdk/Tip";
   value: TipAmino;
 }
@@ -802,7 +802,7 @@ export interface AuxSignerData {
   /** sig is the signature of the sign doc. */
   sig: Uint8Array;
 }
-export interface AuxSignerDataProtoType {
+export interface AuxSignerDataProtoMsg {
   typeUrl: "/cosmos.tx.v1beta1.AuxSignerData";
   value: Uint8Array;
 }
@@ -836,7 +836,7 @@ export interface AuxSignerDataAmino {
   /** sig is the signature of the sign doc. */
   sig: Uint8Array;
 }
-export interface AuxSignerDataAminoType {
+export interface AuxSignerDataAminoMsg {
   type: "cosmos-sdk/AuxSignerData";
   value: AuxSignerDataAmino;
 }
@@ -865,6 +865,9 @@ function createBaseTx(): Tx {
 }
 
 export const Tx = {
+  typeUrl: "/cosmos.tx.v1beta1.Tx",
+  aminoType: "cosmos-sdk/Tx",
+
   encode(message: Tx, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.body !== undefined) {
       TxBody.encode(message.body, writer.uint32(10).fork()).ldelim();
@@ -983,6 +986,32 @@ export const Tx = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: TxAminoMsg): Tx {
+    return Tx.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Tx): TxAminoMsg {
+    return {
+      type: "cosmos-sdk/Tx",
+      value: Tx.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: TxProtoMsg): Tx {
+    return Tx.decode(message.value);
+  },
+
+  toProto(message: Tx): Uint8Array {
+    return Tx.encode(message).finish();
+  },
+
+  toProtoMsg(message: Tx): TxProtoMsg {
+    return {
+      typeUrl: "/cosmos.tx.v1beta1.Tx",
+      value: Tx.encode(message).finish()
+    };
   }
 
 };
@@ -996,6 +1025,9 @@ function createBaseTxRaw(): TxRaw {
 }
 
 export const TxRaw = {
+  typeUrl: "/cosmos.tx.v1beta1.TxRaw",
+  aminoType: "cosmos-sdk/TxRaw",
+
   encode(message: TxRaw, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.bodyBytes.length !== 0) {
       writer.uint32(10).bytes(message.bodyBytes);
@@ -1114,6 +1146,32 @@ export const TxRaw = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: TxRawAminoMsg): TxRaw {
+    return TxRaw.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: TxRaw): TxRawAminoMsg {
+    return {
+      type: "cosmos-sdk/TxRaw",
+      value: TxRaw.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: TxRawProtoMsg): TxRaw {
+    return TxRaw.decode(message.value);
+  },
+
+  toProto(message: TxRaw): Uint8Array {
+    return TxRaw.encode(message).finish();
+  },
+
+  toProtoMsg(message: TxRaw): TxRawProtoMsg {
+    return {
+      typeUrl: "/cosmos.tx.v1beta1.TxRaw",
+      value: TxRaw.encode(message).finish()
+    };
   }
 
 };
@@ -1128,6 +1186,9 @@ function createBaseSignDoc(): SignDoc {
 }
 
 export const SignDoc = {
+  typeUrl: "/cosmos.tx.v1beta1.SignDoc",
+  aminoType: "cosmos-sdk/SignDoc",
+
   encode(message: SignDoc, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.bodyBytes.length !== 0) {
       writer.uint32(10).bytes(message.bodyBytes);
@@ -1243,6 +1304,32 @@ export const SignDoc = {
     obj.chain_id = message.chainId;
     obj.account_number = message.accountNumber ? message.accountNumber.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: SignDocAminoMsg): SignDoc {
+    return SignDoc.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: SignDoc): SignDocAminoMsg {
+    return {
+      type: "cosmos-sdk/SignDoc",
+      value: SignDoc.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: SignDocProtoMsg): SignDoc {
+    return SignDoc.decode(message.value);
+  },
+
+  toProto(message: SignDoc): Uint8Array {
+    return SignDoc.encode(message).finish();
+  },
+
+  toProtoMsg(message: SignDoc): SignDocProtoMsg {
+    return {
+      typeUrl: "/cosmos.tx.v1beta1.SignDoc",
+      value: SignDoc.encode(message).finish()
+    };
   }
 
 };
@@ -1259,6 +1346,9 @@ function createBaseSignDocDirectAux(): SignDocDirectAux {
 }
 
 export const SignDocDirectAux = {
+  typeUrl: "/cosmos.tx.v1beta1.SignDocDirectAux",
+  aminoType: "cosmos-sdk/SignDocDirectAux",
+
   encode(message: SignDocDirectAux, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.bodyBytes.length !== 0) {
       writer.uint32(10).bytes(message.bodyBytes);
@@ -1404,6 +1494,32 @@ export const SignDocDirectAux = {
     obj.sequence = message.sequence ? message.sequence.toString() : undefined;
     obj.tip = message.tip ? Tip.toAmino(message.tip) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: SignDocDirectAuxAminoMsg): SignDocDirectAux {
+    return SignDocDirectAux.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: SignDocDirectAux): SignDocDirectAuxAminoMsg {
+    return {
+      type: "cosmos-sdk/SignDocDirectAux",
+      value: SignDocDirectAux.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: SignDocDirectAuxProtoMsg): SignDocDirectAux {
+    return SignDocDirectAux.decode(message.value);
+  },
+
+  toProto(message: SignDocDirectAux): Uint8Array {
+    return SignDocDirectAux.encode(message).finish();
+  },
+
+  toProtoMsg(message: SignDocDirectAux): SignDocDirectAuxProtoMsg {
+    return {
+      typeUrl: "/cosmos.tx.v1beta1.SignDocDirectAux",
+      value: SignDocDirectAux.encode(message).finish()
+    };
   }
 
 };
@@ -1419,6 +1535,9 @@ function createBaseTxBody(): TxBody {
 }
 
 export const TxBody = {
+  typeUrl: "/cosmos.tx.v1beta1.TxBody",
+  aminoType: "cosmos-sdk/TxBody",
+
   encode(message: TxBody, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.messages) {
       Any.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1600,6 +1719,32 @@ export const TxBody = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: TxBodyAminoMsg): TxBody {
+    return TxBody.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: TxBody): TxBodyAminoMsg {
+    return {
+      type: "cosmos-sdk/TxBody",
+      value: TxBody.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: TxBodyProtoMsg): TxBody {
+    return TxBody.decode(message.value);
+  },
+
+  toProto(message: TxBody): Uint8Array {
+    return TxBody.encode(message).finish();
+  },
+
+  toProtoMsg(message: TxBody): TxBodyProtoMsg {
+    return {
+      typeUrl: "/cosmos.tx.v1beta1.TxBody",
+      value: TxBody.encode(message).finish()
+    };
   }
 
 };
@@ -1613,6 +1758,9 @@ function createBaseAuthInfo(): AuthInfo {
 }
 
 export const AuthInfo = {
+  typeUrl: "/cosmos.tx.v1beta1.AuthInfo",
+  aminoType: "cosmos-sdk/AuthInfo",
+
   encode(message: AuthInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.signerInfos) {
       SignerInfo.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1731,6 +1879,32 @@ export const AuthInfo = {
     obj.fee = message.fee ? Fee.toAmino(message.fee) : undefined;
     obj.tip = message.tip ? Tip.toAmino(message.tip) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: AuthInfoAminoMsg): AuthInfo {
+    return AuthInfo.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: AuthInfo): AuthInfoAminoMsg {
+    return {
+      type: "cosmos-sdk/AuthInfo",
+      value: AuthInfo.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: AuthInfoProtoMsg): AuthInfo {
+    return AuthInfo.decode(message.value);
+  },
+
+  toProto(message: AuthInfo): Uint8Array {
+    return AuthInfo.encode(message).finish();
+  },
+
+  toProtoMsg(message: AuthInfo): AuthInfoProtoMsg {
+    return {
+      typeUrl: "/cosmos.tx.v1beta1.AuthInfo",
+      value: AuthInfo.encode(message).finish()
+    };
   }
 
 };
@@ -1744,6 +1918,9 @@ function createBaseSignerInfo(): SignerInfo {
 }
 
 export const SignerInfo = {
+  typeUrl: "/cosmos.tx.v1beta1.SignerInfo",
+  aminoType: "cosmos-sdk/SignerInfo",
+
   encode(message: SignerInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.publicKey !== undefined) {
       Any.encode(message.publicKey, writer.uint32(10).fork()).ldelim();
@@ -1844,6 +2021,32 @@ export const SignerInfo = {
     obj.mode_info = message.modeInfo ? ModeInfo.toAmino(message.modeInfo) : undefined;
     obj.sequence = message.sequence ? message.sequence.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: SignerInfoAminoMsg): SignerInfo {
+    return SignerInfo.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: SignerInfo): SignerInfoAminoMsg {
+    return {
+      type: "cosmos-sdk/SignerInfo",
+      value: SignerInfo.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: SignerInfoProtoMsg): SignerInfo {
+    return SignerInfo.decode(message.value);
+  },
+
+  toProto(message: SignerInfo): Uint8Array {
+    return SignerInfo.encode(message).finish();
+  },
+
+  toProtoMsg(message: SignerInfo): SignerInfoProtoMsg {
+    return {
+      typeUrl: "/cosmos.tx.v1beta1.SignerInfo",
+      value: SignerInfo.encode(message).finish()
+    };
   }
 
 };
@@ -1856,6 +2059,9 @@ function createBaseModeInfo(): ModeInfo {
 }
 
 export const ModeInfo = {
+  typeUrl: "/cosmos.tx.v1beta1.ModeInfo",
+  aminoType: "cosmos-sdk/ModeInfo",
+
   encode(message: ModeInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.single !== undefined) {
       ModeInfo_Single.encode(message.single, writer.uint32(10).fork()).ldelim();
@@ -1941,6 +2147,32 @@ export const ModeInfo = {
     obj.single = message.single ? ModeInfo_Single.toAmino(message.single) : undefined;
     obj.multi = message.multi ? ModeInfo_Multi.toAmino(message.multi) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ModeInfoAminoMsg): ModeInfo {
+    return ModeInfo.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ModeInfo): ModeInfoAminoMsg {
+    return {
+      type: "cosmos-sdk/ModeInfo",
+      value: ModeInfo.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ModeInfoProtoMsg): ModeInfo {
+    return ModeInfo.decode(message.value);
+  },
+
+  toProto(message: ModeInfo): Uint8Array {
+    return ModeInfo.encode(message).finish();
+  },
+
+  toProtoMsg(message: ModeInfo): ModeInfoProtoMsg {
+    return {
+      typeUrl: "/cosmos.tx.v1beta1.ModeInfo",
+      value: ModeInfo.encode(message).finish()
+    };
   }
 
 };
@@ -1952,6 +2184,9 @@ function createBaseModeInfo_Single(): ModeInfo_Single {
 }
 
 export const ModeInfo_Single = {
+  typeUrl: "/cosmos.tx.v1beta1.Single",
+  aminoType: "cosmos-sdk/Single",
+
   encode(message: ModeInfo_Single, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.mode !== 0) {
       writer.uint32(8).int32(message.mode);
@@ -2022,6 +2257,32 @@ export const ModeInfo_Single = {
     const obj: any = {};
     obj.mode = message.mode;
     return obj;
+  },
+
+  fromAminoMsg(object: ModeInfo_SingleAminoMsg): ModeInfo_Single {
+    return ModeInfo_Single.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ModeInfo_Single): ModeInfo_SingleAminoMsg {
+    return {
+      type: "cosmos-sdk/Single",
+      value: ModeInfo_Single.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ModeInfo_SingleProtoMsg): ModeInfo_Single {
+    return ModeInfo_Single.decode(message.value);
+  },
+
+  toProto(message: ModeInfo_Single): Uint8Array {
+    return ModeInfo_Single.encode(message).finish();
+  },
+
+  toProtoMsg(message: ModeInfo_Single): ModeInfo_SingleProtoMsg {
+    return {
+      typeUrl: "/cosmos.tx.v1beta1.Single",
+      value: ModeInfo_Single.encode(message).finish()
+    };
   }
 
 };
@@ -2034,6 +2295,9 @@ function createBaseModeInfo_Multi(): ModeInfo_Multi {
 }
 
 export const ModeInfo_Multi = {
+  typeUrl: "/cosmos.tx.v1beta1.Multi",
+  aminoType: "cosmos-sdk/Multi",
+
   encode(message: ModeInfo_Multi, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.bitarray !== undefined) {
       CompactBitArray.encode(message.bitarray, writer.uint32(10).fork()).ldelim();
@@ -2137,6 +2401,32 @@ export const ModeInfo_Multi = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ModeInfo_MultiAminoMsg): ModeInfo_Multi {
+    return ModeInfo_Multi.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ModeInfo_Multi): ModeInfo_MultiAminoMsg {
+    return {
+      type: "cosmos-sdk/Multi",
+      value: ModeInfo_Multi.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ModeInfo_MultiProtoMsg): ModeInfo_Multi {
+    return ModeInfo_Multi.decode(message.value);
+  },
+
+  toProto(message: ModeInfo_Multi): Uint8Array {
+    return ModeInfo_Multi.encode(message).finish();
+  },
+
+  toProtoMsg(message: ModeInfo_Multi): ModeInfo_MultiProtoMsg {
+    return {
+      typeUrl: "/cosmos.tx.v1beta1.Multi",
+      value: ModeInfo_Multi.encode(message).finish()
+    };
   }
 
 };
@@ -2151,6 +2441,9 @@ function createBaseFee(): Fee {
 }
 
 export const Fee = {
+  typeUrl: "/cosmos.tx.v1beta1.Fee",
+  aminoType: "cosmos-sdk/Fee",
+
   encode(message: Fee, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.amount) {
       Coin.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -2284,6 +2577,32 @@ export const Fee = {
     obj.payer = message.payer;
     obj.granter = message.granter;
     return obj;
+  },
+
+  fromAminoMsg(object: FeeAminoMsg): Fee {
+    return Fee.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Fee): FeeAminoMsg {
+    return {
+      type: "cosmos-sdk/Fee",
+      value: Fee.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: FeeProtoMsg): Fee {
+    return Fee.decode(message.value);
+  },
+
+  toProto(message: Fee): Uint8Array {
+    return Fee.encode(message).finish();
+  },
+
+  toProtoMsg(message: Fee): FeeProtoMsg {
+    return {
+      typeUrl: "/cosmos.tx.v1beta1.Fee",
+      value: Fee.encode(message).finish()
+    };
   }
 
 };
@@ -2296,6 +2615,9 @@ function createBaseTip(): Tip {
 }
 
 export const Tip = {
+  typeUrl: "/cosmos.tx.v1beta1.Tip",
+  aminoType: "cosmos-sdk/Tip",
+
   encode(message: Tip, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.amount) {
       Coin.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -2399,6 +2721,32 @@ export const Tip = {
 
     obj.tipper = message.tipper;
     return obj;
+  },
+
+  fromAminoMsg(object: TipAminoMsg): Tip {
+    return Tip.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Tip): TipAminoMsg {
+    return {
+      type: "cosmos-sdk/Tip",
+      value: Tip.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: TipProtoMsg): Tip {
+    return Tip.decode(message.value);
+  },
+
+  toProto(message: Tip): Uint8Array {
+    return Tip.encode(message).finish();
+  },
+
+  toProtoMsg(message: Tip): TipProtoMsg {
+    return {
+      typeUrl: "/cosmos.tx.v1beta1.Tip",
+      value: Tip.encode(message).finish()
+    };
   }
 
 };
@@ -2413,6 +2761,9 @@ function createBaseAuxSignerData(): AuxSignerData {
 }
 
 export const AuxSignerData = {
+  typeUrl: "/cosmos.tx.v1beta1.AuxSignerData",
+  aminoType: "cosmos-sdk/AuxSignerData",
+
   encode(message: AuxSignerData, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.address !== "") {
       writer.uint32(10).string(message.address);
@@ -2528,6 +2879,32 @@ export const AuxSignerData = {
     obj.mode = message.mode;
     obj.sig = message.sig;
     return obj;
+  },
+
+  fromAminoMsg(object: AuxSignerDataAminoMsg): AuxSignerData {
+    return AuxSignerData.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: AuxSignerData): AuxSignerDataAminoMsg {
+    return {
+      type: "cosmos-sdk/AuxSignerData",
+      value: AuxSignerData.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: AuxSignerDataProtoMsg): AuxSignerData {
+    return AuxSignerData.decode(message.value);
+  },
+
+  toProto(message: AuxSignerData): Uint8Array {
+    return AuxSignerData.encode(message).finish();
+  },
+
+  toProtoMsg(message: AuxSignerData): AuxSignerDataProtoMsg {
+    return {
+      typeUrl: "/cosmos.tx.v1beta1.AuxSignerData",
+      value: AuxSignerData.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/upgrade/v1beta1/query.ts b/__fixtures__/outputv2/cosmos/upgrade/v1beta1/query.ts
index e38f727fe..ae434d712 100644
--- a/__fixtures__/outputv2/cosmos/upgrade/v1beta1/query.ts
+++ b/__fixtures__/outputv2/cosmos/upgrade/v1beta1/query.ts
@@ -8,7 +8,7 @@ export const protobufPackage = "cosmos.upgrade.v1beta1";
  * method.
  */
 export interface QueryCurrentPlanRequest {}
-export interface QueryCurrentPlanRequestProtoType {
+export interface QueryCurrentPlanRequestProtoMsg {
   typeUrl: "/cosmos.upgrade.v1beta1.QueryCurrentPlanRequest";
   value: Uint8Array;
 }
@@ -18,7 +18,7 @@ export interface QueryCurrentPlanRequestProtoType {
  * method.
  */
 export interface QueryCurrentPlanRequestAmino {}
-export interface QueryCurrentPlanRequestAminoType {
+export interface QueryCurrentPlanRequestAminoMsg {
   type: "cosmos-sdk/QueryCurrentPlanRequest";
   value: QueryCurrentPlanRequestAmino;
 }
@@ -37,7 +37,7 @@ export interface QueryCurrentPlanResponse {
   /** plan is the current upgrade plan. */
   plan?: Plan;
 }
-export interface QueryCurrentPlanResponseProtoType {
+export interface QueryCurrentPlanResponseProtoMsg {
   typeUrl: "/cosmos.upgrade.v1beta1.QueryCurrentPlanResponse";
   value: Uint8Array;
 }
@@ -50,7 +50,7 @@ export interface QueryCurrentPlanResponseAmino {
   /** plan is the current upgrade plan. */
   plan?: PlanAmino;
 }
-export interface QueryCurrentPlanResponseAminoType {
+export interface QueryCurrentPlanResponseAminoMsg {
   type: "cosmos-sdk/QueryCurrentPlanResponse";
   value: QueryCurrentPlanResponseAmino;
 }
@@ -71,7 +71,7 @@ export interface QueryAppliedPlanRequest {
   /** name is the name of the applied plan to query for. */
   name: string;
 }
-export interface QueryAppliedPlanRequestProtoType {
+export interface QueryAppliedPlanRequestProtoMsg {
   typeUrl: "/cosmos.upgrade.v1beta1.QueryAppliedPlanRequest";
   value: Uint8Array;
 }
@@ -84,7 +84,7 @@ export interface QueryAppliedPlanRequestAmino {
   /** name is the name of the applied plan to query for. */
   name: string;
 }
-export interface QueryAppliedPlanRequestAminoType {
+export interface QueryAppliedPlanRequestAminoMsg {
   type: "cosmos-sdk/QueryAppliedPlanRequest";
   value: QueryAppliedPlanRequestAmino;
 }
@@ -105,7 +105,7 @@ export interface QueryAppliedPlanResponse {
   /** height is the block height at which the plan was applied. */
   height: Long;
 }
-export interface QueryAppliedPlanResponseProtoType {
+export interface QueryAppliedPlanResponseProtoMsg {
   typeUrl: "/cosmos.upgrade.v1beta1.QueryAppliedPlanResponse";
   value: Uint8Array;
 }
@@ -118,7 +118,7 @@ export interface QueryAppliedPlanResponseAmino {
   /** height is the block height at which the plan was applied. */
   height: string;
 }
-export interface QueryAppliedPlanResponseAminoType {
+export interface QueryAppliedPlanResponseAminoMsg {
   type: "cosmos-sdk/QueryAppliedPlanResponse";
   value: QueryAppliedPlanResponseAmino;
 }
@@ -144,7 +144,7 @@ export interface QueryUpgradedConsensusStateRequest {
    */
   lastHeight: Long;
 }
-export interface QueryUpgradedConsensusStateRequestProtoType {
+export interface QueryUpgradedConsensusStateRequestProtoMsg {
   typeUrl: "/cosmos.upgrade.v1beta1.QueryUpgradedConsensusStateRequest";
   value: Uint8Array;
 }
@@ -162,7 +162,7 @@ export interface QueryUpgradedConsensusStateRequestAmino {
    */
   last_height: string;
 }
-export interface QueryUpgradedConsensusStateRequestAminoType {
+export interface QueryUpgradedConsensusStateRequestAminoMsg {
   type: "cosmos-sdk/QueryUpgradedConsensusStateRequest";
   value: QueryUpgradedConsensusStateRequestAmino;
 }
@@ -187,7 +187,7 @@ export interface QueryUpgradedConsensusStateResponse {
   /** Since: cosmos-sdk 0.43 */
   upgradedConsensusState: Uint8Array;
 }
-export interface QueryUpgradedConsensusStateResponseProtoType {
+export interface QueryUpgradedConsensusStateResponseProtoMsg {
   typeUrl: "/cosmos.upgrade.v1beta1.QueryUpgradedConsensusStateResponse";
   value: Uint8Array;
 }
@@ -202,7 +202,7 @@ export interface QueryUpgradedConsensusStateResponseAmino {
   /** Since: cosmos-sdk 0.43 */
   upgraded_consensus_state: Uint8Array;
 }
-export interface QueryUpgradedConsensusStateResponseAminoType {
+export interface QueryUpgradedConsensusStateResponseAminoMsg {
   type: "cosmos-sdk/QueryUpgradedConsensusStateResponse";
   value: QueryUpgradedConsensusStateResponseAmino;
 }
@@ -231,7 +231,7 @@ export interface QueryModuleVersionsRequest {
    */
   moduleName: string;
 }
-export interface QueryModuleVersionsRequestProtoType {
+export interface QueryModuleVersionsRequestProtoMsg {
   typeUrl: "/cosmos.upgrade.v1beta1.QueryModuleVersionsRequest";
   value: Uint8Array;
 }
@@ -250,7 +250,7 @@ export interface QueryModuleVersionsRequestAmino {
    */
   module_name: string;
 }
-export interface QueryModuleVersionsRequestAminoType {
+export interface QueryModuleVersionsRequestAminoMsg {
   type: "cosmos-sdk/QueryModuleVersionsRequest";
   value: QueryModuleVersionsRequestAmino;
 }
@@ -275,7 +275,7 @@ export interface QueryModuleVersionsResponse {
   /** module_versions is a list of module names with their consensus versions. */
   moduleVersions: ModuleVersion[];
 }
-export interface QueryModuleVersionsResponseProtoType {
+export interface QueryModuleVersionsResponseProtoMsg {
   typeUrl: "/cosmos.upgrade.v1beta1.QueryModuleVersionsResponse";
   value: Uint8Array;
 }
@@ -290,7 +290,7 @@ export interface QueryModuleVersionsResponseAmino {
   /** module_versions is a list of module names with their consensus versions. */
   module_versions: ModuleVersionAmino[];
 }
-export interface QueryModuleVersionsResponseAminoType {
+export interface QueryModuleVersionsResponseAminoMsg {
   type: "cosmos-sdk/QueryModuleVersionsResponse";
   value: QueryModuleVersionsResponseAmino;
 }
@@ -311,7 +311,7 @@ export interface QueryModuleVersionsResponseSDKType {
  * Since: cosmos-sdk 0.46
  */
 export interface QueryAuthorityRequest {}
-export interface QueryAuthorityRequestProtoType {
+export interface QueryAuthorityRequestProtoMsg {
   typeUrl: "/cosmos.upgrade.v1beta1.QueryAuthorityRequest";
   value: Uint8Array;
 }
@@ -322,7 +322,7 @@ export interface QueryAuthorityRequestProtoType {
  * Since: cosmos-sdk 0.46
  */
 export interface QueryAuthorityRequestAmino {}
-export interface QueryAuthorityRequestAminoType {
+export interface QueryAuthorityRequestAminoMsg {
   type: "cosmos-sdk/QueryAuthorityRequest";
   value: QueryAuthorityRequestAmino;
 }
@@ -342,7 +342,7 @@ export interface QueryAuthorityRequestSDKType {}
 export interface QueryAuthorityResponse {
   address: string;
 }
-export interface QueryAuthorityResponseProtoType {
+export interface QueryAuthorityResponseProtoMsg {
   typeUrl: "/cosmos.upgrade.v1beta1.QueryAuthorityResponse";
   value: Uint8Array;
 }
@@ -355,7 +355,7 @@ export interface QueryAuthorityResponseProtoType {
 export interface QueryAuthorityResponseAmino {
   address: string;
 }
-export interface QueryAuthorityResponseAminoType {
+export interface QueryAuthorityResponseAminoMsg {
   type: "cosmos-sdk/QueryAuthorityResponse";
   value: QueryAuthorityResponseAmino;
 }
@@ -374,6 +374,9 @@ function createBaseQueryCurrentPlanRequest(): QueryCurrentPlanRequest {
 }
 
 export const QueryCurrentPlanRequest = {
+  typeUrl: "/cosmos.upgrade.v1beta1.QueryCurrentPlanRequest",
+  aminoType: "cosmos-sdk/QueryCurrentPlanRequest",
+
   encode(_: QueryCurrentPlanRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -426,6 +429,32 @@ export const QueryCurrentPlanRequest = {
   toAmino(_: QueryCurrentPlanRequest): QueryCurrentPlanRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryCurrentPlanRequestAminoMsg): QueryCurrentPlanRequest {
+    return QueryCurrentPlanRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryCurrentPlanRequest): QueryCurrentPlanRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryCurrentPlanRequest",
+      value: QueryCurrentPlanRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryCurrentPlanRequestProtoMsg): QueryCurrentPlanRequest {
+    return QueryCurrentPlanRequest.decode(message.value);
+  },
+
+  toProto(message: QueryCurrentPlanRequest): Uint8Array {
+    return QueryCurrentPlanRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryCurrentPlanRequest): QueryCurrentPlanRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.upgrade.v1beta1.QueryCurrentPlanRequest",
+      value: QueryCurrentPlanRequest.encode(message).finish()
+    };
   }
 
 };
@@ -437,6 +466,9 @@ function createBaseQueryCurrentPlanResponse(): QueryCurrentPlanResponse {
 }
 
 export const QueryCurrentPlanResponse = {
+  typeUrl: "/cosmos.upgrade.v1beta1.QueryCurrentPlanResponse",
+  aminoType: "cosmos-sdk/QueryCurrentPlanResponse",
+
   encode(message: QueryCurrentPlanResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.plan !== undefined) {
       Plan.encode(message.plan, writer.uint32(10).fork()).ldelim();
@@ -507,6 +539,32 @@ export const QueryCurrentPlanResponse = {
     const obj: any = {};
     obj.plan = message.plan ? Plan.toAmino(message.plan) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryCurrentPlanResponseAminoMsg): QueryCurrentPlanResponse {
+    return QueryCurrentPlanResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryCurrentPlanResponse): QueryCurrentPlanResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryCurrentPlanResponse",
+      value: QueryCurrentPlanResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryCurrentPlanResponseProtoMsg): QueryCurrentPlanResponse {
+    return QueryCurrentPlanResponse.decode(message.value);
+  },
+
+  toProto(message: QueryCurrentPlanResponse): Uint8Array {
+    return QueryCurrentPlanResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryCurrentPlanResponse): QueryCurrentPlanResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.upgrade.v1beta1.QueryCurrentPlanResponse",
+      value: QueryCurrentPlanResponse.encode(message).finish()
+    };
   }
 
 };
@@ -518,6 +576,9 @@ function createBaseQueryAppliedPlanRequest(): QueryAppliedPlanRequest {
 }
 
 export const QueryAppliedPlanRequest = {
+  typeUrl: "/cosmos.upgrade.v1beta1.QueryAppliedPlanRequest",
+  aminoType: "cosmos-sdk/QueryAppliedPlanRequest",
+
   encode(message: QueryAppliedPlanRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -588,6 +649,32 @@ export const QueryAppliedPlanRequest = {
     const obj: any = {};
     obj.name = message.name;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryAppliedPlanRequestAminoMsg): QueryAppliedPlanRequest {
+    return QueryAppliedPlanRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryAppliedPlanRequest): QueryAppliedPlanRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryAppliedPlanRequest",
+      value: QueryAppliedPlanRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryAppliedPlanRequestProtoMsg): QueryAppliedPlanRequest {
+    return QueryAppliedPlanRequest.decode(message.value);
+  },
+
+  toProto(message: QueryAppliedPlanRequest): Uint8Array {
+    return QueryAppliedPlanRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryAppliedPlanRequest): QueryAppliedPlanRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.upgrade.v1beta1.QueryAppliedPlanRequest",
+      value: QueryAppliedPlanRequest.encode(message).finish()
+    };
   }
 
 };
@@ -599,6 +686,9 @@ function createBaseQueryAppliedPlanResponse(): QueryAppliedPlanResponse {
 }
 
 export const QueryAppliedPlanResponse = {
+  typeUrl: "/cosmos.upgrade.v1beta1.QueryAppliedPlanResponse",
+  aminoType: "cosmos-sdk/QueryAppliedPlanResponse",
+
   encode(message: QueryAppliedPlanResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.height.isZero()) {
       writer.uint32(8).int64(message.height);
@@ -669,6 +759,32 @@ export const QueryAppliedPlanResponse = {
     const obj: any = {};
     obj.height = message.height ? message.height.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryAppliedPlanResponseAminoMsg): QueryAppliedPlanResponse {
+    return QueryAppliedPlanResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryAppliedPlanResponse): QueryAppliedPlanResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryAppliedPlanResponse",
+      value: QueryAppliedPlanResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryAppliedPlanResponseProtoMsg): QueryAppliedPlanResponse {
+    return QueryAppliedPlanResponse.decode(message.value);
+  },
+
+  toProto(message: QueryAppliedPlanResponse): Uint8Array {
+    return QueryAppliedPlanResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryAppliedPlanResponse): QueryAppliedPlanResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.upgrade.v1beta1.QueryAppliedPlanResponse",
+      value: QueryAppliedPlanResponse.encode(message).finish()
+    };
   }
 
 };
@@ -680,6 +796,9 @@ function createBaseQueryUpgradedConsensusStateRequest(): QueryUpgradedConsensusS
 }
 
 export const QueryUpgradedConsensusStateRequest = {
+  typeUrl: "/cosmos.upgrade.v1beta1.QueryUpgradedConsensusStateRequest",
+  aminoType: "cosmos-sdk/QueryUpgradedConsensusStateRequest",
+
   encode(message: QueryUpgradedConsensusStateRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.lastHeight.isZero()) {
       writer.uint32(8).int64(message.lastHeight);
@@ -750,6 +869,32 @@ export const QueryUpgradedConsensusStateRequest = {
     const obj: any = {};
     obj.last_height = message.lastHeight ? message.lastHeight.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryUpgradedConsensusStateRequestAminoMsg): QueryUpgradedConsensusStateRequest {
+    return QueryUpgradedConsensusStateRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryUpgradedConsensusStateRequest): QueryUpgradedConsensusStateRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryUpgradedConsensusStateRequest",
+      value: QueryUpgradedConsensusStateRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryUpgradedConsensusStateRequestProtoMsg): QueryUpgradedConsensusStateRequest {
+    return QueryUpgradedConsensusStateRequest.decode(message.value);
+  },
+
+  toProto(message: QueryUpgradedConsensusStateRequest): Uint8Array {
+    return QueryUpgradedConsensusStateRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryUpgradedConsensusStateRequest): QueryUpgradedConsensusStateRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.upgrade.v1beta1.QueryUpgradedConsensusStateRequest",
+      value: QueryUpgradedConsensusStateRequest.encode(message).finish()
+    };
   }
 
 };
@@ -761,6 +906,9 @@ function createBaseQueryUpgradedConsensusStateResponse(): QueryUpgradedConsensus
 }
 
 export const QueryUpgradedConsensusStateResponse = {
+  typeUrl: "/cosmos.upgrade.v1beta1.QueryUpgradedConsensusStateResponse",
+  aminoType: "cosmos-sdk/QueryUpgradedConsensusStateResponse",
+
   encode(message: QueryUpgradedConsensusStateResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.upgradedConsensusState.length !== 0) {
       writer.uint32(18).bytes(message.upgradedConsensusState);
@@ -831,6 +979,32 @@ export const QueryUpgradedConsensusStateResponse = {
     const obj: any = {};
     obj.upgraded_consensus_state = message.upgradedConsensusState;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryUpgradedConsensusStateResponseAminoMsg): QueryUpgradedConsensusStateResponse {
+    return QueryUpgradedConsensusStateResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryUpgradedConsensusStateResponse): QueryUpgradedConsensusStateResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryUpgradedConsensusStateResponse",
+      value: QueryUpgradedConsensusStateResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryUpgradedConsensusStateResponseProtoMsg): QueryUpgradedConsensusStateResponse {
+    return QueryUpgradedConsensusStateResponse.decode(message.value);
+  },
+
+  toProto(message: QueryUpgradedConsensusStateResponse): Uint8Array {
+    return QueryUpgradedConsensusStateResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryUpgradedConsensusStateResponse): QueryUpgradedConsensusStateResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.upgrade.v1beta1.QueryUpgradedConsensusStateResponse",
+      value: QueryUpgradedConsensusStateResponse.encode(message).finish()
+    };
   }
 
 };
@@ -842,6 +1016,9 @@ function createBaseQueryModuleVersionsRequest(): QueryModuleVersionsRequest {
 }
 
 export const QueryModuleVersionsRequest = {
+  typeUrl: "/cosmos.upgrade.v1beta1.QueryModuleVersionsRequest",
+  aminoType: "cosmos-sdk/QueryModuleVersionsRequest",
+
   encode(message: QueryModuleVersionsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.moduleName !== "") {
       writer.uint32(10).string(message.moduleName);
@@ -912,6 +1089,32 @@ export const QueryModuleVersionsRequest = {
     const obj: any = {};
     obj.module_name = message.moduleName;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryModuleVersionsRequestAminoMsg): QueryModuleVersionsRequest {
+    return QueryModuleVersionsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryModuleVersionsRequest): QueryModuleVersionsRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryModuleVersionsRequest",
+      value: QueryModuleVersionsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryModuleVersionsRequestProtoMsg): QueryModuleVersionsRequest {
+    return QueryModuleVersionsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryModuleVersionsRequest): Uint8Array {
+    return QueryModuleVersionsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryModuleVersionsRequest): QueryModuleVersionsRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.upgrade.v1beta1.QueryModuleVersionsRequest",
+      value: QueryModuleVersionsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -923,6 +1126,9 @@ function createBaseQueryModuleVersionsResponse(): QueryModuleVersionsResponse {
 }
 
 export const QueryModuleVersionsResponse = {
+  typeUrl: "/cosmos.upgrade.v1beta1.QueryModuleVersionsResponse",
+  aminoType: "cosmos-sdk/QueryModuleVersionsResponse",
+
   encode(message: QueryModuleVersionsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.moduleVersions) {
       ModuleVersion.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1011,6 +1217,32 @@ export const QueryModuleVersionsResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: QueryModuleVersionsResponseAminoMsg): QueryModuleVersionsResponse {
+    return QueryModuleVersionsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryModuleVersionsResponse): QueryModuleVersionsResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryModuleVersionsResponse",
+      value: QueryModuleVersionsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryModuleVersionsResponseProtoMsg): QueryModuleVersionsResponse {
+    return QueryModuleVersionsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryModuleVersionsResponse): Uint8Array {
+    return QueryModuleVersionsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryModuleVersionsResponse): QueryModuleVersionsResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.upgrade.v1beta1.QueryModuleVersionsResponse",
+      value: QueryModuleVersionsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1020,6 +1252,9 @@ function createBaseQueryAuthorityRequest(): QueryAuthorityRequest {
 }
 
 export const QueryAuthorityRequest = {
+  typeUrl: "/cosmos.upgrade.v1beta1.QueryAuthorityRequest",
+  aminoType: "cosmos-sdk/QueryAuthorityRequest",
+
   encode(_: QueryAuthorityRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -1072,6 +1307,32 @@ export const QueryAuthorityRequest = {
   toAmino(_: QueryAuthorityRequest): QueryAuthorityRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryAuthorityRequestAminoMsg): QueryAuthorityRequest {
+    return QueryAuthorityRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryAuthorityRequest): QueryAuthorityRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryAuthorityRequest",
+      value: QueryAuthorityRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryAuthorityRequestProtoMsg): QueryAuthorityRequest {
+    return QueryAuthorityRequest.decode(message.value);
+  },
+
+  toProto(message: QueryAuthorityRequest): Uint8Array {
+    return QueryAuthorityRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryAuthorityRequest): QueryAuthorityRequestProtoMsg {
+    return {
+      typeUrl: "/cosmos.upgrade.v1beta1.QueryAuthorityRequest",
+      value: QueryAuthorityRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1083,6 +1344,9 @@ function createBaseQueryAuthorityResponse(): QueryAuthorityResponse {
 }
 
 export const QueryAuthorityResponse = {
+  typeUrl: "/cosmos.upgrade.v1beta1.QueryAuthorityResponse",
+  aminoType: "cosmos-sdk/QueryAuthorityResponse",
+
   encode(message: QueryAuthorityResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.address !== "") {
       writer.uint32(10).string(message.address);
@@ -1153,6 +1417,32 @@ export const QueryAuthorityResponse = {
     const obj: any = {};
     obj.address = message.address;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryAuthorityResponseAminoMsg): QueryAuthorityResponse {
+    return QueryAuthorityResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryAuthorityResponse): QueryAuthorityResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryAuthorityResponse",
+      value: QueryAuthorityResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryAuthorityResponseProtoMsg): QueryAuthorityResponse {
+    return QueryAuthorityResponse.decode(message.value);
+  },
+
+  toProto(message: QueryAuthorityResponse): Uint8Array {
+    return QueryAuthorityResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryAuthorityResponse): QueryAuthorityResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.upgrade.v1beta1.QueryAuthorityResponse",
+      value: QueryAuthorityResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/upgrade/v1beta1/tx.ts b/__fixtures__/outputv2/cosmos/upgrade/v1beta1/tx.ts
index 0f56882d2..010681ac7 100644
--- a/__fixtures__/outputv2/cosmos/upgrade/v1beta1/tx.ts
+++ b/__fixtures__/outputv2/cosmos/upgrade/v1beta1/tx.ts
@@ -15,7 +15,7 @@ export interface MsgSoftwareUpgrade {
   /** plan is the upgrade plan. */
   plan?: Plan;
 }
-export interface MsgSoftwareUpgradeProtoType {
+export interface MsgSoftwareUpgradeProtoMsg {
   typeUrl: "/cosmos.upgrade.v1beta1.MsgSoftwareUpgrade";
   value: Uint8Array;
 }
@@ -32,7 +32,7 @@ export interface MsgSoftwareUpgradeAmino {
   /** plan is the upgrade plan. */
   plan?: PlanAmino;
 }
-export interface MsgSoftwareUpgradeAminoType {
+export interface MsgSoftwareUpgradeAminoMsg {
   type: "cosmos-sdk/MsgSoftwareUpgrade";
   value: MsgSoftwareUpgradeAmino;
 }
@@ -53,7 +53,7 @@ export interface MsgSoftwareUpgradeSDKType {
  * Since: cosmos-sdk 0.46
  */
 export interface MsgSoftwareUpgradeResponse {}
-export interface MsgSoftwareUpgradeResponseProtoType {
+export interface MsgSoftwareUpgradeResponseProtoMsg {
   typeUrl: "/cosmos.upgrade.v1beta1.MsgSoftwareUpgradeResponse";
   value: Uint8Array;
 }
@@ -64,7 +64,7 @@ export interface MsgSoftwareUpgradeResponseProtoType {
  * Since: cosmos-sdk 0.46
  */
 export interface MsgSoftwareUpgradeResponseAmino {}
-export interface MsgSoftwareUpgradeResponseAminoType {
+export interface MsgSoftwareUpgradeResponseAminoMsg {
   type: "cosmos-sdk/MsgSoftwareUpgradeResponse";
   value: MsgSoftwareUpgradeResponseAmino;
 }
@@ -85,7 +85,7 @@ export interface MsgCancelUpgrade {
   /** authority is the address of the governance account. */
   authority: string;
 }
-export interface MsgCancelUpgradeProtoType {
+export interface MsgCancelUpgradeProtoMsg {
   typeUrl: "/cosmos.upgrade.v1beta1.MsgCancelUpgrade";
   value: Uint8Array;
 }
@@ -99,7 +99,7 @@ export interface MsgCancelUpgradeAmino {
   /** authority is the address of the governance account. */
   authority: string;
 }
-export interface MsgCancelUpgradeAminoType {
+export interface MsgCancelUpgradeAminoMsg {
   type: "cosmos-sdk/MsgCancelUpgrade";
   value: MsgCancelUpgradeAmino;
 }
@@ -119,7 +119,7 @@ export interface MsgCancelUpgradeSDKType {
  * Since: cosmos-sdk 0.46
  */
 export interface MsgCancelUpgradeResponse {}
-export interface MsgCancelUpgradeResponseProtoType {
+export interface MsgCancelUpgradeResponseProtoMsg {
   typeUrl: "/cosmos.upgrade.v1beta1.MsgCancelUpgradeResponse";
   value: Uint8Array;
 }
@@ -130,7 +130,7 @@ export interface MsgCancelUpgradeResponseProtoType {
  * Since: cosmos-sdk 0.46
  */
 export interface MsgCancelUpgradeResponseAmino {}
-export interface MsgCancelUpgradeResponseAminoType {
+export interface MsgCancelUpgradeResponseAminoMsg {
   type: "cosmos-sdk/MsgCancelUpgradeResponse";
   value: MsgCancelUpgradeResponseAmino;
 }
@@ -150,6 +150,9 @@ function createBaseMsgSoftwareUpgrade(): MsgSoftwareUpgrade {
 }
 
 export const MsgSoftwareUpgrade = {
+  typeUrl: "/cosmos.upgrade.v1beta1.MsgSoftwareUpgrade",
+  aminoType: "cosmos-sdk/MsgSoftwareUpgrade",
+
   encode(message: MsgSoftwareUpgrade, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.authority !== "") {
       writer.uint32(10).string(message.authority);
@@ -235,6 +238,32 @@ export const MsgSoftwareUpgrade = {
     obj.authority = message.authority;
     obj.plan = message.plan ? Plan.toAmino(message.plan) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgSoftwareUpgradeAminoMsg): MsgSoftwareUpgrade {
+    return MsgSoftwareUpgrade.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgSoftwareUpgrade): MsgSoftwareUpgradeAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgSoftwareUpgrade",
+      value: MsgSoftwareUpgrade.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgSoftwareUpgradeProtoMsg): MsgSoftwareUpgrade {
+    return MsgSoftwareUpgrade.decode(message.value);
+  },
+
+  toProto(message: MsgSoftwareUpgrade): Uint8Array {
+    return MsgSoftwareUpgrade.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgSoftwareUpgrade): MsgSoftwareUpgradeProtoMsg {
+    return {
+      typeUrl: "/cosmos.upgrade.v1beta1.MsgSoftwareUpgrade",
+      value: MsgSoftwareUpgrade.encode(message).finish()
+    };
   }
 
 };
@@ -244,6 +273,9 @@ function createBaseMsgSoftwareUpgradeResponse(): MsgSoftwareUpgradeResponse {
 }
 
 export const MsgSoftwareUpgradeResponse = {
+  typeUrl: "/cosmos.upgrade.v1beta1.MsgSoftwareUpgradeResponse",
+  aminoType: "cosmos-sdk/MsgSoftwareUpgradeResponse",
+
   encode(_: MsgSoftwareUpgradeResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -296,6 +328,32 @@ export const MsgSoftwareUpgradeResponse = {
   toAmino(_: MsgSoftwareUpgradeResponse): MsgSoftwareUpgradeResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgSoftwareUpgradeResponseAminoMsg): MsgSoftwareUpgradeResponse {
+    return MsgSoftwareUpgradeResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgSoftwareUpgradeResponse): MsgSoftwareUpgradeResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgSoftwareUpgradeResponse",
+      value: MsgSoftwareUpgradeResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgSoftwareUpgradeResponseProtoMsg): MsgSoftwareUpgradeResponse {
+    return MsgSoftwareUpgradeResponse.decode(message.value);
+  },
+
+  toProto(message: MsgSoftwareUpgradeResponse): Uint8Array {
+    return MsgSoftwareUpgradeResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgSoftwareUpgradeResponse): MsgSoftwareUpgradeResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.upgrade.v1beta1.MsgSoftwareUpgradeResponse",
+      value: MsgSoftwareUpgradeResponse.encode(message).finish()
+    };
   }
 
 };
@@ -307,6 +365,9 @@ function createBaseMsgCancelUpgrade(): MsgCancelUpgrade {
 }
 
 export const MsgCancelUpgrade = {
+  typeUrl: "/cosmos.upgrade.v1beta1.MsgCancelUpgrade",
+  aminoType: "cosmos-sdk/MsgCancelUpgrade",
+
   encode(message: MsgCancelUpgrade, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.authority !== "") {
       writer.uint32(10).string(message.authority);
@@ -377,6 +438,32 @@ export const MsgCancelUpgrade = {
     const obj: any = {};
     obj.authority = message.authority;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCancelUpgradeAminoMsg): MsgCancelUpgrade {
+    return MsgCancelUpgrade.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgCancelUpgrade): MsgCancelUpgradeAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgCancelUpgrade",
+      value: MsgCancelUpgrade.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgCancelUpgradeProtoMsg): MsgCancelUpgrade {
+    return MsgCancelUpgrade.decode(message.value);
+  },
+
+  toProto(message: MsgCancelUpgrade): Uint8Array {
+    return MsgCancelUpgrade.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCancelUpgrade): MsgCancelUpgradeProtoMsg {
+    return {
+      typeUrl: "/cosmos.upgrade.v1beta1.MsgCancelUpgrade",
+      value: MsgCancelUpgrade.encode(message).finish()
+    };
   }
 
 };
@@ -386,6 +473,9 @@ function createBaseMsgCancelUpgradeResponse(): MsgCancelUpgradeResponse {
 }
 
 export const MsgCancelUpgradeResponse = {
+  typeUrl: "/cosmos.upgrade.v1beta1.MsgCancelUpgradeResponse",
+  aminoType: "cosmos-sdk/MsgCancelUpgradeResponse",
+
   encode(_: MsgCancelUpgradeResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -438,6 +528,32 @@ export const MsgCancelUpgradeResponse = {
   toAmino(_: MsgCancelUpgradeResponse): MsgCancelUpgradeResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCancelUpgradeResponseAminoMsg): MsgCancelUpgradeResponse {
+    return MsgCancelUpgradeResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgCancelUpgradeResponse): MsgCancelUpgradeResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgCancelUpgradeResponse",
+      value: MsgCancelUpgradeResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgCancelUpgradeResponseProtoMsg): MsgCancelUpgradeResponse {
+    return MsgCancelUpgradeResponse.decode(message.value);
+  },
+
+  toProto(message: MsgCancelUpgradeResponse): Uint8Array {
+    return MsgCancelUpgradeResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCancelUpgradeResponse): MsgCancelUpgradeResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.upgrade.v1beta1.MsgCancelUpgradeResponse",
+      value: MsgCancelUpgradeResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/upgrade/v1beta1/upgrade.ts b/__fixtures__/outputv2/cosmos/upgrade/v1beta1/upgrade.ts
index 6d43dc631..737c0b317 100644
--- a/__fixtures__/outputv2/cosmos/upgrade/v1beta1/upgrade.ts
+++ b/__fixtures__/outputv2/cosmos/upgrade/v1beta1/upgrade.ts
@@ -47,7 +47,7 @@ export interface Plan {
   /** @deprecated */
   upgradedClientState?: Any;
 }
-export interface PlanProtoType {
+export interface PlanProtoMsg {
   typeUrl: "/cosmos.upgrade.v1beta1.Plan";
   value: Uint8Array;
 }
@@ -95,7 +95,7 @@ export interface PlanAmino {
   /** @deprecated */
   upgraded_client_state?: AnyAmino;
 }
-export interface PlanAminoType {
+export interface PlanAminoMsg {
   type: "cosmos-sdk/Plan";
   value: PlanAmino;
 }
@@ -126,7 +126,7 @@ export interface SoftwareUpgradeProposal {
   description: string;
   plan?: Plan;
 }
-export interface SoftwareUpgradeProposalProtoType {
+export interface SoftwareUpgradeProposalProtoMsg {
   typeUrl: "/cosmos.upgrade.v1beta1.SoftwareUpgradeProposal";
   value: Uint8Array;
 }
@@ -144,7 +144,7 @@ export interface SoftwareUpgradeProposalAmino {
   description: string;
   plan?: PlanAmino;
 }
-export interface SoftwareUpgradeProposalAminoType {
+export interface SoftwareUpgradeProposalAminoMsg {
   type: "cosmos-sdk/SoftwareUpgradeProposal";
   value: SoftwareUpgradeProposalAmino;
 }
@@ -175,7 +175,7 @@ export interface CancelSoftwareUpgradeProposal {
   title: string;
   description: string;
 }
-export interface CancelSoftwareUpgradeProposalProtoType {
+export interface CancelSoftwareUpgradeProposalProtoMsg {
   typeUrl: "/cosmos.upgrade.v1beta1.CancelSoftwareUpgradeProposal";
   value: Uint8Array;
 }
@@ -192,7 +192,7 @@ export interface CancelSoftwareUpgradeProposalAmino {
   title: string;
   description: string;
 }
-export interface CancelSoftwareUpgradeProposalAminoType {
+export interface CancelSoftwareUpgradeProposalAminoMsg {
   type: "cosmos-sdk/CancelSoftwareUpgradeProposal";
   value: CancelSoftwareUpgradeProposalAmino;
 }
@@ -222,7 +222,7 @@ export interface ModuleVersion {
   /** consensus version of the app module */
   version: Long;
 }
-export interface ModuleVersionProtoType {
+export interface ModuleVersionProtoMsg {
   typeUrl: "/cosmos.upgrade.v1beta1.ModuleVersion";
   value: Uint8Array;
 }
@@ -239,7 +239,7 @@ export interface ModuleVersionAmino {
   /** consensus version of the app module */
   version: string;
 }
-export interface ModuleVersionAminoType {
+export interface ModuleVersionAminoMsg {
   type: "cosmos-sdk/ModuleVersion";
   value: ModuleVersionAmino;
 }
@@ -265,6 +265,9 @@ function createBasePlan(): Plan {
 }
 
 export const Plan = {
+  typeUrl: "/cosmos.upgrade.v1beta1.Plan",
+  aminoType: "cosmos-sdk/Plan",
+
   encode(message: Plan, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -395,6 +398,32 @@ export const Plan = {
     obj.info = message.info;
     obj.upgraded_client_state = message.upgradedClientState ? Any.toAmino(message.upgradedClientState) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: PlanAminoMsg): Plan {
+    return Plan.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Plan): PlanAminoMsg {
+    return {
+      type: "cosmos-sdk/Plan",
+      value: Plan.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: PlanProtoMsg): Plan {
+    return Plan.decode(message.value);
+  },
+
+  toProto(message: Plan): Uint8Array {
+    return Plan.encode(message).finish();
+  },
+
+  toProtoMsg(message: Plan): PlanProtoMsg {
+    return {
+      typeUrl: "/cosmos.upgrade.v1beta1.Plan",
+      value: Plan.encode(message).finish()
+    };
   }
 
 };
@@ -408,6 +437,9 @@ function createBaseSoftwareUpgradeProposal(): SoftwareUpgradeProposal {
 }
 
 export const SoftwareUpgradeProposal = {
+  typeUrl: "/cosmos.upgrade.v1beta1.SoftwareUpgradeProposal",
+  aminoType: "cosmos-sdk/SoftwareUpgradeProposal",
+
   encode(message: SoftwareUpgradeProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.title !== "") {
       writer.uint32(10).string(message.title);
@@ -508,6 +540,32 @@ export const SoftwareUpgradeProposal = {
     obj.description = message.description;
     obj.plan = message.plan ? Plan.toAmino(message.plan) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: SoftwareUpgradeProposalAminoMsg): SoftwareUpgradeProposal {
+    return SoftwareUpgradeProposal.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: SoftwareUpgradeProposal): SoftwareUpgradeProposalAminoMsg {
+    return {
+      type: "cosmos-sdk/SoftwareUpgradeProposal",
+      value: SoftwareUpgradeProposal.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: SoftwareUpgradeProposalProtoMsg): SoftwareUpgradeProposal {
+    return SoftwareUpgradeProposal.decode(message.value);
+  },
+
+  toProto(message: SoftwareUpgradeProposal): Uint8Array {
+    return SoftwareUpgradeProposal.encode(message).finish();
+  },
+
+  toProtoMsg(message: SoftwareUpgradeProposal): SoftwareUpgradeProposalProtoMsg {
+    return {
+      typeUrl: "/cosmos.upgrade.v1beta1.SoftwareUpgradeProposal",
+      value: SoftwareUpgradeProposal.encode(message).finish()
+    };
   }
 
 };
@@ -520,6 +578,9 @@ function createBaseCancelSoftwareUpgradeProposal(): CancelSoftwareUpgradeProposa
 }
 
 export const CancelSoftwareUpgradeProposal = {
+  typeUrl: "/cosmos.upgrade.v1beta1.CancelSoftwareUpgradeProposal",
+  aminoType: "cosmos-sdk/CancelSoftwareUpgradeProposal",
+
   encode(message: CancelSoftwareUpgradeProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.title !== "") {
       writer.uint32(10).string(message.title);
@@ -605,6 +666,32 @@ export const CancelSoftwareUpgradeProposal = {
     obj.title = message.title;
     obj.description = message.description;
     return obj;
+  },
+
+  fromAminoMsg(object: CancelSoftwareUpgradeProposalAminoMsg): CancelSoftwareUpgradeProposal {
+    return CancelSoftwareUpgradeProposal.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: CancelSoftwareUpgradeProposal): CancelSoftwareUpgradeProposalAminoMsg {
+    return {
+      type: "cosmos-sdk/CancelSoftwareUpgradeProposal",
+      value: CancelSoftwareUpgradeProposal.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: CancelSoftwareUpgradeProposalProtoMsg): CancelSoftwareUpgradeProposal {
+    return CancelSoftwareUpgradeProposal.decode(message.value);
+  },
+
+  toProto(message: CancelSoftwareUpgradeProposal): Uint8Array {
+    return CancelSoftwareUpgradeProposal.encode(message).finish();
+  },
+
+  toProtoMsg(message: CancelSoftwareUpgradeProposal): CancelSoftwareUpgradeProposalProtoMsg {
+    return {
+      typeUrl: "/cosmos.upgrade.v1beta1.CancelSoftwareUpgradeProposal",
+      value: CancelSoftwareUpgradeProposal.encode(message).finish()
+    };
   }
 
 };
@@ -617,6 +704,9 @@ function createBaseModuleVersion(): ModuleVersion {
 }
 
 export const ModuleVersion = {
+  typeUrl: "/cosmos.upgrade.v1beta1.ModuleVersion",
+  aminoType: "cosmos-sdk/ModuleVersion",
+
   encode(message: ModuleVersion, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -702,6 +792,32 @@ export const ModuleVersion = {
     obj.name = message.name;
     obj.version = message.version ? message.version.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ModuleVersionAminoMsg): ModuleVersion {
+    return ModuleVersion.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ModuleVersion): ModuleVersionAminoMsg {
+    return {
+      type: "cosmos-sdk/ModuleVersion",
+      value: ModuleVersion.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ModuleVersionProtoMsg): ModuleVersion {
+    return ModuleVersion.decode(message.value);
+  },
+
+  toProto(message: ModuleVersion): Uint8Array {
+    return ModuleVersion.encode(message).finish();
+  },
+
+  toProtoMsg(message: ModuleVersion): ModuleVersionProtoMsg {
+    return {
+      typeUrl: "/cosmos.upgrade.v1beta1.ModuleVersion",
+      value: ModuleVersion.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/vesting/v1beta1/tx.ts b/__fixtures__/outputv2/cosmos/vesting/v1beta1/tx.ts
index 3301c3a28..7eb8d9925 100644
--- a/__fixtures__/outputv2/cosmos/vesting/v1beta1/tx.ts
+++ b/__fixtures__/outputv2/cosmos/vesting/v1beta1/tx.ts
@@ -15,7 +15,7 @@ export interface MsgCreateVestingAccount {
   endTime: Long;
   delayed: boolean;
 }
-export interface MsgCreateVestingAccountProtoType {
+export interface MsgCreateVestingAccountProtoMsg {
   typeUrl: "/cosmos.vesting.v1beta1.MsgCreateVestingAccount";
   value: Uint8Array;
 }
@@ -31,7 +31,7 @@ export interface MsgCreateVestingAccountAmino {
   end_time: string;
   delayed: boolean;
 }
-export interface MsgCreateVestingAccountAminoType {
+export interface MsgCreateVestingAccountAminoMsg {
   type: "cosmos-sdk/MsgCreateVestingAccount";
   value: MsgCreateVestingAccountAmino;
 }
@@ -50,14 +50,14 @@ export interface MsgCreateVestingAccountSDKType {
 
 /** MsgCreateVestingAccountResponse defines the Msg/CreateVestingAccount response type. */
 export interface MsgCreateVestingAccountResponse {}
-export interface MsgCreateVestingAccountResponseProtoType {
+export interface MsgCreateVestingAccountResponseProtoMsg {
   typeUrl: "/cosmos.vesting.v1beta1.MsgCreateVestingAccountResponse";
   value: Uint8Array;
 }
 
 /** MsgCreateVestingAccountResponse defines the Msg/CreateVestingAccount response type. */
 export interface MsgCreateVestingAccountResponseAmino {}
-export interface MsgCreateVestingAccountResponseAminoType {
+export interface MsgCreateVestingAccountResponseAminoMsg {
   type: "cosmos-sdk/MsgCreateVestingAccountResponse";
   value: MsgCreateVestingAccountResponseAmino;
 }
@@ -74,7 +74,7 @@ export interface MsgCreatePermanentLockedAccount {
   toAddress: string;
   amount: Coin[];
 }
-export interface MsgCreatePermanentLockedAccountProtoType {
+export interface MsgCreatePermanentLockedAccountProtoMsg {
   typeUrl: "/cosmos.vesting.v1beta1.MsgCreatePermanentLockedAccount";
   value: Uint8Array;
 }
@@ -88,7 +88,7 @@ export interface MsgCreatePermanentLockedAccountAmino {
   to_address: string;
   amount: CoinAmino[];
 }
-export interface MsgCreatePermanentLockedAccountAminoType {
+export interface MsgCreatePermanentLockedAccountAminoMsg {
   type: "cosmos-sdk/MsgCreatePermanentLockedAccount";
   value: MsgCreatePermanentLockedAccountAmino;
 }
@@ -105,14 +105,14 @@ export interface MsgCreatePermanentLockedAccountSDKType {
 
 /** MsgCreatePermanentLockedAccountResponse defines the Msg/CreatePermanentLockedAccount response type. */
 export interface MsgCreatePermanentLockedAccountResponse {}
-export interface MsgCreatePermanentLockedAccountResponseProtoType {
+export interface MsgCreatePermanentLockedAccountResponseProtoMsg {
   typeUrl: "/cosmos.vesting.v1beta1.MsgCreatePermanentLockedAccountResponse";
   value: Uint8Array;
 }
 
 /** MsgCreatePermanentLockedAccountResponse defines the Msg/CreatePermanentLockedAccount response type. */
 export interface MsgCreatePermanentLockedAccountResponseAmino {}
-export interface MsgCreatePermanentLockedAccountResponseAminoType {
+export interface MsgCreatePermanentLockedAccountResponseAminoMsg {
   type: "cosmos-sdk/MsgCreatePermanentLockedAccountResponse";
   value: MsgCreatePermanentLockedAccountResponseAmino;
 }
@@ -130,7 +130,7 @@ export interface MsgCreatePeriodicVestingAccount {
   startTime: Long;
   vestingPeriods: Period[];
 }
-export interface MsgCreatePeriodicVestingAccountProtoType {
+export interface MsgCreatePeriodicVestingAccountProtoMsg {
   typeUrl: "/cosmos.vesting.v1beta1.MsgCreatePeriodicVestingAccount";
   value: Uint8Array;
 }
@@ -145,7 +145,7 @@ export interface MsgCreatePeriodicVestingAccountAmino {
   start_time: string;
   vesting_periods: PeriodAmino[];
 }
-export interface MsgCreatePeriodicVestingAccountAminoType {
+export interface MsgCreatePeriodicVestingAccountAminoMsg {
   type: "cosmos-sdk/MsgCreatePeriodicVestingAccount";
   value: MsgCreatePeriodicVestingAccountAmino;
 }
@@ -166,7 +166,7 @@ export interface MsgCreatePeriodicVestingAccountSDKType {
  * response type.
  */
 export interface MsgCreatePeriodicVestingAccountResponse {}
-export interface MsgCreatePeriodicVestingAccountResponseProtoType {
+export interface MsgCreatePeriodicVestingAccountResponseProtoMsg {
   typeUrl: "/cosmos.vesting.v1beta1.MsgCreatePeriodicVestingAccountResponse";
   value: Uint8Array;
 }
@@ -176,7 +176,7 @@ export interface MsgCreatePeriodicVestingAccountResponseProtoType {
  * response type.
  */
 export interface MsgCreatePeriodicVestingAccountResponseAmino {}
-export interface MsgCreatePeriodicVestingAccountResponseAminoType {
+export interface MsgCreatePeriodicVestingAccountResponseAminoMsg {
   type: "cosmos-sdk/MsgCreatePeriodicVestingAccountResponse";
   value: MsgCreatePeriodicVestingAccountResponseAmino;
 }
@@ -198,6 +198,9 @@ function createBaseMsgCreateVestingAccount(): MsgCreateVestingAccount {
 }
 
 export const MsgCreateVestingAccount = {
+  typeUrl: "/cosmos.vesting.v1beta1.MsgCreateVestingAccount",
+  aminoType: "cosmos-sdk/MsgCreateVestingAccount",
+
   encode(message: MsgCreateVestingAccount, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.fromAddress !== "") {
       writer.uint32(10).string(message.fromAddress);
@@ -346,6 +349,32 @@ export const MsgCreateVestingAccount = {
     obj.end_time = message.endTime ? message.endTime.toString() : undefined;
     obj.delayed = message.delayed;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCreateVestingAccountAminoMsg): MsgCreateVestingAccount {
+    return MsgCreateVestingAccount.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgCreateVestingAccount): MsgCreateVestingAccountAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgCreateVestingAccount",
+      value: MsgCreateVestingAccount.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgCreateVestingAccountProtoMsg): MsgCreateVestingAccount {
+    return MsgCreateVestingAccount.decode(message.value);
+  },
+
+  toProto(message: MsgCreateVestingAccount): Uint8Array {
+    return MsgCreateVestingAccount.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCreateVestingAccount): MsgCreateVestingAccountProtoMsg {
+    return {
+      typeUrl: "/cosmos.vesting.v1beta1.MsgCreateVestingAccount",
+      value: MsgCreateVestingAccount.encode(message).finish()
+    };
   }
 
 };
@@ -355,6 +384,9 @@ function createBaseMsgCreateVestingAccountResponse(): MsgCreateVestingAccountRes
 }
 
 export const MsgCreateVestingAccountResponse = {
+  typeUrl: "/cosmos.vesting.v1beta1.MsgCreateVestingAccountResponse",
+  aminoType: "cosmos-sdk/MsgCreateVestingAccountResponse",
+
   encode(_: MsgCreateVestingAccountResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -407,6 +439,32 @@ export const MsgCreateVestingAccountResponse = {
   toAmino(_: MsgCreateVestingAccountResponse): MsgCreateVestingAccountResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCreateVestingAccountResponseAminoMsg): MsgCreateVestingAccountResponse {
+    return MsgCreateVestingAccountResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgCreateVestingAccountResponse): MsgCreateVestingAccountResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgCreateVestingAccountResponse",
+      value: MsgCreateVestingAccountResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgCreateVestingAccountResponseProtoMsg): MsgCreateVestingAccountResponse {
+    return MsgCreateVestingAccountResponse.decode(message.value);
+  },
+
+  toProto(message: MsgCreateVestingAccountResponse): Uint8Array {
+    return MsgCreateVestingAccountResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCreateVestingAccountResponse): MsgCreateVestingAccountResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.vesting.v1beta1.MsgCreateVestingAccountResponse",
+      value: MsgCreateVestingAccountResponse.encode(message).finish()
+    };
   }
 
 };
@@ -420,6 +478,9 @@ function createBaseMsgCreatePermanentLockedAccount(): MsgCreatePermanentLockedAc
 }
 
 export const MsgCreatePermanentLockedAccount = {
+  typeUrl: "/cosmos.vesting.v1beta1.MsgCreatePermanentLockedAccount",
+  aminoType: "cosmos-sdk/MsgCreatePermanentLockedAccount",
+
   encode(message: MsgCreatePermanentLockedAccount, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.fromAddress !== "") {
       writer.uint32(10).string(message.fromAddress);
@@ -538,6 +599,32 @@ export const MsgCreatePermanentLockedAccount = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCreatePermanentLockedAccountAminoMsg): MsgCreatePermanentLockedAccount {
+    return MsgCreatePermanentLockedAccount.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgCreatePermanentLockedAccount): MsgCreatePermanentLockedAccountAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgCreatePermanentLockedAccount",
+      value: MsgCreatePermanentLockedAccount.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgCreatePermanentLockedAccountProtoMsg): MsgCreatePermanentLockedAccount {
+    return MsgCreatePermanentLockedAccount.decode(message.value);
+  },
+
+  toProto(message: MsgCreatePermanentLockedAccount): Uint8Array {
+    return MsgCreatePermanentLockedAccount.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCreatePermanentLockedAccount): MsgCreatePermanentLockedAccountProtoMsg {
+    return {
+      typeUrl: "/cosmos.vesting.v1beta1.MsgCreatePermanentLockedAccount",
+      value: MsgCreatePermanentLockedAccount.encode(message).finish()
+    };
   }
 
 };
@@ -547,6 +634,9 @@ function createBaseMsgCreatePermanentLockedAccountResponse(): MsgCreatePermanent
 }
 
 export const MsgCreatePermanentLockedAccountResponse = {
+  typeUrl: "/cosmos.vesting.v1beta1.MsgCreatePermanentLockedAccountResponse",
+  aminoType: "cosmos-sdk/MsgCreatePermanentLockedAccountResponse",
+
   encode(_: MsgCreatePermanentLockedAccountResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -599,6 +689,32 @@ export const MsgCreatePermanentLockedAccountResponse = {
   toAmino(_: MsgCreatePermanentLockedAccountResponse): MsgCreatePermanentLockedAccountResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCreatePermanentLockedAccountResponseAminoMsg): MsgCreatePermanentLockedAccountResponse {
+    return MsgCreatePermanentLockedAccountResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgCreatePermanentLockedAccountResponse): MsgCreatePermanentLockedAccountResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgCreatePermanentLockedAccountResponse",
+      value: MsgCreatePermanentLockedAccountResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgCreatePermanentLockedAccountResponseProtoMsg): MsgCreatePermanentLockedAccountResponse {
+    return MsgCreatePermanentLockedAccountResponse.decode(message.value);
+  },
+
+  toProto(message: MsgCreatePermanentLockedAccountResponse): Uint8Array {
+    return MsgCreatePermanentLockedAccountResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCreatePermanentLockedAccountResponse): MsgCreatePermanentLockedAccountResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.vesting.v1beta1.MsgCreatePermanentLockedAccountResponse",
+      value: MsgCreatePermanentLockedAccountResponse.encode(message).finish()
+    };
   }
 
 };
@@ -613,6 +729,9 @@ function createBaseMsgCreatePeriodicVestingAccount(): MsgCreatePeriodicVestingAc
 }
 
 export const MsgCreatePeriodicVestingAccount = {
+  typeUrl: "/cosmos.vesting.v1beta1.MsgCreatePeriodicVestingAccount",
+  aminoType: "cosmos-sdk/MsgCreatePeriodicVestingAccount",
+
   encode(message: MsgCreatePeriodicVestingAccount, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.fromAddress !== "") {
       writer.uint32(10).string(message.fromAddress);
@@ -746,6 +865,32 @@ export const MsgCreatePeriodicVestingAccount = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCreatePeriodicVestingAccountAminoMsg): MsgCreatePeriodicVestingAccount {
+    return MsgCreatePeriodicVestingAccount.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgCreatePeriodicVestingAccount): MsgCreatePeriodicVestingAccountAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgCreatePeriodicVestingAccount",
+      value: MsgCreatePeriodicVestingAccount.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgCreatePeriodicVestingAccountProtoMsg): MsgCreatePeriodicVestingAccount {
+    return MsgCreatePeriodicVestingAccount.decode(message.value);
+  },
+
+  toProto(message: MsgCreatePeriodicVestingAccount): Uint8Array {
+    return MsgCreatePeriodicVestingAccount.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCreatePeriodicVestingAccount): MsgCreatePeriodicVestingAccountProtoMsg {
+    return {
+      typeUrl: "/cosmos.vesting.v1beta1.MsgCreatePeriodicVestingAccount",
+      value: MsgCreatePeriodicVestingAccount.encode(message).finish()
+    };
   }
 
 };
@@ -755,6 +900,9 @@ function createBaseMsgCreatePeriodicVestingAccountResponse(): MsgCreatePeriodicV
 }
 
 export const MsgCreatePeriodicVestingAccountResponse = {
+  typeUrl: "/cosmos.vesting.v1beta1.MsgCreatePeriodicVestingAccountResponse",
+  aminoType: "cosmos-sdk/MsgCreatePeriodicVestingAccountResponse",
+
   encode(_: MsgCreatePeriodicVestingAccountResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -807,6 +955,32 @@ export const MsgCreatePeriodicVestingAccountResponse = {
   toAmino(_: MsgCreatePeriodicVestingAccountResponse): MsgCreatePeriodicVestingAccountResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCreatePeriodicVestingAccountResponseAminoMsg): MsgCreatePeriodicVestingAccountResponse {
+    return MsgCreatePeriodicVestingAccountResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgCreatePeriodicVestingAccountResponse): MsgCreatePeriodicVestingAccountResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgCreatePeriodicVestingAccountResponse",
+      value: MsgCreatePeriodicVestingAccountResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgCreatePeriodicVestingAccountResponseProtoMsg): MsgCreatePeriodicVestingAccountResponse {
+    return MsgCreatePeriodicVestingAccountResponse.decode(message.value);
+  },
+
+  toProto(message: MsgCreatePeriodicVestingAccountResponse): Uint8Array {
+    return MsgCreatePeriodicVestingAccountResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCreatePeriodicVestingAccountResponse): MsgCreatePeriodicVestingAccountResponseProtoMsg {
+    return {
+      typeUrl: "/cosmos.vesting.v1beta1.MsgCreatePeriodicVestingAccountResponse",
+      value: MsgCreatePeriodicVestingAccountResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos/vesting/v1beta1/vesting.ts b/__fixtures__/outputv2/cosmos/vesting/v1beta1/vesting.ts
index 4a466fbac..b806782da 100644
--- a/__fixtures__/outputv2/cosmos/vesting/v1beta1/vesting.ts
+++ b/__fixtures__/outputv2/cosmos/vesting/v1beta1/vesting.ts
@@ -15,7 +15,7 @@ export interface BaseVestingAccount {
   delegatedVesting: Coin[];
   endTime: Long;
 }
-export interface BaseVestingAccountProtoType {
+export interface BaseVestingAccountProtoMsg {
   typeUrl: "/cosmos.vesting.v1beta1.BaseVestingAccount";
   value: Uint8Array;
 }
@@ -31,7 +31,7 @@ export interface BaseVestingAccountAmino {
   delegated_vesting: CoinAmino[];
   end_time: string;
 }
-export interface BaseVestingAccountAminoType {
+export interface BaseVestingAccountAminoMsg {
   type: "cosmos-sdk/BaseVestingAccount";
   value: BaseVestingAccountAmino;
 }
@@ -56,7 +56,7 @@ export interface ContinuousVestingAccount {
   baseVestingAccount?: BaseVestingAccount;
   startTime: Long;
 }
-export interface ContinuousVestingAccountProtoType {
+export interface ContinuousVestingAccountProtoMsg {
   typeUrl: "/cosmos.vesting.v1beta1.ContinuousVestingAccount";
   value: Uint8Array;
 }
@@ -69,7 +69,7 @@ export interface ContinuousVestingAccountAmino {
   base_vesting_account?: BaseVestingAccountAmino;
   start_time: string;
 }
-export interface ContinuousVestingAccountAminoType {
+export interface ContinuousVestingAccountAminoMsg {
   type: "cosmos-sdk/ContinuousVestingAccount";
   value: ContinuousVestingAccountAmino;
 }
@@ -91,7 +91,7 @@ export interface ContinuousVestingAccountSDKType {
 export interface DelayedVestingAccount {
   baseVestingAccount?: BaseVestingAccount;
 }
-export interface DelayedVestingAccountProtoType {
+export interface DelayedVestingAccountProtoMsg {
   typeUrl: "/cosmos.vesting.v1beta1.DelayedVestingAccount";
   value: Uint8Array;
 }
@@ -104,7 +104,7 @@ export interface DelayedVestingAccountProtoType {
 export interface DelayedVestingAccountAmino {
   base_vesting_account?: BaseVestingAccountAmino;
 }
-export interface DelayedVestingAccountAminoType {
+export interface DelayedVestingAccountAminoMsg {
   type: "cosmos-sdk/DelayedVestingAccount";
   value: DelayedVestingAccountAmino;
 }
@@ -123,7 +123,7 @@ export interface Period {
   length: Long;
   amount: Coin[];
 }
-export interface PeriodProtoType {
+export interface PeriodProtoMsg {
   typeUrl: "/cosmos.vesting.v1beta1.Period";
   value: Uint8Array;
 }
@@ -133,7 +133,7 @@ export interface PeriodAmino {
   length: string;
   amount: CoinAmino[];
 }
-export interface PeriodAminoType {
+export interface PeriodAminoMsg {
   type: "cosmos-sdk/Period";
   value: PeriodAmino;
 }
@@ -153,7 +153,7 @@ export interface PeriodicVestingAccount {
   startTime: Long;
   vestingPeriods: Period[];
 }
-export interface PeriodicVestingAccountProtoType {
+export interface PeriodicVestingAccountProtoMsg {
   typeUrl: "/cosmos.vesting.v1beta1.PeriodicVestingAccount";
   value: Uint8Array;
 }
@@ -167,7 +167,7 @@ export interface PeriodicVestingAccountAmino {
   start_time: string;
   vesting_periods: PeriodAmino[];
 }
-export interface PeriodicVestingAccountAminoType {
+export interface PeriodicVestingAccountAminoMsg {
   type: "cosmos-sdk/PeriodicVestingAccount";
   value: PeriodicVestingAccountAmino;
 }
@@ -192,7 +192,7 @@ export interface PeriodicVestingAccountSDKType {
 export interface PermanentLockedAccount {
   baseVestingAccount?: BaseVestingAccount;
 }
-export interface PermanentLockedAccountProtoType {
+export interface PermanentLockedAccountProtoMsg {
   typeUrl: "/cosmos.vesting.v1beta1.PermanentLockedAccount";
   value: Uint8Array;
 }
@@ -207,7 +207,7 @@ export interface PermanentLockedAccountProtoType {
 export interface PermanentLockedAccountAmino {
   base_vesting_account?: BaseVestingAccountAmino;
 }
-export interface PermanentLockedAccountAminoType {
+export interface PermanentLockedAccountAminoMsg {
   type: "cosmos-sdk/PermanentLockedAccount";
   value: PermanentLockedAccountAmino;
 }
@@ -234,6 +234,9 @@ function createBaseBaseVestingAccount(): BaseVestingAccount {
 }
 
 export const BaseVestingAccount = {
+  typeUrl: "/cosmos.vesting.v1beta1.BaseVestingAccount",
+  aminoType: "cosmos-sdk/BaseVestingAccount",
+
   encode(message: BaseVestingAccount, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.baseAccount !== undefined) {
       BaseAccount.encode(message.baseAccount, writer.uint32(10).fork()).ldelim();
@@ -412,6 +415,32 @@ export const BaseVestingAccount = {
 
     obj.end_time = message.endTime ? message.endTime.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: BaseVestingAccountAminoMsg): BaseVestingAccount {
+    return BaseVestingAccount.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: BaseVestingAccount): BaseVestingAccountAminoMsg {
+    return {
+      type: "cosmos-sdk/BaseVestingAccount",
+      value: BaseVestingAccount.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: BaseVestingAccountProtoMsg): BaseVestingAccount {
+    return BaseVestingAccount.decode(message.value);
+  },
+
+  toProto(message: BaseVestingAccount): Uint8Array {
+    return BaseVestingAccount.encode(message).finish();
+  },
+
+  toProtoMsg(message: BaseVestingAccount): BaseVestingAccountProtoMsg {
+    return {
+      typeUrl: "/cosmos.vesting.v1beta1.BaseVestingAccount",
+      value: BaseVestingAccount.encode(message).finish()
+    };
   }
 
 };
@@ -424,6 +453,9 @@ function createBaseContinuousVestingAccount(): ContinuousVestingAccount {
 }
 
 export const ContinuousVestingAccount = {
+  typeUrl: "/cosmos.vesting.v1beta1.ContinuousVestingAccount",
+  aminoType: "cosmos-sdk/ContinuousVestingAccount",
+
   encode(message: ContinuousVestingAccount, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.baseVestingAccount !== undefined) {
       BaseVestingAccount.encode(message.baseVestingAccount, writer.uint32(10).fork()).ldelim();
@@ -509,6 +541,32 @@ export const ContinuousVestingAccount = {
     obj.base_vesting_account = message.baseVestingAccount ? BaseVestingAccount.toAmino(message.baseVestingAccount) : undefined;
     obj.start_time = message.startTime ? message.startTime.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ContinuousVestingAccountAminoMsg): ContinuousVestingAccount {
+    return ContinuousVestingAccount.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ContinuousVestingAccount): ContinuousVestingAccountAminoMsg {
+    return {
+      type: "cosmos-sdk/ContinuousVestingAccount",
+      value: ContinuousVestingAccount.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ContinuousVestingAccountProtoMsg): ContinuousVestingAccount {
+    return ContinuousVestingAccount.decode(message.value);
+  },
+
+  toProto(message: ContinuousVestingAccount): Uint8Array {
+    return ContinuousVestingAccount.encode(message).finish();
+  },
+
+  toProtoMsg(message: ContinuousVestingAccount): ContinuousVestingAccountProtoMsg {
+    return {
+      typeUrl: "/cosmos.vesting.v1beta1.ContinuousVestingAccount",
+      value: ContinuousVestingAccount.encode(message).finish()
+    };
   }
 
 };
@@ -520,6 +578,9 @@ function createBaseDelayedVestingAccount(): DelayedVestingAccount {
 }
 
 export const DelayedVestingAccount = {
+  typeUrl: "/cosmos.vesting.v1beta1.DelayedVestingAccount",
+  aminoType: "cosmos-sdk/DelayedVestingAccount",
+
   encode(message: DelayedVestingAccount, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.baseVestingAccount !== undefined) {
       BaseVestingAccount.encode(message.baseVestingAccount, writer.uint32(10).fork()).ldelim();
@@ -590,6 +651,32 @@ export const DelayedVestingAccount = {
     const obj: any = {};
     obj.base_vesting_account = message.baseVestingAccount ? BaseVestingAccount.toAmino(message.baseVestingAccount) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: DelayedVestingAccountAminoMsg): DelayedVestingAccount {
+    return DelayedVestingAccount.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: DelayedVestingAccount): DelayedVestingAccountAminoMsg {
+    return {
+      type: "cosmos-sdk/DelayedVestingAccount",
+      value: DelayedVestingAccount.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: DelayedVestingAccountProtoMsg): DelayedVestingAccount {
+    return DelayedVestingAccount.decode(message.value);
+  },
+
+  toProto(message: DelayedVestingAccount): Uint8Array {
+    return DelayedVestingAccount.encode(message).finish();
+  },
+
+  toProtoMsg(message: DelayedVestingAccount): DelayedVestingAccountProtoMsg {
+    return {
+      typeUrl: "/cosmos.vesting.v1beta1.DelayedVestingAccount",
+      value: DelayedVestingAccount.encode(message).finish()
+    };
   }
 
 };
@@ -602,6 +689,9 @@ function createBasePeriod(): Period {
 }
 
 export const Period = {
+  typeUrl: "/cosmos.vesting.v1beta1.Period",
+  aminoType: "cosmos-sdk/Period",
+
   encode(message: Period, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.length.isZero()) {
       writer.uint32(8).int64(message.length);
@@ -705,6 +795,32 @@ export const Period = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: PeriodAminoMsg): Period {
+    return Period.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Period): PeriodAminoMsg {
+    return {
+      type: "cosmos-sdk/Period",
+      value: Period.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: PeriodProtoMsg): Period {
+    return Period.decode(message.value);
+  },
+
+  toProto(message: Period): Uint8Array {
+    return Period.encode(message).finish();
+  },
+
+  toProtoMsg(message: Period): PeriodProtoMsg {
+    return {
+      typeUrl: "/cosmos.vesting.v1beta1.Period",
+      value: Period.encode(message).finish()
+    };
   }
 
 };
@@ -718,6 +834,9 @@ function createBasePeriodicVestingAccount(): PeriodicVestingAccount {
 }
 
 export const PeriodicVestingAccount = {
+  typeUrl: "/cosmos.vesting.v1beta1.PeriodicVestingAccount",
+  aminoType: "cosmos-sdk/PeriodicVestingAccount",
+
   encode(message: PeriodicVestingAccount, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.baseVestingAccount !== undefined) {
       BaseVestingAccount.encode(message.baseVestingAccount, writer.uint32(10).fork()).ldelim();
@@ -836,6 +955,32 @@ export const PeriodicVestingAccount = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: PeriodicVestingAccountAminoMsg): PeriodicVestingAccount {
+    return PeriodicVestingAccount.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: PeriodicVestingAccount): PeriodicVestingAccountAminoMsg {
+    return {
+      type: "cosmos-sdk/PeriodicVestingAccount",
+      value: PeriodicVestingAccount.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: PeriodicVestingAccountProtoMsg): PeriodicVestingAccount {
+    return PeriodicVestingAccount.decode(message.value);
+  },
+
+  toProto(message: PeriodicVestingAccount): Uint8Array {
+    return PeriodicVestingAccount.encode(message).finish();
+  },
+
+  toProtoMsg(message: PeriodicVestingAccount): PeriodicVestingAccountProtoMsg {
+    return {
+      typeUrl: "/cosmos.vesting.v1beta1.PeriodicVestingAccount",
+      value: PeriodicVestingAccount.encode(message).finish()
+    };
   }
 
 };
@@ -847,6 +992,9 @@ function createBasePermanentLockedAccount(): PermanentLockedAccount {
 }
 
 export const PermanentLockedAccount = {
+  typeUrl: "/cosmos.vesting.v1beta1.PermanentLockedAccount",
+  aminoType: "cosmos-sdk/PermanentLockedAccount",
+
   encode(message: PermanentLockedAccount, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.baseVestingAccount !== undefined) {
       BaseVestingAccount.encode(message.baseVestingAccount, writer.uint32(10).fork()).ldelim();
@@ -917,6 +1065,32 @@ export const PermanentLockedAccount = {
     const obj: any = {};
     obj.base_vesting_account = message.baseVestingAccount ? BaseVestingAccount.toAmino(message.baseVestingAccount) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: PermanentLockedAccountAminoMsg): PermanentLockedAccount {
+    return PermanentLockedAccount.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: PermanentLockedAccount): PermanentLockedAccountAminoMsg {
+    return {
+      type: "cosmos-sdk/PermanentLockedAccount",
+      value: PermanentLockedAccount.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: PermanentLockedAccountProtoMsg): PermanentLockedAccount {
+    return PermanentLockedAccount.decode(message.value);
+  },
+
+  toProto(message: PermanentLockedAccount): Uint8Array {
+    return PermanentLockedAccount.encode(message).finish();
+  },
+
+  toProtoMsg(message: PermanentLockedAccount): PermanentLockedAccountProtoMsg {
+    return {
+      typeUrl: "/cosmos.vesting.v1beta1.PermanentLockedAccount",
+      value: PermanentLockedAccount.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmos_proto/cosmos.ts b/__fixtures__/outputv2/cosmos_proto/cosmos.ts
index e3fee20d5..cd6fe5102 100644
--- a/__fixtures__/outputv2/cosmos_proto/cosmos.ts
+++ b/__fixtures__/outputv2/cosmos_proto/cosmos.ts
@@ -65,7 +65,7 @@ export interface InterfaceDescriptor {
    */
   description: string;
 }
-export interface InterfaceDescriptorProtoType {
+export interface InterfaceDescriptorProtoMsg {
   typeUrl: "/cosmos_proto.InterfaceDescriptor";
   value: Uint8Array;
 }
@@ -89,7 +89,7 @@ export interface InterfaceDescriptorAmino {
    */
   description: string;
 }
-export interface InterfaceDescriptorAminoType {
+export interface InterfaceDescriptorAminoMsg {
   type: "/cosmos_proto.InterfaceDescriptor";
   value: InterfaceDescriptorAmino;
 }
@@ -136,7 +136,7 @@ export interface ScalarDescriptor {
    */
   fieldType: ScalarType[];
 }
-export interface ScalarDescriptorProtoType {
+export interface ScalarDescriptorProtoMsg {
   typeUrl: "/cosmos_proto.ScalarDescriptor";
   value: Uint8Array;
 }
@@ -174,7 +174,7 @@ export interface ScalarDescriptorAmino {
    */
   field_type: ScalarType[];
 }
-export interface ScalarDescriptorAminoType {
+export interface ScalarDescriptorAminoMsg {
   type: "/cosmos_proto.ScalarDescriptor";
   value: ScalarDescriptorAmino;
 }
@@ -202,6 +202,8 @@ function createBaseInterfaceDescriptor(): InterfaceDescriptor {
 }
 
 export const InterfaceDescriptor = {
+  typeUrl: "/cosmos_proto.InterfaceDescriptor",
+
   encode(message: InterfaceDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -287,6 +289,25 @@ export const InterfaceDescriptor = {
     obj.name = message.name;
     obj.description = message.description;
     return obj;
+  },
+
+  fromAminoMsg(object: InterfaceDescriptorAminoMsg): InterfaceDescriptor {
+    return InterfaceDescriptor.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: InterfaceDescriptorProtoMsg): InterfaceDescriptor {
+    return InterfaceDescriptor.decode(message.value);
+  },
+
+  toProto(message: InterfaceDescriptor): Uint8Array {
+    return InterfaceDescriptor.encode(message).finish();
+  },
+
+  toProtoMsg(message: InterfaceDescriptor): InterfaceDescriptorProtoMsg {
+    return {
+      typeUrl: "/cosmos_proto.InterfaceDescriptor",
+      value: InterfaceDescriptor.encode(message).finish()
+    };
   }
 
 };
@@ -300,6 +321,8 @@ function createBaseScalarDescriptor(): ScalarDescriptor {
 }
 
 export const ScalarDescriptor = {
+  typeUrl: "/cosmos_proto.ScalarDescriptor",
+
   encode(message: ScalarDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -430,6 +453,25 @@ export const ScalarDescriptor = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ScalarDescriptorAminoMsg): ScalarDescriptor {
+    return ScalarDescriptor.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ScalarDescriptorProtoMsg): ScalarDescriptor {
+    return ScalarDescriptor.decode(message.value);
+  },
+
+  toProto(message: ScalarDescriptor): Uint8Array {
+    return ScalarDescriptor.encode(message).finish();
+  },
+
+  toProtoMsg(message: ScalarDescriptor): ScalarDescriptorProtoMsg {
+    return {
+      typeUrl: "/cosmos_proto.ScalarDescriptor",
+      value: ScalarDescriptor.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmwasm/wasm/v1/genesis.ts b/__fixtures__/outputv2/cosmwasm/wasm/v1/genesis.ts
index f9db631a7..14a936e9a 100644
--- a/__fixtures__/outputv2/cosmwasm/wasm/v1/genesis.ts
+++ b/__fixtures__/outputv2/cosmwasm/wasm/v1/genesis.ts
@@ -12,7 +12,7 @@ export interface GenesisState {
   sequences: Sequence[];
   genMsgs: GenesisState_GenMsgs[];
 }
-export interface GenesisStateProtoType {
+export interface GenesisStateProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.GenesisState";
   value: Uint8Array;
 }
@@ -25,7 +25,7 @@ export interface GenesisStateAmino {
   sequences: SequenceAmino[];
   gen_msgs: GenesisState_GenMsgsAmino[];
 }
-export interface GenesisStateAminoType {
+export interface GenesisStateAminoMsg {
   type: "wasm/GenesisState";
   value: GenesisStateAmino;
 }
@@ -48,7 +48,7 @@ export interface GenesisState_GenMsgs {
   instantiateContract?: MsgInstantiateContract;
   executeContract?: MsgExecuteContract;
 }
-export interface GenesisState_GenMsgsProtoType {
+export interface GenesisState_GenMsgsProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.GenMsgs";
   value: Uint8Array;
 }
@@ -62,7 +62,7 @@ export interface GenesisState_GenMsgsAmino {
   instantiate_contract?: MsgInstantiateContractAmino;
   execute_contract?: MsgExecuteContractAmino;
 }
-export interface GenesisState_GenMsgsAminoType {
+export interface GenesisState_GenMsgsAminoMsg {
   type: "wasm/GenMsgs";
   value: GenesisState_GenMsgsAmino;
 }
@@ -86,7 +86,7 @@ export interface Code {
   /** Pinned to wasmvm cache */
   pinned: boolean;
 }
-export interface CodeProtoType {
+export interface CodeProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.Code";
   value: Uint8Array;
 }
@@ -100,7 +100,7 @@ export interface CodeAmino {
   /** Pinned to wasmvm cache */
   pinned: boolean;
 }
-export interface CodeAminoType {
+export interface CodeAminoMsg {
   type: "wasm/Code";
   value: CodeAmino;
 }
@@ -119,7 +119,7 @@ export interface Contract {
   contractInfo?: ContractInfo;
   contractState: Model[];
 }
-export interface ContractProtoType {
+export interface ContractProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.Contract";
   value: Uint8Array;
 }
@@ -130,7 +130,7 @@ export interface ContractAmino {
   contract_info?: ContractInfoAmino;
   contract_state: ModelAmino[];
 }
-export interface ContractAminoType {
+export interface ContractAminoMsg {
   type: "wasm/Contract";
   value: ContractAmino;
 }
@@ -147,7 +147,7 @@ export interface Sequence {
   idKey: Uint8Array;
   value: Long;
 }
-export interface SequenceProtoType {
+export interface SequenceProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.Sequence";
   value: Uint8Array;
 }
@@ -157,7 +157,7 @@ export interface SequenceAmino {
   id_key: Uint8Array;
   value: string;
 }
-export interface SequenceAminoType {
+export interface SequenceAminoMsg {
   type: "wasm/Sequence";
   value: SequenceAmino;
 }
@@ -179,6 +179,9 @@ function createBaseGenesisState(): GenesisState {
 }
 
 export const GenesisState = {
+  typeUrl: "/cosmwasm.wasm.v1.GenesisState",
+  aminoType: "wasm/GenesisState",
+
   encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.params !== undefined) {
       Params.encode(message.params, writer.uint32(10).fork()).ldelim();
@@ -372,6 +375,32 @@ export const GenesisState = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisStateAminoMsg): GenesisState {
+    return GenesisState.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GenesisState): GenesisStateAminoMsg {
+    return {
+      type: "wasm/GenesisState",
+      value: GenesisState.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GenesisStateProtoMsg): GenesisState {
+    return GenesisState.decode(message.value);
+  },
+
+  toProto(message: GenesisState): Uint8Array {
+    return GenesisState.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisState): GenesisStateProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.GenesisState",
+      value: GenesisState.encode(message).finish()
+    };
   }
 
 };
@@ -385,6 +414,9 @@ function createBaseGenesisState_GenMsgs(): GenesisState_GenMsgs {
 }
 
 export const GenesisState_GenMsgs = {
+  typeUrl: "/cosmwasm.wasm.v1.GenMsgs",
+  aminoType: "wasm/GenMsgs",
+
   encode(message: GenesisState_GenMsgs, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.storeCode !== undefined) {
       MsgStoreCode.encode(message.storeCode, writer.uint32(10).fork()).ldelim();
@@ -485,6 +517,32 @@ export const GenesisState_GenMsgs = {
     obj.instantiate_contract = message.instantiateContract ? MsgInstantiateContract.toAmino(message.instantiateContract) : undefined;
     obj.execute_contract = message.executeContract ? MsgExecuteContract.toAmino(message.executeContract) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisState_GenMsgsAminoMsg): GenesisState_GenMsgs {
+    return GenesisState_GenMsgs.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GenesisState_GenMsgs): GenesisState_GenMsgsAminoMsg {
+    return {
+      type: "wasm/GenMsgs",
+      value: GenesisState_GenMsgs.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GenesisState_GenMsgsProtoMsg): GenesisState_GenMsgs {
+    return GenesisState_GenMsgs.decode(message.value);
+  },
+
+  toProto(message: GenesisState_GenMsgs): Uint8Array {
+    return GenesisState_GenMsgs.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisState_GenMsgs): GenesisState_GenMsgsProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.GenMsgs",
+      value: GenesisState_GenMsgs.encode(message).finish()
+    };
   }
 
 };
@@ -499,6 +557,9 @@ function createBaseCode(): Code {
 }
 
 export const Code = {
+  typeUrl: "/cosmwasm.wasm.v1.Code",
+  aminoType: "wasm/Code",
+
   encode(message: Code, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.codeId.isZero()) {
       writer.uint32(8).uint64(message.codeId);
@@ -614,6 +675,32 @@ export const Code = {
     obj.code_bytes = message.codeBytes;
     obj.pinned = message.pinned;
     return obj;
+  },
+
+  fromAminoMsg(object: CodeAminoMsg): Code {
+    return Code.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Code): CodeAminoMsg {
+    return {
+      type: "wasm/Code",
+      value: Code.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: CodeProtoMsg): Code {
+    return Code.decode(message.value);
+  },
+
+  toProto(message: Code): Uint8Array {
+    return Code.encode(message).finish();
+  },
+
+  toProtoMsg(message: Code): CodeProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.Code",
+      value: Code.encode(message).finish()
+    };
   }
 
 };
@@ -627,6 +714,9 @@ function createBaseContract(): Contract {
 }
 
 export const Contract = {
+  typeUrl: "/cosmwasm.wasm.v1.Contract",
+  aminoType: "wasm/Contract",
+
   encode(message: Contract, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.contractAddress !== "") {
       writer.uint32(10).string(message.contractAddress);
@@ -745,6 +835,32 @@ export const Contract = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ContractAminoMsg): Contract {
+    return Contract.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Contract): ContractAminoMsg {
+    return {
+      type: "wasm/Contract",
+      value: Contract.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ContractProtoMsg): Contract {
+    return Contract.decode(message.value);
+  },
+
+  toProto(message: Contract): Uint8Array {
+    return Contract.encode(message).finish();
+  },
+
+  toProtoMsg(message: Contract): ContractProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.Contract",
+      value: Contract.encode(message).finish()
+    };
   }
 
 };
@@ -757,6 +873,9 @@ function createBaseSequence(): Sequence {
 }
 
 export const Sequence = {
+  typeUrl: "/cosmwasm.wasm.v1.Sequence",
+  aminoType: "wasm/Sequence",
+
   encode(message: Sequence, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.idKey.length !== 0) {
       writer.uint32(10).bytes(message.idKey);
@@ -842,6 +961,32 @@ export const Sequence = {
     obj.id_key = message.idKey;
     obj.value = message.value ? message.value.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: SequenceAminoMsg): Sequence {
+    return Sequence.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Sequence): SequenceAminoMsg {
+    return {
+      type: "wasm/Sequence",
+      value: Sequence.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: SequenceProtoMsg): Sequence {
+    return Sequence.decode(message.value);
+  },
+
+  toProto(message: Sequence): Uint8Array {
+    return Sequence.encode(message).finish();
+  },
+
+  toProtoMsg(message: Sequence): SequenceProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.Sequence",
+      value: Sequence.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmwasm/wasm/v1/ibc.ts b/__fixtures__/outputv2/cosmwasm/wasm/v1/ibc.ts
index 0c313df78..0d20a51d6 100644
--- a/__fixtures__/outputv2/cosmwasm/wasm/v1/ibc.ts
+++ b/__fixtures__/outputv2/cosmwasm/wasm/v1/ibc.ts
@@ -25,7 +25,7 @@ export interface MsgIBCSend {
    */
   data: Uint8Array;
 }
-export interface MsgIBCSendProtoType {
+export interface MsgIBCSendProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.MsgIBCSend";
   value: Uint8Array;
 }
@@ -53,7 +53,7 @@ export interface MsgIBCSendAmino {
    */
   data: Uint8Array;
 }
-export interface MsgIBCSendAminoType {
+export interface MsgIBCSendAminoMsg {
   type: "wasm/MsgIBCSend";
   value: MsgIBCSendAmino;
 }
@@ -70,7 +70,7 @@ export interface MsgIBCSendSDKType {
 export interface MsgIBCCloseChannel {
   channel: string;
 }
-export interface MsgIBCCloseChannelProtoType {
+export interface MsgIBCCloseChannelProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.MsgIBCCloseChannel";
   value: Uint8Array;
 }
@@ -79,7 +79,7 @@ export interface MsgIBCCloseChannelProtoType {
 export interface MsgIBCCloseChannelAmino {
   channel: string;
 }
-export interface MsgIBCCloseChannelAminoType {
+export interface MsgIBCCloseChannelAminoMsg {
   type: "wasm/MsgIBCCloseChannel";
   value: MsgIBCCloseChannelAmino;
 }
@@ -99,6 +99,9 @@ function createBaseMsgIBCSend(): MsgIBCSend {
 }
 
 export const MsgIBCSend = {
+  typeUrl: "/cosmwasm.wasm.v1.MsgIBCSend",
+  aminoType: "wasm/MsgIBCSend",
+
   encode(message: MsgIBCSend, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.channel !== "") {
       writer.uint32(18).string(message.channel);
@@ -214,6 +217,32 @@ export const MsgIBCSend = {
     obj.timeout_timestamp = message.timeoutTimestamp ? message.timeoutTimestamp.toString() : undefined;
     obj.data = message.data;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgIBCSendAminoMsg): MsgIBCSend {
+    return MsgIBCSend.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgIBCSend): MsgIBCSendAminoMsg {
+    return {
+      type: "wasm/MsgIBCSend",
+      value: MsgIBCSend.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgIBCSendProtoMsg): MsgIBCSend {
+    return MsgIBCSend.decode(message.value);
+  },
+
+  toProto(message: MsgIBCSend): Uint8Array {
+    return MsgIBCSend.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgIBCSend): MsgIBCSendProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgIBCSend",
+      value: MsgIBCSend.encode(message).finish()
+    };
   }
 
 };
@@ -225,6 +254,9 @@ function createBaseMsgIBCCloseChannel(): MsgIBCCloseChannel {
 }
 
 export const MsgIBCCloseChannel = {
+  typeUrl: "/cosmwasm.wasm.v1.MsgIBCCloseChannel",
+  aminoType: "wasm/MsgIBCCloseChannel",
+
   encode(message: MsgIBCCloseChannel, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.channel !== "") {
       writer.uint32(18).string(message.channel);
@@ -295,6 +327,32 @@ export const MsgIBCCloseChannel = {
     const obj: any = {};
     obj.channel = message.channel;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgIBCCloseChannelAminoMsg): MsgIBCCloseChannel {
+    return MsgIBCCloseChannel.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgIBCCloseChannel): MsgIBCCloseChannelAminoMsg {
+    return {
+      type: "wasm/MsgIBCCloseChannel",
+      value: MsgIBCCloseChannel.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgIBCCloseChannelProtoMsg): MsgIBCCloseChannel {
+    return MsgIBCCloseChannel.decode(message.value);
+  },
+
+  toProto(message: MsgIBCCloseChannel): Uint8Array {
+    return MsgIBCCloseChannel.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgIBCCloseChannel): MsgIBCCloseChannelProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgIBCCloseChannel",
+      value: MsgIBCCloseChannel.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmwasm/wasm/v1/proposal.ts b/__fixtures__/outputv2/cosmwasm/wasm/v1/proposal.ts
index c381eeb90..779165559 100644
--- a/__fixtures__/outputv2/cosmwasm/wasm/v1/proposal.ts
+++ b/__fixtures__/outputv2/cosmwasm/wasm/v1/proposal.ts
@@ -22,7 +22,7 @@ export interface StoreCodeProposal {
   /** InstantiatePermission to apply on contract creation, optional */
   instantiatePermission?: AccessConfig;
 }
-export interface StoreCodeProposalProtoType {
+export interface StoreCodeProposalProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.StoreCodeProposal";
   value: Uint8Array;
 }
@@ -44,7 +44,7 @@ export interface StoreCodeProposalAmino {
   /** InstantiatePermission to apply on contract creation, optional */
   instantiate_permission?: AccessConfigAmino;
 }
-export interface StoreCodeProposalAminoType {
+export interface StoreCodeProposalAminoMsg {
   type: "wasm/StoreCodeProposal";
   value: StoreCodeProposalAmino;
 }
@@ -87,7 +87,7 @@ export interface InstantiateContractProposal {
   /** Funds coins that are transferred to the contract on instantiation */
   funds: Coin[];
 }
-export interface InstantiateContractProposalProtoType {
+export interface InstantiateContractProposalProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.InstantiateContractProposal";
   value: Uint8Array;
 }
@@ -121,7 +121,7 @@ export interface InstantiateContractProposalAmino {
   /** Funds coins that are transferred to the contract on instantiation */
   funds: CoinAmino[];
 }
-export interface InstantiateContractProposalAminoType {
+export interface InstantiateContractProposalAminoMsg {
   type: "wasm/InstantiateContractProposal";
   value: InstantiateContractProposalAmino;
 }
@@ -158,7 +158,7 @@ export interface MigrateContractProposal {
   /** Msg json encoded message to be passed to the contract on migration */
   msg: Uint8Array;
 }
-export interface MigrateContractProposalProtoType {
+export interface MigrateContractProposalProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.MigrateContractProposal";
   value: Uint8Array;
 }
@@ -180,7 +180,7 @@ export interface MigrateContractProposalAmino {
   /** Msg json encoded message to be passed to the contract on migration */
   msg: Uint8Array;
 }
-export interface MigrateContractProposalAminoType {
+export interface MigrateContractProposalAminoMsg {
   type: "wasm/MigrateContractProposal";
   value: MigrateContractProposalAmino;
 }
@@ -208,7 +208,7 @@ export interface SudoContractProposal {
   /** Msg json encoded message to be passed to the contract as sudo */
   msg: Uint8Array;
 }
-export interface SudoContractProposalProtoType {
+export interface SudoContractProposalProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.SudoContractProposal";
   value: Uint8Array;
 }
@@ -227,7 +227,7 @@ export interface SudoContractProposalAmino {
   /** Msg json encoded message to be passed to the contract as sudo */
   msg: Uint8Array;
 }
-export interface SudoContractProposalAminoType {
+export interface SudoContractProposalAminoMsg {
   type: "wasm/SudoContractProposal";
   value: SudoContractProposalAmino;
 }
@@ -263,7 +263,7 @@ export interface ExecuteContractProposal {
   /** Funds coins that are transferred to the contract on instantiation */
   funds: Coin[];
 }
-export interface ExecuteContractProposalProtoType {
+export interface ExecuteContractProposalProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.ExecuteContractProposal";
   value: Uint8Array;
 }
@@ -291,7 +291,7 @@ export interface ExecuteContractProposalAmino {
   /** Funds coins that are transferred to the contract on instantiation */
   funds: CoinAmino[];
 }
-export interface ExecuteContractProposalAminoType {
+export interface ExecuteContractProposalAminoMsg {
   type: "wasm/ExecuteContractProposal";
   value: ExecuteContractProposalAmino;
 }
@@ -323,7 +323,7 @@ export interface UpdateAdminProposal {
   /** Contract is the address of the smart contract */
   contract: string;
 }
-export interface UpdateAdminProposalProtoType {
+export interface UpdateAdminProposalProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.UpdateAdminProposal";
   value: Uint8Array;
 }
@@ -342,7 +342,7 @@ export interface UpdateAdminProposalAmino {
   /** Contract is the address of the smart contract */
   contract: string;
 }
-export interface UpdateAdminProposalAminoType {
+export interface UpdateAdminProposalAminoMsg {
   type: "wasm/UpdateAdminProposal";
   value: UpdateAdminProposalAmino;
 }
@@ -369,7 +369,7 @@ export interface ClearAdminProposal {
   /** Contract is the address of the smart contract */
   contract: string;
 }
-export interface ClearAdminProposalProtoType {
+export interface ClearAdminProposalProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.ClearAdminProposal";
   value: Uint8Array;
 }
@@ -388,7 +388,7 @@ export interface ClearAdminProposalAmino {
   /** Contract is the address of the smart contract */
   contract: string;
 }
-export interface ClearAdminProposalAminoType {
+export interface ClearAdminProposalAminoMsg {
   type: "wasm/ClearAdminProposal";
   value: ClearAdminProposalAmino;
 }
@@ -417,7 +417,7 @@ export interface PinCodesProposal {
   /** CodeIDs references the new WASM codes */
   codeIds: Long[];
 }
-export interface PinCodesProposalProtoType {
+export interface PinCodesProposalProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.PinCodesProposal";
   value: Uint8Array;
 }
@@ -436,7 +436,7 @@ export interface PinCodesProposalAmino {
   /** CodeIDs references the new WASM codes */
   code_ids: string[];
 }
-export interface PinCodesProposalAminoType {
+export interface PinCodesProposalAminoMsg {
   type: "wasm/PinCodesProposal";
   value: PinCodesProposalAmino;
 }
@@ -465,7 +465,7 @@ export interface UnpinCodesProposal {
   /** CodeIDs references the WASM codes */
   codeIds: Long[];
 }
-export interface UnpinCodesProposalProtoType {
+export interface UnpinCodesProposalProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.UnpinCodesProposal";
   value: Uint8Array;
 }
@@ -484,7 +484,7 @@ export interface UnpinCodesProposalAmino {
   /** CodeIDs references the WASM codes */
   code_ids: string[];
 }
-export interface UnpinCodesProposalAminoType {
+export interface UnpinCodesProposalAminoMsg {
   type: "wasm/UnpinCodesProposal";
   value: UnpinCodesProposalAmino;
 }
@@ -510,6 +510,9 @@ function createBaseStoreCodeProposal(): StoreCodeProposal {
 }
 
 export const StoreCodeProposal = {
+  typeUrl: "/cosmwasm.wasm.v1.StoreCodeProposal",
+  aminoType: "wasm/StoreCodeProposal",
+
   encode(message: StoreCodeProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.title !== "") {
       writer.uint32(10).string(message.title);
@@ -640,6 +643,32 @@ export const StoreCodeProposal = {
     obj.wasm_byte_code = message.wasmByteCode ? toBase64(message.wasmByteCode) : undefined;
     obj.instantiate_permission = message.instantiatePermission ? AccessConfig.toAmino(message.instantiatePermission) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: StoreCodeProposalAminoMsg): StoreCodeProposal {
+    return StoreCodeProposal.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: StoreCodeProposal): StoreCodeProposalAminoMsg {
+    return {
+      type: "wasm/StoreCodeProposal",
+      value: StoreCodeProposal.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: StoreCodeProposalProtoMsg): StoreCodeProposal {
+    return StoreCodeProposal.decode(message.value);
+  },
+
+  toProto(message: StoreCodeProposal): Uint8Array {
+    return StoreCodeProposal.encode(message).finish();
+  },
+
+  toProtoMsg(message: StoreCodeProposal): StoreCodeProposalProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.StoreCodeProposal",
+      value: StoreCodeProposal.encode(message).finish()
+    };
   }
 
 };
@@ -658,6 +687,9 @@ function createBaseInstantiateContractProposal(): InstantiateContractProposal {
 }
 
 export const InstantiateContractProposal = {
+  typeUrl: "/cosmwasm.wasm.v1.InstantiateContractProposal",
+  aminoType: "wasm/InstantiateContractProposal",
+
   encode(message: InstantiateContractProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.title !== "") {
       writer.uint32(10).string(message.title);
@@ -851,6 +883,32 @@ export const InstantiateContractProposal = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: InstantiateContractProposalAminoMsg): InstantiateContractProposal {
+    return InstantiateContractProposal.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: InstantiateContractProposal): InstantiateContractProposalAminoMsg {
+    return {
+      type: "wasm/InstantiateContractProposal",
+      value: InstantiateContractProposal.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: InstantiateContractProposalProtoMsg): InstantiateContractProposal {
+    return InstantiateContractProposal.decode(message.value);
+  },
+
+  toProto(message: InstantiateContractProposal): Uint8Array {
+    return InstantiateContractProposal.encode(message).finish();
+  },
+
+  toProtoMsg(message: InstantiateContractProposal): InstantiateContractProposalProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.InstantiateContractProposal",
+      value: InstantiateContractProposal.encode(message).finish()
+    };
   }
 
 };
@@ -866,6 +924,9 @@ function createBaseMigrateContractProposal(): MigrateContractProposal {
 }
 
 export const MigrateContractProposal = {
+  typeUrl: "/cosmwasm.wasm.v1.MigrateContractProposal",
+  aminoType: "wasm/MigrateContractProposal",
+
   encode(message: MigrateContractProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.title !== "") {
       writer.uint32(10).string(message.title);
@@ -996,6 +1057,32 @@ export const MigrateContractProposal = {
     obj.code_id = message.codeId ? message.codeId.toString() : undefined;
     obj.msg = message.msg ? JSON.parse(fromUtf8(message.msg)) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MigrateContractProposalAminoMsg): MigrateContractProposal {
+    return MigrateContractProposal.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MigrateContractProposal): MigrateContractProposalAminoMsg {
+    return {
+      type: "wasm/MigrateContractProposal",
+      value: MigrateContractProposal.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MigrateContractProposalProtoMsg): MigrateContractProposal {
+    return MigrateContractProposal.decode(message.value);
+  },
+
+  toProto(message: MigrateContractProposal): Uint8Array {
+    return MigrateContractProposal.encode(message).finish();
+  },
+
+  toProtoMsg(message: MigrateContractProposal): MigrateContractProposalProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MigrateContractProposal",
+      value: MigrateContractProposal.encode(message).finish()
+    };
   }
 
 };
@@ -1010,6 +1097,9 @@ function createBaseSudoContractProposal(): SudoContractProposal {
 }
 
 export const SudoContractProposal = {
+  typeUrl: "/cosmwasm.wasm.v1.SudoContractProposal",
+  aminoType: "wasm/SudoContractProposal",
+
   encode(message: SudoContractProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.title !== "") {
       writer.uint32(10).string(message.title);
@@ -1125,6 +1215,32 @@ export const SudoContractProposal = {
     obj.contract = message.contract;
     obj.msg = message.msg ? JSON.parse(fromUtf8(message.msg)) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: SudoContractProposalAminoMsg): SudoContractProposal {
+    return SudoContractProposal.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: SudoContractProposal): SudoContractProposalAminoMsg {
+    return {
+      type: "wasm/SudoContractProposal",
+      value: SudoContractProposal.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: SudoContractProposalProtoMsg): SudoContractProposal {
+    return SudoContractProposal.decode(message.value);
+  },
+
+  toProto(message: SudoContractProposal): Uint8Array {
+    return SudoContractProposal.encode(message).finish();
+  },
+
+  toProtoMsg(message: SudoContractProposal): SudoContractProposalProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.SudoContractProposal",
+      value: SudoContractProposal.encode(message).finish()
+    };
   }
 
 };
@@ -1141,6 +1257,9 @@ function createBaseExecuteContractProposal(): ExecuteContractProposal {
 }
 
 export const ExecuteContractProposal = {
+  typeUrl: "/cosmwasm.wasm.v1.ExecuteContractProposal",
+  aminoType: "wasm/ExecuteContractProposal",
+
   encode(message: ExecuteContractProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.title !== "") {
       writer.uint32(10).string(message.title);
@@ -1304,6 +1423,32 @@ export const ExecuteContractProposal = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ExecuteContractProposalAminoMsg): ExecuteContractProposal {
+    return ExecuteContractProposal.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ExecuteContractProposal): ExecuteContractProposalAminoMsg {
+    return {
+      type: "wasm/ExecuteContractProposal",
+      value: ExecuteContractProposal.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ExecuteContractProposalProtoMsg): ExecuteContractProposal {
+    return ExecuteContractProposal.decode(message.value);
+  },
+
+  toProto(message: ExecuteContractProposal): Uint8Array {
+    return ExecuteContractProposal.encode(message).finish();
+  },
+
+  toProtoMsg(message: ExecuteContractProposal): ExecuteContractProposalProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.ExecuteContractProposal",
+      value: ExecuteContractProposal.encode(message).finish()
+    };
   }
 
 };
@@ -1318,6 +1463,9 @@ function createBaseUpdateAdminProposal(): UpdateAdminProposal {
 }
 
 export const UpdateAdminProposal = {
+  typeUrl: "/cosmwasm.wasm.v1.UpdateAdminProposal",
+  aminoType: "wasm/UpdateAdminProposal",
+
   encode(message: UpdateAdminProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.title !== "") {
       writer.uint32(10).string(message.title);
@@ -1433,6 +1581,32 @@ export const UpdateAdminProposal = {
     obj.new_admin = message.newAdmin;
     obj.contract = message.contract;
     return obj;
+  },
+
+  fromAminoMsg(object: UpdateAdminProposalAminoMsg): UpdateAdminProposal {
+    return UpdateAdminProposal.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: UpdateAdminProposal): UpdateAdminProposalAminoMsg {
+    return {
+      type: "wasm/UpdateAdminProposal",
+      value: UpdateAdminProposal.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: UpdateAdminProposalProtoMsg): UpdateAdminProposal {
+    return UpdateAdminProposal.decode(message.value);
+  },
+
+  toProto(message: UpdateAdminProposal): Uint8Array {
+    return UpdateAdminProposal.encode(message).finish();
+  },
+
+  toProtoMsg(message: UpdateAdminProposal): UpdateAdminProposalProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.UpdateAdminProposal",
+      value: UpdateAdminProposal.encode(message).finish()
+    };
   }
 
 };
@@ -1446,6 +1620,9 @@ function createBaseClearAdminProposal(): ClearAdminProposal {
 }
 
 export const ClearAdminProposal = {
+  typeUrl: "/cosmwasm.wasm.v1.ClearAdminProposal",
+  aminoType: "wasm/ClearAdminProposal",
+
   encode(message: ClearAdminProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.title !== "") {
       writer.uint32(10).string(message.title);
@@ -1546,6 +1723,32 @@ export const ClearAdminProposal = {
     obj.description = message.description;
     obj.contract = message.contract;
     return obj;
+  },
+
+  fromAminoMsg(object: ClearAdminProposalAminoMsg): ClearAdminProposal {
+    return ClearAdminProposal.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ClearAdminProposal): ClearAdminProposalAminoMsg {
+    return {
+      type: "wasm/ClearAdminProposal",
+      value: ClearAdminProposal.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ClearAdminProposalProtoMsg): ClearAdminProposal {
+    return ClearAdminProposal.decode(message.value);
+  },
+
+  toProto(message: ClearAdminProposal): Uint8Array {
+    return ClearAdminProposal.encode(message).finish();
+  },
+
+  toProtoMsg(message: ClearAdminProposal): ClearAdminProposalProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.ClearAdminProposal",
+      value: ClearAdminProposal.encode(message).finish()
+    };
   }
 
 };
@@ -1559,6 +1762,9 @@ function createBasePinCodesProposal(): PinCodesProposal {
 }
 
 export const PinCodesProposal = {
+  typeUrl: "/cosmwasm.wasm.v1.PinCodesProposal",
+  aminoType: "wasm/PinCodesProposal",
+
   encode(message: PinCodesProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.title !== "") {
       writer.uint32(10).string(message.title);
@@ -1689,6 +1895,32 @@ export const PinCodesProposal = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: PinCodesProposalAminoMsg): PinCodesProposal {
+    return PinCodesProposal.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: PinCodesProposal): PinCodesProposalAminoMsg {
+    return {
+      type: "wasm/PinCodesProposal",
+      value: PinCodesProposal.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: PinCodesProposalProtoMsg): PinCodesProposal {
+    return PinCodesProposal.decode(message.value);
+  },
+
+  toProto(message: PinCodesProposal): Uint8Array {
+    return PinCodesProposal.encode(message).finish();
+  },
+
+  toProtoMsg(message: PinCodesProposal): PinCodesProposalProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.PinCodesProposal",
+      value: PinCodesProposal.encode(message).finish()
+    };
   }
 
 };
@@ -1702,6 +1934,9 @@ function createBaseUnpinCodesProposal(): UnpinCodesProposal {
 }
 
 export const UnpinCodesProposal = {
+  typeUrl: "/cosmwasm.wasm.v1.UnpinCodesProposal",
+  aminoType: "wasm/UnpinCodesProposal",
+
   encode(message: UnpinCodesProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.title !== "") {
       writer.uint32(10).string(message.title);
@@ -1832,6 +2067,32 @@ export const UnpinCodesProposal = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: UnpinCodesProposalAminoMsg): UnpinCodesProposal {
+    return UnpinCodesProposal.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: UnpinCodesProposal): UnpinCodesProposalAminoMsg {
+    return {
+      type: "wasm/UnpinCodesProposal",
+      value: UnpinCodesProposal.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: UnpinCodesProposalProtoMsg): UnpinCodesProposal {
+    return UnpinCodesProposal.decode(message.value);
+  },
+
+  toProto(message: UnpinCodesProposal): Uint8Array {
+    return UnpinCodesProposal.encode(message).finish();
+  },
+
+  toProtoMsg(message: UnpinCodesProposal): UnpinCodesProposalProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.UnpinCodesProposal",
+      value: UnpinCodesProposal.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmwasm/wasm/v1/query.ts b/__fixtures__/outputv2/cosmwasm/wasm/v1/query.ts
index 58815ea6c..3c0029e2f 100644
--- a/__fixtures__/outputv2/cosmwasm/wasm/v1/query.ts
+++ b/__fixtures__/outputv2/cosmwasm/wasm/v1/query.ts
@@ -13,7 +13,7 @@ export interface QueryContractInfoRequest {
   /** address is the address of the contract to query */
   address: string;
 }
-export interface QueryContractInfoRequestProtoType {
+export interface QueryContractInfoRequestProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.QueryContractInfoRequest";
   value: Uint8Array;
 }
@@ -26,7 +26,7 @@ export interface QueryContractInfoRequestAmino {
   /** address is the address of the contract to query */
   address: string;
 }
-export interface QueryContractInfoRequestAminoType {
+export interface QueryContractInfoRequestAminoMsg {
   type: "wasm/QueryContractInfoRequest";
   value: QueryContractInfoRequestAmino;
 }
@@ -48,7 +48,7 @@ export interface QueryContractInfoResponse {
   address: string;
   contractInfo?: ContractInfo;
 }
-export interface QueryContractInfoResponseProtoType {
+export interface QueryContractInfoResponseProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.QueryContractInfoResponse";
   value: Uint8Array;
 }
@@ -62,7 +62,7 @@ export interface QueryContractInfoResponseAmino {
   address: string;
   contract_info?: ContractInfoAmino;
 }
-export interface QueryContractInfoResponseAminoType {
+export interface QueryContractInfoResponseAminoMsg {
   type: "wasm/QueryContractInfoResponse";
   value: QueryContractInfoResponseAmino;
 }
@@ -87,7 +87,7 @@ export interface QueryContractHistoryRequest {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequest;
 }
-export interface QueryContractHistoryRequestProtoType {
+export interface QueryContractHistoryRequestProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.QueryContractHistoryRequest";
   value: Uint8Array;
 }
@@ -103,7 +103,7 @@ export interface QueryContractHistoryRequestAmino {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequestAmino;
 }
-export interface QueryContractHistoryRequestAminoType {
+export interface QueryContractHistoryRequestAminoMsg {
   type: "wasm/QueryContractHistoryRequest";
   value: QueryContractHistoryRequestAmino;
 }
@@ -127,7 +127,7 @@ export interface QueryContractHistoryResponse {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponse;
 }
-export interface QueryContractHistoryResponseProtoType {
+export interface QueryContractHistoryResponseProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.QueryContractHistoryResponse";
   value: Uint8Array;
 }
@@ -142,7 +142,7 @@ export interface QueryContractHistoryResponseAmino {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponseAmino;
 }
-export interface QueryContractHistoryResponseAminoType {
+export interface QueryContractHistoryResponseAminoMsg {
   type: "wasm/QueryContractHistoryResponse";
   value: QueryContractHistoryResponseAmino;
 }
@@ -168,7 +168,7 @@ export interface QueryContractsByCodeRequest {
   codeId: Long;
   pagination?: PageRequest;
 }
-export interface QueryContractsByCodeRequestProtoType {
+export interface QueryContractsByCodeRequestProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.QueryContractsByCodeRequest";
   value: Uint8Array;
 }
@@ -185,7 +185,7 @@ export interface QueryContractsByCodeRequestAmino {
   code_id: string;
   pagination?: PageRequestAmino;
 }
-export interface QueryContractsByCodeRequestAminoType {
+export interface QueryContractsByCodeRequestAminoMsg {
   type: "wasm/QueryContractsByCodeRequest";
   value: QueryContractsByCodeRequestAmino;
 }
@@ -210,7 +210,7 @@ export interface QueryContractsByCodeResponse {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponse;
 }
-export interface QueryContractsByCodeResponseProtoType {
+export interface QueryContractsByCodeResponseProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.QueryContractsByCodeResponse";
   value: Uint8Array;
 }
@@ -226,7 +226,7 @@ export interface QueryContractsByCodeResponseAmino {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponseAmino;
 }
-export interface QueryContractsByCodeResponseAminoType {
+export interface QueryContractsByCodeResponseAminoMsg {
   type: "wasm/QueryContractsByCodeResponse";
   value: QueryContractsByCodeResponseAmino;
 }
@@ -251,7 +251,7 @@ export interface QueryAllContractStateRequest {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequest;
 }
-export interface QueryAllContractStateRequestProtoType {
+export interface QueryAllContractStateRequestProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.QueryAllContractStateRequest";
   value: Uint8Array;
 }
@@ -267,7 +267,7 @@ export interface QueryAllContractStateRequestAmino {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequestAmino;
 }
-export interface QueryAllContractStateRequestAminoType {
+export interface QueryAllContractStateRequestAminoMsg {
   type: "wasm/QueryAllContractStateRequest";
   value: QueryAllContractStateRequestAmino;
 }
@@ -291,7 +291,7 @@ export interface QueryAllContractStateResponse {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponse;
 }
-export interface QueryAllContractStateResponseProtoType {
+export interface QueryAllContractStateResponseProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.QueryAllContractStateResponse";
   value: Uint8Array;
 }
@@ -306,7 +306,7 @@ export interface QueryAllContractStateResponseAmino {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponseAmino;
 }
-export interface QueryAllContractStateResponseAminoType {
+export interface QueryAllContractStateResponseAminoMsg {
   type: "wasm/QueryAllContractStateResponse";
   value: QueryAllContractStateResponseAmino;
 }
@@ -329,7 +329,7 @@ export interface QueryRawContractStateRequest {
   address: string;
   queryData: Uint8Array;
 }
-export interface QueryRawContractStateRequestProtoType {
+export interface QueryRawContractStateRequestProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.QueryRawContractStateRequest";
   value: Uint8Array;
 }
@@ -343,7 +343,7 @@ export interface QueryRawContractStateRequestAmino {
   address: string;
   query_data: Uint8Array;
 }
-export interface QueryRawContractStateRequestAminoType {
+export interface QueryRawContractStateRequestAminoMsg {
   type: "wasm/QueryRawContractStateRequest";
   value: QueryRawContractStateRequestAmino;
 }
@@ -365,7 +365,7 @@ export interface QueryRawContractStateResponse {
   /** Data contains the raw store data */
   data: Uint8Array;
 }
-export interface QueryRawContractStateResponseProtoType {
+export interface QueryRawContractStateResponseProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.QueryRawContractStateResponse";
   value: Uint8Array;
 }
@@ -378,7 +378,7 @@ export interface QueryRawContractStateResponseAmino {
   /** Data contains the raw store data */
   data: Uint8Array;
 }
-export interface QueryRawContractStateResponseAminoType {
+export interface QueryRawContractStateResponseAminoMsg {
   type: "wasm/QueryRawContractStateResponse";
   value: QueryRawContractStateResponseAmino;
 }
@@ -402,7 +402,7 @@ export interface QuerySmartContractStateRequest {
   /** QueryData contains the query data passed to the contract */
   queryData: Uint8Array;
 }
-export interface QuerySmartContractStateRequestProtoType {
+export interface QuerySmartContractStateRequestProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.QuerySmartContractStateRequest";
   value: Uint8Array;
 }
@@ -418,7 +418,7 @@ export interface QuerySmartContractStateRequestAmino {
   /** QueryData contains the query data passed to the contract */
   query_data: Uint8Array;
 }
-export interface QuerySmartContractStateRequestAminoType {
+export interface QuerySmartContractStateRequestAminoMsg {
   type: "wasm/QuerySmartContractStateRequest";
   value: QuerySmartContractStateRequestAmino;
 }
@@ -440,7 +440,7 @@ export interface QuerySmartContractStateResponse {
   /** Data contains the json data returned from the smart contract */
   data: Uint8Array;
 }
-export interface QuerySmartContractStateResponseProtoType {
+export interface QuerySmartContractStateResponseProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.QuerySmartContractStateResponse";
   value: Uint8Array;
 }
@@ -453,7 +453,7 @@ export interface QuerySmartContractStateResponseAmino {
   /** Data contains the json data returned from the smart contract */
   data: Uint8Array;
 }
-export interface QuerySmartContractStateResponseAminoType {
+export interface QuerySmartContractStateResponseAminoMsg {
   type: "wasm/QuerySmartContractStateResponse";
   value: QuerySmartContractStateResponseAmino;
 }
@@ -471,7 +471,7 @@ export interface QueryCodeRequest {
   /** grpc-gateway_out does not support Go style CodID */
   codeId: Long;
 }
-export interface QueryCodeRequestProtoType {
+export interface QueryCodeRequestProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.QueryCodeRequest";
   value: Uint8Array;
 }
@@ -481,7 +481,7 @@ export interface QueryCodeRequestAmino {
   /** grpc-gateway_out does not support Go style CodID */
   code_id: string;
 }
-export interface QueryCodeRequestAminoType {
+export interface QueryCodeRequestAminoMsg {
   type: "wasm/QueryCodeRequest";
   value: QueryCodeRequestAmino;
 }
@@ -497,7 +497,7 @@ export interface CodeInfoResponse {
   creator: string;
   dataHash: Uint8Array;
 }
-export interface CodeInfoResponseProtoType {
+export interface CodeInfoResponseProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.CodeInfoResponse";
   value: Uint8Array;
 }
@@ -508,7 +508,7 @@ export interface CodeInfoResponseAmino {
   creator: string;
   data_hash: Uint8Array;
 }
-export interface CodeInfoResponseAminoType {
+export interface CodeInfoResponseAminoMsg {
   type: "wasm/CodeInfoResponse";
   value: CodeInfoResponseAmino;
 }
@@ -525,7 +525,7 @@ export interface QueryCodeResponse {
   codeInfo?: CodeInfoResponse;
   data: Uint8Array;
 }
-export interface QueryCodeResponseProtoType {
+export interface QueryCodeResponseProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.QueryCodeResponse";
   value: Uint8Array;
 }
@@ -535,7 +535,7 @@ export interface QueryCodeResponseAmino {
   code_info?: CodeInfoResponseAmino;
   data: Uint8Array;
 }
-export interface QueryCodeResponseAminoType {
+export interface QueryCodeResponseAminoMsg {
   type: "wasm/QueryCodeResponse";
   value: QueryCodeResponseAmino;
 }
@@ -551,7 +551,7 @@ export interface QueryCodesRequest {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequest;
 }
-export interface QueryCodesRequestProtoType {
+export interface QueryCodesRequestProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.QueryCodesRequest";
   value: Uint8Array;
 }
@@ -561,7 +561,7 @@ export interface QueryCodesRequestAmino {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequestAmino;
 }
-export interface QueryCodesRequestAminoType {
+export interface QueryCodesRequestAminoMsg {
   type: "wasm/QueryCodesRequest";
   value: QueryCodesRequestAmino;
 }
@@ -578,7 +578,7 @@ export interface QueryCodesResponse {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponse;
 }
-export interface QueryCodesResponseProtoType {
+export interface QueryCodesResponseProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.QueryCodesResponse";
   value: Uint8Array;
 }
@@ -590,7 +590,7 @@ export interface QueryCodesResponseAmino {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponseAmino;
 }
-export interface QueryCodesResponseAminoType {
+export interface QueryCodesResponseAminoMsg {
   type: "wasm/QueryCodesResponse";
   value: QueryCodesResponseAmino;
 }
@@ -609,7 +609,7 @@ export interface QueryPinnedCodesRequest {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequest;
 }
-export interface QueryPinnedCodesRequestProtoType {
+export interface QueryPinnedCodesRequestProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.QueryPinnedCodesRequest";
   value: Uint8Array;
 }
@@ -622,7 +622,7 @@ export interface QueryPinnedCodesRequestAmino {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequestAmino;
 }
-export interface QueryPinnedCodesRequestAminoType {
+export interface QueryPinnedCodesRequestAminoMsg {
   type: "wasm/QueryPinnedCodesRequest";
   value: QueryPinnedCodesRequestAmino;
 }
@@ -645,7 +645,7 @@ export interface QueryPinnedCodesResponse {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponse;
 }
-export interface QueryPinnedCodesResponseProtoType {
+export interface QueryPinnedCodesResponseProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.QueryPinnedCodesResponse";
   value: Uint8Array;
 }
@@ -660,7 +660,7 @@ export interface QueryPinnedCodesResponseAmino {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponseAmino;
 }
-export interface QueryPinnedCodesResponseAminoType {
+export interface QueryPinnedCodesResponseAminoMsg {
   type: "wasm/QueryPinnedCodesResponse";
   value: QueryPinnedCodesResponseAmino;
 }
@@ -681,6 +681,9 @@ function createBaseQueryContractInfoRequest(): QueryContractInfoRequest {
 }
 
 export const QueryContractInfoRequest = {
+  typeUrl: "/cosmwasm.wasm.v1.QueryContractInfoRequest",
+  aminoType: "wasm/QueryContractInfoRequest",
+
   encode(message: QueryContractInfoRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.address !== "") {
       writer.uint32(10).string(message.address);
@@ -751,6 +754,32 @@ export const QueryContractInfoRequest = {
     const obj: any = {};
     obj.address = message.address;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryContractInfoRequestAminoMsg): QueryContractInfoRequest {
+    return QueryContractInfoRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryContractInfoRequest): QueryContractInfoRequestAminoMsg {
+    return {
+      type: "wasm/QueryContractInfoRequest",
+      value: QueryContractInfoRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryContractInfoRequestProtoMsg): QueryContractInfoRequest {
+    return QueryContractInfoRequest.decode(message.value);
+  },
+
+  toProto(message: QueryContractInfoRequest): Uint8Array {
+    return QueryContractInfoRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryContractInfoRequest): QueryContractInfoRequestProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.QueryContractInfoRequest",
+      value: QueryContractInfoRequest.encode(message).finish()
+    };
   }
 
 };
@@ -763,6 +792,9 @@ function createBaseQueryContractInfoResponse(): QueryContractInfoResponse {
 }
 
 export const QueryContractInfoResponse = {
+  typeUrl: "/cosmwasm.wasm.v1.QueryContractInfoResponse",
+  aminoType: "wasm/QueryContractInfoResponse",
+
   encode(message: QueryContractInfoResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.address !== "") {
       writer.uint32(10).string(message.address);
@@ -848,6 +880,32 @@ export const QueryContractInfoResponse = {
     obj.address = message.address;
     obj.contract_info = message.contractInfo ? ContractInfo.toAmino(message.contractInfo) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryContractInfoResponseAminoMsg): QueryContractInfoResponse {
+    return QueryContractInfoResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryContractInfoResponse): QueryContractInfoResponseAminoMsg {
+    return {
+      type: "wasm/QueryContractInfoResponse",
+      value: QueryContractInfoResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryContractInfoResponseProtoMsg): QueryContractInfoResponse {
+    return QueryContractInfoResponse.decode(message.value);
+  },
+
+  toProto(message: QueryContractInfoResponse): Uint8Array {
+    return QueryContractInfoResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryContractInfoResponse): QueryContractInfoResponseProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.QueryContractInfoResponse",
+      value: QueryContractInfoResponse.encode(message).finish()
+    };
   }
 
 };
@@ -860,6 +918,9 @@ function createBaseQueryContractHistoryRequest(): QueryContractHistoryRequest {
 }
 
 export const QueryContractHistoryRequest = {
+  typeUrl: "/cosmwasm.wasm.v1.QueryContractHistoryRequest",
+  aminoType: "wasm/QueryContractHistoryRequest",
+
   encode(message: QueryContractHistoryRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.address !== "") {
       writer.uint32(10).string(message.address);
@@ -945,6 +1006,32 @@ export const QueryContractHistoryRequest = {
     obj.address = message.address;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryContractHistoryRequestAminoMsg): QueryContractHistoryRequest {
+    return QueryContractHistoryRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryContractHistoryRequest): QueryContractHistoryRequestAminoMsg {
+    return {
+      type: "wasm/QueryContractHistoryRequest",
+      value: QueryContractHistoryRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryContractHistoryRequestProtoMsg): QueryContractHistoryRequest {
+    return QueryContractHistoryRequest.decode(message.value);
+  },
+
+  toProto(message: QueryContractHistoryRequest): Uint8Array {
+    return QueryContractHistoryRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryContractHistoryRequest): QueryContractHistoryRequestProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.QueryContractHistoryRequest",
+      value: QueryContractHistoryRequest.encode(message).finish()
+    };
   }
 
 };
@@ -957,6 +1044,9 @@ function createBaseQueryContractHistoryResponse(): QueryContractHistoryResponse
 }
 
 export const QueryContractHistoryResponse = {
+  typeUrl: "/cosmwasm.wasm.v1.QueryContractHistoryResponse",
+  aminoType: "wasm/QueryContractHistoryResponse",
+
   encode(message: QueryContractHistoryResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.entries) {
       ContractCodeHistoryEntry.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1060,6 +1150,32 @@ export const QueryContractHistoryResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryContractHistoryResponseAminoMsg): QueryContractHistoryResponse {
+    return QueryContractHistoryResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryContractHistoryResponse): QueryContractHistoryResponseAminoMsg {
+    return {
+      type: "wasm/QueryContractHistoryResponse",
+      value: QueryContractHistoryResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryContractHistoryResponseProtoMsg): QueryContractHistoryResponse {
+    return QueryContractHistoryResponse.decode(message.value);
+  },
+
+  toProto(message: QueryContractHistoryResponse): Uint8Array {
+    return QueryContractHistoryResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryContractHistoryResponse): QueryContractHistoryResponseProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.QueryContractHistoryResponse",
+      value: QueryContractHistoryResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1072,6 +1188,9 @@ function createBaseQueryContractsByCodeRequest(): QueryContractsByCodeRequest {
 }
 
 export const QueryContractsByCodeRequest = {
+  typeUrl: "/cosmwasm.wasm.v1.QueryContractsByCodeRequest",
+  aminoType: "wasm/QueryContractsByCodeRequest",
+
   encode(message: QueryContractsByCodeRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.codeId.isZero()) {
       writer.uint32(8).uint64(message.codeId);
@@ -1157,6 +1276,32 @@ export const QueryContractsByCodeRequest = {
     obj.code_id = message.codeId ? message.codeId.toString() : undefined;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryContractsByCodeRequestAminoMsg): QueryContractsByCodeRequest {
+    return QueryContractsByCodeRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryContractsByCodeRequest): QueryContractsByCodeRequestAminoMsg {
+    return {
+      type: "wasm/QueryContractsByCodeRequest",
+      value: QueryContractsByCodeRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryContractsByCodeRequestProtoMsg): QueryContractsByCodeRequest {
+    return QueryContractsByCodeRequest.decode(message.value);
+  },
+
+  toProto(message: QueryContractsByCodeRequest): Uint8Array {
+    return QueryContractsByCodeRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryContractsByCodeRequest): QueryContractsByCodeRequestProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.QueryContractsByCodeRequest",
+      value: QueryContractsByCodeRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1169,6 +1314,9 @@ function createBaseQueryContractsByCodeResponse(): QueryContractsByCodeResponse
 }
 
 export const QueryContractsByCodeResponse = {
+  typeUrl: "/cosmwasm.wasm.v1.QueryContractsByCodeResponse",
+  aminoType: "wasm/QueryContractsByCodeResponse",
+
   encode(message: QueryContractsByCodeResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.contracts) {
       writer.uint32(10).string(v!);
@@ -1272,6 +1420,32 @@ export const QueryContractsByCodeResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryContractsByCodeResponseAminoMsg): QueryContractsByCodeResponse {
+    return QueryContractsByCodeResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryContractsByCodeResponse): QueryContractsByCodeResponseAminoMsg {
+    return {
+      type: "wasm/QueryContractsByCodeResponse",
+      value: QueryContractsByCodeResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryContractsByCodeResponseProtoMsg): QueryContractsByCodeResponse {
+    return QueryContractsByCodeResponse.decode(message.value);
+  },
+
+  toProto(message: QueryContractsByCodeResponse): Uint8Array {
+    return QueryContractsByCodeResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryContractsByCodeResponse): QueryContractsByCodeResponseProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.QueryContractsByCodeResponse",
+      value: QueryContractsByCodeResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1284,6 +1458,9 @@ function createBaseQueryAllContractStateRequest(): QueryAllContractStateRequest
 }
 
 export const QueryAllContractStateRequest = {
+  typeUrl: "/cosmwasm.wasm.v1.QueryAllContractStateRequest",
+  aminoType: "wasm/QueryAllContractStateRequest",
+
   encode(message: QueryAllContractStateRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.address !== "") {
       writer.uint32(10).string(message.address);
@@ -1369,6 +1546,32 @@ export const QueryAllContractStateRequest = {
     obj.address = message.address;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryAllContractStateRequestAminoMsg): QueryAllContractStateRequest {
+    return QueryAllContractStateRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryAllContractStateRequest): QueryAllContractStateRequestAminoMsg {
+    return {
+      type: "wasm/QueryAllContractStateRequest",
+      value: QueryAllContractStateRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryAllContractStateRequestProtoMsg): QueryAllContractStateRequest {
+    return QueryAllContractStateRequest.decode(message.value);
+  },
+
+  toProto(message: QueryAllContractStateRequest): Uint8Array {
+    return QueryAllContractStateRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryAllContractStateRequest): QueryAllContractStateRequestProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.QueryAllContractStateRequest",
+      value: QueryAllContractStateRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1381,6 +1584,9 @@ function createBaseQueryAllContractStateResponse(): QueryAllContractStateRespons
 }
 
 export const QueryAllContractStateResponse = {
+  typeUrl: "/cosmwasm.wasm.v1.QueryAllContractStateResponse",
+  aminoType: "wasm/QueryAllContractStateResponse",
+
   encode(message: QueryAllContractStateResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.models) {
       Model.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1484,6 +1690,32 @@ export const QueryAllContractStateResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryAllContractStateResponseAminoMsg): QueryAllContractStateResponse {
+    return QueryAllContractStateResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryAllContractStateResponse): QueryAllContractStateResponseAminoMsg {
+    return {
+      type: "wasm/QueryAllContractStateResponse",
+      value: QueryAllContractStateResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryAllContractStateResponseProtoMsg): QueryAllContractStateResponse {
+    return QueryAllContractStateResponse.decode(message.value);
+  },
+
+  toProto(message: QueryAllContractStateResponse): Uint8Array {
+    return QueryAllContractStateResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryAllContractStateResponse): QueryAllContractStateResponseProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.QueryAllContractStateResponse",
+      value: QueryAllContractStateResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1496,6 +1728,9 @@ function createBaseQueryRawContractStateRequest(): QueryRawContractStateRequest
 }
 
 export const QueryRawContractStateRequest = {
+  typeUrl: "/cosmwasm.wasm.v1.QueryRawContractStateRequest",
+  aminoType: "wasm/QueryRawContractStateRequest",
+
   encode(message: QueryRawContractStateRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.address !== "") {
       writer.uint32(10).string(message.address);
@@ -1581,6 +1816,32 @@ export const QueryRawContractStateRequest = {
     obj.address = message.address;
     obj.query_data = message.queryData;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryRawContractStateRequestAminoMsg): QueryRawContractStateRequest {
+    return QueryRawContractStateRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryRawContractStateRequest): QueryRawContractStateRequestAminoMsg {
+    return {
+      type: "wasm/QueryRawContractStateRequest",
+      value: QueryRawContractStateRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryRawContractStateRequestProtoMsg): QueryRawContractStateRequest {
+    return QueryRawContractStateRequest.decode(message.value);
+  },
+
+  toProto(message: QueryRawContractStateRequest): Uint8Array {
+    return QueryRawContractStateRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryRawContractStateRequest): QueryRawContractStateRequestProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.QueryRawContractStateRequest",
+      value: QueryRawContractStateRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1592,6 +1853,9 @@ function createBaseQueryRawContractStateResponse(): QueryRawContractStateRespons
 }
 
 export const QueryRawContractStateResponse = {
+  typeUrl: "/cosmwasm.wasm.v1.QueryRawContractStateResponse",
+  aminoType: "wasm/QueryRawContractStateResponse",
+
   encode(message: QueryRawContractStateResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.data.length !== 0) {
       writer.uint32(10).bytes(message.data);
@@ -1662,6 +1926,32 @@ export const QueryRawContractStateResponse = {
     const obj: any = {};
     obj.data = message.data;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryRawContractStateResponseAminoMsg): QueryRawContractStateResponse {
+    return QueryRawContractStateResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryRawContractStateResponse): QueryRawContractStateResponseAminoMsg {
+    return {
+      type: "wasm/QueryRawContractStateResponse",
+      value: QueryRawContractStateResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryRawContractStateResponseProtoMsg): QueryRawContractStateResponse {
+    return QueryRawContractStateResponse.decode(message.value);
+  },
+
+  toProto(message: QueryRawContractStateResponse): Uint8Array {
+    return QueryRawContractStateResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryRawContractStateResponse): QueryRawContractStateResponseProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.QueryRawContractStateResponse",
+      value: QueryRawContractStateResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1674,6 +1964,9 @@ function createBaseQuerySmartContractStateRequest(): QuerySmartContractStateRequ
 }
 
 export const QuerySmartContractStateRequest = {
+  typeUrl: "/cosmwasm.wasm.v1.QuerySmartContractStateRequest",
+  aminoType: "wasm/QuerySmartContractStateRequest",
+
   encode(message: QuerySmartContractStateRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.address !== "") {
       writer.uint32(10).string(message.address);
@@ -1759,6 +2052,32 @@ export const QuerySmartContractStateRequest = {
     obj.address = message.address;
     obj.query_data = message.queryData ? JSON.parse(fromUtf8(message.queryData)) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QuerySmartContractStateRequestAminoMsg): QuerySmartContractStateRequest {
+    return QuerySmartContractStateRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QuerySmartContractStateRequest): QuerySmartContractStateRequestAminoMsg {
+    return {
+      type: "wasm/QuerySmartContractStateRequest",
+      value: QuerySmartContractStateRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QuerySmartContractStateRequestProtoMsg): QuerySmartContractStateRequest {
+    return QuerySmartContractStateRequest.decode(message.value);
+  },
+
+  toProto(message: QuerySmartContractStateRequest): Uint8Array {
+    return QuerySmartContractStateRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QuerySmartContractStateRequest): QuerySmartContractStateRequestProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.QuerySmartContractStateRequest",
+      value: QuerySmartContractStateRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1770,6 +2089,9 @@ function createBaseQuerySmartContractStateResponse(): QuerySmartContractStateRes
 }
 
 export const QuerySmartContractStateResponse = {
+  typeUrl: "/cosmwasm.wasm.v1.QuerySmartContractStateResponse",
+  aminoType: "wasm/QuerySmartContractStateResponse",
+
   encode(message: QuerySmartContractStateResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.data.length !== 0) {
       writer.uint32(10).bytes(message.data);
@@ -1840,6 +2162,32 @@ export const QuerySmartContractStateResponse = {
     const obj: any = {};
     obj.data = message.data ? JSON.parse(fromUtf8(message.data)) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QuerySmartContractStateResponseAminoMsg): QuerySmartContractStateResponse {
+    return QuerySmartContractStateResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QuerySmartContractStateResponse): QuerySmartContractStateResponseAminoMsg {
+    return {
+      type: "wasm/QuerySmartContractStateResponse",
+      value: QuerySmartContractStateResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QuerySmartContractStateResponseProtoMsg): QuerySmartContractStateResponse {
+    return QuerySmartContractStateResponse.decode(message.value);
+  },
+
+  toProto(message: QuerySmartContractStateResponse): Uint8Array {
+    return QuerySmartContractStateResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QuerySmartContractStateResponse): QuerySmartContractStateResponseProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.QuerySmartContractStateResponse",
+      value: QuerySmartContractStateResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1851,6 +2199,9 @@ function createBaseQueryCodeRequest(): QueryCodeRequest {
 }
 
 export const QueryCodeRequest = {
+  typeUrl: "/cosmwasm.wasm.v1.QueryCodeRequest",
+  aminoType: "wasm/QueryCodeRequest",
+
   encode(message: QueryCodeRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.codeId.isZero()) {
       writer.uint32(8).uint64(message.codeId);
@@ -1921,6 +2272,32 @@ export const QueryCodeRequest = {
     const obj: any = {};
     obj.code_id = message.codeId ? message.codeId.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryCodeRequestAminoMsg): QueryCodeRequest {
+    return QueryCodeRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryCodeRequest): QueryCodeRequestAminoMsg {
+    return {
+      type: "wasm/QueryCodeRequest",
+      value: QueryCodeRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryCodeRequestProtoMsg): QueryCodeRequest {
+    return QueryCodeRequest.decode(message.value);
+  },
+
+  toProto(message: QueryCodeRequest): Uint8Array {
+    return QueryCodeRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryCodeRequest): QueryCodeRequestProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.QueryCodeRequest",
+      value: QueryCodeRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1934,6 +2311,9 @@ function createBaseCodeInfoResponse(): CodeInfoResponse {
 }
 
 export const CodeInfoResponse = {
+  typeUrl: "/cosmwasm.wasm.v1.CodeInfoResponse",
+  aminoType: "wasm/CodeInfoResponse",
+
   encode(message: CodeInfoResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.codeId.isZero()) {
       writer.uint32(8).uint64(message.codeId);
@@ -2034,6 +2414,32 @@ export const CodeInfoResponse = {
     obj.creator = message.creator;
     obj.data_hash = message.dataHash;
     return obj;
+  },
+
+  fromAminoMsg(object: CodeInfoResponseAminoMsg): CodeInfoResponse {
+    return CodeInfoResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: CodeInfoResponse): CodeInfoResponseAminoMsg {
+    return {
+      type: "wasm/CodeInfoResponse",
+      value: CodeInfoResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: CodeInfoResponseProtoMsg): CodeInfoResponse {
+    return CodeInfoResponse.decode(message.value);
+  },
+
+  toProto(message: CodeInfoResponse): Uint8Array {
+    return CodeInfoResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: CodeInfoResponse): CodeInfoResponseProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.CodeInfoResponse",
+      value: CodeInfoResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2046,6 +2452,9 @@ function createBaseQueryCodeResponse(): QueryCodeResponse {
 }
 
 export const QueryCodeResponse = {
+  typeUrl: "/cosmwasm.wasm.v1.QueryCodeResponse",
+  aminoType: "wasm/QueryCodeResponse",
+
   encode(message: QueryCodeResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.codeInfo !== undefined) {
       CodeInfoResponse.encode(message.codeInfo, writer.uint32(10).fork()).ldelim();
@@ -2131,6 +2540,32 @@ export const QueryCodeResponse = {
     obj.code_info = message.codeInfo ? CodeInfoResponse.toAmino(message.codeInfo) : undefined;
     obj.data = message.data;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryCodeResponseAminoMsg): QueryCodeResponse {
+    return QueryCodeResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryCodeResponse): QueryCodeResponseAminoMsg {
+    return {
+      type: "wasm/QueryCodeResponse",
+      value: QueryCodeResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryCodeResponseProtoMsg): QueryCodeResponse {
+    return QueryCodeResponse.decode(message.value);
+  },
+
+  toProto(message: QueryCodeResponse): Uint8Array {
+    return QueryCodeResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryCodeResponse): QueryCodeResponseProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.QueryCodeResponse",
+      value: QueryCodeResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2142,6 +2577,9 @@ function createBaseQueryCodesRequest(): QueryCodesRequest {
 }
 
 export const QueryCodesRequest = {
+  typeUrl: "/cosmwasm.wasm.v1.QueryCodesRequest",
+  aminoType: "wasm/QueryCodesRequest",
+
   encode(message: QueryCodesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.pagination !== undefined) {
       PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim();
@@ -2212,6 +2650,32 @@ export const QueryCodesRequest = {
     const obj: any = {};
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryCodesRequestAminoMsg): QueryCodesRequest {
+    return QueryCodesRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryCodesRequest): QueryCodesRequestAminoMsg {
+    return {
+      type: "wasm/QueryCodesRequest",
+      value: QueryCodesRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryCodesRequestProtoMsg): QueryCodesRequest {
+    return QueryCodesRequest.decode(message.value);
+  },
+
+  toProto(message: QueryCodesRequest): Uint8Array {
+    return QueryCodesRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryCodesRequest): QueryCodesRequestProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.QueryCodesRequest",
+      value: QueryCodesRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2224,6 +2688,9 @@ function createBaseQueryCodesResponse(): QueryCodesResponse {
 }
 
 export const QueryCodesResponse = {
+  typeUrl: "/cosmwasm.wasm.v1.QueryCodesResponse",
+  aminoType: "wasm/QueryCodesResponse",
+
   encode(message: QueryCodesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.codeInfos) {
       CodeInfoResponse.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -2327,6 +2794,32 @@ export const QueryCodesResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryCodesResponseAminoMsg): QueryCodesResponse {
+    return QueryCodesResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryCodesResponse): QueryCodesResponseAminoMsg {
+    return {
+      type: "wasm/QueryCodesResponse",
+      value: QueryCodesResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryCodesResponseProtoMsg): QueryCodesResponse {
+    return QueryCodesResponse.decode(message.value);
+  },
+
+  toProto(message: QueryCodesResponse): Uint8Array {
+    return QueryCodesResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryCodesResponse): QueryCodesResponseProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.QueryCodesResponse",
+      value: QueryCodesResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2338,6 +2831,9 @@ function createBaseQueryPinnedCodesRequest(): QueryPinnedCodesRequest {
 }
 
 export const QueryPinnedCodesRequest = {
+  typeUrl: "/cosmwasm.wasm.v1.QueryPinnedCodesRequest",
+  aminoType: "wasm/QueryPinnedCodesRequest",
+
   encode(message: QueryPinnedCodesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.pagination !== undefined) {
       PageRequest.encode(message.pagination, writer.uint32(18).fork()).ldelim();
@@ -2408,6 +2904,32 @@ export const QueryPinnedCodesRequest = {
     const obj: any = {};
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryPinnedCodesRequestAminoMsg): QueryPinnedCodesRequest {
+    return QueryPinnedCodesRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryPinnedCodesRequest): QueryPinnedCodesRequestAminoMsg {
+    return {
+      type: "wasm/QueryPinnedCodesRequest",
+      value: QueryPinnedCodesRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryPinnedCodesRequestProtoMsg): QueryPinnedCodesRequest {
+    return QueryPinnedCodesRequest.decode(message.value);
+  },
+
+  toProto(message: QueryPinnedCodesRequest): Uint8Array {
+    return QueryPinnedCodesRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryPinnedCodesRequest): QueryPinnedCodesRequestProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.QueryPinnedCodesRequest",
+      value: QueryPinnedCodesRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2420,6 +2942,9 @@ function createBaseQueryPinnedCodesResponse(): QueryPinnedCodesResponse {
 }
 
 export const QueryPinnedCodesResponse = {
+  typeUrl: "/cosmwasm.wasm.v1.QueryPinnedCodesResponse",
+  aminoType: "wasm/QueryPinnedCodesResponse",
+
   encode(message: QueryPinnedCodesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     writer.uint32(10).fork();
 
@@ -2536,6 +3061,32 @@ export const QueryPinnedCodesResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryPinnedCodesResponseAminoMsg): QueryPinnedCodesResponse {
+    return QueryPinnedCodesResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryPinnedCodesResponse): QueryPinnedCodesResponseAminoMsg {
+    return {
+      type: "wasm/QueryPinnedCodesResponse",
+      value: QueryPinnedCodesResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryPinnedCodesResponseProtoMsg): QueryPinnedCodesResponse {
+    return QueryPinnedCodesResponse.decode(message.value);
+  },
+
+  toProto(message: QueryPinnedCodesResponse): Uint8Array {
+    return QueryPinnedCodesResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryPinnedCodesResponse): QueryPinnedCodesResponseProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.QueryPinnedCodesResponse",
+      value: QueryPinnedCodesResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmwasm/wasm/v1/tx.ts b/__fixtures__/outputv2/cosmwasm/wasm/v1/tx.ts
index b8ebf5cb2..641721f46 100644
--- a/__fixtures__/outputv2/cosmwasm/wasm/v1/tx.ts
+++ b/__fixtures__/outputv2/cosmwasm/wasm/v1/tx.ts
@@ -19,7 +19,7 @@ export interface MsgStoreCode {
    */
   instantiatePermission?: AccessConfig;
 }
-export interface MsgStoreCodeProtoType {
+export interface MsgStoreCodeProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.MsgStoreCode";
   value: Uint8Array;
 }
@@ -38,7 +38,7 @@ export interface MsgStoreCodeAmino {
    */
   instantiate_permission?: AccessConfigAmino;
 }
-export interface MsgStoreCodeAminoType {
+export interface MsgStoreCodeAminoMsg {
   type: "wasm/MsgStoreCode";
   value: MsgStoreCodeAmino;
 }
@@ -55,7 +55,7 @@ export interface MsgStoreCodeResponse {
   /** CodeID is the reference to the stored WASM code */
   codeId: Long;
 }
-export interface MsgStoreCodeResponseProtoType {
+export interface MsgStoreCodeResponseProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.MsgStoreCodeResponse";
   value: Uint8Array;
 }
@@ -65,7 +65,7 @@ export interface MsgStoreCodeResponseAmino {
   /** CodeID is the reference to the stored WASM code */
   code_id: string;
 }
-export interface MsgStoreCodeResponseAminoType {
+export interface MsgStoreCodeResponseAminoMsg {
   type: "wasm/MsgStoreCodeResponse";
   value: MsgStoreCodeResponseAmino;
 }
@@ -98,7 +98,7 @@ export interface MsgInstantiateContract {
   /** Funds coins that are transferred to the contract on instantiation */
   funds: Coin[];
 }
-export interface MsgInstantiateContractProtoType {
+export interface MsgInstantiateContractProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.MsgInstantiateContract";
   value: Uint8Array;
 }
@@ -126,7 +126,7 @@ export interface MsgInstantiateContractAmino {
   /** Funds coins that are transferred to the contract on instantiation */
   funds: CoinAmino[];
 }
-export interface MsgInstantiateContractAminoType {
+export interface MsgInstantiateContractAminoMsg {
   type: "wasm/MsgInstantiateContract";
   value: MsgInstantiateContractAmino;
 }
@@ -152,7 +152,7 @@ export interface MsgInstantiateContractResponse {
   /** Data contains base64-encoded bytes to returned from the contract */
   data: Uint8Array;
 }
-export interface MsgInstantiateContractResponseProtoType {
+export interface MsgInstantiateContractResponseProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.MsgInstantiateContractResponse";
   value: Uint8Array;
 }
@@ -165,7 +165,7 @@ export interface MsgInstantiateContractResponseAmino {
   /** Data contains base64-encoded bytes to returned from the contract */
   data: Uint8Array;
 }
-export interface MsgInstantiateContractResponseAminoType {
+export interface MsgInstantiateContractResponseAminoMsg {
   type: "wasm/MsgInstantiateContractResponse";
   value: MsgInstantiateContractResponseAmino;
 }
@@ -190,7 +190,7 @@ export interface MsgExecuteContract {
   /** Funds coins that are transferred to the contract on execution */
   funds: Coin[];
 }
-export interface MsgExecuteContractProtoType {
+export interface MsgExecuteContractProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract";
   value: Uint8Array;
 }
@@ -209,7 +209,7 @@ export interface MsgExecuteContractAmino {
   /** Funds coins that are transferred to the contract on execution */
   funds: CoinAmino[];
 }
-export interface MsgExecuteContractAminoType {
+export interface MsgExecuteContractAminoMsg {
   type: "wasm/MsgExecuteContract";
   value: MsgExecuteContractAmino;
 }
@@ -227,7 +227,7 @@ export interface MsgExecuteContractResponse {
   /** Data contains base64-encoded bytes to returned from the contract */
   data: Uint8Array;
 }
-export interface MsgExecuteContractResponseProtoType {
+export interface MsgExecuteContractResponseProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContractResponse";
   value: Uint8Array;
 }
@@ -237,7 +237,7 @@ export interface MsgExecuteContractResponseAmino {
   /** Data contains base64-encoded bytes to returned from the contract */
   data: Uint8Array;
 }
-export interface MsgExecuteContractResponseAminoType {
+export interface MsgExecuteContractResponseAminoMsg {
   type: "wasm/MsgExecuteContractResponse";
   value: MsgExecuteContractResponseAmino;
 }
@@ -261,7 +261,7 @@ export interface MsgMigrateContract {
   /** Msg json encoded message to be passed to the contract on migration */
   msg: Uint8Array;
 }
-export interface MsgMigrateContractProtoType {
+export interface MsgMigrateContractProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.MsgMigrateContract";
   value: Uint8Array;
 }
@@ -280,7 +280,7 @@ export interface MsgMigrateContractAmino {
   /** Msg json encoded message to be passed to the contract on migration */
   msg: Uint8Array;
 }
-export interface MsgMigrateContractAminoType {
+export interface MsgMigrateContractAminoMsg {
   type: "wasm/MsgMigrateContract";
   value: MsgMigrateContractAmino;
 }
@@ -301,7 +301,7 @@ export interface MsgMigrateContractResponse {
    */
   data: Uint8Array;
 }
-export interface MsgMigrateContractResponseProtoType {
+export interface MsgMigrateContractResponseProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.MsgMigrateContractResponse";
   value: Uint8Array;
 }
@@ -314,7 +314,7 @@ export interface MsgMigrateContractResponseAmino {
    */
   data: Uint8Array;
 }
-export interface MsgMigrateContractResponseAminoType {
+export interface MsgMigrateContractResponseAminoMsg {
   type: "wasm/MsgMigrateContractResponse";
   value: MsgMigrateContractResponseAmino;
 }
@@ -335,7 +335,7 @@ export interface MsgUpdateAdmin {
   /** Contract is the address of the smart contract */
   contract: string;
 }
-export interface MsgUpdateAdminProtoType {
+export interface MsgUpdateAdminProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.MsgUpdateAdmin";
   value: Uint8Array;
 }
@@ -351,7 +351,7 @@ export interface MsgUpdateAdminAmino {
   /** Contract is the address of the smart contract */
   contract: string;
 }
-export interface MsgUpdateAdminAminoType {
+export interface MsgUpdateAdminAminoMsg {
   type: "wasm/MsgUpdateAdmin";
   value: MsgUpdateAdminAmino;
 }
@@ -365,14 +365,14 @@ export interface MsgUpdateAdminSDKType {
 
 /** MsgUpdateAdminResponse returns empty data */
 export interface MsgUpdateAdminResponse {}
-export interface MsgUpdateAdminResponseProtoType {
+export interface MsgUpdateAdminResponseProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.MsgUpdateAdminResponse";
   value: Uint8Array;
 }
 
 /** MsgUpdateAdminResponse returns empty data */
 export interface MsgUpdateAdminResponseAmino {}
-export interface MsgUpdateAdminResponseAminoType {
+export interface MsgUpdateAdminResponseAminoMsg {
   type: "wasm/MsgUpdateAdminResponse";
   value: MsgUpdateAdminResponseAmino;
 }
@@ -388,7 +388,7 @@ export interface MsgClearAdmin {
   /** Contract is the address of the smart contract */
   contract: string;
 }
-export interface MsgClearAdminProtoType {
+export interface MsgClearAdminProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.MsgClearAdmin";
   value: Uint8Array;
 }
@@ -401,7 +401,7 @@ export interface MsgClearAdminAmino {
   /** Contract is the address of the smart contract */
   contract: string;
 }
-export interface MsgClearAdminAminoType {
+export interface MsgClearAdminAminoMsg {
   type: "wasm/MsgClearAdmin";
   value: MsgClearAdminAmino;
 }
@@ -414,14 +414,14 @@ export interface MsgClearAdminSDKType {
 
 /** MsgClearAdminResponse returns empty data */
 export interface MsgClearAdminResponse {}
-export interface MsgClearAdminResponseProtoType {
+export interface MsgClearAdminResponseProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.MsgClearAdminResponse";
   value: Uint8Array;
 }
 
 /** MsgClearAdminResponse returns empty data */
 export interface MsgClearAdminResponseAmino {}
-export interface MsgClearAdminResponseAminoType {
+export interface MsgClearAdminResponseAminoMsg {
   type: "wasm/MsgClearAdminResponse";
   value: MsgClearAdminResponseAmino;
 }
@@ -438,6 +438,9 @@ function createBaseMsgStoreCode(): MsgStoreCode {
 }
 
 export const MsgStoreCode = {
+  typeUrl: "/cosmwasm.wasm.v1.MsgStoreCode",
+  aminoType: "wasm/MsgStoreCode",
+
   encode(message: MsgStoreCode, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.sender !== "") {
       writer.uint32(10).string(message.sender);
@@ -538,6 +541,32 @@ export const MsgStoreCode = {
     obj.wasm_byte_code = message.wasmByteCode ? toBase64(message.wasmByteCode) : undefined;
     obj.instantiate_permission = message.instantiatePermission ? AccessConfig.toAmino(message.instantiatePermission) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgStoreCodeAminoMsg): MsgStoreCode {
+    return MsgStoreCode.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgStoreCode): MsgStoreCodeAminoMsg {
+    return {
+      type: "wasm/MsgStoreCode",
+      value: MsgStoreCode.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgStoreCodeProtoMsg): MsgStoreCode {
+    return MsgStoreCode.decode(message.value);
+  },
+
+  toProto(message: MsgStoreCode): Uint8Array {
+    return MsgStoreCode.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgStoreCode): MsgStoreCodeProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgStoreCode",
+      value: MsgStoreCode.encode(message).finish()
+    };
   }
 
 };
@@ -549,6 +578,9 @@ function createBaseMsgStoreCodeResponse(): MsgStoreCodeResponse {
 }
 
 export const MsgStoreCodeResponse = {
+  typeUrl: "/cosmwasm.wasm.v1.MsgStoreCodeResponse",
+  aminoType: "wasm/MsgStoreCodeResponse",
+
   encode(message: MsgStoreCodeResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.codeId.isZero()) {
       writer.uint32(8).uint64(message.codeId);
@@ -619,6 +651,32 @@ export const MsgStoreCodeResponse = {
     const obj: any = {};
     obj.code_id = message.codeId ? message.codeId.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgStoreCodeResponseAminoMsg): MsgStoreCodeResponse {
+    return MsgStoreCodeResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgStoreCodeResponse): MsgStoreCodeResponseAminoMsg {
+    return {
+      type: "wasm/MsgStoreCodeResponse",
+      value: MsgStoreCodeResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgStoreCodeResponseProtoMsg): MsgStoreCodeResponse {
+    return MsgStoreCodeResponse.decode(message.value);
+  },
+
+  toProto(message: MsgStoreCodeResponse): Uint8Array {
+    return MsgStoreCodeResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgStoreCodeResponse): MsgStoreCodeResponseProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgStoreCodeResponse",
+      value: MsgStoreCodeResponse.encode(message).finish()
+    };
   }
 
 };
@@ -635,6 +693,9 @@ function createBaseMsgInstantiateContract(): MsgInstantiateContract {
 }
 
 export const MsgInstantiateContract = {
+  typeUrl: "/cosmwasm.wasm.v1.MsgInstantiateContract",
+  aminoType: "wasm/MsgInstantiateContract",
+
   encode(message: MsgInstantiateContract, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.sender !== "") {
       writer.uint32(10).string(message.sender);
@@ -798,6 +859,32 @@ export const MsgInstantiateContract = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: MsgInstantiateContractAminoMsg): MsgInstantiateContract {
+    return MsgInstantiateContract.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgInstantiateContract): MsgInstantiateContractAminoMsg {
+    return {
+      type: "wasm/MsgInstantiateContract",
+      value: MsgInstantiateContract.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgInstantiateContractProtoMsg): MsgInstantiateContract {
+    return MsgInstantiateContract.decode(message.value);
+  },
+
+  toProto(message: MsgInstantiateContract): Uint8Array {
+    return MsgInstantiateContract.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgInstantiateContract): MsgInstantiateContractProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgInstantiateContract",
+      value: MsgInstantiateContract.encode(message).finish()
+    };
   }
 
 };
@@ -810,6 +897,9 @@ function createBaseMsgInstantiateContractResponse(): MsgInstantiateContractRespo
 }
 
 export const MsgInstantiateContractResponse = {
+  typeUrl: "/cosmwasm.wasm.v1.MsgInstantiateContractResponse",
+  aminoType: "wasm/MsgInstantiateContractResponse",
+
   encode(message: MsgInstantiateContractResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.address !== "") {
       writer.uint32(10).string(message.address);
@@ -895,6 +985,32 @@ export const MsgInstantiateContractResponse = {
     obj.address = message.address;
     obj.data = message.data;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgInstantiateContractResponseAminoMsg): MsgInstantiateContractResponse {
+    return MsgInstantiateContractResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgInstantiateContractResponse): MsgInstantiateContractResponseAminoMsg {
+    return {
+      type: "wasm/MsgInstantiateContractResponse",
+      value: MsgInstantiateContractResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgInstantiateContractResponseProtoMsg): MsgInstantiateContractResponse {
+    return MsgInstantiateContractResponse.decode(message.value);
+  },
+
+  toProto(message: MsgInstantiateContractResponse): Uint8Array {
+    return MsgInstantiateContractResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgInstantiateContractResponse): MsgInstantiateContractResponseProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgInstantiateContractResponse",
+      value: MsgInstantiateContractResponse.encode(message).finish()
+    };
   }
 
 };
@@ -909,6 +1025,9 @@ function createBaseMsgExecuteContract(): MsgExecuteContract {
 }
 
 export const MsgExecuteContract = {
+  typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+  aminoType: "wasm/MsgExecuteContract",
+
   encode(message: MsgExecuteContract, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.sender !== "") {
       writer.uint32(10).string(message.sender);
@@ -1042,6 +1161,32 @@ export const MsgExecuteContract = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: MsgExecuteContractAminoMsg): MsgExecuteContract {
+    return MsgExecuteContract.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgExecuteContract): MsgExecuteContractAminoMsg {
+    return {
+      type: "wasm/MsgExecuteContract",
+      value: MsgExecuteContract.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgExecuteContractProtoMsg): MsgExecuteContract {
+    return MsgExecuteContract.decode(message.value);
+  },
+
+  toProto(message: MsgExecuteContract): Uint8Array {
+    return MsgExecuteContract.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgExecuteContract): MsgExecuteContractProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.encode(message).finish()
+    };
   }
 
 };
@@ -1053,6 +1198,9 @@ function createBaseMsgExecuteContractResponse(): MsgExecuteContractResponse {
 }
 
 export const MsgExecuteContractResponse = {
+  typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContractResponse",
+  aminoType: "wasm/MsgExecuteContractResponse",
+
   encode(message: MsgExecuteContractResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.data.length !== 0) {
       writer.uint32(10).bytes(message.data);
@@ -1123,6 +1271,32 @@ export const MsgExecuteContractResponse = {
     const obj: any = {};
     obj.data = message.data;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgExecuteContractResponseAminoMsg): MsgExecuteContractResponse {
+    return MsgExecuteContractResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgExecuteContractResponse): MsgExecuteContractResponseAminoMsg {
+    return {
+      type: "wasm/MsgExecuteContractResponse",
+      value: MsgExecuteContractResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgExecuteContractResponseProtoMsg): MsgExecuteContractResponse {
+    return MsgExecuteContractResponse.decode(message.value);
+  },
+
+  toProto(message: MsgExecuteContractResponse): Uint8Array {
+    return MsgExecuteContractResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgExecuteContractResponse): MsgExecuteContractResponseProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContractResponse",
+      value: MsgExecuteContractResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1137,6 +1311,9 @@ function createBaseMsgMigrateContract(): MsgMigrateContract {
 }
 
 export const MsgMigrateContract = {
+  typeUrl: "/cosmwasm.wasm.v1.MsgMigrateContract",
+  aminoType: "wasm/MsgMigrateContract",
+
   encode(message: MsgMigrateContract, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.sender !== "") {
       writer.uint32(10).string(message.sender);
@@ -1252,6 +1429,32 @@ export const MsgMigrateContract = {
     obj.code_id = message.codeId ? message.codeId.toString() : undefined;
     obj.msg = message.msg ? JSON.parse(fromUtf8(message.msg)) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgMigrateContractAminoMsg): MsgMigrateContract {
+    return MsgMigrateContract.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgMigrateContract): MsgMigrateContractAminoMsg {
+    return {
+      type: "wasm/MsgMigrateContract",
+      value: MsgMigrateContract.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgMigrateContractProtoMsg): MsgMigrateContract {
+    return MsgMigrateContract.decode(message.value);
+  },
+
+  toProto(message: MsgMigrateContract): Uint8Array {
+    return MsgMigrateContract.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgMigrateContract): MsgMigrateContractProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgMigrateContract",
+      value: MsgMigrateContract.encode(message).finish()
+    };
   }
 
 };
@@ -1263,6 +1466,9 @@ function createBaseMsgMigrateContractResponse(): MsgMigrateContractResponse {
 }
 
 export const MsgMigrateContractResponse = {
+  typeUrl: "/cosmwasm.wasm.v1.MsgMigrateContractResponse",
+  aminoType: "wasm/MsgMigrateContractResponse",
+
   encode(message: MsgMigrateContractResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.data.length !== 0) {
       writer.uint32(10).bytes(message.data);
@@ -1333,6 +1539,32 @@ export const MsgMigrateContractResponse = {
     const obj: any = {};
     obj.data = message.data;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgMigrateContractResponseAminoMsg): MsgMigrateContractResponse {
+    return MsgMigrateContractResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgMigrateContractResponse): MsgMigrateContractResponseAminoMsg {
+    return {
+      type: "wasm/MsgMigrateContractResponse",
+      value: MsgMigrateContractResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgMigrateContractResponseProtoMsg): MsgMigrateContractResponse {
+    return MsgMigrateContractResponse.decode(message.value);
+  },
+
+  toProto(message: MsgMigrateContractResponse): Uint8Array {
+    return MsgMigrateContractResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgMigrateContractResponse): MsgMigrateContractResponseProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgMigrateContractResponse",
+      value: MsgMigrateContractResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1346,6 +1578,9 @@ function createBaseMsgUpdateAdmin(): MsgUpdateAdmin {
 }
 
 export const MsgUpdateAdmin = {
+  typeUrl: "/cosmwasm.wasm.v1.MsgUpdateAdmin",
+  aminoType: "wasm/MsgUpdateAdmin",
+
   encode(message: MsgUpdateAdmin, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.sender !== "") {
       writer.uint32(10).string(message.sender);
@@ -1446,6 +1681,32 @@ export const MsgUpdateAdmin = {
     obj.new_admin = message.newAdmin;
     obj.contract = message.contract;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgUpdateAdminAminoMsg): MsgUpdateAdmin {
+    return MsgUpdateAdmin.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgUpdateAdmin): MsgUpdateAdminAminoMsg {
+    return {
+      type: "wasm/MsgUpdateAdmin",
+      value: MsgUpdateAdmin.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgUpdateAdminProtoMsg): MsgUpdateAdmin {
+    return MsgUpdateAdmin.decode(message.value);
+  },
+
+  toProto(message: MsgUpdateAdmin): Uint8Array {
+    return MsgUpdateAdmin.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgUpdateAdmin): MsgUpdateAdminProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgUpdateAdmin",
+      value: MsgUpdateAdmin.encode(message).finish()
+    };
   }
 
 };
@@ -1455,6 +1716,9 @@ function createBaseMsgUpdateAdminResponse(): MsgUpdateAdminResponse {
 }
 
 export const MsgUpdateAdminResponse = {
+  typeUrl: "/cosmwasm.wasm.v1.MsgUpdateAdminResponse",
+  aminoType: "wasm/MsgUpdateAdminResponse",
+
   encode(_: MsgUpdateAdminResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -1507,6 +1771,32 @@ export const MsgUpdateAdminResponse = {
   toAmino(_: MsgUpdateAdminResponse): MsgUpdateAdminResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgUpdateAdminResponseAminoMsg): MsgUpdateAdminResponse {
+    return MsgUpdateAdminResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgUpdateAdminResponse): MsgUpdateAdminResponseAminoMsg {
+    return {
+      type: "wasm/MsgUpdateAdminResponse",
+      value: MsgUpdateAdminResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgUpdateAdminResponseProtoMsg): MsgUpdateAdminResponse {
+    return MsgUpdateAdminResponse.decode(message.value);
+  },
+
+  toProto(message: MsgUpdateAdminResponse): Uint8Array {
+    return MsgUpdateAdminResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgUpdateAdminResponse): MsgUpdateAdminResponseProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgUpdateAdminResponse",
+      value: MsgUpdateAdminResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1519,6 +1809,9 @@ function createBaseMsgClearAdmin(): MsgClearAdmin {
 }
 
 export const MsgClearAdmin = {
+  typeUrl: "/cosmwasm.wasm.v1.MsgClearAdmin",
+  aminoType: "wasm/MsgClearAdmin",
+
   encode(message: MsgClearAdmin, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.sender !== "") {
       writer.uint32(10).string(message.sender);
@@ -1604,6 +1897,32 @@ export const MsgClearAdmin = {
     obj.sender = message.sender;
     obj.contract = message.contract;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgClearAdminAminoMsg): MsgClearAdmin {
+    return MsgClearAdmin.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgClearAdmin): MsgClearAdminAminoMsg {
+    return {
+      type: "wasm/MsgClearAdmin",
+      value: MsgClearAdmin.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgClearAdminProtoMsg): MsgClearAdmin {
+    return MsgClearAdmin.decode(message.value);
+  },
+
+  toProto(message: MsgClearAdmin): Uint8Array {
+    return MsgClearAdmin.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgClearAdmin): MsgClearAdminProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgClearAdmin",
+      value: MsgClearAdmin.encode(message).finish()
+    };
   }
 
 };
@@ -1613,6 +1932,9 @@ function createBaseMsgClearAdminResponse(): MsgClearAdminResponse {
 }
 
 export const MsgClearAdminResponse = {
+  typeUrl: "/cosmwasm.wasm.v1.MsgClearAdminResponse",
+  aminoType: "wasm/MsgClearAdminResponse",
+
   encode(_: MsgClearAdminResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -1665,6 +1987,32 @@ export const MsgClearAdminResponse = {
   toAmino(_: MsgClearAdminResponse): MsgClearAdminResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgClearAdminResponseAminoMsg): MsgClearAdminResponse {
+    return MsgClearAdminResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgClearAdminResponse): MsgClearAdminResponseAminoMsg {
+    return {
+      type: "wasm/MsgClearAdminResponse",
+      value: MsgClearAdminResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgClearAdminResponseProtoMsg): MsgClearAdminResponse {
+    return MsgClearAdminResponse.decode(message.value);
+  },
+
+  toProto(message: MsgClearAdminResponse): Uint8Array {
+    return MsgClearAdminResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgClearAdminResponse): MsgClearAdminResponseProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgClearAdminResponse",
+      value: MsgClearAdminResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/cosmwasm/wasm/v1/types.ts b/__fixtures__/outputv2/cosmwasm/wasm/v1/types.ts
index 5b93900ff..6a0e798f0 100644
--- a/__fixtures__/outputv2/cosmwasm/wasm/v1/types.ts
+++ b/__fixtures__/outputv2/cosmwasm/wasm/v1/types.ts
@@ -130,7 +130,7 @@ export function contractCodeHistoryOperationTypeToJSON(object: ContractCodeHisto
 export interface AccessTypeParam {
   value: AccessType;
 }
-export interface AccessTypeParamProtoType {
+export interface AccessTypeParamProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.AccessTypeParam";
   value: Uint8Array;
 }
@@ -139,7 +139,7 @@ export interface AccessTypeParamProtoType {
 export interface AccessTypeParamAmino {
   value: AccessType;
 }
-export interface AccessTypeParamAminoType {
+export interface AccessTypeParamAminoMsg {
   type: "wasm/AccessTypeParam";
   value: AccessTypeParamAmino;
 }
@@ -154,7 +154,7 @@ export interface AccessConfig {
   permission: AccessType;
   address: string;
 }
-export interface AccessConfigProtoType {
+export interface AccessConfigProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.AccessConfig";
   value: Uint8Array;
 }
@@ -164,7 +164,7 @@ export interface AccessConfigAmino {
   permission: AccessType;
   address: string;
 }
-export interface AccessConfigAminoType {
+export interface AccessConfigAminoMsg {
   type: "wasm/AccessConfig";
   value: AccessConfigAmino;
 }
@@ -181,7 +181,7 @@ export interface Params {
   instantiateDefaultPermission: AccessType;
   maxWasmCodeSize: Long;
 }
-export interface ParamsProtoType {
+export interface ParamsProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.Params";
   value: Uint8Array;
 }
@@ -192,7 +192,7 @@ export interface ParamsAmino {
   instantiate_default_permission: AccessType;
   max_wasm_code_size: string;
 }
-export interface ParamsAminoType {
+export interface ParamsAminoMsg {
   type: "wasm/Params";
   value: ParamsAmino;
 }
@@ -215,7 +215,7 @@ export interface CodeInfo {
   /** InstantiateConfig access control to apply on contract creation, optional */
   instantiateConfig?: AccessConfig;
 }
-export interface CodeInfoProtoType {
+export interface CodeInfoProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.CodeInfo";
   value: Uint8Array;
 }
@@ -231,7 +231,7 @@ export interface CodeInfoAmino {
   /** InstantiateConfig access control to apply on contract creation, optional */
   instantiate_config?: AccessConfigAmino;
 }
-export interface CodeInfoAminoType {
+export interface CodeInfoAminoMsg {
   type: "wasm/CodeInfo";
   value: CodeInfoAmino;
 }
@@ -271,7 +271,7 @@ export interface ContractInfo {
    */
   extension?: (Any) | undefined;
 }
-export interface ContractInfoProtoType {
+export interface ContractInfoProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.ContractInfo";
   value: Uint8Array;
 }
@@ -304,7 +304,7 @@ export interface ContractInfoAmino {
    */
   extension?: AnyAmino;
 }
-export interface ContractInfoAminoType {
+export interface ContractInfoAminoMsg {
   type: "wasm/ContractInfo";
   value: ContractInfoAmino;
 }
@@ -331,7 +331,7 @@ export interface ContractCodeHistoryEntry {
   updated?: AbsoluteTxPosition;
   msg: Uint8Array;
 }
-export interface ContractCodeHistoryEntryProtoType {
+export interface ContractCodeHistoryEntryProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.ContractCodeHistoryEntry";
   value: Uint8Array;
 }
@@ -347,7 +347,7 @@ export interface ContractCodeHistoryEntryAmino {
   updated?: AbsoluteTxPositionAmino;
   msg: Uint8Array;
 }
-export interface ContractCodeHistoryEntryAminoType {
+export interface ContractCodeHistoryEntryAminoMsg {
   type: "wasm/ContractCodeHistoryEntry";
   value: ContractCodeHistoryEntryAmino;
 }
@@ -374,7 +374,7 @@ export interface AbsoluteTxPosition {
    */
   txIndex: Long;
 }
-export interface AbsoluteTxPositionProtoType {
+export interface AbsoluteTxPositionProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.AbsoluteTxPosition";
   value: Uint8Array;
 }
@@ -393,7 +393,7 @@ export interface AbsoluteTxPositionAmino {
    */
   tx_index: string;
 }
-export interface AbsoluteTxPositionAminoType {
+export interface AbsoluteTxPositionAminoMsg {
   type: "wasm/AbsoluteTxPosition";
   value: AbsoluteTxPositionAmino;
 }
@@ -415,7 +415,7 @@ export interface Model {
   /** base64-encode raw value */
   value: Uint8Array;
 }
-export interface ModelProtoType {
+export interface ModelProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.Model";
   value: Uint8Array;
 }
@@ -428,7 +428,7 @@ export interface ModelAmino {
   /** base64-encode raw value */
   value: Uint8Array;
 }
-export interface ModelAminoType {
+export interface ModelAminoMsg {
   type: "wasm/Model";
   value: ModelAmino;
 }
@@ -446,6 +446,9 @@ function createBaseAccessTypeParam(): AccessTypeParam {
 }
 
 export const AccessTypeParam = {
+  typeUrl: "/cosmwasm.wasm.v1.AccessTypeParam",
+  aminoType: "wasm/AccessTypeParam",
+
   encode(message: AccessTypeParam, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.value !== 0) {
       writer.uint32(8).int32(message.value);
@@ -516,6 +519,32 @@ export const AccessTypeParam = {
     const obj: any = {};
     obj.value = message.value;
     return obj;
+  },
+
+  fromAminoMsg(object: AccessTypeParamAminoMsg): AccessTypeParam {
+    return AccessTypeParam.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: AccessTypeParam): AccessTypeParamAminoMsg {
+    return {
+      type: "wasm/AccessTypeParam",
+      value: AccessTypeParam.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: AccessTypeParamProtoMsg): AccessTypeParam {
+    return AccessTypeParam.decode(message.value);
+  },
+
+  toProto(message: AccessTypeParam): Uint8Array {
+    return AccessTypeParam.encode(message).finish();
+  },
+
+  toProtoMsg(message: AccessTypeParam): AccessTypeParamProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.AccessTypeParam",
+      value: AccessTypeParam.encode(message).finish()
+    };
   }
 
 };
@@ -528,6 +557,9 @@ function createBaseAccessConfig(): AccessConfig {
 }
 
 export const AccessConfig = {
+  typeUrl: "/cosmwasm.wasm.v1.AccessConfig",
+  aminoType: "wasm/AccessConfig",
+
   encode(message: AccessConfig, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.permission !== 0) {
       writer.uint32(8).int32(message.permission);
@@ -613,6 +645,32 @@ export const AccessConfig = {
     obj.permission = message.permission;
     obj.address = message.address;
     return obj;
+  },
+
+  fromAminoMsg(object: AccessConfigAminoMsg): AccessConfig {
+    return AccessConfig.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: AccessConfig): AccessConfigAminoMsg {
+    return {
+      type: "wasm/AccessConfig",
+      value: AccessConfig.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: AccessConfigProtoMsg): AccessConfig {
+    return AccessConfig.decode(message.value);
+  },
+
+  toProto(message: AccessConfig): Uint8Array {
+    return AccessConfig.encode(message).finish();
+  },
+
+  toProtoMsg(message: AccessConfig): AccessConfigProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.AccessConfig",
+      value: AccessConfig.encode(message).finish()
+    };
   }
 
 };
@@ -626,6 +684,9 @@ function createBaseParams(): Params {
 }
 
 export const Params = {
+  typeUrl: "/cosmwasm.wasm.v1.Params",
+  aminoType: "wasm/Params",
+
   encode(message: Params, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.codeUploadAccess !== undefined) {
       AccessConfig.encode(message.codeUploadAccess, writer.uint32(10).fork()).ldelim();
@@ -726,6 +787,32 @@ export const Params = {
     obj.instantiate_default_permission = message.instantiateDefaultPermission;
     obj.max_wasm_code_size = message.maxWasmCodeSize ? message.maxWasmCodeSize.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ParamsAminoMsg): Params {
+    return Params.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Params): ParamsAminoMsg {
+    return {
+      type: "wasm/Params",
+      value: Params.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ParamsProtoMsg): Params {
+    return Params.decode(message.value);
+  },
+
+  toProto(message: Params): Uint8Array {
+    return Params.encode(message).finish();
+  },
+
+  toProtoMsg(message: Params): ParamsProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.Params",
+      value: Params.encode(message).finish()
+    };
   }
 
 };
@@ -739,6 +826,9 @@ function createBaseCodeInfo(): CodeInfo {
 }
 
 export const CodeInfo = {
+  typeUrl: "/cosmwasm.wasm.v1.CodeInfo",
+  aminoType: "wasm/CodeInfo",
+
   encode(message: CodeInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.codeHash.length !== 0) {
       writer.uint32(10).bytes(message.codeHash);
@@ -839,6 +929,32 @@ export const CodeInfo = {
     obj.creator = message.creator;
     obj.instantiate_config = message.instantiateConfig ? AccessConfig.toAmino(message.instantiateConfig) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: CodeInfoAminoMsg): CodeInfo {
+    return CodeInfo.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: CodeInfo): CodeInfoAminoMsg {
+    return {
+      type: "wasm/CodeInfo",
+      value: CodeInfo.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: CodeInfoProtoMsg): CodeInfo {
+    return CodeInfo.decode(message.value);
+  },
+
+  toProto(message: CodeInfo): Uint8Array {
+    return CodeInfo.encode(message).finish();
+  },
+
+  toProtoMsg(message: CodeInfo): CodeInfoProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.CodeInfo",
+      value: CodeInfo.encode(message).finish()
+    };
   }
 
 };
@@ -856,6 +972,9 @@ function createBaseContractInfo(): ContractInfo {
 }
 
 export const ContractInfo = {
+  typeUrl: "/cosmwasm.wasm.v1.ContractInfo",
+  aminoType: "wasm/ContractInfo",
+
   encode(message: ContractInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.codeId.isZero()) {
       writer.uint32(8).uint64(message.codeId);
@@ -1016,6 +1135,32 @@ export const ContractInfo = {
     obj.ibc_port_id = message.ibcPortId;
     obj.extension = message.extension ? ContractInfoExtension_ToAmino((message.extension as Any)) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ContractInfoAminoMsg): ContractInfo {
+    return ContractInfo.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ContractInfo): ContractInfoAminoMsg {
+    return {
+      type: "wasm/ContractInfo",
+      value: ContractInfo.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ContractInfoProtoMsg): ContractInfo {
+    return ContractInfo.decode(message.value);
+  },
+
+  toProto(message: ContractInfo): Uint8Array {
+    return ContractInfo.encode(message).finish();
+  },
+
+  toProtoMsg(message: ContractInfo): ContractInfoProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.ContractInfo",
+      value: ContractInfo.encode(message).finish()
+    };
   }
 
 };
@@ -1030,6 +1175,9 @@ function createBaseContractCodeHistoryEntry(): ContractCodeHistoryEntry {
 }
 
 export const ContractCodeHistoryEntry = {
+  typeUrl: "/cosmwasm.wasm.v1.ContractCodeHistoryEntry",
+  aminoType: "wasm/ContractCodeHistoryEntry",
+
   encode(message: ContractCodeHistoryEntry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.operation !== 0) {
       writer.uint32(8).int32(message.operation);
@@ -1145,6 +1293,32 @@ export const ContractCodeHistoryEntry = {
     obj.updated = message.updated ? AbsoluteTxPosition.toAmino(message.updated) : undefined;
     obj.msg = message.msg ? JSON.parse(fromUtf8(message.msg)) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ContractCodeHistoryEntryAminoMsg): ContractCodeHistoryEntry {
+    return ContractCodeHistoryEntry.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ContractCodeHistoryEntry): ContractCodeHistoryEntryAminoMsg {
+    return {
+      type: "wasm/ContractCodeHistoryEntry",
+      value: ContractCodeHistoryEntry.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ContractCodeHistoryEntryProtoMsg): ContractCodeHistoryEntry {
+    return ContractCodeHistoryEntry.decode(message.value);
+  },
+
+  toProto(message: ContractCodeHistoryEntry): Uint8Array {
+    return ContractCodeHistoryEntry.encode(message).finish();
+  },
+
+  toProtoMsg(message: ContractCodeHistoryEntry): ContractCodeHistoryEntryProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.ContractCodeHistoryEntry",
+      value: ContractCodeHistoryEntry.encode(message).finish()
+    };
   }
 
 };
@@ -1157,6 +1331,9 @@ function createBaseAbsoluteTxPosition(): AbsoluteTxPosition {
 }
 
 export const AbsoluteTxPosition = {
+  typeUrl: "/cosmwasm.wasm.v1.AbsoluteTxPosition",
+  aminoType: "wasm/AbsoluteTxPosition",
+
   encode(message: AbsoluteTxPosition, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.blockHeight.isZero()) {
       writer.uint32(8).uint64(message.blockHeight);
@@ -1242,6 +1419,32 @@ export const AbsoluteTxPosition = {
     obj.block_height = message.blockHeight ? message.blockHeight.toString() : undefined;
     obj.tx_index = message.txIndex ? message.txIndex.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: AbsoluteTxPositionAminoMsg): AbsoluteTxPosition {
+    return AbsoluteTxPosition.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: AbsoluteTxPosition): AbsoluteTxPositionAminoMsg {
+    return {
+      type: "wasm/AbsoluteTxPosition",
+      value: AbsoluteTxPosition.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: AbsoluteTxPositionProtoMsg): AbsoluteTxPosition {
+    return AbsoluteTxPosition.decode(message.value);
+  },
+
+  toProto(message: AbsoluteTxPosition): Uint8Array {
+    return AbsoluteTxPosition.encode(message).finish();
+  },
+
+  toProtoMsg(message: AbsoluteTxPosition): AbsoluteTxPositionProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.AbsoluteTxPosition",
+      value: AbsoluteTxPosition.encode(message).finish()
+    };
   }
 
 };
@@ -1254,6 +1457,9 @@ function createBaseModel(): Model {
 }
 
 export const Model = {
+  typeUrl: "/cosmwasm.wasm.v1.Model",
+  aminoType: "wasm/Model",
+
   encode(message: Model, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.key.length !== 0) {
       writer.uint32(10).bytes(message.key);
@@ -1339,6 +1545,32 @@ export const Model = {
     obj.key = message.key;
     obj.value = message.value;
     return obj;
+  },
+
+  fromAminoMsg(object: ModelAminoMsg): Model {
+    return Model.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Model): ModelAminoMsg {
+    return {
+      type: "wasm/Model",
+      value: Model.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ModelProtoMsg): Model {
+    return Model.decode(message.value);
+  },
+
+  toProto(message: Model): Uint8Array {
+    return Model.encode(message).finish();
+  },
+
+  toProtoMsg(message: Model): ModelProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.Model",
+      value: Model.encode(message).finish()
+    };
   }
 
 };
diff --git a/__fixtures__/outputv2/evmos/claims/v1/claims.ts b/__fixtures__/outputv2/evmos/claims/v1/claims.ts
index 9353c5514..c5aaa88c7 100644
--- a/__fixtures__/outputv2/evmos/claims/v1/claims.ts
+++ b/__fixtures__/outputv2/evmos/claims/v1/claims.ts
@@ -87,7 +87,7 @@ export interface Claim {
   /** claimable token amount for the action. Zero if completed */
   claimableAmount: string;
 }
-export interface ClaimProtoType {
+export interface ClaimProtoMsg {
   typeUrl: "/evmos.claims.v1.Claim";
   value: Uint8Array;
 }
@@ -106,7 +106,7 @@ export interface ClaimAmino {
   /** claimable token amount for the action. Zero if completed */
   claimable_amount: string;
 }
-export interface ClaimAminoType {
+export interface ClaimAminoMsg {
   type: "/evmos.claims.v1.Claim";
   value: ClaimAmino;
 }
@@ -132,7 +132,7 @@ export interface ClaimsRecordAddress {
   /** slice of the available actions completed */
   actionsCompleted: boolean[];
 }
-export interface ClaimsRecordAddressProtoType {
+export interface ClaimsRecordAddressProtoMsg {
   typeUrl: "/evmos.claims.v1.ClaimsRecordAddress";
   value: Uint8Array;
 }
@@ -148,7 +148,7 @@ export interface ClaimsRecordAddressAmino {
   /** slice of the available actions completed */
   actions_completed: boolean[];
 }
-export interface ClaimsRecordAddressAminoType {
+export interface ClaimsRecordAddressAminoMsg {
   type: "/evmos.claims.v1.ClaimsRecordAddress";
   value: ClaimsRecordAddressAmino;
 }
@@ -171,7 +171,7 @@ export interface ClaimsRecord {
   /** slice of the available actions completed */
   actionsCompleted: boolean[];
 }
-export interface ClaimsRecordProtoType {
+export interface ClaimsRecordProtoMsg {
   typeUrl: "/evmos.claims.v1.ClaimsRecord";
   value: Uint8Array;
 }
@@ -187,7 +187,7 @@ export interface ClaimsRecordAmino {
   /** slice of the available actions completed */
   actions_completed: boolean[];
 }
-export interface ClaimsRecordAminoType {
+export interface ClaimsRecordAminoMsg {
   type: "/evmos.claims.v1.ClaimsRecord";
   value: ClaimsRecordAmino;
 }
@@ -210,6 +210,8 @@ function createBaseClaim(): Claim {
 }
 
 export const Claim = {
+  typeUrl: "/evmos.claims.v1.Claim",
+
   encode(message: Claim, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.action !== 0) {
       writer.uint32(8).int32(message.action);
@@ -310,6 +312,25 @@ export const Claim = {
     obj.completed = message.completed;
     obj.claimable_amount = message.claimableAmount;
     return obj;
+  },
+
+  fromAminoMsg(object: ClaimAminoMsg): Claim {
+    return Claim.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ClaimProtoMsg): Claim {
+    return Claim.decode(message.value);
+  },
+
+  toProto(message: Claim): Uint8Array {
+    return Claim.encode(message).finish();
+  },
+
+  toProtoMsg(message: Claim): ClaimProtoMsg {
+    return {
+      typeUrl: "/evmos.claims.v1.Claim",
+      value: Claim.encode(message).finish()
+    };
   }
 
 };
@@ -323,6 +344,8 @@ function createBaseClaimsRecordAddress(): ClaimsRecordAddress {
 }
 
 export const ClaimsRecordAddress = {
+  typeUrl: "/evmos.claims.v1.ClaimsRecordAddress",
+
   encode(message: ClaimsRecordAddress, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.address !== "") {
       writer.uint32(10).string(message.address);
@@ -453,6 +476,25 @@ export const ClaimsRecordAddress = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ClaimsRecordAddressAminoMsg): ClaimsRecordAddress {
+    return ClaimsRecordAddress.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ClaimsRecordAddressProtoMsg): ClaimsRecordAddress {
+    return ClaimsRecordAddress.decode(message.value);
+  },
+
+  toProto(message: ClaimsRecordAddress): Uint8Array {
+    return ClaimsRecordAddress.encode(message).finish();
+  },
+
+  toProtoMsg(message: ClaimsRecordAddress): ClaimsRecordAddressProtoMsg {
+    return {
+      typeUrl: "/evmos.claims.v1.ClaimsRecordAddress",
+      value: ClaimsRecordAddress.encode(message).finish()
+    };
   }
 
 };
@@ -465,6 +507,8 @@ function createBaseClaimsRecord(): ClaimsRecord {
 }
 
 export const ClaimsRecord = {
+  typeUrl: "/evmos.claims.v1.ClaimsRecord",
+
   encode(message: ClaimsRecord, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.initialClaimableAmount !== "") {
       writer.uint32(10).string(message.initialClaimableAmount);
@@ -580,6 +624,25 @@ export const ClaimsRecord = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ClaimsRecordAminoMsg): ClaimsRecord {
+    return ClaimsRecord.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ClaimsRecordProtoMsg): ClaimsRecord {
+    return ClaimsRecord.decode(message.value);
+  },
+
+  toProto(message: ClaimsRecord): Uint8Array {
+    return ClaimsRecord.encode(message).finish();
+  },
+
+  toProtoMsg(message: ClaimsRecord): ClaimsRecordProtoMsg {
+    return {
+      typeUrl: "/evmos.claims.v1.ClaimsRecord",
+      value: ClaimsRecord.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/evmos/claims/v1/genesis.ts b/__fixtures__/outputv2/evmos/claims/v1/genesis.ts
index e85e8013c..f5e5ed365 100644
--- a/__fixtures__/outputv2/evmos/claims/v1/genesis.ts
+++ b/__fixtures__/outputv2/evmos/claims/v1/genesis.ts
@@ -13,7 +13,7 @@ export interface GenesisState {
   /** list of claim records with the corresponding airdrop recipient */
   claimsRecords: ClaimsRecordAddress[];
 }
-export interface GenesisStateProtoType {
+export interface GenesisStateProtoMsg {
   typeUrl: "/evmos.claims.v1.GenesisState";
   value: Uint8Array;
 }
@@ -26,7 +26,7 @@ export interface GenesisStateAmino {
   /** list of claim records with the corresponding airdrop recipient */
   claims_records: ClaimsRecordAddressAmino[];
 }
-export interface GenesisStateAminoType {
+export interface GenesisStateAminoMsg {
   type: "/evmos.claims.v1.GenesisState";
   value: GenesisStateAmino;
 }
@@ -63,7 +63,7 @@ export interface Params {
   /** list of channel identifiers from EVM compatible chains */
   evmChannels: string[];
 }
-export interface ParamsProtoType {
+export interface ParamsProtoMsg {
   typeUrl: "/evmos.claims.v1.Params";
   value: Uint8Array;
 }
@@ -94,7 +94,7 @@ export interface ParamsAmino {
   /** list of channel identifiers from EVM compatible chains */
   evm_channels: string[];
 }
-export interface ParamsAminoType {
+export interface ParamsAminoMsg {
   type: "/evmos.claims.v1.Params";
   value: ParamsAmino;
 }
@@ -118,6 +118,8 @@ function createBaseGenesisState(): GenesisState {
 }
 
 export const GenesisState = {
+  typeUrl: "/evmos.claims.v1.GenesisState",
+
   encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.params !== undefined) {
       Params.encode(message.params, writer.uint32(10).fork()).ldelim();
@@ -221,6 +223,25 @@ export const GenesisState = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisStateAminoMsg): GenesisState {
+    return GenesisState.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: GenesisStateProtoMsg): GenesisState {
+    return GenesisState.decode(message.value);
+  },
+
+  toProto(message: GenesisState): Uint8Array {
+    return GenesisState.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisState): GenesisStateProtoMsg {
+    return {
+      typeUrl: "/evmos.claims.v1.GenesisState",
+      value: GenesisState.encode(message).finish()
+    };
   }
 
 };
@@ -238,6 +259,8 @@ function createBaseParams(): Params {
 }
 
 export const Params = {
+  typeUrl: "/evmos.claims.v1.Params",
+
   encode(message: Params, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.enableClaims === true) {
       writer.uint32(8).bool(message.enableClaims);
@@ -431,6 +454,25 @@ export const Params = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ParamsAminoMsg): Params {
+    return Params.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ParamsProtoMsg): Params {
+    return Params.decode(message.value);
+  },
+
+  toProto(message: Params): Uint8Array {
+    return Params.encode(message).finish();
+  },
+
+  toProtoMsg(message: Params): ParamsProtoMsg {
+    return {
+      typeUrl: "/evmos.claims.v1.Params",
+      value: Params.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/evmos/claims/v1/query.ts b/__fixtures__/outputv2/evmos/claims/v1/query.ts
index d9d10a5c8..bb1790fef 100644
--- a/__fixtures__/outputv2/evmos/claims/v1/query.ts
+++ b/__fixtures__/outputv2/evmos/claims/v1/query.ts
@@ -11,7 +11,7 @@ export const protobufPackage = "evmos.claims.v1";
  * RPC method.
  */
 export interface QueryTotalUnclaimedRequest {}
-export interface QueryTotalUnclaimedRequestProtoType {
+export interface QueryTotalUnclaimedRequestProtoMsg {
   typeUrl: "/evmos.claims.v1.QueryTotalUnclaimedRequest";
   value: Uint8Array;
 }
@@ -21,7 +21,7 @@ export interface QueryTotalUnclaimedRequestProtoType {
  * RPC method.
  */
 export interface QueryTotalUnclaimedRequestAmino {}
-export interface QueryTotalUnclaimedRequestAminoType {
+export interface QueryTotalUnclaimedRequestAminoMsg {
   type: "/evmos.claims.v1.QueryTotalUnclaimedRequest";
   value: QueryTotalUnclaimedRequestAmino;
 }
@@ -40,7 +40,7 @@ export interface QueryTotalUnclaimedResponse {
   /** coins defines the unclaimed coins */
   coins: Coin[];
 }
-export interface QueryTotalUnclaimedResponseProtoType {
+export interface QueryTotalUnclaimedResponseProtoMsg {
   typeUrl: "/evmos.claims.v1.QueryTotalUnclaimedResponse";
   value: Uint8Array;
 }
@@ -53,7 +53,7 @@ export interface QueryTotalUnclaimedResponseAmino {
   /** coins defines the unclaimed coins */
   coins: CoinAmino[];
 }
-export interface QueryTotalUnclaimedResponseAminoType {
+export interface QueryTotalUnclaimedResponseAminoMsg {
   type: "/evmos.claims.v1.QueryTotalUnclaimedResponse";
   value: QueryTotalUnclaimedResponseAmino;
 }
@@ -68,14 +68,14 @@ export interface QueryTotalUnclaimedResponseSDKType {
 
 /** QueryParamsRequest is the request type for the Query/Params RPC method. */
 export interface QueryParamsRequest {}
-export interface QueryParamsRequestProtoType {
+export interface QueryParamsRequestProtoMsg {
   typeUrl: "/evmos.claims.v1.QueryParamsRequest";
   value: Uint8Array;
 }
 
 /** QueryParamsRequest is the request type for the Query/Params RPC method. */
 export interface QueryParamsRequestAmino {}
-export interface QueryParamsRequestAminoType {
+export interface QueryParamsRequestAminoMsg {
   type: "/evmos.claims.v1.QueryParamsRequest";
   value: QueryParamsRequestAmino;
 }
@@ -88,7 +88,7 @@ export interface QueryParamsResponse {
   /** params defines the parameters of the module. */
   params?: Params;
 }
-export interface QueryParamsResponseProtoType {
+export interface QueryParamsResponseProtoMsg {
   typeUrl: "/evmos.claims.v1.QueryParamsResponse";
   value: Uint8Array;
 }
@@ -98,7 +98,7 @@ export interface QueryParamsResponseAmino {
   /** params defines the parameters of the module. */
   params?: ParamsAmino;
 }
-export interface QueryParamsResponseAminoType {
+export interface QueryParamsResponseAminoMsg {
   type: "/evmos.claims.v1.QueryParamsResponse";
   value: QueryParamsResponseAmino;
 }
@@ -116,7 +116,7 @@ export interface QueryClaimsRecordsRequest {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequest;
 }
-export interface QueryClaimsRecordsRequestProtoType {
+export interface QueryClaimsRecordsRequestProtoMsg {
   typeUrl: "/evmos.claims.v1.QueryClaimsRecordsRequest";
   value: Uint8Array;
 }
@@ -129,7 +129,7 @@ export interface QueryClaimsRecordsRequestAmino {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequestAmino;
 }
-export interface QueryClaimsRecordsRequestAminoType {
+export interface QueryClaimsRecordsRequestAminoMsg {
   type: "/evmos.claims.v1.QueryClaimsRecordsRequest";
   value: QueryClaimsRecordsRequestAmino;
 }
@@ -153,7 +153,7 @@ export interface QueryClaimsRecordsResponse {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponse;
 }
-export interface QueryClaimsRecordsResponseProtoType {
+export interface QueryClaimsRecordsResponseProtoMsg {
   typeUrl: "/evmos.claims.v1.QueryClaimsRecordsResponse";
   value: Uint8Array;
 }
@@ -169,7 +169,7 @@ export interface QueryClaimsRecordsResponseAmino {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponseAmino;
 }
-export interface QueryClaimsRecordsResponseAminoType {
+export interface QueryClaimsRecordsResponseAminoMsg {
   type: "/evmos.claims.v1.QueryClaimsRecordsResponse";
   value: QueryClaimsRecordsResponseAmino;
 }
@@ -191,7 +191,7 @@ export interface QueryClaimsRecordRequest {
   /** address defines the user to query claims record for */
   address: string;
 }
-export interface QueryClaimsRecordRequestProtoType {
+export interface QueryClaimsRecordRequestProtoMsg {
   typeUrl: "/evmos.claims.v1.QueryClaimsRecordRequest";
   value: Uint8Array;
 }
@@ -204,7 +204,7 @@ export interface QueryClaimsRecordRequestAmino {
   /** address defines the user to query claims record for */
   address: string;
 }
-export interface QueryClaimsRecordRequestAminoType {
+export interface QueryClaimsRecordRequestAminoMsg {
   type: "/evmos.claims.v1.QueryClaimsRecordRequest";
   value: QueryClaimsRecordRequestAmino;
 }
@@ -228,7 +228,7 @@ export interface QueryClaimsRecordResponse {
   /** the claims of the user */
   claims: Claim[];
 }
-export interface QueryClaimsRecordResponseProtoType {
+export interface QueryClaimsRecordResponseProtoMsg {
   typeUrl: "/evmos.claims.v1.QueryClaimsRecordResponse";
   value: Uint8Array;
 }
@@ -244,7 +244,7 @@ export interface QueryClaimsRecordResponseAmino {
   /** the claims of the user */
   claims: ClaimAmino[];
 }
-export interface QueryClaimsRecordResponseAminoType {
+export interface QueryClaimsRecordResponseAminoMsg {
   type: "/evmos.claims.v1.QueryClaimsRecordResponse";
   value: QueryClaimsRecordResponseAmino;
 }
@@ -263,6 +263,8 @@ function createBaseQueryTotalUnclaimedRequest(): QueryTotalUnclaimedRequest {
 }
 
 export const QueryTotalUnclaimedRequest = {
+  typeUrl: "/evmos.claims.v1.QueryTotalUnclaimedRequest",
+
   encode(_: QueryTotalUnclaimedRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -315,6 +317,25 @@ export const QueryTotalUnclaimedRequest = {
   toAmino(_: QueryTotalUnclaimedRequest): QueryTotalUnclaimedRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryTotalUnclaimedRequestAminoMsg): QueryTotalUnclaimedRequest {
+    return QueryTotalUnclaimedRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryTotalUnclaimedRequestProtoMsg): QueryTotalUnclaimedRequest {
+    return QueryTotalUnclaimedRequest.decode(message.value);
+  },
+
+  toProto(message: QueryTotalUnclaimedRequest): Uint8Array {
+    return QueryTotalUnclaimedRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryTotalUnclaimedRequest): QueryTotalUnclaimedRequestProtoMsg {
+    return {
+      typeUrl: "/evmos.claims.v1.QueryTotalUnclaimedRequest",
+      value: QueryTotalUnclaimedRequest.encode(message).finish()
+    };
   }
 
 };
@@ -326,6 +347,8 @@ function createBaseQueryTotalUnclaimedResponse(): QueryTotalUnclaimedResponse {
 }
 
 export const QueryTotalUnclaimedResponse = {
+  typeUrl: "/evmos.claims.v1.QueryTotalUnclaimedResponse",
+
   encode(message: QueryTotalUnclaimedResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.coins) {
       Coin.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -414,6 +437,25 @@ export const QueryTotalUnclaimedResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: QueryTotalUnclaimedResponseAminoMsg): QueryTotalUnclaimedResponse {
+    return QueryTotalUnclaimedResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryTotalUnclaimedResponseProtoMsg): QueryTotalUnclaimedResponse {
+    return QueryTotalUnclaimedResponse.decode(message.value);
+  },
+
+  toProto(message: QueryTotalUnclaimedResponse): Uint8Array {
+    return QueryTotalUnclaimedResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryTotalUnclaimedResponse): QueryTotalUnclaimedResponseProtoMsg {
+    return {
+      typeUrl: "/evmos.claims.v1.QueryTotalUnclaimedResponse",
+      value: QueryTotalUnclaimedResponse.encode(message).finish()
+    };
   }
 
 };
@@ -423,6 +465,8 @@ function createBaseQueryParamsRequest(): QueryParamsRequest {
 }
 
 export const QueryParamsRequest = {
+  typeUrl: "/evmos.claims.v1.QueryParamsRequest",
+
   encode(_: QueryParamsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -475,6 +519,25 @@ export const QueryParamsRequest = {
   toAmino(_: QueryParamsRequest): QueryParamsRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest {
+    return QueryParamsRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryParamsRequestProtoMsg): QueryParamsRequest {
+    return QueryParamsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryParamsRequest): Uint8Array {
+    return QueryParamsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryParamsRequest): QueryParamsRequestProtoMsg {
+    return {
+      typeUrl: "/evmos.claims.v1.QueryParamsRequest",
+      value: QueryParamsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -486,6 +549,8 @@ function createBaseQueryParamsResponse(): QueryParamsResponse {
 }
 
 export const QueryParamsResponse = {
+  typeUrl: "/evmos.claims.v1.QueryParamsResponse",
+
   encode(message: QueryParamsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.params !== undefined) {
       Params.encode(message.params, writer.uint32(10).fork()).ldelim();
@@ -556,6 +621,25 @@ export const QueryParamsResponse = {
     const obj: any = {};
     obj.params = message.params ? Params.toAmino(message.params) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryParamsResponseAminoMsg): QueryParamsResponse {
+    return QueryParamsResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryParamsResponseProtoMsg): QueryParamsResponse {
+    return QueryParamsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryParamsResponse): Uint8Array {
+    return QueryParamsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryParamsResponse): QueryParamsResponseProtoMsg {
+    return {
+      typeUrl: "/evmos.claims.v1.QueryParamsResponse",
+      value: QueryParamsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -567,6 +651,8 @@ function createBaseQueryClaimsRecordsRequest(): QueryClaimsRecordsRequest {
 }
 
 export const QueryClaimsRecordsRequest = {
+  typeUrl: "/evmos.claims.v1.QueryClaimsRecordsRequest",
+
   encode(message: QueryClaimsRecordsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.pagination !== undefined) {
       PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim();
@@ -637,6 +723,25 @@ export const QueryClaimsRecordsRequest = {
     const obj: any = {};
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryClaimsRecordsRequestAminoMsg): QueryClaimsRecordsRequest {
+    return QueryClaimsRecordsRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryClaimsRecordsRequestProtoMsg): QueryClaimsRecordsRequest {
+    return QueryClaimsRecordsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryClaimsRecordsRequest): Uint8Array {
+    return QueryClaimsRecordsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryClaimsRecordsRequest): QueryClaimsRecordsRequestProtoMsg {
+    return {
+      typeUrl: "/evmos.claims.v1.QueryClaimsRecordsRequest",
+      value: QueryClaimsRecordsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -649,6 +754,8 @@ function createBaseQueryClaimsRecordsResponse(): QueryClaimsRecordsResponse {
 }
 
 export const QueryClaimsRecordsResponse = {
+  typeUrl: "/evmos.claims.v1.QueryClaimsRecordsResponse",
+
   encode(message: QueryClaimsRecordsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.claims) {
       ClaimsRecordAddress.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -752,6 +859,25 @@ export const QueryClaimsRecordsResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryClaimsRecordsResponseAminoMsg): QueryClaimsRecordsResponse {
+    return QueryClaimsRecordsResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryClaimsRecordsResponseProtoMsg): QueryClaimsRecordsResponse {
+    return QueryClaimsRecordsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryClaimsRecordsResponse): Uint8Array {
+    return QueryClaimsRecordsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryClaimsRecordsResponse): QueryClaimsRecordsResponseProtoMsg {
+    return {
+      typeUrl: "/evmos.claims.v1.QueryClaimsRecordsResponse",
+      value: QueryClaimsRecordsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -763,6 +889,8 @@ function createBaseQueryClaimsRecordRequest(): QueryClaimsRecordRequest {
 }
 
 export const QueryClaimsRecordRequest = {
+  typeUrl: "/evmos.claims.v1.QueryClaimsRecordRequest",
+
   encode(message: QueryClaimsRecordRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.address !== "") {
       writer.uint32(10).string(message.address);
@@ -833,6 +961,25 @@ export const QueryClaimsRecordRequest = {
     const obj: any = {};
     obj.address = message.address;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryClaimsRecordRequestAminoMsg): QueryClaimsRecordRequest {
+    return QueryClaimsRecordRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryClaimsRecordRequestProtoMsg): QueryClaimsRecordRequest {
+    return QueryClaimsRecordRequest.decode(message.value);
+  },
+
+  toProto(message: QueryClaimsRecordRequest): Uint8Array {
+    return QueryClaimsRecordRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryClaimsRecordRequest): QueryClaimsRecordRequestProtoMsg {
+    return {
+      typeUrl: "/evmos.claims.v1.QueryClaimsRecordRequest",
+      value: QueryClaimsRecordRequest.encode(message).finish()
+    };
   }
 
 };
@@ -845,6 +992,8 @@ function createBaseQueryClaimsRecordResponse(): QueryClaimsRecordResponse {
 }
 
 export const QueryClaimsRecordResponse = {
+  typeUrl: "/evmos.claims.v1.QueryClaimsRecordResponse",
+
   encode(message: QueryClaimsRecordResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.initialClaimableAmount !== "") {
       writer.uint32(10).string(message.initialClaimableAmount);
@@ -948,6 +1097,25 @@ export const QueryClaimsRecordResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: QueryClaimsRecordResponseAminoMsg): QueryClaimsRecordResponse {
+    return QueryClaimsRecordResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryClaimsRecordResponseProtoMsg): QueryClaimsRecordResponse {
+    return QueryClaimsRecordResponse.decode(message.value);
+  },
+
+  toProto(message: QueryClaimsRecordResponse): Uint8Array {
+    return QueryClaimsRecordResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryClaimsRecordResponse): QueryClaimsRecordResponseProtoMsg {
+    return {
+      typeUrl: "/evmos.claims.v1.QueryClaimsRecordResponse",
+      value: QueryClaimsRecordResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/evmos/epochs/v1/genesis.ts b/__fixtures__/outputv2/evmos/epochs/v1/genesis.ts
index 2f5a07459..1f0e836e9 100644
--- a/__fixtures__/outputv2/evmos/epochs/v1/genesis.ts
+++ b/__fixtures__/outputv2/evmos/epochs/v1/genesis.ts
@@ -12,7 +12,7 @@ export interface EpochInfo {
   epochCountingStarted: boolean;
   currentEpochStartHeight: Long;
 }
-export interface EpochInfoProtoType {
+export interface EpochInfoProtoMsg {
   typeUrl: "/evmos.epochs.v1.EpochInfo";
   value: Uint8Array;
 }
@@ -25,7 +25,7 @@ export interface EpochInfoAmino {
   epoch_counting_started: boolean;
   current_epoch_start_height: string;
 }
-export interface EpochInfoAminoType {
+export interface EpochInfoAminoMsg {
   type: "/evmos.epochs.v1.EpochInfo";
   value: EpochInfoAmino;
 }
@@ -43,7 +43,7 @@ export interface EpochInfoSDKType {
 export interface GenesisState {
   epochs: EpochInfo[];
 }
-export interface GenesisStateProtoType {
+export interface GenesisStateProtoMsg {
   typeUrl: "/evmos.epochs.v1.GenesisState";
   value: Uint8Array;
 }
@@ -52,7 +52,7 @@ export interface GenesisStateProtoType {
 export interface GenesisStateAmino {
   epochs: EpochInfoAmino[];
 }
-export interface GenesisStateAminoType {
+export interface GenesisStateAminoMsg {
   type: "/evmos.epochs.v1.GenesisState";
   value: GenesisStateAmino;
 }
@@ -75,6 +75,8 @@ function createBaseEpochInfo(): EpochInfo {
 }
 
 export const EpochInfo = {
+  typeUrl: "/evmos.epochs.v1.EpochInfo",
+
   encode(message: EpochInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.identifier !== "") {
       writer.uint32(10).string(message.identifier);
@@ -235,6 +237,25 @@ export const EpochInfo = {
     obj.epoch_counting_started = message.epochCountingStarted;
     obj.current_epoch_start_height = message.currentEpochStartHeight ? message.currentEpochStartHeight.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: EpochInfoAminoMsg): EpochInfo {
+    return EpochInfo.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: EpochInfoProtoMsg): EpochInfo {
+    return EpochInfo.decode(message.value);
+  },
+
+  toProto(message: EpochInfo): Uint8Array {
+    return EpochInfo.encode(message).finish();
+  },
+
+  toProtoMsg(message: EpochInfo): EpochInfoProtoMsg {
+    return {
+      typeUrl: "/evmos.epochs.v1.EpochInfo",
+      value: EpochInfo.encode(message).finish()
+    };
   }
 
 };
@@ -246,6 +267,8 @@ function createBaseGenesisState(): GenesisState {
 }
 
 export const GenesisState = {
+  typeUrl: "/evmos.epochs.v1.GenesisState",
+
   encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.epochs) {
       EpochInfo.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -334,6 +357,25 @@ export const GenesisState = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisStateAminoMsg): GenesisState {
+    return GenesisState.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: GenesisStateProtoMsg): GenesisState {
+    return GenesisState.decode(message.value);
+  },
+
+  toProto(message: GenesisState): Uint8Array {
+    return GenesisState.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisState): GenesisStateProtoMsg {
+    return {
+      typeUrl: "/evmos.epochs.v1.GenesisState",
+      value: GenesisState.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/evmos/epochs/v1/query.ts b/__fixtures__/outputv2/evmos/epochs/v1/query.ts
index 8595da5d3..37b235b38 100644
--- a/__fixtures__/outputv2/evmos/epochs/v1/query.ts
+++ b/__fixtures__/outputv2/evmos/epochs/v1/query.ts
@@ -6,14 +6,14 @@ export const protobufPackage = "evmos.epochs.v1";
 export interface QueryEpochsInfoRequest {
   pagination?: PageRequest;
 }
-export interface QueryEpochsInfoRequestProtoType {
+export interface QueryEpochsInfoRequestProtoMsg {
   typeUrl: "/evmos.epochs.v1.QueryEpochsInfoRequest";
   value: Uint8Array;
 }
 export interface QueryEpochsInfoRequestAmino {
   pagination?: PageRequestAmino;
 }
-export interface QueryEpochsInfoRequestAminoType {
+export interface QueryEpochsInfoRequestAminoMsg {
   type: "/evmos.epochs.v1.QueryEpochsInfoRequest";
   value: QueryEpochsInfoRequestAmino;
 }
@@ -24,7 +24,7 @@ export interface QueryEpochsInfoResponse {
   epochs: EpochInfo[];
   pagination?: PageResponse;
 }
-export interface QueryEpochsInfoResponseProtoType {
+export interface QueryEpochsInfoResponseProtoMsg {
   typeUrl: "/evmos.epochs.v1.QueryEpochsInfoResponse";
   value: Uint8Array;
 }
@@ -32,7 +32,7 @@ export interface QueryEpochsInfoResponseAmino {
   epochs: EpochInfoAmino[];
   pagination?: PageResponseAmino;
 }
-export interface QueryEpochsInfoResponseAminoType {
+export interface QueryEpochsInfoResponseAminoMsg {
   type: "/evmos.epochs.v1.QueryEpochsInfoResponse";
   value: QueryEpochsInfoResponseAmino;
 }
@@ -43,14 +43,14 @@ export interface QueryEpochsInfoResponseSDKType {
 export interface QueryCurrentEpochRequest {
   identifier: string;
 }
-export interface QueryCurrentEpochRequestProtoType {
+export interface QueryCurrentEpochRequestProtoMsg {
   typeUrl: "/evmos.epochs.v1.QueryCurrentEpochRequest";
   value: Uint8Array;
 }
 export interface QueryCurrentEpochRequestAmino {
   identifier: string;
 }
-export interface QueryCurrentEpochRequestAminoType {
+export interface QueryCurrentEpochRequestAminoMsg {
   type: "/evmos.epochs.v1.QueryCurrentEpochRequest";
   value: QueryCurrentEpochRequestAmino;
 }
@@ -60,14 +60,14 @@ export interface QueryCurrentEpochRequestSDKType {
 export interface QueryCurrentEpochResponse {
   currentEpoch: Long;
 }
-export interface QueryCurrentEpochResponseProtoType {
+export interface QueryCurrentEpochResponseProtoMsg {
   typeUrl: "/evmos.epochs.v1.QueryCurrentEpochResponse";
   value: Uint8Array;
 }
 export interface QueryCurrentEpochResponseAmino {
   current_epoch: string;
 }
-export interface QueryCurrentEpochResponseAminoType {
+export interface QueryCurrentEpochResponseAminoMsg {
   type: "/evmos.epochs.v1.QueryCurrentEpochResponse";
   value: QueryCurrentEpochResponseAmino;
 }
@@ -82,6 +82,8 @@ function createBaseQueryEpochsInfoRequest(): QueryEpochsInfoRequest {
 }
 
 export const QueryEpochsInfoRequest = {
+  typeUrl: "/evmos.epochs.v1.QueryEpochsInfoRequest",
+
   encode(message: QueryEpochsInfoRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.pagination !== undefined) {
       PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim();
@@ -152,6 +154,25 @@ export const QueryEpochsInfoRequest = {
     const obj: any = {};
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryEpochsInfoRequestAminoMsg): QueryEpochsInfoRequest {
+    return QueryEpochsInfoRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryEpochsInfoRequestProtoMsg): QueryEpochsInfoRequest {
+    return QueryEpochsInfoRequest.decode(message.value);
+  },
+
+  toProto(message: QueryEpochsInfoRequest): Uint8Array {
+    return QueryEpochsInfoRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryEpochsInfoRequest): QueryEpochsInfoRequestProtoMsg {
+    return {
+      typeUrl: "/evmos.epochs.v1.QueryEpochsInfoRequest",
+      value: QueryEpochsInfoRequest.encode(message).finish()
+    };
   }
 
 };
@@ -164,6 +185,8 @@ function createBaseQueryEpochsInfoResponse(): QueryEpochsInfoResponse {
 }
 
 export const QueryEpochsInfoResponse = {
+  typeUrl: "/evmos.epochs.v1.QueryEpochsInfoResponse",
+
   encode(message: QueryEpochsInfoResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.epochs) {
       EpochInfo.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -267,6 +290,25 @@ export const QueryEpochsInfoResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryEpochsInfoResponseAminoMsg): QueryEpochsInfoResponse {
+    return QueryEpochsInfoResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryEpochsInfoResponseProtoMsg): QueryEpochsInfoResponse {
+    return QueryEpochsInfoResponse.decode(message.value);
+  },
+
+  toProto(message: QueryEpochsInfoResponse): Uint8Array {
+    return QueryEpochsInfoResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryEpochsInfoResponse): QueryEpochsInfoResponseProtoMsg {
+    return {
+      typeUrl: "/evmos.epochs.v1.QueryEpochsInfoResponse",
+      value: QueryEpochsInfoResponse.encode(message).finish()
+    };
   }
 
 };
@@ -278,6 +320,8 @@ function createBaseQueryCurrentEpochRequest(): QueryCurrentEpochRequest {
 }
 
 export const QueryCurrentEpochRequest = {
+  typeUrl: "/evmos.epochs.v1.QueryCurrentEpochRequest",
+
   encode(message: QueryCurrentEpochRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.identifier !== "") {
       writer.uint32(10).string(message.identifier);
@@ -348,6 +392,25 @@ export const QueryCurrentEpochRequest = {
     const obj: any = {};
     obj.identifier = message.identifier;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryCurrentEpochRequestAminoMsg): QueryCurrentEpochRequest {
+    return QueryCurrentEpochRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryCurrentEpochRequestProtoMsg): QueryCurrentEpochRequest {
+    return QueryCurrentEpochRequest.decode(message.value);
+  },
+
+  toProto(message: QueryCurrentEpochRequest): Uint8Array {
+    return QueryCurrentEpochRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryCurrentEpochRequest): QueryCurrentEpochRequestProtoMsg {
+    return {
+      typeUrl: "/evmos.epochs.v1.QueryCurrentEpochRequest",
+      value: QueryCurrentEpochRequest.encode(message).finish()
+    };
   }
 
 };
@@ -359,6 +422,8 @@ function createBaseQueryCurrentEpochResponse(): QueryCurrentEpochResponse {
 }
 
 export const QueryCurrentEpochResponse = {
+  typeUrl: "/evmos.epochs.v1.QueryCurrentEpochResponse",
+
   encode(message: QueryCurrentEpochResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.currentEpoch.isZero()) {
       writer.uint32(8).int64(message.currentEpoch);
@@ -429,6 +494,25 @@ export const QueryCurrentEpochResponse = {
     const obj: any = {};
     obj.current_epoch = message.currentEpoch ? message.currentEpoch.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryCurrentEpochResponseAminoMsg): QueryCurrentEpochResponse {
+    return QueryCurrentEpochResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryCurrentEpochResponseProtoMsg): QueryCurrentEpochResponse {
+    return QueryCurrentEpochResponse.decode(message.value);
+  },
+
+  toProto(message: QueryCurrentEpochResponse): Uint8Array {
+    return QueryCurrentEpochResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryCurrentEpochResponse): QueryCurrentEpochResponseProtoMsg {
+    return {
+      typeUrl: "/evmos.epochs.v1.QueryCurrentEpochResponse",
+      value: QueryCurrentEpochResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/evmos/erc20/v1/erc20.ts b/__fixtures__/outputv2/evmos/erc20/v1/erc20.ts
index bb1e6c19b..c55dd4caf 100644
--- a/__fixtures__/outputv2/evmos/erc20/v1/erc20.ts
+++ b/__fixtures__/outputv2/evmos/erc20/v1/erc20.ts
@@ -71,7 +71,7 @@ export interface TokenPair {
   /** ERC20 owner address ENUM (0 invalid, 1 ModuleAccount, 2 external address) */
   contractOwner: Owner;
 }
-export interface TokenPairProtoType {
+export interface TokenPairProtoMsg {
   typeUrl: "/evmos.erc20.v1.TokenPair";
   value: Uint8Array;
 }
@@ -93,7 +93,7 @@ export interface TokenPairAmino {
   /** ERC20 owner address ENUM (0 invalid, 1 ModuleAccount, 2 external address) */
   contract_owner: Owner;
 }
-export interface TokenPairAminoType {
+export interface TokenPairAminoMsg {
   type: "/evmos.erc20.v1.TokenPair";
   value: TokenPairAmino;
 }
@@ -123,7 +123,7 @@ export interface RegisterCoinProposal {
   /** metadata of the native Cosmos coin */
   metadata?: Metadata;
 }
-export interface RegisterCoinProposalProtoType {
+export interface RegisterCoinProposalProtoMsg {
   typeUrl: "/evmos.erc20.v1.RegisterCoinProposal";
   value: Uint8Array;
 }
@@ -142,7 +142,7 @@ export interface RegisterCoinProposalAmino {
   /** metadata of the native Cosmos coin */
   metadata?: MetadataAmino;
 }
-export interface RegisterCoinProposalAminoType {
+export interface RegisterCoinProposalAminoMsg {
   type: "/evmos.erc20.v1.RegisterCoinProposal";
   value: RegisterCoinProposalAmino;
 }
@@ -171,7 +171,7 @@ export interface RegisterERC20Proposal {
   /** contract address of ERC20 token */
   erc20address: string;
 }
-export interface RegisterERC20ProposalProtoType {
+export interface RegisterERC20ProposalProtoMsg {
   typeUrl: "/evmos.erc20.v1.RegisterERC20Proposal";
   value: Uint8Array;
 }
@@ -190,7 +190,7 @@ export interface RegisterERC20ProposalAmino {
   /** contract address of ERC20 token */
   erc20address: string;
 }
-export interface RegisterERC20ProposalAminoType {
+export interface RegisterERC20ProposalAminoMsg {
   type: "/evmos.erc20.v1.RegisterERC20Proposal";
   value: RegisterERC20ProposalAmino;
 }
@@ -222,7 +222,7 @@ export interface ToggleTokenConversionProposal {
    */
   token: string;
 }
-export interface ToggleTokenConversionProposalProtoType {
+export interface ToggleTokenConversionProposalProtoMsg {
   typeUrl: "/evmos.erc20.v1.ToggleTokenConversionProposal";
   value: Uint8Array;
 }
@@ -244,7 +244,7 @@ export interface ToggleTokenConversionProposalAmino {
    */
   token: string;
 }
-export interface ToggleTokenConversionProposalAminoType {
+export interface ToggleTokenConversionProposalAminoMsg {
   type: "/evmos.erc20.v1.ToggleTokenConversionProposal";
   value: ToggleTokenConversionProposalAmino;
 }
@@ -269,6 +269,8 @@ function createBaseTokenPair(): TokenPair {
 }
 
 export const TokenPair = {
+  typeUrl: "/evmos.erc20.v1.TokenPair",
+
   encode(message: TokenPair, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.erc20Address !== "") {
       writer.uint32(10).string(message.erc20Address);
@@ -384,6 +386,25 @@ export const TokenPair = {
     obj.enabled = message.enabled;
     obj.contract_owner = message.contractOwner;
     return obj;
+  },
+
+  fromAminoMsg(object: TokenPairAminoMsg): TokenPair {
+    return TokenPair.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: TokenPairProtoMsg): TokenPair {
+    return TokenPair.decode(message.value);
+  },
+
+  toProto(message: TokenPair): Uint8Array {
+    return TokenPair.encode(message).finish();
+  },
+
+  toProtoMsg(message: TokenPair): TokenPairProtoMsg {
+    return {
+      typeUrl: "/evmos.erc20.v1.TokenPair",
+      value: TokenPair.encode(message).finish()
+    };
   }
 
 };
@@ -397,6 +418,8 @@ function createBaseRegisterCoinProposal(): RegisterCoinProposal {
 }
 
 export const RegisterCoinProposal = {
+  typeUrl: "/evmos.erc20.v1.RegisterCoinProposal",
+
   encode(message: RegisterCoinProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.title !== "") {
       writer.uint32(10).string(message.title);
@@ -497,6 +520,25 @@ export const RegisterCoinProposal = {
     obj.description = message.description;
     obj.metadata = message.metadata ? Metadata.toAmino(message.metadata) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: RegisterCoinProposalAminoMsg): RegisterCoinProposal {
+    return RegisterCoinProposal.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: RegisterCoinProposalProtoMsg): RegisterCoinProposal {
+    return RegisterCoinProposal.decode(message.value);
+  },
+
+  toProto(message: RegisterCoinProposal): Uint8Array {
+    return RegisterCoinProposal.encode(message).finish();
+  },
+
+  toProtoMsg(message: RegisterCoinProposal): RegisterCoinProposalProtoMsg {
+    return {
+      typeUrl: "/evmos.erc20.v1.RegisterCoinProposal",
+      value: RegisterCoinProposal.encode(message).finish()
+    };
   }
 
 };
@@ -510,6 +552,8 @@ function createBaseRegisterERC20Proposal(): RegisterERC20Proposal {
 }
 
 export const RegisterERC20Proposal = {
+  typeUrl: "/evmos.erc20.v1.RegisterERC20Proposal",
+
   encode(message: RegisterERC20Proposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.title !== "") {
       writer.uint32(10).string(message.title);
@@ -610,6 +654,25 @@ export const RegisterERC20Proposal = {
     obj.description = message.description;
     obj.erc20address = message.erc20address;
     return obj;
+  },
+
+  fromAminoMsg(object: RegisterERC20ProposalAminoMsg): RegisterERC20Proposal {
+    return RegisterERC20Proposal.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: RegisterERC20ProposalProtoMsg): RegisterERC20Proposal {
+    return RegisterERC20Proposal.decode(message.value);
+  },
+
+  toProto(message: RegisterERC20Proposal): Uint8Array {
+    return RegisterERC20Proposal.encode(message).finish();
+  },
+
+  toProtoMsg(message: RegisterERC20Proposal): RegisterERC20ProposalProtoMsg {
+    return {
+      typeUrl: "/evmos.erc20.v1.RegisterERC20Proposal",
+      value: RegisterERC20Proposal.encode(message).finish()
+    };
   }
 
 };
@@ -623,6 +686,8 @@ function createBaseToggleTokenConversionProposal(): ToggleTokenConversionProposa
 }
 
 export const ToggleTokenConversionProposal = {
+  typeUrl: "/evmos.erc20.v1.ToggleTokenConversionProposal",
+
   encode(message: ToggleTokenConversionProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.title !== "") {
       writer.uint32(10).string(message.title);
@@ -723,6 +788,25 @@ export const ToggleTokenConversionProposal = {
     obj.description = message.description;
     obj.token = message.token;
     return obj;
+  },
+
+  fromAminoMsg(object: ToggleTokenConversionProposalAminoMsg): ToggleTokenConversionProposal {
+    return ToggleTokenConversionProposal.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ToggleTokenConversionProposalProtoMsg): ToggleTokenConversionProposal {
+    return ToggleTokenConversionProposal.decode(message.value);
+  },
+
+  toProto(message: ToggleTokenConversionProposal): Uint8Array {
+    return ToggleTokenConversionProposal.encode(message).finish();
+  },
+
+  toProtoMsg(message: ToggleTokenConversionProposal): ToggleTokenConversionProposalProtoMsg {
+    return {
+      typeUrl: "/evmos.erc20.v1.ToggleTokenConversionProposal",
+      value: ToggleTokenConversionProposal.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/evmos/erc20/v1/genesis.ts b/__fixtures__/outputv2/evmos/erc20/v1/genesis.ts
index 6fe6abb94..5b0d869c5 100644
--- a/__fixtures__/outputv2/evmos/erc20/v1/genesis.ts
+++ b/__fixtures__/outputv2/evmos/erc20/v1/genesis.ts
@@ -11,7 +11,7 @@ export interface GenesisState {
   /** registered token pairs */
   tokenPairs: TokenPair[];
 }
-export interface GenesisStateProtoType {
+export interface GenesisStateProtoMsg {
   typeUrl: "/evmos.erc20.v1.GenesisState";
   value: Uint8Array;
 }
@@ -24,7 +24,7 @@ export interface GenesisStateAmino {
   /** registered token pairs */
   token_pairs: TokenPairAmino[];
 }
-export interface GenesisStateAminoType {
+export interface GenesisStateAminoMsg {
   type: "/evmos.erc20.v1.GenesisState";
   value: GenesisStateAmino;
 }
@@ -47,7 +47,7 @@ export interface Params {
    */
   enableEvmHook: boolean;
 }
-export interface ParamsProtoType {
+export interface ParamsProtoMsg {
   typeUrl: "/evmos.erc20.v1.Params";
   value: Uint8Array;
 }
@@ -64,7 +64,7 @@ export interface ParamsAmino {
    */
   enable_evm_hook: boolean;
 }
-export interface ParamsAminoType {
+export interface ParamsAminoMsg {
   type: "/evmos.erc20.v1.Params";
   value: ParamsAmino;
 }
@@ -83,6 +83,8 @@ function createBaseGenesisState(): GenesisState {
 }
 
 export const GenesisState = {
+  typeUrl: "/evmos.erc20.v1.GenesisState",
+
   encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.params !== undefined) {
       Params.encode(message.params, writer.uint32(10).fork()).ldelim();
@@ -186,6 +188,25 @@ export const GenesisState = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisStateAminoMsg): GenesisState {
+    return GenesisState.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: GenesisStateProtoMsg): GenesisState {
+    return GenesisState.decode(message.value);
+  },
+
+  toProto(message: GenesisState): Uint8Array {
+    return GenesisState.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisState): GenesisStateProtoMsg {
+    return {
+      typeUrl: "/evmos.erc20.v1.GenesisState",
+      value: GenesisState.encode(message).finish()
+    };
   }
 
 };
@@ -198,6 +219,8 @@ function createBaseParams(): Params {
 }
 
 export const Params = {
+  typeUrl: "/evmos.erc20.v1.Params",
+
   encode(message: Params, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.enableErc20 === true) {
       writer.uint32(8).bool(message.enableErc20);
@@ -283,6 +306,25 @@ export const Params = {
     obj.enable_erc20 = message.enableErc20;
     obj.enable_evm_hook = message.enableEvmHook;
     return obj;
+  },
+
+  fromAminoMsg(object: ParamsAminoMsg): Params {
+    return Params.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ParamsProtoMsg): Params {
+    return Params.decode(message.value);
+  },
+
+  toProto(message: Params): Uint8Array {
+    return Params.encode(message).finish();
+  },
+
+  toProtoMsg(message: Params): ParamsProtoMsg {
+    return {
+      typeUrl: "/evmos.erc20.v1.Params",
+      value: Params.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/evmos/erc20/v1/query.ts b/__fixtures__/outputv2/evmos/erc20/v1/query.ts
index 23396ee88..cebad3bbd 100644
--- a/__fixtures__/outputv2/evmos/erc20/v1/query.ts
+++ b/__fixtures__/outputv2/evmos/erc20/v1/query.ts
@@ -13,7 +13,7 @@ export interface QueryTokenPairsRequest {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequest;
 }
-export interface QueryTokenPairsRequestProtoType {
+export interface QueryTokenPairsRequestProtoMsg {
   typeUrl: "/evmos.erc20.v1.QueryTokenPairsRequest";
   value: Uint8Array;
 }
@@ -26,7 +26,7 @@ export interface QueryTokenPairsRequestAmino {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequestAmino;
 }
-export interface QueryTokenPairsRequestAminoType {
+export interface QueryTokenPairsRequestAminoMsg {
   type: "/evmos.erc20.v1.QueryTokenPairsRequest";
   value: QueryTokenPairsRequestAmino;
 }
@@ -49,7 +49,7 @@ export interface QueryTokenPairsResponse {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponse;
 }
-export interface QueryTokenPairsResponseProtoType {
+export interface QueryTokenPairsResponseProtoMsg {
   typeUrl: "/evmos.erc20.v1.QueryTokenPairsResponse";
   value: Uint8Array;
 }
@@ -64,7 +64,7 @@ export interface QueryTokenPairsResponseAmino {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponseAmino;
 }
-export interface QueryTokenPairsResponseAminoType {
+export interface QueryTokenPairsResponseAminoMsg {
   type: "/evmos.erc20.v1.QueryTokenPairsResponse";
   value: QueryTokenPairsResponseAmino;
 }
@@ -86,7 +86,7 @@ export interface QueryTokenPairRequest {
    */
   token: string;
 }
-export interface QueryTokenPairRequestProtoType {
+export interface QueryTokenPairRequestProtoMsg {
   typeUrl: "/evmos.erc20.v1.QueryTokenPairRequest";
   value: Uint8Array;
 }
@@ -99,7 +99,7 @@ export interface QueryTokenPairRequestAmino {
    */
   token: string;
 }
-export interface QueryTokenPairRequestAminoType {
+export interface QueryTokenPairRequestAminoMsg {
   type: "/evmos.erc20.v1.QueryTokenPairRequest";
   value: QueryTokenPairRequestAmino;
 }
@@ -116,7 +116,7 @@ export interface QueryTokenPairRequestSDKType {
 export interface QueryTokenPairResponse {
   tokenPair?: TokenPair;
 }
-export interface QueryTokenPairResponseProtoType {
+export interface QueryTokenPairResponseProtoMsg {
   typeUrl: "/evmos.erc20.v1.QueryTokenPairResponse";
   value: Uint8Array;
 }
@@ -128,7 +128,7 @@ export interface QueryTokenPairResponseProtoType {
 export interface QueryTokenPairResponseAmino {
   token_pair?: TokenPairAmino;
 }
-export interface QueryTokenPairResponseAminoType {
+export interface QueryTokenPairResponseAminoMsg {
   type: "/evmos.erc20.v1.QueryTokenPairResponse";
   value: QueryTokenPairResponseAmino;
 }
@@ -143,14 +143,14 @@ export interface QueryTokenPairResponseSDKType {
 
 /** QueryParamsRequest is the request type for the Query/Params RPC method. */
 export interface QueryParamsRequest {}
-export interface QueryParamsRequestProtoType {
+export interface QueryParamsRequestProtoMsg {
   typeUrl: "/evmos.erc20.v1.QueryParamsRequest";
   value: Uint8Array;
 }
 
 /** QueryParamsRequest is the request type for the Query/Params RPC method. */
 export interface QueryParamsRequestAmino {}
-export interface QueryParamsRequestAminoType {
+export interface QueryParamsRequestAminoMsg {
   type: "/evmos.erc20.v1.QueryParamsRequest";
   value: QueryParamsRequestAmino;
 }
@@ -165,7 +165,7 @@ export interface QueryParamsRequestSDKType {}
 export interface QueryParamsResponse {
   params?: Params;
 }
-export interface QueryParamsResponseProtoType {
+export interface QueryParamsResponseProtoMsg {
   typeUrl: "/evmos.erc20.v1.QueryParamsResponse";
   value: Uint8Array;
 }
@@ -177,7 +177,7 @@ export interface QueryParamsResponseProtoType {
 export interface QueryParamsResponseAmino {
   params?: ParamsAmino;
 }
-export interface QueryParamsResponseAminoType {
+export interface QueryParamsResponseAminoMsg {
   type: "/evmos.erc20.v1.QueryParamsResponse";
   value: QueryParamsResponseAmino;
 }
@@ -197,6 +197,8 @@ function createBaseQueryTokenPairsRequest(): QueryTokenPairsRequest {
 }
 
 export const QueryTokenPairsRequest = {
+  typeUrl: "/evmos.erc20.v1.QueryTokenPairsRequest",
+
   encode(message: QueryTokenPairsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.pagination !== undefined) {
       PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim();
@@ -267,6 +269,25 @@ export const QueryTokenPairsRequest = {
     const obj: any = {};
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryTokenPairsRequestAminoMsg): QueryTokenPairsRequest {
+    return QueryTokenPairsRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryTokenPairsRequestProtoMsg): QueryTokenPairsRequest {
+    return QueryTokenPairsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryTokenPairsRequest): Uint8Array {
+    return QueryTokenPairsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryTokenPairsRequest): QueryTokenPairsRequestProtoMsg {
+    return {
+      typeUrl: "/evmos.erc20.v1.QueryTokenPairsRequest",
+      value: QueryTokenPairsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -279,6 +300,8 @@ function createBaseQueryTokenPairsResponse(): QueryTokenPairsResponse {
 }
 
 export const QueryTokenPairsResponse = {
+  typeUrl: "/evmos.erc20.v1.QueryTokenPairsResponse",
+
   encode(message: QueryTokenPairsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.tokenPairs) {
       TokenPair.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -382,6 +405,25 @@ export const QueryTokenPairsResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryTokenPairsResponseAminoMsg): QueryTokenPairsResponse {
+    return QueryTokenPairsResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryTokenPairsResponseProtoMsg): QueryTokenPairsResponse {
+    return QueryTokenPairsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryTokenPairsResponse): Uint8Array {
+    return QueryTokenPairsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryTokenPairsResponse): QueryTokenPairsResponseProtoMsg {
+    return {
+      typeUrl: "/evmos.erc20.v1.QueryTokenPairsResponse",
+      value: QueryTokenPairsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -393,6 +435,8 @@ function createBaseQueryTokenPairRequest(): QueryTokenPairRequest {
 }
 
 export const QueryTokenPairRequest = {
+  typeUrl: "/evmos.erc20.v1.QueryTokenPairRequest",
+
   encode(message: QueryTokenPairRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.token !== "") {
       writer.uint32(10).string(message.token);
@@ -463,6 +507,25 @@ export const QueryTokenPairRequest = {
     const obj: any = {};
     obj.token = message.token;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryTokenPairRequestAminoMsg): QueryTokenPairRequest {
+    return QueryTokenPairRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryTokenPairRequestProtoMsg): QueryTokenPairRequest {
+    return QueryTokenPairRequest.decode(message.value);
+  },
+
+  toProto(message: QueryTokenPairRequest): Uint8Array {
+    return QueryTokenPairRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryTokenPairRequest): QueryTokenPairRequestProtoMsg {
+    return {
+      typeUrl: "/evmos.erc20.v1.QueryTokenPairRequest",
+      value: QueryTokenPairRequest.encode(message).finish()
+    };
   }
 
 };
@@ -474,6 +537,8 @@ function createBaseQueryTokenPairResponse(): QueryTokenPairResponse {
 }
 
 export const QueryTokenPairResponse = {
+  typeUrl: "/evmos.erc20.v1.QueryTokenPairResponse",
+
   encode(message: QueryTokenPairResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.tokenPair !== undefined) {
       TokenPair.encode(message.tokenPair, writer.uint32(10).fork()).ldelim();
@@ -544,6 +609,25 @@ export const QueryTokenPairResponse = {
     const obj: any = {};
     obj.token_pair = message.tokenPair ? TokenPair.toAmino(message.tokenPair) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryTokenPairResponseAminoMsg): QueryTokenPairResponse {
+    return QueryTokenPairResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryTokenPairResponseProtoMsg): QueryTokenPairResponse {
+    return QueryTokenPairResponse.decode(message.value);
+  },
+
+  toProto(message: QueryTokenPairResponse): Uint8Array {
+    return QueryTokenPairResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryTokenPairResponse): QueryTokenPairResponseProtoMsg {
+    return {
+      typeUrl: "/evmos.erc20.v1.QueryTokenPairResponse",
+      value: QueryTokenPairResponse.encode(message).finish()
+    };
   }
 
 };
@@ -553,6 +637,8 @@ function createBaseQueryParamsRequest(): QueryParamsRequest {
 }
 
 export const QueryParamsRequest = {
+  typeUrl: "/evmos.erc20.v1.QueryParamsRequest",
+
   encode(_: QueryParamsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -605,6 +691,25 @@ export const QueryParamsRequest = {
   toAmino(_: QueryParamsRequest): QueryParamsRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest {
+    return QueryParamsRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryParamsRequestProtoMsg): QueryParamsRequest {
+    return QueryParamsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryParamsRequest): Uint8Array {
+    return QueryParamsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryParamsRequest): QueryParamsRequestProtoMsg {
+    return {
+      typeUrl: "/evmos.erc20.v1.QueryParamsRequest",
+      value: QueryParamsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -616,6 +721,8 @@ function createBaseQueryParamsResponse(): QueryParamsResponse {
 }
 
 export const QueryParamsResponse = {
+  typeUrl: "/evmos.erc20.v1.QueryParamsResponse",
+
   encode(message: QueryParamsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.params !== undefined) {
       Params.encode(message.params, writer.uint32(10).fork()).ldelim();
@@ -686,6 +793,25 @@ export const QueryParamsResponse = {
     const obj: any = {};
     obj.params = message.params ? Params.toAmino(message.params) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryParamsResponseAminoMsg): QueryParamsResponse {
+    return QueryParamsResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryParamsResponseProtoMsg): QueryParamsResponse {
+    return QueryParamsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryParamsResponse): Uint8Array {
+    return QueryParamsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryParamsResponse): QueryParamsResponseProtoMsg {
+    return {
+      typeUrl: "/evmos.erc20.v1.QueryParamsResponse",
+      value: QueryParamsResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/evmos/erc20/v1/tx.ts b/__fixtures__/outputv2/evmos/erc20/v1/tx.ts
index a7e9773c2..684b00d42 100644
--- a/__fixtures__/outputv2/evmos/erc20/v1/tx.ts
+++ b/__fixtures__/outputv2/evmos/erc20/v1/tx.ts
@@ -17,7 +17,7 @@ export interface MsgConvertCoin {
   /** cosmos bech32 address from the owner of the given Cosmos coins */
   sender: string;
 }
-export interface MsgConvertCoinProtoType {
+export interface MsgConvertCoinProtoMsg {
   typeUrl: "/evmos.erc20.v1.MsgConvertCoin";
   value: Uint8Array;
 }
@@ -36,7 +36,7 @@ export interface MsgConvertCoinAmino {
   /** cosmos bech32 address from the owner of the given Cosmos coins */
   sender: string;
 }
-export interface MsgConvertCoinAminoType {
+export interface MsgConvertCoinAminoMsg {
   type: "/evmos.erc20.v1.MsgConvertCoin";
   value: MsgConvertCoinAmino;
 }
@@ -50,14 +50,14 @@ export interface MsgConvertCoinSDKType {
 
 /** MsgConvertCoinResponse returns no fields */
 export interface MsgConvertCoinResponse {}
-export interface MsgConvertCoinResponseProtoType {
+export interface MsgConvertCoinResponseProtoMsg {
   typeUrl: "/evmos.erc20.v1.MsgConvertCoinResponse";
   value: Uint8Array;
 }
 
 /** MsgConvertCoinResponse returns no fields */
 export interface MsgConvertCoinResponseAmino {}
-export interface MsgConvertCoinResponseAminoType {
+export interface MsgConvertCoinResponseAminoMsg {
   type: "/evmos.erc20.v1.MsgConvertCoinResponse";
   value: MsgConvertCoinResponseAmino;
 }
@@ -82,7 +82,7 @@ export interface MsgConvertERC20 {
   /** sender hex address from the owner of the given ERC20 tokens */
   sender: string;
 }
-export interface MsgConvertERC20ProtoType {
+export interface MsgConvertERC20ProtoMsg {
   typeUrl: "/evmos.erc20.v1.MsgConvertERC20";
   value: Uint8Array;
 }
@@ -104,7 +104,7 @@ export interface MsgConvertERC20Amino {
   /** sender hex address from the owner of the given ERC20 tokens */
   sender: string;
 }
-export interface MsgConvertERC20AminoType {
+export interface MsgConvertERC20AminoMsg {
   type: "/evmos.erc20.v1.MsgConvertERC20";
   value: MsgConvertERC20Amino;
 }
@@ -122,14 +122,14 @@ export interface MsgConvertERC20SDKType {
 
 /** MsgConvertERC20Response returns no fields */
 export interface MsgConvertERC20Response {}
-export interface MsgConvertERC20ResponseProtoType {
+export interface MsgConvertERC20ResponseProtoMsg {
   typeUrl: "/evmos.erc20.v1.MsgConvertERC20Response";
   value: Uint8Array;
 }
 
 /** MsgConvertERC20Response returns no fields */
 export interface MsgConvertERC20ResponseAmino {}
-export interface MsgConvertERC20ResponseAminoType {
+export interface MsgConvertERC20ResponseAminoMsg {
   type: "/evmos.erc20.v1.MsgConvertERC20Response";
   value: MsgConvertERC20ResponseAmino;
 }
@@ -146,6 +146,8 @@ function createBaseMsgConvertCoin(): MsgConvertCoin {
 }
 
 export const MsgConvertCoin = {
+  typeUrl: "/evmos.erc20.v1.MsgConvertCoin",
+
   encode(message: MsgConvertCoin, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.coin !== undefined) {
       Coin.encode(message.coin, writer.uint32(10).fork()).ldelim();
@@ -246,6 +248,25 @@ export const MsgConvertCoin = {
     obj.receiver = message.receiver;
     obj.sender = message.sender;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgConvertCoinAminoMsg): MsgConvertCoin {
+    return MsgConvertCoin.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgConvertCoinProtoMsg): MsgConvertCoin {
+    return MsgConvertCoin.decode(message.value);
+  },
+
+  toProto(message: MsgConvertCoin): Uint8Array {
+    return MsgConvertCoin.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgConvertCoin): MsgConvertCoinProtoMsg {
+    return {
+      typeUrl: "/evmos.erc20.v1.MsgConvertCoin",
+      value: MsgConvertCoin.encode(message).finish()
+    };
   }
 
 };
@@ -255,6 +276,8 @@ function createBaseMsgConvertCoinResponse(): MsgConvertCoinResponse {
 }
 
 export const MsgConvertCoinResponse = {
+  typeUrl: "/evmos.erc20.v1.MsgConvertCoinResponse",
+
   encode(_: MsgConvertCoinResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -307,6 +330,25 @@ export const MsgConvertCoinResponse = {
   toAmino(_: MsgConvertCoinResponse): MsgConvertCoinResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgConvertCoinResponseAminoMsg): MsgConvertCoinResponse {
+    return MsgConvertCoinResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgConvertCoinResponseProtoMsg): MsgConvertCoinResponse {
+    return MsgConvertCoinResponse.decode(message.value);
+  },
+
+  toProto(message: MsgConvertCoinResponse): Uint8Array {
+    return MsgConvertCoinResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgConvertCoinResponse): MsgConvertCoinResponseProtoMsg {
+    return {
+      typeUrl: "/evmos.erc20.v1.MsgConvertCoinResponse",
+      value: MsgConvertCoinResponse.encode(message).finish()
+    };
   }
 
 };
@@ -321,6 +363,8 @@ function createBaseMsgConvertERC20(): MsgConvertERC20 {
 }
 
 export const MsgConvertERC20 = {
+  typeUrl: "/evmos.erc20.v1.MsgConvertERC20",
+
   encode(message: MsgConvertERC20, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.contractAddress !== "") {
       writer.uint32(10).string(message.contractAddress);
@@ -436,6 +480,25 @@ export const MsgConvertERC20 = {
     obj.receiver = message.receiver;
     obj.sender = message.sender;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgConvertERC20AminoMsg): MsgConvertERC20 {
+    return MsgConvertERC20.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgConvertERC20ProtoMsg): MsgConvertERC20 {
+    return MsgConvertERC20.decode(message.value);
+  },
+
+  toProto(message: MsgConvertERC20): Uint8Array {
+    return MsgConvertERC20.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgConvertERC20): MsgConvertERC20ProtoMsg {
+    return {
+      typeUrl: "/evmos.erc20.v1.MsgConvertERC20",
+      value: MsgConvertERC20.encode(message).finish()
+    };
   }
 
 };
@@ -445,6 +508,8 @@ function createBaseMsgConvertERC20Response(): MsgConvertERC20Response {
 }
 
 export const MsgConvertERC20Response = {
+  typeUrl: "/evmos.erc20.v1.MsgConvertERC20Response",
+
   encode(_: MsgConvertERC20Response, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -497,6 +562,25 @@ export const MsgConvertERC20Response = {
   toAmino(_: MsgConvertERC20Response): MsgConvertERC20ResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgConvertERC20ResponseAminoMsg): MsgConvertERC20Response {
+    return MsgConvertERC20Response.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgConvertERC20ResponseProtoMsg): MsgConvertERC20Response {
+    return MsgConvertERC20Response.decode(message.value);
+  },
+
+  toProto(message: MsgConvertERC20Response): Uint8Array {
+    return MsgConvertERC20Response.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgConvertERC20Response): MsgConvertERC20ResponseProtoMsg {
+    return {
+      typeUrl: "/evmos.erc20.v1.MsgConvertERC20Response",
+      value: MsgConvertERC20Response.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/evmos/fees/v1/fees.ts b/__fixtures__/outputv2/evmos/fees/v1/fees.ts
index 2c3f10809..97c3385ae 100644
--- a/__fixtures__/outputv2/evmos/fees/v1/fees.ts
+++ b/__fixtures__/outputv2/evmos/fees/v1/fees.ts
@@ -19,7 +19,7 @@ export interface DevFeeInfo {
    */
   withdrawAddress: string;
 }
-export interface DevFeeInfoProtoType {
+export interface DevFeeInfoProtoMsg {
   typeUrl: "/evmos.fees.v1.DevFeeInfo";
   value: Uint8Array;
 }
@@ -41,7 +41,7 @@ export interface DevFeeInfoAmino {
    */
   withdraw_address: string;
 }
-export interface DevFeeInfoAminoType {
+export interface DevFeeInfoAminoMsg {
   type: "/evmos.fees.v1.DevFeeInfo";
   value: DevFeeInfoAmino;
 }
@@ -65,6 +65,8 @@ function createBaseDevFeeInfo(): DevFeeInfo {
 }
 
 export const DevFeeInfo = {
+  typeUrl: "/evmos.fees.v1.DevFeeInfo",
+
   encode(message: DevFeeInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.contractAddress !== "") {
       writer.uint32(10).string(message.contractAddress);
@@ -165,6 +167,25 @@ export const DevFeeInfo = {
     obj.deployer_address = message.deployerAddress;
     obj.withdraw_address = message.withdrawAddress;
     return obj;
+  },
+
+  fromAminoMsg(object: DevFeeInfoAminoMsg): DevFeeInfo {
+    return DevFeeInfo.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: DevFeeInfoProtoMsg): DevFeeInfo {
+    return DevFeeInfo.decode(message.value);
+  },
+
+  toProto(message: DevFeeInfo): Uint8Array {
+    return DevFeeInfo.encode(message).finish();
+  },
+
+  toProtoMsg(message: DevFeeInfo): DevFeeInfoProtoMsg {
+    return {
+      typeUrl: "/evmos.fees.v1.DevFeeInfo",
+      value: DevFeeInfo.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/evmos/fees/v1/genesis.ts b/__fixtures__/outputv2/evmos/fees/v1/genesis.ts
index 7494a2b13..57e1ca895 100644
--- a/__fixtures__/outputv2/evmos/fees/v1/genesis.ts
+++ b/__fixtures__/outputv2/evmos/fees/v1/genesis.ts
@@ -11,7 +11,7 @@ export interface GenesisState {
   /** active registered contracts */
   devFeeInfos: DevFeeInfo[];
 }
-export interface GenesisStateProtoType {
+export interface GenesisStateProtoMsg {
   typeUrl: "/evmos.fees.v1.GenesisState";
   value: Uint8Array;
 }
@@ -24,7 +24,7 @@ export interface GenesisStateAmino {
   /** active registered contracts */
   dev_fee_infos: DevFeeInfoAmino[];
 }
-export interface GenesisStateAminoType {
+export interface GenesisStateAminoMsg {
   type: "/evmos.fees.v1.GenesisState";
   value: GenesisStateAmino;
 }
@@ -61,7 +61,7 @@ export interface Params {
   /** min_gas_price defines the minimum gas price value for cosmos and eth transactions */
   minGasPrice: string;
 }
-export interface ParamsProtoType {
+export interface ParamsProtoMsg {
   typeUrl: "/evmos.fees.v1.Params";
   value: Uint8Array;
 }
@@ -92,7 +92,7 @@ export interface ParamsAmino {
   /** min_gas_price defines the minimum gas price value for cosmos and eth transactions */
   min_gas_price: string;
 }
-export interface ParamsAminoType {
+export interface ParamsAminoMsg {
   type: "/evmos.fees.v1.Params";
   value: ParamsAmino;
 }
@@ -114,6 +114,8 @@ function createBaseGenesisState(): GenesisState {
 }
 
 export const GenesisState = {
+  typeUrl: "/evmos.fees.v1.GenesisState",
+
   encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.params !== undefined) {
       Params.encode(message.params, writer.uint32(10).fork()).ldelim();
@@ -217,6 +219,25 @@ export const GenesisState = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisStateAminoMsg): GenesisState {
+    return GenesisState.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: GenesisStateProtoMsg): GenesisState {
+    return GenesisState.decode(message.value);
+  },
+
+  toProto(message: GenesisState): Uint8Array {
+    return GenesisState.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisState): GenesisStateProtoMsg {
+    return {
+      typeUrl: "/evmos.fees.v1.GenesisState",
+      value: GenesisState.encode(message).finish()
+    };
   }
 
 };
@@ -232,6 +253,8 @@ function createBaseParams(): Params {
 }
 
 export const Params = {
+  typeUrl: "/evmos.fees.v1.Params",
+
   encode(message: Params, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.enableFees === true) {
       writer.uint32(8).bool(message.enableFees);
@@ -362,6 +385,25 @@ export const Params = {
     obj.addr_derivation_cost_create = message.addrDerivationCostCreate ? message.addrDerivationCostCreate.toString() : undefined;
     obj.min_gas_price = message.minGasPrice;
     return obj;
+  },
+
+  fromAminoMsg(object: ParamsAminoMsg): Params {
+    return Params.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ParamsProtoMsg): Params {
+    return Params.decode(message.value);
+  },
+
+  toProto(message: Params): Uint8Array {
+    return Params.encode(message).finish();
+  },
+
+  toProtoMsg(message: Params): ParamsProtoMsg {
+    return {
+      typeUrl: "/evmos.fees.v1.Params",
+      value: Params.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/evmos/fees/v1/query.ts b/__fixtures__/outputv2/evmos/fees/v1/query.ts
index 9ba250c27..6cc297ed4 100644
--- a/__fixtures__/outputv2/evmos/fees/v1/query.ts
+++ b/__fixtures__/outputv2/evmos/fees/v1/query.ts
@@ -13,7 +13,7 @@ export interface QueryDevFeeInfosRequest {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequest;
 }
-export interface QueryDevFeeInfosRequestProtoType {
+export interface QueryDevFeeInfosRequestProtoMsg {
   typeUrl: "/evmos.fees.v1.QueryDevFeeInfosRequest";
   value: Uint8Array;
 }
@@ -26,7 +26,7 @@ export interface QueryDevFeeInfosRequestAmino {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequestAmino;
 }
-export interface QueryDevFeeInfosRequestAminoType {
+export interface QueryDevFeeInfosRequestAminoMsg {
   type: "/evmos.fees.v1.QueryDevFeeInfosRequest";
   value: QueryDevFeeInfosRequestAmino;
 }
@@ -49,7 +49,7 @@ export interface QueryDevFeeInfosResponse {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponse;
 }
-export interface QueryDevFeeInfosResponseProtoType {
+export interface QueryDevFeeInfosResponseProtoMsg {
   typeUrl: "/evmos.fees.v1.QueryDevFeeInfosResponse";
   value: Uint8Array;
 }
@@ -64,7 +64,7 @@ export interface QueryDevFeeInfosResponseAmino {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponseAmino;
 }
-export interface QueryDevFeeInfosResponseAminoType {
+export interface QueryDevFeeInfosResponseAminoMsg {
   type: "/evmos.fees.v1.QueryDevFeeInfosResponse";
   value: QueryDevFeeInfosResponseAmino;
 }
@@ -86,7 +86,7 @@ export interface QueryDevFeeInfoRequest {
   /** contract identifier is the hex contract address of a contract */
   contractAddress: string;
 }
-export interface QueryDevFeeInfoRequestProtoType {
+export interface QueryDevFeeInfoRequestProtoMsg {
   typeUrl: "/evmos.fees.v1.QueryDevFeeInfoRequest";
   value: Uint8Array;
 }
@@ -99,7 +99,7 @@ export interface QueryDevFeeInfoRequestAmino {
   /** contract identifier is the hex contract address of a contract */
   contract_address: string;
 }
-export interface QueryDevFeeInfoRequestAminoType {
+export interface QueryDevFeeInfoRequestAminoMsg {
   type: "/evmos.fees.v1.QueryDevFeeInfoRequest";
   value: QueryDevFeeInfoRequestAmino;
 }
@@ -119,7 +119,7 @@ export interface QueryDevFeeInfoRequestSDKType {
 export interface QueryDevFeeInfoResponse {
   fee?: DevFeeInfo;
 }
-export interface QueryDevFeeInfoResponseProtoType {
+export interface QueryDevFeeInfoResponseProtoMsg {
   typeUrl: "/evmos.fees.v1.QueryDevFeeInfoResponse";
   value: Uint8Array;
 }
@@ -131,7 +131,7 @@ export interface QueryDevFeeInfoResponseProtoType {
 export interface QueryDevFeeInfoResponseAmino {
   fee?: DevFeeInfoAmino;
 }
-export interface QueryDevFeeInfoResponseAminoType {
+export interface QueryDevFeeInfoResponseAminoMsg {
   type: "/evmos.fees.v1.QueryDevFeeInfoResponse";
   value: QueryDevFeeInfoResponseAmino;
 }
@@ -146,14 +146,14 @@ export interface QueryDevFeeInfoResponseSDKType {
 
 /** QueryParamsRequest is the request type for the Query/Params RPC method. */
 export interface QueryParamsRequest {}
-export interface QueryParamsRequestProtoType {
+export interface QueryParamsRequestProtoMsg {
   typeUrl: "/evmos.fees.v1.QueryParamsRequest";
   value: Uint8Array;
 }
 
 /** QueryParamsRequest is the request type for the Query/Params RPC method. */
 export interface QueryParamsRequestAmino {}
-export interface QueryParamsRequestAminoType {
+export interface QueryParamsRequestAminoMsg {
   type: "/evmos.fees.v1.QueryParamsRequest";
   value: QueryParamsRequestAmino;
 }
@@ -168,7 +168,7 @@ export interface QueryParamsRequestSDKType {}
 export interface QueryParamsResponse {
   params?: Params;
 }
-export interface QueryParamsResponseProtoType {
+export interface QueryParamsResponseProtoMsg {
   typeUrl: "/evmos.fees.v1.QueryParamsResponse";
   value: Uint8Array;
 }
@@ -180,7 +180,7 @@ export interface QueryParamsResponseProtoType {
 export interface QueryParamsResponseAmino {
   params?: ParamsAmino;
 }
-export interface QueryParamsResponseAminoType {
+export interface QueryParamsResponseAminoMsg {
   type: "/evmos.fees.v1.QueryParamsResponse";
   value: QueryParamsResponseAmino;
 }
@@ -204,7 +204,7 @@ export interface QueryDevFeeInfosPerDeployerRequest {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequest;
 }
-export interface QueryDevFeeInfosPerDeployerRequestProtoType {
+export interface QueryDevFeeInfosPerDeployerRequestProtoMsg {
   typeUrl: "/evmos.fees.v1.QueryDevFeeInfosPerDeployerRequest";
   value: Uint8Array;
 }
@@ -220,7 +220,7 @@ export interface QueryDevFeeInfosPerDeployerRequestAmino {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequestAmino;
 }
-export interface QueryDevFeeInfosPerDeployerRequestAminoType {
+export interface QueryDevFeeInfosPerDeployerRequestAminoMsg {
   type: "/evmos.fees.v1.QueryDevFeeInfosPerDeployerRequest";
   value: QueryDevFeeInfosPerDeployerRequestAmino;
 }
@@ -244,7 +244,7 @@ export interface QueryDevFeeInfosPerDeployerResponse {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponse;
 }
-export interface QueryDevFeeInfosPerDeployerResponseProtoType {
+export interface QueryDevFeeInfosPerDeployerResponseProtoMsg {
   typeUrl: "/evmos.fees.v1.QueryDevFeeInfosPerDeployerResponse";
   value: Uint8Array;
 }
@@ -259,7 +259,7 @@ export interface QueryDevFeeInfosPerDeployerResponseAmino {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponseAmino;
 }
-export interface QueryDevFeeInfosPerDeployerResponseAminoType {
+export interface QueryDevFeeInfosPerDeployerResponseAminoMsg {
   type: "/evmos.fees.v1.QueryDevFeeInfosPerDeployerResponse";
   value: QueryDevFeeInfosPerDeployerResponseAmino;
 }
@@ -280,6 +280,8 @@ function createBaseQueryDevFeeInfosRequest(): QueryDevFeeInfosRequest {
 }
 
 export const QueryDevFeeInfosRequest = {
+  typeUrl: "/evmos.fees.v1.QueryDevFeeInfosRequest",
+
   encode(message: QueryDevFeeInfosRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.pagination !== undefined) {
       PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim();
@@ -350,6 +352,25 @@ export const QueryDevFeeInfosRequest = {
     const obj: any = {};
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDevFeeInfosRequestAminoMsg): QueryDevFeeInfosRequest {
+    return QueryDevFeeInfosRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryDevFeeInfosRequestProtoMsg): QueryDevFeeInfosRequest {
+    return QueryDevFeeInfosRequest.decode(message.value);
+  },
+
+  toProto(message: QueryDevFeeInfosRequest): Uint8Array {
+    return QueryDevFeeInfosRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDevFeeInfosRequest): QueryDevFeeInfosRequestProtoMsg {
+    return {
+      typeUrl: "/evmos.fees.v1.QueryDevFeeInfosRequest",
+      value: QueryDevFeeInfosRequest.encode(message).finish()
+    };
   }
 
 };
@@ -362,6 +383,8 @@ function createBaseQueryDevFeeInfosResponse(): QueryDevFeeInfosResponse {
 }
 
 export const QueryDevFeeInfosResponse = {
+  typeUrl: "/evmos.fees.v1.QueryDevFeeInfosResponse",
+
   encode(message: QueryDevFeeInfosResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.fees) {
       DevFeeInfo.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -465,6 +488,25 @@ export const QueryDevFeeInfosResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDevFeeInfosResponseAminoMsg): QueryDevFeeInfosResponse {
+    return QueryDevFeeInfosResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryDevFeeInfosResponseProtoMsg): QueryDevFeeInfosResponse {
+    return QueryDevFeeInfosResponse.decode(message.value);
+  },
+
+  toProto(message: QueryDevFeeInfosResponse): Uint8Array {
+    return QueryDevFeeInfosResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDevFeeInfosResponse): QueryDevFeeInfosResponseProtoMsg {
+    return {
+      typeUrl: "/evmos.fees.v1.QueryDevFeeInfosResponse",
+      value: QueryDevFeeInfosResponse.encode(message).finish()
+    };
   }
 
 };
@@ -476,6 +518,8 @@ function createBaseQueryDevFeeInfoRequest(): QueryDevFeeInfoRequest {
 }
 
 export const QueryDevFeeInfoRequest = {
+  typeUrl: "/evmos.fees.v1.QueryDevFeeInfoRequest",
+
   encode(message: QueryDevFeeInfoRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.contractAddress !== "") {
       writer.uint32(10).string(message.contractAddress);
@@ -546,6 +590,25 @@ export const QueryDevFeeInfoRequest = {
     const obj: any = {};
     obj.contract_address = message.contractAddress;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDevFeeInfoRequestAminoMsg): QueryDevFeeInfoRequest {
+    return QueryDevFeeInfoRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryDevFeeInfoRequestProtoMsg): QueryDevFeeInfoRequest {
+    return QueryDevFeeInfoRequest.decode(message.value);
+  },
+
+  toProto(message: QueryDevFeeInfoRequest): Uint8Array {
+    return QueryDevFeeInfoRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDevFeeInfoRequest): QueryDevFeeInfoRequestProtoMsg {
+    return {
+      typeUrl: "/evmos.fees.v1.QueryDevFeeInfoRequest",
+      value: QueryDevFeeInfoRequest.encode(message).finish()
+    };
   }
 
 };
@@ -557,6 +620,8 @@ function createBaseQueryDevFeeInfoResponse(): QueryDevFeeInfoResponse {
 }
 
 export const QueryDevFeeInfoResponse = {
+  typeUrl: "/evmos.fees.v1.QueryDevFeeInfoResponse",
+
   encode(message: QueryDevFeeInfoResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.fee !== undefined) {
       DevFeeInfo.encode(message.fee, writer.uint32(10).fork()).ldelim();
@@ -627,6 +692,25 @@ export const QueryDevFeeInfoResponse = {
     const obj: any = {};
     obj.fee = message.fee ? DevFeeInfo.toAmino(message.fee) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDevFeeInfoResponseAminoMsg): QueryDevFeeInfoResponse {
+    return QueryDevFeeInfoResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryDevFeeInfoResponseProtoMsg): QueryDevFeeInfoResponse {
+    return QueryDevFeeInfoResponse.decode(message.value);
+  },
+
+  toProto(message: QueryDevFeeInfoResponse): Uint8Array {
+    return QueryDevFeeInfoResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDevFeeInfoResponse): QueryDevFeeInfoResponseProtoMsg {
+    return {
+      typeUrl: "/evmos.fees.v1.QueryDevFeeInfoResponse",
+      value: QueryDevFeeInfoResponse.encode(message).finish()
+    };
   }
 
 };
@@ -636,6 +720,8 @@ function createBaseQueryParamsRequest(): QueryParamsRequest {
 }
 
 export const QueryParamsRequest = {
+  typeUrl: "/evmos.fees.v1.QueryParamsRequest",
+
   encode(_: QueryParamsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -688,6 +774,25 @@ export const QueryParamsRequest = {
   toAmino(_: QueryParamsRequest): QueryParamsRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest {
+    return QueryParamsRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryParamsRequestProtoMsg): QueryParamsRequest {
+    return QueryParamsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryParamsRequest): Uint8Array {
+    return QueryParamsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryParamsRequest): QueryParamsRequestProtoMsg {
+    return {
+      typeUrl: "/evmos.fees.v1.QueryParamsRequest",
+      value: QueryParamsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -699,6 +804,8 @@ function createBaseQueryParamsResponse(): QueryParamsResponse {
 }
 
 export const QueryParamsResponse = {
+  typeUrl: "/evmos.fees.v1.QueryParamsResponse",
+
   encode(message: QueryParamsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.params !== undefined) {
       Params.encode(message.params, writer.uint32(10).fork()).ldelim();
@@ -769,6 +876,25 @@ export const QueryParamsResponse = {
     const obj: any = {};
     obj.params = message.params ? Params.toAmino(message.params) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryParamsResponseAminoMsg): QueryParamsResponse {
+    return QueryParamsResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryParamsResponseProtoMsg): QueryParamsResponse {
+    return QueryParamsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryParamsResponse): Uint8Array {
+    return QueryParamsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryParamsResponse): QueryParamsResponseProtoMsg {
+    return {
+      typeUrl: "/evmos.fees.v1.QueryParamsResponse",
+      value: QueryParamsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -781,6 +907,8 @@ function createBaseQueryDevFeeInfosPerDeployerRequest(): QueryDevFeeInfosPerDepl
 }
 
 export const QueryDevFeeInfosPerDeployerRequest = {
+  typeUrl: "/evmos.fees.v1.QueryDevFeeInfosPerDeployerRequest",
+
   encode(message: QueryDevFeeInfosPerDeployerRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.deployerAddress !== "") {
       writer.uint32(10).string(message.deployerAddress);
@@ -866,6 +994,25 @@ export const QueryDevFeeInfosPerDeployerRequest = {
     obj.deployer_address = message.deployerAddress;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDevFeeInfosPerDeployerRequestAminoMsg): QueryDevFeeInfosPerDeployerRequest {
+    return QueryDevFeeInfosPerDeployerRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryDevFeeInfosPerDeployerRequestProtoMsg): QueryDevFeeInfosPerDeployerRequest {
+    return QueryDevFeeInfosPerDeployerRequest.decode(message.value);
+  },
+
+  toProto(message: QueryDevFeeInfosPerDeployerRequest): Uint8Array {
+    return QueryDevFeeInfosPerDeployerRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDevFeeInfosPerDeployerRequest): QueryDevFeeInfosPerDeployerRequestProtoMsg {
+    return {
+      typeUrl: "/evmos.fees.v1.QueryDevFeeInfosPerDeployerRequest",
+      value: QueryDevFeeInfosPerDeployerRequest.encode(message).finish()
+    };
   }
 
 };
@@ -878,6 +1025,8 @@ function createBaseQueryDevFeeInfosPerDeployerResponse(): QueryDevFeeInfosPerDep
 }
 
 export const QueryDevFeeInfosPerDeployerResponse = {
+  typeUrl: "/evmos.fees.v1.QueryDevFeeInfosPerDeployerResponse",
+
   encode(message: QueryDevFeeInfosPerDeployerResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.fees) {
       DevFeeInfo.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -981,6 +1130,25 @@ export const QueryDevFeeInfosPerDeployerResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDevFeeInfosPerDeployerResponseAminoMsg): QueryDevFeeInfosPerDeployerResponse {
+    return QueryDevFeeInfosPerDeployerResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryDevFeeInfosPerDeployerResponseProtoMsg): QueryDevFeeInfosPerDeployerResponse {
+    return QueryDevFeeInfosPerDeployerResponse.decode(message.value);
+  },
+
+  toProto(message: QueryDevFeeInfosPerDeployerResponse): Uint8Array {
+    return QueryDevFeeInfosPerDeployerResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDevFeeInfosPerDeployerResponse): QueryDevFeeInfosPerDeployerResponseProtoMsg {
+    return {
+      typeUrl: "/evmos.fees.v1.QueryDevFeeInfosPerDeployerResponse",
+      value: QueryDevFeeInfosPerDeployerResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/evmos/fees/v1/tx.ts b/__fixtures__/outputv2/evmos/fees/v1/tx.ts
index 804e8bb51..9405e6bdb 100644
--- a/__fixtures__/outputv2/evmos/fees/v1/tx.ts
+++ b/__fixtures__/outputv2/evmos/fees/v1/tx.ts
@@ -23,7 +23,7 @@ export interface MsgRegisterDevFeeInfo {
    */
   nonces: Long[];
 }
-export interface MsgRegisterDevFeeInfoProtoType {
+export interface MsgRegisterDevFeeInfoProtoMsg {
   typeUrl: "/evmos.fees.v1.MsgRegisterDevFeeInfo";
   value: Uint8Array;
 }
@@ -49,7 +49,7 @@ export interface MsgRegisterDevFeeInfoAmino {
    */
   nonces: string[];
 }
-export interface MsgRegisterDevFeeInfoAminoType {
+export interface MsgRegisterDevFeeInfoAminoMsg {
   type: "/evmos.fees.v1.MsgRegisterDevFeeInfo";
   value: MsgRegisterDevFeeInfoAmino;
 }
@@ -67,7 +67,7 @@ export interface MsgRegisterDevFeeInfoSDKType {
  * type
  */
 export interface MsgRegisterDevFeeInfoResponse {}
-export interface MsgRegisterDevFeeInfoResponseProtoType {
+export interface MsgRegisterDevFeeInfoResponseProtoMsg {
   typeUrl: "/evmos.fees.v1.MsgRegisterDevFeeInfoResponse";
   value: Uint8Array;
 }
@@ -77,7 +77,7 @@ export interface MsgRegisterDevFeeInfoResponseProtoType {
  * type
  */
 export interface MsgRegisterDevFeeInfoResponseAmino {}
-export interface MsgRegisterDevFeeInfoResponseAminoType {
+export interface MsgRegisterDevFeeInfoResponseAminoMsg {
   type: "/evmos.fees.v1.MsgRegisterDevFeeInfoResponse";
   value: MsgRegisterDevFeeInfoResponseAmino;
 }
@@ -99,7 +99,7 @@ export interface MsgCancelDevFeeInfo {
   /** deployer bech32 address */
   deployerAddress: string;
 }
-export interface MsgCancelDevFeeInfoProtoType {
+export interface MsgCancelDevFeeInfoProtoMsg {
   typeUrl: "/evmos.fees.v1.MsgCancelDevFeeInfo";
   value: Uint8Array;
 }
@@ -115,7 +115,7 @@ export interface MsgCancelDevFeeInfoAmino {
   /** deployer bech32 address */
   deployer_address: string;
 }
-export interface MsgCancelDevFeeInfoAminoType {
+export interface MsgCancelDevFeeInfoAminoMsg {
   type: "/evmos.fees.v1.MsgCancelDevFeeInfo";
   value: MsgCancelDevFeeInfoAmino;
 }
@@ -131,14 +131,14 @@ export interface MsgCancelDevFeeInfoSDKType {
 
 /** MsgCancelDevFeeInfoResponse defines the MsgCancelDevFeeInfo response type */
 export interface MsgCancelDevFeeInfoResponse {}
-export interface MsgCancelDevFeeInfoResponseProtoType {
+export interface MsgCancelDevFeeInfoResponseProtoMsg {
   typeUrl: "/evmos.fees.v1.MsgCancelDevFeeInfoResponse";
   value: Uint8Array;
 }
 
 /** MsgCancelDevFeeInfoResponse defines the MsgCancelDevFeeInfo response type */
 export interface MsgCancelDevFeeInfoResponseAmino {}
-export interface MsgCancelDevFeeInfoResponseAminoType {
+export interface MsgCancelDevFeeInfoResponseAminoMsg {
   type: "/evmos.fees.v1.MsgCancelDevFeeInfoResponse";
   value: MsgCancelDevFeeInfoResponseAmino;
 }
@@ -160,7 +160,7 @@ export interface MsgUpdateDevFeeInfo {
   /** new withdraw bech32 address for receiving the transaction fees */
   withdrawAddress: string;
 }
-export interface MsgUpdateDevFeeInfoProtoType {
+export interface MsgUpdateDevFeeInfoProtoMsg {
   typeUrl: "/evmos.fees.v1.MsgUpdateDevFeeInfo";
   value: Uint8Array;
 }
@@ -179,7 +179,7 @@ export interface MsgUpdateDevFeeInfoAmino {
   /** new withdraw bech32 address for receiving the transaction fees */
   withdraw_address: string;
 }
-export interface MsgUpdateDevFeeInfoAminoType {
+export interface MsgUpdateDevFeeInfoAminoMsg {
   type: "/evmos.fees.v1.MsgUpdateDevFeeInfo";
   value: MsgUpdateDevFeeInfoAmino;
 }
@@ -196,14 +196,14 @@ export interface MsgUpdateDevFeeInfoSDKType {
 
 /** MsgUpdateDevFeeInfoResponse defines the MsgUpdateDevFeeInfo response type */
 export interface MsgUpdateDevFeeInfoResponse {}
-export interface MsgUpdateDevFeeInfoResponseProtoType {
+export interface MsgUpdateDevFeeInfoResponseProtoMsg {
   typeUrl: "/evmos.fees.v1.MsgUpdateDevFeeInfoResponse";
   value: Uint8Array;
 }
 
 /** MsgUpdateDevFeeInfoResponse defines the MsgUpdateDevFeeInfo response type */
 export interface MsgUpdateDevFeeInfoResponseAmino {}
-export interface MsgUpdateDevFeeInfoResponseAminoType {
+export interface MsgUpdateDevFeeInfoResponseAminoMsg {
   type: "/evmos.fees.v1.MsgUpdateDevFeeInfoResponse";
   value: MsgUpdateDevFeeInfoResponseAmino;
 }
@@ -221,6 +221,8 @@ function createBaseMsgRegisterDevFeeInfo(): MsgRegisterDevFeeInfo {
 }
 
 export const MsgRegisterDevFeeInfo = {
+  typeUrl: "/evmos.fees.v1.MsgRegisterDevFeeInfo",
+
   encode(message: MsgRegisterDevFeeInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.contractAddress !== "") {
       writer.uint32(10).string(message.contractAddress);
@@ -366,6 +368,25 @@ export const MsgRegisterDevFeeInfo = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: MsgRegisterDevFeeInfoAminoMsg): MsgRegisterDevFeeInfo {
+    return MsgRegisterDevFeeInfo.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgRegisterDevFeeInfoProtoMsg): MsgRegisterDevFeeInfo {
+    return MsgRegisterDevFeeInfo.decode(message.value);
+  },
+
+  toProto(message: MsgRegisterDevFeeInfo): Uint8Array {
+    return MsgRegisterDevFeeInfo.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgRegisterDevFeeInfo): MsgRegisterDevFeeInfoProtoMsg {
+    return {
+      typeUrl: "/evmos.fees.v1.MsgRegisterDevFeeInfo",
+      value: MsgRegisterDevFeeInfo.encode(message).finish()
+    };
   }
 
 };
@@ -375,6 +396,8 @@ function createBaseMsgRegisterDevFeeInfoResponse(): MsgRegisterDevFeeInfoRespons
 }
 
 export const MsgRegisterDevFeeInfoResponse = {
+  typeUrl: "/evmos.fees.v1.MsgRegisterDevFeeInfoResponse",
+
   encode(_: MsgRegisterDevFeeInfoResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -427,6 +450,25 @@ export const MsgRegisterDevFeeInfoResponse = {
   toAmino(_: MsgRegisterDevFeeInfoResponse): MsgRegisterDevFeeInfoResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgRegisterDevFeeInfoResponseAminoMsg): MsgRegisterDevFeeInfoResponse {
+    return MsgRegisterDevFeeInfoResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgRegisterDevFeeInfoResponseProtoMsg): MsgRegisterDevFeeInfoResponse {
+    return MsgRegisterDevFeeInfoResponse.decode(message.value);
+  },
+
+  toProto(message: MsgRegisterDevFeeInfoResponse): Uint8Array {
+    return MsgRegisterDevFeeInfoResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgRegisterDevFeeInfoResponse): MsgRegisterDevFeeInfoResponseProtoMsg {
+    return {
+      typeUrl: "/evmos.fees.v1.MsgRegisterDevFeeInfoResponse",
+      value: MsgRegisterDevFeeInfoResponse.encode(message).finish()
+    };
   }
 
 };
@@ -439,6 +481,8 @@ function createBaseMsgCancelDevFeeInfo(): MsgCancelDevFeeInfo {
 }
 
 export const MsgCancelDevFeeInfo = {
+  typeUrl: "/evmos.fees.v1.MsgCancelDevFeeInfo",
+
   encode(message: MsgCancelDevFeeInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.contractAddress !== "") {
       writer.uint32(10).string(message.contractAddress);
@@ -524,6 +568,25 @@ export const MsgCancelDevFeeInfo = {
     obj.contract_address = message.contractAddress;
     obj.deployer_address = message.deployerAddress;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCancelDevFeeInfoAminoMsg): MsgCancelDevFeeInfo {
+    return MsgCancelDevFeeInfo.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgCancelDevFeeInfoProtoMsg): MsgCancelDevFeeInfo {
+    return MsgCancelDevFeeInfo.decode(message.value);
+  },
+
+  toProto(message: MsgCancelDevFeeInfo): Uint8Array {
+    return MsgCancelDevFeeInfo.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCancelDevFeeInfo): MsgCancelDevFeeInfoProtoMsg {
+    return {
+      typeUrl: "/evmos.fees.v1.MsgCancelDevFeeInfo",
+      value: MsgCancelDevFeeInfo.encode(message).finish()
+    };
   }
 
 };
@@ -533,6 +596,8 @@ function createBaseMsgCancelDevFeeInfoResponse(): MsgCancelDevFeeInfoResponse {
 }
 
 export const MsgCancelDevFeeInfoResponse = {
+  typeUrl: "/evmos.fees.v1.MsgCancelDevFeeInfoResponse",
+
   encode(_: MsgCancelDevFeeInfoResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -585,6 +650,25 @@ export const MsgCancelDevFeeInfoResponse = {
   toAmino(_: MsgCancelDevFeeInfoResponse): MsgCancelDevFeeInfoResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCancelDevFeeInfoResponseAminoMsg): MsgCancelDevFeeInfoResponse {
+    return MsgCancelDevFeeInfoResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgCancelDevFeeInfoResponseProtoMsg): MsgCancelDevFeeInfoResponse {
+    return MsgCancelDevFeeInfoResponse.decode(message.value);
+  },
+
+  toProto(message: MsgCancelDevFeeInfoResponse): Uint8Array {
+    return MsgCancelDevFeeInfoResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCancelDevFeeInfoResponse): MsgCancelDevFeeInfoResponseProtoMsg {
+    return {
+      typeUrl: "/evmos.fees.v1.MsgCancelDevFeeInfoResponse",
+      value: MsgCancelDevFeeInfoResponse.encode(message).finish()
+    };
   }
 
 };
@@ -598,6 +682,8 @@ function createBaseMsgUpdateDevFeeInfo(): MsgUpdateDevFeeInfo {
 }
 
 export const MsgUpdateDevFeeInfo = {
+  typeUrl: "/evmos.fees.v1.MsgUpdateDevFeeInfo",
+
   encode(message: MsgUpdateDevFeeInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.contractAddress !== "") {
       writer.uint32(10).string(message.contractAddress);
@@ -698,6 +784,25 @@ export const MsgUpdateDevFeeInfo = {
     obj.deployer_address = message.deployerAddress;
     obj.withdraw_address = message.withdrawAddress;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgUpdateDevFeeInfoAminoMsg): MsgUpdateDevFeeInfo {
+    return MsgUpdateDevFeeInfo.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgUpdateDevFeeInfoProtoMsg): MsgUpdateDevFeeInfo {
+    return MsgUpdateDevFeeInfo.decode(message.value);
+  },
+
+  toProto(message: MsgUpdateDevFeeInfo): Uint8Array {
+    return MsgUpdateDevFeeInfo.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgUpdateDevFeeInfo): MsgUpdateDevFeeInfoProtoMsg {
+    return {
+      typeUrl: "/evmos.fees.v1.MsgUpdateDevFeeInfo",
+      value: MsgUpdateDevFeeInfo.encode(message).finish()
+    };
   }
 
 };
@@ -707,6 +812,8 @@ function createBaseMsgUpdateDevFeeInfoResponse(): MsgUpdateDevFeeInfoResponse {
 }
 
 export const MsgUpdateDevFeeInfoResponse = {
+  typeUrl: "/evmos.fees.v1.MsgUpdateDevFeeInfoResponse",
+
   encode(_: MsgUpdateDevFeeInfoResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -759,6 +866,25 @@ export const MsgUpdateDevFeeInfoResponse = {
   toAmino(_: MsgUpdateDevFeeInfoResponse): MsgUpdateDevFeeInfoResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgUpdateDevFeeInfoResponseAminoMsg): MsgUpdateDevFeeInfoResponse {
+    return MsgUpdateDevFeeInfoResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgUpdateDevFeeInfoResponseProtoMsg): MsgUpdateDevFeeInfoResponse {
+    return MsgUpdateDevFeeInfoResponse.decode(message.value);
+  },
+
+  toProto(message: MsgUpdateDevFeeInfoResponse): Uint8Array {
+    return MsgUpdateDevFeeInfoResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgUpdateDevFeeInfoResponse): MsgUpdateDevFeeInfoResponseProtoMsg {
+    return {
+      typeUrl: "/evmos.fees.v1.MsgUpdateDevFeeInfoResponse",
+      value: MsgUpdateDevFeeInfoResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/evmos/incentives/v1/genesis.ts b/__fixtures__/outputv2/evmos/incentives/v1/genesis.ts
index 3fa43eb03..6481002ad 100644
--- a/__fixtures__/outputv2/evmos/incentives/v1/genesis.ts
+++ b/__fixtures__/outputv2/evmos/incentives/v1/genesis.ts
@@ -14,7 +14,7 @@ export interface GenesisState {
   /** active Gasmeters */
   gasMeters: GasMeter[];
 }
-export interface GenesisStateProtoType {
+export interface GenesisStateProtoMsg {
   typeUrl: "/evmos.incentives.v1.GenesisState";
   value: Uint8Array;
 }
@@ -30,7 +30,7 @@ export interface GenesisStateAmino {
   /** active Gasmeters */
   gas_meters: GasMeterAmino[];
 }
-export interface GenesisStateAminoType {
+export interface GenesisStateAminoMsg {
   type: "/evmos.incentives.v1.GenesisState";
   value: GenesisStateAmino;
 }
@@ -56,7 +56,7 @@ export interface Params {
   /** scaling factor for capping rewards */
   rewardScaler: string;
 }
-export interface ParamsProtoType {
+export interface ParamsProtoMsg {
   typeUrl: "/evmos.incentives.v1.Params";
   value: Uint8Array;
 }
@@ -75,7 +75,7 @@ export interface ParamsAmino {
   /** scaling factor for capping rewards */
   reward_scaler: string;
 }
-export interface ParamsAminoType {
+export interface ParamsAminoMsg {
   type: "/evmos.incentives.v1.Params";
   value: ParamsAmino;
 }
@@ -97,6 +97,8 @@ function createBaseGenesisState(): GenesisState {
 }
 
 export const GenesisState = {
+  typeUrl: "/evmos.incentives.v1.GenesisState",
+
   encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.params !== undefined) {
       Params.encode(message.params, writer.uint32(10).fork()).ldelim();
@@ -230,6 +232,25 @@ export const GenesisState = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisStateAminoMsg): GenesisState {
+    return GenesisState.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: GenesisStateProtoMsg): GenesisState {
+    return GenesisState.decode(message.value);
+  },
+
+  toProto(message: GenesisState): Uint8Array {
+    return GenesisState.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisState): GenesisStateProtoMsg {
+    return {
+      typeUrl: "/evmos.incentives.v1.GenesisState",
+      value: GenesisState.encode(message).finish()
+    };
   }
 
 };
@@ -244,6 +265,8 @@ function createBaseParams(): Params {
 }
 
 export const Params = {
+  typeUrl: "/evmos.incentives.v1.Params",
+
   encode(message: Params, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.enableIncentives === true) {
       writer.uint32(8).bool(message.enableIncentives);
@@ -359,6 +382,25 @@ export const Params = {
     obj.incentives_epoch_identifier = message.incentivesEpochIdentifier;
     obj.reward_scaler = message.rewardScaler;
     return obj;
+  },
+
+  fromAminoMsg(object: ParamsAminoMsg): Params {
+    return Params.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ParamsProtoMsg): Params {
+    return Params.decode(message.value);
+  },
+
+  toProto(message: Params): Uint8Array {
+    return Params.encode(message).finish();
+  },
+
+  toProtoMsg(message: Params): ParamsProtoMsg {
+    return {
+      typeUrl: "/evmos.incentives.v1.Params",
+      value: Params.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/evmos/incentives/v1/incentives.ts b/__fixtures__/outputv2/evmos/incentives/v1/incentives.ts
index ae59b50b5..30183058c 100644
--- a/__fixtures__/outputv2/evmos/incentives/v1/incentives.ts
+++ b/__fixtures__/outputv2/evmos/incentives/v1/incentives.ts
@@ -24,7 +24,7 @@ export interface Incentive {
   /** cumulative gas spent by all gasmeters of the incentive during the epoch */
   totalGas: Long;
 }
-export interface IncentiveProtoType {
+export interface IncentiveProtoMsg {
   typeUrl: "/evmos.incentives.v1.Incentive";
   value: Uint8Array;
 }
@@ -49,7 +49,7 @@ export interface IncentiveAmino {
   /** cumulative gas spent by all gasmeters of the incentive during the epoch */
   total_gas: string;
 }
-export interface IncentiveAminoType {
+export interface IncentiveAminoMsg {
   type: "/evmos.incentives.v1.Incentive";
   value: IncentiveAmino;
 }
@@ -77,7 +77,7 @@ export interface GasMeter {
   /** cumulative gas spent during the epoch */
   cumulativeGas: Long;
 }
-export interface GasMeterProtoType {
+export interface GasMeterProtoMsg {
   typeUrl: "/evmos.incentives.v1.GasMeter";
   value: Uint8Array;
 }
@@ -93,7 +93,7 @@ export interface GasMeterAmino {
   /** cumulative gas spent during the epoch */
   cumulative_gas: string;
 }
-export interface GasMeterAminoType {
+export interface GasMeterAminoMsg {
   type: "/evmos.incentives.v1.GasMeter";
   value: GasMeterAmino;
 }
@@ -122,7 +122,7 @@ export interface RegisterIncentiveProposal {
   /** number of remaining epochs */
   epochs: number;
 }
-export interface RegisterIncentiveProposalProtoType {
+export interface RegisterIncentiveProposalProtoMsg {
   typeUrl: "/evmos.incentives.v1.RegisterIncentiveProposal";
   value: Uint8Array;
 }
@@ -144,7 +144,7 @@ export interface RegisterIncentiveProposalAmino {
   /** number of remaining epochs */
   epochs: number;
 }
-export interface RegisterIncentiveProposalAminoType {
+export interface RegisterIncentiveProposalAminoMsg {
   type: "/evmos.incentives.v1.RegisterIncentiveProposal";
   value: RegisterIncentiveProposalAmino;
 }
@@ -169,7 +169,7 @@ export interface CancelIncentiveProposal {
   /** contract address */
   contract: string;
 }
-export interface CancelIncentiveProposalProtoType {
+export interface CancelIncentiveProposalProtoMsg {
   typeUrl: "/evmos.incentives.v1.CancelIncentiveProposal";
   value: Uint8Array;
 }
@@ -185,7 +185,7 @@ export interface CancelIncentiveProposalAmino {
   /** contract address */
   contract: string;
 }
-export interface CancelIncentiveProposalAminoType {
+export interface CancelIncentiveProposalAminoMsg {
   type: "/evmos.incentives.v1.CancelIncentiveProposal";
   value: CancelIncentiveProposalAmino;
 }
@@ -208,6 +208,8 @@ function createBaseIncentive(): Incentive {
 }
 
 export const Incentive = {
+  typeUrl: "/evmos.incentives.v1.Incentive",
+
   encode(message: Incentive, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.contract !== "") {
       writer.uint32(10).string(message.contract);
@@ -356,6 +358,25 @@ export const Incentive = {
     obj.start_time = message.startTime ? Timestamp.toAmino(message.startTime) : undefined;
     obj.total_gas = message.totalGas ? message.totalGas.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: IncentiveAminoMsg): Incentive {
+    return Incentive.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: IncentiveProtoMsg): Incentive {
+    return Incentive.decode(message.value);
+  },
+
+  toProto(message: Incentive): Uint8Array {
+    return Incentive.encode(message).finish();
+  },
+
+  toProtoMsg(message: Incentive): IncentiveProtoMsg {
+    return {
+      typeUrl: "/evmos.incentives.v1.Incentive",
+      value: Incentive.encode(message).finish()
+    };
   }
 
 };
@@ -369,6 +390,8 @@ function createBaseGasMeter(): GasMeter {
 }
 
 export const GasMeter = {
+  typeUrl: "/evmos.incentives.v1.GasMeter",
+
   encode(message: GasMeter, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.contract !== "") {
       writer.uint32(10).string(message.contract);
@@ -469,6 +492,25 @@ export const GasMeter = {
     obj.participant = message.participant;
     obj.cumulative_gas = message.cumulativeGas ? message.cumulativeGas.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GasMeterAminoMsg): GasMeter {
+    return GasMeter.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: GasMeterProtoMsg): GasMeter {
+    return GasMeter.decode(message.value);
+  },
+
+  toProto(message: GasMeter): Uint8Array {
+    return GasMeter.encode(message).finish();
+  },
+
+  toProtoMsg(message: GasMeter): GasMeterProtoMsg {
+    return {
+      typeUrl: "/evmos.incentives.v1.GasMeter",
+      value: GasMeter.encode(message).finish()
+    };
   }
 
 };
@@ -484,6 +526,8 @@ function createBaseRegisterIncentiveProposal(): RegisterIncentiveProposal {
 }
 
 export const RegisterIncentiveProposal = {
+  typeUrl: "/evmos.incentives.v1.RegisterIncentiveProposal",
+
   encode(message: RegisterIncentiveProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.title !== "") {
       writer.uint32(10).string(message.title);
@@ -632,6 +676,25 @@ export const RegisterIncentiveProposal = {
 
     obj.epochs = message.epochs;
     return obj;
+  },
+
+  fromAminoMsg(object: RegisterIncentiveProposalAminoMsg): RegisterIncentiveProposal {
+    return RegisterIncentiveProposal.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: RegisterIncentiveProposalProtoMsg): RegisterIncentiveProposal {
+    return RegisterIncentiveProposal.decode(message.value);
+  },
+
+  toProto(message: RegisterIncentiveProposal): Uint8Array {
+    return RegisterIncentiveProposal.encode(message).finish();
+  },
+
+  toProtoMsg(message: RegisterIncentiveProposal): RegisterIncentiveProposalProtoMsg {
+    return {
+      typeUrl: "/evmos.incentives.v1.RegisterIncentiveProposal",
+      value: RegisterIncentiveProposal.encode(message).finish()
+    };
   }
 
 };
@@ -645,6 +708,8 @@ function createBaseCancelIncentiveProposal(): CancelIncentiveProposal {
 }
 
 export const CancelIncentiveProposal = {
+  typeUrl: "/evmos.incentives.v1.CancelIncentiveProposal",
+
   encode(message: CancelIncentiveProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.title !== "") {
       writer.uint32(10).string(message.title);
@@ -745,6 +810,25 @@ export const CancelIncentiveProposal = {
     obj.description = message.description;
     obj.contract = message.contract;
     return obj;
+  },
+
+  fromAminoMsg(object: CancelIncentiveProposalAminoMsg): CancelIncentiveProposal {
+    return CancelIncentiveProposal.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: CancelIncentiveProposalProtoMsg): CancelIncentiveProposal {
+    return CancelIncentiveProposal.decode(message.value);
+  },
+
+  toProto(message: CancelIncentiveProposal): Uint8Array {
+    return CancelIncentiveProposal.encode(message).finish();
+  },
+
+  toProtoMsg(message: CancelIncentiveProposal): CancelIncentiveProposalProtoMsg {
+    return {
+      typeUrl: "/evmos.incentives.v1.CancelIncentiveProposal",
+      value: CancelIncentiveProposal.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/evmos/incentives/v1/query.ts b/__fixtures__/outputv2/evmos/incentives/v1/query.ts
index 14144fad7..9e5d7744c 100644
--- a/__fixtures__/outputv2/evmos/incentives/v1/query.ts
+++ b/__fixtures__/outputv2/evmos/incentives/v1/query.ts
@@ -14,7 +14,7 @@ export interface QueryIncentivesRequest {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequest;
 }
-export interface QueryIncentivesRequestProtoType {
+export interface QueryIncentivesRequestProtoMsg {
   typeUrl: "/evmos.incentives.v1.QueryIncentivesRequest";
   value: Uint8Array;
 }
@@ -27,7 +27,7 @@ export interface QueryIncentivesRequestAmino {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequestAmino;
 }
-export interface QueryIncentivesRequestAminoType {
+export interface QueryIncentivesRequestAminoMsg {
   type: "/evmos.incentives.v1.QueryIncentivesRequest";
   value: QueryIncentivesRequestAmino;
 }
@@ -50,7 +50,7 @@ export interface QueryIncentivesResponse {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponse;
 }
-export interface QueryIncentivesResponseProtoType {
+export interface QueryIncentivesResponseProtoMsg {
   typeUrl: "/evmos.incentives.v1.QueryIncentivesResponse";
   value: Uint8Array;
 }
@@ -65,7 +65,7 @@ export interface QueryIncentivesResponseAmino {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponseAmino;
 }
-export interface QueryIncentivesResponseAminoType {
+export interface QueryIncentivesResponseAminoMsg {
   type: "/evmos.incentives.v1.QueryIncentivesResponse";
   value: QueryIncentivesResponseAmino;
 }
@@ -84,7 +84,7 @@ export interface QueryIncentiveRequest {
   /** contract identifier is the hex contract address of a contract */
   contract: string;
 }
-export interface QueryIncentiveRequestProtoType {
+export interface QueryIncentiveRequestProtoMsg {
   typeUrl: "/evmos.incentives.v1.QueryIncentiveRequest";
   value: Uint8Array;
 }
@@ -94,7 +94,7 @@ export interface QueryIncentiveRequestAmino {
   /** contract identifier is the hex contract address of a contract */
   contract: string;
 }
-export interface QueryIncentiveRequestAminoType {
+export interface QueryIncentiveRequestAminoMsg {
   type: "/evmos.incentives.v1.QueryIncentiveRequest";
   value: QueryIncentiveRequestAmino;
 }
@@ -111,7 +111,7 @@ export interface QueryIncentiveRequestSDKType {
 export interface QueryIncentiveResponse {
   incentive?: Incentive;
 }
-export interface QueryIncentiveResponseProtoType {
+export interface QueryIncentiveResponseProtoMsg {
   typeUrl: "/evmos.incentives.v1.QueryIncentiveResponse";
   value: Uint8Array;
 }
@@ -123,7 +123,7 @@ export interface QueryIncentiveResponseProtoType {
 export interface QueryIncentiveResponseAmino {
   incentive?: IncentiveAmino;
 }
-export interface QueryIncentiveResponseAminoType {
+export interface QueryIncentiveResponseAminoMsg {
   type: "/evmos.incentives.v1.QueryIncentiveResponse";
   value: QueryIncentiveResponseAmino;
 }
@@ -147,7 +147,7 @@ export interface QueryGasMetersRequest {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequest;
 }
-export interface QueryGasMetersRequestProtoType {
+export interface QueryGasMetersRequestProtoMsg {
   typeUrl: "/evmos.incentives.v1.QueryGasMetersRequest";
   value: Uint8Array;
 }
@@ -163,7 +163,7 @@ export interface QueryGasMetersRequestAmino {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequestAmino;
 }
-export interface QueryGasMetersRequestAminoType {
+export interface QueryGasMetersRequestAminoMsg {
   type: "/evmos.incentives.v1.QueryGasMetersRequest";
   value: QueryGasMetersRequestAmino;
 }
@@ -187,7 +187,7 @@ export interface QueryGasMetersResponse {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponse;
 }
-export interface QueryGasMetersResponseProtoType {
+export interface QueryGasMetersResponseProtoMsg {
   typeUrl: "/evmos.incentives.v1.QueryGasMetersResponse";
   value: Uint8Array;
 }
@@ -202,7 +202,7 @@ export interface QueryGasMetersResponseAmino {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponseAmino;
 }
-export interface QueryGasMetersResponseAminoType {
+export interface QueryGasMetersResponseAminoMsg {
   type: "/evmos.incentives.v1.QueryGasMetersResponse";
   value: QueryGasMetersResponseAmino;
 }
@@ -224,7 +224,7 @@ export interface QueryGasMeterRequest {
   /** participant identifier is the hex address of a user */
   participant: string;
 }
-export interface QueryGasMeterRequestProtoType {
+export interface QueryGasMeterRequestProtoMsg {
   typeUrl: "/evmos.incentives.v1.QueryGasMeterRequest";
   value: Uint8Array;
 }
@@ -237,7 +237,7 @@ export interface QueryGasMeterRequestAmino {
   /** participant identifier is the hex address of a user */
   participant: string;
 }
-export interface QueryGasMeterRequestAminoType {
+export interface QueryGasMeterRequestAminoMsg {
   type: "/evmos.incentives.v1.QueryGasMeterRequest";
   value: QueryGasMeterRequestAmino;
 }
@@ -259,7 +259,7 @@ export interface QueryGasMeterResponse {
    */
   gasMeter: Long;
 }
-export interface QueryGasMeterResponseProtoType {
+export interface QueryGasMeterResponseProtoMsg {
   typeUrl: "/evmos.incentives.v1.QueryGasMeterResponse";
   value: Uint8Array;
 }
@@ -275,7 +275,7 @@ export interface QueryGasMeterResponseAmino {
    */
   gas_meter: string;
 }
-export interface QueryGasMeterResponseAminoType {
+export interface QueryGasMeterResponseAminoMsg {
   type: "/evmos.incentives.v1.QueryGasMeterResponse";
   value: QueryGasMeterResponseAmino;
 }
@@ -296,7 +296,7 @@ export interface QueryAllocationMetersRequest {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequest;
 }
-export interface QueryAllocationMetersRequestProtoType {
+export interface QueryAllocationMetersRequestProtoMsg {
   typeUrl: "/evmos.incentives.v1.QueryAllocationMetersRequest";
   value: Uint8Array;
 }
@@ -309,7 +309,7 @@ export interface QueryAllocationMetersRequestAmino {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequestAmino;
 }
-export interface QueryAllocationMetersRequestAminoType {
+export interface QueryAllocationMetersRequestAminoMsg {
   type: "/evmos.incentives.v1.QueryAllocationMetersRequest";
   value: QueryAllocationMetersRequestAmino;
 }
@@ -332,7 +332,7 @@ export interface QueryAllocationMetersResponse {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponse;
 }
-export interface QueryAllocationMetersResponseProtoType {
+export interface QueryAllocationMetersResponseProtoMsg {
   typeUrl: "/evmos.incentives.v1.QueryAllocationMetersResponse";
   value: Uint8Array;
 }
@@ -347,7 +347,7 @@ export interface QueryAllocationMetersResponseAmino {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponseAmino;
 }
-export interface QueryAllocationMetersResponseAminoType {
+export interface QueryAllocationMetersResponseAminoMsg {
   type: "/evmos.incentives.v1.QueryAllocationMetersResponse";
   value: QueryAllocationMetersResponseAmino;
 }
@@ -369,7 +369,7 @@ export interface QueryAllocationMeterRequest {
   /** denom is the coin denom to query an allocation meter for. */
   denom: string;
 }
-export interface QueryAllocationMeterRequestProtoType {
+export interface QueryAllocationMeterRequestProtoMsg {
   typeUrl: "/evmos.incentives.v1.QueryAllocationMeterRequest";
   value: Uint8Array;
 }
@@ -382,7 +382,7 @@ export interface QueryAllocationMeterRequestAmino {
   /** denom is the coin denom to query an allocation meter for. */
   denom: string;
 }
-export interface QueryAllocationMeterRequestAminoType {
+export interface QueryAllocationMeterRequestAminoMsg {
   type: "/evmos.incentives.v1.QueryAllocationMeterRequest";
   value: QueryAllocationMeterRequestAmino;
 }
@@ -402,7 +402,7 @@ export interface QueryAllocationMeterRequestSDKType {
 export interface QueryAllocationMeterResponse {
   allocationMeter?: DecCoin;
 }
-export interface QueryAllocationMeterResponseProtoType {
+export interface QueryAllocationMeterResponseProtoMsg {
   typeUrl: "/evmos.incentives.v1.QueryAllocationMeterResponse";
   value: Uint8Array;
 }
@@ -414,7 +414,7 @@ export interface QueryAllocationMeterResponseProtoType {
 export interface QueryAllocationMeterResponseAmino {
   allocation_meter?: DecCoinAmino;
 }
-export interface QueryAllocationMeterResponseAminoType {
+export interface QueryAllocationMeterResponseAminoMsg {
   type: "/evmos.incentives.v1.QueryAllocationMeterResponse";
   value: QueryAllocationMeterResponseAmino;
 }
@@ -429,14 +429,14 @@ export interface QueryAllocationMeterResponseSDKType {
 
 /** QueryParamsRequest is the request type for the Query/Params RPC method. */
 export interface QueryParamsRequest {}
-export interface QueryParamsRequestProtoType {
+export interface QueryParamsRequestProtoMsg {
   typeUrl: "/evmos.incentives.v1.QueryParamsRequest";
   value: Uint8Array;
 }
 
 /** QueryParamsRequest is the request type for the Query/Params RPC method. */
 export interface QueryParamsRequestAmino {}
-export interface QueryParamsRequestAminoType {
+export interface QueryParamsRequestAminoMsg {
   type: "/evmos.incentives.v1.QueryParamsRequest";
   value: QueryParamsRequestAmino;
 }
@@ -451,7 +451,7 @@ export interface QueryParamsRequestSDKType {}
 export interface QueryParamsResponse {
   params?: Params;
 }
-export interface QueryParamsResponseProtoType {
+export interface QueryParamsResponseProtoMsg {
   typeUrl: "/evmos.incentives.v1.QueryParamsResponse";
   value: Uint8Array;
 }
@@ -463,7 +463,7 @@ export interface QueryParamsResponseProtoType {
 export interface QueryParamsResponseAmino {
   params?: ParamsAmino;
 }
-export interface QueryParamsResponseAminoType {
+export interface QueryParamsResponseAminoMsg {
   type: "/evmos.incentives.v1.QueryParamsResponse";
   value: QueryParamsResponseAmino;
 }
@@ -483,6 +483,8 @@ function createBaseQueryIncentivesRequest(): QueryIncentivesRequest {
 }
 
 export const QueryIncentivesRequest = {
+  typeUrl: "/evmos.incentives.v1.QueryIncentivesRequest",
+
   encode(message: QueryIncentivesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.pagination !== undefined) {
       PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim();
@@ -553,6 +555,25 @@ export const QueryIncentivesRequest = {
     const obj: any = {};
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryIncentivesRequestAminoMsg): QueryIncentivesRequest {
+    return QueryIncentivesRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryIncentivesRequestProtoMsg): QueryIncentivesRequest {
+    return QueryIncentivesRequest.decode(message.value);
+  },
+
+  toProto(message: QueryIncentivesRequest): Uint8Array {
+    return QueryIncentivesRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryIncentivesRequest): QueryIncentivesRequestProtoMsg {
+    return {
+      typeUrl: "/evmos.incentives.v1.QueryIncentivesRequest",
+      value: QueryIncentivesRequest.encode(message).finish()
+    };
   }
 
 };
@@ -565,6 +586,8 @@ function createBaseQueryIncentivesResponse(): QueryIncentivesResponse {
 }
 
 export const QueryIncentivesResponse = {
+  typeUrl: "/evmos.incentives.v1.QueryIncentivesResponse",
+
   encode(message: QueryIncentivesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.incentives) {
       Incentive.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -668,6 +691,25 @@ export const QueryIncentivesResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryIncentivesResponseAminoMsg): QueryIncentivesResponse {
+    return QueryIncentivesResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryIncentivesResponseProtoMsg): QueryIncentivesResponse {
+    return QueryIncentivesResponse.decode(message.value);
+  },
+
+  toProto(message: QueryIncentivesResponse): Uint8Array {
+    return QueryIncentivesResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryIncentivesResponse): QueryIncentivesResponseProtoMsg {
+    return {
+      typeUrl: "/evmos.incentives.v1.QueryIncentivesResponse",
+      value: QueryIncentivesResponse.encode(message).finish()
+    };
   }
 
 };
@@ -679,6 +721,8 @@ function createBaseQueryIncentiveRequest(): QueryIncentiveRequest {
 }
 
 export const QueryIncentiveRequest = {
+  typeUrl: "/evmos.incentives.v1.QueryIncentiveRequest",
+
   encode(message: QueryIncentiveRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.contract !== "") {
       writer.uint32(10).string(message.contract);
@@ -749,6 +793,25 @@ export const QueryIncentiveRequest = {
     const obj: any = {};
     obj.contract = message.contract;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryIncentiveRequestAminoMsg): QueryIncentiveRequest {
+    return QueryIncentiveRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryIncentiveRequestProtoMsg): QueryIncentiveRequest {
+    return QueryIncentiveRequest.decode(message.value);
+  },
+
+  toProto(message: QueryIncentiveRequest): Uint8Array {
+    return QueryIncentiveRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryIncentiveRequest): QueryIncentiveRequestProtoMsg {
+    return {
+      typeUrl: "/evmos.incentives.v1.QueryIncentiveRequest",
+      value: QueryIncentiveRequest.encode(message).finish()
+    };
   }
 
 };
@@ -760,6 +823,8 @@ function createBaseQueryIncentiveResponse(): QueryIncentiveResponse {
 }
 
 export const QueryIncentiveResponse = {
+  typeUrl: "/evmos.incentives.v1.QueryIncentiveResponse",
+
   encode(message: QueryIncentiveResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.incentive !== undefined) {
       Incentive.encode(message.incentive, writer.uint32(10).fork()).ldelim();
@@ -830,6 +895,25 @@ export const QueryIncentiveResponse = {
     const obj: any = {};
     obj.incentive = message.incentive ? Incentive.toAmino(message.incentive) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryIncentiveResponseAminoMsg): QueryIncentiveResponse {
+    return QueryIncentiveResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryIncentiveResponseProtoMsg): QueryIncentiveResponse {
+    return QueryIncentiveResponse.decode(message.value);
+  },
+
+  toProto(message: QueryIncentiveResponse): Uint8Array {
+    return QueryIncentiveResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryIncentiveResponse): QueryIncentiveResponseProtoMsg {
+    return {
+      typeUrl: "/evmos.incentives.v1.QueryIncentiveResponse",
+      value: QueryIncentiveResponse.encode(message).finish()
+    };
   }
 
 };
@@ -842,6 +926,8 @@ function createBaseQueryGasMetersRequest(): QueryGasMetersRequest {
 }
 
 export const QueryGasMetersRequest = {
+  typeUrl: "/evmos.incentives.v1.QueryGasMetersRequest",
+
   encode(message: QueryGasMetersRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.contract !== "") {
       writer.uint32(10).string(message.contract);
@@ -927,6 +1013,25 @@ export const QueryGasMetersRequest = {
     obj.contract = message.contract;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryGasMetersRequestAminoMsg): QueryGasMetersRequest {
+    return QueryGasMetersRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryGasMetersRequestProtoMsg): QueryGasMetersRequest {
+    return QueryGasMetersRequest.decode(message.value);
+  },
+
+  toProto(message: QueryGasMetersRequest): Uint8Array {
+    return QueryGasMetersRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryGasMetersRequest): QueryGasMetersRequestProtoMsg {
+    return {
+      typeUrl: "/evmos.incentives.v1.QueryGasMetersRequest",
+      value: QueryGasMetersRequest.encode(message).finish()
+    };
   }
 
 };
@@ -939,6 +1044,8 @@ function createBaseQueryGasMetersResponse(): QueryGasMetersResponse {
 }
 
 export const QueryGasMetersResponse = {
+  typeUrl: "/evmos.incentives.v1.QueryGasMetersResponse",
+
   encode(message: QueryGasMetersResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.gasMeters) {
       GasMeter.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1042,6 +1149,25 @@ export const QueryGasMetersResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryGasMetersResponseAminoMsg): QueryGasMetersResponse {
+    return QueryGasMetersResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryGasMetersResponseProtoMsg): QueryGasMetersResponse {
+    return QueryGasMetersResponse.decode(message.value);
+  },
+
+  toProto(message: QueryGasMetersResponse): Uint8Array {
+    return QueryGasMetersResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryGasMetersResponse): QueryGasMetersResponseProtoMsg {
+    return {
+      typeUrl: "/evmos.incentives.v1.QueryGasMetersResponse",
+      value: QueryGasMetersResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1054,6 +1180,8 @@ function createBaseQueryGasMeterRequest(): QueryGasMeterRequest {
 }
 
 export const QueryGasMeterRequest = {
+  typeUrl: "/evmos.incentives.v1.QueryGasMeterRequest",
+
   encode(message: QueryGasMeterRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.contract !== "") {
       writer.uint32(10).string(message.contract);
@@ -1139,6 +1267,25 @@ export const QueryGasMeterRequest = {
     obj.contract = message.contract;
     obj.participant = message.participant;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryGasMeterRequestAminoMsg): QueryGasMeterRequest {
+    return QueryGasMeterRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryGasMeterRequestProtoMsg): QueryGasMeterRequest {
+    return QueryGasMeterRequest.decode(message.value);
+  },
+
+  toProto(message: QueryGasMeterRequest): Uint8Array {
+    return QueryGasMeterRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryGasMeterRequest): QueryGasMeterRequestProtoMsg {
+    return {
+      typeUrl: "/evmos.incentives.v1.QueryGasMeterRequest",
+      value: QueryGasMeterRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1150,6 +1297,8 @@ function createBaseQueryGasMeterResponse(): QueryGasMeterResponse {
 }
 
 export const QueryGasMeterResponse = {
+  typeUrl: "/evmos.incentives.v1.QueryGasMeterResponse",
+
   encode(message: QueryGasMeterResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.gasMeter.isZero()) {
       writer.uint32(8).uint64(message.gasMeter);
@@ -1220,6 +1369,25 @@ export const QueryGasMeterResponse = {
     const obj: any = {};
     obj.gas_meter = message.gasMeter ? message.gasMeter.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryGasMeterResponseAminoMsg): QueryGasMeterResponse {
+    return QueryGasMeterResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryGasMeterResponseProtoMsg): QueryGasMeterResponse {
+    return QueryGasMeterResponse.decode(message.value);
+  },
+
+  toProto(message: QueryGasMeterResponse): Uint8Array {
+    return QueryGasMeterResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryGasMeterResponse): QueryGasMeterResponseProtoMsg {
+    return {
+      typeUrl: "/evmos.incentives.v1.QueryGasMeterResponse",
+      value: QueryGasMeterResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1231,6 +1399,8 @@ function createBaseQueryAllocationMetersRequest(): QueryAllocationMetersRequest
 }
 
 export const QueryAllocationMetersRequest = {
+  typeUrl: "/evmos.incentives.v1.QueryAllocationMetersRequest",
+
   encode(message: QueryAllocationMetersRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.pagination !== undefined) {
       PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim();
@@ -1301,6 +1471,25 @@ export const QueryAllocationMetersRequest = {
     const obj: any = {};
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryAllocationMetersRequestAminoMsg): QueryAllocationMetersRequest {
+    return QueryAllocationMetersRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryAllocationMetersRequestProtoMsg): QueryAllocationMetersRequest {
+    return QueryAllocationMetersRequest.decode(message.value);
+  },
+
+  toProto(message: QueryAllocationMetersRequest): Uint8Array {
+    return QueryAllocationMetersRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryAllocationMetersRequest): QueryAllocationMetersRequestProtoMsg {
+    return {
+      typeUrl: "/evmos.incentives.v1.QueryAllocationMetersRequest",
+      value: QueryAllocationMetersRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1313,6 +1502,8 @@ function createBaseQueryAllocationMetersResponse(): QueryAllocationMetersRespons
 }
 
 export const QueryAllocationMetersResponse = {
+  typeUrl: "/evmos.incentives.v1.QueryAllocationMetersResponse",
+
   encode(message: QueryAllocationMetersResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.allocationMeters) {
       DecCoin.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1416,6 +1607,25 @@ export const QueryAllocationMetersResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryAllocationMetersResponseAminoMsg): QueryAllocationMetersResponse {
+    return QueryAllocationMetersResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryAllocationMetersResponseProtoMsg): QueryAllocationMetersResponse {
+    return QueryAllocationMetersResponse.decode(message.value);
+  },
+
+  toProto(message: QueryAllocationMetersResponse): Uint8Array {
+    return QueryAllocationMetersResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryAllocationMetersResponse): QueryAllocationMetersResponseProtoMsg {
+    return {
+      typeUrl: "/evmos.incentives.v1.QueryAllocationMetersResponse",
+      value: QueryAllocationMetersResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1427,6 +1637,8 @@ function createBaseQueryAllocationMeterRequest(): QueryAllocationMeterRequest {
 }
 
 export const QueryAllocationMeterRequest = {
+  typeUrl: "/evmos.incentives.v1.QueryAllocationMeterRequest",
+
   encode(message: QueryAllocationMeterRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.denom !== "") {
       writer.uint32(10).string(message.denom);
@@ -1497,6 +1709,25 @@ export const QueryAllocationMeterRequest = {
     const obj: any = {};
     obj.denom = message.denom;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryAllocationMeterRequestAminoMsg): QueryAllocationMeterRequest {
+    return QueryAllocationMeterRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryAllocationMeterRequestProtoMsg): QueryAllocationMeterRequest {
+    return QueryAllocationMeterRequest.decode(message.value);
+  },
+
+  toProto(message: QueryAllocationMeterRequest): Uint8Array {
+    return QueryAllocationMeterRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryAllocationMeterRequest): QueryAllocationMeterRequestProtoMsg {
+    return {
+      typeUrl: "/evmos.incentives.v1.QueryAllocationMeterRequest",
+      value: QueryAllocationMeterRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1508,6 +1739,8 @@ function createBaseQueryAllocationMeterResponse(): QueryAllocationMeterResponse
 }
 
 export const QueryAllocationMeterResponse = {
+  typeUrl: "/evmos.incentives.v1.QueryAllocationMeterResponse",
+
   encode(message: QueryAllocationMeterResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.allocationMeter !== undefined) {
       DecCoin.encode(message.allocationMeter, writer.uint32(10).fork()).ldelim();
@@ -1578,6 +1811,25 @@ export const QueryAllocationMeterResponse = {
     const obj: any = {};
     obj.allocation_meter = message.allocationMeter ? DecCoin.toAmino(message.allocationMeter) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryAllocationMeterResponseAminoMsg): QueryAllocationMeterResponse {
+    return QueryAllocationMeterResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryAllocationMeterResponseProtoMsg): QueryAllocationMeterResponse {
+    return QueryAllocationMeterResponse.decode(message.value);
+  },
+
+  toProto(message: QueryAllocationMeterResponse): Uint8Array {
+    return QueryAllocationMeterResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryAllocationMeterResponse): QueryAllocationMeterResponseProtoMsg {
+    return {
+      typeUrl: "/evmos.incentives.v1.QueryAllocationMeterResponse",
+      value: QueryAllocationMeterResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1587,6 +1839,8 @@ function createBaseQueryParamsRequest(): QueryParamsRequest {
 }
 
 export const QueryParamsRequest = {
+  typeUrl: "/evmos.incentives.v1.QueryParamsRequest",
+
   encode(_: QueryParamsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -1639,6 +1893,25 @@ export const QueryParamsRequest = {
   toAmino(_: QueryParamsRequest): QueryParamsRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest {
+    return QueryParamsRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryParamsRequestProtoMsg): QueryParamsRequest {
+    return QueryParamsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryParamsRequest): Uint8Array {
+    return QueryParamsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryParamsRequest): QueryParamsRequestProtoMsg {
+    return {
+      typeUrl: "/evmos.incentives.v1.QueryParamsRequest",
+      value: QueryParamsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1650,6 +1923,8 @@ function createBaseQueryParamsResponse(): QueryParamsResponse {
 }
 
 export const QueryParamsResponse = {
+  typeUrl: "/evmos.incentives.v1.QueryParamsResponse",
+
   encode(message: QueryParamsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.params !== undefined) {
       Params.encode(message.params, writer.uint32(10).fork()).ldelim();
@@ -1720,6 +1995,25 @@ export const QueryParamsResponse = {
     const obj: any = {};
     obj.params = message.params ? Params.toAmino(message.params) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryParamsResponseAminoMsg): QueryParamsResponse {
+    return QueryParamsResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryParamsResponseProtoMsg): QueryParamsResponse {
+    return QueryParamsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryParamsResponse): Uint8Array {
+    return QueryParamsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryParamsResponse): QueryParamsResponseProtoMsg {
+    return {
+      typeUrl: "/evmos.incentives.v1.QueryParamsResponse",
+      value: QueryParamsResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/evmos/inflation/v1/genesis.ts b/__fixtures__/outputv2/evmos/inflation/v1/genesis.ts
index a1773e777..64f955370 100644
--- a/__fixtures__/outputv2/evmos/inflation/v1/genesis.ts
+++ b/__fixtures__/outputv2/evmos/inflation/v1/genesis.ts
@@ -20,7 +20,7 @@ export interface GenesisState {
   /** number of epochs that have passed while inflation is disabled */
   skippedEpochs: Long;
 }
-export interface GenesisStateProtoType {
+export interface GenesisStateProtoMsg {
   typeUrl: "/evmos.inflation.v1.GenesisState";
   value: Uint8Array;
 }
@@ -42,7 +42,7 @@ export interface GenesisStateAmino {
   /** number of epochs that have passed while inflation is disabled */
   skipped_epochs: string;
 }
-export interface GenesisStateAminoType {
+export interface GenesisStateAminoMsg {
   type: "/evmos.inflation.v1.GenesisState";
   value: GenesisStateAmino;
 }
@@ -70,7 +70,7 @@ export interface Params {
   /** parameter to enable inflation and halt increasing the skipped_epochs */
   enableInflation: boolean;
 }
-export interface ParamsProtoType {
+export interface ParamsProtoMsg {
   typeUrl: "/evmos.inflation.v1.Params";
   value: Uint8Array;
 }
@@ -89,7 +89,7 @@ export interface ParamsAmino {
   /** parameter to enable inflation and halt increasing the skipped_epochs */
   enable_inflation: boolean;
 }
-export interface ParamsAminoType {
+export interface ParamsAminoMsg {
   type: "/evmos.inflation.v1.Params";
   value: ParamsAmino;
 }
@@ -113,6 +113,8 @@ function createBaseGenesisState(): GenesisState {
 }
 
 export const GenesisState = {
+  typeUrl: "/evmos.inflation.v1.GenesisState",
+
   encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.params !== undefined) {
       Params.encode(message.params, writer.uint32(10).fork()).ldelim();
@@ -243,6 +245,25 @@ export const GenesisState = {
     obj.epochs_per_period = message.epochsPerPeriod ? message.epochsPerPeriod.toString() : undefined;
     obj.skipped_epochs = message.skippedEpochs ? message.skippedEpochs.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisStateAminoMsg): GenesisState {
+    return GenesisState.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: GenesisStateProtoMsg): GenesisState {
+    return GenesisState.decode(message.value);
+  },
+
+  toProto(message: GenesisState): Uint8Array {
+    return GenesisState.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisState): GenesisStateProtoMsg {
+    return {
+      typeUrl: "/evmos.inflation.v1.GenesisState",
+      value: GenesisState.encode(message).finish()
+    };
   }
 
 };
@@ -257,6 +278,8 @@ function createBaseParams(): Params {
 }
 
 export const Params = {
+  typeUrl: "/evmos.inflation.v1.Params",
+
   encode(message: Params, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.mintDenom !== "") {
       writer.uint32(10).string(message.mintDenom);
@@ -372,6 +395,25 @@ export const Params = {
     obj.inflation_distribution = message.inflationDistribution ? InflationDistribution.toAmino(message.inflationDistribution) : undefined;
     obj.enable_inflation = message.enableInflation;
     return obj;
+  },
+
+  fromAminoMsg(object: ParamsAminoMsg): Params {
+    return Params.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ParamsProtoMsg): Params {
+    return Params.decode(message.value);
+  },
+
+  toProto(message: Params): Uint8Array {
+    return Params.encode(message).finish();
+  },
+
+  toProtoMsg(message: Params): ParamsProtoMsg {
+    return {
+      typeUrl: "/evmos.inflation.v1.Params",
+      value: Params.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/evmos/inflation/v1/inflation.ts b/__fixtures__/outputv2/evmos/inflation/v1/inflation.ts
index beec7fe6c..7d1ec1f68 100644
--- a/__fixtures__/outputv2/evmos/inflation/v1/inflation.ts
+++ b/__fixtures__/outputv2/evmos/inflation/v1/inflation.ts
@@ -30,7 +30,7 @@ export interface InflationDistribution {
    */
   communityPool: string;
 }
-export interface InflationDistributionProtoType {
+export interface InflationDistributionProtoMsg {
   typeUrl: "/evmos.inflation.v1.InflationDistribution";
   value: Uint8Array;
 }
@@ -63,7 +63,7 @@ export interface InflationDistributionAmino {
    */
   community_pool: string;
 }
-export interface InflationDistributionAminoType {
+export interface InflationDistributionAminoMsg {
   type: "/evmos.inflation.v1.InflationDistribution";
   value: InflationDistributionAmino;
 }
@@ -106,7 +106,7 @@ export interface ExponentialCalculation {
   /** max variance */
   maxVariance: string;
 }
-export interface ExponentialCalculationProtoType {
+export interface ExponentialCalculationProtoMsg {
   typeUrl: "/evmos.inflation.v1.ExponentialCalculation";
   value: Uint8Array;
 }
@@ -134,7 +134,7 @@ export interface ExponentialCalculationAmino {
   /** max variance */
   max_variance: string;
 }
-export interface ExponentialCalculationAminoType {
+export interface ExponentialCalculationAminoMsg {
   type: "/evmos.inflation.v1.ExponentialCalculation";
   value: ExponentialCalculationAmino;
 }
@@ -163,6 +163,8 @@ function createBaseInflationDistribution(): InflationDistribution {
 }
 
 export const InflationDistribution = {
+  typeUrl: "/evmos.inflation.v1.InflationDistribution",
+
   encode(message: InflationDistribution, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.stakingRewards !== "") {
       writer.uint32(10).string(message.stakingRewards);
@@ -263,6 +265,25 @@ export const InflationDistribution = {
     obj.usage_incentives = message.usageIncentives;
     obj.community_pool = message.communityPool;
     return obj;
+  },
+
+  fromAminoMsg(object: InflationDistributionAminoMsg): InflationDistribution {
+    return InflationDistribution.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: InflationDistributionProtoMsg): InflationDistribution {
+    return InflationDistribution.decode(message.value);
+  },
+
+  toProto(message: InflationDistribution): Uint8Array {
+    return InflationDistribution.encode(message).finish();
+  },
+
+  toProtoMsg(message: InflationDistribution): InflationDistributionProtoMsg {
+    return {
+      typeUrl: "/evmos.inflation.v1.InflationDistribution",
+      value: InflationDistribution.encode(message).finish()
+    };
   }
 
 };
@@ -278,6 +299,8 @@ function createBaseExponentialCalculation(): ExponentialCalculation {
 }
 
 export const ExponentialCalculation = {
+  typeUrl: "/evmos.inflation.v1.ExponentialCalculation",
+
   encode(message: ExponentialCalculation, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.a !== "") {
       writer.uint32(10).string(message.a);
@@ -408,6 +431,25 @@ export const ExponentialCalculation = {
     obj.bonding_target = message.bondingTarget;
     obj.max_variance = message.maxVariance;
     return obj;
+  },
+
+  fromAminoMsg(object: ExponentialCalculationAminoMsg): ExponentialCalculation {
+    return ExponentialCalculation.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ExponentialCalculationProtoMsg): ExponentialCalculation {
+    return ExponentialCalculation.decode(message.value);
+  },
+
+  toProto(message: ExponentialCalculation): Uint8Array {
+    return ExponentialCalculation.encode(message).finish();
+  },
+
+  toProtoMsg(message: ExponentialCalculation): ExponentialCalculationProtoMsg {
+    return {
+      typeUrl: "/evmos.inflation.v1.ExponentialCalculation",
+      value: ExponentialCalculation.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/evmos/inflation/v1/query.ts b/__fixtures__/outputv2/evmos/inflation/v1/query.ts
index e24ee162d..1f8caa0a7 100644
--- a/__fixtures__/outputv2/evmos/inflation/v1/query.ts
+++ b/__fixtures__/outputv2/evmos/inflation/v1/query.ts
@@ -6,14 +6,14 @@ export const protobufPackage = "evmos.inflation.v1";
 
 /** QueryPeriodRequest is the request type for the Query/Period RPC method. */
 export interface QueryPeriodRequest {}
-export interface QueryPeriodRequestProtoType {
+export interface QueryPeriodRequestProtoMsg {
   typeUrl: "/evmos.inflation.v1.QueryPeriodRequest";
   value: Uint8Array;
 }
 
 /** QueryPeriodRequest is the request type for the Query/Period RPC method. */
 export interface QueryPeriodRequestAmino {}
-export interface QueryPeriodRequestAminoType {
+export interface QueryPeriodRequestAminoMsg {
   type: "/evmos.inflation.v1.QueryPeriodRequest";
   value: QueryPeriodRequestAmino;
 }
@@ -26,7 +26,7 @@ export interface QueryPeriodResponse {
   /** period is the current minting per epoch provision value. */
   period: Long;
 }
-export interface QueryPeriodResponseProtoType {
+export interface QueryPeriodResponseProtoMsg {
   typeUrl: "/evmos.inflation.v1.QueryPeriodResponse";
   value: Uint8Array;
 }
@@ -36,7 +36,7 @@ export interface QueryPeriodResponseAmino {
   /** period is the current minting per epoch provision value. */
   period: string;
 }
-export interface QueryPeriodResponseAminoType {
+export interface QueryPeriodResponseAminoMsg {
   type: "/evmos.inflation.v1.QueryPeriodResponse";
   value: QueryPeriodResponseAmino;
 }
@@ -51,7 +51,7 @@ export interface QueryPeriodResponseSDKType {
  * Query/EpochMintProvision RPC method.
  */
 export interface QueryEpochMintProvisionRequest {}
-export interface QueryEpochMintProvisionRequestProtoType {
+export interface QueryEpochMintProvisionRequestProtoMsg {
   typeUrl: "/evmos.inflation.v1.QueryEpochMintProvisionRequest";
   value: Uint8Array;
 }
@@ -61,7 +61,7 @@ export interface QueryEpochMintProvisionRequestProtoType {
  * Query/EpochMintProvision RPC method.
  */
 export interface QueryEpochMintProvisionRequestAmino {}
-export interface QueryEpochMintProvisionRequestAminoType {
+export interface QueryEpochMintProvisionRequestAminoMsg {
   type: "/evmos.inflation.v1.QueryEpochMintProvisionRequest";
   value: QueryEpochMintProvisionRequestAmino;
 }
@@ -80,7 +80,7 @@ export interface QueryEpochMintProvisionResponse {
   /** epoch_mint_provision is the current minting per epoch provision value. */
   epochMintProvision?: DecCoin;
 }
-export interface QueryEpochMintProvisionResponseProtoType {
+export interface QueryEpochMintProvisionResponseProtoMsg {
   typeUrl: "/evmos.inflation.v1.QueryEpochMintProvisionResponse";
   value: Uint8Array;
 }
@@ -93,7 +93,7 @@ export interface QueryEpochMintProvisionResponseAmino {
   /** epoch_mint_provision is the current minting per epoch provision value. */
   epoch_mint_provision?: DecCoinAmino;
 }
-export interface QueryEpochMintProvisionResponseAminoType {
+export interface QueryEpochMintProvisionResponseAminoMsg {
   type: "/evmos.inflation.v1.QueryEpochMintProvisionResponse";
   value: QueryEpochMintProvisionResponseAmino;
 }
@@ -111,7 +111,7 @@ export interface QueryEpochMintProvisionResponseSDKType {
  * method.
  */
 export interface QuerySkippedEpochsRequest {}
-export interface QuerySkippedEpochsRequestProtoType {
+export interface QuerySkippedEpochsRequestProtoMsg {
   typeUrl: "/evmos.inflation.v1.QuerySkippedEpochsRequest";
   value: Uint8Array;
 }
@@ -121,7 +121,7 @@ export interface QuerySkippedEpochsRequestProtoType {
  * method.
  */
 export interface QuerySkippedEpochsRequestAmino {}
-export interface QuerySkippedEpochsRequestAminoType {
+export interface QuerySkippedEpochsRequestAminoMsg {
   type: "/evmos.inflation.v1.QuerySkippedEpochsRequest";
   value: QuerySkippedEpochsRequestAmino;
 }
@@ -140,7 +140,7 @@ export interface QuerySkippedEpochsResponse {
   /** number of epochs that the inflation module has been disabled. */
   skippedEpochs: Long;
 }
-export interface QuerySkippedEpochsResponseProtoType {
+export interface QuerySkippedEpochsResponseProtoMsg {
   typeUrl: "/evmos.inflation.v1.QuerySkippedEpochsResponse";
   value: Uint8Array;
 }
@@ -153,7 +153,7 @@ export interface QuerySkippedEpochsResponseAmino {
   /** number of epochs that the inflation module has been disabled. */
   skipped_epochs: string;
 }
-export interface QuerySkippedEpochsResponseAminoType {
+export interface QuerySkippedEpochsResponseAminoMsg {
   type: "/evmos.inflation.v1.QuerySkippedEpochsResponse";
   value: QuerySkippedEpochsResponseAmino;
 }
@@ -171,7 +171,7 @@ export interface QuerySkippedEpochsResponseSDKType {
  * Query/CirculatingSupply RPC method.
  */
 export interface QueryCirculatingSupplyRequest {}
-export interface QueryCirculatingSupplyRequestProtoType {
+export interface QueryCirculatingSupplyRequestProtoMsg {
   typeUrl: "/evmos.inflation.v1.QueryCirculatingSupplyRequest";
   value: Uint8Array;
 }
@@ -181,7 +181,7 @@ export interface QueryCirculatingSupplyRequestProtoType {
  * Query/CirculatingSupply RPC method.
  */
 export interface QueryCirculatingSupplyRequestAmino {}
-export interface QueryCirculatingSupplyRequestAminoType {
+export interface QueryCirculatingSupplyRequestAminoMsg {
   type: "/evmos.inflation.v1.QueryCirculatingSupplyRequest";
   value: QueryCirculatingSupplyRequestAmino;
 }
@@ -200,7 +200,7 @@ export interface QueryCirculatingSupplyResponse {
   /** total amount of coins in circulation */
   circulatingSupply?: DecCoin;
 }
-export interface QueryCirculatingSupplyResponseProtoType {
+export interface QueryCirculatingSupplyResponseProtoMsg {
   typeUrl: "/evmos.inflation.v1.QueryCirculatingSupplyResponse";
   value: Uint8Array;
 }
@@ -213,7 +213,7 @@ export interface QueryCirculatingSupplyResponseAmino {
   /** total amount of coins in circulation */
   circulating_supply?: DecCoinAmino;
 }
-export interface QueryCirculatingSupplyResponseAminoType {
+export interface QueryCirculatingSupplyResponseAminoMsg {
   type: "/evmos.inflation.v1.QueryCirculatingSupplyResponse";
   value: QueryCirculatingSupplyResponseAmino;
 }
@@ -231,7 +231,7 @@ export interface QueryCirculatingSupplyResponseSDKType {
  * method.
  */
 export interface QueryInflationRateRequest {}
-export interface QueryInflationRateRequestProtoType {
+export interface QueryInflationRateRequestProtoMsg {
   typeUrl: "/evmos.inflation.v1.QueryInflationRateRequest";
   value: Uint8Array;
 }
@@ -241,7 +241,7 @@ export interface QueryInflationRateRequestProtoType {
  * method.
  */
 export interface QueryInflationRateRequestAmino {}
-export interface QueryInflationRateRequestAminoType {
+export interface QueryInflationRateRequestAminoMsg {
   type: "/evmos.inflation.v1.QueryInflationRateRequest";
   value: QueryInflationRateRequestAmino;
 }
@@ -260,7 +260,7 @@ export interface QueryInflationRateResponse {
   /** rate by which the total supply increases within one period */
   inflationRate: string;
 }
-export interface QueryInflationRateResponseProtoType {
+export interface QueryInflationRateResponseProtoMsg {
   typeUrl: "/evmos.inflation.v1.QueryInflationRateResponse";
   value: Uint8Array;
 }
@@ -273,7 +273,7 @@ export interface QueryInflationRateResponseAmino {
   /** rate by which the total supply increases within one period */
   inflation_rate: string;
 }
-export interface QueryInflationRateResponseAminoType {
+export interface QueryInflationRateResponseAminoMsg {
   type: "/evmos.inflation.v1.QueryInflationRateResponse";
   value: QueryInflationRateResponseAmino;
 }
@@ -288,14 +288,14 @@ export interface QueryInflationRateResponseSDKType {
 
 /** QueryParamsRequest is the request type for the Query/Params RPC method. */
 export interface QueryParamsRequest {}
-export interface QueryParamsRequestProtoType {
+export interface QueryParamsRequestProtoMsg {
   typeUrl: "/evmos.inflation.v1.QueryParamsRequest";
   value: Uint8Array;
 }
 
 /** QueryParamsRequest is the request type for the Query/Params RPC method. */
 export interface QueryParamsRequestAmino {}
-export interface QueryParamsRequestAminoType {
+export interface QueryParamsRequestAminoMsg {
   type: "/evmos.inflation.v1.QueryParamsRequest";
   value: QueryParamsRequestAmino;
 }
@@ -308,7 +308,7 @@ export interface QueryParamsResponse {
   /** params defines the parameters of the module. */
   params?: Params;
 }
-export interface QueryParamsResponseProtoType {
+export interface QueryParamsResponseProtoMsg {
   typeUrl: "/evmos.inflation.v1.QueryParamsResponse";
   value: Uint8Array;
 }
@@ -318,7 +318,7 @@ export interface QueryParamsResponseAmino {
   /** params defines the parameters of the module. */
   params?: ParamsAmino;
 }
-export interface QueryParamsResponseAminoType {
+export interface QueryParamsResponseAminoMsg {
   type: "/evmos.inflation.v1.QueryParamsResponse";
   value: QueryParamsResponseAmino;
 }
@@ -333,6 +333,8 @@ function createBaseQueryPeriodRequest(): QueryPeriodRequest {
 }
 
 export const QueryPeriodRequest = {
+  typeUrl: "/evmos.inflation.v1.QueryPeriodRequest",
+
   encode(_: QueryPeriodRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -385,6 +387,25 @@ export const QueryPeriodRequest = {
   toAmino(_: QueryPeriodRequest): QueryPeriodRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryPeriodRequestAminoMsg): QueryPeriodRequest {
+    return QueryPeriodRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryPeriodRequestProtoMsg): QueryPeriodRequest {
+    return QueryPeriodRequest.decode(message.value);
+  },
+
+  toProto(message: QueryPeriodRequest): Uint8Array {
+    return QueryPeriodRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryPeriodRequest): QueryPeriodRequestProtoMsg {
+    return {
+      typeUrl: "/evmos.inflation.v1.QueryPeriodRequest",
+      value: QueryPeriodRequest.encode(message).finish()
+    };
   }
 
 };
@@ -396,6 +417,8 @@ function createBaseQueryPeriodResponse(): QueryPeriodResponse {
 }
 
 export const QueryPeriodResponse = {
+  typeUrl: "/evmos.inflation.v1.QueryPeriodResponse",
+
   encode(message: QueryPeriodResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.period.isZero()) {
       writer.uint32(8).uint64(message.period);
@@ -466,6 +489,25 @@ export const QueryPeriodResponse = {
     const obj: any = {};
     obj.period = message.period ? message.period.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryPeriodResponseAminoMsg): QueryPeriodResponse {
+    return QueryPeriodResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryPeriodResponseProtoMsg): QueryPeriodResponse {
+    return QueryPeriodResponse.decode(message.value);
+  },
+
+  toProto(message: QueryPeriodResponse): Uint8Array {
+    return QueryPeriodResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryPeriodResponse): QueryPeriodResponseProtoMsg {
+    return {
+      typeUrl: "/evmos.inflation.v1.QueryPeriodResponse",
+      value: QueryPeriodResponse.encode(message).finish()
+    };
   }
 
 };
@@ -475,6 +517,8 @@ function createBaseQueryEpochMintProvisionRequest(): QueryEpochMintProvisionRequ
 }
 
 export const QueryEpochMintProvisionRequest = {
+  typeUrl: "/evmos.inflation.v1.QueryEpochMintProvisionRequest",
+
   encode(_: QueryEpochMintProvisionRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -527,6 +571,25 @@ export const QueryEpochMintProvisionRequest = {
   toAmino(_: QueryEpochMintProvisionRequest): QueryEpochMintProvisionRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryEpochMintProvisionRequestAminoMsg): QueryEpochMintProvisionRequest {
+    return QueryEpochMintProvisionRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryEpochMintProvisionRequestProtoMsg): QueryEpochMintProvisionRequest {
+    return QueryEpochMintProvisionRequest.decode(message.value);
+  },
+
+  toProto(message: QueryEpochMintProvisionRequest): Uint8Array {
+    return QueryEpochMintProvisionRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryEpochMintProvisionRequest): QueryEpochMintProvisionRequestProtoMsg {
+    return {
+      typeUrl: "/evmos.inflation.v1.QueryEpochMintProvisionRequest",
+      value: QueryEpochMintProvisionRequest.encode(message).finish()
+    };
   }
 
 };
@@ -538,6 +601,8 @@ function createBaseQueryEpochMintProvisionResponse(): QueryEpochMintProvisionRes
 }
 
 export const QueryEpochMintProvisionResponse = {
+  typeUrl: "/evmos.inflation.v1.QueryEpochMintProvisionResponse",
+
   encode(message: QueryEpochMintProvisionResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.epochMintProvision !== undefined) {
       DecCoin.encode(message.epochMintProvision, writer.uint32(10).fork()).ldelim();
@@ -608,6 +673,25 @@ export const QueryEpochMintProvisionResponse = {
     const obj: any = {};
     obj.epoch_mint_provision = message.epochMintProvision ? DecCoin.toAmino(message.epochMintProvision) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryEpochMintProvisionResponseAminoMsg): QueryEpochMintProvisionResponse {
+    return QueryEpochMintProvisionResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryEpochMintProvisionResponseProtoMsg): QueryEpochMintProvisionResponse {
+    return QueryEpochMintProvisionResponse.decode(message.value);
+  },
+
+  toProto(message: QueryEpochMintProvisionResponse): Uint8Array {
+    return QueryEpochMintProvisionResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryEpochMintProvisionResponse): QueryEpochMintProvisionResponseProtoMsg {
+    return {
+      typeUrl: "/evmos.inflation.v1.QueryEpochMintProvisionResponse",
+      value: QueryEpochMintProvisionResponse.encode(message).finish()
+    };
   }
 
 };
@@ -617,6 +701,8 @@ function createBaseQuerySkippedEpochsRequest(): QuerySkippedEpochsRequest {
 }
 
 export const QuerySkippedEpochsRequest = {
+  typeUrl: "/evmos.inflation.v1.QuerySkippedEpochsRequest",
+
   encode(_: QuerySkippedEpochsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -669,6 +755,25 @@ export const QuerySkippedEpochsRequest = {
   toAmino(_: QuerySkippedEpochsRequest): QuerySkippedEpochsRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: QuerySkippedEpochsRequestAminoMsg): QuerySkippedEpochsRequest {
+    return QuerySkippedEpochsRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QuerySkippedEpochsRequestProtoMsg): QuerySkippedEpochsRequest {
+    return QuerySkippedEpochsRequest.decode(message.value);
+  },
+
+  toProto(message: QuerySkippedEpochsRequest): Uint8Array {
+    return QuerySkippedEpochsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QuerySkippedEpochsRequest): QuerySkippedEpochsRequestProtoMsg {
+    return {
+      typeUrl: "/evmos.inflation.v1.QuerySkippedEpochsRequest",
+      value: QuerySkippedEpochsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -680,6 +785,8 @@ function createBaseQuerySkippedEpochsResponse(): QuerySkippedEpochsResponse {
 }
 
 export const QuerySkippedEpochsResponse = {
+  typeUrl: "/evmos.inflation.v1.QuerySkippedEpochsResponse",
+
   encode(message: QuerySkippedEpochsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.skippedEpochs.isZero()) {
       writer.uint32(8).uint64(message.skippedEpochs);
@@ -750,6 +857,25 @@ export const QuerySkippedEpochsResponse = {
     const obj: any = {};
     obj.skipped_epochs = message.skippedEpochs ? message.skippedEpochs.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QuerySkippedEpochsResponseAminoMsg): QuerySkippedEpochsResponse {
+    return QuerySkippedEpochsResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QuerySkippedEpochsResponseProtoMsg): QuerySkippedEpochsResponse {
+    return QuerySkippedEpochsResponse.decode(message.value);
+  },
+
+  toProto(message: QuerySkippedEpochsResponse): Uint8Array {
+    return QuerySkippedEpochsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QuerySkippedEpochsResponse): QuerySkippedEpochsResponseProtoMsg {
+    return {
+      typeUrl: "/evmos.inflation.v1.QuerySkippedEpochsResponse",
+      value: QuerySkippedEpochsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -759,6 +885,8 @@ function createBaseQueryCirculatingSupplyRequest(): QueryCirculatingSupplyReques
 }
 
 export const QueryCirculatingSupplyRequest = {
+  typeUrl: "/evmos.inflation.v1.QueryCirculatingSupplyRequest",
+
   encode(_: QueryCirculatingSupplyRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -811,6 +939,25 @@ export const QueryCirculatingSupplyRequest = {
   toAmino(_: QueryCirculatingSupplyRequest): QueryCirculatingSupplyRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryCirculatingSupplyRequestAminoMsg): QueryCirculatingSupplyRequest {
+    return QueryCirculatingSupplyRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryCirculatingSupplyRequestProtoMsg): QueryCirculatingSupplyRequest {
+    return QueryCirculatingSupplyRequest.decode(message.value);
+  },
+
+  toProto(message: QueryCirculatingSupplyRequest): Uint8Array {
+    return QueryCirculatingSupplyRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryCirculatingSupplyRequest): QueryCirculatingSupplyRequestProtoMsg {
+    return {
+      typeUrl: "/evmos.inflation.v1.QueryCirculatingSupplyRequest",
+      value: QueryCirculatingSupplyRequest.encode(message).finish()
+    };
   }
 
 };
@@ -822,6 +969,8 @@ function createBaseQueryCirculatingSupplyResponse(): QueryCirculatingSupplyRespo
 }
 
 export const QueryCirculatingSupplyResponse = {
+  typeUrl: "/evmos.inflation.v1.QueryCirculatingSupplyResponse",
+
   encode(message: QueryCirculatingSupplyResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.circulatingSupply !== undefined) {
       DecCoin.encode(message.circulatingSupply, writer.uint32(10).fork()).ldelim();
@@ -892,6 +1041,25 @@ export const QueryCirculatingSupplyResponse = {
     const obj: any = {};
     obj.circulating_supply = message.circulatingSupply ? DecCoin.toAmino(message.circulatingSupply) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryCirculatingSupplyResponseAminoMsg): QueryCirculatingSupplyResponse {
+    return QueryCirculatingSupplyResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryCirculatingSupplyResponseProtoMsg): QueryCirculatingSupplyResponse {
+    return QueryCirculatingSupplyResponse.decode(message.value);
+  },
+
+  toProto(message: QueryCirculatingSupplyResponse): Uint8Array {
+    return QueryCirculatingSupplyResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryCirculatingSupplyResponse): QueryCirculatingSupplyResponseProtoMsg {
+    return {
+      typeUrl: "/evmos.inflation.v1.QueryCirculatingSupplyResponse",
+      value: QueryCirculatingSupplyResponse.encode(message).finish()
+    };
   }
 
 };
@@ -901,6 +1069,8 @@ function createBaseQueryInflationRateRequest(): QueryInflationRateRequest {
 }
 
 export const QueryInflationRateRequest = {
+  typeUrl: "/evmos.inflation.v1.QueryInflationRateRequest",
+
   encode(_: QueryInflationRateRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -953,6 +1123,25 @@ export const QueryInflationRateRequest = {
   toAmino(_: QueryInflationRateRequest): QueryInflationRateRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryInflationRateRequestAminoMsg): QueryInflationRateRequest {
+    return QueryInflationRateRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryInflationRateRequestProtoMsg): QueryInflationRateRequest {
+    return QueryInflationRateRequest.decode(message.value);
+  },
+
+  toProto(message: QueryInflationRateRequest): Uint8Array {
+    return QueryInflationRateRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryInflationRateRequest): QueryInflationRateRequestProtoMsg {
+    return {
+      typeUrl: "/evmos.inflation.v1.QueryInflationRateRequest",
+      value: QueryInflationRateRequest.encode(message).finish()
+    };
   }
 
 };
@@ -964,6 +1153,8 @@ function createBaseQueryInflationRateResponse(): QueryInflationRateResponse {
 }
 
 export const QueryInflationRateResponse = {
+  typeUrl: "/evmos.inflation.v1.QueryInflationRateResponse",
+
   encode(message: QueryInflationRateResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.inflationRate !== "") {
       writer.uint32(10).string(message.inflationRate);
@@ -1034,6 +1225,25 @@ export const QueryInflationRateResponse = {
     const obj: any = {};
     obj.inflation_rate = message.inflationRate;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryInflationRateResponseAminoMsg): QueryInflationRateResponse {
+    return QueryInflationRateResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryInflationRateResponseProtoMsg): QueryInflationRateResponse {
+    return QueryInflationRateResponse.decode(message.value);
+  },
+
+  toProto(message: QueryInflationRateResponse): Uint8Array {
+    return QueryInflationRateResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryInflationRateResponse): QueryInflationRateResponseProtoMsg {
+    return {
+      typeUrl: "/evmos.inflation.v1.QueryInflationRateResponse",
+      value: QueryInflationRateResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1043,6 +1253,8 @@ function createBaseQueryParamsRequest(): QueryParamsRequest {
 }
 
 export const QueryParamsRequest = {
+  typeUrl: "/evmos.inflation.v1.QueryParamsRequest",
+
   encode(_: QueryParamsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -1095,6 +1307,25 @@ export const QueryParamsRequest = {
   toAmino(_: QueryParamsRequest): QueryParamsRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest {
+    return QueryParamsRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryParamsRequestProtoMsg): QueryParamsRequest {
+    return QueryParamsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryParamsRequest): Uint8Array {
+    return QueryParamsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryParamsRequest): QueryParamsRequestProtoMsg {
+    return {
+      typeUrl: "/evmos.inflation.v1.QueryParamsRequest",
+      value: QueryParamsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1106,6 +1337,8 @@ function createBaseQueryParamsResponse(): QueryParamsResponse {
 }
 
 export const QueryParamsResponse = {
+  typeUrl: "/evmos.inflation.v1.QueryParamsResponse",
+
   encode(message: QueryParamsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.params !== undefined) {
       Params.encode(message.params, writer.uint32(10).fork()).ldelim();
@@ -1176,6 +1409,25 @@ export const QueryParamsResponse = {
     const obj: any = {};
     obj.params = message.params ? Params.toAmino(message.params) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryParamsResponseAminoMsg): QueryParamsResponse {
+    return QueryParamsResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryParamsResponseProtoMsg): QueryParamsResponse {
+    return QueryParamsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryParamsResponse): Uint8Array {
+    return QueryParamsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryParamsResponse): QueryParamsResponseProtoMsg {
+    return {
+      typeUrl: "/evmos.inflation.v1.QueryParamsResponse",
+      value: QueryParamsResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/evmos/recovery/v1/genesis.ts b/__fixtures__/outputv2/evmos/recovery/v1/genesis.ts
index 1dd9d0b38..6e9549e9c 100644
--- a/__fixtures__/outputv2/evmos/recovery/v1/genesis.ts
+++ b/__fixtures__/outputv2/evmos/recovery/v1/genesis.ts
@@ -8,7 +8,7 @@ export interface GenesisState {
   /** params defines all the paramaters of the module. */
   params?: Params;
 }
-export interface GenesisStateProtoType {
+export interface GenesisStateProtoMsg {
   typeUrl: "/evmos.recovery.v1.GenesisState";
   value: Uint8Array;
 }
@@ -18,7 +18,7 @@ export interface GenesisStateAmino {
   /** params defines all the paramaters of the module. */
   params?: ParamsAmino;
 }
-export interface GenesisStateAminoType {
+export interface GenesisStateAminoMsg {
   type: "/evmos.recovery.v1.GenesisState";
   value: GenesisStateAmino;
 }
@@ -36,7 +36,7 @@ export interface Params {
   /** duration added to timeout timestamp for balances recovered via IBC packets */
   packetTimeoutDuration?: Duration;
 }
-export interface ParamsProtoType {
+export interface ParamsProtoMsg {
   typeUrl: "/evmos.recovery.v1.Params";
   value: Uint8Array;
 }
@@ -49,7 +49,7 @@ export interface ParamsAmino {
   /** duration added to timeout timestamp for balances recovered via IBC packets */
   packet_timeout_duration?: DurationAmino;
 }
-export interface ParamsAminoType {
+export interface ParamsAminoMsg {
   type: "/evmos.recovery.v1.Params";
   value: ParamsAmino;
 }
@@ -67,6 +67,8 @@ function createBaseGenesisState(): GenesisState {
 }
 
 export const GenesisState = {
+  typeUrl: "/evmos.recovery.v1.GenesisState",
+
   encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.params !== undefined) {
       Params.encode(message.params, writer.uint32(10).fork()).ldelim();
@@ -137,6 +139,25 @@ export const GenesisState = {
     const obj: any = {};
     obj.params = message.params ? Params.toAmino(message.params) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisStateAminoMsg): GenesisState {
+    return GenesisState.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: GenesisStateProtoMsg): GenesisState {
+    return GenesisState.decode(message.value);
+  },
+
+  toProto(message: GenesisState): Uint8Array {
+    return GenesisState.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisState): GenesisStateProtoMsg {
+    return {
+      typeUrl: "/evmos.recovery.v1.GenesisState",
+      value: GenesisState.encode(message).finish()
+    };
   }
 
 };
@@ -149,6 +170,8 @@ function createBaseParams(): Params {
 }
 
 export const Params = {
+  typeUrl: "/evmos.recovery.v1.Params",
+
   encode(message: Params, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.enableRecovery === true) {
       writer.uint32(8).bool(message.enableRecovery);
@@ -234,6 +257,25 @@ export const Params = {
     obj.enable_recovery = message.enableRecovery;
     obj.packet_timeout_duration = message.packetTimeoutDuration ? Duration.toAmino(message.packetTimeoutDuration) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ParamsAminoMsg): Params {
+    return Params.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ParamsProtoMsg): Params {
+    return Params.decode(message.value);
+  },
+
+  toProto(message: Params): Uint8Array {
+    return Params.encode(message).finish();
+  },
+
+  toProtoMsg(message: Params): ParamsProtoMsg {
+    return {
+      typeUrl: "/evmos.recovery.v1.Params",
+      value: Params.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/evmos/recovery/v1/query.ts b/__fixtures__/outputv2/evmos/recovery/v1/query.ts
index 69c384ce5..49ad55bcd 100644
--- a/__fixtures__/outputv2/evmos/recovery/v1/query.ts
+++ b/__fixtures__/outputv2/evmos/recovery/v1/query.ts
@@ -5,14 +5,14 @@ export const protobufPackage = "evmos.recovery.v1";
 
 /** QueryParamsRequest is the request type for the Query/Params RPC method. */
 export interface QueryParamsRequest {}
-export interface QueryParamsRequestProtoType {
+export interface QueryParamsRequestProtoMsg {
   typeUrl: "/evmos.recovery.v1.QueryParamsRequest";
   value: Uint8Array;
 }
 
 /** QueryParamsRequest is the request type for the Query/Params RPC method. */
 export interface QueryParamsRequestAmino {}
-export interface QueryParamsRequestAminoType {
+export interface QueryParamsRequestAminoMsg {
   type: "/evmos.recovery.v1.QueryParamsRequest";
   value: QueryParamsRequestAmino;
 }
@@ -25,7 +25,7 @@ export interface QueryParamsResponse {
   /** params defines the parameters of the module. */
   params?: Params;
 }
-export interface QueryParamsResponseProtoType {
+export interface QueryParamsResponseProtoMsg {
   typeUrl: "/evmos.recovery.v1.QueryParamsResponse";
   value: Uint8Array;
 }
@@ -35,7 +35,7 @@ export interface QueryParamsResponseAmino {
   /** params defines the parameters of the module. */
   params?: ParamsAmino;
 }
-export interface QueryParamsResponseAminoType {
+export interface QueryParamsResponseAminoMsg {
   type: "/evmos.recovery.v1.QueryParamsResponse";
   value: QueryParamsResponseAmino;
 }
@@ -50,6 +50,8 @@ function createBaseQueryParamsRequest(): QueryParamsRequest {
 }
 
 export const QueryParamsRequest = {
+  typeUrl: "/evmos.recovery.v1.QueryParamsRequest",
+
   encode(_: QueryParamsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -102,6 +104,25 @@ export const QueryParamsRequest = {
   toAmino(_: QueryParamsRequest): QueryParamsRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest {
+    return QueryParamsRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryParamsRequestProtoMsg): QueryParamsRequest {
+    return QueryParamsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryParamsRequest): Uint8Array {
+    return QueryParamsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryParamsRequest): QueryParamsRequestProtoMsg {
+    return {
+      typeUrl: "/evmos.recovery.v1.QueryParamsRequest",
+      value: QueryParamsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -113,6 +134,8 @@ function createBaseQueryParamsResponse(): QueryParamsResponse {
 }
 
 export const QueryParamsResponse = {
+  typeUrl: "/evmos.recovery.v1.QueryParamsResponse",
+
   encode(message: QueryParamsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.params !== undefined) {
       Params.encode(message.params, writer.uint32(10).fork()).ldelim();
@@ -183,6 +206,25 @@ export const QueryParamsResponse = {
     const obj: any = {};
     obj.params = message.params ? Params.toAmino(message.params) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryParamsResponseAminoMsg): QueryParamsResponse {
+    return QueryParamsResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryParamsResponseProtoMsg): QueryParamsResponse {
+    return QueryParamsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryParamsResponse): Uint8Array {
+    return QueryParamsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryParamsResponse): QueryParamsResponseProtoMsg {
+    return {
+      typeUrl: "/evmos.recovery.v1.QueryParamsResponse",
+      value: QueryParamsResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/evmos/vesting/v1/query.ts b/__fixtures__/outputv2/evmos/vesting/v1/query.ts
index 3271a0bcf..d58c9eeef 100644
--- a/__fixtures__/outputv2/evmos/vesting/v1/query.ts
+++ b/__fixtures__/outputv2/evmos/vesting/v1/query.ts
@@ -8,7 +8,7 @@ export interface QueryBalancesRequest {
   /** address of the clawback vesting account */
   address: string;
 }
-export interface QueryBalancesRequestProtoType {
+export interface QueryBalancesRequestProtoMsg {
   typeUrl: "/evmos.vesting.v1.QueryBalancesRequest";
   value: Uint8Array;
 }
@@ -18,7 +18,7 @@ export interface QueryBalancesRequestAmino {
   /** address of the clawback vesting account */
   address: string;
 }
-export interface QueryBalancesRequestAminoType {
+export interface QueryBalancesRequestAminoMsg {
   type: "/evmos.vesting.v1.QueryBalancesRequest";
   value: QueryBalancesRequestAmino;
 }
@@ -42,7 +42,7 @@ export interface QueryBalancesResponse {
   /** current amount of vested tokens */
   vested: Coin[];
 }
-export interface QueryBalancesResponseProtoType {
+export interface QueryBalancesResponseProtoMsg {
   typeUrl: "/evmos.vesting.v1.QueryBalancesResponse";
   value: Uint8Array;
 }
@@ -61,7 +61,7 @@ export interface QueryBalancesResponseAmino {
   /** current amount of vested tokens */
   vested: CoinAmino[];
 }
-export interface QueryBalancesResponseAminoType {
+export interface QueryBalancesResponseAminoMsg {
   type: "/evmos.vesting.v1.QueryBalancesResponse";
   value: QueryBalancesResponseAmino;
 }
@@ -83,6 +83,8 @@ function createBaseQueryBalancesRequest(): QueryBalancesRequest {
 }
 
 export const QueryBalancesRequest = {
+  typeUrl: "/evmos.vesting.v1.QueryBalancesRequest",
+
   encode(message: QueryBalancesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.address !== "") {
       writer.uint32(10).string(message.address);
@@ -153,6 +155,25 @@ export const QueryBalancesRequest = {
     const obj: any = {};
     obj.address = message.address;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryBalancesRequestAminoMsg): QueryBalancesRequest {
+    return QueryBalancesRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryBalancesRequestProtoMsg): QueryBalancesRequest {
+    return QueryBalancesRequest.decode(message.value);
+  },
+
+  toProto(message: QueryBalancesRequest): Uint8Array {
+    return QueryBalancesRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryBalancesRequest): QueryBalancesRequestProtoMsg {
+    return {
+      typeUrl: "/evmos.vesting.v1.QueryBalancesRequest",
+      value: QueryBalancesRequest.encode(message).finish()
+    };
   }
 
 };
@@ -166,6 +187,8 @@ function createBaseQueryBalancesResponse(): QueryBalancesResponse {
 }
 
 export const QueryBalancesResponse = {
+  typeUrl: "/evmos.vesting.v1.QueryBalancesResponse",
+
   encode(message: QueryBalancesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.locked) {
       Coin.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -314,6 +337,25 @@ export const QueryBalancesResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: QueryBalancesResponseAminoMsg): QueryBalancesResponse {
+    return QueryBalancesResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QueryBalancesResponseProtoMsg): QueryBalancesResponse {
+    return QueryBalancesResponse.decode(message.value);
+  },
+
+  toProto(message: QueryBalancesResponse): Uint8Array {
+    return QueryBalancesResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryBalancesResponse): QueryBalancesResponseProtoMsg {
+    return {
+      typeUrl: "/evmos.vesting.v1.QueryBalancesResponse",
+      value: QueryBalancesResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/evmos/vesting/v1/tx.ts b/__fixtures__/outputv2/evmos/vesting/v1/tx.ts
index 7235f903a..0fe34aa87 100644
--- a/__fixtures__/outputv2/evmos/vesting/v1/tx.ts
+++ b/__fixtures__/outputv2/evmos/vesting/v1/tx.ts
@@ -33,7 +33,7 @@ export interface MsgCreateClawbackVestingAccount {
    */
   merge: boolean;
 }
-export interface MsgCreateClawbackVestingAccountProtoType {
+export interface MsgCreateClawbackVestingAccountProtoMsg {
   typeUrl: "/evmos.vesting.v1.MsgCreateClawbackVestingAccount";
   value: Uint8Array;
 }
@@ -67,7 +67,7 @@ export interface MsgCreateClawbackVestingAccountAmino {
    */
   merge: boolean;
 }
-export interface MsgCreateClawbackVestingAccountAminoType {
+export interface MsgCreateClawbackVestingAccountAminoMsg {
   type: "/evmos.vesting.v1.MsgCreateClawbackVestingAccount";
   value: MsgCreateClawbackVestingAccountAmino;
 }
@@ -87,7 +87,7 @@ export interface MsgCreateClawbackVestingAccountSDKType {
  * MsgCreateClawbackVestingAccount response type.
  */
 export interface MsgCreateClawbackVestingAccountResponse {}
-export interface MsgCreateClawbackVestingAccountResponseProtoType {
+export interface MsgCreateClawbackVestingAccountResponseProtoMsg {
   typeUrl: "/evmos.vesting.v1.MsgCreateClawbackVestingAccountResponse";
   value: Uint8Array;
 }
@@ -97,7 +97,7 @@ export interface MsgCreateClawbackVestingAccountResponseProtoType {
  * MsgCreateClawbackVestingAccount response type.
  */
 export interface MsgCreateClawbackVestingAccountResponseAmino {}
-export interface MsgCreateClawbackVestingAccountResponseAminoType {
+export interface MsgCreateClawbackVestingAccountResponseAminoMsg {
   type: "/evmos.vesting.v1.MsgCreateClawbackVestingAccountResponse";
   value: MsgCreateClawbackVestingAccountResponseAmino;
 }
@@ -126,7 +126,7 @@ export interface MsgClawback {
    */
   destAddress: string;
 }
-export interface MsgClawbackProtoType {
+export interface MsgClawbackProtoMsg {
   typeUrl: "/evmos.vesting.v1.MsgClawback";
   value: Uint8Array;
 }
@@ -149,7 +149,7 @@ export interface MsgClawbackAmino {
    */
   dest_address: string;
 }
-export interface MsgClawbackAminoType {
+export interface MsgClawbackAminoMsg {
   type: "/evmos.vesting.v1.MsgClawback";
   value: MsgClawbackAmino;
 }
@@ -166,14 +166,14 @@ export interface MsgClawbackSDKType {
 
 /** MsgClawbackResponse defines the MsgClawback response type. */
 export interface MsgClawbackResponse {}
-export interface MsgClawbackResponseProtoType {
+export interface MsgClawbackResponseProtoMsg {
   typeUrl: "/evmos.vesting.v1.MsgClawbackResponse";
   value: Uint8Array;
 }
 
 /** MsgClawbackResponse defines the MsgClawback response type. */
 export interface MsgClawbackResponseAmino {}
-export interface MsgClawbackResponseAminoType {
+export interface MsgClawbackResponseAminoMsg {
   type: "/evmos.vesting.v1.MsgClawbackResponse";
   value: MsgClawbackResponseAmino;
 }
@@ -193,6 +193,8 @@ function createBaseMsgCreateClawbackVestingAccount(): MsgCreateClawbackVestingAc
 }
 
 export const MsgCreateClawbackVestingAccount = {
+  typeUrl: "/evmos.vesting.v1.MsgCreateClawbackVestingAccount",
+
   encode(message: MsgCreateClawbackVestingAccount, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.fromAddress !== "") {
       writer.uint32(10).string(message.fromAddress);
@@ -371,6 +373,25 @@ export const MsgCreateClawbackVestingAccount = {
 
     obj.merge = message.merge;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCreateClawbackVestingAccountAminoMsg): MsgCreateClawbackVestingAccount {
+    return MsgCreateClawbackVestingAccount.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgCreateClawbackVestingAccountProtoMsg): MsgCreateClawbackVestingAccount {
+    return MsgCreateClawbackVestingAccount.decode(message.value);
+  },
+
+  toProto(message: MsgCreateClawbackVestingAccount): Uint8Array {
+    return MsgCreateClawbackVestingAccount.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCreateClawbackVestingAccount): MsgCreateClawbackVestingAccountProtoMsg {
+    return {
+      typeUrl: "/evmos.vesting.v1.MsgCreateClawbackVestingAccount",
+      value: MsgCreateClawbackVestingAccount.encode(message).finish()
+    };
   }
 
 };
@@ -380,6 +401,8 @@ function createBaseMsgCreateClawbackVestingAccountResponse(): MsgCreateClawbackV
 }
 
 export const MsgCreateClawbackVestingAccountResponse = {
+  typeUrl: "/evmos.vesting.v1.MsgCreateClawbackVestingAccountResponse",
+
   encode(_: MsgCreateClawbackVestingAccountResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -432,6 +455,25 @@ export const MsgCreateClawbackVestingAccountResponse = {
   toAmino(_: MsgCreateClawbackVestingAccountResponse): MsgCreateClawbackVestingAccountResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCreateClawbackVestingAccountResponseAminoMsg): MsgCreateClawbackVestingAccountResponse {
+    return MsgCreateClawbackVestingAccountResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgCreateClawbackVestingAccountResponseProtoMsg): MsgCreateClawbackVestingAccountResponse {
+    return MsgCreateClawbackVestingAccountResponse.decode(message.value);
+  },
+
+  toProto(message: MsgCreateClawbackVestingAccountResponse): Uint8Array {
+    return MsgCreateClawbackVestingAccountResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCreateClawbackVestingAccountResponse): MsgCreateClawbackVestingAccountResponseProtoMsg {
+    return {
+      typeUrl: "/evmos.vesting.v1.MsgCreateClawbackVestingAccountResponse",
+      value: MsgCreateClawbackVestingAccountResponse.encode(message).finish()
+    };
   }
 
 };
@@ -445,6 +487,8 @@ function createBaseMsgClawback(): MsgClawback {
 }
 
 export const MsgClawback = {
+  typeUrl: "/evmos.vesting.v1.MsgClawback",
+
   encode(message: MsgClawback, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.funderAddress !== "") {
       writer.uint32(10).string(message.funderAddress);
@@ -545,6 +589,25 @@ export const MsgClawback = {
     obj.account_address = message.accountAddress;
     obj.dest_address = message.destAddress;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgClawbackAminoMsg): MsgClawback {
+    return MsgClawback.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgClawbackProtoMsg): MsgClawback {
+    return MsgClawback.decode(message.value);
+  },
+
+  toProto(message: MsgClawback): Uint8Array {
+    return MsgClawback.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgClawback): MsgClawbackProtoMsg {
+    return {
+      typeUrl: "/evmos.vesting.v1.MsgClawback",
+      value: MsgClawback.encode(message).finish()
+    };
   }
 
 };
@@ -554,6 +617,8 @@ function createBaseMsgClawbackResponse(): MsgClawbackResponse {
 }
 
 export const MsgClawbackResponse = {
+  typeUrl: "/evmos.vesting.v1.MsgClawbackResponse",
+
   encode(_: MsgClawbackResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -606,6 +671,25 @@ export const MsgClawbackResponse = {
   toAmino(_: MsgClawbackResponse): MsgClawbackResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgClawbackResponseAminoMsg): MsgClawbackResponse {
+    return MsgClawbackResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MsgClawbackResponseProtoMsg): MsgClawbackResponse {
+    return MsgClawbackResponse.decode(message.value);
+  },
+
+  toProto(message: MsgClawbackResponse): Uint8Array {
+    return MsgClawbackResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgClawbackResponse): MsgClawbackResponseProtoMsg {
+    return {
+      typeUrl: "/evmos.vesting.v1.MsgClawbackResponse",
+      value: MsgClawbackResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/evmos/vesting/v1/vesting.ts b/__fixtures__/outputv2/evmos/vesting/v1/vesting.ts
index 56afb88ce..6ab578e36 100644
--- a/__fixtures__/outputv2/evmos/vesting/v1/vesting.ts
+++ b/__fixtures__/outputv2/evmos/vesting/v1/vesting.ts
@@ -29,7 +29,7 @@ export interface ClawbackVestingAccount {
   /** vesting_periods defines the vesting schedule relative to the start_time */
   vestingPeriods: Period[];
 }
-export interface ClawbackVestingAccountProtoType {
+export interface ClawbackVestingAccountProtoMsg {
   typeUrl: "/evmos.vesting.v1.ClawbackVestingAccount";
   value: Uint8Array;
 }
@@ -59,7 +59,7 @@ export interface ClawbackVestingAccountAmino {
   /** vesting_periods defines the vesting schedule relative to the start_time */
   vesting_periods: PeriodAmino[];
 }
-export interface ClawbackVestingAccountAminoType {
+export interface ClawbackVestingAccountAminoMsg {
   type: "/evmos.vesting.v1.ClawbackVestingAccount";
   value: ClawbackVestingAccountAmino;
 }
@@ -89,6 +89,8 @@ function createBaseClawbackVestingAccount(): ClawbackVestingAccount {
 }
 
 export const ClawbackVestingAccount = {
+  typeUrl: "/evmos.vesting.v1.ClawbackVestingAccount",
+
   encode(message: ClawbackVestingAccount, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.baseVestingAccount !== undefined) {
       BaseVestingAccount.encode(message.baseVestingAccount, writer.uint32(10).fork()).ldelim();
@@ -252,6 +254,25 @@ export const ClawbackVestingAccount = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ClawbackVestingAccountAminoMsg): ClawbackVestingAccount {
+    return ClawbackVestingAccount.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ClawbackVestingAccountProtoMsg): ClawbackVestingAccount {
+    return ClawbackVestingAccount.decode(message.value);
+  },
+
+  toProto(message: ClawbackVestingAccount): Uint8Array {
+    return ClawbackVestingAccount.encode(message).finish();
+  },
+
+  toProtoMsg(message: ClawbackVestingAccount): ClawbackVestingAccountProtoMsg {
+    return {
+      typeUrl: "/evmos.vesting.v1.ClawbackVestingAccount",
+      value: ClawbackVestingAccount.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/api/auth.ts b/__fixtures__/outputv2/google/api/auth.ts
index b5c737f5a..54fbd5461 100644
--- a/__fixtures__/outputv2/google/api/auth.ts
+++ b/__fixtures__/outputv2/google/api/auth.ts
@@ -33,7 +33,7 @@ export interface Authentication {
   /** Defines a set of authentication providers that a service supports. */
   providers: AuthProvider[];
 }
-export interface AuthenticationProtoType {
+export interface AuthenticationProtoMsg {
   typeUrl: "/google.api.Authentication";
   value: Uint8Array;
 }
@@ -69,7 +69,7 @@ export interface AuthenticationAmino {
   /** Defines a set of authentication providers that a service supports. */
   providers: AuthProviderAmino[];
 }
-export interface AuthenticationAminoType {
+export interface AuthenticationAminoMsg {
   type: "/google.api.Authentication";
   value: AuthenticationAmino;
 }
@@ -130,7 +130,7 @@ export interface AuthenticationRule {
   /** Requirements for additional authentication providers. */
   requirements: AuthRequirement[];
 }
-export interface AuthenticationRuleProtoType {
+export interface AuthenticationRuleProtoMsg {
   typeUrl: "/google.api.AuthenticationRule";
   value: Uint8Array;
 }
@@ -166,7 +166,7 @@ export interface AuthenticationRuleAmino {
   /** Requirements for additional authentication providers. */
   requirements: AuthRequirementAmino[];
 }
-export interface AuthenticationRuleAminoType {
+export interface AuthenticationRuleAminoMsg {
   type: "/google.api.AuthenticationRule";
   value: AuthenticationRuleAmino;
 }
@@ -209,7 +209,7 @@ export interface JwtLocation {
    */
   valuePrefix: string;
 }
-export interface JwtLocationProtoType {
+export interface JwtLocationProtoMsg {
   typeUrl: "/google.api.JwtLocation";
   value: Uint8Array;
 }
@@ -234,7 +234,7 @@ export interface JwtLocationAmino {
    */
   value_prefix: string;
 }
-export interface JwtLocationAminoType {
+export interface JwtLocationAminoMsg {
   type: "/google.api.JwtLocation";
   value: JwtLocationAmino;
 }
@@ -334,7 +334,7 @@ export interface AuthProvider {
    */
   jwtLocations: JwtLocation[];
 }
-export interface AuthProviderProtoType {
+export interface AuthProviderProtoMsg {
   typeUrl: "/google.api.AuthProvider";
   value: Uint8Array;
 }
@@ -427,7 +427,7 @@ export interface AuthProviderAmino {
    */
   jwt_locations: JwtLocationAmino[];
 }
-export interface AuthProviderAminoType {
+export interface AuthProviderAminoMsg {
   type: "/google.api.AuthProvider";
   value: AuthProviderAmino;
 }
@@ -478,7 +478,7 @@ export interface OAuthRequirements {
    */
   canonicalScopes: string;
 }
-export interface OAuthRequirementsProtoType {
+export interface OAuthRequirementsProtoMsg {
   typeUrl: "/google.api.OAuthRequirements";
   value: Uint8Array;
 }
@@ -515,7 +515,7 @@ export interface OAuthRequirementsAmino {
    */
   canonical_scopes: string;
 }
-export interface OAuthRequirementsAminoType {
+export interface OAuthRequirementsAminoMsg {
   type: "/google.api.OAuthRequirements";
   value: OAuthRequirementsAmino;
 }
@@ -579,7 +579,7 @@ export interface AuthRequirement {
    */
   audiences: string;
 }
-export interface AuthRequirementProtoType {
+export interface AuthRequirementProtoMsg {
   typeUrl: "/google.api.AuthRequirement";
   value: Uint8Array;
 }
@@ -619,7 +619,7 @@ export interface AuthRequirementAmino {
    */
   audiences: string;
 }
-export interface AuthRequirementAminoType {
+export interface AuthRequirementAminoMsg {
   type: "/google.api.AuthRequirement";
   value: AuthRequirementAmino;
 }
@@ -642,6 +642,8 @@ function createBaseAuthentication(): Authentication {
 }
 
 export const Authentication = {
+  typeUrl: "/google.api.Authentication",
+
   encode(message: Authentication, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.rules) {
       AuthenticationRule.encode(v!, writer.uint32(26).fork()).ldelim();
@@ -760,6 +762,25 @@ export const Authentication = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: AuthenticationAminoMsg): Authentication {
+    return Authentication.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: AuthenticationProtoMsg): Authentication {
+    return Authentication.decode(message.value);
+  },
+
+  toProto(message: Authentication): Uint8Array {
+    return Authentication.encode(message).finish();
+  },
+
+  toProtoMsg(message: Authentication): AuthenticationProtoMsg {
+    return {
+      typeUrl: "/google.api.Authentication",
+      value: Authentication.encode(message).finish()
+    };
   }
 
 };
@@ -774,6 +795,8 @@ function createBaseAuthenticationRule(): AuthenticationRule {
 }
 
 export const AuthenticationRule = {
+  typeUrl: "/google.api.AuthenticationRule",
+
   encode(message: AuthenticationRule, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.selector !== "") {
       writer.uint32(10).string(message.selector);
@@ -907,6 +930,25 @@ export const AuthenticationRule = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: AuthenticationRuleAminoMsg): AuthenticationRule {
+    return AuthenticationRule.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: AuthenticationRuleProtoMsg): AuthenticationRule {
+    return AuthenticationRule.decode(message.value);
+  },
+
+  toProto(message: AuthenticationRule): Uint8Array {
+    return AuthenticationRule.encode(message).finish();
+  },
+
+  toProtoMsg(message: AuthenticationRule): AuthenticationRuleProtoMsg {
+    return {
+      typeUrl: "/google.api.AuthenticationRule",
+      value: AuthenticationRule.encode(message).finish()
+    };
   }
 
 };
@@ -920,6 +962,8 @@ function createBaseJwtLocation(): JwtLocation {
 }
 
 export const JwtLocation = {
+  typeUrl: "/google.api.JwtLocation",
+
   encode(message: JwtLocation, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.header !== undefined) {
       writer.uint32(10).string(message.header);
@@ -1020,6 +1064,25 @@ export const JwtLocation = {
     obj.query = message.query;
     obj.value_prefix = message.valuePrefix;
     return obj;
+  },
+
+  fromAminoMsg(object: JwtLocationAminoMsg): JwtLocation {
+    return JwtLocation.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: JwtLocationProtoMsg): JwtLocation {
+    return JwtLocation.decode(message.value);
+  },
+
+  toProto(message: JwtLocation): Uint8Array {
+    return JwtLocation.encode(message).finish();
+  },
+
+  toProtoMsg(message: JwtLocation): JwtLocationProtoMsg {
+    return {
+      typeUrl: "/google.api.JwtLocation",
+      value: JwtLocation.encode(message).finish()
+    };
   }
 
 };
@@ -1036,6 +1099,8 @@ function createBaseAuthProvider(): AuthProvider {
 }
 
 export const AuthProvider = {
+  typeUrl: "/google.api.AuthProvider",
+
   encode(message: AuthProvider, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.id !== "") {
       writer.uint32(10).string(message.id);
@@ -1199,6 +1264,25 @@ export const AuthProvider = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: AuthProviderAminoMsg): AuthProvider {
+    return AuthProvider.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: AuthProviderProtoMsg): AuthProvider {
+    return AuthProvider.decode(message.value);
+  },
+
+  toProto(message: AuthProvider): Uint8Array {
+    return AuthProvider.encode(message).finish();
+  },
+
+  toProtoMsg(message: AuthProvider): AuthProviderProtoMsg {
+    return {
+      typeUrl: "/google.api.AuthProvider",
+      value: AuthProvider.encode(message).finish()
+    };
   }
 
 };
@@ -1210,6 +1294,8 @@ function createBaseOAuthRequirements(): OAuthRequirements {
 }
 
 export const OAuthRequirements = {
+  typeUrl: "/google.api.OAuthRequirements",
+
   encode(message: OAuthRequirements, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.canonicalScopes !== "") {
       writer.uint32(10).string(message.canonicalScopes);
@@ -1280,6 +1366,25 @@ export const OAuthRequirements = {
     const obj: any = {};
     obj.canonical_scopes = message.canonicalScopes;
     return obj;
+  },
+
+  fromAminoMsg(object: OAuthRequirementsAminoMsg): OAuthRequirements {
+    return OAuthRequirements.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: OAuthRequirementsProtoMsg): OAuthRequirements {
+    return OAuthRequirements.decode(message.value);
+  },
+
+  toProto(message: OAuthRequirements): Uint8Array {
+    return OAuthRequirements.encode(message).finish();
+  },
+
+  toProtoMsg(message: OAuthRequirements): OAuthRequirementsProtoMsg {
+    return {
+      typeUrl: "/google.api.OAuthRequirements",
+      value: OAuthRequirements.encode(message).finish()
+    };
   }
 
 };
@@ -1292,6 +1397,8 @@ function createBaseAuthRequirement(): AuthRequirement {
 }
 
 export const AuthRequirement = {
+  typeUrl: "/google.api.AuthRequirement",
+
   encode(message: AuthRequirement, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.providerId !== "") {
       writer.uint32(10).string(message.providerId);
@@ -1377,6 +1484,25 @@ export const AuthRequirement = {
     obj.provider_id = message.providerId;
     obj.audiences = message.audiences;
     return obj;
+  },
+
+  fromAminoMsg(object: AuthRequirementAminoMsg): AuthRequirement {
+    return AuthRequirement.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: AuthRequirementProtoMsg): AuthRequirement {
+    return AuthRequirement.decode(message.value);
+  },
+
+  toProto(message: AuthRequirement): Uint8Array {
+    return AuthRequirement.encode(message).finish();
+  },
+
+  toProtoMsg(message: AuthRequirement): AuthRequirementProtoMsg {
+    return {
+      typeUrl: "/google.api.AuthRequirement",
+      value: AuthRequirement.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/api/backend.ts b/__fixtures__/outputv2/google/api/backend.ts
index 744e95b50..6813b3aea 100644
--- a/__fixtures__/outputv2/google/api/backend.ts
+++ b/__fixtures__/outputv2/google/api/backend.ts
@@ -113,7 +113,7 @@ export interface Backend {
    */
   rules: BackendRule[];
 }
-export interface BackendProtoType {
+export interface BackendProtoMsg {
   typeUrl: "/google.api.Backend";
   value: Uint8Array;
 }
@@ -127,7 +127,7 @@ export interface BackendAmino {
    */
   rules: BackendRuleAmino[];
 }
-export interface BackendAminoType {
+export interface BackendAminoMsg {
   type: "/google.api.Backend";
   value: BackendAmino;
 }
@@ -229,7 +229,7 @@ export interface BackendRule {
    */
   protocol: string;
 }
-export interface BackendRuleProtoType {
+export interface BackendRuleProtoMsg {
   typeUrl: "/google.api.BackendRule";
   value: Uint8Array;
 }
@@ -326,7 +326,7 @@ export interface BackendRuleAmino {
    */
   protocol: string;
 }
-export interface BackendRuleAminoType {
+export interface BackendRuleAminoMsg {
   type: "/google.api.BackendRule";
   value: BackendRuleAmino;
 }
@@ -351,6 +351,8 @@ function createBaseBackend(): Backend {
 }
 
 export const Backend = {
+  typeUrl: "/google.api.Backend",
+
   encode(message: Backend, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.rules) {
       BackendRule.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -439,6 +441,25 @@ export const Backend = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: BackendAminoMsg): Backend {
+    return Backend.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: BackendProtoMsg): Backend {
+    return Backend.decode(message.value);
+  },
+
+  toProto(message: Backend): Uint8Array {
+    return Backend.encode(message).finish();
+  },
+
+  toProtoMsg(message: Backend): BackendProtoMsg {
+    return {
+      typeUrl: "/google.api.Backend",
+      value: Backend.encode(message).finish()
+    };
   }
 
 };
@@ -458,6 +479,8 @@ function createBaseBackendRule(): BackendRule {
 }
 
 export const BackendRule = {
+  typeUrl: "/google.api.BackendRule",
+
   encode(message: BackendRule, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.selector !== "") {
       writer.uint32(10).string(message.selector);
@@ -648,6 +671,25 @@ export const BackendRule = {
     obj.disable_auth = message.disableAuth;
     obj.protocol = message.protocol;
     return obj;
+  },
+
+  fromAminoMsg(object: BackendRuleAminoMsg): BackendRule {
+    return BackendRule.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: BackendRuleProtoMsg): BackendRule {
+    return BackendRule.decode(message.value);
+  },
+
+  toProto(message: BackendRule): Uint8Array {
+    return BackendRule.encode(message).finish();
+  },
+
+  toProtoMsg(message: BackendRule): BackendRuleProtoMsg {
+    return {
+      typeUrl: "/google.api.BackendRule",
+      value: BackendRule.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/api/billing.ts b/__fixtures__/outputv2/google/api/billing.ts
index eb1e6e8d1..5a15a1f9d 100644
--- a/__fixtures__/outputv2/google/api/billing.ts
+++ b/__fixtures__/outputv2/google/api/billing.ts
@@ -45,7 +45,7 @@ export interface Billing {
    */
   consumerDestinations: Billing_BillingDestination[];
 }
-export interface BillingProtoType {
+export interface BillingProtoMsg {
   typeUrl: "/google.api.Billing";
   value: Uint8Array;
 }
@@ -93,7 +93,7 @@ export interface BillingAmino {
    */
   consumer_destinations: Billing_BillingDestinationAmino[];
 }
-export interface BillingAminoType {
+export interface BillingAminoMsg {
   type: "/google.api.Billing";
   value: BillingAmino;
 }
@@ -153,7 +153,7 @@ export interface Billing_BillingDestination {
    */
   metrics: string[];
 }
-export interface Billing_BillingDestinationProtoType {
+export interface Billing_BillingDestinationProtoMsg {
   typeUrl: "/google.api.BillingDestination";
   value: Uint8Array;
 }
@@ -175,7 +175,7 @@ export interface Billing_BillingDestinationAmino {
    */
   metrics: string[];
 }
-export interface Billing_BillingDestinationAminoType {
+export interface Billing_BillingDestinationAminoMsg {
   type: "/google.api.BillingDestination";
   value: Billing_BillingDestinationAmino;
 }
@@ -196,6 +196,8 @@ function createBaseBilling(): Billing {
 }
 
 export const Billing = {
+  typeUrl: "/google.api.Billing",
+
   encode(message: Billing, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.consumerDestinations) {
       Billing_BillingDestination.encode(v!, writer.uint32(66).fork()).ldelim();
@@ -284,6 +286,25 @@ export const Billing = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: BillingAminoMsg): Billing {
+    return Billing.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: BillingProtoMsg): Billing {
+    return Billing.decode(message.value);
+  },
+
+  toProto(message: Billing): Uint8Array {
+    return Billing.encode(message).finish();
+  },
+
+  toProtoMsg(message: Billing): BillingProtoMsg {
+    return {
+      typeUrl: "/google.api.Billing",
+      value: Billing.encode(message).finish()
+    };
   }
 
 };
@@ -296,6 +317,8 @@ function createBaseBilling_BillingDestination(): Billing_BillingDestination {
 }
 
 export const Billing_BillingDestination = {
+  typeUrl: "/google.api.BillingDestination",
+
   encode(message: Billing_BillingDestination, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.monitoredResource !== "") {
       writer.uint32(10).string(message.monitoredResource);
@@ -399,6 +422,25 @@ export const Billing_BillingDestination = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: Billing_BillingDestinationAminoMsg): Billing_BillingDestination {
+    return Billing_BillingDestination.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: Billing_BillingDestinationProtoMsg): Billing_BillingDestination {
+    return Billing_BillingDestination.decode(message.value);
+  },
+
+  toProto(message: Billing_BillingDestination): Uint8Array {
+    return Billing_BillingDestination.encode(message).finish();
+  },
+
+  toProtoMsg(message: Billing_BillingDestination): Billing_BillingDestinationProtoMsg {
+    return {
+      typeUrl: "/google.api.BillingDestination",
+      value: Billing_BillingDestination.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/api/config_change.ts b/__fixtures__/outputv2/google/api/config_change.ts
index 05deedb04..b7f3d3533 100644
--- a/__fixtures__/outputv2/google/api/config_change.ts
+++ b/__fixtures__/outputv2/google/api/config_change.ts
@@ -118,7 +118,7 @@ export interface ConfigChange {
    */
   advices: Advice[];
 }
-export interface ConfigChangeProtoType {
+export interface ConfigChangeProtoMsg {
   typeUrl: "/google.api.ConfigChange";
   value: Uint8Array;
 }
@@ -166,7 +166,7 @@ export interface ConfigChangeAmino {
    */
   advices: AdviceAmino[];
 }
-export interface ConfigChangeAminoType {
+export interface ConfigChangeAminoMsg {
   type: "/google.api.ConfigChange";
   value: ConfigChangeAmino;
 }
@@ -198,7 +198,7 @@ export interface Advice {
    */
   description: string;
 }
-export interface AdviceProtoType {
+export interface AdviceProtoMsg {
   typeUrl: "/google.api.Advice";
   value: Uint8Array;
 }
@@ -214,7 +214,7 @@ export interface AdviceAmino {
    */
   description: string;
 }
-export interface AdviceAminoType {
+export interface AdviceAminoMsg {
   type: "/google.api.Advice";
   value: AdviceAmino;
 }
@@ -238,6 +238,8 @@ function createBaseConfigChange(): ConfigChange {
 }
 
 export const ConfigChange = {
+  typeUrl: "/google.api.ConfigChange",
+
   encode(message: ConfigChange, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.element !== "") {
       writer.uint32(10).string(message.element);
@@ -386,6 +388,25 @@ export const ConfigChange = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ConfigChangeAminoMsg): ConfigChange {
+    return ConfigChange.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ConfigChangeProtoMsg): ConfigChange {
+    return ConfigChange.decode(message.value);
+  },
+
+  toProto(message: ConfigChange): Uint8Array {
+    return ConfigChange.encode(message).finish();
+  },
+
+  toProtoMsg(message: ConfigChange): ConfigChangeProtoMsg {
+    return {
+      typeUrl: "/google.api.ConfigChange",
+      value: ConfigChange.encode(message).finish()
+    };
   }
 
 };
@@ -397,6 +418,8 @@ function createBaseAdvice(): Advice {
 }
 
 export const Advice = {
+  typeUrl: "/google.api.Advice",
+
   encode(message: Advice, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.description !== "") {
       writer.uint32(18).string(message.description);
@@ -467,6 +490,25 @@ export const Advice = {
     const obj: any = {};
     obj.description = message.description;
     return obj;
+  },
+
+  fromAminoMsg(object: AdviceAminoMsg): Advice {
+    return Advice.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: AdviceProtoMsg): Advice {
+    return Advice.decode(message.value);
+  },
+
+  toProto(message: Advice): Uint8Array {
+    return Advice.encode(message).finish();
+  },
+
+  toProtoMsg(message: Advice): AdviceProtoMsg {
+    return {
+      typeUrl: "/google.api.Advice",
+      value: Advice.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/api/consumer.ts b/__fixtures__/outputv2/google/api/consumer.ts
index 0dd6dc599..fbdc0168d 100644
--- a/__fixtures__/outputv2/google/api/consumer.ts
+++ b/__fixtures__/outputv2/google/api/consumer.ts
@@ -95,7 +95,7 @@ export interface ProjectProperties {
   /** List of per consumer project-specific properties. */
   properties: Property[];
 }
-export interface ProjectPropertiesProtoType {
+export interface ProjectPropertiesProtoMsg {
   typeUrl: "/google.api.ProjectProperties";
   value: Uint8Array;
 }
@@ -122,7 +122,7 @@ export interface ProjectPropertiesAmino {
   /** List of per consumer project-specific properties. */
   properties: PropertyAmino[];
 }
-export interface ProjectPropertiesAminoType {
+export interface ProjectPropertiesAminoMsg {
   type: "/google.api.ProjectProperties";
   value: ProjectPropertiesAmino;
 }
@@ -171,7 +171,7 @@ export interface Property {
   /** The description of the property */
   description: string;
 }
-export interface PropertyProtoType {
+export interface PropertyProtoMsg {
   typeUrl: "/google.api.Property";
   value: Uint8Array;
 }
@@ -198,7 +198,7 @@ export interface PropertyAmino {
   /** The description of the property */
   description: string;
 }
-export interface PropertyAminoType {
+export interface PropertyAminoMsg {
   type: "/google.api.Property";
   value: PropertyAmino;
 }
@@ -228,6 +228,8 @@ function createBaseProjectProperties(): ProjectProperties {
 }
 
 export const ProjectProperties = {
+  typeUrl: "/google.api.ProjectProperties",
+
   encode(message: ProjectProperties, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.properties) {
       Property.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -316,6 +318,25 @@ export const ProjectProperties = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ProjectPropertiesAminoMsg): ProjectProperties {
+    return ProjectProperties.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ProjectPropertiesProtoMsg): ProjectProperties {
+    return ProjectProperties.decode(message.value);
+  },
+
+  toProto(message: ProjectProperties): Uint8Array {
+    return ProjectProperties.encode(message).finish();
+  },
+
+  toProtoMsg(message: ProjectProperties): ProjectPropertiesProtoMsg {
+    return {
+      typeUrl: "/google.api.ProjectProperties",
+      value: ProjectProperties.encode(message).finish()
+    };
   }
 
 };
@@ -329,6 +350,8 @@ function createBaseProperty(): Property {
 }
 
 export const Property = {
+  typeUrl: "/google.api.Property",
+
   encode(message: Property, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -429,6 +452,25 @@ export const Property = {
     obj.type = message.type;
     obj.description = message.description;
     return obj;
+  },
+
+  fromAminoMsg(object: PropertyAminoMsg): Property {
+    return Property.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: PropertyProtoMsg): Property {
+    return Property.decode(message.value);
+  },
+
+  toProto(message: Property): Uint8Array {
+    return Property.encode(message).finish();
+  },
+
+  toProtoMsg(message: Property): PropertyProtoMsg {
+    return {
+      typeUrl: "/google.api.Property",
+      value: Property.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/api/context.ts b/__fixtures__/outputv2/google/api/context.ts
index 08e39ea17..dbbea8904 100644
--- a/__fixtures__/outputv2/google/api/context.ts
+++ b/__fixtures__/outputv2/google/api/context.ts
@@ -48,7 +48,7 @@ export interface Context {
    */
   rules: ContextRule[];
 }
-export interface ContextProtoType {
+export interface ContextProtoMsg {
   typeUrl: "/google.api.Context";
   value: Uint8Array;
 }
@@ -99,7 +99,7 @@ export interface ContextAmino {
    */
   rules: ContextRuleAmino[];
 }
-export interface ContextAminoType {
+export interface ContextAminoMsg {
   type: "/google.api.Context";
   value: ContextAmino;
 }
@@ -176,7 +176,7 @@ export interface ContextRule {
    */
   allowedResponseExtensions: string[];
 }
-export interface ContextRuleProtoType {
+export interface ContextRuleProtoMsg {
   typeUrl: "/google.api.ContextRule";
   value: Uint8Array;
 }
@@ -211,7 +211,7 @@ export interface ContextRuleAmino {
    */
   allowed_response_extensions: string[];
 }
-export interface ContextRuleAminoType {
+export interface ContextRuleAminoMsg {
   type: "/google.api.ContextRule";
   value: ContextRuleAmino;
 }
@@ -235,6 +235,8 @@ function createBaseContext(): Context {
 }
 
 export const Context = {
+  typeUrl: "/google.api.Context",
+
   encode(message: Context, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.rules) {
       ContextRule.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -323,6 +325,25 @@ export const Context = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ContextAminoMsg): Context {
+    return Context.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ContextProtoMsg): Context {
+    return Context.decode(message.value);
+  },
+
+  toProto(message: Context): Uint8Array {
+    return Context.encode(message).finish();
+  },
+
+  toProtoMsg(message: Context): ContextProtoMsg {
+    return {
+      typeUrl: "/google.api.Context",
+      value: Context.encode(message).finish()
+    };
   }
 
 };
@@ -338,6 +359,8 @@ function createBaseContextRule(): ContextRule {
 }
 
 export const ContextRule = {
+  typeUrl: "/google.api.ContextRule",
+
   encode(message: ContextRule, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.selector !== "") {
       writer.uint32(10).string(message.selector);
@@ -531,6 +554,25 @@ export const ContextRule = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ContextRuleAminoMsg): ContextRule {
+    return ContextRule.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ContextRuleProtoMsg): ContextRule {
+    return ContextRule.decode(message.value);
+  },
+
+  toProto(message: ContextRule): Uint8Array {
+    return ContextRule.encode(message).finish();
+  },
+
+  toProtoMsg(message: ContextRule): ContextRuleProtoMsg {
+    return {
+      typeUrl: "/google.api.ContextRule",
+      value: ContextRule.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/api/control.ts b/__fixtures__/outputv2/google/api/control.ts
index 186c3f447..938e5801f 100644
--- a/__fixtures__/outputv2/google/api/control.ts
+++ b/__fixtures__/outputv2/google/api/control.ts
@@ -14,7 +14,7 @@ export interface Control {
    */
   environment: string;
 }
-export interface ControlProtoType {
+export interface ControlProtoMsg {
   typeUrl: "/google.api.Control";
   value: Uint8Array;
 }
@@ -31,7 +31,7 @@ export interface ControlAmino {
    */
   environment: string;
 }
-export interface ControlAminoType {
+export interface ControlAminoMsg {
   type: "/google.api.Control";
   value: ControlAmino;
 }
@@ -52,6 +52,8 @@ function createBaseControl(): Control {
 }
 
 export const Control = {
+  typeUrl: "/google.api.Control",
+
   encode(message: Control, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.environment !== "") {
       writer.uint32(10).string(message.environment);
@@ -122,6 +124,25 @@ export const Control = {
     const obj: any = {};
     obj.environment = message.environment;
     return obj;
+  },
+
+  fromAminoMsg(object: ControlAminoMsg): Control {
+    return Control.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ControlProtoMsg): Control {
+    return Control.decode(message.value);
+  },
+
+  toProto(message: Control): Uint8Array {
+    return Control.encode(message).finish();
+  },
+
+  toProtoMsg(message: Control): ControlProtoMsg {
+    return {
+      typeUrl: "/google.api.Control",
+      value: Control.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/api/distribution.ts b/__fixtures__/outputv2/google/api/distribution.ts
index 46550c005..2e51da1e9 100644
--- a/__fixtures__/outputv2/google/api/distribution.ts
+++ b/__fixtures__/outputv2/google/api/distribution.ts
@@ -81,7 +81,7 @@ export interface Distribution {
   /** Must be in increasing order of `value` field. */
   exemplars: Distribution_Exemplar[];
 }
-export interface DistributionProtoType {
+export interface DistributionProtoMsg {
   typeUrl: "/google.api.Distribution";
   value: Uint8Array;
 }
@@ -163,7 +163,7 @@ export interface DistributionAmino {
   /** Must be in increasing order of `value` field. */
   exemplars: Distribution_ExemplarAmino[];
 }
-export interface DistributionAminoType {
+export interface DistributionAminoMsg {
   type: "/google.api.Distribution";
   value: DistributionAmino;
 }
@@ -202,7 +202,7 @@ export interface Distribution_Range {
   /** The maximum of the population values. */
   max: number;
 }
-export interface Distribution_RangeProtoType {
+export interface Distribution_RangeProtoMsg {
   typeUrl: "/google.api.Range";
   value: Uint8Array;
 }
@@ -215,7 +215,7 @@ export interface Distribution_RangeAmino {
   /** The maximum of the population values. */
   max: number;
 }
-export interface Distribution_RangeAminoType {
+export interface Distribution_RangeAminoMsg {
   type: "/google.api.Range";
   value: Distribution_RangeAmino;
 }
@@ -253,7 +253,7 @@ export interface Distribution_BucketOptions {
   /** The explicit buckets. */
   explicitBuckets?: Distribution_BucketOptions_Explicit;
 }
-export interface Distribution_BucketOptionsProtoType {
+export interface Distribution_BucketOptionsProtoMsg {
   typeUrl: "/google.api.BucketOptions";
   value: Uint8Array;
 }
@@ -285,7 +285,7 @@ export interface Distribution_BucketOptionsAmino {
   /** The explicit buckets. */
   explicit_buckets?: Distribution_BucketOptions_ExplicitAmino;
 }
-export interface Distribution_BucketOptionsAminoType {
+export interface Distribution_BucketOptionsAminoMsg {
   type: "/google.api.BucketOptions";
   value: Distribution_BucketOptionsAmino;
 }
@@ -334,7 +334,7 @@ export interface Distribution_BucketOptions_Linear {
   /** Lower bound of the first bucket. */
   offset: number;
 }
-export interface Distribution_BucketOptions_LinearProtoType {
+export interface Distribution_BucketOptions_LinearProtoMsg {
   typeUrl: "/google.api.Linear";
   value: Uint8Array;
 }
@@ -360,7 +360,7 @@ export interface Distribution_BucketOptions_LinearAmino {
   /** Lower bound of the first bucket. */
   offset: number;
 }
-export interface Distribution_BucketOptions_LinearAminoType {
+export interface Distribution_BucketOptions_LinearAminoMsg {
   type: "/google.api.Linear";
   value: Distribution_BucketOptions_LinearAmino;
 }
@@ -403,7 +403,7 @@ export interface Distribution_BucketOptions_Exponential {
   /** Must be greater than 0. */
   scale: number;
 }
-export interface Distribution_BucketOptions_ExponentialProtoType {
+export interface Distribution_BucketOptions_ExponentialProtoMsg {
   typeUrl: "/google.api.Exponential";
   value: Uint8Array;
 }
@@ -429,7 +429,7 @@ export interface Distribution_BucketOptions_ExponentialAmino {
   /** Must be greater than 0. */
   scale: number;
 }
-export interface Distribution_BucketOptions_ExponentialAminoType {
+export interface Distribution_BucketOptions_ExponentialAminoMsg {
   type: "/google.api.Exponential";
   value: Distribution_BucketOptions_ExponentialAmino;
 }
@@ -468,7 +468,7 @@ export interface Distribution_BucketOptions_Explicit {
   /** The values must be monotonically increasing. */
   bounds: number[];
 }
-export interface Distribution_BucketOptions_ExplicitProtoType {
+export interface Distribution_BucketOptions_ExplicitProtoMsg {
   typeUrl: "/google.api.Explicit";
   value: Uint8Array;
 }
@@ -490,7 +490,7 @@ export interface Distribution_BucketOptions_ExplicitAmino {
   /** The values must be monotonically increasing. */
   bounds: number[];
 }
-export interface Distribution_BucketOptions_ExplicitAminoType {
+export interface Distribution_BucketOptions_ExplicitAminoMsg {
   type: "/google.api.Explicit";
   value: Distribution_BucketOptions_ExplicitAmino;
 }
@@ -544,7 +544,7 @@ export interface Distribution_Exemplar {
    */
   attachments: Any[];
 }
-export interface Distribution_ExemplarProtoType {
+export interface Distribution_ExemplarProtoMsg {
   typeUrl: "/google.api.Exemplar";
   value: Uint8Array;
 }
@@ -581,7 +581,7 @@ export interface Distribution_ExemplarAmino {
    */
   attachments: AnyAmino[];
 }
-export interface Distribution_ExemplarAminoType {
+export interface Distribution_ExemplarAminoMsg {
   type: "/google.api.Exemplar";
   value: Distribution_ExemplarAmino;
 }
@@ -612,6 +612,8 @@ function createBaseDistribution(): Distribution {
 }
 
 export const Distribution = {
+  typeUrl: "/google.api.Distribution",
+
   encode(message: Distribution, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.count.isZero()) {
       writer.uint32(8).int64(message.count);
@@ -818,6 +820,25 @@ export const Distribution = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: DistributionAminoMsg): Distribution {
+    return Distribution.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: DistributionProtoMsg): Distribution {
+    return Distribution.decode(message.value);
+  },
+
+  toProto(message: Distribution): Uint8Array {
+    return Distribution.encode(message).finish();
+  },
+
+  toProtoMsg(message: Distribution): DistributionProtoMsg {
+    return {
+      typeUrl: "/google.api.Distribution",
+      value: Distribution.encode(message).finish()
+    };
   }
 
 };
@@ -830,6 +851,8 @@ function createBaseDistribution_Range(): Distribution_Range {
 }
 
 export const Distribution_Range = {
+  typeUrl: "/google.api.Range",
+
   encode(message: Distribution_Range, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.min !== 0) {
       writer.uint32(9).double(message.min);
@@ -915,6 +938,25 @@ export const Distribution_Range = {
     obj.min = message.min;
     obj.max = message.max;
     return obj;
+  },
+
+  fromAminoMsg(object: Distribution_RangeAminoMsg): Distribution_Range {
+    return Distribution_Range.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: Distribution_RangeProtoMsg): Distribution_Range {
+    return Distribution_Range.decode(message.value);
+  },
+
+  toProto(message: Distribution_Range): Uint8Array {
+    return Distribution_Range.encode(message).finish();
+  },
+
+  toProtoMsg(message: Distribution_Range): Distribution_RangeProtoMsg {
+    return {
+      typeUrl: "/google.api.Range",
+      value: Distribution_Range.encode(message).finish()
+    };
   }
 
 };
@@ -928,6 +970,8 @@ function createBaseDistribution_BucketOptions(): Distribution_BucketOptions {
 }
 
 export const Distribution_BucketOptions = {
+  typeUrl: "/google.api.BucketOptions",
+
   encode(message: Distribution_BucketOptions, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.linearBuckets !== undefined) {
       Distribution_BucketOptions_Linear.encode(message.linearBuckets, writer.uint32(10).fork()).ldelim();
@@ -1028,6 +1072,25 @@ export const Distribution_BucketOptions = {
     obj.exponential_buckets = message.exponentialBuckets ? Distribution_BucketOptions_Exponential.toAmino(message.exponentialBuckets) : undefined;
     obj.explicit_buckets = message.explicitBuckets ? Distribution_BucketOptions_Explicit.toAmino(message.explicitBuckets) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: Distribution_BucketOptionsAminoMsg): Distribution_BucketOptions {
+    return Distribution_BucketOptions.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: Distribution_BucketOptionsProtoMsg): Distribution_BucketOptions {
+    return Distribution_BucketOptions.decode(message.value);
+  },
+
+  toProto(message: Distribution_BucketOptions): Uint8Array {
+    return Distribution_BucketOptions.encode(message).finish();
+  },
+
+  toProtoMsg(message: Distribution_BucketOptions): Distribution_BucketOptionsProtoMsg {
+    return {
+      typeUrl: "/google.api.BucketOptions",
+      value: Distribution_BucketOptions.encode(message).finish()
+    };
   }
 
 };
@@ -1041,6 +1104,8 @@ function createBaseDistribution_BucketOptions_Linear(): Distribution_BucketOptio
 }
 
 export const Distribution_BucketOptions_Linear = {
+  typeUrl: "/google.api.Linear",
+
   encode(message: Distribution_BucketOptions_Linear, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.numFiniteBuckets !== 0) {
       writer.uint32(8).int32(message.numFiniteBuckets);
@@ -1141,6 +1206,25 @@ export const Distribution_BucketOptions_Linear = {
     obj.width = message.width;
     obj.offset = message.offset;
     return obj;
+  },
+
+  fromAminoMsg(object: Distribution_BucketOptions_LinearAminoMsg): Distribution_BucketOptions_Linear {
+    return Distribution_BucketOptions_Linear.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: Distribution_BucketOptions_LinearProtoMsg): Distribution_BucketOptions_Linear {
+    return Distribution_BucketOptions_Linear.decode(message.value);
+  },
+
+  toProto(message: Distribution_BucketOptions_Linear): Uint8Array {
+    return Distribution_BucketOptions_Linear.encode(message).finish();
+  },
+
+  toProtoMsg(message: Distribution_BucketOptions_Linear): Distribution_BucketOptions_LinearProtoMsg {
+    return {
+      typeUrl: "/google.api.Linear",
+      value: Distribution_BucketOptions_Linear.encode(message).finish()
+    };
   }
 
 };
@@ -1154,6 +1238,8 @@ function createBaseDistribution_BucketOptions_Exponential(): Distribution_Bucket
 }
 
 export const Distribution_BucketOptions_Exponential = {
+  typeUrl: "/google.api.Exponential",
+
   encode(message: Distribution_BucketOptions_Exponential, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.numFiniteBuckets !== 0) {
       writer.uint32(8).int32(message.numFiniteBuckets);
@@ -1254,6 +1340,25 @@ export const Distribution_BucketOptions_Exponential = {
     obj.growth_factor = message.growthFactor;
     obj.scale = message.scale;
     return obj;
+  },
+
+  fromAminoMsg(object: Distribution_BucketOptions_ExponentialAminoMsg): Distribution_BucketOptions_Exponential {
+    return Distribution_BucketOptions_Exponential.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: Distribution_BucketOptions_ExponentialProtoMsg): Distribution_BucketOptions_Exponential {
+    return Distribution_BucketOptions_Exponential.decode(message.value);
+  },
+
+  toProto(message: Distribution_BucketOptions_Exponential): Uint8Array {
+    return Distribution_BucketOptions_Exponential.encode(message).finish();
+  },
+
+  toProtoMsg(message: Distribution_BucketOptions_Exponential): Distribution_BucketOptions_ExponentialProtoMsg {
+    return {
+      typeUrl: "/google.api.Exponential",
+      value: Distribution_BucketOptions_Exponential.encode(message).finish()
+    };
   }
 
 };
@@ -1265,6 +1370,8 @@ function createBaseDistribution_BucketOptions_Explicit(): Distribution_BucketOpt
 }
 
 export const Distribution_BucketOptions_Explicit = {
+  typeUrl: "/google.api.Explicit",
+
   encode(message: Distribution_BucketOptions_Explicit, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     writer.uint32(10).fork();
 
@@ -1365,6 +1472,25 @@ export const Distribution_BucketOptions_Explicit = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: Distribution_BucketOptions_ExplicitAminoMsg): Distribution_BucketOptions_Explicit {
+    return Distribution_BucketOptions_Explicit.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: Distribution_BucketOptions_ExplicitProtoMsg): Distribution_BucketOptions_Explicit {
+    return Distribution_BucketOptions_Explicit.decode(message.value);
+  },
+
+  toProto(message: Distribution_BucketOptions_Explicit): Uint8Array {
+    return Distribution_BucketOptions_Explicit.encode(message).finish();
+  },
+
+  toProtoMsg(message: Distribution_BucketOptions_Explicit): Distribution_BucketOptions_ExplicitProtoMsg {
+    return {
+      typeUrl: "/google.api.Explicit",
+      value: Distribution_BucketOptions_Explicit.encode(message).finish()
+    };
   }
 
 };
@@ -1378,6 +1504,8 @@ function createBaseDistribution_Exemplar(): Distribution_Exemplar {
 }
 
 export const Distribution_Exemplar = {
+  typeUrl: "/google.api.Exemplar",
+
   encode(message: Distribution_Exemplar, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.value !== 0) {
       writer.uint32(9).double(message.value);
@@ -1496,6 +1624,25 @@ export const Distribution_Exemplar = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: Distribution_ExemplarAminoMsg): Distribution_Exemplar {
+    return Distribution_Exemplar.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: Distribution_ExemplarProtoMsg): Distribution_Exemplar {
+    return Distribution_Exemplar.decode(message.value);
+  },
+
+  toProto(message: Distribution_Exemplar): Uint8Array {
+    return Distribution_Exemplar.encode(message).finish();
+  },
+
+  toProtoMsg(message: Distribution_Exemplar): Distribution_ExemplarProtoMsg {
+    return {
+      typeUrl: "/google.api.Exemplar",
+      value: Distribution_Exemplar.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/api/documentation.ts b/__fixtures__/outputv2/google/api/documentation.ts
index 18aef6309..bb13206b6 100644
--- a/__fixtures__/outputv2/google/api/documentation.ts
+++ b/__fixtures__/outputv2/google/api/documentation.ts
@@ -104,7 +104,7 @@ export interface Documentation {
    */
   overview: string;
 }
-export interface DocumentationProtoType {
+export interface DocumentationProtoMsg {
   typeUrl: "/google.api.Documentation";
   value: Uint8Array;
 }
@@ -211,7 +211,7 @@ export interface DocumentationAmino {
    */
   overview: string;
 }
-export interface DocumentationAminoType {
+export interface DocumentationAminoMsg {
   type: "/google.api.Documentation";
   value: DocumentationAmino;
 }
@@ -303,7 +303,7 @@ export interface DocumentationRule {
    */
   deprecationDescription: string;
 }
-export interface DocumentationRuleProtoType {
+export interface DocumentationRuleProtoMsg {
   typeUrl: "/google.api.DocumentationRule";
   value: Uint8Array;
 }
@@ -329,7 +329,7 @@ export interface DocumentationRuleAmino {
    */
   deprecation_description: string;
 }
-export interface DocumentationRuleAminoType {
+export interface DocumentationRuleAminoMsg {
   type: "/google.api.DocumentationRule";
   value: DocumentationRuleAmino;
 }
@@ -376,7 +376,7 @@ export interface Page {
    */
   subpages: Page[];
 }
-export interface PageProtoType {
+export interface PageProtoMsg {
   typeUrl: "/google.api.Page";
   value: Uint8Array;
 }
@@ -416,7 +416,7 @@ export interface PageAmino {
    */
   subpages: PageAmino[];
 }
-export interface PageAminoType {
+export interface PageAminoMsg {
   type: "/google.api.Page";
   value: PageAmino;
 }
@@ -443,6 +443,8 @@ function createBaseDocumentation(): Documentation {
 }
 
 export const Documentation = {
+  typeUrl: "/google.api.Documentation",
+
   encode(message: Documentation, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.summary !== "") {
       writer.uint32(10).string(message.summary);
@@ -621,6 +623,25 @@ export const Documentation = {
     obj.service_root_url = message.serviceRootUrl;
     obj.overview = message.overview;
     return obj;
+  },
+
+  fromAminoMsg(object: DocumentationAminoMsg): Documentation {
+    return Documentation.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: DocumentationProtoMsg): Documentation {
+    return Documentation.decode(message.value);
+  },
+
+  toProto(message: Documentation): Uint8Array {
+    return Documentation.encode(message).finish();
+  },
+
+  toProtoMsg(message: Documentation): DocumentationProtoMsg {
+    return {
+      typeUrl: "/google.api.Documentation",
+      value: Documentation.encode(message).finish()
+    };
   }
 
 };
@@ -634,6 +655,8 @@ function createBaseDocumentationRule(): DocumentationRule {
 }
 
 export const DocumentationRule = {
+  typeUrl: "/google.api.DocumentationRule",
+
   encode(message: DocumentationRule, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.selector !== "") {
       writer.uint32(10).string(message.selector);
@@ -734,6 +757,25 @@ export const DocumentationRule = {
     obj.description = message.description;
     obj.deprecation_description = message.deprecationDescription;
     return obj;
+  },
+
+  fromAminoMsg(object: DocumentationRuleAminoMsg): DocumentationRule {
+    return DocumentationRule.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: DocumentationRuleProtoMsg): DocumentationRule {
+    return DocumentationRule.decode(message.value);
+  },
+
+  toProto(message: DocumentationRule): Uint8Array {
+    return DocumentationRule.encode(message).finish();
+  },
+
+  toProtoMsg(message: DocumentationRule): DocumentationRuleProtoMsg {
+    return {
+      typeUrl: "/google.api.DocumentationRule",
+      value: DocumentationRule.encode(message).finish()
+    };
   }
 
 };
@@ -747,6 +789,8 @@ function createBasePage(): Page {
 }
 
 export const Page = {
+  typeUrl: "/google.api.Page",
+
   encode(message: Page, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -865,6 +909,25 @@ export const Page = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: PageAminoMsg): Page {
+    return Page.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: PageProtoMsg): Page {
+    return Page.decode(message.value);
+  },
+
+  toProto(message: Page): Uint8Array {
+    return Page.encode(message).finish();
+  },
+
+  toProtoMsg(message: Page): PageProtoMsg {
+    return {
+      typeUrl: "/google.api.Page",
+      value: Page.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/api/endpoint.ts b/__fixtures__/outputv2/google/api/endpoint.ts
index 0b6a6059f..f9085aa67 100644
--- a/__fixtures__/outputv2/google/api/endpoint.ts
+++ b/__fixtures__/outputv2/google/api/endpoint.ts
@@ -56,7 +56,7 @@ export interface Endpoint {
    */
   allowCors: boolean;
 }
-export interface EndpointProtoType {
+export interface EndpointProtoMsg {
   typeUrl: "/google.api.Endpoint";
   value: Uint8Array;
 }
@@ -115,7 +115,7 @@ export interface EndpointAmino {
    */
   allow_cors: boolean;
 }
-export interface EndpointAminoType {
+export interface EndpointAminoMsg {
   type: "/google.api.Endpoint";
   value: EndpointAmino;
 }
@@ -157,6 +157,8 @@ function createBaseEndpoint(): Endpoint {
 }
 
 export const Endpoint = {
+  typeUrl: "/google.api.Endpoint",
+
   encode(message: Endpoint, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -290,6 +292,25 @@ export const Endpoint = {
     obj.target = message.target;
     obj.allow_cors = message.allowCors;
     return obj;
+  },
+
+  fromAminoMsg(object: EndpointAminoMsg): Endpoint {
+    return Endpoint.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: EndpointProtoMsg): Endpoint {
+    return Endpoint.decode(message.value);
+  },
+
+  toProto(message: Endpoint): Uint8Array {
+    return Endpoint.encode(message).finish();
+  },
+
+  toProtoMsg(message: Endpoint): EndpointProtoMsg {
+    return {
+      typeUrl: "/google.api.Endpoint",
+      value: Endpoint.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/api/expr/conformance/v1alpha1/conformance_service.ts b/__fixtures__/outputv2/google/api/expr/conformance/v1alpha1/conformance_service.ts
index c0bcbedf1..154475be7 100644
--- a/__fixtures__/outputv2/google/api/expr/conformance/v1alpha1/conformance_service.ts
+++ b/__fixtures__/outputv2/google/api/expr/conformance/v1alpha1/conformance_service.ts
@@ -84,7 +84,7 @@ export interface ParseRequest {
   /** Prevent macro expansion.  See "Macros" in Language Defiinition. */
   disableMacros: boolean;
 }
-export interface ParseRequestProtoType {
+export interface ParseRequestProtoMsg {
   typeUrl: "/google.api.expr.conformance.v1alpha1.ParseRequest";
   value: Uint8Array;
 }
@@ -103,7 +103,7 @@ export interface ParseRequestAmino {
   /** Prevent macro expansion.  See "Macros" in Language Defiinition. */
   disable_macros: boolean;
 }
-export interface ParseRequestAminoType {
+export interface ParseRequestAminoMsg {
   type: "/google.api.expr.conformance.v1alpha1.ParseRequest";
   value: ParseRequestAmino;
 }
@@ -124,7 +124,7 @@ export interface ParseResponse {
   /** Any number of issues with [StatusDetails][] as the details. */
   issues: Status[];
 }
-export interface ParseResponseProtoType {
+export interface ParseResponseProtoMsg {
   typeUrl: "/google.api.expr.conformance.v1alpha1.ParseResponse";
   value: Uint8Array;
 }
@@ -137,7 +137,7 @@ export interface ParseResponseAmino {
   /** Any number of issues with [StatusDetails][] as the details. */
   issues: StatusAmino[];
 }
-export interface ParseResponseAminoType {
+export interface ParseResponseAminoMsg {
   type: "/google.api.expr.conformance.v1alpha1.ParseResponse";
   value: ParseResponseAmino;
 }
@@ -173,7 +173,7 @@ export interface CheckRequest {
    */
   noStdEnv: boolean;
 }
-export interface CheckRequestProtoType {
+export interface CheckRequestProtoMsg {
   typeUrl: "/google.api.expr.conformance.v1alpha1.CheckRequest";
   value: Uint8Array;
 }
@@ -203,7 +203,7 @@ export interface CheckRequestAmino {
    */
   no_std_env: boolean;
 }
-export interface CheckRequestAminoType {
+export interface CheckRequestAminoMsg {
   type: "/google.api.expr.conformance.v1alpha1.CheckRequest";
   value: CheckRequestAmino;
 }
@@ -224,7 +224,7 @@ export interface CheckResponse {
   /** Any number of issues with [StatusDetails][] as the details. */
   issues: Status[];
 }
-export interface CheckResponseProtoType {
+export interface CheckResponseProtoMsg {
   typeUrl: "/google.api.expr.conformance.v1alpha1.CheckResponse";
   value: Uint8Array;
 }
@@ -237,7 +237,7 @@ export interface CheckResponseAmino {
   /** Any number of issues with [StatusDetails][] as the details. */
   issues: StatusAmino[];
 }
-export interface CheckResponseAminoType {
+export interface CheckResponseAminoMsg {
   type: "/google.api.expr.conformance.v1alpha1.CheckResponse";
   value: CheckResponseAmino;
 }
@@ -251,16 +251,16 @@ export interface EvalRequest_BindingsEntry {
   key: string;
   value?: ExprValue;
 }
-export interface EvalRequest_BindingsEntryProtoType {
-  typeUrl: "/google.api.expr.conformance.v1alpha1.undefined";
+export interface EvalRequest_BindingsEntryProtoMsg {
+  typeUrl: string;
   value: Uint8Array;
 }
 export interface EvalRequest_BindingsEntryAmino {
   key: string;
   value?: ExprValueAmino;
 }
-export interface EvalRequest_BindingsEntryAminoType {
-  type: "/google.api.expr.conformance.v1alpha1.undefined";
+export interface EvalRequest_BindingsEntryAminoMsg {
+  type: string;
   value: EvalRequest_BindingsEntryAmino;
 }
 export interface EvalRequest_BindingsEntrySDKType {
@@ -287,7 +287,7 @@ export interface EvalRequest {
   /** SHOULD be the same container as used in [CheckRequest][google.api.expr.conformance.v1alpha1.CheckRequest], if checked. */
   container: string;
 }
-export interface EvalRequestProtoType {
+export interface EvalRequestProtoMsg {
   typeUrl: "/google.api.expr.conformance.v1alpha1.EvalRequest";
   value: Uint8Array;
 }
@@ -311,7 +311,7 @@ export interface EvalRequestAmino {
   /** SHOULD be the same container as used in [CheckRequest][google.api.expr.conformance.v1alpha1.CheckRequest], if checked. */
   container: string;
 }
-export interface EvalRequestAminoType {
+export interface EvalRequestAminoMsg {
   type: "/google.api.expr.conformance.v1alpha1.EvalRequest";
   value: EvalRequestAmino;
 }
@@ -339,7 +339,7 @@ export interface EvalResponse {
    */
   issues: Status[];
 }
-export interface EvalResponseProtoType {
+export interface EvalResponseProtoMsg {
   typeUrl: "/google.api.expr.conformance.v1alpha1.EvalResponse";
   value: Uint8Array;
 }
@@ -357,7 +357,7 @@ export interface EvalResponseAmino {
    */
   issues: StatusAmino[];
 }
-export interface EvalResponseAminoType {
+export interface EvalResponseAminoMsg {
   type: "/google.api.expr.conformance.v1alpha1.EvalResponse";
   value: EvalResponseAmino;
 }
@@ -383,7 +383,7 @@ export interface IssueDetails {
   /** Expression ID from [Expr][], 0 if unknown. */
   id: Long;
 }
-export interface IssueDetailsProtoType {
+export interface IssueDetailsProtoMsg {
   typeUrl: "/google.api.expr.conformance.v1alpha1.IssueDetails";
   value: Uint8Array;
 }
@@ -403,7 +403,7 @@ export interface IssueDetailsAmino {
   /** Expression ID from [Expr][], 0 if unknown. */
   id: string;
 }
-export interface IssueDetailsAminoType {
+export interface IssueDetailsAminoMsg {
   type: "/google.api.expr.conformance.v1alpha1.IssueDetails";
   value: IssueDetailsAmino;
 }
@@ -429,6 +429,8 @@ function createBaseParseRequest(): ParseRequest {
 }
 
 export const ParseRequest = {
+  typeUrl: "/google.api.expr.conformance.v1alpha1.ParseRequest",
+
   encode(message: ParseRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.celSource !== "") {
       writer.uint32(10).string(message.celSource);
@@ -544,6 +546,25 @@ export const ParseRequest = {
     obj.source_location = message.sourceLocation;
     obj.disable_macros = message.disableMacros;
     return obj;
+  },
+
+  fromAminoMsg(object: ParseRequestAminoMsg): ParseRequest {
+    return ParseRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ParseRequestProtoMsg): ParseRequest {
+    return ParseRequest.decode(message.value);
+  },
+
+  toProto(message: ParseRequest): Uint8Array {
+    return ParseRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: ParseRequest): ParseRequestProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.conformance.v1alpha1.ParseRequest",
+      value: ParseRequest.encode(message).finish()
+    };
   }
 
 };
@@ -556,6 +577,8 @@ function createBaseParseResponse(): ParseResponse {
 }
 
 export const ParseResponse = {
+  typeUrl: "/google.api.expr.conformance.v1alpha1.ParseResponse",
+
   encode(message: ParseResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.parsedExpr !== undefined) {
       ParsedExpr.encode(message.parsedExpr, writer.uint32(10).fork()).ldelim();
@@ -659,6 +682,25 @@ export const ParseResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ParseResponseAminoMsg): ParseResponse {
+    return ParseResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ParseResponseProtoMsg): ParseResponse {
+    return ParseResponse.decode(message.value);
+  },
+
+  toProto(message: ParseResponse): Uint8Array {
+    return ParseResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: ParseResponse): ParseResponseProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.conformance.v1alpha1.ParseResponse",
+      value: ParseResponse.encode(message).finish()
+    };
   }
 
 };
@@ -673,6 +715,8 @@ function createBaseCheckRequest(): CheckRequest {
 }
 
 export const CheckRequest = {
+  typeUrl: "/google.api.expr.conformance.v1alpha1.CheckRequest",
+
   encode(message: CheckRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.parsedExpr !== undefined) {
       ParsedExpr.encode(message.parsedExpr, writer.uint32(10).fork()).ldelim();
@@ -806,6 +850,25 @@ export const CheckRequest = {
     obj.container = message.container;
     obj.no_std_env = message.noStdEnv;
     return obj;
+  },
+
+  fromAminoMsg(object: CheckRequestAminoMsg): CheckRequest {
+    return CheckRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: CheckRequestProtoMsg): CheckRequest {
+    return CheckRequest.decode(message.value);
+  },
+
+  toProto(message: CheckRequest): Uint8Array {
+    return CheckRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: CheckRequest): CheckRequestProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.conformance.v1alpha1.CheckRequest",
+      value: CheckRequest.encode(message).finish()
+    };
   }
 
 };
@@ -818,6 +881,8 @@ function createBaseCheckResponse(): CheckResponse {
 }
 
 export const CheckResponse = {
+  typeUrl: "/google.api.expr.conformance.v1alpha1.CheckResponse",
+
   encode(message: CheckResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.checkedExpr !== undefined) {
       CheckedExpr.encode(message.checkedExpr, writer.uint32(10).fork()).ldelim();
@@ -921,6 +986,25 @@ export const CheckResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: CheckResponseAminoMsg): CheckResponse {
+    return CheckResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: CheckResponseProtoMsg): CheckResponse {
+    return CheckResponse.decode(message.value);
+  },
+
+  toProto(message: CheckResponse): Uint8Array {
+    return CheckResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: CheckResponse): CheckResponseProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.conformance.v1alpha1.CheckResponse",
+      value: CheckResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1018,6 +1102,18 @@ export const EvalRequest_BindingsEntry = {
     obj.key = message.key;
     obj.value = message.value ? google.api.expr.v1alpha1.ExprValue.toAmino(message.value) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: EvalRequest_BindingsEntryAminoMsg): EvalRequest_BindingsEntry {
+    return EvalRequest_BindingsEntry.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: EvalRequest_BindingsEntryProtoMsg): EvalRequest_BindingsEntry {
+    return EvalRequest_BindingsEntry.decode(message.value);
+  },
+
+  toProto(message: EvalRequest_BindingsEntry): Uint8Array {
+    return EvalRequest_BindingsEntry.encode(message).finish();
   }
 
 };
@@ -1032,6 +1128,8 @@ function createBaseEvalRequest(): EvalRequest {
 }
 
 export const EvalRequest = {
+  typeUrl: "/google.api.expr.conformance.v1alpha1.EvalRequest",
+
   encode(message: EvalRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.parsedExpr !== undefined) {
       ParsedExpr.encode(message.parsedExpr, writer.uint32(10).fork()).ldelim();
@@ -1199,6 +1297,25 @@ export const EvalRequest = {
 
     obj.container = message.container;
     return obj;
+  },
+
+  fromAminoMsg(object: EvalRequestAminoMsg): EvalRequest {
+    return EvalRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: EvalRequestProtoMsg): EvalRequest {
+    return EvalRequest.decode(message.value);
+  },
+
+  toProto(message: EvalRequest): Uint8Array {
+    return EvalRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: EvalRequest): EvalRequestProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.conformance.v1alpha1.EvalRequest",
+      value: EvalRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1211,6 +1328,8 @@ function createBaseEvalResponse(): EvalResponse {
 }
 
 export const EvalResponse = {
+  typeUrl: "/google.api.expr.conformance.v1alpha1.EvalResponse",
+
   encode(message: EvalResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.result !== undefined) {
       ExprValue.encode(message.result, writer.uint32(10).fork()).ldelim();
@@ -1314,6 +1433,25 @@ export const EvalResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: EvalResponseAminoMsg): EvalResponse {
+    return EvalResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: EvalResponseProtoMsg): EvalResponse {
+    return EvalResponse.decode(message.value);
+  },
+
+  toProto(message: EvalResponse): Uint8Array {
+    return EvalResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: EvalResponse): EvalResponseProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.conformance.v1alpha1.EvalResponse",
+      value: EvalResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1327,6 +1465,8 @@ function createBaseIssueDetails(): IssueDetails {
 }
 
 export const IssueDetails = {
+  typeUrl: "/google.api.expr.conformance.v1alpha1.IssueDetails",
+
   encode(message: IssueDetails, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.severity !== 0) {
       writer.uint32(8).int32(message.severity);
@@ -1427,6 +1567,25 @@ export const IssueDetails = {
     obj.position = message.position ? SourcePosition.toAmino(message.position) : undefined;
     obj.id = message.id ? message.id.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: IssueDetailsAminoMsg): IssueDetails {
+    return IssueDetails.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: IssueDetailsProtoMsg): IssueDetails {
+    return IssueDetails.decode(message.value);
+  },
+
+  toProto(message: IssueDetails): Uint8Array {
+    return IssueDetails.encode(message).finish();
+  },
+
+  toProtoMsg(message: IssueDetails): IssueDetailsProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.conformance.v1alpha1.IssueDetails",
+      value: IssueDetails.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/api/expr/v1alpha1/checked.ts b/__fixtures__/outputv2/google/api/expr/v1alpha1/checked.ts
index 79e33ff79..98b4d3d40 100644
--- a/__fixtures__/outputv2/google/api/expr/v1alpha1/checked.ts
+++ b/__fixtures__/outputv2/google/api/expr/v1alpha1/checked.ts
@@ -178,16 +178,16 @@ export interface CheckedExpr_ReferenceMapEntry {
   key: Long;
   value?: Reference;
 }
-export interface CheckedExpr_ReferenceMapEntryProtoType {
-  typeUrl: "/google.api.expr.v1alpha1.undefined";
+export interface CheckedExpr_ReferenceMapEntryProtoMsg {
+  typeUrl: string;
   value: Uint8Array;
 }
 export interface CheckedExpr_ReferenceMapEntryAmino {
   key: string;
   value?: ReferenceAmino;
 }
-export interface CheckedExpr_ReferenceMapEntryAminoType {
-  type: "/google.api.expr.v1alpha1.undefined";
+export interface CheckedExpr_ReferenceMapEntryAminoMsg {
+  type: string;
   value: CheckedExpr_ReferenceMapEntryAmino;
 }
 export interface CheckedExpr_ReferenceMapEntrySDKType {
@@ -198,16 +198,16 @@ export interface CheckedExpr_TypeMapEntry {
   key: Long;
   value?: Type;
 }
-export interface CheckedExpr_TypeMapEntryProtoType {
-  typeUrl: "/google.api.expr.v1alpha1.undefined";
+export interface CheckedExpr_TypeMapEntryProtoMsg {
+  typeUrl: string;
   value: Uint8Array;
 }
 export interface CheckedExpr_TypeMapEntryAmino {
   key: string;
   value?: TypeAmino;
 }
-export interface CheckedExpr_TypeMapEntryAminoType {
-  type: "/google.api.expr.v1alpha1.undefined";
+export interface CheckedExpr_TypeMapEntryAminoMsg {
+  type: string;
   value: CheckedExpr_TypeMapEntryAmino;
 }
 export interface CheckedExpr_TypeMapEntrySDKType {
@@ -272,7 +272,7 @@ export interface CheckedExpr {
    */
   expr?: Expr;
 }
-export interface CheckedExprProtoType {
+export interface CheckedExprProtoMsg {
   typeUrl: "/google.api.expr.v1alpha1.CheckedExpr";
   value: Uint8Array;
 }
@@ -334,7 +334,7 @@ export interface CheckedExprAmino {
    */
   expr?: ExprAmino;
 }
-export interface CheckedExprAminoType {
+export interface CheckedExprAminoMsg {
   type: "/google.api.expr.v1alpha1.CheckedExpr";
   value: CheckedExprAmino;
 }
@@ -415,7 +415,7 @@ export interface Type {
   /** Abstract, application defined type. */
   abstractType?: Type_AbstractType;
 }
-export interface TypeProtoType {
+export interface TypeProtoMsg {
   typeUrl: "/google.api.expr.v1alpha1.Type";
   value: Uint8Array;
 }
@@ -483,7 +483,7 @@ export interface TypeAmino {
   /** Abstract, application defined type. */
   abstract_type?: Type_AbstractTypeAmino;
 }
-export interface TypeAminoType {
+export interface TypeAminoMsg {
   type: "/google.api.expr.v1alpha1.Type";
   value: TypeAmino;
 }
@@ -510,7 +510,7 @@ export interface Type_ListType {
   /** The element type. */
   elemType?: Type;
 }
-export interface Type_ListTypeProtoType {
+export interface Type_ListTypeProtoMsg {
   typeUrl: "/google.api.expr.v1alpha1.ListType";
   value: Uint8Array;
 }
@@ -520,7 +520,7 @@ export interface Type_ListTypeAmino {
   /** The element type. */
   elem_type?: TypeAmino;
 }
-export interface Type_ListTypeAminoType {
+export interface Type_ListTypeAminoMsg {
   type: "/google.api.expr.v1alpha1.ListType";
   value: Type_ListTypeAmino;
 }
@@ -538,7 +538,7 @@ export interface Type_MapType {
   /** The type of the value. */
   valueType?: Type;
 }
-export interface Type_MapTypeProtoType {
+export interface Type_MapTypeProtoMsg {
   typeUrl: "/google.api.expr.v1alpha1.MapType";
   value: Uint8Array;
 }
@@ -551,7 +551,7 @@ export interface Type_MapTypeAmino {
   /** The type of the value. */
   value_type?: TypeAmino;
 }
-export interface Type_MapTypeAminoType {
+export interface Type_MapTypeAminoMsg {
   type: "/google.api.expr.v1alpha1.MapType";
   value: Type_MapTypeAmino;
 }
@@ -570,7 +570,7 @@ export interface Type_FunctionType {
   /** Argument types of the function. */
   argTypes: Type[];
 }
-export interface Type_FunctionTypeProtoType {
+export interface Type_FunctionTypeProtoMsg {
   typeUrl: "/google.api.expr.v1alpha1.FunctionType";
   value: Uint8Array;
 }
@@ -583,7 +583,7 @@ export interface Type_FunctionTypeAmino {
   /** Argument types of the function. */
   arg_types: TypeAmino[];
 }
-export interface Type_FunctionTypeAminoType {
+export interface Type_FunctionTypeAminoMsg {
   type: "/google.api.expr.v1alpha1.FunctionType";
   value: Type_FunctionTypeAmino;
 }
@@ -602,7 +602,7 @@ export interface Type_AbstractType {
   /** Parameter types for this abstract type. */
   parameterTypes: Type[];
 }
-export interface Type_AbstractTypeProtoType {
+export interface Type_AbstractTypeProtoMsg {
   typeUrl: "/google.api.expr.v1alpha1.AbstractType";
   value: Uint8Array;
 }
@@ -615,7 +615,7 @@ export interface Type_AbstractTypeAmino {
   /** Parameter types for this abstract type. */
   parameter_types: TypeAmino[];
 }
-export interface Type_AbstractTypeAminoType {
+export interface Type_AbstractTypeAminoMsg {
   type: "/google.api.expr.v1alpha1.AbstractType";
   value: Type_AbstractTypeAmino;
 }
@@ -651,7 +651,7 @@ export interface Decl {
   /** Function declaration. */
   function?: Decl_FunctionDecl;
 }
-export interface DeclProtoType {
+export interface DeclProtoMsg {
   typeUrl: "/google.api.expr.v1alpha1.Decl";
   value: Uint8Array;
 }
@@ -681,7 +681,7 @@ export interface DeclAmino {
   /** Function declaration. */
   function?: Decl_FunctionDeclAmino;
 }
-export interface DeclAminoType {
+export interface DeclAminoMsg {
   type: "/google.api.expr.v1alpha1.Decl";
   value: DeclAmino;
 }
@@ -719,7 +719,7 @@ export interface Decl_IdentDecl {
   /** Documentation string for the identifier. */
   doc: string;
 }
-export interface Decl_IdentDeclProtoType {
+export interface Decl_IdentDeclProtoMsg {
   typeUrl: "/google.api.expr.v1alpha1.IdentDecl";
   value: Uint8Array;
 }
@@ -745,7 +745,7 @@ export interface Decl_IdentDeclAmino {
   /** Documentation string for the identifier. */
   doc: string;
 }
-export interface Decl_IdentDeclAminoType {
+export interface Decl_IdentDeclAminoMsg {
   type: "/google.api.expr.v1alpha1.IdentDecl";
   value: Decl_IdentDeclAmino;
 }
@@ -775,7 +775,7 @@ export interface Decl_FunctionDecl {
   /** Required. List of function overloads, must contain at least one overload. */
   overloads: Decl_FunctionDecl_Overload[];
 }
-export interface Decl_FunctionDeclProtoType {
+export interface Decl_FunctionDeclProtoMsg {
   typeUrl: "/google.api.expr.v1alpha1.FunctionDecl";
   value: Uint8Array;
 }
@@ -791,7 +791,7 @@ export interface Decl_FunctionDeclAmino {
   /** Required. List of function overloads, must contain at least one overload. */
   overloads: Decl_FunctionDecl_OverloadAmino[];
 }
-export interface Decl_FunctionDeclAminoType {
+export interface Decl_FunctionDeclAminoMsg {
   type: "/google.api.expr.v1alpha1.FunctionDecl";
   value: Decl_FunctionDeclAmino;
 }
@@ -869,7 +869,7 @@ export interface Decl_FunctionDecl_Overload {
   /** Documentation string for the overload. */
   doc: string;
 }
-export interface Decl_FunctionDecl_OverloadProtoType {
+export interface Decl_FunctionDecl_OverloadProtoMsg {
   typeUrl: "/google.api.expr.v1alpha1.Overload";
   value: Uint8Array;
 }
@@ -936,7 +936,7 @@ export interface Decl_FunctionDecl_OverloadAmino {
   /** Documentation string for the overload. */
   doc: string;
 }
-export interface Decl_FunctionDecl_OverloadAminoType {
+export interface Decl_FunctionDecl_OverloadAminoMsg {
   type: "/google.api.expr.v1alpha1.Overload";
   value: Decl_FunctionDecl_OverloadAmino;
 }
@@ -985,7 +985,7 @@ export interface Reference {
    */
   value?: Constant;
 }
-export interface ReferenceProtoType {
+export interface ReferenceProtoMsg {
   typeUrl: "/google.api.expr.v1alpha1.Reference";
   value: Uint8Array;
 }
@@ -1013,7 +1013,7 @@ export interface ReferenceAmino {
    */
   value?: ConstantAmino;
 }
-export interface ReferenceAminoType {
+export interface ReferenceAminoMsg {
   type: "/google.api.expr.v1alpha1.Reference";
   value: ReferenceAmino;
 }
@@ -1118,6 +1118,18 @@ export const CheckedExpr_ReferenceMapEntry = {
     obj.key = message.key ? message.key.toString() : undefined;
     obj.value = message.value ? Reference.toAmino(message.value) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: CheckedExpr_ReferenceMapEntryAminoMsg): CheckedExpr_ReferenceMapEntry {
+    return CheckedExpr_ReferenceMapEntry.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: CheckedExpr_ReferenceMapEntryProtoMsg): CheckedExpr_ReferenceMapEntry {
+    return CheckedExpr_ReferenceMapEntry.decode(message.value);
+  },
+
+  toProto(message: CheckedExpr_ReferenceMapEntry): Uint8Array {
+    return CheckedExpr_ReferenceMapEntry.encode(message).finish();
   }
 
 };
@@ -1215,6 +1227,18 @@ export const CheckedExpr_TypeMapEntry = {
     obj.key = message.key ? message.key.toString() : undefined;
     obj.value = message.value ? Type.toAmino(message.value) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: CheckedExpr_TypeMapEntryAminoMsg): CheckedExpr_TypeMapEntry {
+    return CheckedExpr_TypeMapEntry.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: CheckedExpr_TypeMapEntryProtoMsg): CheckedExpr_TypeMapEntry {
+    return CheckedExpr_TypeMapEntry.decode(message.value);
+  },
+
+  toProto(message: CheckedExpr_TypeMapEntry): Uint8Array {
+    return CheckedExpr_TypeMapEntry.encode(message).finish();
   }
 
 };
@@ -1230,6 +1254,8 @@ function createBaseCheckedExpr(): CheckedExpr {
 }
 
 export const CheckedExpr = {
+  typeUrl: "/google.api.expr.v1alpha1.CheckedExpr",
+
   encode(message: CheckedExpr, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     Object.entries(message.referenceMap).forEach(([key, value]) => {
       CheckedExpr_ReferenceMapEntry.encode({
@@ -1463,6 +1489,25 @@ export const CheckedExpr = {
     obj.expr_version = message.exprVersion;
     obj.expr = message.expr ? Expr.toAmino(message.expr) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: CheckedExprAminoMsg): CheckedExpr {
+    return CheckedExpr.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: CheckedExprProtoMsg): CheckedExpr {
+    return CheckedExpr.decode(message.value);
+  },
+
+  toProto(message: CheckedExpr): Uint8Array {
+    return CheckedExpr.encode(message).finish();
+  },
+
+  toProtoMsg(message: CheckedExpr): CheckedExprProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1alpha1.CheckedExpr",
+      value: CheckedExpr.encode(message).finish()
+    };
   }
 
 };
@@ -1486,6 +1531,8 @@ function createBaseType(): Type {
 }
 
 export const Type = {
+  typeUrl: "/google.api.expr.v1alpha1.Type",
+
   encode(message: Type, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.dyn !== undefined) {
       Empty.encode(message.dyn, writer.uint32(10).fork()).ldelim();
@@ -1736,6 +1783,25 @@ export const Type = {
     obj.error = message.error ? Empty.toAmino(message.error) : undefined;
     obj.abstract_type = message.abstractType ? Type_AbstractType.toAmino(message.abstractType) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: TypeAminoMsg): Type {
+    return Type.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: TypeProtoMsg): Type {
+    return Type.decode(message.value);
+  },
+
+  toProto(message: Type): Uint8Array {
+    return Type.encode(message).finish();
+  },
+
+  toProtoMsg(message: Type): TypeProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1alpha1.Type",
+      value: Type.encode(message).finish()
+    };
   }
 
 };
@@ -1747,6 +1813,8 @@ function createBaseType_ListType(): Type_ListType {
 }
 
 export const Type_ListType = {
+  typeUrl: "/google.api.expr.v1alpha1.ListType",
+
   encode(message: Type_ListType, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.elemType !== undefined) {
       Type.encode(message.elemType, writer.uint32(10).fork()).ldelim();
@@ -1817,6 +1885,25 @@ export const Type_ListType = {
     const obj: any = {};
     obj.elem_type = message.elemType ? Type.toAmino(message.elemType) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: Type_ListTypeAminoMsg): Type_ListType {
+    return Type_ListType.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: Type_ListTypeProtoMsg): Type_ListType {
+    return Type_ListType.decode(message.value);
+  },
+
+  toProto(message: Type_ListType): Uint8Array {
+    return Type_ListType.encode(message).finish();
+  },
+
+  toProtoMsg(message: Type_ListType): Type_ListTypeProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1alpha1.ListType",
+      value: Type_ListType.encode(message).finish()
+    };
   }
 
 };
@@ -1829,6 +1916,8 @@ function createBaseType_MapType(): Type_MapType {
 }
 
 export const Type_MapType = {
+  typeUrl: "/google.api.expr.v1alpha1.MapType",
+
   encode(message: Type_MapType, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.keyType !== undefined) {
       Type.encode(message.keyType, writer.uint32(10).fork()).ldelim();
@@ -1914,6 +2003,25 @@ export const Type_MapType = {
     obj.key_type = message.keyType ? Type.toAmino(message.keyType) : undefined;
     obj.value_type = message.valueType ? Type.toAmino(message.valueType) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: Type_MapTypeAminoMsg): Type_MapType {
+    return Type_MapType.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: Type_MapTypeProtoMsg): Type_MapType {
+    return Type_MapType.decode(message.value);
+  },
+
+  toProto(message: Type_MapType): Uint8Array {
+    return Type_MapType.encode(message).finish();
+  },
+
+  toProtoMsg(message: Type_MapType): Type_MapTypeProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1alpha1.MapType",
+      value: Type_MapType.encode(message).finish()
+    };
   }
 
 };
@@ -1926,6 +2034,8 @@ function createBaseType_FunctionType(): Type_FunctionType {
 }
 
 export const Type_FunctionType = {
+  typeUrl: "/google.api.expr.v1alpha1.FunctionType",
+
   encode(message: Type_FunctionType, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.resultType !== undefined) {
       Type.encode(message.resultType, writer.uint32(10).fork()).ldelim();
@@ -2029,6 +2139,25 @@ export const Type_FunctionType = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: Type_FunctionTypeAminoMsg): Type_FunctionType {
+    return Type_FunctionType.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: Type_FunctionTypeProtoMsg): Type_FunctionType {
+    return Type_FunctionType.decode(message.value);
+  },
+
+  toProto(message: Type_FunctionType): Uint8Array {
+    return Type_FunctionType.encode(message).finish();
+  },
+
+  toProtoMsg(message: Type_FunctionType): Type_FunctionTypeProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1alpha1.FunctionType",
+      value: Type_FunctionType.encode(message).finish()
+    };
   }
 
 };
@@ -2041,6 +2170,8 @@ function createBaseType_AbstractType(): Type_AbstractType {
 }
 
 export const Type_AbstractType = {
+  typeUrl: "/google.api.expr.v1alpha1.AbstractType",
+
   encode(message: Type_AbstractType, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -2144,6 +2275,25 @@ export const Type_AbstractType = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: Type_AbstractTypeAminoMsg): Type_AbstractType {
+    return Type_AbstractType.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: Type_AbstractTypeProtoMsg): Type_AbstractType {
+    return Type_AbstractType.decode(message.value);
+  },
+
+  toProto(message: Type_AbstractType): Uint8Array {
+    return Type_AbstractType.encode(message).finish();
+  },
+
+  toProtoMsg(message: Type_AbstractType): Type_AbstractTypeProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1alpha1.AbstractType",
+      value: Type_AbstractType.encode(message).finish()
+    };
   }
 
 };
@@ -2157,6 +2307,8 @@ function createBaseDecl(): Decl {
 }
 
 export const Decl = {
+  typeUrl: "/google.api.expr.v1alpha1.Decl",
+
   encode(message: Decl, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -2257,6 +2409,25 @@ export const Decl = {
     obj.ident = message.ident ? Decl_IdentDecl.toAmino(message.ident) : undefined;
     obj.function = message.function ? Decl_FunctionDecl.toAmino(message.function) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: DeclAminoMsg): Decl {
+    return Decl.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: DeclProtoMsg): Decl {
+    return Decl.decode(message.value);
+  },
+
+  toProto(message: Decl): Uint8Array {
+    return Decl.encode(message).finish();
+  },
+
+  toProtoMsg(message: Decl): DeclProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1alpha1.Decl",
+      value: Decl.encode(message).finish()
+    };
   }
 
 };
@@ -2270,6 +2441,8 @@ function createBaseDecl_IdentDecl(): Decl_IdentDecl {
 }
 
 export const Decl_IdentDecl = {
+  typeUrl: "/google.api.expr.v1alpha1.IdentDecl",
+
   encode(message: Decl_IdentDecl, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.type !== undefined) {
       Type.encode(message.type, writer.uint32(10).fork()).ldelim();
@@ -2370,6 +2543,25 @@ export const Decl_IdentDecl = {
     obj.value = message.value ? Constant.toAmino(message.value) : undefined;
     obj.doc = message.doc;
     return obj;
+  },
+
+  fromAminoMsg(object: Decl_IdentDeclAminoMsg): Decl_IdentDecl {
+    return Decl_IdentDecl.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: Decl_IdentDeclProtoMsg): Decl_IdentDecl {
+    return Decl_IdentDecl.decode(message.value);
+  },
+
+  toProto(message: Decl_IdentDecl): Uint8Array {
+    return Decl_IdentDecl.encode(message).finish();
+  },
+
+  toProtoMsg(message: Decl_IdentDecl): Decl_IdentDeclProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1alpha1.IdentDecl",
+      value: Decl_IdentDecl.encode(message).finish()
+    };
   }
 
 };
@@ -2381,6 +2573,8 @@ function createBaseDecl_FunctionDecl(): Decl_FunctionDecl {
 }
 
 export const Decl_FunctionDecl = {
+  typeUrl: "/google.api.expr.v1alpha1.FunctionDecl",
+
   encode(message: Decl_FunctionDecl, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.overloads) {
       Decl_FunctionDecl_Overload.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -2469,6 +2663,25 @@ export const Decl_FunctionDecl = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: Decl_FunctionDeclAminoMsg): Decl_FunctionDecl {
+    return Decl_FunctionDecl.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: Decl_FunctionDeclProtoMsg): Decl_FunctionDecl {
+    return Decl_FunctionDecl.decode(message.value);
+  },
+
+  toProto(message: Decl_FunctionDecl): Uint8Array {
+    return Decl_FunctionDecl.encode(message).finish();
+  },
+
+  toProtoMsg(message: Decl_FunctionDecl): Decl_FunctionDeclProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1alpha1.FunctionDecl",
+      value: Decl_FunctionDecl.encode(message).finish()
+    };
   }
 
 };
@@ -2485,6 +2698,8 @@ function createBaseDecl_FunctionDecl_Overload(): Decl_FunctionDecl_Overload {
 }
 
 export const Decl_FunctionDecl_Overload = {
+  typeUrl: "/google.api.expr.v1alpha1.Overload",
+
   encode(message: Decl_FunctionDecl_Overload, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.overloadId !== "") {
       writer.uint32(10).string(message.overloadId);
@@ -2663,6 +2878,25 @@ export const Decl_FunctionDecl_Overload = {
     obj.is_instance_function = message.isInstanceFunction;
     obj.doc = message.doc;
     return obj;
+  },
+
+  fromAminoMsg(object: Decl_FunctionDecl_OverloadAminoMsg): Decl_FunctionDecl_Overload {
+    return Decl_FunctionDecl_Overload.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: Decl_FunctionDecl_OverloadProtoMsg): Decl_FunctionDecl_Overload {
+    return Decl_FunctionDecl_Overload.decode(message.value);
+  },
+
+  toProto(message: Decl_FunctionDecl_Overload): Uint8Array {
+    return Decl_FunctionDecl_Overload.encode(message).finish();
+  },
+
+  toProtoMsg(message: Decl_FunctionDecl_Overload): Decl_FunctionDecl_OverloadProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1alpha1.Overload",
+      value: Decl_FunctionDecl_Overload.encode(message).finish()
+    };
   }
 
 };
@@ -2676,6 +2910,8 @@ function createBaseReference(): Reference {
 }
 
 export const Reference = {
+  typeUrl: "/google.api.expr.v1alpha1.Reference",
+
   encode(message: Reference, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -2794,6 +3030,25 @@ export const Reference = {
 
     obj.value = message.value ? Constant.toAmino(message.value) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ReferenceAminoMsg): Reference {
+    return Reference.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ReferenceProtoMsg): Reference {
+    return Reference.decode(message.value);
+  },
+
+  toProto(message: Reference): Uint8Array {
+    return Reference.encode(message).finish();
+  },
+
+  toProtoMsg(message: Reference): ReferenceProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1alpha1.Reference",
+      value: Reference.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/api/expr/v1alpha1/eval.ts b/__fixtures__/outputv2/google/api/expr/v1alpha1/eval.ts
index 77fd50eab..2407b769e 100644
--- a/__fixtures__/outputv2/google/api/expr/v1alpha1/eval.ts
+++ b/__fixtures__/outputv2/google/api/expr/v1alpha1/eval.ts
@@ -21,7 +21,7 @@ export interface EvalState {
    */
   results: EvalState_Result[];
 }
-export interface EvalStateProtoType {
+export interface EvalStateProtoMsg {
   typeUrl: "/google.api.expr.v1alpha1.EvalState";
   value: Uint8Array;
 }
@@ -43,7 +43,7 @@ export interface EvalStateAmino {
    */
   results: EvalState_ResultAmino[];
 }
-export interface EvalStateAminoType {
+export interface EvalStateAminoMsg {
   type: "/google.api.expr.v1alpha1.EvalState";
   value: EvalStateAmino;
 }
@@ -66,7 +66,7 @@ export interface EvalState_Result {
   /** The index in `values` of the resulting value. */
   value: Long;
 }
-export interface EvalState_ResultProtoType {
+export interface EvalState_ResultProtoMsg {
   typeUrl: "/google.api.expr.v1alpha1.Result";
   value: Uint8Array;
 }
@@ -79,7 +79,7 @@ export interface EvalState_ResultAmino {
   /** The index in `values` of the resulting value. */
   value: string;
 }
-export interface EvalState_ResultAminoType {
+export interface EvalState_ResultAminoMsg {
   type: "/google.api.expr.v1alpha1.Result";
   value: EvalState_ResultAmino;
 }
@@ -143,7 +143,7 @@ export interface ExprValue {
    */
   unknown?: UnknownSet;
 }
-export interface ExprValueProtoType {
+export interface ExprValueProtoMsg {
   typeUrl: "/google.api.expr.v1alpha1.ExprValue";
   value: Uint8Array;
 }
@@ -201,7 +201,7 @@ export interface ExprValueAmino {
    */
   unknown?: UnknownSetAmino;
 }
-export interface ExprValueAminoType {
+export interface ExprValueAminoMsg {
   type: "/google.api.expr.v1alpha1.ExprValue";
   value: ExprValueAmino;
 }
@@ -222,7 +222,7 @@ export interface ErrorSet {
   /** The errors in the set. */
   errors: Status[];
 }
-export interface ErrorSetProtoType {
+export interface ErrorSetProtoMsg {
   typeUrl: "/google.api.expr.v1alpha1.ErrorSet";
   value: Uint8Array;
 }
@@ -236,7 +236,7 @@ export interface ErrorSetAmino {
   /** The errors in the set. */
   errors: StatusAmino[];
 }
-export interface ErrorSetAminoType {
+export interface ErrorSetAminoMsg {
   type: "/google.api.expr.v1alpha1.ErrorSet";
   value: ErrorSetAmino;
 }
@@ -259,7 +259,7 @@ export interface UnknownSet {
   /** The ids of the expressions with unknown values. */
   exprs: Long[];
 }
-export interface UnknownSetProtoType {
+export interface UnknownSetProtoMsg {
   typeUrl: "/google.api.expr.v1alpha1.UnknownSet";
   value: Uint8Array;
 }
@@ -273,7 +273,7 @@ export interface UnknownSetAmino {
   /** The ids of the expressions with unknown values. */
   exprs: string[];
 }
-export interface UnknownSetAminoType {
+export interface UnknownSetAminoMsg {
   type: "/google.api.expr.v1alpha1.UnknownSet";
   value: UnknownSetAmino;
 }
@@ -295,6 +295,8 @@ function createBaseEvalState(): EvalState {
 }
 
 export const EvalState = {
+  typeUrl: "/google.api.expr.v1alpha1.EvalState",
+
   encode(message: EvalState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.values) {
       ExprValue.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -413,6 +415,25 @@ export const EvalState = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: EvalStateAminoMsg): EvalState {
+    return EvalState.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: EvalStateProtoMsg): EvalState {
+    return EvalState.decode(message.value);
+  },
+
+  toProto(message: EvalState): Uint8Array {
+    return EvalState.encode(message).finish();
+  },
+
+  toProtoMsg(message: EvalState): EvalStateProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1alpha1.EvalState",
+      value: EvalState.encode(message).finish()
+    };
   }
 
 };
@@ -425,6 +446,8 @@ function createBaseEvalState_Result(): EvalState_Result {
 }
 
 export const EvalState_Result = {
+  typeUrl: "/google.api.expr.v1alpha1.Result",
+
   encode(message: EvalState_Result, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.expr.isZero()) {
       writer.uint32(8).int64(message.expr);
@@ -510,6 +533,25 @@ export const EvalState_Result = {
     obj.expr = message.expr ? message.expr.toString() : undefined;
     obj.value = message.value ? message.value.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: EvalState_ResultAminoMsg): EvalState_Result {
+    return EvalState_Result.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: EvalState_ResultProtoMsg): EvalState_Result {
+    return EvalState_Result.decode(message.value);
+  },
+
+  toProto(message: EvalState_Result): Uint8Array {
+    return EvalState_Result.encode(message).finish();
+  },
+
+  toProtoMsg(message: EvalState_Result): EvalState_ResultProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1alpha1.Result",
+      value: EvalState_Result.encode(message).finish()
+    };
   }
 
 };
@@ -523,6 +565,8 @@ function createBaseExprValue(): ExprValue {
 }
 
 export const ExprValue = {
+  typeUrl: "/google.api.expr.v1alpha1.ExprValue",
+
   encode(message: ExprValue, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.value !== undefined) {
       Value.encode(message.value, writer.uint32(10).fork()).ldelim();
@@ -623,6 +667,25 @@ export const ExprValue = {
     obj.error = message.error ? ErrorSet.toAmino(message.error) : undefined;
     obj.unknown = message.unknown ? UnknownSet.toAmino(message.unknown) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ExprValueAminoMsg): ExprValue {
+    return ExprValue.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ExprValueProtoMsg): ExprValue {
+    return ExprValue.decode(message.value);
+  },
+
+  toProto(message: ExprValue): Uint8Array {
+    return ExprValue.encode(message).finish();
+  },
+
+  toProtoMsg(message: ExprValue): ExprValueProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1alpha1.ExprValue",
+      value: ExprValue.encode(message).finish()
+    };
   }
 
 };
@@ -634,6 +697,8 @@ function createBaseErrorSet(): ErrorSet {
 }
 
 export const ErrorSet = {
+  typeUrl: "/google.api.expr.v1alpha1.ErrorSet",
+
   encode(message: ErrorSet, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.errors) {
       Status.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -722,6 +787,25 @@ export const ErrorSet = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ErrorSetAminoMsg): ErrorSet {
+    return ErrorSet.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ErrorSetProtoMsg): ErrorSet {
+    return ErrorSet.decode(message.value);
+  },
+
+  toProto(message: ErrorSet): Uint8Array {
+    return ErrorSet.encode(message).finish();
+  },
+
+  toProtoMsg(message: ErrorSet): ErrorSetProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1alpha1.ErrorSet",
+      value: ErrorSet.encode(message).finish()
+    };
   }
 
 };
@@ -733,6 +817,8 @@ function createBaseUnknownSet(): UnknownSet {
 }
 
 export const UnknownSet = {
+  typeUrl: "/google.api.expr.v1alpha1.UnknownSet",
+
   encode(message: UnknownSet, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     writer.uint32(10).fork();
 
@@ -833,6 +919,25 @@ export const UnknownSet = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: UnknownSetAminoMsg): UnknownSet {
+    return UnknownSet.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: UnknownSetProtoMsg): UnknownSet {
+    return UnknownSet.decode(message.value);
+  },
+
+  toProto(message: UnknownSet): Uint8Array {
+    return UnknownSet.encode(message).finish();
+  },
+
+  toProtoMsg(message: UnknownSet): UnknownSetProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1alpha1.UnknownSet",
+      value: UnknownSet.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/api/expr/v1alpha1/explain.ts b/__fixtures__/outputv2/google/api/expr/v1alpha1/explain.ts
index e9af41110..a734880d0 100644
--- a/__fixtures__/outputv2/google/api/expr/v1alpha1/explain.ts
+++ b/__fixtures__/outputv2/google/api/expr/v1alpha1/explain.ts
@@ -27,7 +27,7 @@ export interface Explain {
    */
   exprSteps: Explain_ExprStep[];
 }
-export interface ExplainProtoType {
+export interface ExplainProtoMsg {
   typeUrl: "/google.api.expr.v1alpha1.Explain";
   value: Uint8Array;
 }
@@ -56,7 +56,7 @@ export interface ExplainAmino {
    */
   expr_steps: Explain_ExprStepAmino[];
 }
-export interface ExplainAminoType {
+export interface ExplainAminoMsg {
   type: "/google.api.expr.v1alpha1.Explain";
   value: ExplainAmino;
 }
@@ -80,7 +80,7 @@ export interface Explain_ExprStep {
   /** Index of the value in the values list. */
   valueIndex: number;
 }
-export interface Explain_ExprStepProtoType {
+export interface Explain_ExprStepProtoMsg {
   typeUrl: "/google.api.expr.v1alpha1.ExprStep";
   value: Uint8Array;
 }
@@ -93,7 +93,7 @@ export interface Explain_ExprStepAmino {
   /** Index of the value in the values list. */
   value_index: number;
 }
-export interface Explain_ExprStepAminoType {
+export interface Explain_ExprStepAminoMsg {
   type: "/google.api.expr.v1alpha1.ExprStep";
   value: Explain_ExprStepAmino;
 }
@@ -112,6 +112,8 @@ function createBaseExplain(): Explain {
 }
 
 export const Explain = {
+  typeUrl: "/google.api.expr.v1alpha1.Explain",
+
   encode(message: Explain, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.values) {
       Value.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -230,6 +232,25 @@ export const Explain = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ExplainAminoMsg): Explain {
+    return Explain.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ExplainProtoMsg): Explain {
+    return Explain.decode(message.value);
+  },
+
+  toProto(message: Explain): Uint8Array {
+    return Explain.encode(message).finish();
+  },
+
+  toProtoMsg(message: Explain): ExplainProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1alpha1.Explain",
+      value: Explain.encode(message).finish()
+    };
   }
 
 };
@@ -242,6 +263,8 @@ function createBaseExplain_ExprStep(): Explain_ExprStep {
 }
 
 export const Explain_ExprStep = {
+  typeUrl: "/google.api.expr.v1alpha1.ExprStep",
+
   encode(message: Explain_ExprStep, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.id.isZero()) {
       writer.uint32(8).int64(message.id);
@@ -327,6 +350,25 @@ export const Explain_ExprStep = {
     obj.id = message.id ? message.id.toString() : undefined;
     obj.value_index = message.valueIndex;
     return obj;
+  },
+
+  fromAminoMsg(object: Explain_ExprStepAminoMsg): Explain_ExprStep {
+    return Explain_ExprStep.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: Explain_ExprStepProtoMsg): Explain_ExprStep {
+    return Explain_ExprStep.decode(message.value);
+  },
+
+  toProto(message: Explain_ExprStep): Uint8Array {
+    return Explain_ExprStep.encode(message).finish();
+  },
+
+  toProtoMsg(message: Explain_ExprStep): Explain_ExprStepProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1alpha1.ExprStep",
+      value: Explain_ExprStep.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/api/expr/v1alpha1/syntax.ts b/__fixtures__/outputv2/google/api/expr/v1alpha1/syntax.ts
index eaa647409..f120b621a 100644
--- a/__fixtures__/outputv2/google/api/expr/v1alpha1/syntax.ts
+++ b/__fixtures__/outputv2/google/api/expr/v1alpha1/syntax.ts
@@ -13,7 +13,7 @@ export interface ParsedExpr {
   /** The source info derived from input that generated the parsed `expr`. */
   sourceInfo?: SourceInfo;
 }
-export interface ParsedExprProtoType {
+export interface ParsedExprProtoMsg {
   typeUrl: "/google.api.expr.v1alpha1.ParsedExpr";
   value: Uint8Array;
 }
@@ -26,7 +26,7 @@ export interface ParsedExprAmino {
   /** The source info derived from input that generated the parsed `expr`. */
   source_info?: SourceInfoAmino;
 }
-export interface ParsedExprAminoType {
+export interface ParsedExprAminoMsg {
   type: "/google.api.expr.v1alpha1.ParsedExpr";
   value: ParsedExprAmino;
 }
@@ -83,7 +83,7 @@ export interface Expr {
   /** A comprehension expression. */
   comprehensionExpr?: Expr_Comprehension;
 }
-export interface ExprProtoType {
+export interface ExprProtoMsg {
   typeUrl: "/google.api.expr.v1alpha1.Expr";
   value: Uint8Array;
 }
@@ -134,7 +134,7 @@ export interface ExprAmino {
   /** A comprehension expression. */
   comprehension_expr?: Expr_ComprehensionAmino;
 }
-export interface ExprAminoType {
+export interface ExprAminoMsg {
   type: "/google.api.expr.v1alpha1.Expr";
   value: ExprAmino;
 }
@@ -177,7 +177,7 @@ export interface Expr_Ident {
    */
   name: string;
 }
-export interface Expr_IdentProtoType {
+export interface Expr_IdentProtoMsg {
   typeUrl: "/google.api.expr.v1alpha1.Ident";
   value: Uint8Array;
 }
@@ -192,7 +192,7 @@ export interface Expr_IdentAmino {
    */
   name: string;
 }
-export interface Expr_IdentAminoType {
+export interface Expr_IdentAminoMsg {
   type: "/google.api.expr.v1alpha1.Ident";
   value: Expr_IdentAmino;
 }
@@ -227,7 +227,7 @@ export interface Expr_Select {
    */
   testOnly: boolean;
 }
-export interface Expr_SelectProtoType {
+export interface Expr_SelectProtoMsg {
   typeUrl: "/google.api.expr.v1alpha1.Select";
   value: Uint8Array;
 }
@@ -257,7 +257,7 @@ export interface Expr_SelectAmino {
    */
   test_only: boolean;
 }
-export interface Expr_SelectAminoType {
+export interface Expr_SelectAminoMsg {
   type: "/google.api.expr.v1alpha1.Select";
   value: Expr_SelectAmino;
 }
@@ -287,7 +287,7 @@ export interface Expr_Call {
   /** The arguments. */
   args: Expr[];
 }
-export interface Expr_CallProtoType {
+export interface Expr_CallProtoMsg {
   typeUrl: "/google.api.expr.v1alpha1.Call";
   value: Uint8Array;
 }
@@ -310,7 +310,7 @@ export interface Expr_CallAmino {
   /** The arguments. */
   args: ExprAmino[];
 }
-export interface Expr_CallAminoType {
+export interface Expr_CallAminoMsg {
   type: "/google.api.expr.v1alpha1.Call";
   value: Expr_CallAmino;
 }
@@ -336,7 +336,7 @@ export interface Expr_CreateList {
   /** The elements part of the list. */
   elements: Expr[];
 }
-export interface Expr_CreateListProtoType {
+export interface Expr_CreateListProtoMsg {
   typeUrl: "/google.api.expr.v1alpha1.CreateList";
   value: Uint8Array;
 }
@@ -351,7 +351,7 @@ export interface Expr_CreateListAmino {
   /** The elements part of the list. */
   elements: ExprAmino[];
 }
-export interface Expr_CreateListAminoType {
+export interface Expr_CreateListAminoMsg {
   type: "/google.api.expr.v1alpha1.CreateList";
   value: Expr_CreateListAmino;
 }
@@ -383,7 +383,7 @@ export interface Expr_CreateStruct {
   /** The entries in the creation expression. */
   entries: Expr_CreateStruct_Entry[];
 }
-export interface Expr_CreateStructProtoType {
+export interface Expr_CreateStructProtoMsg {
   typeUrl: "/google.api.expr.v1alpha1.CreateStruct";
   value: Uint8Array;
 }
@@ -405,7 +405,7 @@ export interface Expr_CreateStructAmino {
   /** The entries in the creation expression. */
   entries: Expr_CreateStruct_EntryAmino[];
 }
-export interface Expr_CreateStructAminoType {
+export interface Expr_CreateStructAminoMsg {
   type: "/google.api.expr.v1alpha1.CreateStruct";
   value: Expr_CreateStructAmino;
 }
@@ -440,7 +440,7 @@ export interface Expr_CreateStruct_Entry {
   /** Required. The value assigned to the key. */
   value?: Expr;
 }
-export interface Expr_CreateStruct_EntryProtoType {
+export interface Expr_CreateStruct_EntryProtoMsg {
   typeUrl: "/google.api.expr.v1alpha1.Entry";
   value: Uint8Array;
 }
@@ -463,7 +463,7 @@ export interface Expr_CreateStruct_EntryAmino {
   /** Required. The value assigned to the key. */
   value?: ExprAmino;
 }
-export interface Expr_CreateStruct_EntryAminoType {
+export interface Expr_CreateStruct_EntryAminoMsg {
   type: "/google.api.expr.v1alpha1.Entry";
   value: Expr_CreateStruct_EntryAmino;
 }
@@ -539,7 +539,7 @@ export interface Expr_Comprehension {
    */
   result?: Expr;
 }
-export interface Expr_ComprehensionProtoType {
+export interface Expr_ComprehensionProtoMsg {
   typeUrl: "/google.api.expr.v1alpha1.Comprehension";
   value: Uint8Array;
 }
@@ -607,7 +607,7 @@ export interface Expr_ComprehensionAmino {
    */
   result?: ExprAmino;
 }
-export interface Expr_ComprehensionAminoType {
+export interface Expr_ComprehensionAminoMsg {
   type: "/google.api.expr.v1alpha1.Comprehension";
   value: Expr_ComprehensionAmino;
 }
@@ -705,7 +705,7 @@ export interface Constant {
   /** @deprecated */
   timestampValue?: Date;
 }
-export interface ConstantProtoType {
+export interface ConstantProtoMsg {
   typeUrl: "/google.api.expr.v1alpha1.Constant";
   value: Uint8Array;
 }
@@ -765,7 +765,7 @@ export interface ConstantAmino {
   /** @deprecated */
   timestamp_value?: Date;
 }
-export interface ConstantAminoType {
+export interface ConstantAminoMsg {
   type: "/google.api.expr.v1alpha1.Constant";
   value: ConstantAmino;
 }
@@ -804,16 +804,16 @@ export interface SourceInfo_PositionsEntry {
   key: Long;
   value: number;
 }
-export interface SourceInfo_PositionsEntryProtoType {
-  typeUrl: "/google.api.expr.v1alpha1.undefined";
+export interface SourceInfo_PositionsEntryProtoMsg {
+  typeUrl: string;
   value: Uint8Array;
 }
 export interface SourceInfo_PositionsEntryAmino {
   key: string;
   value: number;
 }
-export interface SourceInfo_PositionsEntryAminoType {
-  type: "/google.api.expr.v1alpha1.undefined";
+export interface SourceInfo_PositionsEntryAminoMsg {
+  type: string;
   value: SourceInfo_PositionsEntryAmino;
 }
 export interface SourceInfo_PositionsEntrySDKType {
@@ -824,16 +824,16 @@ export interface SourceInfo_MacroCallsEntry {
   key: Long;
   value?: Expr;
 }
-export interface SourceInfo_MacroCallsEntryProtoType {
-  typeUrl: "/google.api.expr.v1alpha1.undefined";
+export interface SourceInfo_MacroCallsEntryProtoMsg {
+  typeUrl: string;
   value: Uint8Array;
 }
 export interface SourceInfo_MacroCallsEntryAmino {
   key: string;
   value?: ExprAmino;
 }
-export interface SourceInfo_MacroCallsEntryAminoType {
-  type: "/google.api.expr.v1alpha1.undefined";
+export interface SourceInfo_MacroCallsEntryAminoMsg {
+  type: string;
   value: SourceInfo_MacroCallsEntryAmino;
 }
 export interface SourceInfo_MacroCallsEntrySDKType {
@@ -887,7 +887,7 @@ export interface SourceInfo {
     [key: Long]: Expr;
   };
 }
-export interface SourceInfoProtoType {
+export interface SourceInfoProtoMsg {
   typeUrl: "/google.api.expr.v1alpha1.SourceInfo";
   value: Uint8Array;
 }
@@ -938,7 +938,7 @@ export interface SourceInfoAmino {
     [key: string]: ExprAmino;
   };
 }
-export interface SourceInfoAminoType {
+export interface SourceInfoAminoMsg {
   type: "/google.api.expr.v1alpha1.SourceInfo";
   value: SourceInfoAmino;
 }
@@ -976,7 +976,7 @@ export interface SourcePosition {
    */
   column: number;
 }
-export interface SourcePositionProtoType {
+export interface SourcePositionProtoMsg {
   typeUrl: "/google.api.expr.v1alpha1.SourcePosition";
   value: Uint8Array;
 }
@@ -1001,7 +1001,7 @@ export interface SourcePositionAmino {
    */
   column: number;
 }
-export interface SourcePositionAminoType {
+export interface SourcePositionAminoMsg {
   type: "/google.api.expr.v1alpha1.SourcePosition";
   value: SourcePositionAmino;
 }
@@ -1022,6 +1022,8 @@ function createBaseParsedExpr(): ParsedExpr {
 }
 
 export const ParsedExpr = {
+  typeUrl: "/google.api.expr.v1alpha1.ParsedExpr",
+
   encode(message: ParsedExpr, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.expr !== undefined) {
       Expr.encode(message.expr, writer.uint32(18).fork()).ldelim();
@@ -1107,6 +1109,25 @@ export const ParsedExpr = {
     obj.expr = message.expr ? Expr.toAmino(message.expr) : undefined;
     obj.source_info = message.sourceInfo ? SourceInfo.toAmino(message.sourceInfo) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ParsedExprAminoMsg): ParsedExpr {
+    return ParsedExpr.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ParsedExprProtoMsg): ParsedExpr {
+    return ParsedExpr.decode(message.value);
+  },
+
+  toProto(message: ParsedExpr): Uint8Array {
+    return ParsedExpr.encode(message).finish();
+  },
+
+  toProtoMsg(message: ParsedExpr): ParsedExprProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1alpha1.ParsedExpr",
+      value: ParsedExpr.encode(message).finish()
+    };
   }
 
 };
@@ -1125,6 +1146,8 @@ function createBaseExpr(): Expr {
 }
 
 export const Expr = {
+  typeUrl: "/google.api.expr.v1alpha1.Expr",
+
   encode(message: Expr, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.id.isZero()) {
       writer.uint32(16).int64(message.id);
@@ -1300,6 +1323,25 @@ export const Expr = {
     obj.struct_expr = message.structExpr ? Expr_CreateStruct.toAmino(message.structExpr) : undefined;
     obj.comprehension_expr = message.comprehensionExpr ? Expr_Comprehension.toAmino(message.comprehensionExpr) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ExprAminoMsg): Expr {
+    return Expr.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ExprProtoMsg): Expr {
+    return Expr.decode(message.value);
+  },
+
+  toProto(message: Expr): Uint8Array {
+    return Expr.encode(message).finish();
+  },
+
+  toProtoMsg(message: Expr): ExprProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1alpha1.Expr",
+      value: Expr.encode(message).finish()
+    };
   }
 
 };
@@ -1311,6 +1353,8 @@ function createBaseExpr_Ident(): Expr_Ident {
 }
 
 export const Expr_Ident = {
+  typeUrl: "/google.api.expr.v1alpha1.Ident",
+
   encode(message: Expr_Ident, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -1381,6 +1425,25 @@ export const Expr_Ident = {
     const obj: any = {};
     obj.name = message.name;
     return obj;
+  },
+
+  fromAminoMsg(object: Expr_IdentAminoMsg): Expr_Ident {
+    return Expr_Ident.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: Expr_IdentProtoMsg): Expr_Ident {
+    return Expr_Ident.decode(message.value);
+  },
+
+  toProto(message: Expr_Ident): Uint8Array {
+    return Expr_Ident.encode(message).finish();
+  },
+
+  toProtoMsg(message: Expr_Ident): Expr_IdentProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1alpha1.Ident",
+      value: Expr_Ident.encode(message).finish()
+    };
   }
 
 };
@@ -1394,6 +1457,8 @@ function createBaseExpr_Select(): Expr_Select {
 }
 
 export const Expr_Select = {
+  typeUrl: "/google.api.expr.v1alpha1.Select",
+
   encode(message: Expr_Select, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.operand !== undefined) {
       Expr.encode(message.operand, writer.uint32(10).fork()).ldelim();
@@ -1494,6 +1559,25 @@ export const Expr_Select = {
     obj.field = message.field;
     obj.test_only = message.testOnly;
     return obj;
+  },
+
+  fromAminoMsg(object: Expr_SelectAminoMsg): Expr_Select {
+    return Expr_Select.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: Expr_SelectProtoMsg): Expr_Select {
+    return Expr_Select.decode(message.value);
+  },
+
+  toProto(message: Expr_Select): Uint8Array {
+    return Expr_Select.encode(message).finish();
+  },
+
+  toProtoMsg(message: Expr_Select): Expr_SelectProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1alpha1.Select",
+      value: Expr_Select.encode(message).finish()
+    };
   }
 
 };
@@ -1507,6 +1591,8 @@ function createBaseExpr_Call(): Expr_Call {
 }
 
 export const Expr_Call = {
+  typeUrl: "/google.api.expr.v1alpha1.Call",
+
   encode(message: Expr_Call, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.target !== undefined) {
       Expr.encode(message.target, writer.uint32(10).fork()).ldelim();
@@ -1625,6 +1711,25 @@ export const Expr_Call = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: Expr_CallAminoMsg): Expr_Call {
+    return Expr_Call.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: Expr_CallProtoMsg): Expr_Call {
+    return Expr_Call.decode(message.value);
+  },
+
+  toProto(message: Expr_Call): Uint8Array {
+    return Expr_Call.encode(message).finish();
+  },
+
+  toProtoMsg(message: Expr_Call): Expr_CallProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1alpha1.Call",
+      value: Expr_Call.encode(message).finish()
+    };
   }
 
 };
@@ -1636,6 +1741,8 @@ function createBaseExpr_CreateList(): Expr_CreateList {
 }
 
 export const Expr_CreateList = {
+  typeUrl: "/google.api.expr.v1alpha1.CreateList",
+
   encode(message: Expr_CreateList, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.elements) {
       Expr.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1724,6 +1831,25 @@ export const Expr_CreateList = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: Expr_CreateListAminoMsg): Expr_CreateList {
+    return Expr_CreateList.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: Expr_CreateListProtoMsg): Expr_CreateList {
+    return Expr_CreateList.decode(message.value);
+  },
+
+  toProto(message: Expr_CreateList): Uint8Array {
+    return Expr_CreateList.encode(message).finish();
+  },
+
+  toProtoMsg(message: Expr_CreateList): Expr_CreateListProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1alpha1.CreateList",
+      value: Expr_CreateList.encode(message).finish()
+    };
   }
 
 };
@@ -1736,6 +1862,8 @@ function createBaseExpr_CreateStruct(): Expr_CreateStruct {
 }
 
 export const Expr_CreateStruct = {
+  typeUrl: "/google.api.expr.v1alpha1.CreateStruct",
+
   encode(message: Expr_CreateStruct, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.messageName !== "") {
       writer.uint32(10).string(message.messageName);
@@ -1839,6 +1967,25 @@ export const Expr_CreateStruct = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: Expr_CreateStructAminoMsg): Expr_CreateStruct {
+    return Expr_CreateStruct.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: Expr_CreateStructProtoMsg): Expr_CreateStruct {
+    return Expr_CreateStruct.decode(message.value);
+  },
+
+  toProto(message: Expr_CreateStruct): Uint8Array {
+    return Expr_CreateStruct.encode(message).finish();
+  },
+
+  toProtoMsg(message: Expr_CreateStruct): Expr_CreateStructProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1alpha1.CreateStruct",
+      value: Expr_CreateStruct.encode(message).finish()
+    };
   }
 
 };
@@ -1853,6 +2000,8 @@ function createBaseExpr_CreateStruct_Entry(): Expr_CreateStruct_Entry {
 }
 
 export const Expr_CreateStruct_Entry = {
+  typeUrl: "/google.api.expr.v1alpha1.Entry",
+
   encode(message: Expr_CreateStruct_Entry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.id.isZero()) {
       writer.uint32(8).int64(message.id);
@@ -1968,6 +2117,25 @@ export const Expr_CreateStruct_Entry = {
     obj.map_key = message.mapKey ? Expr.toAmino(message.mapKey) : undefined;
     obj.value = message.value ? Expr.toAmino(message.value) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: Expr_CreateStruct_EntryAminoMsg): Expr_CreateStruct_Entry {
+    return Expr_CreateStruct_Entry.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: Expr_CreateStruct_EntryProtoMsg): Expr_CreateStruct_Entry {
+    return Expr_CreateStruct_Entry.decode(message.value);
+  },
+
+  toProto(message: Expr_CreateStruct_Entry): Uint8Array {
+    return Expr_CreateStruct_Entry.encode(message).finish();
+  },
+
+  toProtoMsg(message: Expr_CreateStruct_Entry): Expr_CreateStruct_EntryProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1alpha1.Entry",
+      value: Expr_CreateStruct_Entry.encode(message).finish()
+    };
   }
 
 };
@@ -1985,6 +2153,8 @@ function createBaseExpr_Comprehension(): Expr_Comprehension {
 }
 
 export const Expr_Comprehension = {
+  typeUrl: "/google.api.expr.v1alpha1.Comprehension",
+
   encode(message: Expr_Comprehension, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.iterVar !== "") {
       writer.uint32(10).string(message.iterVar);
@@ -2145,6 +2315,25 @@ export const Expr_Comprehension = {
     obj.loop_step = message.loopStep ? Expr.toAmino(message.loopStep) : undefined;
     obj.result = message.result ? Expr.toAmino(message.result) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: Expr_ComprehensionAminoMsg): Expr_Comprehension {
+    return Expr_Comprehension.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: Expr_ComprehensionProtoMsg): Expr_Comprehension {
+    return Expr_Comprehension.decode(message.value);
+  },
+
+  toProto(message: Expr_Comprehension): Uint8Array {
+    return Expr_Comprehension.encode(message).finish();
+  },
+
+  toProtoMsg(message: Expr_Comprehension): Expr_ComprehensionProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1alpha1.Comprehension",
+      value: Expr_Comprehension.encode(message).finish()
+    };
   }
 
 };
@@ -2164,6 +2353,8 @@ function createBaseConstant(): Constant {
 }
 
 export const Constant = {
+  typeUrl: "/google.api.expr.v1alpha1.Constant",
+
   encode(message: Constant, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.nullValue !== undefined) {
       writer.uint32(8).int32(message.nullValue);
@@ -2354,6 +2545,25 @@ export const Constant = {
     obj.duration_value = message.durationValue ? Duration.toAmino(message.durationValue) : undefined;
     obj.timestamp_value = message.timestampValue ? Timestamp.toAmino(message.timestampValue) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ConstantAminoMsg): Constant {
+    return Constant.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ConstantProtoMsg): Constant {
+    return Constant.decode(message.value);
+  },
+
+  toProto(message: Constant): Uint8Array {
+    return Constant.encode(message).finish();
+  },
+
+  toProtoMsg(message: Constant): ConstantProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1alpha1.Constant",
+      value: Constant.encode(message).finish()
+    };
   }
 
 };
@@ -2451,6 +2661,18 @@ export const SourceInfo_PositionsEntry = {
     obj.key = message.key ? message.key.toString() : undefined;
     obj.value = message.value;
     return obj;
+  },
+
+  fromAminoMsg(object: SourceInfo_PositionsEntryAminoMsg): SourceInfo_PositionsEntry {
+    return SourceInfo_PositionsEntry.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: SourceInfo_PositionsEntryProtoMsg): SourceInfo_PositionsEntry {
+    return SourceInfo_PositionsEntry.decode(message.value);
+  },
+
+  toProto(message: SourceInfo_PositionsEntry): Uint8Array {
+    return SourceInfo_PositionsEntry.encode(message).finish();
   }
 
 };
@@ -2548,6 +2770,18 @@ export const SourceInfo_MacroCallsEntry = {
     obj.key = message.key ? message.key.toString() : undefined;
     obj.value = message.value ? Expr.toAmino(message.value) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: SourceInfo_MacroCallsEntryAminoMsg): SourceInfo_MacroCallsEntry {
+    return SourceInfo_MacroCallsEntry.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: SourceInfo_MacroCallsEntryProtoMsg): SourceInfo_MacroCallsEntry {
+    return SourceInfo_MacroCallsEntry.decode(message.value);
+  },
+
+  toProto(message: SourceInfo_MacroCallsEntry): Uint8Array {
+    return SourceInfo_MacroCallsEntry.encode(message).finish();
   }
 
 };
@@ -2563,6 +2797,8 @@ function createBaseSourceInfo(): SourceInfo {
 }
 
 export const SourceInfo = {
+  typeUrl: "/google.api.expr.v1alpha1.SourceInfo",
+
   encode(message: SourceInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.syntaxVersion !== "") {
       writer.uint32(10).string(message.syntaxVersion);
@@ -2825,6 +3061,25 @@ export const SourceInfo = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: SourceInfoAminoMsg): SourceInfo {
+    return SourceInfo.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: SourceInfoProtoMsg): SourceInfo {
+    return SourceInfo.decode(message.value);
+  },
+
+  toProto(message: SourceInfo): Uint8Array {
+    return SourceInfo.encode(message).finish();
+  },
+
+  toProtoMsg(message: SourceInfo): SourceInfoProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1alpha1.SourceInfo",
+      value: SourceInfo.encode(message).finish()
+    };
   }
 
 };
@@ -2839,6 +3094,8 @@ function createBaseSourcePosition(): SourcePosition {
 }
 
 export const SourcePosition = {
+  typeUrl: "/google.api.expr.v1alpha1.SourcePosition",
+
   encode(message: SourcePosition, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.location !== "") {
       writer.uint32(10).string(message.location);
@@ -2954,6 +3211,25 @@ export const SourcePosition = {
     obj.line = message.line;
     obj.column = message.column;
     return obj;
+  },
+
+  fromAminoMsg(object: SourcePositionAminoMsg): SourcePosition {
+    return SourcePosition.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: SourcePositionProtoMsg): SourcePosition {
+    return SourcePosition.decode(message.value);
+  },
+
+  toProto(message: SourcePosition): Uint8Array {
+    return SourcePosition.encode(message).finish();
+  },
+
+  toProtoMsg(message: SourcePosition): SourcePositionProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1alpha1.SourcePosition",
+      value: SourcePosition.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/api/expr/v1alpha1/value.ts b/__fixtures__/outputv2/google/api/expr/v1alpha1/value.ts
index d066e9118..4b20abcd0 100644
--- a/__fixtures__/outputv2/google/api/expr/v1alpha1/value.ts
+++ b/__fixtures__/outputv2/google/api/expr/v1alpha1/value.ts
@@ -47,7 +47,7 @@ export interface Value {
   /** Type value. */
   typeValue?: string;
 }
-export interface ValueProtoType {
+export interface ValueProtoMsg {
   typeUrl: "/google.api.expr.v1alpha1.Value";
   value: Uint8Array;
 }
@@ -95,7 +95,7 @@ export interface ValueAmino {
   /** Type value. */
   type_value?: string;
 }
-export interface ValueAminoType {
+export interface ValueAminoMsg {
   type: "/google.api.expr.v1alpha1.Value";
   value: ValueAmino;
 }
@@ -129,7 +129,7 @@ export interface EnumValue {
   /** The value of the enum. */
   value: number;
 }
-export interface EnumValueProtoType {
+export interface EnumValueProtoMsg {
   typeUrl: "/google.api.expr.v1alpha1.EnumValue";
   value: Uint8Array;
 }
@@ -142,7 +142,7 @@ export interface EnumValueAmino {
   /** The value of the enum. */
   value: number;
 }
-export interface EnumValueAminoType {
+export interface EnumValueAminoMsg {
   type: "/google.api.expr.v1alpha1.EnumValue";
   value: EnumValueAmino;
 }
@@ -163,7 +163,7 @@ export interface ListValue {
   /** The ordered values in the list. */
   values: Value[];
 }
-export interface ListValueProtoType {
+export interface ListValueProtoMsg {
   typeUrl: "/google.api.expr.v1alpha1.ListValue";
   value: Uint8Array;
 }
@@ -178,7 +178,7 @@ export interface ListValueAmino {
   /** The ordered values in the list. */
   values: ValueAmino[];
 }
-export interface ListValueAminoType {
+export interface ListValueAminoMsg {
   type: "/google.api.expr.v1alpha1.ListValue";
   value: ListValueAmino;
 }
@@ -208,7 +208,7 @@ export interface MapValue {
    */
   entries: MapValue_Entry[];
 }
-export interface MapValueProtoType {
+export interface MapValueProtoMsg {
   typeUrl: "/google.api.expr.v1alpha1.MapValue";
   value: Uint8Array;
 }
@@ -228,7 +228,7 @@ export interface MapValueAmino {
    */
   entries: MapValue_EntryAmino[];
 }
-export interface MapValueAminoType {
+export interface MapValueAminoMsg {
   type: "/google.api.expr.v1alpha1.MapValue";
   value: MapValueAmino;
 }
@@ -256,7 +256,7 @@ export interface MapValue_Entry {
   /** The value. */
   value?: Value;
 }
-export interface MapValue_EntryProtoType {
+export interface MapValue_EntryProtoMsg {
   typeUrl: "/google.api.expr.v1alpha1.Entry";
   value: Uint8Array;
 }
@@ -274,7 +274,7 @@ export interface MapValue_EntryAmino {
   /** The value. */
   value?: ValueAmino;
 }
-export interface MapValue_EntryAminoType {
+export interface MapValue_EntryAminoMsg {
   type: "/google.api.expr.v1alpha1.Entry";
   value: MapValue_EntryAmino;
 }
@@ -303,6 +303,8 @@ function createBaseValue(): Value {
 }
 
 export const Value = {
+  typeUrl: "/google.api.expr.v1alpha1.Value",
+
   encode(message: Value, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.nullValue !== undefined) {
       writer.uint32(8).int32(message.nullValue);
@@ -538,6 +540,25 @@ export const Value = {
     obj.list_value = message.listValue ? ListValue.toAmino(message.listValue) : undefined;
     obj.type_value = message.typeValue;
     return obj;
+  },
+
+  fromAminoMsg(object: ValueAminoMsg): Value {
+    return Value.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ValueProtoMsg): Value {
+    return Value.decode(message.value);
+  },
+
+  toProto(message: Value): Uint8Array {
+    return Value.encode(message).finish();
+  },
+
+  toProtoMsg(message: Value): ValueProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1alpha1.Value",
+      value: Value.encode(message).finish()
+    };
   }
 
 };
@@ -550,6 +571,8 @@ function createBaseEnumValue(): EnumValue {
 }
 
 export const EnumValue = {
+  typeUrl: "/google.api.expr.v1alpha1.EnumValue",
+
   encode(message: EnumValue, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.type !== "") {
       writer.uint32(10).string(message.type);
@@ -635,6 +658,25 @@ export const EnumValue = {
     obj.type = message.type;
     obj.value = message.value;
     return obj;
+  },
+
+  fromAminoMsg(object: EnumValueAminoMsg): EnumValue {
+    return EnumValue.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: EnumValueProtoMsg): EnumValue {
+    return EnumValue.decode(message.value);
+  },
+
+  toProto(message: EnumValue): Uint8Array {
+    return EnumValue.encode(message).finish();
+  },
+
+  toProtoMsg(message: EnumValue): EnumValueProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1alpha1.EnumValue",
+      value: EnumValue.encode(message).finish()
+    };
   }
 
 };
@@ -646,6 +688,8 @@ function createBaseListValue(): ListValue {
 }
 
 export const ListValue = {
+  typeUrl: "/google.api.expr.v1alpha1.ListValue",
+
   encode(message: ListValue, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.values) {
       Value.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -734,6 +778,25 @@ export const ListValue = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ListValueAminoMsg): ListValue {
+    return ListValue.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ListValueProtoMsg): ListValue {
+    return ListValue.decode(message.value);
+  },
+
+  toProto(message: ListValue): Uint8Array {
+    return ListValue.encode(message).finish();
+  },
+
+  toProtoMsg(message: ListValue): ListValueProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1alpha1.ListValue",
+      value: ListValue.encode(message).finish()
+    };
   }
 
 };
@@ -745,6 +808,8 @@ function createBaseMapValue(): MapValue {
 }
 
 export const MapValue = {
+  typeUrl: "/google.api.expr.v1alpha1.MapValue",
+
   encode(message: MapValue, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.entries) {
       MapValue_Entry.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -833,6 +898,25 @@ export const MapValue = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: MapValueAminoMsg): MapValue {
+    return MapValue.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MapValueProtoMsg): MapValue {
+    return MapValue.decode(message.value);
+  },
+
+  toProto(message: MapValue): Uint8Array {
+    return MapValue.encode(message).finish();
+  },
+
+  toProtoMsg(message: MapValue): MapValueProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1alpha1.MapValue",
+      value: MapValue.encode(message).finish()
+    };
   }
 
 };
@@ -845,6 +929,8 @@ function createBaseMapValue_Entry(): MapValue_Entry {
 }
 
 export const MapValue_Entry = {
+  typeUrl: "/google.api.expr.v1alpha1.Entry",
+
   encode(message: MapValue_Entry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.key !== undefined) {
       Value.encode(message.key, writer.uint32(10).fork()).ldelim();
@@ -930,6 +1016,25 @@ export const MapValue_Entry = {
     obj.key = message.key ? Value.toAmino(message.key) : undefined;
     obj.value = message.value ? Value.toAmino(message.value) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MapValue_EntryAminoMsg): MapValue_Entry {
+    return MapValue_Entry.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MapValue_EntryProtoMsg): MapValue_Entry {
+    return MapValue_Entry.decode(message.value);
+  },
+
+  toProto(message: MapValue_Entry): Uint8Array {
+    return MapValue_Entry.encode(message).finish();
+  },
+
+  toProtoMsg(message: MapValue_Entry): MapValue_EntryProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1alpha1.Entry",
+      value: MapValue_Entry.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/api/expr/v1beta1/decl.ts b/__fixtures__/outputv2/google/api/expr/v1beta1/decl.ts
index de2a15613..a9207e1fc 100644
--- a/__fixtures__/outputv2/google/api/expr/v1beta1/decl.ts
+++ b/__fixtures__/outputv2/google/api/expr/v1beta1/decl.ts
@@ -20,7 +20,7 @@ export interface Decl {
   /** A function declaration. */
   function?: FunctionDecl;
 }
-export interface DeclProtoType {
+export interface DeclProtoMsg {
   typeUrl: "/google.api.expr.v1beta1.Decl";
   value: Uint8Array;
 }
@@ -42,7 +42,7 @@ export interface DeclAmino {
   /** A function declaration. */
   function?: FunctionDeclAmino;
 }
-export interface DeclAminoType {
+export interface DeclAminoMsg {
   type: "/google.api.expr.v1beta1.Decl";
   value: DeclAmino;
 }
@@ -75,7 +75,7 @@ export interface DeclType {
    */
   typeParams: DeclType[];
 }
-export interface DeclTypeProtoType {
+export interface DeclTypeProtoMsg {
   typeUrl: "/google.api.expr.v1beta1.DeclType";
   value: Uint8Array;
 }
@@ -99,7 +99,7 @@ export interface DeclTypeAmino {
    */
   type_params: DeclTypeAmino[];
 }
-export interface DeclTypeAminoType {
+export interface DeclTypeAminoMsg {
   type: "/google.api.expr.v1beta1.DeclType";
   value: DeclTypeAmino;
 }
@@ -124,7 +124,7 @@ export interface IdentDecl {
   /** Optional value of the identifier. */
   value?: Expr;
 }
-export interface IdentDeclProtoType {
+export interface IdentDeclProtoMsg {
   typeUrl: "/google.api.expr.v1beta1.IdentDecl";
   value: Uint8Array;
 }
@@ -137,7 +137,7 @@ export interface IdentDeclAmino {
   /** Optional value of the identifier. */
   value?: ExprAmino;
 }
-export interface IdentDeclAminoType {
+export interface IdentDeclAminoMsg {
   type: "/google.api.expr.v1beta1.IdentDecl";
   value: IdentDeclAmino;
 }
@@ -159,7 +159,7 @@ export interface FunctionDecl {
   /** If the first argument of the function is the receiver. */
   receiverFunction: boolean;
 }
-export interface FunctionDeclProtoType {
+export interface FunctionDeclProtoMsg {
   typeUrl: "/google.api.expr.v1beta1.FunctionDecl";
   value: Uint8Array;
 }
@@ -175,7 +175,7 @@ export interface FunctionDeclAmino {
   /** If the first argument of the function is the receiver. */
   receiver_function: boolean;
 }
-export interface FunctionDeclAminoType {
+export interface FunctionDeclAminoMsg {
   type: "/google.api.expr.v1beta1.FunctionDecl";
   value: FunctionDeclAmino;
 }
@@ -198,6 +198,8 @@ function createBaseDecl(): Decl {
 }
 
 export const Decl = {
+  typeUrl: "/google.api.expr.v1beta1.Decl",
+
   encode(message: Decl, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.id !== 0) {
       writer.uint32(8).int32(message.id);
@@ -328,6 +330,25 @@ export const Decl = {
     obj.ident = message.ident ? IdentDecl.toAmino(message.ident) : undefined;
     obj.function = message.function ? FunctionDecl.toAmino(message.function) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: DeclAminoMsg): Decl {
+    return Decl.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: DeclProtoMsg): Decl {
+    return Decl.decode(message.value);
+  },
+
+  toProto(message: Decl): Uint8Array {
+    return Decl.encode(message).finish();
+  },
+
+  toProtoMsg(message: Decl): DeclProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1beta1.Decl",
+      value: Decl.encode(message).finish()
+    };
   }
 
 };
@@ -341,6 +362,8 @@ function createBaseDeclType(): DeclType {
 }
 
 export const DeclType = {
+  typeUrl: "/google.api.expr.v1beta1.DeclType",
+
   encode(message: DeclType, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.id !== 0) {
       writer.uint32(8).int32(message.id);
@@ -459,6 +482,25 @@ export const DeclType = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: DeclTypeAminoMsg): DeclType {
+    return DeclType.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: DeclTypeProtoMsg): DeclType {
+    return DeclType.decode(message.value);
+  },
+
+  toProto(message: DeclType): Uint8Array {
+    return DeclType.encode(message).finish();
+  },
+
+  toProtoMsg(message: DeclType): DeclTypeProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1beta1.DeclType",
+      value: DeclType.encode(message).finish()
+    };
   }
 
 };
@@ -471,6 +513,8 @@ function createBaseIdentDecl(): IdentDecl {
 }
 
 export const IdentDecl = {
+  typeUrl: "/google.api.expr.v1beta1.IdentDecl",
+
   encode(message: IdentDecl, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.type !== undefined) {
       DeclType.encode(message.type, writer.uint32(26).fork()).ldelim();
@@ -556,6 +600,25 @@ export const IdentDecl = {
     obj.type = message.type ? DeclType.toAmino(message.type) : undefined;
     obj.value = message.value ? Expr.toAmino(message.value) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: IdentDeclAminoMsg): IdentDecl {
+    return IdentDecl.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: IdentDeclProtoMsg): IdentDecl {
+    return IdentDecl.decode(message.value);
+  },
+
+  toProto(message: IdentDecl): Uint8Array {
+    return IdentDecl.encode(message).finish();
+  },
+
+  toProtoMsg(message: IdentDecl): IdentDeclProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1beta1.IdentDecl",
+      value: IdentDecl.encode(message).finish()
+    };
   }
 
 };
@@ -569,6 +632,8 @@ function createBaseFunctionDecl(): FunctionDecl {
 }
 
 export const FunctionDecl = {
+  typeUrl: "/google.api.expr.v1beta1.FunctionDecl",
+
   encode(message: FunctionDecl, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.args) {
       IdentDecl.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -687,6 +752,25 @@ export const FunctionDecl = {
     obj.return_type = message.returnType ? DeclType.toAmino(message.returnType) : undefined;
     obj.receiver_function = message.receiverFunction;
     return obj;
+  },
+
+  fromAminoMsg(object: FunctionDeclAminoMsg): FunctionDecl {
+    return FunctionDecl.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: FunctionDeclProtoMsg): FunctionDecl {
+    return FunctionDecl.decode(message.value);
+  },
+
+  toProto(message: FunctionDecl): Uint8Array {
+    return FunctionDecl.encode(message).finish();
+  },
+
+  toProtoMsg(message: FunctionDecl): FunctionDeclProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1beta1.FunctionDecl",
+      value: FunctionDecl.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/api/expr/v1beta1/eval.ts b/__fixtures__/outputv2/google/api/expr/v1beta1/eval.ts
index a925c6885..e1839db66 100644
--- a/__fixtures__/outputv2/google/api/expr/v1beta1/eval.ts
+++ b/__fixtures__/outputv2/google/api/expr/v1beta1/eval.ts
@@ -21,7 +21,7 @@ export interface EvalState {
    */
   results: EvalState_Result[];
 }
-export interface EvalStateProtoType {
+export interface EvalStateProtoMsg {
   typeUrl: "/google.api.expr.v1beta1.EvalState";
   value: Uint8Array;
 }
@@ -43,7 +43,7 @@ export interface EvalStateAmino {
    */
   results: EvalState_ResultAmino[];
 }
-export interface EvalStateAminoType {
+export interface EvalStateAminoMsg {
   type: "/google.api.expr.v1beta1.EvalState";
   value: EvalStateAmino;
 }
@@ -66,7 +66,7 @@ export interface EvalState_Result {
   /** The index in `values` of the resulting value. */
   value: number;
 }
-export interface EvalState_ResultProtoType {
+export interface EvalState_ResultProtoMsg {
   typeUrl: "/google.api.expr.v1beta1.Result";
   value: Uint8Array;
 }
@@ -79,7 +79,7 @@ export interface EvalState_ResultAmino {
   /** The index in `values` of the resulting value. */
   value: number;
 }
-export interface EvalState_ResultAminoType {
+export interface EvalState_ResultAminoMsg {
   type: "/google.api.expr.v1beta1.Result";
   value: EvalState_ResultAmino;
 }
@@ -143,7 +143,7 @@ export interface ExprValue {
    */
   unknown?: UnknownSet;
 }
-export interface ExprValueProtoType {
+export interface ExprValueProtoMsg {
   typeUrl: "/google.api.expr.v1beta1.ExprValue";
   value: Uint8Array;
 }
@@ -201,7 +201,7 @@ export interface ExprValueAmino {
    */
   unknown?: UnknownSetAmino;
 }
-export interface ExprValueAminoType {
+export interface ExprValueAminoMsg {
   type: "/google.api.expr.v1beta1.ExprValue";
   value: ExprValueAmino;
 }
@@ -222,7 +222,7 @@ export interface ErrorSet {
   /** The errors in the set. */
   errors: Status[];
 }
-export interface ErrorSetProtoType {
+export interface ErrorSetProtoMsg {
   typeUrl: "/google.api.expr.v1beta1.ErrorSet";
   value: Uint8Array;
 }
@@ -236,7 +236,7 @@ export interface ErrorSetAmino {
   /** The errors in the set. */
   errors: StatusAmino[];
 }
-export interface ErrorSetAminoType {
+export interface ErrorSetAminoMsg {
   type: "/google.api.expr.v1beta1.ErrorSet";
   value: ErrorSetAmino;
 }
@@ -259,7 +259,7 @@ export interface UnknownSet {
   /** The ids of the expressions with unknown values. */
   exprs: IdRef[];
 }
-export interface UnknownSetProtoType {
+export interface UnknownSetProtoMsg {
   typeUrl: "/google.api.expr.v1beta1.UnknownSet";
   value: Uint8Array;
 }
@@ -273,7 +273,7 @@ export interface UnknownSetAmino {
   /** The ids of the expressions with unknown values. */
   exprs: IdRefAmino[];
 }
-export interface UnknownSetAminoType {
+export interface UnknownSetAminoMsg {
   type: "/google.api.expr.v1beta1.UnknownSet";
   value: UnknownSetAmino;
 }
@@ -292,7 +292,7 @@ export interface IdRef {
   /** The expression id. */
   id: number;
 }
-export interface IdRefProtoType {
+export interface IdRefProtoMsg {
   typeUrl: "/google.api.expr.v1beta1.IdRef";
   value: Uint8Array;
 }
@@ -302,7 +302,7 @@ export interface IdRefAmino {
   /** The expression id. */
   id: number;
 }
-export interface IdRefAminoType {
+export interface IdRefAminoMsg {
   type: "/google.api.expr.v1beta1.IdRef";
   value: IdRefAmino;
 }
@@ -320,6 +320,8 @@ function createBaseEvalState(): EvalState {
 }
 
 export const EvalState = {
+  typeUrl: "/google.api.expr.v1beta1.EvalState",
+
   encode(message: EvalState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.values) {
       ExprValue.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -438,6 +440,25 @@ export const EvalState = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: EvalStateAminoMsg): EvalState {
+    return EvalState.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: EvalStateProtoMsg): EvalState {
+    return EvalState.decode(message.value);
+  },
+
+  toProto(message: EvalState): Uint8Array {
+    return EvalState.encode(message).finish();
+  },
+
+  toProtoMsg(message: EvalState): EvalStateProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1beta1.EvalState",
+      value: EvalState.encode(message).finish()
+    };
   }
 
 };
@@ -450,6 +471,8 @@ function createBaseEvalState_Result(): EvalState_Result {
 }
 
 export const EvalState_Result = {
+  typeUrl: "/google.api.expr.v1beta1.Result",
+
   encode(message: EvalState_Result, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.expr !== undefined) {
       IdRef.encode(message.expr, writer.uint32(10).fork()).ldelim();
@@ -535,6 +558,25 @@ export const EvalState_Result = {
     obj.expr = message.expr ? IdRef.toAmino(message.expr) : undefined;
     obj.value = message.value;
     return obj;
+  },
+
+  fromAminoMsg(object: EvalState_ResultAminoMsg): EvalState_Result {
+    return EvalState_Result.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: EvalState_ResultProtoMsg): EvalState_Result {
+    return EvalState_Result.decode(message.value);
+  },
+
+  toProto(message: EvalState_Result): Uint8Array {
+    return EvalState_Result.encode(message).finish();
+  },
+
+  toProtoMsg(message: EvalState_Result): EvalState_ResultProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1beta1.Result",
+      value: EvalState_Result.encode(message).finish()
+    };
   }
 
 };
@@ -548,6 +590,8 @@ function createBaseExprValue(): ExprValue {
 }
 
 export const ExprValue = {
+  typeUrl: "/google.api.expr.v1beta1.ExprValue",
+
   encode(message: ExprValue, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.value !== undefined) {
       Value.encode(message.value, writer.uint32(10).fork()).ldelim();
@@ -648,6 +692,25 @@ export const ExprValue = {
     obj.error = message.error ? ErrorSet.toAmino(message.error) : undefined;
     obj.unknown = message.unknown ? UnknownSet.toAmino(message.unknown) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ExprValueAminoMsg): ExprValue {
+    return ExprValue.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ExprValueProtoMsg): ExprValue {
+    return ExprValue.decode(message.value);
+  },
+
+  toProto(message: ExprValue): Uint8Array {
+    return ExprValue.encode(message).finish();
+  },
+
+  toProtoMsg(message: ExprValue): ExprValueProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1beta1.ExprValue",
+      value: ExprValue.encode(message).finish()
+    };
   }
 
 };
@@ -659,6 +722,8 @@ function createBaseErrorSet(): ErrorSet {
 }
 
 export const ErrorSet = {
+  typeUrl: "/google.api.expr.v1beta1.ErrorSet",
+
   encode(message: ErrorSet, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.errors) {
       Status.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -747,6 +812,25 @@ export const ErrorSet = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ErrorSetAminoMsg): ErrorSet {
+    return ErrorSet.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ErrorSetProtoMsg): ErrorSet {
+    return ErrorSet.decode(message.value);
+  },
+
+  toProto(message: ErrorSet): Uint8Array {
+    return ErrorSet.encode(message).finish();
+  },
+
+  toProtoMsg(message: ErrorSet): ErrorSetProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1beta1.ErrorSet",
+      value: ErrorSet.encode(message).finish()
+    };
   }
 
 };
@@ -758,6 +842,8 @@ function createBaseUnknownSet(): UnknownSet {
 }
 
 export const UnknownSet = {
+  typeUrl: "/google.api.expr.v1beta1.UnknownSet",
+
   encode(message: UnknownSet, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.exprs) {
       IdRef.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -846,6 +932,25 @@ export const UnknownSet = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: UnknownSetAminoMsg): UnknownSet {
+    return UnknownSet.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: UnknownSetProtoMsg): UnknownSet {
+    return UnknownSet.decode(message.value);
+  },
+
+  toProto(message: UnknownSet): Uint8Array {
+    return UnknownSet.encode(message).finish();
+  },
+
+  toProtoMsg(message: UnknownSet): UnknownSetProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1beta1.UnknownSet",
+      value: UnknownSet.encode(message).finish()
+    };
   }
 
 };
@@ -857,6 +962,8 @@ function createBaseIdRef(): IdRef {
 }
 
 export const IdRef = {
+  typeUrl: "/google.api.expr.v1beta1.IdRef",
+
   encode(message: IdRef, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.id !== 0) {
       writer.uint32(8).int32(message.id);
@@ -927,6 +1034,25 @@ export const IdRef = {
     const obj: any = {};
     obj.id = message.id;
     return obj;
+  },
+
+  fromAminoMsg(object: IdRefAminoMsg): IdRef {
+    return IdRef.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: IdRefProtoMsg): IdRef {
+    return IdRef.decode(message.value);
+  },
+
+  toProto(message: IdRef): Uint8Array {
+    return IdRef.encode(message).finish();
+  },
+
+  toProtoMsg(message: IdRef): IdRefProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1beta1.IdRef",
+      value: IdRef.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/api/expr/v1beta1/expr.ts b/__fixtures__/outputv2/google/api/expr/v1beta1/expr.ts
index a8f10409b..b1c7fb4e0 100644
--- a/__fixtures__/outputv2/google/api/expr/v1beta1/expr.ts
+++ b/__fixtures__/outputv2/google/api/expr/v1beta1/expr.ts
@@ -15,7 +15,7 @@ export interface ParsedExpr {
   /** The syntax version of the source, e.g. `cel1`. */
   syntaxVersion: string;
 }
-export interface ParsedExprProtoType {
+export interface ParsedExprProtoMsg {
   typeUrl: "/google.api.expr.v1beta1.ParsedExpr";
   value: Uint8Array;
 }
@@ -31,7 +31,7 @@ export interface ParsedExprAmino {
   /** The syntax version of the source, e.g. `cel1`. */
   syntax_version: string;
 }
-export interface ParsedExprAminoType {
+export interface ParsedExprAminoMsg {
   type: "/google.api.expr.v1beta1.ParsedExpr";
   value: ParsedExprAmino;
 }
@@ -89,7 +89,7 @@ export interface Expr {
   /** A comprehension expression. */
   comprehensionExpr?: Expr_Comprehension;
 }
-export interface ExprProtoType {
+export interface ExprProtoMsg {
   typeUrl: "/google.api.expr.v1beta1.Expr";
   value: Uint8Array;
 }
@@ -140,7 +140,7 @@ export interface ExprAmino {
   /** A comprehension expression. */
   comprehension_expr?: Expr_ComprehensionAmino;
 }
-export interface ExprAminoType {
+export interface ExprAminoMsg {
   type: "/google.api.expr.v1beta1.Expr";
   value: ExprAmino;
 }
@@ -183,7 +183,7 @@ export interface Expr_Ident {
    */
   name: string;
 }
-export interface Expr_IdentProtoType {
+export interface Expr_IdentProtoMsg {
   typeUrl: "/google.api.expr.v1beta1.Ident";
   value: Uint8Array;
 }
@@ -198,7 +198,7 @@ export interface Expr_IdentAmino {
    */
   name: string;
 }
-export interface Expr_IdentAminoType {
+export interface Expr_IdentAminoMsg {
   type: "/google.api.expr.v1beta1.Ident";
   value: Expr_IdentAmino;
 }
@@ -233,7 +233,7 @@ export interface Expr_Select {
    */
   testOnly: boolean;
 }
-export interface Expr_SelectProtoType {
+export interface Expr_SelectProtoMsg {
   typeUrl: "/google.api.expr.v1beta1.Select";
   value: Uint8Array;
 }
@@ -263,7 +263,7 @@ export interface Expr_SelectAmino {
    */
   test_only: boolean;
 }
-export interface Expr_SelectAminoType {
+export interface Expr_SelectAminoMsg {
   type: "/google.api.expr.v1beta1.Select";
   value: Expr_SelectAmino;
 }
@@ -293,7 +293,7 @@ export interface Expr_Call {
   /** The arguments. */
   args: Expr[];
 }
-export interface Expr_CallProtoType {
+export interface Expr_CallProtoMsg {
   typeUrl: "/google.api.expr.v1beta1.Call";
   value: Uint8Array;
 }
@@ -316,7 +316,7 @@ export interface Expr_CallAmino {
   /** The arguments. */
   args: ExprAmino[];
 }
-export interface Expr_CallAminoType {
+export interface Expr_CallAminoMsg {
   type: "/google.api.expr.v1beta1.Call";
   value: Expr_CallAmino;
 }
@@ -342,7 +342,7 @@ export interface Expr_CreateList {
   /** The elements part of the list. */
   elements: Expr[];
 }
-export interface Expr_CreateListProtoType {
+export interface Expr_CreateListProtoMsg {
   typeUrl: "/google.api.expr.v1beta1.CreateList";
   value: Uint8Array;
 }
@@ -357,7 +357,7 @@ export interface Expr_CreateListAmino {
   /** The elements part of the list. */
   elements: ExprAmino[];
 }
-export interface Expr_CreateListAminoType {
+export interface Expr_CreateListAminoMsg {
   type: "/google.api.expr.v1beta1.CreateList";
   value: Expr_CreateListAmino;
 }
@@ -389,7 +389,7 @@ export interface Expr_CreateStruct {
   /** The entries in the creation expression. */
   entries: Expr_CreateStruct_Entry[];
 }
-export interface Expr_CreateStructProtoType {
+export interface Expr_CreateStructProtoMsg {
   typeUrl: "/google.api.expr.v1beta1.CreateStruct";
   value: Uint8Array;
 }
@@ -411,7 +411,7 @@ export interface Expr_CreateStructAmino {
   /** The entries in the creation expression. */
   entries: Expr_CreateStruct_EntryAmino[];
 }
-export interface Expr_CreateStructAminoType {
+export interface Expr_CreateStructAminoMsg {
   type: "/google.api.expr.v1beta1.CreateStruct";
   value: Expr_CreateStructAmino;
 }
@@ -446,7 +446,7 @@ export interface Expr_CreateStruct_Entry {
   /** Required. The value assigned to the key. */
   value?: Expr;
 }
-export interface Expr_CreateStruct_EntryProtoType {
+export interface Expr_CreateStruct_EntryProtoMsg {
   typeUrl: "/google.api.expr.v1beta1.Entry";
   value: Uint8Array;
 }
@@ -469,7 +469,7 @@ export interface Expr_CreateStruct_EntryAmino {
   /** Required. The value assigned to the key. */
   value?: ExprAmino;
 }
-export interface Expr_CreateStruct_EntryAminoType {
+export interface Expr_CreateStruct_EntryAminoMsg {
   type: "/google.api.expr.v1beta1.Entry";
   value: Expr_CreateStruct_EntryAmino;
 }
@@ -545,7 +545,7 @@ export interface Expr_Comprehension {
    */
   result?: Expr;
 }
-export interface Expr_ComprehensionProtoType {
+export interface Expr_ComprehensionProtoMsg {
   typeUrl: "/google.api.expr.v1beta1.Comprehension";
   value: Uint8Array;
 }
@@ -613,7 +613,7 @@ export interface Expr_ComprehensionAmino {
    */
   result?: ExprAmino;
 }
-export interface Expr_ComprehensionAminoType {
+export interface Expr_ComprehensionAminoMsg {
   type: "/google.api.expr.v1beta1.Comprehension";
   value: Expr_ComprehensionAmino;
 }
@@ -691,7 +691,7 @@ export interface Literal {
   /** bytes value. */
   bytesValue?: Uint8Array;
 }
-export interface LiteralProtoType {
+export interface LiteralProtoMsg {
   typeUrl: "/google.api.expr.v1beta1.Literal";
   value: Uint8Array;
 }
@@ -731,7 +731,7 @@ export interface LiteralAmino {
   /** bytes value. */
   bytes_value?: Uint8Array;
 }
-export interface LiteralAminoType {
+export interface LiteralAminoMsg {
   type: "/google.api.expr.v1beta1.Literal";
   value: LiteralAmino;
 }
@@ -768,6 +768,8 @@ function createBaseParsedExpr(): ParsedExpr {
 }
 
 export const ParsedExpr = {
+  typeUrl: "/google.api.expr.v1beta1.ParsedExpr",
+
   encode(message: ParsedExpr, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.expr !== undefined) {
       Expr.encode(message.expr, writer.uint32(18).fork()).ldelim();
@@ -868,6 +870,25 @@ export const ParsedExpr = {
     obj.source_info = message.sourceInfo ? SourceInfo.toAmino(message.sourceInfo) : undefined;
     obj.syntax_version = message.syntaxVersion;
     return obj;
+  },
+
+  fromAminoMsg(object: ParsedExprAminoMsg): ParsedExpr {
+    return ParsedExpr.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ParsedExprProtoMsg): ParsedExpr {
+    return ParsedExpr.decode(message.value);
+  },
+
+  toProto(message: ParsedExpr): Uint8Array {
+    return ParsedExpr.encode(message).finish();
+  },
+
+  toProtoMsg(message: ParsedExpr): ParsedExprProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1beta1.ParsedExpr",
+      value: ParsedExpr.encode(message).finish()
+    };
   }
 
 };
@@ -886,6 +907,8 @@ function createBaseExpr(): Expr {
 }
 
 export const Expr = {
+  typeUrl: "/google.api.expr.v1beta1.Expr",
+
   encode(message: Expr, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.id !== 0) {
       writer.uint32(16).int32(message.id);
@@ -1061,6 +1084,25 @@ export const Expr = {
     obj.struct_expr = message.structExpr ? Expr_CreateStruct.toAmino(message.structExpr) : undefined;
     obj.comprehension_expr = message.comprehensionExpr ? Expr_Comprehension.toAmino(message.comprehensionExpr) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ExprAminoMsg): Expr {
+    return Expr.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ExprProtoMsg): Expr {
+    return Expr.decode(message.value);
+  },
+
+  toProto(message: Expr): Uint8Array {
+    return Expr.encode(message).finish();
+  },
+
+  toProtoMsg(message: Expr): ExprProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1beta1.Expr",
+      value: Expr.encode(message).finish()
+    };
   }
 
 };
@@ -1072,6 +1114,8 @@ function createBaseExpr_Ident(): Expr_Ident {
 }
 
 export const Expr_Ident = {
+  typeUrl: "/google.api.expr.v1beta1.Ident",
+
   encode(message: Expr_Ident, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -1142,6 +1186,25 @@ export const Expr_Ident = {
     const obj: any = {};
     obj.name = message.name;
     return obj;
+  },
+
+  fromAminoMsg(object: Expr_IdentAminoMsg): Expr_Ident {
+    return Expr_Ident.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: Expr_IdentProtoMsg): Expr_Ident {
+    return Expr_Ident.decode(message.value);
+  },
+
+  toProto(message: Expr_Ident): Uint8Array {
+    return Expr_Ident.encode(message).finish();
+  },
+
+  toProtoMsg(message: Expr_Ident): Expr_IdentProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1beta1.Ident",
+      value: Expr_Ident.encode(message).finish()
+    };
   }
 
 };
@@ -1155,6 +1218,8 @@ function createBaseExpr_Select(): Expr_Select {
 }
 
 export const Expr_Select = {
+  typeUrl: "/google.api.expr.v1beta1.Select",
+
   encode(message: Expr_Select, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.operand !== undefined) {
       Expr.encode(message.operand, writer.uint32(10).fork()).ldelim();
@@ -1255,6 +1320,25 @@ export const Expr_Select = {
     obj.field = message.field;
     obj.test_only = message.testOnly;
     return obj;
+  },
+
+  fromAminoMsg(object: Expr_SelectAminoMsg): Expr_Select {
+    return Expr_Select.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: Expr_SelectProtoMsg): Expr_Select {
+    return Expr_Select.decode(message.value);
+  },
+
+  toProto(message: Expr_Select): Uint8Array {
+    return Expr_Select.encode(message).finish();
+  },
+
+  toProtoMsg(message: Expr_Select): Expr_SelectProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1beta1.Select",
+      value: Expr_Select.encode(message).finish()
+    };
   }
 
 };
@@ -1268,6 +1352,8 @@ function createBaseExpr_Call(): Expr_Call {
 }
 
 export const Expr_Call = {
+  typeUrl: "/google.api.expr.v1beta1.Call",
+
   encode(message: Expr_Call, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.target !== undefined) {
       Expr.encode(message.target, writer.uint32(10).fork()).ldelim();
@@ -1386,6 +1472,25 @@ export const Expr_Call = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: Expr_CallAminoMsg): Expr_Call {
+    return Expr_Call.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: Expr_CallProtoMsg): Expr_Call {
+    return Expr_Call.decode(message.value);
+  },
+
+  toProto(message: Expr_Call): Uint8Array {
+    return Expr_Call.encode(message).finish();
+  },
+
+  toProtoMsg(message: Expr_Call): Expr_CallProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1beta1.Call",
+      value: Expr_Call.encode(message).finish()
+    };
   }
 
 };
@@ -1397,6 +1502,8 @@ function createBaseExpr_CreateList(): Expr_CreateList {
 }
 
 export const Expr_CreateList = {
+  typeUrl: "/google.api.expr.v1beta1.CreateList",
+
   encode(message: Expr_CreateList, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.elements) {
       Expr.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1485,6 +1592,25 @@ export const Expr_CreateList = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: Expr_CreateListAminoMsg): Expr_CreateList {
+    return Expr_CreateList.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: Expr_CreateListProtoMsg): Expr_CreateList {
+    return Expr_CreateList.decode(message.value);
+  },
+
+  toProto(message: Expr_CreateList): Uint8Array {
+    return Expr_CreateList.encode(message).finish();
+  },
+
+  toProtoMsg(message: Expr_CreateList): Expr_CreateListProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1beta1.CreateList",
+      value: Expr_CreateList.encode(message).finish()
+    };
   }
 
 };
@@ -1497,6 +1623,8 @@ function createBaseExpr_CreateStruct(): Expr_CreateStruct {
 }
 
 export const Expr_CreateStruct = {
+  typeUrl: "/google.api.expr.v1beta1.CreateStruct",
+
   encode(message: Expr_CreateStruct, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.type !== "") {
       writer.uint32(10).string(message.type);
@@ -1600,6 +1728,25 @@ export const Expr_CreateStruct = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: Expr_CreateStructAminoMsg): Expr_CreateStruct {
+    return Expr_CreateStruct.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: Expr_CreateStructProtoMsg): Expr_CreateStruct {
+    return Expr_CreateStruct.decode(message.value);
+  },
+
+  toProto(message: Expr_CreateStruct): Uint8Array {
+    return Expr_CreateStruct.encode(message).finish();
+  },
+
+  toProtoMsg(message: Expr_CreateStruct): Expr_CreateStructProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1beta1.CreateStruct",
+      value: Expr_CreateStruct.encode(message).finish()
+    };
   }
 
 };
@@ -1614,6 +1761,8 @@ function createBaseExpr_CreateStruct_Entry(): Expr_CreateStruct_Entry {
 }
 
 export const Expr_CreateStruct_Entry = {
+  typeUrl: "/google.api.expr.v1beta1.Entry",
+
   encode(message: Expr_CreateStruct_Entry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.id !== 0) {
       writer.uint32(8).int32(message.id);
@@ -1729,6 +1878,25 @@ export const Expr_CreateStruct_Entry = {
     obj.map_key = message.mapKey ? Expr.toAmino(message.mapKey) : undefined;
     obj.value = message.value ? Expr.toAmino(message.value) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: Expr_CreateStruct_EntryAminoMsg): Expr_CreateStruct_Entry {
+    return Expr_CreateStruct_Entry.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: Expr_CreateStruct_EntryProtoMsg): Expr_CreateStruct_Entry {
+    return Expr_CreateStruct_Entry.decode(message.value);
+  },
+
+  toProto(message: Expr_CreateStruct_Entry): Uint8Array {
+    return Expr_CreateStruct_Entry.encode(message).finish();
+  },
+
+  toProtoMsg(message: Expr_CreateStruct_Entry): Expr_CreateStruct_EntryProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1beta1.Entry",
+      value: Expr_CreateStruct_Entry.encode(message).finish()
+    };
   }
 
 };
@@ -1746,6 +1914,8 @@ function createBaseExpr_Comprehension(): Expr_Comprehension {
 }
 
 export const Expr_Comprehension = {
+  typeUrl: "/google.api.expr.v1beta1.Comprehension",
+
   encode(message: Expr_Comprehension, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.iterVar !== "") {
       writer.uint32(10).string(message.iterVar);
@@ -1906,6 +2076,25 @@ export const Expr_Comprehension = {
     obj.loop_step = message.loopStep ? Expr.toAmino(message.loopStep) : undefined;
     obj.result = message.result ? Expr.toAmino(message.result) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: Expr_ComprehensionAminoMsg): Expr_Comprehension {
+    return Expr_Comprehension.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: Expr_ComprehensionProtoMsg): Expr_Comprehension {
+    return Expr_Comprehension.decode(message.value);
+  },
+
+  toProto(message: Expr_Comprehension): Uint8Array {
+    return Expr_Comprehension.encode(message).finish();
+  },
+
+  toProtoMsg(message: Expr_Comprehension): Expr_ComprehensionProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1beta1.Comprehension",
+      value: Expr_Comprehension.encode(message).finish()
+    };
   }
 
 };
@@ -1923,6 +2112,8 @@ function createBaseLiteral(): Literal {
 }
 
 export const Literal = {
+  typeUrl: "/google.api.expr.v1beta1.Literal",
+
   encode(message: Literal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.nullValue !== undefined) {
       writer.uint32(8).int32(message.nullValue);
@@ -2083,6 +2274,25 @@ export const Literal = {
     obj.string_value = message.stringValue;
     obj.bytes_value = message.bytesValue;
     return obj;
+  },
+
+  fromAminoMsg(object: LiteralAminoMsg): Literal {
+    return Literal.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: LiteralProtoMsg): Literal {
+    return Literal.decode(message.value);
+  },
+
+  toProto(message: Literal): Uint8Array {
+    return Literal.encode(message).finish();
+  },
+
+  toProtoMsg(message: Literal): LiteralProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1beta1.Literal",
+      value: Literal.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/api/expr/v1beta1/source.ts b/__fixtures__/outputv2/google/api/expr/v1beta1/source.ts
index 59c0288f4..4458e13e4 100644
--- a/__fixtures__/outputv2/google/api/expr/v1beta1/source.ts
+++ b/__fixtures__/outputv2/google/api/expr/v1beta1/source.ts
@@ -5,16 +5,16 @@ export interface SourceInfo_PositionsEntry {
   key: number;
   value: number;
 }
-export interface SourceInfo_PositionsEntryProtoType {
-  typeUrl: "/google.api.expr.v1beta1.undefined";
+export interface SourceInfo_PositionsEntryProtoMsg {
+  typeUrl: string;
   value: Uint8Array;
 }
 export interface SourceInfo_PositionsEntryAmino {
   key: number;
   value: number;
 }
-export interface SourceInfo_PositionsEntryAminoType {
-  type: "/google.api.expr.v1beta1.undefined";
+export interface SourceInfo_PositionsEntryAminoMsg {
+  type: string;
   value: SourceInfo_PositionsEntryAmino;
 }
 export interface SourceInfo_PositionsEntrySDKType {
@@ -50,7 +50,7 @@ export interface SourceInfo {
     [key: number]: number;
   };
 }
-export interface SourceInfoProtoType {
+export interface SourceInfoProtoMsg {
   typeUrl: "/google.api.expr.v1beta1.SourceInfo";
   value: Uint8Array;
 }
@@ -83,7 +83,7 @@ export interface SourceInfoAmino {
     [key: number]: number;
   };
 }
-export interface SourceInfoAminoType {
+export interface SourceInfoAminoMsg {
   type: "/google.api.expr.v1beta1.SourceInfo";
   value: SourceInfoAmino;
 }
@@ -117,7 +117,7 @@ export interface SourcePosition {
    */
   column: number;
 }
-export interface SourcePositionProtoType {
+export interface SourcePositionProtoMsg {
   typeUrl: "/google.api.expr.v1beta1.SourcePosition";
   value: Uint8Array;
 }
@@ -142,7 +142,7 @@ export interface SourcePositionAmino {
    */
   column: number;
 }
-export interface SourcePositionAminoType {
+export interface SourcePositionAminoMsg {
   type: "/google.api.expr.v1beta1.SourcePosition";
   value: SourcePositionAmino;
 }
@@ -248,6 +248,18 @@ export const SourceInfo_PositionsEntry = {
     obj.key = message.key;
     obj.value = message.value;
     return obj;
+  },
+
+  fromAminoMsg(object: SourceInfo_PositionsEntryAminoMsg): SourceInfo_PositionsEntry {
+    return SourceInfo_PositionsEntry.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: SourceInfo_PositionsEntryProtoMsg): SourceInfo_PositionsEntry {
+    return SourceInfo_PositionsEntry.decode(message.value);
+  },
+
+  toProto(message: SourceInfo_PositionsEntry): Uint8Array {
+    return SourceInfo_PositionsEntry.encode(message).finish();
   }
 
 };
@@ -261,6 +273,8 @@ function createBaseSourceInfo(): SourceInfo {
 }
 
 export const SourceInfo = {
+  typeUrl: "/google.api.expr.v1beta1.SourceInfo",
+
   encode(message: SourceInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.location !== "") {
       writer.uint32(18).string(message.location);
@@ -442,6 +456,25 @@ export const SourceInfo = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: SourceInfoAminoMsg): SourceInfo {
+    return SourceInfo.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: SourceInfoProtoMsg): SourceInfo {
+    return SourceInfo.decode(message.value);
+  },
+
+  toProto(message: SourceInfo): Uint8Array {
+    return SourceInfo.encode(message).finish();
+  },
+
+  toProtoMsg(message: SourceInfo): SourceInfoProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1beta1.SourceInfo",
+      value: SourceInfo.encode(message).finish()
+    };
   }
 
 };
@@ -456,6 +489,8 @@ function createBaseSourcePosition(): SourcePosition {
 }
 
 export const SourcePosition = {
+  typeUrl: "/google.api.expr.v1beta1.SourcePosition",
+
   encode(message: SourcePosition, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.location !== "") {
       writer.uint32(10).string(message.location);
@@ -571,6 +606,25 @@ export const SourcePosition = {
     obj.line = message.line;
     obj.column = message.column;
     return obj;
+  },
+
+  fromAminoMsg(object: SourcePositionAminoMsg): SourcePosition {
+    return SourcePosition.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: SourcePositionProtoMsg): SourcePosition {
+    return SourcePosition.decode(message.value);
+  },
+
+  toProto(message: SourcePosition): Uint8Array {
+    return SourcePosition.encode(message).finish();
+  },
+
+  toProtoMsg(message: SourcePosition): SourcePositionProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1beta1.SourcePosition",
+      value: SourcePosition.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/api/expr/v1beta1/value.ts b/__fixtures__/outputv2/google/api/expr/v1beta1/value.ts
index 088bfef07..c36893c76 100644
--- a/__fixtures__/outputv2/google/api/expr/v1beta1/value.ts
+++ b/__fixtures__/outputv2/google/api/expr/v1beta1/value.ts
@@ -47,7 +47,7 @@ export interface Value {
   /** A Type value represented by the fully qualified name of the type. */
   typeValue?: string;
 }
-export interface ValueProtoType {
+export interface ValueProtoMsg {
   typeUrl: "/google.api.expr.v1beta1.Value";
   value: Uint8Array;
 }
@@ -95,7 +95,7 @@ export interface ValueAmino {
   /** A Type value represented by the fully qualified name of the type. */
   type_value?: string;
 }
-export interface ValueAminoType {
+export interface ValueAminoMsg {
   type: "/google.api.expr.v1beta1.Value";
   value: ValueAmino;
 }
@@ -129,7 +129,7 @@ export interface EnumValue {
   /** The value of the enum. */
   value: number;
 }
-export interface EnumValueProtoType {
+export interface EnumValueProtoMsg {
   typeUrl: "/google.api.expr.v1beta1.EnumValue";
   value: Uint8Array;
 }
@@ -142,7 +142,7 @@ export interface EnumValueAmino {
   /** The value of the enum. */
   value: number;
 }
-export interface EnumValueAminoType {
+export interface EnumValueAminoMsg {
   type: "/google.api.expr.v1beta1.EnumValue";
   value: EnumValueAmino;
 }
@@ -163,7 +163,7 @@ export interface ListValue {
   /** The ordered values in the list. */
   values: Value[];
 }
-export interface ListValueProtoType {
+export interface ListValueProtoMsg {
   typeUrl: "/google.api.expr.v1beta1.ListValue";
   value: Uint8Array;
 }
@@ -178,7 +178,7 @@ export interface ListValueAmino {
   /** The ordered values in the list. */
   values: ValueAmino[];
 }
-export interface ListValueAminoType {
+export interface ListValueAminoMsg {
   type: "/google.api.expr.v1beta1.ListValue";
   value: ListValueAmino;
 }
@@ -208,7 +208,7 @@ export interface MapValue {
    */
   entries: MapValue_Entry[];
 }
-export interface MapValueProtoType {
+export interface MapValueProtoMsg {
   typeUrl: "/google.api.expr.v1beta1.MapValue";
   value: Uint8Array;
 }
@@ -228,7 +228,7 @@ export interface MapValueAmino {
    */
   entries: MapValue_EntryAmino[];
 }
-export interface MapValueAminoType {
+export interface MapValueAminoMsg {
   type: "/google.api.expr.v1beta1.MapValue";
   value: MapValueAmino;
 }
@@ -256,7 +256,7 @@ export interface MapValue_Entry {
   /** The value. */
   value?: Value;
 }
-export interface MapValue_EntryProtoType {
+export interface MapValue_EntryProtoMsg {
   typeUrl: "/google.api.expr.v1beta1.Entry";
   value: Uint8Array;
 }
@@ -274,7 +274,7 @@ export interface MapValue_EntryAmino {
   /** The value. */
   value?: ValueAmino;
 }
-export interface MapValue_EntryAminoType {
+export interface MapValue_EntryAminoMsg {
   type: "/google.api.expr.v1beta1.Entry";
   value: MapValue_EntryAmino;
 }
@@ -303,6 +303,8 @@ function createBaseValue(): Value {
 }
 
 export const Value = {
+  typeUrl: "/google.api.expr.v1beta1.Value",
+
   encode(message: Value, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.nullValue !== undefined) {
       writer.uint32(8).int32(message.nullValue);
@@ -538,6 +540,25 @@ export const Value = {
     obj.list_value = message.listValue ? ListValue.toAmino(message.listValue) : undefined;
     obj.type_value = message.typeValue;
     return obj;
+  },
+
+  fromAminoMsg(object: ValueAminoMsg): Value {
+    return Value.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ValueProtoMsg): Value {
+    return Value.decode(message.value);
+  },
+
+  toProto(message: Value): Uint8Array {
+    return Value.encode(message).finish();
+  },
+
+  toProtoMsg(message: Value): ValueProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1beta1.Value",
+      value: Value.encode(message).finish()
+    };
   }
 
 };
@@ -550,6 +571,8 @@ function createBaseEnumValue(): EnumValue {
 }
 
 export const EnumValue = {
+  typeUrl: "/google.api.expr.v1beta1.EnumValue",
+
   encode(message: EnumValue, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.type !== "") {
       writer.uint32(10).string(message.type);
@@ -635,6 +658,25 @@ export const EnumValue = {
     obj.type = message.type;
     obj.value = message.value;
     return obj;
+  },
+
+  fromAminoMsg(object: EnumValueAminoMsg): EnumValue {
+    return EnumValue.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: EnumValueProtoMsg): EnumValue {
+    return EnumValue.decode(message.value);
+  },
+
+  toProto(message: EnumValue): Uint8Array {
+    return EnumValue.encode(message).finish();
+  },
+
+  toProtoMsg(message: EnumValue): EnumValueProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1beta1.EnumValue",
+      value: EnumValue.encode(message).finish()
+    };
   }
 
 };
@@ -646,6 +688,8 @@ function createBaseListValue(): ListValue {
 }
 
 export const ListValue = {
+  typeUrl: "/google.api.expr.v1beta1.ListValue",
+
   encode(message: ListValue, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.values) {
       Value.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -734,6 +778,25 @@ export const ListValue = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ListValueAminoMsg): ListValue {
+    return ListValue.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ListValueProtoMsg): ListValue {
+    return ListValue.decode(message.value);
+  },
+
+  toProto(message: ListValue): Uint8Array {
+    return ListValue.encode(message).finish();
+  },
+
+  toProtoMsg(message: ListValue): ListValueProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1beta1.ListValue",
+      value: ListValue.encode(message).finish()
+    };
   }
 
 };
@@ -745,6 +808,8 @@ function createBaseMapValue(): MapValue {
 }
 
 export const MapValue = {
+  typeUrl: "/google.api.expr.v1beta1.MapValue",
+
   encode(message: MapValue, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.entries) {
       MapValue_Entry.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -833,6 +898,25 @@ export const MapValue = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: MapValueAminoMsg): MapValue {
+    return MapValue.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MapValueProtoMsg): MapValue {
+    return MapValue.decode(message.value);
+  },
+
+  toProto(message: MapValue): Uint8Array {
+    return MapValue.encode(message).finish();
+  },
+
+  toProtoMsg(message: MapValue): MapValueProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1beta1.MapValue",
+      value: MapValue.encode(message).finish()
+    };
   }
 
 };
@@ -845,6 +929,8 @@ function createBaseMapValue_Entry(): MapValue_Entry {
 }
 
 export const MapValue_Entry = {
+  typeUrl: "/google.api.expr.v1beta1.Entry",
+
   encode(message: MapValue_Entry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.key !== undefined) {
       Value.encode(message.key, writer.uint32(10).fork()).ldelim();
@@ -930,6 +1016,25 @@ export const MapValue_Entry = {
     obj.key = message.key ? Value.toAmino(message.key) : undefined;
     obj.value = message.value ? Value.toAmino(message.value) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MapValue_EntryAminoMsg): MapValue_Entry {
+    return MapValue_Entry.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MapValue_EntryProtoMsg): MapValue_Entry {
+    return MapValue_Entry.decode(message.value);
+  },
+
+  toProto(message: MapValue_Entry): Uint8Array {
+    return MapValue_Entry.encode(message).finish();
+  },
+
+  toProtoMsg(message: MapValue_Entry): MapValue_EntryProtoMsg {
+    return {
+      typeUrl: "/google.api.expr.v1beta1.Entry",
+      value: MapValue_Entry.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/api/http.ts b/__fixtures__/outputv2/google/api/http.ts
index 33c852cba..8f8a2db23 100644
--- a/__fixtures__/outputv2/google/api/http.ts
+++ b/__fixtures__/outputv2/google/api/http.ts
@@ -25,7 +25,7 @@ export interface Http {
    */
   fullyDecodeReservedExpansion: boolean;
 }
-export interface HttpProtoType {
+export interface HttpProtoMsg {
   typeUrl: "/google.api.Http";
   value: Uint8Array;
 }
@@ -53,7 +53,7 @@ export interface HttpAmino {
    */
   fully_decode_reserved_expansion: boolean;
 }
-export interface HttpAminoType {
+export interface HttpAminoMsg {
   type: "/google.api.Http";
   value: HttpAmino;
 }
@@ -400,7 +400,7 @@ export interface HttpRule {
    */
   additionalBindings: HttpRule[];
 }
-export interface HttpRuleProtoType {
+export interface HttpRuleProtoMsg {
   typeUrl: "/google.api.HttpRule";
   value: Uint8Array;
 }
@@ -737,7 +737,7 @@ export interface HttpRuleAmino {
    */
   additional_bindings: HttpRuleAmino[];
 }
-export interface HttpRuleAminoType {
+export interface HttpRuleAminoMsg {
   type: "/google.api.HttpRule";
   value: HttpRuleAmino;
 }
@@ -1034,7 +1034,7 @@ export interface CustomHttpPattern {
   /** The path matched by this custom verb. */
   path: string;
 }
-export interface CustomHttpPatternProtoType {
+export interface CustomHttpPatternProtoMsg {
   typeUrl: "/google.api.CustomHttpPattern";
   value: Uint8Array;
 }
@@ -1047,7 +1047,7 @@ export interface CustomHttpPatternAmino {
   /** The path matched by this custom verb. */
   path: string;
 }
-export interface CustomHttpPatternAminoType {
+export interface CustomHttpPatternAminoMsg {
   type: "/google.api.CustomHttpPattern";
   value: CustomHttpPatternAmino;
 }
@@ -1066,6 +1066,8 @@ function createBaseHttp(): Http {
 }
 
 export const Http = {
+  typeUrl: "/google.api.Http",
+
   encode(message: Http, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.rules) {
       HttpRule.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1169,6 +1171,25 @@ export const Http = {
 
     obj.fully_decode_reserved_expansion = message.fullyDecodeReservedExpansion;
     return obj;
+  },
+
+  fromAminoMsg(object: HttpAminoMsg): Http {
+    return Http.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: HttpProtoMsg): Http {
+    return Http.decode(message.value);
+  },
+
+  toProto(message: Http): Uint8Array {
+    return Http.encode(message).finish();
+  },
+
+  toProtoMsg(message: Http): HttpProtoMsg {
+    return {
+      typeUrl: "/google.api.Http",
+      value: Http.encode(message).finish()
+    };
   }
 
 };
@@ -1189,6 +1210,8 @@ function createBaseHttpRule(): HttpRule {
 }
 
 export const HttpRule = {
+  typeUrl: "/google.api.HttpRule",
+
   encode(message: HttpRule, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.selector !== "") {
       writer.uint32(10).string(message.selector);
@@ -1412,6 +1435,25 @@ export const HttpRule = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: HttpRuleAminoMsg): HttpRule {
+    return HttpRule.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: HttpRuleProtoMsg): HttpRule {
+    return HttpRule.decode(message.value);
+  },
+
+  toProto(message: HttpRule): Uint8Array {
+    return HttpRule.encode(message).finish();
+  },
+
+  toProtoMsg(message: HttpRule): HttpRuleProtoMsg {
+    return {
+      typeUrl: "/google.api.HttpRule",
+      value: HttpRule.encode(message).finish()
+    };
   }
 
 };
@@ -1424,6 +1466,8 @@ function createBaseCustomHttpPattern(): CustomHttpPattern {
 }
 
 export const CustomHttpPattern = {
+  typeUrl: "/google.api.CustomHttpPattern",
+
   encode(message: CustomHttpPattern, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.kind !== "") {
       writer.uint32(10).string(message.kind);
@@ -1509,6 +1553,25 @@ export const CustomHttpPattern = {
     obj.kind = message.kind;
     obj.path = message.path;
     return obj;
+  },
+
+  fromAminoMsg(object: CustomHttpPatternAminoMsg): CustomHttpPattern {
+    return CustomHttpPattern.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: CustomHttpPatternProtoMsg): CustomHttpPattern {
+    return CustomHttpPattern.decode(message.value);
+  },
+
+  toProto(message: CustomHttpPattern): Uint8Array {
+    return CustomHttpPattern.encode(message).finish();
+  },
+
+  toProtoMsg(message: CustomHttpPattern): CustomHttpPatternProtoMsg {
+    return {
+      typeUrl: "/google.api.CustomHttpPattern",
+      value: CustomHttpPattern.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/api/httpbody.ts b/__fixtures__/outputv2/google/api/httpbody.ts
index 512e8d75f..aef25ccb9 100644
--- a/__fixtures__/outputv2/google/api/httpbody.ts
+++ b/__fixtures__/outputv2/google/api/httpbody.ts
@@ -61,7 +61,7 @@ export interface HttpBody {
    */
   extensions: Any[];
 }
-export interface HttpBodyProtoType {
+export interface HttpBodyProtoMsg {
   typeUrl: "/google.api.HttpBody";
   value: Uint8Array;
 }
@@ -124,7 +124,7 @@ export interface HttpBodyAmino {
    */
   extensions: AnyAmino[];
 }
-export interface HttpBodyAminoType {
+export interface HttpBodyAminoMsg {
   type: "/google.api.HttpBody";
   value: HttpBodyAmino;
 }
@@ -189,6 +189,8 @@ function createBaseHttpBody(): HttpBody {
 }
 
 export const HttpBody = {
+  typeUrl: "/google.api.HttpBody",
+
   encode(message: HttpBody, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.contentType !== "") {
       writer.uint32(10).string(message.contentType);
@@ -307,6 +309,25 @@ export const HttpBody = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: HttpBodyAminoMsg): HttpBody {
+    return HttpBody.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: HttpBodyProtoMsg): HttpBody {
+    return HttpBody.decode(message.value);
+  },
+
+  toProto(message: HttpBody): Uint8Array {
+    return HttpBody.encode(message).finish();
+  },
+
+  toProtoMsg(message: HttpBody): HttpBodyProtoMsg {
+    return {
+      typeUrl: "/google.api.HttpBody",
+      value: HttpBody.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/api/label.ts b/__fixtures__/outputv2/google/api/label.ts
index 2bf8795f2..a7e2c47ab 100644
--- a/__fixtures__/outputv2/google/api/label.ts
+++ b/__fixtures__/outputv2/google/api/label.ts
@@ -64,7 +64,7 @@ export interface LabelDescriptor {
   /** A human-readable description for the label. */
   description: string;
 }
-export interface LabelDescriptorProtoType {
+export interface LabelDescriptorProtoMsg {
   typeUrl: "/google.api.LabelDescriptor";
   value: Uint8Array;
 }
@@ -80,7 +80,7 @@ export interface LabelDescriptorAmino {
   /** A human-readable description for the label. */
   description: string;
 }
-export interface LabelDescriptorAminoType {
+export interface LabelDescriptorAminoMsg {
   type: "/google.api.LabelDescriptor";
   value: LabelDescriptorAmino;
 }
@@ -101,6 +101,8 @@ function createBaseLabelDescriptor(): LabelDescriptor {
 }
 
 export const LabelDescriptor = {
+  typeUrl: "/google.api.LabelDescriptor",
+
   encode(message: LabelDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.key !== "") {
       writer.uint32(10).string(message.key);
@@ -201,6 +203,25 @@ export const LabelDescriptor = {
     obj.value_type = message.valueType;
     obj.description = message.description;
     return obj;
+  },
+
+  fromAminoMsg(object: LabelDescriptorAminoMsg): LabelDescriptor {
+    return LabelDescriptor.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: LabelDescriptorProtoMsg): LabelDescriptor {
+    return LabelDescriptor.decode(message.value);
+  },
+
+  toProto(message: LabelDescriptor): Uint8Array {
+    return LabelDescriptor.encode(message).finish();
+  },
+
+  toProtoMsg(message: LabelDescriptor): LabelDescriptorProtoMsg {
+    return {
+      typeUrl: "/google.api.LabelDescriptor",
+      value: LabelDescriptor.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/api/log.ts b/__fixtures__/outputv2/google/api/log.ts
index e3ccf7dde..58921eaf5 100644
--- a/__fixtures__/outputv2/google/api/log.ts
+++ b/__fixtures__/outputv2/google/api/log.ts
@@ -41,7 +41,7 @@ export interface LogDescriptor {
    */
   displayName: string;
 }
-export interface LogDescriptorProtoType {
+export interface LogDescriptorProtoMsg {
   typeUrl: "/google.api.LogDescriptor";
   value: Uint8Array;
 }
@@ -84,7 +84,7 @@ export interface LogDescriptorAmino {
    */
   display_name: string;
 }
-export interface LogDescriptorAminoType {
+export interface LogDescriptorAminoMsg {
   type: "/google.api.LogDescriptor";
   value: LogDescriptorAmino;
 }
@@ -116,6 +116,8 @@ function createBaseLogDescriptor(): LogDescriptor {
 }
 
 export const LogDescriptor = {
+  typeUrl: "/google.api.LogDescriptor",
+
   encode(message: LogDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -249,6 +251,25 @@ export const LogDescriptor = {
     obj.description = message.description;
     obj.display_name = message.displayName;
     return obj;
+  },
+
+  fromAminoMsg(object: LogDescriptorAminoMsg): LogDescriptor {
+    return LogDescriptor.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: LogDescriptorProtoMsg): LogDescriptor {
+    return LogDescriptor.decode(message.value);
+  },
+
+  toProto(message: LogDescriptor): Uint8Array {
+    return LogDescriptor.encode(message).finish();
+  },
+
+  toProtoMsg(message: LogDescriptor): LogDescriptorProtoMsg {
+    return {
+      typeUrl: "/google.api.LogDescriptor",
+      value: LogDescriptor.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/api/logging.ts b/__fixtures__/outputv2/google/api/logging.ts
index 9f539f26b..f54e64943 100644
--- a/__fixtures__/outputv2/google/api/logging.ts
+++ b/__fixtures__/outputv2/google/api/logging.ts
@@ -50,7 +50,7 @@ export interface Logging {
    */
   consumerDestinations: Logging_LoggingDestination[];
 }
-export interface LoggingProtoType {
+export interface LoggingProtoMsg {
   typeUrl: "/google.api.Logging";
   value: Uint8Array;
 }
@@ -103,7 +103,7 @@ export interface LoggingAmino {
    */
   consumer_destinations: Logging_LoggingDestinationAmino[];
 }
-export interface LoggingAminoType {
+export interface LoggingAminoMsg {
   type: "/google.api.Logging";
   value: LoggingAmino;
 }
@@ -163,7 +163,7 @@ export interface Logging_LoggingDestination {
    */
   logs: string[];
 }
-export interface Logging_LoggingDestinationProtoType {
+export interface Logging_LoggingDestinationProtoMsg {
   typeUrl: "/google.api.LoggingDestination";
   value: Uint8Array;
 }
@@ -187,7 +187,7 @@ export interface Logging_LoggingDestinationAmino {
    */
   logs: string[];
 }
-export interface Logging_LoggingDestinationAminoType {
+export interface Logging_LoggingDestinationAminoMsg {
   type: "/google.api.LoggingDestination";
   value: Logging_LoggingDestinationAmino;
 }
@@ -209,6 +209,8 @@ function createBaseLogging(): Logging {
 }
 
 export const Logging = {
+  typeUrl: "/google.api.Logging",
+
   encode(message: Logging, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.producerDestinations) {
       Logging_LoggingDestination.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -327,6 +329,25 @@ export const Logging = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: LoggingAminoMsg): Logging {
+    return Logging.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: LoggingProtoMsg): Logging {
+    return Logging.decode(message.value);
+  },
+
+  toProto(message: Logging): Uint8Array {
+    return Logging.encode(message).finish();
+  },
+
+  toProtoMsg(message: Logging): LoggingProtoMsg {
+    return {
+      typeUrl: "/google.api.Logging",
+      value: Logging.encode(message).finish()
+    };
   }
 
 };
@@ -339,6 +360,8 @@ function createBaseLogging_LoggingDestination(): Logging_LoggingDestination {
 }
 
 export const Logging_LoggingDestination = {
+  typeUrl: "/google.api.LoggingDestination",
+
   encode(message: Logging_LoggingDestination, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.monitoredResource !== "") {
       writer.uint32(26).string(message.monitoredResource);
@@ -442,6 +465,25 @@ export const Logging_LoggingDestination = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: Logging_LoggingDestinationAminoMsg): Logging_LoggingDestination {
+    return Logging_LoggingDestination.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: Logging_LoggingDestinationProtoMsg): Logging_LoggingDestination {
+    return Logging_LoggingDestination.decode(message.value);
+  },
+
+  toProto(message: Logging_LoggingDestination): Uint8Array {
+    return Logging_LoggingDestination.encode(message).finish();
+  },
+
+  toProtoMsg(message: Logging_LoggingDestination): Logging_LoggingDestinationProtoMsg {
+    return {
+      typeUrl: "/google.api.LoggingDestination",
+      value: Logging_LoggingDestination.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/api/metric.ts b/__fixtures__/outputv2/google/api/metric.ts
index ba7437d0a..d5a21dd46 100644
--- a/__fixtures__/outputv2/google/api/metric.ts
+++ b/__fixtures__/outputv2/google/api/metric.ts
@@ -348,7 +348,7 @@ export interface MetricDescriptor {
    */
   monitoredResourceTypes: string[];
 }
-export interface MetricDescriptorProtoType {
+export interface MetricDescriptorProtoMsg {
   typeUrl: "/google.api.MetricDescriptor";
   value: Uint8Array;
 }
@@ -528,7 +528,7 @@ export interface MetricDescriptorAmino {
    */
   monitored_resource_types: string[];
 }
-export interface MetricDescriptorAminoType {
+export interface MetricDescriptorAminoMsg {
   type: "/google.api.MetricDescriptor";
   value: MetricDescriptorAmino;
 }
@@ -574,7 +574,7 @@ export interface MetricDescriptor_MetricDescriptorMetadata {
    */
   ingestDelay?: Duration;
 }
-export interface MetricDescriptor_MetricDescriptorMetadataProtoType {
+export interface MetricDescriptor_MetricDescriptorMetadataProtoMsg {
   typeUrl: "/google.api.MetricDescriptorMetadata";
   value: Uint8Array;
 }
@@ -601,7 +601,7 @@ export interface MetricDescriptor_MetricDescriptorMetadataAmino {
    */
   ingest_delay?: DurationAmino;
 }
-export interface MetricDescriptor_MetricDescriptorMetadataAminoType {
+export interface MetricDescriptor_MetricDescriptorMetadataAminoMsg {
   type: "/google.api.MetricDescriptorMetadata";
   value: MetricDescriptor_MetricDescriptorMetadataAmino;
 }
@@ -617,16 +617,16 @@ export interface Metric_LabelsEntry {
   key: string;
   value: string;
 }
-export interface Metric_LabelsEntryProtoType {
-  typeUrl: "/google.api.undefined";
+export interface Metric_LabelsEntryProtoMsg {
+  typeUrl: string;
   value: Uint8Array;
 }
 export interface Metric_LabelsEntryAmino {
   key: string;
   value: string;
 }
-export interface Metric_LabelsEntryAminoType {
-  type: "/google.api.undefined";
+export interface Metric_LabelsEntryAminoMsg {
+  type: string;
   value: Metric_LabelsEntryAmino;
 }
 export interface Metric_LabelsEntrySDKType {
@@ -653,7 +653,7 @@ export interface Metric {
     [key: string]: string;
   };
 }
-export interface MetricProtoType {
+export interface MetricProtoMsg {
   typeUrl: "/google.api.Metric";
   value: Uint8Array;
 }
@@ -677,7 +677,7 @@ export interface MetricAmino {
     [key: string]: string;
   };
 }
-export interface MetricAminoType {
+export interface MetricAminoMsg {
   type: "/google.api.Metric";
   value: MetricAmino;
 }
@@ -710,6 +710,8 @@ function createBaseMetricDescriptor(): MetricDescriptor {
 }
 
 export const MetricDescriptor = {
+  typeUrl: "/google.api.MetricDescriptor",
+
   encode(message: MetricDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -966,6 +968,25 @@ export const MetricDescriptor = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: MetricDescriptorAminoMsg): MetricDescriptor {
+    return MetricDescriptor.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MetricDescriptorProtoMsg): MetricDescriptor {
+    return MetricDescriptor.decode(message.value);
+  },
+
+  toProto(message: MetricDescriptor): Uint8Array {
+    return MetricDescriptor.encode(message).finish();
+  },
+
+  toProtoMsg(message: MetricDescriptor): MetricDescriptorProtoMsg {
+    return {
+      typeUrl: "/google.api.MetricDescriptor",
+      value: MetricDescriptor.encode(message).finish()
+    };
   }
 
 };
@@ -979,6 +1000,8 @@ function createBaseMetricDescriptor_MetricDescriptorMetadata(): MetricDescriptor
 }
 
 export const MetricDescriptor_MetricDescriptorMetadata = {
+  typeUrl: "/google.api.MetricDescriptorMetadata",
+
   encode(message: MetricDescriptor_MetricDescriptorMetadata, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.launchStage !== 0) {
       writer.uint32(8).int32(message.launchStage);
@@ -1079,6 +1102,25 @@ export const MetricDescriptor_MetricDescriptorMetadata = {
     obj.sample_period = message.samplePeriod ? Duration.toAmino(message.samplePeriod) : undefined;
     obj.ingest_delay = message.ingestDelay ? Duration.toAmino(message.ingestDelay) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MetricDescriptor_MetricDescriptorMetadataAminoMsg): MetricDescriptor_MetricDescriptorMetadata {
+    return MetricDescriptor_MetricDescriptorMetadata.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MetricDescriptor_MetricDescriptorMetadataProtoMsg): MetricDescriptor_MetricDescriptorMetadata {
+    return MetricDescriptor_MetricDescriptorMetadata.decode(message.value);
+  },
+
+  toProto(message: MetricDescriptor_MetricDescriptorMetadata): Uint8Array {
+    return MetricDescriptor_MetricDescriptorMetadata.encode(message).finish();
+  },
+
+  toProtoMsg(message: MetricDescriptor_MetricDescriptorMetadata): MetricDescriptor_MetricDescriptorMetadataProtoMsg {
+    return {
+      typeUrl: "/google.api.MetricDescriptorMetadata",
+      value: MetricDescriptor_MetricDescriptorMetadata.encode(message).finish()
+    };
   }
 
 };
@@ -1176,6 +1218,18 @@ export const Metric_LabelsEntry = {
     obj.key = message.key;
     obj.value = message.value;
     return obj;
+  },
+
+  fromAminoMsg(object: Metric_LabelsEntryAminoMsg): Metric_LabelsEntry {
+    return Metric_LabelsEntry.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: Metric_LabelsEntryProtoMsg): Metric_LabelsEntry {
+    return Metric_LabelsEntry.decode(message.value);
+  },
+
+  toProto(message: Metric_LabelsEntry): Uint8Array {
+    return Metric_LabelsEntry.encode(message).finish();
   }
 
 };
@@ -1188,6 +1242,8 @@ function createBaseMetric(): Metric {
 }
 
 export const Metric = {
+  typeUrl: "/google.api.Metric",
+
   encode(message: Metric, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.type !== "") {
       writer.uint32(26).string(message.type);
@@ -1324,6 +1380,25 @@ export const Metric = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: MetricAminoMsg): Metric {
+    return Metric.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MetricProtoMsg): Metric {
+    return Metric.decode(message.value);
+  },
+
+  toProto(message: Metric): Uint8Array {
+    return Metric.encode(message).finish();
+  },
+
+  toProtoMsg(message: Metric): MetricProtoMsg {
+    return {
+      typeUrl: "/google.api.Metric",
+      value: Metric.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/api/monitored_resource.ts b/__fixtures__/outputv2/google/api/monitored_resource.ts
index cd355ca6f..751052416 100644
--- a/__fixtures__/outputv2/google/api/monitored_resource.ts
+++ b/__fixtures__/outputv2/google/api/monitored_resource.ts
@@ -57,7 +57,7 @@ export interface MonitoredResourceDescriptor {
   /** Optional. The launch stage of the monitored resource definition. */
   launchStage: LaunchStage;
 }
-export interface MonitoredResourceDescriptorProtoType {
+export interface MonitoredResourceDescriptorProtoMsg {
   typeUrl: "/google.api.MonitoredResourceDescriptor";
   value: Uint8Array;
 }
@@ -114,7 +114,7 @@ export interface MonitoredResourceDescriptorAmino {
   /** Optional. The launch stage of the monitored resource definition. */
   launch_stage: LaunchStage;
 }
-export interface MonitoredResourceDescriptorAminoType {
+export interface MonitoredResourceDescriptorAminoMsg {
   type: "/google.api.MonitoredResourceDescriptor";
   value: MonitoredResourceDescriptorAmino;
 }
@@ -142,16 +142,16 @@ export interface MonitoredResource_LabelsEntry {
   key: string;
   value: string;
 }
-export interface MonitoredResource_LabelsEntryProtoType {
-  typeUrl: "/google.api.undefined";
+export interface MonitoredResource_LabelsEntryProtoMsg {
+  typeUrl: string;
   value: Uint8Array;
 }
 export interface MonitoredResource_LabelsEntryAmino {
   key: string;
   value: string;
 }
-export interface MonitoredResource_LabelsEntryAminoType {
-  type: "/google.api.undefined";
+export interface MonitoredResource_LabelsEntryAminoMsg {
+  type: string;
   value: MonitoredResource_LabelsEntryAmino;
 }
 export interface MonitoredResource_LabelsEntrySDKType {
@@ -191,7 +191,7 @@ export interface MonitoredResource {
     [key: string]: string;
   };
 }
-export interface MonitoredResourceProtoType {
+export interface MonitoredResourceProtoMsg {
   typeUrl: "/google.api.MonitoredResource";
   value: Uint8Array;
 }
@@ -228,7 +228,7 @@ export interface MonitoredResourceAmino {
     [key: string]: string;
   };
 }
-export interface MonitoredResourceAminoType {
+export interface MonitoredResourceAminoMsg {
   type: "/google.api.MonitoredResource";
   value: MonitoredResourceAmino;
 }
@@ -258,16 +258,16 @@ export interface MonitoredResourceMetadata_UserLabelsEntry {
   key: string;
   value: string;
 }
-export interface MonitoredResourceMetadata_UserLabelsEntryProtoType {
-  typeUrl: "/google.api.undefined";
+export interface MonitoredResourceMetadata_UserLabelsEntryProtoMsg {
+  typeUrl: string;
   value: Uint8Array;
 }
 export interface MonitoredResourceMetadata_UserLabelsEntryAmino {
   key: string;
   value: string;
 }
-export interface MonitoredResourceMetadata_UserLabelsEntryAminoType {
-  type: "/google.api.undefined";
+export interface MonitoredResourceMetadata_UserLabelsEntryAminoMsg {
+  type: string;
   value: MonitoredResourceMetadata_UserLabelsEntryAmino;
 }
 export interface MonitoredResourceMetadata_UserLabelsEntrySDKType {
@@ -303,7 +303,7 @@ export interface MonitoredResourceMetadata {
     [key: string]: string;
   };
 }
-export interface MonitoredResourceMetadataProtoType {
+export interface MonitoredResourceMetadataProtoMsg {
   typeUrl: "/google.api.MonitoredResourceMetadata";
   value: Uint8Array;
 }
@@ -336,7 +336,7 @@ export interface MonitoredResourceMetadataAmino {
     [key: string]: string;
   };
 }
-export interface MonitoredResourceMetadataAminoType {
+export interface MonitoredResourceMetadataAminoMsg {
   type: "/google.api.MonitoredResourceMetadata";
   value: MonitoredResourceMetadataAmino;
 }
@@ -368,6 +368,8 @@ function createBaseMonitoredResourceDescriptor(): MonitoredResourceDescriptor {
 }
 
 export const MonitoredResourceDescriptor = {
+  typeUrl: "/google.api.MonitoredResourceDescriptor",
+
   encode(message: MonitoredResourceDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(42).string(message.name);
@@ -531,6 +533,25 @@ export const MonitoredResourceDescriptor = {
 
     obj.launch_stage = message.launchStage;
     return obj;
+  },
+
+  fromAminoMsg(object: MonitoredResourceDescriptorAminoMsg): MonitoredResourceDescriptor {
+    return MonitoredResourceDescriptor.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MonitoredResourceDescriptorProtoMsg): MonitoredResourceDescriptor {
+    return MonitoredResourceDescriptor.decode(message.value);
+  },
+
+  toProto(message: MonitoredResourceDescriptor): Uint8Array {
+    return MonitoredResourceDescriptor.encode(message).finish();
+  },
+
+  toProtoMsg(message: MonitoredResourceDescriptor): MonitoredResourceDescriptorProtoMsg {
+    return {
+      typeUrl: "/google.api.MonitoredResourceDescriptor",
+      value: MonitoredResourceDescriptor.encode(message).finish()
+    };
   }
 
 };
@@ -628,6 +649,18 @@ export const MonitoredResource_LabelsEntry = {
     obj.key = message.key;
     obj.value = message.value;
     return obj;
+  },
+
+  fromAminoMsg(object: MonitoredResource_LabelsEntryAminoMsg): MonitoredResource_LabelsEntry {
+    return MonitoredResource_LabelsEntry.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MonitoredResource_LabelsEntryProtoMsg): MonitoredResource_LabelsEntry {
+    return MonitoredResource_LabelsEntry.decode(message.value);
+  },
+
+  toProto(message: MonitoredResource_LabelsEntry): Uint8Array {
+    return MonitoredResource_LabelsEntry.encode(message).finish();
   }
 
 };
@@ -640,6 +673,8 @@ function createBaseMonitoredResource(): MonitoredResource {
 }
 
 export const MonitoredResource = {
+  typeUrl: "/google.api.MonitoredResource",
+
   encode(message: MonitoredResource, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.type !== "") {
       writer.uint32(10).string(message.type);
@@ -776,6 +811,25 @@ export const MonitoredResource = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: MonitoredResourceAminoMsg): MonitoredResource {
+    return MonitoredResource.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MonitoredResourceProtoMsg): MonitoredResource {
+    return MonitoredResource.decode(message.value);
+  },
+
+  toProto(message: MonitoredResource): Uint8Array {
+    return MonitoredResource.encode(message).finish();
+  },
+
+  toProtoMsg(message: MonitoredResource): MonitoredResourceProtoMsg {
+    return {
+      typeUrl: "/google.api.MonitoredResource",
+      value: MonitoredResource.encode(message).finish()
+    };
   }
 
 };
@@ -873,6 +927,18 @@ export const MonitoredResourceMetadata_UserLabelsEntry = {
     obj.key = message.key;
     obj.value = message.value;
     return obj;
+  },
+
+  fromAminoMsg(object: MonitoredResourceMetadata_UserLabelsEntryAminoMsg): MonitoredResourceMetadata_UserLabelsEntry {
+    return MonitoredResourceMetadata_UserLabelsEntry.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MonitoredResourceMetadata_UserLabelsEntryProtoMsg): MonitoredResourceMetadata_UserLabelsEntry {
+    return MonitoredResourceMetadata_UserLabelsEntry.decode(message.value);
+  },
+
+  toProto(message: MonitoredResourceMetadata_UserLabelsEntry): Uint8Array {
+    return MonitoredResourceMetadata_UserLabelsEntry.encode(message).finish();
   }
 
 };
@@ -885,6 +951,8 @@ function createBaseMonitoredResourceMetadata(): MonitoredResourceMetadata {
 }
 
 export const MonitoredResourceMetadata = {
+  typeUrl: "/google.api.MonitoredResourceMetadata",
+
   encode(message: MonitoredResourceMetadata, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.systemLabels !== undefined) {
       Struct.encode(message.systemLabels, writer.uint32(10).fork()).ldelim();
@@ -1021,6 +1089,25 @@ export const MonitoredResourceMetadata = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: MonitoredResourceMetadataAminoMsg): MonitoredResourceMetadata {
+    return MonitoredResourceMetadata.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MonitoredResourceMetadataProtoMsg): MonitoredResourceMetadata {
+    return MonitoredResourceMetadata.decode(message.value);
+  },
+
+  toProto(message: MonitoredResourceMetadata): Uint8Array {
+    return MonitoredResourceMetadata.encode(message).finish();
+  },
+
+  toProtoMsg(message: MonitoredResourceMetadata): MonitoredResourceMetadataProtoMsg {
+    return {
+      typeUrl: "/google.api.MonitoredResourceMetadata",
+      value: MonitoredResourceMetadata.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/api/monitoring.ts b/__fixtures__/outputv2/google/api/monitoring.ts
index cc270fc5d..de09628a6 100644
--- a/__fixtures__/outputv2/google/api/monitoring.ts
+++ b/__fixtures__/outputv2/google/api/monitoring.ts
@@ -77,7 +77,7 @@ export interface Monitoring {
    */
   consumerDestinations: Monitoring_MonitoringDestination[];
 }
-export interface MonitoringProtoType {
+export interface MonitoringProtoMsg {
   typeUrl: "/google.api.Monitoring";
   value: Uint8Array;
 }
@@ -157,7 +157,7 @@ export interface MonitoringAmino {
    */
   consumer_destinations: Monitoring_MonitoringDestinationAmino[];
 }
-export interface MonitoringAminoType {
+export interface MonitoringAminoMsg {
   type: "/google.api.Monitoring";
   value: MonitoringAmino;
 }
@@ -238,7 +238,7 @@ export interface Monitoring_MonitoringDestination {
    */
   metrics: string[];
 }
-export interface Monitoring_MonitoringDestinationProtoType {
+export interface Monitoring_MonitoringDestinationProtoMsg {
   typeUrl: "/google.api.MonitoringDestination";
   value: Uint8Array;
 }
@@ -260,7 +260,7 @@ export interface Monitoring_MonitoringDestinationAmino {
    */
   metrics: string[];
 }
-export interface Monitoring_MonitoringDestinationAminoType {
+export interface Monitoring_MonitoringDestinationAminoMsg {
   type: "/google.api.MonitoringDestination";
   value: Monitoring_MonitoringDestinationAmino;
 }
@@ -282,6 +282,8 @@ function createBaseMonitoring(): Monitoring {
 }
 
 export const Monitoring = {
+  typeUrl: "/google.api.Monitoring",
+
   encode(message: Monitoring, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.producerDestinations) {
       Monitoring_MonitoringDestination.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -400,6 +402,25 @@ export const Monitoring = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: MonitoringAminoMsg): Monitoring {
+    return Monitoring.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MonitoringProtoMsg): Monitoring {
+    return Monitoring.decode(message.value);
+  },
+
+  toProto(message: Monitoring): Uint8Array {
+    return Monitoring.encode(message).finish();
+  },
+
+  toProtoMsg(message: Monitoring): MonitoringProtoMsg {
+    return {
+      typeUrl: "/google.api.Monitoring",
+      value: Monitoring.encode(message).finish()
+    };
   }
 
 };
@@ -412,6 +433,8 @@ function createBaseMonitoring_MonitoringDestination(): Monitoring_MonitoringDest
 }
 
 export const Monitoring_MonitoringDestination = {
+  typeUrl: "/google.api.MonitoringDestination",
+
   encode(message: Monitoring_MonitoringDestination, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.monitoredResource !== "") {
       writer.uint32(10).string(message.monitoredResource);
@@ -515,6 +538,25 @@ export const Monitoring_MonitoringDestination = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: Monitoring_MonitoringDestinationAminoMsg): Monitoring_MonitoringDestination {
+    return Monitoring_MonitoringDestination.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: Monitoring_MonitoringDestinationProtoMsg): Monitoring_MonitoringDestination {
+    return Monitoring_MonitoringDestination.decode(message.value);
+  },
+
+  toProto(message: Monitoring_MonitoringDestination): Uint8Array {
+    return Monitoring_MonitoringDestination.encode(message).finish();
+  },
+
+  toProtoMsg(message: Monitoring_MonitoringDestination): Monitoring_MonitoringDestinationProtoMsg {
+    return {
+      typeUrl: "/google.api.MonitoringDestination",
+      value: Monitoring_MonitoringDestination.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/api/quota.ts b/__fixtures__/outputv2/google/api/quota.ts
index c16f54e2a..b6ba52cd7 100644
--- a/__fixtures__/outputv2/google/api/quota.ts
+++ b/__fixtures__/outputv2/google/api/quota.ts
@@ -63,7 +63,7 @@ export interface Quota {
    */
   metricRules: MetricRule[];
 }
-export interface QuotaProtoType {
+export interface QuotaProtoMsg {
   typeUrl: "/google.api.Quota";
   value: Uint8Array;
 }
@@ -129,7 +129,7 @@ export interface QuotaAmino {
    */
   metric_rules: MetricRuleAmino[];
 }
-export interface QuotaAminoType {
+export interface QuotaAminoMsg {
   type: "/google.api.Quota";
   value: QuotaAmino;
 }
@@ -193,16 +193,16 @@ export interface MetricRule_MetricCostsEntry {
   key: string;
   value: Long;
 }
-export interface MetricRule_MetricCostsEntryProtoType {
-  typeUrl: "/google.api.undefined";
+export interface MetricRule_MetricCostsEntryProtoMsg {
+  typeUrl: string;
   value: Uint8Array;
 }
 export interface MetricRule_MetricCostsEntryAmino {
   key: string;
   value: string;
 }
-export interface MetricRule_MetricCostsEntryAminoType {
-  type: "/google.api.undefined";
+export interface MetricRule_MetricCostsEntryAminoMsg {
+  type: string;
   value: MetricRule_MetricCostsEntryAmino;
 }
 export interface MetricRule_MetricCostsEntrySDKType {
@@ -234,7 +234,7 @@ export interface MetricRule {
     [key: string]: Long;
   };
 }
-export interface MetricRuleProtoType {
+export interface MetricRuleProtoMsg {
   typeUrl: "/google.api.MetricRule";
   value: Uint8Array;
 }
@@ -263,7 +263,7 @@ export interface MetricRuleAmino {
     [key: string]: string;
   };
 }
-export interface MetricRuleAminoType {
+export interface MetricRuleAminoMsg {
   type: "/google.api.MetricRule";
   value: MetricRuleAmino;
 }
@@ -282,16 +282,16 @@ export interface QuotaLimit_ValuesEntry {
   key: string;
   value: Long;
 }
-export interface QuotaLimit_ValuesEntryProtoType {
-  typeUrl: "/google.api.undefined";
+export interface QuotaLimit_ValuesEntryProtoMsg {
+  typeUrl: string;
   value: Uint8Array;
 }
 export interface QuotaLimit_ValuesEntryAmino {
   key: string;
   value: string;
 }
-export interface QuotaLimit_ValuesEntryAminoType {
-  type: "/google.api.undefined";
+export interface QuotaLimit_ValuesEntryAminoMsg {
+  type: string;
   value: QuotaLimit_ValuesEntryAmino;
 }
 export interface QuotaLimit_ValuesEntrySDKType {
@@ -405,7 +405,7 @@ export interface QuotaLimit {
    */
   displayName: string;
 }
-export interface QuotaLimitProtoType {
+export interface QuotaLimitProtoMsg {
   typeUrl: "/google.api.QuotaLimit";
   value: Uint8Array;
 }
@@ -516,7 +516,7 @@ export interface QuotaLimitAmino {
    */
   display_name: string;
 }
-export interface QuotaLimitAminoType {
+export interface QuotaLimitAminoMsg {
   type: "/google.api.QuotaLimit";
   value: QuotaLimitAmino;
 }
@@ -549,6 +549,8 @@ function createBaseQuota(): Quota {
 }
 
 export const Quota = {
+  typeUrl: "/google.api.Quota",
+
   encode(message: Quota, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.limits) {
       QuotaLimit.encode(v!, writer.uint32(26).fork()).ldelim();
@@ -667,6 +669,25 @@ export const Quota = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: QuotaAminoMsg): Quota {
+    return Quota.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QuotaProtoMsg): Quota {
+    return Quota.decode(message.value);
+  },
+
+  toProto(message: Quota): Uint8Array {
+    return Quota.encode(message).finish();
+  },
+
+  toProtoMsg(message: Quota): QuotaProtoMsg {
+    return {
+      typeUrl: "/google.api.Quota",
+      value: Quota.encode(message).finish()
+    };
   }
 
 };
@@ -764,6 +785,18 @@ export const MetricRule_MetricCostsEntry = {
     obj.key = message.key;
     obj.value = message.value ? message.value.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MetricRule_MetricCostsEntryAminoMsg): MetricRule_MetricCostsEntry {
+    return MetricRule_MetricCostsEntry.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MetricRule_MetricCostsEntryProtoMsg): MetricRule_MetricCostsEntry {
+    return MetricRule_MetricCostsEntry.decode(message.value);
+  },
+
+  toProto(message: MetricRule_MetricCostsEntry): Uint8Array {
+    return MetricRule_MetricCostsEntry.encode(message).finish();
   }
 
 };
@@ -776,6 +809,8 @@ function createBaseMetricRule(): MetricRule {
 }
 
 export const MetricRule = {
+  typeUrl: "/google.api.MetricRule",
+
   encode(message: MetricRule, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.selector !== "") {
       writer.uint32(10).string(message.selector);
@@ -912,6 +947,25 @@ export const MetricRule = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: MetricRuleAminoMsg): MetricRule {
+    return MetricRule.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MetricRuleProtoMsg): MetricRule {
+    return MetricRule.decode(message.value);
+  },
+
+  toProto(message: MetricRule): Uint8Array {
+    return MetricRule.encode(message).finish();
+  },
+
+  toProtoMsg(message: MetricRule): MetricRuleProtoMsg {
+    return {
+      typeUrl: "/google.api.MetricRule",
+      value: MetricRule.encode(message).finish()
+    };
   }
 
 };
@@ -1009,6 +1063,18 @@ export const QuotaLimit_ValuesEntry = {
     obj.key = message.key;
     obj.value = message.value ? message.value.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QuotaLimit_ValuesEntryAminoMsg): QuotaLimit_ValuesEntry {
+    return QuotaLimit_ValuesEntry.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QuotaLimit_ValuesEntryProtoMsg): QuotaLimit_ValuesEntry {
+    return QuotaLimit_ValuesEntry.decode(message.value);
+  },
+
+  toProto(message: QuotaLimit_ValuesEntry): Uint8Array {
+    return QuotaLimit_ValuesEntry.encode(message).finish();
   }
 
 };
@@ -1029,6 +1095,8 @@ function createBaseQuotaLimit(): QuotaLimit {
 }
 
 export const QuotaLimit = {
+  typeUrl: "/google.api.QuotaLimit",
+
   encode(message: QuotaLimit, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(50).string(message.name);
@@ -1286,6 +1354,25 @@ export const QuotaLimit = {
 
     obj.display_name = message.displayName;
     return obj;
+  },
+
+  fromAminoMsg(object: QuotaLimitAminoMsg): QuotaLimit {
+    return QuotaLimit.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QuotaLimitProtoMsg): QuotaLimit {
+    return QuotaLimit.decode(message.value);
+  },
+
+  toProto(message: QuotaLimit): Uint8Array {
+    return QuotaLimit.encode(message).finish();
+  },
+
+  toProtoMsg(message: QuotaLimit): QuotaLimitProtoMsg {
+    return {
+      typeUrl: "/google.api.QuotaLimit",
+      value: QuotaLimit.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/api/resource.ts b/__fixtures__/outputv2/google/api/resource.ts
index 19f49990f..c802c203d 100644
--- a/__fixtures__/outputv2/google/api/resource.ts
+++ b/__fixtures__/outputv2/google/api/resource.ts
@@ -251,7 +251,7 @@ export interface ResourceDescriptor {
    */
   style: ResourceDescriptor_Style[];
 }
-export interface ResourceDescriptorProtoType {
+export interface ResourceDescriptorProtoMsg {
   typeUrl: "/google.api.ResourceDescriptor";
   value: Uint8Array;
 }
@@ -394,7 +394,7 @@ export interface ResourceDescriptorAmino {
    */
   style: ResourceDescriptor_Style[];
 }
-export interface ResourceDescriptorAminoType {
+export interface ResourceDescriptorAminoMsg {
   type: "/google.api.ResourceDescriptor";
   value: ResourceDescriptorAmino;
 }
@@ -502,7 +502,7 @@ export interface ResourceReference {
    */
   childType: string;
 }
-export interface ResourceReferenceProtoType {
+export interface ResourceReferenceProtoMsg {
   typeUrl: "/google.api.ResourceReference";
   value: Uint8Array;
 }
@@ -551,7 +551,7 @@ export interface ResourceReferenceAmino {
    */
   child_type: string;
 }
-export interface ResourceReferenceAminoType {
+export interface ResourceReferenceAminoMsg {
   type: "/google.api.ResourceReference";
   value: ResourceReferenceAmino;
 }
@@ -578,6 +578,8 @@ function createBaseResourceDescriptor(): ResourceDescriptor {
 }
 
 export const ResourceDescriptor = {
+  typeUrl: "/google.api.ResourceDescriptor",
+
   encode(message: ResourceDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.type !== "") {
       writer.uint32(10).string(message.type);
@@ -786,6 +788,25 @@ export const ResourceDescriptor = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ResourceDescriptorAminoMsg): ResourceDescriptor {
+    return ResourceDescriptor.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ResourceDescriptorProtoMsg): ResourceDescriptor {
+    return ResourceDescriptor.decode(message.value);
+  },
+
+  toProto(message: ResourceDescriptor): Uint8Array {
+    return ResourceDescriptor.encode(message).finish();
+  },
+
+  toProtoMsg(message: ResourceDescriptor): ResourceDescriptorProtoMsg {
+    return {
+      typeUrl: "/google.api.ResourceDescriptor",
+      value: ResourceDescriptor.encode(message).finish()
+    };
   }
 
 };
@@ -798,6 +819,8 @@ function createBaseResourceReference(): ResourceReference {
 }
 
 export const ResourceReference = {
+  typeUrl: "/google.api.ResourceReference",
+
   encode(message: ResourceReference, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.type !== "") {
       writer.uint32(10).string(message.type);
@@ -883,6 +906,25 @@ export const ResourceReference = {
     obj.type = message.type;
     obj.child_type = message.childType;
     return obj;
+  },
+
+  fromAminoMsg(object: ResourceReferenceAminoMsg): ResourceReference {
+    return ResourceReference.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ResourceReferenceProtoMsg): ResourceReference {
+    return ResourceReference.decode(message.value);
+  },
+
+  toProto(message: ResourceReference): Uint8Array {
+    return ResourceReference.encode(message).finish();
+  },
+
+  toProtoMsg(message: ResourceReference): ResourceReferenceProtoMsg {
+    return {
+      typeUrl: "/google.api.ResourceReference",
+      value: ResourceReference.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/api/routing.ts b/__fixtures__/outputv2/google/api/routing.ts
index 781c0aa2d..9cc5b52ec 100644
--- a/__fixtures__/outputv2/google/api/routing.ts
+++ b/__fixtures__/outputv2/google/api/routing.ts
@@ -374,7 +374,7 @@ export interface RoutingRule {
    */
   routingParameters: RoutingParameter[];
 }
-export interface RoutingRuleProtoType {
+export interface RoutingRuleProtoMsg {
   typeUrl: "/google.api.RoutingRule";
   value: Uint8Array;
 }
@@ -751,7 +751,7 @@ export interface RoutingRuleAmino {
    */
   routing_parameters: RoutingParameterAmino[];
 }
-export interface RoutingRuleAminoType {
+export interface RoutingRuleAminoMsg {
   type: "/google.api.RoutingRule";
   value: RoutingRuleAmino;
 }
@@ -1184,7 +1184,7 @@ export interface RoutingParameter {
    */
   pathTemplate: string;
 }
-export interface RoutingParameterProtoType {
+export interface RoutingParameterProtoMsg {
   typeUrl: "/google.api.RoutingParameter";
   value: Uint8Array;
 }
@@ -1252,7 +1252,7 @@ export interface RoutingParameterAmino {
    */
   path_template: string;
 }
-export interface RoutingParameterAminoType {
+export interface RoutingParameterAminoMsg {
   type: "/google.api.RoutingParameter";
   value: RoutingParameterAmino;
 }
@@ -1270,6 +1270,8 @@ function createBaseRoutingRule(): RoutingRule {
 }
 
 export const RoutingRule = {
+  typeUrl: "/google.api.RoutingRule",
+
   encode(message: RoutingRule, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.routingParameters) {
       RoutingParameter.encode(v!, writer.uint32(18).fork()).ldelim();
@@ -1358,6 +1360,25 @@ export const RoutingRule = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: RoutingRuleAminoMsg): RoutingRule {
+    return RoutingRule.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: RoutingRuleProtoMsg): RoutingRule {
+    return RoutingRule.decode(message.value);
+  },
+
+  toProto(message: RoutingRule): Uint8Array {
+    return RoutingRule.encode(message).finish();
+  },
+
+  toProtoMsg(message: RoutingRule): RoutingRuleProtoMsg {
+    return {
+      typeUrl: "/google.api.RoutingRule",
+      value: RoutingRule.encode(message).finish()
+    };
   }
 
 };
@@ -1370,6 +1391,8 @@ function createBaseRoutingParameter(): RoutingParameter {
 }
 
 export const RoutingParameter = {
+  typeUrl: "/google.api.RoutingParameter",
+
   encode(message: RoutingParameter, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.field !== "") {
       writer.uint32(10).string(message.field);
@@ -1455,6 +1478,25 @@ export const RoutingParameter = {
     obj.field = message.field;
     obj.path_template = message.pathTemplate;
     return obj;
+  },
+
+  fromAminoMsg(object: RoutingParameterAminoMsg): RoutingParameter {
+    return RoutingParameter.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: RoutingParameterProtoMsg): RoutingParameter {
+    return RoutingParameter.decode(message.value);
+  },
+
+  toProto(message: RoutingParameter): Uint8Array {
+    return RoutingParameter.encode(message).finish();
+  },
+
+  toProtoMsg(message: RoutingParameter): RoutingParameterProtoMsg {
+    return {
+      typeUrl: "/google.api.RoutingParameter",
+      value: RoutingParameter.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/api/service.ts b/__fixtures__/outputv2/google/api/service.ts
index 28d304af6..0e2d0904c 100644
--- a/__fixtures__/outputv2/google/api/service.ts
+++ b/__fixtures__/outputv2/google/api/service.ts
@@ -169,7 +169,7 @@ export interface Service {
   /** @deprecated */
   configVersion?: UInt32Value;
 }
-export interface ServiceProtoType {
+export interface ServiceProtoMsg {
   typeUrl: "/google.api.Service";
   value: Uint8Array;
 }
@@ -321,7 +321,7 @@ export interface ServiceAmino {
   /** @deprecated */
   config_version?: UInt32ValueAmino;
 }
-export interface ServiceAminoType {
+export interface ServiceAminoMsg {
   type: "/google.api.Service";
   value: ServiceAmino;
 }
@@ -411,6 +411,8 @@ function createBaseService(): Service {
 }
 
 export const Service = {
+  typeUrl: "/google.api.Service",
+
   encode(message: Service, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -955,6 +957,25 @@ export const Service = {
     obj.source_info = message.sourceInfo ? SourceInfo.toAmino(message.sourceInfo) : undefined;
     obj.config_version = message.configVersion ? UInt32Value.toAmino(message.configVersion) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ServiceAminoMsg): Service {
+    return Service.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ServiceProtoMsg): Service {
+    return Service.decode(message.value);
+  },
+
+  toProto(message: Service): Uint8Array {
+    return Service.encode(message).finish();
+  },
+
+  toProtoMsg(message: Service): ServiceProtoMsg {
+    return {
+      typeUrl: "/google.api.Service",
+      value: Service.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/api/servicecontrol/v1/check_error.ts b/__fixtures__/outputv2/google/api/servicecontrol/v1/check_error.ts
index 6ef240b42..d4fdeda34 100644
--- a/__fixtures__/outputv2/google/api/servicecontrol/v1/check_error.ts
+++ b/__fixtures__/outputv2/google/api/servicecontrol/v1/check_error.ts
@@ -283,7 +283,7 @@ export interface CheckError {
    */
   status?: Status;
 }
-export interface CheckErrorProtoType {
+export interface CheckErrorProtoMsg {
   typeUrl: "/google.api.servicecontrol.v1.CheckError";
   value: Uint8Array;
 }
@@ -316,7 +316,7 @@ export interface CheckErrorAmino {
    */
   status?: StatusAmino;
 }
-export interface CheckErrorAminoType {
+export interface CheckErrorAminoMsg {
   type: "/google.api.servicecontrol.v1.CheckError";
   value: CheckErrorAmino;
 }
@@ -342,6 +342,8 @@ function createBaseCheckError(): CheckError {
 }
 
 export const CheckError = {
+  typeUrl: "/google.api.servicecontrol.v1.CheckError",
+
   encode(message: CheckError, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.code !== 0) {
       writer.uint32(8).int32(message.code);
@@ -457,6 +459,25 @@ export const CheckError = {
     obj.detail = message.detail;
     obj.status = message.status ? Status.toAmino(message.status) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: CheckErrorAminoMsg): CheckError {
+    return CheckError.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: CheckErrorProtoMsg): CheckError {
+    return CheckError.decode(message.value);
+  },
+
+  toProto(message: CheckError): Uint8Array {
+    return CheckError.encode(message).finish();
+  },
+
+  toProtoMsg(message: CheckError): CheckErrorProtoMsg {
+    return {
+      typeUrl: "/google.api.servicecontrol.v1.CheckError",
+      value: CheckError.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/api/servicecontrol/v1/distribution.ts b/__fixtures__/outputv2/google/api/servicecontrol/v1/distribution.ts
index 12c5aac7a..c2911157b 100644
--- a/__fixtures__/outputv2/google/api/servicecontrol/v1/distribution.ts
+++ b/__fixtures__/outputv2/google/api/servicecontrol/v1/distribution.ts
@@ -64,7 +64,7 @@ export interface Distribution {
   /** Example points. Must be in increasing order of `value` field. */
   exemplars: Distribution_Exemplar[];
 }
-export interface DistributionProtoType {
+export interface DistributionProtoMsg {
   typeUrl: "/google.api.servicecontrol.v1.Distribution";
   value: Uint8Array;
 }
@@ -130,7 +130,7 @@ export interface DistributionAmino {
   /** Example points. Must be in increasing order of `value` field. */
   exemplars: Distribution_ExemplarAmino[];
 }
-export interface DistributionAminoType {
+export interface DistributionAminoMsg {
   type: "/google.api.servicecontrol.v1.Distribution";
   value: DistributionAmino;
 }
@@ -182,7 +182,7 @@ export interface Distribution_LinearBuckets {
    */
   offset: number;
 }
-export interface Distribution_LinearBucketsProtoType {
+export interface Distribution_LinearBucketsProtoMsg {
   typeUrl: "/google.api.servicecontrol.v1.LinearBuckets";
   value: Uint8Array;
 }
@@ -211,7 +211,7 @@ export interface Distribution_LinearBucketsAmino {
    */
   offset: number;
 }
-export interface Distribution_LinearBucketsAminoType {
+export interface Distribution_LinearBucketsAminoMsg {
   type: "/google.api.servicecontrol.v1.LinearBuckets";
   value: Distribution_LinearBucketsAmino;
 }
@@ -248,7 +248,7 @@ export interface Distribution_ExponentialBuckets {
    */
   scale: number;
 }
-export interface Distribution_ExponentialBucketsProtoType {
+export interface Distribution_ExponentialBucketsProtoMsg {
   typeUrl: "/google.api.servicecontrol.v1.ExponentialBuckets";
   value: Uint8Array;
 }
@@ -278,7 +278,7 @@ export interface Distribution_ExponentialBucketsAmino {
    */
   scale: number;
 }
-export interface Distribution_ExponentialBucketsAminoType {
+export interface Distribution_ExponentialBucketsAminoMsg {
   type: "/google.api.servicecontrol.v1.ExponentialBuckets";
   value: Distribution_ExponentialBucketsAmino;
 }
@@ -311,7 +311,7 @@ export interface Distribution_ExplicitBuckets {
    */
   bounds: number[];
 }
-export interface Distribution_ExplicitBucketsProtoType {
+export interface Distribution_ExplicitBucketsProtoMsg {
   typeUrl: "/google.api.servicecontrol.v1.ExplicitBuckets";
   value: Uint8Array;
 }
@@ -337,7 +337,7 @@ export interface Distribution_ExplicitBucketsAmino {
    */
   bounds: number[];
 }
-export interface Distribution_ExplicitBucketsAminoType {
+export interface Distribution_ExplicitBucketsAminoMsg {
   type: "/google.api.servicecontrol.v1.ExplicitBuckets";
   value: Distribution_ExplicitBucketsAmino;
 }
@@ -363,6 +363,8 @@ function createBaseDistribution(): Distribution {
 }
 
 export const Distribution = {
+  typeUrl: "/google.api.servicecontrol.v1.Distribution",
+
   encode(message: Distribution, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.count.isZero()) {
       writer.uint32(8).int64(message.count);
@@ -617,6 +619,25 @@ export const Distribution = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: DistributionAminoMsg): Distribution {
+    return Distribution.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: DistributionProtoMsg): Distribution {
+    return Distribution.decode(message.value);
+  },
+
+  toProto(message: Distribution): Uint8Array {
+    return Distribution.encode(message).finish();
+  },
+
+  toProtoMsg(message: Distribution): DistributionProtoMsg {
+    return {
+      typeUrl: "/google.api.servicecontrol.v1.Distribution",
+      value: Distribution.encode(message).finish()
+    };
   }
 
 };
@@ -630,6 +651,8 @@ function createBaseDistribution_LinearBuckets(): Distribution_LinearBuckets {
 }
 
 export const Distribution_LinearBuckets = {
+  typeUrl: "/google.api.servicecontrol.v1.LinearBuckets",
+
   encode(message: Distribution_LinearBuckets, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.numFiniteBuckets !== 0) {
       writer.uint32(8).int32(message.numFiniteBuckets);
@@ -730,6 +753,25 @@ export const Distribution_LinearBuckets = {
     obj.width = message.width;
     obj.offset = message.offset;
     return obj;
+  },
+
+  fromAminoMsg(object: Distribution_LinearBucketsAminoMsg): Distribution_LinearBuckets {
+    return Distribution_LinearBuckets.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: Distribution_LinearBucketsProtoMsg): Distribution_LinearBuckets {
+    return Distribution_LinearBuckets.decode(message.value);
+  },
+
+  toProto(message: Distribution_LinearBuckets): Uint8Array {
+    return Distribution_LinearBuckets.encode(message).finish();
+  },
+
+  toProtoMsg(message: Distribution_LinearBuckets): Distribution_LinearBucketsProtoMsg {
+    return {
+      typeUrl: "/google.api.servicecontrol.v1.LinearBuckets",
+      value: Distribution_LinearBuckets.encode(message).finish()
+    };
   }
 
 };
@@ -743,6 +785,8 @@ function createBaseDistribution_ExponentialBuckets(): Distribution_ExponentialBu
 }
 
 export const Distribution_ExponentialBuckets = {
+  typeUrl: "/google.api.servicecontrol.v1.ExponentialBuckets",
+
   encode(message: Distribution_ExponentialBuckets, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.numFiniteBuckets !== 0) {
       writer.uint32(8).int32(message.numFiniteBuckets);
@@ -843,6 +887,25 @@ export const Distribution_ExponentialBuckets = {
     obj.growth_factor = message.growthFactor;
     obj.scale = message.scale;
     return obj;
+  },
+
+  fromAminoMsg(object: Distribution_ExponentialBucketsAminoMsg): Distribution_ExponentialBuckets {
+    return Distribution_ExponentialBuckets.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: Distribution_ExponentialBucketsProtoMsg): Distribution_ExponentialBuckets {
+    return Distribution_ExponentialBuckets.decode(message.value);
+  },
+
+  toProto(message: Distribution_ExponentialBuckets): Uint8Array {
+    return Distribution_ExponentialBuckets.encode(message).finish();
+  },
+
+  toProtoMsg(message: Distribution_ExponentialBuckets): Distribution_ExponentialBucketsProtoMsg {
+    return {
+      typeUrl: "/google.api.servicecontrol.v1.ExponentialBuckets",
+      value: Distribution_ExponentialBuckets.encode(message).finish()
+    };
   }
 
 };
@@ -854,6 +917,8 @@ function createBaseDistribution_ExplicitBuckets(): Distribution_ExplicitBuckets
 }
 
 export const Distribution_ExplicitBuckets = {
+  typeUrl: "/google.api.servicecontrol.v1.ExplicitBuckets",
+
   encode(message: Distribution_ExplicitBuckets, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     writer.uint32(10).fork();
 
@@ -954,6 +1019,25 @@ export const Distribution_ExplicitBuckets = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: Distribution_ExplicitBucketsAminoMsg): Distribution_ExplicitBuckets {
+    return Distribution_ExplicitBuckets.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: Distribution_ExplicitBucketsProtoMsg): Distribution_ExplicitBuckets {
+    return Distribution_ExplicitBuckets.decode(message.value);
+  },
+
+  toProto(message: Distribution_ExplicitBuckets): Uint8Array {
+    return Distribution_ExplicitBuckets.encode(message).finish();
+  },
+
+  toProtoMsg(message: Distribution_ExplicitBuckets): Distribution_ExplicitBucketsProtoMsg {
+    return {
+      typeUrl: "/google.api.servicecontrol.v1.ExplicitBuckets",
+      value: Distribution_ExplicitBuckets.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/api/servicecontrol/v1/http_request.ts b/__fixtures__/outputv2/google/api/servicecontrol/v1/http_request.ts
index cb482cab8..cd209b6e7 100644
--- a/__fixtures__/outputv2/google/api/servicecontrol/v1/http_request.ts
+++ b/__fixtures__/outputv2/google/api/servicecontrol/v1/http_request.ts
@@ -94,7 +94,7 @@ export interface HttpRequest {
   /** Protocol used for the request. Examples: "HTTP/1.1", "HTTP/2", "websocket" */
   protocol: string;
 }
-export interface HttpRequestProtoType {
+export interface HttpRequestProtoMsg {
   typeUrl: "/google.api.servicecontrol.v1.HttpRequest";
   value: Uint8Array;
 }
@@ -190,7 +190,7 @@ export interface HttpRequestAmino {
   /** Protocol used for the request. Examples: "HTTP/1.1", "HTTP/2", "websocket" */
   protocol: string;
 }
-export interface HttpRequestAminoType {
+export interface HttpRequestAminoMsg {
   type: "/google.api.servicecontrol.v1.HttpRequest";
   value: HttpRequestAmino;
 }
@@ -239,6 +239,8 @@ function createBaseHttpRequest(): HttpRequest {
 }
 
 export const HttpRequest = {
+  typeUrl: "/google.api.servicecontrol.v1.HttpRequest",
+
   encode(message: HttpRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.requestMethod !== "") {
       writer.uint32(10).string(message.requestMethod);
@@ -519,6 +521,25 @@ export const HttpRequest = {
     obj.cache_fill_bytes = message.cacheFillBytes ? message.cacheFillBytes.toString() : undefined;
     obj.protocol = message.protocol;
     return obj;
+  },
+
+  fromAminoMsg(object: HttpRequestAminoMsg): HttpRequest {
+    return HttpRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: HttpRequestProtoMsg): HttpRequest {
+    return HttpRequest.decode(message.value);
+  },
+
+  toProto(message: HttpRequest): Uint8Array {
+    return HttpRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: HttpRequest): HttpRequestProtoMsg {
+    return {
+      typeUrl: "/google.api.servicecontrol.v1.HttpRequest",
+      value: HttpRequest.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/api/servicecontrol/v1/log_entry.ts b/__fixtures__/outputv2/google/api/servicecontrol/v1/log_entry.ts
index 46933e2f4..b7d6384fe 100644
--- a/__fixtures__/outputv2/google/api/servicecontrol/v1/log_entry.ts
+++ b/__fixtures__/outputv2/google/api/servicecontrol/v1/log_entry.ts
@@ -10,16 +10,16 @@ export interface LogEntry_LabelsEntry {
   key: string;
   value: string;
 }
-export interface LogEntry_LabelsEntryProtoType {
-  typeUrl: "/google.api.servicecontrol.v1.undefined";
+export interface LogEntry_LabelsEntryProtoMsg {
+  typeUrl: string;
   value: Uint8Array;
 }
 export interface LogEntry_LabelsEntryAmino {
   key: string;
   value: string;
 }
-export interface LogEntry_LabelsEntryAminoType {
-  type: "/google.api.servicecontrol.v1.undefined";
+export interface LogEntry_LabelsEntryAminoMsg {
+  type: string;
   value: LogEntry_LabelsEntryAmino;
 }
 export interface LogEntry_LabelsEntrySDKType {
@@ -103,7 +103,7 @@ export interface LogEntry {
    */
   sourceLocation?: LogEntrySourceLocation;
 }
-export interface LogEntryProtoType {
+export interface LogEntryProtoMsg {
   typeUrl: "/google.api.servicecontrol.v1.LogEntry";
   value: Uint8Array;
 }
@@ -184,7 +184,7 @@ export interface LogEntryAmino {
    */
   source_location?: LogEntrySourceLocationAmino;
 }
-export interface LogEntryAminoType {
+export interface LogEntryAminoMsg {
   type: "/google.api.servicecontrol.v1.LogEntry";
   value: LogEntryAmino;
 }
@@ -231,7 +231,7 @@ export interface LogEntryOperation {
   /** Optional. Set this to True if this is the last log entry in the operation. */
   last: boolean;
 }
-export interface LogEntryOperationProtoType {
+export interface LogEntryOperationProtoMsg {
   typeUrl: "/google.api.servicecontrol.v1.LogEntryOperation";
   value: Uint8Array;
 }
@@ -260,7 +260,7 @@ export interface LogEntryOperationAmino {
   /** Optional. Set this to True if this is the last log entry in the operation. */
   last: boolean;
 }
-export interface LogEntryOperationAminoType {
+export interface LogEntryOperationAminoMsg {
   type: "/google.api.servicecontrol.v1.LogEntryOperation";
   value: LogEntryOperationAmino;
 }
@@ -303,7 +303,7 @@ export interface LogEntrySourceLocation {
    */
   function: string;
 }
-export interface LogEntrySourceLocationProtoType {
+export interface LogEntrySourceLocationProtoMsg {
   typeUrl: "/google.api.servicecontrol.v1.LogEntrySourceLocation";
   value: Uint8Array;
 }
@@ -335,7 +335,7 @@ export interface LogEntrySourceLocationAmino {
    */
   function: string;
 }
-export interface LogEntrySourceLocationAminoType {
+export interface LogEntrySourceLocationAminoMsg {
   type: "/google.api.servicecontrol.v1.LogEntrySourceLocation";
   value: LogEntrySourceLocationAmino;
 }
@@ -443,6 +443,18 @@ export const LogEntry_LabelsEntry = {
     obj.key = message.key;
     obj.value = message.value;
     return obj;
+  },
+
+  fromAminoMsg(object: LogEntry_LabelsEntryAminoMsg): LogEntry_LabelsEntry {
+    return LogEntry_LabelsEntry.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: LogEntry_LabelsEntryProtoMsg): LogEntry_LabelsEntry {
+    return LogEntry_LabelsEntry.decode(message.value);
+  },
+
+  toProto(message: LogEntry_LabelsEntry): Uint8Array {
+    return LogEntry_LabelsEntry.encode(message).finish();
   }
 
 };
@@ -465,6 +477,8 @@ function createBaseLogEntry(): LogEntry {
 }
 
 export const LogEntry = {
+  typeUrl: "/google.api.servicecontrol.v1.LogEntry",
+
   encode(message: LogEntry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(82).string(message.name);
@@ -752,6 +766,25 @@ export const LogEntry = {
     obj.operation = message.operation ? LogEntryOperation.toAmino(message.operation) : undefined;
     obj.source_location = message.sourceLocation ? LogEntrySourceLocation.toAmino(message.sourceLocation) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: LogEntryAminoMsg): LogEntry {
+    return LogEntry.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: LogEntryProtoMsg): LogEntry {
+    return LogEntry.decode(message.value);
+  },
+
+  toProto(message: LogEntry): Uint8Array {
+    return LogEntry.encode(message).finish();
+  },
+
+  toProtoMsg(message: LogEntry): LogEntryProtoMsg {
+    return {
+      typeUrl: "/google.api.servicecontrol.v1.LogEntry",
+      value: LogEntry.encode(message).finish()
+    };
   }
 
 };
@@ -766,6 +799,8 @@ function createBaseLogEntryOperation(): LogEntryOperation {
 }
 
 export const LogEntryOperation = {
+  typeUrl: "/google.api.servicecontrol.v1.LogEntryOperation",
+
   encode(message: LogEntryOperation, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.id !== "") {
       writer.uint32(10).string(message.id);
@@ -881,6 +916,25 @@ export const LogEntryOperation = {
     obj.first = message.first;
     obj.last = message.last;
     return obj;
+  },
+
+  fromAminoMsg(object: LogEntryOperationAminoMsg): LogEntryOperation {
+    return LogEntryOperation.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: LogEntryOperationProtoMsg): LogEntryOperation {
+    return LogEntryOperation.decode(message.value);
+  },
+
+  toProto(message: LogEntryOperation): Uint8Array {
+    return LogEntryOperation.encode(message).finish();
+  },
+
+  toProtoMsg(message: LogEntryOperation): LogEntryOperationProtoMsg {
+    return {
+      typeUrl: "/google.api.servicecontrol.v1.LogEntryOperation",
+      value: LogEntryOperation.encode(message).finish()
+    };
   }
 
 };
@@ -894,6 +948,8 @@ function createBaseLogEntrySourceLocation(): LogEntrySourceLocation {
 }
 
 export const LogEntrySourceLocation = {
+  typeUrl: "/google.api.servicecontrol.v1.LogEntrySourceLocation",
+
   encode(message: LogEntrySourceLocation, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.file !== "") {
       writer.uint32(10).string(message.file);
@@ -994,6 +1050,25 @@ export const LogEntrySourceLocation = {
     obj.line = message.line ? message.line.toString() : undefined;
     obj.function = message.function;
     return obj;
+  },
+
+  fromAminoMsg(object: LogEntrySourceLocationAminoMsg): LogEntrySourceLocation {
+    return LogEntrySourceLocation.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: LogEntrySourceLocationProtoMsg): LogEntrySourceLocation {
+    return LogEntrySourceLocation.decode(message.value);
+  },
+
+  toProto(message: LogEntrySourceLocation): Uint8Array {
+    return LogEntrySourceLocation.encode(message).finish();
+  },
+
+  toProtoMsg(message: LogEntrySourceLocation): LogEntrySourceLocationProtoMsg {
+    return {
+      typeUrl: "/google.api.servicecontrol.v1.LogEntrySourceLocation",
+      value: LogEntrySourceLocation.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/api/servicecontrol/v1/metric_value.ts b/__fixtures__/outputv2/google/api/servicecontrol/v1/metric_value.ts
index e68ba417c..d270a9458 100644
--- a/__fixtures__/outputv2/google/api/servicecontrol/v1/metric_value.ts
+++ b/__fixtures__/outputv2/google/api/servicecontrol/v1/metric_value.ts
@@ -7,16 +7,16 @@ export interface MetricValue_LabelsEntry {
   key: string;
   value: string;
 }
-export interface MetricValue_LabelsEntryProtoType {
-  typeUrl: "/google.api.servicecontrol.v1.undefined";
+export interface MetricValue_LabelsEntryProtoMsg {
+  typeUrl: string;
   value: Uint8Array;
 }
 export interface MetricValue_LabelsEntryAmino {
   key: string;
   value: string;
 }
-export interface MetricValue_LabelsEntryAminoType {
-  type: "/google.api.servicecontrol.v1.undefined";
+export interface MetricValue_LabelsEntryAminoMsg {
+  type: string;
   value: MetricValue_LabelsEntryAmino;
 }
 export interface MetricValue_LabelsEntrySDKType {
@@ -67,7 +67,7 @@ export interface MetricValue {
   /** A distribution value. */
   distributionValue?: Distribution;
 }
-export interface MetricValueProtoType {
+export interface MetricValueProtoMsg {
   typeUrl: "/google.api.servicecontrol.v1.MetricValue";
   value: Uint8Array;
 }
@@ -115,7 +115,7 @@ export interface MetricValueAmino {
   /** A distribution value. */
   distribution_value?: DistributionAmino;
 }
-export interface MetricValueAminoType {
+export interface MetricValueAminoMsg {
   type: "/google.api.servicecontrol.v1.MetricValue";
   value: MetricValueAmino;
 }
@@ -146,7 +146,7 @@ export interface MetricValueSet {
   /** The values in this metric. */
   metricValues: MetricValue[];
 }
-export interface MetricValueSetProtoType {
+export interface MetricValueSetProtoMsg {
   typeUrl: "/google.api.servicecontrol.v1.MetricValueSet";
   value: Uint8Array;
 }
@@ -163,7 +163,7 @@ export interface MetricValueSetAmino {
   /** The values in this metric. */
   metric_values: MetricValueAmino[];
 }
-export interface MetricValueSetAminoType {
+export interface MetricValueSetAminoMsg {
   type: "/google.api.servicecontrol.v1.MetricValueSet";
   value: MetricValueSetAmino;
 }
@@ -271,6 +271,18 @@ export const MetricValue_LabelsEntry = {
     obj.key = message.key;
     obj.value = message.value;
     return obj;
+  },
+
+  fromAminoMsg(object: MetricValue_LabelsEntryAminoMsg): MetricValue_LabelsEntry {
+    return MetricValue_LabelsEntry.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MetricValue_LabelsEntryProtoMsg): MetricValue_LabelsEntry {
+    return MetricValue_LabelsEntry.decode(message.value);
+  },
+
+  toProto(message: MetricValue_LabelsEntry): Uint8Array {
+    return MetricValue_LabelsEntry.encode(message).finish();
   }
 
 };
@@ -289,6 +301,8 @@ function createBaseMetricValue(): MetricValue {
 }
 
 export const MetricValue = {
+  typeUrl: "/google.api.servicecontrol.v1.MetricValue",
+
   encode(message: MetricValue, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     Object.entries(message.labels).forEach(([key, value]) => {
       MetricValue_LabelsEntry.encode({
@@ -516,6 +530,25 @@ export const MetricValue = {
     obj.string_value = message.stringValue;
     obj.distribution_value = message.distributionValue ? Distribution.toAmino(message.distributionValue) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MetricValueAminoMsg): MetricValue {
+    return MetricValue.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MetricValueProtoMsg): MetricValue {
+    return MetricValue.decode(message.value);
+  },
+
+  toProto(message: MetricValue): Uint8Array {
+    return MetricValue.encode(message).finish();
+  },
+
+  toProtoMsg(message: MetricValue): MetricValueProtoMsg {
+    return {
+      typeUrl: "/google.api.servicecontrol.v1.MetricValue",
+      value: MetricValue.encode(message).finish()
+    };
   }
 
 };
@@ -528,6 +561,8 @@ function createBaseMetricValueSet(): MetricValueSet {
 }
 
 export const MetricValueSet = {
+  typeUrl: "/google.api.servicecontrol.v1.MetricValueSet",
+
   encode(message: MetricValueSet, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.metricName !== "") {
       writer.uint32(10).string(message.metricName);
@@ -631,6 +666,25 @@ export const MetricValueSet = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: MetricValueSetAminoMsg): MetricValueSet {
+    return MetricValueSet.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MetricValueSetProtoMsg): MetricValueSet {
+    return MetricValueSet.decode(message.value);
+  },
+
+  toProto(message: MetricValueSet): Uint8Array {
+    return MetricValueSet.encode(message).finish();
+  },
+
+  toProtoMsg(message: MetricValueSet): MetricValueSetProtoMsg {
+    return {
+      typeUrl: "/google.api.servicecontrol.v1.MetricValueSet",
+      value: MetricValueSet.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/api/servicecontrol/v1/operation.ts b/__fixtures__/outputv2/google/api/servicecontrol/v1/operation.ts
index b6505ea66..ccc689349 100644
--- a/__fixtures__/outputv2/google/api/servicecontrol/v1/operation.ts
+++ b/__fixtures__/outputv2/google/api/servicecontrol/v1/operation.ts
@@ -57,16 +57,16 @@ export interface Operation_LabelsEntry {
   key: string;
   value: string;
 }
-export interface Operation_LabelsEntryProtoType {
-  typeUrl: "/google.api.servicecontrol.v1.undefined";
+export interface Operation_LabelsEntryProtoMsg {
+  typeUrl: string;
   value: Uint8Array;
 }
 export interface Operation_LabelsEntryAmino {
   key: string;
   value: string;
 }
-export interface Operation_LabelsEntryAminoType {
-  type: "/google.api.servicecontrol.v1.undefined";
+export interface Operation_LabelsEntryAminoMsg {
+  type: string;
   value: Operation_LabelsEntryAmino;
 }
 export interface Operation_LabelsEntrySDKType {
@@ -165,7 +165,7 @@ export interface Operation {
   /** Unimplemented. */
   extensions: Any[];
 }
-export interface OperationProtoType {
+export interface OperationProtoMsg {
   typeUrl: "/google.api.servicecontrol.v1.Operation";
   value: Uint8Array;
 }
@@ -261,7 +261,7 @@ export interface OperationAmino {
   /** Unimplemented. */
   extensions: AnyAmino[];
 }
-export interface OperationAminoType {
+export interface OperationAminoMsg {
   type: "/google.api.servicecontrol.v1.Operation";
   value: OperationAmino;
 }
@@ -375,6 +375,18 @@ export const Operation_LabelsEntry = {
     obj.key = message.key;
     obj.value = message.value;
     return obj;
+  },
+
+  fromAminoMsg(object: Operation_LabelsEntryAminoMsg): Operation_LabelsEntry {
+    return Operation_LabelsEntry.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: Operation_LabelsEntryProtoMsg): Operation_LabelsEntry {
+    return Operation_LabelsEntry.decode(message.value);
+  },
+
+  toProto(message: Operation_LabelsEntry): Uint8Array {
+    return Operation_LabelsEntry.encode(message).finish();
   }
 
 };
@@ -395,6 +407,8 @@ function createBaseOperation(): Operation {
 }
 
 export const Operation = {
+  typeUrl: "/google.api.servicecontrol.v1.Operation",
+
   encode(message: Operation, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.operationId !== "") {
       writer.uint32(10).string(message.operationId);
@@ -700,6 +714,25 @@ export const Operation = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: OperationAminoMsg): Operation {
+    return Operation.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: OperationProtoMsg): Operation {
+    return Operation.decode(message.value);
+  },
+
+  toProto(message: Operation): Uint8Array {
+    return Operation.encode(message).finish();
+  },
+
+  toProtoMsg(message: Operation): OperationProtoMsg {
+    return {
+      typeUrl: "/google.api.servicecontrol.v1.Operation",
+      value: Operation.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/api/servicecontrol/v1/quota_controller.ts b/__fixtures__/outputv2/google/api/servicecontrol/v1/quota_controller.ts
index c70655060..06ce0d995 100644
--- a/__fixtures__/outputv2/google/api/servicecontrol/v1/quota_controller.ts
+++ b/__fixtures__/outputv2/google/api/servicecontrol/v1/quota_controller.ts
@@ -230,7 +230,7 @@ export interface AllocateQuotaRequest {
    */
   serviceConfigId: string;
 }
-export interface AllocateQuotaRequestProtoType {
+export interface AllocateQuotaRequestProtoMsg {
   typeUrl: "/google.api.servicecontrol.v1.AllocateQuotaRequest";
   value: Uint8Array;
 }
@@ -255,7 +255,7 @@ export interface AllocateQuotaRequestAmino {
    */
   service_config_id: string;
 }
-export interface AllocateQuotaRequestAminoType {
+export interface AllocateQuotaRequestAminoMsg {
   type: "/google.api.servicecontrol.v1.AllocateQuotaRequest";
   value: AllocateQuotaRequestAmino;
 }
@@ -270,16 +270,16 @@ export interface QuotaOperation_LabelsEntry {
   key: string;
   value: string;
 }
-export interface QuotaOperation_LabelsEntryProtoType {
-  typeUrl: "/google.api.servicecontrol.v1.undefined";
+export interface QuotaOperation_LabelsEntryProtoMsg {
+  typeUrl: string;
   value: Uint8Array;
 }
 export interface QuotaOperation_LabelsEntryAmino {
   key: string;
   value: string;
 }
-export interface QuotaOperation_LabelsEntryAminoType {
-  type: "/google.api.servicecontrol.v1.undefined";
+export interface QuotaOperation_LabelsEntryAminoMsg {
+  type: string;
   value: QuotaOperation_LabelsEntryAmino;
 }
 export interface QuotaOperation_LabelsEntrySDKType {
@@ -351,7 +351,7 @@ export interface QuotaOperation {
   /** Quota mode for this operation. */
   quotaMode: QuotaOperation_QuotaMode;
 }
-export interface QuotaOperationProtoType {
+export interface QuotaOperationProtoMsg {
   typeUrl: "/google.api.servicecontrol.v1.QuotaOperation";
   value: Uint8Array;
 }
@@ -420,7 +420,7 @@ export interface QuotaOperationAmino {
   /** Quota mode for this operation. */
   quota_mode: QuotaOperation_QuotaMode;
 }
-export interface QuotaOperationAminoType {
+export interface QuotaOperationAminoMsg {
   type: "/google.api.servicecontrol.v1.QuotaOperation";
   value: QuotaOperationAmino;
 }
@@ -465,7 +465,7 @@ export interface AllocateQuotaResponse {
   /** ID of the actual config used to process the request. */
   serviceConfigId: string;
 }
-export interface AllocateQuotaResponseProtoType {
+export interface AllocateQuotaResponseProtoMsg {
   typeUrl: "/google.api.servicecontrol.v1.AllocateQuotaResponse";
   value: Uint8Array;
 }
@@ -498,7 +498,7 @@ export interface AllocateQuotaResponseAmino {
   /** ID of the actual config used to process the request. */
   service_config_id: string;
 }
-export interface AllocateQuotaResponseAminoType {
+export interface AllocateQuotaResponseAminoMsg {
   type: "/google.api.servicecontrol.v1.AllocateQuotaResponse";
   value: AllocateQuotaResponseAmino;
 }
@@ -532,7 +532,7 @@ export interface QuotaError {
    */
   status?: Status;
 }
-export interface QuotaErrorProtoType {
+export interface QuotaErrorProtoMsg {
   typeUrl: "/google.api.servicecontrol.v1.QuotaError";
   value: Uint8Array;
 }
@@ -558,7 +558,7 @@ export interface QuotaErrorAmino {
    */
   status?: StatusAmino;
 }
-export interface QuotaErrorAminoType {
+export interface QuotaErrorAminoMsg {
   type: "/google.api.servicecontrol.v1.QuotaError";
   value: QuotaErrorAmino;
 }
@@ -580,6 +580,8 @@ function createBaseAllocateQuotaRequest(): AllocateQuotaRequest {
 }
 
 export const AllocateQuotaRequest = {
+  typeUrl: "/google.api.servicecontrol.v1.AllocateQuotaRequest",
+
   encode(message: AllocateQuotaRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.serviceName !== "") {
       writer.uint32(10).string(message.serviceName);
@@ -680,6 +682,25 @@ export const AllocateQuotaRequest = {
     obj.allocate_operation = message.allocateOperation ? QuotaOperation.toAmino(message.allocateOperation) : undefined;
     obj.service_config_id = message.serviceConfigId;
     return obj;
+  },
+
+  fromAminoMsg(object: AllocateQuotaRequestAminoMsg): AllocateQuotaRequest {
+    return AllocateQuotaRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: AllocateQuotaRequestProtoMsg): AllocateQuotaRequest {
+    return AllocateQuotaRequest.decode(message.value);
+  },
+
+  toProto(message: AllocateQuotaRequest): Uint8Array {
+    return AllocateQuotaRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: AllocateQuotaRequest): AllocateQuotaRequestProtoMsg {
+    return {
+      typeUrl: "/google.api.servicecontrol.v1.AllocateQuotaRequest",
+      value: AllocateQuotaRequest.encode(message).finish()
+    };
   }
 
 };
@@ -777,6 +798,18 @@ export const QuotaOperation_LabelsEntry = {
     obj.key = message.key;
     obj.value = message.value;
     return obj;
+  },
+
+  fromAminoMsg(object: QuotaOperation_LabelsEntryAminoMsg): QuotaOperation_LabelsEntry {
+    return QuotaOperation_LabelsEntry.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QuotaOperation_LabelsEntryProtoMsg): QuotaOperation_LabelsEntry {
+    return QuotaOperation_LabelsEntry.decode(message.value);
+  },
+
+  toProto(message: QuotaOperation_LabelsEntry): Uint8Array {
+    return QuotaOperation_LabelsEntry.encode(message).finish();
   }
 
 };
@@ -793,6 +826,8 @@ function createBaseQuotaOperation(): QuotaOperation {
 }
 
 export const QuotaOperation = {
+  typeUrl: "/google.api.servicecontrol.v1.QuotaOperation",
+
   encode(message: QuotaOperation, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.operationId !== "") {
       writer.uint32(10).string(message.operationId);
@@ -1005,6 +1040,25 @@ export const QuotaOperation = {
 
     obj.quota_mode = message.quotaMode;
     return obj;
+  },
+
+  fromAminoMsg(object: QuotaOperationAminoMsg): QuotaOperation {
+    return QuotaOperation.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QuotaOperationProtoMsg): QuotaOperation {
+    return QuotaOperation.decode(message.value);
+  },
+
+  toProto(message: QuotaOperation): Uint8Array {
+    return QuotaOperation.encode(message).finish();
+  },
+
+  toProtoMsg(message: QuotaOperation): QuotaOperationProtoMsg {
+    return {
+      typeUrl: "/google.api.servicecontrol.v1.QuotaOperation",
+      value: QuotaOperation.encode(message).finish()
+    };
   }
 
 };
@@ -1019,6 +1073,8 @@ function createBaseAllocateQuotaResponse(): AllocateQuotaResponse {
 }
 
 export const AllocateQuotaResponse = {
+  typeUrl: "/google.api.servicecontrol.v1.AllocateQuotaResponse",
+
   encode(message: AllocateQuotaResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.operationId !== "") {
       writer.uint32(10).string(message.operationId);
@@ -1167,6 +1223,25 @@ export const AllocateQuotaResponse = {
 
     obj.service_config_id = message.serviceConfigId;
     return obj;
+  },
+
+  fromAminoMsg(object: AllocateQuotaResponseAminoMsg): AllocateQuotaResponse {
+    return AllocateQuotaResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: AllocateQuotaResponseProtoMsg): AllocateQuotaResponse {
+    return AllocateQuotaResponse.decode(message.value);
+  },
+
+  toProto(message: AllocateQuotaResponse): Uint8Array {
+    return AllocateQuotaResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: AllocateQuotaResponse): AllocateQuotaResponseProtoMsg {
+    return {
+      typeUrl: "/google.api.servicecontrol.v1.AllocateQuotaResponse",
+      value: AllocateQuotaResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1181,6 +1256,8 @@ function createBaseQuotaError(): QuotaError {
 }
 
 export const QuotaError = {
+  typeUrl: "/google.api.servicecontrol.v1.QuotaError",
+
   encode(message: QuotaError, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.code !== 0) {
       writer.uint32(8).int32(message.code);
@@ -1296,6 +1373,25 @@ export const QuotaError = {
     obj.description = message.description;
     obj.status = message.status ? Status.toAmino(message.status) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QuotaErrorAminoMsg): QuotaError {
+    return QuotaError.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QuotaErrorProtoMsg): QuotaError {
+    return QuotaError.decode(message.value);
+  },
+
+  toProto(message: QuotaError): Uint8Array {
+    return QuotaError.encode(message).finish();
+  },
+
+  toProtoMsg(message: QuotaError): QuotaErrorProtoMsg {
+    return {
+      typeUrl: "/google.api.servicecontrol.v1.QuotaError",
+      value: QuotaError.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/api/servicecontrol/v1/service_controller.ts b/__fixtures__/outputv2/google/api/servicecontrol/v1/service_controller.ts
index 59e77ed85..119f705ce 100644
--- a/__fixtures__/outputv2/google/api/servicecontrol/v1/service_controller.ts
+++ b/__fixtures__/outputv2/google/api/servicecontrol/v1/service_controller.ts
@@ -107,7 +107,7 @@ export interface CheckRequest {
    */
   serviceConfigId: string;
 }
-export interface CheckRequestProtoType {
+export interface CheckRequestProtoMsg {
   typeUrl: "/google.api.servicecontrol.v1.CheckRequest";
   value: Uint8Array;
 }
@@ -136,7 +136,7 @@ export interface CheckRequestAmino {
    */
   service_config_id: string;
 }
-export interface CheckRequestAminoType {
+export interface CheckRequestAminoMsg {
   type: "/google.api.servicecontrol.v1.CheckRequest";
   value: CheckRequestAmino;
 }
@@ -175,7 +175,7 @@ export interface CheckResponse {
   /** Feedback data returned from the server during processing a Check request. */
   checkInfo?: CheckResponse_CheckInfo;
 }
-export interface CheckResponseProtoType {
+export interface CheckResponseProtoMsg {
   typeUrl: "/google.api.servicecontrol.v1.CheckResponse";
   value: Uint8Array;
 }
@@ -207,7 +207,7 @@ export interface CheckResponseAmino {
   /** Feedback data returned from the server during processing a Check request. */
   check_info?: CheckResponse_CheckInfoAmino;
 }
-export interface CheckResponseAminoType {
+export interface CheckResponseAminoMsg {
   type: "/google.api.servicecontrol.v1.CheckResponse";
   value: CheckResponseAmino;
 }
@@ -233,7 +233,7 @@ export interface CheckResponse_CheckInfo {
   /** Consumer info of this check. */
   consumerInfo?: CheckResponse_ConsumerInfo;
 }
-export interface CheckResponse_CheckInfoProtoType {
+export interface CheckResponse_CheckInfoProtoMsg {
   typeUrl: "/google.api.servicecontrol.v1.CheckInfo";
   value: Uint8Array;
 }
@@ -250,7 +250,7 @@ export interface CheckResponse_CheckInfoAmino {
   /** Consumer info of this check. */
   consumer_info?: CheckResponse_ConsumerInfoAmino;
 }
-export interface CheckResponse_CheckInfoAminoType {
+export interface CheckResponse_CheckInfoAminoMsg {
   type: "/google.api.servicecontrol.v1.CheckInfo";
   value: CheckResponse_CheckInfoAmino;
 }
@@ -285,7 +285,7 @@ export interface CheckResponse_ConsumerInfo {
    */
   consumerNumber: Long;
 }
-export interface CheckResponse_ConsumerInfoProtoType {
+export interface CheckResponse_ConsumerInfoProtoMsg {
   typeUrl: "/google.api.servicecontrol.v1.ConsumerInfo";
   value: Uint8Array;
 }
@@ -314,7 +314,7 @@ export interface CheckResponse_ConsumerInfoAmino {
    */
   consumer_number: string;
 }
-export interface CheckResponse_ConsumerInfoAminoType {
+export interface CheckResponse_ConsumerInfoAminoMsg {
   type: "/google.api.servicecontrol.v1.ConsumerInfo";
   value: CheckResponse_ConsumerInfoAmino;
 }
@@ -362,7 +362,7 @@ export interface ReportRequest {
    */
   serviceConfigId: string;
 }
-export interface ReportRequestProtoType {
+export interface ReportRequestProtoMsg {
   typeUrl: "/google.api.servicecontrol.v1.ReportRequest";
   value: Uint8Array;
 }
@@ -403,7 +403,7 @@ export interface ReportRequestAmino {
    */
   service_config_id: string;
 }
-export interface ReportRequestAminoType {
+export interface ReportRequestAminoMsg {
   type: "/google.api.servicecontrol.v1.ReportRequest";
   value: ReportRequestAmino;
 }
@@ -441,7 +441,7 @@ export interface ReportResponse {
   /** The current service rollout id used to process the request. */
   serviceRolloutId: string;
 }
-export interface ReportResponseProtoType {
+export interface ReportResponseProtoMsg {
   typeUrl: "/google.api.servicecontrol.v1.ReportResponse";
   value: Uint8Array;
 }
@@ -472,7 +472,7 @@ export interface ReportResponseAmino {
   /** The current service rollout id used to process the request. */
   service_rollout_id: string;
 }
-export interface ReportResponseAminoType {
+export interface ReportResponseAminoMsg {
   type: "/google.api.servicecontrol.v1.ReportResponse";
   value: ReportResponseAmino;
 }
@@ -502,7 +502,7 @@ export interface ReportResponse_ReportError {
    */
   status?: Status;
 }
-export interface ReportResponse_ReportErrorProtoType {
+export interface ReportResponse_ReportErrorProtoMsg {
   typeUrl: "/google.api.servicecontrol.v1.ReportError";
   value: Uint8Array;
 }
@@ -525,7 +525,7 @@ export interface ReportResponse_ReportErrorAmino {
    */
   status?: StatusAmino;
 }
-export interface ReportResponse_ReportErrorAminoType {
+export interface ReportResponse_ReportErrorAminoMsg {
   type: "/google.api.servicecontrol.v1.ReportError";
   value: ReportResponse_ReportErrorAmino;
 }
@@ -548,6 +548,8 @@ function createBaseCheckRequest(): CheckRequest {
 }
 
 export const CheckRequest = {
+  typeUrl: "/google.api.servicecontrol.v1.CheckRequest",
+
   encode(message: CheckRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.serviceName !== "") {
       writer.uint32(10).string(message.serviceName);
@@ -648,6 +650,25 @@ export const CheckRequest = {
     obj.operation = message.operation ? Operation.toAmino(message.operation) : undefined;
     obj.service_config_id = message.serviceConfigId;
     return obj;
+  },
+
+  fromAminoMsg(object: CheckRequestAminoMsg): CheckRequest {
+    return CheckRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: CheckRequestProtoMsg): CheckRequest {
+    return CheckRequest.decode(message.value);
+  },
+
+  toProto(message: CheckRequest): Uint8Array {
+    return CheckRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: CheckRequest): CheckRequestProtoMsg {
+    return {
+      typeUrl: "/google.api.servicecontrol.v1.CheckRequest",
+      value: CheckRequest.encode(message).finish()
+    };
   }
 
 };
@@ -663,6 +684,8 @@ function createBaseCheckResponse(): CheckResponse {
 }
 
 export const CheckResponse = {
+  typeUrl: "/google.api.servicecontrol.v1.CheckResponse",
+
   encode(message: CheckResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.operationId !== "") {
       writer.uint32(10).string(message.operationId);
@@ -811,6 +834,25 @@ export const CheckResponse = {
     obj.service_rollout_id = message.serviceRolloutId;
     obj.check_info = message.checkInfo ? CheckResponse_CheckInfo.toAmino(message.checkInfo) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: CheckResponseAminoMsg): CheckResponse {
+    return CheckResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: CheckResponseProtoMsg): CheckResponse {
+    return CheckResponse.decode(message.value);
+  },
+
+  toProto(message: CheckResponse): Uint8Array {
+    return CheckResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: CheckResponse): CheckResponseProtoMsg {
+    return {
+      typeUrl: "/google.api.servicecontrol.v1.CheckResponse",
+      value: CheckResponse.encode(message).finish()
+    };
   }
 
 };
@@ -823,6 +865,8 @@ function createBaseCheckResponse_CheckInfo(): CheckResponse_CheckInfo {
 }
 
 export const CheckResponse_CheckInfo = {
+  typeUrl: "/google.api.servicecontrol.v1.CheckInfo",
+
   encode(message: CheckResponse_CheckInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.unusedArguments) {
       writer.uint32(10).string(v!);
@@ -926,6 +970,25 @@ export const CheckResponse_CheckInfo = {
 
     obj.consumer_info = message.consumerInfo ? CheckResponse_ConsumerInfo.toAmino(message.consumerInfo) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: CheckResponse_CheckInfoAminoMsg): CheckResponse_CheckInfo {
+    return CheckResponse_CheckInfo.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: CheckResponse_CheckInfoProtoMsg): CheckResponse_CheckInfo {
+    return CheckResponse_CheckInfo.decode(message.value);
+  },
+
+  toProto(message: CheckResponse_CheckInfo): Uint8Array {
+    return CheckResponse_CheckInfo.encode(message).finish();
+  },
+
+  toProtoMsg(message: CheckResponse_CheckInfo): CheckResponse_CheckInfoProtoMsg {
+    return {
+      typeUrl: "/google.api.servicecontrol.v1.CheckInfo",
+      value: CheckResponse_CheckInfo.encode(message).finish()
+    };
   }
 
 };
@@ -939,6 +1002,8 @@ function createBaseCheckResponse_ConsumerInfo(): CheckResponse_ConsumerInfo {
 }
 
 export const CheckResponse_ConsumerInfo = {
+  typeUrl: "/google.api.servicecontrol.v1.ConsumerInfo",
+
   encode(message: CheckResponse_ConsumerInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.projectNumber.isZero()) {
       writer.uint32(8).int64(message.projectNumber);
@@ -1039,6 +1104,25 @@ export const CheckResponse_ConsumerInfo = {
     obj.type = message.type;
     obj.consumer_number = message.consumerNumber ? message.consumerNumber.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: CheckResponse_ConsumerInfoAminoMsg): CheckResponse_ConsumerInfo {
+    return CheckResponse_ConsumerInfo.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: CheckResponse_ConsumerInfoProtoMsg): CheckResponse_ConsumerInfo {
+    return CheckResponse_ConsumerInfo.decode(message.value);
+  },
+
+  toProto(message: CheckResponse_ConsumerInfo): Uint8Array {
+    return CheckResponse_ConsumerInfo.encode(message).finish();
+  },
+
+  toProtoMsg(message: CheckResponse_ConsumerInfo): CheckResponse_ConsumerInfoProtoMsg {
+    return {
+      typeUrl: "/google.api.servicecontrol.v1.ConsumerInfo",
+      value: CheckResponse_ConsumerInfo.encode(message).finish()
+    };
   }
 
 };
@@ -1052,6 +1136,8 @@ function createBaseReportRequest(): ReportRequest {
 }
 
 export const ReportRequest = {
+  typeUrl: "/google.api.servicecontrol.v1.ReportRequest",
+
   encode(message: ReportRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.serviceName !== "") {
       writer.uint32(10).string(message.serviceName);
@@ -1170,6 +1256,25 @@ export const ReportRequest = {
 
     obj.service_config_id = message.serviceConfigId;
     return obj;
+  },
+
+  fromAminoMsg(object: ReportRequestAminoMsg): ReportRequest {
+    return ReportRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ReportRequestProtoMsg): ReportRequest {
+    return ReportRequest.decode(message.value);
+  },
+
+  toProto(message: ReportRequest): Uint8Array {
+    return ReportRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: ReportRequest): ReportRequestProtoMsg {
+    return {
+      typeUrl: "/google.api.servicecontrol.v1.ReportRequest",
+      value: ReportRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1183,6 +1288,8 @@ function createBaseReportResponse(): ReportResponse {
 }
 
 export const ReportResponse = {
+  typeUrl: "/google.api.servicecontrol.v1.ReportResponse",
+
   encode(message: ReportResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.reportErrors) {
       ReportResponse_ReportError.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1301,6 +1408,25 @@ export const ReportResponse = {
     obj.service_config_id = message.serviceConfigId;
     obj.service_rollout_id = message.serviceRolloutId;
     return obj;
+  },
+
+  fromAminoMsg(object: ReportResponseAminoMsg): ReportResponse {
+    return ReportResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ReportResponseProtoMsg): ReportResponse {
+    return ReportResponse.decode(message.value);
+  },
+
+  toProto(message: ReportResponse): Uint8Array {
+    return ReportResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: ReportResponse): ReportResponseProtoMsg {
+    return {
+      typeUrl: "/google.api.servicecontrol.v1.ReportResponse",
+      value: ReportResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1313,6 +1439,8 @@ function createBaseReportResponse_ReportError(): ReportResponse_ReportError {
 }
 
 export const ReportResponse_ReportError = {
+  typeUrl: "/google.api.servicecontrol.v1.ReportError",
+
   encode(message: ReportResponse_ReportError, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.operationId !== "") {
       writer.uint32(10).string(message.operationId);
@@ -1398,6 +1526,25 @@ export const ReportResponse_ReportError = {
     obj.operation_id = message.operationId;
     obj.status = message.status ? Status.toAmino(message.status) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ReportResponse_ReportErrorAminoMsg): ReportResponse_ReportError {
+    return ReportResponse_ReportError.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ReportResponse_ReportErrorProtoMsg): ReportResponse_ReportError {
+    return ReportResponse_ReportError.decode(message.value);
+  },
+
+  toProto(message: ReportResponse_ReportError): Uint8Array {
+    return ReportResponse_ReportError.encode(message).finish();
+  },
+
+  toProtoMsg(message: ReportResponse_ReportError): ReportResponse_ReportErrorProtoMsg {
+    return {
+      typeUrl: "/google.api.servicecontrol.v1.ReportError",
+      value: ReportResponse_ReportError.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/api/servicecontrol/v2/service_controller.ts b/__fixtures__/outputv2/google/api/servicecontrol/v2/service_controller.ts
index e688d4f32..d0cb3c992 100644
--- a/__fixtures__/outputv2/google/api/servicecontrol/v2/service_controller.ts
+++ b/__fixtures__/outputv2/google/api/servicecontrol/v2/service_controller.ts
@@ -32,7 +32,7 @@ export interface CheckRequest {
   /** Optional. Contains a comma-separated list of flags. */
   flags: string;
 }
-export interface CheckRequestProtoType {
+export interface CheckRequestProtoMsg {
   typeUrl: "/google.api.servicecontrol.v2.CheckRequest";
   value: Uint8Array;
 }
@@ -65,7 +65,7 @@ export interface CheckRequestAmino {
   /** Optional. Contains a comma-separated list of flags. */
   flags: string;
 }
-export interface CheckRequestAminoType {
+export interface CheckRequestAminoMsg {
   type: "/google.api.servicecontrol.v2.CheckRequest";
   value: CheckRequestAmino;
 }
@@ -112,7 +112,7 @@ export interface ResourceInfo {
    */
   location: string;
 }
-export interface ResourceInfoProtoType {
+export interface ResourceInfoProtoMsg {
   typeUrl: "/google.api.servicecontrol.v2.ResourceInfo";
   value: Uint8Array;
 }
@@ -150,7 +150,7 @@ export interface ResourceInfoAmino {
    */
   location: string;
 }
-export interface ResourceInfoAminoType {
+export interface ResourceInfoAminoMsg {
   type: "/google.api.servicecontrol.v2.ResourceInfo";
   value: ResourceInfoAmino;
 }
@@ -167,16 +167,16 @@ export interface CheckResponse_HeadersEntry {
   key: string;
   value: string;
 }
-export interface CheckResponse_HeadersEntryProtoType {
-  typeUrl: "/google.api.servicecontrol.v2.undefined";
+export interface CheckResponse_HeadersEntryProtoMsg {
+  typeUrl: string;
   value: Uint8Array;
 }
 export interface CheckResponse_HeadersEntryAmino {
   key: string;
   value: string;
 }
-export interface CheckResponse_HeadersEntryAminoType {
-  type: "/google.api.servicecontrol.v2.undefined";
+export interface CheckResponse_HeadersEntryAminoMsg {
+  type: string;
   value: CheckResponse_HeadersEntryAmino;
 }
 export interface CheckResponse_HeadersEntrySDKType {
@@ -198,7 +198,7 @@ export interface CheckResponse {
     [key: string]: string;
   };
 }
-export interface CheckResponseProtoType {
+export interface CheckResponseProtoMsg {
   typeUrl: "/google.api.servicecontrol.v2.CheckResponse";
   value: Uint8Array;
 }
@@ -217,7 +217,7 @@ export interface CheckResponseAmino {
     [key: string]: string;
   };
 }
-export interface CheckResponseAminoType {
+export interface CheckResponseAminoMsg {
   type: "/google.api.servicecontrol.v2.CheckResponse";
   value: CheckResponseAmino;
 }
@@ -256,7 +256,7 @@ export interface ReportRequest {
    */
   operations: AttributeContext[];
 }
-export interface ReportRequestProtoType {
+export interface ReportRequestProtoMsg {
   typeUrl: "/google.api.servicecontrol.v2.ReportRequest";
   value: Uint8Array;
 }
@@ -287,7 +287,7 @@ export interface ReportRequestAmino {
    */
   operations: AttributeContextAmino[];
 }
-export interface ReportRequestAminoType {
+export interface ReportRequestAminoMsg {
   type: "/google.api.servicecontrol.v2.ReportRequest";
   value: ReportRequestAmino;
 }
@@ -304,7 +304,7 @@ export interface ReportRequestSDKType {
  * If the request contains any invalid data, the server returns an RPC error.
  */
 export interface ReportResponse {}
-export interface ReportResponseProtoType {
+export interface ReportResponseProtoMsg {
   typeUrl: "/google.api.servicecontrol.v2.ReportResponse";
   value: Uint8Array;
 }
@@ -314,7 +314,7 @@ export interface ReportResponseProtoType {
  * If the request contains any invalid data, the server returns an RPC error.
  */
 export interface ReportResponseAmino {}
-export interface ReportResponseAminoType {
+export interface ReportResponseAminoMsg {
   type: "/google.api.servicecontrol.v2.ReportResponse";
   value: ReportResponseAmino;
 }
@@ -336,6 +336,8 @@ function createBaseCheckRequest(): CheckRequest {
 }
 
 export const CheckRequest = {
+  typeUrl: "/google.api.servicecontrol.v2.CheckRequest",
+
   encode(message: CheckRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.serviceName !== "") {
       writer.uint32(10).string(message.serviceName);
@@ -484,6 +486,25 @@ export const CheckRequest = {
 
     obj.flags = message.flags;
     return obj;
+  },
+
+  fromAminoMsg(object: CheckRequestAminoMsg): CheckRequest {
+    return CheckRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: CheckRequestProtoMsg): CheckRequest {
+    return CheckRequest.decode(message.value);
+  },
+
+  toProto(message: CheckRequest): Uint8Array {
+    return CheckRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: CheckRequest): CheckRequestProtoMsg {
+    return {
+      typeUrl: "/google.api.servicecontrol.v2.CheckRequest",
+      value: CheckRequest.encode(message).finish()
+    };
   }
 
 };
@@ -499,6 +520,8 @@ function createBaseResourceInfo(): ResourceInfo {
 }
 
 export const ResourceInfo = {
+  typeUrl: "/google.api.servicecontrol.v2.ResourceInfo",
+
   encode(message: ResourceInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -629,6 +652,25 @@ export const ResourceInfo = {
     obj.container = message.container;
     obj.location = message.location;
     return obj;
+  },
+
+  fromAminoMsg(object: ResourceInfoAminoMsg): ResourceInfo {
+    return ResourceInfo.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ResourceInfoProtoMsg): ResourceInfo {
+    return ResourceInfo.decode(message.value);
+  },
+
+  toProto(message: ResourceInfo): Uint8Array {
+    return ResourceInfo.encode(message).finish();
+  },
+
+  toProtoMsg(message: ResourceInfo): ResourceInfoProtoMsg {
+    return {
+      typeUrl: "/google.api.servicecontrol.v2.ResourceInfo",
+      value: ResourceInfo.encode(message).finish()
+    };
   }
 
 };
@@ -726,6 +768,18 @@ export const CheckResponse_HeadersEntry = {
     obj.key = message.key;
     obj.value = message.value;
     return obj;
+  },
+
+  fromAminoMsg(object: CheckResponse_HeadersEntryAminoMsg): CheckResponse_HeadersEntry {
+    return CheckResponse_HeadersEntry.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: CheckResponse_HeadersEntryProtoMsg): CheckResponse_HeadersEntry {
+    return CheckResponse_HeadersEntry.decode(message.value);
+  },
+
+  toProto(message: CheckResponse_HeadersEntry): Uint8Array {
+    return CheckResponse_HeadersEntry.encode(message).finish();
   }
 
 };
@@ -738,6 +792,8 @@ function createBaseCheckResponse(): CheckResponse {
 }
 
 export const CheckResponse = {
+  typeUrl: "/google.api.servicecontrol.v2.CheckResponse",
+
   encode(message: CheckResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.status !== undefined) {
       Status.encode(message.status, writer.uint32(10).fork()).ldelim();
@@ -874,6 +930,25 @@ export const CheckResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: CheckResponseAminoMsg): CheckResponse {
+    return CheckResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: CheckResponseProtoMsg): CheckResponse {
+    return CheckResponse.decode(message.value);
+  },
+
+  toProto(message: CheckResponse): Uint8Array {
+    return CheckResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: CheckResponse): CheckResponseProtoMsg {
+    return {
+      typeUrl: "/google.api.servicecontrol.v2.CheckResponse",
+      value: CheckResponse.encode(message).finish()
+    };
   }
 
 };
@@ -887,6 +962,8 @@ function createBaseReportRequest(): ReportRequest {
 }
 
 export const ReportRequest = {
+  typeUrl: "/google.api.servicecontrol.v2.ReportRequest",
+
   encode(message: ReportRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.serviceName !== "") {
       writer.uint32(10).string(message.serviceName);
@@ -1005,6 +1082,25 @@ export const ReportRequest = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ReportRequestAminoMsg): ReportRequest {
+    return ReportRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ReportRequestProtoMsg): ReportRequest {
+    return ReportRequest.decode(message.value);
+  },
+
+  toProto(message: ReportRequest): Uint8Array {
+    return ReportRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: ReportRequest): ReportRequestProtoMsg {
+    return {
+      typeUrl: "/google.api.servicecontrol.v2.ReportRequest",
+      value: ReportRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1014,6 +1110,8 @@ function createBaseReportResponse(): ReportResponse {
 }
 
 export const ReportResponse = {
+  typeUrl: "/google.api.servicecontrol.v2.ReportResponse",
+
   encode(_: ReportResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -1066,6 +1164,25 @@ export const ReportResponse = {
   toAmino(_: ReportResponse): ReportResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: ReportResponseAminoMsg): ReportResponse {
+    return ReportResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ReportResponseProtoMsg): ReportResponse {
+    return ReportResponse.decode(message.value);
+  },
+
+  toProto(message: ReportResponse): Uint8Array {
+    return ReportResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: ReportResponse): ReportResponseProtoMsg {
+    return {
+      typeUrl: "/google.api.servicecontrol.v2.ReportResponse",
+      value: ReportResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/api/servicemanagement/v1/resources.ts b/__fixtures__/outputv2/google/api/servicemanagement/v1/resources.ts
index e50661379..d8b27b908 100644
--- a/__fixtures__/outputv2/google/api/servicemanagement/v1/resources.ts
+++ b/__fixtures__/outputv2/google/api/servicemanagement/v1/resources.ts
@@ -333,7 +333,7 @@ export interface ManagedService {
   /** ID of the project that produces and owns this service. */
   producerProjectId: string;
 }
-export interface ManagedServiceProtoType {
+export interface ManagedServiceProtoMsg {
   typeUrl: "/google.api.servicemanagement.v1.ManagedService";
   value: Uint8Array;
 }
@@ -352,7 +352,7 @@ export interface ManagedServiceAmino {
   /** ID of the project that produces and owns this service. */
   producer_project_id: string;
 }
-export interface ManagedServiceAminoType {
+export interface ManagedServiceAminoMsg {
   type: "/google.api.servicemanagement.v1.ManagedService";
   value: ManagedServiceAmino;
 }
@@ -383,7 +383,7 @@ export interface OperationMetadata {
   /** The start time of the operation. */
   startTime?: Date;
 }
-export interface OperationMetadataProtoType {
+export interface OperationMetadataProtoMsg {
   typeUrl: "/google.api.servicemanagement.v1.OperationMetadata";
   value: Uint8Array;
 }
@@ -405,7 +405,7 @@ export interface OperationMetadataAmino {
   /** The start time of the operation. */
   start_time?: Date;
 }
-export interface OperationMetadataAminoType {
+export interface OperationMetadataAminoMsg {
   type: "/google.api.servicemanagement.v1.OperationMetadata";
   value: OperationMetadataAmino;
 }
@@ -426,7 +426,7 @@ export interface OperationMetadata_Step {
   /** The status code. */
   status: OperationMetadata_Status;
 }
-export interface OperationMetadata_StepProtoType {
+export interface OperationMetadata_StepProtoMsg {
   typeUrl: "/google.api.servicemanagement.v1.Step";
   value: Uint8Array;
 }
@@ -439,7 +439,7 @@ export interface OperationMetadata_StepAmino {
   /** The status code. */
   status: OperationMetadata_Status;
 }
-export interface OperationMetadata_StepAminoType {
+export interface OperationMetadata_StepAminoMsg {
   type: "/google.api.servicemanagement.v1.Step";
   value: OperationMetadata_StepAmino;
 }
@@ -461,7 +461,7 @@ export interface Diagnostic {
   /** Message describing the error or warning. */
   message: string;
 }
-export interface DiagnosticProtoType {
+export interface DiagnosticProtoMsg {
   typeUrl: "/google.api.servicemanagement.v1.Diagnostic";
   value: Uint8Array;
 }
@@ -477,7 +477,7 @@ export interface DiagnosticAmino {
   /** Message describing the error or warning. */
   message: string;
 }
-export interface DiagnosticAminoType {
+export interface DiagnosticAminoMsg {
   type: "/google.api.servicemanagement.v1.Diagnostic";
   value: DiagnosticAmino;
 }
@@ -507,7 +507,7 @@ export interface ConfigSource {
    */
   files: ConfigFile[];
 }
-export interface ConfigSourceProtoType {
+export interface ConfigSourceProtoMsg {
   typeUrl: "/google.api.servicemanagement.v1.ConfigSource";
   value: Uint8Array;
 }
@@ -530,7 +530,7 @@ export interface ConfigSourceAmino {
    */
   files: ConfigFileAmino[];
 }
-export interface ConfigSourceAminoType {
+export interface ConfigSourceAminoMsg {
   type: "/google.api.servicemanagement.v1.ConfigSource";
   value: ConfigSourceAmino;
 }
@@ -555,7 +555,7 @@ export interface ConfigFile {
   /** The type of configuration file this represents. */
   fileType: ConfigFile_FileType;
 }
-export interface ConfigFileProtoType {
+export interface ConfigFileProtoMsg {
   typeUrl: "/google.api.servicemanagement.v1.ConfigFile";
   value: Uint8Array;
 }
@@ -571,7 +571,7 @@ export interface ConfigFileAmino {
   /** The type of configuration file this represents. */
   file_type: ConfigFile_FileType;
 }
-export interface ConfigFileAminoType {
+export interface ConfigFileAminoMsg {
   type: "/google.api.servicemanagement.v1.ConfigFile";
   value: ConfigFileAmino;
 }
@@ -591,7 +591,7 @@ export interface ConfigRef {
    */
   name: string;
 }
-export interface ConfigRefProtoType {
+export interface ConfigRefProtoMsg {
   typeUrl: "/google.api.servicemanagement.v1.ConfigRef";
   value: Uint8Array;
 }
@@ -604,7 +604,7 @@ export interface ConfigRefAmino {
    */
   name: string;
 }
-export interface ConfigRefAminoType {
+export interface ConfigRefAminoMsg {
   type: "/google.api.servicemanagement.v1.ConfigRef";
   value: ConfigRefAmino;
 }
@@ -630,7 +630,7 @@ export interface ChangeReport {
    */
   configChanges: ConfigChange[];
 }
-export interface ChangeReportProtoType {
+export interface ChangeReportProtoMsg {
   typeUrl: "/google.api.servicemanagement.v1.ChangeReport";
   value: Uint8Array;
 }
@@ -651,7 +651,7 @@ export interface ChangeReportAmino {
    */
   config_changes: ConfigChangeAmino[];
 }
-export interface ChangeReportAminoType {
+export interface ChangeReportAminoMsg {
   type: "/google.api.servicemanagement.v1.ChangeReport";
   value: ChangeReportAmino;
 }
@@ -712,7 +712,7 @@ export interface Rollout {
   /** The name of the service associated with this Rollout. */
   serviceName: string;
 }
-export interface RolloutProtoType {
+export interface RolloutProtoMsg {
   typeUrl: "/google.api.servicemanagement.v1.Rollout";
   value: Uint8Array;
 }
@@ -763,7 +763,7 @@ export interface RolloutAmino {
   /** The name of the service associated with this Rollout. */
   service_name: string;
 }
-export interface RolloutAminoType {
+export interface RolloutAminoMsg {
   type: "/google.api.servicemanagement.v1.Rollout";
   value: RolloutAmino;
 }
@@ -786,16 +786,16 @@ export interface Rollout_TrafficPercentStrategy_PercentagesEntry {
   key: string;
   value: number;
 }
-export interface Rollout_TrafficPercentStrategy_PercentagesEntryProtoType {
-  typeUrl: "/google.api.servicemanagement.v1.undefined";
+export interface Rollout_TrafficPercentStrategy_PercentagesEntryProtoMsg {
+  typeUrl: string;
   value: Uint8Array;
 }
 export interface Rollout_TrafficPercentStrategy_PercentagesEntryAmino {
   key: string;
   value: number;
 }
-export interface Rollout_TrafficPercentStrategy_PercentagesEntryAminoType {
-  type: "/google.api.servicemanagement.v1.undefined";
+export interface Rollout_TrafficPercentStrategy_PercentagesEntryAminoMsg {
+  type: string;
   value: Rollout_TrafficPercentStrategy_PercentagesEntryAmino;
 }
 export interface Rollout_TrafficPercentStrategy_PercentagesEntrySDKType {
@@ -845,7 +845,7 @@ export interface Rollout_TrafficPercentStrategy {
     [key: string]: number;
   };
 }
-export interface Rollout_TrafficPercentStrategyProtoType {
+export interface Rollout_TrafficPercentStrategyProtoMsg {
   typeUrl: "/google.api.servicemanagement.v1.TrafficPercentStrategy";
   value: Uint8Array;
 }
@@ -892,7 +892,7 @@ export interface Rollout_TrafficPercentStrategyAmino {
     [key: string]: number;
   };
 }
-export interface Rollout_TrafficPercentStrategyAminoType {
+export interface Rollout_TrafficPercentStrategyAminoMsg {
   type: "/google.api.servicemanagement.v1.TrafficPercentStrategy";
   value: Rollout_TrafficPercentStrategyAmino;
 }
@@ -940,7 +940,7 @@ export interface Rollout_TrafficPercentStrategySDKType {
  * used by the system generated rollout to delete a service.
  */
 export interface Rollout_DeleteServiceStrategy {}
-export interface Rollout_DeleteServiceStrategyProtoType {
+export interface Rollout_DeleteServiceStrategyProtoMsg {
   typeUrl: "/google.api.servicemanagement.v1.DeleteServiceStrategy";
   value: Uint8Array;
 }
@@ -950,7 +950,7 @@ export interface Rollout_DeleteServiceStrategyProtoType {
  * used by the system generated rollout to delete a service.
  */
 export interface Rollout_DeleteServiceStrategyAmino {}
-export interface Rollout_DeleteServiceStrategyAminoType {
+export interface Rollout_DeleteServiceStrategyAminoMsg {
   type: "/google.api.servicemanagement.v1.DeleteServiceStrategy";
   value: Rollout_DeleteServiceStrategyAmino;
 }
@@ -969,6 +969,8 @@ function createBaseManagedService(): ManagedService {
 }
 
 export const ManagedService = {
+  typeUrl: "/google.api.servicemanagement.v1.ManagedService",
+
   encode(message: ManagedService, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.serviceName !== "") {
       writer.uint32(18).string(message.serviceName);
@@ -1054,6 +1056,25 @@ export const ManagedService = {
     obj.service_name = message.serviceName;
     obj.producer_project_id = message.producerProjectId;
     return obj;
+  },
+
+  fromAminoMsg(object: ManagedServiceAminoMsg): ManagedService {
+    return ManagedService.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ManagedServiceProtoMsg): ManagedService {
+    return ManagedService.decode(message.value);
+  },
+
+  toProto(message: ManagedService): Uint8Array {
+    return ManagedService.encode(message).finish();
+  },
+
+  toProtoMsg(message: ManagedService): ManagedServiceProtoMsg {
+    return {
+      typeUrl: "/google.api.servicemanagement.v1.ManagedService",
+      value: ManagedService.encode(message).finish()
+    };
   }
 
 };
@@ -1068,6 +1089,8 @@ function createBaseOperationMetadata(): OperationMetadata {
 }
 
 export const OperationMetadata = {
+  typeUrl: "/google.api.servicemanagement.v1.OperationMetadata",
+
   encode(message: OperationMetadata, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.resourceNames) {
       writer.uint32(10).string(v!);
@@ -1216,6 +1239,25 @@ export const OperationMetadata = {
     obj.progress_percentage = message.progressPercentage;
     obj.start_time = message.startTime ? Timestamp.toAmino(message.startTime) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: OperationMetadataAminoMsg): OperationMetadata {
+    return OperationMetadata.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: OperationMetadataProtoMsg): OperationMetadata {
+    return OperationMetadata.decode(message.value);
+  },
+
+  toProto(message: OperationMetadata): Uint8Array {
+    return OperationMetadata.encode(message).finish();
+  },
+
+  toProtoMsg(message: OperationMetadata): OperationMetadataProtoMsg {
+    return {
+      typeUrl: "/google.api.servicemanagement.v1.OperationMetadata",
+      value: OperationMetadata.encode(message).finish()
+    };
   }
 
 };
@@ -1228,6 +1270,8 @@ function createBaseOperationMetadata_Step(): OperationMetadata_Step {
 }
 
 export const OperationMetadata_Step = {
+  typeUrl: "/google.api.servicemanagement.v1.Step",
+
   encode(message: OperationMetadata_Step, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.description !== "") {
       writer.uint32(18).string(message.description);
@@ -1313,6 +1357,25 @@ export const OperationMetadata_Step = {
     obj.description = message.description;
     obj.status = message.status;
     return obj;
+  },
+
+  fromAminoMsg(object: OperationMetadata_StepAminoMsg): OperationMetadata_Step {
+    return OperationMetadata_Step.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: OperationMetadata_StepProtoMsg): OperationMetadata_Step {
+    return OperationMetadata_Step.decode(message.value);
+  },
+
+  toProto(message: OperationMetadata_Step): Uint8Array {
+    return OperationMetadata_Step.encode(message).finish();
+  },
+
+  toProtoMsg(message: OperationMetadata_Step): OperationMetadata_StepProtoMsg {
+    return {
+      typeUrl: "/google.api.servicemanagement.v1.Step",
+      value: OperationMetadata_Step.encode(message).finish()
+    };
   }
 
 };
@@ -1326,6 +1389,8 @@ function createBaseDiagnostic(): Diagnostic {
 }
 
 export const Diagnostic = {
+  typeUrl: "/google.api.servicemanagement.v1.Diagnostic",
+
   encode(message: Diagnostic, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.location !== "") {
       writer.uint32(10).string(message.location);
@@ -1426,6 +1491,25 @@ export const Diagnostic = {
     obj.kind = message.kind;
     obj.message = message.message;
     return obj;
+  },
+
+  fromAminoMsg(object: DiagnosticAminoMsg): Diagnostic {
+    return Diagnostic.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: DiagnosticProtoMsg): Diagnostic {
+    return Diagnostic.decode(message.value);
+  },
+
+  toProto(message: Diagnostic): Uint8Array {
+    return Diagnostic.encode(message).finish();
+  },
+
+  toProtoMsg(message: Diagnostic): DiagnosticProtoMsg {
+    return {
+      typeUrl: "/google.api.servicemanagement.v1.Diagnostic",
+      value: Diagnostic.encode(message).finish()
+    };
   }
 
 };
@@ -1438,6 +1522,8 @@ function createBaseConfigSource(): ConfigSource {
 }
 
 export const ConfigSource = {
+  typeUrl: "/google.api.servicemanagement.v1.ConfigSource",
+
   encode(message: ConfigSource, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.id !== "") {
       writer.uint32(42).string(message.id);
@@ -1541,6 +1627,25 @@ export const ConfigSource = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ConfigSourceAminoMsg): ConfigSource {
+    return ConfigSource.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ConfigSourceProtoMsg): ConfigSource {
+    return ConfigSource.decode(message.value);
+  },
+
+  toProto(message: ConfigSource): Uint8Array {
+    return ConfigSource.encode(message).finish();
+  },
+
+  toProtoMsg(message: ConfigSource): ConfigSourceProtoMsg {
+    return {
+      typeUrl: "/google.api.servicemanagement.v1.ConfigSource",
+      value: ConfigSource.encode(message).finish()
+    };
   }
 
 };
@@ -1554,6 +1659,8 @@ function createBaseConfigFile(): ConfigFile {
 }
 
 export const ConfigFile = {
+  typeUrl: "/google.api.servicemanagement.v1.ConfigFile",
+
   encode(message: ConfigFile, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.filePath !== "") {
       writer.uint32(10).string(message.filePath);
@@ -1654,6 +1761,25 @@ export const ConfigFile = {
     obj.file_contents = message.fileContents;
     obj.file_type = message.fileType;
     return obj;
+  },
+
+  fromAminoMsg(object: ConfigFileAminoMsg): ConfigFile {
+    return ConfigFile.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ConfigFileProtoMsg): ConfigFile {
+    return ConfigFile.decode(message.value);
+  },
+
+  toProto(message: ConfigFile): Uint8Array {
+    return ConfigFile.encode(message).finish();
+  },
+
+  toProtoMsg(message: ConfigFile): ConfigFileProtoMsg {
+    return {
+      typeUrl: "/google.api.servicemanagement.v1.ConfigFile",
+      value: ConfigFile.encode(message).finish()
+    };
   }
 
 };
@@ -1665,6 +1791,8 @@ function createBaseConfigRef(): ConfigRef {
 }
 
 export const ConfigRef = {
+  typeUrl: "/google.api.servicemanagement.v1.ConfigRef",
+
   encode(message: ConfigRef, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -1735,6 +1863,25 @@ export const ConfigRef = {
     const obj: any = {};
     obj.name = message.name;
     return obj;
+  },
+
+  fromAminoMsg(object: ConfigRefAminoMsg): ConfigRef {
+    return ConfigRef.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ConfigRefProtoMsg): ConfigRef {
+    return ConfigRef.decode(message.value);
+  },
+
+  toProto(message: ConfigRef): Uint8Array {
+    return ConfigRef.encode(message).finish();
+  },
+
+  toProtoMsg(message: ConfigRef): ConfigRefProtoMsg {
+    return {
+      typeUrl: "/google.api.servicemanagement.v1.ConfigRef",
+      value: ConfigRef.encode(message).finish()
+    };
   }
 
 };
@@ -1746,6 +1893,8 @@ function createBaseChangeReport(): ChangeReport {
 }
 
 export const ChangeReport = {
+  typeUrl: "/google.api.servicemanagement.v1.ChangeReport",
+
   encode(message: ChangeReport, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.configChanges) {
       ConfigChange.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1834,6 +1983,25 @@ export const ChangeReport = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ChangeReportAminoMsg): ChangeReport {
+    return ChangeReport.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ChangeReportProtoMsg): ChangeReport {
+    return ChangeReport.decode(message.value);
+  },
+
+  toProto(message: ChangeReport): Uint8Array {
+    return ChangeReport.encode(message).finish();
+  },
+
+  toProtoMsg(message: ChangeReport): ChangeReportProtoMsg {
+    return {
+      typeUrl: "/google.api.servicemanagement.v1.ChangeReport",
+      value: ChangeReport.encode(message).finish()
+    };
   }
 
 };
@@ -1851,6 +2019,8 @@ function createBaseRollout(): Rollout {
 }
 
 export const Rollout = {
+  typeUrl: "/google.api.servicemanagement.v1.Rollout",
+
   encode(message: Rollout, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.rolloutId !== "") {
       writer.uint32(10).string(message.rolloutId);
@@ -2011,6 +2181,25 @@ export const Rollout = {
     obj.delete_service_strategy = message.deleteServiceStrategy ? Rollout_DeleteServiceStrategy.toAmino(message.deleteServiceStrategy) : undefined;
     obj.service_name = message.serviceName;
     return obj;
+  },
+
+  fromAminoMsg(object: RolloutAminoMsg): Rollout {
+    return Rollout.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: RolloutProtoMsg): Rollout {
+    return Rollout.decode(message.value);
+  },
+
+  toProto(message: Rollout): Uint8Array {
+    return Rollout.encode(message).finish();
+  },
+
+  toProtoMsg(message: Rollout): RolloutProtoMsg {
+    return {
+      typeUrl: "/google.api.servicemanagement.v1.Rollout",
+      value: Rollout.encode(message).finish()
+    };
   }
 
 };
@@ -2108,6 +2297,18 @@ export const Rollout_TrafficPercentStrategy_PercentagesEntry = {
     obj.key = message.key;
     obj.value = message.value;
     return obj;
+  },
+
+  fromAminoMsg(object: Rollout_TrafficPercentStrategy_PercentagesEntryAminoMsg): Rollout_TrafficPercentStrategy_PercentagesEntry {
+    return Rollout_TrafficPercentStrategy_PercentagesEntry.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: Rollout_TrafficPercentStrategy_PercentagesEntryProtoMsg): Rollout_TrafficPercentStrategy_PercentagesEntry {
+    return Rollout_TrafficPercentStrategy_PercentagesEntry.decode(message.value);
+  },
+
+  toProto(message: Rollout_TrafficPercentStrategy_PercentagesEntry): Uint8Array {
+    return Rollout_TrafficPercentStrategy_PercentagesEntry.encode(message).finish();
   }
 
 };
@@ -2119,6 +2320,8 @@ function createBaseRollout_TrafficPercentStrategy(): Rollout_TrafficPercentStrat
 }
 
 export const Rollout_TrafficPercentStrategy = {
+  typeUrl: "/google.api.servicemanagement.v1.TrafficPercentStrategy",
+
   encode(message: Rollout_TrafficPercentStrategy, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     Object.entries(message.percentages).forEach(([key, value]) => {
       Rollout_TrafficPercentStrategy_PercentagesEntry.encode({
@@ -2240,6 +2443,25 @@ export const Rollout_TrafficPercentStrategy = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: Rollout_TrafficPercentStrategyAminoMsg): Rollout_TrafficPercentStrategy {
+    return Rollout_TrafficPercentStrategy.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: Rollout_TrafficPercentStrategyProtoMsg): Rollout_TrafficPercentStrategy {
+    return Rollout_TrafficPercentStrategy.decode(message.value);
+  },
+
+  toProto(message: Rollout_TrafficPercentStrategy): Uint8Array {
+    return Rollout_TrafficPercentStrategy.encode(message).finish();
+  },
+
+  toProtoMsg(message: Rollout_TrafficPercentStrategy): Rollout_TrafficPercentStrategyProtoMsg {
+    return {
+      typeUrl: "/google.api.servicemanagement.v1.TrafficPercentStrategy",
+      value: Rollout_TrafficPercentStrategy.encode(message).finish()
+    };
   }
 
 };
@@ -2249,6 +2471,8 @@ function createBaseRollout_DeleteServiceStrategy(): Rollout_DeleteServiceStrateg
 }
 
 export const Rollout_DeleteServiceStrategy = {
+  typeUrl: "/google.api.servicemanagement.v1.DeleteServiceStrategy",
+
   encode(_: Rollout_DeleteServiceStrategy, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -2301,6 +2525,25 @@ export const Rollout_DeleteServiceStrategy = {
   toAmino(_: Rollout_DeleteServiceStrategy): Rollout_DeleteServiceStrategyAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: Rollout_DeleteServiceStrategyAminoMsg): Rollout_DeleteServiceStrategy {
+    return Rollout_DeleteServiceStrategy.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: Rollout_DeleteServiceStrategyProtoMsg): Rollout_DeleteServiceStrategy {
+    return Rollout_DeleteServiceStrategy.decode(message.value);
+  },
+
+  toProto(message: Rollout_DeleteServiceStrategy): Uint8Array {
+    return Rollout_DeleteServiceStrategy.encode(message).finish();
+  },
+
+  toProtoMsg(message: Rollout_DeleteServiceStrategy): Rollout_DeleteServiceStrategyProtoMsg {
+    return {
+      typeUrl: "/google.api.servicemanagement.v1.DeleteServiceStrategy",
+      value: Rollout_DeleteServiceStrategy.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/api/servicemanagement/v1/servicemanager.ts b/__fixtures__/outputv2/google/api/servicemanagement/v1/servicemanager.ts
index 1310335a5..b7aa0d808 100644
--- a/__fixtures__/outputv2/google/api/servicemanagement/v1/servicemanager.ts
+++ b/__fixtures__/outputv2/google/api/servicemanagement/v1/servicemanager.ts
@@ -77,7 +77,7 @@ export interface ListServicesRequest {
   /** @deprecated */
   consumerId: string;
 }
-export interface ListServicesRequestProtoType {
+export interface ListServicesRequestProtoMsg {
   typeUrl: "/google.api.servicemanagement.v1.ListServicesRequest";
   value: Uint8Array;
 }
@@ -110,7 +110,7 @@ export interface ListServicesRequestAmino {
   /** @deprecated */
   consumer_id: string;
 }
-export interface ListServicesRequestAminoType {
+export interface ListServicesRequestAminoMsg {
   type: "/google.api.servicemanagement.v1.ListServicesRequest";
   value: ListServicesRequestAmino;
 }
@@ -133,7 +133,7 @@ export interface ListServicesResponse {
   /** Token that can be passed to `ListServices` to resume a paginated query. */
   nextPageToken: string;
 }
-export interface ListServicesResponseProtoType {
+export interface ListServicesResponseProtoMsg {
   typeUrl: "/google.api.servicemanagement.v1.ListServicesResponse";
   value: Uint8Array;
 }
@@ -146,7 +146,7 @@ export interface ListServicesResponseAmino {
   /** Token that can be passed to `ListServices` to resume a paginated query. */
   next_page_token: string;
 }
-export interface ListServicesResponseAminoType {
+export interface ListServicesResponseAminoMsg {
   type: "/google.api.servicemanagement.v1.ListServicesResponse";
   value: ListServicesResponseAmino;
 }
@@ -165,7 +165,7 @@ export interface GetServiceRequest {
    */
   serviceName: string;
 }
-export interface GetServiceRequestProtoType {
+export interface GetServiceRequestProtoMsg {
   typeUrl: "/google.api.servicemanagement.v1.GetServiceRequest";
   value: Uint8Array;
 }
@@ -178,7 +178,7 @@ export interface GetServiceRequestAmino {
    */
   service_name: string;
 }
-export interface GetServiceRequestAminoType {
+export interface GetServiceRequestAminoMsg {
   type: "/google.api.servicemanagement.v1.GetServiceRequest";
   value: GetServiceRequestAmino;
 }
@@ -193,7 +193,7 @@ export interface CreateServiceRequest {
   /** Required. Initial values for the service resource. */
   service?: ManagedService;
 }
-export interface CreateServiceRequestProtoType {
+export interface CreateServiceRequestProtoMsg {
   typeUrl: "/google.api.servicemanagement.v1.CreateServiceRequest";
   value: Uint8Array;
 }
@@ -203,7 +203,7 @@ export interface CreateServiceRequestAmino {
   /** Required. Initial values for the service resource. */
   service?: ManagedServiceAmino;
 }
-export interface CreateServiceRequestAminoType {
+export interface CreateServiceRequestAminoMsg {
   type: "/google.api.servicemanagement.v1.CreateServiceRequest";
   value: CreateServiceRequestAmino;
 }
@@ -221,7 +221,7 @@ export interface DeleteServiceRequest {
    */
   serviceName: string;
 }
-export interface DeleteServiceRequestProtoType {
+export interface DeleteServiceRequestProtoMsg {
   typeUrl: "/google.api.servicemanagement.v1.DeleteServiceRequest";
   value: Uint8Array;
 }
@@ -234,7 +234,7 @@ export interface DeleteServiceRequestAmino {
    */
   service_name: string;
 }
-export interface DeleteServiceRequestAminoType {
+export interface DeleteServiceRequestAminoMsg {
   type: "/google.api.servicemanagement.v1.DeleteServiceRequest";
   value: DeleteServiceRequestAmino;
 }
@@ -252,7 +252,7 @@ export interface UndeleteServiceRequest {
    */
   serviceName: string;
 }
-export interface UndeleteServiceRequestProtoType {
+export interface UndeleteServiceRequestProtoMsg {
   typeUrl: "/google.api.servicemanagement.v1.UndeleteServiceRequest";
   value: Uint8Array;
 }
@@ -265,7 +265,7 @@ export interface UndeleteServiceRequestAmino {
    */
   service_name: string;
 }
-export interface UndeleteServiceRequestAminoType {
+export interface UndeleteServiceRequestAminoMsg {
   type: "/google.api.servicemanagement.v1.UndeleteServiceRequest";
   value: UndeleteServiceRequestAmino;
 }
@@ -280,7 +280,7 @@ export interface UndeleteServiceResponse {
   /** Revived service resource. */
   service?: ManagedService;
 }
-export interface UndeleteServiceResponseProtoType {
+export interface UndeleteServiceResponseProtoMsg {
   typeUrl: "/google.api.servicemanagement.v1.UndeleteServiceResponse";
   value: Uint8Array;
 }
@@ -290,7 +290,7 @@ export interface UndeleteServiceResponseAmino {
   /** Revived service resource. */
   service?: ManagedServiceAmino;
 }
-export interface UndeleteServiceResponseAminoType {
+export interface UndeleteServiceResponseAminoMsg {
   type: "/google.api.servicemanagement.v1.UndeleteServiceResponse";
   value: UndeleteServiceResponseAmino;
 }
@@ -322,7 +322,7 @@ export interface GetServiceConfigRequest {
    */
   view: GetServiceConfigRequest_ConfigView;
 }
-export interface GetServiceConfigRequestProtoType {
+export interface GetServiceConfigRequestProtoMsg {
   typeUrl: "/google.api.servicemanagement.v1.GetServiceConfigRequest";
   value: Uint8Array;
 }
@@ -349,7 +349,7 @@ export interface GetServiceConfigRequestAmino {
    */
   view: GetServiceConfigRequest_ConfigView;
 }
-export interface GetServiceConfigRequestAminoType {
+export interface GetServiceConfigRequestAminoMsg {
   type: "/google.api.servicemanagement.v1.GetServiceConfigRequest";
   value: GetServiceConfigRequestAmino;
 }
@@ -378,7 +378,7 @@ export interface ListServiceConfigsRequest {
    */
   pageSize: number;
 }
-export interface ListServiceConfigsRequestProtoType {
+export interface ListServiceConfigsRequestProtoMsg {
   typeUrl: "/google.api.servicemanagement.v1.ListServiceConfigsRequest";
   value: Uint8Array;
 }
@@ -400,7 +400,7 @@ export interface ListServiceConfigsRequestAmino {
    */
   page_size: number;
 }
-export interface ListServiceConfigsRequestAminoType {
+export interface ListServiceConfigsRequestAminoMsg {
   type: "/google.api.servicemanagement.v1.ListServiceConfigsRequest";
   value: ListServiceConfigsRequestAmino;
 }
@@ -420,7 +420,7 @@ export interface ListServiceConfigsResponse {
   /** The token of the next page of results. */
   nextPageToken: string;
 }
-export interface ListServiceConfigsResponseProtoType {
+export interface ListServiceConfigsResponseProtoMsg {
   typeUrl: "/google.api.servicemanagement.v1.ListServiceConfigsResponse";
   value: Uint8Array;
 }
@@ -433,7 +433,7 @@ export interface ListServiceConfigsResponseAmino {
   /** The token of the next page of results. */
   next_page_token: string;
 }
-export interface ListServiceConfigsResponseAminoType {
+export interface ListServiceConfigsResponseAminoMsg {
   type: "/google.api.servicemanagement.v1.ListServiceConfigsResponse";
   value: ListServiceConfigsResponseAmino;
 }
@@ -455,7 +455,7 @@ export interface CreateServiceConfigRequest {
   /** Required. The service configuration resource. */
   serviceConfig?: Service;
 }
-export interface CreateServiceConfigRequestProtoType {
+export interface CreateServiceConfigRequestProtoMsg {
   typeUrl: "/google.api.servicemanagement.v1.CreateServiceConfigRequest";
   value: Uint8Array;
 }
@@ -471,7 +471,7 @@ export interface CreateServiceConfigRequestAmino {
   /** Required. The service configuration resource. */
   service_config?: ServiceAmino;
 }
-export interface CreateServiceConfigRequestAminoType {
+export interface CreateServiceConfigRequestAminoMsg {
   type: "/google.api.servicemanagement.v1.CreateServiceConfigRequest";
   value: CreateServiceConfigRequestAmino;
 }
@@ -500,7 +500,7 @@ export interface SubmitConfigSourceRequest {
    */
   validateOnly: boolean;
 }
-export interface SubmitConfigSourceRequestProtoType {
+export interface SubmitConfigSourceRequestProtoMsg {
   typeUrl: "/google.api.servicemanagement.v1.SubmitConfigSourceRequest";
   value: Uint8Array;
 }
@@ -523,7 +523,7 @@ export interface SubmitConfigSourceRequestAmino {
    */
   validate_only: boolean;
 }
-export interface SubmitConfigSourceRequestAminoType {
+export interface SubmitConfigSourceRequestAminoMsg {
   type: "/google.api.servicemanagement.v1.SubmitConfigSourceRequest";
   value: SubmitConfigSourceRequestAmino;
 }
@@ -540,7 +540,7 @@ export interface SubmitConfigSourceResponse {
   /** The generated service configuration. */
   serviceConfig?: Service;
 }
-export interface SubmitConfigSourceResponseProtoType {
+export interface SubmitConfigSourceResponseProtoMsg {
   typeUrl: "/google.api.servicemanagement.v1.SubmitConfigSourceResponse";
   value: Uint8Array;
 }
@@ -550,7 +550,7 @@ export interface SubmitConfigSourceResponseAmino {
   /** The generated service configuration. */
   service_config?: ServiceAmino;
 }
-export interface SubmitConfigSourceResponseAminoType {
+export interface SubmitConfigSourceResponseAminoMsg {
   type: "/google.api.servicemanagement.v1.SubmitConfigSourceResponse";
   value: SubmitConfigSourceResponseAmino;
 }
@@ -571,7 +571,7 @@ export interface CreateServiceRolloutRequest {
   /** Required. The rollout resource. The `service_name` field is output only. */
   rollout?: Rollout;
 }
-export interface CreateServiceRolloutRequestProtoType {
+export interface CreateServiceRolloutRequestProtoMsg {
   typeUrl: "/google.api.servicemanagement.v1.CreateServiceRolloutRequest";
   value: Uint8Array;
 }
@@ -587,7 +587,7 @@ export interface CreateServiceRolloutRequestAmino {
   /** Required. The rollout resource. The `service_name` field is output only. */
   rollout?: RolloutAmino;
 }
-export interface CreateServiceRolloutRequestAminoType {
+export interface CreateServiceRolloutRequestAminoMsg {
   type: "/google.api.servicemanagement.v1.CreateServiceRolloutRequest";
   value: CreateServiceRolloutRequestAmino;
 }
@@ -627,7 +627,7 @@ export interface ListServiceRolloutsRequest {
    */
   filter: string;
 }
-export interface ListServiceRolloutsRequestProtoType {
+export interface ListServiceRolloutsRequestProtoMsg {
   typeUrl: "/google.api.servicemanagement.v1.ListServiceRolloutsRequest";
   value: Uint8Array;
 }
@@ -661,7 +661,7 @@ export interface ListServiceRolloutsRequestAmino {
    */
   filter: string;
 }
-export interface ListServiceRolloutsRequestAminoType {
+export interface ListServiceRolloutsRequestAminoMsg {
   type: "/google.api.servicemanagement.v1.ListServiceRolloutsRequest";
   value: ListServiceRolloutsRequestAmino;
 }
@@ -682,7 +682,7 @@ export interface ListServiceRolloutsResponse {
   /** The token of the next page of results. */
   nextPageToken: string;
 }
-export interface ListServiceRolloutsResponseProtoType {
+export interface ListServiceRolloutsResponseProtoMsg {
   typeUrl: "/google.api.servicemanagement.v1.ListServiceRolloutsResponse";
   value: Uint8Array;
 }
@@ -695,7 +695,7 @@ export interface ListServiceRolloutsResponseAmino {
   /** The token of the next page of results. */
   next_page_token: string;
 }
-export interface ListServiceRolloutsResponseAminoType {
+export interface ListServiceRolloutsResponseAminoMsg {
   type: "/google.api.servicemanagement.v1.ListServiceRolloutsResponse";
   value: ListServiceRolloutsResponseAmino;
 }
@@ -717,7 +717,7 @@ export interface GetServiceRolloutRequest {
   /** Required. The id of the rollout resource. */
   rolloutId: string;
 }
-export interface GetServiceRolloutRequestProtoType {
+export interface GetServiceRolloutRequestProtoMsg {
   typeUrl: "/google.api.servicemanagement.v1.GetServiceRolloutRequest";
   value: Uint8Array;
 }
@@ -733,7 +733,7 @@ export interface GetServiceRolloutRequestAmino {
   /** Required. The id of the rollout resource. */
   rollout_id: string;
 }
-export interface GetServiceRolloutRequestAminoType {
+export interface GetServiceRolloutRequestAminoMsg {
   type: "/google.api.servicemanagement.v1.GetServiceRolloutRequest";
   value: GetServiceRolloutRequestAmino;
 }
@@ -764,7 +764,7 @@ export interface GenerateConfigReportRequest {
    */
   oldConfig?: Any;
 }
-export interface GenerateConfigReportRequestProtoType {
+export interface GenerateConfigReportRequestProtoMsg {
   typeUrl: "/google.api.servicemanagement.v1.GenerateConfigReportRequest";
   value: Uint8Array;
 }
@@ -789,7 +789,7 @@ export interface GenerateConfigReportRequestAmino {
    */
   old_config?: AnyAmino;
 }
-export interface GenerateConfigReportRequestAminoType {
+export interface GenerateConfigReportRequestAminoMsg {
   type: "/google.api.servicemanagement.v1.GenerateConfigReportRequest";
   value: GenerateConfigReportRequestAmino;
 }
@@ -821,7 +821,7 @@ export interface GenerateConfigReportResponse {
    */
   diagnostics: Diagnostic[];
 }
-export interface GenerateConfigReportResponseProtoType {
+export interface GenerateConfigReportResponseProtoMsg {
   typeUrl: "/google.api.servicemanagement.v1.GenerateConfigReportResponse";
   value: Uint8Array;
 }
@@ -847,7 +847,7 @@ export interface GenerateConfigReportResponseAmino {
    */
   diagnostics: DiagnosticAmino[];
 }
-export interface GenerateConfigReportResponseAminoType {
+export interface GenerateConfigReportResponseAminoMsg {
   type: "/google.api.servicemanagement.v1.GenerateConfigReportResponse";
   value: GenerateConfigReportResponseAmino;
 }
@@ -870,6 +870,8 @@ function createBaseListServicesRequest(): ListServicesRequest {
 }
 
 export const ListServicesRequest = {
+  typeUrl: "/google.api.servicemanagement.v1.ListServicesRequest",
+
   encode(message: ListServicesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.producerProjectId !== "") {
       writer.uint32(10).string(message.producerProjectId);
@@ -985,6 +987,25 @@ export const ListServicesRequest = {
     obj.page_token = message.pageToken;
     obj.consumer_id = message.consumerId;
     return obj;
+  },
+
+  fromAminoMsg(object: ListServicesRequestAminoMsg): ListServicesRequest {
+    return ListServicesRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ListServicesRequestProtoMsg): ListServicesRequest {
+    return ListServicesRequest.decode(message.value);
+  },
+
+  toProto(message: ListServicesRequest): Uint8Array {
+    return ListServicesRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: ListServicesRequest): ListServicesRequestProtoMsg {
+    return {
+      typeUrl: "/google.api.servicemanagement.v1.ListServicesRequest",
+      value: ListServicesRequest.encode(message).finish()
+    };
   }
 
 };
@@ -997,6 +1018,8 @@ function createBaseListServicesResponse(): ListServicesResponse {
 }
 
 export const ListServicesResponse = {
+  typeUrl: "/google.api.servicemanagement.v1.ListServicesResponse",
+
   encode(message: ListServicesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.services) {
       ManagedService.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1100,6 +1123,25 @@ export const ListServicesResponse = {
 
     obj.next_page_token = message.nextPageToken;
     return obj;
+  },
+
+  fromAminoMsg(object: ListServicesResponseAminoMsg): ListServicesResponse {
+    return ListServicesResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ListServicesResponseProtoMsg): ListServicesResponse {
+    return ListServicesResponse.decode(message.value);
+  },
+
+  toProto(message: ListServicesResponse): Uint8Array {
+    return ListServicesResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: ListServicesResponse): ListServicesResponseProtoMsg {
+    return {
+      typeUrl: "/google.api.servicemanagement.v1.ListServicesResponse",
+      value: ListServicesResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1111,6 +1153,8 @@ function createBaseGetServiceRequest(): GetServiceRequest {
 }
 
 export const GetServiceRequest = {
+  typeUrl: "/google.api.servicemanagement.v1.GetServiceRequest",
+
   encode(message: GetServiceRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.serviceName !== "") {
       writer.uint32(10).string(message.serviceName);
@@ -1181,6 +1225,25 @@ export const GetServiceRequest = {
     const obj: any = {};
     obj.service_name = message.serviceName;
     return obj;
+  },
+
+  fromAminoMsg(object: GetServiceRequestAminoMsg): GetServiceRequest {
+    return GetServiceRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: GetServiceRequestProtoMsg): GetServiceRequest {
+    return GetServiceRequest.decode(message.value);
+  },
+
+  toProto(message: GetServiceRequest): Uint8Array {
+    return GetServiceRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: GetServiceRequest): GetServiceRequestProtoMsg {
+    return {
+      typeUrl: "/google.api.servicemanagement.v1.GetServiceRequest",
+      value: GetServiceRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1192,6 +1255,8 @@ function createBaseCreateServiceRequest(): CreateServiceRequest {
 }
 
 export const CreateServiceRequest = {
+  typeUrl: "/google.api.servicemanagement.v1.CreateServiceRequest",
+
   encode(message: CreateServiceRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.service !== undefined) {
       ManagedService.encode(message.service, writer.uint32(10).fork()).ldelim();
@@ -1262,6 +1327,25 @@ export const CreateServiceRequest = {
     const obj: any = {};
     obj.service = message.service ? ManagedService.toAmino(message.service) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: CreateServiceRequestAminoMsg): CreateServiceRequest {
+    return CreateServiceRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: CreateServiceRequestProtoMsg): CreateServiceRequest {
+    return CreateServiceRequest.decode(message.value);
+  },
+
+  toProto(message: CreateServiceRequest): Uint8Array {
+    return CreateServiceRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: CreateServiceRequest): CreateServiceRequestProtoMsg {
+    return {
+      typeUrl: "/google.api.servicemanagement.v1.CreateServiceRequest",
+      value: CreateServiceRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1273,6 +1357,8 @@ function createBaseDeleteServiceRequest(): DeleteServiceRequest {
 }
 
 export const DeleteServiceRequest = {
+  typeUrl: "/google.api.servicemanagement.v1.DeleteServiceRequest",
+
   encode(message: DeleteServiceRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.serviceName !== "") {
       writer.uint32(10).string(message.serviceName);
@@ -1343,6 +1429,25 @@ export const DeleteServiceRequest = {
     const obj: any = {};
     obj.service_name = message.serviceName;
     return obj;
+  },
+
+  fromAminoMsg(object: DeleteServiceRequestAminoMsg): DeleteServiceRequest {
+    return DeleteServiceRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: DeleteServiceRequestProtoMsg): DeleteServiceRequest {
+    return DeleteServiceRequest.decode(message.value);
+  },
+
+  toProto(message: DeleteServiceRequest): Uint8Array {
+    return DeleteServiceRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: DeleteServiceRequest): DeleteServiceRequestProtoMsg {
+    return {
+      typeUrl: "/google.api.servicemanagement.v1.DeleteServiceRequest",
+      value: DeleteServiceRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1354,6 +1459,8 @@ function createBaseUndeleteServiceRequest(): UndeleteServiceRequest {
 }
 
 export const UndeleteServiceRequest = {
+  typeUrl: "/google.api.servicemanagement.v1.UndeleteServiceRequest",
+
   encode(message: UndeleteServiceRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.serviceName !== "") {
       writer.uint32(10).string(message.serviceName);
@@ -1424,6 +1531,25 @@ export const UndeleteServiceRequest = {
     const obj: any = {};
     obj.service_name = message.serviceName;
     return obj;
+  },
+
+  fromAminoMsg(object: UndeleteServiceRequestAminoMsg): UndeleteServiceRequest {
+    return UndeleteServiceRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: UndeleteServiceRequestProtoMsg): UndeleteServiceRequest {
+    return UndeleteServiceRequest.decode(message.value);
+  },
+
+  toProto(message: UndeleteServiceRequest): Uint8Array {
+    return UndeleteServiceRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: UndeleteServiceRequest): UndeleteServiceRequestProtoMsg {
+    return {
+      typeUrl: "/google.api.servicemanagement.v1.UndeleteServiceRequest",
+      value: UndeleteServiceRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1435,6 +1561,8 @@ function createBaseUndeleteServiceResponse(): UndeleteServiceResponse {
 }
 
 export const UndeleteServiceResponse = {
+  typeUrl: "/google.api.servicemanagement.v1.UndeleteServiceResponse",
+
   encode(message: UndeleteServiceResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.service !== undefined) {
       ManagedService.encode(message.service, writer.uint32(10).fork()).ldelim();
@@ -1505,6 +1633,25 @@ export const UndeleteServiceResponse = {
     const obj: any = {};
     obj.service = message.service ? ManagedService.toAmino(message.service) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: UndeleteServiceResponseAminoMsg): UndeleteServiceResponse {
+    return UndeleteServiceResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: UndeleteServiceResponseProtoMsg): UndeleteServiceResponse {
+    return UndeleteServiceResponse.decode(message.value);
+  },
+
+  toProto(message: UndeleteServiceResponse): Uint8Array {
+    return UndeleteServiceResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: UndeleteServiceResponse): UndeleteServiceResponseProtoMsg {
+    return {
+      typeUrl: "/google.api.servicemanagement.v1.UndeleteServiceResponse",
+      value: UndeleteServiceResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1518,6 +1665,8 @@ function createBaseGetServiceConfigRequest(): GetServiceConfigRequest {
 }
 
 export const GetServiceConfigRequest = {
+  typeUrl: "/google.api.servicemanagement.v1.GetServiceConfigRequest",
+
   encode(message: GetServiceConfigRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.serviceName !== "") {
       writer.uint32(10).string(message.serviceName);
@@ -1618,6 +1767,25 @@ export const GetServiceConfigRequest = {
     obj.config_id = message.configId;
     obj.view = message.view;
     return obj;
+  },
+
+  fromAminoMsg(object: GetServiceConfigRequestAminoMsg): GetServiceConfigRequest {
+    return GetServiceConfigRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: GetServiceConfigRequestProtoMsg): GetServiceConfigRequest {
+    return GetServiceConfigRequest.decode(message.value);
+  },
+
+  toProto(message: GetServiceConfigRequest): Uint8Array {
+    return GetServiceConfigRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: GetServiceConfigRequest): GetServiceConfigRequestProtoMsg {
+    return {
+      typeUrl: "/google.api.servicemanagement.v1.GetServiceConfigRequest",
+      value: GetServiceConfigRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1631,6 +1799,8 @@ function createBaseListServiceConfigsRequest(): ListServiceConfigsRequest {
 }
 
 export const ListServiceConfigsRequest = {
+  typeUrl: "/google.api.servicemanagement.v1.ListServiceConfigsRequest",
+
   encode(message: ListServiceConfigsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.serviceName !== "") {
       writer.uint32(10).string(message.serviceName);
@@ -1731,6 +1901,25 @@ export const ListServiceConfigsRequest = {
     obj.page_token = message.pageToken;
     obj.page_size = message.pageSize;
     return obj;
+  },
+
+  fromAminoMsg(object: ListServiceConfigsRequestAminoMsg): ListServiceConfigsRequest {
+    return ListServiceConfigsRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ListServiceConfigsRequestProtoMsg): ListServiceConfigsRequest {
+    return ListServiceConfigsRequest.decode(message.value);
+  },
+
+  toProto(message: ListServiceConfigsRequest): Uint8Array {
+    return ListServiceConfigsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: ListServiceConfigsRequest): ListServiceConfigsRequestProtoMsg {
+    return {
+      typeUrl: "/google.api.servicemanagement.v1.ListServiceConfigsRequest",
+      value: ListServiceConfigsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1743,6 +1932,8 @@ function createBaseListServiceConfigsResponse(): ListServiceConfigsResponse {
 }
 
 export const ListServiceConfigsResponse = {
+  typeUrl: "/google.api.servicemanagement.v1.ListServiceConfigsResponse",
+
   encode(message: ListServiceConfigsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.serviceConfigs) {
       Service.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1846,6 +2037,25 @@ export const ListServiceConfigsResponse = {
 
     obj.next_page_token = message.nextPageToken;
     return obj;
+  },
+
+  fromAminoMsg(object: ListServiceConfigsResponseAminoMsg): ListServiceConfigsResponse {
+    return ListServiceConfigsResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ListServiceConfigsResponseProtoMsg): ListServiceConfigsResponse {
+    return ListServiceConfigsResponse.decode(message.value);
+  },
+
+  toProto(message: ListServiceConfigsResponse): Uint8Array {
+    return ListServiceConfigsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: ListServiceConfigsResponse): ListServiceConfigsResponseProtoMsg {
+    return {
+      typeUrl: "/google.api.servicemanagement.v1.ListServiceConfigsResponse",
+      value: ListServiceConfigsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1858,6 +2068,8 @@ function createBaseCreateServiceConfigRequest(): CreateServiceConfigRequest {
 }
 
 export const CreateServiceConfigRequest = {
+  typeUrl: "/google.api.servicemanagement.v1.CreateServiceConfigRequest",
+
   encode(message: CreateServiceConfigRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.serviceName !== "") {
       writer.uint32(10).string(message.serviceName);
@@ -1943,6 +2155,25 @@ export const CreateServiceConfigRequest = {
     obj.service_name = message.serviceName;
     obj.service_config = message.serviceConfig ? Service.toAmino(message.serviceConfig) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: CreateServiceConfigRequestAminoMsg): CreateServiceConfigRequest {
+    return CreateServiceConfigRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: CreateServiceConfigRequestProtoMsg): CreateServiceConfigRequest {
+    return CreateServiceConfigRequest.decode(message.value);
+  },
+
+  toProto(message: CreateServiceConfigRequest): Uint8Array {
+    return CreateServiceConfigRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: CreateServiceConfigRequest): CreateServiceConfigRequestProtoMsg {
+    return {
+      typeUrl: "/google.api.servicemanagement.v1.CreateServiceConfigRequest",
+      value: CreateServiceConfigRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1956,6 +2187,8 @@ function createBaseSubmitConfigSourceRequest(): SubmitConfigSourceRequest {
 }
 
 export const SubmitConfigSourceRequest = {
+  typeUrl: "/google.api.servicemanagement.v1.SubmitConfigSourceRequest",
+
   encode(message: SubmitConfigSourceRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.serviceName !== "") {
       writer.uint32(10).string(message.serviceName);
@@ -2056,6 +2289,25 @@ export const SubmitConfigSourceRequest = {
     obj.config_source = message.configSource ? ConfigSource.toAmino(message.configSource) : undefined;
     obj.validate_only = message.validateOnly;
     return obj;
+  },
+
+  fromAminoMsg(object: SubmitConfigSourceRequestAminoMsg): SubmitConfigSourceRequest {
+    return SubmitConfigSourceRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: SubmitConfigSourceRequestProtoMsg): SubmitConfigSourceRequest {
+    return SubmitConfigSourceRequest.decode(message.value);
+  },
+
+  toProto(message: SubmitConfigSourceRequest): Uint8Array {
+    return SubmitConfigSourceRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: SubmitConfigSourceRequest): SubmitConfigSourceRequestProtoMsg {
+    return {
+      typeUrl: "/google.api.servicemanagement.v1.SubmitConfigSourceRequest",
+      value: SubmitConfigSourceRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2067,6 +2319,8 @@ function createBaseSubmitConfigSourceResponse(): SubmitConfigSourceResponse {
 }
 
 export const SubmitConfigSourceResponse = {
+  typeUrl: "/google.api.servicemanagement.v1.SubmitConfigSourceResponse",
+
   encode(message: SubmitConfigSourceResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.serviceConfig !== undefined) {
       Service.encode(message.serviceConfig, writer.uint32(10).fork()).ldelim();
@@ -2137,6 +2391,25 @@ export const SubmitConfigSourceResponse = {
     const obj: any = {};
     obj.service_config = message.serviceConfig ? Service.toAmino(message.serviceConfig) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: SubmitConfigSourceResponseAminoMsg): SubmitConfigSourceResponse {
+    return SubmitConfigSourceResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: SubmitConfigSourceResponseProtoMsg): SubmitConfigSourceResponse {
+    return SubmitConfigSourceResponse.decode(message.value);
+  },
+
+  toProto(message: SubmitConfigSourceResponse): Uint8Array {
+    return SubmitConfigSourceResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: SubmitConfigSourceResponse): SubmitConfigSourceResponseProtoMsg {
+    return {
+      typeUrl: "/google.api.servicemanagement.v1.SubmitConfigSourceResponse",
+      value: SubmitConfigSourceResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2149,6 +2422,8 @@ function createBaseCreateServiceRolloutRequest(): CreateServiceRolloutRequest {
 }
 
 export const CreateServiceRolloutRequest = {
+  typeUrl: "/google.api.servicemanagement.v1.CreateServiceRolloutRequest",
+
   encode(message: CreateServiceRolloutRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.serviceName !== "") {
       writer.uint32(10).string(message.serviceName);
@@ -2234,6 +2509,25 @@ export const CreateServiceRolloutRequest = {
     obj.service_name = message.serviceName;
     obj.rollout = message.rollout ? Rollout.toAmino(message.rollout) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: CreateServiceRolloutRequestAminoMsg): CreateServiceRolloutRequest {
+    return CreateServiceRolloutRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: CreateServiceRolloutRequestProtoMsg): CreateServiceRolloutRequest {
+    return CreateServiceRolloutRequest.decode(message.value);
+  },
+
+  toProto(message: CreateServiceRolloutRequest): Uint8Array {
+    return CreateServiceRolloutRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: CreateServiceRolloutRequest): CreateServiceRolloutRequestProtoMsg {
+    return {
+      typeUrl: "/google.api.servicemanagement.v1.CreateServiceRolloutRequest",
+      value: CreateServiceRolloutRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2248,6 +2542,8 @@ function createBaseListServiceRolloutsRequest(): ListServiceRolloutsRequest {
 }
 
 export const ListServiceRolloutsRequest = {
+  typeUrl: "/google.api.servicemanagement.v1.ListServiceRolloutsRequest",
+
   encode(message: ListServiceRolloutsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.serviceName !== "") {
       writer.uint32(10).string(message.serviceName);
@@ -2363,6 +2659,25 @@ export const ListServiceRolloutsRequest = {
     obj.page_size = message.pageSize;
     obj.filter = message.filter;
     return obj;
+  },
+
+  fromAminoMsg(object: ListServiceRolloutsRequestAminoMsg): ListServiceRolloutsRequest {
+    return ListServiceRolloutsRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ListServiceRolloutsRequestProtoMsg): ListServiceRolloutsRequest {
+    return ListServiceRolloutsRequest.decode(message.value);
+  },
+
+  toProto(message: ListServiceRolloutsRequest): Uint8Array {
+    return ListServiceRolloutsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: ListServiceRolloutsRequest): ListServiceRolloutsRequestProtoMsg {
+    return {
+      typeUrl: "/google.api.servicemanagement.v1.ListServiceRolloutsRequest",
+      value: ListServiceRolloutsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2375,6 +2690,8 @@ function createBaseListServiceRolloutsResponse(): ListServiceRolloutsResponse {
 }
 
 export const ListServiceRolloutsResponse = {
+  typeUrl: "/google.api.servicemanagement.v1.ListServiceRolloutsResponse",
+
   encode(message: ListServiceRolloutsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.rollouts) {
       Rollout.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -2478,6 +2795,25 @@ export const ListServiceRolloutsResponse = {
 
     obj.next_page_token = message.nextPageToken;
     return obj;
+  },
+
+  fromAminoMsg(object: ListServiceRolloutsResponseAminoMsg): ListServiceRolloutsResponse {
+    return ListServiceRolloutsResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ListServiceRolloutsResponseProtoMsg): ListServiceRolloutsResponse {
+    return ListServiceRolloutsResponse.decode(message.value);
+  },
+
+  toProto(message: ListServiceRolloutsResponse): Uint8Array {
+    return ListServiceRolloutsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: ListServiceRolloutsResponse): ListServiceRolloutsResponseProtoMsg {
+    return {
+      typeUrl: "/google.api.servicemanagement.v1.ListServiceRolloutsResponse",
+      value: ListServiceRolloutsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2490,6 +2826,8 @@ function createBaseGetServiceRolloutRequest(): GetServiceRolloutRequest {
 }
 
 export const GetServiceRolloutRequest = {
+  typeUrl: "/google.api.servicemanagement.v1.GetServiceRolloutRequest",
+
   encode(message: GetServiceRolloutRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.serviceName !== "") {
       writer.uint32(10).string(message.serviceName);
@@ -2575,6 +2913,25 @@ export const GetServiceRolloutRequest = {
     obj.service_name = message.serviceName;
     obj.rollout_id = message.rolloutId;
     return obj;
+  },
+
+  fromAminoMsg(object: GetServiceRolloutRequestAminoMsg): GetServiceRolloutRequest {
+    return GetServiceRolloutRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: GetServiceRolloutRequestProtoMsg): GetServiceRolloutRequest {
+    return GetServiceRolloutRequest.decode(message.value);
+  },
+
+  toProto(message: GetServiceRolloutRequest): Uint8Array {
+    return GetServiceRolloutRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: GetServiceRolloutRequest): GetServiceRolloutRequestProtoMsg {
+    return {
+      typeUrl: "/google.api.servicemanagement.v1.GetServiceRolloutRequest",
+      value: GetServiceRolloutRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2587,6 +2944,8 @@ function createBaseGenerateConfigReportRequest(): GenerateConfigReportRequest {
 }
 
 export const GenerateConfigReportRequest = {
+  typeUrl: "/google.api.servicemanagement.v1.GenerateConfigReportRequest",
+
   encode(message: GenerateConfigReportRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.newConfig !== undefined) {
       Any.encode(message.newConfig, writer.uint32(10).fork()).ldelim();
@@ -2672,6 +3031,25 @@ export const GenerateConfigReportRequest = {
     obj.new_config = message.newConfig ? Any.toAmino(message.newConfig) : undefined;
     obj.old_config = message.oldConfig ? Any.toAmino(message.oldConfig) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GenerateConfigReportRequestAminoMsg): GenerateConfigReportRequest {
+    return GenerateConfigReportRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: GenerateConfigReportRequestProtoMsg): GenerateConfigReportRequest {
+    return GenerateConfigReportRequest.decode(message.value);
+  },
+
+  toProto(message: GenerateConfigReportRequest): Uint8Array {
+    return GenerateConfigReportRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenerateConfigReportRequest): GenerateConfigReportRequestProtoMsg {
+    return {
+      typeUrl: "/google.api.servicemanagement.v1.GenerateConfigReportRequest",
+      value: GenerateConfigReportRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2686,6 +3064,8 @@ function createBaseGenerateConfigReportResponse(): GenerateConfigReportResponse
 }
 
 export const GenerateConfigReportResponse = {
+  typeUrl: "/google.api.servicemanagement.v1.GenerateConfigReportResponse",
+
   encode(message: GenerateConfigReportResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.serviceName !== "") {
       writer.uint32(10).string(message.serviceName);
@@ -2834,6 +3214,25 @@ export const GenerateConfigReportResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: GenerateConfigReportResponseAminoMsg): GenerateConfigReportResponse {
+    return GenerateConfigReportResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: GenerateConfigReportResponseProtoMsg): GenerateConfigReportResponse {
+    return GenerateConfigReportResponse.decode(message.value);
+  },
+
+  toProto(message: GenerateConfigReportResponse): Uint8Array {
+    return GenerateConfigReportResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenerateConfigReportResponse): GenerateConfigReportResponseProtoMsg {
+    return {
+      typeUrl: "/google.api.servicemanagement.v1.GenerateConfigReportResponse",
+      value: GenerateConfigReportResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/api/serviceusage/v1/resources.ts b/__fixtures__/outputv2/google/api/serviceusage/v1/resources.ts
index 53bec6ade..819e56fe6 100644
--- a/__fixtures__/outputv2/google/api/serviceusage/v1/resources.ts
+++ b/__fixtures__/outputv2/google/api/serviceusage/v1/resources.ts
@@ -97,7 +97,7 @@ export interface Service {
   /** Whether or not the service has been enabled for use by the consumer. */
   state: State;
 }
-export interface ServiceProtoType {
+export interface ServiceProtoMsg {
   typeUrl: "/google.api.serviceusage.v1.Service";
   value: Uint8Array;
 }
@@ -131,7 +131,7 @@ export interface ServiceAmino {
   /** Whether or not the service has been enabled for use by the consumer. */
   state: State;
 }
-export interface ServiceAminoType {
+export interface ServiceAminoMsg {
   type: "/google.api.serviceusage.v1.Service";
   value: ServiceAmino;
 }
@@ -196,7 +196,7 @@ export interface ServiceConfig {
    */
   monitoring?: Monitoring;
 }
-export interface ServiceConfigProtoType {
+export interface ServiceConfigProtoMsg {
   typeUrl: "/google.api.serviceusage.v1.ServiceConfig";
   value: Uint8Array;
 }
@@ -253,7 +253,7 @@ export interface ServiceConfigAmino {
    */
   monitoring?: MonitoringAmino;
 }
-export interface ServiceConfigAminoType {
+export interface ServiceConfigAminoMsg {
   type: "/google.api.serviceusage.v1.ServiceConfig";
   value: ServiceConfigAmino;
 }
@@ -280,7 +280,7 @@ export interface OperationMetadata {
    */
   resourceNames: string[];
 }
-export interface OperationMetadataProtoType {
+export interface OperationMetadataProtoMsg {
   typeUrl: "/google.api.serviceusage.v1.OperationMetadata";
   value: Uint8Array;
 }
@@ -293,7 +293,7 @@ export interface OperationMetadataAmino {
    */
   resource_names: string[];
 }
-export interface OperationMetadataAminoType {
+export interface OperationMetadataAminoMsg {
   type: "/google.api.serviceusage.v1.OperationMetadata";
   value: OperationMetadataAmino;
 }
@@ -313,6 +313,8 @@ function createBaseService(): Service {
 }
 
 export const Service = {
+  typeUrl: "/google.api.serviceusage.v1.Service",
+
   encode(message: Service, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -428,6 +430,25 @@ export const Service = {
     obj.config = message.config ? ServiceConfig.toAmino(message.config) : undefined;
     obj.state = message.state;
     return obj;
+  },
+
+  fromAminoMsg(object: ServiceAminoMsg): Service {
+    return Service.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ServiceProtoMsg): Service {
+    return Service.decode(message.value);
+  },
+
+  toProto(message: Service): Uint8Array {
+    return Service.encode(message).finish();
+  },
+
+  toProtoMsg(message: Service): ServiceProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1.Service",
+      value: Service.encode(message).finish()
+    };
   }
 
 };
@@ -448,6 +469,8 @@ function createBaseServiceConfig(): ServiceConfig {
 }
 
 export const ServiceConfig = {
+  typeUrl: "/google.api.serviceusage.v1.ServiceConfig",
+
   encode(message: ServiceConfig, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -704,6 +727,25 @@ export const ServiceConfig = {
 
     obj.monitoring = message.monitoring ? Monitoring.toAmino(message.monitoring) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ServiceConfigAminoMsg): ServiceConfig {
+    return ServiceConfig.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ServiceConfigProtoMsg): ServiceConfig {
+    return ServiceConfig.decode(message.value);
+  },
+
+  toProto(message: ServiceConfig): Uint8Array {
+    return ServiceConfig.encode(message).finish();
+  },
+
+  toProtoMsg(message: ServiceConfig): ServiceConfigProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1.ServiceConfig",
+      value: ServiceConfig.encode(message).finish()
+    };
   }
 
 };
@@ -715,6 +757,8 @@ function createBaseOperationMetadata(): OperationMetadata {
 }
 
 export const OperationMetadata = {
+  typeUrl: "/google.api.serviceusage.v1.OperationMetadata",
+
   encode(message: OperationMetadata, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.resourceNames) {
       writer.uint32(18).string(v!);
@@ -803,6 +847,25 @@ export const OperationMetadata = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: OperationMetadataAminoMsg): OperationMetadata {
+    return OperationMetadata.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: OperationMetadataProtoMsg): OperationMetadata {
+    return OperationMetadata.decode(message.value);
+  },
+
+  toProto(message: OperationMetadata): Uint8Array {
+    return OperationMetadata.encode(message).finish();
+  },
+
+  toProtoMsg(message: OperationMetadata): OperationMetadataProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1.OperationMetadata",
+      value: OperationMetadata.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/api/serviceusage/v1/serviceusage.ts b/__fixtures__/outputv2/google/api/serviceusage/v1/serviceusage.ts
index 865b7d8f2..a07448616 100644
--- a/__fixtures__/outputv2/google/api/serviceusage/v1/serviceusage.ts
+++ b/__fixtures__/outputv2/google/api/serviceusage/v1/serviceusage.ts
@@ -78,7 +78,7 @@ export interface EnableServiceRequest {
    */
   name: string;
 }
-export interface EnableServiceRequestProtoType {
+export interface EnableServiceRequestProtoMsg {
   typeUrl: "/google.api.serviceusage.v1.EnableServiceRequest";
   value: Uint8Array;
 }
@@ -100,7 +100,7 @@ export interface EnableServiceRequestAmino {
    */
   name: string;
 }
-export interface EnableServiceRequestAminoType {
+export interface EnableServiceRequestAminoMsg {
   type: "/google.api.serviceusage.v1.EnableServiceRequest";
   value: EnableServiceRequestAmino;
 }
@@ -119,7 +119,7 @@ export interface EnableServiceResponse {
   /** The new state of the service after enabling. */
   service?: Service;
 }
-export interface EnableServiceResponseProtoType {
+export interface EnableServiceResponseProtoMsg {
   typeUrl: "/google.api.serviceusage.v1.EnableServiceResponse";
   value: Uint8Array;
 }
@@ -133,7 +133,7 @@ export interface EnableServiceResponseAmino {
   /** The new state of the service after enabling. */
   service?: ServiceAmino;
 }
-export interface EnableServiceResponseAminoType {
+export interface EnableServiceResponseAminoMsg {
   type: "/google.api.serviceusage.v1.EnableServiceResponse";
   value: EnableServiceResponseAmino;
 }
@@ -172,7 +172,7 @@ export interface DisableServiceRequest {
   /** Defines the behavior for checking service usage when disabling a service. */
   checkIfServiceHasUsage: DisableServiceRequest_CheckIfServiceHasUsage;
 }
-export interface DisableServiceRequestProtoType {
+export interface DisableServiceRequestProtoMsg {
   typeUrl: "/google.api.serviceusage.v1.DisableServiceRequest";
   value: Uint8Array;
 }
@@ -202,7 +202,7 @@ export interface DisableServiceRequestAmino {
   /** Defines the behavior for checking service usage when disabling a service. */
   check_if_service_has_usage: DisableServiceRequest_CheckIfServiceHasUsage;
 }
-export interface DisableServiceRequestAminoType {
+export interface DisableServiceRequestAminoMsg {
   type: "/google.api.serviceusage.v1.DisableServiceRequest";
   value: DisableServiceRequestAmino;
 }
@@ -223,7 +223,7 @@ export interface DisableServiceResponse {
   /** The new state of the service after disabling. */
   service?: Service;
 }
-export interface DisableServiceResponseProtoType {
+export interface DisableServiceResponseProtoMsg {
   typeUrl: "/google.api.serviceusage.v1.DisableServiceResponse";
   value: Uint8Array;
 }
@@ -237,7 +237,7 @@ export interface DisableServiceResponseAmino {
   /** The new state of the service after disabling. */
   service?: ServiceAmino;
 }
-export interface DisableServiceResponseAminoType {
+export interface DisableServiceResponseAminoMsg {
   type: "/google.api.serviceusage.v1.DisableServiceResponse";
   value: DisableServiceResponseAmino;
 }
@@ -262,7 +262,7 @@ export interface GetServiceRequest {
    */
   name: string;
 }
-export interface GetServiceRequestProtoType {
+export interface GetServiceRequestProtoMsg {
   typeUrl: "/google.api.serviceusage.v1.GetServiceRequest";
   value: Uint8Array;
 }
@@ -278,7 +278,7 @@ export interface GetServiceRequestAmino {
    */
   name: string;
 }
-export interface GetServiceRequestAminoType {
+export interface GetServiceRequestAminoMsg {
   type: "/google.api.serviceusage.v1.GetServiceRequest";
   value: GetServiceRequestAmino;
 }
@@ -317,7 +317,7 @@ export interface ListServicesRequest {
    */
   filter: string;
 }
-export interface ListServicesRequestProtoType {
+export interface ListServicesRequestProtoMsg {
   typeUrl: "/google.api.serviceusage.v1.ListServicesRequest";
   value: Uint8Array;
 }
@@ -351,7 +351,7 @@ export interface ListServicesRequestAmino {
    */
   filter: string;
 }
-export interface ListServicesRequestAminoType {
+export interface ListServicesRequestAminoMsg {
   type: "/google.api.serviceusage.v1.ListServicesRequest";
   value: ListServicesRequestAmino;
 }
@@ -375,7 +375,7 @@ export interface ListServicesResponse {
    */
   nextPageToken: string;
 }
-export interface ListServicesResponseProtoType {
+export interface ListServicesResponseProtoMsg {
   typeUrl: "/google.api.serviceusage.v1.ListServicesResponse";
   value: Uint8Array;
 }
@@ -391,7 +391,7 @@ export interface ListServicesResponseAmino {
    */
   next_page_token: string;
 }
-export interface ListServicesResponseAminoType {
+export interface ListServicesResponseAminoMsg {
   type: "/google.api.serviceusage.v1.ListServicesResponse";
   value: ListServicesResponseAmino;
 }
@@ -429,7 +429,7 @@ export interface BatchEnableServicesRequest {
    */
   serviceIds: string[];
 }
-export interface BatchEnableServicesRequestProtoType {
+export interface BatchEnableServicesRequestProtoMsg {
   typeUrl: "/google.api.serviceusage.v1.BatchEnableServicesRequest";
   value: Uint8Array;
 }
@@ -461,7 +461,7 @@ export interface BatchEnableServicesRequestAmino {
    */
   service_ids: string[];
 }
-export interface BatchEnableServicesRequestAminoType {
+export interface BatchEnableServicesRequestAminoMsg {
   type: "/google.api.serviceusage.v1.BatchEnableServicesRequest";
   value: BatchEnableServicesRequestAmino;
 }
@@ -487,7 +487,7 @@ export interface BatchEnableServicesResponse {
    */
   failures: BatchEnableServicesResponse_EnableFailure[];
 }
-export interface BatchEnableServicesResponseProtoType {
+export interface BatchEnableServicesResponseProtoMsg {
   typeUrl: "/google.api.serviceusage.v1.BatchEnableServicesResponse";
   value: Uint8Array;
 }
@@ -507,7 +507,7 @@ export interface BatchEnableServicesResponseAmino {
    */
   failures: BatchEnableServicesResponse_EnableFailureAmino[];
 }
-export interface BatchEnableServicesResponseAminoType {
+export interface BatchEnableServicesResponseAminoMsg {
   type: "/google.api.serviceusage.v1.BatchEnableServicesResponse";
   value: BatchEnableServicesResponseAmino;
 }
@@ -530,7 +530,7 @@ export interface BatchEnableServicesResponse_EnableFailure {
   /** An error message describing why the service could not be enabled. */
   errorMessage: string;
 }
-export interface BatchEnableServicesResponse_EnableFailureProtoType {
+export interface BatchEnableServicesResponse_EnableFailureProtoMsg {
   typeUrl: "/google.api.serviceusage.v1.EnableFailure";
   value: Uint8Array;
 }
@@ -543,7 +543,7 @@ export interface BatchEnableServicesResponse_EnableFailureAmino {
   /** An error message describing why the service could not be enabled. */
   error_message: string;
 }
-export interface BatchEnableServicesResponse_EnableFailureAminoType {
+export interface BatchEnableServicesResponse_EnableFailureAminoMsg {
   type: "/google.api.serviceusage.v1.EnableFailure";
   value: BatchEnableServicesResponse_EnableFailureAmino;
 }
@@ -575,7 +575,7 @@ export interface BatchGetServicesRequest {
    */
   names: string[];
 }
-export interface BatchGetServicesRequestProtoType {
+export interface BatchGetServicesRequestProtoMsg {
   typeUrl: "/google.api.serviceusage.v1.BatchGetServicesRequest";
   value: Uint8Array;
 }
@@ -601,7 +601,7 @@ export interface BatchGetServicesRequestAmino {
    */
   names: string[];
 }
-export interface BatchGetServicesRequestAminoType {
+export interface BatchGetServicesRequestAminoMsg {
   type: "/google.api.serviceusage.v1.BatchGetServicesRequest";
   value: BatchGetServicesRequestAmino;
 }
@@ -617,7 +617,7 @@ export interface BatchGetServicesResponse {
   /** The requested Service states. */
   services: Service[];
 }
-export interface BatchGetServicesResponseProtoType {
+export interface BatchGetServicesResponseProtoMsg {
   typeUrl: "/google.api.serviceusage.v1.BatchGetServicesResponse";
   value: Uint8Array;
 }
@@ -627,7 +627,7 @@ export interface BatchGetServicesResponseAmino {
   /** The requested Service states. */
   services: ServiceAmino[];
 }
-export interface BatchGetServicesResponseAminoType {
+export interface BatchGetServicesResponseAminoMsg {
   type: "/google.api.serviceusage.v1.BatchGetServicesResponse";
   value: BatchGetServicesResponseAmino;
 }
@@ -644,6 +644,8 @@ function createBaseEnableServiceRequest(): EnableServiceRequest {
 }
 
 export const EnableServiceRequest = {
+  typeUrl: "/google.api.serviceusage.v1.EnableServiceRequest",
+
   encode(message: EnableServiceRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -714,6 +716,25 @@ export const EnableServiceRequest = {
     const obj: any = {};
     obj.name = message.name;
     return obj;
+  },
+
+  fromAminoMsg(object: EnableServiceRequestAminoMsg): EnableServiceRequest {
+    return EnableServiceRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: EnableServiceRequestProtoMsg): EnableServiceRequest {
+    return EnableServiceRequest.decode(message.value);
+  },
+
+  toProto(message: EnableServiceRequest): Uint8Array {
+    return EnableServiceRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: EnableServiceRequest): EnableServiceRequestProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1.EnableServiceRequest",
+      value: EnableServiceRequest.encode(message).finish()
+    };
   }
 
 };
@@ -725,6 +746,8 @@ function createBaseEnableServiceResponse(): EnableServiceResponse {
 }
 
 export const EnableServiceResponse = {
+  typeUrl: "/google.api.serviceusage.v1.EnableServiceResponse",
+
   encode(message: EnableServiceResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.service !== undefined) {
       Service.encode(message.service, writer.uint32(10).fork()).ldelim();
@@ -795,6 +818,25 @@ export const EnableServiceResponse = {
     const obj: any = {};
     obj.service = message.service ? Service.toAmino(message.service) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: EnableServiceResponseAminoMsg): EnableServiceResponse {
+    return EnableServiceResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: EnableServiceResponseProtoMsg): EnableServiceResponse {
+    return EnableServiceResponse.decode(message.value);
+  },
+
+  toProto(message: EnableServiceResponse): Uint8Array {
+    return EnableServiceResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: EnableServiceResponse): EnableServiceResponseProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1.EnableServiceResponse",
+      value: EnableServiceResponse.encode(message).finish()
+    };
   }
 
 };
@@ -808,6 +850,8 @@ function createBaseDisableServiceRequest(): DisableServiceRequest {
 }
 
 export const DisableServiceRequest = {
+  typeUrl: "/google.api.serviceusage.v1.DisableServiceRequest",
+
   encode(message: DisableServiceRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -908,6 +952,25 @@ export const DisableServiceRequest = {
     obj.disable_dependent_services = message.disableDependentServices;
     obj.check_if_service_has_usage = message.checkIfServiceHasUsage;
     return obj;
+  },
+
+  fromAminoMsg(object: DisableServiceRequestAminoMsg): DisableServiceRequest {
+    return DisableServiceRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: DisableServiceRequestProtoMsg): DisableServiceRequest {
+    return DisableServiceRequest.decode(message.value);
+  },
+
+  toProto(message: DisableServiceRequest): Uint8Array {
+    return DisableServiceRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: DisableServiceRequest): DisableServiceRequestProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1.DisableServiceRequest",
+      value: DisableServiceRequest.encode(message).finish()
+    };
   }
 
 };
@@ -919,6 +982,8 @@ function createBaseDisableServiceResponse(): DisableServiceResponse {
 }
 
 export const DisableServiceResponse = {
+  typeUrl: "/google.api.serviceusage.v1.DisableServiceResponse",
+
   encode(message: DisableServiceResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.service !== undefined) {
       Service.encode(message.service, writer.uint32(10).fork()).ldelim();
@@ -989,6 +1054,25 @@ export const DisableServiceResponse = {
     const obj: any = {};
     obj.service = message.service ? Service.toAmino(message.service) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: DisableServiceResponseAminoMsg): DisableServiceResponse {
+    return DisableServiceResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: DisableServiceResponseProtoMsg): DisableServiceResponse {
+    return DisableServiceResponse.decode(message.value);
+  },
+
+  toProto(message: DisableServiceResponse): Uint8Array {
+    return DisableServiceResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: DisableServiceResponse): DisableServiceResponseProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1.DisableServiceResponse",
+      value: DisableServiceResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1000,6 +1084,8 @@ function createBaseGetServiceRequest(): GetServiceRequest {
 }
 
 export const GetServiceRequest = {
+  typeUrl: "/google.api.serviceusage.v1.GetServiceRequest",
+
   encode(message: GetServiceRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -1070,6 +1156,25 @@ export const GetServiceRequest = {
     const obj: any = {};
     obj.name = message.name;
     return obj;
+  },
+
+  fromAminoMsg(object: GetServiceRequestAminoMsg): GetServiceRequest {
+    return GetServiceRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: GetServiceRequestProtoMsg): GetServiceRequest {
+    return GetServiceRequest.decode(message.value);
+  },
+
+  toProto(message: GetServiceRequest): Uint8Array {
+    return GetServiceRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: GetServiceRequest): GetServiceRequestProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1.GetServiceRequest",
+      value: GetServiceRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1084,6 +1189,8 @@ function createBaseListServicesRequest(): ListServicesRequest {
 }
 
 export const ListServicesRequest = {
+  typeUrl: "/google.api.serviceusage.v1.ListServicesRequest",
+
   encode(message: ListServicesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.parent !== "") {
       writer.uint32(10).string(message.parent);
@@ -1199,6 +1306,25 @@ export const ListServicesRequest = {
     obj.page_token = message.pageToken;
     obj.filter = message.filter;
     return obj;
+  },
+
+  fromAminoMsg(object: ListServicesRequestAminoMsg): ListServicesRequest {
+    return ListServicesRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ListServicesRequestProtoMsg): ListServicesRequest {
+    return ListServicesRequest.decode(message.value);
+  },
+
+  toProto(message: ListServicesRequest): Uint8Array {
+    return ListServicesRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: ListServicesRequest): ListServicesRequestProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1.ListServicesRequest",
+      value: ListServicesRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1211,6 +1337,8 @@ function createBaseListServicesResponse(): ListServicesResponse {
 }
 
 export const ListServicesResponse = {
+  typeUrl: "/google.api.serviceusage.v1.ListServicesResponse",
+
   encode(message: ListServicesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.services) {
       Service.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1314,6 +1442,25 @@ export const ListServicesResponse = {
 
     obj.next_page_token = message.nextPageToken;
     return obj;
+  },
+
+  fromAminoMsg(object: ListServicesResponseAminoMsg): ListServicesResponse {
+    return ListServicesResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ListServicesResponseProtoMsg): ListServicesResponse {
+    return ListServicesResponse.decode(message.value);
+  },
+
+  toProto(message: ListServicesResponse): Uint8Array {
+    return ListServicesResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: ListServicesResponse): ListServicesResponseProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1.ListServicesResponse",
+      value: ListServicesResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1326,6 +1473,8 @@ function createBaseBatchEnableServicesRequest(): BatchEnableServicesRequest {
 }
 
 export const BatchEnableServicesRequest = {
+  typeUrl: "/google.api.serviceusage.v1.BatchEnableServicesRequest",
+
   encode(message: BatchEnableServicesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.parent !== "") {
       writer.uint32(10).string(message.parent);
@@ -1429,6 +1578,25 @@ export const BatchEnableServicesRequest = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: BatchEnableServicesRequestAminoMsg): BatchEnableServicesRequest {
+    return BatchEnableServicesRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: BatchEnableServicesRequestProtoMsg): BatchEnableServicesRequest {
+    return BatchEnableServicesRequest.decode(message.value);
+  },
+
+  toProto(message: BatchEnableServicesRequest): Uint8Array {
+    return BatchEnableServicesRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: BatchEnableServicesRequest): BatchEnableServicesRequestProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1.BatchEnableServicesRequest",
+      value: BatchEnableServicesRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1441,6 +1609,8 @@ function createBaseBatchEnableServicesResponse(): BatchEnableServicesResponse {
 }
 
 export const BatchEnableServicesResponse = {
+  typeUrl: "/google.api.serviceusage.v1.BatchEnableServicesResponse",
+
   encode(message: BatchEnableServicesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.services) {
       Service.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1559,6 +1729,25 @@ export const BatchEnableServicesResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: BatchEnableServicesResponseAminoMsg): BatchEnableServicesResponse {
+    return BatchEnableServicesResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: BatchEnableServicesResponseProtoMsg): BatchEnableServicesResponse {
+    return BatchEnableServicesResponse.decode(message.value);
+  },
+
+  toProto(message: BatchEnableServicesResponse): Uint8Array {
+    return BatchEnableServicesResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: BatchEnableServicesResponse): BatchEnableServicesResponseProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1.BatchEnableServicesResponse",
+      value: BatchEnableServicesResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1571,6 +1760,8 @@ function createBaseBatchEnableServicesResponse_EnableFailure(): BatchEnableServi
 }
 
 export const BatchEnableServicesResponse_EnableFailure = {
+  typeUrl: "/google.api.serviceusage.v1.EnableFailure",
+
   encode(message: BatchEnableServicesResponse_EnableFailure, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.serviceId !== "") {
       writer.uint32(10).string(message.serviceId);
@@ -1656,6 +1847,25 @@ export const BatchEnableServicesResponse_EnableFailure = {
     obj.service_id = message.serviceId;
     obj.error_message = message.errorMessage;
     return obj;
+  },
+
+  fromAminoMsg(object: BatchEnableServicesResponse_EnableFailureAminoMsg): BatchEnableServicesResponse_EnableFailure {
+    return BatchEnableServicesResponse_EnableFailure.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: BatchEnableServicesResponse_EnableFailureProtoMsg): BatchEnableServicesResponse_EnableFailure {
+    return BatchEnableServicesResponse_EnableFailure.decode(message.value);
+  },
+
+  toProto(message: BatchEnableServicesResponse_EnableFailure): Uint8Array {
+    return BatchEnableServicesResponse_EnableFailure.encode(message).finish();
+  },
+
+  toProtoMsg(message: BatchEnableServicesResponse_EnableFailure): BatchEnableServicesResponse_EnableFailureProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1.EnableFailure",
+      value: BatchEnableServicesResponse_EnableFailure.encode(message).finish()
+    };
   }
 
 };
@@ -1668,6 +1878,8 @@ function createBaseBatchGetServicesRequest(): BatchGetServicesRequest {
 }
 
 export const BatchGetServicesRequest = {
+  typeUrl: "/google.api.serviceusage.v1.BatchGetServicesRequest",
+
   encode(message: BatchGetServicesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.parent !== "") {
       writer.uint32(10).string(message.parent);
@@ -1771,6 +1983,25 @@ export const BatchGetServicesRequest = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: BatchGetServicesRequestAminoMsg): BatchGetServicesRequest {
+    return BatchGetServicesRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: BatchGetServicesRequestProtoMsg): BatchGetServicesRequest {
+    return BatchGetServicesRequest.decode(message.value);
+  },
+
+  toProto(message: BatchGetServicesRequest): Uint8Array {
+    return BatchGetServicesRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: BatchGetServicesRequest): BatchGetServicesRequestProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1.BatchGetServicesRequest",
+      value: BatchGetServicesRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1782,6 +2013,8 @@ function createBaseBatchGetServicesResponse(): BatchGetServicesResponse {
 }
 
 export const BatchGetServicesResponse = {
+  typeUrl: "/google.api.serviceusage.v1.BatchGetServicesResponse",
+
   encode(message: BatchGetServicesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.services) {
       Service.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1870,6 +2103,25 @@ export const BatchGetServicesResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: BatchGetServicesResponseAminoMsg): BatchGetServicesResponse {
+    return BatchGetServicesResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: BatchGetServicesResponseProtoMsg): BatchGetServicesResponse {
+    return BatchGetServicesResponse.decode(message.value);
+  },
+
+  toProto(message: BatchGetServicesResponse): Uint8Array {
+    return BatchGetServicesResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: BatchGetServicesResponse): BatchGetServicesResponseProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1.BatchGetServicesResponse",
+      value: BatchGetServicesResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/api/serviceusage/v1beta1/resources.ts b/__fixtures__/outputv2/google/api/serviceusage/v1beta1/resources.ts
index b6c1908b9..875ee6383 100644
--- a/__fixtures__/outputv2/google/api/serviceusage/v1beta1/resources.ts
+++ b/__fixtures__/outputv2/google/api/serviceusage/v1beta1/resources.ts
@@ -218,7 +218,7 @@ export interface Service {
   /** Whether or not the service has been enabled for use by the consumer. */
   state: State;
 }
-export interface ServiceProtoType {
+export interface ServiceProtoMsg {
   typeUrl: "/google.api.serviceusage.v1beta1.Service";
   value: Uint8Array;
 }
@@ -252,7 +252,7 @@ export interface ServiceAmino {
   /** Whether or not the service has been enabled for use by the consumer. */
   state: State;
 }
-export interface ServiceAminoType {
+export interface ServiceAminoMsg {
   type: "/google.api.serviceusage.v1beta1.Service";
   value: ServiceAmino;
 }
@@ -317,7 +317,7 @@ export interface ServiceConfig {
    */
   monitoring?: Monitoring;
 }
-export interface ServiceConfigProtoType {
+export interface ServiceConfigProtoMsg {
   typeUrl: "/google.api.serviceusage.v1beta1.ServiceConfig";
   value: Uint8Array;
 }
@@ -374,7 +374,7 @@ export interface ServiceConfigAmino {
    */
   monitoring?: MonitoringAmino;
 }
-export interface ServiceConfigAminoType {
+export interface ServiceConfigAminoMsg {
   type: "/google.api.serviceusage.v1beta1.ServiceConfig";
   value: ServiceConfigAmino;
 }
@@ -401,7 +401,7 @@ export interface OperationMetadata {
    */
   resourceNames: string[];
 }
-export interface OperationMetadataProtoType {
+export interface OperationMetadataProtoMsg {
   typeUrl: "/google.api.serviceusage.v1beta1.OperationMetadata";
   value: Uint8Array;
 }
@@ -414,7 +414,7 @@ export interface OperationMetadataAmino {
    */
   resource_names: string[];
 }
-export interface OperationMetadataAminoType {
+export interface OperationMetadataAminoMsg {
   type: "/google.api.serviceusage.v1beta1.OperationMetadata";
   value: OperationMetadataAmino;
 }
@@ -472,7 +472,7 @@ export interface ConsumerQuotaMetric {
   /** The units in which the metric value is reported. */
   unit: string;
 }
-export interface ConsumerQuotaMetricProtoType {
+export interface ConsumerQuotaMetricProtoMsg {
   typeUrl: "/google.api.serviceusage.v1beta1.ConsumerQuotaMetric";
   value: Uint8Array;
 }
@@ -525,7 +525,7 @@ export interface ConsumerQuotaMetricAmino {
   /** The units in which the metric value is reported. */
   unit: string;
 }
-export interface ConsumerQuotaMetricAminoType {
+export interface ConsumerQuotaMetricAminoMsg {
   type: "/google.api.serviceusage.v1beta1.ConsumerQuotaMetric";
   value: ConsumerQuotaMetricAmino;
 }
@@ -584,7 +584,7 @@ export interface ConsumerQuotaLimit {
    */
   quotaBuckets: QuotaBucket[];
 }
-export interface ConsumerQuotaLimitProtoType {
+export interface ConsumerQuotaLimitProtoMsg {
   typeUrl: "/google.api.serviceusage.v1beta1.ConsumerQuotaLimit";
   value: Uint8Array;
 }
@@ -633,7 +633,7 @@ export interface ConsumerQuotaLimitAmino {
    */
   quota_buckets: QuotaBucketAmino[];
 }
-export interface ConsumerQuotaLimitAminoType {
+export interface ConsumerQuotaLimitAminoMsg {
   type: "/google.api.serviceusage.v1beta1.ConsumerQuotaLimit";
   value: ConsumerQuotaLimitAmino;
 }
@@ -651,16 +651,16 @@ export interface QuotaBucket_DimensionsEntry {
   key: string;
   value: string;
 }
-export interface QuotaBucket_DimensionsEntryProtoType {
-  typeUrl: "/google.api.serviceusage.v1beta1.undefined";
+export interface QuotaBucket_DimensionsEntryProtoMsg {
+  typeUrl: string;
   value: Uint8Array;
 }
 export interface QuotaBucket_DimensionsEntryAmino {
   key: string;
   value: string;
 }
-export interface QuotaBucket_DimensionsEntryAminoType {
-  type: "/google.api.serviceusage.v1beta1.undefined";
+export interface QuotaBucket_DimensionsEntryAminoMsg {
+  type: string;
   value: QuotaBucket_DimensionsEntryAmino;
 }
 export interface QuotaBucket_DimensionsEntrySDKType {
@@ -708,7 +708,7 @@ export interface QuotaBucket {
     [key: string]: string;
   };
 }
-export interface QuotaBucketProtoType {
+export interface QuotaBucketProtoMsg {
   typeUrl: "/google.api.serviceusage.v1beta1.QuotaBucket";
   value: Uint8Array;
 }
@@ -753,7 +753,7 @@ export interface QuotaBucketAmino {
     [key: string]: string;
   };
 }
-export interface QuotaBucketAminoType {
+export interface QuotaBucketAminoMsg {
   type: "/google.api.serviceusage.v1beta1.QuotaBucket";
   value: QuotaBucketAmino;
 }
@@ -773,16 +773,16 @@ export interface QuotaOverride_DimensionsEntry {
   key: string;
   value: string;
 }
-export interface QuotaOverride_DimensionsEntryProtoType {
-  typeUrl: "/google.api.serviceusage.v1beta1.undefined";
+export interface QuotaOverride_DimensionsEntryProtoMsg {
+  typeUrl: string;
   value: Uint8Array;
 }
 export interface QuotaOverride_DimensionsEntryAmino {
   key: string;
   value: string;
 }
-export interface QuotaOverride_DimensionsEntryAminoType {
-  type: "/google.api.serviceusage.v1beta1.undefined";
+export interface QuotaOverride_DimensionsEntryAminoMsg {
+  type: string;
   value: QuotaOverride_DimensionsEntryAmino;
 }
 export interface QuotaOverride_DimensionsEntrySDKType {
@@ -864,7 +864,7 @@ export interface QuotaOverride {
    */
   adminOverrideAncestor: string;
 }
-export interface QuotaOverrideProtoType {
+export interface QuotaOverrideProtoMsg {
   typeUrl: "/google.api.serviceusage.v1beta1.QuotaOverride";
   value: Uint8Array;
 }
@@ -943,7 +943,7 @@ export interface QuotaOverrideAmino {
    */
   admin_override_ancestor: string;
 }
-export interface QuotaOverrideAminoType {
+export interface QuotaOverrideAminoMsg {
   type: "/google.api.serviceusage.v1beta1.QuotaOverride";
   value: QuotaOverrideAmino;
 }
@@ -970,7 +970,7 @@ export interface OverrideInlineSource {
    */
   overrides: QuotaOverride[];
 }
-export interface OverrideInlineSourceProtoType {
+export interface OverrideInlineSourceProtoMsg {
   typeUrl: "/google.api.serviceusage.v1beta1.OverrideInlineSource";
   value: Uint8Array;
 }
@@ -985,7 +985,7 @@ export interface OverrideInlineSourceAmino {
    */
   overrides: QuotaOverrideAmino[];
 }
-export interface OverrideInlineSourceAminoType {
+export interface OverrideInlineSourceAminoMsg {
   type: "/google.api.serviceusage.v1beta1.OverrideInlineSource";
   value: OverrideInlineSourceAmino;
 }
@@ -998,16 +998,16 @@ export interface AdminQuotaPolicy_DimensionsEntry {
   key: string;
   value: string;
 }
-export interface AdminQuotaPolicy_DimensionsEntryProtoType {
-  typeUrl: "/google.api.serviceusage.v1beta1.undefined";
+export interface AdminQuotaPolicy_DimensionsEntryProtoMsg {
+  typeUrl: string;
   value: Uint8Array;
 }
 export interface AdminQuotaPolicy_DimensionsEntryAmino {
   key: string;
   value: string;
 }
-export interface AdminQuotaPolicy_DimensionsEntryAminoType {
-  type: "/google.api.serviceusage.v1beta1.undefined";
+export interface AdminQuotaPolicy_DimensionsEntryAminoMsg {
+  type: string;
   value: AdminQuotaPolicy_DimensionsEntryAmino;
 }
 export interface AdminQuotaPolicy_DimensionsEntrySDKType {
@@ -1074,7 +1074,7 @@ export interface AdminQuotaPolicy {
    */
   container: string;
 }
-export interface AdminQuotaPolicyProtoType {
+export interface AdminQuotaPolicyProtoMsg {
   typeUrl: "/google.api.serviceusage.v1beta1.AdminQuotaPolicy";
   value: Uint8Array;
 }
@@ -1138,7 +1138,7 @@ export interface AdminQuotaPolicyAmino {
    */
   container: string;
 }
-export interface AdminQuotaPolicyAminoType {
+export interface AdminQuotaPolicyAminoMsg {
   type: "/google.api.serviceusage.v1beta1.AdminQuotaPolicy";
   value: AdminQuotaPolicyAmino;
 }
@@ -1172,7 +1172,7 @@ export interface ServiceIdentity {
    */
   uniqueId: string;
 }
-export interface ServiceIdentityProtoType {
+export interface ServiceIdentityProtoMsg {
   typeUrl: "/google.api.serviceusage.v1beta1.ServiceIdentity";
   value: Uint8Array;
 }
@@ -1194,7 +1194,7 @@ export interface ServiceIdentityAmino {
    */
   unique_id: string;
 }
-export interface ServiceIdentityAminoType {
+export interface ServiceIdentityAminoMsg {
   type: "/google.api.serviceusage.v1beta1.ServiceIdentity";
   value: ServiceIdentityAmino;
 }
@@ -1218,6 +1218,8 @@ function createBaseService(): Service {
 }
 
 export const Service = {
+  typeUrl: "/google.api.serviceusage.v1beta1.Service",
+
   encode(message: Service, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -1333,6 +1335,25 @@ export const Service = {
     obj.config = message.config ? ServiceConfig.toAmino(message.config) : undefined;
     obj.state = message.state;
     return obj;
+  },
+
+  fromAminoMsg(object: ServiceAminoMsg): Service {
+    return Service.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ServiceProtoMsg): Service {
+    return Service.decode(message.value);
+  },
+
+  toProto(message: Service): Uint8Array {
+    return Service.encode(message).finish();
+  },
+
+  toProtoMsg(message: Service): ServiceProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1beta1.Service",
+      value: Service.encode(message).finish()
+    };
   }
 
 };
@@ -1353,6 +1374,8 @@ function createBaseServiceConfig(): ServiceConfig {
 }
 
 export const ServiceConfig = {
+  typeUrl: "/google.api.serviceusage.v1beta1.ServiceConfig",
+
   encode(message: ServiceConfig, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -1609,6 +1632,25 @@ export const ServiceConfig = {
 
     obj.monitoring = message.monitoring ? Monitoring.toAmino(message.monitoring) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ServiceConfigAminoMsg): ServiceConfig {
+    return ServiceConfig.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ServiceConfigProtoMsg): ServiceConfig {
+    return ServiceConfig.decode(message.value);
+  },
+
+  toProto(message: ServiceConfig): Uint8Array {
+    return ServiceConfig.encode(message).finish();
+  },
+
+  toProtoMsg(message: ServiceConfig): ServiceConfigProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1beta1.ServiceConfig",
+      value: ServiceConfig.encode(message).finish()
+    };
   }
 
 };
@@ -1620,6 +1662,8 @@ function createBaseOperationMetadata(): OperationMetadata {
 }
 
 export const OperationMetadata = {
+  typeUrl: "/google.api.serviceusage.v1beta1.OperationMetadata",
+
   encode(message: OperationMetadata, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.resourceNames) {
       writer.uint32(18).string(v!);
@@ -1708,6 +1752,25 @@ export const OperationMetadata = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: OperationMetadataAminoMsg): OperationMetadata {
+    return OperationMetadata.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: OperationMetadataProtoMsg): OperationMetadata {
+    return OperationMetadata.decode(message.value);
+  },
+
+  toProto(message: OperationMetadata): Uint8Array {
+    return OperationMetadata.encode(message).finish();
+  },
+
+  toProtoMsg(message: OperationMetadata): OperationMetadataProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1beta1.OperationMetadata",
+      value: OperationMetadata.encode(message).finish()
+    };
   }
 
 };
@@ -1724,6 +1787,8 @@ function createBaseConsumerQuotaMetric(): ConsumerQuotaMetric {
 }
 
 export const ConsumerQuotaMetric = {
+  typeUrl: "/google.api.serviceusage.v1beta1.ConsumerQuotaMetric",
+
   encode(message: ConsumerQuotaMetric, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -1902,6 +1967,25 @@ export const ConsumerQuotaMetric = {
 
     obj.unit = message.unit;
     return obj;
+  },
+
+  fromAminoMsg(object: ConsumerQuotaMetricAminoMsg): ConsumerQuotaMetric {
+    return ConsumerQuotaMetric.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ConsumerQuotaMetricProtoMsg): ConsumerQuotaMetric {
+    return ConsumerQuotaMetric.decode(message.value);
+  },
+
+  toProto(message: ConsumerQuotaMetric): Uint8Array {
+    return ConsumerQuotaMetric.encode(message).finish();
+  },
+
+  toProtoMsg(message: ConsumerQuotaMetric): ConsumerQuotaMetricProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1beta1.ConsumerQuotaMetric",
+      value: ConsumerQuotaMetric.encode(message).finish()
+    };
   }
 
 };
@@ -1918,6 +2002,8 @@ function createBaseConsumerQuotaLimit(): ConsumerQuotaLimit {
 }
 
 export const ConsumerQuotaLimit = {
+  typeUrl: "/google.api.serviceusage.v1beta1.ConsumerQuotaLimit",
+
   encode(message: ConsumerQuotaLimit, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -2081,6 +2167,25 @@ export const ConsumerQuotaLimit = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ConsumerQuotaLimitAminoMsg): ConsumerQuotaLimit {
+    return ConsumerQuotaLimit.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ConsumerQuotaLimitProtoMsg): ConsumerQuotaLimit {
+    return ConsumerQuotaLimit.decode(message.value);
+  },
+
+  toProto(message: ConsumerQuotaLimit): Uint8Array {
+    return ConsumerQuotaLimit.encode(message).finish();
+  },
+
+  toProtoMsg(message: ConsumerQuotaLimit): ConsumerQuotaLimitProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1beta1.ConsumerQuotaLimit",
+      value: ConsumerQuotaLimit.encode(message).finish()
+    };
   }
 
 };
@@ -2178,6 +2283,18 @@ export const QuotaBucket_DimensionsEntry = {
     obj.key = message.key;
     obj.value = message.value;
     return obj;
+  },
+
+  fromAminoMsg(object: QuotaBucket_DimensionsEntryAminoMsg): QuotaBucket_DimensionsEntry {
+    return QuotaBucket_DimensionsEntry.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QuotaBucket_DimensionsEntryProtoMsg): QuotaBucket_DimensionsEntry {
+    return QuotaBucket_DimensionsEntry.decode(message.value);
+  },
+
+  toProto(message: QuotaBucket_DimensionsEntry): Uint8Array {
+    return QuotaBucket_DimensionsEntry.encode(message).finish();
   }
 
 };
@@ -2194,6 +2311,8 @@ function createBaseQuotaBucket(): QuotaBucket {
 }
 
 export const QuotaBucket = {
+  typeUrl: "/google.api.serviceusage.v1beta1.QuotaBucket",
+
   encode(message: QuotaBucket, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.effectiveLimit.isZero()) {
       writer.uint32(8).int64(message.effectiveLimit);
@@ -2390,6 +2509,25 @@ export const QuotaBucket = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: QuotaBucketAminoMsg): QuotaBucket {
+    return QuotaBucket.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QuotaBucketProtoMsg): QuotaBucket {
+    return QuotaBucket.decode(message.value);
+  },
+
+  toProto(message: QuotaBucket): Uint8Array {
+    return QuotaBucket.encode(message).finish();
+  },
+
+  toProtoMsg(message: QuotaBucket): QuotaBucketProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1beta1.QuotaBucket",
+      value: QuotaBucket.encode(message).finish()
+    };
   }
 
 };
@@ -2487,6 +2625,18 @@ export const QuotaOverride_DimensionsEntry = {
     obj.key = message.key;
     obj.value = message.value;
     return obj;
+  },
+
+  fromAminoMsg(object: QuotaOverride_DimensionsEntryAminoMsg): QuotaOverride_DimensionsEntry {
+    return QuotaOverride_DimensionsEntry.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QuotaOverride_DimensionsEntryProtoMsg): QuotaOverride_DimensionsEntry {
+    return QuotaOverride_DimensionsEntry.decode(message.value);
+  },
+
+  toProto(message: QuotaOverride_DimensionsEntry): Uint8Array {
+    return QuotaOverride_DimensionsEntry.encode(message).finish();
   }
 
 };
@@ -2503,6 +2653,8 @@ function createBaseQuotaOverride(): QuotaOverride {
 }
 
 export const QuotaOverride = {
+  typeUrl: "/google.api.serviceusage.v1beta1.QuotaOverride",
+
   encode(message: QuotaOverride, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -2700,6 +2852,25 @@ export const QuotaOverride = {
     obj.unit = message.unit;
     obj.admin_override_ancestor = message.adminOverrideAncestor;
     return obj;
+  },
+
+  fromAminoMsg(object: QuotaOverrideAminoMsg): QuotaOverride {
+    return QuotaOverride.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QuotaOverrideProtoMsg): QuotaOverride {
+    return QuotaOverride.decode(message.value);
+  },
+
+  toProto(message: QuotaOverride): Uint8Array {
+    return QuotaOverride.encode(message).finish();
+  },
+
+  toProtoMsg(message: QuotaOverride): QuotaOverrideProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1beta1.QuotaOverride",
+      value: QuotaOverride.encode(message).finish()
+    };
   }
 
 };
@@ -2711,6 +2882,8 @@ function createBaseOverrideInlineSource(): OverrideInlineSource {
 }
 
 export const OverrideInlineSource = {
+  typeUrl: "/google.api.serviceusage.v1beta1.OverrideInlineSource",
+
   encode(message: OverrideInlineSource, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.overrides) {
       QuotaOverride.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -2799,6 +2972,25 @@ export const OverrideInlineSource = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: OverrideInlineSourceAminoMsg): OverrideInlineSource {
+    return OverrideInlineSource.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: OverrideInlineSourceProtoMsg): OverrideInlineSource {
+    return OverrideInlineSource.decode(message.value);
+  },
+
+  toProto(message: OverrideInlineSource): Uint8Array {
+    return OverrideInlineSource.encode(message).finish();
+  },
+
+  toProtoMsg(message: OverrideInlineSource): OverrideInlineSourceProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1beta1.OverrideInlineSource",
+      value: OverrideInlineSource.encode(message).finish()
+    };
   }
 
 };
@@ -2896,6 +3088,18 @@ export const AdminQuotaPolicy_DimensionsEntry = {
     obj.key = message.key;
     obj.value = message.value;
     return obj;
+  },
+
+  fromAminoMsg(object: AdminQuotaPolicy_DimensionsEntryAminoMsg): AdminQuotaPolicy_DimensionsEntry {
+    return AdminQuotaPolicy_DimensionsEntry.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: AdminQuotaPolicy_DimensionsEntryProtoMsg): AdminQuotaPolicy_DimensionsEntry {
+    return AdminQuotaPolicy_DimensionsEntry.decode(message.value);
+  },
+
+  toProto(message: AdminQuotaPolicy_DimensionsEntry): Uint8Array {
+    return AdminQuotaPolicy_DimensionsEntry.encode(message).finish();
   }
 
 };
@@ -2912,6 +3116,8 @@ function createBaseAdminQuotaPolicy(): AdminQuotaPolicy {
 }
 
 export const AdminQuotaPolicy = {
+  typeUrl: "/google.api.serviceusage.v1beta1.AdminQuotaPolicy",
+
   encode(message: AdminQuotaPolicy, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -3109,6 +3315,25 @@ export const AdminQuotaPolicy = {
     obj.unit = message.unit;
     obj.container = message.container;
     return obj;
+  },
+
+  fromAminoMsg(object: AdminQuotaPolicyAminoMsg): AdminQuotaPolicy {
+    return AdminQuotaPolicy.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: AdminQuotaPolicyProtoMsg): AdminQuotaPolicy {
+    return AdminQuotaPolicy.decode(message.value);
+  },
+
+  toProto(message: AdminQuotaPolicy): Uint8Array {
+    return AdminQuotaPolicy.encode(message).finish();
+  },
+
+  toProtoMsg(message: AdminQuotaPolicy): AdminQuotaPolicyProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1beta1.AdminQuotaPolicy",
+      value: AdminQuotaPolicy.encode(message).finish()
+    };
   }
 
 };
@@ -3121,6 +3346,8 @@ function createBaseServiceIdentity(): ServiceIdentity {
 }
 
 export const ServiceIdentity = {
+  typeUrl: "/google.api.serviceusage.v1beta1.ServiceIdentity",
+
   encode(message: ServiceIdentity, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.email !== "") {
       writer.uint32(10).string(message.email);
@@ -3206,6 +3433,25 @@ export const ServiceIdentity = {
     obj.email = message.email;
     obj.unique_id = message.uniqueId;
     return obj;
+  },
+
+  fromAminoMsg(object: ServiceIdentityAminoMsg): ServiceIdentity {
+    return ServiceIdentity.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ServiceIdentityProtoMsg): ServiceIdentity {
+    return ServiceIdentity.decode(message.value);
+  },
+
+  toProto(message: ServiceIdentity): Uint8Array {
+    return ServiceIdentity.encode(message).finish();
+  },
+
+  toProtoMsg(message: ServiceIdentity): ServiceIdentityProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1beta1.ServiceIdentity",
+      value: ServiceIdentity.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/api/serviceusage/v1beta1/serviceusage.ts b/__fixtures__/outputv2/google/api/serviceusage/v1beta1/serviceusage.ts
index 85e81500e..125e5c342 100644
--- a/__fixtures__/outputv2/google/api/serviceusage/v1beta1/serviceusage.ts
+++ b/__fixtures__/outputv2/google/api/serviceusage/v1beta1/serviceusage.ts
@@ -65,7 +65,7 @@ export interface EnableServiceRequest {
    */
   name: string;
 }
-export interface EnableServiceRequestProtoType {
+export interface EnableServiceRequestProtoMsg {
   typeUrl: "/google.api.serviceusage.v1beta1.EnableServiceRequest";
   value: Uint8Array;
 }
@@ -87,7 +87,7 @@ export interface EnableServiceRequestAmino {
    */
   name: string;
 }
-export interface EnableServiceRequestAminoType {
+export interface EnableServiceRequestAminoMsg {
   type: "/google.api.serviceusage.v1beta1.EnableServiceRequest";
   value: EnableServiceRequestAmino;
 }
@@ -110,7 +110,7 @@ export interface DisableServiceRequest {
    */
   name: string;
 }
-export interface DisableServiceRequestProtoType {
+export interface DisableServiceRequestProtoMsg {
   typeUrl: "/google.api.serviceusage.v1beta1.DisableServiceRequest";
   value: Uint8Array;
 }
@@ -128,7 +128,7 @@ export interface DisableServiceRequestAmino {
    */
   name: string;
 }
-export interface DisableServiceRequestAminoType {
+export interface DisableServiceRequestAminoMsg {
   type: "/google.api.serviceusage.v1beta1.DisableServiceRequest";
   value: DisableServiceRequestAmino;
 }
@@ -149,7 +149,7 @@ export interface GetServiceRequest {
    */
   name: string;
 }
-export interface GetServiceRequestProtoType {
+export interface GetServiceRequestProtoMsg {
   typeUrl: "/google.api.serviceusage.v1beta1.GetServiceRequest";
   value: Uint8Array;
 }
@@ -165,7 +165,7 @@ export interface GetServiceRequestAmino {
    */
   name: string;
 }
-export interface GetServiceRequestAminoType {
+export interface GetServiceRequestAminoMsg {
   type: "/google.api.serviceusage.v1beta1.GetServiceRequest";
   value: GetServiceRequestAmino;
 }
@@ -205,7 +205,7 @@ export interface ListServicesRequest {
    */
   filter: string;
 }
-export interface ListServicesRequestProtoType {
+export interface ListServicesRequestProtoMsg {
   typeUrl: "/google.api.serviceusage.v1beta1.ListServicesRequest";
   value: Uint8Array;
 }
@@ -240,7 +240,7 @@ export interface ListServicesRequestAmino {
    */
   filter: string;
 }
-export interface ListServicesRequestAminoType {
+export interface ListServicesRequestAminoMsg {
   type: "/google.api.serviceusage.v1beta1.ListServicesRequest";
   value: ListServicesRequestAmino;
 }
@@ -264,7 +264,7 @@ export interface ListServicesResponse {
    */
   nextPageToken: string;
 }
-export interface ListServicesResponseProtoType {
+export interface ListServicesResponseProtoMsg {
   typeUrl: "/google.api.serviceusage.v1beta1.ListServicesResponse";
   value: Uint8Array;
 }
@@ -280,7 +280,7 @@ export interface ListServicesResponseAmino {
    */
   next_page_token: string;
 }
-export interface ListServicesResponseAminoType {
+export interface ListServicesResponseAminoMsg {
   type: "/google.api.serviceusage.v1beta1.ListServicesResponse";
   value: ListServicesResponseAmino;
 }
@@ -322,7 +322,7 @@ export interface BatchEnableServicesRequest {
    */
   serviceIds: string[];
 }
-export interface BatchEnableServicesRequestProtoType {
+export interface BatchEnableServicesRequestProtoMsg {
   typeUrl: "/google.api.serviceusage.v1beta1.BatchEnableServicesRequest";
   value: Uint8Array;
 }
@@ -358,7 +358,7 @@ export interface BatchEnableServicesRequestAmino {
    */
   service_ids: string[];
 }
-export interface BatchEnableServicesRequestAminoType {
+export interface BatchEnableServicesRequestAminoMsg {
   type: "/google.api.serviceusage.v1beta1.BatchEnableServicesRequest";
   value: BatchEnableServicesRequestAmino;
 }
@@ -393,7 +393,7 @@ export interface ListConsumerQuotaMetricsRequest {
   /** Specifies the level of detail for quota information in the response. */
   view: QuotaView;
 }
-export interface ListConsumerQuotaMetricsRequestProtoType {
+export interface ListConsumerQuotaMetricsRequestProtoMsg {
   typeUrl: "/google.api.serviceusage.v1beta1.ListConsumerQuotaMetricsRequest";
   value: Uint8Array;
 }
@@ -422,7 +422,7 @@ export interface ListConsumerQuotaMetricsRequestAmino {
   /** Specifies the level of detail for quota information in the response. */
   view: QuotaView;
 }
-export interface ListConsumerQuotaMetricsRequestAminoType {
+export interface ListConsumerQuotaMetricsRequestAminoMsg {
   type: "/google.api.serviceusage.v1beta1.ListConsumerQuotaMetricsRequest";
   value: ListConsumerQuotaMetricsRequestAmino;
 }
@@ -446,7 +446,7 @@ export interface ListConsumerQuotaMetricsResponse {
    */
   nextPageToken: string;
 }
-export interface ListConsumerQuotaMetricsResponseProtoType {
+export interface ListConsumerQuotaMetricsResponseProtoMsg {
   typeUrl: "/google.api.serviceusage.v1beta1.ListConsumerQuotaMetricsResponse";
   value: Uint8Array;
 }
@@ -462,7 +462,7 @@ export interface ListConsumerQuotaMetricsResponseAmino {
    */
   next_page_token: string;
 }
-export interface ListConsumerQuotaMetricsResponseAminoType {
+export interface ListConsumerQuotaMetricsResponseAminoMsg {
   type: "/google.api.serviceusage.v1beta1.ListConsumerQuotaMetricsResponse";
   value: ListConsumerQuotaMetricsResponseAmino;
 }
@@ -486,7 +486,7 @@ export interface GetConsumerQuotaMetricRequest {
   /** Specifies the level of detail for quota information in the response. */
   view: QuotaView;
 }
-export interface GetConsumerQuotaMetricRequestProtoType {
+export interface GetConsumerQuotaMetricRequestProtoMsg {
   typeUrl: "/google.api.serviceusage.v1beta1.GetConsumerQuotaMetricRequest";
   value: Uint8Array;
 }
@@ -504,7 +504,7 @@ export interface GetConsumerQuotaMetricRequestAmino {
   /** Specifies the level of detail for quota information in the response. */
   view: QuotaView;
 }
-export interface GetConsumerQuotaMetricRequestAminoType {
+export interface GetConsumerQuotaMetricRequestAminoMsg {
   type: "/google.api.serviceusage.v1beta1.GetConsumerQuotaMetricRequest";
   value: GetConsumerQuotaMetricRequestAmino;
 }
@@ -528,7 +528,7 @@ export interface GetConsumerQuotaLimitRequest {
   /** Specifies the level of detail for quota information in the response. */
   view: QuotaView;
 }
-export interface GetConsumerQuotaLimitRequestProtoType {
+export interface GetConsumerQuotaLimitRequestProtoMsg {
   typeUrl: "/google.api.serviceusage.v1beta1.GetConsumerQuotaLimitRequest";
   value: Uint8Array;
 }
@@ -546,7 +546,7 @@ export interface GetConsumerQuotaLimitRequestAmino {
   /** Specifies the level of detail for quota information in the response. */
   view: QuotaView;
 }
-export interface GetConsumerQuotaLimitRequestAminoType {
+export interface GetConsumerQuotaLimitRequestAminoMsg {
   type: "/google.api.serviceusage.v1beta1.GetConsumerQuotaLimitRequest";
   value: GetConsumerQuotaLimitRequestAmino;
 }
@@ -586,7 +586,7 @@ export interface CreateAdminOverrideRequest {
    */
   forceOnly: QuotaSafetyCheck[];
 }
-export interface CreateAdminOverrideRequestProtoType {
+export interface CreateAdminOverrideRequestProtoMsg {
   typeUrl: "/google.api.serviceusage.v1beta1.CreateAdminOverrideRequest";
   value: Uint8Array;
 }
@@ -620,7 +620,7 @@ export interface CreateAdminOverrideRequestAmino {
    */
   force_only: QuotaSafetyCheck[];
 }
-export interface CreateAdminOverrideRequestAminoType {
+export interface CreateAdminOverrideRequestAminoMsg {
   type: "/google.api.serviceusage.v1beta1.CreateAdminOverrideRequest";
   value: CreateAdminOverrideRequestAmino;
 }
@@ -670,7 +670,7 @@ export interface UpdateAdminOverrideRequest {
    */
   forceOnly: QuotaSafetyCheck[];
 }
-export interface UpdateAdminOverrideRequestProtoType {
+export interface UpdateAdminOverrideRequestProtoMsg {
   typeUrl: "/google.api.serviceusage.v1beta1.UpdateAdminOverrideRequest";
   value: Uint8Array;
 }
@@ -712,7 +712,7 @@ export interface UpdateAdminOverrideRequestAmino {
    */
   force_only: QuotaSafetyCheck[];
 }
-export interface UpdateAdminOverrideRequestAminoType {
+export interface UpdateAdminOverrideRequestAminoMsg {
   type: "/google.api.serviceusage.v1beta1.UpdateAdminOverrideRequest";
   value: UpdateAdminOverrideRequestAmino;
 }
@@ -751,7 +751,7 @@ export interface DeleteAdminOverrideRequest {
    */
   forceOnly: QuotaSafetyCheck[];
 }
-export interface DeleteAdminOverrideRequestProtoType {
+export interface DeleteAdminOverrideRequestProtoMsg {
   typeUrl: "/google.api.serviceusage.v1beta1.DeleteAdminOverrideRequest";
   value: Uint8Array;
 }
@@ -781,7 +781,7 @@ export interface DeleteAdminOverrideRequestAmino {
    */
   force_only: QuotaSafetyCheck[];
 }
-export interface DeleteAdminOverrideRequestAminoType {
+export interface DeleteAdminOverrideRequestAminoMsg {
   type: "/google.api.serviceusage.v1beta1.DeleteAdminOverrideRequest";
   value: DeleteAdminOverrideRequestAmino;
 }
@@ -813,7 +813,7 @@ export interface ListAdminOverridesRequest {
    */
   pageToken: string;
 }
-export interface ListAdminOverridesRequestProtoType {
+export interface ListAdminOverridesRequestProtoMsg {
   typeUrl: "/google.api.serviceusage.v1beta1.ListAdminOverridesRequest";
   value: Uint8Array;
 }
@@ -838,7 +838,7 @@ export interface ListAdminOverridesRequestAmino {
    */
   page_token: string;
 }
-export interface ListAdminOverridesRequestAminoType {
+export interface ListAdminOverridesRequestAminoMsg {
   type: "/google.api.serviceusage.v1beta1.ListAdminOverridesRequest";
   value: ListAdminOverridesRequestAmino;
 }
@@ -861,7 +861,7 @@ export interface ListAdminOverridesResponse {
    */
   nextPageToken: string;
 }
-export interface ListAdminOverridesResponseProtoType {
+export interface ListAdminOverridesResponseProtoMsg {
   typeUrl: "/google.api.serviceusage.v1beta1.ListAdminOverridesResponse";
   value: Uint8Array;
 }
@@ -877,7 +877,7 @@ export interface ListAdminOverridesResponseAmino {
    */
   next_page_token: string;
 }
-export interface ListAdminOverridesResponseAminoType {
+export interface ListAdminOverridesResponseAminoMsg {
   type: "/google.api.serviceusage.v1beta1.ListAdminOverridesResponse";
   value: ListAdminOverridesResponseAmino;
 }
@@ -893,7 +893,7 @@ export interface BatchCreateAdminOverridesResponse {
   /** The overrides that were created. */
   overrides: QuotaOverride[];
 }
-export interface BatchCreateAdminOverridesResponseProtoType {
+export interface BatchCreateAdminOverridesResponseProtoMsg {
   typeUrl: "/google.api.serviceusage.v1beta1.BatchCreateAdminOverridesResponse";
   value: Uint8Array;
 }
@@ -903,7 +903,7 @@ export interface BatchCreateAdminOverridesResponseAmino {
   /** The overrides that were created. */
   overrides: QuotaOverrideAmino[];
 }
-export interface BatchCreateAdminOverridesResponseAminoType {
+export interface BatchCreateAdminOverridesResponseAminoMsg {
   type: "/google.api.serviceusage.v1beta1.BatchCreateAdminOverridesResponse";
   value: BatchCreateAdminOverridesResponseAmino;
 }
@@ -941,7 +941,7 @@ export interface ImportAdminOverridesRequest {
    */
   forceOnly: QuotaSafetyCheck[];
 }
-export interface ImportAdminOverridesRequestProtoType {
+export interface ImportAdminOverridesRequestProtoMsg {
   typeUrl: "/google.api.serviceusage.v1beta1.ImportAdminOverridesRequest";
   value: Uint8Array;
 }
@@ -974,7 +974,7 @@ export interface ImportAdminOverridesRequestAmino {
    */
   force_only: QuotaSafetyCheck[];
 }
-export interface ImportAdminOverridesRequestAminoType {
+export interface ImportAdminOverridesRequestAminoMsg {
   type: "/google.api.serviceusage.v1beta1.ImportAdminOverridesRequest";
   value: ImportAdminOverridesRequestAmino;
 }
@@ -992,7 +992,7 @@ export interface ImportAdminOverridesResponse {
   /** The overrides that were created from the imported data. */
   overrides: QuotaOverride[];
 }
-export interface ImportAdminOverridesResponseProtoType {
+export interface ImportAdminOverridesResponseProtoMsg {
   typeUrl: "/google.api.serviceusage.v1beta1.ImportAdminOverridesResponse";
   value: Uint8Array;
 }
@@ -1002,7 +1002,7 @@ export interface ImportAdminOverridesResponseAmino {
   /** The overrides that were created from the imported data. */
   overrides: QuotaOverrideAmino[];
 }
-export interface ImportAdminOverridesResponseAminoType {
+export interface ImportAdminOverridesResponseAminoMsg {
   type: "/google.api.serviceusage.v1beta1.ImportAdminOverridesResponse";
   value: ImportAdminOverridesResponseAmino;
 }
@@ -1018,7 +1018,7 @@ export interface ImportAdminOverridesResponseSDKType {
  * of LRO returned by ImportAdminOverrides.
  */
 export interface ImportAdminOverridesMetadata {}
-export interface ImportAdminOverridesMetadataProtoType {
+export interface ImportAdminOverridesMetadataProtoMsg {
   typeUrl: "/google.api.serviceusage.v1beta1.ImportAdminOverridesMetadata";
   value: Uint8Array;
 }
@@ -1029,7 +1029,7 @@ export interface ImportAdminOverridesMetadataProtoType {
  * of LRO returned by ImportAdminOverrides.
  */
 export interface ImportAdminOverridesMetadataAmino {}
-export interface ImportAdminOverridesMetadataAminoType {
+export interface ImportAdminOverridesMetadataAminoMsg {
   type: "/google.api.serviceusage.v1beta1.ImportAdminOverridesMetadata";
   value: ImportAdminOverridesMetadataAmino;
 }
@@ -1070,7 +1070,7 @@ export interface CreateConsumerOverrideRequest {
    */
   forceOnly: QuotaSafetyCheck[];
 }
-export interface CreateConsumerOverrideRequestProtoType {
+export interface CreateConsumerOverrideRequestProtoMsg {
   typeUrl: "/google.api.serviceusage.v1beta1.CreateConsumerOverrideRequest";
   value: Uint8Array;
 }
@@ -1104,7 +1104,7 @@ export interface CreateConsumerOverrideRequestAmino {
    */
   force_only: QuotaSafetyCheck[];
 }
-export interface CreateConsumerOverrideRequestAminoType {
+export interface CreateConsumerOverrideRequestAminoMsg {
   type: "/google.api.serviceusage.v1beta1.CreateConsumerOverrideRequest";
   value: CreateConsumerOverrideRequestAmino;
 }
@@ -1154,7 +1154,7 @@ export interface UpdateConsumerOverrideRequest {
    */
   forceOnly: QuotaSafetyCheck[];
 }
-export interface UpdateConsumerOverrideRequestProtoType {
+export interface UpdateConsumerOverrideRequestProtoMsg {
   typeUrl: "/google.api.serviceusage.v1beta1.UpdateConsumerOverrideRequest";
   value: Uint8Array;
 }
@@ -1196,7 +1196,7 @@ export interface UpdateConsumerOverrideRequestAmino {
    */
   force_only: QuotaSafetyCheck[];
 }
-export interface UpdateConsumerOverrideRequestAminoType {
+export interface UpdateConsumerOverrideRequestAminoMsg {
   type: "/google.api.serviceusage.v1beta1.UpdateConsumerOverrideRequest";
   value: UpdateConsumerOverrideRequestAmino;
 }
@@ -1235,7 +1235,7 @@ export interface DeleteConsumerOverrideRequest {
    */
   forceOnly: QuotaSafetyCheck[];
 }
-export interface DeleteConsumerOverrideRequestProtoType {
+export interface DeleteConsumerOverrideRequestProtoMsg {
   typeUrl: "/google.api.serviceusage.v1beta1.DeleteConsumerOverrideRequest";
   value: Uint8Array;
 }
@@ -1265,7 +1265,7 @@ export interface DeleteConsumerOverrideRequestAmino {
    */
   force_only: QuotaSafetyCheck[];
 }
-export interface DeleteConsumerOverrideRequestAminoType {
+export interface DeleteConsumerOverrideRequestAminoMsg {
   type: "/google.api.serviceusage.v1beta1.DeleteConsumerOverrideRequest";
   value: DeleteConsumerOverrideRequestAmino;
 }
@@ -1297,7 +1297,7 @@ export interface ListConsumerOverridesRequest {
    */
   pageToken: string;
 }
-export interface ListConsumerOverridesRequestProtoType {
+export interface ListConsumerOverridesRequestProtoMsg {
   typeUrl: "/google.api.serviceusage.v1beta1.ListConsumerOverridesRequest";
   value: Uint8Array;
 }
@@ -1322,7 +1322,7 @@ export interface ListConsumerOverridesRequestAmino {
    */
   page_token: string;
 }
-export interface ListConsumerOverridesRequestAminoType {
+export interface ListConsumerOverridesRequestAminoMsg {
   type: "/google.api.serviceusage.v1beta1.ListConsumerOverridesRequest";
   value: ListConsumerOverridesRequestAmino;
 }
@@ -1345,7 +1345,7 @@ export interface ListConsumerOverridesResponse {
    */
   nextPageToken: string;
 }
-export interface ListConsumerOverridesResponseProtoType {
+export interface ListConsumerOverridesResponseProtoMsg {
   typeUrl: "/google.api.serviceusage.v1beta1.ListConsumerOverridesResponse";
   value: Uint8Array;
 }
@@ -1361,7 +1361,7 @@ export interface ListConsumerOverridesResponseAmino {
    */
   next_page_token: string;
 }
-export interface ListConsumerOverridesResponseAminoType {
+export interface ListConsumerOverridesResponseAminoMsg {
   type: "/google.api.serviceusage.v1beta1.ListConsumerOverridesResponse";
   value: ListConsumerOverridesResponseAmino;
 }
@@ -1377,7 +1377,7 @@ export interface BatchCreateConsumerOverridesResponse {
   /** The overrides that were created. */
   overrides: QuotaOverride[];
 }
-export interface BatchCreateConsumerOverridesResponseProtoType {
+export interface BatchCreateConsumerOverridesResponseProtoMsg {
   typeUrl: "/google.api.serviceusage.v1beta1.BatchCreateConsumerOverridesResponse";
   value: Uint8Array;
 }
@@ -1387,7 +1387,7 @@ export interface BatchCreateConsumerOverridesResponseAmino {
   /** The overrides that were created. */
   overrides: QuotaOverrideAmino[];
 }
-export interface BatchCreateConsumerOverridesResponseAminoType {
+export interface BatchCreateConsumerOverridesResponseAminoMsg {
   type: "/google.api.serviceusage.v1beta1.BatchCreateConsumerOverridesResponse";
   value: BatchCreateConsumerOverridesResponseAmino;
 }
@@ -1425,7 +1425,7 @@ export interface ImportConsumerOverridesRequest {
    */
   forceOnly: QuotaSafetyCheck[];
 }
-export interface ImportConsumerOverridesRequestProtoType {
+export interface ImportConsumerOverridesRequestProtoMsg {
   typeUrl: "/google.api.serviceusage.v1beta1.ImportConsumerOverridesRequest";
   value: Uint8Array;
 }
@@ -1458,7 +1458,7 @@ export interface ImportConsumerOverridesRequestAmino {
    */
   force_only: QuotaSafetyCheck[];
 }
-export interface ImportConsumerOverridesRequestAminoType {
+export interface ImportConsumerOverridesRequestAminoMsg {
   type: "/google.api.serviceusage.v1beta1.ImportConsumerOverridesRequest";
   value: ImportConsumerOverridesRequestAmino;
 }
@@ -1476,7 +1476,7 @@ export interface ImportConsumerOverridesResponse {
   /** The overrides that were created from the imported data. */
   overrides: QuotaOverride[];
 }
-export interface ImportConsumerOverridesResponseProtoType {
+export interface ImportConsumerOverridesResponseProtoMsg {
   typeUrl: "/google.api.serviceusage.v1beta1.ImportConsumerOverridesResponse";
   value: Uint8Array;
 }
@@ -1486,7 +1486,7 @@ export interface ImportConsumerOverridesResponseAmino {
   /** The overrides that were created from the imported data. */
   overrides: QuotaOverrideAmino[];
 }
-export interface ImportConsumerOverridesResponseAminoType {
+export interface ImportConsumerOverridesResponseAminoMsg {
   type: "/google.api.serviceusage.v1beta1.ImportConsumerOverridesResponse";
   value: ImportConsumerOverridesResponseAmino;
 }
@@ -1502,7 +1502,7 @@ export interface ImportConsumerOverridesResponseSDKType {
  * of LRO returned by ImportConsumerOverrides.
  */
 export interface ImportConsumerOverridesMetadata {}
-export interface ImportConsumerOverridesMetadataProtoType {
+export interface ImportConsumerOverridesMetadataProtoMsg {
   typeUrl: "/google.api.serviceusage.v1beta1.ImportConsumerOverridesMetadata";
   value: Uint8Array;
 }
@@ -1513,7 +1513,7 @@ export interface ImportConsumerOverridesMetadataProtoType {
  * of LRO returned by ImportConsumerOverrides.
  */
 export interface ImportConsumerOverridesMetadataAmino {}
-export interface ImportConsumerOverridesMetadataAminoType {
+export interface ImportConsumerOverridesMetadataAminoMsg {
   type: "/google.api.serviceusage.v1beta1.ImportConsumerOverridesMetadata";
   value: ImportConsumerOverridesMetadataAmino;
 }
@@ -1530,7 +1530,7 @@ export interface ImportAdminQuotaPoliciesResponse {
   /** The policies that were created from the imported data. */
   policies: AdminQuotaPolicy[];
 }
-export interface ImportAdminQuotaPoliciesResponseProtoType {
+export interface ImportAdminQuotaPoliciesResponseProtoMsg {
   typeUrl: "/google.api.serviceusage.v1beta1.ImportAdminQuotaPoliciesResponse";
   value: Uint8Array;
 }
@@ -1540,7 +1540,7 @@ export interface ImportAdminQuotaPoliciesResponseAmino {
   /** The policies that were created from the imported data. */
   policies: AdminQuotaPolicyAmino[];
 }
-export interface ImportAdminQuotaPoliciesResponseAminoType {
+export interface ImportAdminQuotaPoliciesResponseAminoMsg {
   type: "/google.api.serviceusage.v1beta1.ImportAdminQuotaPoliciesResponse";
   value: ImportAdminQuotaPoliciesResponseAmino;
 }
@@ -1556,7 +1556,7 @@ export interface ImportAdminQuotaPoliciesResponseSDKType {
  * of LRO returned by ImportAdminQuotaPolicies.
  */
 export interface ImportAdminQuotaPoliciesMetadata {}
-export interface ImportAdminQuotaPoliciesMetadataProtoType {
+export interface ImportAdminQuotaPoliciesMetadataProtoMsg {
   typeUrl: "/google.api.serviceusage.v1beta1.ImportAdminQuotaPoliciesMetadata";
   value: Uint8Array;
 }
@@ -1567,7 +1567,7 @@ export interface ImportAdminQuotaPoliciesMetadataProtoType {
  * of LRO returned by ImportAdminQuotaPolicies.
  */
 export interface ImportAdminQuotaPoliciesMetadataAmino {}
-export interface ImportAdminQuotaPoliciesMetadataAminoType {
+export interface ImportAdminQuotaPoliciesMetadataAminoMsg {
   type: "/google.api.serviceusage.v1beta1.ImportAdminQuotaPoliciesMetadata";
   value: ImportAdminQuotaPoliciesMetadataAmino;
 }
@@ -1585,7 +1585,7 @@ export interface ImportAdminQuotaPoliciesMetadataSDKType {}
  * of LRO returned by CreateAdminQuotaPolicy.
  */
 export interface CreateAdminQuotaPolicyMetadata {}
-export interface CreateAdminQuotaPolicyMetadataProtoType {
+export interface CreateAdminQuotaPolicyMetadataProtoMsg {
   typeUrl: "/google.api.serviceusage.v1beta1.CreateAdminQuotaPolicyMetadata";
   value: Uint8Array;
 }
@@ -1596,7 +1596,7 @@ export interface CreateAdminQuotaPolicyMetadataProtoType {
  * of LRO returned by CreateAdminQuotaPolicy.
  */
 export interface CreateAdminQuotaPolicyMetadataAmino {}
-export interface CreateAdminQuotaPolicyMetadataAminoType {
+export interface CreateAdminQuotaPolicyMetadataAminoMsg {
   type: "/google.api.serviceusage.v1beta1.CreateAdminQuotaPolicyMetadata";
   value: CreateAdminQuotaPolicyMetadataAmino;
 }
@@ -1614,7 +1614,7 @@ export interface CreateAdminQuotaPolicyMetadataSDKType {}
  * of LRO returned by UpdateAdminQuotaPolicy.
  */
 export interface UpdateAdminQuotaPolicyMetadata {}
-export interface UpdateAdminQuotaPolicyMetadataProtoType {
+export interface UpdateAdminQuotaPolicyMetadataProtoMsg {
   typeUrl: "/google.api.serviceusage.v1beta1.UpdateAdminQuotaPolicyMetadata";
   value: Uint8Array;
 }
@@ -1625,7 +1625,7 @@ export interface UpdateAdminQuotaPolicyMetadataProtoType {
  * of LRO returned by UpdateAdminQuotaPolicy.
  */
 export interface UpdateAdminQuotaPolicyMetadataAmino {}
-export interface UpdateAdminQuotaPolicyMetadataAminoType {
+export interface UpdateAdminQuotaPolicyMetadataAminoMsg {
   type: "/google.api.serviceusage.v1beta1.UpdateAdminQuotaPolicyMetadata";
   value: UpdateAdminQuotaPolicyMetadataAmino;
 }
@@ -1643,7 +1643,7 @@ export interface UpdateAdminQuotaPolicyMetadataSDKType {}
  * of LRO returned by DeleteAdminQuotaPolicy.
  */
 export interface DeleteAdminQuotaPolicyMetadata {}
-export interface DeleteAdminQuotaPolicyMetadataProtoType {
+export interface DeleteAdminQuotaPolicyMetadataProtoMsg {
   typeUrl: "/google.api.serviceusage.v1beta1.DeleteAdminQuotaPolicyMetadata";
   value: Uint8Array;
 }
@@ -1654,7 +1654,7 @@ export interface DeleteAdminQuotaPolicyMetadataProtoType {
  * of LRO returned by DeleteAdminQuotaPolicy.
  */
 export interface DeleteAdminQuotaPolicyMetadataAmino {}
-export interface DeleteAdminQuotaPolicyMetadataAminoType {
+export interface DeleteAdminQuotaPolicyMetadataAminoMsg {
   type: "/google.api.serviceusage.v1beta1.DeleteAdminQuotaPolicyMetadata";
   value: DeleteAdminQuotaPolicyMetadataAmino;
 }
@@ -1679,7 +1679,7 @@ export interface GenerateServiceIdentityRequest {
    */
   parent: string;
 }
-export interface GenerateServiceIdentityRequestProtoType {
+export interface GenerateServiceIdentityRequestProtoMsg {
   typeUrl: "/google.api.serviceusage.v1beta1.GenerateServiceIdentityRequest";
   value: Uint8Array;
 }
@@ -1697,7 +1697,7 @@ export interface GenerateServiceIdentityRequestAmino {
    */
   parent: string;
 }
-export interface GenerateServiceIdentityRequestAminoType {
+export interface GenerateServiceIdentityRequestAminoMsg {
   type: "/google.api.serviceusage.v1beta1.GenerateServiceIdentityRequest";
   value: GenerateServiceIdentityRequestAmino;
 }
@@ -1719,7 +1719,7 @@ export interface GetServiceIdentityResponse {
   /** Service identity state. */
   state: GetServiceIdentityResponse_IdentityState;
 }
-export interface GetServiceIdentityResponseProtoType {
+export interface GetServiceIdentityResponseProtoMsg {
   typeUrl: "/google.api.serviceusage.v1beta1.GetServiceIdentityResponse";
   value: Uint8Array;
 }
@@ -1736,7 +1736,7 @@ export interface GetServiceIdentityResponseAmino {
   /** Service identity state. */
   state: GetServiceIdentityResponse_IdentityState;
 }
-export interface GetServiceIdentityResponseAminoType {
+export interface GetServiceIdentityResponseAminoMsg {
   type: "/google.api.serviceusage.v1beta1.GetServiceIdentityResponse";
   value: GetServiceIdentityResponseAmino;
 }
@@ -1749,14 +1749,14 @@ export interface GetServiceIdentityResponseSDKType {
 
 /** Metadata for the `GetServiceIdentity` method. */
 export interface GetServiceIdentityMetadata {}
-export interface GetServiceIdentityMetadataProtoType {
+export interface GetServiceIdentityMetadataProtoMsg {
   typeUrl: "/google.api.serviceusage.v1beta1.GetServiceIdentityMetadata";
   value: Uint8Array;
 }
 
 /** Metadata for the `GetServiceIdentity` method. */
 export interface GetServiceIdentityMetadataAmino {}
-export interface GetServiceIdentityMetadataAminoType {
+export interface GetServiceIdentityMetadataAminoMsg {
   type: "/google.api.serviceusage.v1beta1.GetServiceIdentityMetadata";
   value: GetServiceIdentityMetadataAmino;
 }
@@ -1771,6 +1771,8 @@ function createBaseEnableServiceRequest(): EnableServiceRequest {
 }
 
 export const EnableServiceRequest = {
+  typeUrl: "/google.api.serviceusage.v1beta1.EnableServiceRequest",
+
   encode(message: EnableServiceRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -1841,6 +1843,25 @@ export const EnableServiceRequest = {
     const obj: any = {};
     obj.name = message.name;
     return obj;
+  },
+
+  fromAminoMsg(object: EnableServiceRequestAminoMsg): EnableServiceRequest {
+    return EnableServiceRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: EnableServiceRequestProtoMsg): EnableServiceRequest {
+    return EnableServiceRequest.decode(message.value);
+  },
+
+  toProto(message: EnableServiceRequest): Uint8Array {
+    return EnableServiceRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: EnableServiceRequest): EnableServiceRequestProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1beta1.EnableServiceRequest",
+      value: EnableServiceRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1852,6 +1873,8 @@ function createBaseDisableServiceRequest(): DisableServiceRequest {
 }
 
 export const DisableServiceRequest = {
+  typeUrl: "/google.api.serviceusage.v1beta1.DisableServiceRequest",
+
   encode(message: DisableServiceRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -1922,6 +1945,25 @@ export const DisableServiceRequest = {
     const obj: any = {};
     obj.name = message.name;
     return obj;
+  },
+
+  fromAminoMsg(object: DisableServiceRequestAminoMsg): DisableServiceRequest {
+    return DisableServiceRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: DisableServiceRequestProtoMsg): DisableServiceRequest {
+    return DisableServiceRequest.decode(message.value);
+  },
+
+  toProto(message: DisableServiceRequest): Uint8Array {
+    return DisableServiceRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: DisableServiceRequest): DisableServiceRequestProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1beta1.DisableServiceRequest",
+      value: DisableServiceRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1933,6 +1975,8 @@ function createBaseGetServiceRequest(): GetServiceRequest {
 }
 
 export const GetServiceRequest = {
+  typeUrl: "/google.api.serviceusage.v1beta1.GetServiceRequest",
+
   encode(message: GetServiceRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -2003,6 +2047,25 @@ export const GetServiceRequest = {
     const obj: any = {};
     obj.name = message.name;
     return obj;
+  },
+
+  fromAminoMsg(object: GetServiceRequestAminoMsg): GetServiceRequest {
+    return GetServiceRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: GetServiceRequestProtoMsg): GetServiceRequest {
+    return GetServiceRequest.decode(message.value);
+  },
+
+  toProto(message: GetServiceRequest): Uint8Array {
+    return GetServiceRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: GetServiceRequest): GetServiceRequestProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1beta1.GetServiceRequest",
+      value: GetServiceRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2017,6 +2080,8 @@ function createBaseListServicesRequest(): ListServicesRequest {
 }
 
 export const ListServicesRequest = {
+  typeUrl: "/google.api.serviceusage.v1beta1.ListServicesRequest",
+
   encode(message: ListServicesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.parent !== "") {
       writer.uint32(10).string(message.parent);
@@ -2132,6 +2197,25 @@ export const ListServicesRequest = {
     obj.page_token = message.pageToken;
     obj.filter = message.filter;
     return obj;
+  },
+
+  fromAminoMsg(object: ListServicesRequestAminoMsg): ListServicesRequest {
+    return ListServicesRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ListServicesRequestProtoMsg): ListServicesRequest {
+    return ListServicesRequest.decode(message.value);
+  },
+
+  toProto(message: ListServicesRequest): Uint8Array {
+    return ListServicesRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: ListServicesRequest): ListServicesRequestProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1beta1.ListServicesRequest",
+      value: ListServicesRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2144,6 +2228,8 @@ function createBaseListServicesResponse(): ListServicesResponse {
 }
 
 export const ListServicesResponse = {
+  typeUrl: "/google.api.serviceusage.v1beta1.ListServicesResponse",
+
   encode(message: ListServicesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.services) {
       Service.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -2247,6 +2333,25 @@ export const ListServicesResponse = {
 
     obj.next_page_token = message.nextPageToken;
     return obj;
+  },
+
+  fromAminoMsg(object: ListServicesResponseAminoMsg): ListServicesResponse {
+    return ListServicesResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ListServicesResponseProtoMsg): ListServicesResponse {
+    return ListServicesResponse.decode(message.value);
+  },
+
+  toProto(message: ListServicesResponse): Uint8Array {
+    return ListServicesResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: ListServicesResponse): ListServicesResponseProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1beta1.ListServicesResponse",
+      value: ListServicesResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2259,6 +2364,8 @@ function createBaseBatchEnableServicesRequest(): BatchEnableServicesRequest {
 }
 
 export const BatchEnableServicesRequest = {
+  typeUrl: "/google.api.serviceusage.v1beta1.BatchEnableServicesRequest",
+
   encode(message: BatchEnableServicesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.parent !== "") {
       writer.uint32(10).string(message.parent);
@@ -2362,6 +2469,25 @@ export const BatchEnableServicesRequest = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: BatchEnableServicesRequestAminoMsg): BatchEnableServicesRequest {
+    return BatchEnableServicesRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: BatchEnableServicesRequestProtoMsg): BatchEnableServicesRequest {
+    return BatchEnableServicesRequest.decode(message.value);
+  },
+
+  toProto(message: BatchEnableServicesRequest): Uint8Array {
+    return BatchEnableServicesRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: BatchEnableServicesRequest): BatchEnableServicesRequestProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1beta1.BatchEnableServicesRequest",
+      value: BatchEnableServicesRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2376,6 +2502,8 @@ function createBaseListConsumerQuotaMetricsRequest(): ListConsumerQuotaMetricsRe
 }
 
 export const ListConsumerQuotaMetricsRequest = {
+  typeUrl: "/google.api.serviceusage.v1beta1.ListConsumerQuotaMetricsRequest",
+
   encode(message: ListConsumerQuotaMetricsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.parent !== "") {
       writer.uint32(10).string(message.parent);
@@ -2491,6 +2619,25 @@ export const ListConsumerQuotaMetricsRequest = {
     obj.page_token = message.pageToken;
     obj.view = message.view;
     return obj;
+  },
+
+  fromAminoMsg(object: ListConsumerQuotaMetricsRequestAminoMsg): ListConsumerQuotaMetricsRequest {
+    return ListConsumerQuotaMetricsRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ListConsumerQuotaMetricsRequestProtoMsg): ListConsumerQuotaMetricsRequest {
+    return ListConsumerQuotaMetricsRequest.decode(message.value);
+  },
+
+  toProto(message: ListConsumerQuotaMetricsRequest): Uint8Array {
+    return ListConsumerQuotaMetricsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: ListConsumerQuotaMetricsRequest): ListConsumerQuotaMetricsRequestProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1beta1.ListConsumerQuotaMetricsRequest",
+      value: ListConsumerQuotaMetricsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2503,6 +2650,8 @@ function createBaseListConsumerQuotaMetricsResponse(): ListConsumerQuotaMetricsR
 }
 
 export const ListConsumerQuotaMetricsResponse = {
+  typeUrl: "/google.api.serviceusage.v1beta1.ListConsumerQuotaMetricsResponse",
+
   encode(message: ListConsumerQuotaMetricsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.metrics) {
       ConsumerQuotaMetric.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -2606,6 +2755,25 @@ export const ListConsumerQuotaMetricsResponse = {
 
     obj.next_page_token = message.nextPageToken;
     return obj;
+  },
+
+  fromAminoMsg(object: ListConsumerQuotaMetricsResponseAminoMsg): ListConsumerQuotaMetricsResponse {
+    return ListConsumerQuotaMetricsResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ListConsumerQuotaMetricsResponseProtoMsg): ListConsumerQuotaMetricsResponse {
+    return ListConsumerQuotaMetricsResponse.decode(message.value);
+  },
+
+  toProto(message: ListConsumerQuotaMetricsResponse): Uint8Array {
+    return ListConsumerQuotaMetricsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: ListConsumerQuotaMetricsResponse): ListConsumerQuotaMetricsResponseProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1beta1.ListConsumerQuotaMetricsResponse",
+      value: ListConsumerQuotaMetricsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2618,6 +2786,8 @@ function createBaseGetConsumerQuotaMetricRequest(): GetConsumerQuotaMetricReques
 }
 
 export const GetConsumerQuotaMetricRequest = {
+  typeUrl: "/google.api.serviceusage.v1beta1.GetConsumerQuotaMetricRequest",
+
   encode(message: GetConsumerQuotaMetricRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -2703,6 +2873,25 @@ export const GetConsumerQuotaMetricRequest = {
     obj.name = message.name;
     obj.view = message.view;
     return obj;
+  },
+
+  fromAminoMsg(object: GetConsumerQuotaMetricRequestAminoMsg): GetConsumerQuotaMetricRequest {
+    return GetConsumerQuotaMetricRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: GetConsumerQuotaMetricRequestProtoMsg): GetConsumerQuotaMetricRequest {
+    return GetConsumerQuotaMetricRequest.decode(message.value);
+  },
+
+  toProto(message: GetConsumerQuotaMetricRequest): Uint8Array {
+    return GetConsumerQuotaMetricRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: GetConsumerQuotaMetricRequest): GetConsumerQuotaMetricRequestProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1beta1.GetConsumerQuotaMetricRequest",
+      value: GetConsumerQuotaMetricRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2715,6 +2904,8 @@ function createBaseGetConsumerQuotaLimitRequest(): GetConsumerQuotaLimitRequest
 }
 
 export const GetConsumerQuotaLimitRequest = {
+  typeUrl: "/google.api.serviceusage.v1beta1.GetConsumerQuotaLimitRequest",
+
   encode(message: GetConsumerQuotaLimitRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -2800,6 +2991,25 @@ export const GetConsumerQuotaLimitRequest = {
     obj.name = message.name;
     obj.view = message.view;
     return obj;
+  },
+
+  fromAminoMsg(object: GetConsumerQuotaLimitRequestAminoMsg): GetConsumerQuotaLimitRequest {
+    return GetConsumerQuotaLimitRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: GetConsumerQuotaLimitRequestProtoMsg): GetConsumerQuotaLimitRequest {
+    return GetConsumerQuotaLimitRequest.decode(message.value);
+  },
+
+  toProto(message: GetConsumerQuotaLimitRequest): Uint8Array {
+    return GetConsumerQuotaLimitRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: GetConsumerQuotaLimitRequest): GetConsumerQuotaLimitRequestProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1beta1.GetConsumerQuotaLimitRequest",
+      value: GetConsumerQuotaLimitRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2814,6 +3024,8 @@ function createBaseCreateAdminOverrideRequest(): CreateAdminOverrideRequest {
 }
 
 export const CreateAdminOverrideRequest = {
+  typeUrl: "/google.api.serviceusage.v1beta1.CreateAdminOverrideRequest",
+
   encode(message: CreateAdminOverrideRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.parent !== "") {
       writer.uint32(10).string(message.parent);
@@ -2959,6 +3171,25 @@ export const CreateAdminOverrideRequest = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: CreateAdminOverrideRequestAminoMsg): CreateAdminOverrideRequest {
+    return CreateAdminOverrideRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: CreateAdminOverrideRequestProtoMsg): CreateAdminOverrideRequest {
+    return CreateAdminOverrideRequest.decode(message.value);
+  },
+
+  toProto(message: CreateAdminOverrideRequest): Uint8Array {
+    return CreateAdminOverrideRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: CreateAdminOverrideRequest): CreateAdminOverrideRequestProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1beta1.CreateAdminOverrideRequest",
+      value: CreateAdminOverrideRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2974,6 +3205,8 @@ function createBaseUpdateAdminOverrideRequest(): UpdateAdminOverrideRequest {
 }
 
 export const UpdateAdminOverrideRequest = {
+  typeUrl: "/google.api.serviceusage.v1beta1.UpdateAdminOverrideRequest",
+
   encode(message: UpdateAdminOverrideRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -3134,6 +3367,25 @@ export const UpdateAdminOverrideRequest = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: UpdateAdminOverrideRequestAminoMsg): UpdateAdminOverrideRequest {
+    return UpdateAdminOverrideRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: UpdateAdminOverrideRequestProtoMsg): UpdateAdminOverrideRequest {
+    return UpdateAdminOverrideRequest.decode(message.value);
+  },
+
+  toProto(message: UpdateAdminOverrideRequest): Uint8Array {
+    return UpdateAdminOverrideRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: UpdateAdminOverrideRequest): UpdateAdminOverrideRequestProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1beta1.UpdateAdminOverrideRequest",
+      value: UpdateAdminOverrideRequest.encode(message).finish()
+    };
   }
 
 };
@@ -3147,6 +3399,8 @@ function createBaseDeleteAdminOverrideRequest(): DeleteAdminOverrideRequest {
 }
 
 export const DeleteAdminOverrideRequest = {
+  typeUrl: "/google.api.serviceusage.v1beta1.DeleteAdminOverrideRequest",
+
   encode(message: DeleteAdminOverrideRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -3277,6 +3531,25 @@ export const DeleteAdminOverrideRequest = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: DeleteAdminOverrideRequestAminoMsg): DeleteAdminOverrideRequest {
+    return DeleteAdminOverrideRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: DeleteAdminOverrideRequestProtoMsg): DeleteAdminOverrideRequest {
+    return DeleteAdminOverrideRequest.decode(message.value);
+  },
+
+  toProto(message: DeleteAdminOverrideRequest): Uint8Array {
+    return DeleteAdminOverrideRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: DeleteAdminOverrideRequest): DeleteAdminOverrideRequestProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1beta1.DeleteAdminOverrideRequest",
+      value: DeleteAdminOverrideRequest.encode(message).finish()
+    };
   }
 
 };
@@ -3290,6 +3563,8 @@ function createBaseListAdminOverridesRequest(): ListAdminOverridesRequest {
 }
 
 export const ListAdminOverridesRequest = {
+  typeUrl: "/google.api.serviceusage.v1beta1.ListAdminOverridesRequest",
+
   encode(message: ListAdminOverridesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.parent !== "") {
       writer.uint32(10).string(message.parent);
@@ -3390,6 +3665,25 @@ export const ListAdminOverridesRequest = {
     obj.page_size = message.pageSize;
     obj.page_token = message.pageToken;
     return obj;
+  },
+
+  fromAminoMsg(object: ListAdminOverridesRequestAminoMsg): ListAdminOverridesRequest {
+    return ListAdminOverridesRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ListAdminOverridesRequestProtoMsg): ListAdminOverridesRequest {
+    return ListAdminOverridesRequest.decode(message.value);
+  },
+
+  toProto(message: ListAdminOverridesRequest): Uint8Array {
+    return ListAdminOverridesRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: ListAdminOverridesRequest): ListAdminOverridesRequestProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1beta1.ListAdminOverridesRequest",
+      value: ListAdminOverridesRequest.encode(message).finish()
+    };
   }
 
 };
@@ -3402,6 +3696,8 @@ function createBaseListAdminOverridesResponse(): ListAdminOverridesResponse {
 }
 
 export const ListAdminOverridesResponse = {
+  typeUrl: "/google.api.serviceusage.v1beta1.ListAdminOverridesResponse",
+
   encode(message: ListAdminOverridesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.overrides) {
       QuotaOverride.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -3505,6 +3801,25 @@ export const ListAdminOverridesResponse = {
 
     obj.next_page_token = message.nextPageToken;
     return obj;
+  },
+
+  fromAminoMsg(object: ListAdminOverridesResponseAminoMsg): ListAdminOverridesResponse {
+    return ListAdminOverridesResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ListAdminOverridesResponseProtoMsg): ListAdminOverridesResponse {
+    return ListAdminOverridesResponse.decode(message.value);
+  },
+
+  toProto(message: ListAdminOverridesResponse): Uint8Array {
+    return ListAdminOverridesResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: ListAdminOverridesResponse): ListAdminOverridesResponseProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1beta1.ListAdminOverridesResponse",
+      value: ListAdminOverridesResponse.encode(message).finish()
+    };
   }
 
 };
@@ -3516,6 +3831,8 @@ function createBaseBatchCreateAdminOverridesResponse(): BatchCreateAdminOverride
 }
 
 export const BatchCreateAdminOverridesResponse = {
+  typeUrl: "/google.api.serviceusage.v1beta1.BatchCreateAdminOverridesResponse",
+
   encode(message: BatchCreateAdminOverridesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.overrides) {
       QuotaOverride.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -3604,6 +3921,25 @@ export const BatchCreateAdminOverridesResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: BatchCreateAdminOverridesResponseAminoMsg): BatchCreateAdminOverridesResponse {
+    return BatchCreateAdminOverridesResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: BatchCreateAdminOverridesResponseProtoMsg): BatchCreateAdminOverridesResponse {
+    return BatchCreateAdminOverridesResponse.decode(message.value);
+  },
+
+  toProto(message: BatchCreateAdminOverridesResponse): Uint8Array {
+    return BatchCreateAdminOverridesResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: BatchCreateAdminOverridesResponse): BatchCreateAdminOverridesResponseProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1beta1.BatchCreateAdminOverridesResponse",
+      value: BatchCreateAdminOverridesResponse.encode(message).finish()
+    };
   }
 
 };
@@ -3618,6 +3954,8 @@ function createBaseImportAdminOverridesRequest(): ImportAdminOverridesRequest {
 }
 
 export const ImportAdminOverridesRequest = {
+  typeUrl: "/google.api.serviceusage.v1beta1.ImportAdminOverridesRequest",
+
   encode(message: ImportAdminOverridesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.parent !== "") {
       writer.uint32(10).string(message.parent);
@@ -3763,6 +4101,25 @@ export const ImportAdminOverridesRequest = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ImportAdminOverridesRequestAminoMsg): ImportAdminOverridesRequest {
+    return ImportAdminOverridesRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ImportAdminOverridesRequestProtoMsg): ImportAdminOverridesRequest {
+    return ImportAdminOverridesRequest.decode(message.value);
+  },
+
+  toProto(message: ImportAdminOverridesRequest): Uint8Array {
+    return ImportAdminOverridesRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: ImportAdminOverridesRequest): ImportAdminOverridesRequestProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1beta1.ImportAdminOverridesRequest",
+      value: ImportAdminOverridesRequest.encode(message).finish()
+    };
   }
 
 };
@@ -3774,6 +4131,8 @@ function createBaseImportAdminOverridesResponse(): ImportAdminOverridesResponse
 }
 
 export const ImportAdminOverridesResponse = {
+  typeUrl: "/google.api.serviceusage.v1beta1.ImportAdminOverridesResponse",
+
   encode(message: ImportAdminOverridesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.overrides) {
       QuotaOverride.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -3862,6 +4221,25 @@ export const ImportAdminOverridesResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ImportAdminOverridesResponseAminoMsg): ImportAdminOverridesResponse {
+    return ImportAdminOverridesResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ImportAdminOverridesResponseProtoMsg): ImportAdminOverridesResponse {
+    return ImportAdminOverridesResponse.decode(message.value);
+  },
+
+  toProto(message: ImportAdminOverridesResponse): Uint8Array {
+    return ImportAdminOverridesResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: ImportAdminOverridesResponse): ImportAdminOverridesResponseProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1beta1.ImportAdminOverridesResponse",
+      value: ImportAdminOverridesResponse.encode(message).finish()
+    };
   }
 
 };
@@ -3871,6 +4249,8 @@ function createBaseImportAdminOverridesMetadata(): ImportAdminOverridesMetadata
 }
 
 export const ImportAdminOverridesMetadata = {
+  typeUrl: "/google.api.serviceusage.v1beta1.ImportAdminOverridesMetadata",
+
   encode(_: ImportAdminOverridesMetadata, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -3923,6 +4303,25 @@ export const ImportAdminOverridesMetadata = {
   toAmino(_: ImportAdminOverridesMetadata): ImportAdminOverridesMetadataAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: ImportAdminOverridesMetadataAminoMsg): ImportAdminOverridesMetadata {
+    return ImportAdminOverridesMetadata.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ImportAdminOverridesMetadataProtoMsg): ImportAdminOverridesMetadata {
+    return ImportAdminOverridesMetadata.decode(message.value);
+  },
+
+  toProto(message: ImportAdminOverridesMetadata): Uint8Array {
+    return ImportAdminOverridesMetadata.encode(message).finish();
+  },
+
+  toProtoMsg(message: ImportAdminOverridesMetadata): ImportAdminOverridesMetadataProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1beta1.ImportAdminOverridesMetadata",
+      value: ImportAdminOverridesMetadata.encode(message).finish()
+    };
   }
 
 };
@@ -3937,6 +4336,8 @@ function createBaseCreateConsumerOverrideRequest(): CreateConsumerOverrideReques
 }
 
 export const CreateConsumerOverrideRequest = {
+  typeUrl: "/google.api.serviceusage.v1beta1.CreateConsumerOverrideRequest",
+
   encode(message: CreateConsumerOverrideRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.parent !== "") {
       writer.uint32(10).string(message.parent);
@@ -4082,6 +4483,25 @@ export const CreateConsumerOverrideRequest = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: CreateConsumerOverrideRequestAminoMsg): CreateConsumerOverrideRequest {
+    return CreateConsumerOverrideRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: CreateConsumerOverrideRequestProtoMsg): CreateConsumerOverrideRequest {
+    return CreateConsumerOverrideRequest.decode(message.value);
+  },
+
+  toProto(message: CreateConsumerOverrideRequest): Uint8Array {
+    return CreateConsumerOverrideRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: CreateConsumerOverrideRequest): CreateConsumerOverrideRequestProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1beta1.CreateConsumerOverrideRequest",
+      value: CreateConsumerOverrideRequest.encode(message).finish()
+    };
   }
 
 };
@@ -4097,6 +4517,8 @@ function createBaseUpdateConsumerOverrideRequest(): UpdateConsumerOverrideReques
 }
 
 export const UpdateConsumerOverrideRequest = {
+  typeUrl: "/google.api.serviceusage.v1beta1.UpdateConsumerOverrideRequest",
+
   encode(message: UpdateConsumerOverrideRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -4257,6 +4679,25 @@ export const UpdateConsumerOverrideRequest = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: UpdateConsumerOverrideRequestAminoMsg): UpdateConsumerOverrideRequest {
+    return UpdateConsumerOverrideRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: UpdateConsumerOverrideRequestProtoMsg): UpdateConsumerOverrideRequest {
+    return UpdateConsumerOverrideRequest.decode(message.value);
+  },
+
+  toProto(message: UpdateConsumerOverrideRequest): Uint8Array {
+    return UpdateConsumerOverrideRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: UpdateConsumerOverrideRequest): UpdateConsumerOverrideRequestProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1beta1.UpdateConsumerOverrideRequest",
+      value: UpdateConsumerOverrideRequest.encode(message).finish()
+    };
   }
 
 };
@@ -4270,6 +4711,8 @@ function createBaseDeleteConsumerOverrideRequest(): DeleteConsumerOverrideReques
 }
 
 export const DeleteConsumerOverrideRequest = {
+  typeUrl: "/google.api.serviceusage.v1beta1.DeleteConsumerOverrideRequest",
+
   encode(message: DeleteConsumerOverrideRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -4400,6 +4843,25 @@ export const DeleteConsumerOverrideRequest = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: DeleteConsumerOverrideRequestAminoMsg): DeleteConsumerOverrideRequest {
+    return DeleteConsumerOverrideRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: DeleteConsumerOverrideRequestProtoMsg): DeleteConsumerOverrideRequest {
+    return DeleteConsumerOverrideRequest.decode(message.value);
+  },
+
+  toProto(message: DeleteConsumerOverrideRequest): Uint8Array {
+    return DeleteConsumerOverrideRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: DeleteConsumerOverrideRequest): DeleteConsumerOverrideRequestProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1beta1.DeleteConsumerOverrideRequest",
+      value: DeleteConsumerOverrideRequest.encode(message).finish()
+    };
   }
 
 };
@@ -4413,6 +4875,8 @@ function createBaseListConsumerOverridesRequest(): ListConsumerOverridesRequest
 }
 
 export const ListConsumerOverridesRequest = {
+  typeUrl: "/google.api.serviceusage.v1beta1.ListConsumerOverridesRequest",
+
   encode(message: ListConsumerOverridesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.parent !== "") {
       writer.uint32(10).string(message.parent);
@@ -4513,6 +4977,25 @@ export const ListConsumerOverridesRequest = {
     obj.page_size = message.pageSize;
     obj.page_token = message.pageToken;
     return obj;
+  },
+
+  fromAminoMsg(object: ListConsumerOverridesRequestAminoMsg): ListConsumerOverridesRequest {
+    return ListConsumerOverridesRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ListConsumerOverridesRequestProtoMsg): ListConsumerOverridesRequest {
+    return ListConsumerOverridesRequest.decode(message.value);
+  },
+
+  toProto(message: ListConsumerOverridesRequest): Uint8Array {
+    return ListConsumerOverridesRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: ListConsumerOverridesRequest): ListConsumerOverridesRequestProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1beta1.ListConsumerOverridesRequest",
+      value: ListConsumerOverridesRequest.encode(message).finish()
+    };
   }
 
 };
@@ -4525,6 +5008,8 @@ function createBaseListConsumerOverridesResponse(): ListConsumerOverridesRespons
 }
 
 export const ListConsumerOverridesResponse = {
+  typeUrl: "/google.api.serviceusage.v1beta1.ListConsumerOverridesResponse",
+
   encode(message: ListConsumerOverridesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.overrides) {
       QuotaOverride.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -4628,6 +5113,25 @@ export const ListConsumerOverridesResponse = {
 
     obj.next_page_token = message.nextPageToken;
     return obj;
+  },
+
+  fromAminoMsg(object: ListConsumerOverridesResponseAminoMsg): ListConsumerOverridesResponse {
+    return ListConsumerOverridesResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ListConsumerOverridesResponseProtoMsg): ListConsumerOverridesResponse {
+    return ListConsumerOverridesResponse.decode(message.value);
+  },
+
+  toProto(message: ListConsumerOverridesResponse): Uint8Array {
+    return ListConsumerOverridesResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: ListConsumerOverridesResponse): ListConsumerOverridesResponseProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1beta1.ListConsumerOverridesResponse",
+      value: ListConsumerOverridesResponse.encode(message).finish()
+    };
   }
 
 };
@@ -4639,6 +5143,8 @@ function createBaseBatchCreateConsumerOverridesResponse(): BatchCreateConsumerOv
 }
 
 export const BatchCreateConsumerOverridesResponse = {
+  typeUrl: "/google.api.serviceusage.v1beta1.BatchCreateConsumerOverridesResponse",
+
   encode(message: BatchCreateConsumerOverridesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.overrides) {
       QuotaOverride.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -4727,6 +5233,25 @@ export const BatchCreateConsumerOverridesResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: BatchCreateConsumerOverridesResponseAminoMsg): BatchCreateConsumerOverridesResponse {
+    return BatchCreateConsumerOverridesResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: BatchCreateConsumerOverridesResponseProtoMsg): BatchCreateConsumerOverridesResponse {
+    return BatchCreateConsumerOverridesResponse.decode(message.value);
+  },
+
+  toProto(message: BatchCreateConsumerOverridesResponse): Uint8Array {
+    return BatchCreateConsumerOverridesResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: BatchCreateConsumerOverridesResponse): BatchCreateConsumerOverridesResponseProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1beta1.BatchCreateConsumerOverridesResponse",
+      value: BatchCreateConsumerOverridesResponse.encode(message).finish()
+    };
   }
 
 };
@@ -4741,6 +5266,8 @@ function createBaseImportConsumerOverridesRequest(): ImportConsumerOverridesRequ
 }
 
 export const ImportConsumerOverridesRequest = {
+  typeUrl: "/google.api.serviceusage.v1beta1.ImportConsumerOverridesRequest",
+
   encode(message: ImportConsumerOverridesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.parent !== "") {
       writer.uint32(10).string(message.parent);
@@ -4886,6 +5413,25 @@ export const ImportConsumerOverridesRequest = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ImportConsumerOverridesRequestAminoMsg): ImportConsumerOverridesRequest {
+    return ImportConsumerOverridesRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ImportConsumerOverridesRequestProtoMsg): ImportConsumerOverridesRequest {
+    return ImportConsumerOverridesRequest.decode(message.value);
+  },
+
+  toProto(message: ImportConsumerOverridesRequest): Uint8Array {
+    return ImportConsumerOverridesRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: ImportConsumerOverridesRequest): ImportConsumerOverridesRequestProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1beta1.ImportConsumerOverridesRequest",
+      value: ImportConsumerOverridesRequest.encode(message).finish()
+    };
   }
 
 };
@@ -4897,6 +5443,8 @@ function createBaseImportConsumerOverridesResponse(): ImportConsumerOverridesRes
 }
 
 export const ImportConsumerOverridesResponse = {
+  typeUrl: "/google.api.serviceusage.v1beta1.ImportConsumerOverridesResponse",
+
   encode(message: ImportConsumerOverridesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.overrides) {
       QuotaOverride.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -4985,6 +5533,25 @@ export const ImportConsumerOverridesResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ImportConsumerOverridesResponseAminoMsg): ImportConsumerOverridesResponse {
+    return ImportConsumerOverridesResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ImportConsumerOverridesResponseProtoMsg): ImportConsumerOverridesResponse {
+    return ImportConsumerOverridesResponse.decode(message.value);
+  },
+
+  toProto(message: ImportConsumerOverridesResponse): Uint8Array {
+    return ImportConsumerOverridesResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: ImportConsumerOverridesResponse): ImportConsumerOverridesResponseProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1beta1.ImportConsumerOverridesResponse",
+      value: ImportConsumerOverridesResponse.encode(message).finish()
+    };
   }
 
 };
@@ -4994,6 +5561,8 @@ function createBaseImportConsumerOverridesMetadata(): ImportConsumerOverridesMet
 }
 
 export const ImportConsumerOverridesMetadata = {
+  typeUrl: "/google.api.serviceusage.v1beta1.ImportConsumerOverridesMetadata",
+
   encode(_: ImportConsumerOverridesMetadata, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -5046,6 +5615,25 @@ export const ImportConsumerOverridesMetadata = {
   toAmino(_: ImportConsumerOverridesMetadata): ImportConsumerOverridesMetadataAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: ImportConsumerOverridesMetadataAminoMsg): ImportConsumerOverridesMetadata {
+    return ImportConsumerOverridesMetadata.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ImportConsumerOverridesMetadataProtoMsg): ImportConsumerOverridesMetadata {
+    return ImportConsumerOverridesMetadata.decode(message.value);
+  },
+
+  toProto(message: ImportConsumerOverridesMetadata): Uint8Array {
+    return ImportConsumerOverridesMetadata.encode(message).finish();
+  },
+
+  toProtoMsg(message: ImportConsumerOverridesMetadata): ImportConsumerOverridesMetadataProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1beta1.ImportConsumerOverridesMetadata",
+      value: ImportConsumerOverridesMetadata.encode(message).finish()
+    };
   }
 
 };
@@ -5057,6 +5645,8 @@ function createBaseImportAdminQuotaPoliciesResponse(): ImportAdminQuotaPoliciesR
 }
 
 export const ImportAdminQuotaPoliciesResponse = {
+  typeUrl: "/google.api.serviceusage.v1beta1.ImportAdminQuotaPoliciesResponse",
+
   encode(message: ImportAdminQuotaPoliciesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.policies) {
       AdminQuotaPolicy.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -5145,6 +5735,25 @@ export const ImportAdminQuotaPoliciesResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ImportAdminQuotaPoliciesResponseAminoMsg): ImportAdminQuotaPoliciesResponse {
+    return ImportAdminQuotaPoliciesResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ImportAdminQuotaPoliciesResponseProtoMsg): ImportAdminQuotaPoliciesResponse {
+    return ImportAdminQuotaPoliciesResponse.decode(message.value);
+  },
+
+  toProto(message: ImportAdminQuotaPoliciesResponse): Uint8Array {
+    return ImportAdminQuotaPoliciesResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: ImportAdminQuotaPoliciesResponse): ImportAdminQuotaPoliciesResponseProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1beta1.ImportAdminQuotaPoliciesResponse",
+      value: ImportAdminQuotaPoliciesResponse.encode(message).finish()
+    };
   }
 
 };
@@ -5154,6 +5763,8 @@ function createBaseImportAdminQuotaPoliciesMetadata(): ImportAdminQuotaPoliciesM
 }
 
 export const ImportAdminQuotaPoliciesMetadata = {
+  typeUrl: "/google.api.serviceusage.v1beta1.ImportAdminQuotaPoliciesMetadata",
+
   encode(_: ImportAdminQuotaPoliciesMetadata, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -5206,6 +5817,25 @@ export const ImportAdminQuotaPoliciesMetadata = {
   toAmino(_: ImportAdminQuotaPoliciesMetadata): ImportAdminQuotaPoliciesMetadataAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: ImportAdminQuotaPoliciesMetadataAminoMsg): ImportAdminQuotaPoliciesMetadata {
+    return ImportAdminQuotaPoliciesMetadata.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ImportAdminQuotaPoliciesMetadataProtoMsg): ImportAdminQuotaPoliciesMetadata {
+    return ImportAdminQuotaPoliciesMetadata.decode(message.value);
+  },
+
+  toProto(message: ImportAdminQuotaPoliciesMetadata): Uint8Array {
+    return ImportAdminQuotaPoliciesMetadata.encode(message).finish();
+  },
+
+  toProtoMsg(message: ImportAdminQuotaPoliciesMetadata): ImportAdminQuotaPoliciesMetadataProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1beta1.ImportAdminQuotaPoliciesMetadata",
+      value: ImportAdminQuotaPoliciesMetadata.encode(message).finish()
+    };
   }
 
 };
@@ -5215,6 +5845,8 @@ function createBaseCreateAdminQuotaPolicyMetadata(): CreateAdminQuotaPolicyMetad
 }
 
 export const CreateAdminQuotaPolicyMetadata = {
+  typeUrl: "/google.api.serviceusage.v1beta1.CreateAdminQuotaPolicyMetadata",
+
   encode(_: CreateAdminQuotaPolicyMetadata, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -5267,6 +5899,25 @@ export const CreateAdminQuotaPolicyMetadata = {
   toAmino(_: CreateAdminQuotaPolicyMetadata): CreateAdminQuotaPolicyMetadataAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: CreateAdminQuotaPolicyMetadataAminoMsg): CreateAdminQuotaPolicyMetadata {
+    return CreateAdminQuotaPolicyMetadata.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: CreateAdminQuotaPolicyMetadataProtoMsg): CreateAdminQuotaPolicyMetadata {
+    return CreateAdminQuotaPolicyMetadata.decode(message.value);
+  },
+
+  toProto(message: CreateAdminQuotaPolicyMetadata): Uint8Array {
+    return CreateAdminQuotaPolicyMetadata.encode(message).finish();
+  },
+
+  toProtoMsg(message: CreateAdminQuotaPolicyMetadata): CreateAdminQuotaPolicyMetadataProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1beta1.CreateAdminQuotaPolicyMetadata",
+      value: CreateAdminQuotaPolicyMetadata.encode(message).finish()
+    };
   }
 
 };
@@ -5276,6 +5927,8 @@ function createBaseUpdateAdminQuotaPolicyMetadata(): UpdateAdminQuotaPolicyMetad
 }
 
 export const UpdateAdminQuotaPolicyMetadata = {
+  typeUrl: "/google.api.serviceusage.v1beta1.UpdateAdminQuotaPolicyMetadata",
+
   encode(_: UpdateAdminQuotaPolicyMetadata, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -5328,6 +5981,25 @@ export const UpdateAdminQuotaPolicyMetadata = {
   toAmino(_: UpdateAdminQuotaPolicyMetadata): UpdateAdminQuotaPolicyMetadataAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: UpdateAdminQuotaPolicyMetadataAminoMsg): UpdateAdminQuotaPolicyMetadata {
+    return UpdateAdminQuotaPolicyMetadata.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: UpdateAdminQuotaPolicyMetadataProtoMsg): UpdateAdminQuotaPolicyMetadata {
+    return UpdateAdminQuotaPolicyMetadata.decode(message.value);
+  },
+
+  toProto(message: UpdateAdminQuotaPolicyMetadata): Uint8Array {
+    return UpdateAdminQuotaPolicyMetadata.encode(message).finish();
+  },
+
+  toProtoMsg(message: UpdateAdminQuotaPolicyMetadata): UpdateAdminQuotaPolicyMetadataProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1beta1.UpdateAdminQuotaPolicyMetadata",
+      value: UpdateAdminQuotaPolicyMetadata.encode(message).finish()
+    };
   }
 
 };
@@ -5337,6 +6009,8 @@ function createBaseDeleteAdminQuotaPolicyMetadata(): DeleteAdminQuotaPolicyMetad
 }
 
 export const DeleteAdminQuotaPolicyMetadata = {
+  typeUrl: "/google.api.serviceusage.v1beta1.DeleteAdminQuotaPolicyMetadata",
+
   encode(_: DeleteAdminQuotaPolicyMetadata, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -5389,6 +6063,25 @@ export const DeleteAdminQuotaPolicyMetadata = {
   toAmino(_: DeleteAdminQuotaPolicyMetadata): DeleteAdminQuotaPolicyMetadataAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: DeleteAdminQuotaPolicyMetadataAminoMsg): DeleteAdminQuotaPolicyMetadata {
+    return DeleteAdminQuotaPolicyMetadata.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: DeleteAdminQuotaPolicyMetadataProtoMsg): DeleteAdminQuotaPolicyMetadata {
+    return DeleteAdminQuotaPolicyMetadata.decode(message.value);
+  },
+
+  toProto(message: DeleteAdminQuotaPolicyMetadata): Uint8Array {
+    return DeleteAdminQuotaPolicyMetadata.encode(message).finish();
+  },
+
+  toProtoMsg(message: DeleteAdminQuotaPolicyMetadata): DeleteAdminQuotaPolicyMetadataProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1beta1.DeleteAdminQuotaPolicyMetadata",
+      value: DeleteAdminQuotaPolicyMetadata.encode(message).finish()
+    };
   }
 
 };
@@ -5400,6 +6093,8 @@ function createBaseGenerateServiceIdentityRequest(): GenerateServiceIdentityRequ
 }
 
 export const GenerateServiceIdentityRequest = {
+  typeUrl: "/google.api.serviceusage.v1beta1.GenerateServiceIdentityRequest",
+
   encode(message: GenerateServiceIdentityRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.parent !== "") {
       writer.uint32(10).string(message.parent);
@@ -5470,6 +6165,25 @@ export const GenerateServiceIdentityRequest = {
     const obj: any = {};
     obj.parent = message.parent;
     return obj;
+  },
+
+  fromAminoMsg(object: GenerateServiceIdentityRequestAminoMsg): GenerateServiceIdentityRequest {
+    return GenerateServiceIdentityRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: GenerateServiceIdentityRequestProtoMsg): GenerateServiceIdentityRequest {
+    return GenerateServiceIdentityRequest.decode(message.value);
+  },
+
+  toProto(message: GenerateServiceIdentityRequest): Uint8Array {
+    return GenerateServiceIdentityRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenerateServiceIdentityRequest): GenerateServiceIdentityRequestProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1beta1.GenerateServiceIdentityRequest",
+      value: GenerateServiceIdentityRequest.encode(message).finish()
+    };
   }
 
 };
@@ -5482,6 +6196,8 @@ function createBaseGetServiceIdentityResponse(): GetServiceIdentityResponse {
 }
 
 export const GetServiceIdentityResponse = {
+  typeUrl: "/google.api.serviceusage.v1beta1.GetServiceIdentityResponse",
+
   encode(message: GetServiceIdentityResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.identity !== undefined) {
       ServiceIdentity.encode(message.identity, writer.uint32(10).fork()).ldelim();
@@ -5567,6 +6283,25 @@ export const GetServiceIdentityResponse = {
     obj.identity = message.identity ? ServiceIdentity.toAmino(message.identity) : undefined;
     obj.state = message.state;
     return obj;
+  },
+
+  fromAminoMsg(object: GetServiceIdentityResponseAminoMsg): GetServiceIdentityResponse {
+    return GetServiceIdentityResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: GetServiceIdentityResponseProtoMsg): GetServiceIdentityResponse {
+    return GetServiceIdentityResponse.decode(message.value);
+  },
+
+  toProto(message: GetServiceIdentityResponse): Uint8Array {
+    return GetServiceIdentityResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: GetServiceIdentityResponse): GetServiceIdentityResponseProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1beta1.GetServiceIdentityResponse",
+      value: GetServiceIdentityResponse.encode(message).finish()
+    };
   }
 
 };
@@ -5576,6 +6311,8 @@ function createBaseGetServiceIdentityMetadata(): GetServiceIdentityMetadata {
 }
 
 export const GetServiceIdentityMetadata = {
+  typeUrl: "/google.api.serviceusage.v1beta1.GetServiceIdentityMetadata",
+
   encode(_: GetServiceIdentityMetadata, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -5628,6 +6365,25 @@ export const GetServiceIdentityMetadata = {
   toAmino(_: GetServiceIdentityMetadata): GetServiceIdentityMetadataAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: GetServiceIdentityMetadataAminoMsg): GetServiceIdentityMetadata {
+    return GetServiceIdentityMetadata.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: GetServiceIdentityMetadataProtoMsg): GetServiceIdentityMetadata {
+    return GetServiceIdentityMetadata.decode(message.value);
+  },
+
+  toProto(message: GetServiceIdentityMetadata): Uint8Array {
+    return GetServiceIdentityMetadata.encode(message).finish();
+  },
+
+  toProtoMsg(message: GetServiceIdentityMetadata): GetServiceIdentityMetadataProtoMsg {
+    return {
+      typeUrl: "/google.api.serviceusage.v1beta1.GetServiceIdentityMetadata",
+      value: GetServiceIdentityMetadata.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/api/source_info.ts b/__fixtures__/outputv2/google/api/source_info.ts
index eb500ecee..bdfc1f64b 100644
--- a/__fixtures__/outputv2/google/api/source_info.ts
+++ b/__fixtures__/outputv2/google/api/source_info.ts
@@ -8,7 +8,7 @@ export interface SourceInfo {
   /** All files used during config generation. */
   sourceFiles: Any[];
 }
-export interface SourceInfoProtoType {
+export interface SourceInfoProtoMsg {
   typeUrl: "/google.api.SourceInfo";
   value: Uint8Array;
 }
@@ -18,7 +18,7 @@ export interface SourceInfoAmino {
   /** All files used during config generation. */
   source_files: AnyAmino[];
 }
-export interface SourceInfoAminoType {
+export interface SourceInfoAminoMsg {
   type: "/google.api.SourceInfo";
   value: SourceInfoAmino;
 }
@@ -35,6 +35,8 @@ function createBaseSourceInfo(): SourceInfo {
 }
 
 export const SourceInfo = {
+  typeUrl: "/google.api.SourceInfo",
+
   encode(message: SourceInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.sourceFiles) {
       Any.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -123,6 +125,25 @@ export const SourceInfo = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: SourceInfoAminoMsg): SourceInfo {
+    return SourceInfo.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: SourceInfoProtoMsg): SourceInfo {
+    return SourceInfo.decode(message.value);
+  },
+
+  toProto(message: SourceInfo): Uint8Array {
+    return SourceInfo.encode(message).finish();
+  },
+
+  toProtoMsg(message: SourceInfo): SourceInfoProtoMsg {
+    return {
+      typeUrl: "/google.api.SourceInfo",
+      value: SourceInfo.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/api/system_parameter.ts b/__fixtures__/outputv2/google/api/system_parameter.ts
index ee233e64e..5be12e94e 100644
--- a/__fixtures__/outputv2/google/api/system_parameter.ts
+++ b/__fixtures__/outputv2/google/api/system_parameter.ts
@@ -44,7 +44,7 @@ export interface SystemParameters {
    */
   rules: SystemParameterRule[];
 }
-export interface SystemParametersProtoType {
+export interface SystemParametersProtoMsg {
   typeUrl: "/google.api.SystemParameters";
   value: Uint8Array;
 }
@@ -91,7 +91,7 @@ export interface SystemParametersAmino {
    */
   rules: SystemParameterRuleAmino[];
 }
-export interface SystemParametersAminoType {
+export interface SystemParametersAminoMsg {
   type: "/google.api.SystemParameters";
   value: SystemParametersAmino;
 }
@@ -130,7 +130,7 @@ export interface SystemParameterRule {
    */
   parameters: SystemParameter[];
 }
-export interface SystemParameterRuleProtoType {
+export interface SystemParameterRuleProtoMsg {
   typeUrl: "/google.api.SystemParameterRule";
   value: Uint8Array;
 }
@@ -157,7 +157,7 @@ export interface SystemParameterRuleAmino {
    */
   parameters: SystemParameterAmino[];
 }
-export interface SystemParameterRuleAminoType {
+export interface SystemParameterRuleAminoMsg {
   type: "/google.api.SystemParameterRule";
   value: SystemParameterRuleAmino;
 }
@@ -192,7 +192,7 @@ export interface SystemParameter {
    */
   urlQueryParameter: string;
 }
-export interface SystemParameterProtoType {
+export interface SystemParameterProtoMsg {
   typeUrl: "/google.api.SystemParameter";
   value: Uint8Array;
 }
@@ -218,7 +218,7 @@ export interface SystemParameterAmino {
    */
   url_query_parameter: string;
 }
-export interface SystemParameterAminoType {
+export interface SystemParameterAminoMsg {
   type: "/google.api.SystemParameter";
   value: SystemParameterAmino;
 }
@@ -241,6 +241,8 @@ function createBaseSystemParameters(): SystemParameters {
 }
 
 export const SystemParameters = {
+  typeUrl: "/google.api.SystemParameters",
+
   encode(message: SystemParameters, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.rules) {
       SystemParameterRule.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -329,6 +331,25 @@ export const SystemParameters = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: SystemParametersAminoMsg): SystemParameters {
+    return SystemParameters.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: SystemParametersProtoMsg): SystemParameters {
+    return SystemParameters.decode(message.value);
+  },
+
+  toProto(message: SystemParameters): Uint8Array {
+    return SystemParameters.encode(message).finish();
+  },
+
+  toProtoMsg(message: SystemParameters): SystemParametersProtoMsg {
+    return {
+      typeUrl: "/google.api.SystemParameters",
+      value: SystemParameters.encode(message).finish()
+    };
   }
 
 };
@@ -341,6 +362,8 @@ function createBaseSystemParameterRule(): SystemParameterRule {
 }
 
 export const SystemParameterRule = {
+  typeUrl: "/google.api.SystemParameterRule",
+
   encode(message: SystemParameterRule, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.selector !== "") {
       writer.uint32(10).string(message.selector);
@@ -444,6 +467,25 @@ export const SystemParameterRule = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: SystemParameterRuleAminoMsg): SystemParameterRule {
+    return SystemParameterRule.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: SystemParameterRuleProtoMsg): SystemParameterRule {
+    return SystemParameterRule.decode(message.value);
+  },
+
+  toProto(message: SystemParameterRule): Uint8Array {
+    return SystemParameterRule.encode(message).finish();
+  },
+
+  toProtoMsg(message: SystemParameterRule): SystemParameterRuleProtoMsg {
+    return {
+      typeUrl: "/google.api.SystemParameterRule",
+      value: SystemParameterRule.encode(message).finish()
+    };
   }
 
 };
@@ -457,6 +499,8 @@ function createBaseSystemParameter(): SystemParameter {
 }
 
 export const SystemParameter = {
+  typeUrl: "/google.api.SystemParameter",
+
   encode(message: SystemParameter, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -557,6 +601,25 @@ export const SystemParameter = {
     obj.http_header = message.httpHeader;
     obj.url_query_parameter = message.urlQueryParameter;
     return obj;
+  },
+
+  fromAminoMsg(object: SystemParameterAminoMsg): SystemParameter {
+    return SystemParameter.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: SystemParameterProtoMsg): SystemParameter {
+    return SystemParameter.decode(message.value);
+  },
+
+  toProto(message: SystemParameter): Uint8Array {
+    return SystemParameter.encode(message).finish();
+  },
+
+  toProtoMsg(message: SystemParameter): SystemParameterProtoMsg {
+    return {
+      typeUrl: "/google.api.SystemParameter",
+      value: SystemParameter.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/api/usage.ts b/__fixtures__/outputv2/google/api/usage.ts
index ea6d628ea..bde68d4e0 100644
--- a/__fixtures__/outputv2/google/api/usage.ts
+++ b/__fixtures__/outputv2/google/api/usage.ts
@@ -36,7 +36,7 @@ export interface Usage {
    */
   producerNotificationChannel: string;
 }
-export interface UsageProtoType {
+export interface UsageProtoMsg {
   typeUrl: "/google.api.Usage";
   value: Uint8Array;
 }
@@ -75,7 +75,7 @@ export interface UsageAmino {
    */
   producer_notification_channel: string;
 }
-export interface UsageAminoType {
+export interface UsageAminoMsg {
   type: "/google.api.Usage";
   value: UsageAmino;
 }
@@ -137,7 +137,7 @@ export interface UsageRule {
    */
   skipServiceControl: boolean;
 }
-export interface UsageRuleProtoType {
+export interface UsageRuleProtoMsg {
   typeUrl: "/google.api.UsageRule";
   value: Uint8Array;
 }
@@ -192,7 +192,7 @@ export interface UsageRuleAmino {
    */
   skip_service_control: boolean;
 }
-export interface UsageRuleAminoType {
+export interface UsageRuleAminoMsg {
   type: "/google.api.UsageRule";
   value: UsageRuleAmino;
 }
@@ -239,6 +239,8 @@ function createBaseUsage(): Usage {
 }
 
 export const Usage = {
+  typeUrl: "/google.api.Usage",
+
   encode(message: Usage, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.requirements) {
       writer.uint32(10).string(v!);
@@ -372,6 +374,25 @@ export const Usage = {
 
     obj.producer_notification_channel = message.producerNotificationChannel;
     return obj;
+  },
+
+  fromAminoMsg(object: UsageAminoMsg): Usage {
+    return Usage.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: UsageProtoMsg): Usage {
+    return Usage.decode(message.value);
+  },
+
+  toProto(message: Usage): Uint8Array {
+    return Usage.encode(message).finish();
+  },
+
+  toProtoMsg(message: Usage): UsageProtoMsg {
+    return {
+      typeUrl: "/google.api.Usage",
+      value: Usage.encode(message).finish()
+    };
   }
 
 };
@@ -385,6 +406,8 @@ function createBaseUsageRule(): UsageRule {
 }
 
 export const UsageRule = {
+  typeUrl: "/google.api.UsageRule",
+
   encode(message: UsageRule, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.selector !== "") {
       writer.uint32(10).string(message.selector);
@@ -485,6 +508,25 @@ export const UsageRule = {
     obj.allow_unregistered_calls = message.allowUnregisteredCalls;
     obj.skip_service_control = message.skipServiceControl;
     return obj;
+  },
+
+  fromAminoMsg(object: UsageRuleAminoMsg): UsageRule {
+    return UsageRule.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: UsageRuleProtoMsg): UsageRule {
+    return UsageRule.decode(message.value);
+  },
+
+  toProto(message: UsageRule): Uint8Array {
+    return UsageRule.encode(message).finish();
+  },
+
+  toProtoMsg(message: UsageRule): UsageRuleProtoMsg {
+    return {
+      typeUrl: "/google.api.UsageRule",
+      value: UsageRule.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/api/visibility.ts b/__fixtures__/outputv2/google/api/visibility.ts
index e88658b89..5004358a7 100644
--- a/__fixtures__/outputv2/google/api/visibility.ts
+++ b/__fixtures__/outputv2/google/api/visibility.ts
@@ -34,7 +34,7 @@ export interface Visibility {
    */
   rules: VisibilityRule[];
 }
-export interface VisibilityProtoType {
+export interface VisibilityProtoMsg {
   typeUrl: "/google.api.Visibility";
   value: Uint8Array;
 }
@@ -71,7 +71,7 @@ export interface VisibilityAmino {
    */
   rules: VisibilityRuleAmino[];
 }
-export interface VisibilityAminoType {
+export interface VisibilityAminoMsg {
   type: "/google.api.Visibility";
   value: VisibilityAmino;
 }
@@ -135,7 +135,7 @@ export interface VisibilityRule {
    */
   restriction: string;
 }
-export interface VisibilityRuleProtoType {
+export interface VisibilityRuleProtoMsg {
   typeUrl: "/google.api.VisibilityRule";
   value: Uint8Array;
 }
@@ -171,7 +171,7 @@ export interface VisibilityRuleAmino {
    */
   restriction: string;
 }
-export interface VisibilityRuleAminoType {
+export interface VisibilityRuleAminoMsg {
   type: "/google.api.VisibilityRule";
   value: VisibilityRuleAmino;
 }
@@ -192,6 +192,8 @@ function createBaseVisibility(): Visibility {
 }
 
 export const Visibility = {
+  typeUrl: "/google.api.Visibility",
+
   encode(message: Visibility, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.rules) {
       VisibilityRule.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -280,6 +282,25 @@ export const Visibility = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: VisibilityAminoMsg): Visibility {
+    return Visibility.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: VisibilityProtoMsg): Visibility {
+    return Visibility.decode(message.value);
+  },
+
+  toProto(message: Visibility): Uint8Array {
+    return Visibility.encode(message).finish();
+  },
+
+  toProtoMsg(message: Visibility): VisibilityProtoMsg {
+    return {
+      typeUrl: "/google.api.Visibility",
+      value: Visibility.encode(message).finish()
+    };
   }
 
 };
@@ -292,6 +313,8 @@ function createBaseVisibilityRule(): VisibilityRule {
 }
 
 export const VisibilityRule = {
+  typeUrl: "/google.api.VisibilityRule",
+
   encode(message: VisibilityRule, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.selector !== "") {
       writer.uint32(10).string(message.selector);
@@ -377,6 +400,25 @@ export const VisibilityRule = {
     obj.selector = message.selector;
     obj.restriction = message.restriction;
     return obj;
+  },
+
+  fromAminoMsg(object: VisibilityRuleAminoMsg): VisibilityRule {
+    return VisibilityRule.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: VisibilityRuleProtoMsg): VisibilityRule {
+    return VisibilityRule.decode(message.value);
+  },
+
+  toProto(message: VisibilityRule): Uint8Array {
+    return VisibilityRule.encode(message).finish();
+  },
+
+  toProtoMsg(message: VisibilityRule): VisibilityRuleProtoMsg {
+    return {
+      typeUrl: "/google.api.VisibilityRule",
+      value: VisibilityRule.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/logging/type/http_request.ts b/__fixtures__/outputv2/google/logging/type/http_request.ts
index 929f9278d..390e7269c 100644
--- a/__fixtures__/outputv2/google/logging/type/http_request.ts
+++ b/__fixtures__/outputv2/google/logging/type/http_request.ts
@@ -96,7 +96,7 @@ export interface HttpRequest {
   /** Protocol used for the request. Examples: "HTTP/1.1", "HTTP/2", "websocket" */
   protocol: string;
 }
-export interface HttpRequestProtoType {
+export interface HttpRequestProtoMsg {
   typeUrl: "/google.logging.type.HttpRequest";
   value: Uint8Array;
 }
@@ -194,7 +194,7 @@ export interface HttpRequestAmino {
   /** Protocol used for the request. Examples: "HTTP/1.1", "HTTP/2", "websocket" */
   protocol: string;
 }
-export interface HttpRequestAminoType {
+export interface HttpRequestAminoMsg {
   type: "/google.logging.type.HttpRequest";
   value: HttpRequestAmino;
 }
@@ -243,6 +243,8 @@ function createBaseHttpRequest(): HttpRequest {
 }
 
 export const HttpRequest = {
+  typeUrl: "/google.logging.type.HttpRequest",
+
   encode(message: HttpRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.requestMethod !== "") {
       writer.uint32(10).string(message.requestMethod);
@@ -523,6 +525,25 @@ export const HttpRequest = {
     obj.cache_fill_bytes = message.cacheFillBytes ? message.cacheFillBytes.toString() : undefined;
     obj.protocol = message.protocol;
     return obj;
+  },
+
+  fromAminoMsg(object: HttpRequestAminoMsg): HttpRequest {
+    return HttpRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: HttpRequestProtoMsg): HttpRequest {
+    return HttpRequest.decode(message.value);
+  },
+
+  toProto(message: HttpRequest): Uint8Array {
+    return HttpRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: HttpRequest): HttpRequestProtoMsg {
+    return {
+      typeUrl: "/google.logging.type.HttpRequest",
+      value: HttpRequest.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/logging/v2/log_entry.ts b/__fixtures__/outputv2/google/logging/v2/log_entry.ts
index 53e8e19a6..ccc7e0593 100644
--- a/__fixtures__/outputv2/google/logging/v2/log_entry.ts
+++ b/__fixtures__/outputv2/google/logging/v2/log_entry.ts
@@ -11,16 +11,16 @@ export interface LogEntry_LabelsEntry {
   key: string;
   value: string;
 }
-export interface LogEntry_LabelsEntryProtoType {
-  typeUrl: "/google.logging.v2.undefined";
+export interface LogEntry_LabelsEntryProtoMsg {
+  typeUrl: string;
   value: Uint8Array;
 }
 export interface LogEntry_LabelsEntryAmino {
   key: string;
   value: string;
 }
-export interface LogEntry_LabelsEntryAminoType {
-  type: "/google.logging.v2.undefined";
+export interface LogEntry_LabelsEntryAminoMsg {
+  type: string;
   value: LogEntry_LabelsEntryAmino;
 }
 export interface LogEntry_LabelsEntrySDKType {
@@ -192,7 +192,7 @@ export interface LogEntry {
    */
   split?: LogSplit;
 }
-export interface LogEntryProtoType {
+export interface LogEntryProtoMsg {
   typeUrl: "/google.logging.v2.LogEntry";
   value: Uint8Array;
 }
@@ -361,7 +361,7 @@ export interface LogEntryAmino {
    */
   split?: LogSplitAmino;
 }
-export interface LogEntryAminoType {
+export interface LogEntryAminoMsg {
   type: "/google.logging.v2.LogEntry";
   value: LogEntryAmino;
 }
@@ -413,7 +413,7 @@ export interface LogEntryOperation {
   /** Optional. Set this to True if this is the last log entry in the operation. */
   last: boolean;
 }
-export interface LogEntryOperationProtoType {
+export interface LogEntryOperationProtoMsg {
   typeUrl: "/google.logging.v2.LogEntryOperation";
   value: Uint8Array;
 }
@@ -442,7 +442,7 @@ export interface LogEntryOperationAmino {
   /** Optional. Set this to True if this is the last log entry in the operation. */
   last: boolean;
 }
-export interface LogEntryOperationAminoType {
+export interface LogEntryOperationAminoMsg {
   type: "/google.logging.v2.LogEntryOperation";
   value: LogEntryOperationAmino;
 }
@@ -485,7 +485,7 @@ export interface LogEntrySourceLocation {
    */
   function: string;
 }
-export interface LogEntrySourceLocationProtoType {
+export interface LogEntrySourceLocationProtoMsg {
   typeUrl: "/google.logging.v2.LogEntrySourceLocation";
   value: Uint8Array;
 }
@@ -517,7 +517,7 @@ export interface LogEntrySourceLocationAmino {
    */
   function: string;
 }
-export interface LogEntrySourceLocationAminoType {
+export interface LogEntrySourceLocationAminoMsg {
   type: "/google.logging.v2.LogEntrySourceLocation";
   value: LogEntrySourceLocationAmino;
 }
@@ -555,7 +555,7 @@ export interface LogSplit {
   /** The total number of log entries that the original LogEntry was split into. */
   totalSplits: number;
 }
-export interface LogSplitProtoType {
+export interface LogSplitProtoMsg {
   typeUrl: "/google.logging.v2.LogSplit";
   value: Uint8Array;
 }
@@ -583,7 +583,7 @@ export interface LogSplitAmino {
   /** The total number of log entries that the original LogEntry was split into. */
   total_splits: number;
 }
-export interface LogSplitAminoType {
+export interface LogSplitAminoMsg {
   type: "/google.logging.v2.LogSplit";
   value: LogSplitAmino;
 }
@@ -692,6 +692,18 @@ export const LogEntry_LabelsEntry = {
     obj.key = message.key;
     obj.value = message.value;
     return obj;
+  },
+
+  fromAminoMsg(object: LogEntry_LabelsEntryAminoMsg): LogEntry_LabelsEntry {
+    return LogEntry_LabelsEntry.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: LogEntry_LabelsEntryProtoMsg): LogEntry_LabelsEntry {
+    return LogEntry_LabelsEntry.decode(message.value);
+  },
+
+  toProto(message: LogEntry_LabelsEntry): Uint8Array {
+    return LogEntry_LabelsEntry.encode(message).finish();
   }
 
 };
@@ -719,6 +731,8 @@ function createBaseLogEntry(): LogEntry {
 }
 
 export const LogEntry = {
+  typeUrl: "/google.logging.v2.LogEntry",
+
   encode(message: LogEntry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.logName !== "") {
       writer.uint32(98).string(message.logName);
@@ -1081,6 +1095,25 @@ export const LogEntry = {
     obj.source_location = message.sourceLocation ? LogEntrySourceLocation.toAmino(message.sourceLocation) : undefined;
     obj.split = message.split ? LogSplit.toAmino(message.split) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: LogEntryAminoMsg): LogEntry {
+    return LogEntry.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: LogEntryProtoMsg): LogEntry {
+    return LogEntry.decode(message.value);
+  },
+
+  toProto(message: LogEntry): Uint8Array {
+    return LogEntry.encode(message).finish();
+  },
+
+  toProtoMsg(message: LogEntry): LogEntryProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.LogEntry",
+      value: LogEntry.encode(message).finish()
+    };
   }
 
 };
@@ -1095,6 +1128,8 @@ function createBaseLogEntryOperation(): LogEntryOperation {
 }
 
 export const LogEntryOperation = {
+  typeUrl: "/google.logging.v2.LogEntryOperation",
+
   encode(message: LogEntryOperation, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.id !== "") {
       writer.uint32(10).string(message.id);
@@ -1210,6 +1245,25 @@ export const LogEntryOperation = {
     obj.first = message.first;
     obj.last = message.last;
     return obj;
+  },
+
+  fromAminoMsg(object: LogEntryOperationAminoMsg): LogEntryOperation {
+    return LogEntryOperation.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: LogEntryOperationProtoMsg): LogEntryOperation {
+    return LogEntryOperation.decode(message.value);
+  },
+
+  toProto(message: LogEntryOperation): Uint8Array {
+    return LogEntryOperation.encode(message).finish();
+  },
+
+  toProtoMsg(message: LogEntryOperation): LogEntryOperationProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.LogEntryOperation",
+      value: LogEntryOperation.encode(message).finish()
+    };
   }
 
 };
@@ -1223,6 +1277,8 @@ function createBaseLogEntrySourceLocation(): LogEntrySourceLocation {
 }
 
 export const LogEntrySourceLocation = {
+  typeUrl: "/google.logging.v2.LogEntrySourceLocation",
+
   encode(message: LogEntrySourceLocation, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.file !== "") {
       writer.uint32(10).string(message.file);
@@ -1323,6 +1379,25 @@ export const LogEntrySourceLocation = {
     obj.line = message.line ? message.line.toString() : undefined;
     obj.function = message.function;
     return obj;
+  },
+
+  fromAminoMsg(object: LogEntrySourceLocationAminoMsg): LogEntrySourceLocation {
+    return LogEntrySourceLocation.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: LogEntrySourceLocationProtoMsg): LogEntrySourceLocation {
+    return LogEntrySourceLocation.decode(message.value);
+  },
+
+  toProto(message: LogEntrySourceLocation): Uint8Array {
+    return LogEntrySourceLocation.encode(message).finish();
+  },
+
+  toProtoMsg(message: LogEntrySourceLocation): LogEntrySourceLocationProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.LogEntrySourceLocation",
+      value: LogEntrySourceLocation.encode(message).finish()
+    };
   }
 
 };
@@ -1336,6 +1411,8 @@ function createBaseLogSplit(): LogSplit {
 }
 
 export const LogSplit = {
+  typeUrl: "/google.logging.v2.LogSplit",
+
   encode(message: LogSplit, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.uid !== "") {
       writer.uint32(10).string(message.uid);
@@ -1436,6 +1513,25 @@ export const LogSplit = {
     obj.index = message.index;
     obj.total_splits = message.totalSplits;
     return obj;
+  },
+
+  fromAminoMsg(object: LogSplitAminoMsg): LogSplit {
+    return LogSplit.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: LogSplitProtoMsg): LogSplit {
+    return LogSplit.decode(message.value);
+  },
+
+  toProto(message: LogSplit): Uint8Array {
+    return LogSplit.encode(message).finish();
+  },
+
+  toProtoMsg(message: LogSplit): LogSplitProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.LogSplit",
+      value: LogSplit.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/logging/v2/logging.ts b/__fixtures__/outputv2/google/logging/v2/logging.ts
index 39be865d4..e07ab8e67 100644
--- a/__fixtures__/outputv2/google/logging/v2/logging.ts
+++ b/__fixtures__/outputv2/google/logging/v2/logging.ts
@@ -84,7 +84,7 @@ export interface DeleteLogRequest {
    */
   logName: string;
 }
-export interface DeleteLogRequestProtoType {
+export interface DeleteLogRequestProtoMsg {
   typeUrl: "/google.logging.v2.DeleteLogRequest";
   value: Uint8Array;
 }
@@ -108,7 +108,7 @@ export interface DeleteLogRequestAmino {
    */
   log_name: string;
 }
-export interface DeleteLogRequestAminoType {
+export interface DeleteLogRequestAminoMsg {
   type: "/google.logging.v2.DeleteLogRequest";
   value: DeleteLogRequestAmino;
 }
@@ -121,16 +121,16 @@ export interface WriteLogEntriesRequest_LabelsEntry {
   key: string;
   value: string;
 }
-export interface WriteLogEntriesRequest_LabelsEntryProtoType {
-  typeUrl: "/google.logging.v2.undefined";
+export interface WriteLogEntriesRequest_LabelsEntryProtoMsg {
+  typeUrl: string;
   value: Uint8Array;
 }
 export interface WriteLogEntriesRequest_LabelsEntryAmino {
   key: string;
   value: string;
 }
-export interface WriteLogEntriesRequest_LabelsEntryAminoType {
-  type: "/google.logging.v2.undefined";
+export interface WriteLogEntriesRequest_LabelsEntryAminoMsg {
+  type: string;
   value: WriteLogEntriesRequest_LabelsEntryAmino;
 }
 export interface WriteLogEntriesRequest_LabelsEntrySDKType {
@@ -227,7 +227,7 @@ export interface WriteLogEntriesRequest {
    */
   dryRun: boolean;
 }
-export interface WriteLogEntriesRequestProtoType {
+export interface WriteLogEntriesRequestProtoMsg {
   typeUrl: "/google.logging.v2.WriteLogEntriesRequest";
   value: Uint8Array;
 }
@@ -321,7 +321,7 @@ export interface WriteLogEntriesRequestAmino {
    */
   dry_run: boolean;
 }
-export interface WriteLogEntriesRequestAminoType {
+export interface WriteLogEntriesRequestAminoMsg {
   type: "/google.logging.v2.WriteLogEntriesRequest";
   value: WriteLogEntriesRequestAmino;
 }
@@ -340,14 +340,14 @@ export interface WriteLogEntriesRequestSDKType {
 
 /** Result returned from WriteLogEntries. */
 export interface WriteLogEntriesResponse {}
-export interface WriteLogEntriesResponseProtoType {
+export interface WriteLogEntriesResponseProtoMsg {
   typeUrl: "/google.logging.v2.WriteLogEntriesResponse";
   value: Uint8Array;
 }
 
 /** Result returned from WriteLogEntries. */
 export interface WriteLogEntriesResponseAmino {}
-export interface WriteLogEntriesResponseAminoType {
+export interface WriteLogEntriesResponseAminoMsg {
   type: "/google.logging.v2.WriteLogEntriesResponse";
   value: WriteLogEntriesResponseAmino;
 }
@@ -358,16 +358,16 @@ export interface WriteLogEntriesPartialErrors_LogEntryErrorsEntry {
   key: number;
   value?: Status;
 }
-export interface WriteLogEntriesPartialErrors_LogEntryErrorsEntryProtoType {
-  typeUrl: "/google.logging.v2.undefined";
+export interface WriteLogEntriesPartialErrors_LogEntryErrorsEntryProtoMsg {
+  typeUrl: string;
   value: Uint8Array;
 }
 export interface WriteLogEntriesPartialErrors_LogEntryErrorsEntryAmino {
   key: number;
   value?: StatusAmino;
 }
-export interface WriteLogEntriesPartialErrors_LogEntryErrorsEntryAminoType {
-  type: "/google.logging.v2.undefined";
+export interface WriteLogEntriesPartialErrors_LogEntryErrorsEntryAminoMsg {
+  type: string;
   value: WriteLogEntriesPartialErrors_LogEntryErrorsEntryAmino;
 }
 export interface WriteLogEntriesPartialErrors_LogEntryErrorsEntrySDKType {
@@ -389,7 +389,7 @@ export interface WriteLogEntriesPartialErrors {
     [key: number]: Status;
   };
 }
-export interface WriteLogEntriesPartialErrorsProtoType {
+export interface WriteLogEntriesPartialErrorsProtoMsg {
   typeUrl: "/google.logging.v2.WriteLogEntriesPartialErrors";
   value: Uint8Array;
 }
@@ -408,7 +408,7 @@ export interface WriteLogEntriesPartialErrorsAmino {
     [key: number]: StatusAmino;
   };
 }
-export interface WriteLogEntriesPartialErrorsAminoType {
+export interface WriteLogEntriesPartialErrorsAminoMsg {
   type: "/google.logging.v2.WriteLogEntriesPartialErrors";
   value: WriteLogEntriesPartialErrorsAmino;
 }
@@ -479,7 +479,7 @@ export interface ListLogEntriesRequest {
    */
   pageToken: string;
 }
-export interface ListLogEntriesRequestProtoType {
+export interface ListLogEntriesRequestProtoMsg {
   typeUrl: "/google.logging.v2.ListLogEntriesRequest";
   value: Uint8Array;
 }
@@ -543,7 +543,7 @@ export interface ListLogEntriesRequestAmino {
    */
   page_token: string;
 }
-export interface ListLogEntriesRequestAminoType {
+export interface ListLogEntriesRequestAminoMsg {
   type: "/google.logging.v2.ListLogEntriesRequest";
   value: ListLogEntriesRequestAmino;
 }
@@ -580,7 +580,7 @@ export interface ListLogEntriesResponse {
    */
   nextPageToken: string;
 }
-export interface ListLogEntriesResponseProtoType {
+export interface ListLogEntriesResponseProtoMsg {
   typeUrl: "/google.logging.v2.ListLogEntriesResponse";
   value: Uint8Array;
 }
@@ -608,7 +608,7 @@ export interface ListLogEntriesResponseAmino {
    */
   next_page_token: string;
 }
-export interface ListLogEntriesResponseAminoType {
+export interface ListLogEntriesResponseAminoMsg {
   type: "/google.logging.v2.ListLogEntriesResponse";
   value: ListLogEntriesResponseAmino;
 }
@@ -636,7 +636,7 @@ export interface ListMonitoredResourceDescriptorsRequest {
    */
   pageToken: string;
 }
-export interface ListMonitoredResourceDescriptorsRequestProtoType {
+export interface ListMonitoredResourceDescriptorsRequestProtoMsg {
   typeUrl: "/google.logging.v2.ListMonitoredResourceDescriptorsRequest";
   value: Uint8Array;
 }
@@ -658,7 +658,7 @@ export interface ListMonitoredResourceDescriptorsRequestAmino {
    */
   page_token: string;
 }
-export interface ListMonitoredResourceDescriptorsRequestAminoType {
+export interface ListMonitoredResourceDescriptorsRequestAminoMsg {
   type: "/google.logging.v2.ListMonitoredResourceDescriptorsRequest";
   value: ListMonitoredResourceDescriptorsRequestAmino;
 }
@@ -681,7 +681,7 @@ export interface ListMonitoredResourceDescriptorsResponse {
    */
   nextPageToken: string;
 }
-export interface ListMonitoredResourceDescriptorsResponseProtoType {
+export interface ListMonitoredResourceDescriptorsResponseProtoMsg {
   typeUrl: "/google.logging.v2.ListMonitoredResourceDescriptorsResponse";
   value: Uint8Array;
 }
@@ -698,7 +698,7 @@ export interface ListMonitoredResourceDescriptorsResponseAmino {
    */
   next_page_token: string;
 }
-export interface ListMonitoredResourceDescriptorsResponseAminoType {
+export interface ListMonitoredResourceDescriptorsResponseAminoMsg {
   type: "/google.logging.v2.ListMonitoredResourceDescriptorsResponse";
   value: ListMonitoredResourceDescriptorsResponseAmino;
 }
@@ -753,7 +753,7 @@ export interface ListLogsRequest {
    */
   resourceNames: string[];
 }
-export interface ListLogsRequestProtoType {
+export interface ListLogsRequestProtoMsg {
   typeUrl: "/google.logging.v2.ListLogsRequest";
   value: Uint8Array;
 }
@@ -802,7 +802,7 @@ export interface ListLogsRequestAmino {
    */
   resource_names: string[];
 }
-export interface ListLogsRequestAminoType {
+export interface ListLogsRequestAminoMsg {
   type: "/google.logging.v2.ListLogsRequest";
   value: ListLogsRequestAmino;
 }
@@ -831,7 +831,7 @@ export interface ListLogsResponse {
    */
   nextPageToken: string;
 }
-export interface ListLogsResponseProtoType {
+export interface ListLogsResponseProtoMsg {
   typeUrl: "/google.logging.v2.ListLogsResponse";
   value: Uint8Array;
 }
@@ -852,7 +852,7 @@ export interface ListLogsResponseAmino {
    */
   next_page_token: string;
 }
-export interface ListLogsResponseAminoType {
+export interface ListLogsResponseAminoMsg {
   type: "/google.logging.v2.ListLogsResponse";
   value: ListLogsResponseAmino;
 }
@@ -901,7 +901,7 @@ export interface TailLogEntriesRequest {
    */
   bufferWindow?: Duration;
 }
-export interface TailLogEntriesRequestProtoType {
+export interface TailLogEntriesRequestProtoMsg {
   typeUrl: "/google.logging.v2.TailLogEntriesRequest";
   value: Uint8Array;
 }
@@ -944,7 +944,7 @@ export interface TailLogEntriesRequestAmino {
    */
   buffer_window?: DurationAmino;
 }
-export interface TailLogEntriesRequestAminoType {
+export interface TailLogEntriesRequestAminoMsg {
   type: "/google.logging.v2.TailLogEntriesRequest";
   value: TailLogEntriesRequestAmino;
 }
@@ -974,7 +974,7 @@ export interface TailLogEntriesResponse {
    */
   suppressionInfo: TailLogEntriesResponse_SuppressionInfo[];
 }
-export interface TailLogEntriesResponseProtoType {
+export interface TailLogEntriesResponseProtoMsg {
   typeUrl: "/google.logging.v2.TailLogEntriesResponse";
   value: Uint8Array;
 }
@@ -997,7 +997,7 @@ export interface TailLogEntriesResponseAmino {
    */
   suppression_info: TailLogEntriesResponse_SuppressionInfoAmino[];
 }
-export interface TailLogEntriesResponseAminoType {
+export interface TailLogEntriesResponseAminoMsg {
   type: "/google.logging.v2.TailLogEntriesResponse";
   value: TailLogEntriesResponseAmino;
 }
@@ -1016,7 +1016,7 @@ export interface TailLogEntriesResponse_SuppressionInfo {
   /** A lower bound on the count of entries omitted due to `reason`. */
   suppressedCount: number;
 }
-export interface TailLogEntriesResponse_SuppressionInfoProtoType {
+export interface TailLogEntriesResponse_SuppressionInfoProtoMsg {
   typeUrl: "/google.logging.v2.SuppressionInfo";
   value: Uint8Array;
 }
@@ -1029,7 +1029,7 @@ export interface TailLogEntriesResponse_SuppressionInfoAmino {
   /** A lower bound on the count of entries omitted due to `reason`. */
   suppressed_count: number;
 }
-export interface TailLogEntriesResponse_SuppressionInfoAminoType {
+export interface TailLogEntriesResponse_SuppressionInfoAminoMsg {
   type: "/google.logging.v2.SuppressionInfo";
   value: TailLogEntriesResponse_SuppressionInfoAmino;
 }
@@ -1047,6 +1047,8 @@ function createBaseDeleteLogRequest(): DeleteLogRequest {
 }
 
 export const DeleteLogRequest = {
+  typeUrl: "/google.logging.v2.DeleteLogRequest",
+
   encode(message: DeleteLogRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.logName !== "") {
       writer.uint32(10).string(message.logName);
@@ -1117,6 +1119,25 @@ export const DeleteLogRequest = {
     const obj: any = {};
     obj.log_name = message.logName;
     return obj;
+  },
+
+  fromAminoMsg(object: DeleteLogRequestAminoMsg): DeleteLogRequest {
+    return DeleteLogRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: DeleteLogRequestProtoMsg): DeleteLogRequest {
+    return DeleteLogRequest.decode(message.value);
+  },
+
+  toProto(message: DeleteLogRequest): Uint8Array {
+    return DeleteLogRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: DeleteLogRequest): DeleteLogRequestProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.DeleteLogRequest",
+      value: DeleteLogRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1214,6 +1235,18 @@ export const WriteLogEntriesRequest_LabelsEntry = {
     obj.key = message.key;
     obj.value = message.value;
     return obj;
+  },
+
+  fromAminoMsg(object: WriteLogEntriesRequest_LabelsEntryAminoMsg): WriteLogEntriesRequest_LabelsEntry {
+    return WriteLogEntriesRequest_LabelsEntry.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: WriteLogEntriesRequest_LabelsEntryProtoMsg): WriteLogEntriesRequest_LabelsEntry {
+    return WriteLogEntriesRequest_LabelsEntry.decode(message.value);
+  },
+
+  toProto(message: WriteLogEntriesRequest_LabelsEntry): Uint8Array {
+    return WriteLogEntriesRequest_LabelsEntry.encode(message).finish();
   }
 
 };
@@ -1230,6 +1263,8 @@ function createBaseWriteLogEntriesRequest(): WriteLogEntriesRequest {
 }
 
 export const WriteLogEntriesRequest = {
+  typeUrl: "/google.logging.v2.WriteLogEntriesRequest",
+
   encode(message: WriteLogEntriesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.logName !== "") {
       writer.uint32(10).string(message.logName);
@@ -1442,6 +1477,25 @@ export const WriteLogEntriesRequest = {
     obj.partial_success = message.partialSuccess;
     obj.dry_run = message.dryRun;
     return obj;
+  },
+
+  fromAminoMsg(object: WriteLogEntriesRequestAminoMsg): WriteLogEntriesRequest {
+    return WriteLogEntriesRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: WriteLogEntriesRequestProtoMsg): WriteLogEntriesRequest {
+    return WriteLogEntriesRequest.decode(message.value);
+  },
+
+  toProto(message: WriteLogEntriesRequest): Uint8Array {
+    return WriteLogEntriesRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: WriteLogEntriesRequest): WriteLogEntriesRequestProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.WriteLogEntriesRequest",
+      value: WriteLogEntriesRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1451,6 +1505,8 @@ function createBaseWriteLogEntriesResponse(): WriteLogEntriesResponse {
 }
 
 export const WriteLogEntriesResponse = {
+  typeUrl: "/google.logging.v2.WriteLogEntriesResponse",
+
   encode(_: WriteLogEntriesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -1503,6 +1559,25 @@ export const WriteLogEntriesResponse = {
   toAmino(_: WriteLogEntriesResponse): WriteLogEntriesResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: WriteLogEntriesResponseAminoMsg): WriteLogEntriesResponse {
+    return WriteLogEntriesResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: WriteLogEntriesResponseProtoMsg): WriteLogEntriesResponse {
+    return WriteLogEntriesResponse.decode(message.value);
+  },
+
+  toProto(message: WriteLogEntriesResponse): Uint8Array {
+    return WriteLogEntriesResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: WriteLogEntriesResponse): WriteLogEntriesResponseProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.WriteLogEntriesResponse",
+      value: WriteLogEntriesResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1600,6 +1675,18 @@ export const WriteLogEntriesPartialErrors_LogEntryErrorsEntry = {
     obj.key = message.key;
     obj.value = message.value ? google.rpc.Status.toAmino(message.value) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: WriteLogEntriesPartialErrors_LogEntryErrorsEntryAminoMsg): WriteLogEntriesPartialErrors_LogEntryErrorsEntry {
+    return WriteLogEntriesPartialErrors_LogEntryErrorsEntry.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: WriteLogEntriesPartialErrors_LogEntryErrorsEntryProtoMsg): WriteLogEntriesPartialErrors_LogEntryErrorsEntry {
+    return WriteLogEntriesPartialErrors_LogEntryErrorsEntry.decode(message.value);
+  },
+
+  toProto(message: WriteLogEntriesPartialErrors_LogEntryErrorsEntry): Uint8Array {
+    return WriteLogEntriesPartialErrors_LogEntryErrorsEntry.encode(message).finish();
   }
 
 };
@@ -1611,6 +1698,8 @@ function createBaseWriteLogEntriesPartialErrors(): WriteLogEntriesPartialErrors
 }
 
 export const WriteLogEntriesPartialErrors = {
+  typeUrl: "/google.logging.v2.WriteLogEntriesPartialErrors",
+
   encode(message: WriteLogEntriesPartialErrors, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     Object.entries(message.logEntryErrors).forEach(([key, value]) => {
       WriteLogEntriesPartialErrors_LogEntryErrorsEntry.encode({
@@ -1732,6 +1821,25 @@ export const WriteLogEntriesPartialErrors = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: WriteLogEntriesPartialErrorsAminoMsg): WriteLogEntriesPartialErrors {
+    return WriteLogEntriesPartialErrors.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: WriteLogEntriesPartialErrorsProtoMsg): WriteLogEntriesPartialErrors {
+    return WriteLogEntriesPartialErrors.decode(message.value);
+  },
+
+  toProto(message: WriteLogEntriesPartialErrors): Uint8Array {
+    return WriteLogEntriesPartialErrors.encode(message).finish();
+  },
+
+  toProtoMsg(message: WriteLogEntriesPartialErrors): WriteLogEntriesPartialErrorsProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.WriteLogEntriesPartialErrors",
+      value: WriteLogEntriesPartialErrors.encode(message).finish()
+    };
   }
 
 };
@@ -1747,6 +1855,8 @@ function createBaseListLogEntriesRequest(): ListLogEntriesRequest {
 }
 
 export const ListLogEntriesRequest = {
+  typeUrl: "/google.logging.v2.ListLogEntriesRequest",
+
   encode(message: ListLogEntriesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.resourceNames) {
       writer.uint32(66).string(v!);
@@ -1895,6 +2005,25 @@ export const ListLogEntriesRequest = {
     obj.page_size = message.pageSize;
     obj.page_token = message.pageToken;
     return obj;
+  },
+
+  fromAminoMsg(object: ListLogEntriesRequestAminoMsg): ListLogEntriesRequest {
+    return ListLogEntriesRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ListLogEntriesRequestProtoMsg): ListLogEntriesRequest {
+    return ListLogEntriesRequest.decode(message.value);
+  },
+
+  toProto(message: ListLogEntriesRequest): Uint8Array {
+    return ListLogEntriesRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: ListLogEntriesRequest): ListLogEntriesRequestProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.ListLogEntriesRequest",
+      value: ListLogEntriesRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1907,6 +2036,8 @@ function createBaseListLogEntriesResponse(): ListLogEntriesResponse {
 }
 
 export const ListLogEntriesResponse = {
+  typeUrl: "/google.logging.v2.ListLogEntriesResponse",
+
   encode(message: ListLogEntriesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.entries) {
       LogEntry.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -2010,6 +2141,25 @@ export const ListLogEntriesResponse = {
 
     obj.next_page_token = message.nextPageToken;
     return obj;
+  },
+
+  fromAminoMsg(object: ListLogEntriesResponseAminoMsg): ListLogEntriesResponse {
+    return ListLogEntriesResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ListLogEntriesResponseProtoMsg): ListLogEntriesResponse {
+    return ListLogEntriesResponse.decode(message.value);
+  },
+
+  toProto(message: ListLogEntriesResponse): Uint8Array {
+    return ListLogEntriesResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: ListLogEntriesResponse): ListLogEntriesResponseProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.ListLogEntriesResponse",
+      value: ListLogEntriesResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2022,6 +2172,8 @@ function createBaseListMonitoredResourceDescriptorsRequest(): ListMonitoredResou
 }
 
 export const ListMonitoredResourceDescriptorsRequest = {
+  typeUrl: "/google.logging.v2.ListMonitoredResourceDescriptorsRequest",
+
   encode(message: ListMonitoredResourceDescriptorsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.pageSize !== 0) {
       writer.uint32(8).int32(message.pageSize);
@@ -2107,6 +2259,25 @@ export const ListMonitoredResourceDescriptorsRequest = {
     obj.page_size = message.pageSize;
     obj.page_token = message.pageToken;
     return obj;
+  },
+
+  fromAminoMsg(object: ListMonitoredResourceDescriptorsRequestAminoMsg): ListMonitoredResourceDescriptorsRequest {
+    return ListMonitoredResourceDescriptorsRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ListMonitoredResourceDescriptorsRequestProtoMsg): ListMonitoredResourceDescriptorsRequest {
+    return ListMonitoredResourceDescriptorsRequest.decode(message.value);
+  },
+
+  toProto(message: ListMonitoredResourceDescriptorsRequest): Uint8Array {
+    return ListMonitoredResourceDescriptorsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: ListMonitoredResourceDescriptorsRequest): ListMonitoredResourceDescriptorsRequestProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.ListMonitoredResourceDescriptorsRequest",
+      value: ListMonitoredResourceDescriptorsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2119,6 +2290,8 @@ function createBaseListMonitoredResourceDescriptorsResponse(): ListMonitoredReso
 }
 
 export const ListMonitoredResourceDescriptorsResponse = {
+  typeUrl: "/google.logging.v2.ListMonitoredResourceDescriptorsResponse",
+
   encode(message: ListMonitoredResourceDescriptorsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.resourceDescriptors) {
       MonitoredResourceDescriptor.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -2222,6 +2395,25 @@ export const ListMonitoredResourceDescriptorsResponse = {
 
     obj.next_page_token = message.nextPageToken;
     return obj;
+  },
+
+  fromAminoMsg(object: ListMonitoredResourceDescriptorsResponseAminoMsg): ListMonitoredResourceDescriptorsResponse {
+    return ListMonitoredResourceDescriptorsResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ListMonitoredResourceDescriptorsResponseProtoMsg): ListMonitoredResourceDescriptorsResponse {
+    return ListMonitoredResourceDescriptorsResponse.decode(message.value);
+  },
+
+  toProto(message: ListMonitoredResourceDescriptorsResponse): Uint8Array {
+    return ListMonitoredResourceDescriptorsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: ListMonitoredResourceDescriptorsResponse): ListMonitoredResourceDescriptorsResponseProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.ListMonitoredResourceDescriptorsResponse",
+      value: ListMonitoredResourceDescriptorsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2236,6 +2428,8 @@ function createBaseListLogsRequest(): ListLogsRequest {
 }
 
 export const ListLogsRequest = {
+  typeUrl: "/google.logging.v2.ListLogsRequest",
+
   encode(message: ListLogsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.parent !== "") {
       writer.uint32(10).string(message.parent);
@@ -2369,6 +2563,25 @@ export const ListLogsRequest = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ListLogsRequestAminoMsg): ListLogsRequest {
+    return ListLogsRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ListLogsRequestProtoMsg): ListLogsRequest {
+    return ListLogsRequest.decode(message.value);
+  },
+
+  toProto(message: ListLogsRequest): Uint8Array {
+    return ListLogsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: ListLogsRequest): ListLogsRequestProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.ListLogsRequest",
+      value: ListLogsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2381,6 +2594,8 @@ function createBaseListLogsResponse(): ListLogsResponse {
 }
 
 export const ListLogsResponse = {
+  typeUrl: "/google.logging.v2.ListLogsResponse",
+
   encode(message: ListLogsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.logNames) {
       writer.uint32(26).string(v!);
@@ -2484,6 +2699,25 @@ export const ListLogsResponse = {
 
     obj.next_page_token = message.nextPageToken;
     return obj;
+  },
+
+  fromAminoMsg(object: ListLogsResponseAminoMsg): ListLogsResponse {
+    return ListLogsResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ListLogsResponseProtoMsg): ListLogsResponse {
+    return ListLogsResponse.decode(message.value);
+  },
+
+  toProto(message: ListLogsResponse): Uint8Array {
+    return ListLogsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: ListLogsResponse): ListLogsResponseProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.ListLogsResponse",
+      value: ListLogsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2497,6 +2731,8 @@ function createBaseTailLogEntriesRequest(): TailLogEntriesRequest {
 }
 
 export const TailLogEntriesRequest = {
+  typeUrl: "/google.logging.v2.TailLogEntriesRequest",
+
   encode(message: TailLogEntriesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.resourceNames) {
       writer.uint32(10).string(v!);
@@ -2615,6 +2851,25 @@ export const TailLogEntriesRequest = {
     obj.filter = message.filter;
     obj.buffer_window = message.bufferWindow ? Duration.toAmino(message.bufferWindow) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: TailLogEntriesRequestAminoMsg): TailLogEntriesRequest {
+    return TailLogEntriesRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: TailLogEntriesRequestProtoMsg): TailLogEntriesRequest {
+    return TailLogEntriesRequest.decode(message.value);
+  },
+
+  toProto(message: TailLogEntriesRequest): Uint8Array {
+    return TailLogEntriesRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: TailLogEntriesRequest): TailLogEntriesRequestProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.TailLogEntriesRequest",
+      value: TailLogEntriesRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2627,6 +2882,8 @@ function createBaseTailLogEntriesResponse(): TailLogEntriesResponse {
 }
 
 export const TailLogEntriesResponse = {
+  typeUrl: "/google.logging.v2.TailLogEntriesResponse",
+
   encode(message: TailLogEntriesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.entries) {
       LogEntry.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -2745,6 +3002,25 @@ export const TailLogEntriesResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: TailLogEntriesResponseAminoMsg): TailLogEntriesResponse {
+    return TailLogEntriesResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: TailLogEntriesResponseProtoMsg): TailLogEntriesResponse {
+    return TailLogEntriesResponse.decode(message.value);
+  },
+
+  toProto(message: TailLogEntriesResponse): Uint8Array {
+    return TailLogEntriesResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: TailLogEntriesResponse): TailLogEntriesResponseProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.TailLogEntriesResponse",
+      value: TailLogEntriesResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2757,6 +3033,8 @@ function createBaseTailLogEntriesResponse_SuppressionInfo(): TailLogEntriesRespo
 }
 
 export const TailLogEntriesResponse_SuppressionInfo = {
+  typeUrl: "/google.logging.v2.SuppressionInfo",
+
   encode(message: TailLogEntriesResponse_SuppressionInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.reason !== 0) {
       writer.uint32(8).int32(message.reason);
@@ -2842,6 +3120,25 @@ export const TailLogEntriesResponse_SuppressionInfo = {
     obj.reason = message.reason;
     obj.suppressed_count = message.suppressedCount;
     return obj;
+  },
+
+  fromAminoMsg(object: TailLogEntriesResponse_SuppressionInfoAminoMsg): TailLogEntriesResponse_SuppressionInfo {
+    return TailLogEntriesResponse_SuppressionInfo.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: TailLogEntriesResponse_SuppressionInfoProtoMsg): TailLogEntriesResponse_SuppressionInfo {
+    return TailLogEntriesResponse_SuppressionInfo.decode(message.value);
+  },
+
+  toProto(message: TailLogEntriesResponse_SuppressionInfo): Uint8Array {
+    return TailLogEntriesResponse_SuppressionInfo.encode(message).finish();
+  },
+
+  toProtoMsg(message: TailLogEntriesResponse_SuppressionInfo): TailLogEntriesResponse_SuppressionInfoProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.SuppressionInfo",
+      value: TailLogEntriesResponse_SuppressionInfo.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/logging/v2/logging_config.ts b/__fixtures__/outputv2/google/logging/v2/logging_config.ts
index 170b7e1ab..625655dcc 100644
--- a/__fixtures__/outputv2/google/logging/v2/logging_config.ts
+++ b/__fixtures__/outputv2/google/logging/v2/logging_config.ts
@@ -279,7 +279,7 @@ export interface LogBucket {
    */
   cmekSettings?: CmekSettings;
 }
-export interface LogBucketProtoType {
+export interface LogBucketProtoMsg {
   typeUrl: "/google.logging.v2.LogBucket";
   value: Uint8Array;
 }
@@ -354,7 +354,7 @@ export interface LogBucketAmino {
    */
   cmek_settings?: CmekSettingsAmino;
 }
-export interface LogBucketAminoType {
+export interface LogBucketAminoMsg {
   type: "/google.logging.v2.LogBucket";
   value: LogBucketAmino;
 }
@@ -410,7 +410,7 @@ export interface LogView {
    */
   filter: string;
 }
-export interface LogViewProtoType {
+export interface LogViewProtoMsg {
   typeUrl: "/google.logging.v2.LogView";
   value: Uint8Array;
 }
@@ -453,7 +453,7 @@ export interface LogViewAmino {
    */
   filter: string;
 }
-export interface LogViewAminoType {
+export interface LogViewAminoMsg {
   type: "/google.logging.v2.LogView";
   value: LogViewAmino;
 }
@@ -597,7 +597,7 @@ export interface LogSink {
    */
   updateTime?: Date;
 }
-export interface LogSinkProtoType {
+export interface LogSinkProtoMsg {
   typeUrl: "/google.logging.v2.LogSink";
   value: Uint8Array;
 }
@@ -732,7 +732,7 @@ export interface LogSinkAmino {
    */
   update_time?: Date;
 }
-export interface LogSinkAminoType {
+export interface LogSinkAminoMsg {
   type: "/google.logging.v2.LogSink";
   value: LogSinkAmino;
 }
@@ -786,7 +786,7 @@ export interface BigQueryOptions {
    */
   usesTimestampColumnPartitioning: boolean;
 }
-export interface BigQueryOptionsProtoType {
+export interface BigQueryOptionsProtoMsg {
   typeUrl: "/google.logging.v2.BigQueryOptions";
   value: Uint8Array;
 }
@@ -816,7 +816,7 @@ export interface BigQueryOptionsAmino {
    */
   uses_timestamp_column_partitioning: boolean;
 }
-export interface BigQueryOptionsAminoType {
+export interface BigQueryOptionsAminoMsg {
   type: "/google.logging.v2.BigQueryOptions";
   value: BigQueryOptionsAmino;
 }
@@ -858,7 +858,7 @@ export interface ListBucketsRequest {
    */
   pageSize: number;
 }
-export interface ListBucketsRequestProtoType {
+export interface ListBucketsRequestProtoMsg {
   typeUrl: "/google.logging.v2.ListBucketsRequest";
   value: Uint8Array;
 }
@@ -894,7 +894,7 @@ export interface ListBucketsRequestAmino {
    */
   page_size: number;
 }
-export interface ListBucketsRequestAminoType {
+export interface ListBucketsRequestAminoMsg {
   type: "/google.logging.v2.ListBucketsRequest";
   value: ListBucketsRequestAmino;
 }
@@ -918,7 +918,7 @@ export interface ListBucketsResponse {
    */
   nextPageToken: string;
 }
-export interface ListBucketsResponseProtoType {
+export interface ListBucketsResponseProtoMsg {
   typeUrl: "/google.logging.v2.ListBucketsResponse";
   value: Uint8Array;
 }
@@ -935,7 +935,7 @@ export interface ListBucketsResponseAmino {
    */
   next_page_token: string;
 }
-export interface ListBucketsResponseAminoType {
+export interface ListBucketsResponseAminoMsg {
   type: "/google.logging.v2.ListBucketsResponse";
   value: ListBucketsResponseAmino;
 }
@@ -973,7 +973,7 @@ export interface CreateBucketRequest {
    */
   bucket?: LogBucket;
 }
-export interface CreateBucketRequestProtoType {
+export interface CreateBucketRequestProtoMsg {
   typeUrl: "/google.logging.v2.CreateBucketRequest";
   value: Uint8Array;
 }
@@ -1005,7 +1005,7 @@ export interface CreateBucketRequestAmino {
    */
   bucket?: LogBucketAmino;
 }
-export interface CreateBucketRequestAminoType {
+export interface CreateBucketRequestAminoMsg {
   type: "/google.logging.v2.CreateBucketRequest";
   value: CreateBucketRequestAmino;
 }
@@ -1048,7 +1048,7 @@ export interface UpdateBucketRequest {
    */
   updateMask?: FieldMask;
 }
-export interface UpdateBucketRequestProtoType {
+export interface UpdateBucketRequestProtoMsg {
   typeUrl: "/google.logging.v2.UpdateBucketRequest";
   value: Uint8Array;
 }
@@ -1084,7 +1084,7 @@ export interface UpdateBucketRequestAmino {
    */
   update_mask?: FieldMaskAmino;
 }
-export interface UpdateBucketRequestAminoType {
+export interface UpdateBucketRequestAminoMsg {
   type: "/google.logging.v2.UpdateBucketRequest";
   value: UpdateBucketRequestAmino;
 }
@@ -1112,7 +1112,7 @@ export interface GetBucketRequest {
    */
   name: string;
 }
-export interface GetBucketRequestProtoType {
+export interface GetBucketRequestProtoMsg {
   typeUrl: "/google.logging.v2.GetBucketRequest";
   value: Uint8Array;
 }
@@ -1133,7 +1133,7 @@ export interface GetBucketRequestAmino {
    */
   name: string;
 }
-export interface GetBucketRequestAminoType {
+export interface GetBucketRequestAminoMsg {
   type: "/google.logging.v2.GetBucketRequest";
   value: GetBucketRequestAmino;
 }
@@ -1159,7 +1159,7 @@ export interface DeleteBucketRequest {
    */
   name: string;
 }
-export interface DeleteBucketRequestProtoType {
+export interface DeleteBucketRequestProtoMsg {
   typeUrl: "/google.logging.v2.DeleteBucketRequest";
   value: Uint8Array;
 }
@@ -1180,7 +1180,7 @@ export interface DeleteBucketRequestAmino {
    */
   name: string;
 }
-export interface DeleteBucketRequestAminoType {
+export interface DeleteBucketRequestAminoMsg {
   type: "/google.logging.v2.DeleteBucketRequest";
   value: DeleteBucketRequestAmino;
 }
@@ -1206,7 +1206,7 @@ export interface UndeleteBucketRequest {
    */
   name: string;
 }
-export interface UndeleteBucketRequestProtoType {
+export interface UndeleteBucketRequestProtoMsg {
   typeUrl: "/google.logging.v2.UndeleteBucketRequest";
   value: Uint8Array;
 }
@@ -1227,7 +1227,7 @@ export interface UndeleteBucketRequestAmino {
    */
   name: string;
 }
-export interface UndeleteBucketRequestAminoType {
+export interface UndeleteBucketRequestAminoMsg {
   type: "/google.logging.v2.UndeleteBucketRequest";
   value: UndeleteBucketRequestAmino;
 }
@@ -1262,7 +1262,7 @@ export interface ListViewsRequest {
    */
   pageSize: number;
 }
-export interface ListViewsRequestProtoType {
+export interface ListViewsRequestProtoMsg {
   typeUrl: "/google.logging.v2.ListViewsRequest";
   value: Uint8Array;
 }
@@ -1292,7 +1292,7 @@ export interface ListViewsRequestAmino {
    */
   page_size: number;
 }
-export interface ListViewsRequestAminoType {
+export interface ListViewsRequestAminoMsg {
   type: "/google.logging.v2.ListViewsRequest";
   value: ListViewsRequestAmino;
 }
@@ -1316,7 +1316,7 @@ export interface ListViewsResponse {
    */
   nextPageToken: string;
 }
-export interface ListViewsResponseProtoType {
+export interface ListViewsResponseProtoMsg {
   typeUrl: "/google.logging.v2.ListViewsResponse";
   value: Uint8Array;
 }
@@ -1333,7 +1333,7 @@ export interface ListViewsResponseAmino {
    */
   next_page_token: string;
 }
-export interface ListViewsResponseAminoType {
+export interface ListViewsResponseAminoMsg {
   type: "/google.logging.v2.ListViewsResponse";
   value: ListViewsResponseAmino;
 }
@@ -1363,7 +1363,7 @@ export interface CreateViewRequest {
   /** Required. The new view. */
   view?: LogView;
 }
-export interface CreateViewRequestProtoType {
+export interface CreateViewRequestProtoMsg {
   typeUrl: "/google.logging.v2.CreateViewRequest";
   value: Uint8Array;
 }
@@ -1387,7 +1387,7 @@ export interface CreateViewRequestAmino {
   /** Required. The new view. */
   view?: LogViewAmino;
 }
-export interface CreateViewRequestAminoType {
+export interface CreateViewRequestAminoMsg {
   type: "/google.logging.v2.CreateViewRequest";
   value: CreateViewRequestAmino;
 }
@@ -1427,7 +1427,7 @@ export interface UpdateViewRequest {
    */
   updateMask?: FieldMask;
 }
-export interface UpdateViewRequestProtoType {
+export interface UpdateViewRequestProtoMsg {
   typeUrl: "/google.logging.v2.UpdateViewRequest";
   value: Uint8Array;
 }
@@ -1460,7 +1460,7 @@ export interface UpdateViewRequestAmino {
    */
   update_mask?: FieldMaskAmino;
 }
-export interface UpdateViewRequestAminoType {
+export interface UpdateViewRequestAminoMsg {
   type: "/google.logging.v2.UpdateViewRequest";
   value: UpdateViewRequestAmino;
 }
@@ -1485,7 +1485,7 @@ export interface GetViewRequest {
    */
   name: string;
 }
-export interface GetViewRequestProtoType {
+export interface GetViewRequestProtoMsg {
   typeUrl: "/google.logging.v2.GetViewRequest";
   value: Uint8Array;
 }
@@ -1503,7 +1503,7 @@ export interface GetViewRequestAmino {
    */
   name: string;
 }
-export interface GetViewRequestAminoType {
+export interface GetViewRequestAminoMsg {
   type: "/google.logging.v2.GetViewRequest";
   value: GetViewRequestAmino;
 }
@@ -1526,7 +1526,7 @@ export interface DeleteViewRequest {
    */
   name: string;
 }
-export interface DeleteViewRequestProtoType {
+export interface DeleteViewRequestProtoMsg {
   typeUrl: "/google.logging.v2.DeleteViewRequest";
   value: Uint8Array;
 }
@@ -1544,7 +1544,7 @@ export interface DeleteViewRequestAmino {
    */
   name: string;
 }
-export interface DeleteViewRequestAminoType {
+export interface DeleteViewRequestAminoMsg {
   type: "/google.logging.v2.DeleteViewRequest";
   value: DeleteViewRequestAmino;
 }
@@ -1581,7 +1581,7 @@ export interface ListSinksRequest {
    */
   pageSize: number;
 }
-export interface ListSinksRequestProtoType {
+export interface ListSinksRequestProtoMsg {
   typeUrl: "/google.logging.v2.ListSinksRequest";
   value: Uint8Array;
 }
@@ -1613,7 +1613,7 @@ export interface ListSinksRequestAmino {
    */
   page_size: number;
 }
-export interface ListSinksRequestAminoType {
+export interface ListSinksRequestAminoMsg {
   type: "/google.logging.v2.ListSinksRequest";
   value: ListSinksRequestAmino;
 }
@@ -1637,7 +1637,7 @@ export interface ListSinksResponse {
    */
   nextPageToken: string;
 }
-export interface ListSinksResponseProtoType {
+export interface ListSinksResponseProtoMsg {
   typeUrl: "/google.logging.v2.ListSinksResponse";
   value: Uint8Array;
 }
@@ -1654,7 +1654,7 @@ export interface ListSinksResponseAmino {
    */
   next_page_token: string;
 }
-export interface ListSinksResponseAminoType {
+export interface ListSinksResponseAminoMsg {
   type: "/google.logging.v2.ListSinksResponse";
   value: ListSinksResponseAmino;
 }
@@ -1681,7 +1681,7 @@ export interface GetSinkRequest {
    */
   sinkName: string;
 }
-export interface GetSinkRequestProtoType {
+export interface GetSinkRequestProtoMsg {
   typeUrl: "/google.logging.v2.GetSinkRequest";
   value: Uint8Array;
 }
@@ -1702,7 +1702,7 @@ export interface GetSinkRequestAmino {
    */
   sink_name: string;
 }
-export interface GetSinkRequestAminoType {
+export interface GetSinkRequestAminoMsg {
   type: "/google.logging.v2.GetSinkRequest";
   value: GetSinkRequestAmino;
 }
@@ -1750,7 +1750,7 @@ export interface CreateSinkRequest {
    */
   uniqueWriterIdentity: boolean;
 }
-export interface CreateSinkRequestProtoType {
+export interface CreateSinkRequestProtoMsg {
   typeUrl: "/google.logging.v2.CreateSinkRequest";
   value: Uint8Array;
 }
@@ -1793,7 +1793,7 @@ export interface CreateSinkRequestAmino {
    */
   unique_writer_identity: boolean;
 }
-export interface CreateSinkRequestAminoType {
+export interface CreateSinkRequestAminoMsg {
   type: "/google.logging.v2.CreateSinkRequest";
   value: CreateSinkRequestAmino;
 }
@@ -1863,7 +1863,7 @@ export interface UpdateSinkRequest {
    */
   updateMask?: FieldMask;
 }
-export interface UpdateSinkRequestProtoType {
+export interface UpdateSinkRequestProtoMsg {
   typeUrl: "/google.logging.v2.UpdateSinkRequest";
   value: Uint8Array;
 }
@@ -1926,7 +1926,7 @@ export interface UpdateSinkRequestAmino {
    */
   update_mask?: FieldMaskAmino;
 }
-export interface UpdateSinkRequestAminoType {
+export interface UpdateSinkRequestAminoMsg {
   type: "/google.logging.v2.UpdateSinkRequest";
   value: UpdateSinkRequestAmino;
 }
@@ -1956,7 +1956,7 @@ export interface DeleteSinkRequest {
    */
   sinkName: string;
 }
-export interface DeleteSinkRequestProtoType {
+export interface DeleteSinkRequestProtoMsg {
   typeUrl: "/google.logging.v2.DeleteSinkRequest";
   value: Uint8Array;
 }
@@ -1978,7 +1978,7 @@ export interface DeleteSinkRequestAmino {
    */
   sink_name: string;
 }
-export interface DeleteSinkRequestAminoType {
+export interface DeleteSinkRequestAminoMsg {
   type: "/google.logging.v2.DeleteSinkRequest";
   value: DeleteSinkRequestAmino;
 }
@@ -2043,7 +2043,7 @@ export interface LogExclusion {
    */
   updateTime?: Date;
 }
-export interface LogExclusionProtoType {
+export interface LogExclusionProtoMsg {
   typeUrl: "/google.logging.v2.LogExclusion";
   value: Uint8Array;
 }
@@ -2103,7 +2103,7 @@ export interface LogExclusionAmino {
    */
   update_time?: Date;
 }
-export interface LogExclusionAminoType {
+export interface LogExclusionAminoMsg {
   type: "/google.logging.v2.LogExclusion";
   value: LogExclusionAmino;
 }
@@ -2151,7 +2151,7 @@ export interface ListExclusionsRequest {
    */
   pageSize: number;
 }
-export interface ListExclusionsRequestProtoType {
+export interface ListExclusionsRequestProtoMsg {
   typeUrl: "/google.logging.v2.ListExclusionsRequest";
   value: Uint8Array;
 }
@@ -2183,7 +2183,7 @@ export interface ListExclusionsRequestAmino {
    */
   page_size: number;
 }
-export interface ListExclusionsRequestAminoType {
+export interface ListExclusionsRequestAminoMsg {
   type: "/google.logging.v2.ListExclusionsRequest";
   value: ListExclusionsRequestAmino;
 }
@@ -2207,7 +2207,7 @@ export interface ListExclusionsResponse {
    */
   nextPageToken: string;
 }
-export interface ListExclusionsResponseProtoType {
+export interface ListExclusionsResponseProtoMsg {
   typeUrl: "/google.logging.v2.ListExclusionsResponse";
   value: Uint8Array;
 }
@@ -2224,7 +2224,7 @@ export interface ListExclusionsResponseAmino {
    */
   next_page_token: string;
 }
-export interface ListExclusionsResponseAminoType {
+export interface ListExclusionsResponseAminoMsg {
   type: "/google.logging.v2.ListExclusionsResponse";
   value: ListExclusionsResponseAmino;
 }
@@ -2251,7 +2251,7 @@ export interface GetExclusionRequest {
    */
   name: string;
 }
-export interface GetExclusionRequestProtoType {
+export interface GetExclusionRequestProtoMsg {
   typeUrl: "/google.logging.v2.GetExclusionRequest";
   value: Uint8Array;
 }
@@ -2272,7 +2272,7 @@ export interface GetExclusionRequestAmino {
    */
   name: string;
 }
-export interface GetExclusionRequestAminoType {
+export interface GetExclusionRequestAminoMsg {
   type: "/google.logging.v2.GetExclusionRequest";
   value: GetExclusionRequestAmino;
 }
@@ -2305,7 +2305,7 @@ export interface CreateExclusionRequest {
    */
   exclusion?: LogExclusion;
 }
-export interface CreateExclusionRequestProtoType {
+export interface CreateExclusionRequestProtoMsg {
   typeUrl: "/google.logging.v2.CreateExclusionRequest";
   value: Uint8Array;
 }
@@ -2333,7 +2333,7 @@ export interface CreateExclusionRequestAmino {
    */
   exclusion?: LogExclusionAmino;
 }
-export interface CreateExclusionRequestAminoType {
+export interface CreateExclusionRequestAminoMsg {
   type: "/google.logging.v2.CreateExclusionRequest";
   value: CreateExclusionRequestAmino;
 }
@@ -2377,7 +2377,7 @@ export interface UpdateExclusionRequest {
    */
   updateMask?: FieldMask;
 }
-export interface UpdateExclusionRequestProtoType {
+export interface UpdateExclusionRequestProtoMsg {
   typeUrl: "/google.logging.v2.UpdateExclusionRequest";
   value: Uint8Array;
 }
@@ -2415,7 +2415,7 @@ export interface UpdateExclusionRequestAmino {
    */
   update_mask?: FieldMaskAmino;
 }
-export interface UpdateExclusionRequestAminoType {
+export interface UpdateExclusionRequestAminoMsg {
   type: "/google.logging.v2.UpdateExclusionRequest";
   value: UpdateExclusionRequestAmino;
 }
@@ -2443,7 +2443,7 @@ export interface DeleteExclusionRequest {
    */
   name: string;
 }
-export interface DeleteExclusionRequestProtoType {
+export interface DeleteExclusionRequestProtoMsg {
   typeUrl: "/google.logging.v2.DeleteExclusionRequest";
   value: Uint8Array;
 }
@@ -2464,7 +2464,7 @@ export interface DeleteExclusionRequestAmino {
    */
   name: string;
 }
-export interface DeleteExclusionRequestAminoType {
+export interface DeleteExclusionRequestAminoMsg {
   type: "/google.logging.v2.DeleteExclusionRequest";
   value: DeleteExclusionRequestAmino;
 }
@@ -2502,7 +2502,7 @@ export interface GetCmekSettingsRequest {
    */
   name: string;
 }
-export interface GetCmekSettingsRequestProtoType {
+export interface GetCmekSettingsRequestProtoMsg {
   typeUrl: "/google.logging.v2.GetCmekSettingsRequest";
   value: Uint8Array;
 }
@@ -2535,7 +2535,7 @@ export interface GetCmekSettingsRequestAmino {
    */
   name: string;
 }
-export interface GetCmekSettingsRequestAminoType {
+export interface GetCmekSettingsRequestAminoMsg {
   type: "/google.logging.v2.GetCmekSettingsRequest";
   value: GetCmekSettingsRequestAmino;
 }
@@ -2599,7 +2599,7 @@ export interface UpdateCmekSettingsRequest {
    */
   updateMask?: FieldMask;
 }
-export interface UpdateCmekSettingsRequestProtoType {
+export interface UpdateCmekSettingsRequestProtoMsg {
   typeUrl: "/google.logging.v2.UpdateCmekSettingsRequest";
   value: Uint8Array;
 }
@@ -2651,7 +2651,7 @@ export interface UpdateCmekSettingsRequestAmino {
    */
   update_mask?: FieldMaskAmino;
 }
-export interface UpdateCmekSettingsRequestAminoType {
+export interface UpdateCmekSettingsRequestAminoMsg {
   type: "/google.logging.v2.UpdateCmekSettingsRequest";
   value: UpdateCmekSettingsRequestAmino;
 }
@@ -2734,7 +2734,7 @@ export interface CmekSettings {
    */
   serviceAccountId: string;
 }
-export interface CmekSettingsProtoType {
+export interface CmekSettingsProtoMsg {
   typeUrl: "/google.logging.v2.CmekSettings";
   value: Uint8Array;
 }
@@ -2803,7 +2803,7 @@ export interface CmekSettingsAmino {
    */
   service_account_id: string;
 }
-export interface CmekSettingsAminoType {
+export interface CmekSettingsAminoMsg {
   type: "/google.logging.v2.CmekSettings";
   value: CmekSettingsAmino;
 }
@@ -2854,7 +2854,7 @@ export interface GetSettingsRequest {
    */
   name: string;
 }
-export interface GetSettingsRequestProtoType {
+export interface GetSettingsRequestProtoMsg {
   typeUrl: "/google.logging.v2.GetSettingsRequest";
   value: Uint8Array;
 }
@@ -2887,7 +2887,7 @@ export interface GetSettingsRequestAmino {
    */
   name: string;
 }
-export interface GetSettingsRequestAminoType {
+export interface GetSettingsRequestAminoMsg {
   type: "/google.logging.v2.GetSettingsRequest";
   value: GetSettingsRequestAmino;
 }
@@ -2948,7 +2948,7 @@ export interface UpdateSettingsRequest {
    */
   updateMask?: FieldMask;
 }
-export interface UpdateSettingsRequestProtoType {
+export interface UpdateSettingsRequestProtoMsg {
   typeUrl: "/google.logging.v2.UpdateSettingsRequest";
   value: Uint8Array;
 }
@@ -2997,7 +2997,7 @@ export interface UpdateSettingsRequestAmino {
    */
   update_mask?: FieldMaskAmino;
 }
-export interface UpdateSettingsRequestAminoType {
+export interface UpdateSettingsRequestAminoMsg {
   type: "/google.logging.v2.UpdateSettingsRequest";
   value: UpdateSettingsRequestAmino;
 }
@@ -3086,7 +3086,7 @@ export interface Settings {
    */
   disableDefaultSink: boolean;
 }
-export interface SettingsProtoType {
+export interface SettingsProtoMsg {
   typeUrl: "/google.logging.v2.Settings";
   value: Uint8Array;
 }
@@ -3161,7 +3161,7 @@ export interface SettingsAmino {
    */
   disable_default_sink: boolean;
 }
-export interface SettingsAminoType {
+export interface SettingsAminoMsg {
   type: "/google.logging.v2.Settings";
   value: SettingsAmino;
 }
@@ -3198,7 +3198,7 @@ export interface CopyLogEntriesRequest {
   /** Required. Destination to which to copy log entries. */
   destination: string;
 }
-export interface CopyLogEntriesRequestProtoType {
+export interface CopyLogEntriesRequestProtoMsg {
   typeUrl: "/google.logging.v2.CopyLogEntriesRequest";
   value: Uint8Array;
 }
@@ -3223,7 +3223,7 @@ export interface CopyLogEntriesRequestAmino {
   /** Required. Destination to which to copy log entries. */
   destination: string;
 }
-export interface CopyLogEntriesRequestAminoType {
+export interface CopyLogEntriesRequestAminoMsg {
   type: "/google.logging.v2.CopyLogEntriesRequest";
   value: CopyLogEntriesRequestAmino;
 }
@@ -3266,7 +3266,7 @@ export interface CopyLogEntriesMetadata {
    */
   writerIdentity: string;
 }
-export interface CopyLogEntriesMetadataProtoType {
+export interface CopyLogEntriesMetadataProtoMsg {
   typeUrl: "/google.logging.v2.CopyLogEntriesMetadata";
   value: Uint8Array;
 }
@@ -3302,7 +3302,7 @@ export interface CopyLogEntriesMetadataAmino {
    */
   writer_identity: string;
 }
-export interface CopyLogEntriesMetadataAminoType {
+export interface CopyLogEntriesMetadataAminoMsg {
   type: "/google.logging.v2.CopyLogEntriesMetadata";
   value: CopyLogEntriesMetadataAmino;
 }
@@ -3323,7 +3323,7 @@ export interface CopyLogEntriesResponse {
   /** Number of log entries copied. */
   logEntriesCopiedCount: Long;
 }
-export interface CopyLogEntriesResponseProtoType {
+export interface CopyLogEntriesResponseProtoMsg {
   typeUrl: "/google.logging.v2.CopyLogEntriesResponse";
   value: Uint8Array;
 }
@@ -3333,7 +3333,7 @@ export interface CopyLogEntriesResponseAmino {
   /** Number of log entries copied. */
   log_entries_copied_count: string;
 }
-export interface CopyLogEntriesResponseAminoType {
+export interface CopyLogEntriesResponseAminoMsg {
   type: "/google.logging.v2.CopyLogEntriesResponse";
   value: CopyLogEntriesResponseAmino;
 }
@@ -3358,6 +3358,8 @@ function createBaseLogBucket(): LogBucket {
 }
 
 export const LogBucket = {
+  typeUrl: "/google.logging.v2.LogBucket",
+
   encode(message: LogBucket, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -3566,6 +3568,25 @@ export const LogBucket = {
 
     obj.cmek_settings = message.cmekSettings ? CmekSettings.toAmino(message.cmekSettings) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: LogBucketAminoMsg): LogBucket {
+    return LogBucket.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: LogBucketProtoMsg): LogBucket {
+    return LogBucket.decode(message.value);
+  },
+
+  toProto(message: LogBucket): Uint8Array {
+    return LogBucket.encode(message).finish();
+  },
+
+  toProtoMsg(message: LogBucket): LogBucketProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.LogBucket",
+      value: LogBucket.encode(message).finish()
+    };
   }
 
 };
@@ -3581,6 +3602,8 @@ function createBaseLogView(): LogView {
 }
 
 export const LogView = {
+  typeUrl: "/google.logging.v2.LogView",
+
   encode(message: LogView, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -3711,6 +3734,25 @@ export const LogView = {
     obj.update_time = message.updateTime ? Timestamp.toAmino(message.updateTime) : undefined;
     obj.filter = message.filter;
     return obj;
+  },
+
+  fromAminoMsg(object: LogViewAminoMsg): LogView {
+    return LogView.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: LogViewProtoMsg): LogView {
+    return LogView.decode(message.value);
+  },
+
+  toProto(message: LogView): Uint8Array {
+    return LogView.encode(message).finish();
+  },
+
+  toProtoMsg(message: LogView): LogViewProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.LogView",
+      value: LogView.encode(message).finish()
+    };
   }
 
 };
@@ -3733,6 +3775,8 @@ function createBaseLogSink(): LogSink {
 }
 
 export const LogSink = {
+  typeUrl: "/google.logging.v2.LogSink",
+
   encode(message: LogSink, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -3986,6 +4030,25 @@ export const LogSink = {
     obj.create_time = message.createTime ? Timestamp.toAmino(message.createTime) : undefined;
     obj.update_time = message.updateTime ? Timestamp.toAmino(message.updateTime) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: LogSinkAminoMsg): LogSink {
+    return LogSink.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: LogSinkProtoMsg): LogSink {
+    return LogSink.decode(message.value);
+  },
+
+  toProto(message: LogSink): Uint8Array {
+    return LogSink.encode(message).finish();
+  },
+
+  toProtoMsg(message: LogSink): LogSinkProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.LogSink",
+      value: LogSink.encode(message).finish()
+    };
   }
 
 };
@@ -3998,6 +4061,8 @@ function createBaseBigQueryOptions(): BigQueryOptions {
 }
 
 export const BigQueryOptions = {
+  typeUrl: "/google.logging.v2.BigQueryOptions",
+
   encode(message: BigQueryOptions, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.usePartitionedTables === true) {
       writer.uint32(8).bool(message.usePartitionedTables);
@@ -4083,6 +4148,25 @@ export const BigQueryOptions = {
     obj.use_partitioned_tables = message.usePartitionedTables;
     obj.uses_timestamp_column_partitioning = message.usesTimestampColumnPartitioning;
     return obj;
+  },
+
+  fromAminoMsg(object: BigQueryOptionsAminoMsg): BigQueryOptions {
+    return BigQueryOptions.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: BigQueryOptionsProtoMsg): BigQueryOptions {
+    return BigQueryOptions.decode(message.value);
+  },
+
+  toProto(message: BigQueryOptions): Uint8Array {
+    return BigQueryOptions.encode(message).finish();
+  },
+
+  toProtoMsg(message: BigQueryOptions): BigQueryOptionsProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.BigQueryOptions",
+      value: BigQueryOptions.encode(message).finish()
+    };
   }
 
 };
@@ -4096,6 +4180,8 @@ function createBaseListBucketsRequest(): ListBucketsRequest {
 }
 
 export const ListBucketsRequest = {
+  typeUrl: "/google.logging.v2.ListBucketsRequest",
+
   encode(message: ListBucketsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.parent !== "") {
       writer.uint32(10).string(message.parent);
@@ -4196,6 +4282,25 @@ export const ListBucketsRequest = {
     obj.page_token = message.pageToken;
     obj.page_size = message.pageSize;
     return obj;
+  },
+
+  fromAminoMsg(object: ListBucketsRequestAminoMsg): ListBucketsRequest {
+    return ListBucketsRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ListBucketsRequestProtoMsg): ListBucketsRequest {
+    return ListBucketsRequest.decode(message.value);
+  },
+
+  toProto(message: ListBucketsRequest): Uint8Array {
+    return ListBucketsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: ListBucketsRequest): ListBucketsRequestProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.ListBucketsRequest",
+      value: ListBucketsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -4208,6 +4313,8 @@ function createBaseListBucketsResponse(): ListBucketsResponse {
 }
 
 export const ListBucketsResponse = {
+  typeUrl: "/google.logging.v2.ListBucketsResponse",
+
   encode(message: ListBucketsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.buckets) {
       LogBucket.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -4311,6 +4418,25 @@ export const ListBucketsResponse = {
 
     obj.next_page_token = message.nextPageToken;
     return obj;
+  },
+
+  fromAminoMsg(object: ListBucketsResponseAminoMsg): ListBucketsResponse {
+    return ListBucketsResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ListBucketsResponseProtoMsg): ListBucketsResponse {
+    return ListBucketsResponse.decode(message.value);
+  },
+
+  toProto(message: ListBucketsResponse): Uint8Array {
+    return ListBucketsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: ListBucketsResponse): ListBucketsResponseProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.ListBucketsResponse",
+      value: ListBucketsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -4324,6 +4450,8 @@ function createBaseCreateBucketRequest(): CreateBucketRequest {
 }
 
 export const CreateBucketRequest = {
+  typeUrl: "/google.logging.v2.CreateBucketRequest",
+
   encode(message: CreateBucketRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.parent !== "") {
       writer.uint32(10).string(message.parent);
@@ -4424,6 +4552,25 @@ export const CreateBucketRequest = {
     obj.bucket_id = message.bucketId;
     obj.bucket = message.bucket ? LogBucket.toAmino(message.bucket) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: CreateBucketRequestAminoMsg): CreateBucketRequest {
+    return CreateBucketRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: CreateBucketRequestProtoMsg): CreateBucketRequest {
+    return CreateBucketRequest.decode(message.value);
+  },
+
+  toProto(message: CreateBucketRequest): Uint8Array {
+    return CreateBucketRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: CreateBucketRequest): CreateBucketRequestProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.CreateBucketRequest",
+      value: CreateBucketRequest.encode(message).finish()
+    };
   }
 
 };
@@ -4437,6 +4584,8 @@ function createBaseUpdateBucketRequest(): UpdateBucketRequest {
 }
 
 export const UpdateBucketRequest = {
+  typeUrl: "/google.logging.v2.UpdateBucketRequest",
+
   encode(message: UpdateBucketRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -4537,6 +4686,25 @@ export const UpdateBucketRequest = {
     obj.bucket = message.bucket ? LogBucket.toAmino(message.bucket) : undefined;
     obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: UpdateBucketRequestAminoMsg): UpdateBucketRequest {
+    return UpdateBucketRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: UpdateBucketRequestProtoMsg): UpdateBucketRequest {
+    return UpdateBucketRequest.decode(message.value);
+  },
+
+  toProto(message: UpdateBucketRequest): Uint8Array {
+    return UpdateBucketRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: UpdateBucketRequest): UpdateBucketRequestProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.UpdateBucketRequest",
+      value: UpdateBucketRequest.encode(message).finish()
+    };
   }
 
 };
@@ -4548,6 +4716,8 @@ function createBaseGetBucketRequest(): GetBucketRequest {
 }
 
 export const GetBucketRequest = {
+  typeUrl: "/google.logging.v2.GetBucketRequest",
+
   encode(message: GetBucketRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -4618,6 +4788,25 @@ export const GetBucketRequest = {
     const obj: any = {};
     obj.name = message.name;
     return obj;
+  },
+
+  fromAminoMsg(object: GetBucketRequestAminoMsg): GetBucketRequest {
+    return GetBucketRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: GetBucketRequestProtoMsg): GetBucketRequest {
+    return GetBucketRequest.decode(message.value);
+  },
+
+  toProto(message: GetBucketRequest): Uint8Array {
+    return GetBucketRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: GetBucketRequest): GetBucketRequestProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.GetBucketRequest",
+      value: GetBucketRequest.encode(message).finish()
+    };
   }
 
 };
@@ -4629,6 +4818,8 @@ function createBaseDeleteBucketRequest(): DeleteBucketRequest {
 }
 
 export const DeleteBucketRequest = {
+  typeUrl: "/google.logging.v2.DeleteBucketRequest",
+
   encode(message: DeleteBucketRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -4699,6 +4890,25 @@ export const DeleteBucketRequest = {
     const obj: any = {};
     obj.name = message.name;
     return obj;
+  },
+
+  fromAminoMsg(object: DeleteBucketRequestAminoMsg): DeleteBucketRequest {
+    return DeleteBucketRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: DeleteBucketRequestProtoMsg): DeleteBucketRequest {
+    return DeleteBucketRequest.decode(message.value);
+  },
+
+  toProto(message: DeleteBucketRequest): Uint8Array {
+    return DeleteBucketRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: DeleteBucketRequest): DeleteBucketRequestProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.DeleteBucketRequest",
+      value: DeleteBucketRequest.encode(message).finish()
+    };
   }
 
 };
@@ -4710,6 +4920,8 @@ function createBaseUndeleteBucketRequest(): UndeleteBucketRequest {
 }
 
 export const UndeleteBucketRequest = {
+  typeUrl: "/google.logging.v2.UndeleteBucketRequest",
+
   encode(message: UndeleteBucketRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -4780,6 +4992,25 @@ export const UndeleteBucketRequest = {
     const obj: any = {};
     obj.name = message.name;
     return obj;
+  },
+
+  fromAminoMsg(object: UndeleteBucketRequestAminoMsg): UndeleteBucketRequest {
+    return UndeleteBucketRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: UndeleteBucketRequestProtoMsg): UndeleteBucketRequest {
+    return UndeleteBucketRequest.decode(message.value);
+  },
+
+  toProto(message: UndeleteBucketRequest): Uint8Array {
+    return UndeleteBucketRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: UndeleteBucketRequest): UndeleteBucketRequestProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.UndeleteBucketRequest",
+      value: UndeleteBucketRequest.encode(message).finish()
+    };
   }
 
 };
@@ -4793,6 +5024,8 @@ function createBaseListViewsRequest(): ListViewsRequest {
 }
 
 export const ListViewsRequest = {
+  typeUrl: "/google.logging.v2.ListViewsRequest",
+
   encode(message: ListViewsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.parent !== "") {
       writer.uint32(10).string(message.parent);
@@ -4893,6 +5126,25 @@ export const ListViewsRequest = {
     obj.page_token = message.pageToken;
     obj.page_size = message.pageSize;
     return obj;
+  },
+
+  fromAminoMsg(object: ListViewsRequestAminoMsg): ListViewsRequest {
+    return ListViewsRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ListViewsRequestProtoMsg): ListViewsRequest {
+    return ListViewsRequest.decode(message.value);
+  },
+
+  toProto(message: ListViewsRequest): Uint8Array {
+    return ListViewsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: ListViewsRequest): ListViewsRequestProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.ListViewsRequest",
+      value: ListViewsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -4905,6 +5157,8 @@ function createBaseListViewsResponse(): ListViewsResponse {
 }
 
 export const ListViewsResponse = {
+  typeUrl: "/google.logging.v2.ListViewsResponse",
+
   encode(message: ListViewsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.views) {
       LogView.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -5008,6 +5262,25 @@ export const ListViewsResponse = {
 
     obj.next_page_token = message.nextPageToken;
     return obj;
+  },
+
+  fromAminoMsg(object: ListViewsResponseAminoMsg): ListViewsResponse {
+    return ListViewsResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ListViewsResponseProtoMsg): ListViewsResponse {
+    return ListViewsResponse.decode(message.value);
+  },
+
+  toProto(message: ListViewsResponse): Uint8Array {
+    return ListViewsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: ListViewsResponse): ListViewsResponseProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.ListViewsResponse",
+      value: ListViewsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -5021,6 +5294,8 @@ function createBaseCreateViewRequest(): CreateViewRequest {
 }
 
 export const CreateViewRequest = {
+  typeUrl: "/google.logging.v2.CreateViewRequest",
+
   encode(message: CreateViewRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.parent !== "") {
       writer.uint32(10).string(message.parent);
@@ -5121,6 +5396,25 @@ export const CreateViewRequest = {
     obj.view_id = message.viewId;
     obj.view = message.view ? LogView.toAmino(message.view) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: CreateViewRequestAminoMsg): CreateViewRequest {
+    return CreateViewRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: CreateViewRequestProtoMsg): CreateViewRequest {
+    return CreateViewRequest.decode(message.value);
+  },
+
+  toProto(message: CreateViewRequest): Uint8Array {
+    return CreateViewRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: CreateViewRequest): CreateViewRequestProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.CreateViewRequest",
+      value: CreateViewRequest.encode(message).finish()
+    };
   }
 
 };
@@ -5134,6 +5428,8 @@ function createBaseUpdateViewRequest(): UpdateViewRequest {
 }
 
 export const UpdateViewRequest = {
+  typeUrl: "/google.logging.v2.UpdateViewRequest",
+
   encode(message: UpdateViewRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -5234,6 +5530,25 @@ export const UpdateViewRequest = {
     obj.view = message.view ? LogView.toAmino(message.view) : undefined;
     obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: UpdateViewRequestAminoMsg): UpdateViewRequest {
+    return UpdateViewRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: UpdateViewRequestProtoMsg): UpdateViewRequest {
+    return UpdateViewRequest.decode(message.value);
+  },
+
+  toProto(message: UpdateViewRequest): Uint8Array {
+    return UpdateViewRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: UpdateViewRequest): UpdateViewRequestProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.UpdateViewRequest",
+      value: UpdateViewRequest.encode(message).finish()
+    };
   }
 
 };
@@ -5245,6 +5560,8 @@ function createBaseGetViewRequest(): GetViewRequest {
 }
 
 export const GetViewRequest = {
+  typeUrl: "/google.logging.v2.GetViewRequest",
+
   encode(message: GetViewRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -5315,6 +5632,25 @@ export const GetViewRequest = {
     const obj: any = {};
     obj.name = message.name;
     return obj;
+  },
+
+  fromAminoMsg(object: GetViewRequestAminoMsg): GetViewRequest {
+    return GetViewRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: GetViewRequestProtoMsg): GetViewRequest {
+    return GetViewRequest.decode(message.value);
+  },
+
+  toProto(message: GetViewRequest): Uint8Array {
+    return GetViewRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: GetViewRequest): GetViewRequestProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.GetViewRequest",
+      value: GetViewRequest.encode(message).finish()
+    };
   }
 
 };
@@ -5326,6 +5662,8 @@ function createBaseDeleteViewRequest(): DeleteViewRequest {
 }
 
 export const DeleteViewRequest = {
+  typeUrl: "/google.logging.v2.DeleteViewRequest",
+
   encode(message: DeleteViewRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -5396,6 +5734,25 @@ export const DeleteViewRequest = {
     const obj: any = {};
     obj.name = message.name;
     return obj;
+  },
+
+  fromAminoMsg(object: DeleteViewRequestAminoMsg): DeleteViewRequest {
+    return DeleteViewRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: DeleteViewRequestProtoMsg): DeleteViewRequest {
+    return DeleteViewRequest.decode(message.value);
+  },
+
+  toProto(message: DeleteViewRequest): Uint8Array {
+    return DeleteViewRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: DeleteViewRequest): DeleteViewRequestProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.DeleteViewRequest",
+      value: DeleteViewRequest.encode(message).finish()
+    };
   }
 
 };
@@ -5409,6 +5766,8 @@ function createBaseListSinksRequest(): ListSinksRequest {
 }
 
 export const ListSinksRequest = {
+  typeUrl: "/google.logging.v2.ListSinksRequest",
+
   encode(message: ListSinksRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.parent !== "") {
       writer.uint32(10).string(message.parent);
@@ -5509,6 +5868,25 @@ export const ListSinksRequest = {
     obj.page_token = message.pageToken;
     obj.page_size = message.pageSize;
     return obj;
+  },
+
+  fromAminoMsg(object: ListSinksRequestAminoMsg): ListSinksRequest {
+    return ListSinksRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ListSinksRequestProtoMsg): ListSinksRequest {
+    return ListSinksRequest.decode(message.value);
+  },
+
+  toProto(message: ListSinksRequest): Uint8Array {
+    return ListSinksRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: ListSinksRequest): ListSinksRequestProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.ListSinksRequest",
+      value: ListSinksRequest.encode(message).finish()
+    };
   }
 
 };
@@ -5521,6 +5899,8 @@ function createBaseListSinksResponse(): ListSinksResponse {
 }
 
 export const ListSinksResponse = {
+  typeUrl: "/google.logging.v2.ListSinksResponse",
+
   encode(message: ListSinksResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.sinks) {
       LogSink.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -5624,6 +6004,25 @@ export const ListSinksResponse = {
 
     obj.next_page_token = message.nextPageToken;
     return obj;
+  },
+
+  fromAminoMsg(object: ListSinksResponseAminoMsg): ListSinksResponse {
+    return ListSinksResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ListSinksResponseProtoMsg): ListSinksResponse {
+    return ListSinksResponse.decode(message.value);
+  },
+
+  toProto(message: ListSinksResponse): Uint8Array {
+    return ListSinksResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: ListSinksResponse): ListSinksResponseProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.ListSinksResponse",
+      value: ListSinksResponse.encode(message).finish()
+    };
   }
 
 };
@@ -5635,6 +6034,8 @@ function createBaseGetSinkRequest(): GetSinkRequest {
 }
 
 export const GetSinkRequest = {
+  typeUrl: "/google.logging.v2.GetSinkRequest",
+
   encode(message: GetSinkRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.sinkName !== "") {
       writer.uint32(10).string(message.sinkName);
@@ -5705,6 +6106,25 @@ export const GetSinkRequest = {
     const obj: any = {};
     obj.sink_name = message.sinkName;
     return obj;
+  },
+
+  fromAminoMsg(object: GetSinkRequestAminoMsg): GetSinkRequest {
+    return GetSinkRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: GetSinkRequestProtoMsg): GetSinkRequest {
+    return GetSinkRequest.decode(message.value);
+  },
+
+  toProto(message: GetSinkRequest): Uint8Array {
+    return GetSinkRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: GetSinkRequest): GetSinkRequestProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.GetSinkRequest",
+      value: GetSinkRequest.encode(message).finish()
+    };
   }
 
 };
@@ -5718,6 +6138,8 @@ function createBaseCreateSinkRequest(): CreateSinkRequest {
 }
 
 export const CreateSinkRequest = {
+  typeUrl: "/google.logging.v2.CreateSinkRequest",
+
   encode(message: CreateSinkRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.parent !== "") {
       writer.uint32(10).string(message.parent);
@@ -5818,6 +6240,25 @@ export const CreateSinkRequest = {
     obj.sink = message.sink ? LogSink.toAmino(message.sink) : undefined;
     obj.unique_writer_identity = message.uniqueWriterIdentity;
     return obj;
+  },
+
+  fromAminoMsg(object: CreateSinkRequestAminoMsg): CreateSinkRequest {
+    return CreateSinkRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: CreateSinkRequestProtoMsg): CreateSinkRequest {
+    return CreateSinkRequest.decode(message.value);
+  },
+
+  toProto(message: CreateSinkRequest): Uint8Array {
+    return CreateSinkRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: CreateSinkRequest): CreateSinkRequestProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.CreateSinkRequest",
+      value: CreateSinkRequest.encode(message).finish()
+    };
   }
 
 };
@@ -5832,6 +6273,8 @@ function createBaseUpdateSinkRequest(): UpdateSinkRequest {
 }
 
 export const UpdateSinkRequest = {
+  typeUrl: "/google.logging.v2.UpdateSinkRequest",
+
   encode(message: UpdateSinkRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.sinkName !== "") {
       writer.uint32(10).string(message.sinkName);
@@ -5947,6 +6390,25 @@ export const UpdateSinkRequest = {
     obj.unique_writer_identity = message.uniqueWriterIdentity;
     obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: UpdateSinkRequestAminoMsg): UpdateSinkRequest {
+    return UpdateSinkRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: UpdateSinkRequestProtoMsg): UpdateSinkRequest {
+    return UpdateSinkRequest.decode(message.value);
+  },
+
+  toProto(message: UpdateSinkRequest): Uint8Array {
+    return UpdateSinkRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: UpdateSinkRequest): UpdateSinkRequestProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.UpdateSinkRequest",
+      value: UpdateSinkRequest.encode(message).finish()
+    };
   }
 
 };
@@ -5958,6 +6420,8 @@ function createBaseDeleteSinkRequest(): DeleteSinkRequest {
 }
 
 export const DeleteSinkRequest = {
+  typeUrl: "/google.logging.v2.DeleteSinkRequest",
+
   encode(message: DeleteSinkRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.sinkName !== "") {
       writer.uint32(10).string(message.sinkName);
@@ -6028,6 +6492,25 @@ export const DeleteSinkRequest = {
     const obj: any = {};
     obj.sink_name = message.sinkName;
     return obj;
+  },
+
+  fromAminoMsg(object: DeleteSinkRequestAminoMsg): DeleteSinkRequest {
+    return DeleteSinkRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: DeleteSinkRequestProtoMsg): DeleteSinkRequest {
+    return DeleteSinkRequest.decode(message.value);
+  },
+
+  toProto(message: DeleteSinkRequest): Uint8Array {
+    return DeleteSinkRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: DeleteSinkRequest): DeleteSinkRequestProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.DeleteSinkRequest",
+      value: DeleteSinkRequest.encode(message).finish()
+    };
   }
 
 };
@@ -6044,6 +6527,8 @@ function createBaseLogExclusion(): LogExclusion {
 }
 
 export const LogExclusion = {
+  typeUrl: "/google.logging.v2.LogExclusion",
+
   encode(message: LogExclusion, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -6189,6 +6674,25 @@ export const LogExclusion = {
     obj.create_time = message.createTime ? Timestamp.toAmino(message.createTime) : undefined;
     obj.update_time = message.updateTime ? Timestamp.toAmino(message.updateTime) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: LogExclusionAminoMsg): LogExclusion {
+    return LogExclusion.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: LogExclusionProtoMsg): LogExclusion {
+    return LogExclusion.decode(message.value);
+  },
+
+  toProto(message: LogExclusion): Uint8Array {
+    return LogExclusion.encode(message).finish();
+  },
+
+  toProtoMsg(message: LogExclusion): LogExclusionProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.LogExclusion",
+      value: LogExclusion.encode(message).finish()
+    };
   }
 
 };
@@ -6202,6 +6706,8 @@ function createBaseListExclusionsRequest(): ListExclusionsRequest {
 }
 
 export const ListExclusionsRequest = {
+  typeUrl: "/google.logging.v2.ListExclusionsRequest",
+
   encode(message: ListExclusionsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.parent !== "") {
       writer.uint32(10).string(message.parent);
@@ -6302,6 +6808,25 @@ export const ListExclusionsRequest = {
     obj.page_token = message.pageToken;
     obj.page_size = message.pageSize;
     return obj;
+  },
+
+  fromAminoMsg(object: ListExclusionsRequestAminoMsg): ListExclusionsRequest {
+    return ListExclusionsRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ListExclusionsRequestProtoMsg): ListExclusionsRequest {
+    return ListExclusionsRequest.decode(message.value);
+  },
+
+  toProto(message: ListExclusionsRequest): Uint8Array {
+    return ListExclusionsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: ListExclusionsRequest): ListExclusionsRequestProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.ListExclusionsRequest",
+      value: ListExclusionsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -6314,6 +6839,8 @@ function createBaseListExclusionsResponse(): ListExclusionsResponse {
 }
 
 export const ListExclusionsResponse = {
+  typeUrl: "/google.logging.v2.ListExclusionsResponse",
+
   encode(message: ListExclusionsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.exclusions) {
       LogExclusion.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -6417,6 +6944,25 @@ export const ListExclusionsResponse = {
 
     obj.next_page_token = message.nextPageToken;
     return obj;
+  },
+
+  fromAminoMsg(object: ListExclusionsResponseAminoMsg): ListExclusionsResponse {
+    return ListExclusionsResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ListExclusionsResponseProtoMsg): ListExclusionsResponse {
+    return ListExclusionsResponse.decode(message.value);
+  },
+
+  toProto(message: ListExclusionsResponse): Uint8Array {
+    return ListExclusionsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: ListExclusionsResponse): ListExclusionsResponseProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.ListExclusionsResponse",
+      value: ListExclusionsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -6428,6 +6974,8 @@ function createBaseGetExclusionRequest(): GetExclusionRequest {
 }
 
 export const GetExclusionRequest = {
+  typeUrl: "/google.logging.v2.GetExclusionRequest",
+
   encode(message: GetExclusionRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -6498,6 +7046,25 @@ export const GetExclusionRequest = {
     const obj: any = {};
     obj.name = message.name;
     return obj;
+  },
+
+  fromAminoMsg(object: GetExclusionRequestAminoMsg): GetExclusionRequest {
+    return GetExclusionRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: GetExclusionRequestProtoMsg): GetExclusionRequest {
+    return GetExclusionRequest.decode(message.value);
+  },
+
+  toProto(message: GetExclusionRequest): Uint8Array {
+    return GetExclusionRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: GetExclusionRequest): GetExclusionRequestProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.GetExclusionRequest",
+      value: GetExclusionRequest.encode(message).finish()
+    };
   }
 
 };
@@ -6510,6 +7077,8 @@ function createBaseCreateExclusionRequest(): CreateExclusionRequest {
 }
 
 export const CreateExclusionRequest = {
+  typeUrl: "/google.logging.v2.CreateExclusionRequest",
+
   encode(message: CreateExclusionRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.parent !== "") {
       writer.uint32(10).string(message.parent);
@@ -6595,6 +7164,25 @@ export const CreateExclusionRequest = {
     obj.parent = message.parent;
     obj.exclusion = message.exclusion ? LogExclusion.toAmino(message.exclusion) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: CreateExclusionRequestAminoMsg): CreateExclusionRequest {
+    return CreateExclusionRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: CreateExclusionRequestProtoMsg): CreateExclusionRequest {
+    return CreateExclusionRequest.decode(message.value);
+  },
+
+  toProto(message: CreateExclusionRequest): Uint8Array {
+    return CreateExclusionRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: CreateExclusionRequest): CreateExclusionRequestProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.CreateExclusionRequest",
+      value: CreateExclusionRequest.encode(message).finish()
+    };
   }
 
 };
@@ -6608,6 +7196,8 @@ function createBaseUpdateExclusionRequest(): UpdateExclusionRequest {
 }
 
 export const UpdateExclusionRequest = {
+  typeUrl: "/google.logging.v2.UpdateExclusionRequest",
+
   encode(message: UpdateExclusionRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -6708,6 +7298,25 @@ export const UpdateExclusionRequest = {
     obj.exclusion = message.exclusion ? LogExclusion.toAmino(message.exclusion) : undefined;
     obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: UpdateExclusionRequestAminoMsg): UpdateExclusionRequest {
+    return UpdateExclusionRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: UpdateExclusionRequestProtoMsg): UpdateExclusionRequest {
+    return UpdateExclusionRequest.decode(message.value);
+  },
+
+  toProto(message: UpdateExclusionRequest): Uint8Array {
+    return UpdateExclusionRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: UpdateExclusionRequest): UpdateExclusionRequestProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.UpdateExclusionRequest",
+      value: UpdateExclusionRequest.encode(message).finish()
+    };
   }
 
 };
@@ -6719,6 +7328,8 @@ function createBaseDeleteExclusionRequest(): DeleteExclusionRequest {
 }
 
 export const DeleteExclusionRequest = {
+  typeUrl: "/google.logging.v2.DeleteExclusionRequest",
+
   encode(message: DeleteExclusionRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -6789,6 +7400,25 @@ export const DeleteExclusionRequest = {
     const obj: any = {};
     obj.name = message.name;
     return obj;
+  },
+
+  fromAminoMsg(object: DeleteExclusionRequestAminoMsg): DeleteExclusionRequest {
+    return DeleteExclusionRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: DeleteExclusionRequestProtoMsg): DeleteExclusionRequest {
+    return DeleteExclusionRequest.decode(message.value);
+  },
+
+  toProto(message: DeleteExclusionRequest): Uint8Array {
+    return DeleteExclusionRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: DeleteExclusionRequest): DeleteExclusionRequestProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.DeleteExclusionRequest",
+      value: DeleteExclusionRequest.encode(message).finish()
+    };
   }
 
 };
@@ -6800,6 +7430,8 @@ function createBaseGetCmekSettingsRequest(): GetCmekSettingsRequest {
 }
 
 export const GetCmekSettingsRequest = {
+  typeUrl: "/google.logging.v2.GetCmekSettingsRequest",
+
   encode(message: GetCmekSettingsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -6870,6 +7502,25 @@ export const GetCmekSettingsRequest = {
     const obj: any = {};
     obj.name = message.name;
     return obj;
+  },
+
+  fromAminoMsg(object: GetCmekSettingsRequestAminoMsg): GetCmekSettingsRequest {
+    return GetCmekSettingsRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: GetCmekSettingsRequestProtoMsg): GetCmekSettingsRequest {
+    return GetCmekSettingsRequest.decode(message.value);
+  },
+
+  toProto(message: GetCmekSettingsRequest): Uint8Array {
+    return GetCmekSettingsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: GetCmekSettingsRequest): GetCmekSettingsRequestProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.GetCmekSettingsRequest",
+      value: GetCmekSettingsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -6883,6 +7534,8 @@ function createBaseUpdateCmekSettingsRequest(): UpdateCmekSettingsRequest {
 }
 
 export const UpdateCmekSettingsRequest = {
+  typeUrl: "/google.logging.v2.UpdateCmekSettingsRequest",
+
   encode(message: UpdateCmekSettingsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -6983,6 +7636,25 @@ export const UpdateCmekSettingsRequest = {
     obj.cmek_settings = message.cmekSettings ? CmekSettings.toAmino(message.cmekSettings) : undefined;
     obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: UpdateCmekSettingsRequestAminoMsg): UpdateCmekSettingsRequest {
+    return UpdateCmekSettingsRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: UpdateCmekSettingsRequestProtoMsg): UpdateCmekSettingsRequest {
+    return UpdateCmekSettingsRequest.decode(message.value);
+  },
+
+  toProto(message: UpdateCmekSettingsRequest): Uint8Array {
+    return UpdateCmekSettingsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: UpdateCmekSettingsRequest): UpdateCmekSettingsRequestProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.UpdateCmekSettingsRequest",
+      value: UpdateCmekSettingsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -6996,6 +7668,8 @@ function createBaseCmekSettings(): CmekSettings {
 }
 
 export const CmekSettings = {
+  typeUrl: "/google.logging.v2.CmekSettings",
+
   encode(message: CmekSettings, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -7096,6 +7770,25 @@ export const CmekSettings = {
     obj.kms_key_name = message.kmsKeyName;
     obj.service_account_id = message.serviceAccountId;
     return obj;
+  },
+
+  fromAminoMsg(object: CmekSettingsAminoMsg): CmekSettings {
+    return CmekSettings.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: CmekSettingsProtoMsg): CmekSettings {
+    return CmekSettings.decode(message.value);
+  },
+
+  toProto(message: CmekSettings): Uint8Array {
+    return CmekSettings.encode(message).finish();
+  },
+
+  toProtoMsg(message: CmekSettings): CmekSettingsProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.CmekSettings",
+      value: CmekSettings.encode(message).finish()
+    };
   }
 
 };
@@ -7107,6 +7800,8 @@ function createBaseGetSettingsRequest(): GetSettingsRequest {
 }
 
 export const GetSettingsRequest = {
+  typeUrl: "/google.logging.v2.GetSettingsRequest",
+
   encode(message: GetSettingsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -7177,6 +7872,25 @@ export const GetSettingsRequest = {
     const obj: any = {};
     obj.name = message.name;
     return obj;
+  },
+
+  fromAminoMsg(object: GetSettingsRequestAminoMsg): GetSettingsRequest {
+    return GetSettingsRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: GetSettingsRequestProtoMsg): GetSettingsRequest {
+    return GetSettingsRequest.decode(message.value);
+  },
+
+  toProto(message: GetSettingsRequest): Uint8Array {
+    return GetSettingsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: GetSettingsRequest): GetSettingsRequestProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.GetSettingsRequest",
+      value: GetSettingsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -7190,6 +7904,8 @@ function createBaseUpdateSettingsRequest(): UpdateSettingsRequest {
 }
 
 export const UpdateSettingsRequest = {
+  typeUrl: "/google.logging.v2.UpdateSettingsRequest",
+
   encode(message: UpdateSettingsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -7290,6 +8006,25 @@ export const UpdateSettingsRequest = {
     obj.settings = message.settings ? Settings.toAmino(message.settings) : undefined;
     obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: UpdateSettingsRequestAminoMsg): UpdateSettingsRequest {
+    return UpdateSettingsRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: UpdateSettingsRequestProtoMsg): UpdateSettingsRequest {
+    return UpdateSettingsRequest.decode(message.value);
+  },
+
+  toProto(message: UpdateSettingsRequest): Uint8Array {
+    return UpdateSettingsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: UpdateSettingsRequest): UpdateSettingsRequestProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.UpdateSettingsRequest",
+      value: UpdateSettingsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -7305,6 +8040,8 @@ function createBaseSettings(): Settings {
 }
 
 export const Settings = {
+  typeUrl: "/google.logging.v2.Settings",
+
   encode(message: Settings, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -7435,6 +8172,25 @@ export const Settings = {
     obj.storage_location = message.storageLocation;
     obj.disable_default_sink = message.disableDefaultSink;
     return obj;
+  },
+
+  fromAminoMsg(object: SettingsAminoMsg): Settings {
+    return Settings.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: SettingsProtoMsg): Settings {
+    return Settings.decode(message.value);
+  },
+
+  toProto(message: Settings): Uint8Array {
+    return Settings.encode(message).finish();
+  },
+
+  toProtoMsg(message: Settings): SettingsProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.Settings",
+      value: Settings.encode(message).finish()
+    };
   }
 
 };
@@ -7448,6 +8204,8 @@ function createBaseCopyLogEntriesRequest(): CopyLogEntriesRequest {
 }
 
 export const CopyLogEntriesRequest = {
+  typeUrl: "/google.logging.v2.CopyLogEntriesRequest",
+
   encode(message: CopyLogEntriesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -7548,6 +8306,25 @@ export const CopyLogEntriesRequest = {
     obj.filter = message.filter;
     obj.destination = message.destination;
     return obj;
+  },
+
+  fromAminoMsg(object: CopyLogEntriesRequestAminoMsg): CopyLogEntriesRequest {
+    return CopyLogEntriesRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: CopyLogEntriesRequestProtoMsg): CopyLogEntriesRequest {
+    return CopyLogEntriesRequest.decode(message.value);
+  },
+
+  toProto(message: CopyLogEntriesRequest): Uint8Array {
+    return CopyLogEntriesRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: CopyLogEntriesRequest): CopyLogEntriesRequestProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.CopyLogEntriesRequest",
+      value: CopyLogEntriesRequest.encode(message).finish()
+    };
   }
 
 };
@@ -7565,6 +8342,8 @@ function createBaseCopyLogEntriesMetadata(): CopyLogEntriesMetadata {
 }
 
 export const CopyLogEntriesMetadata = {
+  typeUrl: "/google.logging.v2.CopyLogEntriesMetadata",
+
   encode(message: CopyLogEntriesMetadata, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.startTime !== undefined) {
       Timestamp.encode(toTimestamp(message.startTime), writer.uint32(10).fork()).ldelim();
@@ -7725,6 +8504,25 @@ export const CopyLogEntriesMetadata = {
     obj.progress = message.progress;
     obj.writer_identity = message.writerIdentity;
     return obj;
+  },
+
+  fromAminoMsg(object: CopyLogEntriesMetadataAminoMsg): CopyLogEntriesMetadata {
+    return CopyLogEntriesMetadata.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: CopyLogEntriesMetadataProtoMsg): CopyLogEntriesMetadata {
+    return CopyLogEntriesMetadata.decode(message.value);
+  },
+
+  toProto(message: CopyLogEntriesMetadata): Uint8Array {
+    return CopyLogEntriesMetadata.encode(message).finish();
+  },
+
+  toProtoMsg(message: CopyLogEntriesMetadata): CopyLogEntriesMetadataProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.CopyLogEntriesMetadata",
+      value: CopyLogEntriesMetadata.encode(message).finish()
+    };
   }
 
 };
@@ -7736,6 +8534,8 @@ function createBaseCopyLogEntriesResponse(): CopyLogEntriesResponse {
 }
 
 export const CopyLogEntriesResponse = {
+  typeUrl: "/google.logging.v2.CopyLogEntriesResponse",
+
   encode(message: CopyLogEntriesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.logEntriesCopiedCount.isZero()) {
       writer.uint32(8).int64(message.logEntriesCopiedCount);
@@ -7806,6 +8606,25 @@ export const CopyLogEntriesResponse = {
     const obj: any = {};
     obj.log_entries_copied_count = message.logEntriesCopiedCount ? message.logEntriesCopiedCount.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: CopyLogEntriesResponseAminoMsg): CopyLogEntriesResponse {
+    return CopyLogEntriesResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: CopyLogEntriesResponseProtoMsg): CopyLogEntriesResponse {
+    return CopyLogEntriesResponse.decode(message.value);
+  },
+
+  toProto(message: CopyLogEntriesResponse): Uint8Array {
+    return CopyLogEntriesResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: CopyLogEntriesResponse): CopyLogEntriesResponseProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.CopyLogEntriesResponse",
+      value: CopyLogEntriesResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/logging/v2/logging_metrics.ts b/__fixtures__/outputv2/google/logging/v2/logging_metrics.ts
index b2a30fb04..d46d092a5 100644
--- a/__fixtures__/outputv2/google/logging/v2/logging_metrics.ts
+++ b/__fixtures__/outputv2/google/logging/v2/logging_metrics.ts
@@ -49,16 +49,16 @@ export interface LogMetric_LabelExtractorsEntry {
   key: string;
   value: string;
 }
-export interface LogMetric_LabelExtractorsEntryProtoType {
-  typeUrl: "/google.logging.v2.undefined";
+export interface LogMetric_LabelExtractorsEntryProtoMsg {
+  typeUrl: string;
   value: Uint8Array;
 }
 export interface LogMetric_LabelExtractorsEntryAmino {
   key: string;
   value: string;
 }
-export interface LogMetric_LabelExtractorsEntryAminoType {
-  type: "/google.logging.v2.undefined";
+export interface LogMetric_LabelExtractorsEntryAminoMsg {
+  type: string;
   value: LogMetric_LabelExtractorsEntryAmino;
 }
 export interface LogMetric_LabelExtractorsEntrySDKType {
@@ -213,7 +213,7 @@ export interface LogMetric {
   /** @deprecated */
   version: LogMetric_ApiVersion;
 }
-export interface LogMetricProtoType {
+export interface LogMetricProtoMsg {
   typeUrl: "/google.logging.v2.LogMetric";
   value: Uint8Array;
 }
@@ -365,7 +365,7 @@ export interface LogMetricAmino {
   /** @deprecated */
   version: LogMetric_ApiVersion;
 }
-export interface LogMetricAminoType {
+export interface LogMetricAminoMsg {
   type: "/google.logging.v2.LogMetric";
   value: LogMetricAmino;
 }
@@ -421,7 +421,7 @@ export interface ListLogMetricsRequest {
    */
   pageSize: number;
 }
-export interface ListLogMetricsRequestProtoType {
+export interface ListLogMetricsRequestProtoMsg {
   typeUrl: "/google.logging.v2.ListLogMetricsRequest";
   value: Uint8Array;
 }
@@ -450,7 +450,7 @@ export interface ListLogMetricsRequestAmino {
    */
   page_size: number;
 }
-export interface ListLogMetricsRequestAminoType {
+export interface ListLogMetricsRequestAminoMsg {
   type: "/google.logging.v2.ListLogMetricsRequest";
   value: ListLogMetricsRequestAmino;
 }
@@ -474,7 +474,7 @@ export interface ListLogMetricsResponse {
    */
   nextPageToken: string;
 }
-export interface ListLogMetricsResponseProtoType {
+export interface ListLogMetricsResponseProtoMsg {
   typeUrl: "/google.logging.v2.ListLogMetricsResponse";
   value: Uint8Array;
 }
@@ -491,7 +491,7 @@ export interface ListLogMetricsResponseAmino {
    */
   next_page_token: string;
 }
-export interface ListLogMetricsResponseAminoType {
+export interface ListLogMetricsResponseAminoMsg {
   type: "/google.logging.v2.ListLogMetricsResponse";
   value: ListLogMetricsResponseAmino;
 }
@@ -511,7 +511,7 @@ export interface GetLogMetricRequest {
    */
   metricName: string;
 }
-export interface GetLogMetricRequestProtoType {
+export interface GetLogMetricRequestProtoMsg {
   typeUrl: "/google.logging.v2.GetLogMetricRequest";
   value: Uint8Array;
 }
@@ -525,7 +525,7 @@ export interface GetLogMetricRequestAmino {
    */
   metric_name: string;
 }
-export interface GetLogMetricRequestAminoType {
+export interface GetLogMetricRequestAminoMsg {
   type: "/google.logging.v2.GetLogMetricRequest";
   value: GetLogMetricRequestAmino;
 }
@@ -552,7 +552,7 @@ export interface CreateLogMetricRequest {
    */
   metric?: LogMetric;
 }
-export interface CreateLogMetricRequestProtoType {
+export interface CreateLogMetricRequestProtoMsg {
   typeUrl: "/google.logging.v2.CreateLogMetricRequest";
   value: Uint8Array;
 }
@@ -574,7 +574,7 @@ export interface CreateLogMetricRequestAmino {
    */
   metric?: LogMetricAmino;
 }
-export interface CreateLogMetricRequestAminoType {
+export interface CreateLogMetricRequestAminoMsg {
   type: "/google.logging.v2.CreateLogMetricRequest";
   value: CreateLogMetricRequestAmino;
 }
@@ -601,7 +601,7 @@ export interface UpdateLogMetricRequest {
   /** Required. The updated metric. */
   metric?: LogMetric;
 }
-export interface UpdateLogMetricRequestProtoType {
+export interface UpdateLogMetricRequestProtoMsg {
   typeUrl: "/google.logging.v2.UpdateLogMetricRequest";
   value: Uint8Array;
 }
@@ -622,7 +622,7 @@ export interface UpdateLogMetricRequestAmino {
   /** Required. The updated metric. */
   metric?: LogMetricAmino;
 }
-export interface UpdateLogMetricRequestAminoType {
+export interface UpdateLogMetricRequestAminoMsg {
   type: "/google.logging.v2.UpdateLogMetricRequest";
   value: UpdateLogMetricRequestAmino;
 }
@@ -642,7 +642,7 @@ export interface DeleteLogMetricRequest {
    */
   metricName: string;
 }
-export interface DeleteLogMetricRequestProtoType {
+export interface DeleteLogMetricRequestProtoMsg {
   typeUrl: "/google.logging.v2.DeleteLogMetricRequest";
   value: Uint8Array;
 }
@@ -656,7 +656,7 @@ export interface DeleteLogMetricRequestAmino {
    */
   metric_name: string;
 }
-export interface DeleteLogMetricRequestAminoType {
+export interface DeleteLogMetricRequestAminoMsg {
   type: "/google.logging.v2.DeleteLogMetricRequest";
   value: DeleteLogMetricRequestAmino;
 }
@@ -759,6 +759,18 @@ export const LogMetric_LabelExtractorsEntry = {
     obj.key = message.key;
     obj.value = message.value;
     return obj;
+  },
+
+  fromAminoMsg(object: LogMetric_LabelExtractorsEntryAminoMsg): LogMetric_LabelExtractorsEntry {
+    return LogMetric_LabelExtractorsEntry.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: LogMetric_LabelExtractorsEntryProtoMsg): LogMetric_LabelExtractorsEntry {
+    return LogMetric_LabelExtractorsEntry.decode(message.value);
+  },
+
+  toProto(message: LogMetric_LabelExtractorsEntry): Uint8Array {
+    return LogMetric_LabelExtractorsEntry.encode(message).finish();
   }
 
 };
@@ -780,6 +792,8 @@ function createBaseLogMetric(): LogMetric {
 }
 
 export const LogMetric = {
+  typeUrl: "/google.logging.v2.LogMetric",
+
   encode(message: LogMetric, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -1052,6 +1066,25 @@ export const LogMetric = {
     obj.update_time = message.updateTime ? Timestamp.toAmino(message.updateTime) : undefined;
     obj.version = message.version;
     return obj;
+  },
+
+  fromAminoMsg(object: LogMetricAminoMsg): LogMetric {
+    return LogMetric.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: LogMetricProtoMsg): LogMetric {
+    return LogMetric.decode(message.value);
+  },
+
+  toProto(message: LogMetric): Uint8Array {
+    return LogMetric.encode(message).finish();
+  },
+
+  toProtoMsg(message: LogMetric): LogMetricProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.LogMetric",
+      value: LogMetric.encode(message).finish()
+    };
   }
 
 };
@@ -1065,6 +1098,8 @@ function createBaseListLogMetricsRequest(): ListLogMetricsRequest {
 }
 
 export const ListLogMetricsRequest = {
+  typeUrl: "/google.logging.v2.ListLogMetricsRequest",
+
   encode(message: ListLogMetricsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.parent !== "") {
       writer.uint32(10).string(message.parent);
@@ -1165,6 +1200,25 @@ export const ListLogMetricsRequest = {
     obj.page_token = message.pageToken;
     obj.page_size = message.pageSize;
     return obj;
+  },
+
+  fromAminoMsg(object: ListLogMetricsRequestAminoMsg): ListLogMetricsRequest {
+    return ListLogMetricsRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ListLogMetricsRequestProtoMsg): ListLogMetricsRequest {
+    return ListLogMetricsRequest.decode(message.value);
+  },
+
+  toProto(message: ListLogMetricsRequest): Uint8Array {
+    return ListLogMetricsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: ListLogMetricsRequest): ListLogMetricsRequestProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.ListLogMetricsRequest",
+      value: ListLogMetricsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1177,6 +1231,8 @@ function createBaseListLogMetricsResponse(): ListLogMetricsResponse {
 }
 
 export const ListLogMetricsResponse = {
+  typeUrl: "/google.logging.v2.ListLogMetricsResponse",
+
   encode(message: ListLogMetricsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.metrics) {
       LogMetric.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1280,6 +1336,25 @@ export const ListLogMetricsResponse = {
 
     obj.next_page_token = message.nextPageToken;
     return obj;
+  },
+
+  fromAminoMsg(object: ListLogMetricsResponseAminoMsg): ListLogMetricsResponse {
+    return ListLogMetricsResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ListLogMetricsResponseProtoMsg): ListLogMetricsResponse {
+    return ListLogMetricsResponse.decode(message.value);
+  },
+
+  toProto(message: ListLogMetricsResponse): Uint8Array {
+    return ListLogMetricsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: ListLogMetricsResponse): ListLogMetricsResponseProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.ListLogMetricsResponse",
+      value: ListLogMetricsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1291,6 +1366,8 @@ function createBaseGetLogMetricRequest(): GetLogMetricRequest {
 }
 
 export const GetLogMetricRequest = {
+  typeUrl: "/google.logging.v2.GetLogMetricRequest",
+
   encode(message: GetLogMetricRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.metricName !== "") {
       writer.uint32(10).string(message.metricName);
@@ -1361,6 +1438,25 @@ export const GetLogMetricRequest = {
     const obj: any = {};
     obj.metric_name = message.metricName;
     return obj;
+  },
+
+  fromAminoMsg(object: GetLogMetricRequestAminoMsg): GetLogMetricRequest {
+    return GetLogMetricRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: GetLogMetricRequestProtoMsg): GetLogMetricRequest {
+    return GetLogMetricRequest.decode(message.value);
+  },
+
+  toProto(message: GetLogMetricRequest): Uint8Array {
+    return GetLogMetricRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: GetLogMetricRequest): GetLogMetricRequestProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.GetLogMetricRequest",
+      value: GetLogMetricRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1373,6 +1469,8 @@ function createBaseCreateLogMetricRequest(): CreateLogMetricRequest {
 }
 
 export const CreateLogMetricRequest = {
+  typeUrl: "/google.logging.v2.CreateLogMetricRequest",
+
   encode(message: CreateLogMetricRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.parent !== "") {
       writer.uint32(10).string(message.parent);
@@ -1458,6 +1556,25 @@ export const CreateLogMetricRequest = {
     obj.parent = message.parent;
     obj.metric = message.metric ? LogMetric.toAmino(message.metric) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: CreateLogMetricRequestAminoMsg): CreateLogMetricRequest {
+    return CreateLogMetricRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: CreateLogMetricRequestProtoMsg): CreateLogMetricRequest {
+    return CreateLogMetricRequest.decode(message.value);
+  },
+
+  toProto(message: CreateLogMetricRequest): Uint8Array {
+    return CreateLogMetricRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: CreateLogMetricRequest): CreateLogMetricRequestProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.CreateLogMetricRequest",
+      value: CreateLogMetricRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1470,6 +1587,8 @@ function createBaseUpdateLogMetricRequest(): UpdateLogMetricRequest {
 }
 
 export const UpdateLogMetricRequest = {
+  typeUrl: "/google.logging.v2.UpdateLogMetricRequest",
+
   encode(message: UpdateLogMetricRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.metricName !== "") {
       writer.uint32(10).string(message.metricName);
@@ -1555,6 +1674,25 @@ export const UpdateLogMetricRequest = {
     obj.metric_name = message.metricName;
     obj.metric = message.metric ? LogMetric.toAmino(message.metric) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: UpdateLogMetricRequestAminoMsg): UpdateLogMetricRequest {
+    return UpdateLogMetricRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: UpdateLogMetricRequestProtoMsg): UpdateLogMetricRequest {
+    return UpdateLogMetricRequest.decode(message.value);
+  },
+
+  toProto(message: UpdateLogMetricRequest): Uint8Array {
+    return UpdateLogMetricRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: UpdateLogMetricRequest): UpdateLogMetricRequestProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.UpdateLogMetricRequest",
+      value: UpdateLogMetricRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1566,6 +1704,8 @@ function createBaseDeleteLogMetricRequest(): DeleteLogMetricRequest {
 }
 
 export const DeleteLogMetricRequest = {
+  typeUrl: "/google.logging.v2.DeleteLogMetricRequest",
+
   encode(message: DeleteLogMetricRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.metricName !== "") {
       writer.uint32(10).string(message.metricName);
@@ -1636,6 +1776,25 @@ export const DeleteLogMetricRequest = {
     const obj: any = {};
     obj.metric_name = message.metricName;
     return obj;
+  },
+
+  fromAminoMsg(object: DeleteLogMetricRequestAminoMsg): DeleteLogMetricRequest {
+    return DeleteLogMetricRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: DeleteLogMetricRequestProtoMsg): DeleteLogMetricRequest {
+    return DeleteLogMetricRequest.decode(message.value);
+  },
+
+  toProto(message: DeleteLogMetricRequest): Uint8Array {
+    return DeleteLogMetricRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: DeleteLogMetricRequest): DeleteLogMetricRequestProtoMsg {
+    return {
+      typeUrl: "/google.logging.v2.DeleteLogMetricRequest",
+      value: DeleteLogMetricRequest.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/longrunning/operations.ts b/__fixtures__/outputv2/google/longrunning/operations.ts
index 42b6b1d92..1a7d9c9b7 100644
--- a/__fixtures__/outputv2/google/longrunning/operations.ts
+++ b/__fixtures__/outputv2/google/longrunning/operations.ts
@@ -47,7 +47,7 @@ export interface Operation {
    */
   response?: Any;
 }
-export interface OperationProtoType {
+export interface OperationProtoMsg {
   typeUrl: "/google.longrunning.Operation";
   value: Uint8Array;
 }
@@ -94,7 +94,7 @@ export interface OperationAmino {
    */
   response?: AnyAmino;
 }
-export interface OperationAminoType {
+export interface OperationAminoMsg {
   type: "/google.longrunning.Operation";
   value: OperationAmino;
 }
@@ -116,7 +116,7 @@ export interface GetOperationRequest {
   /** The name of the operation resource. */
   name: string;
 }
-export interface GetOperationRequestProtoType {
+export interface GetOperationRequestProtoMsg {
   typeUrl: "/google.longrunning.GetOperationRequest";
   value: Uint8Array;
 }
@@ -126,7 +126,7 @@ export interface GetOperationRequestAmino {
   /** The name of the operation resource. */
   name: string;
 }
-export interface GetOperationRequestAminoType {
+export interface GetOperationRequestAminoMsg {
   type: "/google.longrunning.GetOperationRequest";
   value: GetOperationRequestAmino;
 }
@@ -150,7 +150,7 @@ export interface ListOperationsRequest {
   /** The standard list page token. */
   pageToken: string;
 }
-export interface ListOperationsRequestProtoType {
+export interface ListOperationsRequestProtoMsg {
   typeUrl: "/google.longrunning.ListOperationsRequest";
   value: Uint8Array;
 }
@@ -169,7 +169,7 @@ export interface ListOperationsRequestAmino {
   /** The standard list page token. */
   page_token: string;
 }
-export interface ListOperationsRequestAminoType {
+export interface ListOperationsRequestAminoMsg {
   type: "/google.longrunning.ListOperationsRequest";
   value: ListOperationsRequestAmino;
 }
@@ -190,7 +190,7 @@ export interface ListOperationsResponse {
   /** The standard List next-page token. */
   nextPageToken: string;
 }
-export interface ListOperationsResponseProtoType {
+export interface ListOperationsResponseProtoMsg {
   typeUrl: "/google.longrunning.ListOperationsResponse";
   value: Uint8Array;
 }
@@ -203,7 +203,7 @@ export interface ListOperationsResponseAmino {
   /** The standard List next-page token. */
   next_page_token: string;
 }
-export interface ListOperationsResponseAminoType {
+export interface ListOperationsResponseAminoMsg {
   type: "/google.longrunning.ListOperationsResponse";
   value: ListOperationsResponseAmino;
 }
@@ -219,7 +219,7 @@ export interface CancelOperationRequest {
   /** The name of the operation resource to be cancelled. */
   name: string;
 }
-export interface CancelOperationRequestProtoType {
+export interface CancelOperationRequestProtoMsg {
   typeUrl: "/google.longrunning.CancelOperationRequest";
   value: Uint8Array;
 }
@@ -229,7 +229,7 @@ export interface CancelOperationRequestAmino {
   /** The name of the operation resource to be cancelled. */
   name: string;
 }
-export interface CancelOperationRequestAminoType {
+export interface CancelOperationRequestAminoMsg {
   type: "/google.longrunning.CancelOperationRequest";
   value: CancelOperationRequestAmino;
 }
@@ -244,7 +244,7 @@ export interface DeleteOperationRequest {
   /** The name of the operation resource to be deleted. */
   name: string;
 }
-export interface DeleteOperationRequestProtoType {
+export interface DeleteOperationRequestProtoMsg {
   typeUrl: "/google.longrunning.DeleteOperationRequest";
   value: Uint8Array;
 }
@@ -254,7 +254,7 @@ export interface DeleteOperationRequestAmino {
   /** The name of the operation resource to be deleted. */
   name: string;
 }
-export interface DeleteOperationRequestAminoType {
+export interface DeleteOperationRequestAminoMsg {
   type: "/google.longrunning.DeleteOperationRequest";
   value: DeleteOperationRequestAmino;
 }
@@ -276,7 +276,7 @@ export interface WaitOperationRequest {
    */
   timeout?: Duration;
 }
-export interface WaitOperationRequestProtoType {
+export interface WaitOperationRequestProtoMsg {
   typeUrl: "/google.longrunning.WaitOperationRequest";
   value: Uint8Array;
 }
@@ -293,7 +293,7 @@ export interface WaitOperationRequestAmino {
    */
   timeout?: DurationAmino;
 }
-export interface WaitOperationRequestAminoType {
+export interface WaitOperationRequestAminoMsg {
   type: "/google.longrunning.WaitOperationRequest";
   value: WaitOperationRequestAmino;
 }
@@ -341,7 +341,7 @@ export interface OperationInfo {
    */
   metadataType: string;
 }
-export interface OperationInfoProtoType {
+export interface OperationInfoProtoMsg {
   typeUrl: "/google.longrunning.OperationInfo";
   value: Uint8Array;
 }
@@ -383,7 +383,7 @@ export interface OperationInfoAmino {
    */
   metadata_type: string;
 }
-export interface OperationInfoAminoType {
+export interface OperationInfoAminoMsg {
   type: "/google.longrunning.OperationInfo";
   value: OperationInfoAmino;
 }
@@ -417,6 +417,8 @@ function createBaseOperation(): Operation {
 }
 
 export const Operation = {
+  typeUrl: "/google.longrunning.Operation",
+
   encode(message: Operation, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -547,6 +549,25 @@ export const Operation = {
     obj.error = message.error ? Status.toAmino(message.error) : undefined;
     obj.response = message.response ? Any.toAmino(message.response) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: OperationAminoMsg): Operation {
+    return Operation.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: OperationProtoMsg): Operation {
+    return Operation.decode(message.value);
+  },
+
+  toProto(message: Operation): Uint8Array {
+    return Operation.encode(message).finish();
+  },
+
+  toProtoMsg(message: Operation): OperationProtoMsg {
+    return {
+      typeUrl: "/google.longrunning.Operation",
+      value: Operation.encode(message).finish()
+    };
   }
 
 };
@@ -558,6 +579,8 @@ function createBaseGetOperationRequest(): GetOperationRequest {
 }
 
 export const GetOperationRequest = {
+  typeUrl: "/google.longrunning.GetOperationRequest",
+
   encode(message: GetOperationRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -628,6 +651,25 @@ export const GetOperationRequest = {
     const obj: any = {};
     obj.name = message.name;
     return obj;
+  },
+
+  fromAminoMsg(object: GetOperationRequestAminoMsg): GetOperationRequest {
+    return GetOperationRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: GetOperationRequestProtoMsg): GetOperationRequest {
+    return GetOperationRequest.decode(message.value);
+  },
+
+  toProto(message: GetOperationRequest): Uint8Array {
+    return GetOperationRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: GetOperationRequest): GetOperationRequestProtoMsg {
+    return {
+      typeUrl: "/google.longrunning.GetOperationRequest",
+      value: GetOperationRequest.encode(message).finish()
+    };
   }
 
 };
@@ -642,6 +684,8 @@ function createBaseListOperationsRequest(): ListOperationsRequest {
 }
 
 export const ListOperationsRequest = {
+  typeUrl: "/google.longrunning.ListOperationsRequest",
+
   encode(message: ListOperationsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(34).string(message.name);
@@ -757,6 +801,25 @@ export const ListOperationsRequest = {
     obj.page_size = message.pageSize;
     obj.page_token = message.pageToken;
     return obj;
+  },
+
+  fromAminoMsg(object: ListOperationsRequestAminoMsg): ListOperationsRequest {
+    return ListOperationsRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ListOperationsRequestProtoMsg): ListOperationsRequest {
+    return ListOperationsRequest.decode(message.value);
+  },
+
+  toProto(message: ListOperationsRequest): Uint8Array {
+    return ListOperationsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: ListOperationsRequest): ListOperationsRequestProtoMsg {
+    return {
+      typeUrl: "/google.longrunning.ListOperationsRequest",
+      value: ListOperationsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -769,6 +832,8 @@ function createBaseListOperationsResponse(): ListOperationsResponse {
 }
 
 export const ListOperationsResponse = {
+  typeUrl: "/google.longrunning.ListOperationsResponse",
+
   encode(message: ListOperationsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.operations) {
       Operation.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -872,6 +937,25 @@ export const ListOperationsResponse = {
 
     obj.next_page_token = message.nextPageToken;
     return obj;
+  },
+
+  fromAminoMsg(object: ListOperationsResponseAminoMsg): ListOperationsResponse {
+    return ListOperationsResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ListOperationsResponseProtoMsg): ListOperationsResponse {
+    return ListOperationsResponse.decode(message.value);
+  },
+
+  toProto(message: ListOperationsResponse): Uint8Array {
+    return ListOperationsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: ListOperationsResponse): ListOperationsResponseProtoMsg {
+    return {
+      typeUrl: "/google.longrunning.ListOperationsResponse",
+      value: ListOperationsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -883,6 +967,8 @@ function createBaseCancelOperationRequest(): CancelOperationRequest {
 }
 
 export const CancelOperationRequest = {
+  typeUrl: "/google.longrunning.CancelOperationRequest",
+
   encode(message: CancelOperationRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -953,6 +1039,25 @@ export const CancelOperationRequest = {
     const obj: any = {};
     obj.name = message.name;
     return obj;
+  },
+
+  fromAminoMsg(object: CancelOperationRequestAminoMsg): CancelOperationRequest {
+    return CancelOperationRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: CancelOperationRequestProtoMsg): CancelOperationRequest {
+    return CancelOperationRequest.decode(message.value);
+  },
+
+  toProto(message: CancelOperationRequest): Uint8Array {
+    return CancelOperationRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: CancelOperationRequest): CancelOperationRequestProtoMsg {
+    return {
+      typeUrl: "/google.longrunning.CancelOperationRequest",
+      value: CancelOperationRequest.encode(message).finish()
+    };
   }
 
 };
@@ -964,6 +1069,8 @@ function createBaseDeleteOperationRequest(): DeleteOperationRequest {
 }
 
 export const DeleteOperationRequest = {
+  typeUrl: "/google.longrunning.DeleteOperationRequest",
+
   encode(message: DeleteOperationRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -1034,6 +1141,25 @@ export const DeleteOperationRequest = {
     const obj: any = {};
     obj.name = message.name;
     return obj;
+  },
+
+  fromAminoMsg(object: DeleteOperationRequestAminoMsg): DeleteOperationRequest {
+    return DeleteOperationRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: DeleteOperationRequestProtoMsg): DeleteOperationRequest {
+    return DeleteOperationRequest.decode(message.value);
+  },
+
+  toProto(message: DeleteOperationRequest): Uint8Array {
+    return DeleteOperationRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: DeleteOperationRequest): DeleteOperationRequestProtoMsg {
+    return {
+      typeUrl: "/google.longrunning.DeleteOperationRequest",
+      value: DeleteOperationRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1046,6 +1172,8 @@ function createBaseWaitOperationRequest(): WaitOperationRequest {
 }
 
 export const WaitOperationRequest = {
+  typeUrl: "/google.longrunning.WaitOperationRequest",
+
   encode(message: WaitOperationRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -1131,6 +1259,25 @@ export const WaitOperationRequest = {
     obj.name = message.name;
     obj.timeout = message.timeout ? Duration.toAmino(message.timeout) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: WaitOperationRequestAminoMsg): WaitOperationRequest {
+    return WaitOperationRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: WaitOperationRequestProtoMsg): WaitOperationRequest {
+    return WaitOperationRequest.decode(message.value);
+  },
+
+  toProto(message: WaitOperationRequest): Uint8Array {
+    return WaitOperationRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: WaitOperationRequest): WaitOperationRequestProtoMsg {
+    return {
+      typeUrl: "/google.longrunning.WaitOperationRequest",
+      value: WaitOperationRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1143,6 +1290,8 @@ function createBaseOperationInfo(): OperationInfo {
 }
 
 export const OperationInfo = {
+  typeUrl: "/google.longrunning.OperationInfo",
+
   encode(message: OperationInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.responseType !== "") {
       writer.uint32(10).string(message.responseType);
@@ -1228,6 +1377,25 @@ export const OperationInfo = {
     obj.response_type = message.responseType;
     obj.metadata_type = message.metadataType;
     return obj;
+  },
+
+  fromAminoMsg(object: OperationInfoAminoMsg): OperationInfo {
+    return OperationInfo.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: OperationInfoProtoMsg): OperationInfo {
+    return OperationInfo.decode(message.value);
+  },
+
+  toProto(message: OperationInfo): Uint8Array {
+    return OperationInfo.encode(message).finish();
+  },
+
+  toProtoMsg(message: OperationInfo): OperationInfoProtoMsg {
+    return {
+      typeUrl: "/google.longrunning.OperationInfo",
+      value: OperationInfo.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/protobuf/any.ts b/__fixtures__/outputv2/google/protobuf/any.ts
index 885e0cfe1..48671262f 100644
--- a/__fixtures__/outputv2/google/protobuf/any.ts
+++ b/__fixtures__/outputv2/google/protobuf/any.ts
@@ -118,7 +118,7 @@ export interface Any {
   /** Must be a valid serialized protocol buffer of the above specified type. */
   value: Uint8Array;
 }
-export interface AnyProtoType {
+export interface AnyProtoMsg {
   typeUrl: "/google.protobuf.Any";
   value: Uint8Array;
 }
@@ -239,7 +239,7 @@ export interface AnyAmino {
   /** Must be a valid serialized protocol buffer of the above specified type. */
   value: Uint8Array;
 }
-export interface AnyAminoType {
+export interface AnyAminoMsg {
   type: "/google.protobuf.Any";
   value: AnyAmino;
 }
@@ -338,6 +338,8 @@ function createBaseAny(): Any {
 }
 
 export const Any = {
+  typeUrl: "/google.protobuf.Any",
+
   encode(message: Any, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.typeUrl !== "") {
       writer.uint32(10).string(message.typeUrl);
@@ -423,6 +425,25 @@ export const Any = {
     obj.type_url = message.typeUrl;
     obj.value = message.value;
     return obj;
+  },
+
+  fromAminoMsg(object: AnyAminoMsg): Any {
+    return Any.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: AnyProtoMsg): Any {
+    return Any.decode(message.value);
+  },
+
+  toProto(message: Any): Uint8Array {
+    return Any.encode(message).finish();
+  },
+
+  toProtoMsg(message: Any): AnyProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.Any",
+      value: Any.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/protobuf/api.ts b/__fixtures__/outputv2/google/protobuf/api.ts
index 9e19dc989..01205f906 100644
--- a/__fixtures__/outputv2/google/protobuf/api.ts
+++ b/__fixtures__/outputv2/google/protobuf/api.ts
@@ -63,7 +63,7 @@ export interface Api {
   /** The source syntax of the service. */
   syntax: Syntax;
 }
-export interface ApiProtoType {
+export interface ApiProtoMsg {
   typeUrl: "/google.protobuf.Api";
   value: Uint8Array;
 }
@@ -127,7 +127,7 @@ export interface ApiAmino {
   /** The source syntax of the service. */
   syntax: Syntax;
 }
-export interface ApiAminoType {
+export interface ApiAminoMsg {
   type: "/google.protobuf.Api";
   value: ApiAmino;
 }
@@ -176,7 +176,7 @@ export interface Method {
   /** The source syntax of this method. */
   syntax: Syntax;
 }
-export interface MethodProtoType {
+export interface MethodProtoMsg {
   typeUrl: "/google.protobuf.Method";
   value: Uint8Array;
 }
@@ -204,7 +204,7 @@ export interface MethodAmino {
   /** The source syntax of this method. */
   syntax: Syntax;
 }
-export interface MethodAminoType {
+export interface MethodAminoMsg {
   type: "/google.protobuf.Method";
   value: MethodAmino;
 }
@@ -310,7 +310,7 @@ export interface Mixin {
    */
   root: string;
 }
-export interface MixinProtoType {
+export interface MixinProtoMsg {
   typeUrl: "/google.protobuf.Mixin";
   value: Uint8Array;
 }
@@ -405,7 +405,7 @@ export interface MixinAmino {
    */
   root: string;
 }
-export interface MixinAminoType {
+export interface MixinAminoMsg {
   type: "/google.protobuf.Mixin";
   value: MixinAmino;
 }
@@ -508,6 +508,8 @@ function createBaseApi(): Api {
 }
 
 export const Api = {
+  typeUrl: "/google.protobuf.Api",
+
   encode(message: Api, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -719,6 +721,25 @@ export const Api = {
 
     obj.syntax = message.syntax;
     return obj;
+  },
+
+  fromAminoMsg(object: ApiAminoMsg): Api {
+    return Api.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ApiProtoMsg): Api {
+    return Api.decode(message.value);
+  },
+
+  toProto(message: Api): Uint8Array {
+    return Api.encode(message).finish();
+  },
+
+  toProtoMsg(message: Api): ApiProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.Api",
+      value: Api.encode(message).finish()
+    };
   }
 
 };
@@ -736,6 +757,8 @@ function createBaseMethod(): Method {
 }
 
 export const Method = {
+  typeUrl: "/google.protobuf.Method",
+
   encode(message: Method, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -914,6 +937,25 @@ export const Method = {
 
     obj.syntax = message.syntax;
     return obj;
+  },
+
+  fromAminoMsg(object: MethodAminoMsg): Method {
+    return Method.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MethodProtoMsg): Method {
+    return Method.decode(message.value);
+  },
+
+  toProto(message: Method): Uint8Array {
+    return Method.encode(message).finish();
+  },
+
+  toProtoMsg(message: Method): MethodProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.Method",
+      value: Method.encode(message).finish()
+    };
   }
 
 };
@@ -926,6 +968,8 @@ function createBaseMixin(): Mixin {
 }
 
 export const Mixin = {
+  typeUrl: "/google.protobuf.Mixin",
+
   encode(message: Mixin, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -1011,6 +1055,25 @@ export const Mixin = {
     obj.name = message.name;
     obj.root = message.root;
     return obj;
+  },
+
+  fromAminoMsg(object: MixinAminoMsg): Mixin {
+    return Mixin.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MixinProtoMsg): Mixin {
+    return Mixin.decode(message.value);
+  },
+
+  toProto(message: Mixin): Uint8Array {
+    return Mixin.encode(message).finish();
+  },
+
+  toProtoMsg(message: Mixin): MixinProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.Mixin",
+      value: Mixin.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/protobuf/compiler/plugin.ts b/__fixtures__/outputv2/google/protobuf/compiler/plugin.ts
index 11c3fdabb..16c2dc17b 100644
--- a/__fixtures__/outputv2/google/protobuf/compiler/plugin.ts
+++ b/__fixtures__/outputv2/google/protobuf/compiler/plugin.ts
@@ -15,7 +15,7 @@ export interface Version {
    */
   suffix: string;
 }
-export interface VersionProtoType {
+export interface VersionProtoMsg {
   typeUrl: "/google.protobuf.compiler.Version";
   value: Uint8Array;
 }
@@ -32,7 +32,7 @@ export interface VersionAmino {
    */
   suffix: string;
 }
-export interface VersionAminoType {
+export interface VersionAminoMsg {
   type: "/google.protobuf.compiler.Version";
   value: VersionAmino;
 }
@@ -78,7 +78,7 @@ export interface CodeGeneratorRequest {
   /** The version number of protocol compiler. */
   compilerVersion?: Version;
 }
-export interface CodeGeneratorRequestProtoType {
+export interface CodeGeneratorRequestProtoMsg {
   typeUrl: "/google.protobuf.compiler.CodeGeneratorRequest";
   value: Uint8Array;
 }
@@ -116,7 +116,7 @@ export interface CodeGeneratorRequestAmino {
   /** The version number of protocol compiler. */
   compiler_version?: VersionAmino;
 }
-export interface CodeGeneratorRequestAminoType {
+export interface CodeGeneratorRequestAminoMsg {
   type: "/google.protobuf.compiler.CodeGeneratorRequest";
   value: CodeGeneratorRequestAmino;
 }
@@ -144,7 +144,7 @@ export interface CodeGeneratorResponse {
   error: string;
   file: CodeGeneratorResponse_File[];
 }
-export interface CodeGeneratorResponseProtoType {
+export interface CodeGeneratorResponseProtoMsg {
   typeUrl: "/google.protobuf.compiler.CodeGeneratorResponse";
   value: Uint8Array;
 }
@@ -164,7 +164,7 @@ export interface CodeGeneratorResponseAmino {
   error: string;
   file: CodeGeneratorResponse_FileAmino[];
 }
-export interface CodeGeneratorResponseAminoType {
+export interface CodeGeneratorResponseAminoMsg {
   type: "/google.protobuf.compiler.CodeGeneratorResponse";
   value: CodeGeneratorResponseAmino;
 }
@@ -236,7 +236,7 @@ export interface CodeGeneratorResponse_File {
   /** The file contents. */
   content: string;
 }
-export interface CodeGeneratorResponse_FileProtoType {
+export interface CodeGeneratorResponse_FileProtoMsg {
   typeUrl: "/google.protobuf.compiler.File";
   value: Uint8Array;
 }
@@ -302,7 +302,7 @@ export interface CodeGeneratorResponse_FileAmino {
   /** The file contents. */
   content: string;
 }
-export interface CodeGeneratorResponse_FileAminoType {
+export interface CodeGeneratorResponse_FileAminoMsg {
   type: "/google.protobuf.compiler.File";
   value: CodeGeneratorResponse_FileAmino;
 }
@@ -324,6 +324,8 @@ function createBaseVersion(): Version {
 }
 
 export const Version = {
+  typeUrl: "/google.protobuf.compiler.Version",
+
   encode(message: Version, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.major !== 0) {
       writer.uint32(8).int32(message.major);
@@ -439,6 +441,25 @@ export const Version = {
     obj.patch = message.patch;
     obj.suffix = message.suffix;
     return obj;
+  },
+
+  fromAminoMsg(object: VersionAminoMsg): Version {
+    return Version.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: VersionProtoMsg): Version {
+    return Version.decode(message.value);
+  },
+
+  toProto(message: Version): Uint8Array {
+    return Version.encode(message).finish();
+  },
+
+  toProtoMsg(message: Version): VersionProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.compiler.Version",
+      value: Version.encode(message).finish()
+    };
   }
 
 };
@@ -453,6 +474,8 @@ function createBaseCodeGeneratorRequest(): CodeGeneratorRequest {
 }
 
 export const CodeGeneratorRequest = {
+  typeUrl: "/google.protobuf.compiler.CodeGeneratorRequest",
+
   encode(message: CodeGeneratorRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.fileToGenerate) {
       writer.uint32(10).string(v!);
@@ -604,6 +627,25 @@ export const CodeGeneratorRequest = {
 
     obj.compiler_version = message.compilerVersion ? Version.toAmino(message.compilerVersion) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: CodeGeneratorRequestAminoMsg): CodeGeneratorRequest {
+    return CodeGeneratorRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: CodeGeneratorRequestProtoMsg): CodeGeneratorRequest {
+    return CodeGeneratorRequest.decode(message.value);
+  },
+
+  toProto(message: CodeGeneratorRequest): Uint8Array {
+    return CodeGeneratorRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: CodeGeneratorRequest): CodeGeneratorRequestProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.compiler.CodeGeneratorRequest",
+      value: CodeGeneratorRequest.encode(message).finish()
+    };
   }
 
 };
@@ -616,6 +658,8 @@ function createBaseCodeGeneratorResponse(): CodeGeneratorResponse {
 }
 
 export const CodeGeneratorResponse = {
+  typeUrl: "/google.protobuf.compiler.CodeGeneratorResponse",
+
   encode(message: CodeGeneratorResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.error !== "") {
       writer.uint32(10).string(message.error);
@@ -719,6 +763,25 @@ export const CodeGeneratorResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: CodeGeneratorResponseAminoMsg): CodeGeneratorResponse {
+    return CodeGeneratorResponse.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: CodeGeneratorResponseProtoMsg): CodeGeneratorResponse {
+    return CodeGeneratorResponse.decode(message.value);
+  },
+
+  toProto(message: CodeGeneratorResponse): Uint8Array {
+    return CodeGeneratorResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: CodeGeneratorResponse): CodeGeneratorResponseProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.compiler.CodeGeneratorResponse",
+      value: CodeGeneratorResponse.encode(message).finish()
+    };
   }
 
 };
@@ -732,6 +795,8 @@ function createBaseCodeGeneratorResponse_File(): CodeGeneratorResponse_File {
 }
 
 export const CodeGeneratorResponse_File = {
+  typeUrl: "/google.protobuf.compiler.File",
+
   encode(message: CodeGeneratorResponse_File, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -832,6 +897,25 @@ export const CodeGeneratorResponse_File = {
     obj.insertion_point = message.insertionPoint;
     obj.content = message.content;
     return obj;
+  },
+
+  fromAminoMsg(object: CodeGeneratorResponse_FileAminoMsg): CodeGeneratorResponse_File {
+    return CodeGeneratorResponse_File.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: CodeGeneratorResponse_FileProtoMsg): CodeGeneratorResponse_File {
+    return CodeGeneratorResponse_File.decode(message.value);
+  },
+
+  toProto(message: CodeGeneratorResponse_File): Uint8Array {
+    return CodeGeneratorResponse_File.encode(message).finish();
+  },
+
+  toProtoMsg(message: CodeGeneratorResponse_File): CodeGeneratorResponse_FileProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.compiler.File",
+      value: CodeGeneratorResponse_File.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/protobuf/descriptor.ts b/__fixtures__/outputv2/google/protobuf/descriptor.ts
index 5e0d1b864..e9edf3145 100644
--- a/__fixtures__/outputv2/google/protobuf/descriptor.ts
+++ b/__fixtures__/outputv2/google/protobuf/descriptor.ts
@@ -447,7 +447,7 @@ export function methodOptions_IdempotencyLevelToJSON(object: MethodOptions_Idemp
 export interface FileDescriptorSet {
   file: FileDescriptorProto[];
 }
-export interface FileDescriptorSetProtoType {
+export interface FileDescriptorSetProtoMsg {
   typeUrl: "/google.protobuf.FileDescriptorSet";
   value: Uint8Array;
 }
@@ -459,7 +459,7 @@ export interface FileDescriptorSetProtoType {
 export interface FileDescriptorSetAmino {
   file: FileDescriptorProtoAmino[];
 }
-export interface FileDescriptorSetAminoType {
+export interface FileDescriptorSetAminoMsg {
   type: "/google.protobuf.FileDescriptorSet";
   value: FileDescriptorSetAmino;
 }
@@ -511,7 +511,7 @@ export interface FileDescriptorProto {
    */
   syntax: string;
 }
-export interface FileDescriptorProtoProtoType {
+export interface FileDescriptorProtoProtoMsg {
   typeUrl: "/google.protobuf.FileDescriptorProto";
   value: Uint8Array;
 }
@@ -555,7 +555,7 @@ export interface FileDescriptorProtoAmino {
    */
   syntax: string;
 }
-export interface FileDescriptorProtoAminoType {
+export interface FileDescriptorProtoAminoMsg {
   type: "/google.protobuf.FileDescriptorProto";
   value: FileDescriptorProtoAmino;
 }
@@ -594,7 +594,7 @@ export interface DescriptorProto {
    */
   reservedName: string[];
 }
-export interface DescriptorProtoProtoType {
+export interface DescriptorProtoProtoMsg {
   typeUrl: "/google.protobuf.DescriptorProto";
   value: Uint8Array;
 }
@@ -617,7 +617,7 @@ export interface DescriptorProtoAmino {
    */
   reserved_name: string[];
 }
-export interface DescriptorProtoAminoType {
+export interface DescriptorProtoAminoMsg {
   type: "/google.protobuf.DescriptorProto";
   value: DescriptorProtoAmino;
 }
@@ -643,7 +643,7 @@ export interface DescriptorProto_ExtensionRange {
   end: number;
   options?: ExtensionRangeOptions;
 }
-export interface DescriptorProto_ExtensionRangeProtoType {
+export interface DescriptorProto_ExtensionRangeProtoMsg {
   typeUrl: "/google.protobuf.ExtensionRange";
   value: Uint8Array;
 }
@@ -655,7 +655,7 @@ export interface DescriptorProto_ExtensionRangeAmino {
   end: number;
   options?: ExtensionRangeOptionsAmino;
 }
-export interface DescriptorProto_ExtensionRangeAminoType {
+export interface DescriptorProto_ExtensionRangeAminoMsg {
   type: "/google.protobuf.ExtensionRange";
   value: DescriptorProto_ExtensionRangeAmino;
 }
@@ -677,7 +677,7 @@ export interface DescriptorProto_ReservedRange {
   /** Exclusive. */
   end: number;
 }
-export interface DescriptorProto_ReservedRangeProtoType {
+export interface DescriptorProto_ReservedRangeProtoMsg {
   typeUrl: "/google.protobuf.ReservedRange";
   value: Uint8Array;
 }
@@ -694,7 +694,7 @@ export interface DescriptorProto_ReservedRangeAmino {
   /** Exclusive. */
   end: number;
 }
-export interface DescriptorProto_ReservedRangeAminoType {
+export interface DescriptorProto_ReservedRangeAminoMsg {
   type: "/google.protobuf.ReservedRange";
   value: DescriptorProto_ReservedRangeAmino;
 }
@@ -712,7 +712,7 @@ export interface ExtensionRangeOptions {
   /** The parser stores options it doesn't recognize here. See above. */
   uninterpretedOption: UninterpretedOption[];
 }
-export interface ExtensionRangeOptionsProtoType {
+export interface ExtensionRangeOptionsProtoMsg {
   typeUrl: "/google.protobuf.ExtensionRangeOptions";
   value: Uint8Array;
 }
@@ -720,7 +720,7 @@ export interface ExtensionRangeOptionsAmino {
   /** The parser stores options it doesn't recognize here. See above. */
   uninterpreted_option: UninterpretedOptionAmino[];
 }
-export interface ExtensionRangeOptionsAminoType {
+export interface ExtensionRangeOptionsAminoMsg {
   type: "/google.protobuf.ExtensionRangeOptions";
   value: ExtensionRangeOptionsAmino;
 }
@@ -779,7 +779,7 @@ export interface FieldDescriptorProto {
   jsonName: string;
   options?: FieldOptions;
 }
-export interface FieldDescriptorProtoProtoType {
+export interface FieldDescriptorProtoProtoMsg {
   typeUrl: "/google.protobuf.FieldDescriptorProto";
   value: Uint8Array;
 }
@@ -835,7 +835,7 @@ export interface FieldDescriptorProtoAmino {
   json_name: string;
   options?: FieldOptionsAmino;
 }
-export interface FieldDescriptorProtoAminoType {
+export interface FieldDescriptorProtoAminoMsg {
   type: "/google.protobuf.FieldDescriptorProto";
   value: FieldDescriptorProtoAmino;
 }
@@ -859,7 +859,7 @@ export interface OneofDescriptorProto {
   name: string;
   options?: OneofOptions;
 }
-export interface OneofDescriptorProtoProtoType {
+export interface OneofDescriptorProtoProtoMsg {
   typeUrl: "/google.protobuf.OneofDescriptorProto";
   value: Uint8Array;
 }
@@ -869,7 +869,7 @@ export interface OneofDescriptorProtoAmino {
   name: string;
   options?: OneofOptionsAmino;
 }
-export interface OneofDescriptorProtoAminoType {
+export interface OneofDescriptorProtoAminoMsg {
   type: "/google.protobuf.OneofDescriptorProto";
   value: OneofDescriptorProtoAmino;
 }
@@ -899,7 +899,7 @@ export interface EnumDescriptorProto {
    */
   reservedName: string[];
 }
-export interface EnumDescriptorProtoProtoType {
+export interface EnumDescriptorProtoProtoMsg {
   typeUrl: "/google.protobuf.EnumDescriptorProto";
   value: Uint8Array;
 }
@@ -923,7 +923,7 @@ export interface EnumDescriptorProtoAmino {
    */
   reserved_name: string[];
 }
-export interface EnumDescriptorProtoAminoType {
+export interface EnumDescriptorProtoAminoMsg {
   type: "/google.protobuf.EnumDescriptorProto";
   value: EnumDescriptorProtoAmino;
 }
@@ -952,7 +952,7 @@ export interface EnumDescriptorProto_EnumReservedRange {
   /** Inclusive. */
   end: number;
 }
-export interface EnumDescriptorProto_EnumReservedRangeProtoType {
+export interface EnumDescriptorProto_EnumReservedRangeProtoMsg {
   typeUrl: "/google.protobuf.EnumReservedRange";
   value: Uint8Array;
 }
@@ -972,7 +972,7 @@ export interface EnumDescriptorProto_EnumReservedRangeAmino {
   /** Inclusive. */
   end: number;
 }
-export interface EnumDescriptorProto_EnumReservedRangeAminoType {
+export interface EnumDescriptorProto_EnumReservedRangeAminoMsg {
   type: "/google.protobuf.EnumReservedRange";
   value: EnumDescriptorProto_EnumReservedRangeAmino;
 }
@@ -996,7 +996,7 @@ export interface EnumValueDescriptorProto {
   number: number;
   options?: EnumValueOptions;
 }
-export interface EnumValueDescriptorProtoProtoType {
+export interface EnumValueDescriptorProtoProtoMsg {
   typeUrl: "/google.protobuf.EnumValueDescriptorProto";
   value: Uint8Array;
 }
@@ -1007,7 +1007,7 @@ export interface EnumValueDescriptorProtoAmino {
   number: number;
   options?: EnumValueOptionsAmino;
 }
-export interface EnumValueDescriptorProtoAminoType {
+export interface EnumValueDescriptorProtoAminoMsg {
   type: "/google.protobuf.EnumValueDescriptorProto";
   value: EnumValueDescriptorProtoAmino;
 }
@@ -1025,7 +1025,7 @@ export interface ServiceDescriptorProto {
   method: MethodDescriptorProto[];
   options?: ServiceOptions;
 }
-export interface ServiceDescriptorProtoProtoType {
+export interface ServiceDescriptorProtoProtoMsg {
   typeUrl: "/google.protobuf.ServiceDescriptorProto";
   value: Uint8Array;
 }
@@ -1036,7 +1036,7 @@ export interface ServiceDescriptorProtoAmino {
   method: MethodDescriptorProtoAmino[];
   options?: ServiceOptionsAmino;
 }
-export interface ServiceDescriptorProtoAminoType {
+export interface ServiceDescriptorProtoAminoMsg {
   type: "/google.protobuf.ServiceDescriptorProto";
   value: ServiceDescriptorProtoAmino;
 }
@@ -1066,7 +1066,7 @@ export interface MethodDescriptorProto {
   /** Identifies if server streams multiple server messages */
   serverStreaming: boolean;
 }
-export interface MethodDescriptorProtoProtoType {
+export interface MethodDescriptorProtoProtoMsg {
   typeUrl: "/google.protobuf.MethodDescriptorProto";
   value: Uint8Array;
 }
@@ -1089,7 +1089,7 @@ export interface MethodDescriptorProtoAmino {
   /** Identifies if server streams multiple server messages */
   server_streaming: boolean;
 }
-export interface MethodDescriptorProtoAminoType {
+export interface MethodDescriptorProtoAminoMsg {
   type: "/google.protobuf.MethodDescriptorProto";
   value: MethodDescriptorProtoAmino;
 }
@@ -1237,7 +1237,7 @@ export interface FileOptions {
    */
   uninterpretedOption: UninterpretedOption[];
 }
-export interface FileOptionsProtoType {
+export interface FileOptionsProtoMsg {
   typeUrl: "/google.protobuf.FileOptions";
   value: Uint8Array;
 }
@@ -1375,7 +1375,7 @@ export interface FileOptionsAmino {
    */
   uninterpreted_option: UninterpretedOptionAmino[];
 }
-export interface FileOptionsAminoType {
+export interface FileOptionsAminoMsg {
   type: "/google.protobuf.FileOptions";
   value: FileOptionsAmino;
 }
@@ -1470,7 +1470,7 @@ export interface MessageOptions {
   /** The parser stores options it doesn't recognize here. See above. */
   uninterpretedOption: UninterpretedOption[];
 }
-export interface MessageOptionsProtoType {
+export interface MessageOptionsProtoMsg {
   typeUrl: "/google.protobuf.MessageOptions";
   value: Uint8Array;
 }
@@ -1540,7 +1540,7 @@ export interface MessageOptionsAmino {
   /** The parser stores options it doesn't recognize here. See above. */
   uninterpreted_option: UninterpretedOptionAmino[];
 }
-export interface MessageOptionsAminoType {
+export interface MessageOptionsAminoMsg {
   type: "/google.protobuf.MessageOptions";
   value: MessageOptionsAmino;
 }
@@ -1630,7 +1630,7 @@ export interface FieldOptions {
   /** The parser stores options it doesn't recognize here. See above. */
   uninterpretedOption: UninterpretedOption[];
 }
-export interface FieldOptionsProtoType {
+export interface FieldOptionsProtoMsg {
   typeUrl: "/google.protobuf.FieldOptions";
   value: Uint8Array;
 }
@@ -1713,7 +1713,7 @@ export interface FieldOptionsAmino {
   /** The parser stores options it doesn't recognize here. See above. */
   uninterpreted_option: UninterpretedOptionAmino[];
 }
-export interface FieldOptionsAminoType {
+export interface FieldOptionsAminoMsg {
   type: "/google.protobuf.FieldOptions";
   value: FieldOptionsAmino;
 }
@@ -1730,7 +1730,7 @@ export interface OneofOptions {
   /** The parser stores options it doesn't recognize here. See above. */
   uninterpretedOption: UninterpretedOption[];
 }
-export interface OneofOptionsProtoType {
+export interface OneofOptionsProtoMsg {
   typeUrl: "/google.protobuf.OneofOptions";
   value: Uint8Array;
 }
@@ -1738,7 +1738,7 @@ export interface OneofOptionsAmino {
   /** The parser stores options it doesn't recognize here. See above. */
   uninterpreted_option: UninterpretedOptionAmino[];
 }
-export interface OneofOptionsAminoType {
+export interface OneofOptionsAminoMsg {
   type: "/google.protobuf.OneofOptions";
   value: OneofOptionsAmino;
 }
@@ -1763,7 +1763,7 @@ export interface EnumOptions {
   /** The parser stores options it doesn't recognize here. See above. */
   uninterpretedOption: UninterpretedOption[];
 }
-export interface EnumOptionsProtoType {
+export interface EnumOptionsProtoMsg {
   typeUrl: "/google.protobuf.EnumOptions";
   value: Uint8Array;
 }
@@ -1785,7 +1785,7 @@ export interface EnumOptionsAmino {
   /** The parser stores options it doesn't recognize here. See above. */
   uninterpreted_option: UninterpretedOptionAmino[];
 }
-export interface EnumOptionsAminoType {
+export interface EnumOptionsAminoMsg {
   type: "/google.protobuf.EnumOptions";
   value: EnumOptionsAmino;
 }
@@ -1806,7 +1806,7 @@ export interface EnumValueOptions {
   /** The parser stores options it doesn't recognize here. See above. */
   uninterpretedOption: UninterpretedOption[];
 }
-export interface EnumValueOptionsProtoType {
+export interface EnumValueOptionsProtoMsg {
   typeUrl: "/google.protobuf.EnumValueOptions";
   value: Uint8Array;
 }
@@ -1822,7 +1822,7 @@ export interface EnumValueOptionsAmino {
   /** The parser stores options it doesn't recognize here. See above. */
   uninterpreted_option: UninterpretedOptionAmino[];
 }
-export interface EnumValueOptionsAminoType {
+export interface EnumValueOptionsAminoMsg {
   type: "/google.protobuf.EnumValueOptions";
   value: EnumValueOptionsAmino;
 }
@@ -1842,7 +1842,7 @@ export interface ServiceOptions {
   /** The parser stores options it doesn't recognize here. See above. */
   uninterpretedOption: UninterpretedOption[];
 }
-export interface ServiceOptionsProtoType {
+export interface ServiceOptionsProtoMsg {
   typeUrl: "/google.protobuf.ServiceOptions";
   value: Uint8Array;
 }
@@ -1858,7 +1858,7 @@ export interface ServiceOptionsAmino {
   /** The parser stores options it doesn't recognize here. See above. */
   uninterpreted_option: UninterpretedOptionAmino[];
 }
-export interface ServiceOptionsAminoType {
+export interface ServiceOptionsAminoMsg {
   type: "/google.protobuf.ServiceOptions";
   value: ServiceOptionsAmino;
 }
@@ -1879,7 +1879,7 @@ export interface MethodOptions {
   /** The parser stores options it doesn't recognize here. See above. */
   uninterpretedOption: UninterpretedOption[];
 }
-export interface MethodOptionsProtoType {
+export interface MethodOptionsProtoMsg {
   typeUrl: "/google.protobuf.MethodOptions";
   value: Uint8Array;
 }
@@ -1896,7 +1896,7 @@ export interface MethodOptionsAmino {
   /** The parser stores options it doesn't recognize here. See above. */
   uninterpreted_option: UninterpretedOptionAmino[];
 }
-export interface MethodOptionsAminoType {
+export interface MethodOptionsAminoMsg {
   type: "/google.protobuf.MethodOptions";
   value: MethodOptionsAmino;
 }
@@ -1928,7 +1928,7 @@ export interface UninterpretedOption {
   stringValue: Uint8Array;
   aggregateValue: string;
 }
-export interface UninterpretedOptionProtoType {
+export interface UninterpretedOptionProtoMsg {
   typeUrl: "/google.protobuf.UninterpretedOption";
   value: Uint8Array;
 }
@@ -1955,7 +1955,7 @@ export interface UninterpretedOptionAmino {
   string_value: Uint8Array;
   aggregate_value: string;
 }
-export interface UninterpretedOptionAminoType {
+export interface UninterpretedOptionAminoMsg {
   type: "/google.protobuf.UninterpretedOption";
   value: UninterpretedOptionAmino;
 }
@@ -1989,7 +1989,7 @@ export interface UninterpretedOption_NamePart {
   namePart: string;
   isExtension: boolean;
 }
-export interface UninterpretedOption_NamePartProtoType {
+export interface UninterpretedOption_NamePartProtoMsg {
   typeUrl: "/google.protobuf.NamePart";
   value: Uint8Array;
 }
@@ -2005,7 +2005,7 @@ export interface UninterpretedOption_NamePartAmino {
   name_part: string;
   is_extension: boolean;
 }
-export interface UninterpretedOption_NamePartAminoType {
+export interface UninterpretedOption_NamePartAminoMsg {
   type: "/google.protobuf.NamePart";
   value: UninterpretedOption_NamePartAmino;
 }
@@ -2074,7 +2074,7 @@ export interface SourceCodeInfo {
    */
   location: SourceCodeInfo_Location[];
 }
-export interface SourceCodeInfoProtoType {
+export interface SourceCodeInfoProtoMsg {
   typeUrl: "/google.protobuf.SourceCodeInfo";
   value: Uint8Array;
 }
@@ -2131,7 +2131,7 @@ export interface SourceCodeInfoAmino {
    */
   location: SourceCodeInfo_LocationAmino[];
 }
-export interface SourceCodeInfoAminoType {
+export interface SourceCodeInfoAminoMsg {
   type: "/google.protobuf.SourceCodeInfo";
   value: SourceCodeInfoAmino;
 }
@@ -2233,7 +2233,7 @@ export interface SourceCodeInfo_Location {
   trailingComments: string;
   leadingDetachedComments: string[];
 }
-export interface SourceCodeInfo_LocationProtoType {
+export interface SourceCodeInfo_LocationProtoMsg {
   typeUrl: "/google.protobuf.Location";
   value: Uint8Array;
 }
@@ -2327,7 +2327,7 @@ export interface SourceCodeInfo_LocationAmino {
   trailing_comments: string;
   leading_detached_comments: string[];
 }
-export interface SourceCodeInfo_LocationAminoType {
+export interface SourceCodeInfo_LocationAminoMsg {
   type: "/google.protobuf.Location";
   value: SourceCodeInfo_LocationAmino;
 }
@@ -2351,7 +2351,7 @@ export interface GeneratedCodeInfo {
    */
   annotation: GeneratedCodeInfo_Annotation[];
 }
-export interface GeneratedCodeInfoProtoType {
+export interface GeneratedCodeInfoProtoMsg {
   typeUrl: "/google.protobuf.GeneratedCodeInfo";
   value: Uint8Array;
 }
@@ -2368,7 +2368,7 @@ export interface GeneratedCodeInfoAmino {
    */
   annotation: GeneratedCodeInfo_AnnotationAmino[];
 }
-export interface GeneratedCodeInfoAminoType {
+export interface GeneratedCodeInfoAminoMsg {
   type: "/google.protobuf.GeneratedCodeInfo";
   value: GeneratedCodeInfoAmino;
 }
@@ -2404,7 +2404,7 @@ export interface GeneratedCodeInfo_Annotation {
    */
   end: number;
 }
-export interface GeneratedCodeInfo_AnnotationProtoType {
+export interface GeneratedCodeInfo_AnnotationProtoMsg {
   typeUrl: "/google.protobuf.Annotation";
   value: Uint8Array;
 }
@@ -2431,7 +2431,7 @@ export interface GeneratedCodeInfo_AnnotationAmino {
    */
   end: number;
 }
-export interface GeneratedCodeInfo_AnnotationAminoType {
+export interface GeneratedCodeInfo_AnnotationAminoMsg {
   type: "/google.protobuf.Annotation";
   value: GeneratedCodeInfo_AnnotationAmino;
 }
@@ -2449,6 +2449,8 @@ function createBaseFileDescriptorSet(): FileDescriptorSet {
 }
 
 export const FileDescriptorSet = {
+  typeUrl: "/google.protobuf.FileDescriptorSet",
+
   encode(message: FileDescriptorSet, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.file) {
       FileDescriptorProto.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -2537,6 +2539,25 @@ export const FileDescriptorSet = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: FileDescriptorSetAminoMsg): FileDescriptorSet {
+    return FileDescriptorSet.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: FileDescriptorSetProtoMsg): FileDescriptorSet {
+    return FileDescriptorSet.decode(message.value);
+  },
+
+  toProto(message: FileDescriptorSet): Uint8Array {
+    return FileDescriptorSet.encode(message).finish();
+  },
+
+  toProtoMsg(message: FileDescriptorSet): FileDescriptorSetProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.FileDescriptorSet",
+      value: FileDescriptorSet.encode(message).finish()
+    };
   }
 
 };
@@ -2559,6 +2580,8 @@ function createBaseFileDescriptorProto(): FileDescriptorProto {
 }
 
 export const FileDescriptorProto = {
+  typeUrl: "/google.protobuf.FileDescriptorProto",
+
   encode(message: FileDescriptorProto, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -2927,6 +2950,25 @@ export const FileDescriptorProto = {
     obj.source_code_info = message.sourceCodeInfo ? SourceCodeInfo.toAmino(message.sourceCodeInfo) : undefined;
     obj.syntax = message.syntax;
     return obj;
+  },
+
+  fromAminoMsg(object: FileDescriptorProtoAminoMsg): FileDescriptorProto {
+    return FileDescriptorProto.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: FileDescriptorProtoProtoMsg): FileDescriptorProto {
+    return FileDescriptorProto.decode(message.value);
+  },
+
+  toProto(message: FileDescriptorProto): Uint8Array {
+    return FileDescriptorProto.encode(message).finish();
+  },
+
+  toProtoMsg(message: FileDescriptorProto): FileDescriptorProtoProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.FileDescriptorProto",
+      value: FileDescriptorProto.encode(message).finish()
+    };
   }
 
 };
@@ -2947,6 +2989,8 @@ function createBaseDescriptorProto(): DescriptorProto {
 }
 
 export const DescriptorProto = {
+  typeUrl: "/google.protobuf.DescriptorProto",
+
   encode(message: DescriptorProto, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -3278,6 +3322,25 @@ export const DescriptorProto = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: DescriptorProtoAminoMsg): DescriptorProto {
+    return DescriptorProto.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: DescriptorProtoProtoMsg): DescriptorProto {
+    return DescriptorProto.decode(message.value);
+  },
+
+  toProto(message: DescriptorProto): Uint8Array {
+    return DescriptorProto.encode(message).finish();
+  },
+
+  toProtoMsg(message: DescriptorProto): DescriptorProtoProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.DescriptorProto",
+      value: DescriptorProto.encode(message).finish()
+    };
   }
 
 };
@@ -3291,6 +3354,8 @@ function createBaseDescriptorProto_ExtensionRange(): DescriptorProto_ExtensionRa
 }
 
 export const DescriptorProto_ExtensionRange = {
+  typeUrl: "/google.protobuf.ExtensionRange",
+
   encode(message: DescriptorProto_ExtensionRange, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.start !== 0) {
       writer.uint32(8).int32(message.start);
@@ -3391,6 +3456,25 @@ export const DescriptorProto_ExtensionRange = {
     obj.end = message.end;
     obj.options = message.options ? ExtensionRangeOptions.toAmino(message.options) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: DescriptorProto_ExtensionRangeAminoMsg): DescriptorProto_ExtensionRange {
+    return DescriptorProto_ExtensionRange.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: DescriptorProto_ExtensionRangeProtoMsg): DescriptorProto_ExtensionRange {
+    return DescriptorProto_ExtensionRange.decode(message.value);
+  },
+
+  toProto(message: DescriptorProto_ExtensionRange): Uint8Array {
+    return DescriptorProto_ExtensionRange.encode(message).finish();
+  },
+
+  toProtoMsg(message: DescriptorProto_ExtensionRange): DescriptorProto_ExtensionRangeProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.ExtensionRange",
+      value: DescriptorProto_ExtensionRange.encode(message).finish()
+    };
   }
 
 };
@@ -3403,6 +3487,8 @@ function createBaseDescriptorProto_ReservedRange(): DescriptorProto_ReservedRang
 }
 
 export const DescriptorProto_ReservedRange = {
+  typeUrl: "/google.protobuf.ReservedRange",
+
   encode(message: DescriptorProto_ReservedRange, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.start !== 0) {
       writer.uint32(8).int32(message.start);
@@ -3488,6 +3574,25 @@ export const DescriptorProto_ReservedRange = {
     obj.start = message.start;
     obj.end = message.end;
     return obj;
+  },
+
+  fromAminoMsg(object: DescriptorProto_ReservedRangeAminoMsg): DescriptorProto_ReservedRange {
+    return DescriptorProto_ReservedRange.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: DescriptorProto_ReservedRangeProtoMsg): DescriptorProto_ReservedRange {
+    return DescriptorProto_ReservedRange.decode(message.value);
+  },
+
+  toProto(message: DescriptorProto_ReservedRange): Uint8Array {
+    return DescriptorProto_ReservedRange.encode(message).finish();
+  },
+
+  toProtoMsg(message: DescriptorProto_ReservedRange): DescriptorProto_ReservedRangeProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.ReservedRange",
+      value: DescriptorProto_ReservedRange.encode(message).finish()
+    };
   }
 
 };
@@ -3499,6 +3604,8 @@ function createBaseExtensionRangeOptions(): ExtensionRangeOptions {
 }
 
 export const ExtensionRangeOptions = {
+  typeUrl: "/google.protobuf.ExtensionRangeOptions",
+
   encode(message: ExtensionRangeOptions, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.uninterpretedOption) {
       UninterpretedOption.encode(v!, writer.uint32(7994).fork()).ldelim();
@@ -3587,6 +3694,25 @@ export const ExtensionRangeOptions = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ExtensionRangeOptionsAminoMsg): ExtensionRangeOptions {
+    return ExtensionRangeOptions.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ExtensionRangeOptionsProtoMsg): ExtensionRangeOptions {
+    return ExtensionRangeOptions.decode(message.value);
+  },
+
+  toProto(message: ExtensionRangeOptions): Uint8Array {
+    return ExtensionRangeOptions.encode(message).finish();
+  },
+
+  toProtoMsg(message: ExtensionRangeOptions): ExtensionRangeOptionsProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.ExtensionRangeOptions",
+      value: ExtensionRangeOptions.encode(message).finish()
+    };
   }
 
 };
@@ -3607,6 +3733,8 @@ function createBaseFieldDescriptorProto(): FieldDescriptorProto {
 }
 
 export const FieldDescriptorProto = {
+  typeUrl: "/google.protobuf.FieldDescriptorProto",
+
   encode(message: FieldDescriptorProto, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -3812,6 +3940,25 @@ export const FieldDescriptorProto = {
     obj.json_name = message.jsonName;
     obj.options = message.options ? FieldOptions.toAmino(message.options) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: FieldDescriptorProtoAminoMsg): FieldDescriptorProto {
+    return FieldDescriptorProto.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: FieldDescriptorProtoProtoMsg): FieldDescriptorProto {
+    return FieldDescriptorProto.decode(message.value);
+  },
+
+  toProto(message: FieldDescriptorProto): Uint8Array {
+    return FieldDescriptorProto.encode(message).finish();
+  },
+
+  toProtoMsg(message: FieldDescriptorProto): FieldDescriptorProtoProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.FieldDescriptorProto",
+      value: FieldDescriptorProto.encode(message).finish()
+    };
   }
 
 };
@@ -3824,6 +3971,8 @@ function createBaseOneofDescriptorProto(): OneofDescriptorProto {
 }
 
 export const OneofDescriptorProto = {
+  typeUrl: "/google.protobuf.OneofDescriptorProto",
+
   encode(message: OneofDescriptorProto, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -3909,6 +4058,25 @@ export const OneofDescriptorProto = {
     obj.name = message.name;
     obj.options = message.options ? OneofOptions.toAmino(message.options) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: OneofDescriptorProtoAminoMsg): OneofDescriptorProto {
+    return OneofDescriptorProto.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: OneofDescriptorProtoProtoMsg): OneofDescriptorProto {
+    return OneofDescriptorProto.decode(message.value);
+  },
+
+  toProto(message: OneofDescriptorProto): Uint8Array {
+    return OneofDescriptorProto.encode(message).finish();
+  },
+
+  toProtoMsg(message: OneofDescriptorProto): OneofDescriptorProtoProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.OneofDescriptorProto",
+      value: OneofDescriptorProto.encode(message).finish()
+    };
   }
 
 };
@@ -3924,6 +4092,8 @@ function createBaseEnumDescriptorProto(): EnumDescriptorProto {
 }
 
 export const EnumDescriptorProto = {
+  typeUrl: "/google.protobuf.EnumDescriptorProto",
+
   encode(message: EnumDescriptorProto, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -4105,6 +4275,25 @@ export const EnumDescriptorProto = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: EnumDescriptorProtoAminoMsg): EnumDescriptorProto {
+    return EnumDescriptorProto.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: EnumDescriptorProtoProtoMsg): EnumDescriptorProto {
+    return EnumDescriptorProto.decode(message.value);
+  },
+
+  toProto(message: EnumDescriptorProto): Uint8Array {
+    return EnumDescriptorProto.encode(message).finish();
+  },
+
+  toProtoMsg(message: EnumDescriptorProto): EnumDescriptorProtoProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.EnumDescriptorProto",
+      value: EnumDescriptorProto.encode(message).finish()
+    };
   }
 
 };
@@ -4117,6 +4306,8 @@ function createBaseEnumDescriptorProto_EnumReservedRange(): EnumDescriptorProto_
 }
 
 export const EnumDescriptorProto_EnumReservedRange = {
+  typeUrl: "/google.protobuf.EnumReservedRange",
+
   encode(message: EnumDescriptorProto_EnumReservedRange, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.start !== 0) {
       writer.uint32(8).int32(message.start);
@@ -4202,6 +4393,25 @@ export const EnumDescriptorProto_EnumReservedRange = {
     obj.start = message.start;
     obj.end = message.end;
     return obj;
+  },
+
+  fromAminoMsg(object: EnumDescriptorProto_EnumReservedRangeAminoMsg): EnumDescriptorProto_EnumReservedRange {
+    return EnumDescriptorProto_EnumReservedRange.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: EnumDescriptorProto_EnumReservedRangeProtoMsg): EnumDescriptorProto_EnumReservedRange {
+    return EnumDescriptorProto_EnumReservedRange.decode(message.value);
+  },
+
+  toProto(message: EnumDescriptorProto_EnumReservedRange): Uint8Array {
+    return EnumDescriptorProto_EnumReservedRange.encode(message).finish();
+  },
+
+  toProtoMsg(message: EnumDescriptorProto_EnumReservedRange): EnumDescriptorProto_EnumReservedRangeProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.EnumReservedRange",
+      value: EnumDescriptorProto_EnumReservedRange.encode(message).finish()
+    };
   }
 
 };
@@ -4215,6 +4425,8 @@ function createBaseEnumValueDescriptorProto(): EnumValueDescriptorProto {
 }
 
 export const EnumValueDescriptorProto = {
+  typeUrl: "/google.protobuf.EnumValueDescriptorProto",
+
   encode(message: EnumValueDescriptorProto, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -4315,6 +4527,25 @@ export const EnumValueDescriptorProto = {
     obj.number = message.number;
     obj.options = message.options ? EnumValueOptions.toAmino(message.options) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: EnumValueDescriptorProtoAminoMsg): EnumValueDescriptorProto {
+    return EnumValueDescriptorProto.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: EnumValueDescriptorProtoProtoMsg): EnumValueDescriptorProto {
+    return EnumValueDescriptorProto.decode(message.value);
+  },
+
+  toProto(message: EnumValueDescriptorProto): Uint8Array {
+    return EnumValueDescriptorProto.encode(message).finish();
+  },
+
+  toProtoMsg(message: EnumValueDescriptorProto): EnumValueDescriptorProtoProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.EnumValueDescriptorProto",
+      value: EnumValueDescriptorProto.encode(message).finish()
+    };
   }
 
 };
@@ -4328,6 +4559,8 @@ function createBaseServiceDescriptorProto(): ServiceDescriptorProto {
 }
 
 export const ServiceDescriptorProto = {
+  typeUrl: "/google.protobuf.ServiceDescriptorProto",
+
   encode(message: ServiceDescriptorProto, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -4446,6 +4679,25 @@ export const ServiceDescriptorProto = {
 
     obj.options = message.options ? ServiceOptions.toAmino(message.options) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ServiceDescriptorProtoAminoMsg): ServiceDescriptorProto {
+    return ServiceDescriptorProto.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ServiceDescriptorProtoProtoMsg): ServiceDescriptorProto {
+    return ServiceDescriptorProto.decode(message.value);
+  },
+
+  toProto(message: ServiceDescriptorProto): Uint8Array {
+    return ServiceDescriptorProto.encode(message).finish();
+  },
+
+  toProtoMsg(message: ServiceDescriptorProto): ServiceDescriptorProtoProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.ServiceDescriptorProto",
+      value: ServiceDescriptorProto.encode(message).finish()
+    };
   }
 
 };
@@ -4462,6 +4714,8 @@ function createBaseMethodDescriptorProto(): MethodDescriptorProto {
 }
 
 export const MethodDescriptorProto = {
+  typeUrl: "/google.protobuf.MethodDescriptorProto",
+
   encode(message: MethodDescriptorProto, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -4607,6 +4861,25 @@ export const MethodDescriptorProto = {
     obj.client_streaming = message.clientStreaming;
     obj.server_streaming = message.serverStreaming;
     return obj;
+  },
+
+  fromAminoMsg(object: MethodDescriptorProtoAminoMsg): MethodDescriptorProto {
+    return MethodDescriptorProto.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MethodDescriptorProtoProtoMsg): MethodDescriptorProto {
+    return MethodDescriptorProto.decode(message.value);
+  },
+
+  toProto(message: MethodDescriptorProto): Uint8Array {
+    return MethodDescriptorProto.encode(message).finish();
+  },
+
+  toProtoMsg(message: MethodDescriptorProto): MethodDescriptorProtoProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.MethodDescriptorProto",
+      value: MethodDescriptorProto.encode(message).finish()
+    };
   }
 
 };
@@ -4638,6 +4911,8 @@ function createBaseFileOptions(): FileOptions {
 }
 
 export const FileOptions = {
+  typeUrl: "/google.protobuf.FileOptions",
+
   encode(message: FileOptions, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.javaPackage !== "") {
       writer.uint32(10).string(message.javaPackage);
@@ -5026,6 +5301,25 @@ export const FileOptions = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: FileOptionsAminoMsg): FileOptions {
+    return FileOptions.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: FileOptionsProtoMsg): FileOptions {
+    return FileOptions.decode(message.value);
+  },
+
+  toProto(message: FileOptions): Uint8Array {
+    return FileOptions.encode(message).finish();
+  },
+
+  toProtoMsg(message: FileOptions): FileOptionsProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.FileOptions",
+      value: FileOptions.encode(message).finish()
+    };
   }
 
 };
@@ -5041,6 +5335,8 @@ function createBaseMessageOptions(): MessageOptions {
 }
 
 export const MessageOptions = {
+  typeUrl: "/google.protobuf.MessageOptions",
+
   encode(message: MessageOptions, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.messageSetWireFormat === true) {
       writer.uint32(8).bool(message.messageSetWireFormat);
@@ -5189,6 +5485,25 @@ export const MessageOptions = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: MessageOptionsAminoMsg): MessageOptions {
+    return MessageOptions.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MessageOptionsProtoMsg): MessageOptions {
+    return MessageOptions.decode(message.value);
+  },
+
+  toProto(message: MessageOptions): Uint8Array {
+    return MessageOptions.encode(message).finish();
+  },
+
+  toProtoMsg(message: MessageOptions): MessageOptionsProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.MessageOptions",
+      value: MessageOptions.encode(message).finish()
+    };
   }
 
 };
@@ -5206,6 +5521,8 @@ function createBaseFieldOptions(): FieldOptions {
 }
 
 export const FieldOptions = {
+  typeUrl: "/google.protobuf.FieldOptions",
+
   encode(message: FieldOptions, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.ctype !== 1) {
       writer.uint32(8).int32(message.ctype);
@@ -5384,6 +5701,25 @@ export const FieldOptions = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: FieldOptionsAminoMsg): FieldOptions {
+    return FieldOptions.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: FieldOptionsProtoMsg): FieldOptions {
+    return FieldOptions.decode(message.value);
+  },
+
+  toProto(message: FieldOptions): Uint8Array {
+    return FieldOptions.encode(message).finish();
+  },
+
+  toProtoMsg(message: FieldOptions): FieldOptionsProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.FieldOptions",
+      value: FieldOptions.encode(message).finish()
+    };
   }
 
 };
@@ -5395,6 +5731,8 @@ function createBaseOneofOptions(): OneofOptions {
 }
 
 export const OneofOptions = {
+  typeUrl: "/google.protobuf.OneofOptions",
+
   encode(message: OneofOptions, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.uninterpretedOption) {
       UninterpretedOption.encode(v!, writer.uint32(7994).fork()).ldelim();
@@ -5483,6 +5821,25 @@ export const OneofOptions = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: OneofOptionsAminoMsg): OneofOptions {
+    return OneofOptions.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: OneofOptionsProtoMsg): OneofOptions {
+    return OneofOptions.decode(message.value);
+  },
+
+  toProto(message: OneofOptions): Uint8Array {
+    return OneofOptions.encode(message).finish();
+  },
+
+  toProtoMsg(message: OneofOptions): OneofOptionsProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.OneofOptions",
+      value: OneofOptions.encode(message).finish()
+    };
   }
 
 };
@@ -5496,6 +5853,8 @@ function createBaseEnumOptions(): EnumOptions {
 }
 
 export const EnumOptions = {
+  typeUrl: "/google.protobuf.EnumOptions",
+
   encode(message: EnumOptions, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.allowAlias === true) {
       writer.uint32(16).bool(message.allowAlias);
@@ -5614,6 +5973,25 @@ export const EnumOptions = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: EnumOptionsAminoMsg): EnumOptions {
+    return EnumOptions.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: EnumOptionsProtoMsg): EnumOptions {
+    return EnumOptions.decode(message.value);
+  },
+
+  toProto(message: EnumOptions): Uint8Array {
+    return EnumOptions.encode(message).finish();
+  },
+
+  toProtoMsg(message: EnumOptions): EnumOptionsProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.EnumOptions",
+      value: EnumOptions.encode(message).finish()
+    };
   }
 
 };
@@ -5626,6 +6004,8 @@ function createBaseEnumValueOptions(): EnumValueOptions {
 }
 
 export const EnumValueOptions = {
+  typeUrl: "/google.protobuf.EnumValueOptions",
+
   encode(message: EnumValueOptions, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.deprecated === true) {
       writer.uint32(8).bool(message.deprecated);
@@ -5729,6 +6109,25 @@ export const EnumValueOptions = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: EnumValueOptionsAminoMsg): EnumValueOptions {
+    return EnumValueOptions.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: EnumValueOptionsProtoMsg): EnumValueOptions {
+    return EnumValueOptions.decode(message.value);
+  },
+
+  toProto(message: EnumValueOptions): Uint8Array {
+    return EnumValueOptions.encode(message).finish();
+  },
+
+  toProtoMsg(message: EnumValueOptions): EnumValueOptionsProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.EnumValueOptions",
+      value: EnumValueOptions.encode(message).finish()
+    };
   }
 
 };
@@ -5741,6 +6140,8 @@ function createBaseServiceOptions(): ServiceOptions {
 }
 
 export const ServiceOptions = {
+  typeUrl: "/google.protobuf.ServiceOptions",
+
   encode(message: ServiceOptions, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.deprecated === true) {
       writer.uint32(264).bool(message.deprecated);
@@ -5844,6 +6245,25 @@ export const ServiceOptions = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ServiceOptionsAminoMsg): ServiceOptions {
+    return ServiceOptions.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ServiceOptionsProtoMsg): ServiceOptions {
+    return ServiceOptions.decode(message.value);
+  },
+
+  toProto(message: ServiceOptions): Uint8Array {
+    return ServiceOptions.encode(message).finish();
+  },
+
+  toProtoMsg(message: ServiceOptions): ServiceOptionsProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.ServiceOptions",
+      value: ServiceOptions.encode(message).finish()
+    };
   }
 
 };
@@ -5857,6 +6277,8 @@ function createBaseMethodOptions(): MethodOptions {
 }
 
 export const MethodOptions = {
+  typeUrl: "/google.protobuf.MethodOptions",
+
   encode(message: MethodOptions, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.deprecated === true) {
       writer.uint32(264).bool(message.deprecated);
@@ -5975,6 +6397,25 @@ export const MethodOptions = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: MethodOptionsAminoMsg): MethodOptions {
+    return MethodOptions.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: MethodOptionsProtoMsg): MethodOptions {
+    return MethodOptions.decode(message.value);
+  },
+
+  toProto(message: MethodOptions): Uint8Array {
+    return MethodOptions.encode(message).finish();
+  },
+
+  toProtoMsg(message: MethodOptions): MethodOptionsProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.MethodOptions",
+      value: MethodOptions.encode(message).finish()
+    };
   }
 
 };
@@ -5992,6 +6433,8 @@ function createBaseUninterpretedOption(): UninterpretedOption {
 }
 
 export const UninterpretedOption = {
+  typeUrl: "/google.protobuf.UninterpretedOption",
+
   encode(message: UninterpretedOption, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.name) {
       UninterpretedOption_NamePart.encode(v!, writer.uint32(18).fork()).ldelim();
@@ -6170,6 +6613,25 @@ export const UninterpretedOption = {
     obj.string_value = message.stringValue;
     obj.aggregate_value = message.aggregateValue;
     return obj;
+  },
+
+  fromAminoMsg(object: UninterpretedOptionAminoMsg): UninterpretedOption {
+    return UninterpretedOption.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: UninterpretedOptionProtoMsg): UninterpretedOption {
+    return UninterpretedOption.decode(message.value);
+  },
+
+  toProto(message: UninterpretedOption): Uint8Array {
+    return UninterpretedOption.encode(message).finish();
+  },
+
+  toProtoMsg(message: UninterpretedOption): UninterpretedOptionProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.UninterpretedOption",
+      value: UninterpretedOption.encode(message).finish()
+    };
   }
 
 };
@@ -6182,6 +6644,8 @@ function createBaseUninterpretedOption_NamePart(): UninterpretedOption_NamePart
 }
 
 export const UninterpretedOption_NamePart = {
+  typeUrl: "/google.protobuf.NamePart",
+
   encode(message: UninterpretedOption_NamePart, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.namePart !== "") {
       writer.uint32(10).string(message.namePart);
@@ -6267,6 +6731,25 @@ export const UninterpretedOption_NamePart = {
     obj.name_part = message.namePart;
     obj.is_extension = message.isExtension;
     return obj;
+  },
+
+  fromAminoMsg(object: UninterpretedOption_NamePartAminoMsg): UninterpretedOption_NamePart {
+    return UninterpretedOption_NamePart.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: UninterpretedOption_NamePartProtoMsg): UninterpretedOption_NamePart {
+    return UninterpretedOption_NamePart.decode(message.value);
+  },
+
+  toProto(message: UninterpretedOption_NamePart): Uint8Array {
+    return UninterpretedOption_NamePart.encode(message).finish();
+  },
+
+  toProtoMsg(message: UninterpretedOption_NamePart): UninterpretedOption_NamePartProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.NamePart",
+      value: UninterpretedOption_NamePart.encode(message).finish()
+    };
   }
 
 };
@@ -6278,6 +6761,8 @@ function createBaseSourceCodeInfo(): SourceCodeInfo {
 }
 
 export const SourceCodeInfo = {
+  typeUrl: "/google.protobuf.SourceCodeInfo",
+
   encode(message: SourceCodeInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.location) {
       SourceCodeInfo_Location.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -6366,6 +6851,25 @@ export const SourceCodeInfo = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: SourceCodeInfoAminoMsg): SourceCodeInfo {
+    return SourceCodeInfo.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: SourceCodeInfoProtoMsg): SourceCodeInfo {
+    return SourceCodeInfo.decode(message.value);
+  },
+
+  toProto(message: SourceCodeInfo): Uint8Array {
+    return SourceCodeInfo.encode(message).finish();
+  },
+
+  toProtoMsg(message: SourceCodeInfo): SourceCodeInfoProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.SourceCodeInfo",
+      value: SourceCodeInfo.encode(message).finish()
+    };
   }
 
 };
@@ -6381,6 +6885,8 @@ function createBaseSourceCodeInfo_Location(): SourceCodeInfo_Location {
 }
 
 export const SourceCodeInfo_Location = {
+  typeUrl: "/google.protobuf.Location",
+
   encode(message: SourceCodeInfo_Location, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     writer.uint32(10).fork();
 
@@ -6587,6 +7093,25 @@ export const SourceCodeInfo_Location = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: SourceCodeInfo_LocationAminoMsg): SourceCodeInfo_Location {
+    return SourceCodeInfo_Location.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: SourceCodeInfo_LocationProtoMsg): SourceCodeInfo_Location {
+    return SourceCodeInfo_Location.decode(message.value);
+  },
+
+  toProto(message: SourceCodeInfo_Location): Uint8Array {
+    return SourceCodeInfo_Location.encode(message).finish();
+  },
+
+  toProtoMsg(message: SourceCodeInfo_Location): SourceCodeInfo_LocationProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.Location",
+      value: SourceCodeInfo_Location.encode(message).finish()
+    };
   }
 
 };
@@ -6598,6 +7123,8 @@ function createBaseGeneratedCodeInfo(): GeneratedCodeInfo {
 }
 
 export const GeneratedCodeInfo = {
+  typeUrl: "/google.protobuf.GeneratedCodeInfo",
+
   encode(message: GeneratedCodeInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.annotation) {
       GeneratedCodeInfo_Annotation.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -6686,6 +7213,25 @@ export const GeneratedCodeInfo = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: GeneratedCodeInfoAminoMsg): GeneratedCodeInfo {
+    return GeneratedCodeInfo.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: GeneratedCodeInfoProtoMsg): GeneratedCodeInfo {
+    return GeneratedCodeInfo.decode(message.value);
+  },
+
+  toProto(message: GeneratedCodeInfo): Uint8Array {
+    return GeneratedCodeInfo.encode(message).finish();
+  },
+
+  toProtoMsg(message: GeneratedCodeInfo): GeneratedCodeInfoProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.GeneratedCodeInfo",
+      value: GeneratedCodeInfo.encode(message).finish()
+    };
   }
 
 };
@@ -6700,6 +7246,8 @@ function createBaseGeneratedCodeInfo_Annotation(): GeneratedCodeInfo_Annotation
 }
 
 export const GeneratedCodeInfo_Annotation = {
+  typeUrl: "/google.protobuf.Annotation",
+
   encode(message: GeneratedCodeInfo_Annotation, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     writer.uint32(10).fork();
 
@@ -6846,6 +7394,25 @@ export const GeneratedCodeInfo_Annotation = {
     obj.begin = message.begin;
     obj.end = message.end;
     return obj;
+  },
+
+  fromAminoMsg(object: GeneratedCodeInfo_AnnotationAminoMsg): GeneratedCodeInfo_Annotation {
+    return GeneratedCodeInfo_Annotation.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: GeneratedCodeInfo_AnnotationProtoMsg): GeneratedCodeInfo_Annotation {
+    return GeneratedCodeInfo_Annotation.decode(message.value);
+  },
+
+  toProto(message: GeneratedCodeInfo_Annotation): Uint8Array {
+    return GeneratedCodeInfo_Annotation.encode(message).finish();
+  },
+
+  toProtoMsg(message: GeneratedCodeInfo_Annotation): GeneratedCodeInfo_AnnotationProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.Annotation",
+      value: GeneratedCodeInfo_Annotation.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/protobuf/duration.ts b/__fixtures__/outputv2/google/protobuf/duration.ts
index f76fa0378..43d00ab36 100644
--- a/__fixtures__/outputv2/google/protobuf/duration.ts
+++ b/__fixtures__/outputv2/google/protobuf/duration.ts
@@ -80,7 +80,7 @@ export interface Duration {
    */
   nanos: number;
 }
-export interface DurationProtoType {
+export interface DurationProtoMsg {
   typeUrl: "/google.protobuf.Duration";
   value: Uint8Array;
 }
@@ -146,7 +146,7 @@ export interface DurationProtoType {
  * microsecond should be expressed in JSON format as "3.000001s".
  */
 export type DurationAmino = string;
-export interface DurationAminoType {
+export interface DurationAminoMsg {
   type: "/google.protobuf.Duration";
   value: DurationAmino;
 }
@@ -224,6 +224,8 @@ function createBaseDuration(): Duration {
 }
 
 export const Duration = {
+  typeUrl: "/google.protobuf.Duration",
+
   encode(message: Duration, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.seconds.isZero()) {
       writer.uint32(8).int64(message.seconds);
@@ -307,6 +309,25 @@ export const Duration = {
 
   toAmino(message: Duration): DurationAmino {
     return (message.seconds.toInt() * 1_000_000_000 + message.nanos).toString();
+  },
+
+  fromAminoMsg(object: DurationAminoMsg): Duration {
+    return Duration.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: DurationProtoMsg): Duration {
+    return Duration.decode(message.value);
+  },
+
+  toProto(message: Duration): Uint8Array {
+    return Duration.encode(message).finish();
+  },
+
+  toProtoMsg(message: Duration): DurationProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.Duration",
+      value: Duration.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/protobuf/empty.ts b/__fixtures__/outputv2/google/protobuf/empty.ts
index 803fb88f6..86af0b763 100644
--- a/__fixtures__/outputv2/google/protobuf/empty.ts
+++ b/__fixtures__/outputv2/google/protobuf/empty.ts
@@ -14,7 +14,7 @@ export const protobufPackage = "google.protobuf";
  * The JSON representation for `Empty` is empty JSON object `{}`.
  */
 export interface Empty {}
-export interface EmptyProtoType {
+export interface EmptyProtoMsg {
   typeUrl: "/google.protobuf.Empty";
   value: Uint8Array;
 }
@@ -31,7 +31,7 @@ export interface EmptyProtoType {
  * The JSON representation for `Empty` is empty JSON object `{}`.
  */
 export interface EmptyAmino {}
-export interface EmptyAminoType {
+export interface EmptyAminoMsg {
   type: "/google.protobuf.Empty";
   value: EmptyAmino;
 }
@@ -54,6 +54,8 @@ function createBaseEmpty(): Empty {
 }
 
 export const Empty = {
+  typeUrl: "/google.protobuf.Empty",
+
   encode(_: Empty, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -106,6 +108,25 @@ export const Empty = {
   toAmino(_: Empty): EmptyAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: EmptyAminoMsg): Empty {
+    return Empty.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: EmptyProtoMsg): Empty {
+    return Empty.decode(message.value);
+  },
+
+  toProto(message: Empty): Uint8Array {
+    return Empty.encode(message).finish();
+  },
+
+  toProtoMsg(message: Empty): EmptyProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.Empty",
+      value: Empty.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/protobuf/field_mask.ts b/__fixtures__/outputv2/google/protobuf/field_mask.ts
index d9be69b78..a6d32c872 100644
--- a/__fixtures__/outputv2/google/protobuf/field_mask.ts
+++ b/__fixtures__/outputv2/google/protobuf/field_mask.ts
@@ -207,7 +207,7 @@ export interface FieldMask {
   /** The set of field mask paths. */
   paths: string[];
 }
-export interface FieldMaskProtoType {
+export interface FieldMaskProtoMsg {
   typeUrl: "/google.protobuf.FieldMask";
   value: Uint8Array;
 }
@@ -417,7 +417,7 @@ export interface FieldMaskAmino {
   /** The set of field mask paths. */
   paths: string[];
 }
-export interface FieldMaskAminoType {
+export interface FieldMaskAminoMsg {
   type: "/google.protobuf.FieldMask";
   value: FieldMaskAmino;
 }
@@ -634,6 +634,8 @@ function createBaseFieldMask(): FieldMask {
 }
 
 export const FieldMask = {
+  typeUrl: "/google.protobuf.FieldMask",
+
   encode(message: FieldMask, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.paths) {
       writer.uint32(10).string(v!);
@@ -722,6 +724,25 @@ export const FieldMask = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: FieldMaskAminoMsg): FieldMask {
+    return FieldMask.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: FieldMaskProtoMsg): FieldMask {
+    return FieldMask.decode(message.value);
+  },
+
+  toProto(message: FieldMask): Uint8Array {
+    return FieldMask.encode(message).finish();
+  },
+
+  toProtoMsg(message: FieldMask): FieldMaskProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.FieldMask",
+      value: FieldMask.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/protobuf/source_context.ts b/__fixtures__/outputv2/google/protobuf/source_context.ts
index b5fbca679..acc1d3361 100644
--- a/__fixtures__/outputv2/google/protobuf/source_context.ts
+++ b/__fixtures__/outputv2/google/protobuf/source_context.ts
@@ -13,7 +13,7 @@ export interface SourceContext {
    */
   fileName: string;
 }
-export interface SourceContextProtoType {
+export interface SourceContextProtoMsg {
   typeUrl: "/google.protobuf.SourceContext";
   value: Uint8Array;
 }
@@ -29,7 +29,7 @@ export interface SourceContextAmino {
    */
   file_name: string;
 }
-export interface SourceContextAminoType {
+export interface SourceContextAminoMsg {
   type: "/google.protobuf.SourceContext";
   value: SourceContextAmino;
 }
@@ -49,6 +49,8 @@ function createBaseSourceContext(): SourceContext {
 }
 
 export const SourceContext = {
+  typeUrl: "/google.protobuf.SourceContext",
+
   encode(message: SourceContext, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.fileName !== "") {
       writer.uint32(10).string(message.fileName);
@@ -119,6 +121,25 @@ export const SourceContext = {
     const obj: any = {};
     obj.file_name = message.fileName;
     return obj;
+  },
+
+  fromAminoMsg(object: SourceContextAminoMsg): SourceContext {
+    return SourceContext.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: SourceContextProtoMsg): SourceContext {
+    return SourceContext.decode(message.value);
+  },
+
+  toProto(message: SourceContext): Uint8Array {
+    return SourceContext.encode(message).finish();
+  },
+
+  toProtoMsg(message: SourceContext): SourceContextProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.SourceContext",
+      value: SourceContext.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/protobuf/struct.ts b/__fixtures__/outputv2/google/protobuf/struct.ts
index 9cd88605d..69505506b 100644
--- a/__fixtures__/outputv2/google/protobuf/struct.ts
+++ b/__fixtures__/outputv2/google/protobuf/struct.ts
@@ -41,16 +41,16 @@ export interface Struct_FieldsEntry {
   key: string;
   value?: Value;
 }
-export interface Struct_FieldsEntryProtoType {
-  typeUrl: "/google.protobuf.undefined";
+export interface Struct_FieldsEntryProtoMsg {
+  typeUrl: string;
   value: Uint8Array;
 }
 export interface Struct_FieldsEntryAmino {
   key: string;
   value?: ValueAmino;
 }
-export interface Struct_FieldsEntryAminoType {
-  type: "/google.protobuf.undefined";
+export interface Struct_FieldsEntryAminoMsg {
+  type: string;
   value: Struct_FieldsEntryAmino;
 }
 export interface Struct_FieldsEntrySDKType {
@@ -74,7 +74,7 @@ export interface Struct {
     [key: string]: Value;
   };
 }
-export interface StructProtoType {
+export interface StructProtoMsg {
   typeUrl: "/google.protobuf.Struct";
   value: Uint8Array;
 }
@@ -95,7 +95,7 @@ export interface StructAmino {
     [key: string]: ValueAmino;
   };
 }
-export interface StructAminoType {
+export interface StructAminoMsg {
   type: "/google.protobuf.Struct";
   value: StructAmino;
 }
@@ -143,7 +143,7 @@ export interface Value {
   /** Represents a repeated `Value`. */
   listValue?: ListValue;
 }
-export interface ValueProtoType {
+export interface ValueProtoMsg {
   typeUrl: "/google.protobuf.Value";
   value: Uint8Array;
 }
@@ -175,7 +175,7 @@ export interface ValueAmino {
   /** Represents a repeated `Value`. */
   list_value?: ListValueAmino;
 }
-export interface ValueAminoType {
+export interface ValueAminoMsg {
   type: "/google.protobuf.Value";
   value: ValueAmino;
 }
@@ -206,7 +206,7 @@ export interface ListValue {
   /** Repeated field of dynamically typed values. */
   values: Value[];
 }
-export interface ListValueProtoType {
+export interface ListValueProtoMsg {
   typeUrl: "/google.protobuf.ListValue";
   value: Uint8Array;
 }
@@ -220,7 +220,7 @@ export interface ListValueAmino {
   /** Repeated field of dynamically typed values. */
   values: ValueAmino[];
 }
-export interface ListValueAminoType {
+export interface ListValueAminoMsg {
   type: "/google.protobuf.ListValue";
   value: ListValueAmino;
 }
@@ -327,6 +327,18 @@ export const Struct_FieldsEntry = {
     obj.key = message.key;
     obj.value = message.value ? Value.toAmino(message.value) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: Struct_FieldsEntryAminoMsg): Struct_FieldsEntry {
+    return Struct_FieldsEntry.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: Struct_FieldsEntryProtoMsg): Struct_FieldsEntry {
+    return Struct_FieldsEntry.decode(message.value);
+  },
+
+  toProto(message: Struct_FieldsEntry): Uint8Array {
+    return Struct_FieldsEntry.encode(message).finish();
   }
 
 };
@@ -338,6 +350,8 @@ function createBaseStruct(): Struct {
 }
 
 export const Struct = {
+  typeUrl: "/google.protobuf.Struct",
+
   encode(message: Struct, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     Object.entries(message.fields).forEach(([key, value]) => {
       Struct_FieldsEntry.encode({
@@ -459,6 +473,25 @@ export const Struct = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: StructAminoMsg): Struct {
+    return Struct.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: StructProtoMsg): Struct {
+    return Struct.decode(message.value);
+  },
+
+  toProto(message: Struct): Uint8Array {
+    return Struct.encode(message).finish();
+  },
+
+  toProtoMsg(message: Struct): StructProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.Struct",
+      value: Struct.encode(message).finish()
+    };
   }
 
 };
@@ -475,6 +508,8 @@ function createBaseValue(): Value {
 }
 
 export const Value = {
+  typeUrl: "/google.protobuf.Value",
+
   encode(message: Value, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.nullValue !== undefined) {
       writer.uint32(8).int32(message.nullValue);
@@ -620,6 +655,25 @@ export const Value = {
     obj.struct_value = message.structValue ? Struct.toAmino(message.structValue) : undefined;
     obj.list_value = message.listValue ? ListValue.toAmino(message.listValue) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ValueAminoMsg): Value {
+    return Value.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ValueProtoMsg): Value {
+    return Value.decode(message.value);
+  },
+
+  toProto(message: Value): Uint8Array {
+    return Value.encode(message).finish();
+  },
+
+  toProtoMsg(message: Value): ValueProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.Value",
+      value: Value.encode(message).finish()
+    };
   }
 
 };
@@ -631,6 +685,8 @@ function createBaseListValue(): ListValue {
 }
 
 export const ListValue = {
+  typeUrl: "/google.protobuf.ListValue",
+
   encode(message: ListValue, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.values) {
       Value.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -719,6 +775,25 @@ export const ListValue = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ListValueAminoMsg): ListValue {
+    return ListValue.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ListValueProtoMsg): ListValue {
+    return ListValue.decode(message.value);
+  },
+
+  toProto(message: ListValue): Uint8Array {
+    return ListValue.encode(message).finish();
+  },
+
+  toProtoMsg(message: ListValue): ListValueProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.ListValue",
+      value: ListValue.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/protobuf/timestamp.ts b/__fixtures__/outputv2/google/protobuf/timestamp.ts
index cbecc7f37..0dea508e2 100644
--- a/__fixtures__/outputv2/google/protobuf/timestamp.ts
+++ b/__fixtures__/outputv2/google/protobuf/timestamp.ts
@@ -102,7 +102,7 @@ export interface Timestamp {
    */
   nanos: number;
 }
-export interface TimestampProtoType {
+export interface TimestampProtoMsg {
   typeUrl: "/google.protobuf.Timestamp";
   value: Uint8Array;
 }
@@ -192,7 +192,7 @@ export interface TimestampProtoType {
  * ) to obtain a formatter capable of generating timestamps in this format.
  */
 export type TimestampAmino = string;
-export interface TimestampAminoType {
+export interface TimestampAminoMsg {
   type: "/google.protobuf.Timestamp";
   value: TimestampAmino;
 }
@@ -294,6 +294,8 @@ function createBaseTimestamp(): Timestamp {
 }
 
 export const Timestamp = {
+  typeUrl: "/google.protobuf.Timestamp",
+
   encode(message: Timestamp, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.seconds.isZero()) {
       writer.uint32(8).int64(message.seconds);
@@ -379,6 +381,25 @@ export const Timestamp = {
     obj.seconds = message.seconds ? message.seconds.toString() : undefined;
     obj.nanos = message.nanos;
     return obj;
+  },
+
+  fromAminoMsg(object: TimestampAminoMsg): Timestamp {
+    return Timestamp.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: TimestampProtoMsg): Timestamp {
+    return Timestamp.decode(message.value);
+  },
+
+  toProto(message: Timestamp): Uint8Array {
+    return Timestamp.encode(message).finish();
+  },
+
+  toProtoMsg(message: Timestamp): TimestampProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.Timestamp",
+      value: Timestamp.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/protobuf/type.ts b/__fixtures__/outputv2/google/protobuf/type.ts
index f20fddf04..d4102cae1 100644
--- a/__fixtures__/outputv2/google/protobuf/type.ts
+++ b/__fixtures__/outputv2/google/protobuf/type.ts
@@ -337,7 +337,7 @@ export interface Type {
   /** The source syntax. */
   syntax: Syntax;
 }
-export interface TypeProtoType {
+export interface TypeProtoMsg {
   typeUrl: "/google.protobuf.Type";
   value: Uint8Array;
 }
@@ -362,7 +362,7 @@ export interface TypeAmino {
   /** The source syntax. */
   syntax: Syntax;
 }
-export interface TypeAminoType {
+export interface TypeAminoMsg {
   type: "/google.protobuf.Type";
   value: TypeAmino;
 }
@@ -415,7 +415,7 @@ export interface Field {
   /** The string value of the default value of this field. Proto2 syntax only. */
   defaultValue: string;
 }
-export interface FieldProtoType {
+export interface FieldProtoMsg {
   typeUrl: "/google.protobuf.Field";
   value: Uint8Array;
 }
@@ -458,7 +458,7 @@ export interface FieldAmino {
   /** The string value of the default value of this field. Proto2 syntax only. */
   default_value: string;
 }
-export interface FieldAminoType {
+export interface FieldAminoMsg {
   type: "/google.protobuf.Field";
   value: FieldAmino;
 }
@@ -494,7 +494,7 @@ export interface Enum {
   /** The source syntax. */
   syntax: Syntax;
 }
-export interface EnumProtoType {
+export interface EnumProtoMsg {
   typeUrl: "/google.protobuf.Enum";
   value: Uint8Array;
 }
@@ -516,7 +516,7 @@ export interface EnumAmino {
   /** The source syntax. */
   syntax: Syntax;
 }
-export interface EnumAminoType {
+export interface EnumAminoMsg {
   type: "/google.protobuf.Enum";
   value: EnumAmino;
 }
@@ -541,7 +541,7 @@ export interface EnumValue {
   /** Protocol buffer options. */
   options: Option[];
 }
-export interface EnumValueProtoType {
+export interface EnumValueProtoMsg {
   typeUrl: "/google.protobuf.EnumValue";
   value: Uint8Array;
 }
@@ -557,7 +557,7 @@ export interface EnumValueAmino {
   /** Protocol buffer options. */
   options: OptionAmino[];
 }
-export interface EnumValueAminoType {
+export interface EnumValueAminoMsg {
   type: "/google.protobuf.EnumValue";
   value: EnumValueAmino;
 }
@@ -590,7 +590,7 @@ export interface Option {
    */
   value?: Any;
 }
-export interface OptionProtoType {
+export interface OptionProtoMsg {
   typeUrl: "/google.protobuf.Option";
   value: Uint8Array;
 }
@@ -616,7 +616,7 @@ export interface OptionAmino {
    */
   value?: AnyAmino;
 }
-export interface OptionAminoType {
+export interface OptionAminoMsg {
   type: "/google.protobuf.Option";
   value: OptionAmino;
 }
@@ -642,6 +642,8 @@ function createBaseType(): Type {
 }
 
 export const Type = {
+  typeUrl: "/google.protobuf.Type",
+
   encode(message: Type, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -835,6 +837,25 @@ export const Type = {
     obj.source_context = message.sourceContext ? SourceContext.toAmino(message.sourceContext) : undefined;
     obj.syntax = message.syntax;
     return obj;
+  },
+
+  fromAminoMsg(object: TypeAminoMsg): Type {
+    return Type.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: TypeProtoMsg): Type {
+    return Type.decode(message.value);
+  },
+
+  toProto(message: Type): Uint8Array {
+    return Type.encode(message).finish();
+  },
+
+  toProtoMsg(message: Type): TypeProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.Type",
+      value: Type.encode(message).finish()
+    };
   }
 
 };
@@ -855,6 +876,8 @@ function createBaseField(): Field {
 }
 
 export const Field = {
+  typeUrl: "/google.protobuf.Field",
+
   encode(message: Field, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.kind !== 0) {
       writer.uint32(8).int32(message.kind);
@@ -1078,6 +1101,25 @@ export const Field = {
     obj.json_name = message.jsonName;
     obj.default_value = message.defaultValue;
     return obj;
+  },
+
+  fromAminoMsg(object: FieldAminoMsg): Field {
+    return Field.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: FieldProtoMsg): Field {
+    return Field.decode(message.value);
+  },
+
+  toProto(message: Field): Uint8Array {
+    return Field.encode(message).finish();
+  },
+
+  toProtoMsg(message: Field): FieldProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.Field",
+      value: Field.encode(message).finish()
+    };
   }
 
 };
@@ -1093,6 +1135,8 @@ function createBaseEnum(): Enum {
 }
 
 export const Enum = {
+  typeUrl: "/google.protobuf.Enum",
+
   encode(message: Enum, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -1256,6 +1300,25 @@ export const Enum = {
     obj.source_context = message.sourceContext ? SourceContext.toAmino(message.sourceContext) : undefined;
     obj.syntax = message.syntax;
     return obj;
+  },
+
+  fromAminoMsg(object: EnumAminoMsg): Enum {
+    return Enum.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: EnumProtoMsg): Enum {
+    return Enum.decode(message.value);
+  },
+
+  toProto(message: Enum): Uint8Array {
+    return Enum.encode(message).finish();
+  },
+
+  toProtoMsg(message: Enum): EnumProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.Enum",
+      value: Enum.encode(message).finish()
+    };
   }
 
 };
@@ -1269,6 +1332,8 @@ function createBaseEnumValue(): EnumValue {
 }
 
 export const EnumValue = {
+  typeUrl: "/google.protobuf.EnumValue",
+
   encode(message: EnumValue, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -1387,6 +1452,25 @@ export const EnumValue = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: EnumValueAminoMsg): EnumValue {
+    return EnumValue.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: EnumValueProtoMsg): EnumValue {
+    return EnumValue.decode(message.value);
+  },
+
+  toProto(message: EnumValue): Uint8Array {
+    return EnumValue.encode(message).finish();
+  },
+
+  toProtoMsg(message: EnumValue): EnumValueProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.EnumValue",
+      value: EnumValue.encode(message).finish()
+    };
   }
 
 };
@@ -1399,6 +1483,8 @@ function createBaseOption(): Option {
 }
 
 export const Option = {
+  typeUrl: "/google.protobuf.Option",
+
   encode(message: Option, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.name !== "") {
       writer.uint32(10).string(message.name);
@@ -1484,6 +1570,25 @@ export const Option = {
     obj.name = message.name;
     obj.value = message.value ? Any.toAmino(message.value) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: OptionAminoMsg): Option {
+    return Option.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: OptionProtoMsg): Option {
+    return Option.decode(message.value);
+  },
+
+  toProto(message: Option): Uint8Array {
+    return Option.encode(message).finish();
+  },
+
+  toProtoMsg(message: Option): OptionProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.Option",
+      value: Option.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/protobuf/wrappers.ts b/__fixtures__/outputv2/google/protobuf/wrappers.ts
index 1f1ab80cc..cf1bd2b38 100644
--- a/__fixtures__/outputv2/google/protobuf/wrappers.ts
+++ b/__fixtures__/outputv2/google/protobuf/wrappers.ts
@@ -11,7 +11,7 @@ export interface DoubleValue {
   /** The double value. */
   value: number;
 }
-export interface DoubleValueProtoType {
+export interface DoubleValueProtoMsg {
   typeUrl: "/google.protobuf.DoubleValue";
   value: Uint8Array;
 }
@@ -25,7 +25,7 @@ export interface DoubleValueAmino {
   /** The double value. */
   value: number;
 }
-export interface DoubleValueAminoType {
+export interface DoubleValueAminoMsg {
   type: "/google.protobuf.DoubleValue";
   value: DoubleValueAmino;
 }
@@ -48,7 +48,7 @@ export interface FloatValue {
   /** The float value. */
   value: number;
 }
-export interface FloatValueProtoType {
+export interface FloatValueProtoMsg {
   typeUrl: "/google.protobuf.FloatValue";
   value: Uint8Array;
 }
@@ -62,7 +62,7 @@ export interface FloatValueAmino {
   /** The float value. */
   value: number;
 }
-export interface FloatValueAminoType {
+export interface FloatValueAminoMsg {
   type: "/google.protobuf.FloatValue";
   value: FloatValueAmino;
 }
@@ -85,7 +85,7 @@ export interface Int64Value {
   /** The int64 value. */
   value: Long;
 }
-export interface Int64ValueProtoType {
+export interface Int64ValueProtoMsg {
   typeUrl: "/google.protobuf.Int64Value";
   value: Uint8Array;
 }
@@ -99,7 +99,7 @@ export interface Int64ValueAmino {
   /** The int64 value. */
   value: string;
 }
-export interface Int64ValueAminoType {
+export interface Int64ValueAminoMsg {
   type: "/google.protobuf.Int64Value";
   value: Int64ValueAmino;
 }
@@ -122,7 +122,7 @@ export interface UInt64Value {
   /** The uint64 value. */
   value: Long;
 }
-export interface UInt64ValueProtoType {
+export interface UInt64ValueProtoMsg {
   typeUrl: "/google.protobuf.UInt64Value";
   value: Uint8Array;
 }
@@ -136,7 +136,7 @@ export interface UInt64ValueAmino {
   /** The uint64 value. */
   value: string;
 }
-export interface UInt64ValueAminoType {
+export interface UInt64ValueAminoMsg {
   type: "/google.protobuf.UInt64Value";
   value: UInt64ValueAmino;
 }
@@ -159,7 +159,7 @@ export interface Int32Value {
   /** The int32 value. */
   value: number;
 }
-export interface Int32ValueProtoType {
+export interface Int32ValueProtoMsg {
   typeUrl: "/google.protobuf.Int32Value";
   value: Uint8Array;
 }
@@ -173,7 +173,7 @@ export interface Int32ValueAmino {
   /** The int32 value. */
   value: number;
 }
-export interface Int32ValueAminoType {
+export interface Int32ValueAminoMsg {
   type: "/google.protobuf.Int32Value";
   value: Int32ValueAmino;
 }
@@ -196,7 +196,7 @@ export interface UInt32Value {
   /** The uint32 value. */
   value: number;
 }
-export interface UInt32ValueProtoType {
+export interface UInt32ValueProtoMsg {
   typeUrl: "/google.protobuf.UInt32Value";
   value: Uint8Array;
 }
@@ -210,7 +210,7 @@ export interface UInt32ValueAmino {
   /** The uint32 value. */
   value: number;
 }
-export interface UInt32ValueAminoType {
+export interface UInt32ValueAminoMsg {
   type: "/google.protobuf.UInt32Value";
   value: UInt32ValueAmino;
 }
@@ -233,7 +233,7 @@ export interface BoolValue {
   /** The bool value. */
   value: boolean;
 }
-export interface BoolValueProtoType {
+export interface BoolValueProtoMsg {
   typeUrl: "/google.protobuf.BoolValue";
   value: Uint8Array;
 }
@@ -247,7 +247,7 @@ export interface BoolValueAmino {
   /** The bool value. */
   value: boolean;
 }
-export interface BoolValueAminoType {
+export interface BoolValueAminoMsg {
   type: "/google.protobuf.BoolValue";
   value: BoolValueAmino;
 }
@@ -270,7 +270,7 @@ export interface StringValue {
   /** The string value. */
   value: string;
 }
-export interface StringValueProtoType {
+export interface StringValueProtoMsg {
   typeUrl: "/google.protobuf.StringValue";
   value: Uint8Array;
 }
@@ -284,7 +284,7 @@ export interface StringValueAmino {
   /** The string value. */
   value: string;
 }
-export interface StringValueAminoType {
+export interface StringValueAminoMsg {
   type: "/google.protobuf.StringValue";
   value: StringValueAmino;
 }
@@ -307,7 +307,7 @@ export interface BytesValue {
   /** The bytes value. */
   value: Uint8Array;
 }
-export interface BytesValueProtoType {
+export interface BytesValueProtoMsg {
   typeUrl: "/google.protobuf.BytesValue";
   value: Uint8Array;
 }
@@ -321,7 +321,7 @@ export interface BytesValueAmino {
   /** The bytes value. */
   value: Uint8Array;
 }
-export interface BytesValueAminoType {
+export interface BytesValueAminoMsg {
   type: "/google.protobuf.BytesValue";
   value: BytesValueAmino;
 }
@@ -342,6 +342,8 @@ function createBaseDoubleValue(): DoubleValue {
 }
 
 export const DoubleValue = {
+  typeUrl: "/google.protobuf.DoubleValue",
+
   encode(message: DoubleValue, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.value !== 0) {
       writer.uint32(9).double(message.value);
@@ -412,6 +414,25 @@ export const DoubleValue = {
     const obj: any = {};
     obj.value = message.value;
     return obj;
+  },
+
+  fromAminoMsg(object: DoubleValueAminoMsg): DoubleValue {
+    return DoubleValue.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: DoubleValueProtoMsg): DoubleValue {
+    return DoubleValue.decode(message.value);
+  },
+
+  toProto(message: DoubleValue): Uint8Array {
+    return DoubleValue.encode(message).finish();
+  },
+
+  toProtoMsg(message: DoubleValue): DoubleValueProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.DoubleValue",
+      value: DoubleValue.encode(message).finish()
+    };
   }
 
 };
@@ -423,6 +444,8 @@ function createBaseFloatValue(): FloatValue {
 }
 
 export const FloatValue = {
+  typeUrl: "/google.protobuf.FloatValue",
+
   encode(message: FloatValue, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.value !== 0) {
       writer.uint32(13).float(message.value);
@@ -493,6 +516,25 @@ export const FloatValue = {
     const obj: any = {};
     obj.value = message.value;
     return obj;
+  },
+
+  fromAminoMsg(object: FloatValueAminoMsg): FloatValue {
+    return FloatValue.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: FloatValueProtoMsg): FloatValue {
+    return FloatValue.decode(message.value);
+  },
+
+  toProto(message: FloatValue): Uint8Array {
+    return FloatValue.encode(message).finish();
+  },
+
+  toProtoMsg(message: FloatValue): FloatValueProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.FloatValue",
+      value: FloatValue.encode(message).finish()
+    };
   }
 
 };
@@ -504,6 +546,8 @@ function createBaseInt64Value(): Int64Value {
 }
 
 export const Int64Value = {
+  typeUrl: "/google.protobuf.Int64Value",
+
   encode(message: Int64Value, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.value.isZero()) {
       writer.uint32(8).int64(message.value);
@@ -574,6 +618,25 @@ export const Int64Value = {
     const obj: any = {};
     obj.value = message.value ? message.value.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: Int64ValueAminoMsg): Int64Value {
+    return Int64Value.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: Int64ValueProtoMsg): Int64Value {
+    return Int64Value.decode(message.value);
+  },
+
+  toProto(message: Int64Value): Uint8Array {
+    return Int64Value.encode(message).finish();
+  },
+
+  toProtoMsg(message: Int64Value): Int64ValueProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.Int64Value",
+      value: Int64Value.encode(message).finish()
+    };
   }
 
 };
@@ -585,6 +648,8 @@ function createBaseUInt64Value(): UInt64Value {
 }
 
 export const UInt64Value = {
+  typeUrl: "/google.protobuf.UInt64Value",
+
   encode(message: UInt64Value, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.value.isZero()) {
       writer.uint32(8).uint64(message.value);
@@ -655,6 +720,25 @@ export const UInt64Value = {
     const obj: any = {};
     obj.value = message.value ? message.value.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: UInt64ValueAminoMsg): UInt64Value {
+    return UInt64Value.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: UInt64ValueProtoMsg): UInt64Value {
+    return UInt64Value.decode(message.value);
+  },
+
+  toProto(message: UInt64Value): Uint8Array {
+    return UInt64Value.encode(message).finish();
+  },
+
+  toProtoMsg(message: UInt64Value): UInt64ValueProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.UInt64Value",
+      value: UInt64Value.encode(message).finish()
+    };
   }
 
 };
@@ -666,6 +750,8 @@ function createBaseInt32Value(): Int32Value {
 }
 
 export const Int32Value = {
+  typeUrl: "/google.protobuf.Int32Value",
+
   encode(message: Int32Value, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.value !== 0) {
       writer.uint32(8).int32(message.value);
@@ -736,6 +822,25 @@ export const Int32Value = {
     const obj: any = {};
     obj.value = message.value;
     return obj;
+  },
+
+  fromAminoMsg(object: Int32ValueAminoMsg): Int32Value {
+    return Int32Value.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: Int32ValueProtoMsg): Int32Value {
+    return Int32Value.decode(message.value);
+  },
+
+  toProto(message: Int32Value): Uint8Array {
+    return Int32Value.encode(message).finish();
+  },
+
+  toProtoMsg(message: Int32Value): Int32ValueProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.Int32Value",
+      value: Int32Value.encode(message).finish()
+    };
   }
 
 };
@@ -747,6 +852,8 @@ function createBaseUInt32Value(): UInt32Value {
 }
 
 export const UInt32Value = {
+  typeUrl: "/google.protobuf.UInt32Value",
+
   encode(message: UInt32Value, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.value !== 0) {
       writer.uint32(8).uint32(message.value);
@@ -817,6 +924,25 @@ export const UInt32Value = {
     const obj: any = {};
     obj.value = message.value;
     return obj;
+  },
+
+  fromAminoMsg(object: UInt32ValueAminoMsg): UInt32Value {
+    return UInt32Value.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: UInt32ValueProtoMsg): UInt32Value {
+    return UInt32Value.decode(message.value);
+  },
+
+  toProto(message: UInt32Value): Uint8Array {
+    return UInt32Value.encode(message).finish();
+  },
+
+  toProtoMsg(message: UInt32Value): UInt32ValueProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.UInt32Value",
+      value: UInt32Value.encode(message).finish()
+    };
   }
 
 };
@@ -828,6 +954,8 @@ function createBaseBoolValue(): BoolValue {
 }
 
 export const BoolValue = {
+  typeUrl: "/google.protobuf.BoolValue",
+
   encode(message: BoolValue, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.value === true) {
       writer.uint32(8).bool(message.value);
@@ -898,6 +1026,25 @@ export const BoolValue = {
     const obj: any = {};
     obj.value = message.value;
     return obj;
+  },
+
+  fromAminoMsg(object: BoolValueAminoMsg): BoolValue {
+    return BoolValue.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: BoolValueProtoMsg): BoolValue {
+    return BoolValue.decode(message.value);
+  },
+
+  toProto(message: BoolValue): Uint8Array {
+    return BoolValue.encode(message).finish();
+  },
+
+  toProtoMsg(message: BoolValue): BoolValueProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.BoolValue",
+      value: BoolValue.encode(message).finish()
+    };
   }
 
 };
@@ -909,6 +1056,8 @@ function createBaseStringValue(): StringValue {
 }
 
 export const StringValue = {
+  typeUrl: "/google.protobuf.StringValue",
+
   encode(message: StringValue, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.value !== "") {
       writer.uint32(10).string(message.value);
@@ -979,6 +1128,25 @@ export const StringValue = {
     const obj: any = {};
     obj.value = message.value;
     return obj;
+  },
+
+  fromAminoMsg(object: StringValueAminoMsg): StringValue {
+    return StringValue.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: StringValueProtoMsg): StringValue {
+    return StringValue.decode(message.value);
+  },
+
+  toProto(message: StringValue): Uint8Array {
+    return StringValue.encode(message).finish();
+  },
+
+  toProtoMsg(message: StringValue): StringValueProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.StringValue",
+      value: StringValue.encode(message).finish()
+    };
   }
 
 };
@@ -990,6 +1158,8 @@ function createBaseBytesValue(): BytesValue {
 }
 
 export const BytesValue = {
+  typeUrl: "/google.protobuf.BytesValue",
+
   encode(message: BytesValue, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.value.length !== 0) {
       writer.uint32(10).bytes(message.value);
@@ -1060,6 +1230,25 @@ export const BytesValue = {
     const obj: any = {};
     obj.value = message.value;
     return obj;
+  },
+
+  fromAminoMsg(object: BytesValueAminoMsg): BytesValue {
+    return BytesValue.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: BytesValueProtoMsg): BytesValue {
+    return BytesValue.decode(message.value);
+  },
+
+  toProto(message: BytesValue): Uint8Array {
+    return BytesValue.encode(message).finish();
+  },
+
+  toProtoMsg(message: BytesValue): BytesValueProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.BytesValue",
+      value: BytesValue.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/rpc/context/attribute_context.ts b/__fixtures__/outputv2/google/rpc/context/attribute_context.ts
index 87ac3b2c3..e0e1494de 100644
--- a/__fixtures__/outputv2/google/rpc/context/attribute_context.ts
+++ b/__fixtures__/outputv2/google/rpc/context/attribute_context.ts
@@ -66,7 +66,7 @@ export interface AttributeContext {
   /** Supports extensions for advanced use cases, such as logs and metrics. */
   extensions: Any[];
 }
-export interface AttributeContextProtoType {
+export interface AttributeContextProtoMsg {
   typeUrl: "/google.rpc.context.AttributeContext";
   value: Uint8Array;
 }
@@ -131,7 +131,7 @@ export interface AttributeContextAmino {
   /** Supports extensions for advanced use cases, such as logs and metrics. */
   extensions: AnyAmino[];
 }
-export interface AttributeContextAminoType {
+export interface AttributeContextAminoMsg {
   type: "/google.rpc.context.AttributeContext";
   value: AttributeContextAmino;
 }
@@ -169,16 +169,16 @@ export interface AttributeContext_Peer_LabelsEntry {
   key: string;
   value: string;
 }
-export interface AttributeContext_Peer_LabelsEntryProtoType {
-  typeUrl: "/google.rpc.context.undefined";
+export interface AttributeContext_Peer_LabelsEntryProtoMsg {
+  typeUrl: string;
   value: Uint8Array;
 }
 export interface AttributeContext_Peer_LabelsEntryAmino {
   key: string;
   value: string;
 }
-export interface AttributeContext_Peer_LabelsEntryAminoType {
-  type: "/google.rpc.context.undefined";
+export interface AttributeContext_Peer_LabelsEntryAminoMsg {
+  type: string;
   value: AttributeContext_Peer_LabelsEntryAmino;
 }
 export interface AttributeContext_Peer_LabelsEntrySDKType {
@@ -218,7 +218,7 @@ export interface AttributeContext_Peer {
    */
   regionCode: string;
 }
-export interface AttributeContext_PeerProtoType {
+export interface AttributeContext_PeerProtoMsg {
   typeUrl: "/google.rpc.context.Peer";
   value: Uint8Array;
 }
@@ -255,7 +255,7 @@ export interface AttributeContext_PeerAmino {
    */
   region_code: string;
 }
-export interface AttributeContext_PeerAminoType {
+export interface AttributeContext_PeerAminoMsg {
   type: "/google.rpc.context.Peer";
   value: AttributeContext_PeerAmino;
 }
@@ -308,7 +308,7 @@ export interface AttributeContext_Api {
    */
   version: string;
 }
-export interface AttributeContext_ApiProtoType {
+export interface AttributeContext_ApiProtoMsg {
   typeUrl: "/google.rpc.context.Api";
   value: Uint8Array;
 }
@@ -345,7 +345,7 @@ export interface AttributeContext_ApiAmino {
    */
   version: string;
 }
-export interface AttributeContext_ApiAminoType {
+export interface AttributeContext_ApiAminoMsg {
   type: "/google.rpc.context.Api";
   value: AttributeContext_ApiAmino;
 }
@@ -433,7 +433,7 @@ export interface AttributeContext_Auth {
    */
   accessLevels: string[];
 }
-export interface AttributeContext_AuthProtoType {
+export interface AttributeContext_AuthProtoMsg {
   typeUrl: "/google.rpc.context.Auth";
   value: Uint8Array;
 }
@@ -509,7 +509,7 @@ export interface AttributeContext_AuthAmino {
    */
   access_levels: string[];
 }
-export interface AttributeContext_AuthAminoType {
+export interface AttributeContext_AuthAminoMsg {
   type: "/google.rpc.context.Auth";
   value: AttributeContext_AuthAmino;
 }
@@ -530,16 +530,16 @@ export interface AttributeContext_Request_HeadersEntry {
   key: string;
   value: string;
 }
-export interface AttributeContext_Request_HeadersEntryProtoType {
-  typeUrl: "/google.rpc.context.undefined";
+export interface AttributeContext_Request_HeadersEntryProtoMsg {
+  typeUrl: string;
   value: Uint8Array;
 }
 export interface AttributeContext_Request_HeadersEntryAmino {
   key: string;
   value: string;
 }
-export interface AttributeContext_Request_HeadersEntryAminoType {
-  type: "/google.rpc.context.undefined";
+export interface AttributeContext_Request_HeadersEntryAminoMsg {
+  type: string;
   value: AttributeContext_Request_HeadersEntryAmino;
 }
 export interface AttributeContext_Request_HeadersEntrySDKType {
@@ -616,7 +616,7 @@ export interface AttributeContext_Request {
    */
   auth?: AttributeContext_Auth;
 }
-export interface AttributeContext_RequestProtoType {
+export interface AttributeContext_RequestProtoMsg {
   typeUrl: "/google.rpc.context.Request";
   value: Uint8Array;
 }
@@ -690,7 +690,7 @@ export interface AttributeContext_RequestAmino {
    */
   auth?: AttributeContext_AuthAmino;
 }
-export interface AttributeContext_RequestAminoType {
+export interface AttributeContext_RequestAminoMsg {
   type: "/google.rpc.context.Request";
   value: AttributeContext_RequestAmino;
 }
@@ -720,16 +720,16 @@ export interface AttributeContext_Response_HeadersEntry {
   key: string;
   value: string;
 }
-export interface AttributeContext_Response_HeadersEntryProtoType {
-  typeUrl: "/google.rpc.context.undefined";
+export interface AttributeContext_Response_HeadersEntryProtoMsg {
+  typeUrl: string;
   value: Uint8Array;
 }
 export interface AttributeContext_Response_HeadersEntryAmino {
   key: string;
   value: string;
 }
-export interface AttributeContext_Response_HeadersEntryAminoType {
-  type: "/google.rpc.context.undefined";
+export interface AttributeContext_Response_HeadersEntryAminoMsg {
+  type: string;
   value: AttributeContext_Response_HeadersEntryAmino;
 }
 export interface AttributeContext_Response_HeadersEntrySDKType {
@@ -771,7 +771,7 @@ export interface AttributeContext_Response {
    */
   backendLatency?: Duration;
 }
-export interface AttributeContext_ResponseProtoType {
+export interface AttributeContext_ResponseProtoMsg {
   typeUrl: "/google.rpc.context.Response";
   value: Uint8Array;
 }
@@ -810,7 +810,7 @@ export interface AttributeContext_ResponseAmino {
    */
   backend_latency?: DurationAmino;
 }
-export interface AttributeContext_ResponseAminoType {
+export interface AttributeContext_ResponseAminoMsg {
   type: "/google.rpc.context.Response";
   value: AttributeContext_ResponseAmino;
 }
@@ -832,16 +832,16 @@ export interface AttributeContext_Resource_LabelsEntry {
   key: string;
   value: string;
 }
-export interface AttributeContext_Resource_LabelsEntryProtoType {
-  typeUrl: "/google.rpc.context.undefined";
+export interface AttributeContext_Resource_LabelsEntryProtoMsg {
+  typeUrl: string;
   value: Uint8Array;
 }
 export interface AttributeContext_Resource_LabelsEntryAmino {
   key: string;
   value: string;
 }
-export interface AttributeContext_Resource_LabelsEntryAminoType {
-  type: "/google.rpc.context.undefined";
+export interface AttributeContext_Resource_LabelsEntryAminoMsg {
+  type: string;
   value: AttributeContext_Resource_LabelsEntryAmino;
 }
 export interface AttributeContext_Resource_LabelsEntrySDKType {
@@ -852,16 +852,16 @@ export interface AttributeContext_Resource_AnnotationsEntry {
   key: string;
   value: string;
 }
-export interface AttributeContext_Resource_AnnotationsEntryProtoType {
-  typeUrl: "/google.rpc.context.undefined";
+export interface AttributeContext_Resource_AnnotationsEntryProtoMsg {
+  typeUrl: string;
   value: Uint8Array;
 }
 export interface AttributeContext_Resource_AnnotationsEntryAmino {
   key: string;
   value: string;
 }
-export interface AttributeContext_Resource_AnnotationsEntryAminoType {
-  type: "/google.rpc.context.undefined";
+export interface AttributeContext_Resource_AnnotationsEntryAminoMsg {
+  type: string;
   value: AttributeContext_Resource_AnnotationsEntryAmino;
 }
 export interface AttributeContext_Resource_AnnotationsEntrySDKType {
@@ -975,7 +975,7 @@ export interface AttributeContext_Resource {
    */
   location: string;
 }
-export interface AttributeContext_ResourceProtoType {
+export interface AttributeContext_ResourceProtoMsg {
   typeUrl: "/google.rpc.context.Resource";
   value: Uint8Array;
 }
@@ -1086,7 +1086,7 @@ export interface AttributeContext_ResourceAmino {
    */
   location: string;
 }
-export interface AttributeContext_ResourceAminoType {
+export interface AttributeContext_ResourceAminoMsg {
   type: "/google.rpc.context.Resource";
   value: AttributeContext_ResourceAmino;
 }
@@ -1129,6 +1129,8 @@ function createBaseAttributeContext(): AttributeContext {
 }
 
 export const AttributeContext = {
+  typeUrl: "/google.rpc.context.AttributeContext",
+
   encode(message: AttributeContext, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.origin !== undefined) {
       AttributeContext_Peer.encode(message.origin, writer.uint32(58).fork()).ldelim();
@@ -1322,6 +1324,25 @@ export const AttributeContext = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: AttributeContextAminoMsg): AttributeContext {
+    return AttributeContext.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: AttributeContextProtoMsg): AttributeContext {
+    return AttributeContext.decode(message.value);
+  },
+
+  toProto(message: AttributeContext): Uint8Array {
+    return AttributeContext.encode(message).finish();
+  },
+
+  toProtoMsg(message: AttributeContext): AttributeContextProtoMsg {
+    return {
+      typeUrl: "/google.rpc.context.AttributeContext",
+      value: AttributeContext.encode(message).finish()
+    };
   }
 
 };
@@ -1419,6 +1440,18 @@ export const AttributeContext_Peer_LabelsEntry = {
     obj.key = message.key;
     obj.value = message.value;
     return obj;
+  },
+
+  fromAminoMsg(object: AttributeContext_Peer_LabelsEntryAminoMsg): AttributeContext_Peer_LabelsEntry {
+    return AttributeContext_Peer_LabelsEntry.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: AttributeContext_Peer_LabelsEntryProtoMsg): AttributeContext_Peer_LabelsEntry {
+    return AttributeContext_Peer_LabelsEntry.decode(message.value);
+  },
+
+  toProto(message: AttributeContext_Peer_LabelsEntry): Uint8Array {
+    return AttributeContext_Peer_LabelsEntry.encode(message).finish();
   }
 
 };
@@ -1434,6 +1467,8 @@ function createBaseAttributeContext_Peer(): AttributeContext_Peer {
 }
 
 export const AttributeContext_Peer = {
+  typeUrl: "/google.rpc.context.Peer",
+
   encode(message: AttributeContext_Peer, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.ip !== "") {
       writer.uint32(10).string(message.ip);
@@ -1616,6 +1651,25 @@ export const AttributeContext_Peer = {
     obj.principal = message.principal;
     obj.region_code = message.regionCode;
     return obj;
+  },
+
+  fromAminoMsg(object: AttributeContext_PeerAminoMsg): AttributeContext_Peer {
+    return AttributeContext_Peer.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: AttributeContext_PeerProtoMsg): AttributeContext_Peer {
+    return AttributeContext_Peer.decode(message.value);
+  },
+
+  toProto(message: AttributeContext_Peer): Uint8Array {
+    return AttributeContext_Peer.encode(message).finish();
+  },
+
+  toProtoMsg(message: AttributeContext_Peer): AttributeContext_PeerProtoMsg {
+    return {
+      typeUrl: "/google.rpc.context.Peer",
+      value: AttributeContext_Peer.encode(message).finish()
+    };
   }
 
 };
@@ -1630,6 +1684,8 @@ function createBaseAttributeContext_Api(): AttributeContext_Api {
 }
 
 export const AttributeContext_Api = {
+  typeUrl: "/google.rpc.context.Api",
+
   encode(message: AttributeContext_Api, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.service !== "") {
       writer.uint32(10).string(message.service);
@@ -1745,6 +1801,25 @@ export const AttributeContext_Api = {
     obj.protocol = message.protocol;
     obj.version = message.version;
     return obj;
+  },
+
+  fromAminoMsg(object: AttributeContext_ApiAminoMsg): AttributeContext_Api {
+    return AttributeContext_Api.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: AttributeContext_ApiProtoMsg): AttributeContext_Api {
+    return AttributeContext_Api.decode(message.value);
+  },
+
+  toProto(message: AttributeContext_Api): Uint8Array {
+    return AttributeContext_Api.encode(message).finish();
+  },
+
+  toProtoMsg(message: AttributeContext_Api): AttributeContext_ApiProtoMsg {
+    return {
+      typeUrl: "/google.rpc.context.Api",
+      value: AttributeContext_Api.encode(message).finish()
+    };
   }
 
 };
@@ -1760,6 +1835,8 @@ function createBaseAttributeContext_Auth(): AttributeContext_Auth {
 }
 
 export const AttributeContext_Auth = {
+  typeUrl: "/google.rpc.context.Auth",
+
   encode(message: AttributeContext_Auth, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.principal !== "") {
       writer.uint32(10).string(message.principal);
@@ -1926,6 +2003,25 @@ export const AttributeContext_Auth = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: AttributeContext_AuthAminoMsg): AttributeContext_Auth {
+    return AttributeContext_Auth.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: AttributeContext_AuthProtoMsg): AttributeContext_Auth {
+    return AttributeContext_Auth.decode(message.value);
+  },
+
+  toProto(message: AttributeContext_Auth): Uint8Array {
+    return AttributeContext_Auth.encode(message).finish();
+  },
+
+  toProtoMsg(message: AttributeContext_Auth): AttributeContext_AuthProtoMsg {
+    return {
+      typeUrl: "/google.rpc.context.Auth",
+      value: AttributeContext_Auth.encode(message).finish()
+    };
   }
 
 };
@@ -2023,6 +2119,18 @@ export const AttributeContext_Request_HeadersEntry = {
     obj.key = message.key;
     obj.value = message.value;
     return obj;
+  },
+
+  fromAminoMsg(object: AttributeContext_Request_HeadersEntryAminoMsg): AttributeContext_Request_HeadersEntry {
+    return AttributeContext_Request_HeadersEntry.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: AttributeContext_Request_HeadersEntryProtoMsg): AttributeContext_Request_HeadersEntry {
+    return AttributeContext_Request_HeadersEntry.decode(message.value);
+  },
+
+  toProto(message: AttributeContext_Request_HeadersEntry): Uint8Array {
+    return AttributeContext_Request_HeadersEntry.encode(message).finish();
   }
 
 };
@@ -2045,6 +2153,8 @@ function createBaseAttributeContext_Request(): AttributeContext_Request {
 }
 
 export const AttributeContext_Request = {
+  typeUrl: "/google.rpc.context.Request",
+
   encode(message: AttributeContext_Request, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.id !== "") {
       writer.uint32(10).string(message.id);
@@ -2332,6 +2442,25 @@ export const AttributeContext_Request = {
     obj.reason = message.reason;
     obj.auth = message.auth ? AttributeContext_Auth.toAmino(message.auth) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: AttributeContext_RequestAminoMsg): AttributeContext_Request {
+    return AttributeContext_Request.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: AttributeContext_RequestProtoMsg): AttributeContext_Request {
+    return AttributeContext_Request.decode(message.value);
+  },
+
+  toProto(message: AttributeContext_Request): Uint8Array {
+    return AttributeContext_Request.encode(message).finish();
+  },
+
+  toProtoMsg(message: AttributeContext_Request): AttributeContext_RequestProtoMsg {
+    return {
+      typeUrl: "/google.rpc.context.Request",
+      value: AttributeContext_Request.encode(message).finish()
+    };
   }
 
 };
@@ -2429,6 +2558,18 @@ export const AttributeContext_Response_HeadersEntry = {
     obj.key = message.key;
     obj.value = message.value;
     return obj;
+  },
+
+  fromAminoMsg(object: AttributeContext_Response_HeadersEntryAminoMsg): AttributeContext_Response_HeadersEntry {
+    return AttributeContext_Response_HeadersEntry.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: AttributeContext_Response_HeadersEntryProtoMsg): AttributeContext_Response_HeadersEntry {
+    return AttributeContext_Response_HeadersEntry.decode(message.value);
+  },
+
+  toProto(message: AttributeContext_Response_HeadersEntry): Uint8Array {
+    return AttributeContext_Response_HeadersEntry.encode(message).finish();
   }
 
 };
@@ -2444,6 +2585,8 @@ function createBaseAttributeContext_Response(): AttributeContext_Response {
 }
 
 export const AttributeContext_Response = {
+  typeUrl: "/google.rpc.context.Response",
+
   encode(message: AttributeContext_Response, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.code.isZero()) {
       writer.uint32(8).int64(message.code);
@@ -2626,6 +2769,25 @@ export const AttributeContext_Response = {
     obj.time = message.time ? Timestamp.toAmino(message.time) : undefined;
     obj.backend_latency = message.backendLatency ? Duration.toAmino(message.backendLatency) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: AttributeContext_ResponseAminoMsg): AttributeContext_Response {
+    return AttributeContext_Response.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: AttributeContext_ResponseProtoMsg): AttributeContext_Response {
+    return AttributeContext_Response.decode(message.value);
+  },
+
+  toProto(message: AttributeContext_Response): Uint8Array {
+    return AttributeContext_Response.encode(message).finish();
+  },
+
+  toProtoMsg(message: AttributeContext_Response): AttributeContext_ResponseProtoMsg {
+    return {
+      typeUrl: "/google.rpc.context.Response",
+      value: AttributeContext_Response.encode(message).finish()
+    };
   }
 
 };
@@ -2723,6 +2885,18 @@ export const AttributeContext_Resource_LabelsEntry = {
     obj.key = message.key;
     obj.value = message.value;
     return obj;
+  },
+
+  fromAminoMsg(object: AttributeContext_Resource_LabelsEntryAminoMsg): AttributeContext_Resource_LabelsEntry {
+    return AttributeContext_Resource_LabelsEntry.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: AttributeContext_Resource_LabelsEntryProtoMsg): AttributeContext_Resource_LabelsEntry {
+    return AttributeContext_Resource_LabelsEntry.decode(message.value);
+  },
+
+  toProto(message: AttributeContext_Resource_LabelsEntry): Uint8Array {
+    return AttributeContext_Resource_LabelsEntry.encode(message).finish();
   }
 
 };
@@ -2820,6 +2994,18 @@ export const AttributeContext_Resource_AnnotationsEntry = {
     obj.key = message.key;
     obj.value = message.value;
     return obj;
+  },
+
+  fromAminoMsg(object: AttributeContext_Resource_AnnotationsEntryAminoMsg): AttributeContext_Resource_AnnotationsEntry {
+    return AttributeContext_Resource_AnnotationsEntry.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: AttributeContext_Resource_AnnotationsEntryProtoMsg): AttributeContext_Resource_AnnotationsEntry {
+    return AttributeContext_Resource_AnnotationsEntry.decode(message.value);
+  },
+
+  toProto(message: AttributeContext_Resource_AnnotationsEntry): Uint8Array {
+    return AttributeContext_Resource_AnnotationsEntry.encode(message).finish();
   }
 
 };
@@ -2842,6 +3028,8 @@ function createBaseAttributeContext_Resource(): AttributeContext_Resource {
 }
 
 export const AttributeContext_Resource = {
+  typeUrl: "/google.rpc.context.Resource",
+
   encode(message: AttributeContext_Resource, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.service !== "") {
       writer.uint32(10).string(message.service);
@@ -3181,6 +3369,25 @@ export const AttributeContext_Resource = {
     obj.etag = message.etag;
     obj.location = message.location;
     return obj;
+  },
+
+  fromAminoMsg(object: AttributeContext_ResourceAminoMsg): AttributeContext_Resource {
+    return AttributeContext_Resource.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: AttributeContext_ResourceProtoMsg): AttributeContext_Resource {
+    return AttributeContext_Resource.decode(message.value);
+  },
+
+  toProto(message: AttributeContext_Resource): Uint8Array {
+    return AttributeContext_Resource.encode(message).finish();
+  },
+
+  toProtoMsg(message: AttributeContext_Resource): AttributeContext_ResourceProtoMsg {
+    return {
+      typeUrl: "/google.rpc.context.Resource",
+      value: AttributeContext_Resource.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/rpc/error_details.ts b/__fixtures__/outputv2/google/rpc/error_details.ts
index c705f8755..d26b3afbe 100644
--- a/__fixtures__/outputv2/google/rpc/error_details.ts
+++ b/__fixtures__/outputv2/google/rpc/error_details.ts
@@ -22,7 +22,7 @@ export interface RetryInfo {
   /** Clients should wait at least this long between retrying the same request. */
   retryDelay?: Duration;
 }
-export interface RetryInfoProtoType {
+export interface RetryInfoProtoMsg {
   typeUrl: "/google.rpc.RetryInfo";
   value: Uint8Array;
 }
@@ -46,7 +46,7 @@ export interface RetryInfoAmino {
   /** Clients should wait at least this long between retrying the same request. */
   retry_delay?: DurationAmino;
 }
-export interface RetryInfoAminoType {
+export interface RetryInfoAminoMsg {
   type: "/google.rpc.RetryInfo";
   value: RetryInfoAmino;
 }
@@ -78,7 +78,7 @@ export interface DebugInfo {
   /** Additional debugging information provided by the server. */
   detail: string;
 }
-export interface DebugInfoProtoType {
+export interface DebugInfoProtoMsg {
   typeUrl: "/google.rpc.DebugInfo";
   value: Uint8Array;
 }
@@ -91,7 +91,7 @@ export interface DebugInfoAmino {
   /** Additional debugging information provided by the server. */
   detail: string;
 }
-export interface DebugInfoAminoType {
+export interface DebugInfoAminoMsg {
   type: "/google.rpc.DebugInfo";
   value: DebugInfoAmino;
 }
@@ -119,7 +119,7 @@ export interface QuotaFailure {
   /** Describes all quota violations. */
   violations: QuotaFailure_Violation[];
 }
-export interface QuotaFailureProtoType {
+export interface QuotaFailureProtoMsg {
   typeUrl: "/google.rpc.QuotaFailure";
   value: Uint8Array;
 }
@@ -141,7 +141,7 @@ export interface QuotaFailureAmino {
   /** Describes all quota violations. */
   violations: QuotaFailure_ViolationAmino[];
 }
-export interface QuotaFailureAminoType {
+export interface QuotaFailureAminoMsg {
   type: "/google.rpc.QuotaFailure";
   value: QuotaFailureAmino;
 }
@@ -186,7 +186,7 @@ export interface QuotaFailure_Violation {
    */
   description: string;
 }
-export interface QuotaFailure_ViolationProtoType {
+export interface QuotaFailure_ViolationProtoMsg {
   typeUrl: "/google.rpc.Violation";
   value: Uint8Array;
 }
@@ -214,7 +214,7 @@ export interface QuotaFailure_ViolationAmino {
    */
   description: string;
 }
-export interface QuotaFailure_ViolationAminoType {
+export interface QuotaFailure_ViolationAminoMsg {
   type: "/google.rpc.Violation";
   value: QuotaFailure_ViolationAmino;
 }
@@ -231,16 +231,16 @@ export interface ErrorInfo_MetadataEntry {
   key: string;
   value: string;
 }
-export interface ErrorInfo_MetadataEntryProtoType {
-  typeUrl: "/google.rpc.undefined";
+export interface ErrorInfo_MetadataEntryProtoMsg {
+  typeUrl: string;
   value: Uint8Array;
 }
 export interface ErrorInfo_MetadataEntryAmino {
   key: string;
   value: string;
 }
-export interface ErrorInfo_MetadataEntryAminoType {
-  type: "/google.rpc.undefined";
+export interface ErrorInfo_MetadataEntryAminoMsg {
+  type: string;
   value: ErrorInfo_MetadataEntryAmino;
 }
 export interface ErrorInfo_MetadataEntrySDKType {
@@ -307,7 +307,7 @@ export interface ErrorInfo {
     [key: string]: string;
   };
 }
-export interface ErrorInfoProtoType {
+export interface ErrorInfoProtoMsg {
   typeUrl: "/google.rpc.ErrorInfo";
   value: Uint8Array;
 }
@@ -371,7 +371,7 @@ export interface ErrorInfoAmino {
     [key: string]: string;
   };
 }
-export interface ErrorInfoAminoType {
+export interface ErrorInfoAminoMsg {
   type: "/google.rpc.ErrorInfo";
   value: ErrorInfoAmino;
 }
@@ -421,7 +421,7 @@ export interface PreconditionFailure {
   /** Describes all precondition violations. */
   violations: PreconditionFailure_Violation[];
 }
-export interface PreconditionFailureProtoType {
+export interface PreconditionFailureProtoMsg {
   typeUrl: "/google.rpc.PreconditionFailure";
   value: Uint8Array;
 }
@@ -437,7 +437,7 @@ export interface PreconditionFailureAmino {
   /** Describes all precondition violations. */
   violations: PreconditionFailure_ViolationAmino[];
 }
-export interface PreconditionFailureAminoType {
+export interface PreconditionFailureAminoMsg {
   type: "/google.rpc.PreconditionFailure";
   value: PreconditionFailureAmino;
 }
@@ -477,7 +477,7 @@ export interface PreconditionFailure_Violation {
    */
   description: string;
 }
-export interface PreconditionFailure_ViolationProtoType {
+export interface PreconditionFailure_ViolationProtoMsg {
   typeUrl: "/google.rpc.Violation";
   value: Uint8Array;
 }
@@ -506,7 +506,7 @@ export interface PreconditionFailure_ViolationAmino {
    */
   description: string;
 }
-export interface PreconditionFailure_ViolationAminoType {
+export interface PreconditionFailure_ViolationAminoMsg {
   type: "/google.rpc.Violation";
   value: PreconditionFailure_ViolationAmino;
 }
@@ -526,7 +526,7 @@ export interface BadRequest {
   /** Describes all violations in a client request. */
   fieldViolations: BadRequest_FieldViolation[];
 }
-export interface BadRequestProtoType {
+export interface BadRequestProtoMsg {
   typeUrl: "/google.rpc.BadRequest";
   value: Uint8Array;
 }
@@ -539,7 +539,7 @@ export interface BadRequestAmino {
   /** Describes all violations in a client request. */
   field_violations: BadRequest_FieldViolationAmino[];
 }
-export interface BadRequestAminoType {
+export interface BadRequestAminoMsg {
   type: "/google.rpc.BadRequest";
   value: BadRequestAmino;
 }
@@ -564,7 +564,7 @@ export interface BadRequest_FieldViolation {
   /** A description of why the request element is bad. */
   description: string;
 }
-export interface BadRequest_FieldViolationProtoType {
+export interface BadRequest_FieldViolationProtoMsg {
   typeUrl: "/google.rpc.FieldViolation";
   value: Uint8Array;
 }
@@ -581,7 +581,7 @@ export interface BadRequest_FieldViolationAmino {
   /** A description of why the request element is bad. */
   description: string;
 }
-export interface BadRequest_FieldViolationAminoType {
+export interface BadRequest_FieldViolationAminoMsg {
   type: "/google.rpc.FieldViolation";
   value: BadRequest_FieldViolationAmino;
 }
@@ -609,7 +609,7 @@ export interface RequestInfo {
    */
   servingData: string;
 }
-export interface RequestInfoProtoType {
+export interface RequestInfoProtoMsg {
   typeUrl: "/google.rpc.RequestInfo";
   value: Uint8Array;
 }
@@ -631,7 +631,7 @@ export interface RequestInfoAmino {
    */
   serving_data: string;
 }
-export interface RequestInfoAminoType {
+export interface RequestInfoAminoMsg {
   type: "/google.rpc.RequestInfo";
   value: RequestInfoAmino;
 }
@@ -675,7 +675,7 @@ export interface ResourceInfo {
    */
   description: string;
 }
-export interface ResourceInfoProtoType {
+export interface ResourceInfoProtoMsg {
   typeUrl: "/google.rpc.ResourceInfo";
   value: Uint8Array;
 }
@@ -710,7 +710,7 @@ export interface ResourceInfoAmino {
    */
   description: string;
 }
-export interface ResourceInfoAminoType {
+export interface ResourceInfoAminoMsg {
   type: "/google.rpc.ResourceInfo";
   value: ResourceInfoAmino;
 }
@@ -734,7 +734,7 @@ export interface Help {
   /** URL(s) pointing to additional information on handling the current error. */
   links: Help_Link[];
 }
-export interface HelpProtoType {
+export interface HelpProtoMsg {
   typeUrl: "/google.rpc.Help";
   value: Uint8Array;
 }
@@ -750,7 +750,7 @@ export interface HelpAmino {
   /** URL(s) pointing to additional information on handling the current error. */
   links: Help_LinkAmino[];
 }
-export interface HelpAminoType {
+export interface HelpAminoMsg {
   type: "/google.rpc.Help";
   value: HelpAmino;
 }
@@ -774,7 +774,7 @@ export interface Help_Link {
   /** The URL of the link. */
   url: string;
 }
-export interface Help_LinkProtoType {
+export interface Help_LinkProtoMsg {
   typeUrl: "/google.rpc.Link";
   value: Uint8Array;
 }
@@ -787,7 +787,7 @@ export interface Help_LinkAmino {
   /** The URL of the link. */
   url: string;
 }
-export interface Help_LinkAminoType {
+export interface Help_LinkAminoMsg {
   type: "/google.rpc.Link";
   value: Help_LinkAmino;
 }
@@ -813,7 +813,7 @@ export interface LocalizedMessage {
   /** The localized error message in the above locale. */
   message: string;
 }
-export interface LocalizedMessageProtoType {
+export interface LocalizedMessageProtoMsg {
   typeUrl: "/google.rpc.LocalizedMessage";
   value: Uint8Array;
 }
@@ -833,7 +833,7 @@ export interface LocalizedMessageAmino {
   /** The localized error message in the above locale. */
   message: string;
 }
-export interface LocalizedMessageAminoType {
+export interface LocalizedMessageAminoMsg {
   type: "/google.rpc.LocalizedMessage";
   value: LocalizedMessageAmino;
 }
@@ -854,6 +854,8 @@ function createBaseRetryInfo(): RetryInfo {
 }
 
 export const RetryInfo = {
+  typeUrl: "/google.rpc.RetryInfo",
+
   encode(message: RetryInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.retryDelay !== undefined) {
       Duration.encode(message.retryDelay, writer.uint32(10).fork()).ldelim();
@@ -924,6 +926,25 @@ export const RetryInfo = {
     const obj: any = {};
     obj.retry_delay = message.retryDelay ? Duration.toAmino(message.retryDelay) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: RetryInfoAminoMsg): RetryInfo {
+    return RetryInfo.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: RetryInfoProtoMsg): RetryInfo {
+    return RetryInfo.decode(message.value);
+  },
+
+  toProto(message: RetryInfo): Uint8Array {
+    return RetryInfo.encode(message).finish();
+  },
+
+  toProtoMsg(message: RetryInfo): RetryInfoProtoMsg {
+    return {
+      typeUrl: "/google.rpc.RetryInfo",
+      value: RetryInfo.encode(message).finish()
+    };
   }
 
 };
@@ -936,6 +957,8 @@ function createBaseDebugInfo(): DebugInfo {
 }
 
 export const DebugInfo = {
+  typeUrl: "/google.rpc.DebugInfo",
+
   encode(message: DebugInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.stackEntries) {
       writer.uint32(10).string(v!);
@@ -1039,6 +1062,25 @@ export const DebugInfo = {
 
     obj.detail = message.detail;
     return obj;
+  },
+
+  fromAminoMsg(object: DebugInfoAminoMsg): DebugInfo {
+    return DebugInfo.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: DebugInfoProtoMsg): DebugInfo {
+    return DebugInfo.decode(message.value);
+  },
+
+  toProto(message: DebugInfo): Uint8Array {
+    return DebugInfo.encode(message).finish();
+  },
+
+  toProtoMsg(message: DebugInfo): DebugInfoProtoMsg {
+    return {
+      typeUrl: "/google.rpc.DebugInfo",
+      value: DebugInfo.encode(message).finish()
+    };
   }
 
 };
@@ -1050,6 +1092,8 @@ function createBaseQuotaFailure(): QuotaFailure {
 }
 
 export const QuotaFailure = {
+  typeUrl: "/google.rpc.QuotaFailure",
+
   encode(message: QuotaFailure, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.violations) {
       QuotaFailure_Violation.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1138,6 +1182,25 @@ export const QuotaFailure = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: QuotaFailureAminoMsg): QuotaFailure {
+    return QuotaFailure.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QuotaFailureProtoMsg): QuotaFailure {
+    return QuotaFailure.decode(message.value);
+  },
+
+  toProto(message: QuotaFailure): Uint8Array {
+    return QuotaFailure.encode(message).finish();
+  },
+
+  toProtoMsg(message: QuotaFailure): QuotaFailureProtoMsg {
+    return {
+      typeUrl: "/google.rpc.QuotaFailure",
+      value: QuotaFailure.encode(message).finish()
+    };
   }
 
 };
@@ -1150,6 +1213,8 @@ function createBaseQuotaFailure_Violation(): QuotaFailure_Violation {
 }
 
 export const QuotaFailure_Violation = {
+  typeUrl: "/google.rpc.Violation",
+
   encode(message: QuotaFailure_Violation, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.subject !== "") {
       writer.uint32(10).string(message.subject);
@@ -1235,6 +1300,25 @@ export const QuotaFailure_Violation = {
     obj.subject = message.subject;
     obj.description = message.description;
     return obj;
+  },
+
+  fromAminoMsg(object: QuotaFailure_ViolationAminoMsg): QuotaFailure_Violation {
+    return QuotaFailure_Violation.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: QuotaFailure_ViolationProtoMsg): QuotaFailure_Violation {
+    return QuotaFailure_Violation.decode(message.value);
+  },
+
+  toProto(message: QuotaFailure_Violation): Uint8Array {
+    return QuotaFailure_Violation.encode(message).finish();
+  },
+
+  toProtoMsg(message: QuotaFailure_Violation): QuotaFailure_ViolationProtoMsg {
+    return {
+      typeUrl: "/google.rpc.Violation",
+      value: QuotaFailure_Violation.encode(message).finish()
+    };
   }
 
 };
@@ -1332,6 +1416,18 @@ export const ErrorInfo_MetadataEntry = {
     obj.key = message.key;
     obj.value = message.value;
     return obj;
+  },
+
+  fromAminoMsg(object: ErrorInfo_MetadataEntryAminoMsg): ErrorInfo_MetadataEntry {
+    return ErrorInfo_MetadataEntry.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ErrorInfo_MetadataEntryProtoMsg): ErrorInfo_MetadataEntry {
+    return ErrorInfo_MetadataEntry.decode(message.value);
+  },
+
+  toProto(message: ErrorInfo_MetadataEntry): Uint8Array {
+    return ErrorInfo_MetadataEntry.encode(message).finish();
   }
 
 };
@@ -1345,6 +1441,8 @@ function createBaseErrorInfo(): ErrorInfo {
 }
 
 export const ErrorInfo = {
+  typeUrl: "/google.rpc.ErrorInfo",
+
   encode(message: ErrorInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.reason !== "") {
       writer.uint32(10).string(message.reason);
@@ -1496,6 +1594,25 @@ export const ErrorInfo = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ErrorInfoAminoMsg): ErrorInfo {
+    return ErrorInfo.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ErrorInfoProtoMsg): ErrorInfo {
+    return ErrorInfo.decode(message.value);
+  },
+
+  toProto(message: ErrorInfo): Uint8Array {
+    return ErrorInfo.encode(message).finish();
+  },
+
+  toProtoMsg(message: ErrorInfo): ErrorInfoProtoMsg {
+    return {
+      typeUrl: "/google.rpc.ErrorInfo",
+      value: ErrorInfo.encode(message).finish()
+    };
   }
 
 };
@@ -1507,6 +1624,8 @@ function createBasePreconditionFailure(): PreconditionFailure {
 }
 
 export const PreconditionFailure = {
+  typeUrl: "/google.rpc.PreconditionFailure",
+
   encode(message: PreconditionFailure, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.violations) {
       PreconditionFailure_Violation.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1595,6 +1714,25 @@ export const PreconditionFailure = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: PreconditionFailureAminoMsg): PreconditionFailure {
+    return PreconditionFailure.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: PreconditionFailureProtoMsg): PreconditionFailure {
+    return PreconditionFailure.decode(message.value);
+  },
+
+  toProto(message: PreconditionFailure): Uint8Array {
+    return PreconditionFailure.encode(message).finish();
+  },
+
+  toProtoMsg(message: PreconditionFailure): PreconditionFailureProtoMsg {
+    return {
+      typeUrl: "/google.rpc.PreconditionFailure",
+      value: PreconditionFailure.encode(message).finish()
+    };
   }
 
 };
@@ -1608,6 +1746,8 @@ function createBasePreconditionFailure_Violation(): PreconditionFailure_Violatio
 }
 
 export const PreconditionFailure_Violation = {
+  typeUrl: "/google.rpc.Violation",
+
   encode(message: PreconditionFailure_Violation, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.type !== "") {
       writer.uint32(10).string(message.type);
@@ -1708,6 +1848,25 @@ export const PreconditionFailure_Violation = {
     obj.subject = message.subject;
     obj.description = message.description;
     return obj;
+  },
+
+  fromAminoMsg(object: PreconditionFailure_ViolationAminoMsg): PreconditionFailure_Violation {
+    return PreconditionFailure_Violation.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: PreconditionFailure_ViolationProtoMsg): PreconditionFailure_Violation {
+    return PreconditionFailure_Violation.decode(message.value);
+  },
+
+  toProto(message: PreconditionFailure_Violation): Uint8Array {
+    return PreconditionFailure_Violation.encode(message).finish();
+  },
+
+  toProtoMsg(message: PreconditionFailure_Violation): PreconditionFailure_ViolationProtoMsg {
+    return {
+      typeUrl: "/google.rpc.Violation",
+      value: PreconditionFailure_Violation.encode(message).finish()
+    };
   }
 
 };
@@ -1719,6 +1878,8 @@ function createBaseBadRequest(): BadRequest {
 }
 
 export const BadRequest = {
+  typeUrl: "/google.rpc.BadRequest",
+
   encode(message: BadRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.fieldViolations) {
       BadRequest_FieldViolation.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1807,6 +1968,25 @@ export const BadRequest = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: BadRequestAminoMsg): BadRequest {
+    return BadRequest.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: BadRequestProtoMsg): BadRequest {
+    return BadRequest.decode(message.value);
+  },
+
+  toProto(message: BadRequest): Uint8Array {
+    return BadRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: BadRequest): BadRequestProtoMsg {
+    return {
+      typeUrl: "/google.rpc.BadRequest",
+      value: BadRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1819,6 +1999,8 @@ function createBaseBadRequest_FieldViolation(): BadRequest_FieldViolation {
 }
 
 export const BadRequest_FieldViolation = {
+  typeUrl: "/google.rpc.FieldViolation",
+
   encode(message: BadRequest_FieldViolation, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.field !== "") {
       writer.uint32(10).string(message.field);
@@ -1904,6 +2086,25 @@ export const BadRequest_FieldViolation = {
     obj.field = message.field;
     obj.description = message.description;
     return obj;
+  },
+
+  fromAminoMsg(object: BadRequest_FieldViolationAminoMsg): BadRequest_FieldViolation {
+    return BadRequest_FieldViolation.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: BadRequest_FieldViolationProtoMsg): BadRequest_FieldViolation {
+    return BadRequest_FieldViolation.decode(message.value);
+  },
+
+  toProto(message: BadRequest_FieldViolation): Uint8Array {
+    return BadRequest_FieldViolation.encode(message).finish();
+  },
+
+  toProtoMsg(message: BadRequest_FieldViolation): BadRequest_FieldViolationProtoMsg {
+    return {
+      typeUrl: "/google.rpc.FieldViolation",
+      value: BadRequest_FieldViolation.encode(message).finish()
+    };
   }
 
 };
@@ -1916,6 +2117,8 @@ function createBaseRequestInfo(): RequestInfo {
 }
 
 export const RequestInfo = {
+  typeUrl: "/google.rpc.RequestInfo",
+
   encode(message: RequestInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.requestId !== "") {
       writer.uint32(10).string(message.requestId);
@@ -2001,6 +2204,25 @@ export const RequestInfo = {
     obj.request_id = message.requestId;
     obj.serving_data = message.servingData;
     return obj;
+  },
+
+  fromAminoMsg(object: RequestInfoAminoMsg): RequestInfo {
+    return RequestInfo.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: RequestInfoProtoMsg): RequestInfo {
+    return RequestInfo.decode(message.value);
+  },
+
+  toProto(message: RequestInfo): Uint8Array {
+    return RequestInfo.encode(message).finish();
+  },
+
+  toProtoMsg(message: RequestInfo): RequestInfoProtoMsg {
+    return {
+      typeUrl: "/google.rpc.RequestInfo",
+      value: RequestInfo.encode(message).finish()
+    };
   }
 
 };
@@ -2015,6 +2237,8 @@ function createBaseResourceInfo(): ResourceInfo {
 }
 
 export const ResourceInfo = {
+  typeUrl: "/google.rpc.ResourceInfo",
+
   encode(message: ResourceInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.resourceType !== "") {
       writer.uint32(10).string(message.resourceType);
@@ -2130,6 +2354,25 @@ export const ResourceInfo = {
     obj.owner = message.owner;
     obj.description = message.description;
     return obj;
+  },
+
+  fromAminoMsg(object: ResourceInfoAminoMsg): ResourceInfo {
+    return ResourceInfo.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ResourceInfoProtoMsg): ResourceInfo {
+    return ResourceInfo.decode(message.value);
+  },
+
+  toProto(message: ResourceInfo): Uint8Array {
+    return ResourceInfo.encode(message).finish();
+  },
+
+  toProtoMsg(message: ResourceInfo): ResourceInfoProtoMsg {
+    return {
+      typeUrl: "/google.rpc.ResourceInfo",
+      value: ResourceInfo.encode(message).finish()
+    };
   }
 
 };
@@ -2141,6 +2384,8 @@ function createBaseHelp(): Help {
 }
 
 export const Help = {
+  typeUrl: "/google.rpc.Help",
+
   encode(message: Help, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.links) {
       Help_Link.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -2229,6 +2474,25 @@ export const Help = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: HelpAminoMsg): Help {
+    return Help.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: HelpProtoMsg): Help {
+    return Help.decode(message.value);
+  },
+
+  toProto(message: Help): Uint8Array {
+    return Help.encode(message).finish();
+  },
+
+  toProtoMsg(message: Help): HelpProtoMsg {
+    return {
+      typeUrl: "/google.rpc.Help",
+      value: Help.encode(message).finish()
+    };
   }
 
 };
@@ -2241,6 +2505,8 @@ function createBaseHelp_Link(): Help_Link {
 }
 
 export const Help_Link = {
+  typeUrl: "/google.rpc.Link",
+
   encode(message: Help_Link, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.description !== "") {
       writer.uint32(10).string(message.description);
@@ -2326,6 +2592,25 @@ export const Help_Link = {
     obj.description = message.description;
     obj.url = message.url;
     return obj;
+  },
+
+  fromAminoMsg(object: Help_LinkAminoMsg): Help_Link {
+    return Help_Link.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: Help_LinkProtoMsg): Help_Link {
+    return Help_Link.decode(message.value);
+  },
+
+  toProto(message: Help_Link): Uint8Array {
+    return Help_Link.encode(message).finish();
+  },
+
+  toProtoMsg(message: Help_Link): Help_LinkProtoMsg {
+    return {
+      typeUrl: "/google.rpc.Link",
+      value: Help_Link.encode(message).finish()
+    };
   }
 
 };
@@ -2338,6 +2623,8 @@ function createBaseLocalizedMessage(): LocalizedMessage {
 }
 
 export const LocalizedMessage = {
+  typeUrl: "/google.rpc.LocalizedMessage",
+
   encode(message: LocalizedMessage, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.locale !== "") {
       writer.uint32(10).string(message.locale);
@@ -2423,6 +2710,25 @@ export const LocalizedMessage = {
     obj.locale = message.locale;
     obj.message = message.message;
     return obj;
+  },
+
+  fromAminoMsg(object: LocalizedMessageAminoMsg): LocalizedMessage {
+    return LocalizedMessage.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: LocalizedMessageProtoMsg): LocalizedMessage {
+    return LocalizedMessage.decode(message.value);
+  },
+
+  toProto(message: LocalizedMessage): Uint8Array {
+    return LocalizedMessage.encode(message).finish();
+  },
+
+  toProtoMsg(message: LocalizedMessage): LocalizedMessageProtoMsg {
+    return {
+      typeUrl: "/google.rpc.LocalizedMessage",
+      value: LocalizedMessage.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/google/rpc/status.ts b/__fixtures__/outputv2/google/rpc/status.ts
index 817216cdf..cdf1d5f00 100644
--- a/__fixtures__/outputv2/google/rpc/status.ts
+++ b/__fixtures__/outputv2/google/rpc/status.ts
@@ -29,7 +29,7 @@ export interface Status {
    */
   details: Any[];
 }
-export interface StatusProtoType {
+export interface StatusProtoMsg {
   typeUrl: "/google.rpc.Status";
   value: Uint8Array;
 }
@@ -60,7 +60,7 @@ export interface StatusAmino {
    */
   details: AnyAmino[];
 }
-export interface StatusAminoType {
+export interface StatusAminoMsg {
   type: "/google.rpc.Status";
   value: StatusAmino;
 }
@@ -89,6 +89,8 @@ function createBaseStatus(): Status {
 }
 
 export const Status = {
+  typeUrl: "/google.rpc.Status",
+
   encode(message: Status, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.code !== 0) {
       writer.uint32(8).int32(message.code);
@@ -207,6 +209,25 @@ export const Status = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: StatusAminoMsg): Status {
+    return Status.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: StatusProtoMsg): Status {
+    return Status.decode(message.value);
+  },
+
+  toProto(message: Status): Uint8Array {
+    return Status.encode(message).finish();
+  },
+
+  toProtoMsg(message: Status): StatusProtoMsg {
+    return {
+      typeUrl: "/google.rpc.Status",
+      value: Status.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/ibc/applications/transfer/v1/genesis.ts b/__fixtures__/outputv2/ibc/applications/transfer/v1/genesis.ts
index 2557d2e59..bc73f5f79 100644
--- a/__fixtures__/outputv2/ibc/applications/transfer/v1/genesis.ts
+++ b/__fixtures__/outputv2/ibc/applications/transfer/v1/genesis.ts
@@ -9,7 +9,7 @@ export interface GenesisState {
   denomTraces: DenomTrace[];
   params?: Params;
 }
-export interface GenesisStateProtoType {
+export interface GenesisStateProtoMsg {
   typeUrl: "/ibc.applications.transfer.v1.GenesisState";
   value: Uint8Array;
 }
@@ -20,7 +20,7 @@ export interface GenesisStateAmino {
   denom_traces: DenomTraceAmino[];
   params?: ParamsAmino;
 }
-export interface GenesisStateAminoType {
+export interface GenesisStateAminoMsg {
   type: "cosmos-sdk/GenesisState";
   value: GenesisStateAmino;
 }
@@ -41,6 +41,9 @@ function createBaseGenesisState(): GenesisState {
 }
 
 export const GenesisState = {
+  typeUrl: "/ibc.applications.transfer.v1.GenesisState",
+  aminoType: "cosmos-sdk/GenesisState",
+
   encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.portId !== "") {
       writer.uint32(10).string(message.portId);
@@ -159,6 +162,32 @@ export const GenesisState = {
 
     obj.params = message.params ? Params.toAmino(message.params) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisStateAminoMsg): GenesisState {
+    return GenesisState.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GenesisState): GenesisStateAminoMsg {
+    return {
+      type: "cosmos-sdk/GenesisState",
+      value: GenesisState.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GenesisStateProtoMsg): GenesisState {
+    return GenesisState.decode(message.value);
+  },
+
+  toProto(message: GenesisState): Uint8Array {
+    return GenesisState.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisState): GenesisStateProtoMsg {
+    return {
+      typeUrl: "/ibc.applications.transfer.v1.GenesisState",
+      value: GenesisState.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/ibc/applications/transfer/v1/query.ts b/__fixtures__/outputv2/ibc/applications/transfer/v1/query.ts
index 49682e9bb..168820907 100644
--- a/__fixtures__/outputv2/ibc/applications/transfer/v1/query.ts
+++ b/__fixtures__/outputv2/ibc/applications/transfer/v1/query.ts
@@ -12,7 +12,7 @@ export interface QueryDenomTraceRequest {
   /** hash (in hex format) of the denomination trace information. */
   hash: string;
 }
-export interface QueryDenomTraceRequestProtoType {
+export interface QueryDenomTraceRequestProtoMsg {
   typeUrl: "/ibc.applications.transfer.v1.QueryDenomTraceRequest";
   value: Uint8Array;
 }
@@ -25,7 +25,7 @@ export interface QueryDenomTraceRequestAmino {
   /** hash (in hex format) of the denomination trace information. */
   hash: string;
 }
-export interface QueryDenomTraceRequestAminoType {
+export interface QueryDenomTraceRequestAminoMsg {
   type: "cosmos-sdk/QueryDenomTraceRequest";
   value: QueryDenomTraceRequestAmino;
 }
@@ -46,7 +46,7 @@ export interface QueryDenomTraceResponse {
   /** denom_trace returns the requested denomination trace information. */
   denomTrace?: DenomTrace;
 }
-export interface QueryDenomTraceResponseProtoType {
+export interface QueryDenomTraceResponseProtoMsg {
   typeUrl: "/ibc.applications.transfer.v1.QueryDenomTraceResponse";
   value: Uint8Array;
 }
@@ -59,7 +59,7 @@ export interface QueryDenomTraceResponseAmino {
   /** denom_trace returns the requested denomination trace information. */
   denom_trace?: DenomTraceAmino;
 }
-export interface QueryDenomTraceResponseAminoType {
+export interface QueryDenomTraceResponseAminoMsg {
   type: "cosmos-sdk/QueryDenomTraceResponse";
   value: QueryDenomTraceResponseAmino;
 }
@@ -80,7 +80,7 @@ export interface QueryDenomTracesRequest {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequest;
 }
-export interface QueryDenomTracesRequestProtoType {
+export interface QueryDenomTracesRequestProtoMsg {
   typeUrl: "/ibc.applications.transfer.v1.QueryDenomTracesRequest";
   value: Uint8Array;
 }
@@ -93,7 +93,7 @@ export interface QueryDenomTracesRequestAmino {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequestAmino;
 }
-export interface QueryDenomTracesRequestAminoType {
+export interface QueryDenomTracesRequestAminoMsg {
   type: "cosmos-sdk/QueryDenomTracesRequest";
   value: QueryDenomTracesRequestAmino;
 }
@@ -117,7 +117,7 @@ export interface QueryDenomTracesResponse {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponse;
 }
-export interface QueryDenomTracesResponseProtoType {
+export interface QueryDenomTracesResponseProtoMsg {
   typeUrl: "/ibc.applications.transfer.v1.QueryDenomTracesResponse";
   value: Uint8Array;
 }
@@ -133,7 +133,7 @@ export interface QueryDenomTracesResponseAmino {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponseAmino;
 }
-export interface QueryDenomTracesResponseAminoType {
+export interface QueryDenomTracesResponseAminoMsg {
   type: "cosmos-sdk/QueryDenomTracesResponse";
   value: QueryDenomTracesResponseAmino;
 }
@@ -149,14 +149,14 @@ export interface QueryDenomTracesResponseSDKType {
 
 /** QueryParamsRequest is the request type for the Query/Params RPC method. */
 export interface QueryParamsRequest {}
-export interface QueryParamsRequestProtoType {
+export interface QueryParamsRequestProtoMsg {
   typeUrl: "/ibc.applications.transfer.v1.QueryParamsRequest";
   value: Uint8Array;
 }
 
 /** QueryParamsRequest is the request type for the Query/Params RPC method. */
 export interface QueryParamsRequestAmino {}
-export interface QueryParamsRequestAminoType {
+export interface QueryParamsRequestAminoMsg {
   type: "cosmos-sdk/QueryParamsRequest";
   value: QueryParamsRequestAmino;
 }
@@ -169,7 +169,7 @@ export interface QueryParamsResponse {
   /** params defines the parameters of the module. */
   params?: Params;
 }
-export interface QueryParamsResponseProtoType {
+export interface QueryParamsResponseProtoMsg {
   typeUrl: "/ibc.applications.transfer.v1.QueryParamsResponse";
   value: Uint8Array;
 }
@@ -179,7 +179,7 @@ export interface QueryParamsResponseAmino {
   /** params defines the parameters of the module. */
   params?: ParamsAmino;
 }
-export interface QueryParamsResponseAminoType {
+export interface QueryParamsResponseAminoMsg {
   type: "cosmos-sdk/QueryParamsResponse";
   value: QueryParamsResponseAmino;
 }
@@ -196,6 +196,9 @@ function createBaseQueryDenomTraceRequest(): QueryDenomTraceRequest {
 }
 
 export const QueryDenomTraceRequest = {
+  typeUrl: "/ibc.applications.transfer.v1.QueryDenomTraceRequest",
+  aminoType: "cosmos-sdk/QueryDenomTraceRequest",
+
   encode(message: QueryDenomTraceRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.hash !== "") {
       writer.uint32(10).string(message.hash);
@@ -266,6 +269,32 @@ export const QueryDenomTraceRequest = {
     const obj: any = {};
     obj.hash = message.hash;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDenomTraceRequestAminoMsg): QueryDenomTraceRequest {
+    return QueryDenomTraceRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryDenomTraceRequest): QueryDenomTraceRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryDenomTraceRequest",
+      value: QueryDenomTraceRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryDenomTraceRequestProtoMsg): QueryDenomTraceRequest {
+    return QueryDenomTraceRequest.decode(message.value);
+  },
+
+  toProto(message: QueryDenomTraceRequest): Uint8Array {
+    return QueryDenomTraceRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDenomTraceRequest): QueryDenomTraceRequestProtoMsg {
+    return {
+      typeUrl: "/ibc.applications.transfer.v1.QueryDenomTraceRequest",
+      value: QueryDenomTraceRequest.encode(message).finish()
+    };
   }
 
 };
@@ -277,6 +306,9 @@ function createBaseQueryDenomTraceResponse(): QueryDenomTraceResponse {
 }
 
 export const QueryDenomTraceResponse = {
+  typeUrl: "/ibc.applications.transfer.v1.QueryDenomTraceResponse",
+  aminoType: "cosmos-sdk/QueryDenomTraceResponse",
+
   encode(message: QueryDenomTraceResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.denomTrace !== undefined) {
       DenomTrace.encode(message.denomTrace, writer.uint32(10).fork()).ldelim();
@@ -347,6 +379,32 @@ export const QueryDenomTraceResponse = {
     const obj: any = {};
     obj.denom_trace = message.denomTrace ? DenomTrace.toAmino(message.denomTrace) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDenomTraceResponseAminoMsg): QueryDenomTraceResponse {
+    return QueryDenomTraceResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryDenomTraceResponse): QueryDenomTraceResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryDenomTraceResponse",
+      value: QueryDenomTraceResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryDenomTraceResponseProtoMsg): QueryDenomTraceResponse {
+    return QueryDenomTraceResponse.decode(message.value);
+  },
+
+  toProto(message: QueryDenomTraceResponse): Uint8Array {
+    return QueryDenomTraceResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDenomTraceResponse): QueryDenomTraceResponseProtoMsg {
+    return {
+      typeUrl: "/ibc.applications.transfer.v1.QueryDenomTraceResponse",
+      value: QueryDenomTraceResponse.encode(message).finish()
+    };
   }
 
 };
@@ -358,6 +416,9 @@ function createBaseQueryDenomTracesRequest(): QueryDenomTracesRequest {
 }
 
 export const QueryDenomTracesRequest = {
+  typeUrl: "/ibc.applications.transfer.v1.QueryDenomTracesRequest",
+  aminoType: "cosmos-sdk/QueryDenomTracesRequest",
+
   encode(message: QueryDenomTracesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.pagination !== undefined) {
       PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim();
@@ -428,6 +489,32 @@ export const QueryDenomTracesRequest = {
     const obj: any = {};
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDenomTracesRequestAminoMsg): QueryDenomTracesRequest {
+    return QueryDenomTracesRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryDenomTracesRequest): QueryDenomTracesRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryDenomTracesRequest",
+      value: QueryDenomTracesRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryDenomTracesRequestProtoMsg): QueryDenomTracesRequest {
+    return QueryDenomTracesRequest.decode(message.value);
+  },
+
+  toProto(message: QueryDenomTracesRequest): Uint8Array {
+    return QueryDenomTracesRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDenomTracesRequest): QueryDenomTracesRequestProtoMsg {
+    return {
+      typeUrl: "/ibc.applications.transfer.v1.QueryDenomTracesRequest",
+      value: QueryDenomTracesRequest.encode(message).finish()
+    };
   }
 
 };
@@ -440,6 +527,9 @@ function createBaseQueryDenomTracesResponse(): QueryDenomTracesResponse {
 }
 
 export const QueryDenomTracesResponse = {
+  typeUrl: "/ibc.applications.transfer.v1.QueryDenomTracesResponse",
+  aminoType: "cosmos-sdk/QueryDenomTracesResponse",
+
   encode(message: QueryDenomTracesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.denomTraces) {
       DenomTrace.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -543,6 +633,32 @@ export const QueryDenomTracesResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDenomTracesResponseAminoMsg): QueryDenomTracesResponse {
+    return QueryDenomTracesResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryDenomTracesResponse): QueryDenomTracesResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryDenomTracesResponse",
+      value: QueryDenomTracesResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryDenomTracesResponseProtoMsg): QueryDenomTracesResponse {
+    return QueryDenomTracesResponse.decode(message.value);
+  },
+
+  toProto(message: QueryDenomTracesResponse): Uint8Array {
+    return QueryDenomTracesResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDenomTracesResponse): QueryDenomTracesResponseProtoMsg {
+    return {
+      typeUrl: "/ibc.applications.transfer.v1.QueryDenomTracesResponse",
+      value: QueryDenomTracesResponse.encode(message).finish()
+    };
   }
 
 };
@@ -552,6 +668,9 @@ function createBaseQueryParamsRequest(): QueryParamsRequest {
 }
 
 export const QueryParamsRequest = {
+  typeUrl: "/ibc.applications.transfer.v1.QueryParamsRequest",
+  aminoType: "cosmos-sdk/QueryParamsRequest",
+
   encode(_: QueryParamsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -604,6 +723,32 @@ export const QueryParamsRequest = {
   toAmino(_: QueryParamsRequest): QueryParamsRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest {
+    return QueryParamsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryParamsRequest): QueryParamsRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryParamsRequest",
+      value: QueryParamsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryParamsRequestProtoMsg): QueryParamsRequest {
+    return QueryParamsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryParamsRequest): Uint8Array {
+    return QueryParamsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryParamsRequest): QueryParamsRequestProtoMsg {
+    return {
+      typeUrl: "/ibc.applications.transfer.v1.QueryParamsRequest",
+      value: QueryParamsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -615,6 +760,9 @@ function createBaseQueryParamsResponse(): QueryParamsResponse {
 }
 
 export const QueryParamsResponse = {
+  typeUrl: "/ibc.applications.transfer.v1.QueryParamsResponse",
+  aminoType: "cosmos-sdk/QueryParamsResponse",
+
   encode(message: QueryParamsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.params !== undefined) {
       Params.encode(message.params, writer.uint32(10).fork()).ldelim();
@@ -685,6 +833,32 @@ export const QueryParamsResponse = {
     const obj: any = {};
     obj.params = message.params ? Params.toAmino(message.params) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryParamsResponseAminoMsg): QueryParamsResponse {
+    return QueryParamsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryParamsResponse): QueryParamsResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryParamsResponse",
+      value: QueryParamsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryParamsResponseProtoMsg): QueryParamsResponse {
+    return QueryParamsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryParamsResponse): Uint8Array {
+    return QueryParamsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryParamsResponse): QueryParamsResponseProtoMsg {
+    return {
+      typeUrl: "/ibc.applications.transfer.v1.QueryParamsResponse",
+      value: QueryParamsResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/ibc/applications/transfer/v1/transfer.ts b/__fixtures__/outputv2/ibc/applications/transfer/v1/transfer.ts
index 97daf0a82..a937e141f 100644
--- a/__fixtures__/outputv2/ibc/applications/transfer/v1/transfer.ts
+++ b/__fixtures__/outputv2/ibc/applications/transfer/v1/transfer.ts
@@ -16,7 +16,7 @@ export interface DenomTrace {
   /** base denomination of the relayed fungible token. */
   baseDenom: string;
 }
-export interface DenomTraceProtoType {
+export interface DenomTraceProtoMsg {
   typeUrl: "/ibc.applications.transfer.v1.DenomTrace";
   value: Uint8Array;
 }
@@ -35,7 +35,7 @@ export interface DenomTraceAmino {
   /** base denomination of the relayed fungible token. */
   base_denom: string;
 }
-export interface DenomTraceAminoType {
+export interface DenomTraceAminoMsg {
   type: "cosmos-sdk/DenomTrace";
   value: DenomTraceAmino;
 }
@@ -68,7 +68,7 @@ export interface Params {
    */
   receiveEnabled: boolean;
 }
-export interface ParamsProtoType {
+export interface ParamsProtoMsg {
   typeUrl: "/ibc.applications.transfer.v1.Params";
   value: Uint8Array;
 }
@@ -92,7 +92,7 @@ export interface ParamsAmino {
    */
   receive_enabled: boolean;
 }
-export interface ParamsAminoType {
+export interface ParamsAminoMsg {
   type: "cosmos-sdk/Params";
   value: ParamsAmino;
 }
@@ -116,6 +116,9 @@ function createBaseDenomTrace(): DenomTrace {
 }
 
 export const DenomTrace = {
+  typeUrl: "/ibc.applications.transfer.v1.DenomTrace",
+  aminoType: "cosmos-sdk/DenomTrace",
+
   encode(message: DenomTrace, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.path !== "") {
       writer.uint32(10).string(message.path);
@@ -201,6 +204,32 @@ export const DenomTrace = {
     obj.path = message.path;
     obj.base_denom = message.baseDenom;
     return obj;
+  },
+
+  fromAminoMsg(object: DenomTraceAminoMsg): DenomTrace {
+    return DenomTrace.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: DenomTrace): DenomTraceAminoMsg {
+    return {
+      type: "cosmos-sdk/DenomTrace",
+      value: DenomTrace.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: DenomTraceProtoMsg): DenomTrace {
+    return DenomTrace.decode(message.value);
+  },
+
+  toProto(message: DenomTrace): Uint8Array {
+    return DenomTrace.encode(message).finish();
+  },
+
+  toProtoMsg(message: DenomTrace): DenomTraceProtoMsg {
+    return {
+      typeUrl: "/ibc.applications.transfer.v1.DenomTrace",
+      value: DenomTrace.encode(message).finish()
+    };
   }
 
 };
@@ -213,6 +242,9 @@ function createBaseParams(): Params {
 }
 
 export const Params = {
+  typeUrl: "/ibc.applications.transfer.v1.Params",
+  aminoType: "cosmos-sdk/Params",
+
   encode(message: Params, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.sendEnabled === true) {
       writer.uint32(8).bool(message.sendEnabled);
@@ -298,6 +330,32 @@ export const Params = {
     obj.send_enabled = message.sendEnabled;
     obj.receive_enabled = message.receiveEnabled;
     return obj;
+  },
+
+  fromAminoMsg(object: ParamsAminoMsg): Params {
+    return Params.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Params): ParamsAminoMsg {
+    return {
+      type: "cosmos-sdk/Params",
+      value: Params.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ParamsProtoMsg): Params {
+    return Params.decode(message.value);
+  },
+
+  toProto(message: Params): Uint8Array {
+    return Params.encode(message).finish();
+  },
+
+  toProtoMsg(message: Params): ParamsProtoMsg {
+    return {
+      typeUrl: "/ibc.applications.transfer.v1.Params",
+      value: Params.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/ibc/applications/transfer/v1/tx.ts b/__fixtures__/outputv2/ibc/applications/transfer/v1/tx.ts
index 36541e84c..91cf32d7f 100644
--- a/__fixtures__/outputv2/ibc/applications/transfer/v1/tx.ts
+++ b/__fixtures__/outputv2/ibc/applications/transfer/v1/tx.ts
@@ -37,7 +37,7 @@ export interface MsgTransfer {
    */
   timeoutTimestamp: Long;
 }
-export interface MsgTransferProtoType {
+export interface MsgTransferProtoMsg {
   typeUrl: "/ibc.applications.transfer.v1.MsgTransfer";
   value: Uint8Array;
 }
@@ -75,7 +75,7 @@ export interface MsgTransferAmino {
    */
   timeout_timestamp: string;
 }
-export interface MsgTransferAminoType {
+export interface MsgTransferAminoMsg {
   type: "cosmos-sdk/MsgTransfer";
   value: MsgTransferAmino;
 }
@@ -97,14 +97,14 @@ export interface MsgTransferSDKType {
 
 /** MsgTransferResponse defines the Msg/Transfer response type. */
 export interface MsgTransferResponse {}
-export interface MsgTransferResponseProtoType {
+export interface MsgTransferResponseProtoMsg {
   typeUrl: "/ibc.applications.transfer.v1.MsgTransferResponse";
   value: Uint8Array;
 }
 
 /** MsgTransferResponse defines the Msg/Transfer response type. */
 export interface MsgTransferResponseAmino {}
-export interface MsgTransferResponseAminoType {
+export interface MsgTransferResponseAminoMsg {
   type: "cosmos-sdk/MsgTransferResponse";
   value: MsgTransferResponseAmino;
 }
@@ -125,6 +125,9 @@ function createBaseMsgTransfer(): MsgTransfer {
 }
 
 export const MsgTransfer = {
+  typeUrl: "/ibc.applications.transfer.v1.MsgTransfer",
+  aminoType: "cosmos-sdk/MsgTransfer",
+
   encode(message: MsgTransfer, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.sourcePort !== "") {
       writer.uint32(10).string(message.sourcePort);
@@ -285,6 +288,32 @@ export const MsgTransfer = {
     obj.timeout_height = message.timeoutHeight ? Height.toAmino(message.timeoutHeight) : {};
     obj.timeout_timestamp = message.timeoutTimestamp ? message.timeoutTimestamp.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgTransferAminoMsg): MsgTransfer {
+    return MsgTransfer.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgTransfer): MsgTransferAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgTransfer",
+      value: MsgTransfer.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgTransferProtoMsg): MsgTransfer {
+    return MsgTransfer.decode(message.value);
+  },
+
+  toProto(message: MsgTransfer): Uint8Array {
+    return MsgTransfer.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgTransfer): MsgTransferProtoMsg {
+    return {
+      typeUrl: "/ibc.applications.transfer.v1.MsgTransfer",
+      value: MsgTransfer.encode(message).finish()
+    };
   }
 
 };
@@ -294,6 +323,9 @@ function createBaseMsgTransferResponse(): MsgTransferResponse {
 }
 
 export const MsgTransferResponse = {
+  typeUrl: "/ibc.applications.transfer.v1.MsgTransferResponse",
+  aminoType: "cosmos-sdk/MsgTransferResponse",
+
   encode(_: MsgTransferResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -346,6 +378,32 @@ export const MsgTransferResponse = {
   toAmino(_: MsgTransferResponse): MsgTransferResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgTransferResponseAminoMsg): MsgTransferResponse {
+    return MsgTransferResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgTransferResponse): MsgTransferResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgTransferResponse",
+      value: MsgTransferResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgTransferResponseProtoMsg): MsgTransferResponse {
+    return MsgTransferResponse.decode(message.value);
+  },
+
+  toProto(message: MsgTransferResponse): Uint8Array {
+    return MsgTransferResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgTransferResponse): MsgTransferResponseProtoMsg {
+    return {
+      typeUrl: "/ibc.applications.transfer.v1.MsgTransferResponse",
+      value: MsgTransferResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/ibc/applications/transfer/v2/packet.ts b/__fixtures__/outputv2/ibc/applications/transfer/v2/packet.ts
index 4a15e9e51..1c7811974 100644
--- a/__fixtures__/outputv2/ibc/applications/transfer/v2/packet.ts
+++ b/__fixtures__/outputv2/ibc/applications/transfer/v2/packet.ts
@@ -20,7 +20,7 @@ export interface FungibleTokenPacketData {
   /** the recipient address on the destination chain */
   receiver: string;
 }
-export interface FungibleTokenPacketDataProtoType {
+export interface FungibleTokenPacketDataProtoMsg {
   typeUrl: "/ibc.applications.transfer.v2.FungibleTokenPacketData";
   value: Uint8Array;
 }
@@ -43,7 +43,7 @@ export interface FungibleTokenPacketDataAmino {
   /** the recipient address on the destination chain */
   receiver: string;
 }
-export interface FungibleTokenPacketDataAminoType {
+export interface FungibleTokenPacketDataAminoMsg {
   type: "cosmos-sdk/FungibleTokenPacketData";
   value: FungibleTokenPacketDataAmino;
 }
@@ -70,6 +70,9 @@ function createBaseFungibleTokenPacketData(): FungibleTokenPacketData {
 }
 
 export const FungibleTokenPacketData = {
+  typeUrl: "/ibc.applications.transfer.v2.FungibleTokenPacketData",
+  aminoType: "cosmos-sdk/FungibleTokenPacketData",
+
   encode(message: FungibleTokenPacketData, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.denom !== "") {
       writer.uint32(10).string(message.denom);
@@ -185,6 +188,32 @@ export const FungibleTokenPacketData = {
     obj.sender = message.sender;
     obj.receiver = message.receiver;
     return obj;
+  },
+
+  fromAminoMsg(object: FungibleTokenPacketDataAminoMsg): FungibleTokenPacketData {
+    return FungibleTokenPacketData.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: FungibleTokenPacketData): FungibleTokenPacketDataAminoMsg {
+    return {
+      type: "cosmos-sdk/FungibleTokenPacketData",
+      value: FungibleTokenPacketData.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: FungibleTokenPacketDataProtoMsg): FungibleTokenPacketData {
+    return FungibleTokenPacketData.decode(message.value);
+  },
+
+  toProto(message: FungibleTokenPacketData): Uint8Array {
+    return FungibleTokenPacketData.encode(message).finish();
+  },
+
+  toProtoMsg(message: FungibleTokenPacketData): FungibleTokenPacketDataProtoMsg {
+    return {
+      typeUrl: "/ibc.applications.transfer.v2.FungibleTokenPacketData",
+      value: FungibleTokenPacketData.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/ibc/core/channel/v1/channel.ts b/__fixtures__/outputv2/ibc/core/channel/v1/channel.ts
index ddbad25f0..7fffd6b56 100644
--- a/__fixtures__/outputv2/ibc/core/channel/v1/channel.ts
+++ b/__fixtures__/outputv2/ibc/core/channel/v1/channel.ts
@@ -161,7 +161,7 @@ export interface Channel {
   /** opaque channel version, which is agreed upon during the handshake */
   version: string;
 }
-export interface ChannelProtoType {
+export interface ChannelProtoMsg {
   typeUrl: "/ibc.core.channel.v1.Channel";
   value: Uint8Array;
 }
@@ -190,7 +190,7 @@ export interface ChannelAmino {
   /** opaque channel version, which is agreed upon during the handshake */
   version: string;
 }
-export interface ChannelAminoType {
+export interface ChannelAminoMsg {
   type: "cosmos-sdk/Channel";
   value: ChannelAmino;
 }
@@ -237,7 +237,7 @@ export interface IdentifiedChannel {
   /** channel identifier */
   channelId: string;
 }
-export interface IdentifiedChannelProtoType {
+export interface IdentifiedChannelProtoMsg {
   typeUrl: "/ibc.core.channel.v1.IdentifiedChannel";
   value: Uint8Array;
 }
@@ -271,7 +271,7 @@ export interface IdentifiedChannelAmino {
   /** channel identifier */
   channel_id: string;
 }
-export interface IdentifiedChannelAminoType {
+export interface IdentifiedChannelAminoMsg {
   type: "cosmos-sdk/IdentifiedChannel";
   value: IdentifiedChannelAmino;
 }
@@ -298,7 +298,7 @@ export interface Counterparty {
   /** channel end on the counterparty chain */
   channelId: string;
 }
-export interface CounterpartyProtoType {
+export interface CounterpartyProtoMsg {
   typeUrl: "/ibc.core.channel.v1.Counterparty";
   value: Uint8Array;
 }
@@ -311,7 +311,7 @@ export interface CounterpartyAmino {
   /** channel end on the counterparty chain */
   channel_id: string;
 }
-export interface CounterpartyAminoType {
+export interface CounterpartyAminoMsg {
   type: "cosmos-sdk/Counterparty";
   value: CounterpartyAmino;
 }
@@ -352,7 +352,7 @@ export interface Packet {
   /** block timestamp (in nanoseconds) after which the packet times out */
   timeoutTimestamp: Long;
 }
-export interface PacketProtoType {
+export interface PacketProtoMsg {
   typeUrl: "/ibc.core.channel.v1.Packet";
   value: Uint8Array;
 }
@@ -387,7 +387,7 @@ export interface PacketAmino {
   /** block timestamp (in nanoseconds) after which the packet times out */
   timeout_timestamp: string;
 }
-export interface PacketAminoType {
+export interface PacketAminoMsg {
   type: "cosmos-sdk/Packet";
   value: PacketAmino;
 }
@@ -423,7 +423,7 @@ export interface PacketState {
   /** embedded data that represents packet state. */
   data: Uint8Array;
 }
-export interface PacketStateProtoType {
+export interface PacketStateProtoMsg {
   typeUrl: "/ibc.core.channel.v1.PacketState";
   value: Uint8Array;
 }
@@ -447,7 +447,7 @@ export interface PacketStateAmino {
   /** embedded data that represents packet state. */
   data: Uint8Array;
 }
-export interface PacketStateAminoType {
+export interface PacketStateAminoMsg {
   type: "cosmos-sdk/PacketState";
   value: PacketStateAmino;
 }
@@ -478,7 +478,7 @@ export interface Acknowledgement {
   result?: Uint8Array;
   error?: string;
 }
-export interface AcknowledgementProtoType {
+export interface AcknowledgementProtoMsg {
   typeUrl: "/ibc.core.channel.v1.Acknowledgement";
   value: Uint8Array;
 }
@@ -496,7 +496,7 @@ export interface AcknowledgementAmino {
   result?: Uint8Array;
   error?: string;
 }
-export interface AcknowledgementAminoType {
+export interface AcknowledgementAminoMsg {
   type: "cosmos-sdk/Acknowledgement";
   value: AcknowledgementAmino;
 }
@@ -526,6 +526,9 @@ function createBaseChannel(): Channel {
 }
 
 export const Channel = {
+  typeUrl: "/ibc.core.channel.v1.Channel",
+  aminoType: "cosmos-sdk/Channel",
+
   encode(message: Channel, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.state !== 0) {
       writer.uint32(8).int32(message.state);
@@ -674,6 +677,32 @@ export const Channel = {
 
     obj.version = message.version;
     return obj;
+  },
+
+  fromAminoMsg(object: ChannelAminoMsg): Channel {
+    return Channel.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Channel): ChannelAminoMsg {
+    return {
+      type: "cosmos-sdk/Channel",
+      value: Channel.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ChannelProtoMsg): Channel {
+    return Channel.decode(message.value);
+  },
+
+  toProto(message: Channel): Uint8Array {
+    return Channel.encode(message).finish();
+  },
+
+  toProtoMsg(message: Channel): ChannelProtoMsg {
+    return {
+      typeUrl: "/ibc.core.channel.v1.Channel",
+      value: Channel.encode(message).finish()
+    };
   }
 
 };
@@ -691,6 +720,9 @@ function createBaseIdentifiedChannel(): IdentifiedChannel {
 }
 
 export const IdentifiedChannel = {
+  typeUrl: "/ibc.core.channel.v1.IdentifiedChannel",
+  aminoType: "cosmos-sdk/IdentifiedChannel",
+
   encode(message: IdentifiedChannel, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.state !== 0) {
       writer.uint32(8).int32(message.state);
@@ -869,6 +901,32 @@ export const IdentifiedChannel = {
     obj.port_id = message.portId;
     obj.channel_id = message.channelId;
     return obj;
+  },
+
+  fromAminoMsg(object: IdentifiedChannelAminoMsg): IdentifiedChannel {
+    return IdentifiedChannel.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: IdentifiedChannel): IdentifiedChannelAminoMsg {
+    return {
+      type: "cosmos-sdk/IdentifiedChannel",
+      value: IdentifiedChannel.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: IdentifiedChannelProtoMsg): IdentifiedChannel {
+    return IdentifiedChannel.decode(message.value);
+  },
+
+  toProto(message: IdentifiedChannel): Uint8Array {
+    return IdentifiedChannel.encode(message).finish();
+  },
+
+  toProtoMsg(message: IdentifiedChannel): IdentifiedChannelProtoMsg {
+    return {
+      typeUrl: "/ibc.core.channel.v1.IdentifiedChannel",
+      value: IdentifiedChannel.encode(message).finish()
+    };
   }
 
 };
@@ -881,6 +939,9 @@ function createBaseCounterparty(): Counterparty {
 }
 
 export const Counterparty = {
+  typeUrl: "/ibc.core.channel.v1.Counterparty",
+  aminoType: "cosmos-sdk/Counterparty",
+
   encode(message: Counterparty, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.portId !== "") {
       writer.uint32(10).string(message.portId);
@@ -966,6 +1027,32 @@ export const Counterparty = {
     obj.port_id = message.portId;
     obj.channel_id = message.channelId;
     return obj;
+  },
+
+  fromAminoMsg(object: CounterpartyAminoMsg): Counterparty {
+    return Counterparty.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Counterparty): CounterpartyAminoMsg {
+    return {
+      type: "cosmos-sdk/Counterparty",
+      value: Counterparty.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: CounterpartyProtoMsg): Counterparty {
+    return Counterparty.decode(message.value);
+  },
+
+  toProto(message: Counterparty): Uint8Array {
+    return Counterparty.encode(message).finish();
+  },
+
+  toProtoMsg(message: Counterparty): CounterpartyProtoMsg {
+    return {
+      typeUrl: "/ibc.core.channel.v1.Counterparty",
+      value: Counterparty.encode(message).finish()
+    };
   }
 
 };
@@ -984,6 +1071,9 @@ function createBasePacket(): Packet {
 }
 
 export const Packet = {
+  typeUrl: "/ibc.core.channel.v1.Packet",
+  aminoType: "cosmos-sdk/Packet",
+
   encode(message: Packet, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.sequence.isZero()) {
       writer.uint32(8).uint64(message.sequence);
@@ -1159,6 +1249,32 @@ export const Packet = {
     obj.timeout_height = message.timeoutHeight ? Height.toAmino(message.timeoutHeight) : {};
     obj.timeout_timestamp = message.timeoutTimestamp ? message.timeoutTimestamp.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: PacketAminoMsg): Packet {
+    return Packet.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Packet): PacketAminoMsg {
+    return {
+      type: "cosmos-sdk/Packet",
+      value: Packet.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: PacketProtoMsg): Packet {
+    return Packet.decode(message.value);
+  },
+
+  toProto(message: Packet): Uint8Array {
+    return Packet.encode(message).finish();
+  },
+
+  toProtoMsg(message: Packet): PacketProtoMsg {
+    return {
+      typeUrl: "/ibc.core.channel.v1.Packet",
+      value: Packet.encode(message).finish()
+    };
   }
 
 };
@@ -1173,6 +1289,9 @@ function createBasePacketState(): PacketState {
 }
 
 export const PacketState = {
+  typeUrl: "/ibc.core.channel.v1.PacketState",
+  aminoType: "cosmos-sdk/PacketState",
+
   encode(message: PacketState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.portId !== "") {
       writer.uint32(10).string(message.portId);
@@ -1288,6 +1407,32 @@ export const PacketState = {
     obj.sequence = message.sequence ? message.sequence.toString() : undefined;
     obj.data = message.data;
     return obj;
+  },
+
+  fromAminoMsg(object: PacketStateAminoMsg): PacketState {
+    return PacketState.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: PacketState): PacketStateAminoMsg {
+    return {
+      type: "cosmos-sdk/PacketState",
+      value: PacketState.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: PacketStateProtoMsg): PacketState {
+    return PacketState.decode(message.value);
+  },
+
+  toProto(message: PacketState): Uint8Array {
+    return PacketState.encode(message).finish();
+  },
+
+  toProtoMsg(message: PacketState): PacketStateProtoMsg {
+    return {
+      typeUrl: "/ibc.core.channel.v1.PacketState",
+      value: PacketState.encode(message).finish()
+    };
   }
 
 };
@@ -1300,6 +1445,9 @@ function createBaseAcknowledgement(): Acknowledgement {
 }
 
 export const Acknowledgement = {
+  typeUrl: "/ibc.core.channel.v1.Acknowledgement",
+  aminoType: "cosmos-sdk/Acknowledgement",
+
   encode(message: Acknowledgement, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.result !== undefined) {
       writer.uint32(170).bytes(message.result);
@@ -1385,6 +1533,32 @@ export const Acknowledgement = {
     obj.result = message.result;
     obj.error = message.error;
     return obj;
+  },
+
+  fromAminoMsg(object: AcknowledgementAminoMsg): Acknowledgement {
+    return Acknowledgement.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Acknowledgement): AcknowledgementAminoMsg {
+    return {
+      type: "cosmos-sdk/Acknowledgement",
+      value: Acknowledgement.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: AcknowledgementProtoMsg): Acknowledgement {
+    return Acknowledgement.decode(message.value);
+  },
+
+  toProto(message: Acknowledgement): Uint8Array {
+    return Acknowledgement.encode(message).finish();
+  },
+
+  toProtoMsg(message: Acknowledgement): AcknowledgementProtoMsg {
+    return {
+      typeUrl: "/ibc.core.channel.v1.Acknowledgement",
+      value: Acknowledgement.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/ibc/core/channel/v1/genesis.ts b/__fixtures__/outputv2/ibc/core/channel/v1/genesis.ts
index c415e15bb..b8ad9aa94 100644
--- a/__fixtures__/outputv2/ibc/core/channel/v1/genesis.ts
+++ b/__fixtures__/outputv2/ibc/core/channel/v1/genesis.ts
@@ -16,7 +16,7 @@ export interface GenesisState {
   /** the sequence for the next generated channel identifier */
   nextChannelSequence: Long;
 }
-export interface GenesisStateProtoType {
+export interface GenesisStateProtoMsg {
   typeUrl: "/ibc.core.channel.v1.GenesisState";
   value: Uint8Array;
 }
@@ -34,7 +34,7 @@ export interface GenesisStateAmino {
   /** the sequence for the next generated channel identifier */
   next_channel_sequence: string;
 }
-export interface GenesisStateAminoType {
+export interface GenesisStateAminoMsg {
   type: "cosmos-sdk/GenesisState";
   value: GenesisStateAmino;
 }
@@ -60,7 +60,7 @@ export interface PacketSequence {
   channelId: string;
   sequence: Long;
 }
-export interface PacketSequenceProtoType {
+export interface PacketSequenceProtoMsg {
   typeUrl: "/ibc.core.channel.v1.PacketSequence";
   value: Uint8Array;
 }
@@ -74,7 +74,7 @@ export interface PacketSequenceAmino {
   channel_id: string;
   sequence: string;
 }
-export interface PacketSequenceAminoType {
+export interface PacketSequenceAminoMsg {
   type: "cosmos-sdk/PacketSequence";
   value: PacketSequenceAmino;
 }
@@ -103,6 +103,9 @@ function createBaseGenesisState(): GenesisState {
 }
 
 export const GenesisState = {
+  typeUrl: "/ibc.core.channel.v1.GenesisState",
+  aminoType: "cosmos-sdk/GenesisState",
+
   encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.channels) {
       IdentifiedChannel.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -386,6 +389,32 @@ export const GenesisState = {
 
     obj.next_channel_sequence = message.nextChannelSequence ? message.nextChannelSequence.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisStateAminoMsg): GenesisState {
+    return GenesisState.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GenesisState): GenesisStateAminoMsg {
+    return {
+      type: "cosmos-sdk/GenesisState",
+      value: GenesisState.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GenesisStateProtoMsg): GenesisState {
+    return GenesisState.decode(message.value);
+  },
+
+  toProto(message: GenesisState): Uint8Array {
+    return GenesisState.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisState): GenesisStateProtoMsg {
+    return {
+      typeUrl: "/ibc.core.channel.v1.GenesisState",
+      value: GenesisState.encode(message).finish()
+    };
   }
 
 };
@@ -399,6 +428,9 @@ function createBasePacketSequence(): PacketSequence {
 }
 
 export const PacketSequence = {
+  typeUrl: "/ibc.core.channel.v1.PacketSequence",
+  aminoType: "cosmos-sdk/PacketSequence",
+
   encode(message: PacketSequence, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.portId !== "") {
       writer.uint32(10).string(message.portId);
@@ -499,6 +531,32 @@ export const PacketSequence = {
     obj.channel_id = message.channelId;
     obj.sequence = message.sequence ? message.sequence.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: PacketSequenceAminoMsg): PacketSequence {
+    return PacketSequence.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: PacketSequence): PacketSequenceAminoMsg {
+    return {
+      type: "cosmos-sdk/PacketSequence",
+      value: PacketSequence.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: PacketSequenceProtoMsg): PacketSequence {
+    return PacketSequence.decode(message.value);
+  },
+
+  toProto(message: PacketSequence): Uint8Array {
+    return PacketSequence.encode(message).finish();
+  },
+
+  toProtoMsg(message: PacketSequence): PacketSequenceProtoMsg {
+    return {
+      typeUrl: "/ibc.core.channel.v1.PacketSequence",
+      value: PacketSequence.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/ibc/core/channel/v1/query.ts b/__fixtures__/outputv2/ibc/core/channel/v1/query.ts
index a8e7c4137..1007b890d 100644
--- a/__fixtures__/outputv2/ibc/core/channel/v1/query.ts
+++ b/__fixtures__/outputv2/ibc/core/channel/v1/query.ts
@@ -14,7 +14,7 @@ export interface QueryChannelRequest {
   /** channel unique identifier */
   channelId: string;
 }
-export interface QueryChannelRequestProtoType {
+export interface QueryChannelRequestProtoMsg {
   typeUrl: "/ibc.core.channel.v1.QueryChannelRequest";
   value: Uint8Array;
 }
@@ -27,7 +27,7 @@ export interface QueryChannelRequestAmino {
   /** channel unique identifier */
   channel_id: string;
 }
-export interface QueryChannelRequestAminoType {
+export interface QueryChannelRequestAminoMsg {
   type: "cosmos-sdk/QueryChannelRequest";
   value: QueryChannelRequestAmino;
 }
@@ -53,7 +53,7 @@ export interface QueryChannelResponse {
   /** height at which the proof was retrieved */
   proofHeight?: Height;
 }
-export interface QueryChannelResponseProtoType {
+export interface QueryChannelResponseProtoMsg {
   typeUrl: "/ibc.core.channel.v1.QueryChannelResponse";
   value: Uint8Array;
 }
@@ -73,7 +73,7 @@ export interface QueryChannelResponseAmino {
   /** height at which the proof was retrieved */
   proof_height?: HeightAmino;
 }
-export interface QueryChannelResponseAminoType {
+export interface QueryChannelResponseAminoMsg {
   type: "cosmos-sdk/QueryChannelResponse";
   value: QueryChannelResponseAmino;
 }
@@ -94,7 +94,7 @@ export interface QueryChannelsRequest {
   /** pagination request */
   pagination?: PageRequest;
 }
-export interface QueryChannelsRequestProtoType {
+export interface QueryChannelsRequestProtoMsg {
   typeUrl: "/ibc.core.channel.v1.QueryChannelsRequest";
   value: Uint8Array;
 }
@@ -104,7 +104,7 @@ export interface QueryChannelsRequestAmino {
   /** pagination request */
   pagination?: PageRequestAmino;
 }
-export interface QueryChannelsRequestAminoType {
+export interface QueryChannelsRequestAminoMsg {
   type: "cosmos-sdk/QueryChannelsRequest";
   value: QueryChannelsRequestAmino;
 }
@@ -125,7 +125,7 @@ export interface QueryChannelsResponse {
   /** query block height */
   height?: Height;
 }
-export interface QueryChannelsResponseProtoType {
+export interface QueryChannelsResponseProtoMsg {
   typeUrl: "/ibc.core.channel.v1.QueryChannelsResponse";
   value: Uint8Array;
 }
@@ -141,7 +141,7 @@ export interface QueryChannelsResponseAmino {
   /** query block height */
   height?: HeightAmino;
 }
-export interface QueryChannelsResponseAminoType {
+export interface QueryChannelsResponseAminoMsg {
   type: "cosmos-sdk/QueryChannelsResponse";
   value: QueryChannelsResponseAmino;
 }
@@ -164,7 +164,7 @@ export interface QueryConnectionChannelsRequest {
   /** pagination request */
   pagination?: PageRequest;
 }
-export interface QueryConnectionChannelsRequestProtoType {
+export interface QueryConnectionChannelsRequestProtoMsg {
   typeUrl: "/ibc.core.channel.v1.QueryConnectionChannelsRequest";
   value: Uint8Array;
 }
@@ -180,7 +180,7 @@ export interface QueryConnectionChannelsRequestAmino {
   /** pagination request */
   pagination?: PageRequestAmino;
 }
-export interface QueryConnectionChannelsRequestAminoType {
+export interface QueryConnectionChannelsRequestAminoMsg {
   type: "cosmos-sdk/QueryConnectionChannelsRequest";
   value: QueryConnectionChannelsRequestAmino;
 }
@@ -208,7 +208,7 @@ export interface QueryConnectionChannelsResponse {
   /** query block height */
   height?: Height;
 }
-export interface QueryConnectionChannelsResponseProtoType {
+export interface QueryConnectionChannelsResponseProtoMsg {
   typeUrl: "/ibc.core.channel.v1.QueryConnectionChannelsResponse";
   value: Uint8Array;
 }
@@ -227,7 +227,7 @@ export interface QueryConnectionChannelsResponseAmino {
   /** query block height */
   height?: HeightAmino;
 }
-export interface QueryConnectionChannelsResponseAminoType {
+export interface QueryConnectionChannelsResponseAminoMsg {
   type: "cosmos-sdk/QueryConnectionChannelsResponse";
   value: QueryConnectionChannelsResponseAmino;
 }
@@ -253,7 +253,7 @@ export interface QueryChannelClientStateRequest {
   /** channel unique identifier */
   channelId: string;
 }
-export interface QueryChannelClientStateRequestProtoType {
+export interface QueryChannelClientStateRequestProtoMsg {
   typeUrl: "/ibc.core.channel.v1.QueryChannelClientStateRequest";
   value: Uint8Array;
 }
@@ -269,7 +269,7 @@ export interface QueryChannelClientStateRequestAmino {
   /** channel unique identifier */
   channel_id: string;
 }
-export interface QueryChannelClientStateRequestAminoType {
+export interface QueryChannelClientStateRequestAminoMsg {
   type: "cosmos-sdk/QueryChannelClientStateRequest";
   value: QueryChannelClientStateRequestAmino;
 }
@@ -297,7 +297,7 @@ export interface QueryChannelClientStateResponse {
   /** height at which the proof was retrieved */
   proofHeight?: Height;
 }
-export interface QueryChannelClientStateResponseProtoType {
+export interface QueryChannelClientStateResponseProtoMsg {
   typeUrl: "/ibc.core.channel.v1.QueryChannelClientStateResponse";
   value: Uint8Array;
 }
@@ -316,7 +316,7 @@ export interface QueryChannelClientStateResponseAmino {
   /** height at which the proof was retrieved */
   proof_height?: HeightAmino;
 }
-export interface QueryChannelClientStateResponseAminoType {
+export interface QueryChannelClientStateResponseAminoMsg {
   type: "cosmos-sdk/QueryChannelClientStateResponse";
   value: QueryChannelClientStateResponseAmino;
 }
@@ -348,7 +348,7 @@ export interface QueryChannelConsensusStateRequest {
   /** revision height of the consensus state */
   revisionHeight: Long;
 }
-export interface QueryChannelConsensusStateRequestProtoType {
+export interface QueryChannelConsensusStateRequestProtoMsg {
   typeUrl: "/ibc.core.channel.v1.QueryChannelConsensusStateRequest";
   value: Uint8Array;
 }
@@ -370,7 +370,7 @@ export interface QueryChannelConsensusStateRequestAmino {
   /** revision height of the consensus state */
   revision_height: string;
 }
-export interface QueryChannelConsensusStateRequestAminoType {
+export interface QueryChannelConsensusStateRequestAminoMsg {
   type: "cosmos-sdk/QueryChannelConsensusStateRequest";
   value: QueryChannelConsensusStateRequestAmino;
 }
@@ -403,7 +403,7 @@ export interface QueryChannelConsensusStateResponse {
   /** height at which the proof was retrieved */
   proofHeight?: Height;
 }
-export interface QueryChannelConsensusStateResponseProtoType {
+export interface QueryChannelConsensusStateResponseProtoMsg {
   typeUrl: "/ibc.core.channel.v1.QueryChannelConsensusStateResponse";
   value: Uint8Array;
 }
@@ -425,7 +425,7 @@ export interface QueryChannelConsensusStateResponseAmino {
   /** height at which the proof was retrieved */
   proof_height?: HeightAmino;
 }
-export interface QueryChannelConsensusStateResponseAminoType {
+export interface QueryChannelConsensusStateResponseAminoMsg {
   type: "cosmos-sdk/QueryChannelConsensusStateResponse";
   value: QueryChannelConsensusStateResponseAmino;
 }
@@ -455,7 +455,7 @@ export interface QueryPacketCommitmentRequest {
   /** packet sequence */
   sequence: Long;
 }
-export interface QueryPacketCommitmentRequestProtoType {
+export interface QueryPacketCommitmentRequestProtoMsg {
   typeUrl: "/ibc.core.channel.v1.QueryPacketCommitmentRequest";
   value: Uint8Array;
 }
@@ -474,7 +474,7 @@ export interface QueryPacketCommitmentRequestAmino {
   /** packet sequence */
   sequence: string;
 }
-export interface QueryPacketCommitmentRequestAminoType {
+export interface QueryPacketCommitmentRequestAminoMsg {
   type: "cosmos-sdk/QueryPacketCommitmentRequest";
   value: QueryPacketCommitmentRequestAmino;
 }
@@ -504,7 +504,7 @@ export interface QueryPacketCommitmentResponse {
   /** height at which the proof was retrieved */
   proofHeight?: Height;
 }
-export interface QueryPacketCommitmentResponseProtoType {
+export interface QueryPacketCommitmentResponseProtoMsg {
   typeUrl: "/ibc.core.channel.v1.QueryPacketCommitmentResponse";
   value: Uint8Array;
 }
@@ -524,7 +524,7 @@ export interface QueryPacketCommitmentResponseAmino {
   /** height at which the proof was retrieved */
   proof_height?: HeightAmino;
 }
-export interface QueryPacketCommitmentResponseAminoType {
+export interface QueryPacketCommitmentResponseAminoMsg {
   type: "cosmos-sdk/QueryPacketCommitmentResponse";
   value: QueryPacketCommitmentResponseAmino;
 }
@@ -554,7 +554,7 @@ export interface QueryPacketCommitmentsRequest {
   /** pagination request */
   pagination?: PageRequest;
 }
-export interface QueryPacketCommitmentsRequestProtoType {
+export interface QueryPacketCommitmentsRequestProtoMsg {
   typeUrl: "/ibc.core.channel.v1.QueryPacketCommitmentsRequest";
   value: Uint8Array;
 }
@@ -573,7 +573,7 @@ export interface QueryPacketCommitmentsRequestAmino {
   /** pagination request */
   pagination?: PageRequestAmino;
 }
-export interface QueryPacketCommitmentsRequestAminoType {
+export interface QueryPacketCommitmentsRequestAminoMsg {
   type: "cosmos-sdk/QueryPacketCommitmentsRequest";
   value: QueryPacketCommitmentsRequestAmino;
 }
@@ -601,7 +601,7 @@ export interface QueryPacketCommitmentsResponse {
   /** query block height */
   height?: Height;
 }
-export interface QueryPacketCommitmentsResponseProtoType {
+export interface QueryPacketCommitmentsResponseProtoMsg {
   typeUrl: "/ibc.core.channel.v1.QueryPacketCommitmentsResponse";
   value: Uint8Array;
 }
@@ -619,7 +619,7 @@ export interface QueryPacketCommitmentsResponseAmino {
   /** query block height */
   height?: HeightAmino;
 }
-export interface QueryPacketCommitmentsResponseAminoType {
+export interface QueryPacketCommitmentsResponseAminoMsg {
   type: "cosmos-sdk/QueryPacketCommitmentsResponse";
   value: QueryPacketCommitmentsResponseAmino;
 }
@@ -648,7 +648,7 @@ export interface QueryPacketReceiptRequest {
   /** packet sequence */
   sequence: Long;
 }
-export interface QueryPacketReceiptRequestProtoType {
+export interface QueryPacketReceiptRequestProtoMsg {
   typeUrl: "/ibc.core.channel.v1.QueryPacketReceiptRequest";
   value: Uint8Array;
 }
@@ -667,7 +667,7 @@ export interface QueryPacketReceiptRequestAmino {
   /** packet sequence */
   sequence: string;
 }
-export interface QueryPacketReceiptRequestAminoType {
+export interface QueryPacketReceiptRequestAminoMsg {
   type: "cosmos-sdk/QueryPacketReceiptRequest";
   value: QueryPacketReceiptRequestAmino;
 }
@@ -697,7 +697,7 @@ export interface QueryPacketReceiptResponse {
   /** height at which the proof was retrieved */
   proofHeight?: Height;
 }
-export interface QueryPacketReceiptResponseProtoType {
+export interface QueryPacketReceiptResponseProtoMsg {
   typeUrl: "/ibc.core.channel.v1.QueryPacketReceiptResponse";
   value: Uint8Array;
 }
@@ -717,7 +717,7 @@ export interface QueryPacketReceiptResponseAmino {
   /** height at which the proof was retrieved */
   proof_height?: HeightAmino;
 }
-export interface QueryPacketReceiptResponseAminoType {
+export interface QueryPacketReceiptResponseAminoMsg {
   type: "cosmos-sdk/QueryPacketReceiptResponse";
   value: QueryPacketReceiptResponseAmino;
 }
@@ -747,7 +747,7 @@ export interface QueryPacketAcknowledgementRequest {
   /** packet sequence */
   sequence: Long;
 }
-export interface QueryPacketAcknowledgementRequestProtoType {
+export interface QueryPacketAcknowledgementRequestProtoMsg {
   typeUrl: "/ibc.core.channel.v1.QueryPacketAcknowledgementRequest";
   value: Uint8Array;
 }
@@ -766,7 +766,7 @@ export interface QueryPacketAcknowledgementRequestAmino {
   /** packet sequence */
   sequence: string;
 }
-export interface QueryPacketAcknowledgementRequestAminoType {
+export interface QueryPacketAcknowledgementRequestAminoMsg {
   type: "cosmos-sdk/QueryPacketAcknowledgementRequest";
   value: QueryPacketAcknowledgementRequestAmino;
 }
@@ -796,7 +796,7 @@ export interface QueryPacketAcknowledgementResponse {
   /** height at which the proof was retrieved */
   proofHeight?: Height;
 }
-export interface QueryPacketAcknowledgementResponseProtoType {
+export interface QueryPacketAcknowledgementResponseProtoMsg {
   typeUrl: "/ibc.core.channel.v1.QueryPacketAcknowledgementResponse";
   value: Uint8Array;
 }
@@ -816,7 +816,7 @@ export interface QueryPacketAcknowledgementResponseAmino {
   /** height at which the proof was retrieved */
   proof_height?: HeightAmino;
 }
-export interface QueryPacketAcknowledgementResponseAminoType {
+export interface QueryPacketAcknowledgementResponseAminoMsg {
   type: "cosmos-sdk/QueryPacketAcknowledgementResponse";
   value: QueryPacketAcknowledgementResponseAmino;
 }
@@ -849,7 +849,7 @@ export interface QueryPacketAcknowledgementsRequest {
   /** list of packet sequences */
   packetCommitmentSequences: Long[];
 }
-export interface QueryPacketAcknowledgementsRequestProtoType {
+export interface QueryPacketAcknowledgementsRequestProtoMsg {
   typeUrl: "/ibc.core.channel.v1.QueryPacketAcknowledgementsRequest";
   value: Uint8Array;
 }
@@ -871,7 +871,7 @@ export interface QueryPacketAcknowledgementsRequestAmino {
   /** list of packet sequences */
   packet_commitment_sequences: string[];
 }
-export interface QueryPacketAcknowledgementsRequestAminoType {
+export interface QueryPacketAcknowledgementsRequestAminoMsg {
   type: "cosmos-sdk/QueryPacketAcknowledgementsRequest";
   value: QueryPacketAcknowledgementsRequestAmino;
 }
@@ -900,7 +900,7 @@ export interface QueryPacketAcknowledgementsResponse {
   /** query block height */
   height?: Height;
 }
-export interface QueryPacketAcknowledgementsResponseProtoType {
+export interface QueryPacketAcknowledgementsResponseProtoMsg {
   typeUrl: "/ibc.core.channel.v1.QueryPacketAcknowledgementsResponse";
   value: Uint8Array;
 }
@@ -918,7 +918,7 @@ export interface QueryPacketAcknowledgementsResponseAmino {
   /** query block height */
   height?: HeightAmino;
 }
-export interface QueryPacketAcknowledgementsResponseAminoType {
+export interface QueryPacketAcknowledgementsResponseAminoMsg {
   type: "cosmos-sdk/QueryPacketAcknowledgementsResponse";
   value: QueryPacketAcknowledgementsResponseAmino;
 }
@@ -947,7 +947,7 @@ export interface QueryUnreceivedPacketsRequest {
   /** list of packet sequences */
   packetCommitmentSequences: Long[];
 }
-export interface QueryUnreceivedPacketsRequestProtoType {
+export interface QueryUnreceivedPacketsRequestProtoMsg {
   typeUrl: "/ibc.core.channel.v1.QueryUnreceivedPacketsRequest";
   value: Uint8Array;
 }
@@ -966,7 +966,7 @@ export interface QueryUnreceivedPacketsRequestAmino {
   /** list of packet sequences */
   packet_commitment_sequences: string[];
 }
-export interface QueryUnreceivedPacketsRequestAminoType {
+export interface QueryUnreceivedPacketsRequestAminoMsg {
   type: "cosmos-sdk/QueryUnreceivedPacketsRequest";
   value: QueryUnreceivedPacketsRequestAmino;
 }
@@ -992,7 +992,7 @@ export interface QueryUnreceivedPacketsResponse {
   /** query block height */
   height?: Height;
 }
-export interface QueryUnreceivedPacketsResponseProtoType {
+export interface QueryUnreceivedPacketsResponseProtoMsg {
   typeUrl: "/ibc.core.channel.v1.QueryUnreceivedPacketsResponse";
   value: Uint8Array;
 }
@@ -1008,7 +1008,7 @@ export interface QueryUnreceivedPacketsResponseAmino {
   /** query block height */
   height?: HeightAmino;
 }
-export interface QueryUnreceivedPacketsResponseAminoType {
+export interface QueryUnreceivedPacketsResponseAminoMsg {
   type: "cosmos-sdk/QueryUnreceivedPacketsResponse";
   value: QueryUnreceivedPacketsResponseAmino;
 }
@@ -1036,7 +1036,7 @@ export interface QueryUnreceivedAcksRequest {
   /** list of acknowledgement sequences */
   packetAckSequences: Long[];
 }
-export interface QueryUnreceivedAcksRequestProtoType {
+export interface QueryUnreceivedAcksRequestProtoMsg {
   typeUrl: "/ibc.core.channel.v1.QueryUnreceivedAcksRequest";
   value: Uint8Array;
 }
@@ -1055,7 +1055,7 @@ export interface QueryUnreceivedAcksRequestAmino {
   /** list of acknowledgement sequences */
   packet_ack_sequences: string[];
 }
-export interface QueryUnreceivedAcksRequestAminoType {
+export interface QueryUnreceivedAcksRequestAminoMsg {
   type: "cosmos-sdk/QueryUnreceivedAcksRequest";
   value: QueryUnreceivedAcksRequestAmino;
 }
@@ -1081,7 +1081,7 @@ export interface QueryUnreceivedAcksResponse {
   /** query block height */
   height?: Height;
 }
-export interface QueryUnreceivedAcksResponseProtoType {
+export interface QueryUnreceivedAcksResponseProtoMsg {
   typeUrl: "/ibc.core.channel.v1.QueryUnreceivedAcksResponse";
   value: Uint8Array;
 }
@@ -1097,7 +1097,7 @@ export interface QueryUnreceivedAcksResponseAmino {
   /** query block height */
   height?: HeightAmino;
 }
-export interface QueryUnreceivedAcksResponseAminoType {
+export interface QueryUnreceivedAcksResponseAminoMsg {
   type: "cosmos-sdk/QueryUnreceivedAcksResponse";
   value: QueryUnreceivedAcksResponseAmino;
 }
@@ -1122,7 +1122,7 @@ export interface QueryNextSequenceReceiveRequest {
   /** channel unique identifier */
   channelId: string;
 }
-export interface QueryNextSequenceReceiveRequestProtoType {
+export interface QueryNextSequenceReceiveRequestProtoMsg {
   typeUrl: "/ibc.core.channel.v1.QueryNextSequenceReceiveRequest";
   value: Uint8Array;
 }
@@ -1138,7 +1138,7 @@ export interface QueryNextSequenceReceiveRequestAmino {
   /** channel unique identifier */
   channel_id: string;
 }
-export interface QueryNextSequenceReceiveRequestAminoType {
+export interface QueryNextSequenceReceiveRequestAminoMsg {
   type: "cosmos-sdk/QueryNextSequenceReceiveRequest";
   value: QueryNextSequenceReceiveRequestAmino;
 }
@@ -1166,7 +1166,7 @@ export interface QueryNextSequenceReceiveResponse {
   /** height at which the proof was retrieved */
   proofHeight?: Height;
 }
-export interface QueryNextSequenceReceiveResponseProtoType {
+export interface QueryNextSequenceReceiveResponseProtoMsg {
   typeUrl: "/ibc.core.channel.v1.QueryNextSequenceReceiveResponse";
   value: Uint8Array;
 }
@@ -1185,7 +1185,7 @@ export interface QueryNextSequenceReceiveResponseAmino {
   /** height at which the proof was retrieved */
   proof_height?: HeightAmino;
 }
-export interface QueryNextSequenceReceiveResponseAminoType {
+export interface QueryNextSequenceReceiveResponseAminoMsg {
   type: "cosmos-sdk/QueryNextSequenceReceiveResponse";
   value: QueryNextSequenceReceiveResponseAmino;
 }
@@ -1208,6 +1208,9 @@ function createBaseQueryChannelRequest(): QueryChannelRequest {
 }
 
 export const QueryChannelRequest = {
+  typeUrl: "/ibc.core.channel.v1.QueryChannelRequest",
+  aminoType: "cosmos-sdk/QueryChannelRequest",
+
   encode(message: QueryChannelRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.portId !== "") {
       writer.uint32(10).string(message.portId);
@@ -1293,6 +1296,32 @@ export const QueryChannelRequest = {
     obj.port_id = message.portId;
     obj.channel_id = message.channelId;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryChannelRequestAminoMsg): QueryChannelRequest {
+    return QueryChannelRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryChannelRequest): QueryChannelRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryChannelRequest",
+      value: QueryChannelRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryChannelRequestProtoMsg): QueryChannelRequest {
+    return QueryChannelRequest.decode(message.value);
+  },
+
+  toProto(message: QueryChannelRequest): Uint8Array {
+    return QueryChannelRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryChannelRequest): QueryChannelRequestProtoMsg {
+    return {
+      typeUrl: "/ibc.core.channel.v1.QueryChannelRequest",
+      value: QueryChannelRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1306,6 +1335,9 @@ function createBaseQueryChannelResponse(): QueryChannelResponse {
 }
 
 export const QueryChannelResponse = {
+  typeUrl: "/ibc.core.channel.v1.QueryChannelResponse",
+  aminoType: "cosmos-sdk/QueryChannelResponse",
+
   encode(message: QueryChannelResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.channel !== undefined) {
       Channel.encode(message.channel, writer.uint32(10).fork()).ldelim();
@@ -1406,6 +1438,32 @@ export const QueryChannelResponse = {
     obj.proof = message.proof;
     obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryChannelResponseAminoMsg): QueryChannelResponse {
+    return QueryChannelResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryChannelResponse): QueryChannelResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryChannelResponse",
+      value: QueryChannelResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryChannelResponseProtoMsg): QueryChannelResponse {
+    return QueryChannelResponse.decode(message.value);
+  },
+
+  toProto(message: QueryChannelResponse): Uint8Array {
+    return QueryChannelResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryChannelResponse): QueryChannelResponseProtoMsg {
+    return {
+      typeUrl: "/ibc.core.channel.v1.QueryChannelResponse",
+      value: QueryChannelResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1417,6 +1475,9 @@ function createBaseQueryChannelsRequest(): QueryChannelsRequest {
 }
 
 export const QueryChannelsRequest = {
+  typeUrl: "/ibc.core.channel.v1.QueryChannelsRequest",
+  aminoType: "cosmos-sdk/QueryChannelsRequest",
+
   encode(message: QueryChannelsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.pagination !== undefined) {
       PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim();
@@ -1487,6 +1548,32 @@ export const QueryChannelsRequest = {
     const obj: any = {};
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryChannelsRequestAminoMsg): QueryChannelsRequest {
+    return QueryChannelsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryChannelsRequest): QueryChannelsRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryChannelsRequest",
+      value: QueryChannelsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryChannelsRequestProtoMsg): QueryChannelsRequest {
+    return QueryChannelsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryChannelsRequest): Uint8Array {
+    return QueryChannelsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryChannelsRequest): QueryChannelsRequestProtoMsg {
+    return {
+      typeUrl: "/ibc.core.channel.v1.QueryChannelsRequest",
+      value: QueryChannelsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1500,6 +1587,9 @@ function createBaseQueryChannelsResponse(): QueryChannelsResponse {
 }
 
 export const QueryChannelsResponse = {
+  typeUrl: "/ibc.core.channel.v1.QueryChannelsResponse",
+  aminoType: "cosmos-sdk/QueryChannelsResponse",
+
   encode(message: QueryChannelsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.channels) {
       IdentifiedChannel.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1618,6 +1708,32 @@ export const QueryChannelsResponse = {
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     obj.height = message.height ? Height.toAmino(message.height) : {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryChannelsResponseAminoMsg): QueryChannelsResponse {
+    return QueryChannelsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryChannelsResponse): QueryChannelsResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryChannelsResponse",
+      value: QueryChannelsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryChannelsResponseProtoMsg): QueryChannelsResponse {
+    return QueryChannelsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryChannelsResponse): Uint8Array {
+    return QueryChannelsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryChannelsResponse): QueryChannelsResponseProtoMsg {
+    return {
+      typeUrl: "/ibc.core.channel.v1.QueryChannelsResponse",
+      value: QueryChannelsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1630,6 +1746,9 @@ function createBaseQueryConnectionChannelsRequest(): QueryConnectionChannelsRequ
 }
 
 export const QueryConnectionChannelsRequest = {
+  typeUrl: "/ibc.core.channel.v1.QueryConnectionChannelsRequest",
+  aminoType: "cosmos-sdk/QueryConnectionChannelsRequest",
+
   encode(message: QueryConnectionChannelsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.connection !== "") {
       writer.uint32(10).string(message.connection);
@@ -1715,6 +1834,32 @@ export const QueryConnectionChannelsRequest = {
     obj.connection = message.connection;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryConnectionChannelsRequestAminoMsg): QueryConnectionChannelsRequest {
+    return QueryConnectionChannelsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryConnectionChannelsRequest): QueryConnectionChannelsRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryConnectionChannelsRequest",
+      value: QueryConnectionChannelsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryConnectionChannelsRequestProtoMsg): QueryConnectionChannelsRequest {
+    return QueryConnectionChannelsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryConnectionChannelsRequest): Uint8Array {
+    return QueryConnectionChannelsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryConnectionChannelsRequest): QueryConnectionChannelsRequestProtoMsg {
+    return {
+      typeUrl: "/ibc.core.channel.v1.QueryConnectionChannelsRequest",
+      value: QueryConnectionChannelsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1728,6 +1873,9 @@ function createBaseQueryConnectionChannelsResponse(): QueryConnectionChannelsRes
 }
 
 export const QueryConnectionChannelsResponse = {
+  typeUrl: "/ibc.core.channel.v1.QueryConnectionChannelsResponse",
+  aminoType: "cosmos-sdk/QueryConnectionChannelsResponse",
+
   encode(message: QueryConnectionChannelsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.channels) {
       IdentifiedChannel.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1846,6 +1994,32 @@ export const QueryConnectionChannelsResponse = {
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     obj.height = message.height ? Height.toAmino(message.height) : {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryConnectionChannelsResponseAminoMsg): QueryConnectionChannelsResponse {
+    return QueryConnectionChannelsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryConnectionChannelsResponse): QueryConnectionChannelsResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryConnectionChannelsResponse",
+      value: QueryConnectionChannelsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryConnectionChannelsResponseProtoMsg): QueryConnectionChannelsResponse {
+    return QueryConnectionChannelsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryConnectionChannelsResponse): Uint8Array {
+    return QueryConnectionChannelsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryConnectionChannelsResponse): QueryConnectionChannelsResponseProtoMsg {
+    return {
+      typeUrl: "/ibc.core.channel.v1.QueryConnectionChannelsResponse",
+      value: QueryConnectionChannelsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1858,6 +2032,9 @@ function createBaseQueryChannelClientStateRequest(): QueryChannelClientStateRequ
 }
 
 export const QueryChannelClientStateRequest = {
+  typeUrl: "/ibc.core.channel.v1.QueryChannelClientStateRequest",
+  aminoType: "cosmos-sdk/QueryChannelClientStateRequest",
+
   encode(message: QueryChannelClientStateRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.portId !== "") {
       writer.uint32(10).string(message.portId);
@@ -1943,6 +2120,32 @@ export const QueryChannelClientStateRequest = {
     obj.port_id = message.portId;
     obj.channel_id = message.channelId;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryChannelClientStateRequestAminoMsg): QueryChannelClientStateRequest {
+    return QueryChannelClientStateRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryChannelClientStateRequest): QueryChannelClientStateRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryChannelClientStateRequest",
+      value: QueryChannelClientStateRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryChannelClientStateRequestProtoMsg): QueryChannelClientStateRequest {
+    return QueryChannelClientStateRequest.decode(message.value);
+  },
+
+  toProto(message: QueryChannelClientStateRequest): Uint8Array {
+    return QueryChannelClientStateRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryChannelClientStateRequest): QueryChannelClientStateRequestProtoMsg {
+    return {
+      typeUrl: "/ibc.core.channel.v1.QueryChannelClientStateRequest",
+      value: QueryChannelClientStateRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1956,6 +2159,9 @@ function createBaseQueryChannelClientStateResponse(): QueryChannelClientStateRes
 }
 
 export const QueryChannelClientStateResponse = {
+  typeUrl: "/ibc.core.channel.v1.QueryChannelClientStateResponse",
+  aminoType: "cosmos-sdk/QueryChannelClientStateResponse",
+
   encode(message: QueryChannelClientStateResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.identifiedClientState !== undefined) {
       IdentifiedClientState.encode(message.identifiedClientState, writer.uint32(10).fork()).ldelim();
@@ -2056,6 +2262,32 @@ export const QueryChannelClientStateResponse = {
     obj.proof = message.proof;
     obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryChannelClientStateResponseAminoMsg): QueryChannelClientStateResponse {
+    return QueryChannelClientStateResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryChannelClientStateResponse): QueryChannelClientStateResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryChannelClientStateResponse",
+      value: QueryChannelClientStateResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryChannelClientStateResponseProtoMsg): QueryChannelClientStateResponse {
+    return QueryChannelClientStateResponse.decode(message.value);
+  },
+
+  toProto(message: QueryChannelClientStateResponse): Uint8Array {
+    return QueryChannelClientStateResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryChannelClientStateResponse): QueryChannelClientStateResponseProtoMsg {
+    return {
+      typeUrl: "/ibc.core.channel.v1.QueryChannelClientStateResponse",
+      value: QueryChannelClientStateResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2070,6 +2302,9 @@ function createBaseQueryChannelConsensusStateRequest(): QueryChannelConsensusSta
 }
 
 export const QueryChannelConsensusStateRequest = {
+  typeUrl: "/ibc.core.channel.v1.QueryChannelConsensusStateRequest",
+  aminoType: "cosmos-sdk/QueryChannelConsensusStateRequest",
+
   encode(message: QueryChannelConsensusStateRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.portId !== "") {
       writer.uint32(10).string(message.portId);
@@ -2185,6 +2420,32 @@ export const QueryChannelConsensusStateRequest = {
     obj.revision_number = message.revisionNumber ? message.revisionNumber.toString() : undefined;
     obj.revision_height = message.revisionHeight ? message.revisionHeight.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryChannelConsensusStateRequestAminoMsg): QueryChannelConsensusStateRequest {
+    return QueryChannelConsensusStateRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryChannelConsensusStateRequest): QueryChannelConsensusStateRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryChannelConsensusStateRequest",
+      value: QueryChannelConsensusStateRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryChannelConsensusStateRequestProtoMsg): QueryChannelConsensusStateRequest {
+    return QueryChannelConsensusStateRequest.decode(message.value);
+  },
+
+  toProto(message: QueryChannelConsensusStateRequest): Uint8Array {
+    return QueryChannelConsensusStateRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryChannelConsensusStateRequest): QueryChannelConsensusStateRequestProtoMsg {
+    return {
+      typeUrl: "/ibc.core.channel.v1.QueryChannelConsensusStateRequest",
+      value: QueryChannelConsensusStateRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2199,6 +2460,9 @@ function createBaseQueryChannelConsensusStateResponse(): QueryChannelConsensusSt
 }
 
 export const QueryChannelConsensusStateResponse = {
+  typeUrl: "/ibc.core.channel.v1.QueryChannelConsensusStateResponse",
+  aminoType: "cosmos-sdk/QueryChannelConsensusStateResponse",
+
   encode(message: QueryChannelConsensusStateResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.consensusState !== undefined) {
       Any.encode(message.consensusState, writer.uint32(10).fork()).ldelim();
@@ -2314,6 +2578,32 @@ export const QueryChannelConsensusStateResponse = {
     obj.proof = message.proof;
     obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryChannelConsensusStateResponseAminoMsg): QueryChannelConsensusStateResponse {
+    return QueryChannelConsensusStateResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryChannelConsensusStateResponse): QueryChannelConsensusStateResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryChannelConsensusStateResponse",
+      value: QueryChannelConsensusStateResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryChannelConsensusStateResponseProtoMsg): QueryChannelConsensusStateResponse {
+    return QueryChannelConsensusStateResponse.decode(message.value);
+  },
+
+  toProto(message: QueryChannelConsensusStateResponse): Uint8Array {
+    return QueryChannelConsensusStateResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryChannelConsensusStateResponse): QueryChannelConsensusStateResponseProtoMsg {
+    return {
+      typeUrl: "/ibc.core.channel.v1.QueryChannelConsensusStateResponse",
+      value: QueryChannelConsensusStateResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2327,6 +2617,9 @@ function createBaseQueryPacketCommitmentRequest(): QueryPacketCommitmentRequest
 }
 
 export const QueryPacketCommitmentRequest = {
+  typeUrl: "/ibc.core.channel.v1.QueryPacketCommitmentRequest",
+  aminoType: "cosmos-sdk/QueryPacketCommitmentRequest",
+
   encode(message: QueryPacketCommitmentRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.portId !== "") {
       writer.uint32(10).string(message.portId);
@@ -2427,6 +2720,32 @@ export const QueryPacketCommitmentRequest = {
     obj.channel_id = message.channelId;
     obj.sequence = message.sequence ? message.sequence.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryPacketCommitmentRequestAminoMsg): QueryPacketCommitmentRequest {
+    return QueryPacketCommitmentRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryPacketCommitmentRequest): QueryPacketCommitmentRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryPacketCommitmentRequest",
+      value: QueryPacketCommitmentRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryPacketCommitmentRequestProtoMsg): QueryPacketCommitmentRequest {
+    return QueryPacketCommitmentRequest.decode(message.value);
+  },
+
+  toProto(message: QueryPacketCommitmentRequest): Uint8Array {
+    return QueryPacketCommitmentRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryPacketCommitmentRequest): QueryPacketCommitmentRequestProtoMsg {
+    return {
+      typeUrl: "/ibc.core.channel.v1.QueryPacketCommitmentRequest",
+      value: QueryPacketCommitmentRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2440,6 +2759,9 @@ function createBaseQueryPacketCommitmentResponse(): QueryPacketCommitmentRespons
 }
 
 export const QueryPacketCommitmentResponse = {
+  typeUrl: "/ibc.core.channel.v1.QueryPacketCommitmentResponse",
+  aminoType: "cosmos-sdk/QueryPacketCommitmentResponse",
+
   encode(message: QueryPacketCommitmentResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.commitment.length !== 0) {
       writer.uint32(10).bytes(message.commitment);
@@ -2540,6 +2862,32 @@ export const QueryPacketCommitmentResponse = {
     obj.proof = message.proof;
     obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryPacketCommitmentResponseAminoMsg): QueryPacketCommitmentResponse {
+    return QueryPacketCommitmentResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryPacketCommitmentResponse): QueryPacketCommitmentResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryPacketCommitmentResponse",
+      value: QueryPacketCommitmentResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryPacketCommitmentResponseProtoMsg): QueryPacketCommitmentResponse {
+    return QueryPacketCommitmentResponse.decode(message.value);
+  },
+
+  toProto(message: QueryPacketCommitmentResponse): Uint8Array {
+    return QueryPacketCommitmentResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryPacketCommitmentResponse): QueryPacketCommitmentResponseProtoMsg {
+    return {
+      typeUrl: "/ibc.core.channel.v1.QueryPacketCommitmentResponse",
+      value: QueryPacketCommitmentResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2553,6 +2901,9 @@ function createBaseQueryPacketCommitmentsRequest(): QueryPacketCommitmentsReques
 }
 
 export const QueryPacketCommitmentsRequest = {
+  typeUrl: "/ibc.core.channel.v1.QueryPacketCommitmentsRequest",
+  aminoType: "cosmos-sdk/QueryPacketCommitmentsRequest",
+
   encode(message: QueryPacketCommitmentsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.portId !== "") {
       writer.uint32(10).string(message.portId);
@@ -2653,6 +3004,32 @@ export const QueryPacketCommitmentsRequest = {
     obj.channel_id = message.channelId;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryPacketCommitmentsRequestAminoMsg): QueryPacketCommitmentsRequest {
+    return QueryPacketCommitmentsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryPacketCommitmentsRequest): QueryPacketCommitmentsRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryPacketCommitmentsRequest",
+      value: QueryPacketCommitmentsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryPacketCommitmentsRequestProtoMsg): QueryPacketCommitmentsRequest {
+    return QueryPacketCommitmentsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryPacketCommitmentsRequest): Uint8Array {
+    return QueryPacketCommitmentsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryPacketCommitmentsRequest): QueryPacketCommitmentsRequestProtoMsg {
+    return {
+      typeUrl: "/ibc.core.channel.v1.QueryPacketCommitmentsRequest",
+      value: QueryPacketCommitmentsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2666,6 +3043,9 @@ function createBaseQueryPacketCommitmentsResponse(): QueryPacketCommitmentsRespo
 }
 
 export const QueryPacketCommitmentsResponse = {
+  typeUrl: "/ibc.core.channel.v1.QueryPacketCommitmentsResponse",
+  aminoType: "cosmos-sdk/QueryPacketCommitmentsResponse",
+
   encode(message: QueryPacketCommitmentsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.commitments) {
       PacketState.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -2784,6 +3164,32 @@ export const QueryPacketCommitmentsResponse = {
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     obj.height = message.height ? Height.toAmino(message.height) : {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryPacketCommitmentsResponseAminoMsg): QueryPacketCommitmentsResponse {
+    return QueryPacketCommitmentsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryPacketCommitmentsResponse): QueryPacketCommitmentsResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryPacketCommitmentsResponse",
+      value: QueryPacketCommitmentsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryPacketCommitmentsResponseProtoMsg): QueryPacketCommitmentsResponse {
+    return QueryPacketCommitmentsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryPacketCommitmentsResponse): Uint8Array {
+    return QueryPacketCommitmentsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryPacketCommitmentsResponse): QueryPacketCommitmentsResponseProtoMsg {
+    return {
+      typeUrl: "/ibc.core.channel.v1.QueryPacketCommitmentsResponse",
+      value: QueryPacketCommitmentsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2797,6 +3203,9 @@ function createBaseQueryPacketReceiptRequest(): QueryPacketReceiptRequest {
 }
 
 export const QueryPacketReceiptRequest = {
+  typeUrl: "/ibc.core.channel.v1.QueryPacketReceiptRequest",
+  aminoType: "cosmos-sdk/QueryPacketReceiptRequest",
+
   encode(message: QueryPacketReceiptRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.portId !== "") {
       writer.uint32(10).string(message.portId);
@@ -2897,6 +3306,32 @@ export const QueryPacketReceiptRequest = {
     obj.channel_id = message.channelId;
     obj.sequence = message.sequence ? message.sequence.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryPacketReceiptRequestAminoMsg): QueryPacketReceiptRequest {
+    return QueryPacketReceiptRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryPacketReceiptRequest): QueryPacketReceiptRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryPacketReceiptRequest",
+      value: QueryPacketReceiptRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryPacketReceiptRequestProtoMsg): QueryPacketReceiptRequest {
+    return QueryPacketReceiptRequest.decode(message.value);
+  },
+
+  toProto(message: QueryPacketReceiptRequest): Uint8Array {
+    return QueryPacketReceiptRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryPacketReceiptRequest): QueryPacketReceiptRequestProtoMsg {
+    return {
+      typeUrl: "/ibc.core.channel.v1.QueryPacketReceiptRequest",
+      value: QueryPacketReceiptRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2910,6 +3345,9 @@ function createBaseQueryPacketReceiptResponse(): QueryPacketReceiptResponse {
 }
 
 export const QueryPacketReceiptResponse = {
+  typeUrl: "/ibc.core.channel.v1.QueryPacketReceiptResponse",
+  aminoType: "cosmos-sdk/QueryPacketReceiptResponse",
+
   encode(message: QueryPacketReceiptResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.received === true) {
       writer.uint32(16).bool(message.received);
@@ -3010,6 +3448,32 @@ export const QueryPacketReceiptResponse = {
     obj.proof = message.proof;
     obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryPacketReceiptResponseAminoMsg): QueryPacketReceiptResponse {
+    return QueryPacketReceiptResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryPacketReceiptResponse): QueryPacketReceiptResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryPacketReceiptResponse",
+      value: QueryPacketReceiptResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryPacketReceiptResponseProtoMsg): QueryPacketReceiptResponse {
+    return QueryPacketReceiptResponse.decode(message.value);
+  },
+
+  toProto(message: QueryPacketReceiptResponse): Uint8Array {
+    return QueryPacketReceiptResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryPacketReceiptResponse): QueryPacketReceiptResponseProtoMsg {
+    return {
+      typeUrl: "/ibc.core.channel.v1.QueryPacketReceiptResponse",
+      value: QueryPacketReceiptResponse.encode(message).finish()
+    };
   }
 
 };
@@ -3023,6 +3487,9 @@ function createBaseQueryPacketAcknowledgementRequest(): QueryPacketAcknowledgeme
 }
 
 export const QueryPacketAcknowledgementRequest = {
+  typeUrl: "/ibc.core.channel.v1.QueryPacketAcknowledgementRequest",
+  aminoType: "cosmos-sdk/QueryPacketAcknowledgementRequest",
+
   encode(message: QueryPacketAcknowledgementRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.portId !== "") {
       writer.uint32(10).string(message.portId);
@@ -3123,6 +3590,32 @@ export const QueryPacketAcknowledgementRequest = {
     obj.channel_id = message.channelId;
     obj.sequence = message.sequence ? message.sequence.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryPacketAcknowledgementRequestAminoMsg): QueryPacketAcknowledgementRequest {
+    return QueryPacketAcknowledgementRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryPacketAcknowledgementRequest): QueryPacketAcknowledgementRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryPacketAcknowledgementRequest",
+      value: QueryPacketAcknowledgementRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryPacketAcknowledgementRequestProtoMsg): QueryPacketAcknowledgementRequest {
+    return QueryPacketAcknowledgementRequest.decode(message.value);
+  },
+
+  toProto(message: QueryPacketAcknowledgementRequest): Uint8Array {
+    return QueryPacketAcknowledgementRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryPacketAcknowledgementRequest): QueryPacketAcknowledgementRequestProtoMsg {
+    return {
+      typeUrl: "/ibc.core.channel.v1.QueryPacketAcknowledgementRequest",
+      value: QueryPacketAcknowledgementRequest.encode(message).finish()
+    };
   }
 
 };
@@ -3136,6 +3629,9 @@ function createBaseQueryPacketAcknowledgementResponse(): QueryPacketAcknowledgem
 }
 
 export const QueryPacketAcknowledgementResponse = {
+  typeUrl: "/ibc.core.channel.v1.QueryPacketAcknowledgementResponse",
+  aminoType: "cosmos-sdk/QueryPacketAcknowledgementResponse",
+
   encode(message: QueryPacketAcknowledgementResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.acknowledgement.length !== 0) {
       writer.uint32(10).bytes(message.acknowledgement);
@@ -3236,6 +3732,32 @@ export const QueryPacketAcknowledgementResponse = {
     obj.proof = message.proof;
     obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryPacketAcknowledgementResponseAminoMsg): QueryPacketAcknowledgementResponse {
+    return QueryPacketAcknowledgementResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryPacketAcknowledgementResponse): QueryPacketAcknowledgementResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryPacketAcknowledgementResponse",
+      value: QueryPacketAcknowledgementResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryPacketAcknowledgementResponseProtoMsg): QueryPacketAcknowledgementResponse {
+    return QueryPacketAcknowledgementResponse.decode(message.value);
+  },
+
+  toProto(message: QueryPacketAcknowledgementResponse): Uint8Array {
+    return QueryPacketAcknowledgementResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryPacketAcknowledgementResponse): QueryPacketAcknowledgementResponseProtoMsg {
+    return {
+      typeUrl: "/ibc.core.channel.v1.QueryPacketAcknowledgementResponse",
+      value: QueryPacketAcknowledgementResponse.encode(message).finish()
+    };
   }
 
 };
@@ -3250,6 +3772,9 @@ function createBaseQueryPacketAcknowledgementsRequest(): QueryPacketAcknowledgem
 }
 
 export const QueryPacketAcknowledgementsRequest = {
+  typeUrl: "/ibc.core.channel.v1.QueryPacketAcknowledgementsRequest",
+  aminoType: "cosmos-sdk/QueryPacketAcknowledgementsRequest",
+
   encode(message: QueryPacketAcknowledgementsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.portId !== "") {
       writer.uint32(10).string(message.portId);
@@ -3395,6 +3920,32 @@ export const QueryPacketAcknowledgementsRequest = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: QueryPacketAcknowledgementsRequestAminoMsg): QueryPacketAcknowledgementsRequest {
+    return QueryPacketAcknowledgementsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryPacketAcknowledgementsRequest): QueryPacketAcknowledgementsRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryPacketAcknowledgementsRequest",
+      value: QueryPacketAcknowledgementsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryPacketAcknowledgementsRequestProtoMsg): QueryPacketAcknowledgementsRequest {
+    return QueryPacketAcknowledgementsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryPacketAcknowledgementsRequest): Uint8Array {
+    return QueryPacketAcknowledgementsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryPacketAcknowledgementsRequest): QueryPacketAcknowledgementsRequestProtoMsg {
+    return {
+      typeUrl: "/ibc.core.channel.v1.QueryPacketAcknowledgementsRequest",
+      value: QueryPacketAcknowledgementsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -3408,6 +3959,9 @@ function createBaseQueryPacketAcknowledgementsResponse(): QueryPacketAcknowledge
 }
 
 export const QueryPacketAcknowledgementsResponse = {
+  typeUrl: "/ibc.core.channel.v1.QueryPacketAcknowledgementsResponse",
+  aminoType: "cosmos-sdk/QueryPacketAcknowledgementsResponse",
+
   encode(message: QueryPacketAcknowledgementsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.acknowledgements) {
       PacketState.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -3526,6 +4080,32 @@ export const QueryPacketAcknowledgementsResponse = {
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     obj.height = message.height ? Height.toAmino(message.height) : {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryPacketAcknowledgementsResponseAminoMsg): QueryPacketAcknowledgementsResponse {
+    return QueryPacketAcknowledgementsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryPacketAcknowledgementsResponse): QueryPacketAcknowledgementsResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryPacketAcknowledgementsResponse",
+      value: QueryPacketAcknowledgementsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryPacketAcknowledgementsResponseProtoMsg): QueryPacketAcknowledgementsResponse {
+    return QueryPacketAcknowledgementsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryPacketAcknowledgementsResponse): Uint8Array {
+    return QueryPacketAcknowledgementsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryPacketAcknowledgementsResponse): QueryPacketAcknowledgementsResponseProtoMsg {
+    return {
+      typeUrl: "/ibc.core.channel.v1.QueryPacketAcknowledgementsResponse",
+      value: QueryPacketAcknowledgementsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -3539,6 +4119,9 @@ function createBaseQueryUnreceivedPacketsRequest(): QueryUnreceivedPacketsReques
 }
 
 export const QueryUnreceivedPacketsRequest = {
+  typeUrl: "/ibc.core.channel.v1.QueryUnreceivedPacketsRequest",
+  aminoType: "cosmos-sdk/QueryUnreceivedPacketsRequest",
+
   encode(message: QueryUnreceivedPacketsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.portId !== "") {
       writer.uint32(10).string(message.portId);
@@ -3669,6 +4252,32 @@ export const QueryUnreceivedPacketsRequest = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: QueryUnreceivedPacketsRequestAminoMsg): QueryUnreceivedPacketsRequest {
+    return QueryUnreceivedPacketsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryUnreceivedPacketsRequest): QueryUnreceivedPacketsRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryUnreceivedPacketsRequest",
+      value: QueryUnreceivedPacketsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryUnreceivedPacketsRequestProtoMsg): QueryUnreceivedPacketsRequest {
+    return QueryUnreceivedPacketsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryUnreceivedPacketsRequest): Uint8Array {
+    return QueryUnreceivedPacketsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryUnreceivedPacketsRequest): QueryUnreceivedPacketsRequestProtoMsg {
+    return {
+      typeUrl: "/ibc.core.channel.v1.QueryUnreceivedPacketsRequest",
+      value: QueryUnreceivedPacketsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -3681,6 +4290,9 @@ function createBaseQueryUnreceivedPacketsResponse(): QueryUnreceivedPacketsRespo
 }
 
 export const QueryUnreceivedPacketsResponse = {
+  typeUrl: "/ibc.core.channel.v1.QueryUnreceivedPacketsResponse",
+  aminoType: "cosmos-sdk/QueryUnreceivedPacketsResponse",
+
   encode(message: QueryUnreceivedPacketsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     writer.uint32(10).fork();
 
@@ -3797,6 +4409,32 @@ export const QueryUnreceivedPacketsResponse = {
 
     obj.height = message.height ? Height.toAmino(message.height) : {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryUnreceivedPacketsResponseAminoMsg): QueryUnreceivedPacketsResponse {
+    return QueryUnreceivedPacketsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryUnreceivedPacketsResponse): QueryUnreceivedPacketsResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryUnreceivedPacketsResponse",
+      value: QueryUnreceivedPacketsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryUnreceivedPacketsResponseProtoMsg): QueryUnreceivedPacketsResponse {
+    return QueryUnreceivedPacketsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryUnreceivedPacketsResponse): Uint8Array {
+    return QueryUnreceivedPacketsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryUnreceivedPacketsResponse): QueryUnreceivedPacketsResponseProtoMsg {
+    return {
+      typeUrl: "/ibc.core.channel.v1.QueryUnreceivedPacketsResponse",
+      value: QueryUnreceivedPacketsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -3810,6 +4448,9 @@ function createBaseQueryUnreceivedAcksRequest(): QueryUnreceivedAcksRequest {
 }
 
 export const QueryUnreceivedAcksRequest = {
+  typeUrl: "/ibc.core.channel.v1.QueryUnreceivedAcksRequest",
+  aminoType: "cosmos-sdk/QueryUnreceivedAcksRequest",
+
   encode(message: QueryUnreceivedAcksRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.portId !== "") {
       writer.uint32(10).string(message.portId);
@@ -3940,6 +4581,32 @@ export const QueryUnreceivedAcksRequest = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: QueryUnreceivedAcksRequestAminoMsg): QueryUnreceivedAcksRequest {
+    return QueryUnreceivedAcksRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryUnreceivedAcksRequest): QueryUnreceivedAcksRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryUnreceivedAcksRequest",
+      value: QueryUnreceivedAcksRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryUnreceivedAcksRequestProtoMsg): QueryUnreceivedAcksRequest {
+    return QueryUnreceivedAcksRequest.decode(message.value);
+  },
+
+  toProto(message: QueryUnreceivedAcksRequest): Uint8Array {
+    return QueryUnreceivedAcksRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryUnreceivedAcksRequest): QueryUnreceivedAcksRequestProtoMsg {
+    return {
+      typeUrl: "/ibc.core.channel.v1.QueryUnreceivedAcksRequest",
+      value: QueryUnreceivedAcksRequest.encode(message).finish()
+    };
   }
 
 };
@@ -3952,6 +4619,9 @@ function createBaseQueryUnreceivedAcksResponse(): QueryUnreceivedAcksResponse {
 }
 
 export const QueryUnreceivedAcksResponse = {
+  typeUrl: "/ibc.core.channel.v1.QueryUnreceivedAcksResponse",
+  aminoType: "cosmos-sdk/QueryUnreceivedAcksResponse",
+
   encode(message: QueryUnreceivedAcksResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     writer.uint32(10).fork();
 
@@ -4068,6 +4738,32 @@ export const QueryUnreceivedAcksResponse = {
 
     obj.height = message.height ? Height.toAmino(message.height) : {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryUnreceivedAcksResponseAminoMsg): QueryUnreceivedAcksResponse {
+    return QueryUnreceivedAcksResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryUnreceivedAcksResponse): QueryUnreceivedAcksResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryUnreceivedAcksResponse",
+      value: QueryUnreceivedAcksResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryUnreceivedAcksResponseProtoMsg): QueryUnreceivedAcksResponse {
+    return QueryUnreceivedAcksResponse.decode(message.value);
+  },
+
+  toProto(message: QueryUnreceivedAcksResponse): Uint8Array {
+    return QueryUnreceivedAcksResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryUnreceivedAcksResponse): QueryUnreceivedAcksResponseProtoMsg {
+    return {
+      typeUrl: "/ibc.core.channel.v1.QueryUnreceivedAcksResponse",
+      value: QueryUnreceivedAcksResponse.encode(message).finish()
+    };
   }
 
 };
@@ -4080,6 +4776,9 @@ function createBaseQueryNextSequenceReceiveRequest(): QueryNextSequenceReceiveRe
 }
 
 export const QueryNextSequenceReceiveRequest = {
+  typeUrl: "/ibc.core.channel.v1.QueryNextSequenceReceiveRequest",
+  aminoType: "cosmos-sdk/QueryNextSequenceReceiveRequest",
+
   encode(message: QueryNextSequenceReceiveRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.portId !== "") {
       writer.uint32(10).string(message.portId);
@@ -4165,6 +4864,32 @@ export const QueryNextSequenceReceiveRequest = {
     obj.port_id = message.portId;
     obj.channel_id = message.channelId;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryNextSequenceReceiveRequestAminoMsg): QueryNextSequenceReceiveRequest {
+    return QueryNextSequenceReceiveRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryNextSequenceReceiveRequest): QueryNextSequenceReceiveRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryNextSequenceReceiveRequest",
+      value: QueryNextSequenceReceiveRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryNextSequenceReceiveRequestProtoMsg): QueryNextSequenceReceiveRequest {
+    return QueryNextSequenceReceiveRequest.decode(message.value);
+  },
+
+  toProto(message: QueryNextSequenceReceiveRequest): Uint8Array {
+    return QueryNextSequenceReceiveRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryNextSequenceReceiveRequest): QueryNextSequenceReceiveRequestProtoMsg {
+    return {
+      typeUrl: "/ibc.core.channel.v1.QueryNextSequenceReceiveRequest",
+      value: QueryNextSequenceReceiveRequest.encode(message).finish()
+    };
   }
 
 };
@@ -4178,6 +4903,9 @@ function createBaseQueryNextSequenceReceiveResponse(): QueryNextSequenceReceiveR
 }
 
 export const QueryNextSequenceReceiveResponse = {
+  typeUrl: "/ibc.core.channel.v1.QueryNextSequenceReceiveResponse",
+  aminoType: "cosmos-sdk/QueryNextSequenceReceiveResponse",
+
   encode(message: QueryNextSequenceReceiveResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.nextSequenceReceive.isZero()) {
       writer.uint32(8).uint64(message.nextSequenceReceive);
@@ -4278,6 +5006,32 @@ export const QueryNextSequenceReceiveResponse = {
     obj.proof = message.proof;
     obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryNextSequenceReceiveResponseAminoMsg): QueryNextSequenceReceiveResponse {
+    return QueryNextSequenceReceiveResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryNextSequenceReceiveResponse): QueryNextSequenceReceiveResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryNextSequenceReceiveResponse",
+      value: QueryNextSequenceReceiveResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryNextSequenceReceiveResponseProtoMsg): QueryNextSequenceReceiveResponse {
+    return QueryNextSequenceReceiveResponse.decode(message.value);
+  },
+
+  toProto(message: QueryNextSequenceReceiveResponse): Uint8Array {
+    return QueryNextSequenceReceiveResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryNextSequenceReceiveResponse): QueryNextSequenceReceiveResponseProtoMsg {
+    return {
+      typeUrl: "/ibc.core.channel.v1.QueryNextSequenceReceiveResponse",
+      value: QueryNextSequenceReceiveResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/ibc/core/channel/v1/tx.ts b/__fixtures__/outputv2/ibc/core/channel/v1/tx.ts
index f342fc92b..ab775716f 100644
--- a/__fixtures__/outputv2/ibc/core/channel/v1/tx.ts
+++ b/__fixtures__/outputv2/ibc/core/channel/v1/tx.ts
@@ -13,7 +13,7 @@ export interface MsgChannelOpenInit {
   channel?: Channel;
   signer: string;
 }
-export interface MsgChannelOpenInitProtoType {
+export interface MsgChannelOpenInitProtoMsg {
   typeUrl: "/ibc.core.channel.v1.MsgChannelOpenInit";
   value: Uint8Array;
 }
@@ -27,7 +27,7 @@ export interface MsgChannelOpenInitAmino {
   channel?: ChannelAmino;
   signer: string;
 }
-export interface MsgChannelOpenInitAminoType {
+export interface MsgChannelOpenInitAminoMsg {
   type: "cosmos-sdk/MsgChannelOpenInit";
   value: MsgChannelOpenInitAmino;
 }
@@ -44,14 +44,14 @@ export interface MsgChannelOpenInitSDKType {
 
 /** MsgChannelOpenInitResponse defines the Msg/ChannelOpenInit response type. */
 export interface MsgChannelOpenInitResponse {}
-export interface MsgChannelOpenInitResponseProtoType {
+export interface MsgChannelOpenInitResponseProtoMsg {
   typeUrl: "/ibc.core.channel.v1.MsgChannelOpenInitResponse";
   value: Uint8Array;
 }
 
 /** MsgChannelOpenInitResponse defines the Msg/ChannelOpenInit response type. */
 export interface MsgChannelOpenInitResponseAmino {}
-export interface MsgChannelOpenInitResponseAminoType {
+export interface MsgChannelOpenInitResponseAminoMsg {
   type: "cosmos-sdk/MsgChannelOpenInitResponse";
   value: MsgChannelOpenInitResponseAmino;
 }
@@ -77,7 +77,7 @@ export interface MsgChannelOpenTry {
   proofHeight?: Height;
   signer: string;
 }
-export interface MsgChannelOpenTryProtoType {
+export interface MsgChannelOpenTryProtoMsg {
   typeUrl: "/ibc.core.channel.v1.MsgChannelOpenTry";
   value: Uint8Array;
 }
@@ -100,7 +100,7 @@ export interface MsgChannelOpenTryAmino {
   proof_height?: HeightAmino;
   signer: string;
 }
-export interface MsgChannelOpenTryAminoType {
+export interface MsgChannelOpenTryAminoMsg {
   type: "cosmos-sdk/MsgChannelOpenTry";
   value: MsgChannelOpenTryAmino;
 }
@@ -121,14 +121,14 @@ export interface MsgChannelOpenTrySDKType {
 
 /** MsgChannelOpenTryResponse defines the Msg/ChannelOpenTry response type. */
 export interface MsgChannelOpenTryResponse {}
-export interface MsgChannelOpenTryResponseProtoType {
+export interface MsgChannelOpenTryResponseProtoMsg {
   typeUrl: "/ibc.core.channel.v1.MsgChannelOpenTryResponse";
   value: Uint8Array;
 }
 
 /** MsgChannelOpenTryResponse defines the Msg/ChannelOpenTry response type. */
 export interface MsgChannelOpenTryResponseAmino {}
-export interface MsgChannelOpenTryResponseAminoType {
+export interface MsgChannelOpenTryResponseAminoMsg {
   type: "cosmos-sdk/MsgChannelOpenTryResponse";
   value: MsgChannelOpenTryResponseAmino;
 }
@@ -149,7 +149,7 @@ export interface MsgChannelOpenAck {
   proofHeight?: Height;
   signer: string;
 }
-export interface MsgChannelOpenAckProtoType {
+export interface MsgChannelOpenAckProtoMsg {
   typeUrl: "/ibc.core.channel.v1.MsgChannelOpenAck";
   value: Uint8Array;
 }
@@ -167,7 +167,7 @@ export interface MsgChannelOpenAckAmino {
   proof_height?: HeightAmino;
   signer: string;
 }
-export interface MsgChannelOpenAckAminoType {
+export interface MsgChannelOpenAckAminoMsg {
   type: "cosmos-sdk/MsgChannelOpenAck";
   value: MsgChannelOpenAckAmino;
 }
@@ -188,14 +188,14 @@ export interface MsgChannelOpenAckSDKType {
 
 /** MsgChannelOpenAckResponse defines the Msg/ChannelOpenAck response type. */
 export interface MsgChannelOpenAckResponse {}
-export interface MsgChannelOpenAckResponseProtoType {
+export interface MsgChannelOpenAckResponseProtoMsg {
   typeUrl: "/ibc.core.channel.v1.MsgChannelOpenAckResponse";
   value: Uint8Array;
 }
 
 /** MsgChannelOpenAckResponse defines the Msg/ChannelOpenAck response type. */
 export interface MsgChannelOpenAckResponseAmino {}
-export interface MsgChannelOpenAckResponseAminoType {
+export interface MsgChannelOpenAckResponseAminoMsg {
   type: "cosmos-sdk/MsgChannelOpenAckResponse";
   value: MsgChannelOpenAckResponseAmino;
 }
@@ -214,7 +214,7 @@ export interface MsgChannelOpenConfirm {
   proofHeight?: Height;
   signer: string;
 }
-export interface MsgChannelOpenConfirmProtoType {
+export interface MsgChannelOpenConfirmProtoMsg {
   typeUrl: "/ibc.core.channel.v1.MsgChannelOpenConfirm";
   value: Uint8Array;
 }
@@ -230,7 +230,7 @@ export interface MsgChannelOpenConfirmAmino {
   proof_height?: HeightAmino;
   signer: string;
 }
-export interface MsgChannelOpenConfirmAminoType {
+export interface MsgChannelOpenConfirmAminoMsg {
   type: "cosmos-sdk/MsgChannelOpenConfirm";
   value: MsgChannelOpenConfirmAmino;
 }
@@ -252,7 +252,7 @@ export interface MsgChannelOpenConfirmSDKType {
  * type.
  */
 export interface MsgChannelOpenConfirmResponse {}
-export interface MsgChannelOpenConfirmResponseProtoType {
+export interface MsgChannelOpenConfirmResponseProtoMsg {
   typeUrl: "/ibc.core.channel.v1.MsgChannelOpenConfirmResponse";
   value: Uint8Array;
 }
@@ -262,7 +262,7 @@ export interface MsgChannelOpenConfirmResponseProtoType {
  * type.
  */
 export interface MsgChannelOpenConfirmResponseAmino {}
-export interface MsgChannelOpenConfirmResponseAminoType {
+export interface MsgChannelOpenConfirmResponseAminoMsg {
   type: "cosmos-sdk/MsgChannelOpenConfirmResponse";
   value: MsgChannelOpenConfirmResponseAmino;
 }
@@ -282,7 +282,7 @@ export interface MsgChannelCloseInit {
   channelId: string;
   signer: string;
 }
-export interface MsgChannelCloseInitProtoType {
+export interface MsgChannelCloseInitProtoMsg {
   typeUrl: "/ibc.core.channel.v1.MsgChannelCloseInit";
   value: Uint8Array;
 }
@@ -296,7 +296,7 @@ export interface MsgChannelCloseInitAmino {
   channel_id: string;
   signer: string;
 }
-export interface MsgChannelCloseInitAminoType {
+export interface MsgChannelCloseInitAminoMsg {
   type: "cosmos-sdk/MsgChannelCloseInit";
   value: MsgChannelCloseInitAmino;
 }
@@ -313,14 +313,14 @@ export interface MsgChannelCloseInitSDKType {
 
 /** MsgChannelCloseInitResponse defines the Msg/ChannelCloseInit response type. */
 export interface MsgChannelCloseInitResponse {}
-export interface MsgChannelCloseInitResponseProtoType {
+export interface MsgChannelCloseInitResponseProtoMsg {
   typeUrl: "/ibc.core.channel.v1.MsgChannelCloseInitResponse";
   value: Uint8Array;
 }
 
 /** MsgChannelCloseInitResponse defines the Msg/ChannelCloseInit response type. */
 export interface MsgChannelCloseInitResponseAmino {}
-export interface MsgChannelCloseInitResponseAminoType {
+export interface MsgChannelCloseInitResponseAminoMsg {
   type: "cosmos-sdk/MsgChannelCloseInitResponse";
   value: MsgChannelCloseInitResponseAmino;
 }
@@ -339,7 +339,7 @@ export interface MsgChannelCloseConfirm {
   proofHeight?: Height;
   signer: string;
 }
-export interface MsgChannelCloseConfirmProtoType {
+export interface MsgChannelCloseConfirmProtoMsg {
   typeUrl: "/ibc.core.channel.v1.MsgChannelCloseConfirm";
   value: Uint8Array;
 }
@@ -355,7 +355,7 @@ export interface MsgChannelCloseConfirmAmino {
   proof_height?: HeightAmino;
   signer: string;
 }
-export interface MsgChannelCloseConfirmAminoType {
+export interface MsgChannelCloseConfirmAminoMsg {
   type: "cosmos-sdk/MsgChannelCloseConfirm";
   value: MsgChannelCloseConfirmAmino;
 }
@@ -377,7 +377,7 @@ export interface MsgChannelCloseConfirmSDKType {
  * type.
  */
 export interface MsgChannelCloseConfirmResponse {}
-export interface MsgChannelCloseConfirmResponseProtoType {
+export interface MsgChannelCloseConfirmResponseProtoMsg {
   typeUrl: "/ibc.core.channel.v1.MsgChannelCloseConfirmResponse";
   value: Uint8Array;
 }
@@ -387,7 +387,7 @@ export interface MsgChannelCloseConfirmResponseProtoType {
  * type.
  */
 export interface MsgChannelCloseConfirmResponseAmino {}
-export interface MsgChannelCloseConfirmResponseAminoType {
+export interface MsgChannelCloseConfirmResponseAminoMsg {
   type: "cosmos-sdk/MsgChannelCloseConfirmResponse";
   value: MsgChannelCloseConfirmResponseAmino;
 }
@@ -405,7 +405,7 @@ export interface MsgRecvPacket {
   proofHeight?: Height;
   signer: string;
 }
-export interface MsgRecvPacketProtoType {
+export interface MsgRecvPacketProtoMsg {
   typeUrl: "/ibc.core.channel.v1.MsgRecvPacket";
   value: Uint8Array;
 }
@@ -417,7 +417,7 @@ export interface MsgRecvPacketAmino {
   proof_height?: HeightAmino;
   signer: string;
 }
-export interface MsgRecvPacketAminoType {
+export interface MsgRecvPacketAminoMsg {
   type: "cosmos-sdk/MsgRecvPacket";
   value: MsgRecvPacketAmino;
 }
@@ -432,14 +432,14 @@ export interface MsgRecvPacketSDKType {
 
 /** MsgRecvPacketResponse defines the Msg/RecvPacket response type. */
 export interface MsgRecvPacketResponse {}
-export interface MsgRecvPacketResponseProtoType {
+export interface MsgRecvPacketResponseProtoMsg {
   typeUrl: "/ibc.core.channel.v1.MsgRecvPacketResponse";
   value: Uint8Array;
 }
 
 /** MsgRecvPacketResponse defines the Msg/RecvPacket response type. */
 export interface MsgRecvPacketResponseAmino {}
-export interface MsgRecvPacketResponseAminoType {
+export interface MsgRecvPacketResponseAminoMsg {
   type: "cosmos-sdk/MsgRecvPacketResponse";
   value: MsgRecvPacketResponseAmino;
 }
@@ -455,7 +455,7 @@ export interface MsgTimeout {
   nextSequenceRecv: Long;
   signer: string;
 }
-export interface MsgTimeoutProtoType {
+export interface MsgTimeoutProtoMsg {
   typeUrl: "/ibc.core.channel.v1.MsgTimeout";
   value: Uint8Array;
 }
@@ -468,7 +468,7 @@ export interface MsgTimeoutAmino {
   next_sequence_recv: string;
   signer: string;
 }
-export interface MsgTimeoutAminoType {
+export interface MsgTimeoutAminoMsg {
   type: "cosmos-sdk/MsgTimeout";
   value: MsgTimeoutAmino;
 }
@@ -484,14 +484,14 @@ export interface MsgTimeoutSDKType {
 
 /** MsgTimeoutResponse defines the Msg/Timeout response type. */
 export interface MsgTimeoutResponse {}
-export interface MsgTimeoutResponseProtoType {
+export interface MsgTimeoutResponseProtoMsg {
   typeUrl: "/ibc.core.channel.v1.MsgTimeoutResponse";
   value: Uint8Array;
 }
 
 /** MsgTimeoutResponse defines the Msg/Timeout response type. */
 export interface MsgTimeoutResponseAmino {}
-export interface MsgTimeoutResponseAminoType {
+export interface MsgTimeoutResponseAminoMsg {
   type: "cosmos-sdk/MsgTimeoutResponse";
   value: MsgTimeoutResponseAmino;
 }
@@ -508,7 +508,7 @@ export interface MsgTimeoutOnClose {
   nextSequenceRecv: Long;
   signer: string;
 }
-export interface MsgTimeoutOnCloseProtoType {
+export interface MsgTimeoutOnCloseProtoMsg {
   typeUrl: "/ibc.core.channel.v1.MsgTimeoutOnClose";
   value: Uint8Array;
 }
@@ -522,7 +522,7 @@ export interface MsgTimeoutOnCloseAmino {
   next_sequence_recv: string;
   signer: string;
 }
-export interface MsgTimeoutOnCloseAminoType {
+export interface MsgTimeoutOnCloseAminoMsg {
   type: "cosmos-sdk/MsgTimeoutOnClose";
   value: MsgTimeoutOnCloseAmino;
 }
@@ -539,14 +539,14 @@ export interface MsgTimeoutOnCloseSDKType {
 
 /** MsgTimeoutOnCloseResponse defines the Msg/TimeoutOnClose response type. */
 export interface MsgTimeoutOnCloseResponse {}
-export interface MsgTimeoutOnCloseResponseProtoType {
+export interface MsgTimeoutOnCloseResponseProtoMsg {
   typeUrl: "/ibc.core.channel.v1.MsgTimeoutOnCloseResponse";
   value: Uint8Array;
 }
 
 /** MsgTimeoutOnCloseResponse defines the Msg/TimeoutOnClose response type. */
 export interface MsgTimeoutOnCloseResponseAmino {}
-export interface MsgTimeoutOnCloseResponseAminoType {
+export interface MsgTimeoutOnCloseResponseAminoMsg {
   type: "cosmos-sdk/MsgTimeoutOnCloseResponse";
   value: MsgTimeoutOnCloseResponseAmino;
 }
@@ -562,7 +562,7 @@ export interface MsgAcknowledgement {
   proofHeight?: Height;
   signer: string;
 }
-export interface MsgAcknowledgementProtoType {
+export interface MsgAcknowledgementProtoMsg {
   typeUrl: "/ibc.core.channel.v1.MsgAcknowledgement";
   value: Uint8Array;
 }
@@ -575,7 +575,7 @@ export interface MsgAcknowledgementAmino {
   proof_height?: HeightAmino;
   signer: string;
 }
-export interface MsgAcknowledgementAminoType {
+export interface MsgAcknowledgementAminoMsg {
   type: "cosmos-sdk/MsgAcknowledgement";
   value: MsgAcknowledgementAmino;
 }
@@ -591,14 +591,14 @@ export interface MsgAcknowledgementSDKType {
 
 /** MsgAcknowledgementResponse defines the Msg/Acknowledgement response type. */
 export interface MsgAcknowledgementResponse {}
-export interface MsgAcknowledgementResponseProtoType {
+export interface MsgAcknowledgementResponseProtoMsg {
   typeUrl: "/ibc.core.channel.v1.MsgAcknowledgementResponse";
   value: Uint8Array;
 }
 
 /** MsgAcknowledgementResponse defines the Msg/Acknowledgement response type. */
 export interface MsgAcknowledgementResponseAmino {}
-export interface MsgAcknowledgementResponseAminoType {
+export interface MsgAcknowledgementResponseAminoMsg {
   type: "cosmos-sdk/MsgAcknowledgementResponse";
   value: MsgAcknowledgementResponseAmino;
 }
@@ -615,6 +615,9 @@ function createBaseMsgChannelOpenInit(): MsgChannelOpenInit {
 }
 
 export const MsgChannelOpenInit = {
+  typeUrl: "/ibc.core.channel.v1.MsgChannelOpenInit",
+  aminoType: "cosmos-sdk/MsgChannelOpenInit",
+
   encode(message: MsgChannelOpenInit, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.portId !== "") {
       writer.uint32(10).string(message.portId);
@@ -715,6 +718,32 @@ export const MsgChannelOpenInit = {
     obj.channel = message.channel ? Channel.toAmino(message.channel) : undefined;
     obj.signer = message.signer;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgChannelOpenInitAminoMsg): MsgChannelOpenInit {
+    return MsgChannelOpenInit.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgChannelOpenInit): MsgChannelOpenInitAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgChannelOpenInit",
+      value: MsgChannelOpenInit.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgChannelOpenInitProtoMsg): MsgChannelOpenInit {
+    return MsgChannelOpenInit.decode(message.value);
+  },
+
+  toProto(message: MsgChannelOpenInit): Uint8Array {
+    return MsgChannelOpenInit.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgChannelOpenInit): MsgChannelOpenInitProtoMsg {
+    return {
+      typeUrl: "/ibc.core.channel.v1.MsgChannelOpenInit",
+      value: MsgChannelOpenInit.encode(message).finish()
+    };
   }
 
 };
@@ -724,6 +753,9 @@ function createBaseMsgChannelOpenInitResponse(): MsgChannelOpenInitResponse {
 }
 
 export const MsgChannelOpenInitResponse = {
+  typeUrl: "/ibc.core.channel.v1.MsgChannelOpenInitResponse",
+  aminoType: "cosmos-sdk/MsgChannelOpenInitResponse",
+
   encode(_: MsgChannelOpenInitResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -776,6 +808,32 @@ export const MsgChannelOpenInitResponse = {
   toAmino(_: MsgChannelOpenInitResponse): MsgChannelOpenInitResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgChannelOpenInitResponseAminoMsg): MsgChannelOpenInitResponse {
+    return MsgChannelOpenInitResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgChannelOpenInitResponse): MsgChannelOpenInitResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgChannelOpenInitResponse",
+      value: MsgChannelOpenInitResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgChannelOpenInitResponseProtoMsg): MsgChannelOpenInitResponse {
+    return MsgChannelOpenInitResponse.decode(message.value);
+  },
+
+  toProto(message: MsgChannelOpenInitResponse): Uint8Array {
+    return MsgChannelOpenInitResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgChannelOpenInitResponse): MsgChannelOpenInitResponseProtoMsg {
+    return {
+      typeUrl: "/ibc.core.channel.v1.MsgChannelOpenInitResponse",
+      value: MsgChannelOpenInitResponse.encode(message).finish()
+    };
   }
 
 };
@@ -793,6 +851,9 @@ function createBaseMsgChannelOpenTry(): MsgChannelOpenTry {
 }
 
 export const MsgChannelOpenTry = {
+  typeUrl: "/ibc.core.channel.v1.MsgChannelOpenTry",
+  aminoType: "cosmos-sdk/MsgChannelOpenTry",
+
   encode(message: MsgChannelOpenTry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.portId !== "") {
       writer.uint32(10).string(message.portId);
@@ -953,6 +1014,32 @@ export const MsgChannelOpenTry = {
     obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {};
     obj.signer = message.signer;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgChannelOpenTryAminoMsg): MsgChannelOpenTry {
+    return MsgChannelOpenTry.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgChannelOpenTry): MsgChannelOpenTryAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgChannelOpenTry",
+      value: MsgChannelOpenTry.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgChannelOpenTryProtoMsg): MsgChannelOpenTry {
+    return MsgChannelOpenTry.decode(message.value);
+  },
+
+  toProto(message: MsgChannelOpenTry): Uint8Array {
+    return MsgChannelOpenTry.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgChannelOpenTry): MsgChannelOpenTryProtoMsg {
+    return {
+      typeUrl: "/ibc.core.channel.v1.MsgChannelOpenTry",
+      value: MsgChannelOpenTry.encode(message).finish()
+    };
   }
 
 };
@@ -962,6 +1049,9 @@ function createBaseMsgChannelOpenTryResponse(): MsgChannelOpenTryResponse {
 }
 
 export const MsgChannelOpenTryResponse = {
+  typeUrl: "/ibc.core.channel.v1.MsgChannelOpenTryResponse",
+  aminoType: "cosmos-sdk/MsgChannelOpenTryResponse",
+
   encode(_: MsgChannelOpenTryResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -1014,6 +1104,32 @@ export const MsgChannelOpenTryResponse = {
   toAmino(_: MsgChannelOpenTryResponse): MsgChannelOpenTryResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgChannelOpenTryResponseAminoMsg): MsgChannelOpenTryResponse {
+    return MsgChannelOpenTryResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgChannelOpenTryResponse): MsgChannelOpenTryResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgChannelOpenTryResponse",
+      value: MsgChannelOpenTryResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgChannelOpenTryResponseProtoMsg): MsgChannelOpenTryResponse {
+    return MsgChannelOpenTryResponse.decode(message.value);
+  },
+
+  toProto(message: MsgChannelOpenTryResponse): Uint8Array {
+    return MsgChannelOpenTryResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgChannelOpenTryResponse): MsgChannelOpenTryResponseProtoMsg {
+    return {
+      typeUrl: "/ibc.core.channel.v1.MsgChannelOpenTryResponse",
+      value: MsgChannelOpenTryResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1031,6 +1147,9 @@ function createBaseMsgChannelOpenAck(): MsgChannelOpenAck {
 }
 
 export const MsgChannelOpenAck = {
+  typeUrl: "/ibc.core.channel.v1.MsgChannelOpenAck",
+  aminoType: "cosmos-sdk/MsgChannelOpenAck",
+
   encode(message: MsgChannelOpenAck, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.portId !== "") {
       writer.uint32(10).string(message.portId);
@@ -1191,6 +1310,32 @@ export const MsgChannelOpenAck = {
     obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {};
     obj.signer = message.signer;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgChannelOpenAckAminoMsg): MsgChannelOpenAck {
+    return MsgChannelOpenAck.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgChannelOpenAck): MsgChannelOpenAckAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgChannelOpenAck",
+      value: MsgChannelOpenAck.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgChannelOpenAckProtoMsg): MsgChannelOpenAck {
+    return MsgChannelOpenAck.decode(message.value);
+  },
+
+  toProto(message: MsgChannelOpenAck): Uint8Array {
+    return MsgChannelOpenAck.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgChannelOpenAck): MsgChannelOpenAckProtoMsg {
+    return {
+      typeUrl: "/ibc.core.channel.v1.MsgChannelOpenAck",
+      value: MsgChannelOpenAck.encode(message).finish()
+    };
   }
 
 };
@@ -1200,6 +1345,9 @@ function createBaseMsgChannelOpenAckResponse(): MsgChannelOpenAckResponse {
 }
 
 export const MsgChannelOpenAckResponse = {
+  typeUrl: "/ibc.core.channel.v1.MsgChannelOpenAckResponse",
+  aminoType: "cosmos-sdk/MsgChannelOpenAckResponse",
+
   encode(_: MsgChannelOpenAckResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -1252,6 +1400,32 @@ export const MsgChannelOpenAckResponse = {
   toAmino(_: MsgChannelOpenAckResponse): MsgChannelOpenAckResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgChannelOpenAckResponseAminoMsg): MsgChannelOpenAckResponse {
+    return MsgChannelOpenAckResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgChannelOpenAckResponse): MsgChannelOpenAckResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgChannelOpenAckResponse",
+      value: MsgChannelOpenAckResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgChannelOpenAckResponseProtoMsg): MsgChannelOpenAckResponse {
+    return MsgChannelOpenAckResponse.decode(message.value);
+  },
+
+  toProto(message: MsgChannelOpenAckResponse): Uint8Array {
+    return MsgChannelOpenAckResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgChannelOpenAckResponse): MsgChannelOpenAckResponseProtoMsg {
+    return {
+      typeUrl: "/ibc.core.channel.v1.MsgChannelOpenAckResponse",
+      value: MsgChannelOpenAckResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1267,6 +1441,9 @@ function createBaseMsgChannelOpenConfirm(): MsgChannelOpenConfirm {
 }
 
 export const MsgChannelOpenConfirm = {
+  typeUrl: "/ibc.core.channel.v1.MsgChannelOpenConfirm",
+  aminoType: "cosmos-sdk/MsgChannelOpenConfirm",
+
   encode(message: MsgChannelOpenConfirm, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.portId !== "") {
       writer.uint32(10).string(message.portId);
@@ -1397,6 +1574,32 @@ export const MsgChannelOpenConfirm = {
     obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {};
     obj.signer = message.signer;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgChannelOpenConfirmAminoMsg): MsgChannelOpenConfirm {
+    return MsgChannelOpenConfirm.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgChannelOpenConfirm): MsgChannelOpenConfirmAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgChannelOpenConfirm",
+      value: MsgChannelOpenConfirm.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgChannelOpenConfirmProtoMsg): MsgChannelOpenConfirm {
+    return MsgChannelOpenConfirm.decode(message.value);
+  },
+
+  toProto(message: MsgChannelOpenConfirm): Uint8Array {
+    return MsgChannelOpenConfirm.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgChannelOpenConfirm): MsgChannelOpenConfirmProtoMsg {
+    return {
+      typeUrl: "/ibc.core.channel.v1.MsgChannelOpenConfirm",
+      value: MsgChannelOpenConfirm.encode(message).finish()
+    };
   }
 
 };
@@ -1406,6 +1609,9 @@ function createBaseMsgChannelOpenConfirmResponse(): MsgChannelOpenConfirmRespons
 }
 
 export const MsgChannelOpenConfirmResponse = {
+  typeUrl: "/ibc.core.channel.v1.MsgChannelOpenConfirmResponse",
+  aminoType: "cosmos-sdk/MsgChannelOpenConfirmResponse",
+
   encode(_: MsgChannelOpenConfirmResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -1458,6 +1664,32 @@ export const MsgChannelOpenConfirmResponse = {
   toAmino(_: MsgChannelOpenConfirmResponse): MsgChannelOpenConfirmResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgChannelOpenConfirmResponseAminoMsg): MsgChannelOpenConfirmResponse {
+    return MsgChannelOpenConfirmResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgChannelOpenConfirmResponse): MsgChannelOpenConfirmResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgChannelOpenConfirmResponse",
+      value: MsgChannelOpenConfirmResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgChannelOpenConfirmResponseProtoMsg): MsgChannelOpenConfirmResponse {
+    return MsgChannelOpenConfirmResponse.decode(message.value);
+  },
+
+  toProto(message: MsgChannelOpenConfirmResponse): Uint8Array {
+    return MsgChannelOpenConfirmResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgChannelOpenConfirmResponse): MsgChannelOpenConfirmResponseProtoMsg {
+    return {
+      typeUrl: "/ibc.core.channel.v1.MsgChannelOpenConfirmResponse",
+      value: MsgChannelOpenConfirmResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1471,6 +1703,9 @@ function createBaseMsgChannelCloseInit(): MsgChannelCloseInit {
 }
 
 export const MsgChannelCloseInit = {
+  typeUrl: "/ibc.core.channel.v1.MsgChannelCloseInit",
+  aminoType: "cosmos-sdk/MsgChannelCloseInit",
+
   encode(message: MsgChannelCloseInit, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.portId !== "") {
       writer.uint32(10).string(message.portId);
@@ -1571,6 +1806,32 @@ export const MsgChannelCloseInit = {
     obj.channel_id = message.channelId;
     obj.signer = message.signer;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgChannelCloseInitAminoMsg): MsgChannelCloseInit {
+    return MsgChannelCloseInit.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgChannelCloseInit): MsgChannelCloseInitAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgChannelCloseInit",
+      value: MsgChannelCloseInit.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgChannelCloseInitProtoMsg): MsgChannelCloseInit {
+    return MsgChannelCloseInit.decode(message.value);
+  },
+
+  toProto(message: MsgChannelCloseInit): Uint8Array {
+    return MsgChannelCloseInit.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgChannelCloseInit): MsgChannelCloseInitProtoMsg {
+    return {
+      typeUrl: "/ibc.core.channel.v1.MsgChannelCloseInit",
+      value: MsgChannelCloseInit.encode(message).finish()
+    };
   }
 
 };
@@ -1580,6 +1841,9 @@ function createBaseMsgChannelCloseInitResponse(): MsgChannelCloseInitResponse {
 }
 
 export const MsgChannelCloseInitResponse = {
+  typeUrl: "/ibc.core.channel.v1.MsgChannelCloseInitResponse",
+  aminoType: "cosmos-sdk/MsgChannelCloseInitResponse",
+
   encode(_: MsgChannelCloseInitResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -1632,6 +1896,32 @@ export const MsgChannelCloseInitResponse = {
   toAmino(_: MsgChannelCloseInitResponse): MsgChannelCloseInitResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgChannelCloseInitResponseAminoMsg): MsgChannelCloseInitResponse {
+    return MsgChannelCloseInitResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgChannelCloseInitResponse): MsgChannelCloseInitResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgChannelCloseInitResponse",
+      value: MsgChannelCloseInitResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgChannelCloseInitResponseProtoMsg): MsgChannelCloseInitResponse {
+    return MsgChannelCloseInitResponse.decode(message.value);
+  },
+
+  toProto(message: MsgChannelCloseInitResponse): Uint8Array {
+    return MsgChannelCloseInitResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgChannelCloseInitResponse): MsgChannelCloseInitResponseProtoMsg {
+    return {
+      typeUrl: "/ibc.core.channel.v1.MsgChannelCloseInitResponse",
+      value: MsgChannelCloseInitResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1647,6 +1937,9 @@ function createBaseMsgChannelCloseConfirm(): MsgChannelCloseConfirm {
 }
 
 export const MsgChannelCloseConfirm = {
+  typeUrl: "/ibc.core.channel.v1.MsgChannelCloseConfirm",
+  aminoType: "cosmos-sdk/MsgChannelCloseConfirm",
+
   encode(message: MsgChannelCloseConfirm, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.portId !== "") {
       writer.uint32(10).string(message.portId);
@@ -1777,6 +2070,32 @@ export const MsgChannelCloseConfirm = {
     obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {};
     obj.signer = message.signer;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgChannelCloseConfirmAminoMsg): MsgChannelCloseConfirm {
+    return MsgChannelCloseConfirm.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgChannelCloseConfirm): MsgChannelCloseConfirmAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgChannelCloseConfirm",
+      value: MsgChannelCloseConfirm.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgChannelCloseConfirmProtoMsg): MsgChannelCloseConfirm {
+    return MsgChannelCloseConfirm.decode(message.value);
+  },
+
+  toProto(message: MsgChannelCloseConfirm): Uint8Array {
+    return MsgChannelCloseConfirm.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgChannelCloseConfirm): MsgChannelCloseConfirmProtoMsg {
+    return {
+      typeUrl: "/ibc.core.channel.v1.MsgChannelCloseConfirm",
+      value: MsgChannelCloseConfirm.encode(message).finish()
+    };
   }
 
 };
@@ -1786,6 +2105,9 @@ function createBaseMsgChannelCloseConfirmResponse(): MsgChannelCloseConfirmRespo
 }
 
 export const MsgChannelCloseConfirmResponse = {
+  typeUrl: "/ibc.core.channel.v1.MsgChannelCloseConfirmResponse",
+  aminoType: "cosmos-sdk/MsgChannelCloseConfirmResponse",
+
   encode(_: MsgChannelCloseConfirmResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -1838,6 +2160,32 @@ export const MsgChannelCloseConfirmResponse = {
   toAmino(_: MsgChannelCloseConfirmResponse): MsgChannelCloseConfirmResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgChannelCloseConfirmResponseAminoMsg): MsgChannelCloseConfirmResponse {
+    return MsgChannelCloseConfirmResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgChannelCloseConfirmResponse): MsgChannelCloseConfirmResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgChannelCloseConfirmResponse",
+      value: MsgChannelCloseConfirmResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgChannelCloseConfirmResponseProtoMsg): MsgChannelCloseConfirmResponse {
+    return MsgChannelCloseConfirmResponse.decode(message.value);
+  },
+
+  toProto(message: MsgChannelCloseConfirmResponse): Uint8Array {
+    return MsgChannelCloseConfirmResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgChannelCloseConfirmResponse): MsgChannelCloseConfirmResponseProtoMsg {
+    return {
+      typeUrl: "/ibc.core.channel.v1.MsgChannelCloseConfirmResponse",
+      value: MsgChannelCloseConfirmResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1852,6 +2200,9 @@ function createBaseMsgRecvPacket(): MsgRecvPacket {
 }
 
 export const MsgRecvPacket = {
+  typeUrl: "/ibc.core.channel.v1.MsgRecvPacket",
+  aminoType: "cosmos-sdk/MsgRecvPacket",
+
   encode(message: MsgRecvPacket, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.packet !== undefined) {
       Packet.encode(message.packet, writer.uint32(10).fork()).ldelim();
@@ -1967,6 +2318,32 @@ export const MsgRecvPacket = {
     obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {};
     obj.signer = message.signer;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgRecvPacketAminoMsg): MsgRecvPacket {
+    return MsgRecvPacket.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgRecvPacket): MsgRecvPacketAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgRecvPacket",
+      value: MsgRecvPacket.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgRecvPacketProtoMsg): MsgRecvPacket {
+    return MsgRecvPacket.decode(message.value);
+  },
+
+  toProto(message: MsgRecvPacket): Uint8Array {
+    return MsgRecvPacket.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgRecvPacket): MsgRecvPacketProtoMsg {
+    return {
+      typeUrl: "/ibc.core.channel.v1.MsgRecvPacket",
+      value: MsgRecvPacket.encode(message).finish()
+    };
   }
 
 };
@@ -1976,6 +2353,9 @@ function createBaseMsgRecvPacketResponse(): MsgRecvPacketResponse {
 }
 
 export const MsgRecvPacketResponse = {
+  typeUrl: "/ibc.core.channel.v1.MsgRecvPacketResponse",
+  aminoType: "cosmos-sdk/MsgRecvPacketResponse",
+
   encode(_: MsgRecvPacketResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -2028,6 +2408,32 @@ export const MsgRecvPacketResponse = {
   toAmino(_: MsgRecvPacketResponse): MsgRecvPacketResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgRecvPacketResponseAminoMsg): MsgRecvPacketResponse {
+    return MsgRecvPacketResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgRecvPacketResponse): MsgRecvPacketResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgRecvPacketResponse",
+      value: MsgRecvPacketResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgRecvPacketResponseProtoMsg): MsgRecvPacketResponse {
+    return MsgRecvPacketResponse.decode(message.value);
+  },
+
+  toProto(message: MsgRecvPacketResponse): Uint8Array {
+    return MsgRecvPacketResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgRecvPacketResponse): MsgRecvPacketResponseProtoMsg {
+    return {
+      typeUrl: "/ibc.core.channel.v1.MsgRecvPacketResponse",
+      value: MsgRecvPacketResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2043,6 +2449,9 @@ function createBaseMsgTimeout(): MsgTimeout {
 }
 
 export const MsgTimeout = {
+  typeUrl: "/ibc.core.channel.v1.MsgTimeout",
+  aminoType: "cosmos-sdk/MsgTimeout",
+
   encode(message: MsgTimeout, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.packet !== undefined) {
       Packet.encode(message.packet, writer.uint32(10).fork()).ldelim();
@@ -2173,6 +2582,32 @@ export const MsgTimeout = {
     obj.next_sequence_recv = message.nextSequenceRecv ? message.nextSequenceRecv.toString() : undefined;
     obj.signer = message.signer;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgTimeoutAminoMsg): MsgTimeout {
+    return MsgTimeout.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgTimeout): MsgTimeoutAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgTimeout",
+      value: MsgTimeout.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgTimeoutProtoMsg): MsgTimeout {
+    return MsgTimeout.decode(message.value);
+  },
+
+  toProto(message: MsgTimeout): Uint8Array {
+    return MsgTimeout.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgTimeout): MsgTimeoutProtoMsg {
+    return {
+      typeUrl: "/ibc.core.channel.v1.MsgTimeout",
+      value: MsgTimeout.encode(message).finish()
+    };
   }
 
 };
@@ -2182,6 +2617,9 @@ function createBaseMsgTimeoutResponse(): MsgTimeoutResponse {
 }
 
 export const MsgTimeoutResponse = {
+  typeUrl: "/ibc.core.channel.v1.MsgTimeoutResponse",
+  aminoType: "cosmos-sdk/MsgTimeoutResponse",
+
   encode(_: MsgTimeoutResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -2234,6 +2672,32 @@ export const MsgTimeoutResponse = {
   toAmino(_: MsgTimeoutResponse): MsgTimeoutResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgTimeoutResponseAminoMsg): MsgTimeoutResponse {
+    return MsgTimeoutResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgTimeoutResponse): MsgTimeoutResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgTimeoutResponse",
+      value: MsgTimeoutResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgTimeoutResponseProtoMsg): MsgTimeoutResponse {
+    return MsgTimeoutResponse.decode(message.value);
+  },
+
+  toProto(message: MsgTimeoutResponse): Uint8Array {
+    return MsgTimeoutResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgTimeoutResponse): MsgTimeoutResponseProtoMsg {
+    return {
+      typeUrl: "/ibc.core.channel.v1.MsgTimeoutResponse",
+      value: MsgTimeoutResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2250,6 +2714,9 @@ function createBaseMsgTimeoutOnClose(): MsgTimeoutOnClose {
 }
 
 export const MsgTimeoutOnClose = {
+  typeUrl: "/ibc.core.channel.v1.MsgTimeoutOnClose",
+  aminoType: "cosmos-sdk/MsgTimeoutOnClose",
+
   encode(message: MsgTimeoutOnClose, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.packet !== undefined) {
       Packet.encode(message.packet, writer.uint32(10).fork()).ldelim();
@@ -2395,6 +2862,32 @@ export const MsgTimeoutOnClose = {
     obj.next_sequence_recv = message.nextSequenceRecv ? message.nextSequenceRecv.toString() : undefined;
     obj.signer = message.signer;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgTimeoutOnCloseAminoMsg): MsgTimeoutOnClose {
+    return MsgTimeoutOnClose.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgTimeoutOnClose): MsgTimeoutOnCloseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgTimeoutOnClose",
+      value: MsgTimeoutOnClose.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgTimeoutOnCloseProtoMsg): MsgTimeoutOnClose {
+    return MsgTimeoutOnClose.decode(message.value);
+  },
+
+  toProto(message: MsgTimeoutOnClose): Uint8Array {
+    return MsgTimeoutOnClose.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgTimeoutOnClose): MsgTimeoutOnCloseProtoMsg {
+    return {
+      typeUrl: "/ibc.core.channel.v1.MsgTimeoutOnClose",
+      value: MsgTimeoutOnClose.encode(message).finish()
+    };
   }
 
 };
@@ -2404,6 +2897,9 @@ function createBaseMsgTimeoutOnCloseResponse(): MsgTimeoutOnCloseResponse {
 }
 
 export const MsgTimeoutOnCloseResponse = {
+  typeUrl: "/ibc.core.channel.v1.MsgTimeoutOnCloseResponse",
+  aminoType: "cosmos-sdk/MsgTimeoutOnCloseResponse",
+
   encode(_: MsgTimeoutOnCloseResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -2456,6 +2952,32 @@ export const MsgTimeoutOnCloseResponse = {
   toAmino(_: MsgTimeoutOnCloseResponse): MsgTimeoutOnCloseResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgTimeoutOnCloseResponseAminoMsg): MsgTimeoutOnCloseResponse {
+    return MsgTimeoutOnCloseResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgTimeoutOnCloseResponse): MsgTimeoutOnCloseResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgTimeoutOnCloseResponse",
+      value: MsgTimeoutOnCloseResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgTimeoutOnCloseResponseProtoMsg): MsgTimeoutOnCloseResponse {
+    return MsgTimeoutOnCloseResponse.decode(message.value);
+  },
+
+  toProto(message: MsgTimeoutOnCloseResponse): Uint8Array {
+    return MsgTimeoutOnCloseResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgTimeoutOnCloseResponse): MsgTimeoutOnCloseResponseProtoMsg {
+    return {
+      typeUrl: "/ibc.core.channel.v1.MsgTimeoutOnCloseResponse",
+      value: MsgTimeoutOnCloseResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2471,6 +2993,9 @@ function createBaseMsgAcknowledgement(): MsgAcknowledgement {
 }
 
 export const MsgAcknowledgement = {
+  typeUrl: "/ibc.core.channel.v1.MsgAcknowledgement",
+  aminoType: "cosmos-sdk/MsgAcknowledgement",
+
   encode(message: MsgAcknowledgement, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.packet !== undefined) {
       Packet.encode(message.packet, writer.uint32(10).fork()).ldelim();
@@ -2601,6 +3126,32 @@ export const MsgAcknowledgement = {
     obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {};
     obj.signer = message.signer;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgAcknowledgementAminoMsg): MsgAcknowledgement {
+    return MsgAcknowledgement.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgAcknowledgement): MsgAcknowledgementAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgAcknowledgement",
+      value: MsgAcknowledgement.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgAcknowledgementProtoMsg): MsgAcknowledgement {
+    return MsgAcknowledgement.decode(message.value);
+  },
+
+  toProto(message: MsgAcknowledgement): Uint8Array {
+    return MsgAcknowledgement.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgAcknowledgement): MsgAcknowledgementProtoMsg {
+    return {
+      typeUrl: "/ibc.core.channel.v1.MsgAcknowledgement",
+      value: MsgAcknowledgement.encode(message).finish()
+    };
   }
 
 };
@@ -2610,6 +3161,9 @@ function createBaseMsgAcknowledgementResponse(): MsgAcknowledgementResponse {
 }
 
 export const MsgAcknowledgementResponse = {
+  typeUrl: "/ibc.core.channel.v1.MsgAcknowledgementResponse",
+  aminoType: "cosmos-sdk/MsgAcknowledgementResponse",
+
   encode(_: MsgAcknowledgementResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -2662,6 +3216,32 @@ export const MsgAcknowledgementResponse = {
   toAmino(_: MsgAcknowledgementResponse): MsgAcknowledgementResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgAcknowledgementResponseAminoMsg): MsgAcknowledgementResponse {
+    return MsgAcknowledgementResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgAcknowledgementResponse): MsgAcknowledgementResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgAcknowledgementResponse",
+      value: MsgAcknowledgementResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgAcknowledgementResponseProtoMsg): MsgAcknowledgementResponse {
+    return MsgAcknowledgementResponse.decode(message.value);
+  },
+
+  toProto(message: MsgAcknowledgementResponse): Uint8Array {
+    return MsgAcknowledgementResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgAcknowledgementResponse): MsgAcknowledgementResponseProtoMsg {
+    return {
+      typeUrl: "/ibc.core.channel.v1.MsgAcknowledgementResponse",
+      value: MsgAcknowledgementResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/ibc/core/client/v1/client.ts b/__fixtures__/outputv2/ibc/core/client/v1/client.ts
index 708145ff0..1731f50d4 100644
--- a/__fixtures__/outputv2/ibc/core/client/v1/client.ts
+++ b/__fixtures__/outputv2/ibc/core/client/v1/client.ts
@@ -15,7 +15,7 @@ export interface IdentifiedClientState {
   /** client state */
   clientState?: Any;
 }
-export interface IdentifiedClientStateProtoType {
+export interface IdentifiedClientStateProtoMsg {
   typeUrl: "/ibc.core.client.v1.IdentifiedClientState";
   value: Uint8Array;
 }
@@ -31,7 +31,7 @@ export interface IdentifiedClientStateAmino {
   /** client state */
   client_state?: AnyAmino;
 }
-export interface IdentifiedClientStateAminoType {
+export interface IdentifiedClientStateAminoMsg {
   type: "cosmos-sdk/IdentifiedClientState";
   value: IdentifiedClientStateAmino;
 }
@@ -56,7 +56,7 @@ export interface ConsensusStateWithHeight {
   /** consensus state */
   consensusState?: Any;
 }
-export interface ConsensusStateWithHeightProtoType {
+export interface ConsensusStateWithHeightProtoMsg {
   typeUrl: "/ibc.core.client.v1.ConsensusStateWithHeight";
   value: Uint8Array;
 }
@@ -72,7 +72,7 @@ export interface ConsensusStateWithHeightAmino {
   /** consensus state */
   consensus_state?: AnyAmino;
 }
-export interface ConsensusStateWithHeightAminoType {
+export interface ConsensusStateWithHeightAminoMsg {
   type: "cosmos-sdk/ConsensusStateWithHeight";
   value: ConsensusStateWithHeightAmino;
 }
@@ -97,7 +97,7 @@ export interface ClientConsensusStates {
   /** consensus states and their heights associated with the client */
   consensusStates: ConsensusStateWithHeight[];
 }
-export interface ClientConsensusStatesProtoType {
+export interface ClientConsensusStatesProtoMsg {
   typeUrl: "/ibc.core.client.v1.ClientConsensusStates";
   value: Uint8Array;
 }
@@ -113,7 +113,7 @@ export interface ClientConsensusStatesAmino {
   /** consensus states and their heights associated with the client */
   consensus_states: ConsensusStateWithHeightAmino[];
 }
-export interface ClientConsensusStatesAminoType {
+export interface ClientConsensusStatesAminoMsg {
   type: "cosmos-sdk/ClientConsensusStates";
   value: ClientConsensusStatesAmino;
 }
@@ -149,7 +149,7 @@ export interface ClientUpdateProposal {
    */
   substituteClientId: string;
 }
-export interface ClientUpdateProposalProtoType {
+export interface ClientUpdateProposalProtoMsg {
   typeUrl: "/ibc.core.client.v1.ClientUpdateProposal";
   value: Uint8Array;
 }
@@ -176,7 +176,7 @@ export interface ClientUpdateProposalAmino {
    */
   substitute_client_id: string;
 }
-export interface ClientUpdateProposalAminoType {
+export interface ClientUpdateProposalAminoMsg {
   type: "cosmos-sdk/ClientUpdateProposal";
   value: ClientUpdateProposalAmino;
 }
@@ -213,7 +213,7 @@ export interface UpgradeProposal {
    */
   upgradedClientState?: Any;
 }
-export interface UpgradeProposalProtoType {
+export interface UpgradeProposalProtoMsg {
   typeUrl: "/ibc.core.client.v1.UpgradeProposal";
   value: Uint8Array;
 }
@@ -237,7 +237,7 @@ export interface UpgradeProposalAmino {
    */
   upgraded_client_state?: AnyAmino;
 }
-export interface UpgradeProposalAminoType {
+export interface UpgradeProposalAminoMsg {
   type: "cosmos-sdk/UpgradeProposal";
   value: UpgradeProposalAmino;
 }
@@ -272,7 +272,7 @@ export interface Height {
   /** the height within the given revision */
   revisionHeight: Long;
 }
-export interface HeightProtoType {
+export interface HeightProtoMsg {
   typeUrl: "/ibc.core.client.v1.Height";
   value: Uint8Array;
 }
@@ -296,7 +296,7 @@ export interface HeightAmino {
   /** the height within the given revision */
   revision_height: string;
 }
-export interface HeightAminoType {
+export interface HeightAminoMsg {
   type: "cosmos-sdk/Height";
   value: HeightAmino;
 }
@@ -323,7 +323,7 @@ export interface Params {
   /** allowed_clients defines the list of allowed client state types. */
   allowedClients: string[];
 }
-export interface ParamsProtoType {
+export interface ParamsProtoMsg {
   typeUrl: "/ibc.core.client.v1.Params";
   value: Uint8Array;
 }
@@ -333,7 +333,7 @@ export interface ParamsAmino {
   /** allowed_clients defines the list of allowed client state types. */
   allowed_clients: string[];
 }
-export interface ParamsAminoType {
+export interface ParamsAminoMsg {
   type: "cosmos-sdk/Params";
   value: ParamsAmino;
 }
@@ -351,6 +351,9 @@ function createBaseIdentifiedClientState(): IdentifiedClientState {
 }
 
 export const IdentifiedClientState = {
+  typeUrl: "/ibc.core.client.v1.IdentifiedClientState",
+  aminoType: "cosmos-sdk/IdentifiedClientState",
+
   encode(message: IdentifiedClientState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.clientId !== "") {
       writer.uint32(10).string(message.clientId);
@@ -436,6 +439,32 @@ export const IdentifiedClientState = {
     obj.client_id = message.clientId;
     obj.client_state = message.clientState ? Any.toAmino(message.clientState) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: IdentifiedClientStateAminoMsg): IdentifiedClientState {
+    return IdentifiedClientState.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: IdentifiedClientState): IdentifiedClientStateAminoMsg {
+    return {
+      type: "cosmos-sdk/IdentifiedClientState",
+      value: IdentifiedClientState.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: IdentifiedClientStateProtoMsg): IdentifiedClientState {
+    return IdentifiedClientState.decode(message.value);
+  },
+
+  toProto(message: IdentifiedClientState): Uint8Array {
+    return IdentifiedClientState.encode(message).finish();
+  },
+
+  toProtoMsg(message: IdentifiedClientState): IdentifiedClientStateProtoMsg {
+    return {
+      typeUrl: "/ibc.core.client.v1.IdentifiedClientState",
+      value: IdentifiedClientState.encode(message).finish()
+    };
   }
 
 };
@@ -448,6 +477,9 @@ function createBaseConsensusStateWithHeight(): ConsensusStateWithHeight {
 }
 
 export const ConsensusStateWithHeight = {
+  typeUrl: "/ibc.core.client.v1.ConsensusStateWithHeight",
+  aminoType: "cosmos-sdk/ConsensusStateWithHeight",
+
   encode(message: ConsensusStateWithHeight, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.height !== undefined) {
       Height.encode(message.height, writer.uint32(10).fork()).ldelim();
@@ -533,6 +565,32 @@ export const ConsensusStateWithHeight = {
     obj.height = message.height ? Height.toAmino(message.height) : undefined;
     obj.consensus_state = message.consensusState ? Any.toAmino(message.consensusState) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ConsensusStateWithHeightAminoMsg): ConsensusStateWithHeight {
+    return ConsensusStateWithHeight.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ConsensusStateWithHeight): ConsensusStateWithHeightAminoMsg {
+    return {
+      type: "cosmos-sdk/ConsensusStateWithHeight",
+      value: ConsensusStateWithHeight.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ConsensusStateWithHeightProtoMsg): ConsensusStateWithHeight {
+    return ConsensusStateWithHeight.decode(message.value);
+  },
+
+  toProto(message: ConsensusStateWithHeight): Uint8Array {
+    return ConsensusStateWithHeight.encode(message).finish();
+  },
+
+  toProtoMsg(message: ConsensusStateWithHeight): ConsensusStateWithHeightProtoMsg {
+    return {
+      typeUrl: "/ibc.core.client.v1.ConsensusStateWithHeight",
+      value: ConsensusStateWithHeight.encode(message).finish()
+    };
   }
 
 };
@@ -545,6 +603,9 @@ function createBaseClientConsensusStates(): ClientConsensusStates {
 }
 
 export const ClientConsensusStates = {
+  typeUrl: "/ibc.core.client.v1.ClientConsensusStates",
+  aminoType: "cosmos-sdk/ClientConsensusStates",
+
   encode(message: ClientConsensusStates, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.clientId !== "") {
       writer.uint32(10).string(message.clientId);
@@ -648,6 +709,32 @@ export const ClientConsensusStates = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ClientConsensusStatesAminoMsg): ClientConsensusStates {
+    return ClientConsensusStates.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ClientConsensusStates): ClientConsensusStatesAminoMsg {
+    return {
+      type: "cosmos-sdk/ClientConsensusStates",
+      value: ClientConsensusStates.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ClientConsensusStatesProtoMsg): ClientConsensusStates {
+    return ClientConsensusStates.decode(message.value);
+  },
+
+  toProto(message: ClientConsensusStates): Uint8Array {
+    return ClientConsensusStates.encode(message).finish();
+  },
+
+  toProtoMsg(message: ClientConsensusStates): ClientConsensusStatesProtoMsg {
+    return {
+      typeUrl: "/ibc.core.client.v1.ClientConsensusStates",
+      value: ClientConsensusStates.encode(message).finish()
+    };
   }
 
 };
@@ -662,6 +749,9 @@ function createBaseClientUpdateProposal(): ClientUpdateProposal {
 }
 
 export const ClientUpdateProposal = {
+  typeUrl: "/ibc.core.client.v1.ClientUpdateProposal",
+  aminoType: "cosmos-sdk/ClientUpdateProposal",
+
   encode(message: ClientUpdateProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.title !== "") {
       writer.uint32(10).string(message.title);
@@ -777,6 +867,32 @@ export const ClientUpdateProposal = {
     obj.subject_client_id = message.subjectClientId;
     obj.substitute_client_id = message.substituteClientId;
     return obj;
+  },
+
+  fromAminoMsg(object: ClientUpdateProposalAminoMsg): ClientUpdateProposal {
+    return ClientUpdateProposal.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ClientUpdateProposal): ClientUpdateProposalAminoMsg {
+    return {
+      type: "cosmos-sdk/ClientUpdateProposal",
+      value: ClientUpdateProposal.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ClientUpdateProposalProtoMsg): ClientUpdateProposal {
+    return ClientUpdateProposal.decode(message.value);
+  },
+
+  toProto(message: ClientUpdateProposal): Uint8Array {
+    return ClientUpdateProposal.encode(message).finish();
+  },
+
+  toProtoMsg(message: ClientUpdateProposal): ClientUpdateProposalProtoMsg {
+    return {
+      typeUrl: "/ibc.core.client.v1.ClientUpdateProposal",
+      value: ClientUpdateProposal.encode(message).finish()
+    };
   }
 
 };
@@ -791,6 +907,9 @@ function createBaseUpgradeProposal(): UpgradeProposal {
 }
 
 export const UpgradeProposal = {
+  typeUrl: "/ibc.core.client.v1.UpgradeProposal",
+  aminoType: "cosmos-sdk/UpgradeProposal",
+
   encode(message: UpgradeProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.title !== "") {
       writer.uint32(10).string(message.title);
@@ -906,6 +1025,32 @@ export const UpgradeProposal = {
     obj.plan = message.plan ? Plan.toAmino(message.plan) : undefined;
     obj.upgraded_client_state = message.upgradedClientState ? Any.toAmino(message.upgradedClientState) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: UpgradeProposalAminoMsg): UpgradeProposal {
+    return UpgradeProposal.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: UpgradeProposal): UpgradeProposalAminoMsg {
+    return {
+      type: "cosmos-sdk/UpgradeProposal",
+      value: UpgradeProposal.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: UpgradeProposalProtoMsg): UpgradeProposal {
+    return UpgradeProposal.decode(message.value);
+  },
+
+  toProto(message: UpgradeProposal): Uint8Array {
+    return UpgradeProposal.encode(message).finish();
+  },
+
+  toProtoMsg(message: UpgradeProposal): UpgradeProposalProtoMsg {
+    return {
+      typeUrl: "/ibc.core.client.v1.UpgradeProposal",
+      value: UpgradeProposal.encode(message).finish()
+    };
   }
 
 };
@@ -918,6 +1063,9 @@ function createBaseHeight(): Height {
 }
 
 export const Height = {
+  typeUrl: "/ibc.core.client.v1.Height",
+  aminoType: "cosmos-sdk/Height",
+
   encode(message: Height, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.revisionNumber.isZero()) {
       writer.uint32(8).uint64(message.revisionNumber);
@@ -1003,6 +1151,32 @@ export const Height = {
     obj.revision_number = message.revisionNumber ? message.revisionNumber.toString() : undefined;
     obj.revision_height = message.revisionHeight ? message.revisionHeight.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: HeightAminoMsg): Height {
+    return Height.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Height): HeightAminoMsg {
+    return {
+      type: "cosmos-sdk/Height",
+      value: Height.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: HeightProtoMsg): Height {
+    return Height.decode(message.value);
+  },
+
+  toProto(message: Height): Uint8Array {
+    return Height.encode(message).finish();
+  },
+
+  toProtoMsg(message: Height): HeightProtoMsg {
+    return {
+      typeUrl: "/ibc.core.client.v1.Height",
+      value: Height.encode(message).finish()
+    };
   }
 
 };
@@ -1014,6 +1188,9 @@ function createBaseParams(): Params {
 }
 
 export const Params = {
+  typeUrl: "/ibc.core.client.v1.Params",
+  aminoType: "cosmos-sdk/Params",
+
   encode(message: Params, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.allowedClients) {
       writer.uint32(10).string(v!);
@@ -1102,6 +1279,32 @@ export const Params = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ParamsAminoMsg): Params {
+    return Params.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Params): ParamsAminoMsg {
+    return {
+      type: "cosmos-sdk/Params",
+      value: Params.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ParamsProtoMsg): Params {
+    return Params.decode(message.value);
+  },
+
+  toProto(message: Params): Uint8Array {
+    return Params.encode(message).finish();
+  },
+
+  toProtoMsg(message: Params): ParamsProtoMsg {
+    return {
+      typeUrl: "/ibc.core.client.v1.Params",
+      value: Params.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/ibc/core/client/v1/genesis.ts b/__fixtures__/outputv2/ibc/core/client/v1/genesis.ts
index 577647f1b..66d672692 100644
--- a/__fixtures__/outputv2/ibc/core/client/v1/genesis.ts
+++ b/__fixtures__/outputv2/ibc/core/client/v1/genesis.ts
@@ -21,7 +21,7 @@ export interface GenesisState {
   /** the sequence for the next generated client identifier */
   nextClientSequence: Long;
 }
-export interface GenesisStateProtoType {
+export interface GenesisStateProtoMsg {
   typeUrl: "/ibc.core.client.v1.GenesisState";
   value: Uint8Array;
 }
@@ -44,7 +44,7 @@ export interface GenesisStateAmino {
   /** the sequence for the next generated client identifier */
   next_client_sequence: string;
 }
-export interface GenesisStateAminoType {
+export interface GenesisStateAminoMsg {
   type: "cosmos-sdk/GenesisState";
   value: GenesisStateAmino;
 }
@@ -70,7 +70,7 @@ export interface GenesisMetadata {
   /** metadata value */
   value: Uint8Array;
 }
-export interface GenesisMetadataProtoType {
+export interface GenesisMetadataProtoMsg {
   typeUrl: "/ibc.core.client.v1.GenesisMetadata";
   value: Uint8Array;
 }
@@ -86,7 +86,7 @@ export interface GenesisMetadataAmino {
   /** metadata value */
   value: Uint8Array;
 }
-export interface GenesisMetadataAminoType {
+export interface GenesisMetadataAminoMsg {
   type: "cosmos-sdk/GenesisMetadata";
   value: GenesisMetadataAmino;
 }
@@ -108,7 +108,7 @@ export interface IdentifiedGenesisMetadata {
   clientId: string;
   clientMetadata: GenesisMetadata[];
 }
-export interface IdentifiedGenesisMetadataProtoType {
+export interface IdentifiedGenesisMetadataProtoMsg {
   typeUrl: "/ibc.core.client.v1.IdentifiedGenesisMetadata";
   value: Uint8Array;
 }
@@ -121,7 +121,7 @@ export interface IdentifiedGenesisMetadataAmino {
   client_id: string;
   client_metadata: GenesisMetadataAmino[];
 }
-export interface IdentifiedGenesisMetadataAminoType {
+export interface IdentifiedGenesisMetadataAminoMsg {
   type: "cosmos-sdk/IdentifiedGenesisMetadata";
   value: IdentifiedGenesisMetadataAmino;
 }
@@ -147,6 +147,9 @@ function createBaseGenesisState(): GenesisState {
 }
 
 export const GenesisState = {
+  typeUrl: "/ibc.core.client.v1.GenesisState",
+  aminoType: "cosmos-sdk/GenesisState",
+
   encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.clients) {
       IdentifiedClientState.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -340,6 +343,32 @@ export const GenesisState = {
     obj.create_localhost = message.createLocalhost;
     obj.next_client_sequence = message.nextClientSequence ? message.nextClientSequence.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisStateAminoMsg): GenesisState {
+    return GenesisState.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GenesisState): GenesisStateAminoMsg {
+    return {
+      type: "cosmos-sdk/GenesisState",
+      value: GenesisState.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GenesisStateProtoMsg): GenesisState {
+    return GenesisState.decode(message.value);
+  },
+
+  toProto(message: GenesisState): Uint8Array {
+    return GenesisState.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisState): GenesisStateProtoMsg {
+    return {
+      typeUrl: "/ibc.core.client.v1.GenesisState",
+      value: GenesisState.encode(message).finish()
+    };
   }
 
 };
@@ -352,6 +381,9 @@ function createBaseGenesisMetadata(): GenesisMetadata {
 }
 
 export const GenesisMetadata = {
+  typeUrl: "/ibc.core.client.v1.GenesisMetadata",
+  aminoType: "cosmos-sdk/GenesisMetadata",
+
   encode(message: GenesisMetadata, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.key.length !== 0) {
       writer.uint32(10).bytes(message.key);
@@ -437,6 +469,32 @@ export const GenesisMetadata = {
     obj.key = message.key;
     obj.value = message.value;
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisMetadataAminoMsg): GenesisMetadata {
+    return GenesisMetadata.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GenesisMetadata): GenesisMetadataAminoMsg {
+    return {
+      type: "cosmos-sdk/GenesisMetadata",
+      value: GenesisMetadata.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GenesisMetadataProtoMsg): GenesisMetadata {
+    return GenesisMetadata.decode(message.value);
+  },
+
+  toProto(message: GenesisMetadata): Uint8Array {
+    return GenesisMetadata.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisMetadata): GenesisMetadataProtoMsg {
+    return {
+      typeUrl: "/ibc.core.client.v1.GenesisMetadata",
+      value: GenesisMetadata.encode(message).finish()
+    };
   }
 
 };
@@ -449,6 +507,9 @@ function createBaseIdentifiedGenesisMetadata(): IdentifiedGenesisMetadata {
 }
 
 export const IdentifiedGenesisMetadata = {
+  typeUrl: "/ibc.core.client.v1.IdentifiedGenesisMetadata",
+  aminoType: "cosmos-sdk/IdentifiedGenesisMetadata",
+
   encode(message: IdentifiedGenesisMetadata, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.clientId !== "") {
       writer.uint32(10).string(message.clientId);
@@ -552,6 +613,32 @@ export const IdentifiedGenesisMetadata = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: IdentifiedGenesisMetadataAminoMsg): IdentifiedGenesisMetadata {
+    return IdentifiedGenesisMetadata.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: IdentifiedGenesisMetadata): IdentifiedGenesisMetadataAminoMsg {
+    return {
+      type: "cosmos-sdk/IdentifiedGenesisMetadata",
+      value: IdentifiedGenesisMetadata.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: IdentifiedGenesisMetadataProtoMsg): IdentifiedGenesisMetadata {
+    return IdentifiedGenesisMetadata.decode(message.value);
+  },
+
+  toProto(message: IdentifiedGenesisMetadata): Uint8Array {
+    return IdentifiedGenesisMetadata.encode(message).finish();
+  },
+
+  toProtoMsg(message: IdentifiedGenesisMetadata): IdentifiedGenesisMetadataProtoMsg {
+    return {
+      typeUrl: "/ibc.core.client.v1.IdentifiedGenesisMetadata",
+      value: IdentifiedGenesisMetadata.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/ibc/core/client/v1/query.ts b/__fixtures__/outputv2/ibc/core/client/v1/query.ts
index 74a36037e..f240c4bff 100644
--- a/__fixtures__/outputv2/ibc/core/client/v1/query.ts
+++ b/__fixtures__/outputv2/ibc/core/client/v1/query.ts
@@ -13,7 +13,7 @@ export interface QueryClientStateRequest {
   /** client state unique identifier */
   clientId: string;
 }
-export interface QueryClientStateRequestProtoType {
+export interface QueryClientStateRequestProtoMsg {
   typeUrl: "/ibc.core.client.v1.QueryClientStateRequest";
   value: Uint8Array;
 }
@@ -26,7 +26,7 @@ export interface QueryClientStateRequestAmino {
   /** client state unique identifier */
   client_id: string;
 }
-export interface QueryClientStateRequestAminoType {
+export interface QueryClientStateRequestAminoMsg {
   type: "cosmos-sdk/QueryClientStateRequest";
   value: QueryClientStateRequestAmino;
 }
@@ -54,7 +54,7 @@ export interface QueryClientStateResponse {
   /** height at which the proof was retrieved */
   proofHeight?: Height;
 }
-export interface QueryClientStateResponseProtoType {
+export interface QueryClientStateResponseProtoMsg {
   typeUrl: "/ibc.core.client.v1.QueryClientStateResponse";
   value: Uint8Array;
 }
@@ -74,7 +74,7 @@ export interface QueryClientStateResponseAmino {
   /** height at which the proof was retrieved */
   proof_height?: HeightAmino;
 }
-export interface QueryClientStateResponseAminoType {
+export interface QueryClientStateResponseAminoMsg {
   type: "cosmos-sdk/QueryClientStateResponse";
   value: QueryClientStateResponseAmino;
 }
@@ -98,7 +98,7 @@ export interface QueryClientStatesRequest {
   /** pagination request */
   pagination?: PageRequest;
 }
-export interface QueryClientStatesRequestProtoType {
+export interface QueryClientStatesRequestProtoMsg {
   typeUrl: "/ibc.core.client.v1.QueryClientStatesRequest";
   value: Uint8Array;
 }
@@ -111,7 +111,7 @@ export interface QueryClientStatesRequestAmino {
   /** pagination request */
   pagination?: PageRequestAmino;
 }
-export interface QueryClientStatesRequestAminoType {
+export interface QueryClientStatesRequestAminoMsg {
   type: "cosmos-sdk/QueryClientStatesRequest";
   value: QueryClientStatesRequestAmino;
 }
@@ -135,7 +135,7 @@ export interface QueryClientStatesResponse {
   /** pagination response */
   pagination?: PageResponse;
 }
-export interface QueryClientStatesResponseProtoType {
+export interface QueryClientStatesResponseProtoMsg {
   typeUrl: "/ibc.core.client.v1.QueryClientStatesResponse";
   value: Uint8Array;
 }
@@ -151,7 +151,7 @@ export interface QueryClientStatesResponseAmino {
   /** pagination response */
   pagination?: PageResponseAmino;
 }
-export interface QueryClientStatesResponseAminoType {
+export interface QueryClientStatesResponseAminoMsg {
   type: "cosmos-sdk/QueryClientStatesResponse";
   value: QueryClientStatesResponseAmino;
 }
@@ -186,7 +186,7 @@ export interface QueryConsensusStateRequest {
    */
   latestHeight: boolean;
 }
-export interface QueryConsensusStateRequestProtoType {
+export interface QueryConsensusStateRequestProtoMsg {
   typeUrl: "/ibc.core.client.v1.QueryConsensusStateRequest";
   value: Uint8Array;
 }
@@ -212,7 +212,7 @@ export interface QueryConsensusStateRequestAmino {
    */
   latest_height: boolean;
 }
-export interface QueryConsensusStateRequestAminoType {
+export interface QueryConsensusStateRequestAminoMsg {
   type: "cosmos-sdk/QueryConsensusStateRequest";
   value: QueryConsensusStateRequestAmino;
 }
@@ -243,7 +243,7 @@ export interface QueryConsensusStateResponse {
   /** height at which the proof was retrieved */
   proofHeight?: Height;
 }
-export interface QueryConsensusStateResponseProtoType {
+export interface QueryConsensusStateResponseProtoMsg {
   typeUrl: "/ibc.core.client.v1.QueryConsensusStateResponse";
   value: Uint8Array;
 }
@@ -262,7 +262,7 @@ export interface QueryConsensusStateResponseAmino {
   /** height at which the proof was retrieved */
   proof_height?: HeightAmino;
 }
-export interface QueryConsensusStateResponseAminoType {
+export interface QueryConsensusStateResponseAminoMsg {
   type: "cosmos-sdk/QueryConsensusStateResponse";
   value: QueryConsensusStateResponseAmino;
 }
@@ -288,7 +288,7 @@ export interface QueryConsensusStatesRequest {
   /** pagination request */
   pagination?: PageRequest;
 }
-export interface QueryConsensusStatesRequestProtoType {
+export interface QueryConsensusStatesRequestProtoMsg {
   typeUrl: "/ibc.core.client.v1.QueryConsensusStatesRequest";
   value: Uint8Array;
 }
@@ -304,7 +304,7 @@ export interface QueryConsensusStatesRequestAmino {
   /** pagination request */
   pagination?: PageRequestAmino;
 }
-export interface QueryConsensusStatesRequestAminoType {
+export interface QueryConsensusStatesRequestAminoMsg {
   type: "cosmos-sdk/QueryConsensusStatesRequest";
   value: QueryConsensusStatesRequestAmino;
 }
@@ -329,7 +329,7 @@ export interface QueryConsensusStatesResponse {
   /** pagination response */
   pagination?: PageResponse;
 }
-export interface QueryConsensusStatesResponseProtoType {
+export interface QueryConsensusStatesResponseProtoMsg {
   typeUrl: "/ibc.core.client.v1.QueryConsensusStatesResponse";
   value: Uint8Array;
 }
@@ -345,7 +345,7 @@ export interface QueryConsensusStatesResponseAmino {
   /** pagination response */
   pagination?: PageResponseAmino;
 }
-export interface QueryConsensusStatesResponseAminoType {
+export interface QueryConsensusStatesResponseAminoMsg {
   type: "cosmos-sdk/QueryConsensusStatesResponse";
   value: QueryConsensusStatesResponseAmino;
 }
@@ -367,7 +367,7 @@ export interface QueryClientStatusRequest {
   /** client unique identifier */
   clientId: string;
 }
-export interface QueryClientStatusRequestProtoType {
+export interface QueryClientStatusRequestProtoMsg {
   typeUrl: "/ibc.core.client.v1.QueryClientStatusRequest";
   value: Uint8Array;
 }
@@ -380,7 +380,7 @@ export interface QueryClientStatusRequestAmino {
   /** client unique identifier */
   client_id: string;
 }
-export interface QueryClientStatusRequestAminoType {
+export interface QueryClientStatusRequestAminoMsg {
   type: "cosmos-sdk/QueryClientStatusRequest";
   value: QueryClientStatusRequestAmino;
 }
@@ -400,7 +400,7 @@ export interface QueryClientStatusRequestSDKType {
 export interface QueryClientStatusResponse {
   status: string;
 }
-export interface QueryClientStatusResponseProtoType {
+export interface QueryClientStatusResponseProtoMsg {
   typeUrl: "/ibc.core.client.v1.QueryClientStatusResponse";
   value: Uint8Array;
 }
@@ -412,7 +412,7 @@ export interface QueryClientStatusResponseProtoType {
 export interface QueryClientStatusResponseAmino {
   status: string;
 }
-export interface QueryClientStatusResponseAminoType {
+export interface QueryClientStatusResponseAminoMsg {
   type: "cosmos-sdk/QueryClientStatusResponse";
   value: QueryClientStatusResponseAmino;
 }
@@ -430,7 +430,7 @@ export interface QueryClientStatusResponseSDKType {
  * method.
  */
 export interface QueryClientParamsRequest {}
-export interface QueryClientParamsRequestProtoType {
+export interface QueryClientParamsRequestProtoMsg {
   typeUrl: "/ibc.core.client.v1.QueryClientParamsRequest";
   value: Uint8Array;
 }
@@ -440,7 +440,7 @@ export interface QueryClientParamsRequestProtoType {
  * method.
  */
 export interface QueryClientParamsRequestAmino {}
-export interface QueryClientParamsRequestAminoType {
+export interface QueryClientParamsRequestAminoMsg {
   type: "cosmos-sdk/QueryClientParamsRequest";
   value: QueryClientParamsRequestAmino;
 }
@@ -459,7 +459,7 @@ export interface QueryClientParamsResponse {
   /** params defines the parameters of the module. */
   params?: Params;
 }
-export interface QueryClientParamsResponseProtoType {
+export interface QueryClientParamsResponseProtoMsg {
   typeUrl: "/ibc.core.client.v1.QueryClientParamsResponse";
   value: Uint8Array;
 }
@@ -472,7 +472,7 @@ export interface QueryClientParamsResponseAmino {
   /** params defines the parameters of the module. */
   params?: ParamsAmino;
 }
-export interface QueryClientParamsResponseAminoType {
+export interface QueryClientParamsResponseAminoMsg {
   type: "cosmos-sdk/QueryClientParamsResponse";
   value: QueryClientParamsResponseAmino;
 }
@@ -490,7 +490,7 @@ export interface QueryClientParamsResponseSDKType {
  * Query/UpgradedClientState RPC method
  */
 export interface QueryUpgradedClientStateRequest {}
-export interface QueryUpgradedClientStateRequestProtoType {
+export interface QueryUpgradedClientStateRequestProtoMsg {
   typeUrl: "/ibc.core.client.v1.QueryUpgradedClientStateRequest";
   value: Uint8Array;
 }
@@ -500,7 +500,7 @@ export interface QueryUpgradedClientStateRequestProtoType {
  * Query/UpgradedClientState RPC method
  */
 export interface QueryUpgradedClientStateRequestAmino {}
-export interface QueryUpgradedClientStateRequestAminoType {
+export interface QueryUpgradedClientStateRequestAminoMsg {
   type: "cosmos-sdk/QueryUpgradedClientStateRequest";
   value: QueryUpgradedClientStateRequestAmino;
 }
@@ -519,7 +519,7 @@ export interface QueryUpgradedClientStateResponse {
   /** client state associated with the request identifier */
   upgradedClientState?: Any;
 }
-export interface QueryUpgradedClientStateResponseProtoType {
+export interface QueryUpgradedClientStateResponseProtoMsg {
   typeUrl: "/ibc.core.client.v1.QueryUpgradedClientStateResponse";
   value: Uint8Array;
 }
@@ -532,7 +532,7 @@ export interface QueryUpgradedClientStateResponseAmino {
   /** client state associated with the request identifier */
   upgraded_client_state?: AnyAmino;
 }
-export interface QueryUpgradedClientStateResponseAminoType {
+export interface QueryUpgradedClientStateResponseAminoMsg {
   type: "cosmos-sdk/QueryUpgradedClientStateResponse";
   value: QueryUpgradedClientStateResponseAmino;
 }
@@ -550,7 +550,7 @@ export interface QueryUpgradedClientStateResponseSDKType {
  * Query/UpgradedConsensusState RPC method
  */
 export interface QueryUpgradedConsensusStateRequest {}
-export interface QueryUpgradedConsensusStateRequestProtoType {
+export interface QueryUpgradedConsensusStateRequestProtoMsg {
   typeUrl: "/ibc.core.client.v1.QueryUpgradedConsensusStateRequest";
   value: Uint8Array;
 }
@@ -560,7 +560,7 @@ export interface QueryUpgradedConsensusStateRequestProtoType {
  * Query/UpgradedConsensusState RPC method
  */
 export interface QueryUpgradedConsensusStateRequestAmino {}
-export interface QueryUpgradedConsensusStateRequestAminoType {
+export interface QueryUpgradedConsensusStateRequestAminoMsg {
   type: "cosmos-sdk/QueryUpgradedConsensusStateRequest";
   value: QueryUpgradedConsensusStateRequestAmino;
 }
@@ -579,7 +579,7 @@ export interface QueryUpgradedConsensusStateResponse {
   /** Consensus state associated with the request identifier */
   upgradedConsensusState?: Any;
 }
-export interface QueryUpgradedConsensusStateResponseProtoType {
+export interface QueryUpgradedConsensusStateResponseProtoMsg {
   typeUrl: "/ibc.core.client.v1.QueryUpgradedConsensusStateResponse";
   value: Uint8Array;
 }
@@ -592,7 +592,7 @@ export interface QueryUpgradedConsensusStateResponseAmino {
   /** Consensus state associated with the request identifier */
   upgraded_consensus_state?: AnyAmino;
 }
-export interface QueryUpgradedConsensusStateResponseAminoType {
+export interface QueryUpgradedConsensusStateResponseAminoMsg {
   type: "cosmos-sdk/QueryUpgradedConsensusStateResponse";
   value: QueryUpgradedConsensusStateResponseAmino;
 }
@@ -612,6 +612,9 @@ function createBaseQueryClientStateRequest(): QueryClientStateRequest {
 }
 
 export const QueryClientStateRequest = {
+  typeUrl: "/ibc.core.client.v1.QueryClientStateRequest",
+  aminoType: "cosmos-sdk/QueryClientStateRequest",
+
   encode(message: QueryClientStateRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.clientId !== "") {
       writer.uint32(10).string(message.clientId);
@@ -682,6 +685,32 @@ export const QueryClientStateRequest = {
     const obj: any = {};
     obj.client_id = message.clientId;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryClientStateRequestAminoMsg): QueryClientStateRequest {
+    return QueryClientStateRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryClientStateRequest): QueryClientStateRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryClientStateRequest",
+      value: QueryClientStateRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryClientStateRequestProtoMsg): QueryClientStateRequest {
+    return QueryClientStateRequest.decode(message.value);
+  },
+
+  toProto(message: QueryClientStateRequest): Uint8Array {
+    return QueryClientStateRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryClientStateRequest): QueryClientStateRequestProtoMsg {
+    return {
+      typeUrl: "/ibc.core.client.v1.QueryClientStateRequest",
+      value: QueryClientStateRequest.encode(message).finish()
+    };
   }
 
 };
@@ -695,6 +724,9 @@ function createBaseQueryClientStateResponse(): QueryClientStateResponse {
 }
 
 export const QueryClientStateResponse = {
+  typeUrl: "/ibc.core.client.v1.QueryClientStateResponse",
+  aminoType: "cosmos-sdk/QueryClientStateResponse",
+
   encode(message: QueryClientStateResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.clientState !== undefined) {
       Any.encode(message.clientState, writer.uint32(10).fork()).ldelim();
@@ -795,6 +827,32 @@ export const QueryClientStateResponse = {
     obj.proof = message.proof;
     obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryClientStateResponseAminoMsg): QueryClientStateResponse {
+    return QueryClientStateResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryClientStateResponse): QueryClientStateResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryClientStateResponse",
+      value: QueryClientStateResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryClientStateResponseProtoMsg): QueryClientStateResponse {
+    return QueryClientStateResponse.decode(message.value);
+  },
+
+  toProto(message: QueryClientStateResponse): Uint8Array {
+    return QueryClientStateResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryClientStateResponse): QueryClientStateResponseProtoMsg {
+    return {
+      typeUrl: "/ibc.core.client.v1.QueryClientStateResponse",
+      value: QueryClientStateResponse.encode(message).finish()
+    };
   }
 
 };
@@ -806,6 +864,9 @@ function createBaseQueryClientStatesRequest(): QueryClientStatesRequest {
 }
 
 export const QueryClientStatesRequest = {
+  typeUrl: "/ibc.core.client.v1.QueryClientStatesRequest",
+  aminoType: "cosmos-sdk/QueryClientStatesRequest",
+
   encode(message: QueryClientStatesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.pagination !== undefined) {
       PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim();
@@ -876,6 +937,32 @@ export const QueryClientStatesRequest = {
     const obj: any = {};
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryClientStatesRequestAminoMsg): QueryClientStatesRequest {
+    return QueryClientStatesRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryClientStatesRequest): QueryClientStatesRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryClientStatesRequest",
+      value: QueryClientStatesRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryClientStatesRequestProtoMsg): QueryClientStatesRequest {
+    return QueryClientStatesRequest.decode(message.value);
+  },
+
+  toProto(message: QueryClientStatesRequest): Uint8Array {
+    return QueryClientStatesRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryClientStatesRequest): QueryClientStatesRequestProtoMsg {
+    return {
+      typeUrl: "/ibc.core.client.v1.QueryClientStatesRequest",
+      value: QueryClientStatesRequest.encode(message).finish()
+    };
   }
 
 };
@@ -888,6 +975,9 @@ function createBaseQueryClientStatesResponse(): QueryClientStatesResponse {
 }
 
 export const QueryClientStatesResponse = {
+  typeUrl: "/ibc.core.client.v1.QueryClientStatesResponse",
+  aminoType: "cosmos-sdk/QueryClientStatesResponse",
+
   encode(message: QueryClientStatesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.clientStates) {
       IdentifiedClientState.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -991,6 +1081,32 @@ export const QueryClientStatesResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryClientStatesResponseAminoMsg): QueryClientStatesResponse {
+    return QueryClientStatesResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryClientStatesResponse): QueryClientStatesResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryClientStatesResponse",
+      value: QueryClientStatesResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryClientStatesResponseProtoMsg): QueryClientStatesResponse {
+    return QueryClientStatesResponse.decode(message.value);
+  },
+
+  toProto(message: QueryClientStatesResponse): Uint8Array {
+    return QueryClientStatesResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryClientStatesResponse): QueryClientStatesResponseProtoMsg {
+    return {
+      typeUrl: "/ibc.core.client.v1.QueryClientStatesResponse",
+      value: QueryClientStatesResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1005,6 +1121,9 @@ function createBaseQueryConsensusStateRequest(): QueryConsensusStateRequest {
 }
 
 export const QueryConsensusStateRequest = {
+  typeUrl: "/ibc.core.client.v1.QueryConsensusStateRequest",
+  aminoType: "cosmos-sdk/QueryConsensusStateRequest",
+
   encode(message: QueryConsensusStateRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.clientId !== "") {
       writer.uint32(10).string(message.clientId);
@@ -1120,6 +1239,32 @@ export const QueryConsensusStateRequest = {
     obj.revision_height = message.revisionHeight ? message.revisionHeight.toString() : undefined;
     obj.latest_height = message.latestHeight;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryConsensusStateRequestAminoMsg): QueryConsensusStateRequest {
+    return QueryConsensusStateRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryConsensusStateRequest): QueryConsensusStateRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryConsensusStateRequest",
+      value: QueryConsensusStateRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryConsensusStateRequestProtoMsg): QueryConsensusStateRequest {
+    return QueryConsensusStateRequest.decode(message.value);
+  },
+
+  toProto(message: QueryConsensusStateRequest): Uint8Array {
+    return QueryConsensusStateRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryConsensusStateRequest): QueryConsensusStateRequestProtoMsg {
+    return {
+      typeUrl: "/ibc.core.client.v1.QueryConsensusStateRequest",
+      value: QueryConsensusStateRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1133,6 +1278,9 @@ function createBaseQueryConsensusStateResponse(): QueryConsensusStateResponse {
 }
 
 export const QueryConsensusStateResponse = {
+  typeUrl: "/ibc.core.client.v1.QueryConsensusStateResponse",
+  aminoType: "cosmos-sdk/QueryConsensusStateResponse",
+
   encode(message: QueryConsensusStateResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.consensusState !== undefined) {
       Any.encode(message.consensusState, writer.uint32(10).fork()).ldelim();
@@ -1233,6 +1381,32 @@ export const QueryConsensusStateResponse = {
     obj.proof = message.proof;
     obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryConsensusStateResponseAminoMsg): QueryConsensusStateResponse {
+    return QueryConsensusStateResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryConsensusStateResponse): QueryConsensusStateResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryConsensusStateResponse",
+      value: QueryConsensusStateResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryConsensusStateResponseProtoMsg): QueryConsensusStateResponse {
+    return QueryConsensusStateResponse.decode(message.value);
+  },
+
+  toProto(message: QueryConsensusStateResponse): Uint8Array {
+    return QueryConsensusStateResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryConsensusStateResponse): QueryConsensusStateResponseProtoMsg {
+    return {
+      typeUrl: "/ibc.core.client.v1.QueryConsensusStateResponse",
+      value: QueryConsensusStateResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1245,6 +1419,9 @@ function createBaseQueryConsensusStatesRequest(): QueryConsensusStatesRequest {
 }
 
 export const QueryConsensusStatesRequest = {
+  typeUrl: "/ibc.core.client.v1.QueryConsensusStatesRequest",
+  aminoType: "cosmos-sdk/QueryConsensusStatesRequest",
+
   encode(message: QueryConsensusStatesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.clientId !== "") {
       writer.uint32(10).string(message.clientId);
@@ -1330,6 +1507,32 @@ export const QueryConsensusStatesRequest = {
     obj.client_id = message.clientId;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryConsensusStatesRequestAminoMsg): QueryConsensusStatesRequest {
+    return QueryConsensusStatesRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryConsensusStatesRequest): QueryConsensusStatesRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryConsensusStatesRequest",
+      value: QueryConsensusStatesRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryConsensusStatesRequestProtoMsg): QueryConsensusStatesRequest {
+    return QueryConsensusStatesRequest.decode(message.value);
+  },
+
+  toProto(message: QueryConsensusStatesRequest): Uint8Array {
+    return QueryConsensusStatesRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryConsensusStatesRequest): QueryConsensusStatesRequestProtoMsg {
+    return {
+      typeUrl: "/ibc.core.client.v1.QueryConsensusStatesRequest",
+      value: QueryConsensusStatesRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1342,6 +1545,9 @@ function createBaseQueryConsensusStatesResponse(): QueryConsensusStatesResponse
 }
 
 export const QueryConsensusStatesResponse = {
+  typeUrl: "/ibc.core.client.v1.QueryConsensusStatesResponse",
+  aminoType: "cosmos-sdk/QueryConsensusStatesResponse",
+
   encode(message: QueryConsensusStatesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.consensusStates) {
       ConsensusStateWithHeight.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1445,6 +1651,32 @@ export const QueryConsensusStatesResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryConsensusStatesResponseAminoMsg): QueryConsensusStatesResponse {
+    return QueryConsensusStatesResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryConsensusStatesResponse): QueryConsensusStatesResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryConsensusStatesResponse",
+      value: QueryConsensusStatesResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryConsensusStatesResponseProtoMsg): QueryConsensusStatesResponse {
+    return QueryConsensusStatesResponse.decode(message.value);
+  },
+
+  toProto(message: QueryConsensusStatesResponse): Uint8Array {
+    return QueryConsensusStatesResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryConsensusStatesResponse): QueryConsensusStatesResponseProtoMsg {
+    return {
+      typeUrl: "/ibc.core.client.v1.QueryConsensusStatesResponse",
+      value: QueryConsensusStatesResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1456,6 +1688,9 @@ function createBaseQueryClientStatusRequest(): QueryClientStatusRequest {
 }
 
 export const QueryClientStatusRequest = {
+  typeUrl: "/ibc.core.client.v1.QueryClientStatusRequest",
+  aminoType: "cosmos-sdk/QueryClientStatusRequest",
+
   encode(message: QueryClientStatusRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.clientId !== "") {
       writer.uint32(10).string(message.clientId);
@@ -1526,6 +1761,32 @@ export const QueryClientStatusRequest = {
     const obj: any = {};
     obj.client_id = message.clientId;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryClientStatusRequestAminoMsg): QueryClientStatusRequest {
+    return QueryClientStatusRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryClientStatusRequest): QueryClientStatusRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryClientStatusRequest",
+      value: QueryClientStatusRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryClientStatusRequestProtoMsg): QueryClientStatusRequest {
+    return QueryClientStatusRequest.decode(message.value);
+  },
+
+  toProto(message: QueryClientStatusRequest): Uint8Array {
+    return QueryClientStatusRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryClientStatusRequest): QueryClientStatusRequestProtoMsg {
+    return {
+      typeUrl: "/ibc.core.client.v1.QueryClientStatusRequest",
+      value: QueryClientStatusRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1537,6 +1798,9 @@ function createBaseQueryClientStatusResponse(): QueryClientStatusResponse {
 }
 
 export const QueryClientStatusResponse = {
+  typeUrl: "/ibc.core.client.v1.QueryClientStatusResponse",
+  aminoType: "cosmos-sdk/QueryClientStatusResponse",
+
   encode(message: QueryClientStatusResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.status !== "") {
       writer.uint32(10).string(message.status);
@@ -1607,6 +1871,32 @@ export const QueryClientStatusResponse = {
     const obj: any = {};
     obj.status = message.status;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryClientStatusResponseAminoMsg): QueryClientStatusResponse {
+    return QueryClientStatusResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryClientStatusResponse): QueryClientStatusResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryClientStatusResponse",
+      value: QueryClientStatusResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryClientStatusResponseProtoMsg): QueryClientStatusResponse {
+    return QueryClientStatusResponse.decode(message.value);
+  },
+
+  toProto(message: QueryClientStatusResponse): Uint8Array {
+    return QueryClientStatusResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryClientStatusResponse): QueryClientStatusResponseProtoMsg {
+    return {
+      typeUrl: "/ibc.core.client.v1.QueryClientStatusResponse",
+      value: QueryClientStatusResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1616,6 +1906,9 @@ function createBaseQueryClientParamsRequest(): QueryClientParamsRequest {
 }
 
 export const QueryClientParamsRequest = {
+  typeUrl: "/ibc.core.client.v1.QueryClientParamsRequest",
+  aminoType: "cosmos-sdk/QueryClientParamsRequest",
+
   encode(_: QueryClientParamsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -1668,6 +1961,32 @@ export const QueryClientParamsRequest = {
   toAmino(_: QueryClientParamsRequest): QueryClientParamsRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryClientParamsRequestAminoMsg): QueryClientParamsRequest {
+    return QueryClientParamsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryClientParamsRequest): QueryClientParamsRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryClientParamsRequest",
+      value: QueryClientParamsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryClientParamsRequestProtoMsg): QueryClientParamsRequest {
+    return QueryClientParamsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryClientParamsRequest): Uint8Array {
+    return QueryClientParamsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryClientParamsRequest): QueryClientParamsRequestProtoMsg {
+    return {
+      typeUrl: "/ibc.core.client.v1.QueryClientParamsRequest",
+      value: QueryClientParamsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1679,6 +1998,9 @@ function createBaseQueryClientParamsResponse(): QueryClientParamsResponse {
 }
 
 export const QueryClientParamsResponse = {
+  typeUrl: "/ibc.core.client.v1.QueryClientParamsResponse",
+  aminoType: "cosmos-sdk/QueryClientParamsResponse",
+
   encode(message: QueryClientParamsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.params !== undefined) {
       Params.encode(message.params, writer.uint32(10).fork()).ldelim();
@@ -1749,6 +2071,32 @@ export const QueryClientParamsResponse = {
     const obj: any = {};
     obj.params = message.params ? Params.toAmino(message.params) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryClientParamsResponseAminoMsg): QueryClientParamsResponse {
+    return QueryClientParamsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryClientParamsResponse): QueryClientParamsResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryClientParamsResponse",
+      value: QueryClientParamsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryClientParamsResponseProtoMsg): QueryClientParamsResponse {
+    return QueryClientParamsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryClientParamsResponse): Uint8Array {
+    return QueryClientParamsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryClientParamsResponse): QueryClientParamsResponseProtoMsg {
+    return {
+      typeUrl: "/ibc.core.client.v1.QueryClientParamsResponse",
+      value: QueryClientParamsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1758,6 +2106,9 @@ function createBaseQueryUpgradedClientStateRequest(): QueryUpgradedClientStateRe
 }
 
 export const QueryUpgradedClientStateRequest = {
+  typeUrl: "/ibc.core.client.v1.QueryUpgradedClientStateRequest",
+  aminoType: "cosmos-sdk/QueryUpgradedClientStateRequest",
+
   encode(_: QueryUpgradedClientStateRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -1810,6 +2161,32 @@ export const QueryUpgradedClientStateRequest = {
   toAmino(_: QueryUpgradedClientStateRequest): QueryUpgradedClientStateRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryUpgradedClientStateRequestAminoMsg): QueryUpgradedClientStateRequest {
+    return QueryUpgradedClientStateRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryUpgradedClientStateRequest): QueryUpgradedClientStateRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryUpgradedClientStateRequest",
+      value: QueryUpgradedClientStateRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryUpgradedClientStateRequestProtoMsg): QueryUpgradedClientStateRequest {
+    return QueryUpgradedClientStateRequest.decode(message.value);
+  },
+
+  toProto(message: QueryUpgradedClientStateRequest): Uint8Array {
+    return QueryUpgradedClientStateRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryUpgradedClientStateRequest): QueryUpgradedClientStateRequestProtoMsg {
+    return {
+      typeUrl: "/ibc.core.client.v1.QueryUpgradedClientStateRequest",
+      value: QueryUpgradedClientStateRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1821,6 +2198,9 @@ function createBaseQueryUpgradedClientStateResponse(): QueryUpgradedClientStateR
 }
 
 export const QueryUpgradedClientStateResponse = {
+  typeUrl: "/ibc.core.client.v1.QueryUpgradedClientStateResponse",
+  aminoType: "cosmos-sdk/QueryUpgradedClientStateResponse",
+
   encode(message: QueryUpgradedClientStateResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.upgradedClientState !== undefined) {
       Any.encode(message.upgradedClientState, writer.uint32(10).fork()).ldelim();
@@ -1891,6 +2271,32 @@ export const QueryUpgradedClientStateResponse = {
     const obj: any = {};
     obj.upgraded_client_state = message.upgradedClientState ? Any.toAmino(message.upgradedClientState) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryUpgradedClientStateResponseAminoMsg): QueryUpgradedClientStateResponse {
+    return QueryUpgradedClientStateResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryUpgradedClientStateResponse): QueryUpgradedClientStateResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryUpgradedClientStateResponse",
+      value: QueryUpgradedClientStateResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryUpgradedClientStateResponseProtoMsg): QueryUpgradedClientStateResponse {
+    return QueryUpgradedClientStateResponse.decode(message.value);
+  },
+
+  toProto(message: QueryUpgradedClientStateResponse): Uint8Array {
+    return QueryUpgradedClientStateResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryUpgradedClientStateResponse): QueryUpgradedClientStateResponseProtoMsg {
+    return {
+      typeUrl: "/ibc.core.client.v1.QueryUpgradedClientStateResponse",
+      value: QueryUpgradedClientStateResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1900,6 +2306,9 @@ function createBaseQueryUpgradedConsensusStateRequest(): QueryUpgradedConsensusS
 }
 
 export const QueryUpgradedConsensusStateRequest = {
+  typeUrl: "/ibc.core.client.v1.QueryUpgradedConsensusStateRequest",
+  aminoType: "cosmos-sdk/QueryUpgradedConsensusStateRequest",
+
   encode(_: QueryUpgradedConsensusStateRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -1952,6 +2361,32 @@ export const QueryUpgradedConsensusStateRequest = {
   toAmino(_: QueryUpgradedConsensusStateRequest): QueryUpgradedConsensusStateRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryUpgradedConsensusStateRequestAminoMsg): QueryUpgradedConsensusStateRequest {
+    return QueryUpgradedConsensusStateRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryUpgradedConsensusStateRequest): QueryUpgradedConsensusStateRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryUpgradedConsensusStateRequest",
+      value: QueryUpgradedConsensusStateRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryUpgradedConsensusStateRequestProtoMsg): QueryUpgradedConsensusStateRequest {
+    return QueryUpgradedConsensusStateRequest.decode(message.value);
+  },
+
+  toProto(message: QueryUpgradedConsensusStateRequest): Uint8Array {
+    return QueryUpgradedConsensusStateRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryUpgradedConsensusStateRequest): QueryUpgradedConsensusStateRequestProtoMsg {
+    return {
+      typeUrl: "/ibc.core.client.v1.QueryUpgradedConsensusStateRequest",
+      value: QueryUpgradedConsensusStateRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1963,6 +2398,9 @@ function createBaseQueryUpgradedConsensusStateResponse(): QueryUpgradedConsensus
 }
 
 export const QueryUpgradedConsensusStateResponse = {
+  typeUrl: "/ibc.core.client.v1.QueryUpgradedConsensusStateResponse",
+  aminoType: "cosmos-sdk/QueryUpgradedConsensusStateResponse",
+
   encode(message: QueryUpgradedConsensusStateResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.upgradedConsensusState !== undefined) {
       Any.encode(message.upgradedConsensusState, writer.uint32(10).fork()).ldelim();
@@ -2033,6 +2471,32 @@ export const QueryUpgradedConsensusStateResponse = {
     const obj: any = {};
     obj.upgraded_consensus_state = message.upgradedConsensusState ? Any.toAmino(message.upgradedConsensusState) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryUpgradedConsensusStateResponseAminoMsg): QueryUpgradedConsensusStateResponse {
+    return QueryUpgradedConsensusStateResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryUpgradedConsensusStateResponse): QueryUpgradedConsensusStateResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryUpgradedConsensusStateResponse",
+      value: QueryUpgradedConsensusStateResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryUpgradedConsensusStateResponseProtoMsg): QueryUpgradedConsensusStateResponse {
+    return QueryUpgradedConsensusStateResponse.decode(message.value);
+  },
+
+  toProto(message: QueryUpgradedConsensusStateResponse): Uint8Array {
+    return QueryUpgradedConsensusStateResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryUpgradedConsensusStateResponse): QueryUpgradedConsensusStateResponseProtoMsg {
+    return {
+      typeUrl: "/ibc.core.client.v1.QueryUpgradedConsensusStateResponse",
+      value: QueryUpgradedConsensusStateResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/ibc/core/client/v1/tx.ts b/__fixtures__/outputv2/ibc/core/client/v1/tx.ts
index 941f0f346..e58fc7e9d 100644
--- a/__fixtures__/outputv2/ibc/core/client/v1/tx.ts
+++ b/__fixtures__/outputv2/ibc/core/client/v1/tx.ts
@@ -17,7 +17,7 @@ export interface MsgCreateClient {
   /** signer address */
   signer: string;
 }
-export interface MsgCreateClientProtoType {
+export interface MsgCreateClientProtoMsg {
   typeUrl: "/ibc.core.client.v1.MsgCreateClient";
   value: Uint8Array;
 }
@@ -36,7 +36,7 @@ export interface MsgCreateClientAmino {
   /** signer address */
   signer: string;
 }
-export interface MsgCreateClientAminoType {
+export interface MsgCreateClientAminoMsg {
   type: "cosmos-sdk/MsgCreateClient";
   value: MsgCreateClientAmino;
 }
@@ -50,14 +50,14 @@ export interface MsgCreateClientSDKType {
 
 /** MsgCreateClientResponse defines the Msg/CreateClient response type. */
 export interface MsgCreateClientResponse {}
-export interface MsgCreateClientResponseProtoType {
+export interface MsgCreateClientResponseProtoMsg {
   typeUrl: "/ibc.core.client.v1.MsgCreateClientResponse";
   value: Uint8Array;
 }
 
 /** MsgCreateClientResponse defines the Msg/CreateClient response type. */
 export interface MsgCreateClientResponseAmino {}
-export interface MsgCreateClientResponseAminoType {
+export interface MsgCreateClientResponseAminoMsg {
   type: "cosmos-sdk/MsgCreateClientResponse";
   value: MsgCreateClientResponseAmino;
 }
@@ -79,7 +79,7 @@ export interface MsgUpdateClient {
   /** signer address */
   signer: string;
 }
-export interface MsgUpdateClientProtoType {
+export interface MsgUpdateClientProtoMsg {
   typeUrl: "/ibc.core.client.v1.MsgUpdateClient";
   value: Uint8Array;
 }
@@ -98,7 +98,7 @@ export interface MsgUpdateClientAmino {
   /** signer address */
   signer: string;
 }
-export interface MsgUpdateClientAminoType {
+export interface MsgUpdateClientAminoMsg {
   type: "cosmos-sdk/MsgUpdateClient";
   value: MsgUpdateClientAmino;
 }
@@ -115,14 +115,14 @@ export interface MsgUpdateClientSDKType {
 
 /** MsgUpdateClientResponse defines the Msg/UpdateClient response type. */
 export interface MsgUpdateClientResponse {}
-export interface MsgUpdateClientResponseProtoType {
+export interface MsgUpdateClientResponseProtoMsg {
   typeUrl: "/ibc.core.client.v1.MsgUpdateClientResponse";
   value: Uint8Array;
 }
 
 /** MsgUpdateClientResponse defines the Msg/UpdateClient response type. */
 export interface MsgUpdateClientResponseAmino {}
-export interface MsgUpdateClientResponseAminoType {
+export interface MsgUpdateClientResponseAminoMsg {
   type: "cosmos-sdk/MsgUpdateClientResponse";
   value: MsgUpdateClientResponseAmino;
 }
@@ -156,7 +156,7 @@ export interface MsgUpgradeClient {
   /** signer address */
   signer: string;
 }
-export interface MsgUpgradeClientProtoType {
+export interface MsgUpgradeClientProtoMsg {
   typeUrl: "/ibc.core.client.v1.MsgUpgradeClient";
   value: Uint8Array;
 }
@@ -187,7 +187,7 @@ export interface MsgUpgradeClientAmino {
   /** signer address */
   signer: string;
 }
-export interface MsgUpgradeClientAminoType {
+export interface MsgUpgradeClientAminoMsg {
   type: "cosmos-sdk/MsgUpgradeClient";
   value: MsgUpgradeClientAmino;
 }
@@ -207,14 +207,14 @@ export interface MsgUpgradeClientSDKType {
 
 /** MsgUpgradeClientResponse defines the Msg/UpgradeClient response type. */
 export interface MsgUpgradeClientResponse {}
-export interface MsgUpgradeClientResponseProtoType {
+export interface MsgUpgradeClientResponseProtoMsg {
   typeUrl: "/ibc.core.client.v1.MsgUpgradeClientResponse";
   value: Uint8Array;
 }
 
 /** MsgUpgradeClientResponse defines the Msg/UpgradeClient response type. */
 export interface MsgUpgradeClientResponseAmino {}
-export interface MsgUpgradeClientResponseAminoType {
+export interface MsgUpgradeClientResponseAminoMsg {
   type: "cosmos-sdk/MsgUpgradeClientResponse";
   value: MsgUpgradeClientResponseAmino;
 }
@@ -236,7 +236,7 @@ export interface MsgSubmitMisbehaviour {
   /** signer address */
   signer: string;
 }
-export interface MsgSubmitMisbehaviourProtoType {
+export interface MsgSubmitMisbehaviourProtoMsg {
   typeUrl: "/ibc.core.client.v1.MsgSubmitMisbehaviour";
   value: Uint8Array;
 }
@@ -255,7 +255,7 @@ export interface MsgSubmitMisbehaviourAmino {
   /** signer address */
   signer: string;
 }
-export interface MsgSubmitMisbehaviourAminoType {
+export interface MsgSubmitMisbehaviourAminoMsg {
   type: "cosmos-sdk/MsgSubmitMisbehaviour";
   value: MsgSubmitMisbehaviourAmino;
 }
@@ -275,7 +275,7 @@ export interface MsgSubmitMisbehaviourSDKType {
  * type.
  */
 export interface MsgSubmitMisbehaviourResponse {}
-export interface MsgSubmitMisbehaviourResponseProtoType {
+export interface MsgSubmitMisbehaviourResponseProtoMsg {
   typeUrl: "/ibc.core.client.v1.MsgSubmitMisbehaviourResponse";
   value: Uint8Array;
 }
@@ -285,7 +285,7 @@ export interface MsgSubmitMisbehaviourResponseProtoType {
  * type.
  */
 export interface MsgSubmitMisbehaviourResponseAmino {}
-export interface MsgSubmitMisbehaviourResponseAminoType {
+export interface MsgSubmitMisbehaviourResponseAminoMsg {
   type: "cosmos-sdk/MsgSubmitMisbehaviourResponse";
   value: MsgSubmitMisbehaviourResponseAmino;
 }
@@ -305,6 +305,9 @@ function createBaseMsgCreateClient(): MsgCreateClient {
 }
 
 export const MsgCreateClient = {
+  typeUrl: "/ibc.core.client.v1.MsgCreateClient",
+  aminoType: "cosmos-sdk/MsgCreateClient",
+
   encode(message: MsgCreateClient, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.clientState !== undefined) {
       Any.encode(message.clientState, writer.uint32(10).fork()).ldelim();
@@ -405,6 +408,32 @@ export const MsgCreateClient = {
     obj.consensus_state = message.consensusState ? Any.toAmino(message.consensusState) : undefined;
     obj.signer = message.signer;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCreateClientAminoMsg): MsgCreateClient {
+    return MsgCreateClient.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgCreateClient): MsgCreateClientAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgCreateClient",
+      value: MsgCreateClient.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgCreateClientProtoMsg): MsgCreateClient {
+    return MsgCreateClient.decode(message.value);
+  },
+
+  toProto(message: MsgCreateClient): Uint8Array {
+    return MsgCreateClient.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCreateClient): MsgCreateClientProtoMsg {
+    return {
+      typeUrl: "/ibc.core.client.v1.MsgCreateClient",
+      value: MsgCreateClient.encode(message).finish()
+    };
   }
 
 };
@@ -414,6 +443,9 @@ function createBaseMsgCreateClientResponse(): MsgCreateClientResponse {
 }
 
 export const MsgCreateClientResponse = {
+  typeUrl: "/ibc.core.client.v1.MsgCreateClientResponse",
+  aminoType: "cosmos-sdk/MsgCreateClientResponse",
+
   encode(_: MsgCreateClientResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -466,6 +498,32 @@ export const MsgCreateClientResponse = {
   toAmino(_: MsgCreateClientResponse): MsgCreateClientResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCreateClientResponseAminoMsg): MsgCreateClientResponse {
+    return MsgCreateClientResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgCreateClientResponse): MsgCreateClientResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgCreateClientResponse",
+      value: MsgCreateClientResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgCreateClientResponseProtoMsg): MsgCreateClientResponse {
+    return MsgCreateClientResponse.decode(message.value);
+  },
+
+  toProto(message: MsgCreateClientResponse): Uint8Array {
+    return MsgCreateClientResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCreateClientResponse): MsgCreateClientResponseProtoMsg {
+    return {
+      typeUrl: "/ibc.core.client.v1.MsgCreateClientResponse",
+      value: MsgCreateClientResponse.encode(message).finish()
+    };
   }
 
 };
@@ -479,6 +537,9 @@ function createBaseMsgUpdateClient(): MsgUpdateClient {
 }
 
 export const MsgUpdateClient = {
+  typeUrl: "/ibc.core.client.v1.MsgUpdateClient",
+  aminoType: "cosmos-sdk/MsgUpdateClient",
+
   encode(message: MsgUpdateClient, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.clientId !== "") {
       writer.uint32(10).string(message.clientId);
@@ -579,6 +640,32 @@ export const MsgUpdateClient = {
     obj.header = message.header ? Any.toAmino(message.header) : undefined;
     obj.signer = message.signer;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgUpdateClientAminoMsg): MsgUpdateClient {
+    return MsgUpdateClient.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgUpdateClient): MsgUpdateClientAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgUpdateClient",
+      value: MsgUpdateClient.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgUpdateClientProtoMsg): MsgUpdateClient {
+    return MsgUpdateClient.decode(message.value);
+  },
+
+  toProto(message: MsgUpdateClient): Uint8Array {
+    return MsgUpdateClient.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgUpdateClient): MsgUpdateClientProtoMsg {
+    return {
+      typeUrl: "/ibc.core.client.v1.MsgUpdateClient",
+      value: MsgUpdateClient.encode(message).finish()
+    };
   }
 
 };
@@ -588,6 +675,9 @@ function createBaseMsgUpdateClientResponse(): MsgUpdateClientResponse {
 }
 
 export const MsgUpdateClientResponse = {
+  typeUrl: "/ibc.core.client.v1.MsgUpdateClientResponse",
+  aminoType: "cosmos-sdk/MsgUpdateClientResponse",
+
   encode(_: MsgUpdateClientResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -640,6 +730,32 @@ export const MsgUpdateClientResponse = {
   toAmino(_: MsgUpdateClientResponse): MsgUpdateClientResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgUpdateClientResponseAminoMsg): MsgUpdateClientResponse {
+    return MsgUpdateClientResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgUpdateClientResponse): MsgUpdateClientResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgUpdateClientResponse",
+      value: MsgUpdateClientResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgUpdateClientResponseProtoMsg): MsgUpdateClientResponse {
+    return MsgUpdateClientResponse.decode(message.value);
+  },
+
+  toProto(message: MsgUpdateClientResponse): Uint8Array {
+    return MsgUpdateClientResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgUpdateClientResponse): MsgUpdateClientResponseProtoMsg {
+    return {
+      typeUrl: "/ibc.core.client.v1.MsgUpdateClientResponse",
+      value: MsgUpdateClientResponse.encode(message).finish()
+    };
   }
 
 };
@@ -656,6 +772,9 @@ function createBaseMsgUpgradeClient(): MsgUpgradeClient {
 }
 
 export const MsgUpgradeClient = {
+  typeUrl: "/ibc.core.client.v1.MsgUpgradeClient",
+  aminoType: "cosmos-sdk/MsgUpgradeClient",
+
   encode(message: MsgUpgradeClient, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.clientId !== "") {
       writer.uint32(10).string(message.clientId);
@@ -801,6 +920,32 @@ export const MsgUpgradeClient = {
     obj.proof_upgrade_consensus_state = message.proofUpgradeConsensusState;
     obj.signer = message.signer;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgUpgradeClientAminoMsg): MsgUpgradeClient {
+    return MsgUpgradeClient.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgUpgradeClient): MsgUpgradeClientAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgUpgradeClient",
+      value: MsgUpgradeClient.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgUpgradeClientProtoMsg): MsgUpgradeClient {
+    return MsgUpgradeClient.decode(message.value);
+  },
+
+  toProto(message: MsgUpgradeClient): Uint8Array {
+    return MsgUpgradeClient.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgUpgradeClient): MsgUpgradeClientProtoMsg {
+    return {
+      typeUrl: "/ibc.core.client.v1.MsgUpgradeClient",
+      value: MsgUpgradeClient.encode(message).finish()
+    };
   }
 
 };
@@ -810,6 +955,9 @@ function createBaseMsgUpgradeClientResponse(): MsgUpgradeClientResponse {
 }
 
 export const MsgUpgradeClientResponse = {
+  typeUrl: "/ibc.core.client.v1.MsgUpgradeClientResponse",
+  aminoType: "cosmos-sdk/MsgUpgradeClientResponse",
+
   encode(_: MsgUpgradeClientResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -862,6 +1010,32 @@ export const MsgUpgradeClientResponse = {
   toAmino(_: MsgUpgradeClientResponse): MsgUpgradeClientResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgUpgradeClientResponseAminoMsg): MsgUpgradeClientResponse {
+    return MsgUpgradeClientResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgUpgradeClientResponse): MsgUpgradeClientResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgUpgradeClientResponse",
+      value: MsgUpgradeClientResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgUpgradeClientResponseProtoMsg): MsgUpgradeClientResponse {
+    return MsgUpgradeClientResponse.decode(message.value);
+  },
+
+  toProto(message: MsgUpgradeClientResponse): Uint8Array {
+    return MsgUpgradeClientResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgUpgradeClientResponse): MsgUpgradeClientResponseProtoMsg {
+    return {
+      typeUrl: "/ibc.core.client.v1.MsgUpgradeClientResponse",
+      value: MsgUpgradeClientResponse.encode(message).finish()
+    };
   }
 
 };
@@ -875,6 +1049,9 @@ function createBaseMsgSubmitMisbehaviour(): MsgSubmitMisbehaviour {
 }
 
 export const MsgSubmitMisbehaviour = {
+  typeUrl: "/ibc.core.client.v1.MsgSubmitMisbehaviour",
+  aminoType: "cosmos-sdk/MsgSubmitMisbehaviour",
+
   encode(message: MsgSubmitMisbehaviour, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.clientId !== "") {
       writer.uint32(10).string(message.clientId);
@@ -975,6 +1152,32 @@ export const MsgSubmitMisbehaviour = {
     obj.misbehaviour = message.misbehaviour ? Any.toAmino(message.misbehaviour) : undefined;
     obj.signer = message.signer;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgSubmitMisbehaviourAminoMsg): MsgSubmitMisbehaviour {
+    return MsgSubmitMisbehaviour.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgSubmitMisbehaviour): MsgSubmitMisbehaviourAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgSubmitMisbehaviour",
+      value: MsgSubmitMisbehaviour.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgSubmitMisbehaviourProtoMsg): MsgSubmitMisbehaviour {
+    return MsgSubmitMisbehaviour.decode(message.value);
+  },
+
+  toProto(message: MsgSubmitMisbehaviour): Uint8Array {
+    return MsgSubmitMisbehaviour.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgSubmitMisbehaviour): MsgSubmitMisbehaviourProtoMsg {
+    return {
+      typeUrl: "/ibc.core.client.v1.MsgSubmitMisbehaviour",
+      value: MsgSubmitMisbehaviour.encode(message).finish()
+    };
   }
 
 };
@@ -984,6 +1187,9 @@ function createBaseMsgSubmitMisbehaviourResponse(): MsgSubmitMisbehaviourRespons
 }
 
 export const MsgSubmitMisbehaviourResponse = {
+  typeUrl: "/ibc.core.client.v1.MsgSubmitMisbehaviourResponse",
+  aminoType: "cosmos-sdk/MsgSubmitMisbehaviourResponse",
+
   encode(_: MsgSubmitMisbehaviourResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -1036,6 +1242,32 @@ export const MsgSubmitMisbehaviourResponse = {
   toAmino(_: MsgSubmitMisbehaviourResponse): MsgSubmitMisbehaviourResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgSubmitMisbehaviourResponseAminoMsg): MsgSubmitMisbehaviourResponse {
+    return MsgSubmitMisbehaviourResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgSubmitMisbehaviourResponse): MsgSubmitMisbehaviourResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgSubmitMisbehaviourResponse",
+      value: MsgSubmitMisbehaviourResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgSubmitMisbehaviourResponseProtoMsg): MsgSubmitMisbehaviourResponse {
+    return MsgSubmitMisbehaviourResponse.decode(message.value);
+  },
+
+  toProto(message: MsgSubmitMisbehaviourResponse): Uint8Array {
+    return MsgSubmitMisbehaviourResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgSubmitMisbehaviourResponse): MsgSubmitMisbehaviourResponseProtoMsg {
+    return {
+      typeUrl: "/ibc.core.client.v1.MsgSubmitMisbehaviourResponse",
+      value: MsgSubmitMisbehaviourResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/ibc/core/commitment/v1/commitment.ts b/__fixtures__/outputv2/ibc/core/commitment/v1/commitment.ts
index 70c071054..9a80c108e 100644
--- a/__fixtures__/outputv2/ibc/core/commitment/v1/commitment.ts
+++ b/__fixtures__/outputv2/ibc/core/commitment/v1/commitment.ts
@@ -10,7 +10,7 @@ export const protobufPackage = "ibc.core.commitment.v1";
 export interface MerkleRoot {
   hash: Uint8Array;
 }
-export interface MerkleRootProtoType {
+export interface MerkleRootProtoMsg {
   typeUrl: "/ibc.core.commitment.v1.MerkleRoot";
   value: Uint8Array;
 }
@@ -22,7 +22,7 @@ export interface MerkleRootProtoType {
 export interface MerkleRootAmino {
   hash: Uint8Array;
 }
-export interface MerkleRootAminoType {
+export interface MerkleRootAminoMsg {
   type: "cosmos-sdk/MerkleRoot";
   value: MerkleRootAmino;
 }
@@ -43,7 +43,7 @@ export interface MerkleRootSDKType {
 export interface MerklePrefix {
   keyPrefix: Uint8Array;
 }
-export interface MerklePrefixProtoType {
+export interface MerklePrefixProtoMsg {
   typeUrl: "/ibc.core.commitment.v1.MerklePrefix";
   value: Uint8Array;
 }
@@ -56,7 +56,7 @@ export interface MerklePrefixProtoType {
 export interface MerklePrefixAmino {
   key_prefix: Uint8Array;
 }
-export interface MerklePrefixAminoType {
+export interface MerklePrefixAminoMsg {
   type: "cosmos-sdk/MerklePrefix";
   value: MerklePrefixAmino;
 }
@@ -78,7 +78,7 @@ export interface MerklePrefixSDKType {
 export interface MerklePath {
   keyPath: string[];
 }
-export interface MerklePathProtoType {
+export interface MerklePathProtoMsg {
   typeUrl: "/ibc.core.commitment.v1.MerklePath";
   value: Uint8Array;
 }
@@ -91,7 +91,7 @@ export interface MerklePathProtoType {
 export interface MerklePathAmino {
   key_path: string[];
 }
-export interface MerklePathAminoType {
+export interface MerklePathAminoMsg {
   type: "cosmos-sdk/MerklePath";
   value: MerklePathAmino;
 }
@@ -115,7 +115,7 @@ export interface MerklePathSDKType {
 export interface MerkleProof {
   proofs: CommitmentProof[];
 }
-export interface MerkleProofProtoType {
+export interface MerkleProofProtoMsg {
   typeUrl: "/ibc.core.commitment.v1.MerkleProof";
   value: Uint8Array;
 }
@@ -130,7 +130,7 @@ export interface MerkleProofProtoType {
 export interface MerkleProofAmino {
   proofs: CommitmentProofAmino[];
 }
-export interface MerkleProofAminoType {
+export interface MerkleProofAminoMsg {
   type: "cosmos-sdk/MerkleProof";
   value: MerkleProofAmino;
 }
@@ -153,6 +153,9 @@ function createBaseMerkleRoot(): MerkleRoot {
 }
 
 export const MerkleRoot = {
+  typeUrl: "/ibc.core.commitment.v1.MerkleRoot",
+  aminoType: "cosmos-sdk/MerkleRoot",
+
   encode(message: MerkleRoot, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.hash.length !== 0) {
       writer.uint32(10).bytes(message.hash);
@@ -223,6 +226,32 @@ export const MerkleRoot = {
     const obj: any = {};
     obj.hash = message.hash;
     return obj;
+  },
+
+  fromAminoMsg(object: MerkleRootAminoMsg): MerkleRoot {
+    return MerkleRoot.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MerkleRoot): MerkleRootAminoMsg {
+    return {
+      type: "cosmos-sdk/MerkleRoot",
+      value: MerkleRoot.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MerkleRootProtoMsg): MerkleRoot {
+    return MerkleRoot.decode(message.value);
+  },
+
+  toProto(message: MerkleRoot): Uint8Array {
+    return MerkleRoot.encode(message).finish();
+  },
+
+  toProtoMsg(message: MerkleRoot): MerkleRootProtoMsg {
+    return {
+      typeUrl: "/ibc.core.commitment.v1.MerkleRoot",
+      value: MerkleRoot.encode(message).finish()
+    };
   }
 
 };
@@ -234,6 +263,9 @@ function createBaseMerklePrefix(): MerklePrefix {
 }
 
 export const MerklePrefix = {
+  typeUrl: "/ibc.core.commitment.v1.MerklePrefix",
+  aminoType: "cosmos-sdk/MerklePrefix",
+
   encode(message: MerklePrefix, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.keyPrefix.length !== 0) {
       writer.uint32(10).bytes(message.keyPrefix);
@@ -304,6 +336,32 @@ export const MerklePrefix = {
     const obj: any = {};
     obj.key_prefix = message.keyPrefix;
     return obj;
+  },
+
+  fromAminoMsg(object: MerklePrefixAminoMsg): MerklePrefix {
+    return MerklePrefix.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MerklePrefix): MerklePrefixAminoMsg {
+    return {
+      type: "cosmos-sdk/MerklePrefix",
+      value: MerklePrefix.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MerklePrefixProtoMsg): MerklePrefix {
+    return MerklePrefix.decode(message.value);
+  },
+
+  toProto(message: MerklePrefix): Uint8Array {
+    return MerklePrefix.encode(message).finish();
+  },
+
+  toProtoMsg(message: MerklePrefix): MerklePrefixProtoMsg {
+    return {
+      typeUrl: "/ibc.core.commitment.v1.MerklePrefix",
+      value: MerklePrefix.encode(message).finish()
+    };
   }
 
 };
@@ -315,6 +373,9 @@ function createBaseMerklePath(): MerklePath {
 }
 
 export const MerklePath = {
+  typeUrl: "/ibc.core.commitment.v1.MerklePath",
+  aminoType: "cosmos-sdk/MerklePath",
+
   encode(message: MerklePath, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.keyPath) {
       writer.uint32(10).string(v!);
@@ -403,6 +464,32 @@ export const MerklePath = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: MerklePathAminoMsg): MerklePath {
+    return MerklePath.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MerklePath): MerklePathAminoMsg {
+    return {
+      type: "cosmos-sdk/MerklePath",
+      value: MerklePath.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MerklePathProtoMsg): MerklePath {
+    return MerklePath.decode(message.value);
+  },
+
+  toProto(message: MerklePath): Uint8Array {
+    return MerklePath.encode(message).finish();
+  },
+
+  toProtoMsg(message: MerklePath): MerklePathProtoMsg {
+    return {
+      typeUrl: "/ibc.core.commitment.v1.MerklePath",
+      value: MerklePath.encode(message).finish()
+    };
   }
 
 };
@@ -414,6 +501,9 @@ function createBaseMerkleProof(): MerkleProof {
 }
 
 export const MerkleProof = {
+  typeUrl: "/ibc.core.commitment.v1.MerkleProof",
+  aminoType: "cosmos-sdk/MerkleProof",
+
   encode(message: MerkleProof, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.proofs) {
       CommitmentProof.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -502,6 +592,32 @@ export const MerkleProof = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: MerkleProofAminoMsg): MerkleProof {
+    return MerkleProof.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MerkleProof): MerkleProofAminoMsg {
+    return {
+      type: "cosmos-sdk/MerkleProof",
+      value: MerkleProof.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MerkleProofProtoMsg): MerkleProof {
+    return MerkleProof.decode(message.value);
+  },
+
+  toProto(message: MerkleProof): Uint8Array {
+    return MerkleProof.encode(message).finish();
+  },
+
+  toProtoMsg(message: MerkleProof): MerkleProofProtoMsg {
+    return {
+      typeUrl: "/ibc.core.commitment.v1.MerkleProof",
+      value: MerkleProof.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/ibc/core/connection/v1/connection.ts b/__fixtures__/outputv2/ibc/core/connection/v1/connection.ts
index 4805232da..7eec1c7ab 100644
--- a/__fixtures__/outputv2/ibc/core/connection/v1/connection.ts
+++ b/__fixtures__/outputv2/ibc/core/connection/v1/connection.ts
@@ -99,7 +99,7 @@ export interface ConnectionEnd {
    */
   delayPeriod: Long;
 }
-export interface ConnectionEndProtoType {
+export interface ConnectionEndProtoMsg {
   typeUrl: "/ibc.core.connection.v1.ConnectionEnd";
   value: Uint8Array;
 }
@@ -133,7 +133,7 @@ export interface ConnectionEndAmino {
    */
   delay_period: string;
 }
-export interface ConnectionEndAminoType {
+export interface ConnectionEndAminoMsg {
   type: "cosmos-sdk/ConnectionEnd";
   value: ConnectionEndAmino;
 }
@@ -178,7 +178,7 @@ export interface IdentifiedConnection {
   /** delay period associated with this connection. */
   delayPeriod: Long;
 }
-export interface IdentifiedConnectionProtoType {
+export interface IdentifiedConnectionProtoMsg {
   typeUrl: "/ibc.core.connection.v1.IdentifiedConnection";
   value: Uint8Array;
 }
@@ -209,7 +209,7 @@ export interface IdentifiedConnectionAmino {
   /** delay period associated with this connection. */
   delay_period: string;
 }
-export interface IdentifiedConnectionAminoType {
+export interface IdentifiedConnectionAminoMsg {
   type: "cosmos-sdk/IdentifiedConnection";
   value: IdentifiedConnectionAmino;
 }
@@ -244,7 +244,7 @@ export interface Counterparty {
   /** commitment merkle prefix of the counterparty chain. */
   prefix?: MerklePrefix;
 }
-export interface CounterpartyProtoType {
+export interface CounterpartyProtoMsg {
   typeUrl: "/ibc.core.connection.v1.Counterparty";
   value: Uint8Array;
 }
@@ -266,7 +266,7 @@ export interface CounterpartyAmino {
   /** commitment merkle prefix of the counterparty chain. */
   prefix?: MerklePrefixAmino;
 }
-export interface CounterpartyAminoType {
+export interface CounterpartyAminoMsg {
   type: "cosmos-sdk/Counterparty";
   value: CounterpartyAmino;
 }
@@ -283,7 +283,7 @@ export interface ClientPaths {
   /** list of connection paths */
   paths: string[];
 }
-export interface ClientPathsProtoType {
+export interface ClientPathsProtoMsg {
   typeUrl: "/ibc.core.connection.v1.ClientPaths";
   value: Uint8Array;
 }
@@ -293,7 +293,7 @@ export interface ClientPathsAmino {
   /** list of connection paths */
   paths: string[];
 }
-export interface ClientPathsAminoType {
+export interface ClientPathsAminoMsg {
   type: "cosmos-sdk/ClientPaths";
   value: ClientPathsAmino;
 }
@@ -311,7 +311,7 @@ export interface ConnectionPaths {
   /** list of connection paths */
   paths: string[];
 }
-export interface ConnectionPathsProtoType {
+export interface ConnectionPathsProtoMsg {
   typeUrl: "/ibc.core.connection.v1.ConnectionPaths";
   value: Uint8Array;
 }
@@ -324,7 +324,7 @@ export interface ConnectionPathsAmino {
   /** list of connection paths */
   paths: string[];
 }
-export interface ConnectionPathsAminoType {
+export interface ConnectionPathsAminoMsg {
   type: "cosmos-sdk/ConnectionPaths";
   value: ConnectionPathsAmino;
 }
@@ -346,7 +346,7 @@ export interface Version {
   /** list of features compatible with the specified identifier */
   features: string[];
 }
-export interface VersionProtoType {
+export interface VersionProtoMsg {
   typeUrl: "/ibc.core.connection.v1.Version";
   value: Uint8Array;
 }
@@ -362,7 +362,7 @@ export interface VersionAmino {
   /** list of features compatible with the specified identifier */
   features: string[];
 }
-export interface VersionAminoType {
+export interface VersionAminoMsg {
   type: "cosmos-sdk/Version";
   value: VersionAmino;
 }
@@ -385,7 +385,7 @@ export interface Params {
    */
   maxExpectedTimePerBlock: Long;
 }
-export interface ParamsProtoType {
+export interface ParamsProtoMsg {
   typeUrl: "/ibc.core.connection.v1.Params";
   value: Uint8Array;
 }
@@ -399,7 +399,7 @@ export interface ParamsAmino {
    */
   max_expected_time_per_block: string;
 }
-export interface ParamsAminoType {
+export interface ParamsAminoMsg {
   type: "cosmos-sdk/Params";
   value: ParamsAmino;
 }
@@ -420,6 +420,9 @@ function createBaseConnectionEnd(): ConnectionEnd {
 }
 
 export const ConnectionEnd = {
+  typeUrl: "/ibc.core.connection.v1.ConnectionEnd",
+  aminoType: "cosmos-sdk/ConnectionEnd",
+
   encode(message: ConnectionEnd, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.clientId !== "") {
       writer.uint32(10).string(message.clientId);
@@ -568,6 +571,32 @@ export const ConnectionEnd = {
     obj.counterparty = message.counterparty ? Counterparty.toAmino(message.counterparty) : undefined;
     obj.delay_period = message.delayPeriod ? message.delayPeriod.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ConnectionEndAminoMsg): ConnectionEnd {
+    return ConnectionEnd.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ConnectionEnd): ConnectionEndAminoMsg {
+    return {
+      type: "cosmos-sdk/ConnectionEnd",
+      value: ConnectionEnd.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ConnectionEndProtoMsg): ConnectionEnd {
+    return ConnectionEnd.decode(message.value);
+  },
+
+  toProto(message: ConnectionEnd): Uint8Array {
+    return ConnectionEnd.encode(message).finish();
+  },
+
+  toProtoMsg(message: ConnectionEnd): ConnectionEndProtoMsg {
+    return {
+      typeUrl: "/ibc.core.connection.v1.ConnectionEnd",
+      value: ConnectionEnd.encode(message).finish()
+    };
   }
 
 };
@@ -584,6 +613,9 @@ function createBaseIdentifiedConnection(): IdentifiedConnection {
 }
 
 export const IdentifiedConnection = {
+  typeUrl: "/ibc.core.connection.v1.IdentifiedConnection",
+  aminoType: "cosmos-sdk/IdentifiedConnection",
+
   encode(message: IdentifiedConnection, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.id !== "") {
       writer.uint32(10).string(message.id);
@@ -747,6 +779,32 @@ export const IdentifiedConnection = {
     obj.counterparty = message.counterparty ? Counterparty.toAmino(message.counterparty) : undefined;
     obj.delay_period = message.delayPeriod ? message.delayPeriod.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: IdentifiedConnectionAminoMsg): IdentifiedConnection {
+    return IdentifiedConnection.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: IdentifiedConnection): IdentifiedConnectionAminoMsg {
+    return {
+      type: "cosmos-sdk/IdentifiedConnection",
+      value: IdentifiedConnection.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: IdentifiedConnectionProtoMsg): IdentifiedConnection {
+    return IdentifiedConnection.decode(message.value);
+  },
+
+  toProto(message: IdentifiedConnection): Uint8Array {
+    return IdentifiedConnection.encode(message).finish();
+  },
+
+  toProtoMsg(message: IdentifiedConnection): IdentifiedConnectionProtoMsg {
+    return {
+      typeUrl: "/ibc.core.connection.v1.IdentifiedConnection",
+      value: IdentifiedConnection.encode(message).finish()
+    };
   }
 
 };
@@ -760,6 +818,9 @@ function createBaseCounterparty(): Counterparty {
 }
 
 export const Counterparty = {
+  typeUrl: "/ibc.core.connection.v1.Counterparty",
+  aminoType: "cosmos-sdk/Counterparty",
+
   encode(message: Counterparty, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.clientId !== "") {
       writer.uint32(10).string(message.clientId);
@@ -860,6 +921,32 @@ export const Counterparty = {
     obj.connection_id = message.connectionId;
     obj.prefix = message.prefix ? MerklePrefix.toAmino(message.prefix) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: CounterpartyAminoMsg): Counterparty {
+    return Counterparty.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Counterparty): CounterpartyAminoMsg {
+    return {
+      type: "cosmos-sdk/Counterparty",
+      value: Counterparty.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: CounterpartyProtoMsg): Counterparty {
+    return Counterparty.decode(message.value);
+  },
+
+  toProto(message: Counterparty): Uint8Array {
+    return Counterparty.encode(message).finish();
+  },
+
+  toProtoMsg(message: Counterparty): CounterpartyProtoMsg {
+    return {
+      typeUrl: "/ibc.core.connection.v1.Counterparty",
+      value: Counterparty.encode(message).finish()
+    };
   }
 
 };
@@ -871,6 +958,9 @@ function createBaseClientPaths(): ClientPaths {
 }
 
 export const ClientPaths = {
+  typeUrl: "/ibc.core.connection.v1.ClientPaths",
+  aminoType: "cosmos-sdk/ClientPaths",
+
   encode(message: ClientPaths, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.paths) {
       writer.uint32(10).string(v!);
@@ -959,6 +1049,32 @@ export const ClientPaths = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ClientPathsAminoMsg): ClientPaths {
+    return ClientPaths.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ClientPaths): ClientPathsAminoMsg {
+    return {
+      type: "cosmos-sdk/ClientPaths",
+      value: ClientPaths.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ClientPathsProtoMsg): ClientPaths {
+    return ClientPaths.decode(message.value);
+  },
+
+  toProto(message: ClientPaths): Uint8Array {
+    return ClientPaths.encode(message).finish();
+  },
+
+  toProtoMsg(message: ClientPaths): ClientPathsProtoMsg {
+    return {
+      typeUrl: "/ibc.core.connection.v1.ClientPaths",
+      value: ClientPaths.encode(message).finish()
+    };
   }
 
 };
@@ -971,6 +1087,9 @@ function createBaseConnectionPaths(): ConnectionPaths {
 }
 
 export const ConnectionPaths = {
+  typeUrl: "/ibc.core.connection.v1.ConnectionPaths",
+  aminoType: "cosmos-sdk/ConnectionPaths",
+
   encode(message: ConnectionPaths, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.clientId !== "") {
       writer.uint32(10).string(message.clientId);
@@ -1074,6 +1193,32 @@ export const ConnectionPaths = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ConnectionPathsAminoMsg): ConnectionPaths {
+    return ConnectionPaths.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ConnectionPaths): ConnectionPathsAminoMsg {
+    return {
+      type: "cosmos-sdk/ConnectionPaths",
+      value: ConnectionPaths.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ConnectionPathsProtoMsg): ConnectionPaths {
+    return ConnectionPaths.decode(message.value);
+  },
+
+  toProto(message: ConnectionPaths): Uint8Array {
+    return ConnectionPaths.encode(message).finish();
+  },
+
+  toProtoMsg(message: ConnectionPaths): ConnectionPathsProtoMsg {
+    return {
+      typeUrl: "/ibc.core.connection.v1.ConnectionPaths",
+      value: ConnectionPaths.encode(message).finish()
+    };
   }
 
 };
@@ -1086,6 +1231,9 @@ function createBaseVersion(): Version {
 }
 
 export const Version = {
+  typeUrl: "/ibc.core.connection.v1.Version",
+  aminoType: "cosmos-sdk/Version",
+
   encode(message: Version, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.identifier !== "") {
       writer.uint32(10).string(message.identifier);
@@ -1189,6 +1337,32 @@ export const Version = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: VersionAminoMsg): Version {
+    return Version.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Version): VersionAminoMsg {
+    return {
+      type: "cosmos-sdk/Version",
+      value: Version.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: VersionProtoMsg): Version {
+    return Version.decode(message.value);
+  },
+
+  toProto(message: Version): Uint8Array {
+    return Version.encode(message).finish();
+  },
+
+  toProtoMsg(message: Version): VersionProtoMsg {
+    return {
+      typeUrl: "/ibc.core.connection.v1.Version",
+      value: Version.encode(message).finish()
+    };
   }
 
 };
@@ -1200,6 +1374,9 @@ function createBaseParams(): Params {
 }
 
 export const Params = {
+  typeUrl: "/ibc.core.connection.v1.Params",
+  aminoType: "cosmos-sdk/Params",
+
   encode(message: Params, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.maxExpectedTimePerBlock.isZero()) {
       writer.uint32(8).uint64(message.maxExpectedTimePerBlock);
@@ -1270,6 +1447,32 @@ export const Params = {
     const obj: any = {};
     obj.max_expected_time_per_block = message.maxExpectedTimePerBlock ? message.maxExpectedTimePerBlock.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ParamsAminoMsg): Params {
+    return Params.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Params): ParamsAminoMsg {
+    return {
+      type: "cosmos-sdk/Params",
+      value: Params.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ParamsProtoMsg): Params {
+    return Params.decode(message.value);
+  },
+
+  toProto(message: Params): Uint8Array {
+    return Params.encode(message).finish();
+  },
+
+  toProtoMsg(message: Params): ParamsProtoMsg {
+    return {
+      typeUrl: "/ibc.core.connection.v1.Params",
+      value: Params.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/ibc/core/connection/v1/genesis.ts b/__fixtures__/outputv2/ibc/core/connection/v1/genesis.ts
index cda88b680..e60174e7f 100644
--- a/__fixtures__/outputv2/ibc/core/connection/v1/genesis.ts
+++ b/__fixtures__/outputv2/ibc/core/connection/v1/genesis.ts
@@ -12,7 +12,7 @@ export interface GenesisState {
   nextConnectionSequence: Long;
   params?: Params;
 }
-export interface GenesisStateProtoType {
+export interface GenesisStateProtoMsg {
   typeUrl: "/ibc.core.connection.v1.GenesisState";
   value: Uint8Array;
 }
@@ -26,7 +26,7 @@ export interface GenesisStateAmino {
   next_connection_sequence: string;
   params?: ParamsAmino;
 }
-export interface GenesisStateAminoType {
+export interface GenesisStateAminoMsg {
   type: "cosmos-sdk/GenesisState";
   value: GenesisStateAmino;
 }
@@ -49,6 +49,9 @@ function createBaseGenesisState(): GenesisState {
 }
 
 export const GenesisState = {
+  typeUrl: "/ibc.core.connection.v1.GenesisState",
+  aminoType: "cosmos-sdk/GenesisState",
+
   encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.connections) {
       IdentifiedConnection.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -197,6 +200,32 @@ export const GenesisState = {
     obj.next_connection_sequence = message.nextConnectionSequence ? message.nextConnectionSequence.toString() : undefined;
     obj.params = message.params ? Params.toAmino(message.params) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisStateAminoMsg): GenesisState {
+    return GenesisState.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GenesisState): GenesisStateAminoMsg {
+    return {
+      type: "cosmos-sdk/GenesisState",
+      value: GenesisState.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GenesisStateProtoMsg): GenesisState {
+    return GenesisState.decode(message.value);
+  },
+
+  toProto(message: GenesisState): Uint8Array {
+    return GenesisState.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisState): GenesisStateProtoMsg {
+    return {
+      typeUrl: "/ibc.core.connection.v1.GenesisState",
+      value: GenesisState.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/ibc/core/connection/v1/query.ts b/__fixtures__/outputv2/ibc/core/connection/v1/query.ts
index bffdf6c94..7be106aa1 100644
--- a/__fixtures__/outputv2/ibc/core/connection/v1/query.ts
+++ b/__fixtures__/outputv2/ibc/core/connection/v1/query.ts
@@ -14,7 +14,7 @@ export interface QueryConnectionRequest {
   /** connection unique identifier */
   connectionId: string;
 }
-export interface QueryConnectionRequestProtoType {
+export interface QueryConnectionRequestProtoMsg {
   typeUrl: "/ibc.core.connection.v1.QueryConnectionRequest";
   value: Uint8Array;
 }
@@ -27,7 +27,7 @@ export interface QueryConnectionRequestAmino {
   /** connection unique identifier */
   connection_id: string;
 }
-export interface QueryConnectionRequestAminoType {
+export interface QueryConnectionRequestAminoMsg {
   type: "cosmos-sdk/QueryConnectionRequest";
   value: QueryConnectionRequestAmino;
 }
@@ -55,7 +55,7 @@ export interface QueryConnectionResponse {
   /** height at which the proof was retrieved */
   proofHeight?: Height;
 }
-export interface QueryConnectionResponseProtoType {
+export interface QueryConnectionResponseProtoMsg {
   typeUrl: "/ibc.core.connection.v1.QueryConnectionResponse";
   value: Uint8Array;
 }
@@ -75,7 +75,7 @@ export interface QueryConnectionResponseAmino {
   /** height at which the proof was retrieved */
   proof_height?: HeightAmino;
 }
-export interface QueryConnectionResponseAminoType {
+export interface QueryConnectionResponseAminoMsg {
   type: "cosmos-sdk/QueryConnectionResponse";
   value: QueryConnectionResponseAmino;
 }
@@ -98,7 +98,7 @@ export interface QueryConnectionResponseSDKType {
 export interface QueryConnectionsRequest {
   pagination?: PageRequest;
 }
-export interface QueryConnectionsRequestProtoType {
+export interface QueryConnectionsRequestProtoMsg {
   typeUrl: "/ibc.core.connection.v1.QueryConnectionsRequest";
   value: Uint8Array;
 }
@@ -110,7 +110,7 @@ export interface QueryConnectionsRequestProtoType {
 export interface QueryConnectionsRequestAmino {
   pagination?: PageRequestAmino;
 }
-export interface QueryConnectionsRequestAminoType {
+export interface QueryConnectionsRequestAminoMsg {
   type: "cosmos-sdk/QueryConnectionsRequest";
   value: QueryConnectionsRequestAmino;
 }
@@ -137,7 +137,7 @@ export interface QueryConnectionsResponse {
   /** query block height */
   height?: Height;
 }
-export interface QueryConnectionsResponseProtoType {
+export interface QueryConnectionsResponseProtoMsg {
   typeUrl: "/ibc.core.connection.v1.QueryConnectionsResponse";
   value: Uint8Array;
 }
@@ -156,7 +156,7 @@ export interface QueryConnectionsResponseAmino {
   /** query block height */
   height?: HeightAmino;
 }
-export interface QueryConnectionsResponseAminoType {
+export interface QueryConnectionsResponseAminoMsg {
   type: "cosmos-sdk/QueryConnectionsResponse";
   value: QueryConnectionsResponseAmino;
 }
@@ -179,7 +179,7 @@ export interface QueryClientConnectionsRequest {
   /** client identifier associated with a connection */
   clientId: string;
 }
-export interface QueryClientConnectionsRequestProtoType {
+export interface QueryClientConnectionsRequestProtoMsg {
   typeUrl: "/ibc.core.connection.v1.QueryClientConnectionsRequest";
   value: Uint8Array;
 }
@@ -192,7 +192,7 @@ export interface QueryClientConnectionsRequestAmino {
   /** client identifier associated with a connection */
   client_id: string;
 }
-export interface QueryClientConnectionsRequestAminoType {
+export interface QueryClientConnectionsRequestAminoMsg {
   type: "cosmos-sdk/QueryClientConnectionsRequest";
   value: QueryClientConnectionsRequestAmino;
 }
@@ -219,7 +219,7 @@ export interface QueryClientConnectionsResponse {
   /** height at which the proof was generated */
   proofHeight?: Height;
 }
-export interface QueryClientConnectionsResponseProtoType {
+export interface QueryClientConnectionsResponseProtoMsg {
   typeUrl: "/ibc.core.connection.v1.QueryClientConnectionsResponse";
   value: Uint8Array;
 }
@@ -238,7 +238,7 @@ export interface QueryClientConnectionsResponseAmino {
   /** height at which the proof was generated */
   proof_height?: HeightAmino;
 }
-export interface QueryClientConnectionsResponseAminoType {
+export interface QueryClientConnectionsResponseAminoMsg {
   type: "cosmos-sdk/QueryClientConnectionsResponse";
   value: QueryClientConnectionsResponseAmino;
 }
@@ -261,7 +261,7 @@ export interface QueryConnectionClientStateRequest {
   /** connection identifier */
   connectionId: string;
 }
-export interface QueryConnectionClientStateRequestProtoType {
+export interface QueryConnectionClientStateRequestProtoMsg {
   typeUrl: "/ibc.core.connection.v1.QueryConnectionClientStateRequest";
   value: Uint8Array;
 }
@@ -274,7 +274,7 @@ export interface QueryConnectionClientStateRequestAmino {
   /** connection identifier */
   connection_id: string;
 }
-export interface QueryConnectionClientStateRequestAminoType {
+export interface QueryConnectionClientStateRequestAminoMsg {
   type: "cosmos-sdk/QueryConnectionClientStateRequest";
   value: QueryConnectionClientStateRequestAmino;
 }
@@ -301,7 +301,7 @@ export interface QueryConnectionClientStateResponse {
   /** height at which the proof was retrieved */
   proofHeight?: Height;
 }
-export interface QueryConnectionClientStateResponseProtoType {
+export interface QueryConnectionClientStateResponseProtoMsg {
   typeUrl: "/ibc.core.connection.v1.QueryConnectionClientStateResponse";
   value: Uint8Array;
 }
@@ -320,7 +320,7 @@ export interface QueryConnectionClientStateResponseAmino {
   /** height at which the proof was retrieved */
   proof_height?: HeightAmino;
 }
-export interface QueryConnectionClientStateResponseAminoType {
+export interface QueryConnectionClientStateResponseAminoMsg {
   type: "cosmos-sdk/QueryConnectionClientStateResponse";
   value: QueryConnectionClientStateResponseAmino;
 }
@@ -345,7 +345,7 @@ export interface QueryConnectionConsensusStateRequest {
   revisionNumber: Long;
   revisionHeight: Long;
 }
-export interface QueryConnectionConsensusStateRequestProtoType {
+export interface QueryConnectionConsensusStateRequestProtoMsg {
   typeUrl: "/ibc.core.connection.v1.QueryConnectionConsensusStateRequest";
   value: Uint8Array;
 }
@@ -360,7 +360,7 @@ export interface QueryConnectionConsensusStateRequestAmino {
   revision_number: string;
   revision_height: string;
 }
-export interface QueryConnectionConsensusStateRequestAminoType {
+export interface QueryConnectionConsensusStateRequestAminoMsg {
   type: "cosmos-sdk/QueryConnectionConsensusStateRequest";
   value: QueryConnectionConsensusStateRequestAmino;
 }
@@ -392,7 +392,7 @@ export interface QueryConnectionConsensusStateResponse {
   /** height at which the proof was retrieved */
   proofHeight?: Height;
 }
-export interface QueryConnectionConsensusStateResponseProtoType {
+export interface QueryConnectionConsensusStateResponseProtoMsg {
   typeUrl: "/ibc.core.connection.v1.QueryConnectionConsensusStateResponse";
   value: Uint8Array;
 }
@@ -414,7 +414,7 @@ export interface QueryConnectionConsensusStateResponseAmino {
   /** height at which the proof was retrieved */
   proof_height?: HeightAmino;
 }
-export interface QueryConnectionConsensusStateResponseAminoType {
+export interface QueryConnectionConsensusStateResponseAminoMsg {
   type: "cosmos-sdk/QueryConnectionConsensusStateResponse";
   value: QueryConnectionConsensusStateResponseAmino;
 }
@@ -437,6 +437,9 @@ function createBaseQueryConnectionRequest(): QueryConnectionRequest {
 }
 
 export const QueryConnectionRequest = {
+  typeUrl: "/ibc.core.connection.v1.QueryConnectionRequest",
+  aminoType: "cosmos-sdk/QueryConnectionRequest",
+
   encode(message: QueryConnectionRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.connectionId !== "") {
       writer.uint32(10).string(message.connectionId);
@@ -507,6 +510,32 @@ export const QueryConnectionRequest = {
     const obj: any = {};
     obj.connection_id = message.connectionId;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryConnectionRequestAminoMsg): QueryConnectionRequest {
+    return QueryConnectionRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryConnectionRequest): QueryConnectionRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryConnectionRequest",
+      value: QueryConnectionRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryConnectionRequestProtoMsg): QueryConnectionRequest {
+    return QueryConnectionRequest.decode(message.value);
+  },
+
+  toProto(message: QueryConnectionRequest): Uint8Array {
+    return QueryConnectionRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryConnectionRequest): QueryConnectionRequestProtoMsg {
+    return {
+      typeUrl: "/ibc.core.connection.v1.QueryConnectionRequest",
+      value: QueryConnectionRequest.encode(message).finish()
+    };
   }
 
 };
@@ -520,6 +549,9 @@ function createBaseQueryConnectionResponse(): QueryConnectionResponse {
 }
 
 export const QueryConnectionResponse = {
+  typeUrl: "/ibc.core.connection.v1.QueryConnectionResponse",
+  aminoType: "cosmos-sdk/QueryConnectionResponse",
+
   encode(message: QueryConnectionResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.connection !== undefined) {
       ConnectionEnd.encode(message.connection, writer.uint32(10).fork()).ldelim();
@@ -620,6 +652,32 @@ export const QueryConnectionResponse = {
     obj.proof = message.proof;
     obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryConnectionResponseAminoMsg): QueryConnectionResponse {
+    return QueryConnectionResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryConnectionResponse): QueryConnectionResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryConnectionResponse",
+      value: QueryConnectionResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryConnectionResponseProtoMsg): QueryConnectionResponse {
+    return QueryConnectionResponse.decode(message.value);
+  },
+
+  toProto(message: QueryConnectionResponse): Uint8Array {
+    return QueryConnectionResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryConnectionResponse): QueryConnectionResponseProtoMsg {
+    return {
+      typeUrl: "/ibc.core.connection.v1.QueryConnectionResponse",
+      value: QueryConnectionResponse.encode(message).finish()
+    };
   }
 
 };
@@ -631,6 +689,9 @@ function createBaseQueryConnectionsRequest(): QueryConnectionsRequest {
 }
 
 export const QueryConnectionsRequest = {
+  typeUrl: "/ibc.core.connection.v1.QueryConnectionsRequest",
+  aminoType: "cosmos-sdk/QueryConnectionsRequest",
+
   encode(message: QueryConnectionsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.pagination !== undefined) {
       PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim();
@@ -701,6 +762,32 @@ export const QueryConnectionsRequest = {
     const obj: any = {};
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryConnectionsRequestAminoMsg): QueryConnectionsRequest {
+    return QueryConnectionsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryConnectionsRequest): QueryConnectionsRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryConnectionsRequest",
+      value: QueryConnectionsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryConnectionsRequestProtoMsg): QueryConnectionsRequest {
+    return QueryConnectionsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryConnectionsRequest): Uint8Array {
+    return QueryConnectionsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryConnectionsRequest): QueryConnectionsRequestProtoMsg {
+    return {
+      typeUrl: "/ibc.core.connection.v1.QueryConnectionsRequest",
+      value: QueryConnectionsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -714,6 +801,9 @@ function createBaseQueryConnectionsResponse(): QueryConnectionsResponse {
 }
 
 export const QueryConnectionsResponse = {
+  typeUrl: "/ibc.core.connection.v1.QueryConnectionsResponse",
+  aminoType: "cosmos-sdk/QueryConnectionsResponse",
+
   encode(message: QueryConnectionsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.connections) {
       IdentifiedConnection.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -832,6 +922,32 @@ export const QueryConnectionsResponse = {
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     obj.height = message.height ? Height.toAmino(message.height) : {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryConnectionsResponseAminoMsg): QueryConnectionsResponse {
+    return QueryConnectionsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryConnectionsResponse): QueryConnectionsResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryConnectionsResponse",
+      value: QueryConnectionsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryConnectionsResponseProtoMsg): QueryConnectionsResponse {
+    return QueryConnectionsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryConnectionsResponse): Uint8Array {
+    return QueryConnectionsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryConnectionsResponse): QueryConnectionsResponseProtoMsg {
+    return {
+      typeUrl: "/ibc.core.connection.v1.QueryConnectionsResponse",
+      value: QueryConnectionsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -843,6 +959,9 @@ function createBaseQueryClientConnectionsRequest(): QueryClientConnectionsReques
 }
 
 export const QueryClientConnectionsRequest = {
+  typeUrl: "/ibc.core.connection.v1.QueryClientConnectionsRequest",
+  aminoType: "cosmos-sdk/QueryClientConnectionsRequest",
+
   encode(message: QueryClientConnectionsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.clientId !== "") {
       writer.uint32(10).string(message.clientId);
@@ -913,6 +1032,32 @@ export const QueryClientConnectionsRequest = {
     const obj: any = {};
     obj.client_id = message.clientId;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryClientConnectionsRequestAminoMsg): QueryClientConnectionsRequest {
+    return QueryClientConnectionsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryClientConnectionsRequest): QueryClientConnectionsRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryClientConnectionsRequest",
+      value: QueryClientConnectionsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryClientConnectionsRequestProtoMsg): QueryClientConnectionsRequest {
+    return QueryClientConnectionsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryClientConnectionsRequest): Uint8Array {
+    return QueryClientConnectionsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryClientConnectionsRequest): QueryClientConnectionsRequestProtoMsg {
+    return {
+      typeUrl: "/ibc.core.connection.v1.QueryClientConnectionsRequest",
+      value: QueryClientConnectionsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -926,6 +1071,9 @@ function createBaseQueryClientConnectionsResponse(): QueryClientConnectionsRespo
 }
 
 export const QueryClientConnectionsResponse = {
+  typeUrl: "/ibc.core.connection.v1.QueryClientConnectionsResponse",
+  aminoType: "cosmos-sdk/QueryClientConnectionsResponse",
+
   encode(message: QueryClientConnectionsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.connectionPaths) {
       writer.uint32(10).string(v!);
@@ -1044,6 +1192,32 @@ export const QueryClientConnectionsResponse = {
     obj.proof = message.proof;
     obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryClientConnectionsResponseAminoMsg): QueryClientConnectionsResponse {
+    return QueryClientConnectionsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryClientConnectionsResponse): QueryClientConnectionsResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryClientConnectionsResponse",
+      value: QueryClientConnectionsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryClientConnectionsResponseProtoMsg): QueryClientConnectionsResponse {
+    return QueryClientConnectionsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryClientConnectionsResponse): Uint8Array {
+    return QueryClientConnectionsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryClientConnectionsResponse): QueryClientConnectionsResponseProtoMsg {
+    return {
+      typeUrl: "/ibc.core.connection.v1.QueryClientConnectionsResponse",
+      value: QueryClientConnectionsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1055,6 +1229,9 @@ function createBaseQueryConnectionClientStateRequest(): QueryConnectionClientSta
 }
 
 export const QueryConnectionClientStateRequest = {
+  typeUrl: "/ibc.core.connection.v1.QueryConnectionClientStateRequest",
+  aminoType: "cosmos-sdk/QueryConnectionClientStateRequest",
+
   encode(message: QueryConnectionClientStateRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.connectionId !== "") {
       writer.uint32(10).string(message.connectionId);
@@ -1125,6 +1302,32 @@ export const QueryConnectionClientStateRequest = {
     const obj: any = {};
     obj.connection_id = message.connectionId;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryConnectionClientStateRequestAminoMsg): QueryConnectionClientStateRequest {
+    return QueryConnectionClientStateRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryConnectionClientStateRequest): QueryConnectionClientStateRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryConnectionClientStateRequest",
+      value: QueryConnectionClientStateRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryConnectionClientStateRequestProtoMsg): QueryConnectionClientStateRequest {
+    return QueryConnectionClientStateRequest.decode(message.value);
+  },
+
+  toProto(message: QueryConnectionClientStateRequest): Uint8Array {
+    return QueryConnectionClientStateRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryConnectionClientStateRequest): QueryConnectionClientStateRequestProtoMsg {
+    return {
+      typeUrl: "/ibc.core.connection.v1.QueryConnectionClientStateRequest",
+      value: QueryConnectionClientStateRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1138,6 +1341,9 @@ function createBaseQueryConnectionClientStateResponse(): QueryConnectionClientSt
 }
 
 export const QueryConnectionClientStateResponse = {
+  typeUrl: "/ibc.core.connection.v1.QueryConnectionClientStateResponse",
+  aminoType: "cosmos-sdk/QueryConnectionClientStateResponse",
+
   encode(message: QueryConnectionClientStateResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.identifiedClientState !== undefined) {
       IdentifiedClientState.encode(message.identifiedClientState, writer.uint32(10).fork()).ldelim();
@@ -1238,6 +1444,32 @@ export const QueryConnectionClientStateResponse = {
     obj.proof = message.proof;
     obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryConnectionClientStateResponseAminoMsg): QueryConnectionClientStateResponse {
+    return QueryConnectionClientStateResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryConnectionClientStateResponse): QueryConnectionClientStateResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryConnectionClientStateResponse",
+      value: QueryConnectionClientStateResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryConnectionClientStateResponseProtoMsg): QueryConnectionClientStateResponse {
+    return QueryConnectionClientStateResponse.decode(message.value);
+  },
+
+  toProto(message: QueryConnectionClientStateResponse): Uint8Array {
+    return QueryConnectionClientStateResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryConnectionClientStateResponse): QueryConnectionClientStateResponseProtoMsg {
+    return {
+      typeUrl: "/ibc.core.connection.v1.QueryConnectionClientStateResponse",
+      value: QueryConnectionClientStateResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1251,6 +1483,9 @@ function createBaseQueryConnectionConsensusStateRequest(): QueryConnectionConsen
 }
 
 export const QueryConnectionConsensusStateRequest = {
+  typeUrl: "/ibc.core.connection.v1.QueryConnectionConsensusStateRequest",
+  aminoType: "cosmos-sdk/QueryConnectionConsensusStateRequest",
+
   encode(message: QueryConnectionConsensusStateRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.connectionId !== "") {
       writer.uint32(10).string(message.connectionId);
@@ -1351,6 +1586,32 @@ export const QueryConnectionConsensusStateRequest = {
     obj.revision_number = message.revisionNumber ? message.revisionNumber.toString() : undefined;
     obj.revision_height = message.revisionHeight ? message.revisionHeight.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryConnectionConsensusStateRequestAminoMsg): QueryConnectionConsensusStateRequest {
+    return QueryConnectionConsensusStateRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryConnectionConsensusStateRequest): QueryConnectionConsensusStateRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryConnectionConsensusStateRequest",
+      value: QueryConnectionConsensusStateRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryConnectionConsensusStateRequestProtoMsg): QueryConnectionConsensusStateRequest {
+    return QueryConnectionConsensusStateRequest.decode(message.value);
+  },
+
+  toProto(message: QueryConnectionConsensusStateRequest): Uint8Array {
+    return QueryConnectionConsensusStateRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryConnectionConsensusStateRequest): QueryConnectionConsensusStateRequestProtoMsg {
+    return {
+      typeUrl: "/ibc.core.connection.v1.QueryConnectionConsensusStateRequest",
+      value: QueryConnectionConsensusStateRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1365,6 +1626,9 @@ function createBaseQueryConnectionConsensusStateResponse(): QueryConnectionConse
 }
 
 export const QueryConnectionConsensusStateResponse = {
+  typeUrl: "/ibc.core.connection.v1.QueryConnectionConsensusStateResponse",
+  aminoType: "cosmos-sdk/QueryConnectionConsensusStateResponse",
+
   encode(message: QueryConnectionConsensusStateResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.consensusState !== undefined) {
       Any.encode(message.consensusState, writer.uint32(10).fork()).ldelim();
@@ -1480,6 +1744,32 @@ export const QueryConnectionConsensusStateResponse = {
     obj.proof = message.proof;
     obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryConnectionConsensusStateResponseAminoMsg): QueryConnectionConsensusStateResponse {
+    return QueryConnectionConsensusStateResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryConnectionConsensusStateResponse): QueryConnectionConsensusStateResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryConnectionConsensusStateResponse",
+      value: QueryConnectionConsensusStateResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryConnectionConsensusStateResponseProtoMsg): QueryConnectionConsensusStateResponse {
+    return QueryConnectionConsensusStateResponse.decode(message.value);
+  },
+
+  toProto(message: QueryConnectionConsensusStateResponse): Uint8Array {
+    return QueryConnectionConsensusStateResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryConnectionConsensusStateResponse): QueryConnectionConsensusStateResponseProtoMsg {
+    return {
+      typeUrl: "/ibc.core.connection.v1.QueryConnectionConsensusStateResponse",
+      value: QueryConnectionConsensusStateResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/ibc/core/connection/v1/tx.ts b/__fixtures__/outputv2/ibc/core/connection/v1/tx.ts
index 86c43e263..6dbc6ca28 100644
--- a/__fixtures__/outputv2/ibc/core/connection/v1/tx.ts
+++ b/__fixtures__/outputv2/ibc/core/connection/v1/tx.ts
@@ -16,7 +16,7 @@ export interface MsgConnectionOpenInit {
   delayPeriod: Long;
   signer: string;
 }
-export interface MsgConnectionOpenInitProtoType {
+export interface MsgConnectionOpenInitProtoMsg {
   typeUrl: "/ibc.core.connection.v1.MsgConnectionOpenInit";
   value: Uint8Array;
 }
@@ -32,7 +32,7 @@ export interface MsgConnectionOpenInitAmino {
   delay_period: string;
   signer: string;
 }
-export interface MsgConnectionOpenInitAminoType {
+export interface MsgConnectionOpenInitAminoMsg {
   type: "cosmos-sdk/MsgConnectionOpenInit";
   value: MsgConnectionOpenInitAmino;
 }
@@ -54,7 +54,7 @@ export interface MsgConnectionOpenInitSDKType {
  * type.
  */
 export interface MsgConnectionOpenInitResponse {}
-export interface MsgConnectionOpenInitResponseProtoType {
+export interface MsgConnectionOpenInitResponseProtoMsg {
   typeUrl: "/ibc.core.connection.v1.MsgConnectionOpenInitResponse";
   value: Uint8Array;
 }
@@ -64,7 +64,7 @@ export interface MsgConnectionOpenInitResponseProtoType {
  * type.
  */
 export interface MsgConnectionOpenInitResponseAmino {}
-export interface MsgConnectionOpenInitResponseAminoType {
+export interface MsgConnectionOpenInitResponseAminoMsg {
   type: "cosmos-sdk/MsgConnectionOpenInitResponse";
   value: MsgConnectionOpenInitResponseAmino;
 }
@@ -107,7 +107,7 @@ export interface MsgConnectionOpenTry {
   consensusHeight?: Height;
   signer: string;
 }
-export interface MsgConnectionOpenTryProtoType {
+export interface MsgConnectionOpenTryProtoMsg {
   typeUrl: "/ibc.core.connection.v1.MsgConnectionOpenTry";
   value: Uint8Array;
 }
@@ -144,7 +144,7 @@ export interface MsgConnectionOpenTryAmino {
   consensus_height?: HeightAmino;
   signer: string;
 }
-export interface MsgConnectionOpenTryAminoType {
+export interface MsgConnectionOpenTryAminoMsg {
   type: "cosmos-sdk/MsgConnectionOpenTry";
   value: MsgConnectionOpenTryAmino;
 }
@@ -170,14 +170,14 @@ export interface MsgConnectionOpenTrySDKType {
 
 /** MsgConnectionOpenTryResponse defines the Msg/ConnectionOpenTry response type. */
 export interface MsgConnectionOpenTryResponse {}
-export interface MsgConnectionOpenTryResponseProtoType {
+export interface MsgConnectionOpenTryResponseProtoMsg {
   typeUrl: "/ibc.core.connection.v1.MsgConnectionOpenTryResponse";
   value: Uint8Array;
 }
 
 /** MsgConnectionOpenTryResponse defines the Msg/ConnectionOpenTry response type. */
 export interface MsgConnectionOpenTryResponseAmino {}
-export interface MsgConnectionOpenTryResponseAminoType {
+export interface MsgConnectionOpenTryResponseAminoMsg {
   type: "cosmos-sdk/MsgConnectionOpenTryResponse";
   value: MsgConnectionOpenTryResponseAmino;
 }
@@ -210,7 +210,7 @@ export interface MsgConnectionOpenAck {
   consensusHeight?: Height;
   signer: string;
 }
-export interface MsgConnectionOpenAckProtoType {
+export interface MsgConnectionOpenAckProtoMsg {
   typeUrl: "/ibc.core.connection.v1.MsgConnectionOpenAck";
   value: Uint8Array;
 }
@@ -240,7 +240,7 @@ export interface MsgConnectionOpenAckAmino {
   consensus_height?: HeightAmino;
   signer: string;
 }
-export interface MsgConnectionOpenAckAminoType {
+export interface MsgConnectionOpenAckAminoMsg {
   type: "cosmos-sdk/MsgConnectionOpenAck";
   value: MsgConnectionOpenAckAmino;
 }
@@ -264,14 +264,14 @@ export interface MsgConnectionOpenAckSDKType {
 
 /** MsgConnectionOpenAckResponse defines the Msg/ConnectionOpenAck response type. */
 export interface MsgConnectionOpenAckResponse {}
-export interface MsgConnectionOpenAckResponseProtoType {
+export interface MsgConnectionOpenAckResponseProtoMsg {
   typeUrl: "/ibc.core.connection.v1.MsgConnectionOpenAckResponse";
   value: Uint8Array;
 }
 
 /** MsgConnectionOpenAckResponse defines the Msg/ConnectionOpenAck response type. */
 export interface MsgConnectionOpenAckResponseAmino {}
-export interface MsgConnectionOpenAckResponseAminoType {
+export interface MsgConnectionOpenAckResponseAminoMsg {
   type: "cosmos-sdk/MsgConnectionOpenAckResponse";
   value: MsgConnectionOpenAckResponseAmino;
 }
@@ -291,7 +291,7 @@ export interface MsgConnectionOpenConfirm {
   proofHeight?: Height;
   signer: string;
 }
-export interface MsgConnectionOpenConfirmProtoType {
+export interface MsgConnectionOpenConfirmProtoMsg {
   typeUrl: "/ibc.core.connection.v1.MsgConnectionOpenConfirm";
   value: Uint8Array;
 }
@@ -308,7 +308,7 @@ export interface MsgConnectionOpenConfirmAmino {
   proof_height?: HeightAmino;
   signer: string;
 }
-export interface MsgConnectionOpenConfirmAminoType {
+export interface MsgConnectionOpenConfirmAminoMsg {
   type: "cosmos-sdk/MsgConnectionOpenConfirm";
   value: MsgConnectionOpenConfirmAmino;
 }
@@ -329,7 +329,7 @@ export interface MsgConnectionOpenConfirmSDKType {
  * response type.
  */
 export interface MsgConnectionOpenConfirmResponse {}
-export interface MsgConnectionOpenConfirmResponseProtoType {
+export interface MsgConnectionOpenConfirmResponseProtoMsg {
   typeUrl: "/ibc.core.connection.v1.MsgConnectionOpenConfirmResponse";
   value: Uint8Array;
 }
@@ -339,7 +339,7 @@ export interface MsgConnectionOpenConfirmResponseProtoType {
  * response type.
  */
 export interface MsgConnectionOpenConfirmResponseAmino {}
-export interface MsgConnectionOpenConfirmResponseAminoType {
+export interface MsgConnectionOpenConfirmResponseAminoMsg {
   type: "cosmos-sdk/MsgConnectionOpenConfirmResponse";
   value: MsgConnectionOpenConfirmResponseAmino;
 }
@@ -361,6 +361,9 @@ function createBaseMsgConnectionOpenInit(): MsgConnectionOpenInit {
 }
 
 export const MsgConnectionOpenInit = {
+  typeUrl: "/ibc.core.connection.v1.MsgConnectionOpenInit",
+  aminoType: "cosmos-sdk/MsgConnectionOpenInit",
+
   encode(message: MsgConnectionOpenInit, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.clientId !== "") {
       writer.uint32(10).string(message.clientId);
@@ -491,6 +494,32 @@ export const MsgConnectionOpenInit = {
     obj.delay_period = message.delayPeriod ? message.delayPeriod.toString() : undefined;
     obj.signer = message.signer;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgConnectionOpenInitAminoMsg): MsgConnectionOpenInit {
+    return MsgConnectionOpenInit.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgConnectionOpenInit): MsgConnectionOpenInitAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgConnectionOpenInit",
+      value: MsgConnectionOpenInit.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgConnectionOpenInitProtoMsg): MsgConnectionOpenInit {
+    return MsgConnectionOpenInit.decode(message.value);
+  },
+
+  toProto(message: MsgConnectionOpenInit): Uint8Array {
+    return MsgConnectionOpenInit.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgConnectionOpenInit): MsgConnectionOpenInitProtoMsg {
+    return {
+      typeUrl: "/ibc.core.connection.v1.MsgConnectionOpenInit",
+      value: MsgConnectionOpenInit.encode(message).finish()
+    };
   }
 
 };
@@ -500,6 +529,9 @@ function createBaseMsgConnectionOpenInitResponse(): MsgConnectionOpenInitRespons
 }
 
 export const MsgConnectionOpenInitResponse = {
+  typeUrl: "/ibc.core.connection.v1.MsgConnectionOpenInitResponse",
+  aminoType: "cosmos-sdk/MsgConnectionOpenInitResponse",
+
   encode(_: MsgConnectionOpenInitResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -552,6 +584,32 @@ export const MsgConnectionOpenInitResponse = {
   toAmino(_: MsgConnectionOpenInitResponse): MsgConnectionOpenInitResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgConnectionOpenInitResponseAminoMsg): MsgConnectionOpenInitResponse {
+    return MsgConnectionOpenInitResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgConnectionOpenInitResponse): MsgConnectionOpenInitResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgConnectionOpenInitResponse",
+      value: MsgConnectionOpenInitResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgConnectionOpenInitResponseProtoMsg): MsgConnectionOpenInitResponse {
+    return MsgConnectionOpenInitResponse.decode(message.value);
+  },
+
+  toProto(message: MsgConnectionOpenInitResponse): Uint8Array {
+    return MsgConnectionOpenInitResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgConnectionOpenInitResponse): MsgConnectionOpenInitResponseProtoMsg {
+    return {
+      typeUrl: "/ibc.core.connection.v1.MsgConnectionOpenInitResponse",
+      value: MsgConnectionOpenInitResponse.encode(message).finish()
+    };
   }
 
 };
@@ -574,6 +632,9 @@ function createBaseMsgConnectionOpenTry(): MsgConnectionOpenTry {
 }
 
 export const MsgConnectionOpenTry = {
+  typeUrl: "/ibc.core.connection.v1.MsgConnectionOpenTry",
+  aminoType: "cosmos-sdk/MsgConnectionOpenTry",
+
   encode(message: MsgConnectionOpenTry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.clientId !== "") {
       writer.uint32(10).string(message.clientId);
@@ -827,6 +888,32 @@ export const MsgConnectionOpenTry = {
     obj.consensus_height = message.consensusHeight ? Height.toAmino(message.consensusHeight) : {};
     obj.signer = message.signer;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgConnectionOpenTryAminoMsg): MsgConnectionOpenTry {
+    return MsgConnectionOpenTry.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgConnectionOpenTry): MsgConnectionOpenTryAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgConnectionOpenTry",
+      value: MsgConnectionOpenTry.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgConnectionOpenTryProtoMsg): MsgConnectionOpenTry {
+    return MsgConnectionOpenTry.decode(message.value);
+  },
+
+  toProto(message: MsgConnectionOpenTry): Uint8Array {
+    return MsgConnectionOpenTry.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgConnectionOpenTry): MsgConnectionOpenTryProtoMsg {
+    return {
+      typeUrl: "/ibc.core.connection.v1.MsgConnectionOpenTry",
+      value: MsgConnectionOpenTry.encode(message).finish()
+    };
   }
 
 };
@@ -836,6 +923,9 @@ function createBaseMsgConnectionOpenTryResponse(): MsgConnectionOpenTryResponse
 }
 
 export const MsgConnectionOpenTryResponse = {
+  typeUrl: "/ibc.core.connection.v1.MsgConnectionOpenTryResponse",
+  aminoType: "cosmos-sdk/MsgConnectionOpenTryResponse",
+
   encode(_: MsgConnectionOpenTryResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -888,6 +978,32 @@ export const MsgConnectionOpenTryResponse = {
   toAmino(_: MsgConnectionOpenTryResponse): MsgConnectionOpenTryResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgConnectionOpenTryResponseAminoMsg): MsgConnectionOpenTryResponse {
+    return MsgConnectionOpenTryResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgConnectionOpenTryResponse): MsgConnectionOpenTryResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgConnectionOpenTryResponse",
+      value: MsgConnectionOpenTryResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgConnectionOpenTryResponseProtoMsg): MsgConnectionOpenTryResponse {
+    return MsgConnectionOpenTryResponse.decode(message.value);
+  },
+
+  toProto(message: MsgConnectionOpenTryResponse): Uint8Array {
+    return MsgConnectionOpenTryResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgConnectionOpenTryResponse): MsgConnectionOpenTryResponseProtoMsg {
+    return {
+      typeUrl: "/ibc.core.connection.v1.MsgConnectionOpenTryResponse",
+      value: MsgConnectionOpenTryResponse.encode(message).finish()
+    };
   }
 
 };
@@ -908,6 +1024,9 @@ function createBaseMsgConnectionOpenAck(): MsgConnectionOpenAck {
 }
 
 export const MsgConnectionOpenAck = {
+  typeUrl: "/ibc.core.connection.v1.MsgConnectionOpenAck",
+  aminoType: "cosmos-sdk/MsgConnectionOpenAck",
+
   encode(message: MsgConnectionOpenAck, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.connectionId !== "") {
       writer.uint32(10).string(message.connectionId);
@@ -1113,6 +1232,32 @@ export const MsgConnectionOpenAck = {
     obj.consensus_height = message.consensusHeight ? Height.toAmino(message.consensusHeight) : {};
     obj.signer = message.signer;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgConnectionOpenAckAminoMsg): MsgConnectionOpenAck {
+    return MsgConnectionOpenAck.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgConnectionOpenAck): MsgConnectionOpenAckAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgConnectionOpenAck",
+      value: MsgConnectionOpenAck.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgConnectionOpenAckProtoMsg): MsgConnectionOpenAck {
+    return MsgConnectionOpenAck.decode(message.value);
+  },
+
+  toProto(message: MsgConnectionOpenAck): Uint8Array {
+    return MsgConnectionOpenAck.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgConnectionOpenAck): MsgConnectionOpenAckProtoMsg {
+    return {
+      typeUrl: "/ibc.core.connection.v1.MsgConnectionOpenAck",
+      value: MsgConnectionOpenAck.encode(message).finish()
+    };
   }
 
 };
@@ -1122,6 +1267,9 @@ function createBaseMsgConnectionOpenAckResponse(): MsgConnectionOpenAckResponse
 }
 
 export const MsgConnectionOpenAckResponse = {
+  typeUrl: "/ibc.core.connection.v1.MsgConnectionOpenAckResponse",
+  aminoType: "cosmos-sdk/MsgConnectionOpenAckResponse",
+
   encode(_: MsgConnectionOpenAckResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -1174,6 +1322,32 @@ export const MsgConnectionOpenAckResponse = {
   toAmino(_: MsgConnectionOpenAckResponse): MsgConnectionOpenAckResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgConnectionOpenAckResponseAminoMsg): MsgConnectionOpenAckResponse {
+    return MsgConnectionOpenAckResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgConnectionOpenAckResponse): MsgConnectionOpenAckResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgConnectionOpenAckResponse",
+      value: MsgConnectionOpenAckResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgConnectionOpenAckResponseProtoMsg): MsgConnectionOpenAckResponse {
+    return MsgConnectionOpenAckResponse.decode(message.value);
+  },
+
+  toProto(message: MsgConnectionOpenAckResponse): Uint8Array {
+    return MsgConnectionOpenAckResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgConnectionOpenAckResponse): MsgConnectionOpenAckResponseProtoMsg {
+    return {
+      typeUrl: "/ibc.core.connection.v1.MsgConnectionOpenAckResponse",
+      value: MsgConnectionOpenAckResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1188,6 +1362,9 @@ function createBaseMsgConnectionOpenConfirm(): MsgConnectionOpenConfirm {
 }
 
 export const MsgConnectionOpenConfirm = {
+  typeUrl: "/ibc.core.connection.v1.MsgConnectionOpenConfirm",
+  aminoType: "cosmos-sdk/MsgConnectionOpenConfirm",
+
   encode(message: MsgConnectionOpenConfirm, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.connectionId !== "") {
       writer.uint32(10).string(message.connectionId);
@@ -1303,6 +1480,32 @@ export const MsgConnectionOpenConfirm = {
     obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {};
     obj.signer = message.signer;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgConnectionOpenConfirmAminoMsg): MsgConnectionOpenConfirm {
+    return MsgConnectionOpenConfirm.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgConnectionOpenConfirm): MsgConnectionOpenConfirmAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgConnectionOpenConfirm",
+      value: MsgConnectionOpenConfirm.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgConnectionOpenConfirmProtoMsg): MsgConnectionOpenConfirm {
+    return MsgConnectionOpenConfirm.decode(message.value);
+  },
+
+  toProto(message: MsgConnectionOpenConfirm): Uint8Array {
+    return MsgConnectionOpenConfirm.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgConnectionOpenConfirm): MsgConnectionOpenConfirmProtoMsg {
+    return {
+      typeUrl: "/ibc.core.connection.v1.MsgConnectionOpenConfirm",
+      value: MsgConnectionOpenConfirm.encode(message).finish()
+    };
   }
 
 };
@@ -1312,6 +1515,9 @@ function createBaseMsgConnectionOpenConfirmResponse(): MsgConnectionOpenConfirmR
 }
 
 export const MsgConnectionOpenConfirmResponse = {
+  typeUrl: "/ibc.core.connection.v1.MsgConnectionOpenConfirmResponse",
+  aminoType: "cosmos-sdk/MsgConnectionOpenConfirmResponse",
+
   encode(_: MsgConnectionOpenConfirmResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -1364,6 +1570,32 @@ export const MsgConnectionOpenConfirmResponse = {
   toAmino(_: MsgConnectionOpenConfirmResponse): MsgConnectionOpenConfirmResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgConnectionOpenConfirmResponseAminoMsg): MsgConnectionOpenConfirmResponse {
+    return MsgConnectionOpenConfirmResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgConnectionOpenConfirmResponse): MsgConnectionOpenConfirmResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgConnectionOpenConfirmResponse",
+      value: MsgConnectionOpenConfirmResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgConnectionOpenConfirmResponseProtoMsg): MsgConnectionOpenConfirmResponse {
+    return MsgConnectionOpenConfirmResponse.decode(message.value);
+  },
+
+  toProto(message: MsgConnectionOpenConfirmResponse): Uint8Array {
+    return MsgConnectionOpenConfirmResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgConnectionOpenConfirmResponse): MsgConnectionOpenConfirmResponseProtoMsg {
+    return {
+      typeUrl: "/ibc.core.connection.v1.MsgConnectionOpenConfirmResponse",
+      value: MsgConnectionOpenConfirmResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/ibc/core/port/v1/query.ts b/__fixtures__/outputv2/ibc/core/port/v1/query.ts
index cb57075ac..bdd238919 100644
--- a/__fixtures__/outputv2/ibc/core/port/v1/query.ts
+++ b/__fixtures__/outputv2/ibc/core/port/v1/query.ts
@@ -20,7 +20,7 @@ export interface QueryAppVersionRequest {
   /** proposed version */
   proposedVersion: string;
 }
-export interface QueryAppVersionRequestProtoType {
+export interface QueryAppVersionRequestProtoMsg {
   typeUrl: "/ibc.core.port.v1.QueryAppVersionRequest";
   value: Uint8Array;
 }
@@ -42,7 +42,7 @@ export interface QueryAppVersionRequestAmino {
   /** proposed version */
   proposed_version: string;
 }
-export interface QueryAppVersionRequestAminoType {
+export interface QueryAppVersionRequestAminoMsg {
   type: "cosmos-sdk/QueryAppVersionRequest";
   value: QueryAppVersionRequestAmino;
 }
@@ -64,7 +64,7 @@ export interface QueryAppVersionResponse {
   /** supported app version */
   version: string;
 }
-export interface QueryAppVersionResponseProtoType {
+export interface QueryAppVersionResponseProtoMsg {
   typeUrl: "/ibc.core.port.v1.QueryAppVersionResponse";
   value: Uint8Array;
 }
@@ -77,7 +77,7 @@ export interface QueryAppVersionResponseAmino {
   /** supported app version */
   version: string;
 }
-export interface QueryAppVersionResponseAminoType {
+export interface QueryAppVersionResponseAminoMsg {
   type: "cosmos-sdk/QueryAppVersionResponse";
   value: QueryAppVersionResponseAmino;
 }
@@ -99,6 +99,9 @@ function createBaseQueryAppVersionRequest(): QueryAppVersionRequest {
 }
 
 export const QueryAppVersionRequest = {
+  typeUrl: "/ibc.core.port.v1.QueryAppVersionRequest",
+  aminoType: "cosmos-sdk/QueryAppVersionRequest",
+
   encode(message: QueryAppVersionRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.portId !== "") {
       writer.uint32(10).string(message.portId);
@@ -229,6 +232,32 @@ export const QueryAppVersionRequest = {
     obj.counterparty = message.counterparty ? Counterparty.toAmino(message.counterparty) : undefined;
     obj.proposed_version = message.proposedVersion;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryAppVersionRequestAminoMsg): QueryAppVersionRequest {
+    return QueryAppVersionRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryAppVersionRequest): QueryAppVersionRequestAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryAppVersionRequest",
+      value: QueryAppVersionRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryAppVersionRequestProtoMsg): QueryAppVersionRequest {
+    return QueryAppVersionRequest.decode(message.value);
+  },
+
+  toProto(message: QueryAppVersionRequest): Uint8Array {
+    return QueryAppVersionRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryAppVersionRequest): QueryAppVersionRequestProtoMsg {
+    return {
+      typeUrl: "/ibc.core.port.v1.QueryAppVersionRequest",
+      value: QueryAppVersionRequest.encode(message).finish()
+    };
   }
 
 };
@@ -241,6 +270,9 @@ function createBaseQueryAppVersionResponse(): QueryAppVersionResponse {
 }
 
 export const QueryAppVersionResponse = {
+  typeUrl: "/ibc.core.port.v1.QueryAppVersionResponse",
+  aminoType: "cosmos-sdk/QueryAppVersionResponse",
+
   encode(message: QueryAppVersionResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.portId !== "") {
       writer.uint32(10).string(message.portId);
@@ -326,6 +358,32 @@ export const QueryAppVersionResponse = {
     obj.port_id = message.portId;
     obj.version = message.version;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryAppVersionResponseAminoMsg): QueryAppVersionResponse {
+    return QueryAppVersionResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryAppVersionResponse): QueryAppVersionResponseAminoMsg {
+    return {
+      type: "cosmos-sdk/QueryAppVersionResponse",
+      value: QueryAppVersionResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryAppVersionResponseProtoMsg): QueryAppVersionResponse {
+    return QueryAppVersionResponse.decode(message.value);
+  },
+
+  toProto(message: QueryAppVersionResponse): Uint8Array {
+    return QueryAppVersionResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryAppVersionResponse): QueryAppVersionResponseProtoMsg {
+    return {
+      typeUrl: "/ibc.core.port.v1.QueryAppVersionResponse",
+      value: QueryAppVersionResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/ibc/core/types/v1/genesis.ts b/__fixtures__/outputv2/ibc/core/types/v1/genesis.ts
index 6f5636913..98b77cede 100644
--- a/__fixtures__/outputv2/ibc/core/types/v1/genesis.ts
+++ b/__fixtures__/outputv2/ibc/core/types/v1/genesis.ts
@@ -22,7 +22,7 @@ export interface GenesisState {
   /** ICS004 - Channel genesis state */
   channelGenesis?: GenesisState3;
 }
-export interface GenesisStateProtoType {
+export interface GenesisStateProtoMsg {
   typeUrl: "/ibc.core.types.v1.GenesisState";
   value: Uint8Array;
 }
@@ -38,7 +38,7 @@ export interface GenesisStateAmino {
   /** ICS004 - Channel genesis state */
   channel_genesis?: GenesisState3Amino;
 }
-export interface GenesisStateAminoType {
+export interface GenesisStateAminoMsg {
   type: "cosmos-sdk/GenesisState";
   value: GenesisStateAmino;
 }
@@ -59,6 +59,9 @@ function createBaseGenesisState(): GenesisState {
 }
 
 export const GenesisState = {
+  typeUrl: "/ibc.core.types.v1.GenesisState",
+  aminoType: "cosmos-sdk/GenesisState",
+
   encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.clientGenesis !== undefined) {
       GenesisState1.encode(message.clientGenesis, writer.uint32(10).fork()).ldelim();
@@ -159,6 +162,32 @@ export const GenesisState = {
     obj.connection_genesis = message.connectionGenesis ? GenesisState2.toAmino(message.connectionGenesis) : undefined;
     obj.channel_genesis = message.channelGenesis ? GenesisState3.toAmino(message.channelGenesis) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisStateAminoMsg): GenesisState {
+    return GenesisState.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GenesisState): GenesisStateAminoMsg {
+    return {
+      type: "cosmos-sdk/GenesisState",
+      value: GenesisState.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GenesisStateProtoMsg): GenesisState {
+    return GenesisState.decode(message.value);
+  },
+
+  toProto(message: GenesisState): Uint8Array {
+    return GenesisState.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisState): GenesisStateProtoMsg {
+    return {
+      typeUrl: "/ibc.core.types.v1.GenesisState",
+      value: GenesisState.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/ibc/lightclients/localhost/v1/localhost.ts b/__fixtures__/outputv2/ibc/lightclients/localhost/v1/localhost.ts
index d0ff75dae..912c52323 100644
--- a/__fixtures__/outputv2/ibc/lightclients/localhost/v1/localhost.ts
+++ b/__fixtures__/outputv2/ibc/lightclients/localhost/v1/localhost.ts
@@ -14,7 +14,7 @@ export interface ClientState {
   /** self latest block height */
   height?: Height;
 }
-export interface ClientStateProtoType {
+export interface ClientStateProtoMsg {
   typeUrl: "/ibc.lightclients.localhost.v1.ClientState";
   value: Uint8Array;
 }
@@ -30,7 +30,7 @@ export interface ClientStateAmino {
   /** self latest block height */
   height?: HeightAmino;
 }
-export interface ClientStateAminoType {
+export interface ClientStateAminoMsg {
   type: "cosmos-sdk/ClientState";
   value: ClientStateAmino;
 }
@@ -52,6 +52,9 @@ function createBaseClientState(): ClientState {
 }
 
 export const ClientState = {
+  typeUrl: "/ibc.lightclients.localhost.v1.ClientState",
+  aminoType: "cosmos-sdk/ClientState",
+
   encode(message: ClientState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.chainId !== "") {
       writer.uint32(10).string(message.chainId);
@@ -137,6 +140,32 @@ export const ClientState = {
     obj.chain_id = message.chainId;
     obj.height = message.height ? Height.toAmino(message.height) : {};
     return obj;
+  },
+
+  fromAminoMsg(object: ClientStateAminoMsg): ClientState {
+    return ClientState.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ClientState): ClientStateAminoMsg {
+    return {
+      type: "cosmos-sdk/ClientState",
+      value: ClientState.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ClientStateProtoMsg): ClientState {
+    return ClientState.decode(message.value);
+  },
+
+  toProto(message: ClientState): Uint8Array {
+    return ClientState.encode(message).finish();
+  },
+
+  toProtoMsg(message: ClientState): ClientStateProtoMsg {
+    return {
+      typeUrl: "/ibc.lightclients.localhost.v1.ClientState",
+      value: ClientState.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/ibc/lightclients/solomachine/v1/solomachine.ts b/__fixtures__/outputv2/ibc/lightclients/solomachine/v1/solomachine.ts
index 8c4d51217..8a0821fc2 100644
--- a/__fixtures__/outputv2/ibc/lightclients/solomachine/v1/solomachine.ts
+++ b/__fixtures__/outputv2/ibc/lightclients/solomachine/v1/solomachine.ts
@@ -147,7 +147,7 @@ export interface ClientState {
    */
   allowUpdateAfterProposal: boolean;
 }
-export interface ClientStateProtoType {
+export interface ClientStateProtoMsg {
   typeUrl: "/ibc.lightclients.solomachine.v1.ClientState";
   value: Uint8Array;
 }
@@ -170,7 +170,7 @@ export interface ClientStateAmino {
    */
   allow_update_after_proposal: boolean;
 }
-export interface ClientStateAminoType {
+export interface ClientStateAminoMsg {
   type: "cosmos-sdk/ClientState";
   value: ClientStateAmino;
 }
@@ -203,7 +203,7 @@ export interface ConsensusState {
   diversifier: string;
   timestamp: Long;
 }
-export interface ConsensusStateProtoType {
+export interface ConsensusStateProtoMsg {
   typeUrl: "/ibc.lightclients.solomachine.v1.ConsensusState";
   value: Uint8Array;
 }
@@ -225,7 +225,7 @@ export interface ConsensusStateAmino {
   diversifier: string;
   timestamp: string;
 }
-export interface ConsensusStateAminoType {
+export interface ConsensusStateAminoMsg {
   type: "cosmos-sdk/ConsensusState";
   value: ConsensusStateAmino;
 }
@@ -250,7 +250,7 @@ export interface Header {
   newPublicKey?: Any;
   newDiversifier: string;
 }
-export interface HeaderProtoType {
+export interface HeaderProtoMsg {
   typeUrl: "/ibc.lightclients.solomachine.v1.Header";
   value: Uint8Array;
 }
@@ -264,7 +264,7 @@ export interface HeaderAmino {
   new_public_key?: AnyAmino;
   new_diversifier: string;
 }
-export interface HeaderAminoType {
+export interface HeaderAminoMsg {
   type: "cosmos-sdk/Header";
   value: HeaderAmino;
 }
@@ -288,7 +288,7 @@ export interface Misbehaviour {
   signatureOne?: SignatureAndData;
   signatureTwo?: SignatureAndData;
 }
-export interface MisbehaviourProtoType {
+export interface MisbehaviourProtoMsg {
   typeUrl: "/ibc.lightclients.solomachine.v1.Misbehaviour";
   value: Uint8Array;
 }
@@ -303,7 +303,7 @@ export interface MisbehaviourAmino {
   signature_one?: SignatureAndDataAmino;
   signature_two?: SignatureAndDataAmino;
 }
-export interface MisbehaviourAminoType {
+export interface MisbehaviourAminoMsg {
   type: "cosmos-sdk/Misbehaviour";
   value: MisbehaviourAmino;
 }
@@ -329,7 +329,7 @@ export interface SignatureAndData {
   data: Uint8Array;
   timestamp: Long;
 }
-export interface SignatureAndDataProtoType {
+export interface SignatureAndDataProtoMsg {
   typeUrl: "/ibc.lightclients.solomachine.v1.SignatureAndData";
   value: Uint8Array;
 }
@@ -344,7 +344,7 @@ export interface SignatureAndDataAmino {
   data: Uint8Array;
   timestamp: string;
 }
-export interface SignatureAndDataAminoType {
+export interface SignatureAndDataAminoMsg {
   type: "cosmos-sdk/SignatureAndData";
   value: SignatureAndDataAmino;
 }
@@ -368,7 +368,7 @@ export interface TimestampedSignatureData {
   signatureData: Uint8Array;
   timestamp: Long;
 }
-export interface TimestampedSignatureDataProtoType {
+export interface TimestampedSignatureDataProtoMsg {
   typeUrl: "/ibc.lightclients.solomachine.v1.TimestampedSignatureData";
   value: Uint8Array;
 }
@@ -381,7 +381,7 @@ export interface TimestampedSignatureDataAmino {
   signature_data: Uint8Array;
   timestamp: string;
 }
-export interface TimestampedSignatureDataAminoType {
+export interface TimestampedSignatureDataAminoMsg {
   type: "cosmos-sdk/TimestampedSignatureData";
   value: TimestampedSignatureDataAmino;
 }
@@ -407,7 +407,7 @@ export interface SignBytes {
   /** marshaled data */
   data: Uint8Array;
 }
-export interface SignBytesProtoType {
+export interface SignBytesProtoMsg {
   typeUrl: "/ibc.lightclients.solomachine.v1.SignBytes";
   value: Uint8Array;
 }
@@ -424,7 +424,7 @@ export interface SignBytesAmino {
   /** marshaled data */
   data: Uint8Array;
 }
-export interface SignBytesAminoType {
+export interface SignBytesAminoMsg {
   type: "cosmos-sdk/SignBytes";
   value: SignBytesAmino;
 }
@@ -446,7 +446,7 @@ export interface HeaderData {
   /** header diversifier */
   newDiversifier: string;
 }
-export interface HeaderDataProtoType {
+export interface HeaderDataProtoMsg {
   typeUrl: "/ibc.lightclients.solomachine.v1.HeaderData";
   value: Uint8Array;
 }
@@ -459,7 +459,7 @@ export interface HeaderDataAmino {
   /** header diversifier */
   new_diversifier: string;
 }
-export interface HeaderDataAminoType {
+export interface HeaderDataAminoMsg {
   type: "cosmos-sdk/HeaderData";
   value: HeaderDataAmino;
 }
@@ -475,7 +475,7 @@ export interface ClientStateData {
   path: Uint8Array;
   clientState?: Any;
 }
-export interface ClientStateDataProtoType {
+export interface ClientStateDataProtoMsg {
   typeUrl: "/ibc.lightclients.solomachine.v1.ClientStateData";
   value: Uint8Array;
 }
@@ -485,7 +485,7 @@ export interface ClientStateDataAmino {
   path: Uint8Array;
   client_state?: AnyAmino;
 }
-export interface ClientStateDataAminoType {
+export interface ClientStateDataAminoMsg {
   type: "cosmos-sdk/ClientStateData";
   value: ClientStateDataAmino;
 }
@@ -504,7 +504,7 @@ export interface ConsensusStateData {
   path: Uint8Array;
   consensusState?: Any;
 }
-export interface ConsensusStateDataProtoType {
+export interface ConsensusStateDataProtoMsg {
   typeUrl: "/ibc.lightclients.solomachine.v1.ConsensusStateData";
   value: Uint8Array;
 }
@@ -517,7 +517,7 @@ export interface ConsensusStateDataAmino {
   path: Uint8Array;
   consensus_state?: AnyAmino;
 }
-export interface ConsensusStateDataAminoType {
+export interface ConsensusStateDataAminoMsg {
   type: "cosmos-sdk/ConsensusStateData";
   value: ConsensusStateDataAmino;
 }
@@ -539,7 +539,7 @@ export interface ConnectionStateData {
   path: Uint8Array;
   connection?: ConnectionEnd;
 }
-export interface ConnectionStateDataProtoType {
+export interface ConnectionStateDataProtoMsg {
   typeUrl: "/ibc.lightclients.solomachine.v1.ConnectionStateData";
   value: Uint8Array;
 }
@@ -552,7 +552,7 @@ export interface ConnectionStateDataAmino {
   path: Uint8Array;
   connection?: ConnectionEndAmino;
 }
-export interface ConnectionStateDataAminoType {
+export interface ConnectionStateDataAminoMsg {
   type: "cosmos-sdk/ConnectionStateData";
   value: ConnectionStateDataAmino;
 }
@@ -574,7 +574,7 @@ export interface ChannelStateData {
   path: Uint8Array;
   channel?: Channel;
 }
-export interface ChannelStateDataProtoType {
+export interface ChannelStateDataProtoMsg {
   typeUrl: "/ibc.lightclients.solomachine.v1.ChannelStateData";
   value: Uint8Array;
 }
@@ -587,7 +587,7 @@ export interface ChannelStateDataAmino {
   path: Uint8Array;
   channel?: ChannelAmino;
 }
-export interface ChannelStateDataAminoType {
+export interface ChannelStateDataAminoMsg {
   type: "cosmos-sdk/ChannelStateData";
   value: ChannelStateDataAmino;
 }
@@ -609,7 +609,7 @@ export interface PacketCommitmentData {
   path: Uint8Array;
   commitment: Uint8Array;
 }
-export interface PacketCommitmentDataProtoType {
+export interface PacketCommitmentDataProtoMsg {
   typeUrl: "/ibc.lightclients.solomachine.v1.PacketCommitmentData";
   value: Uint8Array;
 }
@@ -622,7 +622,7 @@ export interface PacketCommitmentDataAmino {
   path: Uint8Array;
   commitment: Uint8Array;
 }
-export interface PacketCommitmentDataAminoType {
+export interface PacketCommitmentDataAminoMsg {
   type: "cosmos-sdk/PacketCommitmentData";
   value: PacketCommitmentDataAmino;
 }
@@ -644,7 +644,7 @@ export interface PacketAcknowledgementData {
   path: Uint8Array;
   acknowledgement: Uint8Array;
 }
-export interface PacketAcknowledgementDataProtoType {
+export interface PacketAcknowledgementDataProtoMsg {
   typeUrl: "/ibc.lightclients.solomachine.v1.PacketAcknowledgementData";
   value: Uint8Array;
 }
@@ -657,7 +657,7 @@ export interface PacketAcknowledgementDataAmino {
   path: Uint8Array;
   acknowledgement: Uint8Array;
 }
-export interface PacketAcknowledgementDataAminoType {
+export interface PacketAcknowledgementDataAminoMsg {
   type: "cosmos-sdk/PacketAcknowledgementData";
   value: PacketAcknowledgementDataAmino;
 }
@@ -678,7 +678,7 @@ export interface PacketAcknowledgementDataSDKType {
 export interface PacketReceiptAbsenceData {
   path: Uint8Array;
 }
-export interface PacketReceiptAbsenceDataProtoType {
+export interface PacketReceiptAbsenceDataProtoMsg {
   typeUrl: "/ibc.lightclients.solomachine.v1.PacketReceiptAbsenceData";
   value: Uint8Array;
 }
@@ -690,7 +690,7 @@ export interface PacketReceiptAbsenceDataProtoType {
 export interface PacketReceiptAbsenceDataAmino {
   path: Uint8Array;
 }
-export interface PacketReceiptAbsenceDataAminoType {
+export interface PacketReceiptAbsenceDataAminoMsg {
   type: "cosmos-sdk/PacketReceiptAbsenceData";
   value: PacketReceiptAbsenceDataAmino;
 }
@@ -711,7 +711,7 @@ export interface NextSequenceRecvData {
   path: Uint8Array;
   nextSeqRecv: Long;
 }
-export interface NextSequenceRecvDataProtoType {
+export interface NextSequenceRecvDataProtoMsg {
   typeUrl: "/ibc.lightclients.solomachine.v1.NextSequenceRecvData";
   value: Uint8Array;
 }
@@ -724,7 +724,7 @@ export interface NextSequenceRecvDataAmino {
   path: Uint8Array;
   next_seq_recv: string;
 }
-export interface NextSequenceRecvDataAminoType {
+export interface NextSequenceRecvDataAminoMsg {
   type: "cosmos-sdk/NextSequenceRecvData";
   value: NextSequenceRecvDataAmino;
 }
@@ -748,6 +748,9 @@ function createBaseClientState(): ClientState {
 }
 
 export const ClientState = {
+  typeUrl: "/ibc.lightclients.solomachine.v1.ClientState",
+  aminoType: "cosmos-sdk/ClientState",
+
   encode(message: ClientState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.sequence.isZero()) {
       writer.uint32(8).uint64(message.sequence);
@@ -863,6 +866,32 @@ export const ClientState = {
     obj.consensus_state = message.consensusState ? ConsensusState.toAmino(message.consensusState) : undefined;
     obj.allow_update_after_proposal = message.allowUpdateAfterProposal;
     return obj;
+  },
+
+  fromAminoMsg(object: ClientStateAminoMsg): ClientState {
+    return ClientState.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ClientState): ClientStateAminoMsg {
+    return {
+      type: "cosmos-sdk/ClientState",
+      value: ClientState.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ClientStateProtoMsg): ClientState {
+    return ClientState.decode(message.value);
+  },
+
+  toProto(message: ClientState): Uint8Array {
+    return ClientState.encode(message).finish();
+  },
+
+  toProtoMsg(message: ClientState): ClientStateProtoMsg {
+    return {
+      typeUrl: "/ibc.lightclients.solomachine.v1.ClientState",
+      value: ClientState.encode(message).finish()
+    };
   }
 
 };
@@ -876,6 +905,9 @@ function createBaseConsensusState(): ConsensusState {
 }
 
 export const ConsensusState = {
+  typeUrl: "/ibc.lightclients.solomachine.v1.ConsensusState",
+  aminoType: "cosmos-sdk/ConsensusState",
+
   encode(message: ConsensusState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.publicKey !== undefined) {
       Any.encode(message.publicKey, writer.uint32(10).fork()).ldelim();
@@ -976,6 +1008,32 @@ export const ConsensusState = {
     obj.diversifier = message.diversifier;
     obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ConsensusStateAminoMsg): ConsensusState {
+    return ConsensusState.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ConsensusState): ConsensusStateAminoMsg {
+    return {
+      type: "cosmos-sdk/ConsensusState",
+      value: ConsensusState.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ConsensusStateProtoMsg): ConsensusState {
+    return ConsensusState.decode(message.value);
+  },
+
+  toProto(message: ConsensusState): Uint8Array {
+    return ConsensusState.encode(message).finish();
+  },
+
+  toProtoMsg(message: ConsensusState): ConsensusStateProtoMsg {
+    return {
+      typeUrl: "/ibc.lightclients.solomachine.v1.ConsensusState",
+      value: ConsensusState.encode(message).finish()
+    };
   }
 
 };
@@ -991,6 +1049,9 @@ function createBaseHeader(): Header {
 }
 
 export const Header = {
+  typeUrl: "/ibc.lightclients.solomachine.v1.Header",
+  aminoType: "cosmos-sdk/Header",
+
   encode(message: Header, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.sequence.isZero()) {
       writer.uint32(8).uint64(message.sequence);
@@ -1121,6 +1182,32 @@ export const Header = {
     obj.new_public_key = message.newPublicKey ? Any.toAmino(message.newPublicKey) : undefined;
     obj.new_diversifier = message.newDiversifier;
     return obj;
+  },
+
+  fromAminoMsg(object: HeaderAminoMsg): Header {
+    return Header.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Header): HeaderAminoMsg {
+    return {
+      type: "cosmos-sdk/Header",
+      value: Header.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: HeaderProtoMsg): Header {
+    return Header.decode(message.value);
+  },
+
+  toProto(message: Header): Uint8Array {
+    return Header.encode(message).finish();
+  },
+
+  toProtoMsg(message: Header): HeaderProtoMsg {
+    return {
+      typeUrl: "/ibc.lightclients.solomachine.v1.Header",
+      value: Header.encode(message).finish()
+    };
   }
 
 };
@@ -1135,6 +1222,9 @@ function createBaseMisbehaviour(): Misbehaviour {
 }
 
 export const Misbehaviour = {
+  typeUrl: "/ibc.lightclients.solomachine.v1.Misbehaviour",
+  aminoType: "cosmos-sdk/Misbehaviour",
+
   encode(message: Misbehaviour, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.clientId !== "") {
       writer.uint32(10).string(message.clientId);
@@ -1250,6 +1340,32 @@ export const Misbehaviour = {
     obj.signature_one = message.signatureOne ? SignatureAndData.toAmino(message.signatureOne) : undefined;
     obj.signature_two = message.signatureTwo ? SignatureAndData.toAmino(message.signatureTwo) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MisbehaviourAminoMsg): Misbehaviour {
+    return Misbehaviour.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Misbehaviour): MisbehaviourAminoMsg {
+    return {
+      type: "cosmos-sdk/Misbehaviour",
+      value: Misbehaviour.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MisbehaviourProtoMsg): Misbehaviour {
+    return Misbehaviour.decode(message.value);
+  },
+
+  toProto(message: Misbehaviour): Uint8Array {
+    return Misbehaviour.encode(message).finish();
+  },
+
+  toProtoMsg(message: Misbehaviour): MisbehaviourProtoMsg {
+    return {
+      typeUrl: "/ibc.lightclients.solomachine.v1.Misbehaviour",
+      value: Misbehaviour.encode(message).finish()
+    };
   }
 
 };
@@ -1264,6 +1380,9 @@ function createBaseSignatureAndData(): SignatureAndData {
 }
 
 export const SignatureAndData = {
+  typeUrl: "/ibc.lightclients.solomachine.v1.SignatureAndData",
+  aminoType: "cosmos-sdk/SignatureAndData",
+
   encode(message: SignatureAndData, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.signature.length !== 0) {
       writer.uint32(10).bytes(message.signature);
@@ -1379,6 +1498,32 @@ export const SignatureAndData = {
     obj.data = message.data;
     obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: SignatureAndDataAminoMsg): SignatureAndData {
+    return SignatureAndData.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: SignatureAndData): SignatureAndDataAminoMsg {
+    return {
+      type: "cosmos-sdk/SignatureAndData",
+      value: SignatureAndData.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: SignatureAndDataProtoMsg): SignatureAndData {
+    return SignatureAndData.decode(message.value);
+  },
+
+  toProto(message: SignatureAndData): Uint8Array {
+    return SignatureAndData.encode(message).finish();
+  },
+
+  toProtoMsg(message: SignatureAndData): SignatureAndDataProtoMsg {
+    return {
+      typeUrl: "/ibc.lightclients.solomachine.v1.SignatureAndData",
+      value: SignatureAndData.encode(message).finish()
+    };
   }
 
 };
@@ -1391,6 +1536,9 @@ function createBaseTimestampedSignatureData(): TimestampedSignatureData {
 }
 
 export const TimestampedSignatureData = {
+  typeUrl: "/ibc.lightclients.solomachine.v1.TimestampedSignatureData",
+  aminoType: "cosmos-sdk/TimestampedSignatureData",
+
   encode(message: TimestampedSignatureData, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.signatureData.length !== 0) {
       writer.uint32(10).bytes(message.signatureData);
@@ -1476,6 +1624,32 @@ export const TimestampedSignatureData = {
     obj.signature_data = message.signatureData;
     obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: TimestampedSignatureDataAminoMsg): TimestampedSignatureData {
+    return TimestampedSignatureData.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: TimestampedSignatureData): TimestampedSignatureDataAminoMsg {
+    return {
+      type: "cosmos-sdk/TimestampedSignatureData",
+      value: TimestampedSignatureData.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: TimestampedSignatureDataProtoMsg): TimestampedSignatureData {
+    return TimestampedSignatureData.decode(message.value);
+  },
+
+  toProto(message: TimestampedSignatureData): Uint8Array {
+    return TimestampedSignatureData.encode(message).finish();
+  },
+
+  toProtoMsg(message: TimestampedSignatureData): TimestampedSignatureDataProtoMsg {
+    return {
+      typeUrl: "/ibc.lightclients.solomachine.v1.TimestampedSignatureData",
+      value: TimestampedSignatureData.encode(message).finish()
+    };
   }
 
 };
@@ -1491,6 +1665,9 @@ function createBaseSignBytes(): SignBytes {
 }
 
 export const SignBytes = {
+  typeUrl: "/ibc.lightclients.solomachine.v1.SignBytes",
+  aminoType: "cosmos-sdk/SignBytes",
+
   encode(message: SignBytes, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.sequence.isZero()) {
       writer.uint32(8).uint64(message.sequence);
@@ -1621,6 +1798,32 @@ export const SignBytes = {
     obj.data_type = message.dataType;
     obj.data = message.data;
     return obj;
+  },
+
+  fromAminoMsg(object: SignBytesAminoMsg): SignBytes {
+    return SignBytes.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: SignBytes): SignBytesAminoMsg {
+    return {
+      type: "cosmos-sdk/SignBytes",
+      value: SignBytes.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: SignBytesProtoMsg): SignBytes {
+    return SignBytes.decode(message.value);
+  },
+
+  toProto(message: SignBytes): Uint8Array {
+    return SignBytes.encode(message).finish();
+  },
+
+  toProtoMsg(message: SignBytes): SignBytesProtoMsg {
+    return {
+      typeUrl: "/ibc.lightclients.solomachine.v1.SignBytes",
+      value: SignBytes.encode(message).finish()
+    };
   }
 
 };
@@ -1633,6 +1836,9 @@ function createBaseHeaderData(): HeaderData {
 }
 
 export const HeaderData = {
+  typeUrl: "/ibc.lightclients.solomachine.v1.HeaderData",
+  aminoType: "cosmos-sdk/HeaderData",
+
   encode(message: HeaderData, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.newPubKey !== undefined) {
       Any.encode(message.newPubKey, writer.uint32(10).fork()).ldelim();
@@ -1718,6 +1924,32 @@ export const HeaderData = {
     obj.new_pub_key = message.newPubKey ? Any.toAmino(message.newPubKey) : undefined;
     obj.new_diversifier = message.newDiversifier;
     return obj;
+  },
+
+  fromAminoMsg(object: HeaderDataAminoMsg): HeaderData {
+    return HeaderData.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: HeaderData): HeaderDataAminoMsg {
+    return {
+      type: "cosmos-sdk/HeaderData",
+      value: HeaderData.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: HeaderDataProtoMsg): HeaderData {
+    return HeaderData.decode(message.value);
+  },
+
+  toProto(message: HeaderData): Uint8Array {
+    return HeaderData.encode(message).finish();
+  },
+
+  toProtoMsg(message: HeaderData): HeaderDataProtoMsg {
+    return {
+      typeUrl: "/ibc.lightclients.solomachine.v1.HeaderData",
+      value: HeaderData.encode(message).finish()
+    };
   }
 
 };
@@ -1730,6 +1962,9 @@ function createBaseClientStateData(): ClientStateData {
 }
 
 export const ClientStateData = {
+  typeUrl: "/ibc.lightclients.solomachine.v1.ClientStateData",
+  aminoType: "cosmos-sdk/ClientStateData",
+
   encode(message: ClientStateData, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.path.length !== 0) {
       writer.uint32(10).bytes(message.path);
@@ -1815,6 +2050,32 @@ export const ClientStateData = {
     obj.path = message.path;
     obj.client_state = message.clientState ? Any.toAmino(message.clientState) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ClientStateDataAminoMsg): ClientStateData {
+    return ClientStateData.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ClientStateData): ClientStateDataAminoMsg {
+    return {
+      type: "cosmos-sdk/ClientStateData",
+      value: ClientStateData.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ClientStateDataProtoMsg): ClientStateData {
+    return ClientStateData.decode(message.value);
+  },
+
+  toProto(message: ClientStateData): Uint8Array {
+    return ClientStateData.encode(message).finish();
+  },
+
+  toProtoMsg(message: ClientStateData): ClientStateDataProtoMsg {
+    return {
+      typeUrl: "/ibc.lightclients.solomachine.v1.ClientStateData",
+      value: ClientStateData.encode(message).finish()
+    };
   }
 
 };
@@ -1827,6 +2088,9 @@ function createBaseConsensusStateData(): ConsensusStateData {
 }
 
 export const ConsensusStateData = {
+  typeUrl: "/ibc.lightclients.solomachine.v1.ConsensusStateData",
+  aminoType: "cosmos-sdk/ConsensusStateData",
+
   encode(message: ConsensusStateData, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.path.length !== 0) {
       writer.uint32(10).bytes(message.path);
@@ -1912,6 +2176,32 @@ export const ConsensusStateData = {
     obj.path = message.path;
     obj.consensus_state = message.consensusState ? Any.toAmino(message.consensusState) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ConsensusStateDataAminoMsg): ConsensusStateData {
+    return ConsensusStateData.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ConsensusStateData): ConsensusStateDataAminoMsg {
+    return {
+      type: "cosmos-sdk/ConsensusStateData",
+      value: ConsensusStateData.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ConsensusStateDataProtoMsg): ConsensusStateData {
+    return ConsensusStateData.decode(message.value);
+  },
+
+  toProto(message: ConsensusStateData): Uint8Array {
+    return ConsensusStateData.encode(message).finish();
+  },
+
+  toProtoMsg(message: ConsensusStateData): ConsensusStateDataProtoMsg {
+    return {
+      typeUrl: "/ibc.lightclients.solomachine.v1.ConsensusStateData",
+      value: ConsensusStateData.encode(message).finish()
+    };
   }
 
 };
@@ -1924,6 +2214,9 @@ function createBaseConnectionStateData(): ConnectionStateData {
 }
 
 export const ConnectionStateData = {
+  typeUrl: "/ibc.lightclients.solomachine.v1.ConnectionStateData",
+  aminoType: "cosmos-sdk/ConnectionStateData",
+
   encode(message: ConnectionStateData, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.path.length !== 0) {
       writer.uint32(10).bytes(message.path);
@@ -2009,6 +2302,32 @@ export const ConnectionStateData = {
     obj.path = message.path;
     obj.connection = message.connection ? ConnectionEnd.toAmino(message.connection) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ConnectionStateDataAminoMsg): ConnectionStateData {
+    return ConnectionStateData.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ConnectionStateData): ConnectionStateDataAminoMsg {
+    return {
+      type: "cosmos-sdk/ConnectionStateData",
+      value: ConnectionStateData.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ConnectionStateDataProtoMsg): ConnectionStateData {
+    return ConnectionStateData.decode(message.value);
+  },
+
+  toProto(message: ConnectionStateData): Uint8Array {
+    return ConnectionStateData.encode(message).finish();
+  },
+
+  toProtoMsg(message: ConnectionStateData): ConnectionStateDataProtoMsg {
+    return {
+      typeUrl: "/ibc.lightclients.solomachine.v1.ConnectionStateData",
+      value: ConnectionStateData.encode(message).finish()
+    };
   }
 
 };
@@ -2021,6 +2340,9 @@ function createBaseChannelStateData(): ChannelStateData {
 }
 
 export const ChannelStateData = {
+  typeUrl: "/ibc.lightclients.solomachine.v1.ChannelStateData",
+  aminoType: "cosmos-sdk/ChannelStateData",
+
   encode(message: ChannelStateData, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.path.length !== 0) {
       writer.uint32(10).bytes(message.path);
@@ -2106,6 +2428,32 @@ export const ChannelStateData = {
     obj.path = message.path;
     obj.channel = message.channel ? Channel.toAmino(message.channel) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ChannelStateDataAminoMsg): ChannelStateData {
+    return ChannelStateData.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ChannelStateData): ChannelStateDataAminoMsg {
+    return {
+      type: "cosmos-sdk/ChannelStateData",
+      value: ChannelStateData.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ChannelStateDataProtoMsg): ChannelStateData {
+    return ChannelStateData.decode(message.value);
+  },
+
+  toProto(message: ChannelStateData): Uint8Array {
+    return ChannelStateData.encode(message).finish();
+  },
+
+  toProtoMsg(message: ChannelStateData): ChannelStateDataProtoMsg {
+    return {
+      typeUrl: "/ibc.lightclients.solomachine.v1.ChannelStateData",
+      value: ChannelStateData.encode(message).finish()
+    };
   }
 
 };
@@ -2118,6 +2466,9 @@ function createBasePacketCommitmentData(): PacketCommitmentData {
 }
 
 export const PacketCommitmentData = {
+  typeUrl: "/ibc.lightclients.solomachine.v1.PacketCommitmentData",
+  aminoType: "cosmos-sdk/PacketCommitmentData",
+
   encode(message: PacketCommitmentData, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.path.length !== 0) {
       writer.uint32(10).bytes(message.path);
@@ -2203,6 +2554,32 @@ export const PacketCommitmentData = {
     obj.path = message.path;
     obj.commitment = message.commitment;
     return obj;
+  },
+
+  fromAminoMsg(object: PacketCommitmentDataAminoMsg): PacketCommitmentData {
+    return PacketCommitmentData.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: PacketCommitmentData): PacketCommitmentDataAminoMsg {
+    return {
+      type: "cosmos-sdk/PacketCommitmentData",
+      value: PacketCommitmentData.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: PacketCommitmentDataProtoMsg): PacketCommitmentData {
+    return PacketCommitmentData.decode(message.value);
+  },
+
+  toProto(message: PacketCommitmentData): Uint8Array {
+    return PacketCommitmentData.encode(message).finish();
+  },
+
+  toProtoMsg(message: PacketCommitmentData): PacketCommitmentDataProtoMsg {
+    return {
+      typeUrl: "/ibc.lightclients.solomachine.v1.PacketCommitmentData",
+      value: PacketCommitmentData.encode(message).finish()
+    };
   }
 
 };
@@ -2215,6 +2592,9 @@ function createBasePacketAcknowledgementData(): PacketAcknowledgementData {
 }
 
 export const PacketAcknowledgementData = {
+  typeUrl: "/ibc.lightclients.solomachine.v1.PacketAcknowledgementData",
+  aminoType: "cosmos-sdk/PacketAcknowledgementData",
+
   encode(message: PacketAcknowledgementData, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.path.length !== 0) {
       writer.uint32(10).bytes(message.path);
@@ -2300,6 +2680,32 @@ export const PacketAcknowledgementData = {
     obj.path = message.path;
     obj.acknowledgement = message.acknowledgement;
     return obj;
+  },
+
+  fromAminoMsg(object: PacketAcknowledgementDataAminoMsg): PacketAcknowledgementData {
+    return PacketAcknowledgementData.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: PacketAcknowledgementData): PacketAcknowledgementDataAminoMsg {
+    return {
+      type: "cosmos-sdk/PacketAcknowledgementData",
+      value: PacketAcknowledgementData.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: PacketAcknowledgementDataProtoMsg): PacketAcknowledgementData {
+    return PacketAcknowledgementData.decode(message.value);
+  },
+
+  toProto(message: PacketAcknowledgementData): Uint8Array {
+    return PacketAcknowledgementData.encode(message).finish();
+  },
+
+  toProtoMsg(message: PacketAcknowledgementData): PacketAcknowledgementDataProtoMsg {
+    return {
+      typeUrl: "/ibc.lightclients.solomachine.v1.PacketAcknowledgementData",
+      value: PacketAcknowledgementData.encode(message).finish()
+    };
   }
 
 };
@@ -2311,6 +2717,9 @@ function createBasePacketReceiptAbsenceData(): PacketReceiptAbsenceData {
 }
 
 export const PacketReceiptAbsenceData = {
+  typeUrl: "/ibc.lightclients.solomachine.v1.PacketReceiptAbsenceData",
+  aminoType: "cosmos-sdk/PacketReceiptAbsenceData",
+
   encode(message: PacketReceiptAbsenceData, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.path.length !== 0) {
       writer.uint32(10).bytes(message.path);
@@ -2381,6 +2790,32 @@ export const PacketReceiptAbsenceData = {
     const obj: any = {};
     obj.path = message.path;
     return obj;
+  },
+
+  fromAminoMsg(object: PacketReceiptAbsenceDataAminoMsg): PacketReceiptAbsenceData {
+    return PacketReceiptAbsenceData.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: PacketReceiptAbsenceData): PacketReceiptAbsenceDataAminoMsg {
+    return {
+      type: "cosmos-sdk/PacketReceiptAbsenceData",
+      value: PacketReceiptAbsenceData.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: PacketReceiptAbsenceDataProtoMsg): PacketReceiptAbsenceData {
+    return PacketReceiptAbsenceData.decode(message.value);
+  },
+
+  toProto(message: PacketReceiptAbsenceData): Uint8Array {
+    return PacketReceiptAbsenceData.encode(message).finish();
+  },
+
+  toProtoMsg(message: PacketReceiptAbsenceData): PacketReceiptAbsenceDataProtoMsg {
+    return {
+      typeUrl: "/ibc.lightclients.solomachine.v1.PacketReceiptAbsenceData",
+      value: PacketReceiptAbsenceData.encode(message).finish()
+    };
   }
 
 };
@@ -2393,6 +2828,9 @@ function createBaseNextSequenceRecvData(): NextSequenceRecvData {
 }
 
 export const NextSequenceRecvData = {
+  typeUrl: "/ibc.lightclients.solomachine.v1.NextSequenceRecvData",
+  aminoType: "cosmos-sdk/NextSequenceRecvData",
+
   encode(message: NextSequenceRecvData, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.path.length !== 0) {
       writer.uint32(10).bytes(message.path);
@@ -2478,6 +2916,32 @@ export const NextSequenceRecvData = {
     obj.path = message.path;
     obj.next_seq_recv = message.nextSeqRecv ? message.nextSeqRecv.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: NextSequenceRecvDataAminoMsg): NextSequenceRecvData {
+    return NextSequenceRecvData.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: NextSequenceRecvData): NextSequenceRecvDataAminoMsg {
+    return {
+      type: "cosmos-sdk/NextSequenceRecvData",
+      value: NextSequenceRecvData.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: NextSequenceRecvDataProtoMsg): NextSequenceRecvData {
+    return NextSequenceRecvData.decode(message.value);
+  },
+
+  toProto(message: NextSequenceRecvData): Uint8Array {
+    return NextSequenceRecvData.encode(message).finish();
+  },
+
+  toProtoMsg(message: NextSequenceRecvData): NextSequenceRecvDataProtoMsg {
+    return {
+      typeUrl: "/ibc.lightclients.solomachine.v1.NextSequenceRecvData",
+      value: NextSequenceRecvData.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/ibc/lightclients/solomachine/v2/solomachine.ts b/__fixtures__/outputv2/ibc/lightclients/solomachine/v2/solomachine.ts
index 9dc1bdc2a..8bf529335 100644
--- a/__fixtures__/outputv2/ibc/lightclients/solomachine/v2/solomachine.ts
+++ b/__fixtures__/outputv2/ibc/lightclients/solomachine/v2/solomachine.ts
@@ -147,7 +147,7 @@ export interface ClientState {
    */
   allowUpdateAfterProposal: boolean;
 }
-export interface ClientStateProtoType {
+export interface ClientStateProtoMsg {
   typeUrl: "/ibc.lightclients.solomachine.v2.ClientState";
   value: Uint8Array;
 }
@@ -170,7 +170,7 @@ export interface ClientStateAmino {
    */
   allow_update_after_proposal: boolean;
 }
-export interface ClientStateAminoType {
+export interface ClientStateAminoMsg {
   type: "cosmos-sdk/ClientState";
   value: ClientStateAmino;
 }
@@ -203,7 +203,7 @@ export interface ConsensusState {
   diversifier: string;
   timestamp: Long;
 }
-export interface ConsensusStateProtoType {
+export interface ConsensusStateProtoMsg {
   typeUrl: "/ibc.lightclients.solomachine.v2.ConsensusState";
   value: Uint8Array;
 }
@@ -225,7 +225,7 @@ export interface ConsensusStateAmino {
   diversifier: string;
   timestamp: string;
 }
-export interface ConsensusStateAminoType {
+export interface ConsensusStateAminoMsg {
   type: "cosmos-sdk/ConsensusState";
   value: ConsensusStateAmino;
 }
@@ -250,7 +250,7 @@ export interface Header {
   newPublicKey?: Any;
   newDiversifier: string;
 }
-export interface HeaderProtoType {
+export interface HeaderProtoMsg {
   typeUrl: "/ibc.lightclients.solomachine.v2.Header";
   value: Uint8Array;
 }
@@ -264,7 +264,7 @@ export interface HeaderAmino {
   new_public_key?: AnyAmino;
   new_diversifier: string;
 }
-export interface HeaderAminoType {
+export interface HeaderAminoMsg {
   type: "cosmos-sdk/Header";
   value: HeaderAmino;
 }
@@ -288,7 +288,7 @@ export interface Misbehaviour {
   signatureOne?: SignatureAndData;
   signatureTwo?: SignatureAndData;
 }
-export interface MisbehaviourProtoType {
+export interface MisbehaviourProtoMsg {
   typeUrl: "/ibc.lightclients.solomachine.v2.Misbehaviour";
   value: Uint8Array;
 }
@@ -303,7 +303,7 @@ export interface MisbehaviourAmino {
   signature_one?: SignatureAndDataAmino;
   signature_two?: SignatureAndDataAmino;
 }
-export interface MisbehaviourAminoType {
+export interface MisbehaviourAminoMsg {
   type: "cosmos-sdk/Misbehaviour";
   value: MisbehaviourAmino;
 }
@@ -329,7 +329,7 @@ export interface SignatureAndData {
   data: Uint8Array;
   timestamp: Long;
 }
-export interface SignatureAndDataProtoType {
+export interface SignatureAndDataProtoMsg {
   typeUrl: "/ibc.lightclients.solomachine.v2.SignatureAndData";
   value: Uint8Array;
 }
@@ -344,7 +344,7 @@ export interface SignatureAndDataAmino {
   data: Uint8Array;
   timestamp: string;
 }
-export interface SignatureAndDataAminoType {
+export interface SignatureAndDataAminoMsg {
   type: "cosmos-sdk/SignatureAndData";
   value: SignatureAndDataAmino;
 }
@@ -368,7 +368,7 @@ export interface TimestampedSignatureData {
   signatureData: Uint8Array;
   timestamp: Long;
 }
-export interface TimestampedSignatureDataProtoType {
+export interface TimestampedSignatureDataProtoMsg {
   typeUrl: "/ibc.lightclients.solomachine.v2.TimestampedSignatureData";
   value: Uint8Array;
 }
@@ -381,7 +381,7 @@ export interface TimestampedSignatureDataAmino {
   signature_data: Uint8Array;
   timestamp: string;
 }
-export interface TimestampedSignatureDataAminoType {
+export interface TimestampedSignatureDataAminoMsg {
   type: "cosmos-sdk/TimestampedSignatureData";
   value: TimestampedSignatureDataAmino;
 }
@@ -407,7 +407,7 @@ export interface SignBytes {
   /** marshaled data */
   data: Uint8Array;
 }
-export interface SignBytesProtoType {
+export interface SignBytesProtoMsg {
   typeUrl: "/ibc.lightclients.solomachine.v2.SignBytes";
   value: Uint8Array;
 }
@@ -424,7 +424,7 @@ export interface SignBytesAmino {
   /** marshaled data */
   data: Uint8Array;
 }
-export interface SignBytesAminoType {
+export interface SignBytesAminoMsg {
   type: "cosmos-sdk/SignBytes";
   value: SignBytesAmino;
 }
@@ -446,7 +446,7 @@ export interface HeaderData {
   /** header diversifier */
   newDiversifier: string;
 }
-export interface HeaderDataProtoType {
+export interface HeaderDataProtoMsg {
   typeUrl: "/ibc.lightclients.solomachine.v2.HeaderData";
   value: Uint8Array;
 }
@@ -459,7 +459,7 @@ export interface HeaderDataAmino {
   /** header diversifier */
   new_diversifier: string;
 }
-export interface HeaderDataAminoType {
+export interface HeaderDataAminoMsg {
   type: "cosmos-sdk/HeaderData";
   value: HeaderDataAmino;
 }
@@ -475,7 +475,7 @@ export interface ClientStateData {
   path: Uint8Array;
   clientState?: Any;
 }
-export interface ClientStateDataProtoType {
+export interface ClientStateDataProtoMsg {
   typeUrl: "/ibc.lightclients.solomachine.v2.ClientStateData";
   value: Uint8Array;
 }
@@ -485,7 +485,7 @@ export interface ClientStateDataAmino {
   path: Uint8Array;
   client_state?: AnyAmino;
 }
-export interface ClientStateDataAminoType {
+export interface ClientStateDataAminoMsg {
   type: "cosmos-sdk/ClientStateData";
   value: ClientStateDataAmino;
 }
@@ -504,7 +504,7 @@ export interface ConsensusStateData {
   path: Uint8Array;
   consensusState?: Any;
 }
-export interface ConsensusStateDataProtoType {
+export interface ConsensusStateDataProtoMsg {
   typeUrl: "/ibc.lightclients.solomachine.v2.ConsensusStateData";
   value: Uint8Array;
 }
@@ -517,7 +517,7 @@ export interface ConsensusStateDataAmino {
   path: Uint8Array;
   consensus_state?: AnyAmino;
 }
-export interface ConsensusStateDataAminoType {
+export interface ConsensusStateDataAminoMsg {
   type: "cosmos-sdk/ConsensusStateData";
   value: ConsensusStateDataAmino;
 }
@@ -539,7 +539,7 @@ export interface ConnectionStateData {
   path: Uint8Array;
   connection?: ConnectionEnd;
 }
-export interface ConnectionStateDataProtoType {
+export interface ConnectionStateDataProtoMsg {
   typeUrl: "/ibc.lightclients.solomachine.v2.ConnectionStateData";
   value: Uint8Array;
 }
@@ -552,7 +552,7 @@ export interface ConnectionStateDataAmino {
   path: Uint8Array;
   connection?: ConnectionEndAmino;
 }
-export interface ConnectionStateDataAminoType {
+export interface ConnectionStateDataAminoMsg {
   type: "cosmos-sdk/ConnectionStateData";
   value: ConnectionStateDataAmino;
 }
@@ -574,7 +574,7 @@ export interface ChannelStateData {
   path: Uint8Array;
   channel?: Channel;
 }
-export interface ChannelStateDataProtoType {
+export interface ChannelStateDataProtoMsg {
   typeUrl: "/ibc.lightclients.solomachine.v2.ChannelStateData";
   value: Uint8Array;
 }
@@ -587,7 +587,7 @@ export interface ChannelStateDataAmino {
   path: Uint8Array;
   channel?: ChannelAmino;
 }
-export interface ChannelStateDataAminoType {
+export interface ChannelStateDataAminoMsg {
   type: "cosmos-sdk/ChannelStateData";
   value: ChannelStateDataAmino;
 }
@@ -609,7 +609,7 @@ export interface PacketCommitmentData {
   path: Uint8Array;
   commitment: Uint8Array;
 }
-export interface PacketCommitmentDataProtoType {
+export interface PacketCommitmentDataProtoMsg {
   typeUrl: "/ibc.lightclients.solomachine.v2.PacketCommitmentData";
   value: Uint8Array;
 }
@@ -622,7 +622,7 @@ export interface PacketCommitmentDataAmino {
   path: Uint8Array;
   commitment: Uint8Array;
 }
-export interface PacketCommitmentDataAminoType {
+export interface PacketCommitmentDataAminoMsg {
   type: "cosmos-sdk/PacketCommitmentData";
   value: PacketCommitmentDataAmino;
 }
@@ -644,7 +644,7 @@ export interface PacketAcknowledgementData {
   path: Uint8Array;
   acknowledgement: Uint8Array;
 }
-export interface PacketAcknowledgementDataProtoType {
+export interface PacketAcknowledgementDataProtoMsg {
   typeUrl: "/ibc.lightclients.solomachine.v2.PacketAcknowledgementData";
   value: Uint8Array;
 }
@@ -657,7 +657,7 @@ export interface PacketAcknowledgementDataAmino {
   path: Uint8Array;
   acknowledgement: Uint8Array;
 }
-export interface PacketAcknowledgementDataAminoType {
+export interface PacketAcknowledgementDataAminoMsg {
   type: "cosmos-sdk/PacketAcknowledgementData";
   value: PacketAcknowledgementDataAmino;
 }
@@ -678,7 +678,7 @@ export interface PacketAcknowledgementDataSDKType {
 export interface PacketReceiptAbsenceData {
   path: Uint8Array;
 }
-export interface PacketReceiptAbsenceDataProtoType {
+export interface PacketReceiptAbsenceDataProtoMsg {
   typeUrl: "/ibc.lightclients.solomachine.v2.PacketReceiptAbsenceData";
   value: Uint8Array;
 }
@@ -690,7 +690,7 @@ export interface PacketReceiptAbsenceDataProtoType {
 export interface PacketReceiptAbsenceDataAmino {
   path: Uint8Array;
 }
-export interface PacketReceiptAbsenceDataAminoType {
+export interface PacketReceiptAbsenceDataAminoMsg {
   type: "cosmos-sdk/PacketReceiptAbsenceData";
   value: PacketReceiptAbsenceDataAmino;
 }
@@ -711,7 +711,7 @@ export interface NextSequenceRecvData {
   path: Uint8Array;
   nextSeqRecv: Long;
 }
-export interface NextSequenceRecvDataProtoType {
+export interface NextSequenceRecvDataProtoMsg {
   typeUrl: "/ibc.lightclients.solomachine.v2.NextSequenceRecvData";
   value: Uint8Array;
 }
@@ -724,7 +724,7 @@ export interface NextSequenceRecvDataAmino {
   path: Uint8Array;
   next_seq_recv: string;
 }
-export interface NextSequenceRecvDataAminoType {
+export interface NextSequenceRecvDataAminoMsg {
   type: "cosmos-sdk/NextSequenceRecvData";
   value: NextSequenceRecvDataAmino;
 }
@@ -748,6 +748,9 @@ function createBaseClientState(): ClientState {
 }
 
 export const ClientState = {
+  typeUrl: "/ibc.lightclients.solomachine.v2.ClientState",
+  aminoType: "cosmos-sdk/ClientState",
+
   encode(message: ClientState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.sequence.isZero()) {
       writer.uint32(8).uint64(message.sequence);
@@ -863,6 +866,32 @@ export const ClientState = {
     obj.consensus_state = message.consensusState ? ConsensusState.toAmino(message.consensusState) : undefined;
     obj.allow_update_after_proposal = message.allowUpdateAfterProposal;
     return obj;
+  },
+
+  fromAminoMsg(object: ClientStateAminoMsg): ClientState {
+    return ClientState.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ClientState): ClientStateAminoMsg {
+    return {
+      type: "cosmos-sdk/ClientState",
+      value: ClientState.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ClientStateProtoMsg): ClientState {
+    return ClientState.decode(message.value);
+  },
+
+  toProto(message: ClientState): Uint8Array {
+    return ClientState.encode(message).finish();
+  },
+
+  toProtoMsg(message: ClientState): ClientStateProtoMsg {
+    return {
+      typeUrl: "/ibc.lightclients.solomachine.v2.ClientState",
+      value: ClientState.encode(message).finish()
+    };
   }
 
 };
@@ -876,6 +905,9 @@ function createBaseConsensusState(): ConsensusState {
 }
 
 export const ConsensusState = {
+  typeUrl: "/ibc.lightclients.solomachine.v2.ConsensusState",
+  aminoType: "cosmos-sdk/ConsensusState",
+
   encode(message: ConsensusState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.publicKey !== undefined) {
       Any.encode(message.publicKey, writer.uint32(10).fork()).ldelim();
@@ -976,6 +1008,32 @@ export const ConsensusState = {
     obj.diversifier = message.diversifier;
     obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ConsensusStateAminoMsg): ConsensusState {
+    return ConsensusState.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ConsensusState): ConsensusStateAminoMsg {
+    return {
+      type: "cosmos-sdk/ConsensusState",
+      value: ConsensusState.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ConsensusStateProtoMsg): ConsensusState {
+    return ConsensusState.decode(message.value);
+  },
+
+  toProto(message: ConsensusState): Uint8Array {
+    return ConsensusState.encode(message).finish();
+  },
+
+  toProtoMsg(message: ConsensusState): ConsensusStateProtoMsg {
+    return {
+      typeUrl: "/ibc.lightclients.solomachine.v2.ConsensusState",
+      value: ConsensusState.encode(message).finish()
+    };
   }
 
 };
@@ -991,6 +1049,9 @@ function createBaseHeader(): Header {
 }
 
 export const Header = {
+  typeUrl: "/ibc.lightclients.solomachine.v2.Header",
+  aminoType: "cosmos-sdk/Header",
+
   encode(message: Header, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.sequence.isZero()) {
       writer.uint32(8).uint64(message.sequence);
@@ -1121,6 +1182,32 @@ export const Header = {
     obj.new_public_key = message.newPublicKey ? Any.toAmino(message.newPublicKey) : undefined;
     obj.new_diversifier = message.newDiversifier;
     return obj;
+  },
+
+  fromAminoMsg(object: HeaderAminoMsg): Header {
+    return Header.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Header): HeaderAminoMsg {
+    return {
+      type: "cosmos-sdk/Header",
+      value: Header.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: HeaderProtoMsg): Header {
+    return Header.decode(message.value);
+  },
+
+  toProto(message: Header): Uint8Array {
+    return Header.encode(message).finish();
+  },
+
+  toProtoMsg(message: Header): HeaderProtoMsg {
+    return {
+      typeUrl: "/ibc.lightclients.solomachine.v2.Header",
+      value: Header.encode(message).finish()
+    };
   }
 
 };
@@ -1135,6 +1222,9 @@ function createBaseMisbehaviour(): Misbehaviour {
 }
 
 export const Misbehaviour = {
+  typeUrl: "/ibc.lightclients.solomachine.v2.Misbehaviour",
+  aminoType: "cosmos-sdk/Misbehaviour",
+
   encode(message: Misbehaviour, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.clientId !== "") {
       writer.uint32(10).string(message.clientId);
@@ -1250,6 +1340,32 @@ export const Misbehaviour = {
     obj.signature_one = message.signatureOne ? SignatureAndData.toAmino(message.signatureOne) : undefined;
     obj.signature_two = message.signatureTwo ? SignatureAndData.toAmino(message.signatureTwo) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MisbehaviourAminoMsg): Misbehaviour {
+    return Misbehaviour.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Misbehaviour): MisbehaviourAminoMsg {
+    return {
+      type: "cosmos-sdk/Misbehaviour",
+      value: Misbehaviour.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MisbehaviourProtoMsg): Misbehaviour {
+    return Misbehaviour.decode(message.value);
+  },
+
+  toProto(message: Misbehaviour): Uint8Array {
+    return Misbehaviour.encode(message).finish();
+  },
+
+  toProtoMsg(message: Misbehaviour): MisbehaviourProtoMsg {
+    return {
+      typeUrl: "/ibc.lightclients.solomachine.v2.Misbehaviour",
+      value: Misbehaviour.encode(message).finish()
+    };
   }
 
 };
@@ -1264,6 +1380,9 @@ function createBaseSignatureAndData(): SignatureAndData {
 }
 
 export const SignatureAndData = {
+  typeUrl: "/ibc.lightclients.solomachine.v2.SignatureAndData",
+  aminoType: "cosmos-sdk/SignatureAndData",
+
   encode(message: SignatureAndData, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.signature.length !== 0) {
       writer.uint32(10).bytes(message.signature);
@@ -1379,6 +1498,32 @@ export const SignatureAndData = {
     obj.data = message.data;
     obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: SignatureAndDataAminoMsg): SignatureAndData {
+    return SignatureAndData.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: SignatureAndData): SignatureAndDataAminoMsg {
+    return {
+      type: "cosmos-sdk/SignatureAndData",
+      value: SignatureAndData.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: SignatureAndDataProtoMsg): SignatureAndData {
+    return SignatureAndData.decode(message.value);
+  },
+
+  toProto(message: SignatureAndData): Uint8Array {
+    return SignatureAndData.encode(message).finish();
+  },
+
+  toProtoMsg(message: SignatureAndData): SignatureAndDataProtoMsg {
+    return {
+      typeUrl: "/ibc.lightclients.solomachine.v2.SignatureAndData",
+      value: SignatureAndData.encode(message).finish()
+    };
   }
 
 };
@@ -1391,6 +1536,9 @@ function createBaseTimestampedSignatureData(): TimestampedSignatureData {
 }
 
 export const TimestampedSignatureData = {
+  typeUrl: "/ibc.lightclients.solomachine.v2.TimestampedSignatureData",
+  aminoType: "cosmos-sdk/TimestampedSignatureData",
+
   encode(message: TimestampedSignatureData, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.signatureData.length !== 0) {
       writer.uint32(10).bytes(message.signatureData);
@@ -1476,6 +1624,32 @@ export const TimestampedSignatureData = {
     obj.signature_data = message.signatureData;
     obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: TimestampedSignatureDataAminoMsg): TimestampedSignatureData {
+    return TimestampedSignatureData.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: TimestampedSignatureData): TimestampedSignatureDataAminoMsg {
+    return {
+      type: "cosmos-sdk/TimestampedSignatureData",
+      value: TimestampedSignatureData.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: TimestampedSignatureDataProtoMsg): TimestampedSignatureData {
+    return TimestampedSignatureData.decode(message.value);
+  },
+
+  toProto(message: TimestampedSignatureData): Uint8Array {
+    return TimestampedSignatureData.encode(message).finish();
+  },
+
+  toProtoMsg(message: TimestampedSignatureData): TimestampedSignatureDataProtoMsg {
+    return {
+      typeUrl: "/ibc.lightclients.solomachine.v2.TimestampedSignatureData",
+      value: TimestampedSignatureData.encode(message).finish()
+    };
   }
 
 };
@@ -1491,6 +1665,9 @@ function createBaseSignBytes(): SignBytes {
 }
 
 export const SignBytes = {
+  typeUrl: "/ibc.lightclients.solomachine.v2.SignBytes",
+  aminoType: "cosmos-sdk/SignBytes",
+
   encode(message: SignBytes, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.sequence.isZero()) {
       writer.uint32(8).uint64(message.sequence);
@@ -1621,6 +1798,32 @@ export const SignBytes = {
     obj.data_type = message.dataType;
     obj.data = message.data;
     return obj;
+  },
+
+  fromAminoMsg(object: SignBytesAminoMsg): SignBytes {
+    return SignBytes.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: SignBytes): SignBytesAminoMsg {
+    return {
+      type: "cosmos-sdk/SignBytes",
+      value: SignBytes.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: SignBytesProtoMsg): SignBytes {
+    return SignBytes.decode(message.value);
+  },
+
+  toProto(message: SignBytes): Uint8Array {
+    return SignBytes.encode(message).finish();
+  },
+
+  toProtoMsg(message: SignBytes): SignBytesProtoMsg {
+    return {
+      typeUrl: "/ibc.lightclients.solomachine.v2.SignBytes",
+      value: SignBytes.encode(message).finish()
+    };
   }
 
 };
@@ -1633,6 +1836,9 @@ function createBaseHeaderData(): HeaderData {
 }
 
 export const HeaderData = {
+  typeUrl: "/ibc.lightclients.solomachine.v2.HeaderData",
+  aminoType: "cosmos-sdk/HeaderData",
+
   encode(message: HeaderData, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.newPubKey !== undefined) {
       Any.encode(message.newPubKey, writer.uint32(10).fork()).ldelim();
@@ -1718,6 +1924,32 @@ export const HeaderData = {
     obj.new_pub_key = message.newPubKey ? Any.toAmino(message.newPubKey) : undefined;
     obj.new_diversifier = message.newDiversifier;
     return obj;
+  },
+
+  fromAminoMsg(object: HeaderDataAminoMsg): HeaderData {
+    return HeaderData.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: HeaderData): HeaderDataAminoMsg {
+    return {
+      type: "cosmos-sdk/HeaderData",
+      value: HeaderData.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: HeaderDataProtoMsg): HeaderData {
+    return HeaderData.decode(message.value);
+  },
+
+  toProto(message: HeaderData): Uint8Array {
+    return HeaderData.encode(message).finish();
+  },
+
+  toProtoMsg(message: HeaderData): HeaderDataProtoMsg {
+    return {
+      typeUrl: "/ibc.lightclients.solomachine.v2.HeaderData",
+      value: HeaderData.encode(message).finish()
+    };
   }
 
 };
@@ -1730,6 +1962,9 @@ function createBaseClientStateData(): ClientStateData {
 }
 
 export const ClientStateData = {
+  typeUrl: "/ibc.lightclients.solomachine.v2.ClientStateData",
+  aminoType: "cosmos-sdk/ClientStateData",
+
   encode(message: ClientStateData, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.path.length !== 0) {
       writer.uint32(10).bytes(message.path);
@@ -1815,6 +2050,32 @@ export const ClientStateData = {
     obj.path = message.path;
     obj.client_state = message.clientState ? Any.toAmino(message.clientState) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ClientStateDataAminoMsg): ClientStateData {
+    return ClientStateData.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ClientStateData): ClientStateDataAminoMsg {
+    return {
+      type: "cosmos-sdk/ClientStateData",
+      value: ClientStateData.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ClientStateDataProtoMsg): ClientStateData {
+    return ClientStateData.decode(message.value);
+  },
+
+  toProto(message: ClientStateData): Uint8Array {
+    return ClientStateData.encode(message).finish();
+  },
+
+  toProtoMsg(message: ClientStateData): ClientStateDataProtoMsg {
+    return {
+      typeUrl: "/ibc.lightclients.solomachine.v2.ClientStateData",
+      value: ClientStateData.encode(message).finish()
+    };
   }
 
 };
@@ -1827,6 +2088,9 @@ function createBaseConsensusStateData(): ConsensusStateData {
 }
 
 export const ConsensusStateData = {
+  typeUrl: "/ibc.lightclients.solomachine.v2.ConsensusStateData",
+  aminoType: "cosmos-sdk/ConsensusStateData",
+
   encode(message: ConsensusStateData, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.path.length !== 0) {
       writer.uint32(10).bytes(message.path);
@@ -1912,6 +2176,32 @@ export const ConsensusStateData = {
     obj.path = message.path;
     obj.consensus_state = message.consensusState ? Any.toAmino(message.consensusState) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ConsensusStateDataAminoMsg): ConsensusStateData {
+    return ConsensusStateData.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ConsensusStateData): ConsensusStateDataAminoMsg {
+    return {
+      type: "cosmos-sdk/ConsensusStateData",
+      value: ConsensusStateData.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ConsensusStateDataProtoMsg): ConsensusStateData {
+    return ConsensusStateData.decode(message.value);
+  },
+
+  toProto(message: ConsensusStateData): Uint8Array {
+    return ConsensusStateData.encode(message).finish();
+  },
+
+  toProtoMsg(message: ConsensusStateData): ConsensusStateDataProtoMsg {
+    return {
+      typeUrl: "/ibc.lightclients.solomachine.v2.ConsensusStateData",
+      value: ConsensusStateData.encode(message).finish()
+    };
   }
 
 };
@@ -1924,6 +2214,9 @@ function createBaseConnectionStateData(): ConnectionStateData {
 }
 
 export const ConnectionStateData = {
+  typeUrl: "/ibc.lightclients.solomachine.v2.ConnectionStateData",
+  aminoType: "cosmos-sdk/ConnectionStateData",
+
   encode(message: ConnectionStateData, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.path.length !== 0) {
       writer.uint32(10).bytes(message.path);
@@ -2009,6 +2302,32 @@ export const ConnectionStateData = {
     obj.path = message.path;
     obj.connection = message.connection ? ConnectionEnd.toAmino(message.connection) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ConnectionStateDataAminoMsg): ConnectionStateData {
+    return ConnectionStateData.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ConnectionStateData): ConnectionStateDataAminoMsg {
+    return {
+      type: "cosmos-sdk/ConnectionStateData",
+      value: ConnectionStateData.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ConnectionStateDataProtoMsg): ConnectionStateData {
+    return ConnectionStateData.decode(message.value);
+  },
+
+  toProto(message: ConnectionStateData): Uint8Array {
+    return ConnectionStateData.encode(message).finish();
+  },
+
+  toProtoMsg(message: ConnectionStateData): ConnectionStateDataProtoMsg {
+    return {
+      typeUrl: "/ibc.lightclients.solomachine.v2.ConnectionStateData",
+      value: ConnectionStateData.encode(message).finish()
+    };
   }
 
 };
@@ -2021,6 +2340,9 @@ function createBaseChannelStateData(): ChannelStateData {
 }
 
 export const ChannelStateData = {
+  typeUrl: "/ibc.lightclients.solomachine.v2.ChannelStateData",
+  aminoType: "cosmos-sdk/ChannelStateData",
+
   encode(message: ChannelStateData, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.path.length !== 0) {
       writer.uint32(10).bytes(message.path);
@@ -2106,6 +2428,32 @@ export const ChannelStateData = {
     obj.path = message.path;
     obj.channel = message.channel ? Channel.toAmino(message.channel) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ChannelStateDataAminoMsg): ChannelStateData {
+    return ChannelStateData.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ChannelStateData): ChannelStateDataAminoMsg {
+    return {
+      type: "cosmos-sdk/ChannelStateData",
+      value: ChannelStateData.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ChannelStateDataProtoMsg): ChannelStateData {
+    return ChannelStateData.decode(message.value);
+  },
+
+  toProto(message: ChannelStateData): Uint8Array {
+    return ChannelStateData.encode(message).finish();
+  },
+
+  toProtoMsg(message: ChannelStateData): ChannelStateDataProtoMsg {
+    return {
+      typeUrl: "/ibc.lightclients.solomachine.v2.ChannelStateData",
+      value: ChannelStateData.encode(message).finish()
+    };
   }
 
 };
@@ -2118,6 +2466,9 @@ function createBasePacketCommitmentData(): PacketCommitmentData {
 }
 
 export const PacketCommitmentData = {
+  typeUrl: "/ibc.lightclients.solomachine.v2.PacketCommitmentData",
+  aminoType: "cosmos-sdk/PacketCommitmentData",
+
   encode(message: PacketCommitmentData, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.path.length !== 0) {
       writer.uint32(10).bytes(message.path);
@@ -2203,6 +2554,32 @@ export const PacketCommitmentData = {
     obj.path = message.path;
     obj.commitment = message.commitment;
     return obj;
+  },
+
+  fromAminoMsg(object: PacketCommitmentDataAminoMsg): PacketCommitmentData {
+    return PacketCommitmentData.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: PacketCommitmentData): PacketCommitmentDataAminoMsg {
+    return {
+      type: "cosmos-sdk/PacketCommitmentData",
+      value: PacketCommitmentData.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: PacketCommitmentDataProtoMsg): PacketCommitmentData {
+    return PacketCommitmentData.decode(message.value);
+  },
+
+  toProto(message: PacketCommitmentData): Uint8Array {
+    return PacketCommitmentData.encode(message).finish();
+  },
+
+  toProtoMsg(message: PacketCommitmentData): PacketCommitmentDataProtoMsg {
+    return {
+      typeUrl: "/ibc.lightclients.solomachine.v2.PacketCommitmentData",
+      value: PacketCommitmentData.encode(message).finish()
+    };
   }
 
 };
@@ -2215,6 +2592,9 @@ function createBasePacketAcknowledgementData(): PacketAcknowledgementData {
 }
 
 export const PacketAcknowledgementData = {
+  typeUrl: "/ibc.lightclients.solomachine.v2.PacketAcknowledgementData",
+  aminoType: "cosmos-sdk/PacketAcknowledgementData",
+
   encode(message: PacketAcknowledgementData, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.path.length !== 0) {
       writer.uint32(10).bytes(message.path);
@@ -2300,6 +2680,32 @@ export const PacketAcknowledgementData = {
     obj.path = message.path;
     obj.acknowledgement = message.acknowledgement;
     return obj;
+  },
+
+  fromAminoMsg(object: PacketAcknowledgementDataAminoMsg): PacketAcknowledgementData {
+    return PacketAcknowledgementData.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: PacketAcknowledgementData): PacketAcknowledgementDataAminoMsg {
+    return {
+      type: "cosmos-sdk/PacketAcknowledgementData",
+      value: PacketAcknowledgementData.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: PacketAcknowledgementDataProtoMsg): PacketAcknowledgementData {
+    return PacketAcknowledgementData.decode(message.value);
+  },
+
+  toProto(message: PacketAcknowledgementData): Uint8Array {
+    return PacketAcknowledgementData.encode(message).finish();
+  },
+
+  toProtoMsg(message: PacketAcknowledgementData): PacketAcknowledgementDataProtoMsg {
+    return {
+      typeUrl: "/ibc.lightclients.solomachine.v2.PacketAcknowledgementData",
+      value: PacketAcknowledgementData.encode(message).finish()
+    };
   }
 
 };
@@ -2311,6 +2717,9 @@ function createBasePacketReceiptAbsenceData(): PacketReceiptAbsenceData {
 }
 
 export const PacketReceiptAbsenceData = {
+  typeUrl: "/ibc.lightclients.solomachine.v2.PacketReceiptAbsenceData",
+  aminoType: "cosmos-sdk/PacketReceiptAbsenceData",
+
   encode(message: PacketReceiptAbsenceData, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.path.length !== 0) {
       writer.uint32(10).bytes(message.path);
@@ -2381,6 +2790,32 @@ export const PacketReceiptAbsenceData = {
     const obj: any = {};
     obj.path = message.path;
     return obj;
+  },
+
+  fromAminoMsg(object: PacketReceiptAbsenceDataAminoMsg): PacketReceiptAbsenceData {
+    return PacketReceiptAbsenceData.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: PacketReceiptAbsenceData): PacketReceiptAbsenceDataAminoMsg {
+    return {
+      type: "cosmos-sdk/PacketReceiptAbsenceData",
+      value: PacketReceiptAbsenceData.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: PacketReceiptAbsenceDataProtoMsg): PacketReceiptAbsenceData {
+    return PacketReceiptAbsenceData.decode(message.value);
+  },
+
+  toProto(message: PacketReceiptAbsenceData): Uint8Array {
+    return PacketReceiptAbsenceData.encode(message).finish();
+  },
+
+  toProtoMsg(message: PacketReceiptAbsenceData): PacketReceiptAbsenceDataProtoMsg {
+    return {
+      typeUrl: "/ibc.lightclients.solomachine.v2.PacketReceiptAbsenceData",
+      value: PacketReceiptAbsenceData.encode(message).finish()
+    };
   }
 
 };
@@ -2393,6 +2828,9 @@ function createBaseNextSequenceRecvData(): NextSequenceRecvData {
 }
 
 export const NextSequenceRecvData = {
+  typeUrl: "/ibc.lightclients.solomachine.v2.NextSequenceRecvData",
+  aminoType: "cosmos-sdk/NextSequenceRecvData",
+
   encode(message: NextSequenceRecvData, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.path.length !== 0) {
       writer.uint32(10).bytes(message.path);
@@ -2478,6 +2916,32 @@ export const NextSequenceRecvData = {
     obj.path = message.path;
     obj.next_seq_recv = message.nextSeqRecv ? message.nextSeqRecv.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: NextSequenceRecvDataAminoMsg): NextSequenceRecvData {
+    return NextSequenceRecvData.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: NextSequenceRecvData): NextSequenceRecvDataAminoMsg {
+    return {
+      type: "cosmos-sdk/NextSequenceRecvData",
+      value: NextSequenceRecvData.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: NextSequenceRecvDataProtoMsg): NextSequenceRecvData {
+    return NextSequenceRecvData.decode(message.value);
+  },
+
+  toProto(message: NextSequenceRecvData): Uint8Array {
+    return NextSequenceRecvData.encode(message).finish();
+  },
+
+  toProtoMsg(message: NextSequenceRecvData): NextSequenceRecvDataProtoMsg {
+    return {
+      typeUrl: "/ibc.lightclients.solomachine.v2.NextSequenceRecvData",
+      value: NextSequenceRecvData.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/ibc/lightclients/tendermint/v1/tendermint.ts b/__fixtures__/outputv2/ibc/lightclients/tendermint/v1/tendermint.ts
index 9018788d2..b49402a99 100644
--- a/__fixtures__/outputv2/ibc/lightclients/tendermint/v1/tendermint.ts
+++ b/__fixtures__/outputv2/ibc/lightclients/tendermint/v1/tendermint.ts
@@ -61,7 +61,7 @@ export interface ClientState {
    */
   allowUpdateAfterMisbehaviour: boolean;
 }
-export interface ClientStateProtoType {
+export interface ClientStateProtoMsg {
   typeUrl: "/ibc.lightclients.tendermint.v1.ClientState";
   value: Uint8Array;
 }
@@ -118,7 +118,7 @@ export interface ClientStateAmino {
    */
   allow_update_after_misbehaviour: boolean;
 }
-export interface ClientStateAminoType {
+export interface ClientStateAminoMsg {
   type: "cosmos-sdk/ClientState";
   value: ClientStateAmino;
 }
@@ -153,7 +153,7 @@ export interface ConsensusState {
   root?: MerkleRoot;
   nextValidatorsHash: Uint8Array;
 }
-export interface ConsensusStateProtoType {
+export interface ConsensusStateProtoMsg {
   typeUrl: "/ibc.lightclients.tendermint.v1.ConsensusState";
   value: Uint8Array;
 }
@@ -170,7 +170,7 @@ export interface ConsensusStateAmino {
   root?: MerkleRootAmino;
   next_validators_hash: Uint8Array;
 }
-export interface ConsensusStateAminoType {
+export interface ConsensusStateAminoMsg {
   type: "cosmos-sdk/ConsensusState";
   value: ConsensusStateAmino;
 }
@@ -191,7 +191,7 @@ export interface Misbehaviour {
   header1?: Header;
   header2?: Header;
 }
-export interface MisbehaviourProtoType {
+export interface MisbehaviourProtoMsg {
   typeUrl: "/ibc.lightclients.tendermint.v1.Misbehaviour";
   value: Uint8Array;
 }
@@ -205,7 +205,7 @@ export interface MisbehaviourAmino {
   header_1?: HeaderAmino;
   header_2?: HeaderAmino;
 }
-export interface MisbehaviourAminoType {
+export interface MisbehaviourAminoMsg {
   type: "cosmos-sdk/Misbehaviour";
   value: MisbehaviourAmino;
 }
@@ -240,7 +240,7 @@ export interface Header {
   trustedHeight?: Height;
   trustedValidators?: ValidatorSet;
 }
-export interface HeaderProtoType {
+export interface HeaderProtoMsg {
   typeUrl: "/ibc.lightclients.tendermint.v1.Header";
   value: Uint8Array;
 }
@@ -265,7 +265,7 @@ export interface HeaderAmino {
   trusted_height?: HeightAmino;
   trusted_validators?: ValidatorSetAmino;
 }
-export interface HeaderAminoType {
+export interface HeaderAminoMsg {
   type: "cosmos-sdk/Header";
   value: HeaderAmino;
 }
@@ -299,7 +299,7 @@ export interface Fraction {
   numerator: Long;
   denominator: Long;
 }
-export interface FractionProtoType {
+export interface FractionProtoMsg {
   typeUrl: "/ibc.lightclients.tendermint.v1.Fraction";
   value: Uint8Array;
 }
@@ -312,7 +312,7 @@ export interface FractionAmino {
   numerator: string;
   denominator: string;
 }
-export interface FractionAminoType {
+export interface FractionAminoMsg {
   type: "cosmos-sdk/Fraction";
   value: FractionAmino;
 }
@@ -343,6 +343,9 @@ function createBaseClientState(): ClientState {
 }
 
 export const ClientState = {
+  typeUrl: "/ibc.lightclients.tendermint.v1.ClientState",
+  aminoType: "cosmos-sdk/ClientState",
+
   encode(message: ClientState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.chainId !== "") {
       writer.uint32(10).string(message.chainId);
@@ -596,6 +599,32 @@ export const ClientState = {
     obj.allow_update_after_expiry = message.allowUpdateAfterExpiry;
     obj.allow_update_after_misbehaviour = message.allowUpdateAfterMisbehaviour;
     return obj;
+  },
+
+  fromAminoMsg(object: ClientStateAminoMsg): ClientState {
+    return ClientState.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ClientState): ClientStateAminoMsg {
+    return {
+      type: "cosmos-sdk/ClientState",
+      value: ClientState.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ClientStateProtoMsg): ClientState {
+    return ClientState.decode(message.value);
+  },
+
+  toProto(message: ClientState): Uint8Array {
+    return ClientState.encode(message).finish();
+  },
+
+  toProtoMsg(message: ClientState): ClientStateProtoMsg {
+    return {
+      typeUrl: "/ibc.lightclients.tendermint.v1.ClientState",
+      value: ClientState.encode(message).finish()
+    };
   }
 
 };
@@ -609,6 +638,9 @@ function createBaseConsensusState(): ConsensusState {
 }
 
 export const ConsensusState = {
+  typeUrl: "/ibc.lightclients.tendermint.v1.ConsensusState",
+  aminoType: "cosmos-sdk/ConsensusState",
+
   encode(message: ConsensusState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.timestamp !== undefined) {
       Timestamp.encode(toTimestamp(message.timestamp), writer.uint32(10).fork()).ldelim();
@@ -709,6 +741,32 @@ export const ConsensusState = {
     obj.root = message.root ? MerkleRoot.toAmino(message.root) : undefined;
     obj.next_validators_hash = message.nextValidatorsHash;
     return obj;
+  },
+
+  fromAminoMsg(object: ConsensusStateAminoMsg): ConsensusState {
+    return ConsensusState.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ConsensusState): ConsensusStateAminoMsg {
+    return {
+      type: "cosmos-sdk/ConsensusState",
+      value: ConsensusState.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ConsensusStateProtoMsg): ConsensusState {
+    return ConsensusState.decode(message.value);
+  },
+
+  toProto(message: ConsensusState): Uint8Array {
+    return ConsensusState.encode(message).finish();
+  },
+
+  toProtoMsg(message: ConsensusState): ConsensusStateProtoMsg {
+    return {
+      typeUrl: "/ibc.lightclients.tendermint.v1.ConsensusState",
+      value: ConsensusState.encode(message).finish()
+    };
   }
 
 };
@@ -722,6 +780,9 @@ function createBaseMisbehaviour(): Misbehaviour {
 }
 
 export const Misbehaviour = {
+  typeUrl: "/ibc.lightclients.tendermint.v1.Misbehaviour",
+  aminoType: "cosmos-sdk/Misbehaviour",
+
   encode(message: Misbehaviour, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.clientId !== "") {
       writer.uint32(10).string(message.clientId);
@@ -822,6 +883,32 @@ export const Misbehaviour = {
     obj.header_1 = message.header_1 ? Header.toAmino(message.header_1) : undefined;
     obj.header_2 = message.header_2 ? Header.toAmino(message.header_2) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MisbehaviourAminoMsg): Misbehaviour {
+    return Misbehaviour.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Misbehaviour): MisbehaviourAminoMsg {
+    return {
+      type: "cosmos-sdk/Misbehaviour",
+      value: Misbehaviour.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MisbehaviourProtoMsg): Misbehaviour {
+    return Misbehaviour.decode(message.value);
+  },
+
+  toProto(message: Misbehaviour): Uint8Array {
+    return Misbehaviour.encode(message).finish();
+  },
+
+  toProtoMsg(message: Misbehaviour): MisbehaviourProtoMsg {
+    return {
+      typeUrl: "/ibc.lightclients.tendermint.v1.Misbehaviour",
+      value: Misbehaviour.encode(message).finish()
+    };
   }
 
 };
@@ -836,6 +923,9 @@ function createBaseHeader(): Header {
 }
 
 export const Header = {
+  typeUrl: "/ibc.lightclients.tendermint.v1.Header",
+  aminoType: "cosmos-sdk/Header",
+
   encode(message: Header, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.signedHeader !== undefined) {
       SignedHeader.encode(message.signedHeader, writer.uint32(10).fork()).ldelim();
@@ -951,6 +1041,32 @@ export const Header = {
     obj.trusted_height = message.trustedHeight ? Height.toAmino(message.trustedHeight) : {};
     obj.trusted_validators = message.trustedValidators ? ValidatorSet.toAmino(message.trustedValidators) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: HeaderAminoMsg): Header {
+    return Header.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Header): HeaderAminoMsg {
+    return {
+      type: "cosmos-sdk/Header",
+      value: Header.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: HeaderProtoMsg): Header {
+    return Header.decode(message.value);
+  },
+
+  toProto(message: Header): Uint8Array {
+    return Header.encode(message).finish();
+  },
+
+  toProtoMsg(message: Header): HeaderProtoMsg {
+    return {
+      typeUrl: "/ibc.lightclients.tendermint.v1.Header",
+      value: Header.encode(message).finish()
+    };
   }
 
 };
@@ -963,6 +1079,9 @@ function createBaseFraction(): Fraction {
 }
 
 export const Fraction = {
+  typeUrl: "/ibc.lightclients.tendermint.v1.Fraction",
+  aminoType: "cosmos-sdk/Fraction",
+
   encode(message: Fraction, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.numerator.isZero()) {
       writer.uint32(8).uint64(message.numerator);
@@ -1048,6 +1167,32 @@ export const Fraction = {
     obj.numerator = message.numerator ? message.numerator.toString() : undefined;
     obj.denominator = message.denominator ? message.denominator.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: FractionAminoMsg): Fraction {
+    return Fraction.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Fraction): FractionAminoMsg {
+    return {
+      type: "cosmos-sdk/Fraction",
+      value: Fraction.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: FractionProtoMsg): Fraction {
+    return Fraction.decode(message.value);
+  },
+
+  toProto(message: Fraction): Uint8Array {
+    return Fraction.encode(message).finish();
+  },
+
+  toProtoMsg(message: Fraction): FractionProtoMsg {
+    return {
+      typeUrl: "/ibc.lightclients.tendermint.v1.Fraction",
+      value: Fraction.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/osmosis/claim/v1beta1/claim.ts b/__fixtures__/outputv2/osmosis/claim/v1beta1/claim.ts
index c29edf1c0..8336937af 100644
--- a/__fixtures__/outputv2/osmosis/claim/v1beta1/claim.ts
+++ b/__fixtures__/outputv2/osmosis/claim/v1beta1/claim.ts
@@ -69,7 +69,7 @@ export interface ClaimRecord {
    */
   actionCompleted: boolean[];
 }
-export interface ClaimRecordProtoType {
+export interface ClaimRecordProtoMsg {
   typeUrl: "/osmosis.claim.v1beta1.ClaimRecord";
   value: Uint8Array;
 }
@@ -88,7 +88,7 @@ export interface ClaimRecordAmino {
    */
   action_completed: boolean[];
 }
-export interface ClaimRecordAminoType {
+export interface ClaimRecordAminoMsg {
   type: "osmosis/claim/claim-record";
   value: ClaimRecordAmino;
 }
@@ -109,6 +109,9 @@ function createBaseClaimRecord(): ClaimRecord {
 }
 
 export const ClaimRecord = {
+  typeUrl: "/osmosis.claim.v1beta1.ClaimRecord",
+  aminoType: "osmosis/claim/claim-record",
+
   encode(message: ClaimRecord, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.address !== "") {
       writer.uint32(10).string(message.address);
@@ -254,6 +257,32 @@ export const ClaimRecord = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ClaimRecordAminoMsg): ClaimRecord {
+    return ClaimRecord.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ClaimRecord): ClaimRecordAminoMsg {
+    return {
+      type: "osmosis/claim/claim-record",
+      value: ClaimRecord.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ClaimRecordProtoMsg): ClaimRecord {
+    return ClaimRecord.decode(message.value);
+  },
+
+  toProto(message: ClaimRecord): Uint8Array {
+    return ClaimRecord.encode(message).finish();
+  },
+
+  toProtoMsg(message: ClaimRecord): ClaimRecordProtoMsg {
+    return {
+      typeUrl: "/osmosis.claim.v1beta1.ClaimRecord",
+      value: ClaimRecord.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/osmosis/claim/v1beta1/genesis.ts b/__fixtures__/outputv2/osmosis/claim/v1beta1/genesis.ts
index 44c9d031b..1b6628eb3 100644
--- a/__fixtures__/outputv2/osmosis/claim/v1beta1/genesis.ts
+++ b/__fixtures__/outputv2/osmosis/claim/v1beta1/genesis.ts
@@ -16,7 +16,7 @@ export interface GenesisState {
   /** list of claim records, one for every airdrop recipient */
   claimRecords: ClaimRecord[];
 }
-export interface GenesisStateProtoType {
+export interface GenesisStateProtoMsg {
   typeUrl: "/osmosis.claim.v1beta1.GenesisState";
   value: Uint8Array;
 }
@@ -32,7 +32,7 @@ export interface GenesisStateAmino {
   /** list of claim records, one for every airdrop recipient */
   claim_records: ClaimRecordAmino[];
 }
-export interface GenesisStateAminoType {
+export interface GenesisStateAminoMsg {
   type: "osmosis/claim/genesis-state";
   value: GenesisStateAmino;
 }
@@ -53,6 +53,9 @@ function createBaseGenesisState(): GenesisState {
 }
 
 export const GenesisState = {
+  typeUrl: "/osmosis.claim.v1beta1.GenesisState",
+  aminoType: "osmosis/claim/genesis-state",
+
   encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.moduleAccountBalance !== undefined) {
       Coin.encode(message.moduleAccountBalance, writer.uint32(10).fork()).ldelim();
@@ -171,6 +174,32 @@ export const GenesisState = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisStateAminoMsg): GenesisState {
+    return GenesisState.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GenesisState): GenesisStateAminoMsg {
+    return {
+      type: "osmosis/claim/genesis-state",
+      value: GenesisState.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GenesisStateProtoMsg): GenesisState {
+    return GenesisState.decode(message.value);
+  },
+
+  toProto(message: GenesisState): Uint8Array {
+    return GenesisState.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisState): GenesisStateProtoMsg {
+    return {
+      typeUrl: "/osmosis.claim.v1beta1.GenesisState",
+      value: GenesisState.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/osmosis/claim/v1beta1/params.ts b/__fixtures__/outputv2/osmosis/claim/v1beta1/params.ts
index e11fe388e..88646f06d 100644
--- a/__fixtures__/outputv2/osmosis/claim/v1beta1/params.ts
+++ b/__fixtures__/outputv2/osmosis/claim/v1beta1/params.ts
@@ -13,7 +13,7 @@ export interface Params {
   /** denom of claimable asset */
   claimDenom: string;
 }
-export interface ParamsProtoType {
+export interface ParamsProtoMsg {
   typeUrl: "/osmosis.claim.v1beta1.Params";
   value: Uint8Array;
 }
@@ -27,7 +27,7 @@ export interface ParamsAmino {
   /** denom of claimable asset */
   claim_denom: string;
 }
-export interface ParamsAminoType {
+export interface ParamsAminoMsg {
   type: "osmosis/claim/params";
   value: ParamsAmino;
 }
@@ -50,6 +50,9 @@ function createBaseParams(): Params {
 }
 
 export const Params = {
+  typeUrl: "/osmosis.claim.v1beta1.Params",
+  aminoType: "osmosis/claim/params",
+
   encode(message: Params, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.airdropStartTime !== undefined) {
       Timestamp.encode(toTimestamp(message.airdropStartTime), writer.uint32(10).fork()).ldelim();
@@ -165,6 +168,32 @@ export const Params = {
     obj.duration_of_decay = message.durationOfDecay ? Duration.toAmino(message.durationOfDecay) : undefined;
     obj.claim_denom = message.claimDenom;
     return obj;
+  },
+
+  fromAminoMsg(object: ParamsAminoMsg): Params {
+    return Params.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Params): ParamsAminoMsg {
+    return {
+      type: "osmosis/claim/params",
+      value: Params.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ParamsProtoMsg): Params {
+    return Params.decode(message.value);
+  },
+
+  toProto(message: Params): Uint8Array {
+    return Params.encode(message).finish();
+  },
+
+  toProtoMsg(message: Params): ParamsProtoMsg {
+    return {
+      typeUrl: "/osmosis.claim.v1beta1.Params",
+      value: Params.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/osmosis/claim/v1beta1/query.ts b/__fixtures__/outputv2/osmosis/claim/v1beta1/query.ts
index c903c42f8..bbfb15b1b 100644
--- a/__fixtures__/outputv2/osmosis/claim/v1beta1/query.ts
+++ b/__fixtures__/outputv2/osmosis/claim/v1beta1/query.ts
@@ -7,14 +7,14 @@ export const protobufPackage = "osmosis.claim.v1beta1";
 
 /** QueryParamsRequest is the request type for the Query/Params RPC method. */
 export interface QueryModuleAccountBalanceRequest {}
-export interface QueryModuleAccountBalanceRequestProtoType {
+export interface QueryModuleAccountBalanceRequestProtoMsg {
   typeUrl: "/osmosis.claim.v1beta1.QueryModuleAccountBalanceRequest";
   value: Uint8Array;
 }
 
 /** QueryParamsRequest is the request type for the Query/Params RPC method. */
 export interface QueryModuleAccountBalanceRequestAmino {}
-export interface QueryModuleAccountBalanceRequestAminoType {
+export interface QueryModuleAccountBalanceRequestAminoMsg {
   type: "osmosis/claim/query-module-account-balance-request";
   value: QueryModuleAccountBalanceRequestAmino;
 }
@@ -27,7 +27,7 @@ export interface QueryModuleAccountBalanceResponse {
   /** params defines the parameters of the module. */
   moduleAccountBalance: Coin[];
 }
-export interface QueryModuleAccountBalanceResponseProtoType {
+export interface QueryModuleAccountBalanceResponseProtoMsg {
   typeUrl: "/osmosis.claim.v1beta1.QueryModuleAccountBalanceResponse";
   value: Uint8Array;
 }
@@ -37,7 +37,7 @@ export interface QueryModuleAccountBalanceResponseAmino {
   /** params defines the parameters of the module. */
   moduleAccountBalance: CoinAmino[];
 }
-export interface QueryModuleAccountBalanceResponseAminoType {
+export interface QueryModuleAccountBalanceResponseAminoMsg {
   type: "osmosis/claim/query-module-account-balance-response";
   value: QueryModuleAccountBalanceResponseAmino;
 }
@@ -49,14 +49,14 @@ export interface QueryModuleAccountBalanceResponseSDKType {
 
 /** QueryParamsRequest is the request type for the Query/Params RPC method. */
 export interface QueryParamsRequest {}
-export interface QueryParamsRequestProtoType {
+export interface QueryParamsRequestProtoMsg {
   typeUrl: "/osmosis.claim.v1beta1.QueryParamsRequest";
   value: Uint8Array;
 }
 
 /** QueryParamsRequest is the request type for the Query/Params RPC method. */
 export interface QueryParamsRequestAmino {}
-export interface QueryParamsRequestAminoType {
+export interface QueryParamsRequestAminoMsg {
   type: "osmosis/claim/query-params-request";
   value: QueryParamsRequestAmino;
 }
@@ -69,7 +69,7 @@ export interface QueryParamsResponse {
   /** params defines the parameters of the module. */
   params?: Params;
 }
-export interface QueryParamsResponseProtoType {
+export interface QueryParamsResponseProtoMsg {
   typeUrl: "/osmosis.claim.v1beta1.QueryParamsResponse";
   value: Uint8Array;
 }
@@ -79,7 +79,7 @@ export interface QueryParamsResponseAmino {
   /** params defines the parameters of the module. */
   params?: ParamsAmino;
 }
-export interface QueryParamsResponseAminoType {
+export interface QueryParamsResponseAminoMsg {
   type: "osmosis/claim/query-params-response";
   value: QueryParamsResponseAmino;
 }
@@ -91,14 +91,14 @@ export interface QueryParamsResponseSDKType {
 export interface QueryClaimRecordRequest {
   address: string;
 }
-export interface QueryClaimRecordRequestProtoType {
+export interface QueryClaimRecordRequestProtoMsg {
   typeUrl: "/osmosis.claim.v1beta1.QueryClaimRecordRequest";
   value: Uint8Array;
 }
 export interface QueryClaimRecordRequestAmino {
   address: string;
 }
-export interface QueryClaimRecordRequestAminoType {
+export interface QueryClaimRecordRequestAminoMsg {
   type: "osmosis/claim/query-claim-record-request";
   value: QueryClaimRecordRequestAmino;
 }
@@ -108,14 +108,14 @@ export interface QueryClaimRecordRequestSDKType {
 export interface QueryClaimRecordResponse {
   claimRecord?: ClaimRecord;
 }
-export interface QueryClaimRecordResponseProtoType {
+export interface QueryClaimRecordResponseProtoMsg {
   typeUrl: "/osmosis.claim.v1beta1.QueryClaimRecordResponse";
   value: Uint8Array;
 }
 export interface QueryClaimRecordResponseAmino {
   claim_record?: ClaimRecordAmino;
 }
-export interface QueryClaimRecordResponseAminoType {
+export interface QueryClaimRecordResponseAminoMsg {
   type: "osmosis/claim/query-claim-record-response";
   value: QueryClaimRecordResponseAmino;
 }
@@ -126,7 +126,7 @@ export interface QueryClaimableForActionRequest {
   address: string;
   action: Action;
 }
-export interface QueryClaimableForActionRequestProtoType {
+export interface QueryClaimableForActionRequestProtoMsg {
   typeUrl: "/osmosis.claim.v1beta1.QueryClaimableForActionRequest";
   value: Uint8Array;
 }
@@ -134,7 +134,7 @@ export interface QueryClaimableForActionRequestAmino {
   address: string;
   action: Action;
 }
-export interface QueryClaimableForActionRequestAminoType {
+export interface QueryClaimableForActionRequestAminoMsg {
   type: "osmosis/claim/query-claimable-for-action-request";
   value: QueryClaimableForActionRequestAmino;
 }
@@ -145,14 +145,14 @@ export interface QueryClaimableForActionRequestSDKType {
 export interface QueryClaimableForActionResponse {
   coins: Coin[];
 }
-export interface QueryClaimableForActionResponseProtoType {
+export interface QueryClaimableForActionResponseProtoMsg {
   typeUrl: "/osmosis.claim.v1beta1.QueryClaimableForActionResponse";
   value: Uint8Array;
 }
 export interface QueryClaimableForActionResponseAmino {
   coins: CoinAmino[];
 }
-export interface QueryClaimableForActionResponseAminoType {
+export interface QueryClaimableForActionResponseAminoMsg {
   type: "osmosis/claim/query-claimable-for-action-response";
   value: QueryClaimableForActionResponseAmino;
 }
@@ -162,14 +162,14 @@ export interface QueryClaimableForActionResponseSDKType {
 export interface QueryTotalClaimableRequest {
   address: string;
 }
-export interface QueryTotalClaimableRequestProtoType {
+export interface QueryTotalClaimableRequestProtoMsg {
   typeUrl: "/osmosis.claim.v1beta1.QueryTotalClaimableRequest";
   value: Uint8Array;
 }
 export interface QueryTotalClaimableRequestAmino {
   address: string;
 }
-export interface QueryTotalClaimableRequestAminoType {
+export interface QueryTotalClaimableRequestAminoMsg {
   type: "osmosis/claim/query-total-claimable-request";
   value: QueryTotalClaimableRequestAmino;
 }
@@ -179,14 +179,14 @@ export interface QueryTotalClaimableRequestSDKType {
 export interface QueryTotalClaimableResponse {
   coins: Coin[];
 }
-export interface QueryTotalClaimableResponseProtoType {
+export interface QueryTotalClaimableResponseProtoMsg {
   typeUrl: "/osmosis.claim.v1beta1.QueryTotalClaimableResponse";
   value: Uint8Array;
 }
 export interface QueryTotalClaimableResponseAmino {
   coins: CoinAmino[];
 }
-export interface QueryTotalClaimableResponseAminoType {
+export interface QueryTotalClaimableResponseAminoMsg {
   type: "osmosis/claim/query-total-claimable-response";
   value: QueryTotalClaimableResponseAmino;
 }
@@ -199,6 +199,9 @@ function createBaseQueryModuleAccountBalanceRequest(): QueryModuleAccountBalance
 }
 
 export const QueryModuleAccountBalanceRequest = {
+  typeUrl: "/osmosis.claim.v1beta1.QueryModuleAccountBalanceRequest",
+  aminoType: "osmosis/claim/query-module-account-balance-request",
+
   encode(_: QueryModuleAccountBalanceRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -251,6 +254,32 @@ export const QueryModuleAccountBalanceRequest = {
   toAmino(_: QueryModuleAccountBalanceRequest): QueryModuleAccountBalanceRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryModuleAccountBalanceRequestAminoMsg): QueryModuleAccountBalanceRequest {
+    return QueryModuleAccountBalanceRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryModuleAccountBalanceRequest): QueryModuleAccountBalanceRequestAminoMsg {
+    return {
+      type: "osmosis/claim/query-module-account-balance-request",
+      value: QueryModuleAccountBalanceRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryModuleAccountBalanceRequestProtoMsg): QueryModuleAccountBalanceRequest {
+    return QueryModuleAccountBalanceRequest.decode(message.value);
+  },
+
+  toProto(message: QueryModuleAccountBalanceRequest): Uint8Array {
+    return QueryModuleAccountBalanceRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryModuleAccountBalanceRequest): QueryModuleAccountBalanceRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.claim.v1beta1.QueryModuleAccountBalanceRequest",
+      value: QueryModuleAccountBalanceRequest.encode(message).finish()
+    };
   }
 
 };
@@ -262,6 +291,9 @@ function createBaseQueryModuleAccountBalanceResponse(): QueryModuleAccountBalanc
 }
 
 export const QueryModuleAccountBalanceResponse = {
+  typeUrl: "/osmosis.claim.v1beta1.QueryModuleAccountBalanceResponse",
+  aminoType: "osmosis/claim/query-module-account-balance-response",
+
   encode(message: QueryModuleAccountBalanceResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.moduleAccountBalance) {
       Coin.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -350,6 +382,32 @@ export const QueryModuleAccountBalanceResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: QueryModuleAccountBalanceResponseAminoMsg): QueryModuleAccountBalanceResponse {
+    return QueryModuleAccountBalanceResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryModuleAccountBalanceResponse): QueryModuleAccountBalanceResponseAminoMsg {
+    return {
+      type: "osmosis/claim/query-module-account-balance-response",
+      value: QueryModuleAccountBalanceResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryModuleAccountBalanceResponseProtoMsg): QueryModuleAccountBalanceResponse {
+    return QueryModuleAccountBalanceResponse.decode(message.value);
+  },
+
+  toProto(message: QueryModuleAccountBalanceResponse): Uint8Array {
+    return QueryModuleAccountBalanceResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryModuleAccountBalanceResponse): QueryModuleAccountBalanceResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.claim.v1beta1.QueryModuleAccountBalanceResponse",
+      value: QueryModuleAccountBalanceResponse.encode(message).finish()
+    };
   }
 
 };
@@ -359,6 +417,9 @@ function createBaseQueryParamsRequest(): QueryParamsRequest {
 }
 
 export const QueryParamsRequest = {
+  typeUrl: "/osmosis.claim.v1beta1.QueryParamsRequest",
+  aminoType: "osmosis/claim/query-params-request",
+
   encode(_: QueryParamsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -411,6 +472,32 @@ export const QueryParamsRequest = {
   toAmino(_: QueryParamsRequest): QueryParamsRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest {
+    return QueryParamsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryParamsRequest): QueryParamsRequestAminoMsg {
+    return {
+      type: "osmosis/claim/query-params-request",
+      value: QueryParamsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryParamsRequestProtoMsg): QueryParamsRequest {
+    return QueryParamsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryParamsRequest): Uint8Array {
+    return QueryParamsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryParamsRequest): QueryParamsRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.claim.v1beta1.QueryParamsRequest",
+      value: QueryParamsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -422,6 +509,9 @@ function createBaseQueryParamsResponse(): QueryParamsResponse {
 }
 
 export const QueryParamsResponse = {
+  typeUrl: "/osmosis.claim.v1beta1.QueryParamsResponse",
+  aminoType: "osmosis/claim/query-params-response",
+
   encode(message: QueryParamsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.params !== undefined) {
       Params.encode(message.params, writer.uint32(10).fork()).ldelim();
@@ -492,6 +582,32 @@ export const QueryParamsResponse = {
     const obj: any = {};
     obj.params = message.params ? Params.toAmino(message.params) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryParamsResponseAminoMsg): QueryParamsResponse {
+    return QueryParamsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryParamsResponse): QueryParamsResponseAminoMsg {
+    return {
+      type: "osmosis/claim/query-params-response",
+      value: QueryParamsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryParamsResponseProtoMsg): QueryParamsResponse {
+    return QueryParamsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryParamsResponse): Uint8Array {
+    return QueryParamsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryParamsResponse): QueryParamsResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.claim.v1beta1.QueryParamsResponse",
+      value: QueryParamsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -503,6 +619,9 @@ function createBaseQueryClaimRecordRequest(): QueryClaimRecordRequest {
 }
 
 export const QueryClaimRecordRequest = {
+  typeUrl: "/osmosis.claim.v1beta1.QueryClaimRecordRequest",
+  aminoType: "osmosis/claim/query-claim-record-request",
+
   encode(message: QueryClaimRecordRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.address !== "") {
       writer.uint32(10).string(message.address);
@@ -573,6 +692,32 @@ export const QueryClaimRecordRequest = {
     const obj: any = {};
     obj.address = message.address;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryClaimRecordRequestAminoMsg): QueryClaimRecordRequest {
+    return QueryClaimRecordRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryClaimRecordRequest): QueryClaimRecordRequestAminoMsg {
+    return {
+      type: "osmosis/claim/query-claim-record-request",
+      value: QueryClaimRecordRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryClaimRecordRequestProtoMsg): QueryClaimRecordRequest {
+    return QueryClaimRecordRequest.decode(message.value);
+  },
+
+  toProto(message: QueryClaimRecordRequest): Uint8Array {
+    return QueryClaimRecordRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryClaimRecordRequest): QueryClaimRecordRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.claim.v1beta1.QueryClaimRecordRequest",
+      value: QueryClaimRecordRequest.encode(message).finish()
+    };
   }
 
 };
@@ -584,6 +729,9 @@ function createBaseQueryClaimRecordResponse(): QueryClaimRecordResponse {
 }
 
 export const QueryClaimRecordResponse = {
+  typeUrl: "/osmosis.claim.v1beta1.QueryClaimRecordResponse",
+  aminoType: "osmosis/claim/query-claim-record-response",
+
   encode(message: QueryClaimRecordResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.claimRecord !== undefined) {
       ClaimRecord.encode(message.claimRecord, writer.uint32(10).fork()).ldelim();
@@ -654,6 +802,32 @@ export const QueryClaimRecordResponse = {
     const obj: any = {};
     obj.claim_record = message.claimRecord ? ClaimRecord.toAmino(message.claimRecord) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryClaimRecordResponseAminoMsg): QueryClaimRecordResponse {
+    return QueryClaimRecordResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryClaimRecordResponse): QueryClaimRecordResponseAminoMsg {
+    return {
+      type: "osmosis/claim/query-claim-record-response",
+      value: QueryClaimRecordResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryClaimRecordResponseProtoMsg): QueryClaimRecordResponse {
+    return QueryClaimRecordResponse.decode(message.value);
+  },
+
+  toProto(message: QueryClaimRecordResponse): Uint8Array {
+    return QueryClaimRecordResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryClaimRecordResponse): QueryClaimRecordResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.claim.v1beta1.QueryClaimRecordResponse",
+      value: QueryClaimRecordResponse.encode(message).finish()
+    };
   }
 
 };
@@ -666,6 +840,9 @@ function createBaseQueryClaimableForActionRequest(): QueryClaimableForActionRequ
 }
 
 export const QueryClaimableForActionRequest = {
+  typeUrl: "/osmosis.claim.v1beta1.QueryClaimableForActionRequest",
+  aminoType: "osmosis/claim/query-claimable-for-action-request",
+
   encode(message: QueryClaimableForActionRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.address !== "") {
       writer.uint32(10).string(message.address);
@@ -751,6 +928,32 @@ export const QueryClaimableForActionRequest = {
     obj.address = message.address;
     obj.action = message.action;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryClaimableForActionRequestAminoMsg): QueryClaimableForActionRequest {
+    return QueryClaimableForActionRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryClaimableForActionRequest): QueryClaimableForActionRequestAminoMsg {
+    return {
+      type: "osmosis/claim/query-claimable-for-action-request",
+      value: QueryClaimableForActionRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryClaimableForActionRequestProtoMsg): QueryClaimableForActionRequest {
+    return QueryClaimableForActionRequest.decode(message.value);
+  },
+
+  toProto(message: QueryClaimableForActionRequest): Uint8Array {
+    return QueryClaimableForActionRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryClaimableForActionRequest): QueryClaimableForActionRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.claim.v1beta1.QueryClaimableForActionRequest",
+      value: QueryClaimableForActionRequest.encode(message).finish()
+    };
   }
 
 };
@@ -762,6 +965,9 @@ function createBaseQueryClaimableForActionResponse(): QueryClaimableForActionRes
 }
 
 export const QueryClaimableForActionResponse = {
+  typeUrl: "/osmosis.claim.v1beta1.QueryClaimableForActionResponse",
+  aminoType: "osmosis/claim/query-claimable-for-action-response",
+
   encode(message: QueryClaimableForActionResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.coins) {
       Coin.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -850,6 +1056,32 @@ export const QueryClaimableForActionResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: QueryClaimableForActionResponseAminoMsg): QueryClaimableForActionResponse {
+    return QueryClaimableForActionResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryClaimableForActionResponse): QueryClaimableForActionResponseAminoMsg {
+    return {
+      type: "osmosis/claim/query-claimable-for-action-response",
+      value: QueryClaimableForActionResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryClaimableForActionResponseProtoMsg): QueryClaimableForActionResponse {
+    return QueryClaimableForActionResponse.decode(message.value);
+  },
+
+  toProto(message: QueryClaimableForActionResponse): Uint8Array {
+    return QueryClaimableForActionResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryClaimableForActionResponse): QueryClaimableForActionResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.claim.v1beta1.QueryClaimableForActionResponse",
+      value: QueryClaimableForActionResponse.encode(message).finish()
+    };
   }
 
 };
@@ -861,6 +1093,9 @@ function createBaseQueryTotalClaimableRequest(): QueryTotalClaimableRequest {
 }
 
 export const QueryTotalClaimableRequest = {
+  typeUrl: "/osmosis.claim.v1beta1.QueryTotalClaimableRequest",
+  aminoType: "osmosis/claim/query-total-claimable-request",
+
   encode(message: QueryTotalClaimableRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.address !== "") {
       writer.uint32(10).string(message.address);
@@ -931,6 +1166,32 @@ export const QueryTotalClaimableRequest = {
     const obj: any = {};
     obj.address = message.address;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryTotalClaimableRequestAminoMsg): QueryTotalClaimableRequest {
+    return QueryTotalClaimableRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryTotalClaimableRequest): QueryTotalClaimableRequestAminoMsg {
+    return {
+      type: "osmosis/claim/query-total-claimable-request",
+      value: QueryTotalClaimableRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryTotalClaimableRequestProtoMsg): QueryTotalClaimableRequest {
+    return QueryTotalClaimableRequest.decode(message.value);
+  },
+
+  toProto(message: QueryTotalClaimableRequest): Uint8Array {
+    return QueryTotalClaimableRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryTotalClaimableRequest): QueryTotalClaimableRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.claim.v1beta1.QueryTotalClaimableRequest",
+      value: QueryTotalClaimableRequest.encode(message).finish()
+    };
   }
 
 };
@@ -942,6 +1203,9 @@ function createBaseQueryTotalClaimableResponse(): QueryTotalClaimableResponse {
 }
 
 export const QueryTotalClaimableResponse = {
+  typeUrl: "/osmosis.claim.v1beta1.QueryTotalClaimableResponse",
+  aminoType: "osmosis/claim/query-total-claimable-response",
+
   encode(message: QueryTotalClaimableResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.coins) {
       Coin.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1030,6 +1294,32 @@ export const QueryTotalClaimableResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: QueryTotalClaimableResponseAminoMsg): QueryTotalClaimableResponse {
+    return QueryTotalClaimableResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryTotalClaimableResponse): QueryTotalClaimableResponseAminoMsg {
+    return {
+      type: "osmosis/claim/query-total-claimable-response",
+      value: QueryTotalClaimableResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryTotalClaimableResponseProtoMsg): QueryTotalClaimableResponse {
+    return QueryTotalClaimableResponse.decode(message.value);
+  },
+
+  toProto(message: QueryTotalClaimableResponse): Uint8Array {
+    return QueryTotalClaimableResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryTotalClaimableResponse): QueryTotalClaimableResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.claim.v1beta1.QueryTotalClaimableResponse",
+      value: QueryTotalClaimableResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/osmosis/epochs/genesis.ts b/__fixtures__/outputv2/osmosis/epochs/genesis.ts
index a9aa30fec..3ad0edcda 100644
--- a/__fixtures__/outputv2/osmosis/epochs/genesis.ts
+++ b/__fixtures__/outputv2/osmosis/epochs/genesis.ts
@@ -68,7 +68,7 @@ export interface EpochInfo {
    */
   currentEpochStartHeight: Long;
 }
-export interface EpochInfoProtoType {
+export interface EpochInfoProtoMsg {
   typeUrl: "/osmosis.epochs.v1beta1.EpochInfo";
   value: Uint8Array;
 }
@@ -137,7 +137,7 @@ export interface EpochInfoAmino {
    */
   current_epoch_start_height: string;
 }
-export interface EpochInfoAminoType {
+export interface EpochInfoAminoMsg {
   type: "osmosis/epochs/epoch-info";
   value: EpochInfoAmino;
 }
@@ -160,7 +160,7 @@ export interface EpochInfoSDKType {
 export interface GenesisState {
   epochs: EpochInfo[];
 }
-export interface GenesisStateProtoType {
+export interface GenesisStateProtoMsg {
   typeUrl: "/osmosis.epochs.v1beta1.GenesisState";
   value: Uint8Array;
 }
@@ -169,7 +169,7 @@ export interface GenesisStateProtoType {
 export interface GenesisStateAmino {
   epochs: EpochInfoAmino[];
 }
-export interface GenesisStateAminoType {
+export interface GenesisStateAminoMsg {
   type: "osmosis/epochs/genesis-state";
   value: GenesisStateAmino;
 }
@@ -192,6 +192,9 @@ function createBaseEpochInfo(): EpochInfo {
 }
 
 export const EpochInfo = {
+  typeUrl: "/osmosis.epochs.v1beta1.EpochInfo",
+  aminoType: "osmosis/epochs/epoch-info",
+
   encode(message: EpochInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.identifier !== "") {
       writer.uint32(10).string(message.identifier);
@@ -352,6 +355,32 @@ export const EpochInfo = {
     obj.epoch_counting_started = message.epochCountingStarted;
     obj.current_epoch_start_height = message.currentEpochStartHeight ? message.currentEpochStartHeight.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: EpochInfoAminoMsg): EpochInfo {
+    return EpochInfo.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: EpochInfo): EpochInfoAminoMsg {
+    return {
+      type: "osmosis/epochs/epoch-info",
+      value: EpochInfo.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: EpochInfoProtoMsg): EpochInfo {
+    return EpochInfo.decode(message.value);
+  },
+
+  toProto(message: EpochInfo): Uint8Array {
+    return EpochInfo.encode(message).finish();
+  },
+
+  toProtoMsg(message: EpochInfo): EpochInfoProtoMsg {
+    return {
+      typeUrl: "/osmosis.epochs.v1beta1.EpochInfo",
+      value: EpochInfo.encode(message).finish()
+    };
   }
 
 };
@@ -363,6 +392,9 @@ function createBaseGenesisState(): GenesisState {
 }
 
 export const GenesisState = {
+  typeUrl: "/osmosis.epochs.v1beta1.GenesisState",
+  aminoType: "osmosis/epochs/genesis-state",
+
   encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.epochs) {
       EpochInfo.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -451,6 +483,32 @@ export const GenesisState = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisStateAminoMsg): GenesisState {
+    return GenesisState.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GenesisState): GenesisStateAminoMsg {
+    return {
+      type: "osmosis/epochs/genesis-state",
+      value: GenesisState.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GenesisStateProtoMsg): GenesisState {
+    return GenesisState.decode(message.value);
+  },
+
+  toProto(message: GenesisState): Uint8Array {
+    return GenesisState.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisState): GenesisStateProtoMsg {
+    return {
+      typeUrl: "/osmosis.epochs.v1beta1.GenesisState",
+      value: GenesisState.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/osmosis/epochs/query.ts b/__fixtures__/outputv2/osmosis/epochs/query.ts
index a7a447869..b430693e1 100644
--- a/__fixtures__/outputv2/osmosis/epochs/query.ts
+++ b/__fixtures__/outputv2/osmosis/epochs/query.ts
@@ -3,12 +3,12 @@ import * as _m0 from "protobufjs/minimal";
 import { DeepPartial, isSet, Long } from "../../helpers";
 export const protobufPackage = "osmosis.epochs.v1beta1";
 export interface QueryEpochsInfoRequest {}
-export interface QueryEpochsInfoRequestProtoType {
+export interface QueryEpochsInfoRequestProtoMsg {
   typeUrl: "/osmosis.epochs.v1beta1.QueryEpochsInfoRequest";
   value: Uint8Array;
 }
 export interface QueryEpochsInfoRequestAmino {}
-export interface QueryEpochsInfoRequestAminoType {
+export interface QueryEpochsInfoRequestAminoMsg {
   type: "osmosis/epochs/query-epochs-info-request";
   value: QueryEpochsInfoRequestAmino;
 }
@@ -16,14 +16,14 @@ export interface QueryEpochsInfoRequestSDKType {}
 export interface QueryEpochsInfoResponse {
   epochs: EpochInfo[];
 }
-export interface QueryEpochsInfoResponseProtoType {
+export interface QueryEpochsInfoResponseProtoMsg {
   typeUrl: "/osmosis.epochs.v1beta1.QueryEpochsInfoResponse";
   value: Uint8Array;
 }
 export interface QueryEpochsInfoResponseAmino {
   epochs: EpochInfoAmino[];
 }
-export interface QueryEpochsInfoResponseAminoType {
+export interface QueryEpochsInfoResponseAminoMsg {
   type: "osmosis/epochs/query-epochs-info-response";
   value: QueryEpochsInfoResponseAmino;
 }
@@ -33,14 +33,14 @@ export interface QueryEpochsInfoResponseSDKType {
 export interface QueryCurrentEpochRequest {
   identifier: string;
 }
-export interface QueryCurrentEpochRequestProtoType {
+export interface QueryCurrentEpochRequestProtoMsg {
   typeUrl: "/osmosis.epochs.v1beta1.QueryCurrentEpochRequest";
   value: Uint8Array;
 }
 export interface QueryCurrentEpochRequestAmino {
   identifier: string;
 }
-export interface QueryCurrentEpochRequestAminoType {
+export interface QueryCurrentEpochRequestAminoMsg {
   type: "osmosis/epochs/query-current-epoch-request";
   value: QueryCurrentEpochRequestAmino;
 }
@@ -50,14 +50,14 @@ export interface QueryCurrentEpochRequestSDKType {
 export interface QueryCurrentEpochResponse {
   currentEpoch: Long;
 }
-export interface QueryCurrentEpochResponseProtoType {
+export interface QueryCurrentEpochResponseProtoMsg {
   typeUrl: "/osmosis.epochs.v1beta1.QueryCurrentEpochResponse";
   value: Uint8Array;
 }
 export interface QueryCurrentEpochResponseAmino {
   current_epoch: string;
 }
-export interface QueryCurrentEpochResponseAminoType {
+export interface QueryCurrentEpochResponseAminoMsg {
   type: "osmosis/epochs/query-current-epoch-response";
   value: QueryCurrentEpochResponseAmino;
 }
@@ -70,6 +70,9 @@ function createBaseQueryEpochsInfoRequest(): QueryEpochsInfoRequest {
 }
 
 export const QueryEpochsInfoRequest = {
+  typeUrl: "/osmosis.epochs.v1beta1.QueryEpochsInfoRequest",
+  aminoType: "osmosis/epochs/query-epochs-info-request",
+
   encode(_: QueryEpochsInfoRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -122,6 +125,32 @@ export const QueryEpochsInfoRequest = {
   toAmino(_: QueryEpochsInfoRequest): QueryEpochsInfoRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryEpochsInfoRequestAminoMsg): QueryEpochsInfoRequest {
+    return QueryEpochsInfoRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryEpochsInfoRequest): QueryEpochsInfoRequestAminoMsg {
+    return {
+      type: "osmosis/epochs/query-epochs-info-request",
+      value: QueryEpochsInfoRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryEpochsInfoRequestProtoMsg): QueryEpochsInfoRequest {
+    return QueryEpochsInfoRequest.decode(message.value);
+  },
+
+  toProto(message: QueryEpochsInfoRequest): Uint8Array {
+    return QueryEpochsInfoRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryEpochsInfoRequest): QueryEpochsInfoRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.epochs.v1beta1.QueryEpochsInfoRequest",
+      value: QueryEpochsInfoRequest.encode(message).finish()
+    };
   }
 
 };
@@ -133,6 +162,9 @@ function createBaseQueryEpochsInfoResponse(): QueryEpochsInfoResponse {
 }
 
 export const QueryEpochsInfoResponse = {
+  typeUrl: "/osmosis.epochs.v1beta1.QueryEpochsInfoResponse",
+  aminoType: "osmosis/epochs/query-epochs-info-response",
+
   encode(message: QueryEpochsInfoResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.epochs) {
       EpochInfo.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -221,6 +253,32 @@ export const QueryEpochsInfoResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: QueryEpochsInfoResponseAminoMsg): QueryEpochsInfoResponse {
+    return QueryEpochsInfoResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryEpochsInfoResponse): QueryEpochsInfoResponseAminoMsg {
+    return {
+      type: "osmosis/epochs/query-epochs-info-response",
+      value: QueryEpochsInfoResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryEpochsInfoResponseProtoMsg): QueryEpochsInfoResponse {
+    return QueryEpochsInfoResponse.decode(message.value);
+  },
+
+  toProto(message: QueryEpochsInfoResponse): Uint8Array {
+    return QueryEpochsInfoResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryEpochsInfoResponse): QueryEpochsInfoResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.epochs.v1beta1.QueryEpochsInfoResponse",
+      value: QueryEpochsInfoResponse.encode(message).finish()
+    };
   }
 
 };
@@ -232,6 +290,9 @@ function createBaseQueryCurrentEpochRequest(): QueryCurrentEpochRequest {
 }
 
 export const QueryCurrentEpochRequest = {
+  typeUrl: "/osmosis.epochs.v1beta1.QueryCurrentEpochRequest",
+  aminoType: "osmosis/epochs/query-current-epoch-request",
+
   encode(message: QueryCurrentEpochRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.identifier !== "") {
       writer.uint32(10).string(message.identifier);
@@ -302,6 +363,32 @@ export const QueryCurrentEpochRequest = {
     const obj: any = {};
     obj.identifier = message.identifier;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryCurrentEpochRequestAminoMsg): QueryCurrentEpochRequest {
+    return QueryCurrentEpochRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryCurrentEpochRequest): QueryCurrentEpochRequestAminoMsg {
+    return {
+      type: "osmosis/epochs/query-current-epoch-request",
+      value: QueryCurrentEpochRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryCurrentEpochRequestProtoMsg): QueryCurrentEpochRequest {
+    return QueryCurrentEpochRequest.decode(message.value);
+  },
+
+  toProto(message: QueryCurrentEpochRequest): Uint8Array {
+    return QueryCurrentEpochRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryCurrentEpochRequest): QueryCurrentEpochRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.epochs.v1beta1.QueryCurrentEpochRequest",
+      value: QueryCurrentEpochRequest.encode(message).finish()
+    };
   }
 
 };
@@ -313,6 +400,9 @@ function createBaseQueryCurrentEpochResponse(): QueryCurrentEpochResponse {
 }
 
 export const QueryCurrentEpochResponse = {
+  typeUrl: "/osmosis.epochs.v1beta1.QueryCurrentEpochResponse",
+  aminoType: "osmosis/epochs/query-current-epoch-response",
+
   encode(message: QueryCurrentEpochResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.currentEpoch.isZero()) {
       writer.uint32(8).int64(message.currentEpoch);
@@ -383,6 +473,32 @@ export const QueryCurrentEpochResponse = {
     const obj: any = {};
     obj.current_epoch = message.currentEpoch ? message.currentEpoch.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryCurrentEpochResponseAminoMsg): QueryCurrentEpochResponse {
+    return QueryCurrentEpochResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryCurrentEpochResponse): QueryCurrentEpochResponseAminoMsg {
+    return {
+      type: "osmosis/epochs/query-current-epoch-response",
+      value: QueryCurrentEpochResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryCurrentEpochResponseProtoMsg): QueryCurrentEpochResponse {
+    return QueryCurrentEpochResponse.decode(message.value);
+  },
+
+  toProto(message: QueryCurrentEpochResponse): Uint8Array {
+    return QueryCurrentEpochResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryCurrentEpochResponse): QueryCurrentEpochResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.epochs.v1beta1.QueryCurrentEpochResponse",
+      value: QueryCurrentEpochResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/osmosis/gamm/pool-models/balancer/balancerPool.ts b/__fixtures__/outputv2/osmosis/gamm/pool-models/balancer/balancerPool.ts
index c8a5f80a3..ecb93a1fa 100644
--- a/__fixtures__/outputv2/osmosis/gamm/pool-models/balancer/balancerPool.ts
+++ b/__fixtures__/outputv2/osmosis/gamm/pool-models/balancer/balancerPool.ts
@@ -46,7 +46,7 @@ export interface SmoothWeightChangeParams {
    */
   targetPoolWeights: PoolAsset[];
 }
-export interface SmoothWeightChangeParamsProtoType {
+export interface SmoothWeightChangeParamsProtoMsg {
   typeUrl: "/osmosis.gamm.v1beta1.SmoothWeightChangeParams";
   value: Uint8Array;
 }
@@ -92,7 +92,7 @@ export interface SmoothWeightChangeParamsAmino {
    */
   target_pool_weights: PoolAssetAmino[];
 }
-export interface SmoothWeightChangeParamsAminoType {
+export interface SmoothWeightChangeParamsAminoMsg {
   type: "osmosis/gamm/smooth-weight-change-params";
   value: SmoothWeightChangeParamsAmino;
 }
@@ -128,7 +128,7 @@ export interface PoolParams {
   exitFee: string;
   smoothWeightChangeParams?: SmoothWeightChangeParams;
 }
-export interface PoolParamsProtoType {
+export interface PoolParamsProtoMsg {
   typeUrl: "/osmosis.gamm.v1beta1.PoolParams";
   value: Uint8Array;
 }
@@ -144,7 +144,7 @@ export interface PoolParamsAmino {
   exit_fee: string;
   smooth_weight_change_params?: SmoothWeightChangeParamsAmino;
 }
-export interface PoolParamsAminoType {
+export interface PoolParamsAminoMsg {
   type: "osmosis/gamm/pool-params";
   value: PoolParamsAmino;
 }
@@ -177,7 +177,7 @@ export interface PoolAsset {
   /** Weight that is not normalized. This weight must be less than 2^50 */
   weight: string;
 }
-export interface PoolAssetProtoType {
+export interface PoolAssetProtoMsg {
   typeUrl: "/osmosis.gamm.v1beta1.PoolAsset";
   value: Uint8Array;
 }
@@ -198,7 +198,7 @@ export interface PoolAssetAmino {
   /** Weight that is not normalized. This weight must be less than 2^50 */
   weight: string;
 }
-export interface PoolAssetAminoType {
+export interface PoolAssetAminoMsg {
   type: "osmosis/gamm/pool-asset";
   value: PoolAssetAmino;
 }
@@ -243,7 +243,7 @@ export interface Pool {
   /** sum of all non-normalized pool weights */
   totalWeight: string;
 }
-export interface PoolProtoType {
+export interface PoolProtoMsg {
   typeUrl: "/osmosis.gamm.v1beta1.Pool";
   value: Uint8Array;
 }
@@ -277,7 +277,7 @@ export interface PoolAmino {
   /** sum of all non-normalized pool weights */
   total_weight: string;
 }
-export interface PoolAminoType {
+export interface PoolAminoMsg {
   type: "osmosis/gamm/pool";
   value: PoolAmino;
 }
@@ -301,6 +301,9 @@ function createBaseSmoothWeightChangeParams(): SmoothWeightChangeParams {
 }
 
 export const SmoothWeightChangeParams = {
+  typeUrl: "/osmosis.gamm.v1beta1.SmoothWeightChangeParams",
+  aminoType: "osmosis/gamm/smooth-weight-change-params",
+
   encode(message: SmoothWeightChangeParams, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.startTime !== undefined) {
       Timestamp.encode(toTimestamp(message.startTime), writer.uint32(10).fork()).ldelim();
@@ -449,6 +452,32 @@ export const SmoothWeightChangeParams = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: SmoothWeightChangeParamsAminoMsg): SmoothWeightChangeParams {
+    return SmoothWeightChangeParams.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: SmoothWeightChangeParams): SmoothWeightChangeParamsAminoMsg {
+    return {
+      type: "osmosis/gamm/smooth-weight-change-params",
+      value: SmoothWeightChangeParams.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: SmoothWeightChangeParamsProtoMsg): SmoothWeightChangeParams {
+    return SmoothWeightChangeParams.decode(message.value);
+  },
+
+  toProto(message: SmoothWeightChangeParams): Uint8Array {
+    return SmoothWeightChangeParams.encode(message).finish();
+  },
+
+  toProtoMsg(message: SmoothWeightChangeParams): SmoothWeightChangeParamsProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v1beta1.SmoothWeightChangeParams",
+      value: SmoothWeightChangeParams.encode(message).finish()
+    };
   }
 
 };
@@ -462,6 +491,9 @@ function createBasePoolParams(): PoolParams {
 }
 
 export const PoolParams = {
+  typeUrl: "/osmosis.gamm.v1beta1.PoolParams",
+  aminoType: "osmosis/gamm/pool-params",
+
   encode(message: PoolParams, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.swapFee !== "") {
       writer.uint32(10).string(message.swapFee);
@@ -562,6 +594,32 @@ export const PoolParams = {
     obj.exit_fee = message.exitFee;
     obj.smooth_weight_change_params = message.smoothWeightChangeParams ? SmoothWeightChangeParams.toAmino(message.smoothWeightChangeParams) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: PoolParamsAminoMsg): PoolParams {
+    return PoolParams.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: PoolParams): PoolParamsAminoMsg {
+    return {
+      type: "osmosis/gamm/pool-params",
+      value: PoolParams.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: PoolParamsProtoMsg): PoolParams {
+    return PoolParams.decode(message.value);
+  },
+
+  toProto(message: PoolParams): Uint8Array {
+    return PoolParams.encode(message).finish();
+  },
+
+  toProtoMsg(message: PoolParams): PoolParamsProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v1beta1.PoolParams",
+      value: PoolParams.encode(message).finish()
+    };
   }
 
 };
@@ -574,6 +632,9 @@ function createBasePoolAsset(): PoolAsset {
 }
 
 export const PoolAsset = {
+  typeUrl: "/osmosis.gamm.v1beta1.PoolAsset",
+  aminoType: "osmosis/gamm/pool-asset",
+
   encode(message: PoolAsset, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.token !== undefined) {
       Coin.encode(message.token, writer.uint32(10).fork()).ldelim();
@@ -659,6 +720,32 @@ export const PoolAsset = {
     obj.token = message.token ? Coin.toAmino(message.token) : undefined;
     obj.weight = message.weight;
     return obj;
+  },
+
+  fromAminoMsg(object: PoolAssetAminoMsg): PoolAsset {
+    return PoolAsset.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: PoolAsset): PoolAssetAminoMsg {
+    return {
+      type: "osmosis/gamm/pool-asset",
+      value: PoolAsset.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: PoolAssetProtoMsg): PoolAsset {
+    return PoolAsset.decode(message.value);
+  },
+
+  toProto(message: PoolAsset): Uint8Array {
+    return PoolAsset.encode(message).finish();
+  },
+
+  toProtoMsg(message: PoolAsset): PoolAssetProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v1beta1.PoolAsset",
+      value: PoolAsset.encode(message).finish()
+    };
   }
 
 };
@@ -676,6 +763,9 @@ function createBasePool(): Pool {
 }
 
 export const Pool = {
+  typeUrl: "/osmosis.gamm.v1beta1.Pool",
+  aminoType: "osmosis/gamm/pool",
+
   encode(message: Pool, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.address !== "") {
       writer.uint32(10).string(message.address);
@@ -854,6 +944,32 @@ export const Pool = {
 
     obj.total_weight = message.totalWeight;
     return obj;
+  },
+
+  fromAminoMsg(object: PoolAminoMsg): Pool {
+    return Pool.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Pool): PoolAminoMsg {
+    return {
+      type: "osmosis/gamm/pool",
+      value: Pool.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: PoolProtoMsg): Pool {
+    return Pool.decode(message.value);
+  },
+
+  toProto(message: Pool): Uint8Array {
+    return Pool.encode(message).finish();
+  },
+
+  toProtoMsg(message: Pool): PoolProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v1beta1.Pool",
+      value: Pool.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/osmosis/gamm/pool-models/balancer/tx/tx.ts b/__fixtures__/outputv2/osmosis/gamm/pool-models/balancer/tx/tx.ts
index 0c3e04ec7..e275ce5ff 100644
--- a/__fixtures__/outputv2/osmosis/gamm/pool-models/balancer/tx/tx.ts
+++ b/__fixtures__/outputv2/osmosis/gamm/pool-models/balancer/tx/tx.ts
@@ -10,7 +10,7 @@ export interface MsgCreateBalancerPool {
   poolAssets: PoolAsset[];
   futurePoolGovernor: string;
 }
-export interface MsgCreateBalancerPoolProtoType {
+export interface MsgCreateBalancerPoolProtoMsg {
   typeUrl: "/osmosis.gamm.poolmodels.balancer.v1beta1.MsgCreateBalancerPool";
   value: Uint8Array;
 }
@@ -22,7 +22,7 @@ export interface MsgCreateBalancerPoolAmino {
   pool_assets: PoolAssetAmino[];
   future_pool_governor: string;
 }
-export interface MsgCreateBalancerPoolAminoType {
+export interface MsgCreateBalancerPoolAminoMsg {
   type: "osmosis/gamm/poolmodels/balancer/create-balancer-pool";
   value: MsgCreateBalancerPoolAmino;
 }
@@ -39,7 +39,7 @@ export interface MsgCreateBalancerPoolSDKType {
 export interface MsgCreateBalancerPoolResponse {
   poolId: Long;
 }
-export interface MsgCreateBalancerPoolResponseProtoType {
+export interface MsgCreateBalancerPoolResponseProtoMsg {
   typeUrl: "/osmosis.gamm.poolmodels.balancer.v1beta1.MsgCreateBalancerPoolResponse";
   value: Uint8Array;
 }
@@ -48,7 +48,7 @@ export interface MsgCreateBalancerPoolResponseProtoType {
 export interface MsgCreateBalancerPoolResponseAmino {
   pool_id: string;
 }
-export interface MsgCreateBalancerPoolResponseAminoType {
+export interface MsgCreateBalancerPoolResponseAminoMsg {
   type: "osmosis/gamm/poolmodels/balancer/create-balancer-pool-response";
   value: MsgCreateBalancerPoolResponseAmino;
 }
@@ -68,6 +68,9 @@ function createBaseMsgCreateBalancerPool(): MsgCreateBalancerPool {
 }
 
 export const MsgCreateBalancerPool = {
+  typeUrl: "/osmosis.gamm.poolmodels.balancer.v1beta1.MsgCreateBalancerPool",
+  aminoType: "osmosis/gamm/poolmodels/balancer/create-balancer-pool",
+
   encode(message: MsgCreateBalancerPool, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.sender !== "") {
       writer.uint32(10).string(message.sender);
@@ -201,6 +204,32 @@ export const MsgCreateBalancerPool = {
 
     obj.future_pool_governor = message.futurePoolGovernor;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCreateBalancerPoolAminoMsg): MsgCreateBalancerPool {
+    return MsgCreateBalancerPool.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgCreateBalancerPool): MsgCreateBalancerPoolAminoMsg {
+    return {
+      type: "osmosis/gamm/poolmodels/balancer/create-balancer-pool",
+      value: MsgCreateBalancerPool.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgCreateBalancerPoolProtoMsg): MsgCreateBalancerPool {
+    return MsgCreateBalancerPool.decode(message.value);
+  },
+
+  toProto(message: MsgCreateBalancerPool): Uint8Array {
+    return MsgCreateBalancerPool.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCreateBalancerPool): MsgCreateBalancerPoolProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.poolmodels.balancer.v1beta1.MsgCreateBalancerPool",
+      value: MsgCreateBalancerPool.encode(message).finish()
+    };
   }
 
 };
@@ -212,6 +241,9 @@ function createBaseMsgCreateBalancerPoolResponse(): MsgCreateBalancerPoolRespons
 }
 
 export const MsgCreateBalancerPoolResponse = {
+  typeUrl: "/osmosis.gamm.poolmodels.balancer.v1beta1.MsgCreateBalancerPoolResponse",
+  aminoType: "osmosis/gamm/poolmodels/balancer/create-balancer-pool-response",
+
   encode(message: MsgCreateBalancerPoolResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.poolId.isZero()) {
       writer.uint32(8).uint64(message.poolId);
@@ -282,6 +314,32 @@ export const MsgCreateBalancerPoolResponse = {
     const obj: any = {};
     obj.pool_id = message.poolId ? message.poolId.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCreateBalancerPoolResponseAminoMsg): MsgCreateBalancerPoolResponse {
+    return MsgCreateBalancerPoolResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgCreateBalancerPoolResponse): MsgCreateBalancerPoolResponseAminoMsg {
+    return {
+      type: "osmosis/gamm/poolmodels/balancer/create-balancer-pool-response",
+      value: MsgCreateBalancerPoolResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgCreateBalancerPoolResponseProtoMsg): MsgCreateBalancerPoolResponse {
+    return MsgCreateBalancerPoolResponse.decode(message.value);
+  },
+
+  toProto(message: MsgCreateBalancerPoolResponse): Uint8Array {
+    return MsgCreateBalancerPoolResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCreateBalancerPoolResponse): MsgCreateBalancerPoolResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.poolmodels.balancer.v1beta1.MsgCreateBalancerPoolResponse",
+      value: MsgCreateBalancerPoolResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/osmosis/gamm/pool-models/stableswap/stableswap_pool.ts b/__fixtures__/outputv2/osmosis/gamm/pool-models/stableswap/stableswap_pool.ts
index e914b2f1f..853b47583 100644
--- a/__fixtures__/outputv2/osmosis/gamm/pool-models/stableswap/stableswap_pool.ts
+++ b/__fixtures__/outputv2/osmosis/gamm/pool-models/stableswap/stableswap_pool.ts
@@ -13,7 +13,7 @@ export interface PoolParams {
   swapFee: string;
   exitFee: string;
 }
-export interface PoolParamsProtoType {
+export interface PoolParamsProtoMsg {
   typeUrl: "/osmosis.gamm.poolmodels.stableswap.v1beta1.PoolParams";
   value: Uint8Array;
 }
@@ -28,7 +28,7 @@ export interface PoolParamsAmino {
   swap_fee: string;
   exit_fee: string;
 }
-export interface PoolParamsAminoType {
+export interface PoolParamsAminoMsg {
   type: "osmosis/gamm/pool-params";
   value: PoolParamsAmino;
 }
@@ -74,7 +74,7 @@ export interface Pool {
   /** scaling_factor_controller is the address can adjust pool scaling factors */
   scalingFactorController: string;
 }
-export interface PoolProtoType {
+export interface PoolProtoMsg {
   typeUrl: "/osmosis.gamm.poolmodels.stableswap.v1beta1.Pool";
   value: Uint8Array;
 }
@@ -109,7 +109,7 @@ export interface PoolAmino {
   /** scaling_factor_controller is the address can adjust pool scaling factors */
   scaling_factor_controller: string;
 }
-export interface PoolAminoType {
+export interface PoolAminoMsg {
   type: "osmosis/gamm/pool";
   value: PoolAmino;
 }
@@ -134,6 +134,9 @@ function createBasePoolParams(): PoolParams {
 }
 
 export const PoolParams = {
+  typeUrl: "/osmosis.gamm.poolmodels.stableswap.v1beta1.PoolParams",
+  aminoType: "osmosis/gamm/pool-params",
+
   encode(message: PoolParams, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.swapFee !== "") {
       writer.uint32(10).string(message.swapFee);
@@ -219,6 +222,32 @@ export const PoolParams = {
     obj.swap_fee = message.swapFee;
     obj.exit_fee = message.exitFee;
     return obj;
+  },
+
+  fromAminoMsg(object: PoolParamsAminoMsg): PoolParams {
+    return PoolParams.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: PoolParams): PoolParamsAminoMsg {
+    return {
+      type: "osmosis/gamm/pool-params",
+      value: PoolParams.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: PoolParamsProtoMsg): PoolParams {
+    return PoolParams.decode(message.value);
+  },
+
+  toProto(message: PoolParams): Uint8Array {
+    return PoolParams.encode(message).finish();
+  },
+
+  toProtoMsg(message: PoolParams): PoolParamsProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.poolmodels.stableswap.v1beta1.PoolParams",
+      value: PoolParams.encode(message).finish()
+    };
   }
 
 };
@@ -237,6 +266,9 @@ function createBasePool(): Pool {
 }
 
 export const Pool = {
+  typeUrl: "/osmosis.gamm.poolmodels.stableswap.v1beta1.Pool",
+  aminoType: "osmosis/gamm/pool",
+
   encode(message: Pool, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.address !== "") {
       writer.uint32(10).string(message.address);
@@ -458,6 +490,32 @@ export const Pool = {
 
     obj.scaling_factor_controller = message.scalingFactorController;
     return obj;
+  },
+
+  fromAminoMsg(object: PoolAminoMsg): Pool {
+    return Pool.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Pool): PoolAminoMsg {
+    return {
+      type: "osmosis/gamm/pool",
+      value: Pool.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: PoolProtoMsg): Pool {
+    return Pool.decode(message.value);
+  },
+
+  toProto(message: Pool): Uint8Array {
+    return Pool.encode(message).finish();
+  },
+
+  toProtoMsg(message: Pool): PoolProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.poolmodels.stableswap.v1beta1.Pool",
+      value: Pool.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/osmosis/gamm/pool-models/stableswap/tx.ts b/__fixtures__/outputv2/osmosis/gamm/pool-models/stableswap/tx.ts
index 2dea52cca..4d4abf7c6 100644
--- a/__fixtures__/outputv2/osmosis/gamm/pool-models/stableswap/tx.ts
+++ b/__fixtures__/outputv2/osmosis/gamm/pool-models/stableswap/tx.ts
@@ -13,7 +13,7 @@ export interface MsgCreateStableswapPool {
   futurePoolGovernor: string;
   scalingFactorController: string;
 }
-export interface MsgCreateStableswapPoolProtoType {
+export interface MsgCreateStableswapPoolProtoMsg {
   typeUrl: "/osmosis.gamm.poolmodels.stableswap.v1beta1.MsgCreateStableswapPool";
   value: Uint8Array;
 }
@@ -27,7 +27,7 @@ export interface MsgCreateStableswapPoolAmino {
   future_pool_governor: string;
   scaling_factor_controller: string;
 }
-export interface MsgCreateStableswapPoolAminoType {
+export interface MsgCreateStableswapPoolAminoMsg {
   type: "osmosis/gamm/create-stableswap-pool";
   value: MsgCreateStableswapPoolAmino;
 }
@@ -46,7 +46,7 @@ export interface MsgCreateStableswapPoolSDKType {
 export interface MsgCreateStableswapPoolResponse {
   poolId: Long;
 }
-export interface MsgCreateStableswapPoolResponseProtoType {
+export interface MsgCreateStableswapPoolResponseProtoMsg {
   typeUrl: "/osmosis.gamm.poolmodels.stableswap.v1beta1.MsgCreateStableswapPoolResponse";
   value: Uint8Array;
 }
@@ -55,7 +55,7 @@ export interface MsgCreateStableswapPoolResponseProtoType {
 export interface MsgCreateStableswapPoolResponseAmino {
   pool_id: string;
 }
-export interface MsgCreateStableswapPoolResponseAminoType {
+export interface MsgCreateStableswapPoolResponseAminoMsg {
   type: "osmosis/gamm/create-stableswap-pool-response";
   value: MsgCreateStableswapPoolResponseAmino;
 }
@@ -74,7 +74,7 @@ export interface MsgStableSwapAdjustScalingFactors {
   poolId: Long;
   scalingFactors: Long[];
 }
-export interface MsgStableSwapAdjustScalingFactorsProtoType {
+export interface MsgStableSwapAdjustScalingFactorsProtoMsg {
   typeUrl: "/osmosis.gamm.poolmodels.stableswap.v1beta1.MsgStableSwapAdjustScalingFactors";
   value: Uint8Array;
 }
@@ -88,7 +88,7 @@ export interface MsgStableSwapAdjustScalingFactorsAmino {
   pool_id: string;
   scaling_factors: string[];
 }
-export interface MsgStableSwapAdjustScalingFactorsAminoType {
+export interface MsgStableSwapAdjustScalingFactorsAminoMsg {
   type: "osmosis/gamm/stable-swap-adjust-scaling-factors";
   value: MsgStableSwapAdjustScalingFactorsAmino;
 }
@@ -103,12 +103,12 @@ export interface MsgStableSwapAdjustScalingFactorsSDKType {
   scaling_factors: Long[];
 }
 export interface MsgStableSwapAdjustScalingFactorsResponse {}
-export interface MsgStableSwapAdjustScalingFactorsResponseProtoType {
+export interface MsgStableSwapAdjustScalingFactorsResponseProtoMsg {
   typeUrl: "/osmosis.gamm.poolmodels.stableswap.v1beta1.MsgStableSwapAdjustScalingFactorsResponse";
   value: Uint8Array;
 }
 export interface MsgStableSwapAdjustScalingFactorsResponseAmino {}
-export interface MsgStableSwapAdjustScalingFactorsResponseAminoType {
+export interface MsgStableSwapAdjustScalingFactorsResponseAminoMsg {
   type: "osmosis/gamm/stable-swap-adjust-scaling-factors-response";
   value: MsgStableSwapAdjustScalingFactorsResponseAmino;
 }
@@ -126,6 +126,9 @@ function createBaseMsgCreateStableswapPool(): MsgCreateStableswapPool {
 }
 
 export const MsgCreateStableswapPool = {
+  typeUrl: "/osmosis.gamm.poolmodels.stableswap.v1beta1.MsgCreateStableswapPool",
+  aminoType: "osmosis/gamm/create-stableswap-pool",
+
   encode(message: MsgCreateStableswapPool, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.sender !== "") {
       writer.uint32(10).string(message.sender);
@@ -317,6 +320,32 @@ export const MsgCreateStableswapPool = {
     obj.future_pool_governor = message.futurePoolGovernor;
     obj.scaling_factor_controller = message.scalingFactorController;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCreateStableswapPoolAminoMsg): MsgCreateStableswapPool {
+    return MsgCreateStableswapPool.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgCreateStableswapPool): MsgCreateStableswapPoolAminoMsg {
+    return {
+      type: "osmosis/gamm/create-stableswap-pool",
+      value: MsgCreateStableswapPool.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgCreateStableswapPoolProtoMsg): MsgCreateStableswapPool {
+    return MsgCreateStableswapPool.decode(message.value);
+  },
+
+  toProto(message: MsgCreateStableswapPool): Uint8Array {
+    return MsgCreateStableswapPool.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCreateStableswapPool): MsgCreateStableswapPoolProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.poolmodels.stableswap.v1beta1.MsgCreateStableswapPool",
+      value: MsgCreateStableswapPool.encode(message).finish()
+    };
   }
 
 };
@@ -328,6 +357,9 @@ function createBaseMsgCreateStableswapPoolResponse(): MsgCreateStableswapPoolRes
 }
 
 export const MsgCreateStableswapPoolResponse = {
+  typeUrl: "/osmosis.gamm.poolmodels.stableswap.v1beta1.MsgCreateStableswapPoolResponse",
+  aminoType: "osmosis/gamm/create-stableswap-pool-response",
+
   encode(message: MsgCreateStableswapPoolResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.poolId.isZero()) {
       writer.uint32(8).uint64(message.poolId);
@@ -398,6 +430,32 @@ export const MsgCreateStableswapPoolResponse = {
     const obj: any = {};
     obj.pool_id = message.poolId ? message.poolId.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCreateStableswapPoolResponseAminoMsg): MsgCreateStableswapPoolResponse {
+    return MsgCreateStableswapPoolResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgCreateStableswapPoolResponse): MsgCreateStableswapPoolResponseAminoMsg {
+    return {
+      type: "osmosis/gamm/create-stableswap-pool-response",
+      value: MsgCreateStableswapPoolResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgCreateStableswapPoolResponseProtoMsg): MsgCreateStableswapPoolResponse {
+    return MsgCreateStableswapPoolResponse.decode(message.value);
+  },
+
+  toProto(message: MsgCreateStableswapPoolResponse): Uint8Array {
+    return MsgCreateStableswapPoolResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCreateStableswapPoolResponse): MsgCreateStableswapPoolResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.poolmodels.stableswap.v1beta1.MsgCreateStableswapPoolResponse",
+      value: MsgCreateStableswapPoolResponse.encode(message).finish()
+    };
   }
 
 };
@@ -411,6 +469,9 @@ function createBaseMsgStableSwapAdjustScalingFactors(): MsgStableSwapAdjustScali
 }
 
 export const MsgStableSwapAdjustScalingFactors = {
+  typeUrl: "/osmosis.gamm.poolmodels.stableswap.v1beta1.MsgStableSwapAdjustScalingFactors",
+  aminoType: "osmosis/gamm/stable-swap-adjust-scaling-factors",
+
   encode(message: MsgStableSwapAdjustScalingFactors, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.sender !== "") {
       writer.uint32(10).string(message.sender);
@@ -541,6 +602,32 @@ export const MsgStableSwapAdjustScalingFactors = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: MsgStableSwapAdjustScalingFactorsAminoMsg): MsgStableSwapAdjustScalingFactors {
+    return MsgStableSwapAdjustScalingFactors.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgStableSwapAdjustScalingFactors): MsgStableSwapAdjustScalingFactorsAminoMsg {
+    return {
+      type: "osmosis/gamm/stable-swap-adjust-scaling-factors",
+      value: MsgStableSwapAdjustScalingFactors.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgStableSwapAdjustScalingFactorsProtoMsg): MsgStableSwapAdjustScalingFactors {
+    return MsgStableSwapAdjustScalingFactors.decode(message.value);
+  },
+
+  toProto(message: MsgStableSwapAdjustScalingFactors): Uint8Array {
+    return MsgStableSwapAdjustScalingFactors.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgStableSwapAdjustScalingFactors): MsgStableSwapAdjustScalingFactorsProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.poolmodels.stableswap.v1beta1.MsgStableSwapAdjustScalingFactors",
+      value: MsgStableSwapAdjustScalingFactors.encode(message).finish()
+    };
   }
 
 };
@@ -550,6 +637,9 @@ function createBaseMsgStableSwapAdjustScalingFactorsResponse(): MsgStableSwapAdj
 }
 
 export const MsgStableSwapAdjustScalingFactorsResponse = {
+  typeUrl: "/osmosis.gamm.poolmodels.stableswap.v1beta1.MsgStableSwapAdjustScalingFactorsResponse",
+  aminoType: "osmosis/gamm/stable-swap-adjust-scaling-factors-response",
+
   encode(_: MsgStableSwapAdjustScalingFactorsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -602,6 +692,32 @@ export const MsgStableSwapAdjustScalingFactorsResponse = {
   toAmino(_: MsgStableSwapAdjustScalingFactorsResponse): MsgStableSwapAdjustScalingFactorsResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgStableSwapAdjustScalingFactorsResponseAminoMsg): MsgStableSwapAdjustScalingFactorsResponse {
+    return MsgStableSwapAdjustScalingFactorsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgStableSwapAdjustScalingFactorsResponse): MsgStableSwapAdjustScalingFactorsResponseAminoMsg {
+    return {
+      type: "osmosis/gamm/stable-swap-adjust-scaling-factors-response",
+      value: MsgStableSwapAdjustScalingFactorsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgStableSwapAdjustScalingFactorsResponseProtoMsg): MsgStableSwapAdjustScalingFactorsResponse {
+    return MsgStableSwapAdjustScalingFactorsResponse.decode(message.value);
+  },
+
+  toProto(message: MsgStableSwapAdjustScalingFactorsResponse): Uint8Array {
+    return MsgStableSwapAdjustScalingFactorsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgStableSwapAdjustScalingFactorsResponse): MsgStableSwapAdjustScalingFactorsResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.poolmodels.stableswap.v1beta1.MsgStableSwapAdjustScalingFactorsResponse",
+      value: MsgStableSwapAdjustScalingFactorsResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/osmosis/gamm/v1beta1/genesis.ts b/__fixtures__/outputv2/osmosis/gamm/v1beta1/genesis.ts
index ef8cad5de..4dd2f8159 100644
--- a/__fixtures__/outputv2/osmosis/gamm/v1beta1/genesis.ts
+++ b/__fixtures__/outputv2/osmosis/gamm/v1beta1/genesis.ts
@@ -14,7 +14,7 @@ export const protobufPackage = "osmosis.gamm.v1beta1";
 export interface Params {
   poolCreationFee: Coin[];
 }
-export interface ParamsProtoType {
+export interface ParamsProtoMsg {
   typeUrl: "/osmosis.gamm.v1beta1.Params";
   value: Uint8Array;
 }
@@ -23,7 +23,7 @@ export interface ParamsProtoType {
 export interface ParamsAmino {
   pool_creation_fee: CoinAmino[];
 }
-export interface ParamsAminoType {
+export interface ParamsAminoMsg {
   type: "osmosis/gamm/params";
   value: ParamsAmino;
 }
@@ -41,7 +41,7 @@ export interface GenesisState {
   nextPoolNumber: Long;
   params?: Params;
 }
-export interface GenesisStateProtoType {
+export interface GenesisStateProtoMsg {
   typeUrl: "/osmosis.gamm.v1beta1.GenesisState";
   value: Uint8Array;
 }
@@ -54,7 +54,7 @@ export interface GenesisStateAmino {
   next_pool_number: string;
   params?: ParamsAmino;
 }
-export interface GenesisStateAminoType {
+export interface GenesisStateAminoMsg {
   type: "osmosis/gamm/genesis-state";
   value: GenesisStateAmino;
 }
@@ -73,6 +73,9 @@ function createBaseParams(): Params {
 }
 
 export const Params = {
+  typeUrl: "/osmosis.gamm.v1beta1.Params",
+  aminoType: "osmosis/gamm/params",
+
   encode(message: Params, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.poolCreationFee) {
       Coin.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -161,6 +164,32 @@ export const Params = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ParamsAminoMsg): Params {
+    return Params.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Params): ParamsAminoMsg {
+    return {
+      type: "osmosis/gamm/params",
+      value: Params.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ParamsProtoMsg): Params {
+    return Params.decode(message.value);
+  },
+
+  toProto(message: Params): Uint8Array {
+    return Params.encode(message).finish();
+  },
+
+  toProtoMsg(message: Params): ParamsProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v1beta1.Params",
+      value: Params.encode(message).finish()
+    };
   }
 
 };
@@ -174,6 +203,9 @@ function createBaseGenesisState(): GenesisState {
 }
 
 export const GenesisState = {
+  typeUrl: "/osmosis.gamm.v1beta1.GenesisState",
+  aminoType: "osmosis/gamm/genesis-state",
+
   encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.pools) {
       Any.encode((v! as Any), writer.uint32(10).fork()).ldelim();
@@ -292,6 +324,32 @@ export const GenesisState = {
     obj.next_pool_number = message.nextPoolNumber ? message.nextPoolNumber.toString() : undefined;
     obj.params = message.params ? Params.toAmino(message.params) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisStateAminoMsg): GenesisState {
+    return GenesisState.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GenesisState): GenesisStateAminoMsg {
+    return {
+      type: "osmosis/gamm/genesis-state",
+      value: GenesisState.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GenesisStateProtoMsg): GenesisState {
+    return GenesisState.decode(message.value);
+  },
+
+  toProto(message: GenesisState): Uint8Array {
+    return GenesisState.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisState): GenesisStateProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v1beta1.GenesisState",
+      value: GenesisState.encode(message).finish()
+    };
   }
 
 };
diff --git a/__fixtures__/outputv2/osmosis/gamm/v1beta1/query.ts b/__fixtures__/outputv2/osmosis/gamm/v1beta1/query.ts
index 646940438..416dda225 100644
--- a/__fixtures__/outputv2/osmosis/gamm/v1beta1/query.ts
+++ b/__fixtures__/outputv2/osmosis/gamm/v1beta1/query.ts
@@ -16,7 +16,7 @@ export const protobufPackage = "osmosis.gamm.v1beta1";
 export interface QueryPoolRequest {
   poolId: Long;
 }
-export interface QueryPoolRequestProtoType {
+export interface QueryPoolRequestProtoMsg {
   typeUrl: "/osmosis.gamm.v1beta1.QueryPoolRequest";
   value: Uint8Array;
 }
@@ -25,7 +25,7 @@ export interface QueryPoolRequestProtoType {
 export interface QueryPoolRequestAmino {
   pool_id: string;
 }
-export interface QueryPoolRequestAminoType {
+export interface QueryPoolRequestAminoMsg {
   type: "osmosis/gamm/query-pool-request";
   value: QueryPoolRequestAmino;
 }
@@ -37,14 +37,14 @@ export interface QueryPoolRequestSDKType {
 export interface QueryPoolResponse {
   pool?: (Pool1 & Pool2 & Any) | undefined;
 }
-export interface QueryPoolResponseProtoType {
+export interface QueryPoolResponseProtoMsg {
   typeUrl: "/osmosis.gamm.v1beta1.QueryPoolResponse";
   value: Uint8Array;
 }
 export interface QueryPoolResponseAmino {
   pool?: AnyAmino;
 }
-export interface QueryPoolResponseAminoType {
+export interface QueryPoolResponseAminoMsg {
   type: "osmosis/gamm/query-pool-response";
   value: QueryPoolResponseAmino;
 }
@@ -57,7 +57,7 @@ export interface QueryPoolsRequest {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequest;
 }
-export interface QueryPoolsRequestProtoType {
+export interface QueryPoolsRequestProtoMsg {
   typeUrl: "/osmosis.gamm.v1beta1.QueryPoolsRequest";
   value: Uint8Array;
 }
@@ -67,7 +67,7 @@ export interface QueryPoolsRequestAmino {
   /** pagination defines an optional pagination for the request. */
   pagination?: PageRequestAmino;
 }
-export interface QueryPoolsRequestAminoType {
+export interface QueryPoolsRequestAminoMsg {
   type: "osmosis/gamm/query-pools-request";
   value: QueryPoolsRequestAmino;
 }
@@ -82,7 +82,7 @@ export interface QueryPoolsResponse {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponse;
 }
-export interface QueryPoolsResponseProtoType {
+export interface QueryPoolsResponseProtoMsg {
   typeUrl: "/osmosis.gamm.v1beta1.QueryPoolsResponse";
   value: Uint8Array;
 }
@@ -92,7 +92,7 @@ export interface QueryPoolsResponseAmino {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponseAmino;
 }
-export interface QueryPoolsResponseAminoType {
+export interface QueryPoolsResponseAminoMsg {
   type: "osmosis/gamm/query-pools-response";
   value: QueryPoolsResponseAmino;
 }
@@ -103,14 +103,14 @@ export interface QueryPoolsResponseSDKType {
 
 /** =============================== NumPools */
 export interface QueryNumPoolsRequest {}
-export interface QueryNumPoolsRequestProtoType {
+export interface QueryNumPoolsRequestProtoMsg {
   typeUrl: "/osmosis.gamm.v1beta1.QueryNumPoolsRequest";
   value: Uint8Array;
 }
 
 /** =============================== NumPools */
 export interface QueryNumPoolsRequestAmino {}
-export interface QueryNumPoolsRequestAminoType {
+export interface QueryNumPoolsRequestAminoMsg {
   type: "osmosis/gamm/query-num-pools-request";
   value: QueryNumPoolsRequestAmino;
 }
@@ -120,14 +120,14 @@ export interface QueryNumPoolsRequestSDKType {}
 export interface QueryNumPoolsResponse {
   numPools: Long;
 }
-export interface QueryNumPoolsResponseProtoType {
+export interface QueryNumPoolsResponseProtoMsg {
   typeUrl: "/osmosis.gamm.v1beta1.QueryNumPoolsResponse";
   value: Uint8Array;
 }
 export interface QueryNumPoolsResponseAmino {
   num_pools: string;
 }
-export interface QueryNumPoolsResponseAminoType {
+export interface QueryNumPoolsResponseAminoMsg {
   type: "osmosis/gamm/query-num-pools-response";
   value: QueryNumPoolsResponseAmino;
 }
@@ -139,7 +139,7 @@ export interface QueryNumPoolsResponseSDKType {
 export interface QueryPoolTypeRequest {
   poolId: Long;
 }
-export interface QueryPoolTypeRequestProtoType {
+export interface QueryPoolTypeRequestProtoMsg {
   typeUrl: "/osmosis.gamm.v1beta1.QueryPoolTypeRequest";
   value: Uint8Array;
 }
@@ -148,7 +148,7 @@ export interface QueryPoolTypeRequestProtoType {
 export interface QueryPoolTypeRequestAmino {
   pool_id: string;
 }
-export interface QueryPoolTypeRequestAminoType {
+export interface QueryPoolTypeRequestAminoMsg {
   type: "osmosis/gamm/query-pool-type-request";
   value: QueryPoolTypeRequestAmino;
 }
@@ -160,14 +160,14 @@ export interface QueryPoolTypeRequestSDKType {
 export interface QueryPoolTypeResponse {
   poolType: string;
 }
-export interface QueryPoolTypeResponseProtoType {
+export interface QueryPoolTypeResponseProtoMsg {
   typeUrl: "/osmosis.gamm.v1beta1.QueryPoolTypeResponse";
   value: Uint8Array;
 }
 export interface QueryPoolTypeResponseAmino {
   pool_type: string;
 }
-export interface QueryPoolTypeResponseAminoType {
+export interface QueryPoolTypeResponseAminoMsg {
   type: "osmosis/gamm/query-pool-type-response";
   value: QueryPoolTypeResponseAmino;
 }
@@ -180,7 +180,7 @@ export interface QueryCalcJoinPoolSharesRequest {
   poolId: Long;
   tokensIn: Coin[];
 }
-export interface QueryCalcJoinPoolSharesRequestProtoType {
+export interface QueryCalcJoinPoolSharesRequestProtoMsg {
   typeUrl: "/osmosis.gamm.v1beta1.QueryCalcJoinPoolSharesRequest";
   value: Uint8Array;
 }
@@ -190,7 +190,7 @@ export interface QueryCalcJoinPoolSharesRequestAmino {
   pool_id: string;
   tokens_in: CoinAmino[];
 }
-export interface QueryCalcJoinPoolSharesRequestAminoType {
+export interface QueryCalcJoinPoolSharesRequestAminoMsg {
   type: "osmosis/gamm/query-calc-join-pool-shares-request";
   value: QueryCalcJoinPoolSharesRequestAmino;
 }
@@ -204,7 +204,7 @@ export interface QueryCalcJoinPoolSharesResponse {
   shareOutAmount: string;
   tokensOut: Coin[];
 }
-export interface QueryCalcJoinPoolSharesResponseProtoType {
+export interface QueryCalcJoinPoolSharesResponseProtoMsg {
   typeUrl: "/osmosis.gamm.v1beta1.QueryCalcJoinPoolSharesResponse";
   value: Uint8Array;
 }
@@ -212,7 +212,7 @@ export interface QueryCalcJoinPoolSharesResponseAmino {
   share_out_amount: string;
   tokens_out: CoinAmino[];
 }
-export interface QueryCalcJoinPoolSharesResponseAminoType {
+export interface QueryCalcJoinPoolSharesResponseAminoMsg {
   type: "osmosis/gamm/query-calc-join-pool-shares-response";
   value: QueryCalcJoinPoolSharesResponseAmino;
 }
@@ -226,7 +226,7 @@ export interface QueryCalcExitPoolCoinsFromSharesRequest {
   poolId: Long;
   shareInAmount: string;
 }
-export interface QueryCalcExitPoolCoinsFromSharesRequestProtoType {
+export interface QueryCalcExitPoolCoinsFromSharesRequestProtoMsg {
   typeUrl: "/osmosis.gamm.v1beta1.QueryCalcExitPoolCoinsFromSharesRequest";
   value: Uint8Array;
 }
@@ -236,7 +236,7 @@ export interface QueryCalcExitPoolCoinsFromSharesRequestAmino {
   pool_id: string;
   share_in_amount: string;
 }
-export interface QueryCalcExitPoolCoinsFromSharesRequestAminoType {
+export interface QueryCalcExitPoolCoinsFromSharesRequestAminoMsg {
   type: "osmosis/gamm/query-calc-exit-pool-coins-from-shares-request";
   value: QueryCalcExitPoolCoinsFromSharesRequestAmino;
 }
@@ -249,14 +249,14 @@ export interface QueryCalcExitPoolCoinsFromSharesRequestSDKType {
 export interface QueryCalcExitPoolCoinsFromSharesResponse {
   tokensOut: Coin[];
 }
-export interface QueryCalcExitPoolCoinsFromSharesResponseProtoType {
+export interface QueryCalcExitPoolCoinsFromSharesResponseProtoMsg {
   typeUrl: "/osmosis.gamm.v1beta1.QueryCalcExitPoolCoinsFromSharesResponse";
   value: Uint8Array;
 }
 export interface QueryCalcExitPoolCoinsFromSharesResponseAmino {
   tokens_out: CoinAmino[];
 }
-export interface QueryCalcExitPoolCoinsFromSharesResponseAminoType {
+export interface QueryCalcExitPoolCoinsFromSharesResponseAminoMsg {
   type: "osmosis/gamm/query-calc-exit-pool-coins-from-shares-response";
   value: QueryCalcExitPoolCoinsFromSharesResponseAmino;
 }
@@ -268,7 +268,7 @@ export interface QueryCalcExitPoolCoinsFromSharesResponseSDKType {
 export interface QueryPoolParamsRequest {
   poolId: Long;
 }
-export interface QueryPoolParamsRequestProtoType {
+export interface QueryPoolParamsRequestProtoMsg {
   typeUrl: "/osmosis.gamm.v1beta1.QueryPoolParamsRequest";
   value: Uint8Array;
 }
@@ -277,7 +277,7 @@ export interface QueryPoolParamsRequestProtoType {
 export interface QueryPoolParamsRequestAmino {
   pool_id: string;
 }
-export interface QueryPoolParamsRequestAminoType {
+export interface QueryPoolParamsRequestAminoMsg {
   type: "osmosis/gamm/query-pool-params-request";
   value: QueryPoolParamsRequestAmino;
 }
@@ -289,14 +289,14 @@ export interface QueryPoolParamsRequestSDKType {
 export interface QueryPoolParamsResponse {
   params?: Any;
 }
-export interface QueryPoolParamsResponseProtoType {
+export interface QueryPoolParamsResponseProtoMsg {
   typeUrl: "/osmosis.gamm.v1beta1.QueryPoolParamsResponse";
   value: Uint8Array;
 }
 export interface QueryPoolParamsResponseAmino {
   params?: AnyAmino;
 }
-export interface QueryPoolParamsResponseAminoType {
+export interface QueryPoolParamsResponseAminoMsg {
   type: "osmosis/gamm/query-pool-params-response";
   value: QueryPoolParamsResponseAmino;
 }
@@ -308,7 +308,7 @@ export interface QueryPoolParamsResponseSDKType {
 export interface QueryTotalPoolLiquidityRequest {
   poolId: Long;
 }
-export interface QueryTotalPoolLiquidityRequestProtoType {
+export interface QueryTotalPoolLiquidityRequestProtoMsg {
   typeUrl: "/osmosis.gamm.v1beta1.QueryTotalPoolLiquidityRequest";
   value: Uint8Array;
 }
@@ -317,7 +317,7 @@ export interface QueryTotalPoolLiquidityRequestProtoType {
 export interface QueryTotalPoolLiquidityRequestAmino {
   pool_id: string;
 }
-export interface QueryTotalPoolLiquidityRequestAminoType {
+export interface QueryTotalPoolLiquidityRequestAminoMsg {
   type: "osmosis/gamm/query-total-pool-liquidity-request";
   value: QueryTotalPoolLiquidityRequestAmino;
 }
@@ -329,14 +329,14 @@ export interface QueryTotalPoolLiquidityRequestSDKType {
 export interface QueryTotalPoolLiquidityResponse {
   liquidity: Coin[];
 }
-export interface QueryTotalPoolLiquidityResponseProtoType {
+export interface QueryTotalPoolLiquidityResponseProtoMsg {
   typeUrl: "/osmosis.gamm.v1beta1.QueryTotalPoolLiquidityResponse";
   value: Uint8Array;
 }
 export interface QueryTotalPoolLiquidityResponseAmino {
   liquidity: CoinAmino[];
 }
-export interface QueryTotalPoolLiquidityResponseAminoType {
+export interface QueryTotalPoolLiquidityResponseAminoMsg {
   type: "osmosis/gamm/query-total-pool-liquidity-response";
   value: QueryTotalPoolLiquidityResponseAmino;
 }
@@ -348,7 +348,7 @@ export interface QueryTotalPoolLiquidityResponseSDKType {
 export interface QueryTotalSharesRequest {
   poolId: Long;
 }
-export interface QueryTotalSharesRequestProtoType {
+export interface QueryTotalSharesRequestProtoMsg {
   typeUrl: "/osmosis.gamm.v1beta1.QueryTotalSharesRequest";
   value: Uint8Array;
 }
@@ -357,7 +357,7 @@ export interface QueryTotalSharesRequestProtoType {
 export interface QueryTotalSharesRequestAmino {
   pool_id: string;
 }
-export interface QueryTotalSharesRequestAminoType {
+export interface QueryTotalSharesRequestAminoMsg {
   type: "osmosis/gamm/query-total-shares-request";
   value: QueryTotalSharesRequestAmino;
 }
@@ -369,14 +369,14 @@ export interface QueryTotalSharesRequestSDKType {
 export interface QueryTotalSharesResponse {
   totalShares?: Coin;
 }
-export interface QueryTotalSharesResponseProtoType {
+export interface QueryTotalSharesResponseProtoMsg {
   typeUrl: "/osmosis.gamm.v1beta1.QueryTotalSharesResponse";
   value: Uint8Array;
 }
 export interface QueryTotalSharesResponseAmino {
   total_shares?: CoinAmino;
 }
-export interface QueryTotalSharesResponseAminoType {
+export interface QueryTotalSharesResponseAminoMsg {
   type: "osmosis/gamm/query-total-shares-response";
   value: QueryTotalSharesResponseAmino;
 }
@@ -389,7 +389,7 @@ export interface QueryCalcJoinPoolNoSwapSharesRequest {
   poolId: Long;
   tokensIn: Coin[];
 }
-export interface QueryCalcJoinPoolNoSwapSharesRequestProtoType {
+export interface QueryCalcJoinPoolNoSwapSharesRequestProtoMsg {
   typeUrl: "/osmosis.gamm.v1beta1.QueryCalcJoinPoolNoSwapSharesRequest";
   value: Uint8Array;
 }
@@ -399,7 +399,7 @@ export interface QueryCalcJoinPoolNoSwapSharesRequestAmino {
   pool_id: string;
   tokens_in: CoinAmino[];
 }
-export interface QueryCalcJoinPoolNoSwapSharesRequestAminoType {
+export interface QueryCalcJoinPoolNoSwapSharesRequestAminoMsg {
   type: "osmosis/gamm/query-calc-join-pool-no-swap-shares-request";
   value: QueryCalcJoinPoolNoSwapSharesRequestAmino;
 }
@@ -413,7 +413,7 @@ export interface QueryCalcJoinPoolNoSwapSharesResponse {
   tokensOut: Coin[];
   sharesOut: string;
 }
-export interface QueryCalcJoinPoolNoSwapSharesResponseProtoType {
+export interface QueryCalcJoinPoolNoSwapSharesResponseProtoMsg {
   typeUrl: "/osmosis.gamm.v1beta1.QueryCalcJoinPoolNoSwapSharesResponse";
   value: Uint8Array;
 }
@@ -421,7 +421,7 @@ export interface QueryCalcJoinPoolNoSwapSharesResponseAmino {
   tokens_out: CoinAmino[];
   shares_out: string;
 }
-export interface QueryCalcJoinPoolNoSwapSharesResponseAminoType {
+export interface QueryCalcJoinPoolNoSwapSharesResponseAminoMsg {
   type: "osmosis/gamm/query-calc-join-pool-no-swap-shares-response";
   value: QueryCalcJoinPoolNoSwapSharesResponseAmino;
 }
@@ -441,7 +441,7 @@ export interface QuerySpotPriceRequest {
   baseAssetDenom: string;
   quoteAssetDenom: string;
 }
-export interface QuerySpotPriceRequestProtoType {
+export interface QuerySpotPriceRequestProtoMsg {
   typeUrl: "/osmosis.gamm.v1beta1.QuerySpotPriceRequest";
   value: Uint8Array;
 }
@@ -457,7 +457,7 @@ export interface QuerySpotPriceRequestAmino {
   base_asset_denom: string;
   quote_asset_denom: string;
 }
-export interface QuerySpotPriceRequestAminoType {
+export interface QuerySpotPriceRequestAminoMsg {
   type: "osmosis/gamm/query-spot-price-request";
   value: QuerySpotPriceRequestAmino;
 }
@@ -478,7 +478,7 @@ export interface QueryPoolsWithFilterRequest {
   poolType: string;
   pagination?: PageRequest;
 }
-export interface QueryPoolsWithFilterRequestProtoType {
+export interface QueryPoolsWithFilterRequestProtoMsg {
   typeUrl: "/osmosis.gamm.v1beta1.QueryPoolsWithFilterRequest";
   value: Uint8Array;
 }
@@ -487,7 +487,7 @@ export interface QueryPoolsWithFilterRequestAmino {
   pool_type: string;
   pagination?: PageRequestAmino;
 }
-export interface QueryPoolsWithFilterRequestAminoType {
+export interface QueryPoolsWithFilterRequestAminoMsg {
   type: "osmosis/gamm/query-pools-with-filter-request";
   value: QueryPoolsWithFilterRequestAmino;
 }
@@ -502,7 +502,7 @@ export interface QueryPoolsWithFilterResponse {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponse;
 }
-export interface QueryPoolsWithFilterResponseProtoType {
+export interface QueryPoolsWithFilterResponseProtoMsg {
   typeUrl: "/osmosis.gamm.v1beta1.QueryPoolsWithFilterResponse";
   value: Uint8Array;
 }
@@ -512,7 +512,7 @@ export interface QueryPoolsWithFilterResponseAmino {
   /** pagination defines the pagination in the response. */
   pagination?: PageResponseAmino;
 }
-export interface QueryPoolsWithFilterResponseAminoType {
+export interface QueryPoolsWithFilterResponseAminoMsg {
   type: "osmosis/gamm/query-pools-with-filter-response";
   value: QueryPoolsWithFilterResponseAmino;
 }
@@ -531,7 +531,7 @@ export interface QuerySpotPriceResponse {
   /** String of the Dec. Ex) 10.203uatom */
   spotPrice: string;
 }
-export interface QuerySpotPriceResponseProtoType {
+export interface QuerySpotPriceResponseProtoMsg {
   typeUrl: "/osmosis.gamm.v1beta1.QuerySpotPriceResponse";
   value: Uint8Array;
 }
@@ -546,7 +546,7 @@ export interface QuerySpotPriceResponseAmino {
   /** String of the Dec. Ex) 10.203uatom */
   spot_price: string;
 }
-export interface QuerySpotPriceResponseAminoType {
+export interface QuerySpotPriceResponseAminoMsg {
   type: "osmosis/gamm/query-spot-price-response";
   value: QuerySpotPriceResponseAmino;
 }
@@ -569,7 +569,7 @@ export interface QuerySwapExactAmountInRequest {
   tokenIn: string;
   routes: SwapAmountInRoute[];
 }
-export interface QuerySwapExactAmountInRequestProtoType {
+export interface QuerySwapExactAmountInRequestProtoMsg {
   typeUrl: "/osmosis.gamm.v1beta1.QuerySwapExactAmountInRequest";
   value: Uint8Array;
 }
@@ -582,7 +582,7 @@ export interface QuerySwapExactAmountInRequestAmino {
   token_in: string;
   routes: SwapAmountInRouteAmino[];
 }
-export interface QuerySwapExactAmountInRequestAminoType {
+export interface QuerySwapExactAmountInRequestAminoMsg {
   type: "osmosis/gamm/query-swap-exact-amount-in-request";
   value: QuerySwapExactAmountInRequestAmino;
 }
@@ -597,14 +597,14 @@ export interface QuerySwapExactAmountInRequestSDKType {
 export interface QuerySwapExactAmountInResponse {
   tokenOutAmount: string;
 }
-export interface QuerySwapExactAmountInResponseProtoType {
+export interface QuerySwapExactAmountInResponseProtoMsg {
   typeUrl: "/osmosis.gamm.v1beta1.QuerySwapExactAmountInResponse";
   value: Uint8Array;
 }
 export interface QuerySwapExactAmountInResponseAmino {
   token_out_amount: string;
 }
-export interface QuerySwapExactAmountInResponseAminoType {
+export interface QuerySwapExactAmountInResponseAminoMsg {
   type: "osmosis/gamm/query-swap-exact-amount-in-response";
   value: QuerySwapExactAmountInResponseAmino;
 }
@@ -620,7 +620,7 @@ export interface QuerySwapExactAmountOutRequest {
   routes: SwapAmountOutRoute[];
   tokenOut: string;
 }
-export interface QuerySwapExactAmountOutRequestProtoType {
+export interface QuerySwapExactAmountOutRequestProtoMsg {
   typeUrl: "/osmosis.gamm.v1beta1.QuerySwapExactAmountOutRequest";
   value: Uint8Array;
 }
@@ -633,7 +633,7 @@ export interface QuerySwapExactAmountOutRequestAmino {
   routes: SwapAmountOutRouteAmino[];
   token_out: string;
 }
-export interface QuerySwapExactAmountOutRequestAminoType {
+export interface QuerySwapExactAmountOutRequestAminoMsg {
   type: "osmosis/gamm/query-swap-exact-amount-out-request";
   value: QuerySwapExactAmountOutRequestAmino;
 }
@@ -648,14 +648,14 @@ export interface QuerySwapExactAmountOutRequestSDKType {
 export interface QuerySwapExactAmountOutResponse {
   tokenInAmount: string;
 }
-export interface QuerySwapExactAmountOutResponseProtoType {
+export interface QuerySwapExactAmountOutResponseProtoMsg {
   typeUrl: "/osmosis.gamm.v1beta1.QuerySwapExactAmountOutResponse";
   value: Uint8Array;
 }
 export interface QuerySwapExactAmountOutResponseAmino {
   token_in_amount: string;
 }
-export interface QuerySwapExactAmountOutResponseAminoType {
+export interface QuerySwapExactAmountOutResponseAminoMsg {
   type: "osmosis/gamm/query-swap-exact-amount-out-response";
   value: QuerySwapExactAmountOutResponseAmino;
 }
@@ -663,12 +663,12 @@ export interface QuerySwapExactAmountOutResponseSDKType {
   token_in_amount: string;
 }
 export interface QueryTotalLiquidityRequest {}
-export interface QueryTotalLiquidityRequestProtoType {
+export interface QueryTotalLiquidityRequestProtoMsg {
   typeUrl: "/osmosis.gamm.v1beta1.QueryTotalLiquidityRequest";
   value: Uint8Array;
 }
 export interface QueryTotalLiquidityRequestAmino {}
-export interface QueryTotalLiquidityRequestAminoType {
+export interface QueryTotalLiquidityRequestAminoMsg {
   type: "osmosis/gamm/query-total-liquidity-request";
   value: QueryTotalLiquidityRequestAmino;
 }
@@ -676,14 +676,14 @@ export interface QueryTotalLiquidityRequestSDKType {}
 export interface QueryTotalLiquidityResponse {
   liquidity: Coin[];
 }
-export interface QueryTotalLiquidityResponseProtoType {
+export interface QueryTotalLiquidityResponseProtoMsg {
   typeUrl: "/osmosis.gamm.v1beta1.QueryTotalLiquidityResponse";
   value: Uint8Array;
 }
 export interface QueryTotalLiquidityResponseAmino {
   liquidity: CoinAmino[];
 }
-export interface QueryTotalLiquidityResponseAminoType {
+export interface QueryTotalLiquidityResponseAminoMsg {
   type: "osmosis/gamm/query-total-liquidity-response";
   value: QueryTotalLiquidityResponseAmino;
 }
@@ -698,6 +698,9 @@ function createBaseQueryPoolRequest(): QueryPoolRequest {
 }
 
 export const QueryPoolRequest = {
+  typeUrl: "/osmosis.gamm.v1beta1.QueryPoolRequest",
+  aminoType: "osmosis/gamm/query-pool-request",
+
   encode(message: QueryPoolRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.poolId.isZero()) {
       writer.uint32(8).uint64(message.poolId);
@@ -768,6 +771,32 @@ export const QueryPoolRequest = {
     const obj: any = {};
     obj.pool_id = message.poolId ? message.poolId.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryPoolRequestAminoMsg): QueryPoolRequest {
+    return QueryPoolRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryPoolRequest): QueryPoolRequestAminoMsg {
+    return {
+      type: "osmosis/gamm/query-pool-request",
+      value: QueryPoolRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryPoolRequestProtoMsg): QueryPoolRequest {
+    return QueryPoolRequest.decode(message.value);
+  },
+
+  toProto(message: QueryPoolRequest): Uint8Array {
+    return QueryPoolRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryPoolRequest): QueryPoolRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v1beta1.QueryPoolRequest",
+      value: QueryPoolRequest.encode(message).finish()
+    };
   }
 
 };
@@ -779,6 +808,9 @@ function createBaseQueryPoolResponse(): QueryPoolResponse {
 }
 
 export const QueryPoolResponse = {
+  typeUrl: "/osmosis.gamm.v1beta1.QueryPoolResponse",
+  aminoType: "osmosis/gamm/query-pool-response",
+
   encode(message: QueryPoolResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.pool !== undefined) {
       Any.encode((message.pool as Any), writer.uint32(10).fork()).ldelim();
@@ -849,6 +881,32 @@ export const QueryPoolResponse = {
     const obj: any = {};
     obj.pool = message.pool ? PoolI_ToAmino((message.pool as Any)) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryPoolResponseAminoMsg): QueryPoolResponse {
+    return QueryPoolResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryPoolResponse): QueryPoolResponseAminoMsg {
+    return {
+      type: "osmosis/gamm/query-pool-response",
+      value: QueryPoolResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryPoolResponseProtoMsg): QueryPoolResponse {
+    return QueryPoolResponse.decode(message.value);
+  },
+
+  toProto(message: QueryPoolResponse): Uint8Array {
+    return QueryPoolResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryPoolResponse): QueryPoolResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v1beta1.QueryPoolResponse",
+      value: QueryPoolResponse.encode(message).finish()
+    };
   }
 
 };
@@ -860,6 +918,9 @@ function createBaseQueryPoolsRequest(): QueryPoolsRequest {
 }
 
 export const QueryPoolsRequest = {
+  typeUrl: "/osmosis.gamm.v1beta1.QueryPoolsRequest",
+  aminoType: "osmosis/gamm/query-pools-request",
+
   encode(message: QueryPoolsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.pagination !== undefined) {
       PageRequest.encode(message.pagination, writer.uint32(18).fork()).ldelim();
@@ -930,6 +991,32 @@ export const QueryPoolsRequest = {
     const obj: any = {};
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryPoolsRequestAminoMsg): QueryPoolsRequest {
+    return QueryPoolsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryPoolsRequest): QueryPoolsRequestAminoMsg {
+    return {
+      type: "osmosis/gamm/query-pools-request",
+      value: QueryPoolsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryPoolsRequestProtoMsg): QueryPoolsRequest {
+    return QueryPoolsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryPoolsRequest): Uint8Array {
+    return QueryPoolsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryPoolsRequest): QueryPoolsRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v1beta1.QueryPoolsRequest",
+      value: QueryPoolsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -942,6 +1029,9 @@ function createBaseQueryPoolsResponse(): QueryPoolsResponse {
 }
 
 export const QueryPoolsResponse = {
+  typeUrl: "/osmosis.gamm.v1beta1.QueryPoolsResponse",
+  aminoType: "osmosis/gamm/query-pools-response",
+
   encode(message: QueryPoolsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.pools) {
       Any.encode((v! as Any), writer.uint32(10).fork()).ldelim();
@@ -1045,6 +1135,32 @@ export const QueryPoolsResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryPoolsResponseAminoMsg): QueryPoolsResponse {
+    return QueryPoolsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryPoolsResponse): QueryPoolsResponseAminoMsg {
+    return {
+      type: "osmosis/gamm/query-pools-response",
+      value: QueryPoolsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryPoolsResponseProtoMsg): QueryPoolsResponse {
+    return QueryPoolsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryPoolsResponse): Uint8Array {
+    return QueryPoolsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryPoolsResponse): QueryPoolsResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v1beta1.QueryPoolsResponse",
+      value: QueryPoolsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1054,6 +1170,9 @@ function createBaseQueryNumPoolsRequest(): QueryNumPoolsRequest {
 }
 
 export const QueryNumPoolsRequest = {
+  typeUrl: "/osmosis.gamm.v1beta1.QueryNumPoolsRequest",
+  aminoType: "osmosis/gamm/query-num-pools-request",
+
   encode(_: QueryNumPoolsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -1106,6 +1225,32 @@ export const QueryNumPoolsRequest = {
   toAmino(_: QueryNumPoolsRequest): QueryNumPoolsRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryNumPoolsRequestAminoMsg): QueryNumPoolsRequest {
+    return QueryNumPoolsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryNumPoolsRequest): QueryNumPoolsRequestAminoMsg {
+    return {
+      type: "osmosis/gamm/query-num-pools-request",
+      value: QueryNumPoolsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryNumPoolsRequestProtoMsg): QueryNumPoolsRequest {
+    return QueryNumPoolsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryNumPoolsRequest): Uint8Array {
+    return QueryNumPoolsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryNumPoolsRequest): QueryNumPoolsRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v1beta1.QueryNumPoolsRequest",
+      value: QueryNumPoolsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1117,6 +1262,9 @@ function createBaseQueryNumPoolsResponse(): QueryNumPoolsResponse {
 }
 
 export const QueryNumPoolsResponse = {
+  typeUrl: "/osmosis.gamm.v1beta1.QueryNumPoolsResponse",
+  aminoType: "osmosis/gamm/query-num-pools-response",
+
   encode(message: QueryNumPoolsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.numPools.isZero()) {
       writer.uint32(8).uint64(message.numPools);
@@ -1187,6 +1335,32 @@ export const QueryNumPoolsResponse = {
     const obj: any = {};
     obj.num_pools = message.numPools ? message.numPools.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryNumPoolsResponseAminoMsg): QueryNumPoolsResponse {
+    return QueryNumPoolsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryNumPoolsResponse): QueryNumPoolsResponseAminoMsg {
+    return {
+      type: "osmosis/gamm/query-num-pools-response",
+      value: QueryNumPoolsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryNumPoolsResponseProtoMsg): QueryNumPoolsResponse {
+    return QueryNumPoolsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryNumPoolsResponse): Uint8Array {
+    return QueryNumPoolsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryNumPoolsResponse): QueryNumPoolsResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v1beta1.QueryNumPoolsResponse",
+      value: QueryNumPoolsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1198,6 +1372,9 @@ function createBaseQueryPoolTypeRequest(): QueryPoolTypeRequest {
 }
 
 export const QueryPoolTypeRequest = {
+  typeUrl: "/osmosis.gamm.v1beta1.QueryPoolTypeRequest",
+  aminoType: "osmosis/gamm/query-pool-type-request",
+
   encode(message: QueryPoolTypeRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.poolId.isZero()) {
       writer.uint32(8).uint64(message.poolId);
@@ -1268,6 +1445,32 @@ export const QueryPoolTypeRequest = {
     const obj: any = {};
     obj.pool_id = message.poolId ? message.poolId.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryPoolTypeRequestAminoMsg): QueryPoolTypeRequest {
+    return QueryPoolTypeRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryPoolTypeRequest): QueryPoolTypeRequestAminoMsg {
+    return {
+      type: "osmosis/gamm/query-pool-type-request",
+      value: QueryPoolTypeRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryPoolTypeRequestProtoMsg): QueryPoolTypeRequest {
+    return QueryPoolTypeRequest.decode(message.value);
+  },
+
+  toProto(message: QueryPoolTypeRequest): Uint8Array {
+    return QueryPoolTypeRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryPoolTypeRequest): QueryPoolTypeRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v1beta1.QueryPoolTypeRequest",
+      value: QueryPoolTypeRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1279,6 +1482,9 @@ function createBaseQueryPoolTypeResponse(): QueryPoolTypeResponse {
 }
 
 export const QueryPoolTypeResponse = {
+  typeUrl: "/osmosis.gamm.v1beta1.QueryPoolTypeResponse",
+  aminoType: "osmosis/gamm/query-pool-type-response",
+
   encode(message: QueryPoolTypeResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.poolType !== "") {
       writer.uint32(10).string(message.poolType);
@@ -1349,6 +1555,32 @@ export const QueryPoolTypeResponse = {
     const obj: any = {};
     obj.pool_type = message.poolType;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryPoolTypeResponseAminoMsg): QueryPoolTypeResponse {
+    return QueryPoolTypeResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryPoolTypeResponse): QueryPoolTypeResponseAminoMsg {
+    return {
+      type: "osmosis/gamm/query-pool-type-response",
+      value: QueryPoolTypeResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryPoolTypeResponseProtoMsg): QueryPoolTypeResponse {
+    return QueryPoolTypeResponse.decode(message.value);
+  },
+
+  toProto(message: QueryPoolTypeResponse): Uint8Array {
+    return QueryPoolTypeResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryPoolTypeResponse): QueryPoolTypeResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v1beta1.QueryPoolTypeResponse",
+      value: QueryPoolTypeResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1361,6 +1593,9 @@ function createBaseQueryCalcJoinPoolSharesRequest(): QueryCalcJoinPoolSharesRequ
 }
 
 export const QueryCalcJoinPoolSharesRequest = {
+  typeUrl: "/osmosis.gamm.v1beta1.QueryCalcJoinPoolSharesRequest",
+  aminoType: "osmosis/gamm/query-calc-join-pool-shares-request",
+
   encode(message: QueryCalcJoinPoolSharesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.poolId.isZero()) {
       writer.uint32(8).uint64(message.poolId);
@@ -1464,6 +1699,32 @@ export const QueryCalcJoinPoolSharesRequest = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: QueryCalcJoinPoolSharesRequestAminoMsg): QueryCalcJoinPoolSharesRequest {
+    return QueryCalcJoinPoolSharesRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryCalcJoinPoolSharesRequest): QueryCalcJoinPoolSharesRequestAminoMsg {
+    return {
+      type: "osmosis/gamm/query-calc-join-pool-shares-request",
+      value: QueryCalcJoinPoolSharesRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryCalcJoinPoolSharesRequestProtoMsg): QueryCalcJoinPoolSharesRequest {
+    return QueryCalcJoinPoolSharesRequest.decode(message.value);
+  },
+
+  toProto(message: QueryCalcJoinPoolSharesRequest): Uint8Array {
+    return QueryCalcJoinPoolSharesRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryCalcJoinPoolSharesRequest): QueryCalcJoinPoolSharesRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v1beta1.QueryCalcJoinPoolSharesRequest",
+      value: QueryCalcJoinPoolSharesRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1476,6 +1737,9 @@ function createBaseQueryCalcJoinPoolSharesResponse(): QueryCalcJoinPoolSharesRes
 }
 
 export const QueryCalcJoinPoolSharesResponse = {
+  typeUrl: "/osmosis.gamm.v1beta1.QueryCalcJoinPoolSharesResponse",
+  aminoType: "osmosis/gamm/query-calc-join-pool-shares-response",
+
   encode(message: QueryCalcJoinPoolSharesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.shareOutAmount !== "") {
       writer.uint32(10).string(message.shareOutAmount);
@@ -1579,6 +1843,32 @@ export const QueryCalcJoinPoolSharesResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: QueryCalcJoinPoolSharesResponseAminoMsg): QueryCalcJoinPoolSharesResponse {
+    return QueryCalcJoinPoolSharesResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryCalcJoinPoolSharesResponse): QueryCalcJoinPoolSharesResponseAminoMsg {
+    return {
+      type: "osmosis/gamm/query-calc-join-pool-shares-response",
+      value: QueryCalcJoinPoolSharesResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryCalcJoinPoolSharesResponseProtoMsg): QueryCalcJoinPoolSharesResponse {
+    return QueryCalcJoinPoolSharesResponse.decode(message.value);
+  },
+
+  toProto(message: QueryCalcJoinPoolSharesResponse): Uint8Array {
+    return QueryCalcJoinPoolSharesResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryCalcJoinPoolSharesResponse): QueryCalcJoinPoolSharesResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v1beta1.QueryCalcJoinPoolSharesResponse",
+      value: QueryCalcJoinPoolSharesResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1591,6 +1881,9 @@ function createBaseQueryCalcExitPoolCoinsFromSharesRequest(): QueryCalcExitPoolC
 }
 
 export const QueryCalcExitPoolCoinsFromSharesRequest = {
+  typeUrl: "/osmosis.gamm.v1beta1.QueryCalcExitPoolCoinsFromSharesRequest",
+  aminoType: "osmosis/gamm/query-calc-exit-pool-coins-from-shares-request",
+
   encode(message: QueryCalcExitPoolCoinsFromSharesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.poolId.isZero()) {
       writer.uint32(8).uint64(message.poolId);
@@ -1676,6 +1969,32 @@ export const QueryCalcExitPoolCoinsFromSharesRequest = {
     obj.pool_id = message.poolId ? message.poolId.toString() : undefined;
     obj.share_in_amount = message.shareInAmount;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryCalcExitPoolCoinsFromSharesRequestAminoMsg): QueryCalcExitPoolCoinsFromSharesRequest {
+    return QueryCalcExitPoolCoinsFromSharesRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryCalcExitPoolCoinsFromSharesRequest): QueryCalcExitPoolCoinsFromSharesRequestAminoMsg {
+    return {
+      type: "osmosis/gamm/query-calc-exit-pool-coins-from-shares-request",
+      value: QueryCalcExitPoolCoinsFromSharesRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryCalcExitPoolCoinsFromSharesRequestProtoMsg): QueryCalcExitPoolCoinsFromSharesRequest {
+    return QueryCalcExitPoolCoinsFromSharesRequest.decode(message.value);
+  },
+
+  toProto(message: QueryCalcExitPoolCoinsFromSharesRequest): Uint8Array {
+    return QueryCalcExitPoolCoinsFromSharesRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryCalcExitPoolCoinsFromSharesRequest): QueryCalcExitPoolCoinsFromSharesRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v1beta1.QueryCalcExitPoolCoinsFromSharesRequest",
+      value: QueryCalcExitPoolCoinsFromSharesRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1687,6 +2006,9 @@ function createBaseQueryCalcExitPoolCoinsFromSharesResponse(): QueryCalcExitPool
 }
 
 export const QueryCalcExitPoolCoinsFromSharesResponse = {
+  typeUrl: "/osmosis.gamm.v1beta1.QueryCalcExitPoolCoinsFromSharesResponse",
+  aminoType: "osmosis/gamm/query-calc-exit-pool-coins-from-shares-response",
+
   encode(message: QueryCalcExitPoolCoinsFromSharesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.tokensOut) {
       Coin.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1775,6 +2097,32 @@ export const QueryCalcExitPoolCoinsFromSharesResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: QueryCalcExitPoolCoinsFromSharesResponseAminoMsg): QueryCalcExitPoolCoinsFromSharesResponse {
+    return QueryCalcExitPoolCoinsFromSharesResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryCalcExitPoolCoinsFromSharesResponse): QueryCalcExitPoolCoinsFromSharesResponseAminoMsg {
+    return {
+      type: "osmosis/gamm/query-calc-exit-pool-coins-from-shares-response",
+      value: QueryCalcExitPoolCoinsFromSharesResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryCalcExitPoolCoinsFromSharesResponseProtoMsg): QueryCalcExitPoolCoinsFromSharesResponse {
+    return QueryCalcExitPoolCoinsFromSharesResponse.decode(message.value);
+  },
+
+  toProto(message: QueryCalcExitPoolCoinsFromSharesResponse): Uint8Array {
+    return QueryCalcExitPoolCoinsFromSharesResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryCalcExitPoolCoinsFromSharesResponse): QueryCalcExitPoolCoinsFromSharesResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v1beta1.QueryCalcExitPoolCoinsFromSharesResponse",
+      value: QueryCalcExitPoolCoinsFromSharesResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1786,6 +2134,9 @@ function createBaseQueryPoolParamsRequest(): QueryPoolParamsRequest {
 }
 
 export const QueryPoolParamsRequest = {
+  typeUrl: "/osmosis.gamm.v1beta1.QueryPoolParamsRequest",
+  aminoType: "osmosis/gamm/query-pool-params-request",
+
   encode(message: QueryPoolParamsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.poolId.isZero()) {
       writer.uint32(8).uint64(message.poolId);
@@ -1856,6 +2207,32 @@ export const QueryPoolParamsRequest = {
     const obj: any = {};
     obj.pool_id = message.poolId ? message.poolId.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryPoolParamsRequestAminoMsg): QueryPoolParamsRequest {
+    return QueryPoolParamsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryPoolParamsRequest): QueryPoolParamsRequestAminoMsg {
+    return {
+      type: "osmosis/gamm/query-pool-params-request",
+      value: QueryPoolParamsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryPoolParamsRequestProtoMsg): QueryPoolParamsRequest {
+    return QueryPoolParamsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryPoolParamsRequest): Uint8Array {
+    return QueryPoolParamsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryPoolParamsRequest): QueryPoolParamsRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v1beta1.QueryPoolParamsRequest",
+      value: QueryPoolParamsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1867,6 +2244,9 @@ function createBaseQueryPoolParamsResponse(): QueryPoolParamsResponse {
 }
 
 export const QueryPoolParamsResponse = {
+  typeUrl: "/osmosis.gamm.v1beta1.QueryPoolParamsResponse",
+  aminoType: "osmosis/gamm/query-pool-params-response",
+
   encode(message: QueryPoolParamsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.params !== undefined) {
       Any.encode(message.params, writer.uint32(10).fork()).ldelim();
@@ -1937,6 +2317,32 @@ export const QueryPoolParamsResponse = {
     const obj: any = {};
     obj.params = message.params ? Any.toAmino(message.params) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryPoolParamsResponseAminoMsg): QueryPoolParamsResponse {
+    return QueryPoolParamsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryPoolParamsResponse): QueryPoolParamsResponseAminoMsg {
+    return {
+      type: "osmosis/gamm/query-pool-params-response",
+      value: QueryPoolParamsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryPoolParamsResponseProtoMsg): QueryPoolParamsResponse {
+    return QueryPoolParamsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryPoolParamsResponse): Uint8Array {
+    return QueryPoolParamsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryPoolParamsResponse): QueryPoolParamsResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v1beta1.QueryPoolParamsResponse",
+      value: QueryPoolParamsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1948,6 +2354,9 @@ function createBaseQueryTotalPoolLiquidityRequest(): QueryTotalPoolLiquidityRequ
 }
 
 export const QueryTotalPoolLiquidityRequest = {
+  typeUrl: "/osmosis.gamm.v1beta1.QueryTotalPoolLiquidityRequest",
+  aminoType: "osmosis/gamm/query-total-pool-liquidity-request",
+
   encode(message: QueryTotalPoolLiquidityRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.poolId.isZero()) {
       writer.uint32(8).uint64(message.poolId);
@@ -2018,6 +2427,32 @@ export const QueryTotalPoolLiquidityRequest = {
     const obj: any = {};
     obj.pool_id = message.poolId ? message.poolId.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryTotalPoolLiquidityRequestAminoMsg): QueryTotalPoolLiquidityRequest {
+    return QueryTotalPoolLiquidityRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryTotalPoolLiquidityRequest): QueryTotalPoolLiquidityRequestAminoMsg {
+    return {
+      type: "osmosis/gamm/query-total-pool-liquidity-request",
+      value: QueryTotalPoolLiquidityRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryTotalPoolLiquidityRequestProtoMsg): QueryTotalPoolLiquidityRequest {
+    return QueryTotalPoolLiquidityRequest.decode(message.value);
+  },
+
+  toProto(message: QueryTotalPoolLiquidityRequest): Uint8Array {
+    return QueryTotalPoolLiquidityRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryTotalPoolLiquidityRequest): QueryTotalPoolLiquidityRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v1beta1.QueryTotalPoolLiquidityRequest",
+      value: QueryTotalPoolLiquidityRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2029,6 +2464,9 @@ function createBaseQueryTotalPoolLiquidityResponse(): QueryTotalPoolLiquidityRes
 }
 
 export const QueryTotalPoolLiquidityResponse = {
+  typeUrl: "/osmosis.gamm.v1beta1.QueryTotalPoolLiquidityResponse",
+  aminoType: "osmosis/gamm/query-total-pool-liquidity-response",
+
   encode(message: QueryTotalPoolLiquidityResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.liquidity) {
       Coin.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -2117,6 +2555,32 @@ export const QueryTotalPoolLiquidityResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: QueryTotalPoolLiquidityResponseAminoMsg): QueryTotalPoolLiquidityResponse {
+    return QueryTotalPoolLiquidityResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryTotalPoolLiquidityResponse): QueryTotalPoolLiquidityResponseAminoMsg {
+    return {
+      type: "osmosis/gamm/query-total-pool-liquidity-response",
+      value: QueryTotalPoolLiquidityResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryTotalPoolLiquidityResponseProtoMsg): QueryTotalPoolLiquidityResponse {
+    return QueryTotalPoolLiquidityResponse.decode(message.value);
+  },
+
+  toProto(message: QueryTotalPoolLiquidityResponse): Uint8Array {
+    return QueryTotalPoolLiquidityResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryTotalPoolLiquidityResponse): QueryTotalPoolLiquidityResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v1beta1.QueryTotalPoolLiquidityResponse",
+      value: QueryTotalPoolLiquidityResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2128,6 +2592,9 @@ function createBaseQueryTotalSharesRequest(): QueryTotalSharesRequest {
 }
 
 export const QueryTotalSharesRequest = {
+  typeUrl: "/osmosis.gamm.v1beta1.QueryTotalSharesRequest",
+  aminoType: "osmosis/gamm/query-total-shares-request",
+
   encode(message: QueryTotalSharesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.poolId.isZero()) {
       writer.uint32(8).uint64(message.poolId);
@@ -2198,6 +2665,32 @@ export const QueryTotalSharesRequest = {
     const obj: any = {};
     obj.pool_id = message.poolId ? message.poolId.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryTotalSharesRequestAminoMsg): QueryTotalSharesRequest {
+    return QueryTotalSharesRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryTotalSharesRequest): QueryTotalSharesRequestAminoMsg {
+    return {
+      type: "osmosis/gamm/query-total-shares-request",
+      value: QueryTotalSharesRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryTotalSharesRequestProtoMsg): QueryTotalSharesRequest {
+    return QueryTotalSharesRequest.decode(message.value);
+  },
+
+  toProto(message: QueryTotalSharesRequest): Uint8Array {
+    return QueryTotalSharesRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryTotalSharesRequest): QueryTotalSharesRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v1beta1.QueryTotalSharesRequest",
+      value: QueryTotalSharesRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2209,6 +2702,9 @@ function createBaseQueryTotalSharesResponse(): QueryTotalSharesResponse {
 }
 
 export const QueryTotalSharesResponse = {
+  typeUrl: "/osmosis.gamm.v1beta1.QueryTotalSharesResponse",
+  aminoType: "osmosis/gamm/query-total-shares-response",
+
   encode(message: QueryTotalSharesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.totalShares !== undefined) {
       Coin.encode(message.totalShares, writer.uint32(10).fork()).ldelim();
@@ -2279,6 +2775,32 @@ export const QueryTotalSharesResponse = {
     const obj: any = {};
     obj.total_shares = message.totalShares ? Coin.toAmino(message.totalShares) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryTotalSharesResponseAminoMsg): QueryTotalSharesResponse {
+    return QueryTotalSharesResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryTotalSharesResponse): QueryTotalSharesResponseAminoMsg {
+    return {
+      type: "osmosis/gamm/query-total-shares-response",
+      value: QueryTotalSharesResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryTotalSharesResponseProtoMsg): QueryTotalSharesResponse {
+    return QueryTotalSharesResponse.decode(message.value);
+  },
+
+  toProto(message: QueryTotalSharesResponse): Uint8Array {
+    return QueryTotalSharesResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryTotalSharesResponse): QueryTotalSharesResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v1beta1.QueryTotalSharesResponse",
+      value: QueryTotalSharesResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2291,6 +2813,9 @@ function createBaseQueryCalcJoinPoolNoSwapSharesRequest(): QueryCalcJoinPoolNoSw
 }
 
 export const QueryCalcJoinPoolNoSwapSharesRequest = {
+  typeUrl: "/osmosis.gamm.v1beta1.QueryCalcJoinPoolNoSwapSharesRequest",
+  aminoType: "osmosis/gamm/query-calc-join-pool-no-swap-shares-request",
+
   encode(message: QueryCalcJoinPoolNoSwapSharesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.poolId.isZero()) {
       writer.uint32(8).uint64(message.poolId);
@@ -2394,6 +2919,32 @@ export const QueryCalcJoinPoolNoSwapSharesRequest = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: QueryCalcJoinPoolNoSwapSharesRequestAminoMsg): QueryCalcJoinPoolNoSwapSharesRequest {
+    return QueryCalcJoinPoolNoSwapSharesRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryCalcJoinPoolNoSwapSharesRequest): QueryCalcJoinPoolNoSwapSharesRequestAminoMsg {
+    return {
+      type: "osmosis/gamm/query-calc-join-pool-no-swap-shares-request",
+      value: QueryCalcJoinPoolNoSwapSharesRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryCalcJoinPoolNoSwapSharesRequestProtoMsg): QueryCalcJoinPoolNoSwapSharesRequest {
+    return QueryCalcJoinPoolNoSwapSharesRequest.decode(message.value);
+  },
+
+  toProto(message: QueryCalcJoinPoolNoSwapSharesRequest): Uint8Array {
+    return QueryCalcJoinPoolNoSwapSharesRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryCalcJoinPoolNoSwapSharesRequest): QueryCalcJoinPoolNoSwapSharesRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v1beta1.QueryCalcJoinPoolNoSwapSharesRequest",
+      value: QueryCalcJoinPoolNoSwapSharesRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2406,6 +2957,9 @@ function createBaseQueryCalcJoinPoolNoSwapSharesResponse(): QueryCalcJoinPoolNoS
 }
 
 export const QueryCalcJoinPoolNoSwapSharesResponse = {
+  typeUrl: "/osmosis.gamm.v1beta1.QueryCalcJoinPoolNoSwapSharesResponse",
+  aminoType: "osmosis/gamm/query-calc-join-pool-no-swap-shares-response",
+
   encode(message: QueryCalcJoinPoolNoSwapSharesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.tokensOut) {
       Coin.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -2509,6 +3063,32 @@ export const QueryCalcJoinPoolNoSwapSharesResponse = {
 
     obj.shares_out = message.sharesOut;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryCalcJoinPoolNoSwapSharesResponseAminoMsg): QueryCalcJoinPoolNoSwapSharesResponse {
+    return QueryCalcJoinPoolNoSwapSharesResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryCalcJoinPoolNoSwapSharesResponse): QueryCalcJoinPoolNoSwapSharesResponseAminoMsg {
+    return {
+      type: "osmosis/gamm/query-calc-join-pool-no-swap-shares-response",
+      value: QueryCalcJoinPoolNoSwapSharesResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryCalcJoinPoolNoSwapSharesResponseProtoMsg): QueryCalcJoinPoolNoSwapSharesResponse {
+    return QueryCalcJoinPoolNoSwapSharesResponse.decode(message.value);
+  },
+
+  toProto(message: QueryCalcJoinPoolNoSwapSharesResponse): Uint8Array {
+    return QueryCalcJoinPoolNoSwapSharesResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryCalcJoinPoolNoSwapSharesResponse): QueryCalcJoinPoolNoSwapSharesResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v1beta1.QueryCalcJoinPoolNoSwapSharesResponse",
+      value: QueryCalcJoinPoolNoSwapSharesResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2522,6 +3102,9 @@ function createBaseQuerySpotPriceRequest(): QuerySpotPriceRequest {
 }
 
 export const QuerySpotPriceRequest = {
+  typeUrl: "/osmosis.gamm.v1beta1.QuerySpotPriceRequest",
+  aminoType: "osmosis/gamm/query-spot-price-request",
+
   encode(message: QuerySpotPriceRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.poolId.isZero()) {
       writer.uint32(8).uint64(message.poolId);
@@ -2622,6 +3205,32 @@ export const QuerySpotPriceRequest = {
     obj.base_asset_denom = message.baseAssetDenom;
     obj.quote_asset_denom = message.quoteAssetDenom;
     return obj;
+  },
+
+  fromAminoMsg(object: QuerySpotPriceRequestAminoMsg): QuerySpotPriceRequest {
+    return QuerySpotPriceRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QuerySpotPriceRequest): QuerySpotPriceRequestAminoMsg {
+    return {
+      type: "osmosis/gamm/query-spot-price-request",
+      value: QuerySpotPriceRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QuerySpotPriceRequestProtoMsg): QuerySpotPriceRequest {
+    return QuerySpotPriceRequest.decode(message.value);
+  },
+
+  toProto(message: QuerySpotPriceRequest): Uint8Array {
+    return QuerySpotPriceRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QuerySpotPriceRequest): QuerySpotPriceRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v1beta1.QuerySpotPriceRequest",
+      value: QuerySpotPriceRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2635,6 +3244,9 @@ function createBaseQueryPoolsWithFilterRequest(): QueryPoolsWithFilterRequest {
 }
 
 export const QueryPoolsWithFilterRequest = {
+  typeUrl: "/osmosis.gamm.v1beta1.QueryPoolsWithFilterRequest",
+  aminoType: "osmosis/gamm/query-pools-with-filter-request",
+
   encode(message: QueryPoolsWithFilterRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.minLiquidity) {
       Coin.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -2753,6 +3365,32 @@ export const QueryPoolsWithFilterRequest = {
     obj.pool_type = message.poolType;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryPoolsWithFilterRequestAminoMsg): QueryPoolsWithFilterRequest {
+    return QueryPoolsWithFilterRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryPoolsWithFilterRequest): QueryPoolsWithFilterRequestAminoMsg {
+    return {
+      type: "osmosis/gamm/query-pools-with-filter-request",
+      value: QueryPoolsWithFilterRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryPoolsWithFilterRequestProtoMsg): QueryPoolsWithFilterRequest {
+    return QueryPoolsWithFilterRequest.decode(message.value);
+  },
+
+  toProto(message: QueryPoolsWithFilterRequest): Uint8Array {
+    return QueryPoolsWithFilterRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryPoolsWithFilterRequest): QueryPoolsWithFilterRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v1beta1.QueryPoolsWithFilterRequest",
+      value: QueryPoolsWithFilterRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2765,6 +3403,9 @@ function createBaseQueryPoolsWithFilterResponse(): QueryPoolsWithFilterResponse
 }
 
 export const QueryPoolsWithFilterResponse = {
+  typeUrl: "/osmosis.gamm.v1beta1.QueryPoolsWithFilterResponse",
+  aminoType: "osmosis/gamm/query-pools-with-filter-response",
+
   encode(message: QueryPoolsWithFilterResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.pools) {
       Any.encode((v! as Any), writer.uint32(10).fork()).ldelim();
@@ -2868,6 +3509,32 @@ export const QueryPoolsWithFilterResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryPoolsWithFilterResponseAminoMsg): QueryPoolsWithFilterResponse {
+    return QueryPoolsWithFilterResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryPoolsWithFilterResponse): QueryPoolsWithFilterResponseAminoMsg {
+    return {
+      type: "osmosis/gamm/query-pools-with-filter-response",
+      value: QueryPoolsWithFilterResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryPoolsWithFilterResponseProtoMsg): QueryPoolsWithFilterResponse {
+    return QueryPoolsWithFilterResponse.decode(message.value);
+  },
+
+  toProto(message: QueryPoolsWithFilterResponse): Uint8Array {
+    return QueryPoolsWithFilterResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryPoolsWithFilterResponse): QueryPoolsWithFilterResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v1beta1.QueryPoolsWithFilterResponse",
+      value: QueryPoolsWithFilterResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2879,6 +3546,9 @@ function createBaseQuerySpotPriceResponse(): QuerySpotPriceResponse {
 }
 
 export const QuerySpotPriceResponse = {
+  typeUrl: "/osmosis.gamm.v1beta1.QuerySpotPriceResponse",
+  aminoType: "osmosis/gamm/query-spot-price-response",
+
   encode(message: QuerySpotPriceResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.spotPrice !== "") {
       writer.uint32(10).string(message.spotPrice);
@@ -2949,6 +3619,32 @@ export const QuerySpotPriceResponse = {
     const obj: any = {};
     obj.spot_price = message.spotPrice;
     return obj;
+  },
+
+  fromAminoMsg(object: QuerySpotPriceResponseAminoMsg): QuerySpotPriceResponse {
+    return QuerySpotPriceResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QuerySpotPriceResponse): QuerySpotPriceResponseAminoMsg {
+    return {
+      type: "osmosis/gamm/query-spot-price-response",
+      value: QuerySpotPriceResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QuerySpotPriceResponseProtoMsg): QuerySpotPriceResponse {
+    return QuerySpotPriceResponse.decode(message.value);
+  },
+
+  toProto(message: QuerySpotPriceResponse): Uint8Array {
+    return QuerySpotPriceResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QuerySpotPriceResponse): QuerySpotPriceResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v1beta1.QuerySpotPriceResponse",
+      value: QuerySpotPriceResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2963,6 +3659,9 @@ function createBaseQuerySwapExactAmountInRequest(): QuerySwapExactAmountInReques
 }
 
 export const QuerySwapExactAmountInRequest = {
+  typeUrl: "/osmosis.gamm.v1beta1.QuerySwapExactAmountInRequest",
+  aminoType: "osmosis/gamm/query-swap-exact-amount-in-request",
+
   encode(message: QuerySwapExactAmountInRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.sender !== "") {
       writer.uint32(10).string(message.sender);
@@ -3096,6 +3795,32 @@ export const QuerySwapExactAmountInRequest = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: QuerySwapExactAmountInRequestAminoMsg): QuerySwapExactAmountInRequest {
+    return QuerySwapExactAmountInRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QuerySwapExactAmountInRequest): QuerySwapExactAmountInRequestAminoMsg {
+    return {
+      type: "osmosis/gamm/query-swap-exact-amount-in-request",
+      value: QuerySwapExactAmountInRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QuerySwapExactAmountInRequestProtoMsg): QuerySwapExactAmountInRequest {
+    return QuerySwapExactAmountInRequest.decode(message.value);
+  },
+
+  toProto(message: QuerySwapExactAmountInRequest): Uint8Array {
+    return QuerySwapExactAmountInRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QuerySwapExactAmountInRequest): QuerySwapExactAmountInRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v1beta1.QuerySwapExactAmountInRequest",
+      value: QuerySwapExactAmountInRequest.encode(message).finish()
+    };
   }
 
 };
@@ -3107,6 +3832,9 @@ function createBaseQuerySwapExactAmountInResponse(): QuerySwapExactAmountInRespo
 }
 
 export const QuerySwapExactAmountInResponse = {
+  typeUrl: "/osmosis.gamm.v1beta1.QuerySwapExactAmountInResponse",
+  aminoType: "osmosis/gamm/query-swap-exact-amount-in-response",
+
   encode(message: QuerySwapExactAmountInResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.tokenOutAmount !== "") {
       writer.uint32(10).string(message.tokenOutAmount);
@@ -3177,6 +3905,32 @@ export const QuerySwapExactAmountInResponse = {
     const obj: any = {};
     obj.token_out_amount = message.tokenOutAmount;
     return obj;
+  },
+
+  fromAminoMsg(object: QuerySwapExactAmountInResponseAminoMsg): QuerySwapExactAmountInResponse {
+    return QuerySwapExactAmountInResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QuerySwapExactAmountInResponse): QuerySwapExactAmountInResponseAminoMsg {
+    return {
+      type: "osmosis/gamm/query-swap-exact-amount-in-response",
+      value: QuerySwapExactAmountInResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QuerySwapExactAmountInResponseProtoMsg): QuerySwapExactAmountInResponse {
+    return QuerySwapExactAmountInResponse.decode(message.value);
+  },
+
+  toProto(message: QuerySwapExactAmountInResponse): Uint8Array {
+    return QuerySwapExactAmountInResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QuerySwapExactAmountInResponse): QuerySwapExactAmountInResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v1beta1.QuerySwapExactAmountInResponse",
+      value: QuerySwapExactAmountInResponse.encode(message).finish()
+    };
   }
 
 };
@@ -3191,6 +3945,9 @@ function createBaseQuerySwapExactAmountOutRequest(): QuerySwapExactAmountOutRequ
 }
 
 export const QuerySwapExactAmountOutRequest = {
+  typeUrl: "/osmosis.gamm.v1beta1.QuerySwapExactAmountOutRequest",
+  aminoType: "osmosis/gamm/query-swap-exact-amount-out-request",
+
   encode(message: QuerySwapExactAmountOutRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.sender !== "") {
       writer.uint32(10).string(message.sender);
@@ -3324,6 +4081,32 @@ export const QuerySwapExactAmountOutRequest = {
 
     obj.token_out = message.tokenOut;
     return obj;
+  },
+
+  fromAminoMsg(object: QuerySwapExactAmountOutRequestAminoMsg): QuerySwapExactAmountOutRequest {
+    return QuerySwapExactAmountOutRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QuerySwapExactAmountOutRequest): QuerySwapExactAmountOutRequestAminoMsg {
+    return {
+      type: "osmosis/gamm/query-swap-exact-amount-out-request",
+      value: QuerySwapExactAmountOutRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QuerySwapExactAmountOutRequestProtoMsg): QuerySwapExactAmountOutRequest {
+    return QuerySwapExactAmountOutRequest.decode(message.value);
+  },
+
+  toProto(message: QuerySwapExactAmountOutRequest): Uint8Array {
+    return QuerySwapExactAmountOutRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QuerySwapExactAmountOutRequest): QuerySwapExactAmountOutRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v1beta1.QuerySwapExactAmountOutRequest",
+      value: QuerySwapExactAmountOutRequest.encode(message).finish()
+    };
   }
 
 };
@@ -3335,6 +4118,9 @@ function createBaseQuerySwapExactAmountOutResponse(): QuerySwapExactAmountOutRes
 }
 
 export const QuerySwapExactAmountOutResponse = {
+  typeUrl: "/osmosis.gamm.v1beta1.QuerySwapExactAmountOutResponse",
+  aminoType: "osmosis/gamm/query-swap-exact-amount-out-response",
+
   encode(message: QuerySwapExactAmountOutResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.tokenInAmount !== "") {
       writer.uint32(10).string(message.tokenInAmount);
@@ -3405,6 +4191,32 @@ export const QuerySwapExactAmountOutResponse = {
     const obj: any = {};
     obj.token_in_amount = message.tokenInAmount;
     return obj;
+  },
+
+  fromAminoMsg(object: QuerySwapExactAmountOutResponseAminoMsg): QuerySwapExactAmountOutResponse {
+    return QuerySwapExactAmountOutResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QuerySwapExactAmountOutResponse): QuerySwapExactAmountOutResponseAminoMsg {
+    return {
+      type: "osmosis/gamm/query-swap-exact-amount-out-response",
+      value: QuerySwapExactAmountOutResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QuerySwapExactAmountOutResponseProtoMsg): QuerySwapExactAmountOutResponse {
+    return QuerySwapExactAmountOutResponse.decode(message.value);
+  },
+
+  toProto(message: QuerySwapExactAmountOutResponse): Uint8Array {
+    return QuerySwapExactAmountOutResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QuerySwapExactAmountOutResponse): QuerySwapExactAmountOutResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v1beta1.QuerySwapExactAmountOutResponse",
+      value: QuerySwapExactAmountOutResponse.encode(message).finish()
+    };
   }
 
 };
@@ -3414,6 +4226,9 @@ function createBaseQueryTotalLiquidityRequest(): QueryTotalLiquidityRequest {
 }
 
 export const QueryTotalLiquidityRequest = {
+  typeUrl: "/osmosis.gamm.v1beta1.QueryTotalLiquidityRequest",
+  aminoType: "osmosis/gamm/query-total-liquidity-request",
+
   encode(_: QueryTotalLiquidityRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -3466,6 +4281,32 @@ export const QueryTotalLiquidityRequest = {
   toAmino(_: QueryTotalLiquidityRequest): QueryTotalLiquidityRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryTotalLiquidityRequestAminoMsg): QueryTotalLiquidityRequest {
+    return QueryTotalLiquidityRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryTotalLiquidityRequest): QueryTotalLiquidityRequestAminoMsg {
+    return {
+      type: "osmosis/gamm/query-total-liquidity-request",
+      value: QueryTotalLiquidityRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryTotalLiquidityRequestProtoMsg): QueryTotalLiquidityRequest {
+    return QueryTotalLiquidityRequest.decode(message.value);
+  },
+
+  toProto(message: QueryTotalLiquidityRequest): Uint8Array {
+    return QueryTotalLiquidityRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryTotalLiquidityRequest): QueryTotalLiquidityRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v1beta1.QueryTotalLiquidityRequest",
+      value: QueryTotalLiquidityRequest.encode(message).finish()
+    };
   }
 
 };
@@ -3477,6 +4318,9 @@ function createBaseQueryTotalLiquidityResponse(): QueryTotalLiquidityResponse {
 }
 
 export const QueryTotalLiquidityResponse = {
+  typeUrl: "/osmosis.gamm.v1beta1.QueryTotalLiquidityResponse",
+  aminoType: "osmosis/gamm/query-total-liquidity-response",
+
   encode(message: QueryTotalLiquidityResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.liquidity) {
       Coin.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -3565,6 +4409,32 @@ export const QueryTotalLiquidityResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: QueryTotalLiquidityResponseAminoMsg): QueryTotalLiquidityResponse {
+    return QueryTotalLiquidityResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryTotalLiquidityResponse): QueryTotalLiquidityResponseAminoMsg {
+    return {
+      type: "osmosis/gamm/query-total-liquidity-response",
+      value: QueryTotalLiquidityResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryTotalLiquidityResponseProtoMsg): QueryTotalLiquidityResponse {
+    return QueryTotalLiquidityResponse.decode(message.value);
+  },
+
+  toProto(message: QueryTotalLiquidityResponse): Uint8Array {
+    return QueryTotalLiquidityResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryTotalLiquidityResponse): QueryTotalLiquidityResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v1beta1.QueryTotalLiquidityResponse",
+      value: QueryTotalLiquidityResponse.encode(message).finish()
+    };
   }
 
 };
diff --git a/__fixtures__/outputv2/osmosis/gamm/v1beta1/tx.ts b/__fixtures__/outputv2/osmosis/gamm/v1beta1/tx.ts
index 3ad7342a9..ac05065f1 100644
--- a/__fixtures__/outputv2/osmosis/gamm/v1beta1/tx.ts
+++ b/__fixtures__/outputv2/osmosis/gamm/v1beta1/tx.ts
@@ -13,7 +13,7 @@ export interface MsgJoinPool {
   shareOutAmount: string;
   tokenInMaxs: Coin[];
 }
-export interface MsgJoinPoolProtoType {
+export interface MsgJoinPoolProtoMsg {
   typeUrl: "/osmosis.gamm.v1beta1.MsgJoinPool";
   value: Uint8Array;
 }
@@ -28,7 +28,7 @@ export interface MsgJoinPoolAmino {
   share_out_amount: string;
   token_in_maxs: CoinAmino[];
 }
-export interface MsgJoinPoolAminoType {
+export interface MsgJoinPoolAminoMsg {
   type: "osmosis/gamm/join-pool";
   value: MsgJoinPoolAmino;
 }
@@ -47,7 +47,7 @@ export interface MsgJoinPoolResponse {
   shareOutAmount: string;
   tokenIn: Coin[];
 }
-export interface MsgJoinPoolResponseProtoType {
+export interface MsgJoinPoolResponseProtoMsg {
   typeUrl: "/osmosis.gamm.v1beta1.MsgJoinPoolResponse";
   value: Uint8Array;
 }
@@ -55,7 +55,7 @@ export interface MsgJoinPoolResponseAmino {
   share_out_amount: string;
   token_in: CoinAmino[];
 }
-export interface MsgJoinPoolResponseAminoType {
+export interface MsgJoinPoolResponseAminoMsg {
   type: "osmosis/gamm/join-pool-response";
   value: MsgJoinPoolResponseAmino;
 }
@@ -71,7 +71,7 @@ export interface MsgExitPool {
   shareInAmount: string;
   tokenOutMins: Coin[];
 }
-export interface MsgExitPoolProtoType {
+export interface MsgExitPoolProtoMsg {
   typeUrl: "/osmosis.gamm.v1beta1.MsgExitPool";
   value: Uint8Array;
 }
@@ -83,7 +83,7 @@ export interface MsgExitPoolAmino {
   share_in_amount: string;
   token_out_mins: CoinAmino[];
 }
-export interface MsgExitPoolAminoType {
+export interface MsgExitPoolAminoMsg {
   type: "osmosis/gamm/exit-pool";
   value: MsgExitPoolAmino;
 }
@@ -98,14 +98,14 @@ export interface MsgExitPoolSDKType {
 export interface MsgExitPoolResponse {
   tokenOut: Coin[];
 }
-export interface MsgExitPoolResponseProtoType {
+export interface MsgExitPoolResponseProtoMsg {
   typeUrl: "/osmosis.gamm.v1beta1.MsgExitPoolResponse";
   value: Uint8Array;
 }
 export interface MsgExitPoolResponseAmino {
   token_out: CoinAmino[];
 }
-export interface MsgExitPoolResponseAminoType {
+export interface MsgExitPoolResponseAminoMsg {
   type: "osmosis/gamm/exit-pool-response";
   value: MsgExitPoolResponseAmino;
 }
@@ -118,7 +118,7 @@ export interface SwapAmountInRoute {
   poolId: Long;
   tokenOutDenom: string;
 }
-export interface SwapAmountInRouteProtoType {
+export interface SwapAmountInRouteProtoMsg {
   typeUrl: "/osmosis.gamm.v1beta1.SwapAmountInRoute";
   value: Uint8Array;
 }
@@ -128,7 +128,7 @@ export interface SwapAmountInRouteAmino {
   pool_id: string;
   token_out_denom: string;
 }
-export interface SwapAmountInRouteAminoType {
+export interface SwapAmountInRouteAminoMsg {
   type: "osmosis/gamm/swap-amount-in-route";
   value: SwapAmountInRouteAmino;
 }
@@ -144,7 +144,7 @@ export interface MsgSwapExactAmountIn {
   tokenIn?: Coin;
   tokenOutMinAmount: string;
 }
-export interface MsgSwapExactAmountInProtoType {
+export interface MsgSwapExactAmountInProtoMsg {
   typeUrl: "/osmosis.gamm.v1beta1.MsgSwapExactAmountIn";
   value: Uint8Array;
 }
@@ -154,7 +154,7 @@ export interface MsgSwapExactAmountInAmino {
   token_in?: CoinAmino;
   token_out_min_amount: string;
 }
-export interface MsgSwapExactAmountInAminoType {
+export interface MsgSwapExactAmountInAminoMsg {
   type: "osmosis/gamm/swap-exact-amount-in";
   value: MsgSwapExactAmountInAmino;
 }
@@ -167,14 +167,14 @@ export interface MsgSwapExactAmountInSDKType {
 export interface MsgSwapExactAmountInResponse {
   tokenOutAmount: string;
 }
-export interface MsgSwapExactAmountInResponseProtoType {
+export interface MsgSwapExactAmountInResponseProtoMsg {
   typeUrl: "/osmosis.gamm.v1beta1.MsgSwapExactAmountInResponse";
   value: Uint8Array;
 }
 export interface MsgSwapExactAmountInResponseAmino {
   token_out_amount: string;
 }
-export interface MsgSwapExactAmountInResponseAminoType {
+export interface MsgSwapExactAmountInResponseAminoMsg {
   type: "osmosis/gamm/swap-exact-amount-in-response";
   value: MsgSwapExactAmountInResponseAmino;
 }
@@ -187,7 +187,7 @@ export interface SwapAmountOutRoute {
   poolId: Long;
   tokenInDenom: string;
 }
-export interface SwapAmountOutRouteProtoType {
+export interface SwapAmountOutRouteProtoMsg {
   typeUrl: "/osmosis.gamm.v1beta1.SwapAmountOutRoute";
   value: Uint8Array;
 }
@@ -197,7 +197,7 @@ export interface SwapAmountOutRouteAmino {
   pool_id: string;
   token_in_denom: string;
 }
-export interface SwapAmountOutRouteAminoType {
+export interface SwapAmountOutRouteAminoMsg {
   type: "osmosis/gamm/swap-amount-out-route";
   value: SwapAmountOutRouteAmino;
 }
@@ -213,7 +213,7 @@ export interface MsgSwapExactAmountOut {
   tokenInMaxAmount: string;
   tokenOut?: Coin;
 }
-export interface MsgSwapExactAmountOutProtoType {
+export interface MsgSwapExactAmountOutProtoMsg {
   typeUrl: "/osmosis.gamm.v1beta1.MsgSwapExactAmountOut";
   value: Uint8Array;
 }
@@ -223,7 +223,7 @@ export interface MsgSwapExactAmountOutAmino {
   token_in_max_amount: string;
   token_out?: CoinAmino;
 }
-export interface MsgSwapExactAmountOutAminoType {
+export interface MsgSwapExactAmountOutAminoMsg {
   type: "osmosis/gamm/swap-exact-amount-out";
   value: MsgSwapExactAmountOutAmino;
 }
@@ -236,14 +236,14 @@ export interface MsgSwapExactAmountOutSDKType {
 export interface MsgSwapExactAmountOutResponse {
   tokenInAmount: string;
 }
-export interface MsgSwapExactAmountOutResponseProtoType {
+export interface MsgSwapExactAmountOutResponseProtoMsg {
   typeUrl: "/osmosis.gamm.v1beta1.MsgSwapExactAmountOutResponse";
   value: Uint8Array;
 }
 export interface MsgSwapExactAmountOutResponseAmino {
   token_in_amount: string;
 }
-export interface MsgSwapExactAmountOutResponseAminoType {
+export interface MsgSwapExactAmountOutResponseAminoMsg {
   type: "osmosis/gamm/swap-exact-amount-out-response";
   value: MsgSwapExactAmountOutResponseAmino;
 }
@@ -261,7 +261,7 @@ export interface MsgJoinSwapExternAmountIn {
   tokenIn?: Coin;
   shareOutMinAmount: string;
 }
-export interface MsgJoinSwapExternAmountInProtoType {
+export interface MsgJoinSwapExternAmountInProtoMsg {
   typeUrl: "/osmosis.gamm.v1beta1.MsgJoinSwapExternAmountIn";
   value: Uint8Array;
 }
@@ -276,7 +276,7 @@ export interface MsgJoinSwapExternAmountInAmino {
   token_in?: CoinAmino;
   share_out_min_amount: string;
 }
-export interface MsgJoinSwapExternAmountInAminoType {
+export interface MsgJoinSwapExternAmountInAminoMsg {
   type: "osmosis/gamm/join-swap-extern-amount-in";
   value: MsgJoinSwapExternAmountInAmino;
 }
@@ -294,14 +294,14 @@ export interface MsgJoinSwapExternAmountInSDKType {
 export interface MsgJoinSwapExternAmountInResponse {
   shareOutAmount: string;
 }
-export interface MsgJoinSwapExternAmountInResponseProtoType {
+export interface MsgJoinSwapExternAmountInResponseProtoMsg {
   typeUrl: "/osmosis.gamm.v1beta1.MsgJoinSwapExternAmountInResponse";
   value: Uint8Array;
 }
 export interface MsgJoinSwapExternAmountInResponseAmino {
   share_out_amount: string;
 }
-export interface MsgJoinSwapExternAmountInResponseAminoType {
+export interface MsgJoinSwapExternAmountInResponseAminoMsg {
   type: "osmosis/gamm/join-swap-extern-amount-in-response";
   value: MsgJoinSwapExternAmountInResponseAmino;
 }
@@ -317,7 +317,7 @@ export interface MsgJoinSwapShareAmountOut {
   shareOutAmount: string;
   tokenInMaxAmount: string;
 }
-export interface MsgJoinSwapShareAmountOutProtoType {
+export interface MsgJoinSwapShareAmountOutProtoMsg {
   typeUrl: "/osmosis.gamm.v1beta1.MsgJoinSwapShareAmountOut";
   value: Uint8Array;
 }
@@ -330,7 +330,7 @@ export interface MsgJoinSwapShareAmountOutAmino {
   share_out_amount: string;
   token_in_max_amount: string;
 }
-export interface MsgJoinSwapShareAmountOutAminoType {
+export interface MsgJoinSwapShareAmountOutAminoMsg {
   type: "osmosis/gamm/join-swap-share-amount-out";
   value: MsgJoinSwapShareAmountOutAmino;
 }
@@ -346,14 +346,14 @@ export interface MsgJoinSwapShareAmountOutSDKType {
 export interface MsgJoinSwapShareAmountOutResponse {
   tokenInAmount: string;
 }
-export interface MsgJoinSwapShareAmountOutResponseProtoType {
+export interface MsgJoinSwapShareAmountOutResponseProtoMsg {
   typeUrl: "/osmosis.gamm.v1beta1.MsgJoinSwapShareAmountOutResponse";
   value: Uint8Array;
 }
 export interface MsgJoinSwapShareAmountOutResponseAmino {
   token_in_amount: string;
 }
-export interface MsgJoinSwapShareAmountOutResponseAminoType {
+export interface MsgJoinSwapShareAmountOutResponseAminoMsg {
   type: "osmosis/gamm/join-swap-share-amount-out-response";
   value: MsgJoinSwapShareAmountOutResponseAmino;
 }
@@ -369,7 +369,7 @@ export interface MsgExitSwapShareAmountIn {
   shareInAmount: string;
   tokenOutMinAmount: string;
 }
-export interface MsgExitSwapShareAmountInProtoType {
+export interface MsgExitSwapShareAmountInProtoMsg {
   typeUrl: "/osmosis.gamm.v1beta1.MsgExitSwapShareAmountIn";
   value: Uint8Array;
 }
@@ -382,7 +382,7 @@ export interface MsgExitSwapShareAmountInAmino {
   share_in_amount: string;
   token_out_min_amount: string;
 }
-export interface MsgExitSwapShareAmountInAminoType {
+export interface MsgExitSwapShareAmountInAminoMsg {
   type: "osmosis/gamm/exit-swap-share-amount-in";
   value: MsgExitSwapShareAmountInAmino;
 }
@@ -398,14 +398,14 @@ export interface MsgExitSwapShareAmountInSDKType {
 export interface MsgExitSwapShareAmountInResponse {
   tokenOutAmount: string;
 }
-export interface MsgExitSwapShareAmountInResponseProtoType {
+export interface MsgExitSwapShareAmountInResponseProtoMsg {
   typeUrl: "/osmosis.gamm.v1beta1.MsgExitSwapShareAmountInResponse";
   value: Uint8Array;
 }
 export interface MsgExitSwapShareAmountInResponseAmino {
   token_out_amount: string;
 }
-export interface MsgExitSwapShareAmountInResponseAminoType {
+export interface MsgExitSwapShareAmountInResponseAminoMsg {
   type: "osmosis/gamm/exit-swap-share-amount-in-response";
   value: MsgExitSwapShareAmountInResponseAmino;
 }
@@ -420,7 +420,7 @@ export interface MsgExitSwapExternAmountOut {
   tokenOut?: Coin;
   shareInMaxAmount: string;
 }
-export interface MsgExitSwapExternAmountOutProtoType {
+export interface MsgExitSwapExternAmountOutProtoMsg {
   typeUrl: "/osmosis.gamm.v1beta1.MsgExitSwapExternAmountOut";
   value: Uint8Array;
 }
@@ -432,7 +432,7 @@ export interface MsgExitSwapExternAmountOutAmino {
   token_out?: CoinAmino;
   share_in_max_amount: string;
 }
-export interface MsgExitSwapExternAmountOutAminoType {
+export interface MsgExitSwapExternAmountOutAminoMsg {
   type: "osmosis/gamm/exit-swap-extern-amount-out";
   value: MsgExitSwapExternAmountOutAmino;
 }
@@ -447,14 +447,14 @@ export interface MsgExitSwapExternAmountOutSDKType {
 export interface MsgExitSwapExternAmountOutResponse {
   shareInAmount: string;
 }
-export interface MsgExitSwapExternAmountOutResponseProtoType {
+export interface MsgExitSwapExternAmountOutResponseProtoMsg {
   typeUrl: "/osmosis.gamm.v1beta1.MsgExitSwapExternAmountOutResponse";
   value: Uint8Array;
 }
 export interface MsgExitSwapExternAmountOutResponseAmino {
   share_in_amount: string;
 }
-export interface MsgExitSwapExternAmountOutResponseAminoType {
+export interface MsgExitSwapExternAmountOutResponseAminoMsg {
   type: "osmosis/gamm/exit-swap-extern-amount-out-response";
   value: MsgExitSwapExternAmountOutResponseAmino;
 }
@@ -472,6 +472,9 @@ function createBaseMsgJoinPool(): MsgJoinPool {
 }
 
 export const MsgJoinPool = {
+  typeUrl: "/osmosis.gamm.v1beta1.MsgJoinPool",
+  aminoType: "osmosis/gamm/join-pool",
+
   encode(message: MsgJoinPool, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.sender !== "") {
       writer.uint32(10).string(message.sender);
@@ -605,6 +608,32 @@ export const MsgJoinPool = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: MsgJoinPoolAminoMsg): MsgJoinPool {
+    return MsgJoinPool.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgJoinPool): MsgJoinPoolAminoMsg {
+    return {
+      type: "osmosis/gamm/join-pool",
+      value: MsgJoinPool.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgJoinPoolProtoMsg): MsgJoinPool {
+    return MsgJoinPool.decode(message.value);
+  },
+
+  toProto(message: MsgJoinPool): Uint8Array {
+    return MsgJoinPool.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgJoinPool): MsgJoinPoolProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v1beta1.MsgJoinPool",
+      value: MsgJoinPool.encode(message).finish()
+    };
   }
 
 };
@@ -617,6 +646,9 @@ function createBaseMsgJoinPoolResponse(): MsgJoinPoolResponse {
 }
 
 export const MsgJoinPoolResponse = {
+  typeUrl: "/osmosis.gamm.v1beta1.MsgJoinPoolResponse",
+  aminoType: "osmosis/gamm/join-pool-response",
+
   encode(message: MsgJoinPoolResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.shareOutAmount !== "") {
       writer.uint32(10).string(message.shareOutAmount);
@@ -720,6 +752,32 @@ export const MsgJoinPoolResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: MsgJoinPoolResponseAminoMsg): MsgJoinPoolResponse {
+    return MsgJoinPoolResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgJoinPoolResponse): MsgJoinPoolResponseAminoMsg {
+    return {
+      type: "osmosis/gamm/join-pool-response",
+      value: MsgJoinPoolResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgJoinPoolResponseProtoMsg): MsgJoinPoolResponse {
+    return MsgJoinPoolResponse.decode(message.value);
+  },
+
+  toProto(message: MsgJoinPoolResponse): Uint8Array {
+    return MsgJoinPoolResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgJoinPoolResponse): MsgJoinPoolResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v1beta1.MsgJoinPoolResponse",
+      value: MsgJoinPoolResponse.encode(message).finish()
+    };
   }
 
 };
@@ -734,6 +792,9 @@ function createBaseMsgExitPool(): MsgExitPool {
 }
 
 export const MsgExitPool = {
+  typeUrl: "/osmosis.gamm.v1beta1.MsgExitPool",
+  aminoType: "osmosis/gamm/exit-pool",
+
   encode(message: MsgExitPool, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.sender !== "") {
       writer.uint32(10).string(message.sender);
@@ -867,6 +928,32 @@ export const MsgExitPool = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: MsgExitPoolAminoMsg): MsgExitPool {
+    return MsgExitPool.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgExitPool): MsgExitPoolAminoMsg {
+    return {
+      type: "osmosis/gamm/exit-pool",
+      value: MsgExitPool.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgExitPoolProtoMsg): MsgExitPool {
+    return MsgExitPool.decode(message.value);
+  },
+
+  toProto(message: MsgExitPool): Uint8Array {
+    return MsgExitPool.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgExitPool): MsgExitPoolProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v1beta1.MsgExitPool",
+      value: MsgExitPool.encode(message).finish()
+    };
   }
 
 };
@@ -878,6 +965,9 @@ function createBaseMsgExitPoolResponse(): MsgExitPoolResponse {
 }
 
 export const MsgExitPoolResponse = {
+  typeUrl: "/osmosis.gamm.v1beta1.MsgExitPoolResponse",
+  aminoType: "osmosis/gamm/exit-pool-response",
+
   encode(message: MsgExitPoolResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.tokenOut) {
       Coin.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -966,6 +1056,32 @@ export const MsgExitPoolResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: MsgExitPoolResponseAminoMsg): MsgExitPoolResponse {
+    return MsgExitPoolResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgExitPoolResponse): MsgExitPoolResponseAminoMsg {
+    return {
+      type: "osmosis/gamm/exit-pool-response",
+      value: MsgExitPoolResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgExitPoolResponseProtoMsg): MsgExitPoolResponse {
+    return MsgExitPoolResponse.decode(message.value);
+  },
+
+  toProto(message: MsgExitPoolResponse): Uint8Array {
+    return MsgExitPoolResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgExitPoolResponse): MsgExitPoolResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v1beta1.MsgExitPoolResponse",
+      value: MsgExitPoolResponse.encode(message).finish()
+    };
   }
 
 };
@@ -978,6 +1094,9 @@ function createBaseSwapAmountInRoute(): SwapAmountInRoute {
 }
 
 export const SwapAmountInRoute = {
+  typeUrl: "/osmosis.gamm.v1beta1.SwapAmountInRoute",
+  aminoType: "osmosis/gamm/swap-amount-in-route",
+
   encode(message: SwapAmountInRoute, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.poolId.isZero()) {
       writer.uint32(8).uint64(message.poolId);
@@ -1063,6 +1182,32 @@ export const SwapAmountInRoute = {
     obj.pool_id = message.poolId ? message.poolId.toString() : undefined;
     obj.token_out_denom = message.tokenOutDenom;
     return obj;
+  },
+
+  fromAminoMsg(object: SwapAmountInRouteAminoMsg): SwapAmountInRoute {
+    return SwapAmountInRoute.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: SwapAmountInRoute): SwapAmountInRouteAminoMsg {
+    return {
+      type: "osmosis/gamm/swap-amount-in-route",
+      value: SwapAmountInRoute.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: SwapAmountInRouteProtoMsg): SwapAmountInRoute {
+    return SwapAmountInRoute.decode(message.value);
+  },
+
+  toProto(message: SwapAmountInRoute): Uint8Array {
+    return SwapAmountInRoute.encode(message).finish();
+  },
+
+  toProtoMsg(message: SwapAmountInRoute): SwapAmountInRouteProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v1beta1.SwapAmountInRoute",
+      value: SwapAmountInRoute.encode(message).finish()
+    };
   }
 
 };
@@ -1077,6 +1222,9 @@ function createBaseMsgSwapExactAmountIn(): MsgSwapExactAmountIn {
 }
 
 export const MsgSwapExactAmountIn = {
+  typeUrl: "/osmosis.gamm.v1beta1.MsgSwapExactAmountIn",
+  aminoType: "osmosis/gamm/swap-exact-amount-in",
+
   encode(message: MsgSwapExactAmountIn, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.sender !== "") {
       writer.uint32(10).string(message.sender);
@@ -1210,6 +1358,32 @@ export const MsgSwapExactAmountIn = {
     obj.token_in = message.tokenIn ? Coin.toAmino(message.tokenIn) : undefined;
     obj.token_out_min_amount = message.tokenOutMinAmount;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgSwapExactAmountInAminoMsg): MsgSwapExactAmountIn {
+    return MsgSwapExactAmountIn.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgSwapExactAmountIn): MsgSwapExactAmountInAminoMsg {
+    return {
+      type: "osmosis/gamm/swap-exact-amount-in",
+      value: MsgSwapExactAmountIn.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgSwapExactAmountInProtoMsg): MsgSwapExactAmountIn {
+    return MsgSwapExactAmountIn.decode(message.value);
+  },
+
+  toProto(message: MsgSwapExactAmountIn): Uint8Array {
+    return MsgSwapExactAmountIn.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgSwapExactAmountIn): MsgSwapExactAmountInProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v1beta1.MsgSwapExactAmountIn",
+      value: MsgSwapExactAmountIn.encode(message).finish()
+    };
   }
 
 };
@@ -1221,6 +1395,9 @@ function createBaseMsgSwapExactAmountInResponse(): MsgSwapExactAmountInResponse
 }
 
 export const MsgSwapExactAmountInResponse = {
+  typeUrl: "/osmosis.gamm.v1beta1.MsgSwapExactAmountInResponse",
+  aminoType: "osmosis/gamm/swap-exact-amount-in-response",
+
   encode(message: MsgSwapExactAmountInResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.tokenOutAmount !== "") {
       writer.uint32(10).string(message.tokenOutAmount);
@@ -1291,6 +1468,32 @@ export const MsgSwapExactAmountInResponse = {
     const obj: any = {};
     obj.token_out_amount = message.tokenOutAmount;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgSwapExactAmountInResponseAminoMsg): MsgSwapExactAmountInResponse {
+    return MsgSwapExactAmountInResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgSwapExactAmountInResponse): MsgSwapExactAmountInResponseAminoMsg {
+    return {
+      type: "osmosis/gamm/swap-exact-amount-in-response",
+      value: MsgSwapExactAmountInResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgSwapExactAmountInResponseProtoMsg): MsgSwapExactAmountInResponse {
+    return MsgSwapExactAmountInResponse.decode(message.value);
+  },
+
+  toProto(message: MsgSwapExactAmountInResponse): Uint8Array {
+    return MsgSwapExactAmountInResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgSwapExactAmountInResponse): MsgSwapExactAmountInResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v1beta1.MsgSwapExactAmountInResponse",
+      value: MsgSwapExactAmountInResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1303,6 +1506,9 @@ function createBaseSwapAmountOutRoute(): SwapAmountOutRoute {
 }
 
 export const SwapAmountOutRoute = {
+  typeUrl: "/osmosis.gamm.v1beta1.SwapAmountOutRoute",
+  aminoType: "osmosis/gamm/swap-amount-out-route",
+
   encode(message: SwapAmountOutRoute, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.poolId.isZero()) {
       writer.uint32(8).uint64(message.poolId);
@@ -1388,6 +1594,32 @@ export const SwapAmountOutRoute = {
     obj.pool_id = message.poolId ? message.poolId.toString() : undefined;
     obj.token_in_denom = message.tokenInDenom;
     return obj;
+  },
+
+  fromAminoMsg(object: SwapAmountOutRouteAminoMsg): SwapAmountOutRoute {
+    return SwapAmountOutRoute.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: SwapAmountOutRoute): SwapAmountOutRouteAminoMsg {
+    return {
+      type: "osmosis/gamm/swap-amount-out-route",
+      value: SwapAmountOutRoute.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: SwapAmountOutRouteProtoMsg): SwapAmountOutRoute {
+    return SwapAmountOutRoute.decode(message.value);
+  },
+
+  toProto(message: SwapAmountOutRoute): Uint8Array {
+    return SwapAmountOutRoute.encode(message).finish();
+  },
+
+  toProtoMsg(message: SwapAmountOutRoute): SwapAmountOutRouteProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v1beta1.SwapAmountOutRoute",
+      value: SwapAmountOutRoute.encode(message).finish()
+    };
   }
 
 };
@@ -1402,6 +1634,9 @@ function createBaseMsgSwapExactAmountOut(): MsgSwapExactAmountOut {
 }
 
 export const MsgSwapExactAmountOut = {
+  typeUrl: "/osmosis.gamm.v1beta1.MsgSwapExactAmountOut",
+  aminoType: "osmosis/gamm/swap-exact-amount-out",
+
   encode(message: MsgSwapExactAmountOut, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.sender !== "") {
       writer.uint32(10).string(message.sender);
@@ -1535,6 +1770,32 @@ export const MsgSwapExactAmountOut = {
     obj.token_in_max_amount = message.tokenInMaxAmount;
     obj.token_out = message.tokenOut ? Coin.toAmino(message.tokenOut) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgSwapExactAmountOutAminoMsg): MsgSwapExactAmountOut {
+    return MsgSwapExactAmountOut.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgSwapExactAmountOut): MsgSwapExactAmountOutAminoMsg {
+    return {
+      type: "osmosis/gamm/swap-exact-amount-out",
+      value: MsgSwapExactAmountOut.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgSwapExactAmountOutProtoMsg): MsgSwapExactAmountOut {
+    return MsgSwapExactAmountOut.decode(message.value);
+  },
+
+  toProto(message: MsgSwapExactAmountOut): Uint8Array {
+    return MsgSwapExactAmountOut.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgSwapExactAmountOut): MsgSwapExactAmountOutProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v1beta1.MsgSwapExactAmountOut",
+      value: MsgSwapExactAmountOut.encode(message).finish()
+    };
   }
 
 };
@@ -1546,6 +1807,9 @@ function createBaseMsgSwapExactAmountOutResponse(): MsgSwapExactAmountOutRespons
 }
 
 export const MsgSwapExactAmountOutResponse = {
+  typeUrl: "/osmosis.gamm.v1beta1.MsgSwapExactAmountOutResponse",
+  aminoType: "osmosis/gamm/swap-exact-amount-out-response",
+
   encode(message: MsgSwapExactAmountOutResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.tokenInAmount !== "") {
       writer.uint32(10).string(message.tokenInAmount);
@@ -1616,6 +1880,32 @@ export const MsgSwapExactAmountOutResponse = {
     const obj: any = {};
     obj.token_in_amount = message.tokenInAmount;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgSwapExactAmountOutResponseAminoMsg): MsgSwapExactAmountOutResponse {
+    return MsgSwapExactAmountOutResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgSwapExactAmountOutResponse): MsgSwapExactAmountOutResponseAminoMsg {
+    return {
+      type: "osmosis/gamm/swap-exact-amount-out-response",
+      value: MsgSwapExactAmountOutResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgSwapExactAmountOutResponseProtoMsg): MsgSwapExactAmountOutResponse {
+    return MsgSwapExactAmountOutResponse.decode(message.value);
+  },
+
+  toProto(message: MsgSwapExactAmountOutResponse): Uint8Array {
+    return MsgSwapExactAmountOutResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgSwapExactAmountOutResponse): MsgSwapExactAmountOutResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v1beta1.MsgSwapExactAmountOutResponse",
+      value: MsgSwapExactAmountOutResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1630,6 +1920,9 @@ function createBaseMsgJoinSwapExternAmountIn(): MsgJoinSwapExternAmountIn {
 }
 
 export const MsgJoinSwapExternAmountIn = {
+  typeUrl: "/osmosis.gamm.v1beta1.MsgJoinSwapExternAmountIn",
+  aminoType: "osmosis/gamm/join-swap-extern-amount-in",
+
   encode(message: MsgJoinSwapExternAmountIn, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.sender !== "") {
       writer.uint32(10).string(message.sender);
@@ -1745,6 +2038,32 @@ export const MsgJoinSwapExternAmountIn = {
     obj.token_in = message.tokenIn ? Coin.toAmino(message.tokenIn) : undefined;
     obj.share_out_min_amount = message.shareOutMinAmount;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgJoinSwapExternAmountInAminoMsg): MsgJoinSwapExternAmountIn {
+    return MsgJoinSwapExternAmountIn.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgJoinSwapExternAmountIn): MsgJoinSwapExternAmountInAminoMsg {
+    return {
+      type: "osmosis/gamm/join-swap-extern-amount-in",
+      value: MsgJoinSwapExternAmountIn.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgJoinSwapExternAmountInProtoMsg): MsgJoinSwapExternAmountIn {
+    return MsgJoinSwapExternAmountIn.decode(message.value);
+  },
+
+  toProto(message: MsgJoinSwapExternAmountIn): Uint8Array {
+    return MsgJoinSwapExternAmountIn.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgJoinSwapExternAmountIn): MsgJoinSwapExternAmountInProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v1beta1.MsgJoinSwapExternAmountIn",
+      value: MsgJoinSwapExternAmountIn.encode(message).finish()
+    };
   }
 
 };
@@ -1756,6 +2075,9 @@ function createBaseMsgJoinSwapExternAmountInResponse(): MsgJoinSwapExternAmountI
 }
 
 export const MsgJoinSwapExternAmountInResponse = {
+  typeUrl: "/osmosis.gamm.v1beta1.MsgJoinSwapExternAmountInResponse",
+  aminoType: "osmosis/gamm/join-swap-extern-amount-in-response",
+
   encode(message: MsgJoinSwapExternAmountInResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.shareOutAmount !== "") {
       writer.uint32(10).string(message.shareOutAmount);
@@ -1826,6 +2148,32 @@ export const MsgJoinSwapExternAmountInResponse = {
     const obj: any = {};
     obj.share_out_amount = message.shareOutAmount;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgJoinSwapExternAmountInResponseAminoMsg): MsgJoinSwapExternAmountInResponse {
+    return MsgJoinSwapExternAmountInResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgJoinSwapExternAmountInResponse): MsgJoinSwapExternAmountInResponseAminoMsg {
+    return {
+      type: "osmosis/gamm/join-swap-extern-amount-in-response",
+      value: MsgJoinSwapExternAmountInResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgJoinSwapExternAmountInResponseProtoMsg): MsgJoinSwapExternAmountInResponse {
+    return MsgJoinSwapExternAmountInResponse.decode(message.value);
+  },
+
+  toProto(message: MsgJoinSwapExternAmountInResponse): Uint8Array {
+    return MsgJoinSwapExternAmountInResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgJoinSwapExternAmountInResponse): MsgJoinSwapExternAmountInResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v1beta1.MsgJoinSwapExternAmountInResponse",
+      value: MsgJoinSwapExternAmountInResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1841,6 +2189,9 @@ function createBaseMsgJoinSwapShareAmountOut(): MsgJoinSwapShareAmountOut {
 }
 
 export const MsgJoinSwapShareAmountOut = {
+  typeUrl: "/osmosis.gamm.v1beta1.MsgJoinSwapShareAmountOut",
+  aminoType: "osmosis/gamm/join-swap-share-amount-out",
+
   encode(message: MsgJoinSwapShareAmountOut, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.sender !== "") {
       writer.uint32(10).string(message.sender);
@@ -1971,6 +2322,32 @@ export const MsgJoinSwapShareAmountOut = {
     obj.share_out_amount = message.shareOutAmount;
     obj.token_in_max_amount = message.tokenInMaxAmount;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgJoinSwapShareAmountOutAminoMsg): MsgJoinSwapShareAmountOut {
+    return MsgJoinSwapShareAmountOut.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgJoinSwapShareAmountOut): MsgJoinSwapShareAmountOutAminoMsg {
+    return {
+      type: "osmosis/gamm/join-swap-share-amount-out",
+      value: MsgJoinSwapShareAmountOut.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgJoinSwapShareAmountOutProtoMsg): MsgJoinSwapShareAmountOut {
+    return MsgJoinSwapShareAmountOut.decode(message.value);
+  },
+
+  toProto(message: MsgJoinSwapShareAmountOut): Uint8Array {
+    return MsgJoinSwapShareAmountOut.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgJoinSwapShareAmountOut): MsgJoinSwapShareAmountOutProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v1beta1.MsgJoinSwapShareAmountOut",
+      value: MsgJoinSwapShareAmountOut.encode(message).finish()
+    };
   }
 
 };
@@ -1982,6 +2359,9 @@ function createBaseMsgJoinSwapShareAmountOutResponse(): MsgJoinSwapShareAmountOu
 }
 
 export const MsgJoinSwapShareAmountOutResponse = {
+  typeUrl: "/osmosis.gamm.v1beta1.MsgJoinSwapShareAmountOutResponse",
+  aminoType: "osmosis/gamm/join-swap-share-amount-out-response",
+
   encode(message: MsgJoinSwapShareAmountOutResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.tokenInAmount !== "") {
       writer.uint32(10).string(message.tokenInAmount);
@@ -2052,6 +2432,32 @@ export const MsgJoinSwapShareAmountOutResponse = {
     const obj: any = {};
     obj.token_in_amount = message.tokenInAmount;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgJoinSwapShareAmountOutResponseAminoMsg): MsgJoinSwapShareAmountOutResponse {
+    return MsgJoinSwapShareAmountOutResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgJoinSwapShareAmountOutResponse): MsgJoinSwapShareAmountOutResponseAminoMsg {
+    return {
+      type: "osmosis/gamm/join-swap-share-amount-out-response",
+      value: MsgJoinSwapShareAmountOutResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgJoinSwapShareAmountOutResponseProtoMsg): MsgJoinSwapShareAmountOutResponse {
+    return MsgJoinSwapShareAmountOutResponse.decode(message.value);
+  },
+
+  toProto(message: MsgJoinSwapShareAmountOutResponse): Uint8Array {
+    return MsgJoinSwapShareAmountOutResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgJoinSwapShareAmountOutResponse): MsgJoinSwapShareAmountOutResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v1beta1.MsgJoinSwapShareAmountOutResponse",
+      value: MsgJoinSwapShareAmountOutResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2067,6 +2473,9 @@ function createBaseMsgExitSwapShareAmountIn(): MsgExitSwapShareAmountIn {
 }
 
 export const MsgExitSwapShareAmountIn = {
+  typeUrl: "/osmosis.gamm.v1beta1.MsgExitSwapShareAmountIn",
+  aminoType: "osmosis/gamm/exit-swap-share-amount-in",
+
   encode(message: MsgExitSwapShareAmountIn, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.sender !== "") {
       writer.uint32(10).string(message.sender);
@@ -2197,6 +2606,32 @@ export const MsgExitSwapShareAmountIn = {
     obj.share_in_amount = message.shareInAmount;
     obj.token_out_min_amount = message.tokenOutMinAmount;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgExitSwapShareAmountInAminoMsg): MsgExitSwapShareAmountIn {
+    return MsgExitSwapShareAmountIn.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgExitSwapShareAmountIn): MsgExitSwapShareAmountInAminoMsg {
+    return {
+      type: "osmosis/gamm/exit-swap-share-amount-in",
+      value: MsgExitSwapShareAmountIn.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgExitSwapShareAmountInProtoMsg): MsgExitSwapShareAmountIn {
+    return MsgExitSwapShareAmountIn.decode(message.value);
+  },
+
+  toProto(message: MsgExitSwapShareAmountIn): Uint8Array {
+    return MsgExitSwapShareAmountIn.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgExitSwapShareAmountIn): MsgExitSwapShareAmountInProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v1beta1.MsgExitSwapShareAmountIn",
+      value: MsgExitSwapShareAmountIn.encode(message).finish()
+    };
   }
 
 };
@@ -2208,6 +2643,9 @@ function createBaseMsgExitSwapShareAmountInResponse(): MsgExitSwapShareAmountInR
 }
 
 export const MsgExitSwapShareAmountInResponse = {
+  typeUrl: "/osmosis.gamm.v1beta1.MsgExitSwapShareAmountInResponse",
+  aminoType: "osmosis/gamm/exit-swap-share-amount-in-response",
+
   encode(message: MsgExitSwapShareAmountInResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.tokenOutAmount !== "") {
       writer.uint32(10).string(message.tokenOutAmount);
@@ -2278,6 +2716,32 @@ export const MsgExitSwapShareAmountInResponse = {
     const obj: any = {};
     obj.token_out_amount = message.tokenOutAmount;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgExitSwapShareAmountInResponseAminoMsg): MsgExitSwapShareAmountInResponse {
+    return MsgExitSwapShareAmountInResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgExitSwapShareAmountInResponse): MsgExitSwapShareAmountInResponseAminoMsg {
+    return {
+      type: "osmosis/gamm/exit-swap-share-amount-in-response",
+      value: MsgExitSwapShareAmountInResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgExitSwapShareAmountInResponseProtoMsg): MsgExitSwapShareAmountInResponse {
+    return MsgExitSwapShareAmountInResponse.decode(message.value);
+  },
+
+  toProto(message: MsgExitSwapShareAmountInResponse): Uint8Array {
+    return MsgExitSwapShareAmountInResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgExitSwapShareAmountInResponse): MsgExitSwapShareAmountInResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v1beta1.MsgExitSwapShareAmountInResponse",
+      value: MsgExitSwapShareAmountInResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2292,6 +2756,9 @@ function createBaseMsgExitSwapExternAmountOut(): MsgExitSwapExternAmountOut {
 }
 
 export const MsgExitSwapExternAmountOut = {
+  typeUrl: "/osmosis.gamm.v1beta1.MsgExitSwapExternAmountOut",
+  aminoType: "osmosis/gamm/exit-swap-extern-amount-out",
+
   encode(message: MsgExitSwapExternAmountOut, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.sender !== "") {
       writer.uint32(10).string(message.sender);
@@ -2407,6 +2874,32 @@ export const MsgExitSwapExternAmountOut = {
     obj.token_out = message.tokenOut ? Coin.toAmino(message.tokenOut) : undefined;
     obj.share_in_max_amount = message.shareInMaxAmount;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgExitSwapExternAmountOutAminoMsg): MsgExitSwapExternAmountOut {
+    return MsgExitSwapExternAmountOut.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgExitSwapExternAmountOut): MsgExitSwapExternAmountOutAminoMsg {
+    return {
+      type: "osmosis/gamm/exit-swap-extern-amount-out",
+      value: MsgExitSwapExternAmountOut.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgExitSwapExternAmountOutProtoMsg): MsgExitSwapExternAmountOut {
+    return MsgExitSwapExternAmountOut.decode(message.value);
+  },
+
+  toProto(message: MsgExitSwapExternAmountOut): Uint8Array {
+    return MsgExitSwapExternAmountOut.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgExitSwapExternAmountOut): MsgExitSwapExternAmountOutProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v1beta1.MsgExitSwapExternAmountOut",
+      value: MsgExitSwapExternAmountOut.encode(message).finish()
+    };
   }
 
 };
@@ -2418,6 +2911,9 @@ function createBaseMsgExitSwapExternAmountOutResponse(): MsgExitSwapExternAmount
 }
 
 export const MsgExitSwapExternAmountOutResponse = {
+  typeUrl: "/osmosis.gamm.v1beta1.MsgExitSwapExternAmountOutResponse",
+  aminoType: "osmosis/gamm/exit-swap-extern-amount-out-response",
+
   encode(message: MsgExitSwapExternAmountOutResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.shareInAmount !== "") {
       writer.uint32(10).string(message.shareInAmount);
@@ -2488,6 +2984,32 @@ export const MsgExitSwapExternAmountOutResponse = {
     const obj: any = {};
     obj.share_in_amount = message.shareInAmount;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgExitSwapExternAmountOutResponseAminoMsg): MsgExitSwapExternAmountOutResponse {
+    return MsgExitSwapExternAmountOutResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgExitSwapExternAmountOutResponse): MsgExitSwapExternAmountOutResponseAminoMsg {
+    return {
+      type: "osmosis/gamm/exit-swap-extern-amount-out-response",
+      value: MsgExitSwapExternAmountOutResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgExitSwapExternAmountOutResponseProtoMsg): MsgExitSwapExternAmountOutResponse {
+    return MsgExitSwapExternAmountOutResponse.decode(message.value);
+  },
+
+  toProto(message: MsgExitSwapExternAmountOutResponse): Uint8Array {
+    return MsgExitSwapExternAmountOutResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgExitSwapExternAmountOutResponse): MsgExitSwapExternAmountOutResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v1beta1.MsgExitSwapExternAmountOutResponse",
+      value: MsgExitSwapExternAmountOutResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/osmosis/gamm/v2/query.ts b/__fixtures__/outputv2/osmosis/gamm/v2/query.ts
index 3cbaddc8a..c9d27f137 100644
--- a/__fixtures__/outputv2/osmosis/gamm/v2/query.ts
+++ b/__fixtures__/outputv2/osmosis/gamm/v2/query.ts
@@ -11,7 +11,7 @@ export interface QuerySpotPriceRequest {
   baseAssetDenom: string;
   quoteAssetDenom: string;
 }
-export interface QuerySpotPriceRequestProtoType {
+export interface QuerySpotPriceRequestProtoMsg {
   typeUrl: "/osmosis.gamm.v2.QuerySpotPriceRequest";
   value: Uint8Array;
 }
@@ -25,7 +25,7 @@ export interface QuerySpotPriceRequestAmino {
   base_asset_denom: string;
   quote_asset_denom: string;
 }
-export interface QuerySpotPriceRequestAminoType {
+export interface QuerySpotPriceRequestAminoMsg {
   type: "osmosis/gamm/v2/query-spot-price-request";
   value: QuerySpotPriceRequestAmino;
 }
@@ -48,7 +48,7 @@ export interface QuerySpotPriceResponse {
   /** String of the Dec. Ex) 10.203uatom */
   spotPrice: string;
 }
-export interface QuerySpotPriceResponseProtoType {
+export interface QuerySpotPriceResponseProtoMsg {
   typeUrl: "/osmosis.gamm.v2.QuerySpotPriceResponse";
   value: Uint8Array;
 }
@@ -61,7 +61,7 @@ export interface QuerySpotPriceResponseAmino {
   /** String of the Dec. Ex) 10.203uatom */
   spot_price: string;
 }
-export interface QuerySpotPriceResponseAminoType {
+export interface QuerySpotPriceResponseAminoMsg {
   type: "osmosis/gamm/v2/query-spot-price-response";
   value: QuerySpotPriceResponseAmino;
 }
@@ -83,6 +83,9 @@ function createBaseQuerySpotPriceRequest(): QuerySpotPriceRequest {
 }
 
 export const QuerySpotPriceRequest = {
+  typeUrl: "/osmosis.gamm.v2.QuerySpotPriceRequest",
+  aminoType: "osmosis/gamm/v2/query-spot-price-request",
+
   encode(message: QuerySpotPriceRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.poolId.isZero()) {
       writer.uint32(8).uint64(message.poolId);
@@ -183,6 +186,32 @@ export const QuerySpotPriceRequest = {
     obj.base_asset_denom = message.baseAssetDenom;
     obj.quote_asset_denom = message.quoteAssetDenom;
     return obj;
+  },
+
+  fromAminoMsg(object: QuerySpotPriceRequestAminoMsg): QuerySpotPriceRequest {
+    return QuerySpotPriceRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QuerySpotPriceRequest): QuerySpotPriceRequestAminoMsg {
+    return {
+      type: "osmosis/gamm/v2/query-spot-price-request",
+      value: QuerySpotPriceRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QuerySpotPriceRequestProtoMsg): QuerySpotPriceRequest {
+    return QuerySpotPriceRequest.decode(message.value);
+  },
+
+  toProto(message: QuerySpotPriceRequest): Uint8Array {
+    return QuerySpotPriceRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QuerySpotPriceRequest): QuerySpotPriceRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v2.QuerySpotPriceRequest",
+      value: QuerySpotPriceRequest.encode(message).finish()
+    };
   }
 
 };
@@ -194,6 +223,9 @@ function createBaseQuerySpotPriceResponse(): QuerySpotPriceResponse {
 }
 
 export const QuerySpotPriceResponse = {
+  typeUrl: "/osmosis.gamm.v2.QuerySpotPriceResponse",
+  aminoType: "osmosis/gamm/v2/query-spot-price-response",
+
   encode(message: QuerySpotPriceResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.spotPrice !== "") {
       writer.uint32(10).string(message.spotPrice);
@@ -264,6 +296,32 @@ export const QuerySpotPriceResponse = {
     const obj: any = {};
     obj.spot_price = message.spotPrice;
     return obj;
+  },
+
+  fromAminoMsg(object: QuerySpotPriceResponseAminoMsg): QuerySpotPriceResponse {
+    return QuerySpotPriceResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QuerySpotPriceResponse): QuerySpotPriceResponseAminoMsg {
+    return {
+      type: "osmosis/gamm/v2/query-spot-price-response",
+      value: QuerySpotPriceResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QuerySpotPriceResponseProtoMsg): QuerySpotPriceResponse {
+    return QuerySpotPriceResponse.decode(message.value);
+  },
+
+  toProto(message: QuerySpotPriceResponse): Uint8Array {
+    return QuerySpotPriceResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QuerySpotPriceResponse): QuerySpotPriceResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v2.QuerySpotPriceResponse",
+      value: QuerySpotPriceResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/osmosis/ibc-rate-limit/v1beta1/params.ts b/__fixtures__/outputv2/osmosis/ibc-rate-limit/v1beta1/params.ts
index 58a0410dd..dd9f0518b 100644
--- a/__fixtures__/outputv2/osmosis/ibc-rate-limit/v1beta1/params.ts
+++ b/__fixtures__/outputv2/osmosis/ibc-rate-limit/v1beta1/params.ts
@@ -6,7 +6,7 @@ export const protobufPackage = "osmosis.ibcratelimit.v1beta1";
 export interface Params {
   contractAddress: string;
 }
-export interface ParamsProtoType {
+export interface ParamsProtoMsg {
   typeUrl: "/osmosis.ibcratelimit.v1beta1.Params";
   value: Uint8Array;
 }
@@ -15,7 +15,7 @@ export interface ParamsProtoType {
 export interface ParamsAmino {
   contract_address: string;
 }
-export interface ParamsAminoType {
+export interface ParamsAminoMsg {
   type: "osmosis/ibcratelimit/params";
   value: ParamsAmino;
 }
@@ -32,6 +32,9 @@ function createBaseParams(): Params {
 }
 
 export const Params = {
+  typeUrl: "/osmosis.ibcratelimit.v1beta1.Params",
+  aminoType: "osmosis/ibcratelimit/params",
+
   encode(message: Params, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.contractAddress !== "") {
       writer.uint32(10).string(message.contractAddress);
@@ -102,6 +105,32 @@ export const Params = {
     const obj: any = {};
     obj.contract_address = message.contractAddress;
     return obj;
+  },
+
+  fromAminoMsg(object: ParamsAminoMsg): Params {
+    return Params.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Params): ParamsAminoMsg {
+    return {
+      type: "osmosis/ibcratelimit/params",
+      value: Params.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ParamsProtoMsg): Params {
+    return Params.decode(message.value);
+  },
+
+  toProto(message: Params): Uint8Array {
+    return Params.encode(message).finish();
+  },
+
+  toProtoMsg(message: Params): ParamsProtoMsg {
+    return {
+      typeUrl: "/osmosis.ibcratelimit.v1beta1.Params",
+      value: Params.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/osmosis/ibc-rate-limit/v1beta1/query.ts b/__fixtures__/outputv2/osmosis/ibc-rate-limit/v1beta1/query.ts
index 47bc22f46..f9b363f94 100644
--- a/__fixtures__/outputv2/osmosis/ibc-rate-limit/v1beta1/query.ts
+++ b/__fixtures__/outputv2/osmosis/ibc-rate-limit/v1beta1/query.ts
@@ -5,14 +5,14 @@ export const protobufPackage = "osmosis.ibcratelimit.v1beta1";
 
 /** QueryParamsRequest is the request type for the Query/Params RPC method. */
 export interface QueryParamsRequest {}
-export interface QueryParamsRequestProtoType {
+export interface QueryParamsRequestProtoMsg {
   typeUrl: "/osmosis.ibcratelimit.v1beta1.QueryParamsRequest";
   value: Uint8Array;
 }
 
 /** QueryParamsRequest is the request type for the Query/Params RPC method. */
 export interface QueryParamsRequestAmino {}
-export interface QueryParamsRequestAminoType {
+export interface QueryParamsRequestAminoMsg {
   type: "osmosis/ibcratelimit/query-params-request";
   value: QueryParamsRequestAmino;
 }
@@ -25,7 +25,7 @@ export interface QueryParamsResponse {
   /** params defines the parameters of the module. */
   params?: Params;
 }
-export interface QueryParamsResponseProtoType {
+export interface QueryParamsResponseProtoMsg {
   typeUrl: "/osmosis.ibcratelimit.v1beta1.QueryParamsResponse";
   value: Uint8Array;
 }
@@ -35,7 +35,7 @@ export interface QueryParamsResponseAmino {
   /** params defines the parameters of the module. */
   params?: ParamsAmino;
 }
-export interface QueryParamsResponseAminoType {
+export interface QueryParamsResponseAminoMsg {
   type: "osmosis/ibcratelimit/query-params-response";
   value: QueryParamsResponseAmino;
 }
@@ -50,6 +50,9 @@ function createBaseQueryParamsRequest(): QueryParamsRequest {
 }
 
 export const QueryParamsRequest = {
+  typeUrl: "/osmosis.ibcratelimit.v1beta1.QueryParamsRequest",
+  aminoType: "osmosis/ibcratelimit/query-params-request",
+
   encode(_: QueryParamsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -102,6 +105,32 @@ export const QueryParamsRequest = {
   toAmino(_: QueryParamsRequest): QueryParamsRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest {
+    return QueryParamsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryParamsRequest): QueryParamsRequestAminoMsg {
+    return {
+      type: "osmosis/ibcratelimit/query-params-request",
+      value: QueryParamsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryParamsRequestProtoMsg): QueryParamsRequest {
+    return QueryParamsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryParamsRequest): Uint8Array {
+    return QueryParamsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryParamsRequest): QueryParamsRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.ibcratelimit.v1beta1.QueryParamsRequest",
+      value: QueryParamsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -113,6 +142,9 @@ function createBaseQueryParamsResponse(): QueryParamsResponse {
 }
 
 export const QueryParamsResponse = {
+  typeUrl: "/osmosis.ibcratelimit.v1beta1.QueryParamsResponse",
+  aminoType: "osmosis/ibcratelimit/query-params-response",
+
   encode(message: QueryParamsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.params !== undefined) {
       Params.encode(message.params, writer.uint32(10).fork()).ldelim();
@@ -183,6 +215,32 @@ export const QueryParamsResponse = {
     const obj: any = {};
     obj.params = message.params ? Params.toAmino(message.params) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryParamsResponseAminoMsg): QueryParamsResponse {
+    return QueryParamsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryParamsResponse): QueryParamsResponseAminoMsg {
+    return {
+      type: "osmosis/ibcratelimit/query-params-response",
+      value: QueryParamsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryParamsResponseProtoMsg): QueryParamsResponse {
+    return QueryParamsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryParamsResponse): Uint8Array {
+    return QueryParamsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryParamsResponse): QueryParamsResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.ibcratelimit.v1beta1.QueryParamsResponse",
+      value: QueryParamsResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/osmosis/incentives/gauge.ts b/__fixtures__/outputv2/osmosis/incentives/gauge.ts
index ac4ad0d8c..44bdcf6fd 100644
--- a/__fixtures__/outputv2/osmosis/incentives/gauge.ts
+++ b/__fixtures__/outputv2/osmosis/incentives/gauge.ts
@@ -54,7 +54,7 @@ export interface Gauge {
   /** distributed_coins are coins that have been distributed already */
   distributedCoins: Coin[];
 }
-export interface GaugeProtoType {
+export interface GaugeProtoMsg {
   typeUrl: "/osmosis.incentives.Gauge";
   value: Uint8Array;
 }
@@ -107,7 +107,7 @@ export interface GaugeAmino {
   /** distributed_coins are coins that have been distributed already */
   distributed_coins: CoinAmino[];
 }
-export interface GaugeAminoType {
+export interface GaugeAminoMsg {
   type: "osmosis/incentives/gauge";
   value: GaugeAmino;
 }
@@ -131,7 +131,7 @@ export interface LockableDurationsInfo {
   /** List of incentivised durations that gauges will pay out to */
   lockableDurations: Duration[];
 }
-export interface LockableDurationsInfoProtoType {
+export interface LockableDurationsInfoProtoMsg {
   typeUrl: "/osmosis.incentives.LockableDurationsInfo";
   value: Uint8Array;
 }
@@ -139,7 +139,7 @@ export interface LockableDurationsInfoAmino {
   /** List of incentivised durations that gauges will pay out to */
   lockable_durations: DurationAmino[];
 }
-export interface LockableDurationsInfoAminoType {
+export interface LockableDurationsInfoAminoMsg {
   type: "osmosis/incentives/lockable-durations-info";
   value: LockableDurationsInfoAmino;
 }
@@ -161,6 +161,9 @@ function createBaseGauge(): Gauge {
 }
 
 export const Gauge = {
+  typeUrl: "/osmosis.incentives.Gauge",
+  aminoType: "osmosis/incentives/gauge",
+
   encode(message: Gauge, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.id.isZero()) {
       writer.uint32(8).uint64(message.id);
@@ -372,6 +375,32 @@ export const Gauge = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: GaugeAminoMsg): Gauge {
+    return Gauge.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Gauge): GaugeAminoMsg {
+    return {
+      type: "osmosis/incentives/gauge",
+      value: Gauge.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GaugeProtoMsg): Gauge {
+    return Gauge.decode(message.value);
+  },
+
+  toProto(message: Gauge): Uint8Array {
+    return Gauge.encode(message).finish();
+  },
+
+  toProtoMsg(message: Gauge): GaugeProtoMsg {
+    return {
+      typeUrl: "/osmosis.incentives.Gauge",
+      value: Gauge.encode(message).finish()
+    };
   }
 
 };
@@ -383,6 +412,9 @@ function createBaseLockableDurationsInfo(): LockableDurationsInfo {
 }
 
 export const LockableDurationsInfo = {
+  typeUrl: "/osmosis.incentives.LockableDurationsInfo",
+  aminoType: "osmosis/incentives/lockable-durations-info",
+
   encode(message: LockableDurationsInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.lockableDurations) {
       Duration.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -471,6 +503,32 @@ export const LockableDurationsInfo = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: LockableDurationsInfoAminoMsg): LockableDurationsInfo {
+    return LockableDurationsInfo.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: LockableDurationsInfo): LockableDurationsInfoAminoMsg {
+    return {
+      type: "osmosis/incentives/lockable-durations-info",
+      value: LockableDurationsInfo.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: LockableDurationsInfoProtoMsg): LockableDurationsInfo {
+    return LockableDurationsInfo.decode(message.value);
+  },
+
+  toProto(message: LockableDurationsInfo): Uint8Array {
+    return LockableDurationsInfo.encode(message).finish();
+  },
+
+  toProtoMsg(message: LockableDurationsInfo): LockableDurationsInfoProtoMsg {
+    return {
+      typeUrl: "/osmosis.incentives.LockableDurationsInfo",
+      value: LockableDurationsInfo.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/osmosis/incentives/genesis.ts b/__fixtures__/outputv2/osmosis/incentives/genesis.ts
index 1a40e9a56..f4dd2d74d 100644
--- a/__fixtures__/outputv2/osmosis/incentives/genesis.ts
+++ b/__fixtures__/outputv2/osmosis/incentives/genesis.ts
@@ -28,7 +28,7 @@ export interface GenesisState {
    */
   lastGaugeId: Long;
 }
-export interface GenesisStateProtoType {
+export interface GenesisStateProtoMsg {
   typeUrl: "/osmosis.incentives.GenesisState";
   value: Uint8Array;
 }
@@ -56,7 +56,7 @@ export interface GenesisStateAmino {
    */
   last_gauge_id: string;
 }
-export interface GenesisStateAminoType {
+export interface GenesisStateAminoMsg {
   type: "osmosis/incentives/genesis-state";
   value: GenesisStateAmino;
 }
@@ -82,6 +82,9 @@ function createBaseGenesisState(): GenesisState {
 }
 
 export const GenesisState = {
+  typeUrl: "/osmosis.incentives.GenesisState",
+  aminoType: "osmosis/incentives/genesis-state",
+
   encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.params !== undefined) {
       Params.encode(message.params, writer.uint32(10).fork()).ldelim();
@@ -230,6 +233,32 @@ export const GenesisState = {
 
     obj.last_gauge_id = message.lastGaugeId ? message.lastGaugeId.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisStateAminoMsg): GenesisState {
+    return GenesisState.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GenesisState): GenesisStateAminoMsg {
+    return {
+      type: "osmosis/incentives/genesis-state",
+      value: GenesisState.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GenesisStateProtoMsg): GenesisState {
+    return GenesisState.decode(message.value);
+  },
+
+  toProto(message: GenesisState): Uint8Array {
+    return GenesisState.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisState): GenesisStateProtoMsg {
+    return {
+      typeUrl: "/osmosis.incentives.GenesisState",
+      value: GenesisState.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/osmosis/incentives/params.ts b/__fixtures__/outputv2/osmosis/incentives/params.ts
index 8c5b80d95..50652fd31 100644
--- a/__fixtures__/outputv2/osmosis/incentives/params.ts
+++ b/__fixtures__/outputv2/osmosis/incentives/params.ts
@@ -10,7 +10,7 @@ export interface Params {
    */
   distrEpochIdentifier: string;
 }
-export interface ParamsProtoType {
+export interface ParamsProtoMsg {
   typeUrl: "/osmosis.incentives.Params";
   value: Uint8Array;
 }
@@ -23,7 +23,7 @@ export interface ParamsAmino {
    */
   distr_epoch_identifier: string;
 }
-export interface ParamsAminoType {
+export interface ParamsAminoMsg {
   type: "osmosis/incentives/params";
   value: ParamsAmino;
 }
@@ -40,6 +40,9 @@ function createBaseParams(): Params {
 }
 
 export const Params = {
+  typeUrl: "/osmosis.incentives.Params",
+  aminoType: "osmosis/incentives/params",
+
   encode(message: Params, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.distrEpochIdentifier !== "") {
       writer.uint32(10).string(message.distrEpochIdentifier);
@@ -110,6 +113,32 @@ export const Params = {
     const obj: any = {};
     obj.distr_epoch_identifier = message.distrEpochIdentifier;
     return obj;
+  },
+
+  fromAminoMsg(object: ParamsAminoMsg): Params {
+    return Params.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Params): ParamsAminoMsg {
+    return {
+      type: "osmosis/incentives/params",
+      value: Params.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ParamsProtoMsg): Params {
+    return Params.decode(message.value);
+  },
+
+  toProto(message: Params): Uint8Array {
+    return Params.encode(message).finish();
+  },
+
+  toProtoMsg(message: Params): ParamsProtoMsg {
+    return {
+      typeUrl: "/osmosis.incentives.Params",
+      value: Params.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/osmosis/incentives/query.ts b/__fixtures__/outputv2/osmosis/incentives/query.ts
index b46735824..2214dddad 100644
--- a/__fixtures__/outputv2/osmosis/incentives/query.ts
+++ b/__fixtures__/outputv2/osmosis/incentives/query.ts
@@ -6,12 +6,12 @@ import * as _m0 from "protobufjs/minimal";
 import { DeepPartial, Long, isSet } from "../../helpers";
 export const protobufPackage = "osmosis.incentives";
 export interface ModuleToDistributeCoinsRequest {}
-export interface ModuleToDistributeCoinsRequestProtoType {
+export interface ModuleToDistributeCoinsRequestProtoMsg {
   typeUrl: "/osmosis.incentives.ModuleToDistributeCoinsRequest";
   value: Uint8Array;
 }
 export interface ModuleToDistributeCoinsRequestAmino {}
-export interface ModuleToDistributeCoinsRequestAminoType {
+export interface ModuleToDistributeCoinsRequestAminoMsg {
   type: "osmosis/incentives/module-to-distribute-coins-request";
   value: ModuleToDistributeCoinsRequestAmino;
 }
@@ -20,7 +20,7 @@ export interface ModuleToDistributeCoinsResponse {
   /** Coins that have yet to be distributed */
   coins: Coin[];
 }
-export interface ModuleToDistributeCoinsResponseProtoType {
+export interface ModuleToDistributeCoinsResponseProtoMsg {
   typeUrl: "/osmosis.incentives.ModuleToDistributeCoinsResponse";
   value: Uint8Array;
 }
@@ -28,7 +28,7 @@ export interface ModuleToDistributeCoinsResponseAmino {
   /** Coins that have yet to be distributed */
   coins: CoinAmino[];
 }
-export interface ModuleToDistributeCoinsResponseAminoType {
+export interface ModuleToDistributeCoinsResponseAminoMsg {
   type: "osmosis/incentives/module-to-distribute-coins-response";
   value: ModuleToDistributeCoinsResponseAmino;
 }
@@ -39,7 +39,7 @@ export interface GaugeByIDRequest {
   /** Gague ID being queried */
   id: Long;
 }
-export interface GaugeByIDRequestProtoType {
+export interface GaugeByIDRequestProtoMsg {
   typeUrl: "/osmosis.incentives.GaugeByIDRequest";
   value: Uint8Array;
 }
@@ -47,7 +47,7 @@ export interface GaugeByIDRequestAmino {
   /** Gague ID being queried */
   id: string;
 }
-export interface GaugeByIDRequestAminoType {
+export interface GaugeByIDRequestAminoMsg {
   type: "osmosis/incentives/gauge-by-id-request";
   value: GaugeByIDRequestAmino;
 }
@@ -58,7 +58,7 @@ export interface GaugeByIDResponse {
   /** Gauge that corresponds to provided gague ID */
   gauge?: Gauge;
 }
-export interface GaugeByIDResponseProtoType {
+export interface GaugeByIDResponseProtoMsg {
   typeUrl: "/osmosis.incentives.GaugeByIDResponse";
   value: Uint8Array;
 }
@@ -66,7 +66,7 @@ export interface GaugeByIDResponseAmino {
   /** Gauge that corresponds to provided gague ID */
   gauge?: GaugeAmino;
 }
-export interface GaugeByIDResponseAminoType {
+export interface GaugeByIDResponseAminoMsg {
   type: "osmosis/incentives/gauge-by-id-response";
   value: GaugeByIDResponseAmino;
 }
@@ -77,7 +77,7 @@ export interface GaugesRequest {
   /** Pagination defines pagination for the request */
   pagination?: PageRequest;
 }
-export interface GaugesRequestProtoType {
+export interface GaugesRequestProtoMsg {
   typeUrl: "/osmosis.incentives.GaugesRequest";
   value: Uint8Array;
 }
@@ -85,7 +85,7 @@ export interface GaugesRequestAmino {
   /** Pagination defines pagination for the request */
   pagination?: PageRequestAmino;
 }
-export interface GaugesRequestAminoType {
+export interface GaugesRequestAminoMsg {
   type: "osmosis/incentives/gauges-request";
   value: GaugesRequestAmino;
 }
@@ -99,7 +99,7 @@ export interface GaugesResponse {
   /** Pagination defines pagination for the response */
   pagination?: PageResponse;
 }
-export interface GaugesResponseProtoType {
+export interface GaugesResponseProtoMsg {
   typeUrl: "/osmosis.incentives.GaugesResponse";
   value: Uint8Array;
 }
@@ -110,7 +110,7 @@ export interface GaugesResponseAmino {
   /** Pagination defines pagination for the response */
   pagination?: PageResponseAmino;
 }
-export interface GaugesResponseAminoType {
+export interface GaugesResponseAminoMsg {
   type: "osmosis/incentives/gauges-response";
   value: GaugesResponseAmino;
 }
@@ -122,7 +122,7 @@ export interface ActiveGaugesRequest {
   /** Pagination defines pagination for the request */
   pagination?: PageRequest;
 }
-export interface ActiveGaugesRequestProtoType {
+export interface ActiveGaugesRequestProtoMsg {
   typeUrl: "/osmosis.incentives.ActiveGaugesRequest";
   value: Uint8Array;
 }
@@ -130,7 +130,7 @@ export interface ActiveGaugesRequestAmino {
   /** Pagination defines pagination for the request */
   pagination?: PageRequestAmino;
 }
-export interface ActiveGaugesRequestAminoType {
+export interface ActiveGaugesRequestAminoMsg {
   type: "osmosis/incentives/active-gauges-request";
   value: ActiveGaugesRequestAmino;
 }
@@ -144,7 +144,7 @@ export interface ActiveGaugesResponse {
   /** Pagination defines pagination for the response */
   pagination?: PageResponse;
 }
-export interface ActiveGaugesResponseProtoType {
+export interface ActiveGaugesResponseProtoMsg {
   typeUrl: "/osmosis.incentives.ActiveGaugesResponse";
   value: Uint8Array;
 }
@@ -155,7 +155,7 @@ export interface ActiveGaugesResponseAmino {
   /** Pagination defines pagination for the response */
   pagination?: PageResponseAmino;
 }
-export interface ActiveGaugesResponseAminoType {
+export interface ActiveGaugesResponseAminoMsg {
   type: "osmosis/incentives/active-gauges-response";
   value: ActiveGaugesResponseAmino;
 }
@@ -170,7 +170,7 @@ export interface ActiveGaugesPerDenomRequest {
   /** Pagination defines pagination for the request */
   pagination?: PageRequest;
 }
-export interface ActiveGaugesPerDenomRequestProtoType {
+export interface ActiveGaugesPerDenomRequestProtoMsg {
   typeUrl: "/osmosis.incentives.ActiveGaugesPerDenomRequest";
   value: Uint8Array;
 }
@@ -181,7 +181,7 @@ export interface ActiveGaugesPerDenomRequestAmino {
   /** Pagination defines pagination for the request */
   pagination?: PageRequestAmino;
 }
-export interface ActiveGaugesPerDenomRequestAminoType {
+export interface ActiveGaugesPerDenomRequestAminoMsg {
   type: "osmosis/incentives/active-gauges-per-denom-request";
   value: ActiveGaugesPerDenomRequestAmino;
 }
@@ -196,7 +196,7 @@ export interface ActiveGaugesPerDenomResponse {
   /** Pagination defines pagination for the response */
   pagination?: PageResponse;
 }
-export interface ActiveGaugesPerDenomResponseProtoType {
+export interface ActiveGaugesPerDenomResponseProtoMsg {
   typeUrl: "/osmosis.incentives.ActiveGaugesPerDenomResponse";
   value: Uint8Array;
 }
@@ -207,7 +207,7 @@ export interface ActiveGaugesPerDenomResponseAmino {
   /** Pagination defines pagination for the response */
   pagination?: PageResponseAmino;
 }
-export interface ActiveGaugesPerDenomResponseAminoType {
+export interface ActiveGaugesPerDenomResponseAminoMsg {
   type: "osmosis/incentives/active-gauges-per-denom-response";
   value: ActiveGaugesPerDenomResponseAmino;
 }
@@ -219,7 +219,7 @@ export interface UpcomingGaugesRequest {
   /** Pagination defines pagination for the request */
   pagination?: PageRequest;
 }
-export interface UpcomingGaugesRequestProtoType {
+export interface UpcomingGaugesRequestProtoMsg {
   typeUrl: "/osmosis.incentives.UpcomingGaugesRequest";
   value: Uint8Array;
 }
@@ -227,7 +227,7 @@ export interface UpcomingGaugesRequestAmino {
   /** Pagination defines pagination for the request */
   pagination?: PageRequestAmino;
 }
-export interface UpcomingGaugesRequestAminoType {
+export interface UpcomingGaugesRequestAminoMsg {
   type: "osmosis/incentives/upcoming-gauges-request";
   value: UpcomingGaugesRequestAmino;
 }
@@ -241,7 +241,7 @@ export interface UpcomingGaugesResponse {
   /** Pagination defines pagination for the response */
   pagination?: PageResponse;
 }
-export interface UpcomingGaugesResponseProtoType {
+export interface UpcomingGaugesResponseProtoMsg {
   typeUrl: "/osmosis.incentives.UpcomingGaugesResponse";
   value: Uint8Array;
 }
@@ -252,7 +252,7 @@ export interface UpcomingGaugesResponseAmino {
   /** Pagination defines pagination for the response */
   pagination?: PageResponseAmino;
 }
-export interface UpcomingGaugesResponseAminoType {
+export interface UpcomingGaugesResponseAminoMsg {
   type: "osmosis/incentives/upcoming-gauges-response";
   value: UpcomingGaugesResponseAmino;
 }
@@ -267,7 +267,7 @@ export interface UpcomingGaugesPerDenomRequest {
   /** Pagination defines pagination for the request */
   pagination?: PageRequest;
 }
-export interface UpcomingGaugesPerDenomRequestProtoType {
+export interface UpcomingGaugesPerDenomRequestProtoMsg {
   typeUrl: "/osmosis.incentives.UpcomingGaugesPerDenomRequest";
   value: Uint8Array;
 }
@@ -278,7 +278,7 @@ export interface UpcomingGaugesPerDenomRequestAmino {
   /** Pagination defines pagination for the request */
   pagination?: PageRequestAmino;
 }
-export interface UpcomingGaugesPerDenomRequestAminoType {
+export interface UpcomingGaugesPerDenomRequestAminoMsg {
   type: "osmosis/incentives/upcoming-gauges-per-denom-request";
   value: UpcomingGaugesPerDenomRequestAmino;
 }
@@ -293,7 +293,7 @@ export interface UpcomingGaugesPerDenomResponse {
   /** Pagination defines pagination for the response */
   pagination?: PageResponse;
 }
-export interface UpcomingGaugesPerDenomResponseProtoType {
+export interface UpcomingGaugesPerDenomResponseProtoMsg {
   typeUrl: "/osmosis.incentives.UpcomingGaugesPerDenomResponse";
   value: Uint8Array;
 }
@@ -304,7 +304,7 @@ export interface UpcomingGaugesPerDenomResponseAmino {
   /** Pagination defines pagination for the response */
   pagination?: PageResponseAmino;
 }
-export interface UpcomingGaugesPerDenomResponseAminoType {
+export interface UpcomingGaugesPerDenomResponseAminoMsg {
   type: "osmosis/incentives/upcoming-gauges-per-denom-response";
   value: UpcomingGaugesPerDenomResponseAmino;
 }
@@ -325,7 +325,7 @@ export interface RewardsEstRequest {
    */
   endEpoch: Long;
 }
-export interface RewardsEstRequestProtoType {
+export interface RewardsEstRequestProtoMsg {
   typeUrl: "/osmosis.incentives.RewardsEstRequest";
   value: Uint8Array;
 }
@@ -342,7 +342,7 @@ export interface RewardsEstRequestAmino {
    */
   end_epoch: string;
 }
-export interface RewardsEstRequestAminoType {
+export interface RewardsEstRequestAminoMsg {
   type: "osmosis/incentives/rewards-est-request";
   value: RewardsEstRequestAmino;
 }
@@ -358,7 +358,7 @@ export interface RewardsEstResponse {
    */
   coins: Coin[];
 }
-export interface RewardsEstResponseProtoType {
+export interface RewardsEstResponseProtoMsg {
   typeUrl: "/osmosis.incentives.RewardsEstResponse";
   value: Uint8Array;
 }
@@ -369,7 +369,7 @@ export interface RewardsEstResponseAmino {
    */
   coins: CoinAmino[];
 }
-export interface RewardsEstResponseAminoType {
+export interface RewardsEstResponseAminoMsg {
   type: "osmosis/incentives/rewards-est-response";
   value: RewardsEstResponseAmino;
 }
@@ -377,12 +377,12 @@ export interface RewardsEstResponseSDKType {
   coins: CoinSDKType[];
 }
 export interface QueryLockableDurationsRequest {}
-export interface QueryLockableDurationsRequestProtoType {
+export interface QueryLockableDurationsRequestProtoMsg {
   typeUrl: "/osmosis.incentives.QueryLockableDurationsRequest";
   value: Uint8Array;
 }
 export interface QueryLockableDurationsRequestAmino {}
-export interface QueryLockableDurationsRequestAminoType {
+export interface QueryLockableDurationsRequestAminoMsg {
   type: "osmosis/incentives/query-lockable-durations-request";
   value: QueryLockableDurationsRequestAmino;
 }
@@ -391,7 +391,7 @@ export interface QueryLockableDurationsResponse {
   /** Time durations that users can lock coins for in order to recieve rewards */
   lockableDurations: Duration[];
 }
-export interface QueryLockableDurationsResponseProtoType {
+export interface QueryLockableDurationsResponseProtoMsg {
   typeUrl: "/osmosis.incentives.QueryLockableDurationsResponse";
   value: Uint8Array;
 }
@@ -399,7 +399,7 @@ export interface QueryLockableDurationsResponseAmino {
   /** Time durations that users can lock coins for in order to recieve rewards */
   lockable_durations: DurationAmino[];
 }
-export interface QueryLockableDurationsResponseAminoType {
+export interface QueryLockableDurationsResponseAminoMsg {
   type: "osmosis/incentives/query-lockable-durations-response";
   value: QueryLockableDurationsResponseAmino;
 }
@@ -412,6 +412,9 @@ function createBaseModuleToDistributeCoinsRequest(): ModuleToDistributeCoinsRequ
 }
 
 export const ModuleToDistributeCoinsRequest = {
+  typeUrl: "/osmosis.incentives.ModuleToDistributeCoinsRequest",
+  aminoType: "osmosis/incentives/module-to-distribute-coins-request",
+
   encode(_: ModuleToDistributeCoinsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -464,6 +467,32 @@ export const ModuleToDistributeCoinsRequest = {
   toAmino(_: ModuleToDistributeCoinsRequest): ModuleToDistributeCoinsRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: ModuleToDistributeCoinsRequestAminoMsg): ModuleToDistributeCoinsRequest {
+    return ModuleToDistributeCoinsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ModuleToDistributeCoinsRequest): ModuleToDistributeCoinsRequestAminoMsg {
+    return {
+      type: "osmosis/incentives/module-to-distribute-coins-request",
+      value: ModuleToDistributeCoinsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ModuleToDistributeCoinsRequestProtoMsg): ModuleToDistributeCoinsRequest {
+    return ModuleToDistributeCoinsRequest.decode(message.value);
+  },
+
+  toProto(message: ModuleToDistributeCoinsRequest): Uint8Array {
+    return ModuleToDistributeCoinsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: ModuleToDistributeCoinsRequest): ModuleToDistributeCoinsRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.incentives.ModuleToDistributeCoinsRequest",
+      value: ModuleToDistributeCoinsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -475,6 +504,9 @@ function createBaseModuleToDistributeCoinsResponse(): ModuleToDistributeCoinsRes
 }
 
 export const ModuleToDistributeCoinsResponse = {
+  typeUrl: "/osmosis.incentives.ModuleToDistributeCoinsResponse",
+  aminoType: "osmosis/incentives/module-to-distribute-coins-response",
+
   encode(message: ModuleToDistributeCoinsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.coins) {
       Coin.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -563,6 +595,32 @@ export const ModuleToDistributeCoinsResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ModuleToDistributeCoinsResponseAminoMsg): ModuleToDistributeCoinsResponse {
+    return ModuleToDistributeCoinsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ModuleToDistributeCoinsResponse): ModuleToDistributeCoinsResponseAminoMsg {
+    return {
+      type: "osmosis/incentives/module-to-distribute-coins-response",
+      value: ModuleToDistributeCoinsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ModuleToDistributeCoinsResponseProtoMsg): ModuleToDistributeCoinsResponse {
+    return ModuleToDistributeCoinsResponse.decode(message.value);
+  },
+
+  toProto(message: ModuleToDistributeCoinsResponse): Uint8Array {
+    return ModuleToDistributeCoinsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: ModuleToDistributeCoinsResponse): ModuleToDistributeCoinsResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.incentives.ModuleToDistributeCoinsResponse",
+      value: ModuleToDistributeCoinsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -574,6 +632,9 @@ function createBaseGaugeByIDRequest(): GaugeByIDRequest {
 }
 
 export const GaugeByIDRequest = {
+  typeUrl: "/osmosis.incentives.GaugeByIDRequest",
+  aminoType: "osmosis/incentives/gauge-by-id-request",
+
   encode(message: GaugeByIDRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.id.isZero()) {
       writer.uint32(8).uint64(message.id);
@@ -644,6 +705,32 @@ export const GaugeByIDRequest = {
     const obj: any = {};
     obj.id = message.id ? message.id.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GaugeByIDRequestAminoMsg): GaugeByIDRequest {
+    return GaugeByIDRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GaugeByIDRequest): GaugeByIDRequestAminoMsg {
+    return {
+      type: "osmosis/incentives/gauge-by-id-request",
+      value: GaugeByIDRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GaugeByIDRequestProtoMsg): GaugeByIDRequest {
+    return GaugeByIDRequest.decode(message.value);
+  },
+
+  toProto(message: GaugeByIDRequest): Uint8Array {
+    return GaugeByIDRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: GaugeByIDRequest): GaugeByIDRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.incentives.GaugeByIDRequest",
+      value: GaugeByIDRequest.encode(message).finish()
+    };
   }
 
 };
@@ -655,6 +742,9 @@ function createBaseGaugeByIDResponse(): GaugeByIDResponse {
 }
 
 export const GaugeByIDResponse = {
+  typeUrl: "/osmosis.incentives.GaugeByIDResponse",
+  aminoType: "osmosis/incentives/gauge-by-id-response",
+
   encode(message: GaugeByIDResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.gauge !== undefined) {
       Gauge.encode(message.gauge, writer.uint32(10).fork()).ldelim();
@@ -725,6 +815,32 @@ export const GaugeByIDResponse = {
     const obj: any = {};
     obj.gauge = message.gauge ? Gauge.toAmino(message.gauge) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GaugeByIDResponseAminoMsg): GaugeByIDResponse {
+    return GaugeByIDResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GaugeByIDResponse): GaugeByIDResponseAminoMsg {
+    return {
+      type: "osmosis/incentives/gauge-by-id-response",
+      value: GaugeByIDResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GaugeByIDResponseProtoMsg): GaugeByIDResponse {
+    return GaugeByIDResponse.decode(message.value);
+  },
+
+  toProto(message: GaugeByIDResponse): Uint8Array {
+    return GaugeByIDResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: GaugeByIDResponse): GaugeByIDResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.incentives.GaugeByIDResponse",
+      value: GaugeByIDResponse.encode(message).finish()
+    };
   }
 
 };
@@ -736,6 +852,9 @@ function createBaseGaugesRequest(): GaugesRequest {
 }
 
 export const GaugesRequest = {
+  typeUrl: "/osmosis.incentives.GaugesRequest",
+  aminoType: "osmosis/incentives/gauges-request",
+
   encode(message: GaugesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.pagination !== undefined) {
       PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim();
@@ -806,6 +925,32 @@ export const GaugesRequest = {
     const obj: any = {};
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GaugesRequestAminoMsg): GaugesRequest {
+    return GaugesRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GaugesRequest): GaugesRequestAminoMsg {
+    return {
+      type: "osmosis/incentives/gauges-request",
+      value: GaugesRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GaugesRequestProtoMsg): GaugesRequest {
+    return GaugesRequest.decode(message.value);
+  },
+
+  toProto(message: GaugesRequest): Uint8Array {
+    return GaugesRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: GaugesRequest): GaugesRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.incentives.GaugesRequest",
+      value: GaugesRequest.encode(message).finish()
+    };
   }
 
 };
@@ -818,6 +963,9 @@ function createBaseGaugesResponse(): GaugesResponse {
 }
 
 export const GaugesResponse = {
+  typeUrl: "/osmosis.incentives.GaugesResponse",
+  aminoType: "osmosis/incentives/gauges-response",
+
   encode(message: GaugesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.data) {
       Gauge.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -921,6 +1069,32 @@ export const GaugesResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GaugesResponseAminoMsg): GaugesResponse {
+    return GaugesResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GaugesResponse): GaugesResponseAminoMsg {
+    return {
+      type: "osmosis/incentives/gauges-response",
+      value: GaugesResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GaugesResponseProtoMsg): GaugesResponse {
+    return GaugesResponse.decode(message.value);
+  },
+
+  toProto(message: GaugesResponse): Uint8Array {
+    return GaugesResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: GaugesResponse): GaugesResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.incentives.GaugesResponse",
+      value: GaugesResponse.encode(message).finish()
+    };
   }
 
 };
@@ -932,6 +1106,9 @@ function createBaseActiveGaugesRequest(): ActiveGaugesRequest {
 }
 
 export const ActiveGaugesRequest = {
+  typeUrl: "/osmosis.incentives.ActiveGaugesRequest",
+  aminoType: "osmosis/incentives/active-gauges-request",
+
   encode(message: ActiveGaugesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.pagination !== undefined) {
       PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim();
@@ -1002,6 +1179,32 @@ export const ActiveGaugesRequest = {
     const obj: any = {};
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ActiveGaugesRequestAminoMsg): ActiveGaugesRequest {
+    return ActiveGaugesRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ActiveGaugesRequest): ActiveGaugesRequestAminoMsg {
+    return {
+      type: "osmosis/incentives/active-gauges-request",
+      value: ActiveGaugesRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ActiveGaugesRequestProtoMsg): ActiveGaugesRequest {
+    return ActiveGaugesRequest.decode(message.value);
+  },
+
+  toProto(message: ActiveGaugesRequest): Uint8Array {
+    return ActiveGaugesRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: ActiveGaugesRequest): ActiveGaugesRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.incentives.ActiveGaugesRequest",
+      value: ActiveGaugesRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1014,6 +1217,9 @@ function createBaseActiveGaugesResponse(): ActiveGaugesResponse {
 }
 
 export const ActiveGaugesResponse = {
+  typeUrl: "/osmosis.incentives.ActiveGaugesResponse",
+  aminoType: "osmosis/incentives/active-gauges-response",
+
   encode(message: ActiveGaugesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.data) {
       Gauge.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1117,6 +1323,32 @@ export const ActiveGaugesResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ActiveGaugesResponseAminoMsg): ActiveGaugesResponse {
+    return ActiveGaugesResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ActiveGaugesResponse): ActiveGaugesResponseAminoMsg {
+    return {
+      type: "osmosis/incentives/active-gauges-response",
+      value: ActiveGaugesResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ActiveGaugesResponseProtoMsg): ActiveGaugesResponse {
+    return ActiveGaugesResponse.decode(message.value);
+  },
+
+  toProto(message: ActiveGaugesResponse): Uint8Array {
+    return ActiveGaugesResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: ActiveGaugesResponse): ActiveGaugesResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.incentives.ActiveGaugesResponse",
+      value: ActiveGaugesResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1129,6 +1361,9 @@ function createBaseActiveGaugesPerDenomRequest(): ActiveGaugesPerDenomRequest {
 }
 
 export const ActiveGaugesPerDenomRequest = {
+  typeUrl: "/osmosis.incentives.ActiveGaugesPerDenomRequest",
+  aminoType: "osmosis/incentives/active-gauges-per-denom-request",
+
   encode(message: ActiveGaugesPerDenomRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.denom !== "") {
       writer.uint32(10).string(message.denom);
@@ -1214,6 +1449,32 @@ export const ActiveGaugesPerDenomRequest = {
     obj.denom = message.denom;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ActiveGaugesPerDenomRequestAminoMsg): ActiveGaugesPerDenomRequest {
+    return ActiveGaugesPerDenomRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ActiveGaugesPerDenomRequest): ActiveGaugesPerDenomRequestAminoMsg {
+    return {
+      type: "osmosis/incentives/active-gauges-per-denom-request",
+      value: ActiveGaugesPerDenomRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ActiveGaugesPerDenomRequestProtoMsg): ActiveGaugesPerDenomRequest {
+    return ActiveGaugesPerDenomRequest.decode(message.value);
+  },
+
+  toProto(message: ActiveGaugesPerDenomRequest): Uint8Array {
+    return ActiveGaugesPerDenomRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: ActiveGaugesPerDenomRequest): ActiveGaugesPerDenomRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.incentives.ActiveGaugesPerDenomRequest",
+      value: ActiveGaugesPerDenomRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1226,6 +1487,9 @@ function createBaseActiveGaugesPerDenomResponse(): ActiveGaugesPerDenomResponse
 }
 
 export const ActiveGaugesPerDenomResponse = {
+  typeUrl: "/osmosis.incentives.ActiveGaugesPerDenomResponse",
+  aminoType: "osmosis/incentives/active-gauges-per-denom-response",
+
   encode(message: ActiveGaugesPerDenomResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.data) {
       Gauge.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1329,6 +1593,32 @@ export const ActiveGaugesPerDenomResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ActiveGaugesPerDenomResponseAminoMsg): ActiveGaugesPerDenomResponse {
+    return ActiveGaugesPerDenomResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ActiveGaugesPerDenomResponse): ActiveGaugesPerDenomResponseAminoMsg {
+    return {
+      type: "osmosis/incentives/active-gauges-per-denom-response",
+      value: ActiveGaugesPerDenomResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ActiveGaugesPerDenomResponseProtoMsg): ActiveGaugesPerDenomResponse {
+    return ActiveGaugesPerDenomResponse.decode(message.value);
+  },
+
+  toProto(message: ActiveGaugesPerDenomResponse): Uint8Array {
+    return ActiveGaugesPerDenomResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: ActiveGaugesPerDenomResponse): ActiveGaugesPerDenomResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.incentives.ActiveGaugesPerDenomResponse",
+      value: ActiveGaugesPerDenomResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1340,6 +1630,9 @@ function createBaseUpcomingGaugesRequest(): UpcomingGaugesRequest {
 }
 
 export const UpcomingGaugesRequest = {
+  typeUrl: "/osmosis.incentives.UpcomingGaugesRequest",
+  aminoType: "osmosis/incentives/upcoming-gauges-request",
+
   encode(message: UpcomingGaugesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.pagination !== undefined) {
       PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim();
@@ -1410,6 +1703,32 @@ export const UpcomingGaugesRequest = {
     const obj: any = {};
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: UpcomingGaugesRequestAminoMsg): UpcomingGaugesRequest {
+    return UpcomingGaugesRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: UpcomingGaugesRequest): UpcomingGaugesRequestAminoMsg {
+    return {
+      type: "osmosis/incentives/upcoming-gauges-request",
+      value: UpcomingGaugesRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: UpcomingGaugesRequestProtoMsg): UpcomingGaugesRequest {
+    return UpcomingGaugesRequest.decode(message.value);
+  },
+
+  toProto(message: UpcomingGaugesRequest): Uint8Array {
+    return UpcomingGaugesRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: UpcomingGaugesRequest): UpcomingGaugesRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.incentives.UpcomingGaugesRequest",
+      value: UpcomingGaugesRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1422,6 +1741,9 @@ function createBaseUpcomingGaugesResponse(): UpcomingGaugesResponse {
 }
 
 export const UpcomingGaugesResponse = {
+  typeUrl: "/osmosis.incentives.UpcomingGaugesResponse",
+  aminoType: "osmosis/incentives/upcoming-gauges-response",
+
   encode(message: UpcomingGaugesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.data) {
       Gauge.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1525,6 +1847,32 @@ export const UpcomingGaugesResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: UpcomingGaugesResponseAminoMsg): UpcomingGaugesResponse {
+    return UpcomingGaugesResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: UpcomingGaugesResponse): UpcomingGaugesResponseAminoMsg {
+    return {
+      type: "osmosis/incentives/upcoming-gauges-response",
+      value: UpcomingGaugesResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: UpcomingGaugesResponseProtoMsg): UpcomingGaugesResponse {
+    return UpcomingGaugesResponse.decode(message.value);
+  },
+
+  toProto(message: UpcomingGaugesResponse): Uint8Array {
+    return UpcomingGaugesResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: UpcomingGaugesResponse): UpcomingGaugesResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.incentives.UpcomingGaugesResponse",
+      value: UpcomingGaugesResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1537,6 +1885,9 @@ function createBaseUpcomingGaugesPerDenomRequest(): UpcomingGaugesPerDenomReques
 }
 
 export const UpcomingGaugesPerDenomRequest = {
+  typeUrl: "/osmosis.incentives.UpcomingGaugesPerDenomRequest",
+  aminoType: "osmosis/incentives/upcoming-gauges-per-denom-request",
+
   encode(message: UpcomingGaugesPerDenomRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.denom !== "") {
       writer.uint32(10).string(message.denom);
@@ -1622,6 +1973,32 @@ export const UpcomingGaugesPerDenomRequest = {
     obj.denom = message.denom;
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: UpcomingGaugesPerDenomRequestAminoMsg): UpcomingGaugesPerDenomRequest {
+    return UpcomingGaugesPerDenomRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: UpcomingGaugesPerDenomRequest): UpcomingGaugesPerDenomRequestAminoMsg {
+    return {
+      type: "osmosis/incentives/upcoming-gauges-per-denom-request",
+      value: UpcomingGaugesPerDenomRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: UpcomingGaugesPerDenomRequestProtoMsg): UpcomingGaugesPerDenomRequest {
+    return UpcomingGaugesPerDenomRequest.decode(message.value);
+  },
+
+  toProto(message: UpcomingGaugesPerDenomRequest): Uint8Array {
+    return UpcomingGaugesPerDenomRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: UpcomingGaugesPerDenomRequest): UpcomingGaugesPerDenomRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.incentives.UpcomingGaugesPerDenomRequest",
+      value: UpcomingGaugesPerDenomRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1634,6 +2011,9 @@ function createBaseUpcomingGaugesPerDenomResponse(): UpcomingGaugesPerDenomRespo
 }
 
 export const UpcomingGaugesPerDenomResponse = {
+  typeUrl: "/osmosis.incentives.UpcomingGaugesPerDenomResponse",
+  aminoType: "osmosis/incentives/upcoming-gauges-per-denom-response",
+
   encode(message: UpcomingGaugesPerDenomResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.upcomingGauges) {
       Gauge.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1737,6 +2117,32 @@ export const UpcomingGaugesPerDenomResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: UpcomingGaugesPerDenomResponseAminoMsg): UpcomingGaugesPerDenomResponse {
+    return UpcomingGaugesPerDenomResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: UpcomingGaugesPerDenomResponse): UpcomingGaugesPerDenomResponseAminoMsg {
+    return {
+      type: "osmosis/incentives/upcoming-gauges-per-denom-response",
+      value: UpcomingGaugesPerDenomResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: UpcomingGaugesPerDenomResponseProtoMsg): UpcomingGaugesPerDenomResponse {
+    return UpcomingGaugesPerDenomResponse.decode(message.value);
+  },
+
+  toProto(message: UpcomingGaugesPerDenomResponse): Uint8Array {
+    return UpcomingGaugesPerDenomResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: UpcomingGaugesPerDenomResponse): UpcomingGaugesPerDenomResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.incentives.UpcomingGaugesPerDenomResponse",
+      value: UpcomingGaugesPerDenomResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1750,6 +2156,9 @@ function createBaseRewardsEstRequest(): RewardsEstRequest {
 }
 
 export const RewardsEstRequest = {
+  typeUrl: "/osmosis.incentives.RewardsEstRequest",
+  aminoType: "osmosis/incentives/rewards-est-request",
+
   encode(message: RewardsEstRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.owner !== "") {
       writer.uint32(10).string(message.owner);
@@ -1881,6 +2290,32 @@ export const RewardsEstRequest = {
 
     obj.end_epoch = message.endEpoch ? message.endEpoch.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: RewardsEstRequestAminoMsg): RewardsEstRequest {
+    return RewardsEstRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: RewardsEstRequest): RewardsEstRequestAminoMsg {
+    return {
+      type: "osmosis/incentives/rewards-est-request",
+      value: RewardsEstRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: RewardsEstRequestProtoMsg): RewardsEstRequest {
+    return RewardsEstRequest.decode(message.value);
+  },
+
+  toProto(message: RewardsEstRequest): Uint8Array {
+    return RewardsEstRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: RewardsEstRequest): RewardsEstRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.incentives.RewardsEstRequest",
+      value: RewardsEstRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1892,6 +2327,9 @@ function createBaseRewardsEstResponse(): RewardsEstResponse {
 }
 
 export const RewardsEstResponse = {
+  typeUrl: "/osmosis.incentives.RewardsEstResponse",
+  aminoType: "osmosis/incentives/rewards-est-response",
+
   encode(message: RewardsEstResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.coins) {
       Coin.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1980,6 +2418,32 @@ export const RewardsEstResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: RewardsEstResponseAminoMsg): RewardsEstResponse {
+    return RewardsEstResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: RewardsEstResponse): RewardsEstResponseAminoMsg {
+    return {
+      type: "osmosis/incentives/rewards-est-response",
+      value: RewardsEstResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: RewardsEstResponseProtoMsg): RewardsEstResponse {
+    return RewardsEstResponse.decode(message.value);
+  },
+
+  toProto(message: RewardsEstResponse): Uint8Array {
+    return RewardsEstResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: RewardsEstResponse): RewardsEstResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.incentives.RewardsEstResponse",
+      value: RewardsEstResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1989,6 +2453,9 @@ function createBaseQueryLockableDurationsRequest(): QueryLockableDurationsReques
 }
 
 export const QueryLockableDurationsRequest = {
+  typeUrl: "/osmosis.incentives.QueryLockableDurationsRequest",
+  aminoType: "osmosis/incentives/query-lockable-durations-request",
+
   encode(_: QueryLockableDurationsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -2041,6 +2508,32 @@ export const QueryLockableDurationsRequest = {
   toAmino(_: QueryLockableDurationsRequest): QueryLockableDurationsRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryLockableDurationsRequestAminoMsg): QueryLockableDurationsRequest {
+    return QueryLockableDurationsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryLockableDurationsRequest): QueryLockableDurationsRequestAminoMsg {
+    return {
+      type: "osmosis/incentives/query-lockable-durations-request",
+      value: QueryLockableDurationsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryLockableDurationsRequestProtoMsg): QueryLockableDurationsRequest {
+    return QueryLockableDurationsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryLockableDurationsRequest): Uint8Array {
+    return QueryLockableDurationsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryLockableDurationsRequest): QueryLockableDurationsRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.incentives.QueryLockableDurationsRequest",
+      value: QueryLockableDurationsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2052,6 +2545,9 @@ function createBaseQueryLockableDurationsResponse(): QueryLockableDurationsRespo
 }
 
 export const QueryLockableDurationsResponse = {
+  typeUrl: "/osmosis.incentives.QueryLockableDurationsResponse",
+  aminoType: "osmosis/incentives/query-lockable-durations-response",
+
   encode(message: QueryLockableDurationsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.lockableDurations) {
       Duration.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -2140,6 +2636,32 @@ export const QueryLockableDurationsResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: QueryLockableDurationsResponseAminoMsg): QueryLockableDurationsResponse {
+    return QueryLockableDurationsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryLockableDurationsResponse): QueryLockableDurationsResponseAminoMsg {
+    return {
+      type: "osmosis/incentives/query-lockable-durations-response",
+      value: QueryLockableDurationsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryLockableDurationsResponseProtoMsg): QueryLockableDurationsResponse {
+    return QueryLockableDurationsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryLockableDurationsResponse): Uint8Array {
+    return QueryLockableDurationsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryLockableDurationsResponse): QueryLockableDurationsResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.incentives.QueryLockableDurationsResponse",
+      value: QueryLockableDurationsResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/osmosis/incentives/tx.ts b/__fixtures__/outputv2/osmosis/incentives/tx.ts
index 9cafc29f1..dc198ffa0 100644
--- a/__fixtures__/outputv2/osmosis/incentives/tx.ts
+++ b/__fixtures__/outputv2/osmosis/incentives/tx.ts
@@ -37,7 +37,7 @@ export interface MsgCreateGauge {
    */
   numEpochsPaidOver: Long;
 }
-export interface MsgCreateGaugeProtoType {
+export interface MsgCreateGaugeProtoMsg {
   typeUrl: "/osmosis.incentives.MsgCreateGauge";
   value: Uint8Array;
 }
@@ -74,7 +74,7 @@ export interface MsgCreateGaugeAmino {
    */
   num_epochs_paid_over: string;
 }
-export interface MsgCreateGaugeAminoType {
+export interface MsgCreateGaugeAminoMsg {
   type: "osmosis/incentives/create-gauge";
   value: MsgCreateGaugeAmino;
 }
@@ -89,12 +89,12 @@ export interface MsgCreateGaugeSDKType {
   num_epochs_paid_over: Long;
 }
 export interface MsgCreateGaugeResponse {}
-export interface MsgCreateGaugeResponseProtoType {
+export interface MsgCreateGaugeResponseProtoMsg {
   typeUrl: "/osmosis.incentives.MsgCreateGaugeResponse";
   value: Uint8Array;
 }
 export interface MsgCreateGaugeResponseAmino {}
-export interface MsgCreateGaugeResponseAminoType {
+export interface MsgCreateGaugeResponseAminoMsg {
   type: "osmosis/incentives/create-gauge-response";
   value: MsgCreateGaugeResponseAmino;
 }
@@ -111,7 +111,7 @@ export interface MsgAddToGauge {
   /** rewards are the coin(s) to add to gauge */
   rewards: Coin[];
 }
-export interface MsgAddToGaugeProtoType {
+export interface MsgAddToGaugeProtoMsg {
   typeUrl: "/osmosis.incentives.MsgAddToGauge";
   value: Uint8Array;
 }
@@ -127,7 +127,7 @@ export interface MsgAddToGaugeAmino {
   /** rewards are the coin(s) to add to gauge */
   rewards: CoinAmino[];
 }
-export interface MsgAddToGaugeAminoType {
+export interface MsgAddToGaugeAminoMsg {
   type: "osmosis/incentives/add-to-gauge";
   value: MsgAddToGaugeAmino;
 }
@@ -139,12 +139,12 @@ export interface MsgAddToGaugeSDKType {
   rewards: CoinSDKType[];
 }
 export interface MsgAddToGaugeResponse {}
-export interface MsgAddToGaugeResponseProtoType {
+export interface MsgAddToGaugeResponseProtoMsg {
   typeUrl: "/osmosis.incentives.MsgAddToGaugeResponse";
   value: Uint8Array;
 }
 export interface MsgAddToGaugeResponseAmino {}
-export interface MsgAddToGaugeResponseAminoType {
+export interface MsgAddToGaugeResponseAminoMsg {
   type: "osmosis/incentives/add-to-gauge-response";
   value: MsgAddToGaugeResponseAmino;
 }
@@ -162,6 +162,9 @@ function createBaseMsgCreateGauge(): MsgCreateGauge {
 }
 
 export const MsgCreateGauge = {
+  typeUrl: "/osmosis.incentives.MsgCreateGauge",
+  aminoType: "osmosis/incentives/create-gauge",
+
   encode(message: MsgCreateGauge, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.isPerpetual === true) {
       writer.uint32(8).bool(message.isPerpetual);
@@ -325,6 +328,32 @@ export const MsgCreateGauge = {
     obj.start_time = message.startTime ? Timestamp.toAmino(message.startTime) : undefined;
     obj.num_epochs_paid_over = message.numEpochsPaidOver ? message.numEpochsPaidOver.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCreateGaugeAminoMsg): MsgCreateGauge {
+    return MsgCreateGauge.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgCreateGauge): MsgCreateGaugeAminoMsg {
+    return {
+      type: "osmosis/incentives/create-gauge",
+      value: MsgCreateGauge.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgCreateGaugeProtoMsg): MsgCreateGauge {
+    return MsgCreateGauge.decode(message.value);
+  },
+
+  toProto(message: MsgCreateGauge): Uint8Array {
+    return MsgCreateGauge.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCreateGauge): MsgCreateGaugeProtoMsg {
+    return {
+      typeUrl: "/osmosis.incentives.MsgCreateGauge",
+      value: MsgCreateGauge.encode(message).finish()
+    };
   }
 
 };
@@ -334,6 +363,9 @@ function createBaseMsgCreateGaugeResponse(): MsgCreateGaugeResponse {
 }
 
 export const MsgCreateGaugeResponse = {
+  typeUrl: "/osmosis.incentives.MsgCreateGaugeResponse",
+  aminoType: "osmosis/incentives/create-gauge-response",
+
   encode(_: MsgCreateGaugeResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -386,6 +418,32 @@ export const MsgCreateGaugeResponse = {
   toAmino(_: MsgCreateGaugeResponse): MsgCreateGaugeResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCreateGaugeResponseAminoMsg): MsgCreateGaugeResponse {
+    return MsgCreateGaugeResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgCreateGaugeResponse): MsgCreateGaugeResponseAminoMsg {
+    return {
+      type: "osmosis/incentives/create-gauge-response",
+      value: MsgCreateGaugeResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgCreateGaugeResponseProtoMsg): MsgCreateGaugeResponse {
+    return MsgCreateGaugeResponse.decode(message.value);
+  },
+
+  toProto(message: MsgCreateGaugeResponse): Uint8Array {
+    return MsgCreateGaugeResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCreateGaugeResponse): MsgCreateGaugeResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.incentives.MsgCreateGaugeResponse",
+      value: MsgCreateGaugeResponse.encode(message).finish()
+    };
   }
 
 };
@@ -399,6 +457,9 @@ function createBaseMsgAddToGauge(): MsgAddToGauge {
 }
 
 export const MsgAddToGauge = {
+  typeUrl: "/osmosis.incentives.MsgAddToGauge",
+  aminoType: "osmosis/incentives/add-to-gauge",
+
   encode(message: MsgAddToGauge, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.owner !== "") {
       writer.uint32(10).string(message.owner);
@@ -517,6 +578,32 @@ export const MsgAddToGauge = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: MsgAddToGaugeAminoMsg): MsgAddToGauge {
+    return MsgAddToGauge.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgAddToGauge): MsgAddToGaugeAminoMsg {
+    return {
+      type: "osmosis/incentives/add-to-gauge",
+      value: MsgAddToGauge.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgAddToGaugeProtoMsg): MsgAddToGauge {
+    return MsgAddToGauge.decode(message.value);
+  },
+
+  toProto(message: MsgAddToGauge): Uint8Array {
+    return MsgAddToGauge.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgAddToGauge): MsgAddToGaugeProtoMsg {
+    return {
+      typeUrl: "/osmosis.incentives.MsgAddToGauge",
+      value: MsgAddToGauge.encode(message).finish()
+    };
   }
 
 };
@@ -526,6 +613,9 @@ function createBaseMsgAddToGaugeResponse(): MsgAddToGaugeResponse {
 }
 
 export const MsgAddToGaugeResponse = {
+  typeUrl: "/osmosis.incentives.MsgAddToGaugeResponse",
+  aminoType: "osmosis/incentives/add-to-gauge-response",
+
   encode(_: MsgAddToGaugeResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -578,6 +668,32 @@ export const MsgAddToGaugeResponse = {
   toAmino(_: MsgAddToGaugeResponse): MsgAddToGaugeResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgAddToGaugeResponseAminoMsg): MsgAddToGaugeResponse {
+    return MsgAddToGaugeResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgAddToGaugeResponse): MsgAddToGaugeResponseAminoMsg {
+    return {
+      type: "osmosis/incentives/add-to-gauge-response",
+      value: MsgAddToGaugeResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgAddToGaugeResponseProtoMsg): MsgAddToGaugeResponse {
+    return MsgAddToGaugeResponse.decode(message.value);
+  },
+
+  toProto(message: MsgAddToGaugeResponse): Uint8Array {
+    return MsgAddToGaugeResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgAddToGaugeResponse): MsgAddToGaugeResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.incentives.MsgAddToGaugeResponse",
+      value: MsgAddToGaugeResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/osmosis/lockup/genesis.ts b/__fixtures__/outputv2/osmosis/lockup/genesis.ts
index 97ed005b0..7441de3e5 100644
--- a/__fixtures__/outputv2/osmosis/lockup/genesis.ts
+++ b/__fixtures__/outputv2/osmosis/lockup/genesis.ts
@@ -9,7 +9,7 @@ export interface GenesisState {
   locks: PeriodLock[];
   syntheticLocks: SyntheticLock[];
 }
-export interface GenesisStateProtoType {
+export interface GenesisStateProtoMsg {
   typeUrl: "/osmosis.lockup.GenesisState";
   value: Uint8Array;
 }
@@ -20,7 +20,7 @@ export interface GenesisStateAmino {
   locks: PeriodLockAmino[];
   synthetic_locks: SyntheticLockAmino[];
 }
-export interface GenesisStateAminoType {
+export interface GenesisStateAminoMsg {
   type: "osmosis/lockup/genesis-state";
   value: GenesisStateAmino;
 }
@@ -41,6 +41,9 @@ function createBaseGenesisState(): GenesisState {
 }
 
 export const GenesisState = {
+  typeUrl: "/osmosis.lockup.GenesisState",
+  aminoType: "osmosis/lockup/genesis-state",
+
   encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.lastLockId.isZero()) {
       writer.uint32(8).uint64(message.lastLockId);
@@ -174,6 +177,32 @@ export const GenesisState = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisStateAminoMsg): GenesisState {
+    return GenesisState.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GenesisState): GenesisStateAminoMsg {
+    return {
+      type: "osmosis/lockup/genesis-state",
+      value: GenesisState.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GenesisStateProtoMsg): GenesisState {
+    return GenesisState.decode(message.value);
+  },
+
+  toProto(message: GenesisState): Uint8Array {
+    return GenesisState.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisState): GenesisStateProtoMsg {
+    return {
+      typeUrl: "/osmosis.lockup.GenesisState",
+      value: GenesisState.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/osmosis/lockup/lock.ts b/__fixtures__/outputv2/osmosis/lockup/lock.ts
index e6e43cc2d..1041855b4 100644
--- a/__fixtures__/outputv2/osmosis/lockup/lock.ts
+++ b/__fixtures__/outputv2/osmosis/lockup/lock.ts
@@ -83,7 +83,7 @@ export interface PeriodLock {
   /** Coins are the tokens locked within the lock, kept in the module account. */
   coins: Coin[];
 }
-export interface PeriodLockProtoType {
+export interface PeriodLockProtoMsg {
   typeUrl: "/osmosis.lockup.PeriodLock";
   value: Uint8Array;
 }
@@ -125,7 +125,7 @@ export interface PeriodLockAmino {
   /** Coins are the tokens locked within the lock, kept in the module account. */
   coins: CoinAmino[];
 }
-export interface PeriodLockAminoType {
+export interface PeriodLockAminoMsg {
   type: "osmosis/lockup/period-lock";
   value: PeriodLockAmino;
 }
@@ -171,7 +171,7 @@ export interface QueryCondition {
    */
   timestamp?: Date;
 }
-export interface QueryConditionProtoType {
+export interface QueryConditionProtoMsg {
   typeUrl: "/osmosis.lockup.QueryCondition";
   value: Uint8Array;
 }
@@ -202,7 +202,7 @@ export interface QueryConditionAmino {
    */
   timestamp?: Date;
 }
-export interface QueryConditionAminoType {
+export interface QueryConditionAminoMsg {
   type: "osmosis/lockup/query-condition";
   value: QueryConditionAmino;
 }
@@ -250,7 +250,7 @@ export interface SyntheticLock {
    */
   duration?: Duration;
 }
-export interface SyntheticLockProtoType {
+export interface SyntheticLockProtoMsg {
   typeUrl: "/osmosis.lockup.SyntheticLock";
   value: Uint8Array;
 }
@@ -286,7 +286,7 @@ export interface SyntheticLockAmino {
    */
   duration?: DurationAmino;
 }
-export interface SyntheticLockAminoType {
+export interface SyntheticLockAminoMsg {
   type: "osmosis/lockup/synthetic-lock";
   value: SyntheticLockAmino;
 }
@@ -315,6 +315,9 @@ function createBasePeriodLock(): PeriodLock {
 }
 
 export const PeriodLock = {
+  typeUrl: "/osmosis.lockup.PeriodLock",
+  aminoType: "osmosis/lockup/period-lock",
+
   encode(message: PeriodLock, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.ID.isZero()) {
       writer.uint32(8).uint64(message.ID);
@@ -463,6 +466,32 @@ export const PeriodLock = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: PeriodLockAminoMsg): PeriodLock {
+    return PeriodLock.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: PeriodLock): PeriodLockAminoMsg {
+    return {
+      type: "osmosis/lockup/period-lock",
+      value: PeriodLock.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: PeriodLockProtoMsg): PeriodLock {
+    return PeriodLock.decode(message.value);
+  },
+
+  toProto(message: PeriodLock): Uint8Array {
+    return PeriodLock.encode(message).finish();
+  },
+
+  toProtoMsg(message: PeriodLock): PeriodLockProtoMsg {
+    return {
+      typeUrl: "/osmosis.lockup.PeriodLock",
+      value: PeriodLock.encode(message).finish()
+    };
   }
 
 };
@@ -477,6 +506,9 @@ function createBaseQueryCondition(): QueryCondition {
 }
 
 export const QueryCondition = {
+  typeUrl: "/osmosis.lockup.QueryCondition",
+  aminoType: "osmosis/lockup/query-condition",
+
   encode(message: QueryCondition, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.lockQueryType !== 0) {
       writer.uint32(8).int32(message.lockQueryType);
@@ -592,6 +624,32 @@ export const QueryCondition = {
     obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined;
     obj.timestamp = message.timestamp ? Timestamp.toAmino(message.timestamp) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryConditionAminoMsg): QueryCondition {
+    return QueryCondition.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryCondition): QueryConditionAminoMsg {
+    return {
+      type: "osmosis/lockup/query-condition",
+      value: QueryCondition.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryConditionProtoMsg): QueryCondition {
+    return QueryCondition.decode(message.value);
+  },
+
+  toProto(message: QueryCondition): Uint8Array {
+    return QueryCondition.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryCondition): QueryConditionProtoMsg {
+    return {
+      typeUrl: "/osmosis.lockup.QueryCondition",
+      value: QueryCondition.encode(message).finish()
+    };
   }
 
 };
@@ -606,6 +664,9 @@ function createBaseSyntheticLock(): SyntheticLock {
 }
 
 export const SyntheticLock = {
+  typeUrl: "/osmosis.lockup.SyntheticLock",
+  aminoType: "osmosis/lockup/synthetic-lock",
+
   encode(message: SyntheticLock, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.underlyingLockId.isZero()) {
       writer.uint32(8).uint64(message.underlyingLockId);
@@ -721,6 +782,32 @@ export const SyntheticLock = {
     obj.end_time = message.endTime ? Timestamp.toAmino(message.endTime) : undefined;
     obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: SyntheticLockAminoMsg): SyntheticLock {
+    return SyntheticLock.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: SyntheticLock): SyntheticLockAminoMsg {
+    return {
+      type: "osmosis/lockup/synthetic-lock",
+      value: SyntheticLock.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: SyntheticLockProtoMsg): SyntheticLock {
+    return SyntheticLock.decode(message.value);
+  },
+
+  toProto(message: SyntheticLock): Uint8Array {
+    return SyntheticLock.encode(message).finish();
+  },
+
+  toProtoMsg(message: SyntheticLock): SyntheticLockProtoMsg {
+    return {
+      typeUrl: "/osmosis.lockup.SyntheticLock",
+      value: SyntheticLock.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/osmosis/lockup/params.ts b/__fixtures__/outputv2/osmosis/lockup/params.ts
index a15b94c6a..9be20b697 100644
--- a/__fixtures__/outputv2/osmosis/lockup/params.ts
+++ b/__fixtures__/outputv2/osmosis/lockup/params.ts
@@ -4,14 +4,14 @@ export const protobufPackage = "osmosis.lockup";
 export interface Params {
   forceUnlockAllowedAddresses: string[];
 }
-export interface ParamsProtoType {
+export interface ParamsProtoMsg {
   typeUrl: "/osmosis.lockup.Params";
   value: Uint8Array;
 }
 export interface ParamsAmino {
   force_unlock_allowed_addresses: string[];
 }
-export interface ParamsAminoType {
+export interface ParamsAminoMsg {
   type: "osmosis/lockup/params";
   value: ParamsAmino;
 }
@@ -26,6 +26,9 @@ function createBaseParams(): Params {
 }
 
 export const Params = {
+  typeUrl: "/osmosis.lockup.Params",
+  aminoType: "osmosis/lockup/params",
+
   encode(message: Params, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.forceUnlockAllowedAddresses) {
       writer.uint32(10).string(v!);
@@ -114,6 +117,32 @@ export const Params = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ParamsAminoMsg): Params {
+    return Params.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Params): ParamsAminoMsg {
+    return {
+      type: "osmosis/lockup/params",
+      value: Params.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ParamsProtoMsg): Params {
+    return Params.decode(message.value);
+  },
+
+  toProto(message: Params): Uint8Array {
+    return Params.encode(message).finish();
+  },
+
+  toProtoMsg(message: Params): ParamsProtoMsg {
+    return {
+      typeUrl: "/osmosis.lockup.Params",
+      value: Params.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/osmosis/lockup/query.ts b/__fixtures__/outputv2/osmosis/lockup/query.ts
index efc7c0216..6bcde3283 100644
--- a/__fixtures__/outputv2/osmosis/lockup/query.ts
+++ b/__fixtures__/outputv2/osmosis/lockup/query.ts
@@ -7,12 +7,12 @@ import * as _m0 from "protobufjs/minimal";
 import { DeepPartial, isSet, toTimestamp, fromTimestamp, fromJsonTimestamp, Long } from "../../helpers";
 export const protobufPackage = "osmosis.lockup";
 export interface ModuleBalanceRequest {}
-export interface ModuleBalanceRequestProtoType {
+export interface ModuleBalanceRequestProtoMsg {
   typeUrl: "/osmosis.lockup.ModuleBalanceRequest";
   value: Uint8Array;
 }
 export interface ModuleBalanceRequestAmino {}
-export interface ModuleBalanceRequestAminoType {
+export interface ModuleBalanceRequestAminoMsg {
   type: "osmosis/lockup/module-balance-request";
   value: ModuleBalanceRequestAmino;
 }
@@ -20,14 +20,14 @@ export interface ModuleBalanceRequestSDKType {}
 export interface ModuleBalanceResponse {
   coins: Coin[];
 }
-export interface ModuleBalanceResponseProtoType {
+export interface ModuleBalanceResponseProtoMsg {
   typeUrl: "/osmosis.lockup.ModuleBalanceResponse";
   value: Uint8Array;
 }
 export interface ModuleBalanceResponseAmino {
   coins: CoinAmino[];
 }
-export interface ModuleBalanceResponseAminoType {
+export interface ModuleBalanceResponseAminoMsg {
   type: "osmosis/lockup/module-balance-response";
   value: ModuleBalanceResponseAmino;
 }
@@ -35,12 +35,12 @@ export interface ModuleBalanceResponseSDKType {
   coins: CoinSDKType[];
 }
 export interface ModuleLockedAmountRequest {}
-export interface ModuleLockedAmountRequestProtoType {
+export interface ModuleLockedAmountRequestProtoMsg {
   typeUrl: "/osmosis.lockup.ModuleLockedAmountRequest";
   value: Uint8Array;
 }
 export interface ModuleLockedAmountRequestAmino {}
-export interface ModuleLockedAmountRequestAminoType {
+export interface ModuleLockedAmountRequestAminoMsg {
   type: "osmosis/lockup/module-locked-amount-request";
   value: ModuleLockedAmountRequestAmino;
 }
@@ -48,14 +48,14 @@ export interface ModuleLockedAmountRequestSDKType {}
 export interface ModuleLockedAmountResponse {
   coins: Coin[];
 }
-export interface ModuleLockedAmountResponseProtoType {
+export interface ModuleLockedAmountResponseProtoMsg {
   typeUrl: "/osmosis.lockup.ModuleLockedAmountResponse";
   value: Uint8Array;
 }
 export interface ModuleLockedAmountResponseAmino {
   coins: CoinAmino[];
 }
-export interface ModuleLockedAmountResponseAminoType {
+export interface ModuleLockedAmountResponseAminoMsg {
   type: "osmosis/lockup/module-locked-amount-response";
   value: ModuleLockedAmountResponseAmino;
 }
@@ -65,14 +65,14 @@ export interface ModuleLockedAmountResponseSDKType {
 export interface AccountUnlockableCoinsRequest {
   owner: string;
 }
-export interface AccountUnlockableCoinsRequestProtoType {
+export interface AccountUnlockableCoinsRequestProtoMsg {
   typeUrl: "/osmosis.lockup.AccountUnlockableCoinsRequest";
   value: Uint8Array;
 }
 export interface AccountUnlockableCoinsRequestAmino {
   owner: string;
 }
-export interface AccountUnlockableCoinsRequestAminoType {
+export interface AccountUnlockableCoinsRequestAminoMsg {
   type: "osmosis/lockup/account-unlockable-coins-request";
   value: AccountUnlockableCoinsRequestAmino;
 }
@@ -82,14 +82,14 @@ export interface AccountUnlockableCoinsRequestSDKType {
 export interface AccountUnlockableCoinsResponse {
   coins: Coin[];
 }
-export interface AccountUnlockableCoinsResponseProtoType {
+export interface AccountUnlockableCoinsResponseProtoMsg {
   typeUrl: "/osmosis.lockup.AccountUnlockableCoinsResponse";
   value: Uint8Array;
 }
 export interface AccountUnlockableCoinsResponseAmino {
   coins: CoinAmino[];
 }
-export interface AccountUnlockableCoinsResponseAminoType {
+export interface AccountUnlockableCoinsResponseAminoMsg {
   type: "osmosis/lockup/account-unlockable-coins-response";
   value: AccountUnlockableCoinsResponseAmino;
 }
@@ -99,14 +99,14 @@ export interface AccountUnlockableCoinsResponseSDKType {
 export interface AccountUnlockingCoinsRequest {
   owner: string;
 }
-export interface AccountUnlockingCoinsRequestProtoType {
+export interface AccountUnlockingCoinsRequestProtoMsg {
   typeUrl: "/osmosis.lockup.AccountUnlockingCoinsRequest";
   value: Uint8Array;
 }
 export interface AccountUnlockingCoinsRequestAmino {
   owner: string;
 }
-export interface AccountUnlockingCoinsRequestAminoType {
+export interface AccountUnlockingCoinsRequestAminoMsg {
   type: "osmosis/lockup/account-unlocking-coins-request";
   value: AccountUnlockingCoinsRequestAmino;
 }
@@ -116,14 +116,14 @@ export interface AccountUnlockingCoinsRequestSDKType {
 export interface AccountUnlockingCoinsResponse {
   coins: Coin[];
 }
-export interface AccountUnlockingCoinsResponseProtoType {
+export interface AccountUnlockingCoinsResponseProtoMsg {
   typeUrl: "/osmosis.lockup.AccountUnlockingCoinsResponse";
   value: Uint8Array;
 }
 export interface AccountUnlockingCoinsResponseAmino {
   coins: CoinAmino[];
 }
-export interface AccountUnlockingCoinsResponseAminoType {
+export interface AccountUnlockingCoinsResponseAminoMsg {
   type: "osmosis/lockup/account-unlocking-coins-response";
   value: AccountUnlockingCoinsResponseAmino;
 }
@@ -133,14 +133,14 @@ export interface AccountUnlockingCoinsResponseSDKType {
 export interface AccountLockedCoinsRequest {
   owner: string;
 }
-export interface AccountLockedCoinsRequestProtoType {
+export interface AccountLockedCoinsRequestProtoMsg {
   typeUrl: "/osmosis.lockup.AccountLockedCoinsRequest";
   value: Uint8Array;
 }
 export interface AccountLockedCoinsRequestAmino {
   owner: string;
 }
-export interface AccountLockedCoinsRequestAminoType {
+export interface AccountLockedCoinsRequestAminoMsg {
   type: "osmosis/lockup/account-locked-coins-request";
   value: AccountLockedCoinsRequestAmino;
 }
@@ -150,14 +150,14 @@ export interface AccountLockedCoinsRequestSDKType {
 export interface AccountLockedCoinsResponse {
   coins: Coin[];
 }
-export interface AccountLockedCoinsResponseProtoType {
+export interface AccountLockedCoinsResponseProtoMsg {
   typeUrl: "/osmosis.lockup.AccountLockedCoinsResponse";
   value: Uint8Array;
 }
 export interface AccountLockedCoinsResponseAmino {
   coins: CoinAmino[];
 }
-export interface AccountLockedCoinsResponseAminoType {
+export interface AccountLockedCoinsResponseAminoMsg {
   type: "osmosis/lockup/account-locked-coins-response";
   value: AccountLockedCoinsResponseAmino;
 }
@@ -168,7 +168,7 @@ export interface AccountLockedPastTimeRequest {
   owner: string;
   timestamp?: Date;
 }
-export interface AccountLockedPastTimeRequestProtoType {
+export interface AccountLockedPastTimeRequestProtoMsg {
   typeUrl: "/osmosis.lockup.AccountLockedPastTimeRequest";
   value: Uint8Array;
 }
@@ -176,7 +176,7 @@ export interface AccountLockedPastTimeRequestAmino {
   owner: string;
   timestamp?: Date;
 }
-export interface AccountLockedPastTimeRequestAminoType {
+export interface AccountLockedPastTimeRequestAminoMsg {
   type: "osmosis/lockup/account-locked-past-time-request";
   value: AccountLockedPastTimeRequestAmino;
 }
@@ -187,14 +187,14 @@ export interface AccountLockedPastTimeRequestSDKType {
 export interface AccountLockedPastTimeResponse {
   locks: PeriodLock[];
 }
-export interface AccountLockedPastTimeResponseProtoType {
+export interface AccountLockedPastTimeResponseProtoMsg {
   typeUrl: "/osmosis.lockup.AccountLockedPastTimeResponse";
   value: Uint8Array;
 }
 export interface AccountLockedPastTimeResponseAmino {
   locks: PeriodLockAmino[];
 }
-export interface AccountLockedPastTimeResponseAminoType {
+export interface AccountLockedPastTimeResponseAminoMsg {
   type: "osmosis/lockup/account-locked-past-time-response";
   value: AccountLockedPastTimeResponseAmino;
 }
@@ -205,7 +205,7 @@ export interface AccountLockedPastTimeNotUnlockingOnlyRequest {
   owner: string;
   timestamp?: Date;
 }
-export interface AccountLockedPastTimeNotUnlockingOnlyRequestProtoType {
+export interface AccountLockedPastTimeNotUnlockingOnlyRequestProtoMsg {
   typeUrl: "/osmosis.lockup.AccountLockedPastTimeNotUnlockingOnlyRequest";
   value: Uint8Array;
 }
@@ -213,7 +213,7 @@ export interface AccountLockedPastTimeNotUnlockingOnlyRequestAmino {
   owner: string;
   timestamp?: Date;
 }
-export interface AccountLockedPastTimeNotUnlockingOnlyRequestAminoType {
+export interface AccountLockedPastTimeNotUnlockingOnlyRequestAminoMsg {
   type: "osmosis/lockup/account-locked-past-time-not-unlocking-only-request";
   value: AccountLockedPastTimeNotUnlockingOnlyRequestAmino;
 }
@@ -224,14 +224,14 @@ export interface AccountLockedPastTimeNotUnlockingOnlyRequestSDKType {
 export interface AccountLockedPastTimeNotUnlockingOnlyResponse {
   locks: PeriodLock[];
 }
-export interface AccountLockedPastTimeNotUnlockingOnlyResponseProtoType {
+export interface AccountLockedPastTimeNotUnlockingOnlyResponseProtoMsg {
   typeUrl: "/osmosis.lockup.AccountLockedPastTimeNotUnlockingOnlyResponse";
   value: Uint8Array;
 }
 export interface AccountLockedPastTimeNotUnlockingOnlyResponseAmino {
   locks: PeriodLockAmino[];
 }
-export interface AccountLockedPastTimeNotUnlockingOnlyResponseAminoType {
+export interface AccountLockedPastTimeNotUnlockingOnlyResponseAminoMsg {
   type: "osmosis/lockup/account-locked-past-time-not-unlocking-only-response";
   value: AccountLockedPastTimeNotUnlockingOnlyResponseAmino;
 }
@@ -242,7 +242,7 @@ export interface AccountUnlockedBeforeTimeRequest {
   owner: string;
   timestamp?: Date;
 }
-export interface AccountUnlockedBeforeTimeRequestProtoType {
+export interface AccountUnlockedBeforeTimeRequestProtoMsg {
   typeUrl: "/osmosis.lockup.AccountUnlockedBeforeTimeRequest";
   value: Uint8Array;
 }
@@ -250,7 +250,7 @@ export interface AccountUnlockedBeforeTimeRequestAmino {
   owner: string;
   timestamp?: Date;
 }
-export interface AccountUnlockedBeforeTimeRequestAminoType {
+export interface AccountUnlockedBeforeTimeRequestAminoMsg {
   type: "osmosis/lockup/account-unlocked-before-time-request";
   value: AccountUnlockedBeforeTimeRequestAmino;
 }
@@ -261,14 +261,14 @@ export interface AccountUnlockedBeforeTimeRequestSDKType {
 export interface AccountUnlockedBeforeTimeResponse {
   locks: PeriodLock[];
 }
-export interface AccountUnlockedBeforeTimeResponseProtoType {
+export interface AccountUnlockedBeforeTimeResponseProtoMsg {
   typeUrl: "/osmosis.lockup.AccountUnlockedBeforeTimeResponse";
   value: Uint8Array;
 }
 export interface AccountUnlockedBeforeTimeResponseAmino {
   locks: PeriodLockAmino[];
 }
-export interface AccountUnlockedBeforeTimeResponseAminoType {
+export interface AccountUnlockedBeforeTimeResponseAminoMsg {
   type: "osmosis/lockup/account-unlocked-before-time-response";
   value: AccountUnlockedBeforeTimeResponseAmino;
 }
@@ -280,7 +280,7 @@ export interface AccountLockedPastTimeDenomRequest {
   timestamp?: Date;
   denom: string;
 }
-export interface AccountLockedPastTimeDenomRequestProtoType {
+export interface AccountLockedPastTimeDenomRequestProtoMsg {
   typeUrl: "/osmosis.lockup.AccountLockedPastTimeDenomRequest";
   value: Uint8Array;
 }
@@ -289,7 +289,7 @@ export interface AccountLockedPastTimeDenomRequestAmino {
   timestamp?: Date;
   denom: string;
 }
-export interface AccountLockedPastTimeDenomRequestAminoType {
+export interface AccountLockedPastTimeDenomRequestAminoMsg {
   type: "osmosis/lockup/account-locked-past-time-denom-request";
   value: AccountLockedPastTimeDenomRequestAmino;
 }
@@ -301,14 +301,14 @@ export interface AccountLockedPastTimeDenomRequestSDKType {
 export interface AccountLockedPastTimeDenomResponse {
   locks: PeriodLock[];
 }
-export interface AccountLockedPastTimeDenomResponseProtoType {
+export interface AccountLockedPastTimeDenomResponseProtoMsg {
   typeUrl: "/osmosis.lockup.AccountLockedPastTimeDenomResponse";
   value: Uint8Array;
 }
 export interface AccountLockedPastTimeDenomResponseAmino {
   locks: PeriodLockAmino[];
 }
-export interface AccountLockedPastTimeDenomResponseAminoType {
+export interface AccountLockedPastTimeDenomResponseAminoMsg {
   type: "osmosis/lockup/account-locked-past-time-denom-response";
   value: AccountLockedPastTimeDenomResponseAmino;
 }
@@ -319,7 +319,7 @@ export interface LockedDenomRequest {
   denom: string;
   duration?: Duration;
 }
-export interface LockedDenomRequestProtoType {
+export interface LockedDenomRequestProtoMsg {
   typeUrl: "/osmosis.lockup.LockedDenomRequest";
   value: Uint8Array;
 }
@@ -327,7 +327,7 @@ export interface LockedDenomRequestAmino {
   denom: string;
   duration?: DurationAmino;
 }
-export interface LockedDenomRequestAminoType {
+export interface LockedDenomRequestAminoMsg {
   type: "osmosis/lockup/locked-denom-request";
   value: LockedDenomRequestAmino;
 }
@@ -338,14 +338,14 @@ export interface LockedDenomRequestSDKType {
 export interface LockedDenomResponse {
   amount: string;
 }
-export interface LockedDenomResponseProtoType {
+export interface LockedDenomResponseProtoMsg {
   typeUrl: "/osmosis.lockup.LockedDenomResponse";
   value: Uint8Array;
 }
 export interface LockedDenomResponseAmino {
   amount: string;
 }
-export interface LockedDenomResponseAminoType {
+export interface LockedDenomResponseAminoMsg {
   type: "osmosis/lockup/locked-denom-response";
   value: LockedDenomResponseAmino;
 }
@@ -355,14 +355,14 @@ export interface LockedDenomResponseSDKType {
 export interface LockedRequest {
   lockId: Long;
 }
-export interface LockedRequestProtoType {
+export interface LockedRequestProtoMsg {
   typeUrl: "/osmosis.lockup.LockedRequest";
   value: Uint8Array;
 }
 export interface LockedRequestAmino {
   lock_id: string;
 }
-export interface LockedRequestAminoType {
+export interface LockedRequestAminoMsg {
   type: "osmosis/lockup/locked-request";
   value: LockedRequestAmino;
 }
@@ -372,14 +372,14 @@ export interface LockedRequestSDKType {
 export interface LockedResponse {
   lock?: PeriodLock;
 }
-export interface LockedResponseProtoType {
+export interface LockedResponseProtoMsg {
   typeUrl: "/osmosis.lockup.LockedResponse";
   value: Uint8Array;
 }
 export interface LockedResponseAmino {
   lock?: PeriodLockAmino;
 }
-export interface LockedResponseAminoType {
+export interface LockedResponseAminoMsg {
   type: "osmosis/lockup/locked-response";
   value: LockedResponseAmino;
 }
@@ -389,14 +389,14 @@ export interface LockedResponseSDKType {
 export interface SyntheticLockupsByLockupIDRequest {
   lockId: Long;
 }
-export interface SyntheticLockupsByLockupIDRequestProtoType {
+export interface SyntheticLockupsByLockupIDRequestProtoMsg {
   typeUrl: "/osmosis.lockup.SyntheticLockupsByLockupIDRequest";
   value: Uint8Array;
 }
 export interface SyntheticLockupsByLockupIDRequestAmino {
   lock_id: string;
 }
-export interface SyntheticLockupsByLockupIDRequestAminoType {
+export interface SyntheticLockupsByLockupIDRequestAminoMsg {
   type: "osmosis/lockup/synthetic-lockups-by-lockup-id-request";
   value: SyntheticLockupsByLockupIDRequestAmino;
 }
@@ -406,14 +406,14 @@ export interface SyntheticLockupsByLockupIDRequestSDKType {
 export interface SyntheticLockupsByLockupIDResponse {
   syntheticLocks: SyntheticLock[];
 }
-export interface SyntheticLockupsByLockupIDResponseProtoType {
+export interface SyntheticLockupsByLockupIDResponseProtoMsg {
   typeUrl: "/osmosis.lockup.SyntheticLockupsByLockupIDResponse";
   value: Uint8Array;
 }
 export interface SyntheticLockupsByLockupIDResponseAmino {
   synthetic_locks: SyntheticLockAmino[];
 }
-export interface SyntheticLockupsByLockupIDResponseAminoType {
+export interface SyntheticLockupsByLockupIDResponseAminoMsg {
   type: "osmosis/lockup/synthetic-lockups-by-lockup-id-response";
   value: SyntheticLockupsByLockupIDResponseAmino;
 }
@@ -424,7 +424,7 @@ export interface AccountLockedLongerDurationRequest {
   owner: string;
   duration?: Duration;
 }
-export interface AccountLockedLongerDurationRequestProtoType {
+export interface AccountLockedLongerDurationRequestProtoMsg {
   typeUrl: "/osmosis.lockup.AccountLockedLongerDurationRequest";
   value: Uint8Array;
 }
@@ -432,7 +432,7 @@ export interface AccountLockedLongerDurationRequestAmino {
   owner: string;
   duration?: DurationAmino;
 }
-export interface AccountLockedLongerDurationRequestAminoType {
+export interface AccountLockedLongerDurationRequestAminoMsg {
   type: "osmosis/lockup/account-locked-longer-duration-request";
   value: AccountLockedLongerDurationRequestAmino;
 }
@@ -443,14 +443,14 @@ export interface AccountLockedLongerDurationRequestSDKType {
 export interface AccountLockedLongerDurationResponse {
   locks: PeriodLock[];
 }
-export interface AccountLockedLongerDurationResponseProtoType {
+export interface AccountLockedLongerDurationResponseProtoMsg {
   typeUrl: "/osmosis.lockup.AccountLockedLongerDurationResponse";
   value: Uint8Array;
 }
 export interface AccountLockedLongerDurationResponseAmino {
   locks: PeriodLockAmino[];
 }
-export interface AccountLockedLongerDurationResponseAminoType {
+export interface AccountLockedLongerDurationResponseAminoMsg {
   type: "osmosis/lockup/account-locked-longer-duration-response";
   value: AccountLockedLongerDurationResponseAmino;
 }
@@ -461,7 +461,7 @@ export interface AccountLockedDurationRequest {
   owner: string;
   duration?: Duration;
 }
-export interface AccountLockedDurationRequestProtoType {
+export interface AccountLockedDurationRequestProtoMsg {
   typeUrl: "/osmosis.lockup.AccountLockedDurationRequest";
   value: Uint8Array;
 }
@@ -469,7 +469,7 @@ export interface AccountLockedDurationRequestAmino {
   owner: string;
   duration?: DurationAmino;
 }
-export interface AccountLockedDurationRequestAminoType {
+export interface AccountLockedDurationRequestAminoMsg {
   type: "osmosis/lockup/account-locked-duration-request";
   value: AccountLockedDurationRequestAmino;
 }
@@ -480,14 +480,14 @@ export interface AccountLockedDurationRequestSDKType {
 export interface AccountLockedDurationResponse {
   locks: PeriodLock[];
 }
-export interface AccountLockedDurationResponseProtoType {
+export interface AccountLockedDurationResponseProtoMsg {
   typeUrl: "/osmosis.lockup.AccountLockedDurationResponse";
   value: Uint8Array;
 }
 export interface AccountLockedDurationResponseAmino {
   locks: PeriodLockAmino[];
 }
-export interface AccountLockedDurationResponseAminoType {
+export interface AccountLockedDurationResponseAminoMsg {
   type: "osmosis/lockup/account-locked-duration-response";
   value: AccountLockedDurationResponseAmino;
 }
@@ -498,7 +498,7 @@ export interface AccountLockedLongerDurationNotUnlockingOnlyRequest {
   owner: string;
   duration?: Duration;
 }
-export interface AccountLockedLongerDurationNotUnlockingOnlyRequestProtoType {
+export interface AccountLockedLongerDurationNotUnlockingOnlyRequestProtoMsg {
   typeUrl: "/osmosis.lockup.AccountLockedLongerDurationNotUnlockingOnlyRequest";
   value: Uint8Array;
 }
@@ -506,7 +506,7 @@ export interface AccountLockedLongerDurationNotUnlockingOnlyRequestAmino {
   owner: string;
   duration?: DurationAmino;
 }
-export interface AccountLockedLongerDurationNotUnlockingOnlyRequestAminoType {
+export interface AccountLockedLongerDurationNotUnlockingOnlyRequestAminoMsg {
   type: "osmosis/lockup/account-locked-longer-duration-not-unlocking-only-request";
   value: AccountLockedLongerDurationNotUnlockingOnlyRequestAmino;
 }
@@ -517,14 +517,14 @@ export interface AccountLockedLongerDurationNotUnlockingOnlyRequestSDKType {
 export interface AccountLockedLongerDurationNotUnlockingOnlyResponse {
   locks: PeriodLock[];
 }
-export interface AccountLockedLongerDurationNotUnlockingOnlyResponseProtoType {
+export interface AccountLockedLongerDurationNotUnlockingOnlyResponseProtoMsg {
   typeUrl: "/osmosis.lockup.AccountLockedLongerDurationNotUnlockingOnlyResponse";
   value: Uint8Array;
 }
 export interface AccountLockedLongerDurationNotUnlockingOnlyResponseAmino {
   locks: PeriodLockAmino[];
 }
-export interface AccountLockedLongerDurationNotUnlockingOnlyResponseAminoType {
+export interface AccountLockedLongerDurationNotUnlockingOnlyResponseAminoMsg {
   type: "osmosis/lockup/account-locked-longer-duration-not-unlocking-only-response";
   value: AccountLockedLongerDurationNotUnlockingOnlyResponseAmino;
 }
@@ -536,7 +536,7 @@ export interface AccountLockedLongerDurationDenomRequest {
   duration?: Duration;
   denom: string;
 }
-export interface AccountLockedLongerDurationDenomRequestProtoType {
+export interface AccountLockedLongerDurationDenomRequestProtoMsg {
   typeUrl: "/osmosis.lockup.AccountLockedLongerDurationDenomRequest";
   value: Uint8Array;
 }
@@ -545,7 +545,7 @@ export interface AccountLockedLongerDurationDenomRequestAmino {
   duration?: DurationAmino;
   denom: string;
 }
-export interface AccountLockedLongerDurationDenomRequestAminoType {
+export interface AccountLockedLongerDurationDenomRequestAminoMsg {
   type: "osmosis/lockup/account-locked-longer-duration-denom-request";
   value: AccountLockedLongerDurationDenomRequestAmino;
 }
@@ -557,14 +557,14 @@ export interface AccountLockedLongerDurationDenomRequestSDKType {
 export interface AccountLockedLongerDurationDenomResponse {
   locks: PeriodLock[];
 }
-export interface AccountLockedLongerDurationDenomResponseProtoType {
+export interface AccountLockedLongerDurationDenomResponseProtoMsg {
   typeUrl: "/osmosis.lockup.AccountLockedLongerDurationDenomResponse";
   value: Uint8Array;
 }
 export interface AccountLockedLongerDurationDenomResponseAmino {
   locks: PeriodLockAmino[];
 }
-export interface AccountLockedLongerDurationDenomResponseAminoType {
+export interface AccountLockedLongerDurationDenomResponseAminoMsg {
   type: "osmosis/lockup/account-locked-longer-duration-denom-response";
   value: AccountLockedLongerDurationDenomResponseAmino;
 }
@@ -572,12 +572,12 @@ export interface AccountLockedLongerDurationDenomResponseSDKType {
   locks: PeriodLockSDKType[];
 }
 export interface QueryParamsRequest {}
-export interface QueryParamsRequestProtoType {
+export interface QueryParamsRequestProtoMsg {
   typeUrl: "/osmosis.lockup.QueryParamsRequest";
   value: Uint8Array;
 }
 export interface QueryParamsRequestAmino {}
-export interface QueryParamsRequestAminoType {
+export interface QueryParamsRequestAminoMsg {
   type: "osmosis/lockup/query-params-request";
   value: QueryParamsRequestAmino;
 }
@@ -585,14 +585,14 @@ export interface QueryParamsRequestSDKType {}
 export interface QueryParamsResponse {
   params?: Params;
 }
-export interface QueryParamsResponseProtoType {
+export interface QueryParamsResponseProtoMsg {
   typeUrl: "/osmosis.lockup.QueryParamsResponse";
   value: Uint8Array;
 }
 export interface QueryParamsResponseAmino {
   params?: ParamsAmino;
 }
-export interface QueryParamsResponseAminoType {
+export interface QueryParamsResponseAminoMsg {
   type: "osmosis/lockup/query-params-response";
   value: QueryParamsResponseAmino;
 }
@@ -605,6 +605,9 @@ function createBaseModuleBalanceRequest(): ModuleBalanceRequest {
 }
 
 export const ModuleBalanceRequest = {
+  typeUrl: "/osmosis.lockup.ModuleBalanceRequest",
+  aminoType: "osmosis/lockup/module-balance-request",
+
   encode(_: ModuleBalanceRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -657,6 +660,32 @@ export const ModuleBalanceRequest = {
   toAmino(_: ModuleBalanceRequest): ModuleBalanceRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: ModuleBalanceRequestAminoMsg): ModuleBalanceRequest {
+    return ModuleBalanceRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ModuleBalanceRequest): ModuleBalanceRequestAminoMsg {
+    return {
+      type: "osmosis/lockup/module-balance-request",
+      value: ModuleBalanceRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ModuleBalanceRequestProtoMsg): ModuleBalanceRequest {
+    return ModuleBalanceRequest.decode(message.value);
+  },
+
+  toProto(message: ModuleBalanceRequest): Uint8Array {
+    return ModuleBalanceRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: ModuleBalanceRequest): ModuleBalanceRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.lockup.ModuleBalanceRequest",
+      value: ModuleBalanceRequest.encode(message).finish()
+    };
   }
 
 };
@@ -668,6 +697,9 @@ function createBaseModuleBalanceResponse(): ModuleBalanceResponse {
 }
 
 export const ModuleBalanceResponse = {
+  typeUrl: "/osmosis.lockup.ModuleBalanceResponse",
+  aminoType: "osmosis/lockup/module-balance-response",
+
   encode(message: ModuleBalanceResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.coins) {
       Coin.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -756,6 +788,32 @@ export const ModuleBalanceResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ModuleBalanceResponseAminoMsg): ModuleBalanceResponse {
+    return ModuleBalanceResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ModuleBalanceResponse): ModuleBalanceResponseAminoMsg {
+    return {
+      type: "osmosis/lockup/module-balance-response",
+      value: ModuleBalanceResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ModuleBalanceResponseProtoMsg): ModuleBalanceResponse {
+    return ModuleBalanceResponse.decode(message.value);
+  },
+
+  toProto(message: ModuleBalanceResponse): Uint8Array {
+    return ModuleBalanceResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: ModuleBalanceResponse): ModuleBalanceResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.lockup.ModuleBalanceResponse",
+      value: ModuleBalanceResponse.encode(message).finish()
+    };
   }
 
 };
@@ -765,6 +823,9 @@ function createBaseModuleLockedAmountRequest(): ModuleLockedAmountRequest {
 }
 
 export const ModuleLockedAmountRequest = {
+  typeUrl: "/osmosis.lockup.ModuleLockedAmountRequest",
+  aminoType: "osmosis/lockup/module-locked-amount-request",
+
   encode(_: ModuleLockedAmountRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -817,6 +878,32 @@ export const ModuleLockedAmountRequest = {
   toAmino(_: ModuleLockedAmountRequest): ModuleLockedAmountRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: ModuleLockedAmountRequestAminoMsg): ModuleLockedAmountRequest {
+    return ModuleLockedAmountRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ModuleLockedAmountRequest): ModuleLockedAmountRequestAminoMsg {
+    return {
+      type: "osmosis/lockup/module-locked-amount-request",
+      value: ModuleLockedAmountRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ModuleLockedAmountRequestProtoMsg): ModuleLockedAmountRequest {
+    return ModuleLockedAmountRequest.decode(message.value);
+  },
+
+  toProto(message: ModuleLockedAmountRequest): Uint8Array {
+    return ModuleLockedAmountRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: ModuleLockedAmountRequest): ModuleLockedAmountRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.lockup.ModuleLockedAmountRequest",
+      value: ModuleLockedAmountRequest.encode(message).finish()
+    };
   }
 
 };
@@ -828,6 +915,9 @@ function createBaseModuleLockedAmountResponse(): ModuleLockedAmountResponse {
 }
 
 export const ModuleLockedAmountResponse = {
+  typeUrl: "/osmosis.lockup.ModuleLockedAmountResponse",
+  aminoType: "osmosis/lockup/module-locked-amount-response",
+
   encode(message: ModuleLockedAmountResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.coins) {
       Coin.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -916,6 +1006,32 @@ export const ModuleLockedAmountResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ModuleLockedAmountResponseAminoMsg): ModuleLockedAmountResponse {
+    return ModuleLockedAmountResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ModuleLockedAmountResponse): ModuleLockedAmountResponseAminoMsg {
+    return {
+      type: "osmosis/lockup/module-locked-amount-response",
+      value: ModuleLockedAmountResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ModuleLockedAmountResponseProtoMsg): ModuleLockedAmountResponse {
+    return ModuleLockedAmountResponse.decode(message.value);
+  },
+
+  toProto(message: ModuleLockedAmountResponse): Uint8Array {
+    return ModuleLockedAmountResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: ModuleLockedAmountResponse): ModuleLockedAmountResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.lockup.ModuleLockedAmountResponse",
+      value: ModuleLockedAmountResponse.encode(message).finish()
+    };
   }
 
 };
@@ -927,6 +1043,9 @@ function createBaseAccountUnlockableCoinsRequest(): AccountUnlockableCoinsReques
 }
 
 export const AccountUnlockableCoinsRequest = {
+  typeUrl: "/osmosis.lockup.AccountUnlockableCoinsRequest",
+  aminoType: "osmosis/lockup/account-unlockable-coins-request",
+
   encode(message: AccountUnlockableCoinsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.owner !== "") {
       writer.uint32(10).string(message.owner);
@@ -997,6 +1116,32 @@ export const AccountUnlockableCoinsRequest = {
     const obj: any = {};
     obj.owner = message.owner;
     return obj;
+  },
+
+  fromAminoMsg(object: AccountUnlockableCoinsRequestAminoMsg): AccountUnlockableCoinsRequest {
+    return AccountUnlockableCoinsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: AccountUnlockableCoinsRequest): AccountUnlockableCoinsRequestAminoMsg {
+    return {
+      type: "osmosis/lockup/account-unlockable-coins-request",
+      value: AccountUnlockableCoinsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: AccountUnlockableCoinsRequestProtoMsg): AccountUnlockableCoinsRequest {
+    return AccountUnlockableCoinsRequest.decode(message.value);
+  },
+
+  toProto(message: AccountUnlockableCoinsRequest): Uint8Array {
+    return AccountUnlockableCoinsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: AccountUnlockableCoinsRequest): AccountUnlockableCoinsRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.lockup.AccountUnlockableCoinsRequest",
+      value: AccountUnlockableCoinsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1008,6 +1153,9 @@ function createBaseAccountUnlockableCoinsResponse(): AccountUnlockableCoinsRespo
 }
 
 export const AccountUnlockableCoinsResponse = {
+  typeUrl: "/osmosis.lockup.AccountUnlockableCoinsResponse",
+  aminoType: "osmosis/lockup/account-unlockable-coins-response",
+
   encode(message: AccountUnlockableCoinsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.coins) {
       Coin.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1096,6 +1244,32 @@ export const AccountUnlockableCoinsResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: AccountUnlockableCoinsResponseAminoMsg): AccountUnlockableCoinsResponse {
+    return AccountUnlockableCoinsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: AccountUnlockableCoinsResponse): AccountUnlockableCoinsResponseAminoMsg {
+    return {
+      type: "osmosis/lockup/account-unlockable-coins-response",
+      value: AccountUnlockableCoinsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: AccountUnlockableCoinsResponseProtoMsg): AccountUnlockableCoinsResponse {
+    return AccountUnlockableCoinsResponse.decode(message.value);
+  },
+
+  toProto(message: AccountUnlockableCoinsResponse): Uint8Array {
+    return AccountUnlockableCoinsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: AccountUnlockableCoinsResponse): AccountUnlockableCoinsResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.lockup.AccountUnlockableCoinsResponse",
+      value: AccountUnlockableCoinsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1107,6 +1281,9 @@ function createBaseAccountUnlockingCoinsRequest(): AccountUnlockingCoinsRequest
 }
 
 export const AccountUnlockingCoinsRequest = {
+  typeUrl: "/osmosis.lockup.AccountUnlockingCoinsRequest",
+  aminoType: "osmosis/lockup/account-unlocking-coins-request",
+
   encode(message: AccountUnlockingCoinsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.owner !== "") {
       writer.uint32(10).string(message.owner);
@@ -1177,6 +1354,32 @@ export const AccountUnlockingCoinsRequest = {
     const obj: any = {};
     obj.owner = message.owner;
     return obj;
+  },
+
+  fromAminoMsg(object: AccountUnlockingCoinsRequestAminoMsg): AccountUnlockingCoinsRequest {
+    return AccountUnlockingCoinsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: AccountUnlockingCoinsRequest): AccountUnlockingCoinsRequestAminoMsg {
+    return {
+      type: "osmosis/lockup/account-unlocking-coins-request",
+      value: AccountUnlockingCoinsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: AccountUnlockingCoinsRequestProtoMsg): AccountUnlockingCoinsRequest {
+    return AccountUnlockingCoinsRequest.decode(message.value);
+  },
+
+  toProto(message: AccountUnlockingCoinsRequest): Uint8Array {
+    return AccountUnlockingCoinsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: AccountUnlockingCoinsRequest): AccountUnlockingCoinsRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.lockup.AccountUnlockingCoinsRequest",
+      value: AccountUnlockingCoinsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1188,6 +1391,9 @@ function createBaseAccountUnlockingCoinsResponse(): AccountUnlockingCoinsRespons
 }
 
 export const AccountUnlockingCoinsResponse = {
+  typeUrl: "/osmosis.lockup.AccountUnlockingCoinsResponse",
+  aminoType: "osmosis/lockup/account-unlocking-coins-response",
+
   encode(message: AccountUnlockingCoinsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.coins) {
       Coin.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1276,6 +1482,32 @@ export const AccountUnlockingCoinsResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: AccountUnlockingCoinsResponseAminoMsg): AccountUnlockingCoinsResponse {
+    return AccountUnlockingCoinsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: AccountUnlockingCoinsResponse): AccountUnlockingCoinsResponseAminoMsg {
+    return {
+      type: "osmosis/lockup/account-unlocking-coins-response",
+      value: AccountUnlockingCoinsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: AccountUnlockingCoinsResponseProtoMsg): AccountUnlockingCoinsResponse {
+    return AccountUnlockingCoinsResponse.decode(message.value);
+  },
+
+  toProto(message: AccountUnlockingCoinsResponse): Uint8Array {
+    return AccountUnlockingCoinsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: AccountUnlockingCoinsResponse): AccountUnlockingCoinsResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.lockup.AccountUnlockingCoinsResponse",
+      value: AccountUnlockingCoinsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1287,6 +1519,9 @@ function createBaseAccountLockedCoinsRequest(): AccountLockedCoinsRequest {
 }
 
 export const AccountLockedCoinsRequest = {
+  typeUrl: "/osmosis.lockup.AccountLockedCoinsRequest",
+  aminoType: "osmosis/lockup/account-locked-coins-request",
+
   encode(message: AccountLockedCoinsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.owner !== "") {
       writer.uint32(10).string(message.owner);
@@ -1357,6 +1592,32 @@ export const AccountLockedCoinsRequest = {
     const obj: any = {};
     obj.owner = message.owner;
     return obj;
+  },
+
+  fromAminoMsg(object: AccountLockedCoinsRequestAminoMsg): AccountLockedCoinsRequest {
+    return AccountLockedCoinsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: AccountLockedCoinsRequest): AccountLockedCoinsRequestAminoMsg {
+    return {
+      type: "osmosis/lockup/account-locked-coins-request",
+      value: AccountLockedCoinsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: AccountLockedCoinsRequestProtoMsg): AccountLockedCoinsRequest {
+    return AccountLockedCoinsRequest.decode(message.value);
+  },
+
+  toProto(message: AccountLockedCoinsRequest): Uint8Array {
+    return AccountLockedCoinsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: AccountLockedCoinsRequest): AccountLockedCoinsRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.lockup.AccountLockedCoinsRequest",
+      value: AccountLockedCoinsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1368,6 +1629,9 @@ function createBaseAccountLockedCoinsResponse(): AccountLockedCoinsResponse {
 }
 
 export const AccountLockedCoinsResponse = {
+  typeUrl: "/osmosis.lockup.AccountLockedCoinsResponse",
+  aminoType: "osmosis/lockup/account-locked-coins-response",
+
   encode(message: AccountLockedCoinsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.coins) {
       Coin.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1456,6 +1720,32 @@ export const AccountLockedCoinsResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: AccountLockedCoinsResponseAminoMsg): AccountLockedCoinsResponse {
+    return AccountLockedCoinsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: AccountLockedCoinsResponse): AccountLockedCoinsResponseAminoMsg {
+    return {
+      type: "osmosis/lockup/account-locked-coins-response",
+      value: AccountLockedCoinsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: AccountLockedCoinsResponseProtoMsg): AccountLockedCoinsResponse {
+    return AccountLockedCoinsResponse.decode(message.value);
+  },
+
+  toProto(message: AccountLockedCoinsResponse): Uint8Array {
+    return AccountLockedCoinsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: AccountLockedCoinsResponse): AccountLockedCoinsResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.lockup.AccountLockedCoinsResponse",
+      value: AccountLockedCoinsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1468,6 +1758,9 @@ function createBaseAccountLockedPastTimeRequest(): AccountLockedPastTimeRequest
 }
 
 export const AccountLockedPastTimeRequest = {
+  typeUrl: "/osmosis.lockup.AccountLockedPastTimeRequest",
+  aminoType: "osmosis/lockup/account-locked-past-time-request",
+
   encode(message: AccountLockedPastTimeRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.owner !== "") {
       writer.uint32(10).string(message.owner);
@@ -1553,6 +1846,32 @@ export const AccountLockedPastTimeRequest = {
     obj.owner = message.owner;
     obj.timestamp = message.timestamp ? Timestamp.toAmino(message.timestamp) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: AccountLockedPastTimeRequestAminoMsg): AccountLockedPastTimeRequest {
+    return AccountLockedPastTimeRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: AccountLockedPastTimeRequest): AccountLockedPastTimeRequestAminoMsg {
+    return {
+      type: "osmosis/lockup/account-locked-past-time-request",
+      value: AccountLockedPastTimeRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: AccountLockedPastTimeRequestProtoMsg): AccountLockedPastTimeRequest {
+    return AccountLockedPastTimeRequest.decode(message.value);
+  },
+
+  toProto(message: AccountLockedPastTimeRequest): Uint8Array {
+    return AccountLockedPastTimeRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: AccountLockedPastTimeRequest): AccountLockedPastTimeRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.lockup.AccountLockedPastTimeRequest",
+      value: AccountLockedPastTimeRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1564,6 +1883,9 @@ function createBaseAccountLockedPastTimeResponse(): AccountLockedPastTimeRespons
 }
 
 export const AccountLockedPastTimeResponse = {
+  typeUrl: "/osmosis.lockup.AccountLockedPastTimeResponse",
+  aminoType: "osmosis/lockup/account-locked-past-time-response",
+
   encode(message: AccountLockedPastTimeResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.locks) {
       PeriodLock.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1652,6 +1974,32 @@ export const AccountLockedPastTimeResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: AccountLockedPastTimeResponseAminoMsg): AccountLockedPastTimeResponse {
+    return AccountLockedPastTimeResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: AccountLockedPastTimeResponse): AccountLockedPastTimeResponseAminoMsg {
+    return {
+      type: "osmosis/lockup/account-locked-past-time-response",
+      value: AccountLockedPastTimeResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: AccountLockedPastTimeResponseProtoMsg): AccountLockedPastTimeResponse {
+    return AccountLockedPastTimeResponse.decode(message.value);
+  },
+
+  toProto(message: AccountLockedPastTimeResponse): Uint8Array {
+    return AccountLockedPastTimeResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: AccountLockedPastTimeResponse): AccountLockedPastTimeResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.lockup.AccountLockedPastTimeResponse",
+      value: AccountLockedPastTimeResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1664,6 +2012,9 @@ function createBaseAccountLockedPastTimeNotUnlockingOnlyRequest(): AccountLocked
 }
 
 export const AccountLockedPastTimeNotUnlockingOnlyRequest = {
+  typeUrl: "/osmosis.lockup.AccountLockedPastTimeNotUnlockingOnlyRequest",
+  aminoType: "osmosis/lockup/account-locked-past-time-not-unlocking-only-request",
+
   encode(message: AccountLockedPastTimeNotUnlockingOnlyRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.owner !== "") {
       writer.uint32(10).string(message.owner);
@@ -1749,6 +2100,32 @@ export const AccountLockedPastTimeNotUnlockingOnlyRequest = {
     obj.owner = message.owner;
     obj.timestamp = message.timestamp ? Timestamp.toAmino(message.timestamp) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: AccountLockedPastTimeNotUnlockingOnlyRequestAminoMsg): AccountLockedPastTimeNotUnlockingOnlyRequest {
+    return AccountLockedPastTimeNotUnlockingOnlyRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: AccountLockedPastTimeNotUnlockingOnlyRequest): AccountLockedPastTimeNotUnlockingOnlyRequestAminoMsg {
+    return {
+      type: "osmosis/lockup/account-locked-past-time-not-unlocking-only-request",
+      value: AccountLockedPastTimeNotUnlockingOnlyRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: AccountLockedPastTimeNotUnlockingOnlyRequestProtoMsg): AccountLockedPastTimeNotUnlockingOnlyRequest {
+    return AccountLockedPastTimeNotUnlockingOnlyRequest.decode(message.value);
+  },
+
+  toProto(message: AccountLockedPastTimeNotUnlockingOnlyRequest): Uint8Array {
+    return AccountLockedPastTimeNotUnlockingOnlyRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: AccountLockedPastTimeNotUnlockingOnlyRequest): AccountLockedPastTimeNotUnlockingOnlyRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.lockup.AccountLockedPastTimeNotUnlockingOnlyRequest",
+      value: AccountLockedPastTimeNotUnlockingOnlyRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1760,6 +2137,9 @@ function createBaseAccountLockedPastTimeNotUnlockingOnlyResponse(): AccountLocke
 }
 
 export const AccountLockedPastTimeNotUnlockingOnlyResponse = {
+  typeUrl: "/osmosis.lockup.AccountLockedPastTimeNotUnlockingOnlyResponse",
+  aminoType: "osmosis/lockup/account-locked-past-time-not-unlocking-only-response",
+
   encode(message: AccountLockedPastTimeNotUnlockingOnlyResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.locks) {
       PeriodLock.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1848,6 +2228,32 @@ export const AccountLockedPastTimeNotUnlockingOnlyResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: AccountLockedPastTimeNotUnlockingOnlyResponseAminoMsg): AccountLockedPastTimeNotUnlockingOnlyResponse {
+    return AccountLockedPastTimeNotUnlockingOnlyResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: AccountLockedPastTimeNotUnlockingOnlyResponse): AccountLockedPastTimeNotUnlockingOnlyResponseAminoMsg {
+    return {
+      type: "osmosis/lockup/account-locked-past-time-not-unlocking-only-response",
+      value: AccountLockedPastTimeNotUnlockingOnlyResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: AccountLockedPastTimeNotUnlockingOnlyResponseProtoMsg): AccountLockedPastTimeNotUnlockingOnlyResponse {
+    return AccountLockedPastTimeNotUnlockingOnlyResponse.decode(message.value);
+  },
+
+  toProto(message: AccountLockedPastTimeNotUnlockingOnlyResponse): Uint8Array {
+    return AccountLockedPastTimeNotUnlockingOnlyResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: AccountLockedPastTimeNotUnlockingOnlyResponse): AccountLockedPastTimeNotUnlockingOnlyResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.lockup.AccountLockedPastTimeNotUnlockingOnlyResponse",
+      value: AccountLockedPastTimeNotUnlockingOnlyResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1860,6 +2266,9 @@ function createBaseAccountUnlockedBeforeTimeRequest(): AccountUnlockedBeforeTime
 }
 
 export const AccountUnlockedBeforeTimeRequest = {
+  typeUrl: "/osmosis.lockup.AccountUnlockedBeforeTimeRequest",
+  aminoType: "osmosis/lockup/account-unlocked-before-time-request",
+
   encode(message: AccountUnlockedBeforeTimeRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.owner !== "") {
       writer.uint32(10).string(message.owner);
@@ -1945,6 +2354,32 @@ export const AccountUnlockedBeforeTimeRequest = {
     obj.owner = message.owner;
     obj.timestamp = message.timestamp ? Timestamp.toAmino(message.timestamp) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: AccountUnlockedBeforeTimeRequestAminoMsg): AccountUnlockedBeforeTimeRequest {
+    return AccountUnlockedBeforeTimeRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: AccountUnlockedBeforeTimeRequest): AccountUnlockedBeforeTimeRequestAminoMsg {
+    return {
+      type: "osmosis/lockup/account-unlocked-before-time-request",
+      value: AccountUnlockedBeforeTimeRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: AccountUnlockedBeforeTimeRequestProtoMsg): AccountUnlockedBeforeTimeRequest {
+    return AccountUnlockedBeforeTimeRequest.decode(message.value);
+  },
+
+  toProto(message: AccountUnlockedBeforeTimeRequest): Uint8Array {
+    return AccountUnlockedBeforeTimeRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: AccountUnlockedBeforeTimeRequest): AccountUnlockedBeforeTimeRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.lockup.AccountUnlockedBeforeTimeRequest",
+      value: AccountUnlockedBeforeTimeRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1956,6 +2391,9 @@ function createBaseAccountUnlockedBeforeTimeResponse(): AccountUnlockedBeforeTim
 }
 
 export const AccountUnlockedBeforeTimeResponse = {
+  typeUrl: "/osmosis.lockup.AccountUnlockedBeforeTimeResponse",
+  aminoType: "osmosis/lockup/account-unlocked-before-time-response",
+
   encode(message: AccountUnlockedBeforeTimeResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.locks) {
       PeriodLock.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -2044,6 +2482,32 @@ export const AccountUnlockedBeforeTimeResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: AccountUnlockedBeforeTimeResponseAminoMsg): AccountUnlockedBeforeTimeResponse {
+    return AccountUnlockedBeforeTimeResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: AccountUnlockedBeforeTimeResponse): AccountUnlockedBeforeTimeResponseAminoMsg {
+    return {
+      type: "osmosis/lockup/account-unlocked-before-time-response",
+      value: AccountUnlockedBeforeTimeResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: AccountUnlockedBeforeTimeResponseProtoMsg): AccountUnlockedBeforeTimeResponse {
+    return AccountUnlockedBeforeTimeResponse.decode(message.value);
+  },
+
+  toProto(message: AccountUnlockedBeforeTimeResponse): Uint8Array {
+    return AccountUnlockedBeforeTimeResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: AccountUnlockedBeforeTimeResponse): AccountUnlockedBeforeTimeResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.lockup.AccountUnlockedBeforeTimeResponse",
+      value: AccountUnlockedBeforeTimeResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2057,6 +2521,9 @@ function createBaseAccountLockedPastTimeDenomRequest(): AccountLockedPastTimeDen
 }
 
 export const AccountLockedPastTimeDenomRequest = {
+  typeUrl: "/osmosis.lockup.AccountLockedPastTimeDenomRequest",
+  aminoType: "osmosis/lockup/account-locked-past-time-denom-request",
+
   encode(message: AccountLockedPastTimeDenomRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.owner !== "") {
       writer.uint32(10).string(message.owner);
@@ -2157,6 +2624,32 @@ export const AccountLockedPastTimeDenomRequest = {
     obj.timestamp = message.timestamp ? Timestamp.toAmino(message.timestamp) : undefined;
     obj.denom = message.denom;
     return obj;
+  },
+
+  fromAminoMsg(object: AccountLockedPastTimeDenomRequestAminoMsg): AccountLockedPastTimeDenomRequest {
+    return AccountLockedPastTimeDenomRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: AccountLockedPastTimeDenomRequest): AccountLockedPastTimeDenomRequestAminoMsg {
+    return {
+      type: "osmosis/lockup/account-locked-past-time-denom-request",
+      value: AccountLockedPastTimeDenomRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: AccountLockedPastTimeDenomRequestProtoMsg): AccountLockedPastTimeDenomRequest {
+    return AccountLockedPastTimeDenomRequest.decode(message.value);
+  },
+
+  toProto(message: AccountLockedPastTimeDenomRequest): Uint8Array {
+    return AccountLockedPastTimeDenomRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: AccountLockedPastTimeDenomRequest): AccountLockedPastTimeDenomRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.lockup.AccountLockedPastTimeDenomRequest",
+      value: AccountLockedPastTimeDenomRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2168,6 +2661,9 @@ function createBaseAccountLockedPastTimeDenomResponse(): AccountLockedPastTimeDe
 }
 
 export const AccountLockedPastTimeDenomResponse = {
+  typeUrl: "/osmosis.lockup.AccountLockedPastTimeDenomResponse",
+  aminoType: "osmosis/lockup/account-locked-past-time-denom-response",
+
   encode(message: AccountLockedPastTimeDenomResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.locks) {
       PeriodLock.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -2256,6 +2752,32 @@ export const AccountLockedPastTimeDenomResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: AccountLockedPastTimeDenomResponseAminoMsg): AccountLockedPastTimeDenomResponse {
+    return AccountLockedPastTimeDenomResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: AccountLockedPastTimeDenomResponse): AccountLockedPastTimeDenomResponseAminoMsg {
+    return {
+      type: "osmosis/lockup/account-locked-past-time-denom-response",
+      value: AccountLockedPastTimeDenomResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: AccountLockedPastTimeDenomResponseProtoMsg): AccountLockedPastTimeDenomResponse {
+    return AccountLockedPastTimeDenomResponse.decode(message.value);
+  },
+
+  toProto(message: AccountLockedPastTimeDenomResponse): Uint8Array {
+    return AccountLockedPastTimeDenomResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: AccountLockedPastTimeDenomResponse): AccountLockedPastTimeDenomResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.lockup.AccountLockedPastTimeDenomResponse",
+      value: AccountLockedPastTimeDenomResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2268,6 +2790,9 @@ function createBaseLockedDenomRequest(): LockedDenomRequest {
 }
 
 export const LockedDenomRequest = {
+  typeUrl: "/osmosis.lockup.LockedDenomRequest",
+  aminoType: "osmosis/lockup/locked-denom-request",
+
   encode(message: LockedDenomRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.denom !== "") {
       writer.uint32(10).string(message.denom);
@@ -2353,6 +2878,32 @@ export const LockedDenomRequest = {
     obj.denom = message.denom;
     obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: LockedDenomRequestAminoMsg): LockedDenomRequest {
+    return LockedDenomRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: LockedDenomRequest): LockedDenomRequestAminoMsg {
+    return {
+      type: "osmosis/lockup/locked-denom-request",
+      value: LockedDenomRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: LockedDenomRequestProtoMsg): LockedDenomRequest {
+    return LockedDenomRequest.decode(message.value);
+  },
+
+  toProto(message: LockedDenomRequest): Uint8Array {
+    return LockedDenomRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: LockedDenomRequest): LockedDenomRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.lockup.LockedDenomRequest",
+      value: LockedDenomRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2364,6 +2915,9 @@ function createBaseLockedDenomResponse(): LockedDenomResponse {
 }
 
 export const LockedDenomResponse = {
+  typeUrl: "/osmosis.lockup.LockedDenomResponse",
+  aminoType: "osmosis/lockup/locked-denom-response",
+
   encode(message: LockedDenomResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.amount !== "") {
       writer.uint32(10).string(message.amount);
@@ -2434,6 +2988,32 @@ export const LockedDenomResponse = {
     const obj: any = {};
     obj.amount = message.amount;
     return obj;
+  },
+
+  fromAminoMsg(object: LockedDenomResponseAminoMsg): LockedDenomResponse {
+    return LockedDenomResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: LockedDenomResponse): LockedDenomResponseAminoMsg {
+    return {
+      type: "osmosis/lockup/locked-denom-response",
+      value: LockedDenomResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: LockedDenomResponseProtoMsg): LockedDenomResponse {
+    return LockedDenomResponse.decode(message.value);
+  },
+
+  toProto(message: LockedDenomResponse): Uint8Array {
+    return LockedDenomResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: LockedDenomResponse): LockedDenomResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.lockup.LockedDenomResponse",
+      value: LockedDenomResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2445,6 +3025,9 @@ function createBaseLockedRequest(): LockedRequest {
 }
 
 export const LockedRequest = {
+  typeUrl: "/osmosis.lockup.LockedRequest",
+  aminoType: "osmosis/lockup/locked-request",
+
   encode(message: LockedRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.lockId.isZero()) {
       writer.uint32(8).uint64(message.lockId);
@@ -2515,6 +3098,32 @@ export const LockedRequest = {
     const obj: any = {};
     obj.lock_id = message.lockId ? message.lockId.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: LockedRequestAminoMsg): LockedRequest {
+    return LockedRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: LockedRequest): LockedRequestAminoMsg {
+    return {
+      type: "osmosis/lockup/locked-request",
+      value: LockedRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: LockedRequestProtoMsg): LockedRequest {
+    return LockedRequest.decode(message.value);
+  },
+
+  toProto(message: LockedRequest): Uint8Array {
+    return LockedRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: LockedRequest): LockedRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.lockup.LockedRequest",
+      value: LockedRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2526,6 +3135,9 @@ function createBaseLockedResponse(): LockedResponse {
 }
 
 export const LockedResponse = {
+  typeUrl: "/osmosis.lockup.LockedResponse",
+  aminoType: "osmosis/lockup/locked-response",
+
   encode(message: LockedResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.lock !== undefined) {
       PeriodLock.encode(message.lock, writer.uint32(10).fork()).ldelim();
@@ -2596,6 +3208,32 @@ export const LockedResponse = {
     const obj: any = {};
     obj.lock = message.lock ? PeriodLock.toAmino(message.lock) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: LockedResponseAminoMsg): LockedResponse {
+    return LockedResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: LockedResponse): LockedResponseAminoMsg {
+    return {
+      type: "osmosis/lockup/locked-response",
+      value: LockedResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: LockedResponseProtoMsg): LockedResponse {
+    return LockedResponse.decode(message.value);
+  },
+
+  toProto(message: LockedResponse): Uint8Array {
+    return LockedResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: LockedResponse): LockedResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.lockup.LockedResponse",
+      value: LockedResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2607,6 +3245,9 @@ function createBaseSyntheticLockupsByLockupIDRequest(): SyntheticLockupsByLockup
 }
 
 export const SyntheticLockupsByLockupIDRequest = {
+  typeUrl: "/osmosis.lockup.SyntheticLockupsByLockupIDRequest",
+  aminoType: "osmosis/lockup/synthetic-lockups-by-lockup-id-request",
+
   encode(message: SyntheticLockupsByLockupIDRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.lockId.isZero()) {
       writer.uint32(8).uint64(message.lockId);
@@ -2677,6 +3318,32 @@ export const SyntheticLockupsByLockupIDRequest = {
     const obj: any = {};
     obj.lock_id = message.lockId ? message.lockId.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: SyntheticLockupsByLockupIDRequestAminoMsg): SyntheticLockupsByLockupIDRequest {
+    return SyntheticLockupsByLockupIDRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: SyntheticLockupsByLockupIDRequest): SyntheticLockupsByLockupIDRequestAminoMsg {
+    return {
+      type: "osmosis/lockup/synthetic-lockups-by-lockup-id-request",
+      value: SyntheticLockupsByLockupIDRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: SyntheticLockupsByLockupIDRequestProtoMsg): SyntheticLockupsByLockupIDRequest {
+    return SyntheticLockupsByLockupIDRequest.decode(message.value);
+  },
+
+  toProto(message: SyntheticLockupsByLockupIDRequest): Uint8Array {
+    return SyntheticLockupsByLockupIDRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: SyntheticLockupsByLockupIDRequest): SyntheticLockupsByLockupIDRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.lockup.SyntheticLockupsByLockupIDRequest",
+      value: SyntheticLockupsByLockupIDRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2688,6 +3355,9 @@ function createBaseSyntheticLockupsByLockupIDResponse(): SyntheticLockupsByLocku
 }
 
 export const SyntheticLockupsByLockupIDResponse = {
+  typeUrl: "/osmosis.lockup.SyntheticLockupsByLockupIDResponse",
+  aminoType: "osmosis/lockup/synthetic-lockups-by-lockup-id-response",
+
   encode(message: SyntheticLockupsByLockupIDResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.syntheticLocks) {
       SyntheticLock.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -2776,6 +3446,32 @@ export const SyntheticLockupsByLockupIDResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: SyntheticLockupsByLockupIDResponseAminoMsg): SyntheticLockupsByLockupIDResponse {
+    return SyntheticLockupsByLockupIDResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: SyntheticLockupsByLockupIDResponse): SyntheticLockupsByLockupIDResponseAminoMsg {
+    return {
+      type: "osmosis/lockup/synthetic-lockups-by-lockup-id-response",
+      value: SyntheticLockupsByLockupIDResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: SyntheticLockupsByLockupIDResponseProtoMsg): SyntheticLockupsByLockupIDResponse {
+    return SyntheticLockupsByLockupIDResponse.decode(message.value);
+  },
+
+  toProto(message: SyntheticLockupsByLockupIDResponse): Uint8Array {
+    return SyntheticLockupsByLockupIDResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: SyntheticLockupsByLockupIDResponse): SyntheticLockupsByLockupIDResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.lockup.SyntheticLockupsByLockupIDResponse",
+      value: SyntheticLockupsByLockupIDResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2788,6 +3484,9 @@ function createBaseAccountLockedLongerDurationRequest(): AccountLockedLongerDura
 }
 
 export const AccountLockedLongerDurationRequest = {
+  typeUrl: "/osmosis.lockup.AccountLockedLongerDurationRequest",
+  aminoType: "osmosis/lockup/account-locked-longer-duration-request",
+
   encode(message: AccountLockedLongerDurationRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.owner !== "") {
       writer.uint32(10).string(message.owner);
@@ -2873,6 +3572,32 @@ export const AccountLockedLongerDurationRequest = {
     obj.owner = message.owner;
     obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: AccountLockedLongerDurationRequestAminoMsg): AccountLockedLongerDurationRequest {
+    return AccountLockedLongerDurationRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: AccountLockedLongerDurationRequest): AccountLockedLongerDurationRequestAminoMsg {
+    return {
+      type: "osmosis/lockup/account-locked-longer-duration-request",
+      value: AccountLockedLongerDurationRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: AccountLockedLongerDurationRequestProtoMsg): AccountLockedLongerDurationRequest {
+    return AccountLockedLongerDurationRequest.decode(message.value);
+  },
+
+  toProto(message: AccountLockedLongerDurationRequest): Uint8Array {
+    return AccountLockedLongerDurationRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: AccountLockedLongerDurationRequest): AccountLockedLongerDurationRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.lockup.AccountLockedLongerDurationRequest",
+      value: AccountLockedLongerDurationRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2884,6 +3609,9 @@ function createBaseAccountLockedLongerDurationResponse(): AccountLockedLongerDur
 }
 
 export const AccountLockedLongerDurationResponse = {
+  typeUrl: "/osmosis.lockup.AccountLockedLongerDurationResponse",
+  aminoType: "osmosis/lockup/account-locked-longer-duration-response",
+
   encode(message: AccountLockedLongerDurationResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.locks) {
       PeriodLock.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -2972,6 +3700,32 @@ export const AccountLockedLongerDurationResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: AccountLockedLongerDurationResponseAminoMsg): AccountLockedLongerDurationResponse {
+    return AccountLockedLongerDurationResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: AccountLockedLongerDurationResponse): AccountLockedLongerDurationResponseAminoMsg {
+    return {
+      type: "osmosis/lockup/account-locked-longer-duration-response",
+      value: AccountLockedLongerDurationResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: AccountLockedLongerDurationResponseProtoMsg): AccountLockedLongerDurationResponse {
+    return AccountLockedLongerDurationResponse.decode(message.value);
+  },
+
+  toProto(message: AccountLockedLongerDurationResponse): Uint8Array {
+    return AccountLockedLongerDurationResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: AccountLockedLongerDurationResponse): AccountLockedLongerDurationResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.lockup.AccountLockedLongerDurationResponse",
+      value: AccountLockedLongerDurationResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2984,6 +3738,9 @@ function createBaseAccountLockedDurationRequest(): AccountLockedDurationRequest
 }
 
 export const AccountLockedDurationRequest = {
+  typeUrl: "/osmosis.lockup.AccountLockedDurationRequest",
+  aminoType: "osmosis/lockup/account-locked-duration-request",
+
   encode(message: AccountLockedDurationRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.owner !== "") {
       writer.uint32(10).string(message.owner);
@@ -3069,6 +3826,32 @@ export const AccountLockedDurationRequest = {
     obj.owner = message.owner;
     obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: AccountLockedDurationRequestAminoMsg): AccountLockedDurationRequest {
+    return AccountLockedDurationRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: AccountLockedDurationRequest): AccountLockedDurationRequestAminoMsg {
+    return {
+      type: "osmosis/lockup/account-locked-duration-request",
+      value: AccountLockedDurationRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: AccountLockedDurationRequestProtoMsg): AccountLockedDurationRequest {
+    return AccountLockedDurationRequest.decode(message.value);
+  },
+
+  toProto(message: AccountLockedDurationRequest): Uint8Array {
+    return AccountLockedDurationRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: AccountLockedDurationRequest): AccountLockedDurationRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.lockup.AccountLockedDurationRequest",
+      value: AccountLockedDurationRequest.encode(message).finish()
+    };
   }
 
 };
@@ -3080,6 +3863,9 @@ function createBaseAccountLockedDurationResponse(): AccountLockedDurationRespons
 }
 
 export const AccountLockedDurationResponse = {
+  typeUrl: "/osmosis.lockup.AccountLockedDurationResponse",
+  aminoType: "osmosis/lockup/account-locked-duration-response",
+
   encode(message: AccountLockedDurationResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.locks) {
       PeriodLock.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -3168,6 +3954,32 @@ export const AccountLockedDurationResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: AccountLockedDurationResponseAminoMsg): AccountLockedDurationResponse {
+    return AccountLockedDurationResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: AccountLockedDurationResponse): AccountLockedDurationResponseAminoMsg {
+    return {
+      type: "osmosis/lockup/account-locked-duration-response",
+      value: AccountLockedDurationResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: AccountLockedDurationResponseProtoMsg): AccountLockedDurationResponse {
+    return AccountLockedDurationResponse.decode(message.value);
+  },
+
+  toProto(message: AccountLockedDurationResponse): Uint8Array {
+    return AccountLockedDurationResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: AccountLockedDurationResponse): AccountLockedDurationResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.lockup.AccountLockedDurationResponse",
+      value: AccountLockedDurationResponse.encode(message).finish()
+    };
   }
 
 };
@@ -3180,6 +3992,9 @@ function createBaseAccountLockedLongerDurationNotUnlockingOnlyRequest(): Account
 }
 
 export const AccountLockedLongerDurationNotUnlockingOnlyRequest = {
+  typeUrl: "/osmosis.lockup.AccountLockedLongerDurationNotUnlockingOnlyRequest",
+  aminoType: "osmosis/lockup/account-locked-longer-duration-not-unlocking-only-request",
+
   encode(message: AccountLockedLongerDurationNotUnlockingOnlyRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.owner !== "") {
       writer.uint32(10).string(message.owner);
@@ -3265,6 +4080,32 @@ export const AccountLockedLongerDurationNotUnlockingOnlyRequest = {
     obj.owner = message.owner;
     obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: AccountLockedLongerDurationNotUnlockingOnlyRequestAminoMsg): AccountLockedLongerDurationNotUnlockingOnlyRequest {
+    return AccountLockedLongerDurationNotUnlockingOnlyRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: AccountLockedLongerDurationNotUnlockingOnlyRequest): AccountLockedLongerDurationNotUnlockingOnlyRequestAminoMsg {
+    return {
+      type: "osmosis/lockup/account-locked-longer-duration-not-unlocking-only-request",
+      value: AccountLockedLongerDurationNotUnlockingOnlyRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: AccountLockedLongerDurationNotUnlockingOnlyRequestProtoMsg): AccountLockedLongerDurationNotUnlockingOnlyRequest {
+    return AccountLockedLongerDurationNotUnlockingOnlyRequest.decode(message.value);
+  },
+
+  toProto(message: AccountLockedLongerDurationNotUnlockingOnlyRequest): Uint8Array {
+    return AccountLockedLongerDurationNotUnlockingOnlyRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: AccountLockedLongerDurationNotUnlockingOnlyRequest): AccountLockedLongerDurationNotUnlockingOnlyRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.lockup.AccountLockedLongerDurationNotUnlockingOnlyRequest",
+      value: AccountLockedLongerDurationNotUnlockingOnlyRequest.encode(message).finish()
+    };
   }
 
 };
@@ -3276,6 +4117,9 @@ function createBaseAccountLockedLongerDurationNotUnlockingOnlyResponse(): Accoun
 }
 
 export const AccountLockedLongerDurationNotUnlockingOnlyResponse = {
+  typeUrl: "/osmosis.lockup.AccountLockedLongerDurationNotUnlockingOnlyResponse",
+  aminoType: "osmosis/lockup/account-locked-longer-duration-not-unlocking-only-response",
+
   encode(message: AccountLockedLongerDurationNotUnlockingOnlyResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.locks) {
       PeriodLock.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -3364,6 +4208,32 @@ export const AccountLockedLongerDurationNotUnlockingOnlyResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: AccountLockedLongerDurationNotUnlockingOnlyResponseAminoMsg): AccountLockedLongerDurationNotUnlockingOnlyResponse {
+    return AccountLockedLongerDurationNotUnlockingOnlyResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: AccountLockedLongerDurationNotUnlockingOnlyResponse): AccountLockedLongerDurationNotUnlockingOnlyResponseAminoMsg {
+    return {
+      type: "osmosis/lockup/account-locked-longer-duration-not-unlocking-only-response",
+      value: AccountLockedLongerDurationNotUnlockingOnlyResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: AccountLockedLongerDurationNotUnlockingOnlyResponseProtoMsg): AccountLockedLongerDurationNotUnlockingOnlyResponse {
+    return AccountLockedLongerDurationNotUnlockingOnlyResponse.decode(message.value);
+  },
+
+  toProto(message: AccountLockedLongerDurationNotUnlockingOnlyResponse): Uint8Array {
+    return AccountLockedLongerDurationNotUnlockingOnlyResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: AccountLockedLongerDurationNotUnlockingOnlyResponse): AccountLockedLongerDurationNotUnlockingOnlyResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.lockup.AccountLockedLongerDurationNotUnlockingOnlyResponse",
+      value: AccountLockedLongerDurationNotUnlockingOnlyResponse.encode(message).finish()
+    };
   }
 
 };
@@ -3377,6 +4247,9 @@ function createBaseAccountLockedLongerDurationDenomRequest(): AccountLockedLonge
 }
 
 export const AccountLockedLongerDurationDenomRequest = {
+  typeUrl: "/osmosis.lockup.AccountLockedLongerDurationDenomRequest",
+  aminoType: "osmosis/lockup/account-locked-longer-duration-denom-request",
+
   encode(message: AccountLockedLongerDurationDenomRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.owner !== "") {
       writer.uint32(10).string(message.owner);
@@ -3477,6 +4350,32 @@ export const AccountLockedLongerDurationDenomRequest = {
     obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined;
     obj.denom = message.denom;
     return obj;
+  },
+
+  fromAminoMsg(object: AccountLockedLongerDurationDenomRequestAminoMsg): AccountLockedLongerDurationDenomRequest {
+    return AccountLockedLongerDurationDenomRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: AccountLockedLongerDurationDenomRequest): AccountLockedLongerDurationDenomRequestAminoMsg {
+    return {
+      type: "osmosis/lockup/account-locked-longer-duration-denom-request",
+      value: AccountLockedLongerDurationDenomRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: AccountLockedLongerDurationDenomRequestProtoMsg): AccountLockedLongerDurationDenomRequest {
+    return AccountLockedLongerDurationDenomRequest.decode(message.value);
+  },
+
+  toProto(message: AccountLockedLongerDurationDenomRequest): Uint8Array {
+    return AccountLockedLongerDurationDenomRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: AccountLockedLongerDurationDenomRequest): AccountLockedLongerDurationDenomRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.lockup.AccountLockedLongerDurationDenomRequest",
+      value: AccountLockedLongerDurationDenomRequest.encode(message).finish()
+    };
   }
 
 };
@@ -3488,6 +4387,9 @@ function createBaseAccountLockedLongerDurationDenomResponse(): AccountLockedLong
 }
 
 export const AccountLockedLongerDurationDenomResponse = {
+  typeUrl: "/osmosis.lockup.AccountLockedLongerDurationDenomResponse",
+  aminoType: "osmosis/lockup/account-locked-longer-duration-denom-response",
+
   encode(message: AccountLockedLongerDurationDenomResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.locks) {
       PeriodLock.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -3576,6 +4478,32 @@ export const AccountLockedLongerDurationDenomResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: AccountLockedLongerDurationDenomResponseAminoMsg): AccountLockedLongerDurationDenomResponse {
+    return AccountLockedLongerDurationDenomResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: AccountLockedLongerDurationDenomResponse): AccountLockedLongerDurationDenomResponseAminoMsg {
+    return {
+      type: "osmosis/lockup/account-locked-longer-duration-denom-response",
+      value: AccountLockedLongerDurationDenomResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: AccountLockedLongerDurationDenomResponseProtoMsg): AccountLockedLongerDurationDenomResponse {
+    return AccountLockedLongerDurationDenomResponse.decode(message.value);
+  },
+
+  toProto(message: AccountLockedLongerDurationDenomResponse): Uint8Array {
+    return AccountLockedLongerDurationDenomResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: AccountLockedLongerDurationDenomResponse): AccountLockedLongerDurationDenomResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.lockup.AccountLockedLongerDurationDenomResponse",
+      value: AccountLockedLongerDurationDenomResponse.encode(message).finish()
+    };
   }
 
 };
@@ -3585,6 +4513,9 @@ function createBaseQueryParamsRequest(): QueryParamsRequest {
 }
 
 export const QueryParamsRequest = {
+  typeUrl: "/osmosis.lockup.QueryParamsRequest",
+  aminoType: "osmosis/lockup/query-params-request",
+
   encode(_: QueryParamsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -3637,6 +4568,32 @@ export const QueryParamsRequest = {
   toAmino(_: QueryParamsRequest): QueryParamsRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest {
+    return QueryParamsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryParamsRequest): QueryParamsRequestAminoMsg {
+    return {
+      type: "osmosis/lockup/query-params-request",
+      value: QueryParamsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryParamsRequestProtoMsg): QueryParamsRequest {
+    return QueryParamsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryParamsRequest): Uint8Array {
+    return QueryParamsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryParamsRequest): QueryParamsRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.lockup.QueryParamsRequest",
+      value: QueryParamsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -3648,6 +4605,9 @@ function createBaseQueryParamsResponse(): QueryParamsResponse {
 }
 
 export const QueryParamsResponse = {
+  typeUrl: "/osmosis.lockup.QueryParamsResponse",
+  aminoType: "osmosis/lockup/query-params-response",
+
   encode(message: QueryParamsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.params !== undefined) {
       Params.encode(message.params, writer.uint32(10).fork()).ldelim();
@@ -3718,6 +4678,32 @@ export const QueryParamsResponse = {
     const obj: any = {};
     obj.params = message.params ? Params.toAmino(message.params) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryParamsResponseAminoMsg): QueryParamsResponse {
+    return QueryParamsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryParamsResponse): QueryParamsResponseAminoMsg {
+    return {
+      type: "osmosis/lockup/query-params-response",
+      value: QueryParamsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryParamsResponseProtoMsg): QueryParamsResponse {
+    return QueryParamsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryParamsResponse): Uint8Array {
+    return QueryParamsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryParamsResponse): QueryParamsResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.lockup.QueryParamsResponse",
+      value: QueryParamsResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/osmosis/lockup/tx.ts b/__fixtures__/outputv2/osmosis/lockup/tx.ts
index aeb879888..be015bef9 100644
--- a/__fixtures__/outputv2/osmosis/lockup/tx.ts
+++ b/__fixtures__/outputv2/osmosis/lockup/tx.ts
@@ -9,7 +9,7 @@ export interface MsgLockTokens {
   duration?: Duration;
   coins: Coin[];
 }
-export interface MsgLockTokensProtoType {
+export interface MsgLockTokensProtoMsg {
   typeUrl: "/osmosis.lockup.MsgLockTokens";
   value: Uint8Array;
 }
@@ -18,7 +18,7 @@ export interface MsgLockTokensAmino {
   duration?: DurationAmino;
   coins: CoinAmino[];
 }
-export interface MsgLockTokensAminoType {
+export interface MsgLockTokensAminoMsg {
   type: "osmosis/lockup/lock-tokens";
   value: MsgLockTokensAmino;
 }
@@ -30,14 +30,14 @@ export interface MsgLockTokensSDKType {
 export interface MsgLockTokensResponse {
   ID: Long;
 }
-export interface MsgLockTokensResponseProtoType {
+export interface MsgLockTokensResponseProtoMsg {
   typeUrl: "/osmosis.lockup.MsgLockTokensResponse";
   value: Uint8Array;
 }
 export interface MsgLockTokensResponseAmino {
   ID: string;
 }
-export interface MsgLockTokensResponseAminoType {
+export interface MsgLockTokensResponseAminoMsg {
   type: "osmosis/lockup/lock-tokens-response";
   value: MsgLockTokensResponseAmino;
 }
@@ -47,14 +47,14 @@ export interface MsgLockTokensResponseSDKType {
 export interface MsgBeginUnlockingAll {
   owner: string;
 }
-export interface MsgBeginUnlockingAllProtoType {
+export interface MsgBeginUnlockingAllProtoMsg {
   typeUrl: "/osmosis.lockup.MsgBeginUnlockingAll";
   value: Uint8Array;
 }
 export interface MsgBeginUnlockingAllAmino {
   owner: string;
 }
-export interface MsgBeginUnlockingAllAminoType {
+export interface MsgBeginUnlockingAllAminoMsg {
   type: "osmosis/lockup/begin-unlock-tokens";
   value: MsgBeginUnlockingAllAmino;
 }
@@ -64,14 +64,14 @@ export interface MsgBeginUnlockingAllSDKType {
 export interface MsgBeginUnlockingAllResponse {
   unlocks: PeriodLock[];
 }
-export interface MsgBeginUnlockingAllResponseProtoType {
+export interface MsgBeginUnlockingAllResponseProtoMsg {
   typeUrl: "/osmosis.lockup.MsgBeginUnlockingAllResponse";
   value: Uint8Array;
 }
 export interface MsgBeginUnlockingAllResponseAmino {
   unlocks: PeriodLockAmino[];
 }
-export interface MsgBeginUnlockingAllResponseAminoType {
+export interface MsgBeginUnlockingAllResponseAminoMsg {
   type: "osmosis/lockup/begin-unlocking-all-response";
   value: MsgBeginUnlockingAllResponseAmino;
 }
@@ -85,7 +85,7 @@ export interface MsgBeginUnlocking {
   /** Amount of unlocking coins. Unlock all if not set. */
   coins: Coin[];
 }
-export interface MsgBeginUnlockingProtoType {
+export interface MsgBeginUnlockingProtoMsg {
   typeUrl: "/osmosis.lockup.MsgBeginUnlocking";
   value: Uint8Array;
 }
@@ -96,7 +96,7 @@ export interface MsgBeginUnlockingAmino {
   /** Amount of unlocking coins. Unlock all if not set. */
   coins: CoinAmino[];
 }
-export interface MsgBeginUnlockingAminoType {
+export interface MsgBeginUnlockingAminoMsg {
   type: "osmosis/lockup/begin-unlock-period-lock";
   value: MsgBeginUnlockingAmino;
 }
@@ -108,14 +108,14 @@ export interface MsgBeginUnlockingSDKType {
 export interface MsgBeginUnlockingResponse {
   success: boolean;
 }
-export interface MsgBeginUnlockingResponseProtoType {
+export interface MsgBeginUnlockingResponseProtoMsg {
   typeUrl: "/osmosis.lockup.MsgBeginUnlockingResponse";
   value: Uint8Array;
 }
 export interface MsgBeginUnlockingResponseAmino {
   success: boolean;
 }
-export interface MsgBeginUnlockingResponseAminoType {
+export interface MsgBeginUnlockingResponseAminoMsg {
   type: "osmosis/lockup/begin-unlocking-response";
   value: MsgBeginUnlockingResponseAmino;
 }
@@ -137,7 +137,7 @@ export interface MsgExtendLockup {
    */
   duration?: Duration;
 }
-export interface MsgExtendLockupProtoType {
+export interface MsgExtendLockupProtoMsg {
   typeUrl: "/osmosis.lockup.MsgExtendLockup";
   value: Uint8Array;
 }
@@ -156,7 +156,7 @@ export interface MsgExtendLockupAmino {
    */
   duration?: DurationAmino;
 }
-export interface MsgExtendLockupAminoType {
+export interface MsgExtendLockupAminoMsg {
   type: "osmosis/lockup/extend-lockup";
   value: MsgExtendLockupAmino;
 }
@@ -173,14 +173,14 @@ export interface MsgExtendLockupSDKType {
 export interface MsgExtendLockupResponse {
   success: boolean;
 }
-export interface MsgExtendLockupResponseProtoType {
+export interface MsgExtendLockupResponseProtoMsg {
   typeUrl: "/osmosis.lockup.MsgExtendLockupResponse";
   value: Uint8Array;
 }
 export interface MsgExtendLockupResponseAmino {
   success: boolean;
 }
-export interface MsgExtendLockupResponseAminoType {
+export interface MsgExtendLockupResponseAminoMsg {
   type: "osmosis/lockup/extend-lockup-response";
   value: MsgExtendLockupResponseAmino;
 }
@@ -199,7 +199,7 @@ export interface MsgForceUnlock {
   /** Amount of unlocking coins. Unlock all if not set. */
   coins: Coin[];
 }
-export interface MsgForceUnlockProtoType {
+export interface MsgForceUnlockProtoMsg {
   typeUrl: "/osmosis.lockup.MsgForceUnlock";
   value: Uint8Array;
 }
@@ -215,7 +215,7 @@ export interface MsgForceUnlockAmino {
   /** Amount of unlocking coins. Unlock all if not set. */
   coins: CoinAmino[];
 }
-export interface MsgForceUnlockAminoType {
+export interface MsgForceUnlockAminoMsg {
   type: "osmosis/lockup/force-unlock";
   value: MsgForceUnlockAmino;
 }
@@ -232,14 +232,14 @@ export interface MsgForceUnlockSDKType {
 export interface MsgForceUnlockResponse {
   success: boolean;
 }
-export interface MsgForceUnlockResponseProtoType {
+export interface MsgForceUnlockResponseProtoMsg {
   typeUrl: "/osmosis.lockup.MsgForceUnlockResponse";
   value: Uint8Array;
 }
 export interface MsgForceUnlockResponseAmino {
   success: boolean;
 }
-export interface MsgForceUnlockResponseAminoType {
+export interface MsgForceUnlockResponseAminoMsg {
   type: "osmosis/lockup/force-unlock-response";
   value: MsgForceUnlockResponseAmino;
 }
@@ -256,6 +256,9 @@ function createBaseMsgLockTokens(): MsgLockTokens {
 }
 
 export const MsgLockTokens = {
+  typeUrl: "/osmosis.lockup.MsgLockTokens",
+  aminoType: "osmosis/lockup/lock-tokens",
+
   encode(message: MsgLockTokens, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.owner !== "") {
       writer.uint32(10).string(message.owner);
@@ -374,6 +377,32 @@ export const MsgLockTokens = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: MsgLockTokensAminoMsg): MsgLockTokens {
+    return MsgLockTokens.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgLockTokens): MsgLockTokensAminoMsg {
+    return {
+      type: "osmosis/lockup/lock-tokens",
+      value: MsgLockTokens.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgLockTokensProtoMsg): MsgLockTokens {
+    return MsgLockTokens.decode(message.value);
+  },
+
+  toProto(message: MsgLockTokens): Uint8Array {
+    return MsgLockTokens.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgLockTokens): MsgLockTokensProtoMsg {
+    return {
+      typeUrl: "/osmosis.lockup.MsgLockTokens",
+      value: MsgLockTokens.encode(message).finish()
+    };
   }
 
 };
@@ -385,6 +414,9 @@ function createBaseMsgLockTokensResponse(): MsgLockTokensResponse {
 }
 
 export const MsgLockTokensResponse = {
+  typeUrl: "/osmosis.lockup.MsgLockTokensResponse",
+  aminoType: "osmosis/lockup/lock-tokens-response",
+
   encode(message: MsgLockTokensResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.ID.isZero()) {
       writer.uint32(8).uint64(message.ID);
@@ -455,6 +487,32 @@ export const MsgLockTokensResponse = {
     const obj: any = {};
     obj.ID = message.ID ? message.ID.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgLockTokensResponseAminoMsg): MsgLockTokensResponse {
+    return MsgLockTokensResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgLockTokensResponse): MsgLockTokensResponseAminoMsg {
+    return {
+      type: "osmosis/lockup/lock-tokens-response",
+      value: MsgLockTokensResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgLockTokensResponseProtoMsg): MsgLockTokensResponse {
+    return MsgLockTokensResponse.decode(message.value);
+  },
+
+  toProto(message: MsgLockTokensResponse): Uint8Array {
+    return MsgLockTokensResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgLockTokensResponse): MsgLockTokensResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.lockup.MsgLockTokensResponse",
+      value: MsgLockTokensResponse.encode(message).finish()
+    };
   }
 
 };
@@ -466,6 +524,9 @@ function createBaseMsgBeginUnlockingAll(): MsgBeginUnlockingAll {
 }
 
 export const MsgBeginUnlockingAll = {
+  typeUrl: "/osmosis.lockup.MsgBeginUnlockingAll",
+  aminoType: "osmosis/lockup/begin-unlock-tokens",
+
   encode(message: MsgBeginUnlockingAll, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.owner !== "") {
       writer.uint32(10).string(message.owner);
@@ -536,6 +597,32 @@ export const MsgBeginUnlockingAll = {
     const obj: any = {};
     obj.owner = message.owner;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgBeginUnlockingAllAminoMsg): MsgBeginUnlockingAll {
+    return MsgBeginUnlockingAll.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgBeginUnlockingAll): MsgBeginUnlockingAllAminoMsg {
+    return {
+      type: "osmosis/lockup/begin-unlock-tokens",
+      value: MsgBeginUnlockingAll.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgBeginUnlockingAllProtoMsg): MsgBeginUnlockingAll {
+    return MsgBeginUnlockingAll.decode(message.value);
+  },
+
+  toProto(message: MsgBeginUnlockingAll): Uint8Array {
+    return MsgBeginUnlockingAll.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgBeginUnlockingAll): MsgBeginUnlockingAllProtoMsg {
+    return {
+      typeUrl: "/osmosis.lockup.MsgBeginUnlockingAll",
+      value: MsgBeginUnlockingAll.encode(message).finish()
+    };
   }
 
 };
@@ -547,6 +634,9 @@ function createBaseMsgBeginUnlockingAllResponse(): MsgBeginUnlockingAllResponse
 }
 
 export const MsgBeginUnlockingAllResponse = {
+  typeUrl: "/osmosis.lockup.MsgBeginUnlockingAllResponse",
+  aminoType: "osmosis/lockup/begin-unlocking-all-response",
+
   encode(message: MsgBeginUnlockingAllResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.unlocks) {
       PeriodLock.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -635,6 +725,32 @@ export const MsgBeginUnlockingAllResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: MsgBeginUnlockingAllResponseAminoMsg): MsgBeginUnlockingAllResponse {
+    return MsgBeginUnlockingAllResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgBeginUnlockingAllResponse): MsgBeginUnlockingAllResponseAminoMsg {
+    return {
+      type: "osmosis/lockup/begin-unlocking-all-response",
+      value: MsgBeginUnlockingAllResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgBeginUnlockingAllResponseProtoMsg): MsgBeginUnlockingAllResponse {
+    return MsgBeginUnlockingAllResponse.decode(message.value);
+  },
+
+  toProto(message: MsgBeginUnlockingAllResponse): Uint8Array {
+    return MsgBeginUnlockingAllResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgBeginUnlockingAllResponse): MsgBeginUnlockingAllResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.lockup.MsgBeginUnlockingAllResponse",
+      value: MsgBeginUnlockingAllResponse.encode(message).finish()
+    };
   }
 
 };
@@ -648,6 +764,9 @@ function createBaseMsgBeginUnlocking(): MsgBeginUnlocking {
 }
 
 export const MsgBeginUnlocking = {
+  typeUrl: "/osmosis.lockup.MsgBeginUnlocking",
+  aminoType: "osmosis/lockup/begin-unlock-period-lock",
+
   encode(message: MsgBeginUnlocking, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.owner !== "") {
       writer.uint32(10).string(message.owner);
@@ -766,6 +885,32 @@ export const MsgBeginUnlocking = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: MsgBeginUnlockingAminoMsg): MsgBeginUnlocking {
+    return MsgBeginUnlocking.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgBeginUnlocking): MsgBeginUnlockingAminoMsg {
+    return {
+      type: "osmosis/lockup/begin-unlock-period-lock",
+      value: MsgBeginUnlocking.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgBeginUnlockingProtoMsg): MsgBeginUnlocking {
+    return MsgBeginUnlocking.decode(message.value);
+  },
+
+  toProto(message: MsgBeginUnlocking): Uint8Array {
+    return MsgBeginUnlocking.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgBeginUnlocking): MsgBeginUnlockingProtoMsg {
+    return {
+      typeUrl: "/osmosis.lockup.MsgBeginUnlocking",
+      value: MsgBeginUnlocking.encode(message).finish()
+    };
   }
 
 };
@@ -777,6 +922,9 @@ function createBaseMsgBeginUnlockingResponse(): MsgBeginUnlockingResponse {
 }
 
 export const MsgBeginUnlockingResponse = {
+  typeUrl: "/osmosis.lockup.MsgBeginUnlockingResponse",
+  aminoType: "osmosis/lockup/begin-unlocking-response",
+
   encode(message: MsgBeginUnlockingResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.success === true) {
       writer.uint32(8).bool(message.success);
@@ -847,6 +995,32 @@ export const MsgBeginUnlockingResponse = {
     const obj: any = {};
     obj.success = message.success;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgBeginUnlockingResponseAminoMsg): MsgBeginUnlockingResponse {
+    return MsgBeginUnlockingResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgBeginUnlockingResponse): MsgBeginUnlockingResponseAminoMsg {
+    return {
+      type: "osmosis/lockup/begin-unlocking-response",
+      value: MsgBeginUnlockingResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgBeginUnlockingResponseProtoMsg): MsgBeginUnlockingResponse {
+    return MsgBeginUnlockingResponse.decode(message.value);
+  },
+
+  toProto(message: MsgBeginUnlockingResponse): Uint8Array {
+    return MsgBeginUnlockingResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgBeginUnlockingResponse): MsgBeginUnlockingResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.lockup.MsgBeginUnlockingResponse",
+      value: MsgBeginUnlockingResponse.encode(message).finish()
+    };
   }
 
 };
@@ -860,6 +1034,9 @@ function createBaseMsgExtendLockup(): MsgExtendLockup {
 }
 
 export const MsgExtendLockup = {
+  typeUrl: "/osmosis.lockup.MsgExtendLockup",
+  aminoType: "osmosis/lockup/extend-lockup",
+
   encode(message: MsgExtendLockup, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.owner !== "") {
       writer.uint32(10).string(message.owner);
@@ -960,6 +1137,32 @@ export const MsgExtendLockup = {
     obj.ID = message.ID ? message.ID.toString() : undefined;
     obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgExtendLockupAminoMsg): MsgExtendLockup {
+    return MsgExtendLockup.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgExtendLockup): MsgExtendLockupAminoMsg {
+    return {
+      type: "osmosis/lockup/extend-lockup",
+      value: MsgExtendLockup.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgExtendLockupProtoMsg): MsgExtendLockup {
+    return MsgExtendLockup.decode(message.value);
+  },
+
+  toProto(message: MsgExtendLockup): Uint8Array {
+    return MsgExtendLockup.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgExtendLockup): MsgExtendLockupProtoMsg {
+    return {
+      typeUrl: "/osmosis.lockup.MsgExtendLockup",
+      value: MsgExtendLockup.encode(message).finish()
+    };
   }
 
 };
@@ -971,6 +1174,9 @@ function createBaseMsgExtendLockupResponse(): MsgExtendLockupResponse {
 }
 
 export const MsgExtendLockupResponse = {
+  typeUrl: "/osmosis.lockup.MsgExtendLockupResponse",
+  aminoType: "osmosis/lockup/extend-lockup-response",
+
   encode(message: MsgExtendLockupResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.success === true) {
       writer.uint32(8).bool(message.success);
@@ -1041,6 +1247,32 @@ export const MsgExtendLockupResponse = {
     const obj: any = {};
     obj.success = message.success;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgExtendLockupResponseAminoMsg): MsgExtendLockupResponse {
+    return MsgExtendLockupResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgExtendLockupResponse): MsgExtendLockupResponseAminoMsg {
+    return {
+      type: "osmosis/lockup/extend-lockup-response",
+      value: MsgExtendLockupResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgExtendLockupResponseProtoMsg): MsgExtendLockupResponse {
+    return MsgExtendLockupResponse.decode(message.value);
+  },
+
+  toProto(message: MsgExtendLockupResponse): Uint8Array {
+    return MsgExtendLockupResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgExtendLockupResponse): MsgExtendLockupResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.lockup.MsgExtendLockupResponse",
+      value: MsgExtendLockupResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1054,6 +1286,9 @@ function createBaseMsgForceUnlock(): MsgForceUnlock {
 }
 
 export const MsgForceUnlock = {
+  typeUrl: "/osmosis.lockup.MsgForceUnlock",
+  aminoType: "osmosis/lockup/force-unlock",
+
   encode(message: MsgForceUnlock, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.owner !== "") {
       writer.uint32(10).string(message.owner);
@@ -1172,6 +1407,32 @@ export const MsgForceUnlock = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: MsgForceUnlockAminoMsg): MsgForceUnlock {
+    return MsgForceUnlock.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgForceUnlock): MsgForceUnlockAminoMsg {
+    return {
+      type: "osmosis/lockup/force-unlock",
+      value: MsgForceUnlock.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgForceUnlockProtoMsg): MsgForceUnlock {
+    return MsgForceUnlock.decode(message.value);
+  },
+
+  toProto(message: MsgForceUnlock): Uint8Array {
+    return MsgForceUnlock.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgForceUnlock): MsgForceUnlockProtoMsg {
+    return {
+      typeUrl: "/osmosis.lockup.MsgForceUnlock",
+      value: MsgForceUnlock.encode(message).finish()
+    };
   }
 
 };
@@ -1183,6 +1444,9 @@ function createBaseMsgForceUnlockResponse(): MsgForceUnlockResponse {
 }
 
 export const MsgForceUnlockResponse = {
+  typeUrl: "/osmosis.lockup.MsgForceUnlockResponse",
+  aminoType: "osmosis/lockup/force-unlock-response",
+
   encode(message: MsgForceUnlockResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.success === true) {
       writer.uint32(8).bool(message.success);
@@ -1253,6 +1517,32 @@ export const MsgForceUnlockResponse = {
     const obj: any = {};
     obj.success = message.success;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgForceUnlockResponseAminoMsg): MsgForceUnlockResponse {
+    return MsgForceUnlockResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgForceUnlockResponse): MsgForceUnlockResponseAminoMsg {
+    return {
+      type: "osmosis/lockup/force-unlock-response",
+      value: MsgForceUnlockResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgForceUnlockResponseProtoMsg): MsgForceUnlockResponse {
+    return MsgForceUnlockResponse.decode(message.value);
+  },
+
+  toProto(message: MsgForceUnlockResponse): Uint8Array {
+    return MsgForceUnlockResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgForceUnlockResponse): MsgForceUnlockResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.lockup.MsgForceUnlockResponse",
+      value: MsgForceUnlockResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/osmosis/mint/v1beta1/genesis.ts b/__fixtures__/outputv2/osmosis/mint/v1beta1/genesis.ts
index e1fb8c461..729d80d70 100644
--- a/__fixtures__/outputv2/osmosis/mint/v1beta1/genesis.ts
+++ b/__fixtures__/outputv2/osmosis/mint/v1beta1/genesis.ts
@@ -17,7 +17,7 @@ export interface GenesisState {
    */
   reductionStartedEpoch: Long;
 }
-export interface GenesisStateProtoType {
+export interface GenesisStateProtoMsg {
   typeUrl: "/osmosis.mint.v1beta1.GenesisState";
   value: Uint8Array;
 }
@@ -36,7 +36,7 @@ export interface GenesisStateAmino {
    */
   reduction_started_epoch: string;
 }
-export interface GenesisStateAminoType {
+export interface GenesisStateAminoMsg {
   type: "osmosis/mint/genesis-state";
   value: GenesisStateAmino;
 }
@@ -57,6 +57,9 @@ function createBaseGenesisState(): GenesisState {
 }
 
 export const GenesisState = {
+  typeUrl: "/osmosis.mint.v1beta1.GenesisState",
+  aminoType: "osmosis/mint/genesis-state",
+
   encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.minter !== undefined) {
       Minter.encode(message.minter, writer.uint32(10).fork()).ldelim();
@@ -157,6 +160,32 @@ export const GenesisState = {
     obj.params = message.params ? Params.toAmino(message.params) : undefined;
     obj.reduction_started_epoch = message.reductionStartedEpoch ? message.reductionStartedEpoch.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisStateAminoMsg): GenesisState {
+    return GenesisState.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GenesisState): GenesisStateAminoMsg {
+    return {
+      type: "osmosis/mint/genesis-state",
+      value: GenesisState.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GenesisStateProtoMsg): GenesisState {
+    return GenesisState.decode(message.value);
+  },
+
+  toProto(message: GenesisState): Uint8Array {
+    return GenesisState.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisState): GenesisStateProtoMsg {
+    return {
+      typeUrl: "/osmosis.mint.v1beta1.GenesisState",
+      value: GenesisState.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/osmosis/mint/v1beta1/mint.ts b/__fixtures__/outputv2/osmosis/mint/v1beta1/mint.ts
index f9c3e396c..f78baea47 100644
--- a/__fixtures__/outputv2/osmosis/mint/v1beta1/mint.ts
+++ b/__fixtures__/outputv2/osmosis/mint/v1beta1/mint.ts
@@ -7,7 +7,7 @@ export interface Minter {
   /** epoch_provisions represent rewards for the current epoch. */
   epochProvisions: string;
 }
-export interface MinterProtoType {
+export interface MinterProtoMsg {
   typeUrl: "/osmosis.mint.v1beta1.Minter";
   value: Uint8Array;
 }
@@ -17,7 +17,7 @@ export interface MinterAmino {
   /** epoch_provisions represent rewards for the current epoch. */
   epoch_provisions: string;
 }
-export interface MinterAminoType {
+export interface MinterAminoMsg {
   type: "osmosis/mint/minter";
   value: MinterAmino;
 }
@@ -36,7 +36,7 @@ export interface WeightedAddress {
   address: string;
   weight: string;
 }
-export interface WeightedAddressProtoType {
+export interface WeightedAddressProtoMsg {
   typeUrl: "/osmosis.mint.v1beta1.WeightedAddress";
   value: Uint8Array;
 }
@@ -50,7 +50,7 @@ export interface WeightedAddressAmino {
   address: string;
   weight: string;
 }
-export interface WeightedAddressAminoType {
+export interface WeightedAddressAminoMsg {
   type: "osmosis/mint/weighted-address";
   value: WeightedAddressAmino;
 }
@@ -95,7 +95,7 @@ export interface DistributionProportions {
    */
   communityPool: string;
 }
-export interface DistributionProportionsProtoType {
+export interface DistributionProportionsProtoMsg {
   typeUrl: "/osmosis.mint.v1beta1.DistributionProportions";
   value: Uint8Array;
 }
@@ -130,7 +130,7 @@ export interface DistributionProportionsAmino {
    */
   community_pool: string;
 }
-export interface DistributionProportionsAminoType {
+export interface DistributionProportionsAminoMsg {
   type: "osmosis/mint/distribution-proportions";
   value: DistributionProportionsAmino;
 }
@@ -191,7 +191,7 @@ export interface Params {
    */
   mintingRewardsDistributionStartEpoch: Long;
 }
-export interface ParamsProtoType {
+export interface ParamsProtoMsg {
   typeUrl: "/osmosis.mint.v1beta1.Params";
   value: Uint8Array;
 }
@@ -240,7 +240,7 @@ export interface ParamsAmino {
    */
   minting_rewards_distribution_start_epoch: string;
 }
-export interface ParamsAminoType {
+export interface ParamsAminoMsg {
   type: "osmosis/mint/params";
   value: ParamsAmino;
 }
@@ -264,6 +264,9 @@ function createBaseMinter(): Minter {
 }
 
 export const Minter = {
+  typeUrl: "/osmosis.mint.v1beta1.Minter",
+  aminoType: "osmosis/mint/minter",
+
   encode(message: Minter, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.epochProvisions !== "") {
       writer.uint32(10).string(message.epochProvisions);
@@ -334,6 +337,32 @@ export const Minter = {
     const obj: any = {};
     obj.epoch_provisions = message.epochProvisions;
     return obj;
+  },
+
+  fromAminoMsg(object: MinterAminoMsg): Minter {
+    return Minter.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Minter): MinterAminoMsg {
+    return {
+      type: "osmosis/mint/minter",
+      value: Minter.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MinterProtoMsg): Minter {
+    return Minter.decode(message.value);
+  },
+
+  toProto(message: Minter): Uint8Array {
+    return Minter.encode(message).finish();
+  },
+
+  toProtoMsg(message: Minter): MinterProtoMsg {
+    return {
+      typeUrl: "/osmosis.mint.v1beta1.Minter",
+      value: Minter.encode(message).finish()
+    };
   }
 
 };
@@ -346,6 +375,9 @@ function createBaseWeightedAddress(): WeightedAddress {
 }
 
 export const WeightedAddress = {
+  typeUrl: "/osmosis.mint.v1beta1.WeightedAddress",
+  aminoType: "osmosis/mint/weighted-address",
+
   encode(message: WeightedAddress, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.address !== "") {
       writer.uint32(10).string(message.address);
@@ -431,6 +463,32 @@ export const WeightedAddress = {
     obj.address = message.address;
     obj.weight = message.weight;
     return obj;
+  },
+
+  fromAminoMsg(object: WeightedAddressAminoMsg): WeightedAddress {
+    return WeightedAddress.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: WeightedAddress): WeightedAddressAminoMsg {
+    return {
+      type: "osmosis/mint/weighted-address",
+      value: WeightedAddress.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: WeightedAddressProtoMsg): WeightedAddress {
+    return WeightedAddress.decode(message.value);
+  },
+
+  toProto(message: WeightedAddress): Uint8Array {
+    return WeightedAddress.encode(message).finish();
+  },
+
+  toProtoMsg(message: WeightedAddress): WeightedAddressProtoMsg {
+    return {
+      typeUrl: "/osmosis.mint.v1beta1.WeightedAddress",
+      value: WeightedAddress.encode(message).finish()
+    };
   }
 
 };
@@ -445,6 +503,9 @@ function createBaseDistributionProportions(): DistributionProportions {
 }
 
 export const DistributionProportions = {
+  typeUrl: "/osmosis.mint.v1beta1.DistributionProportions",
+  aminoType: "osmosis/mint/distribution-proportions",
+
   encode(message: DistributionProportions, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.staking !== "") {
       writer.uint32(10).string(message.staking);
@@ -560,6 +621,32 @@ export const DistributionProportions = {
     obj.developer_rewards = message.developerRewards;
     obj.community_pool = message.communityPool;
     return obj;
+  },
+
+  fromAminoMsg(object: DistributionProportionsAminoMsg): DistributionProportions {
+    return DistributionProportions.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: DistributionProportions): DistributionProportionsAminoMsg {
+    return {
+      type: "osmosis/mint/distribution-proportions",
+      value: DistributionProportions.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: DistributionProportionsProtoMsg): DistributionProportions {
+    return DistributionProportions.decode(message.value);
+  },
+
+  toProto(message: DistributionProportions): Uint8Array {
+    return DistributionProportions.encode(message).finish();
+  },
+
+  toProtoMsg(message: DistributionProportions): DistributionProportionsProtoMsg {
+    return {
+      typeUrl: "/osmosis.mint.v1beta1.DistributionProportions",
+      value: DistributionProportions.encode(message).finish()
+    };
   }
 
 };
@@ -578,6 +665,9 @@ function createBaseParams(): Params {
 }
 
 export const Params = {
+  typeUrl: "/osmosis.mint.v1beta1.Params",
+  aminoType: "osmosis/mint/params",
+
   encode(message: Params, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.mintDenom !== "") {
       writer.uint32(10).string(message.mintDenom);
@@ -771,6 +861,32 @@ export const Params = {
 
     obj.minting_rewards_distribution_start_epoch = message.mintingRewardsDistributionStartEpoch ? message.mintingRewardsDistributionStartEpoch.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ParamsAminoMsg): Params {
+    return Params.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Params): ParamsAminoMsg {
+    return {
+      type: "osmosis/mint/params",
+      value: Params.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ParamsProtoMsg): Params {
+    return Params.decode(message.value);
+  },
+
+  toProto(message: Params): Uint8Array {
+    return Params.encode(message).finish();
+  },
+
+  toProtoMsg(message: Params): ParamsProtoMsg {
+    return {
+      typeUrl: "/osmosis.mint.v1beta1.Params",
+      value: Params.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/osmosis/mint/v1beta1/query.ts b/__fixtures__/outputv2/osmosis/mint/v1beta1/query.ts
index 92fde39f9..311926c33 100644
--- a/__fixtures__/outputv2/osmosis/mint/v1beta1/query.ts
+++ b/__fixtures__/outputv2/osmosis/mint/v1beta1/query.ts
@@ -5,14 +5,14 @@ export const protobufPackage = "osmosis.mint.v1beta1";
 
 /** QueryParamsRequest is the request type for the Query/Params RPC method. */
 export interface QueryParamsRequest {}
-export interface QueryParamsRequestProtoType {
+export interface QueryParamsRequestProtoMsg {
   typeUrl: "/osmosis.mint.v1beta1.QueryParamsRequest";
   value: Uint8Array;
 }
 
 /** QueryParamsRequest is the request type for the Query/Params RPC method. */
 export interface QueryParamsRequestAmino {}
-export interface QueryParamsRequestAminoType {
+export interface QueryParamsRequestAminoMsg {
   type: "osmosis/mint/query-params-request";
   value: QueryParamsRequestAmino;
 }
@@ -25,7 +25,7 @@ export interface QueryParamsResponse {
   /** params defines the parameters of the module. */
   params?: Params;
 }
-export interface QueryParamsResponseProtoType {
+export interface QueryParamsResponseProtoMsg {
   typeUrl: "/osmosis.mint.v1beta1.QueryParamsResponse";
   value: Uint8Array;
 }
@@ -35,7 +35,7 @@ export interface QueryParamsResponseAmino {
   /** params defines the parameters of the module. */
   params?: ParamsAmino;
 }
-export interface QueryParamsResponseAminoType {
+export interface QueryParamsResponseAminoMsg {
   type: "osmosis/mint/query-params-response";
   value: QueryParamsResponseAmino;
 }
@@ -50,7 +50,7 @@ export interface QueryParamsResponseSDKType {
  * Query/EpochProvisions RPC method.
  */
 export interface QueryEpochProvisionsRequest {}
-export interface QueryEpochProvisionsRequestProtoType {
+export interface QueryEpochProvisionsRequestProtoMsg {
   typeUrl: "/osmosis.mint.v1beta1.QueryEpochProvisionsRequest";
   value: Uint8Array;
 }
@@ -60,7 +60,7 @@ export interface QueryEpochProvisionsRequestProtoType {
  * Query/EpochProvisions RPC method.
  */
 export interface QueryEpochProvisionsRequestAmino {}
-export interface QueryEpochProvisionsRequestAminoType {
+export interface QueryEpochProvisionsRequestAminoMsg {
   type: "osmosis/mint/query-epoch-provisions-request";
   value: QueryEpochProvisionsRequestAmino;
 }
@@ -79,7 +79,7 @@ export interface QueryEpochProvisionsResponse {
   /** epoch_provisions is the current minting per epoch provisions value. */
   epochProvisions: Uint8Array;
 }
-export interface QueryEpochProvisionsResponseProtoType {
+export interface QueryEpochProvisionsResponseProtoMsg {
   typeUrl: "/osmosis.mint.v1beta1.QueryEpochProvisionsResponse";
   value: Uint8Array;
 }
@@ -92,7 +92,7 @@ export interface QueryEpochProvisionsResponseAmino {
   /** epoch_provisions is the current minting per epoch provisions value. */
   epoch_provisions: Uint8Array;
 }
-export interface QueryEpochProvisionsResponseAminoType {
+export interface QueryEpochProvisionsResponseAminoMsg {
   type: "osmosis/mint/query-epoch-provisions-response";
   value: QueryEpochProvisionsResponseAmino;
 }
@@ -110,6 +110,9 @@ function createBaseQueryParamsRequest(): QueryParamsRequest {
 }
 
 export const QueryParamsRequest = {
+  typeUrl: "/osmosis.mint.v1beta1.QueryParamsRequest",
+  aminoType: "osmosis/mint/query-params-request",
+
   encode(_: QueryParamsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -162,6 +165,32 @@ export const QueryParamsRequest = {
   toAmino(_: QueryParamsRequest): QueryParamsRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest {
+    return QueryParamsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryParamsRequest): QueryParamsRequestAminoMsg {
+    return {
+      type: "osmosis/mint/query-params-request",
+      value: QueryParamsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryParamsRequestProtoMsg): QueryParamsRequest {
+    return QueryParamsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryParamsRequest): Uint8Array {
+    return QueryParamsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryParamsRequest): QueryParamsRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.mint.v1beta1.QueryParamsRequest",
+      value: QueryParamsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -173,6 +202,9 @@ function createBaseQueryParamsResponse(): QueryParamsResponse {
 }
 
 export const QueryParamsResponse = {
+  typeUrl: "/osmosis.mint.v1beta1.QueryParamsResponse",
+  aminoType: "osmosis/mint/query-params-response",
+
   encode(message: QueryParamsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.params !== undefined) {
       Params.encode(message.params, writer.uint32(10).fork()).ldelim();
@@ -243,6 +275,32 @@ export const QueryParamsResponse = {
     const obj: any = {};
     obj.params = message.params ? Params.toAmino(message.params) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryParamsResponseAminoMsg): QueryParamsResponse {
+    return QueryParamsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryParamsResponse): QueryParamsResponseAminoMsg {
+    return {
+      type: "osmosis/mint/query-params-response",
+      value: QueryParamsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryParamsResponseProtoMsg): QueryParamsResponse {
+    return QueryParamsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryParamsResponse): Uint8Array {
+    return QueryParamsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryParamsResponse): QueryParamsResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.mint.v1beta1.QueryParamsResponse",
+      value: QueryParamsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -252,6 +310,9 @@ function createBaseQueryEpochProvisionsRequest(): QueryEpochProvisionsRequest {
 }
 
 export const QueryEpochProvisionsRequest = {
+  typeUrl: "/osmosis.mint.v1beta1.QueryEpochProvisionsRequest",
+  aminoType: "osmosis/mint/query-epoch-provisions-request",
+
   encode(_: QueryEpochProvisionsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -304,6 +365,32 @@ export const QueryEpochProvisionsRequest = {
   toAmino(_: QueryEpochProvisionsRequest): QueryEpochProvisionsRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryEpochProvisionsRequestAminoMsg): QueryEpochProvisionsRequest {
+    return QueryEpochProvisionsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryEpochProvisionsRequest): QueryEpochProvisionsRequestAminoMsg {
+    return {
+      type: "osmosis/mint/query-epoch-provisions-request",
+      value: QueryEpochProvisionsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryEpochProvisionsRequestProtoMsg): QueryEpochProvisionsRequest {
+    return QueryEpochProvisionsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryEpochProvisionsRequest): Uint8Array {
+    return QueryEpochProvisionsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryEpochProvisionsRequest): QueryEpochProvisionsRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.mint.v1beta1.QueryEpochProvisionsRequest",
+      value: QueryEpochProvisionsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -315,6 +402,9 @@ function createBaseQueryEpochProvisionsResponse(): QueryEpochProvisionsResponse
 }
 
 export const QueryEpochProvisionsResponse = {
+  typeUrl: "/osmosis.mint.v1beta1.QueryEpochProvisionsResponse",
+  aminoType: "osmosis/mint/query-epoch-provisions-response",
+
   encode(message: QueryEpochProvisionsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.epochProvisions.length !== 0) {
       writer.uint32(10).bytes(message.epochProvisions);
@@ -385,6 +475,32 @@ export const QueryEpochProvisionsResponse = {
     const obj: any = {};
     obj.epoch_provisions = message.epochProvisions;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryEpochProvisionsResponseAminoMsg): QueryEpochProvisionsResponse {
+    return QueryEpochProvisionsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryEpochProvisionsResponse): QueryEpochProvisionsResponseAminoMsg {
+    return {
+      type: "osmosis/mint/query-epoch-provisions-response",
+      value: QueryEpochProvisionsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryEpochProvisionsResponseProtoMsg): QueryEpochProvisionsResponse {
+    return QueryEpochProvisionsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryEpochProvisionsResponse): Uint8Array {
+    return QueryEpochProvisionsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryEpochProvisionsResponse): QueryEpochProvisionsResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.mint.v1beta1.QueryEpochProvisionsResponse",
+      value: QueryEpochProvisionsResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/osmosis/pool-incentives/v1beta1/genesis.ts b/__fixtures__/outputv2/osmosis/pool-incentives/v1beta1/genesis.ts
index a8049d0a4..e5980f5cd 100644
--- a/__fixtures__/outputv2/osmosis/pool-incentives/v1beta1/genesis.ts
+++ b/__fixtures__/outputv2/osmosis/pool-incentives/v1beta1/genesis.ts
@@ -12,7 +12,7 @@ export interface GenesisState {
   distrInfo?: DistrInfo;
   poolToGauges?: PoolToGauges;
 }
-export interface GenesisStateProtoType {
+export interface GenesisStateProtoMsg {
   typeUrl: "/osmosis.poolincentives.v1beta1.GenesisState";
   value: Uint8Array;
 }
@@ -25,7 +25,7 @@ export interface GenesisStateAmino {
   distr_info?: DistrInfoAmino;
   pool_to_gauges?: PoolToGaugesAmino;
 }
-export interface GenesisStateAminoType {
+export interface GenesisStateAminoMsg {
   type: "osmosis/poolincentives/genesis-state";
   value: GenesisStateAmino;
 }
@@ -48,6 +48,9 @@ function createBaseGenesisState(): GenesisState {
 }
 
 export const GenesisState = {
+  typeUrl: "/osmosis.poolincentives.v1beta1.GenesisState",
+  aminoType: "osmosis/poolincentives/genesis-state",
+
   encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.params !== undefined) {
       Params.encode(message.params, writer.uint32(10).fork()).ldelim();
@@ -181,6 +184,32 @@ export const GenesisState = {
     obj.distr_info = message.distrInfo ? DistrInfo.toAmino(message.distrInfo) : undefined;
     obj.pool_to_gauges = message.poolToGauges ? PoolToGauges.toAmino(message.poolToGauges) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisStateAminoMsg): GenesisState {
+    return GenesisState.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GenesisState): GenesisStateAminoMsg {
+    return {
+      type: "osmosis/poolincentives/genesis-state",
+      value: GenesisState.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GenesisStateProtoMsg): GenesisState {
+    return GenesisState.decode(message.value);
+  },
+
+  toProto(message: GenesisState): Uint8Array {
+    return GenesisState.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisState): GenesisStateProtoMsg {
+    return {
+      typeUrl: "/osmosis.poolincentives.v1beta1.GenesisState",
+      value: GenesisState.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/osmosis/pool-incentives/v1beta1/gov.ts b/__fixtures__/outputv2/osmosis/pool-incentives/v1beta1/gov.ts
index f00b8ae22..5a10d1d4a 100644
--- a/__fixtures__/outputv2/osmosis/pool-incentives/v1beta1/gov.ts
+++ b/__fixtures__/outputv2/osmosis/pool-incentives/v1beta1/gov.ts
@@ -17,7 +17,7 @@ export interface ReplacePoolIncentivesProposal {
   description: string;
   records: DistrRecord[];
 }
-export interface ReplacePoolIncentivesProposalProtoType {
+export interface ReplacePoolIncentivesProposalProtoMsg {
   typeUrl: "/osmosis.poolincentives.v1beta1.ReplacePoolIncentivesProposal";
   value: Uint8Array;
 }
@@ -36,7 +36,7 @@ export interface ReplacePoolIncentivesProposalAmino {
   description: string;
   records: DistrRecordAmino[];
 }
-export interface ReplacePoolIncentivesProposalAminoType {
+export interface ReplacePoolIncentivesProposalAminoMsg {
   type: "osmosis/poolincentives/replace-pool-incentives-proposal";
   value: ReplacePoolIncentivesProposalAmino;
 }
@@ -70,7 +70,7 @@ export interface UpdatePoolIncentivesProposal {
   description: string;
   records: DistrRecord[];
 }
-export interface UpdatePoolIncentivesProposalProtoType {
+export interface UpdatePoolIncentivesProposalProtoMsg {
   typeUrl: "/osmosis.poolincentives.v1beta1.UpdatePoolIncentivesProposal";
   value: Uint8Array;
 }
@@ -89,7 +89,7 @@ export interface UpdatePoolIncentivesProposalAmino {
   description: string;
   records: DistrRecordAmino[];
 }
-export interface UpdatePoolIncentivesProposalAminoType {
+export interface UpdatePoolIncentivesProposalAminoMsg {
   type: "osmosis/poolincentives/update-pool-incentives-proposal";
   value: UpdatePoolIncentivesProposalAmino;
 }
@@ -118,6 +118,9 @@ function createBaseReplacePoolIncentivesProposal(): ReplacePoolIncentivesProposa
 }
 
 export const ReplacePoolIncentivesProposal = {
+  typeUrl: "/osmosis.poolincentives.v1beta1.ReplacePoolIncentivesProposal",
+  aminoType: "osmosis/poolincentives/replace-pool-incentives-proposal",
+
   encode(message: ReplacePoolIncentivesProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.title !== "") {
       writer.uint32(10).string(message.title);
@@ -236,6 +239,32 @@ export const ReplacePoolIncentivesProposal = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ReplacePoolIncentivesProposalAminoMsg): ReplacePoolIncentivesProposal {
+    return ReplacePoolIncentivesProposal.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ReplacePoolIncentivesProposal): ReplacePoolIncentivesProposalAminoMsg {
+    return {
+      type: "osmosis/poolincentives/replace-pool-incentives-proposal",
+      value: ReplacePoolIncentivesProposal.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ReplacePoolIncentivesProposalProtoMsg): ReplacePoolIncentivesProposal {
+    return ReplacePoolIncentivesProposal.decode(message.value);
+  },
+
+  toProto(message: ReplacePoolIncentivesProposal): Uint8Array {
+    return ReplacePoolIncentivesProposal.encode(message).finish();
+  },
+
+  toProtoMsg(message: ReplacePoolIncentivesProposal): ReplacePoolIncentivesProposalProtoMsg {
+    return {
+      typeUrl: "/osmosis.poolincentives.v1beta1.ReplacePoolIncentivesProposal",
+      value: ReplacePoolIncentivesProposal.encode(message).finish()
+    };
   }
 
 };
@@ -249,6 +278,9 @@ function createBaseUpdatePoolIncentivesProposal(): UpdatePoolIncentivesProposal
 }
 
 export const UpdatePoolIncentivesProposal = {
+  typeUrl: "/osmosis.poolincentives.v1beta1.UpdatePoolIncentivesProposal",
+  aminoType: "osmosis/poolincentives/update-pool-incentives-proposal",
+
   encode(message: UpdatePoolIncentivesProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.title !== "") {
       writer.uint32(10).string(message.title);
@@ -367,6 +399,32 @@ export const UpdatePoolIncentivesProposal = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: UpdatePoolIncentivesProposalAminoMsg): UpdatePoolIncentivesProposal {
+    return UpdatePoolIncentivesProposal.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: UpdatePoolIncentivesProposal): UpdatePoolIncentivesProposalAminoMsg {
+    return {
+      type: "osmosis/poolincentives/update-pool-incentives-proposal",
+      value: UpdatePoolIncentivesProposal.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: UpdatePoolIncentivesProposalProtoMsg): UpdatePoolIncentivesProposal {
+    return UpdatePoolIncentivesProposal.decode(message.value);
+  },
+
+  toProto(message: UpdatePoolIncentivesProposal): Uint8Array {
+    return UpdatePoolIncentivesProposal.encode(message).finish();
+  },
+
+  toProtoMsg(message: UpdatePoolIncentivesProposal): UpdatePoolIncentivesProposalProtoMsg {
+    return {
+      typeUrl: "/osmosis.poolincentives.v1beta1.UpdatePoolIncentivesProposal",
+      value: UpdatePoolIncentivesProposal.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/osmosis/pool-incentives/v1beta1/incentives.ts b/__fixtures__/outputv2/osmosis/pool-incentives/v1beta1/incentives.ts
index 04445adc0..db301de18 100644
--- a/__fixtures__/outputv2/osmosis/pool-incentives/v1beta1/incentives.ts
+++ b/__fixtures__/outputv2/osmosis/pool-incentives/v1beta1/incentives.ts
@@ -11,7 +11,7 @@ export interface Params {
    */
   mintedDenom: string;
 }
-export interface ParamsProtoType {
+export interface ParamsProtoMsg {
   typeUrl: "/osmosis.poolincentives.v1beta1.Params";
   value: Uint8Array;
 }
@@ -24,7 +24,7 @@ export interface ParamsAmino {
    */
   minted_denom: string;
 }
-export interface ParamsAminoType {
+export interface ParamsAminoMsg {
   type: "osmosis/poolincentives/params";
   value: ParamsAmino;
 }
@@ -34,14 +34,14 @@ export interface ParamsSDKType {
 export interface LockableDurationsInfo {
   lockableDurations: Duration[];
 }
-export interface LockableDurationsInfoProtoType {
+export interface LockableDurationsInfoProtoMsg {
   typeUrl: "/osmosis.poolincentives.v1beta1.LockableDurationsInfo";
   value: Uint8Array;
 }
 export interface LockableDurationsInfoAmino {
   lockable_durations: DurationAmino[];
 }
-export interface LockableDurationsInfoAminoType {
+export interface LockableDurationsInfoAminoMsg {
   type: "osmosis/poolincentives/lockable-durations-info";
   value: LockableDurationsInfoAmino;
 }
@@ -52,7 +52,7 @@ export interface DistrInfo {
   totalWeight: string;
   records: DistrRecord[];
 }
-export interface DistrInfoProtoType {
+export interface DistrInfoProtoMsg {
   typeUrl: "/osmosis.poolincentives.v1beta1.DistrInfo";
   value: Uint8Array;
 }
@@ -60,7 +60,7 @@ export interface DistrInfoAmino {
   total_weight: string;
   records: DistrRecordAmino[];
 }
-export interface DistrInfoAminoType {
+export interface DistrInfoAminoMsg {
   type: "osmosis/poolincentives/distr-info";
   value: DistrInfoAmino;
 }
@@ -72,7 +72,7 @@ export interface DistrRecord {
   gaugeId: Long;
   weight: string;
 }
-export interface DistrRecordProtoType {
+export interface DistrRecordProtoMsg {
   typeUrl: "/osmosis.poolincentives.v1beta1.DistrRecord";
   value: Uint8Array;
 }
@@ -80,7 +80,7 @@ export interface DistrRecordAmino {
   gauge_id: string;
   weight: string;
 }
-export interface DistrRecordAminoType {
+export interface DistrRecordAminoMsg {
   type: "osmosis/poolincentives/distr-record";
   value: DistrRecordAmino;
 }
@@ -93,7 +93,7 @@ export interface PoolToGauge {
   gaugeId: Long;
   duration?: Duration;
 }
-export interface PoolToGaugeProtoType {
+export interface PoolToGaugeProtoMsg {
   typeUrl: "/osmosis.poolincentives.v1beta1.PoolToGauge";
   value: Uint8Array;
 }
@@ -102,7 +102,7 @@ export interface PoolToGaugeAmino {
   gauge_id: string;
   duration?: DurationAmino;
 }
-export interface PoolToGaugeAminoType {
+export interface PoolToGaugeAminoMsg {
   type: "osmosis/poolincentives/pool-to-gauge";
   value: PoolToGaugeAmino;
 }
@@ -114,14 +114,14 @@ export interface PoolToGaugeSDKType {
 export interface PoolToGauges {
   poolToGauge: PoolToGauge[];
 }
-export interface PoolToGaugesProtoType {
+export interface PoolToGaugesProtoMsg {
   typeUrl: "/osmosis.poolincentives.v1beta1.PoolToGauges";
   value: Uint8Array;
 }
 export interface PoolToGaugesAmino {
   pool_to_gauge: PoolToGaugeAmino[];
 }
-export interface PoolToGaugesAminoType {
+export interface PoolToGaugesAminoMsg {
   type: "osmosis/poolincentives/pool-to-gauges";
   value: PoolToGaugesAmino;
 }
@@ -136,6 +136,9 @@ function createBaseParams(): Params {
 }
 
 export const Params = {
+  typeUrl: "/osmosis.poolincentives.v1beta1.Params",
+  aminoType: "osmosis/poolincentives/params",
+
   encode(message: Params, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.mintedDenom !== "") {
       writer.uint32(10).string(message.mintedDenom);
@@ -206,6 +209,32 @@ export const Params = {
     const obj: any = {};
     obj.minted_denom = message.mintedDenom;
     return obj;
+  },
+
+  fromAminoMsg(object: ParamsAminoMsg): Params {
+    return Params.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Params): ParamsAminoMsg {
+    return {
+      type: "osmosis/poolincentives/params",
+      value: Params.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ParamsProtoMsg): Params {
+    return Params.decode(message.value);
+  },
+
+  toProto(message: Params): Uint8Array {
+    return Params.encode(message).finish();
+  },
+
+  toProtoMsg(message: Params): ParamsProtoMsg {
+    return {
+      typeUrl: "/osmosis.poolincentives.v1beta1.Params",
+      value: Params.encode(message).finish()
+    };
   }
 
 };
@@ -217,6 +246,9 @@ function createBaseLockableDurationsInfo(): LockableDurationsInfo {
 }
 
 export const LockableDurationsInfo = {
+  typeUrl: "/osmosis.poolincentives.v1beta1.LockableDurationsInfo",
+  aminoType: "osmosis/poolincentives/lockable-durations-info",
+
   encode(message: LockableDurationsInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.lockableDurations) {
       Duration.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -305,6 +337,32 @@ export const LockableDurationsInfo = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: LockableDurationsInfoAminoMsg): LockableDurationsInfo {
+    return LockableDurationsInfo.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: LockableDurationsInfo): LockableDurationsInfoAminoMsg {
+    return {
+      type: "osmosis/poolincentives/lockable-durations-info",
+      value: LockableDurationsInfo.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: LockableDurationsInfoProtoMsg): LockableDurationsInfo {
+    return LockableDurationsInfo.decode(message.value);
+  },
+
+  toProto(message: LockableDurationsInfo): Uint8Array {
+    return LockableDurationsInfo.encode(message).finish();
+  },
+
+  toProtoMsg(message: LockableDurationsInfo): LockableDurationsInfoProtoMsg {
+    return {
+      typeUrl: "/osmosis.poolincentives.v1beta1.LockableDurationsInfo",
+      value: LockableDurationsInfo.encode(message).finish()
+    };
   }
 
 };
@@ -317,6 +375,9 @@ function createBaseDistrInfo(): DistrInfo {
 }
 
 export const DistrInfo = {
+  typeUrl: "/osmosis.poolincentives.v1beta1.DistrInfo",
+  aminoType: "osmosis/poolincentives/distr-info",
+
   encode(message: DistrInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.totalWeight !== "") {
       writer.uint32(10).string(message.totalWeight);
@@ -420,6 +481,32 @@ export const DistrInfo = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: DistrInfoAminoMsg): DistrInfo {
+    return DistrInfo.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: DistrInfo): DistrInfoAminoMsg {
+    return {
+      type: "osmosis/poolincentives/distr-info",
+      value: DistrInfo.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: DistrInfoProtoMsg): DistrInfo {
+    return DistrInfo.decode(message.value);
+  },
+
+  toProto(message: DistrInfo): Uint8Array {
+    return DistrInfo.encode(message).finish();
+  },
+
+  toProtoMsg(message: DistrInfo): DistrInfoProtoMsg {
+    return {
+      typeUrl: "/osmosis.poolincentives.v1beta1.DistrInfo",
+      value: DistrInfo.encode(message).finish()
+    };
   }
 
 };
@@ -432,6 +519,9 @@ function createBaseDistrRecord(): DistrRecord {
 }
 
 export const DistrRecord = {
+  typeUrl: "/osmosis.poolincentives.v1beta1.DistrRecord",
+  aminoType: "osmosis/poolincentives/distr-record",
+
   encode(message: DistrRecord, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.gaugeId.isZero()) {
       writer.uint32(8).uint64(message.gaugeId);
@@ -517,6 +607,32 @@ export const DistrRecord = {
     obj.gauge_id = message.gaugeId ? message.gaugeId.toString() : undefined;
     obj.weight = message.weight;
     return obj;
+  },
+
+  fromAminoMsg(object: DistrRecordAminoMsg): DistrRecord {
+    return DistrRecord.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: DistrRecord): DistrRecordAminoMsg {
+    return {
+      type: "osmosis/poolincentives/distr-record",
+      value: DistrRecord.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: DistrRecordProtoMsg): DistrRecord {
+    return DistrRecord.decode(message.value);
+  },
+
+  toProto(message: DistrRecord): Uint8Array {
+    return DistrRecord.encode(message).finish();
+  },
+
+  toProtoMsg(message: DistrRecord): DistrRecordProtoMsg {
+    return {
+      typeUrl: "/osmosis.poolincentives.v1beta1.DistrRecord",
+      value: DistrRecord.encode(message).finish()
+    };
   }
 
 };
@@ -530,6 +646,9 @@ function createBasePoolToGauge(): PoolToGauge {
 }
 
 export const PoolToGauge = {
+  typeUrl: "/osmosis.poolincentives.v1beta1.PoolToGauge",
+  aminoType: "osmosis/poolincentives/pool-to-gauge",
+
   encode(message: PoolToGauge, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.poolId.isZero()) {
       writer.uint32(8).uint64(message.poolId);
@@ -630,6 +749,32 @@ export const PoolToGauge = {
     obj.gauge_id = message.gaugeId ? message.gaugeId.toString() : undefined;
     obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: PoolToGaugeAminoMsg): PoolToGauge {
+    return PoolToGauge.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: PoolToGauge): PoolToGaugeAminoMsg {
+    return {
+      type: "osmosis/poolincentives/pool-to-gauge",
+      value: PoolToGauge.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: PoolToGaugeProtoMsg): PoolToGauge {
+    return PoolToGauge.decode(message.value);
+  },
+
+  toProto(message: PoolToGauge): Uint8Array {
+    return PoolToGauge.encode(message).finish();
+  },
+
+  toProtoMsg(message: PoolToGauge): PoolToGaugeProtoMsg {
+    return {
+      typeUrl: "/osmosis.poolincentives.v1beta1.PoolToGauge",
+      value: PoolToGauge.encode(message).finish()
+    };
   }
 
 };
@@ -641,6 +786,9 @@ function createBasePoolToGauges(): PoolToGauges {
 }
 
 export const PoolToGauges = {
+  typeUrl: "/osmosis.poolincentives.v1beta1.PoolToGauges",
+  aminoType: "osmosis/poolincentives/pool-to-gauges",
+
   encode(message: PoolToGauges, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.poolToGauge) {
       PoolToGauge.encode(v!, writer.uint32(18).fork()).ldelim();
@@ -729,6 +877,32 @@ export const PoolToGauges = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: PoolToGaugesAminoMsg): PoolToGauges {
+    return PoolToGauges.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: PoolToGauges): PoolToGaugesAminoMsg {
+    return {
+      type: "osmosis/poolincentives/pool-to-gauges",
+      value: PoolToGauges.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: PoolToGaugesProtoMsg): PoolToGauges {
+    return PoolToGauges.decode(message.value);
+  },
+
+  toProto(message: PoolToGauges): Uint8Array {
+    return PoolToGauges.encode(message).finish();
+  },
+
+  toProtoMsg(message: PoolToGauges): PoolToGaugesProtoMsg {
+    return {
+      typeUrl: "/osmosis.poolincentives.v1beta1.PoolToGauges",
+      value: PoolToGauges.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/osmosis/pool-incentives/v1beta1/query.ts b/__fixtures__/outputv2/osmosis/pool-incentives/v1beta1/query.ts
index 61b5c5641..3318ca679 100644
--- a/__fixtures__/outputv2/osmosis/pool-incentives/v1beta1/query.ts
+++ b/__fixtures__/outputv2/osmosis/pool-incentives/v1beta1/query.ts
@@ -7,14 +7,14 @@ export const protobufPackage = "osmosis.poolincentives.v1beta1";
 export interface QueryGaugeIdsRequest {
   poolId: Long;
 }
-export interface QueryGaugeIdsRequestProtoType {
+export interface QueryGaugeIdsRequestProtoMsg {
   typeUrl: "/osmosis.poolincentives.v1beta1.QueryGaugeIdsRequest";
   value: Uint8Array;
 }
 export interface QueryGaugeIdsRequestAmino {
   pool_id: string;
 }
-export interface QueryGaugeIdsRequestAminoType {
+export interface QueryGaugeIdsRequestAminoMsg {
   type: "osmosis/poolincentives/query-gauge-ids-request";
   value: QueryGaugeIdsRequestAmino;
 }
@@ -24,14 +24,14 @@ export interface QueryGaugeIdsRequestSDKType {
 export interface QueryGaugeIdsResponse {
   gaugeIdsWithDuration: QueryGaugeIdsResponse_GaugeIdWithDuration[];
 }
-export interface QueryGaugeIdsResponseProtoType {
+export interface QueryGaugeIdsResponseProtoMsg {
   typeUrl: "/osmosis.poolincentives.v1beta1.QueryGaugeIdsResponse";
   value: Uint8Array;
 }
 export interface QueryGaugeIdsResponseAmino {
   gauge_ids_with_duration: QueryGaugeIdsResponse_GaugeIdWithDurationAmino[];
 }
-export interface QueryGaugeIdsResponseAminoType {
+export interface QueryGaugeIdsResponseAminoMsg {
   type: "osmosis/poolincentives/query-gauge-ids-response";
   value: QueryGaugeIdsResponseAmino;
 }
@@ -43,7 +43,7 @@ export interface QueryGaugeIdsResponse_GaugeIdWithDuration {
   duration?: Duration;
   gaugeIncentivePercentage: string;
 }
-export interface QueryGaugeIdsResponse_GaugeIdWithDurationProtoType {
+export interface QueryGaugeIdsResponse_GaugeIdWithDurationProtoMsg {
   typeUrl: "/osmosis.poolincentives.v1beta1.GaugeIdWithDuration";
   value: Uint8Array;
 }
@@ -52,7 +52,7 @@ export interface QueryGaugeIdsResponse_GaugeIdWithDurationAmino {
   duration?: DurationAmino;
   gauge_incentive_percentage: string;
 }
-export interface QueryGaugeIdsResponse_GaugeIdWithDurationAminoType {
+export interface QueryGaugeIdsResponse_GaugeIdWithDurationAminoMsg {
   type: "osmosis/poolincentives/gauge-id-with-duration";
   value: QueryGaugeIdsResponse_GaugeIdWithDurationAmino;
 }
@@ -62,12 +62,12 @@ export interface QueryGaugeIdsResponse_GaugeIdWithDurationSDKType {
   gauge_incentive_percentage: string;
 }
 export interface QueryDistrInfoRequest {}
-export interface QueryDistrInfoRequestProtoType {
+export interface QueryDistrInfoRequestProtoMsg {
   typeUrl: "/osmosis.poolincentives.v1beta1.QueryDistrInfoRequest";
   value: Uint8Array;
 }
 export interface QueryDistrInfoRequestAmino {}
-export interface QueryDistrInfoRequestAminoType {
+export interface QueryDistrInfoRequestAminoMsg {
   type: "osmosis/poolincentives/query-distr-info-request";
   value: QueryDistrInfoRequestAmino;
 }
@@ -75,14 +75,14 @@ export interface QueryDistrInfoRequestSDKType {}
 export interface QueryDistrInfoResponse {
   distrInfo?: DistrInfo;
 }
-export interface QueryDistrInfoResponseProtoType {
+export interface QueryDistrInfoResponseProtoMsg {
   typeUrl: "/osmosis.poolincentives.v1beta1.QueryDistrInfoResponse";
   value: Uint8Array;
 }
 export interface QueryDistrInfoResponseAmino {
   distr_info?: DistrInfoAmino;
 }
-export interface QueryDistrInfoResponseAminoType {
+export interface QueryDistrInfoResponseAminoMsg {
   type: "osmosis/poolincentives/query-distr-info-response";
   value: QueryDistrInfoResponseAmino;
 }
@@ -90,12 +90,12 @@ export interface QueryDistrInfoResponseSDKType {
   distr_info?: DistrInfoSDKType;
 }
 export interface QueryParamsRequest {}
-export interface QueryParamsRequestProtoType {
+export interface QueryParamsRequestProtoMsg {
   typeUrl: "/osmosis.poolincentives.v1beta1.QueryParamsRequest";
   value: Uint8Array;
 }
 export interface QueryParamsRequestAmino {}
-export interface QueryParamsRequestAminoType {
+export interface QueryParamsRequestAminoMsg {
   type: "osmosis/poolincentives/query-params-request";
   value: QueryParamsRequestAmino;
 }
@@ -103,14 +103,14 @@ export interface QueryParamsRequestSDKType {}
 export interface QueryParamsResponse {
   params?: Params;
 }
-export interface QueryParamsResponseProtoType {
+export interface QueryParamsResponseProtoMsg {
   typeUrl: "/osmosis.poolincentives.v1beta1.QueryParamsResponse";
   value: Uint8Array;
 }
 export interface QueryParamsResponseAmino {
   params?: ParamsAmino;
 }
-export interface QueryParamsResponseAminoType {
+export interface QueryParamsResponseAminoMsg {
   type: "osmosis/poolincentives/query-params-response";
   value: QueryParamsResponseAmino;
 }
@@ -118,12 +118,12 @@ export interface QueryParamsResponseSDKType {
   params?: ParamsSDKType;
 }
 export interface QueryLockableDurationsRequest {}
-export interface QueryLockableDurationsRequestProtoType {
+export interface QueryLockableDurationsRequestProtoMsg {
   typeUrl: "/osmosis.poolincentives.v1beta1.QueryLockableDurationsRequest";
   value: Uint8Array;
 }
 export interface QueryLockableDurationsRequestAmino {}
-export interface QueryLockableDurationsRequestAminoType {
+export interface QueryLockableDurationsRequestAminoMsg {
   type: "osmosis/poolincentives/query-lockable-durations-request";
   value: QueryLockableDurationsRequestAmino;
 }
@@ -131,14 +131,14 @@ export interface QueryLockableDurationsRequestSDKType {}
 export interface QueryLockableDurationsResponse {
   lockableDurations: Duration[];
 }
-export interface QueryLockableDurationsResponseProtoType {
+export interface QueryLockableDurationsResponseProtoMsg {
   typeUrl: "/osmosis.poolincentives.v1beta1.QueryLockableDurationsResponse";
   value: Uint8Array;
 }
 export interface QueryLockableDurationsResponseAmino {
   lockable_durations: DurationAmino[];
 }
-export interface QueryLockableDurationsResponseAminoType {
+export interface QueryLockableDurationsResponseAminoMsg {
   type: "osmosis/poolincentives/query-lockable-durations-response";
   value: QueryLockableDurationsResponseAmino;
 }
@@ -146,12 +146,12 @@ export interface QueryLockableDurationsResponseSDKType {
   lockable_durations: DurationSDKType[];
 }
 export interface QueryIncentivizedPoolsRequest {}
-export interface QueryIncentivizedPoolsRequestProtoType {
+export interface QueryIncentivizedPoolsRequestProtoMsg {
   typeUrl: "/osmosis.poolincentives.v1beta1.QueryIncentivizedPoolsRequest";
   value: Uint8Array;
 }
 export interface QueryIncentivizedPoolsRequestAmino {}
-export interface QueryIncentivizedPoolsRequestAminoType {
+export interface QueryIncentivizedPoolsRequestAminoMsg {
   type: "osmosis/poolincentives/query-incentivized-pools-request";
   value: QueryIncentivizedPoolsRequestAmino;
 }
@@ -161,7 +161,7 @@ export interface IncentivizedPool {
   lockableDuration?: Duration;
   gaugeId: Long;
 }
-export interface IncentivizedPoolProtoType {
+export interface IncentivizedPoolProtoMsg {
   typeUrl: "/osmosis.poolincentives.v1beta1.IncentivizedPool";
   value: Uint8Array;
 }
@@ -170,7 +170,7 @@ export interface IncentivizedPoolAmino {
   lockable_duration?: DurationAmino;
   gauge_id: string;
 }
-export interface IncentivizedPoolAminoType {
+export interface IncentivizedPoolAminoMsg {
   type: "osmosis/poolincentives/incentivized-pool";
   value: IncentivizedPoolAmino;
 }
@@ -182,14 +182,14 @@ export interface IncentivizedPoolSDKType {
 export interface QueryIncentivizedPoolsResponse {
   incentivizedPools: IncentivizedPool[];
 }
-export interface QueryIncentivizedPoolsResponseProtoType {
+export interface QueryIncentivizedPoolsResponseProtoMsg {
   typeUrl: "/osmosis.poolincentives.v1beta1.QueryIncentivizedPoolsResponse";
   value: Uint8Array;
 }
 export interface QueryIncentivizedPoolsResponseAmino {
   incentivized_pools: IncentivizedPoolAmino[];
 }
-export interface QueryIncentivizedPoolsResponseAminoType {
+export interface QueryIncentivizedPoolsResponseAminoMsg {
   type: "osmosis/poolincentives/query-incentivized-pools-response";
   value: QueryIncentivizedPoolsResponseAmino;
 }
@@ -197,12 +197,12 @@ export interface QueryIncentivizedPoolsResponseSDKType {
   incentivized_pools: IncentivizedPoolSDKType[];
 }
 export interface QueryExternalIncentiveGaugesRequest {}
-export interface QueryExternalIncentiveGaugesRequestProtoType {
+export interface QueryExternalIncentiveGaugesRequestProtoMsg {
   typeUrl: "/osmosis.poolincentives.v1beta1.QueryExternalIncentiveGaugesRequest";
   value: Uint8Array;
 }
 export interface QueryExternalIncentiveGaugesRequestAmino {}
-export interface QueryExternalIncentiveGaugesRequestAminoType {
+export interface QueryExternalIncentiveGaugesRequestAminoMsg {
   type: "osmosis/poolincentives/query-external-incentive-gauges-request";
   value: QueryExternalIncentiveGaugesRequestAmino;
 }
@@ -210,14 +210,14 @@ export interface QueryExternalIncentiveGaugesRequestSDKType {}
 export interface QueryExternalIncentiveGaugesResponse {
   data: Gauge[];
 }
-export interface QueryExternalIncentiveGaugesResponseProtoType {
+export interface QueryExternalIncentiveGaugesResponseProtoMsg {
   typeUrl: "/osmosis.poolincentives.v1beta1.QueryExternalIncentiveGaugesResponse";
   value: Uint8Array;
 }
 export interface QueryExternalIncentiveGaugesResponseAmino {
   data: GaugeAmino[];
 }
-export interface QueryExternalIncentiveGaugesResponseAminoType {
+export interface QueryExternalIncentiveGaugesResponseAminoMsg {
   type: "osmosis/poolincentives/query-external-incentive-gauges-response";
   value: QueryExternalIncentiveGaugesResponseAmino;
 }
@@ -232,6 +232,9 @@ function createBaseQueryGaugeIdsRequest(): QueryGaugeIdsRequest {
 }
 
 export const QueryGaugeIdsRequest = {
+  typeUrl: "/osmosis.poolincentives.v1beta1.QueryGaugeIdsRequest",
+  aminoType: "osmosis/poolincentives/query-gauge-ids-request",
+
   encode(message: QueryGaugeIdsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.poolId.isZero()) {
       writer.uint32(8).uint64(message.poolId);
@@ -302,6 +305,32 @@ export const QueryGaugeIdsRequest = {
     const obj: any = {};
     obj.pool_id = message.poolId ? message.poolId.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryGaugeIdsRequestAminoMsg): QueryGaugeIdsRequest {
+    return QueryGaugeIdsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryGaugeIdsRequest): QueryGaugeIdsRequestAminoMsg {
+    return {
+      type: "osmosis/poolincentives/query-gauge-ids-request",
+      value: QueryGaugeIdsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryGaugeIdsRequestProtoMsg): QueryGaugeIdsRequest {
+    return QueryGaugeIdsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryGaugeIdsRequest): Uint8Array {
+    return QueryGaugeIdsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryGaugeIdsRequest): QueryGaugeIdsRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.poolincentives.v1beta1.QueryGaugeIdsRequest",
+      value: QueryGaugeIdsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -313,6 +342,9 @@ function createBaseQueryGaugeIdsResponse(): QueryGaugeIdsResponse {
 }
 
 export const QueryGaugeIdsResponse = {
+  typeUrl: "/osmosis.poolincentives.v1beta1.QueryGaugeIdsResponse",
+  aminoType: "osmosis/poolincentives/query-gauge-ids-response",
+
   encode(message: QueryGaugeIdsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.gaugeIdsWithDuration) {
       QueryGaugeIdsResponse_GaugeIdWithDuration.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -401,6 +433,32 @@ export const QueryGaugeIdsResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: QueryGaugeIdsResponseAminoMsg): QueryGaugeIdsResponse {
+    return QueryGaugeIdsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryGaugeIdsResponse): QueryGaugeIdsResponseAminoMsg {
+    return {
+      type: "osmosis/poolincentives/query-gauge-ids-response",
+      value: QueryGaugeIdsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryGaugeIdsResponseProtoMsg): QueryGaugeIdsResponse {
+    return QueryGaugeIdsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryGaugeIdsResponse): Uint8Array {
+    return QueryGaugeIdsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryGaugeIdsResponse): QueryGaugeIdsResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.poolincentives.v1beta1.QueryGaugeIdsResponse",
+      value: QueryGaugeIdsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -414,6 +472,9 @@ function createBaseQueryGaugeIdsResponse_GaugeIdWithDuration(): QueryGaugeIdsRes
 }
 
 export const QueryGaugeIdsResponse_GaugeIdWithDuration = {
+  typeUrl: "/osmosis.poolincentives.v1beta1.GaugeIdWithDuration",
+  aminoType: "osmosis/poolincentives/gauge-id-with-duration",
+
   encode(message: QueryGaugeIdsResponse_GaugeIdWithDuration, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.gaugeId.isZero()) {
       writer.uint32(8).uint64(message.gaugeId);
@@ -514,6 +575,32 @@ export const QueryGaugeIdsResponse_GaugeIdWithDuration = {
     obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined;
     obj.gauge_incentive_percentage = message.gaugeIncentivePercentage;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryGaugeIdsResponse_GaugeIdWithDurationAminoMsg): QueryGaugeIdsResponse_GaugeIdWithDuration {
+    return QueryGaugeIdsResponse_GaugeIdWithDuration.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryGaugeIdsResponse_GaugeIdWithDuration): QueryGaugeIdsResponse_GaugeIdWithDurationAminoMsg {
+    return {
+      type: "osmosis/poolincentives/gauge-id-with-duration",
+      value: QueryGaugeIdsResponse_GaugeIdWithDuration.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryGaugeIdsResponse_GaugeIdWithDurationProtoMsg): QueryGaugeIdsResponse_GaugeIdWithDuration {
+    return QueryGaugeIdsResponse_GaugeIdWithDuration.decode(message.value);
+  },
+
+  toProto(message: QueryGaugeIdsResponse_GaugeIdWithDuration): Uint8Array {
+    return QueryGaugeIdsResponse_GaugeIdWithDuration.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryGaugeIdsResponse_GaugeIdWithDuration): QueryGaugeIdsResponse_GaugeIdWithDurationProtoMsg {
+    return {
+      typeUrl: "/osmosis.poolincentives.v1beta1.GaugeIdWithDuration",
+      value: QueryGaugeIdsResponse_GaugeIdWithDuration.encode(message).finish()
+    };
   }
 
 };
@@ -523,6 +610,9 @@ function createBaseQueryDistrInfoRequest(): QueryDistrInfoRequest {
 }
 
 export const QueryDistrInfoRequest = {
+  typeUrl: "/osmosis.poolincentives.v1beta1.QueryDistrInfoRequest",
+  aminoType: "osmosis/poolincentives/query-distr-info-request",
+
   encode(_: QueryDistrInfoRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -575,6 +665,32 @@ export const QueryDistrInfoRequest = {
   toAmino(_: QueryDistrInfoRequest): QueryDistrInfoRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDistrInfoRequestAminoMsg): QueryDistrInfoRequest {
+    return QueryDistrInfoRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryDistrInfoRequest): QueryDistrInfoRequestAminoMsg {
+    return {
+      type: "osmosis/poolincentives/query-distr-info-request",
+      value: QueryDistrInfoRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryDistrInfoRequestProtoMsg): QueryDistrInfoRequest {
+    return QueryDistrInfoRequest.decode(message.value);
+  },
+
+  toProto(message: QueryDistrInfoRequest): Uint8Array {
+    return QueryDistrInfoRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDistrInfoRequest): QueryDistrInfoRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.poolincentives.v1beta1.QueryDistrInfoRequest",
+      value: QueryDistrInfoRequest.encode(message).finish()
+    };
   }
 
 };
@@ -586,6 +702,9 @@ function createBaseQueryDistrInfoResponse(): QueryDistrInfoResponse {
 }
 
 export const QueryDistrInfoResponse = {
+  typeUrl: "/osmosis.poolincentives.v1beta1.QueryDistrInfoResponse",
+  aminoType: "osmosis/poolincentives/query-distr-info-response",
+
   encode(message: QueryDistrInfoResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.distrInfo !== undefined) {
       DistrInfo.encode(message.distrInfo, writer.uint32(10).fork()).ldelim();
@@ -656,6 +775,32 @@ export const QueryDistrInfoResponse = {
     const obj: any = {};
     obj.distr_info = message.distrInfo ? DistrInfo.toAmino(message.distrInfo) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDistrInfoResponseAminoMsg): QueryDistrInfoResponse {
+    return QueryDistrInfoResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryDistrInfoResponse): QueryDistrInfoResponseAminoMsg {
+    return {
+      type: "osmosis/poolincentives/query-distr-info-response",
+      value: QueryDistrInfoResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryDistrInfoResponseProtoMsg): QueryDistrInfoResponse {
+    return QueryDistrInfoResponse.decode(message.value);
+  },
+
+  toProto(message: QueryDistrInfoResponse): Uint8Array {
+    return QueryDistrInfoResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDistrInfoResponse): QueryDistrInfoResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.poolincentives.v1beta1.QueryDistrInfoResponse",
+      value: QueryDistrInfoResponse.encode(message).finish()
+    };
   }
 
 };
@@ -665,6 +810,9 @@ function createBaseQueryParamsRequest(): QueryParamsRequest {
 }
 
 export const QueryParamsRequest = {
+  typeUrl: "/osmosis.poolincentives.v1beta1.QueryParamsRequest",
+  aminoType: "osmosis/poolincentives/query-params-request",
+
   encode(_: QueryParamsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -717,6 +865,32 @@ export const QueryParamsRequest = {
   toAmino(_: QueryParamsRequest): QueryParamsRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest {
+    return QueryParamsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryParamsRequest): QueryParamsRequestAminoMsg {
+    return {
+      type: "osmosis/poolincentives/query-params-request",
+      value: QueryParamsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryParamsRequestProtoMsg): QueryParamsRequest {
+    return QueryParamsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryParamsRequest): Uint8Array {
+    return QueryParamsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryParamsRequest): QueryParamsRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.poolincentives.v1beta1.QueryParamsRequest",
+      value: QueryParamsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -728,6 +902,9 @@ function createBaseQueryParamsResponse(): QueryParamsResponse {
 }
 
 export const QueryParamsResponse = {
+  typeUrl: "/osmosis.poolincentives.v1beta1.QueryParamsResponse",
+  aminoType: "osmosis/poolincentives/query-params-response",
+
   encode(message: QueryParamsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.params !== undefined) {
       Params.encode(message.params, writer.uint32(10).fork()).ldelim();
@@ -798,6 +975,32 @@ export const QueryParamsResponse = {
     const obj: any = {};
     obj.params = message.params ? Params.toAmino(message.params) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryParamsResponseAminoMsg): QueryParamsResponse {
+    return QueryParamsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryParamsResponse): QueryParamsResponseAminoMsg {
+    return {
+      type: "osmosis/poolincentives/query-params-response",
+      value: QueryParamsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryParamsResponseProtoMsg): QueryParamsResponse {
+    return QueryParamsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryParamsResponse): Uint8Array {
+    return QueryParamsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryParamsResponse): QueryParamsResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.poolincentives.v1beta1.QueryParamsResponse",
+      value: QueryParamsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -807,6 +1010,9 @@ function createBaseQueryLockableDurationsRequest(): QueryLockableDurationsReques
 }
 
 export const QueryLockableDurationsRequest = {
+  typeUrl: "/osmosis.poolincentives.v1beta1.QueryLockableDurationsRequest",
+  aminoType: "osmosis/poolincentives/query-lockable-durations-request",
+
   encode(_: QueryLockableDurationsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -859,6 +1065,32 @@ export const QueryLockableDurationsRequest = {
   toAmino(_: QueryLockableDurationsRequest): QueryLockableDurationsRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryLockableDurationsRequestAminoMsg): QueryLockableDurationsRequest {
+    return QueryLockableDurationsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryLockableDurationsRequest): QueryLockableDurationsRequestAminoMsg {
+    return {
+      type: "osmosis/poolincentives/query-lockable-durations-request",
+      value: QueryLockableDurationsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryLockableDurationsRequestProtoMsg): QueryLockableDurationsRequest {
+    return QueryLockableDurationsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryLockableDurationsRequest): Uint8Array {
+    return QueryLockableDurationsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryLockableDurationsRequest): QueryLockableDurationsRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.poolincentives.v1beta1.QueryLockableDurationsRequest",
+      value: QueryLockableDurationsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -870,6 +1102,9 @@ function createBaseQueryLockableDurationsResponse(): QueryLockableDurationsRespo
 }
 
 export const QueryLockableDurationsResponse = {
+  typeUrl: "/osmosis.poolincentives.v1beta1.QueryLockableDurationsResponse",
+  aminoType: "osmosis/poolincentives/query-lockable-durations-response",
+
   encode(message: QueryLockableDurationsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.lockableDurations) {
       Duration.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -958,6 +1193,32 @@ export const QueryLockableDurationsResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: QueryLockableDurationsResponseAminoMsg): QueryLockableDurationsResponse {
+    return QueryLockableDurationsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryLockableDurationsResponse): QueryLockableDurationsResponseAminoMsg {
+    return {
+      type: "osmosis/poolincentives/query-lockable-durations-response",
+      value: QueryLockableDurationsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryLockableDurationsResponseProtoMsg): QueryLockableDurationsResponse {
+    return QueryLockableDurationsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryLockableDurationsResponse): Uint8Array {
+    return QueryLockableDurationsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryLockableDurationsResponse): QueryLockableDurationsResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.poolincentives.v1beta1.QueryLockableDurationsResponse",
+      value: QueryLockableDurationsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -967,6 +1228,9 @@ function createBaseQueryIncentivizedPoolsRequest(): QueryIncentivizedPoolsReques
 }
 
 export const QueryIncentivizedPoolsRequest = {
+  typeUrl: "/osmosis.poolincentives.v1beta1.QueryIncentivizedPoolsRequest",
+  aminoType: "osmosis/poolincentives/query-incentivized-pools-request",
+
   encode(_: QueryIncentivizedPoolsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -1019,6 +1283,32 @@ export const QueryIncentivizedPoolsRequest = {
   toAmino(_: QueryIncentivizedPoolsRequest): QueryIncentivizedPoolsRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryIncentivizedPoolsRequestAminoMsg): QueryIncentivizedPoolsRequest {
+    return QueryIncentivizedPoolsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryIncentivizedPoolsRequest): QueryIncentivizedPoolsRequestAminoMsg {
+    return {
+      type: "osmosis/poolincentives/query-incentivized-pools-request",
+      value: QueryIncentivizedPoolsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryIncentivizedPoolsRequestProtoMsg): QueryIncentivizedPoolsRequest {
+    return QueryIncentivizedPoolsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryIncentivizedPoolsRequest): Uint8Array {
+    return QueryIncentivizedPoolsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryIncentivizedPoolsRequest): QueryIncentivizedPoolsRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.poolincentives.v1beta1.QueryIncentivizedPoolsRequest",
+      value: QueryIncentivizedPoolsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1032,6 +1322,9 @@ function createBaseIncentivizedPool(): IncentivizedPool {
 }
 
 export const IncentivizedPool = {
+  typeUrl: "/osmosis.poolincentives.v1beta1.IncentivizedPool",
+  aminoType: "osmosis/poolincentives/incentivized-pool",
+
   encode(message: IncentivizedPool, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.poolId.isZero()) {
       writer.uint32(8).uint64(message.poolId);
@@ -1132,6 +1425,32 @@ export const IncentivizedPool = {
     obj.lockable_duration = message.lockableDuration ? Duration.toAmino(message.lockableDuration) : undefined;
     obj.gauge_id = message.gaugeId ? message.gaugeId.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: IncentivizedPoolAminoMsg): IncentivizedPool {
+    return IncentivizedPool.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: IncentivizedPool): IncentivizedPoolAminoMsg {
+    return {
+      type: "osmosis/poolincentives/incentivized-pool",
+      value: IncentivizedPool.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: IncentivizedPoolProtoMsg): IncentivizedPool {
+    return IncentivizedPool.decode(message.value);
+  },
+
+  toProto(message: IncentivizedPool): Uint8Array {
+    return IncentivizedPool.encode(message).finish();
+  },
+
+  toProtoMsg(message: IncentivizedPool): IncentivizedPoolProtoMsg {
+    return {
+      typeUrl: "/osmosis.poolincentives.v1beta1.IncentivizedPool",
+      value: IncentivizedPool.encode(message).finish()
+    };
   }
 
 };
@@ -1143,6 +1462,9 @@ function createBaseQueryIncentivizedPoolsResponse(): QueryIncentivizedPoolsRespo
 }
 
 export const QueryIncentivizedPoolsResponse = {
+  typeUrl: "/osmosis.poolincentives.v1beta1.QueryIncentivizedPoolsResponse",
+  aminoType: "osmosis/poolincentives/query-incentivized-pools-response",
+
   encode(message: QueryIncentivizedPoolsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.incentivizedPools) {
       IncentivizedPool.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1231,6 +1553,32 @@ export const QueryIncentivizedPoolsResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: QueryIncentivizedPoolsResponseAminoMsg): QueryIncentivizedPoolsResponse {
+    return QueryIncentivizedPoolsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryIncentivizedPoolsResponse): QueryIncentivizedPoolsResponseAminoMsg {
+    return {
+      type: "osmosis/poolincentives/query-incentivized-pools-response",
+      value: QueryIncentivizedPoolsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryIncentivizedPoolsResponseProtoMsg): QueryIncentivizedPoolsResponse {
+    return QueryIncentivizedPoolsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryIncentivizedPoolsResponse): Uint8Array {
+    return QueryIncentivizedPoolsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryIncentivizedPoolsResponse): QueryIncentivizedPoolsResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.poolincentives.v1beta1.QueryIncentivizedPoolsResponse",
+      value: QueryIncentivizedPoolsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1240,6 +1588,9 @@ function createBaseQueryExternalIncentiveGaugesRequest(): QueryExternalIncentive
 }
 
 export const QueryExternalIncentiveGaugesRequest = {
+  typeUrl: "/osmosis.poolincentives.v1beta1.QueryExternalIncentiveGaugesRequest",
+  aminoType: "osmosis/poolincentives/query-external-incentive-gauges-request",
+
   encode(_: QueryExternalIncentiveGaugesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -1292,6 +1643,32 @@ export const QueryExternalIncentiveGaugesRequest = {
   toAmino(_: QueryExternalIncentiveGaugesRequest): QueryExternalIncentiveGaugesRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryExternalIncentiveGaugesRequestAminoMsg): QueryExternalIncentiveGaugesRequest {
+    return QueryExternalIncentiveGaugesRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryExternalIncentiveGaugesRequest): QueryExternalIncentiveGaugesRequestAminoMsg {
+    return {
+      type: "osmosis/poolincentives/query-external-incentive-gauges-request",
+      value: QueryExternalIncentiveGaugesRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryExternalIncentiveGaugesRequestProtoMsg): QueryExternalIncentiveGaugesRequest {
+    return QueryExternalIncentiveGaugesRequest.decode(message.value);
+  },
+
+  toProto(message: QueryExternalIncentiveGaugesRequest): Uint8Array {
+    return QueryExternalIncentiveGaugesRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryExternalIncentiveGaugesRequest): QueryExternalIncentiveGaugesRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.poolincentives.v1beta1.QueryExternalIncentiveGaugesRequest",
+      value: QueryExternalIncentiveGaugesRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1303,6 +1680,9 @@ function createBaseQueryExternalIncentiveGaugesResponse(): QueryExternalIncentiv
 }
 
 export const QueryExternalIncentiveGaugesResponse = {
+  typeUrl: "/osmosis.poolincentives.v1beta1.QueryExternalIncentiveGaugesResponse",
+  aminoType: "osmosis/poolincentives/query-external-incentive-gauges-response",
+
   encode(message: QueryExternalIncentiveGaugesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.data) {
       Gauge.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1391,6 +1771,32 @@ export const QueryExternalIncentiveGaugesResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: QueryExternalIncentiveGaugesResponseAminoMsg): QueryExternalIncentiveGaugesResponse {
+    return QueryExternalIncentiveGaugesResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryExternalIncentiveGaugesResponse): QueryExternalIncentiveGaugesResponseAminoMsg {
+    return {
+      type: "osmosis/poolincentives/query-external-incentive-gauges-response",
+      value: QueryExternalIncentiveGaugesResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryExternalIncentiveGaugesResponseProtoMsg): QueryExternalIncentiveGaugesResponse {
+    return QueryExternalIncentiveGaugesResponse.decode(message.value);
+  },
+
+  toProto(message: QueryExternalIncentiveGaugesResponse): Uint8Array {
+    return QueryExternalIncentiveGaugesResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryExternalIncentiveGaugesResponse): QueryExternalIncentiveGaugesResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.poolincentives.v1beta1.QueryExternalIncentiveGaugesResponse",
+      value: QueryExternalIncentiveGaugesResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/osmosis/sumtree/v1beta1/tree.ts b/__fixtures__/outputv2/osmosis/sumtree/v1beta1/tree.ts
index e34afa847..159d52734 100644
--- a/__fixtures__/outputv2/osmosis/sumtree/v1beta1/tree.ts
+++ b/__fixtures__/outputv2/osmosis/sumtree/v1beta1/tree.ts
@@ -4,14 +4,14 @@ export const protobufPackage = "osmosis.store.v1beta1";
 export interface Node {
   children: Child[];
 }
-export interface NodeProtoType {
+export interface NodeProtoMsg {
   typeUrl: "/osmosis.store.v1beta1.Node";
   value: Uint8Array;
 }
 export interface NodeAmino {
   children: ChildAmino[];
 }
-export interface NodeAminoType {
+export interface NodeAminoMsg {
   type: "osmosis/store/node";
   value: NodeAmino;
 }
@@ -22,7 +22,7 @@ export interface Child {
   index: Uint8Array;
   accumulation: string;
 }
-export interface ChildProtoType {
+export interface ChildProtoMsg {
   typeUrl: "/osmosis.store.v1beta1.Child";
   value: Uint8Array;
 }
@@ -30,7 +30,7 @@ export interface ChildAmino {
   index: Uint8Array;
   accumulation: string;
 }
-export interface ChildAminoType {
+export interface ChildAminoMsg {
   type: "osmosis/store/child";
   value: ChildAmino;
 }
@@ -41,14 +41,14 @@ export interface ChildSDKType {
 export interface Leaf {
   leaf?: Child;
 }
-export interface LeafProtoType {
+export interface LeafProtoMsg {
   typeUrl: "/osmosis.store.v1beta1.Leaf";
   value: Uint8Array;
 }
 export interface LeafAmino {
   leaf?: ChildAmino;
 }
-export interface LeafAminoType {
+export interface LeafAminoMsg {
   type: "osmosis/store/leaf";
   value: LeafAmino;
 }
@@ -63,6 +63,9 @@ function createBaseNode(): Node {
 }
 
 export const Node = {
+  typeUrl: "/osmosis.store.v1beta1.Node",
+  aminoType: "osmosis/store/node",
+
   encode(message: Node, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.children) {
       Child.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -151,6 +154,32 @@ export const Node = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: NodeAminoMsg): Node {
+    return Node.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Node): NodeAminoMsg {
+    return {
+      type: "osmosis/store/node",
+      value: Node.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: NodeProtoMsg): Node {
+    return Node.decode(message.value);
+  },
+
+  toProto(message: Node): Uint8Array {
+    return Node.encode(message).finish();
+  },
+
+  toProtoMsg(message: Node): NodeProtoMsg {
+    return {
+      typeUrl: "/osmosis.store.v1beta1.Node",
+      value: Node.encode(message).finish()
+    };
   }
 
 };
@@ -163,6 +192,9 @@ function createBaseChild(): Child {
 }
 
 export const Child = {
+  typeUrl: "/osmosis.store.v1beta1.Child",
+  aminoType: "osmosis/store/child",
+
   encode(message: Child, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.index.length !== 0) {
       writer.uint32(10).bytes(message.index);
@@ -248,6 +280,32 @@ export const Child = {
     obj.index = message.index;
     obj.accumulation = message.accumulation;
     return obj;
+  },
+
+  fromAminoMsg(object: ChildAminoMsg): Child {
+    return Child.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Child): ChildAminoMsg {
+    return {
+      type: "osmosis/store/child",
+      value: Child.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ChildProtoMsg): Child {
+    return Child.decode(message.value);
+  },
+
+  toProto(message: Child): Uint8Array {
+    return Child.encode(message).finish();
+  },
+
+  toProtoMsg(message: Child): ChildProtoMsg {
+    return {
+      typeUrl: "/osmosis.store.v1beta1.Child",
+      value: Child.encode(message).finish()
+    };
   }
 
 };
@@ -259,6 +317,9 @@ function createBaseLeaf(): Leaf {
 }
 
 export const Leaf = {
+  typeUrl: "/osmosis.store.v1beta1.Leaf",
+  aminoType: "osmosis/store/leaf",
+
   encode(message: Leaf, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.leaf !== undefined) {
       Child.encode(message.leaf, writer.uint32(10).fork()).ldelim();
@@ -329,6 +390,32 @@ export const Leaf = {
     const obj: any = {};
     obj.leaf = message.leaf ? Child.toAmino(message.leaf) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: LeafAminoMsg): Leaf {
+    return Leaf.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Leaf): LeafAminoMsg {
+    return {
+      type: "osmosis/store/leaf",
+      value: Leaf.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: LeafProtoMsg): Leaf {
+    return Leaf.decode(message.value);
+  },
+
+  toProto(message: Leaf): Uint8Array {
+    return Leaf.encode(message).finish();
+  },
+
+  toProtoMsg(message: Leaf): LeafProtoMsg {
+    return {
+      typeUrl: "/osmosis.store.v1beta1.Leaf",
+      value: Leaf.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/osmosis/superfluid/genesis.ts b/__fixtures__/outputv2/osmosis/superfluid/genesis.ts
index 9beadd530..c61b592f8 100644
--- a/__fixtures__/outputv2/osmosis/superfluid/genesis.ts
+++ b/__fixtures__/outputv2/osmosis/superfluid/genesis.ts
@@ -27,7 +27,7 @@ export interface GenesisState {
   intermediaryAccounts: SuperfluidIntermediaryAccount[];
   intemediaryAccountConnections: LockIdIntermediaryAccountConnection[];
 }
-export interface GenesisStateProtoType {
+export interface GenesisStateProtoMsg {
   typeUrl: "/osmosis.superfluid.GenesisState";
   value: Uint8Array;
 }
@@ -55,7 +55,7 @@ export interface GenesisStateAmino {
   intermediary_accounts: SuperfluidIntermediaryAccountAmino[];
   intemediary_account_connections: LockIdIntermediaryAccountConnectionAmino[];
 }
-export interface GenesisStateAminoType {
+export interface GenesisStateAminoMsg {
   type: "osmosis/genesis-state";
   value: GenesisStateAmino;
 }
@@ -80,6 +80,9 @@ function createBaseGenesisState(): GenesisState {
 }
 
 export const GenesisState = {
+  typeUrl: "/osmosis.superfluid.GenesisState",
+  aminoType: "osmosis/genesis-state",
+
   encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.params !== undefined) {
       Params.encode(message.params, writer.uint32(10).fork()).ldelim();
@@ -273,6 +276,32 @@ export const GenesisState = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisStateAminoMsg): GenesisState {
+    return GenesisState.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GenesisState): GenesisStateAminoMsg {
+    return {
+      type: "osmosis/genesis-state",
+      value: GenesisState.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GenesisStateProtoMsg): GenesisState {
+    return GenesisState.decode(message.value);
+  },
+
+  toProto(message: GenesisState): Uint8Array {
+    return GenesisState.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisState): GenesisStateProtoMsg {
+    return {
+      typeUrl: "/osmosis.superfluid.GenesisState",
+      value: GenesisState.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/osmosis/superfluid/params.ts b/__fixtures__/outputv2/osmosis/superfluid/params.ts
index ce2737566..ce550b33d 100644
--- a/__fixtures__/outputv2/osmosis/superfluid/params.ts
+++ b/__fixtures__/outputv2/osmosis/superfluid/params.ts
@@ -12,7 +12,7 @@ export interface Params {
    */
   minimumRiskFactor: string;
 }
-export interface ParamsProtoType {
+export interface ParamsProtoMsg {
   typeUrl: "/osmosis.superfluid.Params";
   value: Uint8Array;
 }
@@ -27,7 +27,7 @@ export interface ParamsAmino {
    */
   minimum_risk_factor: string;
 }
-export interface ParamsAminoType {
+export interface ParamsAminoMsg {
   type: "osmosis/params";
   value: ParamsAmino;
 }
@@ -44,6 +44,9 @@ function createBaseParams(): Params {
 }
 
 export const Params = {
+  typeUrl: "/osmosis.superfluid.Params",
+  aminoType: "osmosis/params",
+
   encode(message: Params, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.minimumRiskFactor !== "") {
       writer.uint32(10).string(message.minimumRiskFactor);
@@ -114,6 +117,32 @@ export const Params = {
     const obj: any = {};
     obj.minimum_risk_factor = message.minimumRiskFactor;
     return obj;
+  },
+
+  fromAminoMsg(object: ParamsAminoMsg): Params {
+    return Params.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Params): ParamsAminoMsg {
+    return {
+      type: "osmosis/params",
+      value: Params.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ParamsProtoMsg): Params {
+    return Params.decode(message.value);
+  },
+
+  toProto(message: Params): Uint8Array {
+    return Params.encode(message).finish();
+  },
+
+  toProtoMsg(message: Params): ParamsProtoMsg {
+    return {
+      typeUrl: "/osmosis.superfluid.Params",
+      value: Params.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/osmosis/superfluid/query.ts b/__fixtures__/outputv2/osmosis/superfluid/query.ts
index 760224886..df6193f66 100644
--- a/__fixtures__/outputv2/osmosis/superfluid/query.ts
+++ b/__fixtures__/outputv2/osmosis/superfluid/query.ts
@@ -8,12 +8,12 @@ import * as _m0 from "protobufjs/minimal";
 import { DeepPartial, isSet, Long } from "../../helpers";
 export const protobufPackage = "osmosis.superfluid";
 export interface QueryParamsRequest {}
-export interface QueryParamsRequestProtoType {
+export interface QueryParamsRequestProtoMsg {
   typeUrl: "/osmosis.superfluid.QueryParamsRequest";
   value: Uint8Array;
 }
 export interface QueryParamsRequestAmino {}
-export interface QueryParamsRequestAminoType {
+export interface QueryParamsRequestAminoMsg {
   type: "osmosis/query-params-request";
   value: QueryParamsRequestAmino;
 }
@@ -22,7 +22,7 @@ export interface QueryParamsResponse {
   /** params defines the parameters of the module. */
   params?: Params;
 }
-export interface QueryParamsResponseProtoType {
+export interface QueryParamsResponseProtoMsg {
   typeUrl: "/osmosis.superfluid.QueryParamsResponse";
   value: Uint8Array;
 }
@@ -30,7 +30,7 @@ export interface QueryParamsResponseAmino {
   /** params defines the parameters of the module. */
   params?: ParamsAmino;
 }
-export interface QueryParamsResponseAminoType {
+export interface QueryParamsResponseAminoMsg {
   type: "osmosis/query-params-response";
   value: QueryParamsResponseAmino;
 }
@@ -40,14 +40,14 @@ export interface QueryParamsResponseSDKType {
 export interface AssetTypeRequest {
   denom: string;
 }
-export interface AssetTypeRequestProtoType {
+export interface AssetTypeRequestProtoMsg {
   typeUrl: "/osmosis.superfluid.AssetTypeRequest";
   value: Uint8Array;
 }
 export interface AssetTypeRequestAmino {
   denom: string;
 }
-export interface AssetTypeRequestAminoType {
+export interface AssetTypeRequestAminoMsg {
   type: "osmosis/asset-type-request";
   value: AssetTypeRequestAmino;
 }
@@ -57,14 +57,14 @@ export interface AssetTypeRequestSDKType {
 export interface AssetTypeResponse {
   assetType: SuperfluidAssetType;
 }
-export interface AssetTypeResponseProtoType {
+export interface AssetTypeResponseProtoMsg {
   typeUrl: "/osmosis.superfluid.AssetTypeResponse";
   value: Uint8Array;
 }
 export interface AssetTypeResponseAmino {
   asset_type: SuperfluidAssetType;
 }
-export interface AssetTypeResponseAminoType {
+export interface AssetTypeResponseAminoMsg {
   type: "osmosis/asset-type-response";
   value: AssetTypeResponseAmino;
 }
@@ -72,12 +72,12 @@ export interface AssetTypeResponseSDKType {
   asset_type: SuperfluidAssetType;
 }
 export interface AllAssetsRequest {}
-export interface AllAssetsRequestProtoType {
+export interface AllAssetsRequestProtoMsg {
   typeUrl: "/osmosis.superfluid.AllAssetsRequest";
   value: Uint8Array;
 }
 export interface AllAssetsRequestAmino {}
-export interface AllAssetsRequestAminoType {
+export interface AllAssetsRequestAminoMsg {
   type: "osmosis/all-assets-request";
   value: AllAssetsRequestAmino;
 }
@@ -85,14 +85,14 @@ export interface AllAssetsRequestSDKType {}
 export interface AllAssetsResponse {
   assets: SuperfluidAsset[];
 }
-export interface AllAssetsResponseProtoType {
+export interface AllAssetsResponseProtoMsg {
   typeUrl: "/osmosis.superfluid.AllAssetsResponse";
   value: Uint8Array;
 }
 export interface AllAssetsResponseAmino {
   assets: SuperfluidAssetAmino[];
 }
-export interface AllAssetsResponseAminoType {
+export interface AllAssetsResponseAminoMsg {
   type: "osmosis/all-assets-response";
   value: AllAssetsResponseAmino;
 }
@@ -102,14 +102,14 @@ export interface AllAssetsResponseSDKType {
 export interface AssetMultiplierRequest {
   denom: string;
 }
-export interface AssetMultiplierRequestProtoType {
+export interface AssetMultiplierRequestProtoMsg {
   typeUrl: "/osmosis.superfluid.AssetMultiplierRequest";
   value: Uint8Array;
 }
 export interface AssetMultiplierRequestAmino {
   denom: string;
 }
-export interface AssetMultiplierRequestAminoType {
+export interface AssetMultiplierRequestAminoMsg {
   type: "osmosis/asset-multiplier-request";
   value: AssetMultiplierRequestAmino;
 }
@@ -119,14 +119,14 @@ export interface AssetMultiplierRequestSDKType {
 export interface AssetMultiplierResponse {
   osmoEquivalentMultiplier?: OsmoEquivalentMultiplierRecord;
 }
-export interface AssetMultiplierResponseProtoType {
+export interface AssetMultiplierResponseProtoMsg {
   typeUrl: "/osmosis.superfluid.AssetMultiplierResponse";
   value: Uint8Array;
 }
 export interface AssetMultiplierResponseAmino {
   osmo_equivalent_multiplier?: OsmoEquivalentMultiplierRecordAmino;
 }
-export interface AssetMultiplierResponseAminoType {
+export interface AssetMultiplierResponseAminoMsg {
   type: "osmosis/asset-multiplier-response";
   value: AssetMultiplierResponseAmino;
 }
@@ -139,7 +139,7 @@ export interface SuperfluidIntermediaryAccountInfo {
   gaugeId: Long;
   address: string;
 }
-export interface SuperfluidIntermediaryAccountInfoProtoType {
+export interface SuperfluidIntermediaryAccountInfoProtoMsg {
   typeUrl: "/osmosis.superfluid.SuperfluidIntermediaryAccountInfo";
   value: Uint8Array;
 }
@@ -149,7 +149,7 @@ export interface SuperfluidIntermediaryAccountInfoAmino {
   gauge_id: string;
   address: string;
 }
-export interface SuperfluidIntermediaryAccountInfoAminoType {
+export interface SuperfluidIntermediaryAccountInfoAminoMsg {
   type: "osmosis/superfluid-intermediary-account-info";
   value: SuperfluidIntermediaryAccountInfoAmino;
 }
@@ -162,14 +162,14 @@ export interface SuperfluidIntermediaryAccountInfoSDKType {
 export interface AllIntermediaryAccountsRequest {
   pagination?: PageRequest;
 }
-export interface AllIntermediaryAccountsRequestProtoType {
+export interface AllIntermediaryAccountsRequestProtoMsg {
   typeUrl: "/osmosis.superfluid.AllIntermediaryAccountsRequest";
   value: Uint8Array;
 }
 export interface AllIntermediaryAccountsRequestAmino {
   pagination?: PageRequestAmino;
 }
-export interface AllIntermediaryAccountsRequestAminoType {
+export interface AllIntermediaryAccountsRequestAminoMsg {
   type: "osmosis/all-intermediary-accounts-request";
   value: AllIntermediaryAccountsRequestAmino;
 }
@@ -180,7 +180,7 @@ export interface AllIntermediaryAccountsResponse {
   accounts: SuperfluidIntermediaryAccountInfo[];
   pagination?: PageResponse;
 }
-export interface AllIntermediaryAccountsResponseProtoType {
+export interface AllIntermediaryAccountsResponseProtoMsg {
   typeUrl: "/osmosis.superfluid.AllIntermediaryAccountsResponse";
   value: Uint8Array;
 }
@@ -188,7 +188,7 @@ export interface AllIntermediaryAccountsResponseAmino {
   accounts: SuperfluidIntermediaryAccountInfoAmino[];
   pagination?: PageResponseAmino;
 }
-export interface AllIntermediaryAccountsResponseAminoType {
+export interface AllIntermediaryAccountsResponseAminoMsg {
   type: "osmosis/all-intermediary-accounts-response";
   value: AllIntermediaryAccountsResponseAmino;
 }
@@ -199,14 +199,14 @@ export interface AllIntermediaryAccountsResponseSDKType {
 export interface ConnectedIntermediaryAccountRequest {
   lockId: Long;
 }
-export interface ConnectedIntermediaryAccountRequestProtoType {
+export interface ConnectedIntermediaryAccountRequestProtoMsg {
   typeUrl: "/osmosis.superfluid.ConnectedIntermediaryAccountRequest";
   value: Uint8Array;
 }
 export interface ConnectedIntermediaryAccountRequestAmino {
   lock_id: string;
 }
-export interface ConnectedIntermediaryAccountRequestAminoType {
+export interface ConnectedIntermediaryAccountRequestAminoMsg {
   type: "osmosis/connected-intermediary-account-request";
   value: ConnectedIntermediaryAccountRequestAmino;
 }
@@ -216,14 +216,14 @@ export interface ConnectedIntermediaryAccountRequestSDKType {
 export interface ConnectedIntermediaryAccountResponse {
   account?: SuperfluidIntermediaryAccountInfo;
 }
-export interface ConnectedIntermediaryAccountResponseProtoType {
+export interface ConnectedIntermediaryAccountResponseProtoMsg {
   typeUrl: "/osmosis.superfluid.ConnectedIntermediaryAccountResponse";
   value: Uint8Array;
 }
 export interface ConnectedIntermediaryAccountResponseAmino {
   account?: SuperfluidIntermediaryAccountInfoAmino;
 }
-export interface ConnectedIntermediaryAccountResponseAminoType {
+export interface ConnectedIntermediaryAccountResponseAminoMsg {
   type: "osmosis/connected-intermediary-account-response";
   value: ConnectedIntermediaryAccountResponseAmino;
 }
@@ -233,14 +233,14 @@ export interface ConnectedIntermediaryAccountResponseSDKType {
 export interface QueryTotalDelegationByValidatorForDenomRequest {
   denom: string;
 }
-export interface QueryTotalDelegationByValidatorForDenomRequestProtoType {
+export interface QueryTotalDelegationByValidatorForDenomRequestProtoMsg {
   typeUrl: "/osmosis.superfluid.QueryTotalDelegationByValidatorForDenomRequest";
   value: Uint8Array;
 }
 export interface QueryTotalDelegationByValidatorForDenomRequestAmino {
   denom: string;
 }
-export interface QueryTotalDelegationByValidatorForDenomRequestAminoType {
+export interface QueryTotalDelegationByValidatorForDenomRequestAminoMsg {
   type: "osmosis/query-total-delegation-by-validator-for-denom-request";
   value: QueryTotalDelegationByValidatorForDenomRequestAmino;
 }
@@ -250,14 +250,14 @@ export interface QueryTotalDelegationByValidatorForDenomRequestSDKType {
 export interface QueryTotalDelegationByValidatorForDenomResponse {
   assets: Delegations[];
 }
-export interface QueryTotalDelegationByValidatorForDenomResponseProtoType {
+export interface QueryTotalDelegationByValidatorForDenomResponseProtoMsg {
   typeUrl: "/osmosis.superfluid.QueryTotalDelegationByValidatorForDenomResponse";
   value: Uint8Array;
 }
 export interface QueryTotalDelegationByValidatorForDenomResponseAmino {
   assets: DelegationsAmino[];
 }
-export interface QueryTotalDelegationByValidatorForDenomResponseAminoType {
+export interface QueryTotalDelegationByValidatorForDenomResponseAminoMsg {
   type: "osmosis/query-total-delegation-by-validator-for-denom-response";
   value: QueryTotalDelegationByValidatorForDenomResponseAmino;
 }
@@ -269,7 +269,7 @@ export interface Delegations {
   amountSfsd: string;
   osmoEquivalent: string;
 }
-export interface DelegationsProtoType {
+export interface DelegationsProtoMsg {
   typeUrl: "/osmosis.superfluid.Delegations";
   value: Uint8Array;
 }
@@ -278,7 +278,7 @@ export interface DelegationsAmino {
   amount_sfsd: string;
   osmo_equivalent: string;
 }
-export interface DelegationsAminoType {
+export interface DelegationsAminoMsg {
   type: "osmosis/delegations";
   value: DelegationsAmino;
 }
@@ -288,12 +288,12 @@ export interface DelegationsSDKType {
   osmo_equivalent: string;
 }
 export interface TotalSuperfluidDelegationsRequest {}
-export interface TotalSuperfluidDelegationsRequestProtoType {
+export interface TotalSuperfluidDelegationsRequestProtoMsg {
   typeUrl: "/osmosis.superfluid.TotalSuperfluidDelegationsRequest";
   value: Uint8Array;
 }
 export interface TotalSuperfluidDelegationsRequestAmino {}
-export interface TotalSuperfluidDelegationsRequestAminoType {
+export interface TotalSuperfluidDelegationsRequestAminoMsg {
   type: "osmosis/total-superfluid-delegations-request";
   value: TotalSuperfluidDelegationsRequestAmino;
 }
@@ -301,14 +301,14 @@ export interface TotalSuperfluidDelegationsRequestSDKType {}
 export interface TotalSuperfluidDelegationsResponse {
   totalDelegations: string;
 }
-export interface TotalSuperfluidDelegationsResponseProtoType {
+export interface TotalSuperfluidDelegationsResponseProtoMsg {
   typeUrl: "/osmosis.superfluid.TotalSuperfluidDelegationsResponse";
   value: Uint8Array;
 }
 export interface TotalSuperfluidDelegationsResponseAmino {
   total_delegations: string;
 }
-export interface TotalSuperfluidDelegationsResponseAminoType {
+export interface TotalSuperfluidDelegationsResponseAminoMsg {
   type: "osmosis/total-superfluid-delegations-response";
   value: TotalSuperfluidDelegationsResponseAmino;
 }
@@ -320,7 +320,7 @@ export interface SuperfluidDelegationAmountRequest {
   validatorAddress: string;
   denom: string;
 }
-export interface SuperfluidDelegationAmountRequestProtoType {
+export interface SuperfluidDelegationAmountRequestProtoMsg {
   typeUrl: "/osmosis.superfluid.SuperfluidDelegationAmountRequest";
   value: Uint8Array;
 }
@@ -329,7 +329,7 @@ export interface SuperfluidDelegationAmountRequestAmino {
   validator_address: string;
   denom: string;
 }
-export interface SuperfluidDelegationAmountRequestAminoType {
+export interface SuperfluidDelegationAmountRequestAminoMsg {
   type: "osmosis/superfluid-delegation-amount-request";
   value: SuperfluidDelegationAmountRequestAmino;
 }
@@ -341,14 +341,14 @@ export interface SuperfluidDelegationAmountRequestSDKType {
 export interface SuperfluidDelegationAmountResponse {
   amount: Coin[];
 }
-export interface SuperfluidDelegationAmountResponseProtoType {
+export interface SuperfluidDelegationAmountResponseProtoMsg {
   typeUrl: "/osmosis.superfluid.SuperfluidDelegationAmountResponse";
   value: Uint8Array;
 }
 export interface SuperfluidDelegationAmountResponseAmino {
   amount: CoinAmino[];
 }
-export interface SuperfluidDelegationAmountResponseAminoType {
+export interface SuperfluidDelegationAmountResponseAminoMsg {
   type: "osmosis/superfluid-delegation-amount-response";
   value: SuperfluidDelegationAmountResponseAmino;
 }
@@ -358,14 +358,14 @@ export interface SuperfluidDelegationAmountResponseSDKType {
 export interface SuperfluidDelegationsByDelegatorRequest {
   delegatorAddress: string;
 }
-export interface SuperfluidDelegationsByDelegatorRequestProtoType {
+export interface SuperfluidDelegationsByDelegatorRequestProtoMsg {
   typeUrl: "/osmosis.superfluid.SuperfluidDelegationsByDelegatorRequest";
   value: Uint8Array;
 }
 export interface SuperfluidDelegationsByDelegatorRequestAmino {
   delegator_address: string;
 }
-export interface SuperfluidDelegationsByDelegatorRequestAminoType {
+export interface SuperfluidDelegationsByDelegatorRequestAminoMsg {
   type: "osmosis/superfluid-delegations-by-delegator-request";
   value: SuperfluidDelegationsByDelegatorRequestAmino;
 }
@@ -377,7 +377,7 @@ export interface SuperfluidDelegationsByDelegatorResponse {
   totalDelegatedCoins: Coin[];
   totalEquivalentStakedAmount?: Coin;
 }
-export interface SuperfluidDelegationsByDelegatorResponseProtoType {
+export interface SuperfluidDelegationsByDelegatorResponseProtoMsg {
   typeUrl: "/osmosis.superfluid.SuperfluidDelegationsByDelegatorResponse";
   value: Uint8Array;
 }
@@ -386,7 +386,7 @@ export interface SuperfluidDelegationsByDelegatorResponseAmino {
   total_delegated_coins: CoinAmino[];
   total_equivalent_staked_amount?: CoinAmino;
 }
-export interface SuperfluidDelegationsByDelegatorResponseAminoType {
+export interface SuperfluidDelegationsByDelegatorResponseAminoMsg {
   type: "osmosis/superfluid-delegations-by-delegator-response";
   value: SuperfluidDelegationsByDelegatorResponseAmino;
 }
@@ -399,7 +399,7 @@ export interface SuperfluidUndelegationsByDelegatorRequest {
   delegatorAddress: string;
   denom: string;
 }
-export interface SuperfluidUndelegationsByDelegatorRequestProtoType {
+export interface SuperfluidUndelegationsByDelegatorRequestProtoMsg {
   typeUrl: "/osmosis.superfluid.SuperfluidUndelegationsByDelegatorRequest";
   value: Uint8Array;
 }
@@ -407,7 +407,7 @@ export interface SuperfluidUndelegationsByDelegatorRequestAmino {
   delegator_address: string;
   denom: string;
 }
-export interface SuperfluidUndelegationsByDelegatorRequestAminoType {
+export interface SuperfluidUndelegationsByDelegatorRequestAminoMsg {
   type: "osmosis/superfluid-undelegations-by-delegator-request";
   value: SuperfluidUndelegationsByDelegatorRequestAmino;
 }
@@ -420,7 +420,7 @@ export interface SuperfluidUndelegationsByDelegatorResponse {
   totalUndelegatedCoins: Coin[];
   syntheticLocks: SyntheticLock[];
 }
-export interface SuperfluidUndelegationsByDelegatorResponseProtoType {
+export interface SuperfluidUndelegationsByDelegatorResponseProtoMsg {
   typeUrl: "/osmosis.superfluid.SuperfluidUndelegationsByDelegatorResponse";
   value: Uint8Array;
 }
@@ -429,7 +429,7 @@ export interface SuperfluidUndelegationsByDelegatorResponseAmino {
   total_undelegated_coins: CoinAmino[];
   synthetic_locks: SyntheticLockAmino[];
 }
-export interface SuperfluidUndelegationsByDelegatorResponseAminoType {
+export interface SuperfluidUndelegationsByDelegatorResponseAminoMsg {
   type: "osmosis/superfluid-undelegations-by-delegator-response";
   value: SuperfluidUndelegationsByDelegatorResponseAmino;
 }
@@ -442,7 +442,7 @@ export interface SuperfluidDelegationsByValidatorDenomRequest {
   validatorAddress: string;
   denom: string;
 }
-export interface SuperfluidDelegationsByValidatorDenomRequestProtoType {
+export interface SuperfluidDelegationsByValidatorDenomRequestProtoMsg {
   typeUrl: "/osmosis.superfluid.SuperfluidDelegationsByValidatorDenomRequest";
   value: Uint8Array;
 }
@@ -450,7 +450,7 @@ export interface SuperfluidDelegationsByValidatorDenomRequestAmino {
   validator_address: string;
   denom: string;
 }
-export interface SuperfluidDelegationsByValidatorDenomRequestAminoType {
+export interface SuperfluidDelegationsByValidatorDenomRequestAminoMsg {
   type: "osmosis/superfluid-delegations-by-validator-denom-request";
   value: SuperfluidDelegationsByValidatorDenomRequestAmino;
 }
@@ -461,14 +461,14 @@ export interface SuperfluidDelegationsByValidatorDenomRequestSDKType {
 export interface SuperfluidDelegationsByValidatorDenomResponse {
   superfluidDelegationRecords: SuperfluidDelegationRecord[];
 }
-export interface SuperfluidDelegationsByValidatorDenomResponseProtoType {
+export interface SuperfluidDelegationsByValidatorDenomResponseProtoMsg {
   typeUrl: "/osmosis.superfluid.SuperfluidDelegationsByValidatorDenomResponse";
   value: Uint8Array;
 }
 export interface SuperfluidDelegationsByValidatorDenomResponseAmino {
   superfluid_delegation_records: SuperfluidDelegationRecordAmino[];
 }
-export interface SuperfluidDelegationsByValidatorDenomResponseAminoType {
+export interface SuperfluidDelegationsByValidatorDenomResponseAminoMsg {
   type: "osmosis/superfluid-delegations-by-validator-denom-response";
   value: SuperfluidDelegationsByValidatorDenomResponseAmino;
 }
@@ -479,7 +479,7 @@ export interface EstimateSuperfluidDelegatedAmountByValidatorDenomRequest {
   validatorAddress: string;
   denom: string;
 }
-export interface EstimateSuperfluidDelegatedAmountByValidatorDenomRequestProtoType {
+export interface EstimateSuperfluidDelegatedAmountByValidatorDenomRequestProtoMsg {
   typeUrl: "/osmosis.superfluid.EstimateSuperfluidDelegatedAmountByValidatorDenomRequest";
   value: Uint8Array;
 }
@@ -487,7 +487,7 @@ export interface EstimateSuperfluidDelegatedAmountByValidatorDenomRequestAmino {
   validator_address: string;
   denom: string;
 }
-export interface EstimateSuperfluidDelegatedAmountByValidatorDenomRequestAminoType {
+export interface EstimateSuperfluidDelegatedAmountByValidatorDenomRequestAminoMsg {
   type: "osmosis/estimate-superfluid-delegated-amount-by-validator-denom-request";
   value: EstimateSuperfluidDelegatedAmountByValidatorDenomRequestAmino;
 }
@@ -498,14 +498,14 @@ export interface EstimateSuperfluidDelegatedAmountByValidatorDenomRequestSDKType
 export interface EstimateSuperfluidDelegatedAmountByValidatorDenomResponse {
   totalDelegatedCoins: Coin[];
 }
-export interface EstimateSuperfluidDelegatedAmountByValidatorDenomResponseProtoType {
+export interface EstimateSuperfluidDelegatedAmountByValidatorDenomResponseProtoMsg {
   typeUrl: "/osmosis.superfluid.EstimateSuperfluidDelegatedAmountByValidatorDenomResponse";
   value: Uint8Array;
 }
 export interface EstimateSuperfluidDelegatedAmountByValidatorDenomResponseAmino {
   total_delegated_coins: CoinAmino[];
 }
-export interface EstimateSuperfluidDelegatedAmountByValidatorDenomResponseAminoType {
+export interface EstimateSuperfluidDelegatedAmountByValidatorDenomResponseAminoMsg {
   type: "osmosis/estimate-superfluid-delegated-amount-by-validator-denom-response";
   value: EstimateSuperfluidDelegatedAmountByValidatorDenomResponseAmino;
 }
@@ -515,14 +515,14 @@ export interface EstimateSuperfluidDelegatedAmountByValidatorDenomResponseSDKTyp
 export interface QueryTotalDelegationByDelegatorRequest {
   delegatorAddress: string;
 }
-export interface QueryTotalDelegationByDelegatorRequestProtoType {
+export interface QueryTotalDelegationByDelegatorRequestProtoMsg {
   typeUrl: "/osmosis.superfluid.QueryTotalDelegationByDelegatorRequest";
   value: Uint8Array;
 }
 export interface QueryTotalDelegationByDelegatorRequestAmino {
   delegator_address: string;
 }
-export interface QueryTotalDelegationByDelegatorRequestAminoType {
+export interface QueryTotalDelegationByDelegatorRequestAminoMsg {
   type: "osmosis/query-total-delegation-by-delegator-request";
   value: QueryTotalDelegationByDelegatorRequestAmino;
 }
@@ -535,7 +535,7 @@ export interface QueryTotalDelegationByDelegatorResponse {
   totalDelegatedCoins: Coin[];
   totalEquivalentStakedAmount?: Coin;
 }
-export interface QueryTotalDelegationByDelegatorResponseProtoType {
+export interface QueryTotalDelegationByDelegatorResponseProtoMsg {
   typeUrl: "/osmosis.superfluid.QueryTotalDelegationByDelegatorResponse";
   value: Uint8Array;
 }
@@ -545,7 +545,7 @@ export interface QueryTotalDelegationByDelegatorResponseAmino {
   total_delegated_coins: CoinAmino[];
   total_equivalent_staked_amount?: CoinAmino;
 }
-export interface QueryTotalDelegationByDelegatorResponseAminoType {
+export interface QueryTotalDelegationByDelegatorResponseAminoMsg {
   type: "osmosis/query-total-delegation-by-delegator-response";
   value: QueryTotalDelegationByDelegatorResponseAmino;
 }
@@ -556,12 +556,12 @@ export interface QueryTotalDelegationByDelegatorResponseSDKType {
   total_equivalent_staked_amount?: CoinSDKType;
 }
 export interface QueryUnpoolWhitelistRequest {}
-export interface QueryUnpoolWhitelistRequestProtoType {
+export interface QueryUnpoolWhitelistRequestProtoMsg {
   typeUrl: "/osmosis.superfluid.QueryUnpoolWhitelistRequest";
   value: Uint8Array;
 }
 export interface QueryUnpoolWhitelistRequestAmino {}
-export interface QueryUnpoolWhitelistRequestAminoType {
+export interface QueryUnpoolWhitelistRequestAminoMsg {
   type: "osmosis/query-unpool-whitelist-request";
   value: QueryUnpoolWhitelistRequestAmino;
 }
@@ -569,14 +569,14 @@ export interface QueryUnpoolWhitelistRequestSDKType {}
 export interface QueryUnpoolWhitelistResponse {
   poolIds: Long[];
 }
-export interface QueryUnpoolWhitelistResponseProtoType {
+export interface QueryUnpoolWhitelistResponseProtoMsg {
   typeUrl: "/osmosis.superfluid.QueryUnpoolWhitelistResponse";
   value: Uint8Array;
 }
 export interface QueryUnpoolWhitelistResponseAmino {
   pool_ids: string[];
 }
-export interface QueryUnpoolWhitelistResponseAminoType {
+export interface QueryUnpoolWhitelistResponseAminoMsg {
   type: "osmosis/query-unpool-whitelist-response";
   value: QueryUnpoolWhitelistResponseAmino;
 }
@@ -589,6 +589,9 @@ function createBaseQueryParamsRequest(): QueryParamsRequest {
 }
 
 export const QueryParamsRequest = {
+  typeUrl: "/osmosis.superfluid.QueryParamsRequest",
+  aminoType: "osmosis/query-params-request",
+
   encode(_: QueryParamsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -641,6 +644,32 @@ export const QueryParamsRequest = {
   toAmino(_: QueryParamsRequest): QueryParamsRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest {
+    return QueryParamsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryParamsRequest): QueryParamsRequestAminoMsg {
+    return {
+      type: "osmosis/query-params-request",
+      value: QueryParamsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryParamsRequestProtoMsg): QueryParamsRequest {
+    return QueryParamsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryParamsRequest): Uint8Array {
+    return QueryParamsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryParamsRequest): QueryParamsRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.superfluid.QueryParamsRequest",
+      value: QueryParamsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -652,6 +681,9 @@ function createBaseQueryParamsResponse(): QueryParamsResponse {
 }
 
 export const QueryParamsResponse = {
+  typeUrl: "/osmosis.superfluid.QueryParamsResponse",
+  aminoType: "osmosis/query-params-response",
+
   encode(message: QueryParamsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.params !== undefined) {
       Params.encode(message.params, writer.uint32(10).fork()).ldelim();
@@ -722,6 +754,32 @@ export const QueryParamsResponse = {
     const obj: any = {};
     obj.params = message.params ? Params.toAmino(message.params) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryParamsResponseAminoMsg): QueryParamsResponse {
+    return QueryParamsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryParamsResponse): QueryParamsResponseAminoMsg {
+    return {
+      type: "osmosis/query-params-response",
+      value: QueryParamsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryParamsResponseProtoMsg): QueryParamsResponse {
+    return QueryParamsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryParamsResponse): Uint8Array {
+    return QueryParamsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryParamsResponse): QueryParamsResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.superfluid.QueryParamsResponse",
+      value: QueryParamsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -733,6 +791,9 @@ function createBaseAssetTypeRequest(): AssetTypeRequest {
 }
 
 export const AssetTypeRequest = {
+  typeUrl: "/osmosis.superfluid.AssetTypeRequest",
+  aminoType: "osmosis/asset-type-request",
+
   encode(message: AssetTypeRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.denom !== "") {
       writer.uint32(10).string(message.denom);
@@ -803,6 +864,32 @@ export const AssetTypeRequest = {
     const obj: any = {};
     obj.denom = message.denom;
     return obj;
+  },
+
+  fromAminoMsg(object: AssetTypeRequestAminoMsg): AssetTypeRequest {
+    return AssetTypeRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: AssetTypeRequest): AssetTypeRequestAminoMsg {
+    return {
+      type: "osmosis/asset-type-request",
+      value: AssetTypeRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: AssetTypeRequestProtoMsg): AssetTypeRequest {
+    return AssetTypeRequest.decode(message.value);
+  },
+
+  toProto(message: AssetTypeRequest): Uint8Array {
+    return AssetTypeRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: AssetTypeRequest): AssetTypeRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.superfluid.AssetTypeRequest",
+      value: AssetTypeRequest.encode(message).finish()
+    };
   }
 
 };
@@ -814,6 +901,9 @@ function createBaseAssetTypeResponse(): AssetTypeResponse {
 }
 
 export const AssetTypeResponse = {
+  typeUrl: "/osmosis.superfluid.AssetTypeResponse",
+  aminoType: "osmosis/asset-type-response",
+
   encode(message: AssetTypeResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.assetType !== 0) {
       writer.uint32(8).int32(message.assetType);
@@ -884,6 +974,32 @@ export const AssetTypeResponse = {
     const obj: any = {};
     obj.asset_type = message.assetType;
     return obj;
+  },
+
+  fromAminoMsg(object: AssetTypeResponseAminoMsg): AssetTypeResponse {
+    return AssetTypeResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: AssetTypeResponse): AssetTypeResponseAminoMsg {
+    return {
+      type: "osmosis/asset-type-response",
+      value: AssetTypeResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: AssetTypeResponseProtoMsg): AssetTypeResponse {
+    return AssetTypeResponse.decode(message.value);
+  },
+
+  toProto(message: AssetTypeResponse): Uint8Array {
+    return AssetTypeResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: AssetTypeResponse): AssetTypeResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.superfluid.AssetTypeResponse",
+      value: AssetTypeResponse.encode(message).finish()
+    };
   }
 
 };
@@ -893,6 +1009,9 @@ function createBaseAllAssetsRequest(): AllAssetsRequest {
 }
 
 export const AllAssetsRequest = {
+  typeUrl: "/osmosis.superfluid.AllAssetsRequest",
+  aminoType: "osmosis/all-assets-request",
+
   encode(_: AllAssetsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -945,6 +1064,32 @@ export const AllAssetsRequest = {
   toAmino(_: AllAssetsRequest): AllAssetsRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: AllAssetsRequestAminoMsg): AllAssetsRequest {
+    return AllAssetsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: AllAssetsRequest): AllAssetsRequestAminoMsg {
+    return {
+      type: "osmosis/all-assets-request",
+      value: AllAssetsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: AllAssetsRequestProtoMsg): AllAssetsRequest {
+    return AllAssetsRequest.decode(message.value);
+  },
+
+  toProto(message: AllAssetsRequest): Uint8Array {
+    return AllAssetsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: AllAssetsRequest): AllAssetsRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.superfluid.AllAssetsRequest",
+      value: AllAssetsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -956,6 +1101,9 @@ function createBaseAllAssetsResponse(): AllAssetsResponse {
 }
 
 export const AllAssetsResponse = {
+  typeUrl: "/osmosis.superfluid.AllAssetsResponse",
+  aminoType: "osmosis/all-assets-response",
+
   encode(message: AllAssetsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.assets) {
       SuperfluidAsset.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1044,6 +1192,32 @@ export const AllAssetsResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: AllAssetsResponseAminoMsg): AllAssetsResponse {
+    return AllAssetsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: AllAssetsResponse): AllAssetsResponseAminoMsg {
+    return {
+      type: "osmosis/all-assets-response",
+      value: AllAssetsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: AllAssetsResponseProtoMsg): AllAssetsResponse {
+    return AllAssetsResponse.decode(message.value);
+  },
+
+  toProto(message: AllAssetsResponse): Uint8Array {
+    return AllAssetsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: AllAssetsResponse): AllAssetsResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.superfluid.AllAssetsResponse",
+      value: AllAssetsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1055,6 +1229,9 @@ function createBaseAssetMultiplierRequest(): AssetMultiplierRequest {
 }
 
 export const AssetMultiplierRequest = {
+  typeUrl: "/osmosis.superfluid.AssetMultiplierRequest",
+  aminoType: "osmosis/asset-multiplier-request",
+
   encode(message: AssetMultiplierRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.denom !== "") {
       writer.uint32(10).string(message.denom);
@@ -1125,6 +1302,32 @@ export const AssetMultiplierRequest = {
     const obj: any = {};
     obj.denom = message.denom;
     return obj;
+  },
+
+  fromAminoMsg(object: AssetMultiplierRequestAminoMsg): AssetMultiplierRequest {
+    return AssetMultiplierRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: AssetMultiplierRequest): AssetMultiplierRequestAminoMsg {
+    return {
+      type: "osmosis/asset-multiplier-request",
+      value: AssetMultiplierRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: AssetMultiplierRequestProtoMsg): AssetMultiplierRequest {
+    return AssetMultiplierRequest.decode(message.value);
+  },
+
+  toProto(message: AssetMultiplierRequest): Uint8Array {
+    return AssetMultiplierRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: AssetMultiplierRequest): AssetMultiplierRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.superfluid.AssetMultiplierRequest",
+      value: AssetMultiplierRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1136,6 +1339,9 @@ function createBaseAssetMultiplierResponse(): AssetMultiplierResponse {
 }
 
 export const AssetMultiplierResponse = {
+  typeUrl: "/osmosis.superfluid.AssetMultiplierResponse",
+  aminoType: "osmosis/asset-multiplier-response",
+
   encode(message: AssetMultiplierResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.osmoEquivalentMultiplier !== undefined) {
       OsmoEquivalentMultiplierRecord.encode(message.osmoEquivalentMultiplier, writer.uint32(10).fork()).ldelim();
@@ -1206,6 +1412,32 @@ export const AssetMultiplierResponse = {
     const obj: any = {};
     obj.osmo_equivalent_multiplier = message.osmoEquivalentMultiplier ? OsmoEquivalentMultiplierRecord.toAmino(message.osmoEquivalentMultiplier) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: AssetMultiplierResponseAminoMsg): AssetMultiplierResponse {
+    return AssetMultiplierResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: AssetMultiplierResponse): AssetMultiplierResponseAminoMsg {
+    return {
+      type: "osmosis/asset-multiplier-response",
+      value: AssetMultiplierResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: AssetMultiplierResponseProtoMsg): AssetMultiplierResponse {
+    return AssetMultiplierResponse.decode(message.value);
+  },
+
+  toProto(message: AssetMultiplierResponse): Uint8Array {
+    return AssetMultiplierResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: AssetMultiplierResponse): AssetMultiplierResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.superfluid.AssetMultiplierResponse",
+      value: AssetMultiplierResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1220,6 +1452,9 @@ function createBaseSuperfluidIntermediaryAccountInfo(): SuperfluidIntermediaryAc
 }
 
 export const SuperfluidIntermediaryAccountInfo = {
+  typeUrl: "/osmosis.superfluid.SuperfluidIntermediaryAccountInfo",
+  aminoType: "osmosis/superfluid-intermediary-account-info",
+
   encode(message: SuperfluidIntermediaryAccountInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.denom !== "") {
       writer.uint32(10).string(message.denom);
@@ -1335,6 +1570,32 @@ export const SuperfluidIntermediaryAccountInfo = {
     obj.gauge_id = message.gaugeId ? message.gaugeId.toString() : undefined;
     obj.address = message.address;
     return obj;
+  },
+
+  fromAminoMsg(object: SuperfluidIntermediaryAccountInfoAminoMsg): SuperfluidIntermediaryAccountInfo {
+    return SuperfluidIntermediaryAccountInfo.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: SuperfluidIntermediaryAccountInfo): SuperfluidIntermediaryAccountInfoAminoMsg {
+    return {
+      type: "osmosis/superfluid-intermediary-account-info",
+      value: SuperfluidIntermediaryAccountInfo.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: SuperfluidIntermediaryAccountInfoProtoMsg): SuperfluidIntermediaryAccountInfo {
+    return SuperfluidIntermediaryAccountInfo.decode(message.value);
+  },
+
+  toProto(message: SuperfluidIntermediaryAccountInfo): Uint8Array {
+    return SuperfluidIntermediaryAccountInfo.encode(message).finish();
+  },
+
+  toProtoMsg(message: SuperfluidIntermediaryAccountInfo): SuperfluidIntermediaryAccountInfoProtoMsg {
+    return {
+      typeUrl: "/osmosis.superfluid.SuperfluidIntermediaryAccountInfo",
+      value: SuperfluidIntermediaryAccountInfo.encode(message).finish()
+    };
   }
 
 };
@@ -1346,6 +1607,9 @@ function createBaseAllIntermediaryAccountsRequest(): AllIntermediaryAccountsRequ
 }
 
 export const AllIntermediaryAccountsRequest = {
+  typeUrl: "/osmosis.superfluid.AllIntermediaryAccountsRequest",
+  aminoType: "osmosis/all-intermediary-accounts-request",
+
   encode(message: AllIntermediaryAccountsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.pagination !== undefined) {
       PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim();
@@ -1416,6 +1680,32 @@ export const AllIntermediaryAccountsRequest = {
     const obj: any = {};
     obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: AllIntermediaryAccountsRequestAminoMsg): AllIntermediaryAccountsRequest {
+    return AllIntermediaryAccountsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: AllIntermediaryAccountsRequest): AllIntermediaryAccountsRequestAminoMsg {
+    return {
+      type: "osmosis/all-intermediary-accounts-request",
+      value: AllIntermediaryAccountsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: AllIntermediaryAccountsRequestProtoMsg): AllIntermediaryAccountsRequest {
+    return AllIntermediaryAccountsRequest.decode(message.value);
+  },
+
+  toProto(message: AllIntermediaryAccountsRequest): Uint8Array {
+    return AllIntermediaryAccountsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: AllIntermediaryAccountsRequest): AllIntermediaryAccountsRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.superfluid.AllIntermediaryAccountsRequest",
+      value: AllIntermediaryAccountsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1428,6 +1718,9 @@ function createBaseAllIntermediaryAccountsResponse(): AllIntermediaryAccountsRes
 }
 
 export const AllIntermediaryAccountsResponse = {
+  typeUrl: "/osmosis.superfluid.AllIntermediaryAccountsResponse",
+  aminoType: "osmosis/all-intermediary-accounts-response",
+
   encode(message: AllIntermediaryAccountsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.accounts) {
       SuperfluidIntermediaryAccountInfo.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1531,6 +1824,32 @@ export const AllIntermediaryAccountsResponse = {
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: AllIntermediaryAccountsResponseAminoMsg): AllIntermediaryAccountsResponse {
+    return AllIntermediaryAccountsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: AllIntermediaryAccountsResponse): AllIntermediaryAccountsResponseAminoMsg {
+    return {
+      type: "osmosis/all-intermediary-accounts-response",
+      value: AllIntermediaryAccountsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: AllIntermediaryAccountsResponseProtoMsg): AllIntermediaryAccountsResponse {
+    return AllIntermediaryAccountsResponse.decode(message.value);
+  },
+
+  toProto(message: AllIntermediaryAccountsResponse): Uint8Array {
+    return AllIntermediaryAccountsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: AllIntermediaryAccountsResponse): AllIntermediaryAccountsResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.superfluid.AllIntermediaryAccountsResponse",
+      value: AllIntermediaryAccountsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1542,6 +1861,9 @@ function createBaseConnectedIntermediaryAccountRequest(): ConnectedIntermediaryA
 }
 
 export const ConnectedIntermediaryAccountRequest = {
+  typeUrl: "/osmosis.superfluid.ConnectedIntermediaryAccountRequest",
+  aminoType: "osmosis/connected-intermediary-account-request",
+
   encode(message: ConnectedIntermediaryAccountRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.lockId.isZero()) {
       writer.uint32(8).uint64(message.lockId);
@@ -1612,6 +1934,32 @@ export const ConnectedIntermediaryAccountRequest = {
     const obj: any = {};
     obj.lock_id = message.lockId ? message.lockId.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ConnectedIntermediaryAccountRequestAminoMsg): ConnectedIntermediaryAccountRequest {
+    return ConnectedIntermediaryAccountRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ConnectedIntermediaryAccountRequest): ConnectedIntermediaryAccountRequestAminoMsg {
+    return {
+      type: "osmosis/connected-intermediary-account-request",
+      value: ConnectedIntermediaryAccountRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ConnectedIntermediaryAccountRequestProtoMsg): ConnectedIntermediaryAccountRequest {
+    return ConnectedIntermediaryAccountRequest.decode(message.value);
+  },
+
+  toProto(message: ConnectedIntermediaryAccountRequest): Uint8Array {
+    return ConnectedIntermediaryAccountRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: ConnectedIntermediaryAccountRequest): ConnectedIntermediaryAccountRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.superfluid.ConnectedIntermediaryAccountRequest",
+      value: ConnectedIntermediaryAccountRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1623,6 +1971,9 @@ function createBaseConnectedIntermediaryAccountResponse(): ConnectedIntermediary
 }
 
 export const ConnectedIntermediaryAccountResponse = {
+  typeUrl: "/osmosis.superfluid.ConnectedIntermediaryAccountResponse",
+  aminoType: "osmosis/connected-intermediary-account-response",
+
   encode(message: ConnectedIntermediaryAccountResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.account !== undefined) {
       SuperfluidIntermediaryAccountInfo.encode(message.account, writer.uint32(10).fork()).ldelim();
@@ -1693,6 +2044,32 @@ export const ConnectedIntermediaryAccountResponse = {
     const obj: any = {};
     obj.account = message.account ? SuperfluidIntermediaryAccountInfo.toAmino(message.account) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ConnectedIntermediaryAccountResponseAminoMsg): ConnectedIntermediaryAccountResponse {
+    return ConnectedIntermediaryAccountResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ConnectedIntermediaryAccountResponse): ConnectedIntermediaryAccountResponseAminoMsg {
+    return {
+      type: "osmosis/connected-intermediary-account-response",
+      value: ConnectedIntermediaryAccountResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ConnectedIntermediaryAccountResponseProtoMsg): ConnectedIntermediaryAccountResponse {
+    return ConnectedIntermediaryAccountResponse.decode(message.value);
+  },
+
+  toProto(message: ConnectedIntermediaryAccountResponse): Uint8Array {
+    return ConnectedIntermediaryAccountResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: ConnectedIntermediaryAccountResponse): ConnectedIntermediaryAccountResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.superfluid.ConnectedIntermediaryAccountResponse",
+      value: ConnectedIntermediaryAccountResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1704,6 +2081,9 @@ function createBaseQueryTotalDelegationByValidatorForDenomRequest(): QueryTotalD
 }
 
 export const QueryTotalDelegationByValidatorForDenomRequest = {
+  typeUrl: "/osmosis.superfluid.QueryTotalDelegationByValidatorForDenomRequest",
+  aminoType: "osmosis/query-total-delegation-by-validator-for-denom-request",
+
   encode(message: QueryTotalDelegationByValidatorForDenomRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.denom !== "") {
       writer.uint32(10).string(message.denom);
@@ -1774,6 +2154,32 @@ export const QueryTotalDelegationByValidatorForDenomRequest = {
     const obj: any = {};
     obj.denom = message.denom;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryTotalDelegationByValidatorForDenomRequestAminoMsg): QueryTotalDelegationByValidatorForDenomRequest {
+    return QueryTotalDelegationByValidatorForDenomRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryTotalDelegationByValidatorForDenomRequest): QueryTotalDelegationByValidatorForDenomRequestAminoMsg {
+    return {
+      type: "osmosis/query-total-delegation-by-validator-for-denom-request",
+      value: QueryTotalDelegationByValidatorForDenomRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryTotalDelegationByValidatorForDenomRequestProtoMsg): QueryTotalDelegationByValidatorForDenomRequest {
+    return QueryTotalDelegationByValidatorForDenomRequest.decode(message.value);
+  },
+
+  toProto(message: QueryTotalDelegationByValidatorForDenomRequest): Uint8Array {
+    return QueryTotalDelegationByValidatorForDenomRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryTotalDelegationByValidatorForDenomRequest): QueryTotalDelegationByValidatorForDenomRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.superfluid.QueryTotalDelegationByValidatorForDenomRequest",
+      value: QueryTotalDelegationByValidatorForDenomRequest.encode(message).finish()
+    };
   }
 
 };
@@ -1785,6 +2191,9 @@ function createBaseQueryTotalDelegationByValidatorForDenomResponse(): QueryTotal
 }
 
 export const QueryTotalDelegationByValidatorForDenomResponse = {
+  typeUrl: "/osmosis.superfluid.QueryTotalDelegationByValidatorForDenomResponse",
+  aminoType: "osmosis/query-total-delegation-by-validator-for-denom-response",
+
   encode(message: QueryTotalDelegationByValidatorForDenomResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.assets) {
       Delegations.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -1873,6 +2282,32 @@ export const QueryTotalDelegationByValidatorForDenomResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: QueryTotalDelegationByValidatorForDenomResponseAminoMsg): QueryTotalDelegationByValidatorForDenomResponse {
+    return QueryTotalDelegationByValidatorForDenomResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryTotalDelegationByValidatorForDenomResponse): QueryTotalDelegationByValidatorForDenomResponseAminoMsg {
+    return {
+      type: "osmosis/query-total-delegation-by-validator-for-denom-response",
+      value: QueryTotalDelegationByValidatorForDenomResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryTotalDelegationByValidatorForDenomResponseProtoMsg): QueryTotalDelegationByValidatorForDenomResponse {
+    return QueryTotalDelegationByValidatorForDenomResponse.decode(message.value);
+  },
+
+  toProto(message: QueryTotalDelegationByValidatorForDenomResponse): Uint8Array {
+    return QueryTotalDelegationByValidatorForDenomResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryTotalDelegationByValidatorForDenomResponse): QueryTotalDelegationByValidatorForDenomResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.superfluid.QueryTotalDelegationByValidatorForDenomResponse",
+      value: QueryTotalDelegationByValidatorForDenomResponse.encode(message).finish()
+    };
   }
 
 };
@@ -1886,6 +2321,9 @@ function createBaseDelegations(): Delegations {
 }
 
 export const Delegations = {
+  typeUrl: "/osmosis.superfluid.Delegations",
+  aminoType: "osmosis/delegations",
+
   encode(message: Delegations, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.valAddr !== "") {
       writer.uint32(10).string(message.valAddr);
@@ -1986,6 +2424,32 @@ export const Delegations = {
     obj.amount_sfsd = message.amountSfsd;
     obj.osmo_equivalent = message.osmoEquivalent;
     return obj;
+  },
+
+  fromAminoMsg(object: DelegationsAminoMsg): Delegations {
+    return Delegations.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Delegations): DelegationsAminoMsg {
+    return {
+      type: "osmosis/delegations",
+      value: Delegations.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: DelegationsProtoMsg): Delegations {
+    return Delegations.decode(message.value);
+  },
+
+  toProto(message: Delegations): Uint8Array {
+    return Delegations.encode(message).finish();
+  },
+
+  toProtoMsg(message: Delegations): DelegationsProtoMsg {
+    return {
+      typeUrl: "/osmosis.superfluid.Delegations",
+      value: Delegations.encode(message).finish()
+    };
   }
 
 };
@@ -1995,6 +2459,9 @@ function createBaseTotalSuperfluidDelegationsRequest(): TotalSuperfluidDelegatio
 }
 
 export const TotalSuperfluidDelegationsRequest = {
+  typeUrl: "/osmosis.superfluid.TotalSuperfluidDelegationsRequest",
+  aminoType: "osmosis/total-superfluid-delegations-request",
+
   encode(_: TotalSuperfluidDelegationsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -2047,6 +2514,32 @@ export const TotalSuperfluidDelegationsRequest = {
   toAmino(_: TotalSuperfluidDelegationsRequest): TotalSuperfluidDelegationsRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: TotalSuperfluidDelegationsRequestAminoMsg): TotalSuperfluidDelegationsRequest {
+    return TotalSuperfluidDelegationsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: TotalSuperfluidDelegationsRequest): TotalSuperfluidDelegationsRequestAminoMsg {
+    return {
+      type: "osmosis/total-superfluid-delegations-request",
+      value: TotalSuperfluidDelegationsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: TotalSuperfluidDelegationsRequestProtoMsg): TotalSuperfluidDelegationsRequest {
+    return TotalSuperfluidDelegationsRequest.decode(message.value);
+  },
+
+  toProto(message: TotalSuperfluidDelegationsRequest): Uint8Array {
+    return TotalSuperfluidDelegationsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: TotalSuperfluidDelegationsRequest): TotalSuperfluidDelegationsRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.superfluid.TotalSuperfluidDelegationsRequest",
+      value: TotalSuperfluidDelegationsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2058,6 +2551,9 @@ function createBaseTotalSuperfluidDelegationsResponse(): TotalSuperfluidDelegati
 }
 
 export const TotalSuperfluidDelegationsResponse = {
+  typeUrl: "/osmosis.superfluid.TotalSuperfluidDelegationsResponse",
+  aminoType: "osmosis/total-superfluid-delegations-response",
+
   encode(message: TotalSuperfluidDelegationsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.totalDelegations !== "") {
       writer.uint32(10).string(message.totalDelegations);
@@ -2128,6 +2624,32 @@ export const TotalSuperfluidDelegationsResponse = {
     const obj: any = {};
     obj.total_delegations = message.totalDelegations;
     return obj;
+  },
+
+  fromAminoMsg(object: TotalSuperfluidDelegationsResponseAminoMsg): TotalSuperfluidDelegationsResponse {
+    return TotalSuperfluidDelegationsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: TotalSuperfluidDelegationsResponse): TotalSuperfluidDelegationsResponseAminoMsg {
+    return {
+      type: "osmosis/total-superfluid-delegations-response",
+      value: TotalSuperfluidDelegationsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: TotalSuperfluidDelegationsResponseProtoMsg): TotalSuperfluidDelegationsResponse {
+    return TotalSuperfluidDelegationsResponse.decode(message.value);
+  },
+
+  toProto(message: TotalSuperfluidDelegationsResponse): Uint8Array {
+    return TotalSuperfluidDelegationsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: TotalSuperfluidDelegationsResponse): TotalSuperfluidDelegationsResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.superfluid.TotalSuperfluidDelegationsResponse",
+      value: TotalSuperfluidDelegationsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2141,6 +2663,9 @@ function createBaseSuperfluidDelegationAmountRequest(): SuperfluidDelegationAmou
 }
 
 export const SuperfluidDelegationAmountRequest = {
+  typeUrl: "/osmosis.superfluid.SuperfluidDelegationAmountRequest",
+  aminoType: "osmosis/superfluid-delegation-amount-request",
+
   encode(message: SuperfluidDelegationAmountRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.delegatorAddress !== "") {
       writer.uint32(10).string(message.delegatorAddress);
@@ -2241,6 +2766,32 @@ export const SuperfluidDelegationAmountRequest = {
     obj.validator_address = message.validatorAddress;
     obj.denom = message.denom;
     return obj;
+  },
+
+  fromAminoMsg(object: SuperfluidDelegationAmountRequestAminoMsg): SuperfluidDelegationAmountRequest {
+    return SuperfluidDelegationAmountRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: SuperfluidDelegationAmountRequest): SuperfluidDelegationAmountRequestAminoMsg {
+    return {
+      type: "osmosis/superfluid-delegation-amount-request",
+      value: SuperfluidDelegationAmountRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: SuperfluidDelegationAmountRequestProtoMsg): SuperfluidDelegationAmountRequest {
+    return SuperfluidDelegationAmountRequest.decode(message.value);
+  },
+
+  toProto(message: SuperfluidDelegationAmountRequest): Uint8Array {
+    return SuperfluidDelegationAmountRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: SuperfluidDelegationAmountRequest): SuperfluidDelegationAmountRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.superfluid.SuperfluidDelegationAmountRequest",
+      value: SuperfluidDelegationAmountRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2252,6 +2803,9 @@ function createBaseSuperfluidDelegationAmountResponse(): SuperfluidDelegationAmo
 }
 
 export const SuperfluidDelegationAmountResponse = {
+  typeUrl: "/osmosis.superfluid.SuperfluidDelegationAmountResponse",
+  aminoType: "osmosis/superfluid-delegation-amount-response",
+
   encode(message: SuperfluidDelegationAmountResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.amount) {
       Coin.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -2340,6 +2894,32 @@ export const SuperfluidDelegationAmountResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: SuperfluidDelegationAmountResponseAminoMsg): SuperfluidDelegationAmountResponse {
+    return SuperfluidDelegationAmountResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: SuperfluidDelegationAmountResponse): SuperfluidDelegationAmountResponseAminoMsg {
+    return {
+      type: "osmosis/superfluid-delegation-amount-response",
+      value: SuperfluidDelegationAmountResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: SuperfluidDelegationAmountResponseProtoMsg): SuperfluidDelegationAmountResponse {
+    return SuperfluidDelegationAmountResponse.decode(message.value);
+  },
+
+  toProto(message: SuperfluidDelegationAmountResponse): Uint8Array {
+    return SuperfluidDelegationAmountResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: SuperfluidDelegationAmountResponse): SuperfluidDelegationAmountResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.superfluid.SuperfluidDelegationAmountResponse",
+      value: SuperfluidDelegationAmountResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2351,6 +2931,9 @@ function createBaseSuperfluidDelegationsByDelegatorRequest(): SuperfluidDelegati
 }
 
 export const SuperfluidDelegationsByDelegatorRequest = {
+  typeUrl: "/osmosis.superfluid.SuperfluidDelegationsByDelegatorRequest",
+  aminoType: "osmosis/superfluid-delegations-by-delegator-request",
+
   encode(message: SuperfluidDelegationsByDelegatorRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.delegatorAddress !== "") {
       writer.uint32(10).string(message.delegatorAddress);
@@ -2421,6 +3004,32 @@ export const SuperfluidDelegationsByDelegatorRequest = {
     const obj: any = {};
     obj.delegator_address = message.delegatorAddress;
     return obj;
+  },
+
+  fromAminoMsg(object: SuperfluidDelegationsByDelegatorRequestAminoMsg): SuperfluidDelegationsByDelegatorRequest {
+    return SuperfluidDelegationsByDelegatorRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: SuperfluidDelegationsByDelegatorRequest): SuperfluidDelegationsByDelegatorRequestAminoMsg {
+    return {
+      type: "osmosis/superfluid-delegations-by-delegator-request",
+      value: SuperfluidDelegationsByDelegatorRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: SuperfluidDelegationsByDelegatorRequestProtoMsg): SuperfluidDelegationsByDelegatorRequest {
+    return SuperfluidDelegationsByDelegatorRequest.decode(message.value);
+  },
+
+  toProto(message: SuperfluidDelegationsByDelegatorRequest): Uint8Array {
+    return SuperfluidDelegationsByDelegatorRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: SuperfluidDelegationsByDelegatorRequest): SuperfluidDelegationsByDelegatorRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.superfluid.SuperfluidDelegationsByDelegatorRequest",
+      value: SuperfluidDelegationsByDelegatorRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2434,6 +3043,9 @@ function createBaseSuperfluidDelegationsByDelegatorResponse(): SuperfluidDelegat
 }
 
 export const SuperfluidDelegationsByDelegatorResponse = {
+  typeUrl: "/osmosis.superfluid.SuperfluidDelegationsByDelegatorResponse",
+  aminoType: "osmosis/superfluid-delegations-by-delegator-response",
+
   encode(message: SuperfluidDelegationsByDelegatorResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.superfluidDelegationRecords) {
       SuperfluidDelegationRecord.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -2567,6 +3179,32 @@ export const SuperfluidDelegationsByDelegatorResponse = {
 
     obj.total_equivalent_staked_amount = message.totalEquivalentStakedAmount ? Coin.toAmino(message.totalEquivalentStakedAmount) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: SuperfluidDelegationsByDelegatorResponseAminoMsg): SuperfluidDelegationsByDelegatorResponse {
+    return SuperfluidDelegationsByDelegatorResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: SuperfluidDelegationsByDelegatorResponse): SuperfluidDelegationsByDelegatorResponseAminoMsg {
+    return {
+      type: "osmosis/superfluid-delegations-by-delegator-response",
+      value: SuperfluidDelegationsByDelegatorResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: SuperfluidDelegationsByDelegatorResponseProtoMsg): SuperfluidDelegationsByDelegatorResponse {
+    return SuperfluidDelegationsByDelegatorResponse.decode(message.value);
+  },
+
+  toProto(message: SuperfluidDelegationsByDelegatorResponse): Uint8Array {
+    return SuperfluidDelegationsByDelegatorResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: SuperfluidDelegationsByDelegatorResponse): SuperfluidDelegationsByDelegatorResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.superfluid.SuperfluidDelegationsByDelegatorResponse",
+      value: SuperfluidDelegationsByDelegatorResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2579,6 +3217,9 @@ function createBaseSuperfluidUndelegationsByDelegatorRequest(): SuperfluidUndele
 }
 
 export const SuperfluidUndelegationsByDelegatorRequest = {
+  typeUrl: "/osmosis.superfluid.SuperfluidUndelegationsByDelegatorRequest",
+  aminoType: "osmosis/superfluid-undelegations-by-delegator-request",
+
   encode(message: SuperfluidUndelegationsByDelegatorRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.delegatorAddress !== "") {
       writer.uint32(10).string(message.delegatorAddress);
@@ -2664,6 +3305,32 @@ export const SuperfluidUndelegationsByDelegatorRequest = {
     obj.delegator_address = message.delegatorAddress;
     obj.denom = message.denom;
     return obj;
+  },
+
+  fromAminoMsg(object: SuperfluidUndelegationsByDelegatorRequestAminoMsg): SuperfluidUndelegationsByDelegatorRequest {
+    return SuperfluidUndelegationsByDelegatorRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: SuperfluidUndelegationsByDelegatorRequest): SuperfluidUndelegationsByDelegatorRequestAminoMsg {
+    return {
+      type: "osmosis/superfluid-undelegations-by-delegator-request",
+      value: SuperfluidUndelegationsByDelegatorRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: SuperfluidUndelegationsByDelegatorRequestProtoMsg): SuperfluidUndelegationsByDelegatorRequest {
+    return SuperfluidUndelegationsByDelegatorRequest.decode(message.value);
+  },
+
+  toProto(message: SuperfluidUndelegationsByDelegatorRequest): Uint8Array {
+    return SuperfluidUndelegationsByDelegatorRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: SuperfluidUndelegationsByDelegatorRequest): SuperfluidUndelegationsByDelegatorRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.superfluid.SuperfluidUndelegationsByDelegatorRequest",
+      value: SuperfluidUndelegationsByDelegatorRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2677,6 +3344,9 @@ function createBaseSuperfluidUndelegationsByDelegatorResponse(): SuperfluidUndel
 }
 
 export const SuperfluidUndelegationsByDelegatorResponse = {
+  typeUrl: "/osmosis.superfluid.SuperfluidUndelegationsByDelegatorResponse",
+  aminoType: "osmosis/superfluid-undelegations-by-delegator-response",
+
   encode(message: SuperfluidUndelegationsByDelegatorResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.superfluidDelegationRecords) {
       SuperfluidDelegationRecord.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -2825,6 +3495,32 @@ export const SuperfluidUndelegationsByDelegatorResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: SuperfluidUndelegationsByDelegatorResponseAminoMsg): SuperfluidUndelegationsByDelegatorResponse {
+    return SuperfluidUndelegationsByDelegatorResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: SuperfluidUndelegationsByDelegatorResponse): SuperfluidUndelegationsByDelegatorResponseAminoMsg {
+    return {
+      type: "osmosis/superfluid-undelegations-by-delegator-response",
+      value: SuperfluidUndelegationsByDelegatorResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: SuperfluidUndelegationsByDelegatorResponseProtoMsg): SuperfluidUndelegationsByDelegatorResponse {
+    return SuperfluidUndelegationsByDelegatorResponse.decode(message.value);
+  },
+
+  toProto(message: SuperfluidUndelegationsByDelegatorResponse): Uint8Array {
+    return SuperfluidUndelegationsByDelegatorResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: SuperfluidUndelegationsByDelegatorResponse): SuperfluidUndelegationsByDelegatorResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.superfluid.SuperfluidUndelegationsByDelegatorResponse",
+      value: SuperfluidUndelegationsByDelegatorResponse.encode(message).finish()
+    };
   }
 
 };
@@ -2837,6 +3533,9 @@ function createBaseSuperfluidDelegationsByValidatorDenomRequest(): SuperfluidDel
 }
 
 export const SuperfluidDelegationsByValidatorDenomRequest = {
+  typeUrl: "/osmosis.superfluid.SuperfluidDelegationsByValidatorDenomRequest",
+  aminoType: "osmosis/superfluid-delegations-by-validator-denom-request",
+
   encode(message: SuperfluidDelegationsByValidatorDenomRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.validatorAddress !== "") {
       writer.uint32(10).string(message.validatorAddress);
@@ -2922,6 +3621,32 @@ export const SuperfluidDelegationsByValidatorDenomRequest = {
     obj.validator_address = message.validatorAddress;
     obj.denom = message.denom;
     return obj;
+  },
+
+  fromAminoMsg(object: SuperfluidDelegationsByValidatorDenomRequestAminoMsg): SuperfluidDelegationsByValidatorDenomRequest {
+    return SuperfluidDelegationsByValidatorDenomRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: SuperfluidDelegationsByValidatorDenomRequest): SuperfluidDelegationsByValidatorDenomRequestAminoMsg {
+    return {
+      type: "osmosis/superfluid-delegations-by-validator-denom-request",
+      value: SuperfluidDelegationsByValidatorDenomRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: SuperfluidDelegationsByValidatorDenomRequestProtoMsg): SuperfluidDelegationsByValidatorDenomRequest {
+    return SuperfluidDelegationsByValidatorDenomRequest.decode(message.value);
+  },
+
+  toProto(message: SuperfluidDelegationsByValidatorDenomRequest): Uint8Array {
+    return SuperfluidDelegationsByValidatorDenomRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: SuperfluidDelegationsByValidatorDenomRequest): SuperfluidDelegationsByValidatorDenomRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.superfluid.SuperfluidDelegationsByValidatorDenomRequest",
+      value: SuperfluidDelegationsByValidatorDenomRequest.encode(message).finish()
+    };
   }
 
 };
@@ -2933,6 +3658,9 @@ function createBaseSuperfluidDelegationsByValidatorDenomResponse(): SuperfluidDe
 }
 
 export const SuperfluidDelegationsByValidatorDenomResponse = {
+  typeUrl: "/osmosis.superfluid.SuperfluidDelegationsByValidatorDenomResponse",
+  aminoType: "osmosis/superfluid-delegations-by-validator-denom-response",
+
   encode(message: SuperfluidDelegationsByValidatorDenomResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.superfluidDelegationRecords) {
       SuperfluidDelegationRecord.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -3021,6 +3749,32 @@ export const SuperfluidDelegationsByValidatorDenomResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: SuperfluidDelegationsByValidatorDenomResponseAminoMsg): SuperfluidDelegationsByValidatorDenomResponse {
+    return SuperfluidDelegationsByValidatorDenomResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: SuperfluidDelegationsByValidatorDenomResponse): SuperfluidDelegationsByValidatorDenomResponseAminoMsg {
+    return {
+      type: "osmosis/superfluid-delegations-by-validator-denom-response",
+      value: SuperfluidDelegationsByValidatorDenomResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: SuperfluidDelegationsByValidatorDenomResponseProtoMsg): SuperfluidDelegationsByValidatorDenomResponse {
+    return SuperfluidDelegationsByValidatorDenomResponse.decode(message.value);
+  },
+
+  toProto(message: SuperfluidDelegationsByValidatorDenomResponse): Uint8Array {
+    return SuperfluidDelegationsByValidatorDenomResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: SuperfluidDelegationsByValidatorDenomResponse): SuperfluidDelegationsByValidatorDenomResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.superfluid.SuperfluidDelegationsByValidatorDenomResponse",
+      value: SuperfluidDelegationsByValidatorDenomResponse.encode(message).finish()
+    };
   }
 
 };
@@ -3033,6 +3787,9 @@ function createBaseEstimateSuperfluidDelegatedAmountByValidatorDenomRequest(): E
 }
 
 export const EstimateSuperfluidDelegatedAmountByValidatorDenomRequest = {
+  typeUrl: "/osmosis.superfluid.EstimateSuperfluidDelegatedAmountByValidatorDenomRequest",
+  aminoType: "osmosis/estimate-superfluid-delegated-amount-by-validator-denom-request",
+
   encode(message: EstimateSuperfluidDelegatedAmountByValidatorDenomRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.validatorAddress !== "") {
       writer.uint32(10).string(message.validatorAddress);
@@ -3118,6 +3875,32 @@ export const EstimateSuperfluidDelegatedAmountByValidatorDenomRequest = {
     obj.validator_address = message.validatorAddress;
     obj.denom = message.denom;
     return obj;
+  },
+
+  fromAminoMsg(object: EstimateSuperfluidDelegatedAmountByValidatorDenomRequestAminoMsg): EstimateSuperfluidDelegatedAmountByValidatorDenomRequest {
+    return EstimateSuperfluidDelegatedAmountByValidatorDenomRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: EstimateSuperfluidDelegatedAmountByValidatorDenomRequest): EstimateSuperfluidDelegatedAmountByValidatorDenomRequestAminoMsg {
+    return {
+      type: "osmosis/estimate-superfluid-delegated-amount-by-validator-denom-request",
+      value: EstimateSuperfluidDelegatedAmountByValidatorDenomRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: EstimateSuperfluidDelegatedAmountByValidatorDenomRequestProtoMsg): EstimateSuperfluidDelegatedAmountByValidatorDenomRequest {
+    return EstimateSuperfluidDelegatedAmountByValidatorDenomRequest.decode(message.value);
+  },
+
+  toProto(message: EstimateSuperfluidDelegatedAmountByValidatorDenomRequest): Uint8Array {
+    return EstimateSuperfluidDelegatedAmountByValidatorDenomRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: EstimateSuperfluidDelegatedAmountByValidatorDenomRequest): EstimateSuperfluidDelegatedAmountByValidatorDenomRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.superfluid.EstimateSuperfluidDelegatedAmountByValidatorDenomRequest",
+      value: EstimateSuperfluidDelegatedAmountByValidatorDenomRequest.encode(message).finish()
+    };
   }
 
 };
@@ -3129,6 +3912,9 @@ function createBaseEstimateSuperfluidDelegatedAmountByValidatorDenomResponse():
 }
 
 export const EstimateSuperfluidDelegatedAmountByValidatorDenomResponse = {
+  typeUrl: "/osmosis.superfluid.EstimateSuperfluidDelegatedAmountByValidatorDenomResponse",
+  aminoType: "osmosis/estimate-superfluid-delegated-amount-by-validator-denom-response",
+
   encode(message: EstimateSuperfluidDelegatedAmountByValidatorDenomResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.totalDelegatedCoins) {
       Coin.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -3217,6 +4003,32 @@ export const EstimateSuperfluidDelegatedAmountByValidatorDenomResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: EstimateSuperfluidDelegatedAmountByValidatorDenomResponseAminoMsg): EstimateSuperfluidDelegatedAmountByValidatorDenomResponse {
+    return EstimateSuperfluidDelegatedAmountByValidatorDenomResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: EstimateSuperfluidDelegatedAmountByValidatorDenomResponse): EstimateSuperfluidDelegatedAmountByValidatorDenomResponseAminoMsg {
+    return {
+      type: "osmosis/estimate-superfluid-delegated-amount-by-validator-denom-response",
+      value: EstimateSuperfluidDelegatedAmountByValidatorDenomResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: EstimateSuperfluidDelegatedAmountByValidatorDenomResponseProtoMsg): EstimateSuperfluidDelegatedAmountByValidatorDenomResponse {
+    return EstimateSuperfluidDelegatedAmountByValidatorDenomResponse.decode(message.value);
+  },
+
+  toProto(message: EstimateSuperfluidDelegatedAmountByValidatorDenomResponse): Uint8Array {
+    return EstimateSuperfluidDelegatedAmountByValidatorDenomResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: EstimateSuperfluidDelegatedAmountByValidatorDenomResponse): EstimateSuperfluidDelegatedAmountByValidatorDenomResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.superfluid.EstimateSuperfluidDelegatedAmountByValidatorDenomResponse",
+      value: EstimateSuperfluidDelegatedAmountByValidatorDenomResponse.encode(message).finish()
+    };
   }
 
 };
@@ -3228,6 +4040,9 @@ function createBaseQueryTotalDelegationByDelegatorRequest(): QueryTotalDelegatio
 }
 
 export const QueryTotalDelegationByDelegatorRequest = {
+  typeUrl: "/osmosis.superfluid.QueryTotalDelegationByDelegatorRequest",
+  aminoType: "osmosis/query-total-delegation-by-delegator-request",
+
   encode(message: QueryTotalDelegationByDelegatorRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.delegatorAddress !== "") {
       writer.uint32(10).string(message.delegatorAddress);
@@ -3298,6 +4113,32 @@ export const QueryTotalDelegationByDelegatorRequest = {
     const obj: any = {};
     obj.delegator_address = message.delegatorAddress;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryTotalDelegationByDelegatorRequestAminoMsg): QueryTotalDelegationByDelegatorRequest {
+    return QueryTotalDelegationByDelegatorRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryTotalDelegationByDelegatorRequest): QueryTotalDelegationByDelegatorRequestAminoMsg {
+    return {
+      type: "osmosis/query-total-delegation-by-delegator-request",
+      value: QueryTotalDelegationByDelegatorRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryTotalDelegationByDelegatorRequestProtoMsg): QueryTotalDelegationByDelegatorRequest {
+    return QueryTotalDelegationByDelegatorRequest.decode(message.value);
+  },
+
+  toProto(message: QueryTotalDelegationByDelegatorRequest): Uint8Array {
+    return QueryTotalDelegationByDelegatorRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryTotalDelegationByDelegatorRequest): QueryTotalDelegationByDelegatorRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.superfluid.QueryTotalDelegationByDelegatorRequest",
+      value: QueryTotalDelegationByDelegatorRequest.encode(message).finish()
+    };
   }
 
 };
@@ -3312,6 +4153,9 @@ function createBaseQueryTotalDelegationByDelegatorResponse(): QueryTotalDelegati
 }
 
 export const QueryTotalDelegationByDelegatorResponse = {
+  typeUrl: "/osmosis.superfluid.QueryTotalDelegationByDelegatorResponse",
+  aminoType: "osmosis/query-total-delegation-by-delegator-response",
+
   encode(message: QueryTotalDelegationByDelegatorResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.superfluidDelegationRecords) {
       SuperfluidDelegationRecord.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -3475,6 +4319,32 @@ export const QueryTotalDelegationByDelegatorResponse = {
 
     obj.total_equivalent_staked_amount = message.totalEquivalentStakedAmount ? Coin.toAmino(message.totalEquivalentStakedAmount) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryTotalDelegationByDelegatorResponseAminoMsg): QueryTotalDelegationByDelegatorResponse {
+    return QueryTotalDelegationByDelegatorResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryTotalDelegationByDelegatorResponse): QueryTotalDelegationByDelegatorResponseAminoMsg {
+    return {
+      type: "osmosis/query-total-delegation-by-delegator-response",
+      value: QueryTotalDelegationByDelegatorResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryTotalDelegationByDelegatorResponseProtoMsg): QueryTotalDelegationByDelegatorResponse {
+    return QueryTotalDelegationByDelegatorResponse.decode(message.value);
+  },
+
+  toProto(message: QueryTotalDelegationByDelegatorResponse): Uint8Array {
+    return QueryTotalDelegationByDelegatorResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryTotalDelegationByDelegatorResponse): QueryTotalDelegationByDelegatorResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.superfluid.QueryTotalDelegationByDelegatorResponse",
+      value: QueryTotalDelegationByDelegatorResponse.encode(message).finish()
+    };
   }
 
 };
@@ -3484,6 +4354,9 @@ function createBaseQueryUnpoolWhitelistRequest(): QueryUnpoolWhitelistRequest {
 }
 
 export const QueryUnpoolWhitelistRequest = {
+  typeUrl: "/osmosis.superfluid.QueryUnpoolWhitelistRequest",
+  aminoType: "osmosis/query-unpool-whitelist-request",
+
   encode(_: QueryUnpoolWhitelistRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -3536,6 +4409,32 @@ export const QueryUnpoolWhitelistRequest = {
   toAmino(_: QueryUnpoolWhitelistRequest): QueryUnpoolWhitelistRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryUnpoolWhitelistRequestAminoMsg): QueryUnpoolWhitelistRequest {
+    return QueryUnpoolWhitelistRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryUnpoolWhitelistRequest): QueryUnpoolWhitelistRequestAminoMsg {
+    return {
+      type: "osmosis/query-unpool-whitelist-request",
+      value: QueryUnpoolWhitelistRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryUnpoolWhitelistRequestProtoMsg): QueryUnpoolWhitelistRequest {
+    return QueryUnpoolWhitelistRequest.decode(message.value);
+  },
+
+  toProto(message: QueryUnpoolWhitelistRequest): Uint8Array {
+    return QueryUnpoolWhitelistRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryUnpoolWhitelistRequest): QueryUnpoolWhitelistRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.superfluid.QueryUnpoolWhitelistRequest",
+      value: QueryUnpoolWhitelistRequest.encode(message).finish()
+    };
   }
 
 };
@@ -3547,6 +4446,9 @@ function createBaseQueryUnpoolWhitelistResponse(): QueryUnpoolWhitelistResponse
 }
 
 export const QueryUnpoolWhitelistResponse = {
+  typeUrl: "/osmosis.superfluid.QueryUnpoolWhitelistResponse",
+  aminoType: "osmosis/query-unpool-whitelist-response",
+
   encode(message: QueryUnpoolWhitelistResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     writer.uint32(10).fork();
 
@@ -3647,6 +4549,32 @@ export const QueryUnpoolWhitelistResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: QueryUnpoolWhitelistResponseAminoMsg): QueryUnpoolWhitelistResponse {
+    return QueryUnpoolWhitelistResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryUnpoolWhitelistResponse): QueryUnpoolWhitelistResponseAminoMsg {
+    return {
+      type: "osmosis/query-unpool-whitelist-response",
+      value: QueryUnpoolWhitelistResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryUnpoolWhitelistResponseProtoMsg): QueryUnpoolWhitelistResponse {
+    return QueryUnpoolWhitelistResponse.decode(message.value);
+  },
+
+  toProto(message: QueryUnpoolWhitelistResponse): Uint8Array {
+    return QueryUnpoolWhitelistResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryUnpoolWhitelistResponse): QueryUnpoolWhitelistResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.superfluid.QueryUnpoolWhitelistResponse",
+      value: QueryUnpoolWhitelistResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/osmosis/superfluid/superfluid.ts b/__fixtures__/outputv2/osmosis/superfluid/superfluid.ts
index a2b71ae33..c4f92daaf 100644
--- a/__fixtures__/outputv2/osmosis/superfluid/superfluid.ts
+++ b/__fixtures__/outputv2/osmosis/superfluid/superfluid.ts
@@ -54,7 +54,7 @@ export interface SuperfluidAsset {
    */
   assetType: SuperfluidAssetType;
 }
-export interface SuperfluidAssetProtoType {
+export interface SuperfluidAssetProtoMsg {
   typeUrl: "/osmosis.superfluid.SuperfluidAsset";
   value: Uint8Array;
 }
@@ -69,7 +69,7 @@ export interface SuperfluidAssetAmino {
    */
   asset_type: SuperfluidAssetType;
 }
-export interface SuperfluidAssetAminoType {
+export interface SuperfluidAssetAminoMsg {
   type: "osmosis/superfluid-asset";
   value: SuperfluidAssetAmino;
 }
@@ -93,7 +93,7 @@ export interface SuperfluidIntermediaryAccount {
   /** perpetual gauge for rewards distribution */
   gaugeId: Long;
 }
-export interface SuperfluidIntermediaryAccountProtoType {
+export interface SuperfluidIntermediaryAccountProtoMsg {
   typeUrl: "/osmosis.superfluid.SuperfluidIntermediaryAccount";
   value: Uint8Array;
 }
@@ -111,7 +111,7 @@ export interface SuperfluidIntermediaryAccountAmino {
   /** perpetual gauge for rewards distribution */
   gauge_id: string;
 }
-export interface SuperfluidIntermediaryAccountAminoType {
+export interface SuperfluidIntermediaryAccountAminoMsg {
   type: "osmosis/superfluid-intermediary-account";
   value: SuperfluidIntermediaryAccountAmino;
 }
@@ -143,7 +143,7 @@ export interface OsmoEquivalentMultiplierRecord {
   denom: string;
   multiplier: string;
 }
-export interface OsmoEquivalentMultiplierRecordProtoType {
+export interface OsmoEquivalentMultiplierRecordProtoMsg {
   typeUrl: "/osmosis.superfluid.OsmoEquivalentMultiplierRecord";
   value: Uint8Array;
 }
@@ -164,7 +164,7 @@ export interface OsmoEquivalentMultiplierRecordAmino {
   denom: string;
   multiplier: string;
 }
-export interface OsmoEquivalentMultiplierRecordAminoType {
+export interface OsmoEquivalentMultiplierRecordAminoMsg {
   type: "osmosis/osmo-equivalent-multiplier-record";
   value: OsmoEquivalentMultiplierRecordAmino;
 }
@@ -194,7 +194,7 @@ export interface SuperfluidDelegationRecord {
   delegationAmount?: Coin;
   equivalentStakedAmount?: Coin;
 }
-export interface SuperfluidDelegationRecordProtoType {
+export interface SuperfluidDelegationRecordProtoMsg {
   typeUrl: "/osmosis.superfluid.SuperfluidDelegationRecord";
   value: Uint8Array;
 }
@@ -209,7 +209,7 @@ export interface SuperfluidDelegationRecordAmino {
   delegation_amount?: CoinAmino;
   equivalent_staked_amount?: CoinAmino;
 }
-export interface SuperfluidDelegationRecordAminoType {
+export interface SuperfluidDelegationRecordAminoMsg {
   type: "osmosis/superfluid-delegation-record";
   value: SuperfluidDelegationRecordAmino;
 }
@@ -234,7 +234,7 @@ export interface LockIdIntermediaryAccountConnection {
   lockId: Long;
   intermediaryAccount: string;
 }
-export interface LockIdIntermediaryAccountConnectionProtoType {
+export interface LockIdIntermediaryAccountConnectionProtoMsg {
   typeUrl: "/osmosis.superfluid.LockIdIntermediaryAccountConnection";
   value: Uint8Array;
 }
@@ -248,7 +248,7 @@ export interface LockIdIntermediaryAccountConnectionAmino {
   lock_id: string;
   intermediary_account: string;
 }
-export interface LockIdIntermediaryAccountConnectionAminoType {
+export interface LockIdIntermediaryAccountConnectionAminoMsg {
   type: "osmosis/lock-id-intermediary-account-connection";
   value: LockIdIntermediaryAccountConnectionAmino;
 }
@@ -265,14 +265,14 @@ export interface LockIdIntermediaryAccountConnectionSDKType {
 export interface UnpoolWhitelistedPools {
   ids: Long[];
 }
-export interface UnpoolWhitelistedPoolsProtoType {
+export interface UnpoolWhitelistedPoolsProtoMsg {
   typeUrl: "/osmosis.superfluid.UnpoolWhitelistedPools";
   value: Uint8Array;
 }
 export interface UnpoolWhitelistedPoolsAmino {
   ids: string[];
 }
-export interface UnpoolWhitelistedPoolsAminoType {
+export interface UnpoolWhitelistedPoolsAminoMsg {
   type: "osmosis/unpool-whitelisted-pools";
   value: UnpoolWhitelistedPoolsAmino;
 }
@@ -288,6 +288,9 @@ function createBaseSuperfluidAsset(): SuperfluidAsset {
 }
 
 export const SuperfluidAsset = {
+  typeUrl: "/osmosis.superfluid.SuperfluidAsset",
+  aminoType: "osmosis/superfluid-asset",
+
   encode(message: SuperfluidAsset, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.denom !== "") {
       writer.uint32(10).string(message.denom);
@@ -373,6 +376,32 @@ export const SuperfluidAsset = {
     obj.denom = message.denom;
     obj.asset_type = message.assetType;
     return obj;
+  },
+
+  fromAminoMsg(object: SuperfluidAssetAminoMsg): SuperfluidAsset {
+    return SuperfluidAsset.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: SuperfluidAsset): SuperfluidAssetAminoMsg {
+    return {
+      type: "osmosis/superfluid-asset",
+      value: SuperfluidAsset.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: SuperfluidAssetProtoMsg): SuperfluidAsset {
+    return SuperfluidAsset.decode(message.value);
+  },
+
+  toProto(message: SuperfluidAsset): Uint8Array {
+    return SuperfluidAsset.encode(message).finish();
+  },
+
+  toProtoMsg(message: SuperfluidAsset): SuperfluidAssetProtoMsg {
+    return {
+      typeUrl: "/osmosis.superfluid.SuperfluidAsset",
+      value: SuperfluidAsset.encode(message).finish()
+    };
   }
 
 };
@@ -386,6 +415,9 @@ function createBaseSuperfluidIntermediaryAccount(): SuperfluidIntermediaryAccoun
 }
 
 export const SuperfluidIntermediaryAccount = {
+  typeUrl: "/osmosis.superfluid.SuperfluidIntermediaryAccount",
+  aminoType: "osmosis/superfluid-intermediary-account",
+
   encode(message: SuperfluidIntermediaryAccount, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.denom !== "") {
       writer.uint32(10).string(message.denom);
@@ -486,6 +518,32 @@ export const SuperfluidIntermediaryAccount = {
     obj.val_addr = message.valAddr;
     obj.gauge_id = message.gaugeId ? message.gaugeId.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: SuperfluidIntermediaryAccountAminoMsg): SuperfluidIntermediaryAccount {
+    return SuperfluidIntermediaryAccount.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: SuperfluidIntermediaryAccount): SuperfluidIntermediaryAccountAminoMsg {
+    return {
+      type: "osmosis/superfluid-intermediary-account",
+      value: SuperfluidIntermediaryAccount.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: SuperfluidIntermediaryAccountProtoMsg): SuperfluidIntermediaryAccount {
+    return SuperfluidIntermediaryAccount.decode(message.value);
+  },
+
+  toProto(message: SuperfluidIntermediaryAccount): Uint8Array {
+    return SuperfluidIntermediaryAccount.encode(message).finish();
+  },
+
+  toProtoMsg(message: SuperfluidIntermediaryAccount): SuperfluidIntermediaryAccountProtoMsg {
+    return {
+      typeUrl: "/osmosis.superfluid.SuperfluidIntermediaryAccount",
+      value: SuperfluidIntermediaryAccount.encode(message).finish()
+    };
   }
 
 };
@@ -499,6 +557,9 @@ function createBaseOsmoEquivalentMultiplierRecord(): OsmoEquivalentMultiplierRec
 }
 
 export const OsmoEquivalentMultiplierRecord = {
+  typeUrl: "/osmosis.superfluid.OsmoEquivalentMultiplierRecord",
+  aminoType: "osmosis/osmo-equivalent-multiplier-record",
+
   encode(message: OsmoEquivalentMultiplierRecord, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.epochNumber.isZero()) {
       writer.uint32(8).int64(message.epochNumber);
@@ -599,6 +660,32 @@ export const OsmoEquivalentMultiplierRecord = {
     obj.denom = message.denom;
     obj.multiplier = message.multiplier;
     return obj;
+  },
+
+  fromAminoMsg(object: OsmoEquivalentMultiplierRecordAminoMsg): OsmoEquivalentMultiplierRecord {
+    return OsmoEquivalentMultiplierRecord.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: OsmoEquivalentMultiplierRecord): OsmoEquivalentMultiplierRecordAminoMsg {
+    return {
+      type: "osmosis/osmo-equivalent-multiplier-record",
+      value: OsmoEquivalentMultiplierRecord.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: OsmoEquivalentMultiplierRecordProtoMsg): OsmoEquivalentMultiplierRecord {
+    return OsmoEquivalentMultiplierRecord.decode(message.value);
+  },
+
+  toProto(message: OsmoEquivalentMultiplierRecord): Uint8Array {
+    return OsmoEquivalentMultiplierRecord.encode(message).finish();
+  },
+
+  toProtoMsg(message: OsmoEquivalentMultiplierRecord): OsmoEquivalentMultiplierRecordProtoMsg {
+    return {
+      typeUrl: "/osmosis.superfluid.OsmoEquivalentMultiplierRecord",
+      value: OsmoEquivalentMultiplierRecord.encode(message).finish()
+    };
   }
 
 };
@@ -613,6 +700,9 @@ function createBaseSuperfluidDelegationRecord(): SuperfluidDelegationRecord {
 }
 
 export const SuperfluidDelegationRecord = {
+  typeUrl: "/osmosis.superfluid.SuperfluidDelegationRecord",
+  aminoType: "osmosis/superfluid-delegation-record",
+
   encode(message: SuperfluidDelegationRecord, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.delegatorAddress !== "") {
       writer.uint32(10).string(message.delegatorAddress);
@@ -728,6 +818,32 @@ export const SuperfluidDelegationRecord = {
     obj.delegation_amount = message.delegationAmount ? Coin.toAmino(message.delegationAmount) : undefined;
     obj.equivalent_staked_amount = message.equivalentStakedAmount ? Coin.toAmino(message.equivalentStakedAmount) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: SuperfluidDelegationRecordAminoMsg): SuperfluidDelegationRecord {
+    return SuperfluidDelegationRecord.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: SuperfluidDelegationRecord): SuperfluidDelegationRecordAminoMsg {
+    return {
+      type: "osmosis/superfluid-delegation-record",
+      value: SuperfluidDelegationRecord.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: SuperfluidDelegationRecordProtoMsg): SuperfluidDelegationRecord {
+    return SuperfluidDelegationRecord.decode(message.value);
+  },
+
+  toProto(message: SuperfluidDelegationRecord): Uint8Array {
+    return SuperfluidDelegationRecord.encode(message).finish();
+  },
+
+  toProtoMsg(message: SuperfluidDelegationRecord): SuperfluidDelegationRecordProtoMsg {
+    return {
+      typeUrl: "/osmosis.superfluid.SuperfluidDelegationRecord",
+      value: SuperfluidDelegationRecord.encode(message).finish()
+    };
   }
 
 };
@@ -740,6 +856,9 @@ function createBaseLockIdIntermediaryAccountConnection(): LockIdIntermediaryAcco
 }
 
 export const LockIdIntermediaryAccountConnection = {
+  typeUrl: "/osmosis.superfluid.LockIdIntermediaryAccountConnection",
+  aminoType: "osmosis/lock-id-intermediary-account-connection",
+
   encode(message: LockIdIntermediaryAccountConnection, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.lockId.isZero()) {
       writer.uint32(8).uint64(message.lockId);
@@ -825,6 +944,32 @@ export const LockIdIntermediaryAccountConnection = {
     obj.lock_id = message.lockId ? message.lockId.toString() : undefined;
     obj.intermediary_account = message.intermediaryAccount;
     return obj;
+  },
+
+  fromAminoMsg(object: LockIdIntermediaryAccountConnectionAminoMsg): LockIdIntermediaryAccountConnection {
+    return LockIdIntermediaryAccountConnection.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: LockIdIntermediaryAccountConnection): LockIdIntermediaryAccountConnectionAminoMsg {
+    return {
+      type: "osmosis/lock-id-intermediary-account-connection",
+      value: LockIdIntermediaryAccountConnection.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: LockIdIntermediaryAccountConnectionProtoMsg): LockIdIntermediaryAccountConnection {
+    return LockIdIntermediaryAccountConnection.decode(message.value);
+  },
+
+  toProto(message: LockIdIntermediaryAccountConnection): Uint8Array {
+    return LockIdIntermediaryAccountConnection.encode(message).finish();
+  },
+
+  toProtoMsg(message: LockIdIntermediaryAccountConnection): LockIdIntermediaryAccountConnectionProtoMsg {
+    return {
+      typeUrl: "/osmosis.superfluid.LockIdIntermediaryAccountConnection",
+      value: LockIdIntermediaryAccountConnection.encode(message).finish()
+    };
   }
 
 };
@@ -836,6 +981,9 @@ function createBaseUnpoolWhitelistedPools(): UnpoolWhitelistedPools {
 }
 
 export const UnpoolWhitelistedPools = {
+  typeUrl: "/osmosis.superfluid.UnpoolWhitelistedPools",
+  aminoType: "osmosis/unpool-whitelisted-pools",
+
   encode(message: UnpoolWhitelistedPools, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     writer.uint32(10).fork();
 
@@ -936,6 +1084,32 @@ export const UnpoolWhitelistedPools = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: UnpoolWhitelistedPoolsAminoMsg): UnpoolWhitelistedPools {
+    return UnpoolWhitelistedPools.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: UnpoolWhitelistedPools): UnpoolWhitelistedPoolsAminoMsg {
+    return {
+      type: "osmosis/unpool-whitelisted-pools",
+      value: UnpoolWhitelistedPools.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: UnpoolWhitelistedPoolsProtoMsg): UnpoolWhitelistedPools {
+    return UnpoolWhitelistedPools.decode(message.value);
+  },
+
+  toProto(message: UnpoolWhitelistedPools): Uint8Array {
+    return UnpoolWhitelistedPools.encode(message).finish();
+  },
+
+  toProtoMsg(message: UnpoolWhitelistedPools): UnpoolWhitelistedPoolsProtoMsg {
+    return {
+      typeUrl: "/osmosis.superfluid.UnpoolWhitelistedPools",
+      value: UnpoolWhitelistedPools.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/osmosis/superfluid/tx.ts b/__fixtures__/outputv2/osmosis/superfluid/tx.ts
index 907fecdd2..ee423c2e1 100644
--- a/__fixtures__/outputv2/osmosis/superfluid/tx.ts
+++ b/__fixtures__/outputv2/osmosis/superfluid/tx.ts
@@ -7,7 +7,7 @@ export interface MsgSuperfluidDelegate {
   lockId: Long;
   valAddr: string;
 }
-export interface MsgSuperfluidDelegateProtoType {
+export interface MsgSuperfluidDelegateProtoMsg {
   typeUrl: "/osmosis.superfluid.MsgSuperfluidDelegate";
   value: Uint8Array;
 }
@@ -16,7 +16,7 @@ export interface MsgSuperfluidDelegateAmino {
   lock_id: string;
   val_addr: string;
 }
-export interface MsgSuperfluidDelegateAminoType {
+export interface MsgSuperfluidDelegateAminoMsg {
   type: "osmosis/superfluid-delegate";
   value: MsgSuperfluidDelegateAmino;
 }
@@ -26,12 +26,12 @@ export interface MsgSuperfluidDelegateSDKType {
   val_addr: string;
 }
 export interface MsgSuperfluidDelegateResponse {}
-export interface MsgSuperfluidDelegateResponseProtoType {
+export interface MsgSuperfluidDelegateResponseProtoMsg {
   typeUrl: "/osmosis.superfluid.MsgSuperfluidDelegateResponse";
   value: Uint8Array;
 }
 export interface MsgSuperfluidDelegateResponseAmino {}
-export interface MsgSuperfluidDelegateResponseAminoType {
+export interface MsgSuperfluidDelegateResponseAminoMsg {
   type: "osmosis/superfluid-delegate-response";
   value: MsgSuperfluidDelegateResponseAmino;
 }
@@ -40,7 +40,7 @@ export interface MsgSuperfluidUndelegate {
   sender: string;
   lockId: Long;
 }
-export interface MsgSuperfluidUndelegateProtoType {
+export interface MsgSuperfluidUndelegateProtoMsg {
   typeUrl: "/osmosis.superfluid.MsgSuperfluidUndelegate";
   value: Uint8Array;
 }
@@ -48,7 +48,7 @@ export interface MsgSuperfluidUndelegateAmino {
   sender: string;
   lock_id: string;
 }
-export interface MsgSuperfluidUndelegateAminoType {
+export interface MsgSuperfluidUndelegateAminoMsg {
   type: "osmosis/superfluid-undelegate";
   value: MsgSuperfluidUndelegateAmino;
 }
@@ -57,12 +57,12 @@ export interface MsgSuperfluidUndelegateSDKType {
   lock_id: Long;
 }
 export interface MsgSuperfluidUndelegateResponse {}
-export interface MsgSuperfluidUndelegateResponseProtoType {
+export interface MsgSuperfluidUndelegateResponseProtoMsg {
   typeUrl: "/osmosis.superfluid.MsgSuperfluidUndelegateResponse";
   value: Uint8Array;
 }
 export interface MsgSuperfluidUndelegateResponseAmino {}
-export interface MsgSuperfluidUndelegateResponseAminoType {
+export interface MsgSuperfluidUndelegateResponseAminoMsg {
   type: "osmosis/superfluid-undelegate-response";
   value: MsgSuperfluidUndelegateResponseAmino;
 }
@@ -71,7 +71,7 @@ export interface MsgSuperfluidUnbondLock {
   sender: string;
   lockId: Long;
 }
-export interface MsgSuperfluidUnbondLockProtoType {
+export interface MsgSuperfluidUnbondLockProtoMsg {
   typeUrl: "/osmosis.superfluid.MsgSuperfluidUnbondLock";
   value: Uint8Array;
 }
@@ -79,7 +79,7 @@ export interface MsgSuperfluidUnbondLockAmino {
   sender: string;
   lock_id: string;
 }
-export interface MsgSuperfluidUnbondLockAminoType {
+export interface MsgSuperfluidUnbondLockAminoMsg {
   type: "osmosis/superfluid-unbond-lock";
   value: MsgSuperfluidUnbondLockAmino;
 }
@@ -88,12 +88,12 @@ export interface MsgSuperfluidUnbondLockSDKType {
   lock_id: Long;
 }
 export interface MsgSuperfluidUnbondLockResponse {}
-export interface MsgSuperfluidUnbondLockResponseProtoType {
+export interface MsgSuperfluidUnbondLockResponseProtoMsg {
   typeUrl: "/osmosis.superfluid.MsgSuperfluidUnbondLockResponse";
   value: Uint8Array;
 }
 export interface MsgSuperfluidUnbondLockResponseAmino {}
-export interface MsgSuperfluidUnbondLockResponseAminoType {
+export interface MsgSuperfluidUnbondLockResponseAminoMsg {
   type: "osmosis/superfluid-unbond-lock-response";
   value: MsgSuperfluidUnbondLockResponseAmino;
 }
@@ -109,7 +109,7 @@ export interface MsgLockAndSuperfluidDelegate {
   coins: Coin[];
   valAddr: string;
 }
-export interface MsgLockAndSuperfluidDelegateProtoType {
+export interface MsgLockAndSuperfluidDelegateProtoMsg {
   typeUrl: "/osmosis.superfluid.MsgLockAndSuperfluidDelegate";
   value: Uint8Array;
 }
@@ -124,7 +124,7 @@ export interface MsgLockAndSuperfluidDelegateAmino {
   coins: CoinAmino[];
   val_addr: string;
 }
-export interface MsgLockAndSuperfluidDelegateAminoType {
+export interface MsgLockAndSuperfluidDelegateAminoMsg {
   type: "osmosis/lock-and-superfluid-delegate";
   value: MsgLockAndSuperfluidDelegateAmino;
 }
@@ -142,14 +142,14 @@ export interface MsgLockAndSuperfluidDelegateSDKType {
 export interface MsgLockAndSuperfluidDelegateResponse {
   ID: Long;
 }
-export interface MsgLockAndSuperfluidDelegateResponseProtoType {
+export interface MsgLockAndSuperfluidDelegateResponseProtoMsg {
   typeUrl: "/osmosis.superfluid.MsgLockAndSuperfluidDelegateResponse";
   value: Uint8Array;
 }
 export interface MsgLockAndSuperfluidDelegateResponseAmino {
   ID: string;
 }
-export interface MsgLockAndSuperfluidDelegateResponseAminoType {
+export interface MsgLockAndSuperfluidDelegateResponseAminoMsg {
   type: "osmosis/lock-and-superfluid-delegate-response";
   value: MsgLockAndSuperfluidDelegateResponseAmino;
 }
@@ -171,7 +171,7 @@ export interface MsgUnPoolWhitelistedPool {
   sender: string;
   poolId: Long;
 }
-export interface MsgUnPoolWhitelistedPoolProtoType {
+export interface MsgUnPoolWhitelistedPoolProtoMsg {
   typeUrl: "/osmosis.superfluid.MsgUnPoolWhitelistedPool";
   value: Uint8Array;
 }
@@ -190,7 +190,7 @@ export interface MsgUnPoolWhitelistedPoolAmino {
   sender: string;
   pool_id: string;
 }
-export interface MsgUnPoolWhitelistedPoolAminoType {
+export interface MsgUnPoolWhitelistedPoolAminoMsg {
   type: "osmosis/unpool-whitelisted-pool";
   value: MsgUnPoolWhitelistedPoolAmino;
 }
@@ -212,14 +212,14 @@ export interface MsgUnPoolWhitelistedPoolSDKType {
 export interface MsgUnPoolWhitelistedPoolResponse {
   exitedLockIds: Long[];
 }
-export interface MsgUnPoolWhitelistedPoolResponseProtoType {
+export interface MsgUnPoolWhitelistedPoolResponseProtoMsg {
   typeUrl: "/osmosis.superfluid.MsgUnPoolWhitelistedPoolResponse";
   value: Uint8Array;
 }
 export interface MsgUnPoolWhitelistedPoolResponseAmino {
   exited_lock_ids: string[];
 }
-export interface MsgUnPoolWhitelistedPoolResponseAminoType {
+export interface MsgUnPoolWhitelistedPoolResponseAminoMsg {
   type: "osmosis/un-pool-whitelisted-pool-response";
   value: MsgUnPoolWhitelistedPoolResponseAmino;
 }
@@ -236,6 +236,9 @@ function createBaseMsgSuperfluidDelegate(): MsgSuperfluidDelegate {
 }
 
 export const MsgSuperfluidDelegate = {
+  typeUrl: "/osmosis.superfluid.MsgSuperfluidDelegate",
+  aminoType: "osmosis/superfluid-delegate",
+
   encode(message: MsgSuperfluidDelegate, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.sender !== "") {
       writer.uint32(10).string(message.sender);
@@ -336,6 +339,32 @@ export const MsgSuperfluidDelegate = {
     obj.lock_id = message.lockId ? message.lockId.toString() : undefined;
     obj.val_addr = message.valAddr;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgSuperfluidDelegateAminoMsg): MsgSuperfluidDelegate {
+    return MsgSuperfluidDelegate.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgSuperfluidDelegate): MsgSuperfluidDelegateAminoMsg {
+    return {
+      type: "osmosis/superfluid-delegate",
+      value: MsgSuperfluidDelegate.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgSuperfluidDelegateProtoMsg): MsgSuperfluidDelegate {
+    return MsgSuperfluidDelegate.decode(message.value);
+  },
+
+  toProto(message: MsgSuperfluidDelegate): Uint8Array {
+    return MsgSuperfluidDelegate.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgSuperfluidDelegate): MsgSuperfluidDelegateProtoMsg {
+    return {
+      typeUrl: "/osmosis.superfluid.MsgSuperfluidDelegate",
+      value: MsgSuperfluidDelegate.encode(message).finish()
+    };
   }
 
 };
@@ -345,6 +374,9 @@ function createBaseMsgSuperfluidDelegateResponse(): MsgSuperfluidDelegateRespons
 }
 
 export const MsgSuperfluidDelegateResponse = {
+  typeUrl: "/osmosis.superfluid.MsgSuperfluidDelegateResponse",
+  aminoType: "osmosis/superfluid-delegate-response",
+
   encode(_: MsgSuperfluidDelegateResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -397,6 +429,32 @@ export const MsgSuperfluidDelegateResponse = {
   toAmino(_: MsgSuperfluidDelegateResponse): MsgSuperfluidDelegateResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgSuperfluidDelegateResponseAminoMsg): MsgSuperfluidDelegateResponse {
+    return MsgSuperfluidDelegateResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgSuperfluidDelegateResponse): MsgSuperfluidDelegateResponseAminoMsg {
+    return {
+      type: "osmosis/superfluid-delegate-response",
+      value: MsgSuperfluidDelegateResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgSuperfluidDelegateResponseProtoMsg): MsgSuperfluidDelegateResponse {
+    return MsgSuperfluidDelegateResponse.decode(message.value);
+  },
+
+  toProto(message: MsgSuperfluidDelegateResponse): Uint8Array {
+    return MsgSuperfluidDelegateResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgSuperfluidDelegateResponse): MsgSuperfluidDelegateResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.superfluid.MsgSuperfluidDelegateResponse",
+      value: MsgSuperfluidDelegateResponse.encode(message).finish()
+    };
   }
 
 };
@@ -409,6 +467,9 @@ function createBaseMsgSuperfluidUndelegate(): MsgSuperfluidUndelegate {
 }
 
 export const MsgSuperfluidUndelegate = {
+  typeUrl: "/osmosis.superfluid.MsgSuperfluidUndelegate",
+  aminoType: "osmosis/superfluid-undelegate",
+
   encode(message: MsgSuperfluidUndelegate, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.sender !== "") {
       writer.uint32(10).string(message.sender);
@@ -494,6 +555,32 @@ export const MsgSuperfluidUndelegate = {
     obj.sender = message.sender;
     obj.lock_id = message.lockId ? message.lockId.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgSuperfluidUndelegateAminoMsg): MsgSuperfluidUndelegate {
+    return MsgSuperfluidUndelegate.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgSuperfluidUndelegate): MsgSuperfluidUndelegateAminoMsg {
+    return {
+      type: "osmosis/superfluid-undelegate",
+      value: MsgSuperfluidUndelegate.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgSuperfluidUndelegateProtoMsg): MsgSuperfluidUndelegate {
+    return MsgSuperfluidUndelegate.decode(message.value);
+  },
+
+  toProto(message: MsgSuperfluidUndelegate): Uint8Array {
+    return MsgSuperfluidUndelegate.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgSuperfluidUndelegate): MsgSuperfluidUndelegateProtoMsg {
+    return {
+      typeUrl: "/osmosis.superfluid.MsgSuperfluidUndelegate",
+      value: MsgSuperfluidUndelegate.encode(message).finish()
+    };
   }
 
 };
@@ -503,6 +590,9 @@ function createBaseMsgSuperfluidUndelegateResponse(): MsgSuperfluidUndelegateRes
 }
 
 export const MsgSuperfluidUndelegateResponse = {
+  typeUrl: "/osmosis.superfluid.MsgSuperfluidUndelegateResponse",
+  aminoType: "osmosis/superfluid-undelegate-response",
+
   encode(_: MsgSuperfluidUndelegateResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -555,6 +645,32 @@ export const MsgSuperfluidUndelegateResponse = {
   toAmino(_: MsgSuperfluidUndelegateResponse): MsgSuperfluidUndelegateResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgSuperfluidUndelegateResponseAminoMsg): MsgSuperfluidUndelegateResponse {
+    return MsgSuperfluidUndelegateResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgSuperfluidUndelegateResponse): MsgSuperfluidUndelegateResponseAminoMsg {
+    return {
+      type: "osmosis/superfluid-undelegate-response",
+      value: MsgSuperfluidUndelegateResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgSuperfluidUndelegateResponseProtoMsg): MsgSuperfluidUndelegateResponse {
+    return MsgSuperfluidUndelegateResponse.decode(message.value);
+  },
+
+  toProto(message: MsgSuperfluidUndelegateResponse): Uint8Array {
+    return MsgSuperfluidUndelegateResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgSuperfluidUndelegateResponse): MsgSuperfluidUndelegateResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.superfluid.MsgSuperfluidUndelegateResponse",
+      value: MsgSuperfluidUndelegateResponse.encode(message).finish()
+    };
   }
 
 };
@@ -567,6 +683,9 @@ function createBaseMsgSuperfluidUnbondLock(): MsgSuperfluidUnbondLock {
 }
 
 export const MsgSuperfluidUnbondLock = {
+  typeUrl: "/osmosis.superfluid.MsgSuperfluidUnbondLock",
+  aminoType: "osmosis/superfluid-unbond-lock",
+
   encode(message: MsgSuperfluidUnbondLock, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.sender !== "") {
       writer.uint32(10).string(message.sender);
@@ -652,6 +771,32 @@ export const MsgSuperfluidUnbondLock = {
     obj.sender = message.sender;
     obj.lock_id = message.lockId ? message.lockId.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgSuperfluidUnbondLockAminoMsg): MsgSuperfluidUnbondLock {
+    return MsgSuperfluidUnbondLock.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgSuperfluidUnbondLock): MsgSuperfluidUnbondLockAminoMsg {
+    return {
+      type: "osmosis/superfluid-unbond-lock",
+      value: MsgSuperfluidUnbondLock.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgSuperfluidUnbondLockProtoMsg): MsgSuperfluidUnbondLock {
+    return MsgSuperfluidUnbondLock.decode(message.value);
+  },
+
+  toProto(message: MsgSuperfluidUnbondLock): Uint8Array {
+    return MsgSuperfluidUnbondLock.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgSuperfluidUnbondLock): MsgSuperfluidUnbondLockProtoMsg {
+    return {
+      typeUrl: "/osmosis.superfluid.MsgSuperfluidUnbondLock",
+      value: MsgSuperfluidUnbondLock.encode(message).finish()
+    };
   }
 
 };
@@ -661,6 +806,9 @@ function createBaseMsgSuperfluidUnbondLockResponse(): MsgSuperfluidUnbondLockRes
 }
 
 export const MsgSuperfluidUnbondLockResponse = {
+  typeUrl: "/osmosis.superfluid.MsgSuperfluidUnbondLockResponse",
+  aminoType: "osmosis/superfluid-unbond-lock-response",
+
   encode(_: MsgSuperfluidUnbondLockResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -713,6 +861,32 @@ export const MsgSuperfluidUnbondLockResponse = {
   toAmino(_: MsgSuperfluidUnbondLockResponse): MsgSuperfluidUnbondLockResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgSuperfluidUnbondLockResponseAminoMsg): MsgSuperfluidUnbondLockResponse {
+    return MsgSuperfluidUnbondLockResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgSuperfluidUnbondLockResponse): MsgSuperfluidUnbondLockResponseAminoMsg {
+    return {
+      type: "osmosis/superfluid-unbond-lock-response",
+      value: MsgSuperfluidUnbondLockResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgSuperfluidUnbondLockResponseProtoMsg): MsgSuperfluidUnbondLockResponse {
+    return MsgSuperfluidUnbondLockResponse.decode(message.value);
+  },
+
+  toProto(message: MsgSuperfluidUnbondLockResponse): Uint8Array {
+    return MsgSuperfluidUnbondLockResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgSuperfluidUnbondLockResponse): MsgSuperfluidUnbondLockResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.superfluid.MsgSuperfluidUnbondLockResponse",
+      value: MsgSuperfluidUnbondLockResponse.encode(message).finish()
+    };
   }
 
 };
@@ -726,6 +900,9 @@ function createBaseMsgLockAndSuperfluidDelegate(): MsgLockAndSuperfluidDelegate
 }
 
 export const MsgLockAndSuperfluidDelegate = {
+  typeUrl: "/osmosis.superfluid.MsgLockAndSuperfluidDelegate",
+  aminoType: "osmosis/lock-and-superfluid-delegate",
+
   encode(message: MsgLockAndSuperfluidDelegate, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.sender !== "") {
       writer.uint32(10).string(message.sender);
@@ -844,6 +1021,32 @@ export const MsgLockAndSuperfluidDelegate = {
 
     obj.val_addr = message.valAddr;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgLockAndSuperfluidDelegateAminoMsg): MsgLockAndSuperfluidDelegate {
+    return MsgLockAndSuperfluidDelegate.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgLockAndSuperfluidDelegate): MsgLockAndSuperfluidDelegateAminoMsg {
+    return {
+      type: "osmosis/lock-and-superfluid-delegate",
+      value: MsgLockAndSuperfluidDelegate.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgLockAndSuperfluidDelegateProtoMsg): MsgLockAndSuperfluidDelegate {
+    return MsgLockAndSuperfluidDelegate.decode(message.value);
+  },
+
+  toProto(message: MsgLockAndSuperfluidDelegate): Uint8Array {
+    return MsgLockAndSuperfluidDelegate.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgLockAndSuperfluidDelegate): MsgLockAndSuperfluidDelegateProtoMsg {
+    return {
+      typeUrl: "/osmosis.superfluid.MsgLockAndSuperfluidDelegate",
+      value: MsgLockAndSuperfluidDelegate.encode(message).finish()
+    };
   }
 
 };
@@ -855,6 +1058,9 @@ function createBaseMsgLockAndSuperfluidDelegateResponse(): MsgLockAndSuperfluidD
 }
 
 export const MsgLockAndSuperfluidDelegateResponse = {
+  typeUrl: "/osmosis.superfluid.MsgLockAndSuperfluidDelegateResponse",
+  aminoType: "osmosis/lock-and-superfluid-delegate-response",
+
   encode(message: MsgLockAndSuperfluidDelegateResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.ID.isZero()) {
       writer.uint32(8).uint64(message.ID);
@@ -925,6 +1131,32 @@ export const MsgLockAndSuperfluidDelegateResponse = {
     const obj: any = {};
     obj.ID = message.ID ? message.ID.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgLockAndSuperfluidDelegateResponseAminoMsg): MsgLockAndSuperfluidDelegateResponse {
+    return MsgLockAndSuperfluidDelegateResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgLockAndSuperfluidDelegateResponse): MsgLockAndSuperfluidDelegateResponseAminoMsg {
+    return {
+      type: "osmosis/lock-and-superfluid-delegate-response",
+      value: MsgLockAndSuperfluidDelegateResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgLockAndSuperfluidDelegateResponseProtoMsg): MsgLockAndSuperfluidDelegateResponse {
+    return MsgLockAndSuperfluidDelegateResponse.decode(message.value);
+  },
+
+  toProto(message: MsgLockAndSuperfluidDelegateResponse): Uint8Array {
+    return MsgLockAndSuperfluidDelegateResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgLockAndSuperfluidDelegateResponse): MsgLockAndSuperfluidDelegateResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.superfluid.MsgLockAndSuperfluidDelegateResponse",
+      value: MsgLockAndSuperfluidDelegateResponse.encode(message).finish()
+    };
   }
 
 };
@@ -937,6 +1169,9 @@ function createBaseMsgUnPoolWhitelistedPool(): MsgUnPoolWhitelistedPool {
 }
 
 export const MsgUnPoolWhitelistedPool = {
+  typeUrl: "/osmosis.superfluid.MsgUnPoolWhitelistedPool",
+  aminoType: "osmosis/unpool-whitelisted-pool",
+
   encode(message: MsgUnPoolWhitelistedPool, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.sender !== "") {
       writer.uint32(10).string(message.sender);
@@ -1022,6 +1257,32 @@ export const MsgUnPoolWhitelistedPool = {
     obj.sender = message.sender;
     obj.pool_id = message.poolId ? message.poolId.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgUnPoolWhitelistedPoolAminoMsg): MsgUnPoolWhitelistedPool {
+    return MsgUnPoolWhitelistedPool.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgUnPoolWhitelistedPool): MsgUnPoolWhitelistedPoolAminoMsg {
+    return {
+      type: "osmosis/unpool-whitelisted-pool",
+      value: MsgUnPoolWhitelistedPool.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgUnPoolWhitelistedPoolProtoMsg): MsgUnPoolWhitelistedPool {
+    return MsgUnPoolWhitelistedPool.decode(message.value);
+  },
+
+  toProto(message: MsgUnPoolWhitelistedPool): Uint8Array {
+    return MsgUnPoolWhitelistedPool.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgUnPoolWhitelistedPool): MsgUnPoolWhitelistedPoolProtoMsg {
+    return {
+      typeUrl: "/osmosis.superfluid.MsgUnPoolWhitelistedPool",
+      value: MsgUnPoolWhitelistedPool.encode(message).finish()
+    };
   }
 
 };
@@ -1033,6 +1294,9 @@ function createBaseMsgUnPoolWhitelistedPoolResponse(): MsgUnPoolWhitelistedPoolR
 }
 
 export const MsgUnPoolWhitelistedPoolResponse = {
+  typeUrl: "/osmosis.superfluid.MsgUnPoolWhitelistedPoolResponse",
+  aminoType: "osmosis/un-pool-whitelisted-pool-response",
+
   encode(message: MsgUnPoolWhitelistedPoolResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     writer.uint32(10).fork();
 
@@ -1133,6 +1397,32 @@ export const MsgUnPoolWhitelistedPoolResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: MsgUnPoolWhitelistedPoolResponseAminoMsg): MsgUnPoolWhitelistedPoolResponse {
+    return MsgUnPoolWhitelistedPoolResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgUnPoolWhitelistedPoolResponse): MsgUnPoolWhitelistedPoolResponseAminoMsg {
+    return {
+      type: "osmosis/un-pool-whitelisted-pool-response",
+      value: MsgUnPoolWhitelistedPoolResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgUnPoolWhitelistedPoolResponseProtoMsg): MsgUnPoolWhitelistedPoolResponse {
+    return MsgUnPoolWhitelistedPoolResponse.decode(message.value);
+  },
+
+  toProto(message: MsgUnPoolWhitelistedPoolResponse): Uint8Array {
+    return MsgUnPoolWhitelistedPoolResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgUnPoolWhitelistedPoolResponse): MsgUnPoolWhitelistedPoolResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.superfluid.MsgUnPoolWhitelistedPoolResponse",
+      value: MsgUnPoolWhitelistedPoolResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/osmosis/superfluid/v1beta1/gov.ts b/__fixtures__/outputv2/osmosis/superfluid/v1beta1/gov.ts
index fab9ce644..16759165b 100644
--- a/__fixtures__/outputv2/osmosis/superfluid/v1beta1/gov.ts
+++ b/__fixtures__/outputv2/osmosis/superfluid/v1beta1/gov.ts
@@ -12,7 +12,7 @@ export interface SetSuperfluidAssetsProposal {
   description: string;
   assets: SuperfluidAsset[];
 }
-export interface SetSuperfluidAssetsProposalProtoType {
+export interface SetSuperfluidAssetsProposalProtoMsg {
   typeUrl: "/osmosis.superfluid.v1beta1.SetSuperfluidAssetsProposal";
   value: Uint8Array;
 }
@@ -26,7 +26,7 @@ export interface SetSuperfluidAssetsProposalAmino {
   description: string;
   assets: SuperfluidAssetAmino[];
 }
-export interface SetSuperfluidAssetsProposalAminoType {
+export interface SetSuperfluidAssetsProposalAminoMsg {
   type: "osmosis/v1beta1/set-superfluid-assets-proposal";
   value: SetSuperfluidAssetsProposalAmino;
 }
@@ -50,7 +50,7 @@ export interface RemoveSuperfluidAssetsProposal {
   description: string;
   superfluidAssetDenoms: string[];
 }
-export interface RemoveSuperfluidAssetsProposalProtoType {
+export interface RemoveSuperfluidAssetsProposalProtoMsg {
   typeUrl: "/osmosis.superfluid.v1beta1.RemoveSuperfluidAssetsProposal";
   value: Uint8Array;
 }
@@ -64,7 +64,7 @@ export interface RemoveSuperfluidAssetsProposalAmino {
   description: string;
   superfluid_asset_denoms: string[];
 }
-export interface RemoveSuperfluidAssetsProposalAminoType {
+export interface RemoveSuperfluidAssetsProposalAminoMsg {
   type: "osmosis/v1beta1/remove-superfluid-assets-proposal";
   value: RemoveSuperfluidAssetsProposalAmino;
 }
@@ -89,7 +89,7 @@ export interface UpdateUnpoolWhiteListProposal {
   ids: Long[];
   isOverwrite: boolean;
 }
-export interface UpdateUnpoolWhiteListProposalProtoType {
+export interface UpdateUnpoolWhiteListProposalProtoMsg {
   typeUrl: "/osmosis.superfluid.v1beta1.UpdateUnpoolWhiteListProposal";
   value: Uint8Array;
 }
@@ -104,7 +104,7 @@ export interface UpdateUnpoolWhiteListProposalAmino {
   ids: string[];
   is_overwrite: boolean;
 }
-export interface UpdateUnpoolWhiteListProposalAminoType {
+export interface UpdateUnpoolWhiteListProposalAminoMsg {
   type: "osmosis/v1beta1/update-unpool-white-list-proposal";
   value: UpdateUnpoolWhiteListProposalAmino;
 }
@@ -129,6 +129,9 @@ function createBaseSetSuperfluidAssetsProposal(): SetSuperfluidAssetsProposal {
 }
 
 export const SetSuperfluidAssetsProposal = {
+  typeUrl: "/osmosis.superfluid.v1beta1.SetSuperfluidAssetsProposal",
+  aminoType: "osmosis/v1beta1/set-superfluid-assets-proposal",
+
   encode(message: SetSuperfluidAssetsProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.title !== "") {
       writer.uint32(10).string(message.title);
@@ -247,6 +250,32 @@ export const SetSuperfluidAssetsProposal = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: SetSuperfluidAssetsProposalAminoMsg): SetSuperfluidAssetsProposal {
+    return SetSuperfluidAssetsProposal.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: SetSuperfluidAssetsProposal): SetSuperfluidAssetsProposalAminoMsg {
+    return {
+      type: "osmosis/v1beta1/set-superfluid-assets-proposal",
+      value: SetSuperfluidAssetsProposal.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: SetSuperfluidAssetsProposalProtoMsg): SetSuperfluidAssetsProposal {
+    return SetSuperfluidAssetsProposal.decode(message.value);
+  },
+
+  toProto(message: SetSuperfluidAssetsProposal): Uint8Array {
+    return SetSuperfluidAssetsProposal.encode(message).finish();
+  },
+
+  toProtoMsg(message: SetSuperfluidAssetsProposal): SetSuperfluidAssetsProposalProtoMsg {
+    return {
+      typeUrl: "/osmosis.superfluid.v1beta1.SetSuperfluidAssetsProposal",
+      value: SetSuperfluidAssetsProposal.encode(message).finish()
+    };
   }
 
 };
@@ -260,6 +289,9 @@ function createBaseRemoveSuperfluidAssetsProposal(): RemoveSuperfluidAssetsPropo
 }
 
 export const RemoveSuperfluidAssetsProposal = {
+  typeUrl: "/osmosis.superfluid.v1beta1.RemoveSuperfluidAssetsProposal",
+  aminoType: "osmosis/v1beta1/remove-superfluid-assets-proposal",
+
   encode(message: RemoveSuperfluidAssetsProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.title !== "") {
       writer.uint32(10).string(message.title);
@@ -378,6 +410,32 @@ export const RemoveSuperfluidAssetsProposal = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: RemoveSuperfluidAssetsProposalAminoMsg): RemoveSuperfluidAssetsProposal {
+    return RemoveSuperfluidAssetsProposal.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: RemoveSuperfluidAssetsProposal): RemoveSuperfluidAssetsProposalAminoMsg {
+    return {
+      type: "osmosis/v1beta1/remove-superfluid-assets-proposal",
+      value: RemoveSuperfluidAssetsProposal.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: RemoveSuperfluidAssetsProposalProtoMsg): RemoveSuperfluidAssetsProposal {
+    return RemoveSuperfluidAssetsProposal.decode(message.value);
+  },
+
+  toProto(message: RemoveSuperfluidAssetsProposal): Uint8Array {
+    return RemoveSuperfluidAssetsProposal.encode(message).finish();
+  },
+
+  toProtoMsg(message: RemoveSuperfluidAssetsProposal): RemoveSuperfluidAssetsProposalProtoMsg {
+    return {
+      typeUrl: "/osmosis.superfluid.v1beta1.RemoveSuperfluidAssetsProposal",
+      value: RemoveSuperfluidAssetsProposal.encode(message).finish()
+    };
   }
 
 };
@@ -392,6 +450,9 @@ function createBaseUpdateUnpoolWhiteListProposal(): UpdateUnpoolWhiteListProposa
 }
 
 export const UpdateUnpoolWhiteListProposal = {
+  typeUrl: "/osmosis.superfluid.v1beta1.UpdateUnpoolWhiteListProposal",
+  aminoType: "osmosis/v1beta1/update-unpool-white-list-proposal",
+
   encode(message: UpdateUnpoolWhiteListProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.title !== "") {
       writer.uint32(10).string(message.title);
@@ -538,6 +599,32 @@ export const UpdateUnpoolWhiteListProposal = {
 
     obj.is_overwrite = message.isOverwrite;
     return obj;
+  },
+
+  fromAminoMsg(object: UpdateUnpoolWhiteListProposalAminoMsg): UpdateUnpoolWhiteListProposal {
+    return UpdateUnpoolWhiteListProposal.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: UpdateUnpoolWhiteListProposal): UpdateUnpoolWhiteListProposalAminoMsg {
+    return {
+      type: "osmosis/v1beta1/update-unpool-white-list-proposal",
+      value: UpdateUnpoolWhiteListProposal.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: UpdateUnpoolWhiteListProposalProtoMsg): UpdateUnpoolWhiteListProposal {
+    return UpdateUnpoolWhiteListProposal.decode(message.value);
+  },
+
+  toProto(message: UpdateUnpoolWhiteListProposal): Uint8Array {
+    return UpdateUnpoolWhiteListProposal.encode(message).finish();
+  },
+
+  toProtoMsg(message: UpdateUnpoolWhiteListProposal): UpdateUnpoolWhiteListProposalProtoMsg {
+    return {
+      typeUrl: "/osmosis.superfluid.v1beta1.UpdateUnpoolWhiteListProposal",
+      value: UpdateUnpoolWhiteListProposal.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/osmosis/tokenfactory/v1beta1/authorityMetadata.ts b/__fixtures__/outputv2/osmosis/tokenfactory/v1beta1/authorityMetadata.ts
index 5ff7842e4..d90412dc4 100644
--- a/__fixtures__/outputv2/osmosis/tokenfactory/v1beta1/authorityMetadata.ts
+++ b/__fixtures__/outputv2/osmosis/tokenfactory/v1beta1/authorityMetadata.ts
@@ -11,7 +11,7 @@ export interface DenomAuthorityMetadata {
   /** Can be empty for no admin, or a valid osmosis address */
   admin: string;
 }
-export interface DenomAuthorityMetadataProtoType {
+export interface DenomAuthorityMetadataProtoMsg {
   typeUrl: "/osmosis.tokenfactory.v1beta1.DenomAuthorityMetadata";
   value: Uint8Array;
 }
@@ -25,7 +25,7 @@ export interface DenomAuthorityMetadataAmino {
   /** Can be empty for no admin, or a valid osmosis address */
   admin: string;
 }
-export interface DenomAuthorityMetadataAminoType {
+export interface DenomAuthorityMetadataAminoMsg {
   type: "osmosis/tokenfactory/denom-authority-metadata";
   value: DenomAuthorityMetadataAmino;
 }
@@ -46,6 +46,9 @@ function createBaseDenomAuthorityMetadata(): DenomAuthorityMetadata {
 }
 
 export const DenomAuthorityMetadata = {
+  typeUrl: "/osmosis.tokenfactory.v1beta1.DenomAuthorityMetadata",
+  aminoType: "osmosis/tokenfactory/denom-authority-metadata",
+
   encode(message: DenomAuthorityMetadata, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.admin !== "") {
       writer.uint32(10).string(message.admin);
@@ -116,6 +119,32 @@ export const DenomAuthorityMetadata = {
     const obj: any = {};
     obj.admin = message.admin;
     return obj;
+  },
+
+  fromAminoMsg(object: DenomAuthorityMetadataAminoMsg): DenomAuthorityMetadata {
+    return DenomAuthorityMetadata.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: DenomAuthorityMetadata): DenomAuthorityMetadataAminoMsg {
+    return {
+      type: "osmosis/tokenfactory/denom-authority-metadata",
+      value: DenomAuthorityMetadata.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: DenomAuthorityMetadataProtoMsg): DenomAuthorityMetadata {
+    return DenomAuthorityMetadata.decode(message.value);
+  },
+
+  toProto(message: DenomAuthorityMetadata): Uint8Array {
+    return DenomAuthorityMetadata.encode(message).finish();
+  },
+
+  toProtoMsg(message: DenomAuthorityMetadata): DenomAuthorityMetadataProtoMsg {
+    return {
+      typeUrl: "/osmosis.tokenfactory.v1beta1.DenomAuthorityMetadata",
+      value: DenomAuthorityMetadata.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/osmosis/tokenfactory/v1beta1/genesis.ts b/__fixtures__/outputv2/osmosis/tokenfactory/v1beta1/genesis.ts
index a068b0963..df214640d 100644
--- a/__fixtures__/outputv2/osmosis/tokenfactory/v1beta1/genesis.ts
+++ b/__fixtures__/outputv2/osmosis/tokenfactory/v1beta1/genesis.ts
@@ -10,7 +10,7 @@ export interface GenesisState {
   params?: Params;
   factoryDenoms: GenesisDenom[];
 }
-export interface GenesisStateProtoType {
+export interface GenesisStateProtoMsg {
   typeUrl: "/osmosis.tokenfactory.v1beta1.GenesisState";
   value: Uint8Array;
 }
@@ -21,7 +21,7 @@ export interface GenesisStateAmino {
   params?: ParamsAmino;
   factory_denoms: GenesisDenomAmino[];
 }
-export interface GenesisStateAminoType {
+export interface GenesisStateAminoMsg {
   type: "osmosis/tokenfactory/genesis-state";
   value: GenesisStateAmino;
 }
@@ -41,7 +41,7 @@ export interface GenesisDenom {
   denom: string;
   authorityMetadata?: DenomAuthorityMetadata;
 }
-export interface GenesisDenomProtoType {
+export interface GenesisDenomProtoMsg {
   typeUrl: "/osmosis.tokenfactory.v1beta1.GenesisDenom";
   value: Uint8Array;
 }
@@ -55,7 +55,7 @@ export interface GenesisDenomAmino {
   denom: string;
   authority_metadata?: DenomAuthorityMetadataAmino;
 }
-export interface GenesisDenomAminoType {
+export interface GenesisDenomAminoMsg {
   type: "osmosis/tokenfactory/genesis-denom";
   value: GenesisDenomAmino;
 }
@@ -78,6 +78,9 @@ function createBaseGenesisState(): GenesisState {
 }
 
 export const GenesisState = {
+  typeUrl: "/osmosis.tokenfactory.v1beta1.GenesisState",
+  aminoType: "osmosis/tokenfactory/genesis-state",
+
   encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.params !== undefined) {
       Params.encode(message.params, writer.uint32(10).fork()).ldelim();
@@ -181,6 +184,32 @@ export const GenesisState = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisStateAminoMsg): GenesisState {
+    return GenesisState.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GenesisState): GenesisStateAminoMsg {
+    return {
+      type: "osmosis/tokenfactory/genesis-state",
+      value: GenesisState.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GenesisStateProtoMsg): GenesisState {
+    return GenesisState.decode(message.value);
+  },
+
+  toProto(message: GenesisState): Uint8Array {
+    return GenesisState.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisState): GenesisStateProtoMsg {
+    return {
+      typeUrl: "/osmosis.tokenfactory.v1beta1.GenesisState",
+      value: GenesisState.encode(message).finish()
+    };
   }
 
 };
@@ -193,6 +222,9 @@ function createBaseGenesisDenom(): GenesisDenom {
 }
 
 export const GenesisDenom = {
+  typeUrl: "/osmosis.tokenfactory.v1beta1.GenesisDenom",
+  aminoType: "osmosis/tokenfactory/genesis-denom",
+
   encode(message: GenesisDenom, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.denom !== "") {
       writer.uint32(10).string(message.denom);
@@ -278,6 +310,32 @@ export const GenesisDenom = {
     obj.denom = message.denom;
     obj.authority_metadata = message.authorityMetadata ? DenomAuthorityMetadata.toAmino(message.authorityMetadata) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisDenomAminoMsg): GenesisDenom {
+    return GenesisDenom.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GenesisDenom): GenesisDenomAminoMsg {
+    return {
+      type: "osmosis/tokenfactory/genesis-denom",
+      value: GenesisDenom.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GenesisDenomProtoMsg): GenesisDenom {
+    return GenesisDenom.decode(message.value);
+  },
+
+  toProto(message: GenesisDenom): Uint8Array {
+    return GenesisDenom.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisDenom): GenesisDenomProtoMsg {
+    return {
+      typeUrl: "/osmosis.tokenfactory.v1beta1.GenesisDenom",
+      value: GenesisDenom.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/osmosis/tokenfactory/v1beta1/params.ts b/__fixtures__/outputv2/osmosis/tokenfactory/v1beta1/params.ts
index 3fc75e539..dce4b7606 100644
--- a/__fixtures__/outputv2/osmosis/tokenfactory/v1beta1/params.ts
+++ b/__fixtures__/outputv2/osmosis/tokenfactory/v1beta1/params.ts
@@ -7,7 +7,7 @@ export const protobufPackage = "osmosis.tokenfactory.v1beta1";
 export interface Params {
   denomCreationFee: Coin[];
 }
-export interface ParamsProtoType {
+export interface ParamsProtoMsg {
   typeUrl: "/osmosis.tokenfactory.v1beta1.Params";
   value: Uint8Array;
 }
@@ -16,7 +16,7 @@ export interface ParamsProtoType {
 export interface ParamsAmino {
   denom_creation_fee: CoinAmino[];
 }
-export interface ParamsAminoType {
+export interface ParamsAminoMsg {
   type: "osmosis/tokenfactory/params";
   value: ParamsAmino;
 }
@@ -33,6 +33,9 @@ function createBaseParams(): Params {
 }
 
 export const Params = {
+  typeUrl: "/osmosis.tokenfactory.v1beta1.Params",
+  aminoType: "osmosis/tokenfactory/params",
+
   encode(message: Params, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.denomCreationFee) {
       Coin.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -121,6 +124,32 @@ export const Params = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ParamsAminoMsg): Params {
+    return Params.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Params): ParamsAminoMsg {
+    return {
+      type: "osmosis/tokenfactory/params",
+      value: Params.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ParamsProtoMsg): Params {
+    return Params.decode(message.value);
+  },
+
+  toProto(message: Params): Uint8Array {
+    return Params.encode(message).finish();
+  },
+
+  toProtoMsg(message: Params): ParamsProtoMsg {
+    return {
+      typeUrl: "/osmosis.tokenfactory.v1beta1.Params",
+      value: Params.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/osmosis/tokenfactory/v1beta1/query.ts b/__fixtures__/outputv2/osmosis/tokenfactory/v1beta1/query.ts
index 0a6857878..e78a079df 100644
--- a/__fixtures__/outputv2/osmosis/tokenfactory/v1beta1/query.ts
+++ b/__fixtures__/outputv2/osmosis/tokenfactory/v1beta1/query.ts
@@ -6,14 +6,14 @@ export const protobufPackage = "osmosis.tokenfactory.v1beta1";
 
 /** QueryParamsRequest is the request type for the Query/Params RPC method. */
 export interface QueryParamsRequest {}
-export interface QueryParamsRequestProtoType {
+export interface QueryParamsRequestProtoMsg {
   typeUrl: "/osmosis.tokenfactory.v1beta1.QueryParamsRequest";
   value: Uint8Array;
 }
 
 /** QueryParamsRequest is the request type for the Query/Params RPC method. */
 export interface QueryParamsRequestAmino {}
-export interface QueryParamsRequestAminoType {
+export interface QueryParamsRequestAminoMsg {
   type: "osmosis/tokenfactory/query-params-request";
   value: QueryParamsRequestAmino;
 }
@@ -26,7 +26,7 @@ export interface QueryParamsResponse {
   /** params defines the parameters of the module. */
   params?: Params;
 }
-export interface QueryParamsResponseProtoType {
+export interface QueryParamsResponseProtoMsg {
   typeUrl: "/osmosis.tokenfactory.v1beta1.QueryParamsResponse";
   value: Uint8Array;
 }
@@ -36,7 +36,7 @@ export interface QueryParamsResponseAmino {
   /** params defines the parameters of the module. */
   params?: ParamsAmino;
 }
-export interface QueryParamsResponseAminoType {
+export interface QueryParamsResponseAminoMsg {
   type: "osmosis/tokenfactory/query-params-response";
   value: QueryParamsResponseAmino;
 }
@@ -53,7 +53,7 @@ export interface QueryParamsResponseSDKType {
 export interface QueryDenomAuthorityMetadataRequest {
   denom: string;
 }
-export interface QueryDenomAuthorityMetadataRequestProtoType {
+export interface QueryDenomAuthorityMetadataRequestProtoMsg {
   typeUrl: "/osmosis.tokenfactory.v1beta1.QueryDenomAuthorityMetadataRequest";
   value: Uint8Array;
 }
@@ -65,7 +65,7 @@ export interface QueryDenomAuthorityMetadataRequestProtoType {
 export interface QueryDenomAuthorityMetadataRequestAmino {
   denom: string;
 }
-export interface QueryDenomAuthorityMetadataRequestAminoType {
+export interface QueryDenomAuthorityMetadataRequestAminoMsg {
   type: "osmosis/tokenfactory/query-denom-authority-metadata-request";
   value: QueryDenomAuthorityMetadataRequestAmino;
 }
@@ -85,7 +85,7 @@ export interface QueryDenomAuthorityMetadataRequestSDKType {
 export interface QueryDenomAuthorityMetadataResponse {
   authorityMetadata?: DenomAuthorityMetadata;
 }
-export interface QueryDenomAuthorityMetadataResponseProtoType {
+export interface QueryDenomAuthorityMetadataResponseProtoMsg {
   typeUrl: "/osmosis.tokenfactory.v1beta1.QueryDenomAuthorityMetadataResponse";
   value: Uint8Array;
 }
@@ -97,7 +97,7 @@ export interface QueryDenomAuthorityMetadataResponseProtoType {
 export interface QueryDenomAuthorityMetadataResponseAmino {
   authority_metadata?: DenomAuthorityMetadataAmino;
 }
-export interface QueryDenomAuthorityMetadataResponseAminoType {
+export interface QueryDenomAuthorityMetadataResponseAminoMsg {
   type: "osmosis/tokenfactory/query-denom-authority-metadata-response";
   value: QueryDenomAuthorityMetadataResponseAmino;
 }
@@ -117,7 +117,7 @@ export interface QueryDenomAuthorityMetadataResponseSDKType {
 export interface QueryDenomsFromCreatorRequest {
   creator: string;
 }
-export interface QueryDenomsFromCreatorRequestProtoType {
+export interface QueryDenomsFromCreatorRequestProtoMsg {
   typeUrl: "/osmosis.tokenfactory.v1beta1.QueryDenomsFromCreatorRequest";
   value: Uint8Array;
 }
@@ -129,7 +129,7 @@ export interface QueryDenomsFromCreatorRequestProtoType {
 export interface QueryDenomsFromCreatorRequestAmino {
   creator: string;
 }
-export interface QueryDenomsFromCreatorRequestAminoType {
+export interface QueryDenomsFromCreatorRequestAminoMsg {
   type: "osmosis/tokenfactory/query-denoms-from-creator-request";
   value: QueryDenomsFromCreatorRequestAmino;
 }
@@ -149,7 +149,7 @@ export interface QueryDenomsFromCreatorRequestSDKType {
 export interface QueryDenomsFromCreatorResponse {
   denoms: string[];
 }
-export interface QueryDenomsFromCreatorResponseProtoType {
+export interface QueryDenomsFromCreatorResponseProtoMsg {
   typeUrl: "/osmosis.tokenfactory.v1beta1.QueryDenomsFromCreatorResponse";
   value: Uint8Array;
 }
@@ -161,7 +161,7 @@ export interface QueryDenomsFromCreatorResponseProtoType {
 export interface QueryDenomsFromCreatorResponseAmino {
   denoms: string[];
 }
-export interface QueryDenomsFromCreatorResponseAminoType {
+export interface QueryDenomsFromCreatorResponseAminoMsg {
   type: "osmosis/tokenfactory/query-denoms-from-creator-response";
   value: QueryDenomsFromCreatorResponseAmino;
 }
@@ -179,6 +179,9 @@ function createBaseQueryParamsRequest(): QueryParamsRequest {
 }
 
 export const QueryParamsRequest = {
+  typeUrl: "/osmosis.tokenfactory.v1beta1.QueryParamsRequest",
+  aminoType: "osmosis/tokenfactory/query-params-request",
+
   encode(_: QueryParamsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -231,6 +234,32 @@ export const QueryParamsRequest = {
   toAmino(_: QueryParamsRequest): QueryParamsRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest {
+    return QueryParamsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryParamsRequest): QueryParamsRequestAminoMsg {
+    return {
+      type: "osmosis/tokenfactory/query-params-request",
+      value: QueryParamsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryParamsRequestProtoMsg): QueryParamsRequest {
+    return QueryParamsRequest.decode(message.value);
+  },
+
+  toProto(message: QueryParamsRequest): Uint8Array {
+    return QueryParamsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryParamsRequest): QueryParamsRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.tokenfactory.v1beta1.QueryParamsRequest",
+      value: QueryParamsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -242,6 +271,9 @@ function createBaseQueryParamsResponse(): QueryParamsResponse {
 }
 
 export const QueryParamsResponse = {
+  typeUrl: "/osmosis.tokenfactory.v1beta1.QueryParamsResponse",
+  aminoType: "osmosis/tokenfactory/query-params-response",
+
   encode(message: QueryParamsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.params !== undefined) {
       Params.encode(message.params, writer.uint32(10).fork()).ldelim();
@@ -312,6 +344,32 @@ export const QueryParamsResponse = {
     const obj: any = {};
     obj.params = message.params ? Params.toAmino(message.params) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryParamsResponseAminoMsg): QueryParamsResponse {
+    return QueryParamsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryParamsResponse): QueryParamsResponseAminoMsg {
+    return {
+      type: "osmosis/tokenfactory/query-params-response",
+      value: QueryParamsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryParamsResponseProtoMsg): QueryParamsResponse {
+    return QueryParamsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryParamsResponse): Uint8Array {
+    return QueryParamsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryParamsResponse): QueryParamsResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.tokenfactory.v1beta1.QueryParamsResponse",
+      value: QueryParamsResponse.encode(message).finish()
+    };
   }
 
 };
@@ -323,6 +381,9 @@ function createBaseQueryDenomAuthorityMetadataRequest(): QueryDenomAuthorityMeta
 }
 
 export const QueryDenomAuthorityMetadataRequest = {
+  typeUrl: "/osmosis.tokenfactory.v1beta1.QueryDenomAuthorityMetadataRequest",
+  aminoType: "osmosis/tokenfactory/query-denom-authority-metadata-request",
+
   encode(message: QueryDenomAuthorityMetadataRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.denom !== "") {
       writer.uint32(10).string(message.denom);
@@ -393,6 +454,32 @@ export const QueryDenomAuthorityMetadataRequest = {
     const obj: any = {};
     obj.denom = message.denom;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDenomAuthorityMetadataRequestAminoMsg): QueryDenomAuthorityMetadataRequest {
+    return QueryDenomAuthorityMetadataRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryDenomAuthorityMetadataRequest): QueryDenomAuthorityMetadataRequestAminoMsg {
+    return {
+      type: "osmosis/tokenfactory/query-denom-authority-metadata-request",
+      value: QueryDenomAuthorityMetadataRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryDenomAuthorityMetadataRequestProtoMsg): QueryDenomAuthorityMetadataRequest {
+    return QueryDenomAuthorityMetadataRequest.decode(message.value);
+  },
+
+  toProto(message: QueryDenomAuthorityMetadataRequest): Uint8Array {
+    return QueryDenomAuthorityMetadataRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDenomAuthorityMetadataRequest): QueryDenomAuthorityMetadataRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.tokenfactory.v1beta1.QueryDenomAuthorityMetadataRequest",
+      value: QueryDenomAuthorityMetadataRequest.encode(message).finish()
+    };
   }
 
 };
@@ -404,6 +491,9 @@ function createBaseQueryDenomAuthorityMetadataResponse(): QueryDenomAuthorityMet
 }
 
 export const QueryDenomAuthorityMetadataResponse = {
+  typeUrl: "/osmosis.tokenfactory.v1beta1.QueryDenomAuthorityMetadataResponse",
+  aminoType: "osmosis/tokenfactory/query-denom-authority-metadata-response",
+
   encode(message: QueryDenomAuthorityMetadataResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.authorityMetadata !== undefined) {
       DenomAuthorityMetadata.encode(message.authorityMetadata, writer.uint32(10).fork()).ldelim();
@@ -474,6 +564,32 @@ export const QueryDenomAuthorityMetadataResponse = {
     const obj: any = {};
     obj.authority_metadata = message.authorityMetadata ? DenomAuthorityMetadata.toAmino(message.authorityMetadata) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDenomAuthorityMetadataResponseAminoMsg): QueryDenomAuthorityMetadataResponse {
+    return QueryDenomAuthorityMetadataResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryDenomAuthorityMetadataResponse): QueryDenomAuthorityMetadataResponseAminoMsg {
+    return {
+      type: "osmosis/tokenfactory/query-denom-authority-metadata-response",
+      value: QueryDenomAuthorityMetadataResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryDenomAuthorityMetadataResponseProtoMsg): QueryDenomAuthorityMetadataResponse {
+    return QueryDenomAuthorityMetadataResponse.decode(message.value);
+  },
+
+  toProto(message: QueryDenomAuthorityMetadataResponse): Uint8Array {
+    return QueryDenomAuthorityMetadataResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDenomAuthorityMetadataResponse): QueryDenomAuthorityMetadataResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.tokenfactory.v1beta1.QueryDenomAuthorityMetadataResponse",
+      value: QueryDenomAuthorityMetadataResponse.encode(message).finish()
+    };
   }
 
 };
@@ -485,6 +601,9 @@ function createBaseQueryDenomsFromCreatorRequest(): QueryDenomsFromCreatorReques
 }
 
 export const QueryDenomsFromCreatorRequest = {
+  typeUrl: "/osmosis.tokenfactory.v1beta1.QueryDenomsFromCreatorRequest",
+  aminoType: "osmosis/tokenfactory/query-denoms-from-creator-request",
+
   encode(message: QueryDenomsFromCreatorRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.creator !== "") {
       writer.uint32(10).string(message.creator);
@@ -555,6 +674,32 @@ export const QueryDenomsFromCreatorRequest = {
     const obj: any = {};
     obj.creator = message.creator;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDenomsFromCreatorRequestAminoMsg): QueryDenomsFromCreatorRequest {
+    return QueryDenomsFromCreatorRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryDenomsFromCreatorRequest): QueryDenomsFromCreatorRequestAminoMsg {
+    return {
+      type: "osmosis/tokenfactory/query-denoms-from-creator-request",
+      value: QueryDenomsFromCreatorRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryDenomsFromCreatorRequestProtoMsg): QueryDenomsFromCreatorRequest {
+    return QueryDenomsFromCreatorRequest.decode(message.value);
+  },
+
+  toProto(message: QueryDenomsFromCreatorRequest): Uint8Array {
+    return QueryDenomsFromCreatorRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDenomsFromCreatorRequest): QueryDenomsFromCreatorRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.tokenfactory.v1beta1.QueryDenomsFromCreatorRequest",
+      value: QueryDenomsFromCreatorRequest.encode(message).finish()
+    };
   }
 
 };
@@ -566,6 +711,9 @@ function createBaseQueryDenomsFromCreatorResponse(): QueryDenomsFromCreatorRespo
 }
 
 export const QueryDenomsFromCreatorResponse = {
+  typeUrl: "/osmosis.tokenfactory.v1beta1.QueryDenomsFromCreatorResponse",
+  aminoType: "osmosis/tokenfactory/query-denoms-from-creator-response",
+
   encode(message: QueryDenomsFromCreatorResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.denoms) {
       writer.uint32(10).string(v!);
@@ -654,6 +802,32 @@ export const QueryDenomsFromCreatorResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDenomsFromCreatorResponseAminoMsg): QueryDenomsFromCreatorResponse {
+    return QueryDenomsFromCreatorResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryDenomsFromCreatorResponse): QueryDenomsFromCreatorResponseAminoMsg {
+    return {
+      type: "osmosis/tokenfactory/query-denoms-from-creator-response",
+      value: QueryDenomsFromCreatorResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryDenomsFromCreatorResponseProtoMsg): QueryDenomsFromCreatorResponse {
+    return QueryDenomsFromCreatorResponse.decode(message.value);
+  },
+
+  toProto(message: QueryDenomsFromCreatorResponse): Uint8Array {
+    return QueryDenomsFromCreatorResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDenomsFromCreatorResponse): QueryDenomsFromCreatorResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.tokenfactory.v1beta1.QueryDenomsFromCreatorResponse",
+      value: QueryDenomsFromCreatorResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/osmosis/tokenfactory/v1beta1/tx.ts b/__fixtures__/outputv2/osmosis/tokenfactory/v1beta1/tx.ts
index 0bec6142b..606214f50 100644
--- a/__fixtures__/outputv2/osmosis/tokenfactory/v1beta1/tx.ts
+++ b/__fixtures__/outputv2/osmosis/tokenfactory/v1beta1/tx.ts
@@ -21,7 +21,7 @@ export interface MsgCreateDenom {
   /** subdenom can be up to 44 "alphanumeric" characters long. */
   subdenom: string;
 }
-export interface MsgCreateDenomProtoType {
+export interface MsgCreateDenomProtoMsg {
   typeUrl: "/osmosis.tokenfactory.v1beta1.MsgCreateDenom";
   value: Uint8Array;
 }
@@ -43,7 +43,7 @@ export interface MsgCreateDenomAmino {
   /** subdenom can be up to 44 "alphanumeric" characters long. */
   subdenom: string;
 }
-export interface MsgCreateDenomAminoType {
+export interface MsgCreateDenomAminoMsg {
   type: "osmosis/tokenfactory/create-denom";
   value: MsgCreateDenomAmino;
 }
@@ -71,7 +71,7 @@ export interface MsgCreateDenomSDKType {
 export interface MsgCreateDenomResponse {
   newTokenDenom: string;
 }
-export interface MsgCreateDenomResponseProtoType {
+export interface MsgCreateDenomResponseProtoMsg {
   typeUrl: "/osmosis.tokenfactory.v1beta1.MsgCreateDenomResponse";
   value: Uint8Array;
 }
@@ -83,7 +83,7 @@ export interface MsgCreateDenomResponseProtoType {
 export interface MsgCreateDenomResponseAmino {
   new_token_denom: string;
 }
-export interface MsgCreateDenomResponseAminoType {
+export interface MsgCreateDenomResponseAminoMsg {
   type: "osmosis/tokenfactory/create-denom-response";
   value: MsgCreateDenomResponseAmino;
 }
@@ -104,7 +104,7 @@ export interface MsgMint {
   sender: string;
   amount?: Coin;
 }
-export interface MsgMintProtoType {
+export interface MsgMintProtoMsg {
   typeUrl: "/osmosis.tokenfactory.v1beta1.MsgMint";
   value: Uint8Array;
 }
@@ -117,7 +117,7 @@ export interface MsgMintAmino {
   sender: string;
   amount?: CoinAmino;
 }
-export interface MsgMintAminoType {
+export interface MsgMintAminoMsg {
   type: "osmosis/tokenfactory/mint";
   value: MsgMintAmino;
 }
@@ -131,12 +131,12 @@ export interface MsgMintSDKType {
   amount?: CoinSDKType;
 }
 export interface MsgMintResponse {}
-export interface MsgMintResponseProtoType {
+export interface MsgMintResponseProtoMsg {
   typeUrl: "/osmosis.tokenfactory.v1beta1.MsgMintResponse";
   value: Uint8Array;
 }
 export interface MsgMintResponseAmino {}
-export interface MsgMintResponseAminoType {
+export interface MsgMintResponseAminoMsg {
   type: "osmosis/tokenfactory/mint-response";
   value: MsgMintResponseAmino;
 }
@@ -150,7 +150,7 @@ export interface MsgBurn {
   sender: string;
   amount?: Coin;
 }
-export interface MsgBurnProtoType {
+export interface MsgBurnProtoMsg {
   typeUrl: "/osmosis.tokenfactory.v1beta1.MsgBurn";
   value: Uint8Array;
 }
@@ -163,7 +163,7 @@ export interface MsgBurnAmino {
   sender: string;
   amount?: CoinAmino;
 }
-export interface MsgBurnAminoType {
+export interface MsgBurnAminoMsg {
   type: "osmosis/tokenfactory/burn";
   value: MsgBurnAmino;
 }
@@ -177,12 +177,12 @@ export interface MsgBurnSDKType {
   amount?: CoinSDKType;
 }
 export interface MsgBurnResponse {}
-export interface MsgBurnResponseProtoType {
+export interface MsgBurnResponseProtoMsg {
   typeUrl: "/osmosis.tokenfactory.v1beta1.MsgBurnResponse";
   value: Uint8Array;
 }
 export interface MsgBurnResponseAmino {}
-export interface MsgBurnResponseAminoType {
+export interface MsgBurnResponseAminoMsg {
   type: "osmosis/tokenfactory/burn-response";
   value: MsgBurnResponseAmino;
 }
@@ -197,7 +197,7 @@ export interface MsgChangeAdmin {
   denom: string;
   newAdmin: string;
 }
-export interface MsgChangeAdminProtoType {
+export interface MsgChangeAdminProtoMsg {
   typeUrl: "/osmosis.tokenfactory.v1beta1.MsgChangeAdmin";
   value: Uint8Array;
 }
@@ -211,7 +211,7 @@ export interface MsgChangeAdminAmino {
   denom: string;
   new_admin: string;
 }
-export interface MsgChangeAdminAminoType {
+export interface MsgChangeAdminAminoMsg {
   type: "osmosis/tokenfactory/change-admin";
   value: MsgChangeAdminAmino;
 }
@@ -231,7 +231,7 @@ export interface MsgChangeAdminSDKType {
  * MsgChangeAdmin message.
  */
 export interface MsgChangeAdminResponse {}
-export interface MsgChangeAdminResponseProtoType {
+export interface MsgChangeAdminResponseProtoMsg {
   typeUrl: "/osmosis.tokenfactory.v1beta1.MsgChangeAdminResponse";
   value: Uint8Array;
 }
@@ -241,7 +241,7 @@ export interface MsgChangeAdminResponseProtoType {
  * MsgChangeAdmin message.
  */
 export interface MsgChangeAdminResponseAmino {}
-export interface MsgChangeAdminResponseAminoType {
+export interface MsgChangeAdminResponseAminoMsg {
   type: "osmosis/tokenfactory/change-admin-response";
   value: MsgChangeAdminResponseAmino;
 }
@@ -260,7 +260,7 @@ export interface MsgSetDenomMetadata {
   sender: string;
   metadata?: Metadata;
 }
-export interface MsgSetDenomMetadataProtoType {
+export interface MsgSetDenomMetadataProtoMsg {
   typeUrl: "/osmosis.tokenfactory.v1beta1.MsgSetDenomMetadata";
   value: Uint8Array;
 }
@@ -273,7 +273,7 @@ export interface MsgSetDenomMetadataAmino {
   sender: string;
   metadata?: MetadataAmino;
 }
-export interface MsgSetDenomMetadataAminoType {
+export interface MsgSetDenomMetadataAminoMsg {
   type: "osmosis/tokenfactory/set-denom-metadata";
   value: MsgSetDenomMetadataAmino;
 }
@@ -292,7 +292,7 @@ export interface MsgSetDenomMetadataSDKType {
  * MsgSetDenomMetadata message.
  */
 export interface MsgSetDenomMetadataResponse {}
-export interface MsgSetDenomMetadataResponseProtoType {
+export interface MsgSetDenomMetadataResponseProtoMsg {
   typeUrl: "/osmosis.tokenfactory.v1beta1.MsgSetDenomMetadataResponse";
   value: Uint8Array;
 }
@@ -302,7 +302,7 @@ export interface MsgSetDenomMetadataResponseProtoType {
  * MsgSetDenomMetadata message.
  */
 export interface MsgSetDenomMetadataResponseAmino {}
-export interface MsgSetDenomMetadataResponseAminoType {
+export interface MsgSetDenomMetadataResponseAminoMsg {
   type: "osmosis/tokenfactory/set-denom-metadata-response";
   value: MsgSetDenomMetadataResponseAmino;
 }
@@ -321,6 +321,9 @@ function createBaseMsgCreateDenom(): MsgCreateDenom {
 }
 
 export const MsgCreateDenom = {
+  typeUrl: "/osmosis.tokenfactory.v1beta1.MsgCreateDenom",
+  aminoType: "osmosis/tokenfactory/create-denom",
+
   encode(message: MsgCreateDenom, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.sender !== "") {
       writer.uint32(10).string(message.sender);
@@ -406,6 +409,32 @@ export const MsgCreateDenom = {
     obj.sender = message.sender;
     obj.subdenom = message.subdenom;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCreateDenomAminoMsg): MsgCreateDenom {
+    return MsgCreateDenom.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgCreateDenom): MsgCreateDenomAminoMsg {
+    return {
+      type: "osmosis/tokenfactory/create-denom",
+      value: MsgCreateDenom.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgCreateDenomProtoMsg): MsgCreateDenom {
+    return MsgCreateDenom.decode(message.value);
+  },
+
+  toProto(message: MsgCreateDenom): Uint8Array {
+    return MsgCreateDenom.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCreateDenom): MsgCreateDenomProtoMsg {
+    return {
+      typeUrl: "/osmosis.tokenfactory.v1beta1.MsgCreateDenom",
+      value: MsgCreateDenom.encode(message).finish()
+    };
   }
 
 };
@@ -417,6 +446,9 @@ function createBaseMsgCreateDenomResponse(): MsgCreateDenomResponse {
 }
 
 export const MsgCreateDenomResponse = {
+  typeUrl: "/osmosis.tokenfactory.v1beta1.MsgCreateDenomResponse",
+  aminoType: "osmosis/tokenfactory/create-denom-response",
+
   encode(message: MsgCreateDenomResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.newTokenDenom !== "") {
       writer.uint32(10).string(message.newTokenDenom);
@@ -487,6 +519,32 @@ export const MsgCreateDenomResponse = {
     const obj: any = {};
     obj.new_token_denom = message.newTokenDenom;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCreateDenomResponseAminoMsg): MsgCreateDenomResponse {
+    return MsgCreateDenomResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgCreateDenomResponse): MsgCreateDenomResponseAminoMsg {
+    return {
+      type: "osmosis/tokenfactory/create-denom-response",
+      value: MsgCreateDenomResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgCreateDenomResponseProtoMsg): MsgCreateDenomResponse {
+    return MsgCreateDenomResponse.decode(message.value);
+  },
+
+  toProto(message: MsgCreateDenomResponse): Uint8Array {
+    return MsgCreateDenomResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCreateDenomResponse): MsgCreateDenomResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.tokenfactory.v1beta1.MsgCreateDenomResponse",
+      value: MsgCreateDenomResponse.encode(message).finish()
+    };
   }
 
 };
@@ -499,6 +557,9 @@ function createBaseMsgMint(): MsgMint {
 }
 
 export const MsgMint = {
+  typeUrl: "/osmosis.tokenfactory.v1beta1.MsgMint",
+  aminoType: "osmosis/tokenfactory/mint",
+
   encode(message: MsgMint, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.sender !== "") {
       writer.uint32(10).string(message.sender);
@@ -584,6 +645,32 @@ export const MsgMint = {
     obj.sender = message.sender;
     obj.amount = message.amount ? Coin.toAmino(message.amount) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgMintAminoMsg): MsgMint {
+    return MsgMint.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgMint): MsgMintAminoMsg {
+    return {
+      type: "osmosis/tokenfactory/mint",
+      value: MsgMint.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgMintProtoMsg): MsgMint {
+    return MsgMint.decode(message.value);
+  },
+
+  toProto(message: MsgMint): Uint8Array {
+    return MsgMint.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgMint): MsgMintProtoMsg {
+    return {
+      typeUrl: "/osmosis.tokenfactory.v1beta1.MsgMint",
+      value: MsgMint.encode(message).finish()
+    };
   }
 
 };
@@ -593,6 +680,9 @@ function createBaseMsgMintResponse(): MsgMintResponse {
 }
 
 export const MsgMintResponse = {
+  typeUrl: "/osmosis.tokenfactory.v1beta1.MsgMintResponse",
+  aminoType: "osmosis/tokenfactory/mint-response",
+
   encode(_: MsgMintResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -645,6 +735,32 @@ export const MsgMintResponse = {
   toAmino(_: MsgMintResponse): MsgMintResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgMintResponseAminoMsg): MsgMintResponse {
+    return MsgMintResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgMintResponse): MsgMintResponseAminoMsg {
+    return {
+      type: "osmosis/tokenfactory/mint-response",
+      value: MsgMintResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgMintResponseProtoMsg): MsgMintResponse {
+    return MsgMintResponse.decode(message.value);
+  },
+
+  toProto(message: MsgMintResponse): Uint8Array {
+    return MsgMintResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgMintResponse): MsgMintResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.tokenfactory.v1beta1.MsgMintResponse",
+      value: MsgMintResponse.encode(message).finish()
+    };
   }
 
 };
@@ -657,6 +773,9 @@ function createBaseMsgBurn(): MsgBurn {
 }
 
 export const MsgBurn = {
+  typeUrl: "/osmosis.tokenfactory.v1beta1.MsgBurn",
+  aminoType: "osmosis/tokenfactory/burn",
+
   encode(message: MsgBurn, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.sender !== "") {
       writer.uint32(10).string(message.sender);
@@ -742,6 +861,32 @@ export const MsgBurn = {
     obj.sender = message.sender;
     obj.amount = message.amount ? Coin.toAmino(message.amount) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgBurnAminoMsg): MsgBurn {
+    return MsgBurn.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgBurn): MsgBurnAminoMsg {
+    return {
+      type: "osmosis/tokenfactory/burn",
+      value: MsgBurn.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgBurnProtoMsg): MsgBurn {
+    return MsgBurn.decode(message.value);
+  },
+
+  toProto(message: MsgBurn): Uint8Array {
+    return MsgBurn.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgBurn): MsgBurnProtoMsg {
+    return {
+      typeUrl: "/osmosis.tokenfactory.v1beta1.MsgBurn",
+      value: MsgBurn.encode(message).finish()
+    };
   }
 
 };
@@ -751,6 +896,9 @@ function createBaseMsgBurnResponse(): MsgBurnResponse {
 }
 
 export const MsgBurnResponse = {
+  typeUrl: "/osmosis.tokenfactory.v1beta1.MsgBurnResponse",
+  aminoType: "osmosis/tokenfactory/burn-response",
+
   encode(_: MsgBurnResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -803,6 +951,32 @@ export const MsgBurnResponse = {
   toAmino(_: MsgBurnResponse): MsgBurnResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgBurnResponseAminoMsg): MsgBurnResponse {
+    return MsgBurnResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgBurnResponse): MsgBurnResponseAminoMsg {
+    return {
+      type: "osmosis/tokenfactory/burn-response",
+      value: MsgBurnResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgBurnResponseProtoMsg): MsgBurnResponse {
+    return MsgBurnResponse.decode(message.value);
+  },
+
+  toProto(message: MsgBurnResponse): Uint8Array {
+    return MsgBurnResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgBurnResponse): MsgBurnResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.tokenfactory.v1beta1.MsgBurnResponse",
+      value: MsgBurnResponse.encode(message).finish()
+    };
   }
 
 };
@@ -816,6 +990,9 @@ function createBaseMsgChangeAdmin(): MsgChangeAdmin {
 }
 
 export const MsgChangeAdmin = {
+  typeUrl: "/osmosis.tokenfactory.v1beta1.MsgChangeAdmin",
+  aminoType: "osmosis/tokenfactory/change-admin",
+
   encode(message: MsgChangeAdmin, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.sender !== "") {
       writer.uint32(10).string(message.sender);
@@ -916,6 +1093,32 @@ export const MsgChangeAdmin = {
     obj.denom = message.denom;
     obj.new_admin = message.newAdmin;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgChangeAdminAminoMsg): MsgChangeAdmin {
+    return MsgChangeAdmin.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgChangeAdmin): MsgChangeAdminAminoMsg {
+    return {
+      type: "osmosis/tokenfactory/change-admin",
+      value: MsgChangeAdmin.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgChangeAdminProtoMsg): MsgChangeAdmin {
+    return MsgChangeAdmin.decode(message.value);
+  },
+
+  toProto(message: MsgChangeAdmin): Uint8Array {
+    return MsgChangeAdmin.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgChangeAdmin): MsgChangeAdminProtoMsg {
+    return {
+      typeUrl: "/osmosis.tokenfactory.v1beta1.MsgChangeAdmin",
+      value: MsgChangeAdmin.encode(message).finish()
+    };
   }
 
 };
@@ -925,6 +1128,9 @@ function createBaseMsgChangeAdminResponse(): MsgChangeAdminResponse {
 }
 
 export const MsgChangeAdminResponse = {
+  typeUrl: "/osmosis.tokenfactory.v1beta1.MsgChangeAdminResponse",
+  aminoType: "osmosis/tokenfactory/change-admin-response",
+
   encode(_: MsgChangeAdminResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -977,6 +1183,32 @@ export const MsgChangeAdminResponse = {
   toAmino(_: MsgChangeAdminResponse): MsgChangeAdminResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgChangeAdminResponseAminoMsg): MsgChangeAdminResponse {
+    return MsgChangeAdminResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgChangeAdminResponse): MsgChangeAdminResponseAminoMsg {
+    return {
+      type: "osmosis/tokenfactory/change-admin-response",
+      value: MsgChangeAdminResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgChangeAdminResponseProtoMsg): MsgChangeAdminResponse {
+    return MsgChangeAdminResponse.decode(message.value);
+  },
+
+  toProto(message: MsgChangeAdminResponse): Uint8Array {
+    return MsgChangeAdminResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgChangeAdminResponse): MsgChangeAdminResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.tokenfactory.v1beta1.MsgChangeAdminResponse",
+      value: MsgChangeAdminResponse.encode(message).finish()
+    };
   }
 
 };
@@ -989,6 +1221,9 @@ function createBaseMsgSetDenomMetadata(): MsgSetDenomMetadata {
 }
 
 export const MsgSetDenomMetadata = {
+  typeUrl: "/osmosis.tokenfactory.v1beta1.MsgSetDenomMetadata",
+  aminoType: "osmosis/tokenfactory/set-denom-metadata",
+
   encode(message: MsgSetDenomMetadata, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.sender !== "") {
       writer.uint32(10).string(message.sender);
@@ -1074,6 +1309,32 @@ export const MsgSetDenomMetadata = {
     obj.sender = message.sender;
     obj.metadata = message.metadata ? Metadata.toAmino(message.metadata) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgSetDenomMetadataAminoMsg): MsgSetDenomMetadata {
+    return MsgSetDenomMetadata.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgSetDenomMetadata): MsgSetDenomMetadataAminoMsg {
+    return {
+      type: "osmosis/tokenfactory/set-denom-metadata",
+      value: MsgSetDenomMetadata.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgSetDenomMetadataProtoMsg): MsgSetDenomMetadata {
+    return MsgSetDenomMetadata.decode(message.value);
+  },
+
+  toProto(message: MsgSetDenomMetadata): Uint8Array {
+    return MsgSetDenomMetadata.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgSetDenomMetadata): MsgSetDenomMetadataProtoMsg {
+    return {
+      typeUrl: "/osmosis.tokenfactory.v1beta1.MsgSetDenomMetadata",
+      value: MsgSetDenomMetadata.encode(message).finish()
+    };
   }
 
 };
@@ -1083,6 +1344,9 @@ function createBaseMsgSetDenomMetadataResponse(): MsgSetDenomMetadataResponse {
 }
 
 export const MsgSetDenomMetadataResponse = {
+  typeUrl: "/osmosis.tokenfactory.v1beta1.MsgSetDenomMetadataResponse",
+  aminoType: "osmosis/tokenfactory/set-denom-metadata-response",
+
   encode(_: MsgSetDenomMetadataResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -1135,6 +1399,32 @@ export const MsgSetDenomMetadataResponse = {
   toAmino(_: MsgSetDenomMetadataResponse): MsgSetDenomMetadataResponseAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: MsgSetDenomMetadataResponseAminoMsg): MsgSetDenomMetadataResponse {
+    return MsgSetDenomMetadataResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgSetDenomMetadataResponse): MsgSetDenomMetadataResponseAminoMsg {
+    return {
+      type: "osmosis/tokenfactory/set-denom-metadata-response",
+      value: MsgSetDenomMetadataResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgSetDenomMetadataResponseProtoMsg): MsgSetDenomMetadataResponse {
+    return MsgSetDenomMetadataResponse.decode(message.value);
+  },
+
+  toProto(message: MsgSetDenomMetadataResponse): Uint8Array {
+    return MsgSetDenomMetadataResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgSetDenomMetadataResponse): MsgSetDenomMetadataResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.tokenfactory.v1beta1.MsgSetDenomMetadataResponse",
+      value: MsgSetDenomMetadataResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/osmosis/twap/v1beta1/genesis.ts b/__fixtures__/outputv2/osmosis/twap/v1beta1/genesis.ts
index 728af48a7..cea0f028d 100644
--- a/__fixtures__/outputv2/osmosis/twap/v1beta1/genesis.ts
+++ b/__fixtures__/outputv2/osmosis/twap/v1beta1/genesis.ts
@@ -9,7 +9,7 @@ export interface Params {
   pruneEpochIdentifier: string;
   recordHistoryKeepPeriod?: Duration;
 }
-export interface ParamsProtoType {
+export interface ParamsProtoMsg {
   typeUrl: "/osmosis.twap.v1beta1.Params";
   value: Uint8Array;
 }
@@ -19,7 +19,7 @@ export interface ParamsAmino {
   prune_epoch_identifier: string;
   record_history_keep_period?: DurationAmino;
 }
-export interface ParamsAminoType {
+export interface ParamsAminoMsg {
   type: "osmosis/twap/params";
   value: ParamsAmino;
 }
@@ -38,7 +38,7 @@ export interface GenesisState {
   /** params is the container of twap parameters. */
   params?: Params;
 }
-export interface GenesisStateProtoType {
+export interface GenesisStateProtoMsg {
   typeUrl: "/osmosis.twap.v1beta1.GenesisState";
   value: Uint8Array;
 }
@@ -51,7 +51,7 @@ export interface GenesisStateAmino {
   /** params is the container of twap parameters. */
   params?: ParamsAmino;
 }
-export interface GenesisStateAminoType {
+export interface GenesisStateAminoMsg {
   type: "osmosis/twap/genesis-state";
   value: GenesisStateAmino;
 }
@@ -70,6 +70,9 @@ function createBaseParams(): Params {
 }
 
 export const Params = {
+  typeUrl: "/osmosis.twap.v1beta1.Params",
+  aminoType: "osmosis/twap/params",
+
   encode(message: Params, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.pruneEpochIdentifier !== "") {
       writer.uint32(10).string(message.pruneEpochIdentifier);
@@ -155,6 +158,32 @@ export const Params = {
     obj.prune_epoch_identifier = message.pruneEpochIdentifier;
     obj.record_history_keep_period = message.recordHistoryKeepPeriod ? Duration.toAmino(message.recordHistoryKeepPeriod) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ParamsAminoMsg): Params {
+    return Params.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Params): ParamsAminoMsg {
+    return {
+      type: "osmosis/twap/params",
+      value: Params.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ParamsProtoMsg): Params {
+    return Params.decode(message.value);
+  },
+
+  toProto(message: Params): Uint8Array {
+    return Params.encode(message).finish();
+  },
+
+  toProtoMsg(message: Params): ParamsProtoMsg {
+    return {
+      typeUrl: "/osmosis.twap.v1beta1.Params",
+      value: Params.encode(message).finish()
+    };
   }
 
 };
@@ -167,6 +196,9 @@ function createBaseGenesisState(): GenesisState {
 }
 
 export const GenesisState = {
+  typeUrl: "/osmosis.twap.v1beta1.GenesisState",
+  aminoType: "osmosis/twap/genesis-state",
+
   encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.twaps) {
       TwapRecord.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -270,6 +302,32 @@ export const GenesisState = {
 
     obj.params = message.params ? Params.toAmino(message.params) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisStateAminoMsg): GenesisState {
+    return GenesisState.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GenesisState): GenesisStateAminoMsg {
+    return {
+      type: "osmosis/twap/genesis-state",
+      value: GenesisState.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GenesisStateProtoMsg): GenesisState {
+    return GenesisState.decode(message.value);
+  },
+
+  toProto(message: GenesisState): Uint8Array {
+    return GenesisState.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisState): GenesisStateProtoMsg {
+    return {
+      typeUrl: "/osmosis.twap.v1beta1.GenesisState",
+      value: GenesisState.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/osmosis/twap/v1beta1/query.ts b/__fixtures__/outputv2/osmosis/twap/v1beta1/query.ts
index f94ddad8a..8fa047335 100644
--- a/__fixtures__/outputv2/osmosis/twap/v1beta1/query.ts
+++ b/__fixtures__/outputv2/osmosis/twap/v1beta1/query.ts
@@ -10,7 +10,7 @@ export interface ArithmeticTwapRequest {
   startTime?: Date;
   endTime?: Date;
 }
-export interface ArithmeticTwapRequestProtoType {
+export interface ArithmeticTwapRequestProtoMsg {
   typeUrl: "/osmosis.twap.v1beta1.ArithmeticTwapRequest";
   value: Uint8Array;
 }
@@ -21,7 +21,7 @@ export interface ArithmeticTwapRequestAmino {
   start_time?: Date;
   end_time?: Date;
 }
-export interface ArithmeticTwapRequestAminoType {
+export interface ArithmeticTwapRequestAminoMsg {
   type: "osmosis/twap/arithmetic-twap-request";
   value: ArithmeticTwapRequestAmino;
 }
@@ -35,14 +35,14 @@ export interface ArithmeticTwapRequestSDKType {
 export interface ArithmeticTwapResponse {
   arithmeticTwap: string;
 }
-export interface ArithmeticTwapResponseProtoType {
+export interface ArithmeticTwapResponseProtoMsg {
   typeUrl: "/osmosis.twap.v1beta1.ArithmeticTwapResponse";
   value: Uint8Array;
 }
 export interface ArithmeticTwapResponseAmino {
   arithmetic_twap: string;
 }
-export interface ArithmeticTwapResponseAminoType {
+export interface ArithmeticTwapResponseAminoMsg {
   type: "osmosis/twap/arithmetic-twap-response";
   value: ArithmeticTwapResponseAmino;
 }
@@ -55,7 +55,7 @@ export interface ArithmeticTwapToNowRequest {
   quoteAsset: string;
   startTime?: Date;
 }
-export interface ArithmeticTwapToNowRequestProtoType {
+export interface ArithmeticTwapToNowRequestProtoMsg {
   typeUrl: "/osmosis.twap.v1beta1.ArithmeticTwapToNowRequest";
   value: Uint8Array;
 }
@@ -65,7 +65,7 @@ export interface ArithmeticTwapToNowRequestAmino {
   quote_asset: string;
   start_time?: Date;
 }
-export interface ArithmeticTwapToNowRequestAminoType {
+export interface ArithmeticTwapToNowRequestAminoMsg {
   type: "osmosis/twap/arithmetic-twap-to-now-request";
   value: ArithmeticTwapToNowRequestAmino;
 }
@@ -78,14 +78,14 @@ export interface ArithmeticTwapToNowRequestSDKType {
 export interface ArithmeticTwapToNowResponse {
   arithmeticTwap: string;
 }
-export interface ArithmeticTwapToNowResponseProtoType {
+export interface ArithmeticTwapToNowResponseProtoMsg {
   typeUrl: "/osmosis.twap.v1beta1.ArithmeticTwapToNowResponse";
   value: Uint8Array;
 }
 export interface ArithmeticTwapToNowResponseAmino {
   arithmetic_twap: string;
 }
-export interface ArithmeticTwapToNowResponseAminoType {
+export interface ArithmeticTwapToNowResponseAminoMsg {
   type: "osmosis/twap/arithmetic-twap-to-now-response";
   value: ArithmeticTwapToNowResponseAmino;
 }
@@ -93,12 +93,12 @@ export interface ArithmeticTwapToNowResponseSDKType {
   arithmetic_twap: string;
 }
 export interface ParamsRequest {}
-export interface ParamsRequestProtoType {
+export interface ParamsRequestProtoMsg {
   typeUrl: "/osmosis.twap.v1beta1.ParamsRequest";
   value: Uint8Array;
 }
 export interface ParamsRequestAmino {}
-export interface ParamsRequestAminoType {
+export interface ParamsRequestAminoMsg {
   type: "osmosis/twap/params-request";
   value: ParamsRequestAmino;
 }
@@ -106,14 +106,14 @@ export interface ParamsRequestSDKType {}
 export interface ParamsResponse {
   params?: Params;
 }
-export interface ParamsResponseProtoType {
+export interface ParamsResponseProtoMsg {
   typeUrl: "/osmosis.twap.v1beta1.ParamsResponse";
   value: Uint8Array;
 }
 export interface ParamsResponseAmino {
   params?: ParamsAmino;
 }
-export interface ParamsResponseAminoType {
+export interface ParamsResponseAminoMsg {
   type: "osmosis/twap/params-response";
   value: ParamsResponseAmino;
 }
@@ -132,6 +132,9 @@ function createBaseArithmeticTwapRequest(): ArithmeticTwapRequest {
 }
 
 export const ArithmeticTwapRequest = {
+  typeUrl: "/osmosis.twap.v1beta1.ArithmeticTwapRequest",
+  aminoType: "osmosis/twap/arithmetic-twap-request",
+
   encode(message: ArithmeticTwapRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.poolId.isZero()) {
       writer.uint32(8).uint64(message.poolId);
@@ -262,6 +265,32 @@ export const ArithmeticTwapRequest = {
     obj.start_time = message.startTime ? Timestamp.toAmino(message.startTime) : undefined;
     obj.end_time = message.endTime ? Timestamp.toAmino(message.endTime) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ArithmeticTwapRequestAminoMsg): ArithmeticTwapRequest {
+    return ArithmeticTwapRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ArithmeticTwapRequest): ArithmeticTwapRequestAminoMsg {
+    return {
+      type: "osmosis/twap/arithmetic-twap-request",
+      value: ArithmeticTwapRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ArithmeticTwapRequestProtoMsg): ArithmeticTwapRequest {
+    return ArithmeticTwapRequest.decode(message.value);
+  },
+
+  toProto(message: ArithmeticTwapRequest): Uint8Array {
+    return ArithmeticTwapRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: ArithmeticTwapRequest): ArithmeticTwapRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.twap.v1beta1.ArithmeticTwapRequest",
+      value: ArithmeticTwapRequest.encode(message).finish()
+    };
   }
 
 };
@@ -273,6 +302,9 @@ function createBaseArithmeticTwapResponse(): ArithmeticTwapResponse {
 }
 
 export const ArithmeticTwapResponse = {
+  typeUrl: "/osmosis.twap.v1beta1.ArithmeticTwapResponse",
+  aminoType: "osmosis/twap/arithmetic-twap-response",
+
   encode(message: ArithmeticTwapResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.arithmeticTwap !== "") {
       writer.uint32(10).string(message.arithmeticTwap);
@@ -343,6 +375,32 @@ export const ArithmeticTwapResponse = {
     const obj: any = {};
     obj.arithmetic_twap = message.arithmeticTwap;
     return obj;
+  },
+
+  fromAminoMsg(object: ArithmeticTwapResponseAminoMsg): ArithmeticTwapResponse {
+    return ArithmeticTwapResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ArithmeticTwapResponse): ArithmeticTwapResponseAminoMsg {
+    return {
+      type: "osmosis/twap/arithmetic-twap-response",
+      value: ArithmeticTwapResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ArithmeticTwapResponseProtoMsg): ArithmeticTwapResponse {
+    return ArithmeticTwapResponse.decode(message.value);
+  },
+
+  toProto(message: ArithmeticTwapResponse): Uint8Array {
+    return ArithmeticTwapResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: ArithmeticTwapResponse): ArithmeticTwapResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.twap.v1beta1.ArithmeticTwapResponse",
+      value: ArithmeticTwapResponse.encode(message).finish()
+    };
   }
 
 };
@@ -357,6 +415,9 @@ function createBaseArithmeticTwapToNowRequest(): ArithmeticTwapToNowRequest {
 }
 
 export const ArithmeticTwapToNowRequest = {
+  typeUrl: "/osmosis.twap.v1beta1.ArithmeticTwapToNowRequest",
+  aminoType: "osmosis/twap/arithmetic-twap-to-now-request",
+
   encode(message: ArithmeticTwapToNowRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.poolId.isZero()) {
       writer.uint32(8).uint64(message.poolId);
@@ -472,6 +533,32 @@ export const ArithmeticTwapToNowRequest = {
     obj.quote_asset = message.quoteAsset;
     obj.start_time = message.startTime ? Timestamp.toAmino(message.startTime) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ArithmeticTwapToNowRequestAminoMsg): ArithmeticTwapToNowRequest {
+    return ArithmeticTwapToNowRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ArithmeticTwapToNowRequest): ArithmeticTwapToNowRequestAminoMsg {
+    return {
+      type: "osmosis/twap/arithmetic-twap-to-now-request",
+      value: ArithmeticTwapToNowRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ArithmeticTwapToNowRequestProtoMsg): ArithmeticTwapToNowRequest {
+    return ArithmeticTwapToNowRequest.decode(message.value);
+  },
+
+  toProto(message: ArithmeticTwapToNowRequest): Uint8Array {
+    return ArithmeticTwapToNowRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: ArithmeticTwapToNowRequest): ArithmeticTwapToNowRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.twap.v1beta1.ArithmeticTwapToNowRequest",
+      value: ArithmeticTwapToNowRequest.encode(message).finish()
+    };
   }
 
 };
@@ -483,6 +570,9 @@ function createBaseArithmeticTwapToNowResponse(): ArithmeticTwapToNowResponse {
 }
 
 export const ArithmeticTwapToNowResponse = {
+  typeUrl: "/osmosis.twap.v1beta1.ArithmeticTwapToNowResponse",
+  aminoType: "osmosis/twap/arithmetic-twap-to-now-response",
+
   encode(message: ArithmeticTwapToNowResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.arithmeticTwap !== "") {
       writer.uint32(10).string(message.arithmeticTwap);
@@ -553,6 +643,32 @@ export const ArithmeticTwapToNowResponse = {
     const obj: any = {};
     obj.arithmetic_twap = message.arithmeticTwap;
     return obj;
+  },
+
+  fromAminoMsg(object: ArithmeticTwapToNowResponseAminoMsg): ArithmeticTwapToNowResponse {
+    return ArithmeticTwapToNowResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ArithmeticTwapToNowResponse): ArithmeticTwapToNowResponseAminoMsg {
+    return {
+      type: "osmosis/twap/arithmetic-twap-to-now-response",
+      value: ArithmeticTwapToNowResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ArithmeticTwapToNowResponseProtoMsg): ArithmeticTwapToNowResponse {
+    return ArithmeticTwapToNowResponse.decode(message.value);
+  },
+
+  toProto(message: ArithmeticTwapToNowResponse): Uint8Array {
+    return ArithmeticTwapToNowResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: ArithmeticTwapToNowResponse): ArithmeticTwapToNowResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.twap.v1beta1.ArithmeticTwapToNowResponse",
+      value: ArithmeticTwapToNowResponse.encode(message).finish()
+    };
   }
 
 };
@@ -562,6 +678,9 @@ function createBaseParamsRequest(): ParamsRequest {
 }
 
 export const ParamsRequest = {
+  typeUrl: "/osmosis.twap.v1beta1.ParamsRequest",
+  aminoType: "osmosis/twap/params-request",
+
   encode(_: ParamsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -614,6 +733,32 @@ export const ParamsRequest = {
   toAmino(_: ParamsRequest): ParamsRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: ParamsRequestAminoMsg): ParamsRequest {
+    return ParamsRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ParamsRequest): ParamsRequestAminoMsg {
+    return {
+      type: "osmosis/twap/params-request",
+      value: ParamsRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ParamsRequestProtoMsg): ParamsRequest {
+    return ParamsRequest.decode(message.value);
+  },
+
+  toProto(message: ParamsRequest): Uint8Array {
+    return ParamsRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: ParamsRequest): ParamsRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.twap.v1beta1.ParamsRequest",
+      value: ParamsRequest.encode(message).finish()
+    };
   }
 
 };
@@ -625,6 +770,9 @@ function createBaseParamsResponse(): ParamsResponse {
 }
 
 export const ParamsResponse = {
+  typeUrl: "/osmosis.twap.v1beta1.ParamsResponse",
+  aminoType: "osmosis/twap/params-response",
+
   encode(message: ParamsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.params !== undefined) {
       Params.encode(message.params, writer.uint32(10).fork()).ldelim();
@@ -695,6 +843,32 @@ export const ParamsResponse = {
     const obj: any = {};
     obj.params = message.params ? Params.toAmino(message.params) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ParamsResponseAminoMsg): ParamsResponse {
+    return ParamsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: ParamsResponse): ParamsResponseAminoMsg {
+    return {
+      type: "osmosis/twap/params-response",
+      value: ParamsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: ParamsResponseProtoMsg): ParamsResponse {
+    return ParamsResponse.decode(message.value);
+  },
+
+  toProto(message: ParamsResponse): Uint8Array {
+    return ParamsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: ParamsResponse): ParamsResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.twap.v1beta1.ParamsResponse",
+      value: ParamsResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/osmosis/twap/v1beta1/twap_record.ts b/__fixtures__/outputv2/osmosis/twap/v1beta1/twap_record.ts
index b46d92b6e..40663d724 100644
--- a/__fixtures__/outputv2/osmosis/twap/v1beta1/twap_record.ts
+++ b/__fixtures__/outputv2/osmosis/twap/v1beta1/twap_record.ts
@@ -46,7 +46,7 @@ export interface TwapRecord {
    */
   lastErrorTime?: Date;
 }
-export interface TwapRecordProtoType {
+export interface TwapRecordProtoMsg {
   typeUrl: "/osmosis.twap.v1beta1.TwapRecord";
   value: Uint8Array;
 }
@@ -94,7 +94,7 @@ export interface TwapRecordAmino {
    */
   last_error_time?: Date;
 }
-export interface TwapRecordAminoType {
+export interface TwapRecordAminoMsg {
   type: "osmosis/twap/twap-record";
   value: TwapRecordAmino;
 }
@@ -137,6 +137,9 @@ function createBaseTwapRecord(): TwapRecord {
 }
 
 export const TwapRecord = {
+  typeUrl: "/osmosis.twap.v1beta1.TwapRecord",
+  aminoType: "osmosis/twap/twap-record",
+
   encode(message: TwapRecord, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.poolId.isZero()) {
       writer.uint32(8).uint64(message.poolId);
@@ -342,6 +345,32 @@ export const TwapRecord = {
     obj.p1_arithmetic_twap_accumulator = message.p1ArithmeticTwapAccumulator;
     obj.last_error_time = message.lastErrorTime ? Timestamp.toAmino(message.lastErrorTime) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: TwapRecordAminoMsg): TwapRecord {
+    return TwapRecord.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: TwapRecord): TwapRecordAminoMsg {
+    return {
+      type: "osmosis/twap/twap-record",
+      value: TwapRecord.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: TwapRecordProtoMsg): TwapRecord {
+    return TwapRecord.decode(message.value);
+  },
+
+  toProto(message: TwapRecord): Uint8Array {
+    return TwapRecord.encode(message).finish();
+  },
+
+  toProtoMsg(message: TwapRecord): TwapRecordProtoMsg {
+    return {
+      typeUrl: "/osmosis.twap.v1beta1.TwapRecord",
+      value: TwapRecord.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/osmosis/txfees/v1beta1/feetoken.ts b/__fixtures__/outputv2/osmosis/txfees/v1beta1/feetoken.ts
index a7d098101..517d4c9bf 100644
--- a/__fixtures__/outputv2/osmosis/txfees/v1beta1/feetoken.ts
+++ b/__fixtures__/outputv2/osmosis/txfees/v1beta1/feetoken.ts
@@ -12,7 +12,7 @@ export interface FeeToken {
   denom: string;
   poolID: Long;
 }
-export interface FeeTokenProtoType {
+export interface FeeTokenProtoMsg {
   typeUrl: "/osmosis.txfees.v1beta1.FeeToken";
   value: Uint8Array;
 }
@@ -27,7 +27,7 @@ export interface FeeTokenAmino {
   denom: string;
   poolID: string;
 }
-export interface FeeTokenAminoType {
+export interface FeeTokenAminoMsg {
   type: "osmosis/txfees/fee-token";
   value: FeeTokenAmino;
 }
@@ -51,6 +51,9 @@ function createBaseFeeToken(): FeeToken {
 }
 
 export const FeeToken = {
+  typeUrl: "/osmosis.txfees.v1beta1.FeeToken",
+  aminoType: "osmosis/txfees/fee-token",
+
   encode(message: FeeToken, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.denom !== "") {
       writer.uint32(10).string(message.denom);
@@ -136,6 +139,32 @@ export const FeeToken = {
     obj.denom = message.denom;
     obj.poolID = message.poolID ? message.poolID.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: FeeTokenAminoMsg): FeeToken {
+    return FeeToken.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: FeeToken): FeeTokenAminoMsg {
+    return {
+      type: "osmosis/txfees/fee-token",
+      value: FeeToken.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: FeeTokenProtoMsg): FeeToken {
+    return FeeToken.decode(message.value);
+  },
+
+  toProto(message: FeeToken): Uint8Array {
+    return FeeToken.encode(message).finish();
+  },
+
+  toProtoMsg(message: FeeToken): FeeTokenProtoMsg {
+    return {
+      typeUrl: "/osmosis.txfees.v1beta1.FeeToken",
+      value: FeeToken.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/osmosis/txfees/v1beta1/genesis.ts b/__fixtures__/outputv2/osmosis/txfees/v1beta1/genesis.ts
index abfa3da67..9711cd57e 100644
--- a/__fixtures__/outputv2/osmosis/txfees/v1beta1/genesis.ts
+++ b/__fixtures__/outputv2/osmosis/txfees/v1beta1/genesis.ts
@@ -8,7 +8,7 @@ export interface GenesisState {
   basedenom: string;
   feetokens: FeeToken[];
 }
-export interface GenesisStateProtoType {
+export interface GenesisStateProtoMsg {
   typeUrl: "/osmosis.txfees.v1beta1.GenesisState";
   value: Uint8Array;
 }
@@ -18,7 +18,7 @@ export interface GenesisStateAmino {
   basedenom: string;
   feetokens: FeeTokenAmino[];
 }
-export interface GenesisStateAminoType {
+export interface GenesisStateAminoMsg {
   type: "osmosis/txfees/genesis-state";
   value: GenesisStateAmino;
 }
@@ -37,6 +37,9 @@ function createBaseGenesisState(): GenesisState {
 }
 
 export const GenesisState = {
+  typeUrl: "/osmosis.txfees.v1beta1.GenesisState",
+  aminoType: "osmosis/txfees/genesis-state",
+
   encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.basedenom !== "") {
       writer.uint32(10).string(message.basedenom);
@@ -140,6 +143,32 @@ export const GenesisState = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: GenesisStateAminoMsg): GenesisState {
+    return GenesisState.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: GenesisState): GenesisStateAminoMsg {
+    return {
+      type: "osmosis/txfees/genesis-state",
+      value: GenesisState.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: GenesisStateProtoMsg): GenesisState {
+    return GenesisState.decode(message.value);
+  },
+
+  toProto(message: GenesisState): Uint8Array {
+    return GenesisState.encode(message).finish();
+  },
+
+  toProtoMsg(message: GenesisState): GenesisStateProtoMsg {
+    return {
+      typeUrl: "/osmosis.txfees.v1beta1.GenesisState",
+      value: GenesisState.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/osmosis/txfees/v1beta1/gov.ts b/__fixtures__/outputv2/osmosis/txfees/v1beta1/gov.ts
index 354143d1f..1763a9a33 100644
--- a/__fixtures__/outputv2/osmosis/txfees/v1beta1/gov.ts
+++ b/__fixtures__/outputv2/osmosis/txfees/v1beta1/gov.ts
@@ -15,7 +15,7 @@ export interface UpdateFeeTokenProposal {
   description: string;
   feetoken?: FeeToken;
 }
-export interface UpdateFeeTokenProposalProtoType {
+export interface UpdateFeeTokenProposalProtoMsg {
   typeUrl: "/osmosis.txfees.v1beta1.UpdateFeeTokenProposal";
   value: Uint8Array;
 }
@@ -32,7 +32,7 @@ export interface UpdateFeeTokenProposalAmino {
   description: string;
   feetoken?: FeeTokenAmino;
 }
-export interface UpdateFeeTokenProposalAminoType {
+export interface UpdateFeeTokenProposalAminoMsg {
   type: "osmosis/txfees/update-fee-token-proposal";
   value: UpdateFeeTokenProposalAmino;
 }
@@ -59,6 +59,9 @@ function createBaseUpdateFeeTokenProposal(): UpdateFeeTokenProposal {
 }
 
 export const UpdateFeeTokenProposal = {
+  typeUrl: "/osmosis.txfees.v1beta1.UpdateFeeTokenProposal",
+  aminoType: "osmosis/txfees/update-fee-token-proposal",
+
   encode(message: UpdateFeeTokenProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.title !== "") {
       writer.uint32(10).string(message.title);
@@ -159,6 +162,32 @@ export const UpdateFeeTokenProposal = {
     obj.description = message.description;
     obj.feetoken = message.feetoken ? FeeToken.toAmino(message.feetoken) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: UpdateFeeTokenProposalAminoMsg): UpdateFeeTokenProposal {
+    return UpdateFeeTokenProposal.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: UpdateFeeTokenProposal): UpdateFeeTokenProposalAminoMsg {
+    return {
+      type: "osmosis/txfees/update-fee-token-proposal",
+      value: UpdateFeeTokenProposal.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: UpdateFeeTokenProposalProtoMsg): UpdateFeeTokenProposal {
+    return UpdateFeeTokenProposal.decode(message.value);
+  },
+
+  toProto(message: UpdateFeeTokenProposal): Uint8Array {
+    return UpdateFeeTokenProposal.encode(message).finish();
+  },
+
+  toProtoMsg(message: UpdateFeeTokenProposal): UpdateFeeTokenProposalProtoMsg {
+    return {
+      typeUrl: "/osmosis.txfees.v1beta1.UpdateFeeTokenProposal",
+      value: UpdateFeeTokenProposal.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/osmosis/txfees/v1beta1/query.ts b/__fixtures__/outputv2/osmosis/txfees/v1beta1/query.ts
index 9ea81a3fb..da0059fbd 100644
--- a/__fixtures__/outputv2/osmosis/txfees/v1beta1/query.ts
+++ b/__fixtures__/outputv2/osmosis/txfees/v1beta1/query.ts
@@ -3,12 +3,12 @@ import * as _m0 from "protobufjs/minimal";
 import { DeepPartial, isSet, Long } from "../../../helpers";
 export const protobufPackage = "osmosis.txfees.v1beta1";
 export interface QueryFeeTokensRequest {}
-export interface QueryFeeTokensRequestProtoType {
+export interface QueryFeeTokensRequestProtoMsg {
   typeUrl: "/osmosis.txfees.v1beta1.QueryFeeTokensRequest";
   value: Uint8Array;
 }
 export interface QueryFeeTokensRequestAmino {}
-export interface QueryFeeTokensRequestAminoType {
+export interface QueryFeeTokensRequestAminoMsg {
   type: "osmosis/txfees/query-fee-tokens-request";
   value: QueryFeeTokensRequestAmino;
 }
@@ -16,14 +16,14 @@ export interface QueryFeeTokensRequestSDKType {}
 export interface QueryFeeTokensResponse {
   feeTokens: FeeToken[];
 }
-export interface QueryFeeTokensResponseProtoType {
+export interface QueryFeeTokensResponseProtoMsg {
   typeUrl: "/osmosis.txfees.v1beta1.QueryFeeTokensResponse";
   value: Uint8Array;
 }
 export interface QueryFeeTokensResponseAmino {
   fee_tokens: FeeTokenAmino[];
 }
-export interface QueryFeeTokensResponseAminoType {
+export interface QueryFeeTokensResponseAminoMsg {
   type: "osmosis/txfees/query-fee-tokens-response";
   value: QueryFeeTokensResponseAmino;
 }
@@ -38,7 +38,7 @@ export interface QueryFeeTokensResponseSDKType {
 export interface QueryDenomSpotPriceRequest {
   denom: string;
 }
-export interface QueryDenomSpotPriceRequestProtoType {
+export interface QueryDenomSpotPriceRequestProtoMsg {
   typeUrl: "/osmosis.txfees.v1beta1.QueryDenomSpotPriceRequest";
   value: Uint8Array;
 }
@@ -50,7 +50,7 @@ export interface QueryDenomSpotPriceRequestProtoType {
 export interface QueryDenomSpotPriceRequestAmino {
   denom: string;
 }
-export interface QueryDenomSpotPriceRequestAminoType {
+export interface QueryDenomSpotPriceRequestAminoMsg {
   type: "osmosis/txfees/query-denom-spot-price-request";
   value: QueryDenomSpotPriceRequestAmino;
 }
@@ -71,7 +71,7 @@ export interface QueryDenomSpotPriceResponse {
   poolID: Long;
   spotPrice: string;
 }
-export interface QueryDenomSpotPriceResponseProtoType {
+export interface QueryDenomSpotPriceResponseProtoMsg {
   typeUrl: "/osmosis.txfees.v1beta1.QueryDenomSpotPriceResponse";
   value: Uint8Array;
 }
@@ -84,7 +84,7 @@ export interface QueryDenomSpotPriceResponseAmino {
   poolID: string;
   spot_price: string;
 }
-export interface QueryDenomSpotPriceResponseAminoType {
+export interface QueryDenomSpotPriceResponseAminoMsg {
   type: "osmosis/txfees/query-denom-spot-price-response";
   value: QueryDenomSpotPriceResponseAmino;
 }
@@ -100,14 +100,14 @@ export interface QueryDenomSpotPriceResponseSDKType {
 export interface QueryDenomPoolIdRequest {
   denom: string;
 }
-export interface QueryDenomPoolIdRequestProtoType {
+export interface QueryDenomPoolIdRequestProtoMsg {
   typeUrl: "/osmosis.txfees.v1beta1.QueryDenomPoolIdRequest";
   value: Uint8Array;
 }
 export interface QueryDenomPoolIdRequestAmino {
   denom: string;
 }
-export interface QueryDenomPoolIdRequestAminoType {
+export interface QueryDenomPoolIdRequestAminoMsg {
   type: "osmosis/txfees/query-denom-pool-id-request";
   value: QueryDenomPoolIdRequestAmino;
 }
@@ -117,14 +117,14 @@ export interface QueryDenomPoolIdRequestSDKType {
 export interface QueryDenomPoolIdResponse {
   poolID: Long;
 }
-export interface QueryDenomPoolIdResponseProtoType {
+export interface QueryDenomPoolIdResponseProtoMsg {
   typeUrl: "/osmosis.txfees.v1beta1.QueryDenomPoolIdResponse";
   value: Uint8Array;
 }
 export interface QueryDenomPoolIdResponseAmino {
   poolID: string;
 }
-export interface QueryDenomPoolIdResponseAminoType {
+export interface QueryDenomPoolIdResponseAminoMsg {
   type: "osmosis/txfees/query-denom-pool-id-response";
   value: QueryDenomPoolIdResponseAmino;
 }
@@ -132,12 +132,12 @@ export interface QueryDenomPoolIdResponseSDKType {
   poolID: Long;
 }
 export interface QueryBaseDenomRequest {}
-export interface QueryBaseDenomRequestProtoType {
+export interface QueryBaseDenomRequestProtoMsg {
   typeUrl: "/osmosis.txfees.v1beta1.QueryBaseDenomRequest";
   value: Uint8Array;
 }
 export interface QueryBaseDenomRequestAmino {}
-export interface QueryBaseDenomRequestAminoType {
+export interface QueryBaseDenomRequestAminoMsg {
   type: "osmosis/txfees/query-base-denom-request";
   value: QueryBaseDenomRequestAmino;
 }
@@ -145,14 +145,14 @@ export interface QueryBaseDenomRequestSDKType {}
 export interface QueryBaseDenomResponse {
   baseDenom: string;
 }
-export interface QueryBaseDenomResponseProtoType {
+export interface QueryBaseDenomResponseProtoMsg {
   typeUrl: "/osmosis.txfees.v1beta1.QueryBaseDenomResponse";
   value: Uint8Array;
 }
 export interface QueryBaseDenomResponseAmino {
   base_denom: string;
 }
-export interface QueryBaseDenomResponseAminoType {
+export interface QueryBaseDenomResponseAminoMsg {
   type: "osmosis/txfees/query-base-denom-response";
   value: QueryBaseDenomResponseAmino;
 }
@@ -165,6 +165,9 @@ function createBaseQueryFeeTokensRequest(): QueryFeeTokensRequest {
 }
 
 export const QueryFeeTokensRequest = {
+  typeUrl: "/osmosis.txfees.v1beta1.QueryFeeTokensRequest",
+  aminoType: "osmosis/txfees/query-fee-tokens-request",
+
   encode(_: QueryFeeTokensRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -217,6 +220,32 @@ export const QueryFeeTokensRequest = {
   toAmino(_: QueryFeeTokensRequest): QueryFeeTokensRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryFeeTokensRequestAminoMsg): QueryFeeTokensRequest {
+    return QueryFeeTokensRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryFeeTokensRequest): QueryFeeTokensRequestAminoMsg {
+    return {
+      type: "osmosis/txfees/query-fee-tokens-request",
+      value: QueryFeeTokensRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryFeeTokensRequestProtoMsg): QueryFeeTokensRequest {
+    return QueryFeeTokensRequest.decode(message.value);
+  },
+
+  toProto(message: QueryFeeTokensRequest): Uint8Array {
+    return QueryFeeTokensRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryFeeTokensRequest): QueryFeeTokensRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.txfees.v1beta1.QueryFeeTokensRequest",
+      value: QueryFeeTokensRequest.encode(message).finish()
+    };
   }
 
 };
@@ -228,6 +257,9 @@ function createBaseQueryFeeTokensResponse(): QueryFeeTokensResponse {
 }
 
 export const QueryFeeTokensResponse = {
+  typeUrl: "/osmosis.txfees.v1beta1.QueryFeeTokensResponse",
+  aminoType: "osmosis/txfees/query-fee-tokens-response",
+
   encode(message: QueryFeeTokensResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.feeTokens) {
       FeeToken.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -316,6 +348,32 @@ export const QueryFeeTokensResponse = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: QueryFeeTokensResponseAminoMsg): QueryFeeTokensResponse {
+    return QueryFeeTokensResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryFeeTokensResponse): QueryFeeTokensResponseAminoMsg {
+    return {
+      type: "osmosis/txfees/query-fee-tokens-response",
+      value: QueryFeeTokensResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryFeeTokensResponseProtoMsg): QueryFeeTokensResponse {
+    return QueryFeeTokensResponse.decode(message.value);
+  },
+
+  toProto(message: QueryFeeTokensResponse): Uint8Array {
+    return QueryFeeTokensResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryFeeTokensResponse): QueryFeeTokensResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.txfees.v1beta1.QueryFeeTokensResponse",
+      value: QueryFeeTokensResponse.encode(message).finish()
+    };
   }
 
 };
@@ -327,6 +385,9 @@ function createBaseQueryDenomSpotPriceRequest(): QueryDenomSpotPriceRequest {
 }
 
 export const QueryDenomSpotPriceRequest = {
+  typeUrl: "/osmosis.txfees.v1beta1.QueryDenomSpotPriceRequest",
+  aminoType: "osmosis/txfees/query-denom-spot-price-request",
+
   encode(message: QueryDenomSpotPriceRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.denom !== "") {
       writer.uint32(10).string(message.denom);
@@ -397,6 +458,32 @@ export const QueryDenomSpotPriceRequest = {
     const obj: any = {};
     obj.denom = message.denom;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDenomSpotPriceRequestAminoMsg): QueryDenomSpotPriceRequest {
+    return QueryDenomSpotPriceRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryDenomSpotPriceRequest): QueryDenomSpotPriceRequestAminoMsg {
+    return {
+      type: "osmosis/txfees/query-denom-spot-price-request",
+      value: QueryDenomSpotPriceRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryDenomSpotPriceRequestProtoMsg): QueryDenomSpotPriceRequest {
+    return QueryDenomSpotPriceRequest.decode(message.value);
+  },
+
+  toProto(message: QueryDenomSpotPriceRequest): Uint8Array {
+    return QueryDenomSpotPriceRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDenomSpotPriceRequest): QueryDenomSpotPriceRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.txfees.v1beta1.QueryDenomSpotPriceRequest",
+      value: QueryDenomSpotPriceRequest.encode(message).finish()
+    };
   }
 
 };
@@ -409,6 +496,9 @@ function createBaseQueryDenomSpotPriceResponse(): QueryDenomSpotPriceResponse {
 }
 
 export const QueryDenomSpotPriceResponse = {
+  typeUrl: "/osmosis.txfees.v1beta1.QueryDenomSpotPriceResponse",
+  aminoType: "osmosis/txfees/query-denom-spot-price-response",
+
   encode(message: QueryDenomSpotPriceResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.poolID.isZero()) {
       writer.uint32(8).uint64(message.poolID);
@@ -494,6 +584,32 @@ export const QueryDenomSpotPriceResponse = {
     obj.poolID = message.poolID ? message.poolID.toString() : undefined;
     obj.spot_price = message.spotPrice;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDenomSpotPriceResponseAminoMsg): QueryDenomSpotPriceResponse {
+    return QueryDenomSpotPriceResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryDenomSpotPriceResponse): QueryDenomSpotPriceResponseAminoMsg {
+    return {
+      type: "osmosis/txfees/query-denom-spot-price-response",
+      value: QueryDenomSpotPriceResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryDenomSpotPriceResponseProtoMsg): QueryDenomSpotPriceResponse {
+    return QueryDenomSpotPriceResponse.decode(message.value);
+  },
+
+  toProto(message: QueryDenomSpotPriceResponse): Uint8Array {
+    return QueryDenomSpotPriceResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDenomSpotPriceResponse): QueryDenomSpotPriceResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.txfees.v1beta1.QueryDenomSpotPriceResponse",
+      value: QueryDenomSpotPriceResponse.encode(message).finish()
+    };
   }
 
 };
@@ -505,6 +621,9 @@ function createBaseQueryDenomPoolIdRequest(): QueryDenomPoolIdRequest {
 }
 
 export const QueryDenomPoolIdRequest = {
+  typeUrl: "/osmosis.txfees.v1beta1.QueryDenomPoolIdRequest",
+  aminoType: "osmosis/txfees/query-denom-pool-id-request",
+
   encode(message: QueryDenomPoolIdRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.denom !== "") {
       writer.uint32(10).string(message.denom);
@@ -575,6 +694,32 @@ export const QueryDenomPoolIdRequest = {
     const obj: any = {};
     obj.denom = message.denom;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDenomPoolIdRequestAminoMsg): QueryDenomPoolIdRequest {
+    return QueryDenomPoolIdRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryDenomPoolIdRequest): QueryDenomPoolIdRequestAminoMsg {
+    return {
+      type: "osmosis/txfees/query-denom-pool-id-request",
+      value: QueryDenomPoolIdRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryDenomPoolIdRequestProtoMsg): QueryDenomPoolIdRequest {
+    return QueryDenomPoolIdRequest.decode(message.value);
+  },
+
+  toProto(message: QueryDenomPoolIdRequest): Uint8Array {
+    return QueryDenomPoolIdRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDenomPoolIdRequest): QueryDenomPoolIdRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.txfees.v1beta1.QueryDenomPoolIdRequest",
+      value: QueryDenomPoolIdRequest.encode(message).finish()
+    };
   }
 
 };
@@ -586,6 +731,9 @@ function createBaseQueryDenomPoolIdResponse(): QueryDenomPoolIdResponse {
 }
 
 export const QueryDenomPoolIdResponse = {
+  typeUrl: "/osmosis.txfees.v1beta1.QueryDenomPoolIdResponse",
+  aminoType: "osmosis/txfees/query-denom-pool-id-response",
+
   encode(message: QueryDenomPoolIdResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.poolID.isZero()) {
       writer.uint32(8).uint64(message.poolID);
@@ -656,6 +804,32 @@ export const QueryDenomPoolIdResponse = {
     const obj: any = {};
     obj.poolID = message.poolID ? message.poolID.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryDenomPoolIdResponseAminoMsg): QueryDenomPoolIdResponse {
+    return QueryDenomPoolIdResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryDenomPoolIdResponse): QueryDenomPoolIdResponseAminoMsg {
+    return {
+      type: "osmosis/txfees/query-denom-pool-id-response",
+      value: QueryDenomPoolIdResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryDenomPoolIdResponseProtoMsg): QueryDenomPoolIdResponse {
+    return QueryDenomPoolIdResponse.decode(message.value);
+  },
+
+  toProto(message: QueryDenomPoolIdResponse): Uint8Array {
+    return QueryDenomPoolIdResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryDenomPoolIdResponse): QueryDenomPoolIdResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.txfees.v1beta1.QueryDenomPoolIdResponse",
+      value: QueryDenomPoolIdResponse.encode(message).finish()
+    };
   }
 
 };
@@ -665,6 +839,9 @@ function createBaseQueryBaseDenomRequest(): QueryBaseDenomRequest {
 }
 
 export const QueryBaseDenomRequest = {
+  typeUrl: "/osmosis.txfees.v1beta1.QueryBaseDenomRequest",
+  aminoType: "osmosis/txfees/query-base-denom-request",
+
   encode(_: QueryBaseDenomRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -717,6 +894,32 @@ export const QueryBaseDenomRequest = {
   toAmino(_: QueryBaseDenomRequest): QueryBaseDenomRequestAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: QueryBaseDenomRequestAminoMsg): QueryBaseDenomRequest {
+    return QueryBaseDenomRequest.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryBaseDenomRequest): QueryBaseDenomRequestAminoMsg {
+    return {
+      type: "osmosis/txfees/query-base-denom-request",
+      value: QueryBaseDenomRequest.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryBaseDenomRequestProtoMsg): QueryBaseDenomRequest {
+    return QueryBaseDenomRequest.decode(message.value);
+  },
+
+  toProto(message: QueryBaseDenomRequest): Uint8Array {
+    return QueryBaseDenomRequest.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryBaseDenomRequest): QueryBaseDenomRequestProtoMsg {
+    return {
+      typeUrl: "/osmosis.txfees.v1beta1.QueryBaseDenomRequest",
+      value: QueryBaseDenomRequest.encode(message).finish()
+    };
   }
 
 };
@@ -728,6 +931,9 @@ function createBaseQueryBaseDenomResponse(): QueryBaseDenomResponse {
 }
 
 export const QueryBaseDenomResponse = {
+  typeUrl: "/osmosis.txfees.v1beta1.QueryBaseDenomResponse",
+  aminoType: "osmosis/txfees/query-base-denom-response",
+
   encode(message: QueryBaseDenomResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.baseDenom !== "") {
       writer.uint32(10).string(message.baseDenom);
@@ -798,6 +1004,32 @@ export const QueryBaseDenomResponse = {
     const obj: any = {};
     obj.base_denom = message.baseDenom;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryBaseDenomResponseAminoMsg): QueryBaseDenomResponse {
+    return QueryBaseDenomResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryBaseDenomResponse): QueryBaseDenomResponseAminoMsg {
+    return {
+      type: "osmosis/txfees/query-base-denom-response",
+      value: QueryBaseDenomResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryBaseDenomResponseProtoMsg): QueryBaseDenomResponse {
+    return QueryBaseDenomResponse.decode(message.value);
+  },
+
+  toProto(message: QueryBaseDenomResponse): Uint8Array {
+    return QueryBaseDenomResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryBaseDenomResponse): QueryBaseDenomResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.txfees.v1beta1.QueryBaseDenomResponse",
+      value: QueryBaseDenomResponse.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/tendermint/abci/types.ts b/__fixtures__/outputv2/tendermint/abci/types.ts
index 5f407c10d..867ea583b 100644
--- a/__fixtures__/outputv2/tendermint/abci/types.ts
+++ b/__fixtures__/outputv2/tendermint/abci/types.ts
@@ -261,7 +261,7 @@ export interface Request {
   loadSnapshotChunk?: RequestLoadSnapshotChunk;
   applySnapshotChunk?: RequestApplySnapshotChunk;
 }
-export interface RequestProtoType {
+export interface RequestProtoMsg {
   typeUrl: "/tendermint.abci.Request";
   value: Uint8Array;
 }
@@ -282,7 +282,7 @@ export interface RequestAmino {
   load_snapshot_chunk?: RequestLoadSnapshotChunkAmino;
   apply_snapshot_chunk?: RequestApplySnapshotChunkAmino;
 }
-export interface RequestAminoType {
+export interface RequestAminoMsg {
   type: "/tendermint.abci.Request";
   value: RequestAmino;
 }
@@ -306,14 +306,14 @@ export interface RequestSDKType {
 export interface RequestEcho {
   message: string;
 }
-export interface RequestEchoProtoType {
+export interface RequestEchoProtoMsg {
   typeUrl: "/tendermint.abci.RequestEcho";
   value: Uint8Array;
 }
 export interface RequestEchoAmino {
   message: string;
 }
-export interface RequestEchoAminoType {
+export interface RequestEchoAminoMsg {
   type: "/tendermint.abci.RequestEcho";
   value: RequestEchoAmino;
 }
@@ -321,12 +321,12 @@ export interface RequestEchoSDKType {
   message: string;
 }
 export interface RequestFlush {}
-export interface RequestFlushProtoType {
+export interface RequestFlushProtoMsg {
   typeUrl: "/tendermint.abci.RequestFlush";
   value: Uint8Array;
 }
 export interface RequestFlushAmino {}
-export interface RequestFlushAminoType {
+export interface RequestFlushAminoMsg {
   type: "/tendermint.abci.RequestFlush";
   value: RequestFlushAmino;
 }
@@ -336,7 +336,7 @@ export interface RequestInfo {
   blockVersion: Long;
   p2pVersion: Long;
 }
-export interface RequestInfoProtoType {
+export interface RequestInfoProtoMsg {
   typeUrl: "/tendermint.abci.RequestInfo";
   value: Uint8Array;
 }
@@ -345,7 +345,7 @@ export interface RequestInfoAmino {
   block_version: string;
   p2p_version: string;
 }
-export interface RequestInfoAminoType {
+export interface RequestInfoAminoMsg {
   type: "/tendermint.abci.RequestInfo";
   value: RequestInfoAmino;
 }
@@ -360,7 +360,7 @@ export interface RequestSetOption {
   key: string;
   value: string;
 }
-export interface RequestSetOptionProtoType {
+export interface RequestSetOptionProtoMsg {
   typeUrl: "/tendermint.abci.RequestSetOption";
   value: Uint8Array;
 }
@@ -370,7 +370,7 @@ export interface RequestSetOptionAmino {
   key: string;
   value: string;
 }
-export interface RequestSetOptionAminoType {
+export interface RequestSetOptionAminoMsg {
   type: "/tendermint.abci.RequestSetOption";
   value: RequestSetOptionAmino;
 }
@@ -388,7 +388,7 @@ export interface RequestInitChain {
   appStateBytes: Uint8Array;
   initialHeight: Long;
 }
-export interface RequestInitChainProtoType {
+export interface RequestInitChainProtoMsg {
   typeUrl: "/tendermint.abci.RequestInitChain";
   value: Uint8Array;
 }
@@ -400,7 +400,7 @@ export interface RequestInitChainAmino {
   app_state_bytes: Uint8Array;
   initial_height: string;
 }
-export interface RequestInitChainAminoType {
+export interface RequestInitChainAminoMsg {
   type: "/tendermint.abci.RequestInitChain";
   value: RequestInitChainAmino;
 }
@@ -418,7 +418,7 @@ export interface RequestQuery {
   height: Long;
   prove: boolean;
 }
-export interface RequestQueryProtoType {
+export interface RequestQueryProtoMsg {
   typeUrl: "/tendermint.abci.RequestQuery";
   value: Uint8Array;
 }
@@ -428,7 +428,7 @@ export interface RequestQueryAmino {
   height: string;
   prove: boolean;
 }
-export interface RequestQueryAminoType {
+export interface RequestQueryAminoMsg {
   type: "/tendermint.abci.RequestQuery";
   value: RequestQueryAmino;
 }
@@ -444,7 +444,7 @@ export interface RequestBeginBlock {
   lastCommitInfo?: LastCommitInfo;
   byzantineValidators: Evidence[];
 }
-export interface RequestBeginBlockProtoType {
+export interface RequestBeginBlockProtoMsg {
   typeUrl: "/tendermint.abci.RequestBeginBlock";
   value: Uint8Array;
 }
@@ -454,7 +454,7 @@ export interface RequestBeginBlockAmino {
   last_commit_info?: LastCommitInfoAmino;
   byzantine_validators: EvidenceAmino[];
 }
-export interface RequestBeginBlockAminoType {
+export interface RequestBeginBlockAminoMsg {
   type: "/tendermint.abci.RequestBeginBlock";
   value: RequestBeginBlockAmino;
 }
@@ -468,7 +468,7 @@ export interface RequestCheckTx {
   tx: Uint8Array;
   type: CheckTxType;
 }
-export interface RequestCheckTxProtoType {
+export interface RequestCheckTxProtoMsg {
   typeUrl: "/tendermint.abci.RequestCheckTx";
   value: Uint8Array;
 }
@@ -476,7 +476,7 @@ export interface RequestCheckTxAmino {
   tx: Uint8Array;
   type: CheckTxType;
 }
-export interface RequestCheckTxAminoType {
+export interface RequestCheckTxAminoMsg {
   type: "/tendermint.abci.RequestCheckTx";
   value: RequestCheckTxAmino;
 }
@@ -487,14 +487,14 @@ export interface RequestCheckTxSDKType {
 export interface RequestDeliverTx {
   tx: Uint8Array;
 }
-export interface RequestDeliverTxProtoType {
+export interface RequestDeliverTxProtoMsg {
   typeUrl: "/tendermint.abci.RequestDeliverTx";
   value: Uint8Array;
 }
 export interface RequestDeliverTxAmino {
   tx: Uint8Array;
 }
-export interface RequestDeliverTxAminoType {
+export interface RequestDeliverTxAminoMsg {
   type: "/tendermint.abci.RequestDeliverTx";
   value: RequestDeliverTxAmino;
 }
@@ -504,14 +504,14 @@ export interface RequestDeliverTxSDKType {
 export interface RequestEndBlock {
   height: Long;
 }
-export interface RequestEndBlockProtoType {
+export interface RequestEndBlockProtoMsg {
   typeUrl: "/tendermint.abci.RequestEndBlock";
   value: Uint8Array;
 }
 export interface RequestEndBlockAmino {
   height: string;
 }
-export interface RequestEndBlockAminoType {
+export interface RequestEndBlockAminoMsg {
   type: "/tendermint.abci.RequestEndBlock";
   value: RequestEndBlockAmino;
 }
@@ -519,12 +519,12 @@ export interface RequestEndBlockSDKType {
   height: Long;
 }
 export interface RequestCommit {}
-export interface RequestCommitProtoType {
+export interface RequestCommitProtoMsg {
   typeUrl: "/tendermint.abci.RequestCommit";
   value: Uint8Array;
 }
 export interface RequestCommitAmino {}
-export interface RequestCommitAminoType {
+export interface RequestCommitAminoMsg {
   type: "/tendermint.abci.RequestCommit";
   value: RequestCommitAmino;
 }
@@ -532,14 +532,14 @@ export interface RequestCommitSDKType {}
 
 /** lists available snapshots */
 export interface RequestListSnapshots {}
-export interface RequestListSnapshotsProtoType {
+export interface RequestListSnapshotsProtoMsg {
   typeUrl: "/tendermint.abci.RequestListSnapshots";
   value: Uint8Array;
 }
 
 /** lists available snapshots */
 export interface RequestListSnapshotsAmino {}
-export interface RequestListSnapshotsAminoType {
+export interface RequestListSnapshotsAminoMsg {
   type: "/tendermint.abci.RequestListSnapshots";
   value: RequestListSnapshotsAmino;
 }
@@ -555,7 +555,7 @@ export interface RequestOfferSnapshot {
   /** light client-verified app hash for snapshot height */
   appHash: Uint8Array;
 }
-export interface RequestOfferSnapshotProtoType {
+export interface RequestOfferSnapshotProtoMsg {
   typeUrl: "/tendermint.abci.RequestOfferSnapshot";
   value: Uint8Array;
 }
@@ -568,7 +568,7 @@ export interface RequestOfferSnapshotAmino {
   /** light client-verified app hash for snapshot height */
   app_hash: Uint8Array;
 }
-export interface RequestOfferSnapshotAminoType {
+export interface RequestOfferSnapshotAminoMsg {
   type: "/tendermint.abci.RequestOfferSnapshot";
   value: RequestOfferSnapshotAmino;
 }
@@ -585,7 +585,7 @@ export interface RequestLoadSnapshotChunk {
   format: number;
   chunk: number;
 }
-export interface RequestLoadSnapshotChunkProtoType {
+export interface RequestLoadSnapshotChunkProtoMsg {
   typeUrl: "/tendermint.abci.RequestLoadSnapshotChunk";
   value: Uint8Array;
 }
@@ -596,7 +596,7 @@ export interface RequestLoadSnapshotChunkAmino {
   format: number;
   chunk: number;
 }
-export interface RequestLoadSnapshotChunkAminoType {
+export interface RequestLoadSnapshotChunkAminoMsg {
   type: "/tendermint.abci.RequestLoadSnapshotChunk";
   value: RequestLoadSnapshotChunkAmino;
 }
@@ -614,7 +614,7 @@ export interface RequestApplySnapshotChunk {
   chunk: Uint8Array;
   sender: string;
 }
-export interface RequestApplySnapshotChunkProtoType {
+export interface RequestApplySnapshotChunkProtoMsg {
   typeUrl: "/tendermint.abci.RequestApplySnapshotChunk";
   value: Uint8Array;
 }
@@ -625,7 +625,7 @@ export interface RequestApplySnapshotChunkAmino {
   chunk: Uint8Array;
   sender: string;
 }
-export interface RequestApplySnapshotChunkAminoType {
+export interface RequestApplySnapshotChunkAminoMsg {
   type: "/tendermint.abci.RequestApplySnapshotChunk";
   value: RequestApplySnapshotChunkAmino;
 }
@@ -654,7 +654,7 @@ export interface Response {
   loadSnapshotChunk?: ResponseLoadSnapshotChunk;
   applySnapshotChunk?: ResponseApplySnapshotChunk;
 }
-export interface ResponseProtoType {
+export interface ResponseProtoMsg {
   typeUrl: "/tendermint.abci.Response";
   value: Uint8Array;
 }
@@ -676,7 +676,7 @@ export interface ResponseAmino {
   load_snapshot_chunk?: ResponseLoadSnapshotChunkAmino;
   apply_snapshot_chunk?: ResponseApplySnapshotChunkAmino;
 }
-export interface ResponseAminoType {
+export interface ResponseAminoMsg {
   type: "/tendermint.abci.Response";
   value: ResponseAmino;
 }
@@ -703,7 +703,7 @@ export interface ResponseSDKType {
 export interface ResponseException {
   error: string;
 }
-export interface ResponseExceptionProtoType {
+export interface ResponseExceptionProtoMsg {
   typeUrl: "/tendermint.abci.ResponseException";
   value: Uint8Array;
 }
@@ -712,7 +712,7 @@ export interface ResponseExceptionProtoType {
 export interface ResponseExceptionAmino {
   error: string;
 }
-export interface ResponseExceptionAminoType {
+export interface ResponseExceptionAminoMsg {
   type: "/tendermint.abci.ResponseException";
   value: ResponseExceptionAmino;
 }
@@ -724,14 +724,14 @@ export interface ResponseExceptionSDKType {
 export interface ResponseEcho {
   message: string;
 }
-export interface ResponseEchoProtoType {
+export interface ResponseEchoProtoMsg {
   typeUrl: "/tendermint.abci.ResponseEcho";
   value: Uint8Array;
 }
 export interface ResponseEchoAmino {
   message: string;
 }
-export interface ResponseEchoAminoType {
+export interface ResponseEchoAminoMsg {
   type: "/tendermint.abci.ResponseEcho";
   value: ResponseEchoAmino;
 }
@@ -739,12 +739,12 @@ export interface ResponseEchoSDKType {
   message: string;
 }
 export interface ResponseFlush {}
-export interface ResponseFlushProtoType {
+export interface ResponseFlushProtoMsg {
   typeUrl: "/tendermint.abci.ResponseFlush";
   value: Uint8Array;
 }
 export interface ResponseFlushAmino {}
-export interface ResponseFlushAminoType {
+export interface ResponseFlushAminoMsg {
   type: "/tendermint.abci.ResponseFlush";
   value: ResponseFlushAmino;
 }
@@ -756,7 +756,7 @@ export interface ResponseInfo {
   lastBlockHeight: Long;
   lastBlockAppHash: Uint8Array;
 }
-export interface ResponseInfoProtoType {
+export interface ResponseInfoProtoMsg {
   typeUrl: "/tendermint.abci.ResponseInfo";
   value: Uint8Array;
 }
@@ -767,7 +767,7 @@ export interface ResponseInfoAmino {
   last_block_height: string;
   last_block_app_hash: Uint8Array;
 }
-export interface ResponseInfoAminoType {
+export interface ResponseInfoAminoMsg {
   type: "/tendermint.abci.ResponseInfo";
   value: ResponseInfoAmino;
 }
@@ -787,7 +787,7 @@ export interface ResponseSetOption {
   log: string;
   info: string;
 }
-export interface ResponseSetOptionProtoType {
+export interface ResponseSetOptionProtoMsg {
   typeUrl: "/tendermint.abci.ResponseSetOption";
   value: Uint8Array;
 }
@@ -800,7 +800,7 @@ export interface ResponseSetOptionAmino {
   log: string;
   info: string;
 }
-export interface ResponseSetOptionAminoType {
+export interface ResponseSetOptionAminoMsg {
   type: "/tendermint.abci.ResponseSetOption";
   value: ResponseSetOptionAmino;
 }
@@ -816,7 +816,7 @@ export interface ResponseInitChain {
   validators: ValidatorUpdate[];
   appHash: Uint8Array;
 }
-export interface ResponseInitChainProtoType {
+export interface ResponseInitChainProtoMsg {
   typeUrl: "/tendermint.abci.ResponseInitChain";
   value: Uint8Array;
 }
@@ -825,7 +825,7 @@ export interface ResponseInitChainAmino {
   validators: ValidatorUpdateAmino[];
   app_hash: Uint8Array;
 }
-export interface ResponseInitChainAminoType {
+export interface ResponseInitChainAminoMsg {
   type: "/tendermint.abci.ResponseInitChain";
   value: ResponseInitChainAmino;
 }
@@ -849,7 +849,7 @@ export interface ResponseQuery {
   height: Long;
   codespace: string;
 }
-export interface ResponseQueryProtoType {
+export interface ResponseQueryProtoMsg {
   typeUrl: "/tendermint.abci.ResponseQuery";
   value: Uint8Array;
 }
@@ -868,7 +868,7 @@ export interface ResponseQueryAmino {
   height: string;
   codespace: string;
 }
-export interface ResponseQueryAminoType {
+export interface ResponseQueryAminoMsg {
   type: "/tendermint.abci.ResponseQuery";
   value: ResponseQueryAmino;
 }
@@ -886,14 +886,14 @@ export interface ResponseQuerySDKType {
 export interface ResponseBeginBlock {
   events: Event[];
 }
-export interface ResponseBeginBlockProtoType {
+export interface ResponseBeginBlockProtoMsg {
   typeUrl: "/tendermint.abci.ResponseBeginBlock";
   value: Uint8Array;
 }
 export interface ResponseBeginBlockAmino {
   events: EventAmino[];
 }
-export interface ResponseBeginBlockAminoType {
+export interface ResponseBeginBlockAminoMsg {
   type: "/tendermint.abci.ResponseBeginBlock";
   value: ResponseBeginBlockAmino;
 }
@@ -914,7 +914,7 @@ export interface ResponseCheckTx {
   events: Event[];
   codespace: string;
 }
-export interface ResponseCheckTxProtoType {
+export interface ResponseCheckTxProtoMsg {
   typeUrl: "/tendermint.abci.ResponseCheckTx";
   value: Uint8Array;
 }
@@ -932,7 +932,7 @@ export interface ResponseCheckTxAmino {
   events: EventAmino[];
   codespace: string;
 }
-export interface ResponseCheckTxAminoType {
+export interface ResponseCheckTxAminoMsg {
   type: "/tendermint.abci.ResponseCheckTx";
   value: ResponseCheckTxAmino;
 }
@@ -960,7 +960,7 @@ export interface ResponseDeliverTx {
   events: Event[];
   codespace: string;
 }
-export interface ResponseDeliverTxProtoType {
+export interface ResponseDeliverTxProtoMsg {
   typeUrl: "/tendermint.abci.ResponseDeliverTx";
   value: Uint8Array;
 }
@@ -978,7 +978,7 @@ export interface ResponseDeliverTxAmino {
   events: EventAmino[];
   codespace: string;
 }
-export interface ResponseDeliverTxAminoType {
+export interface ResponseDeliverTxAminoMsg {
   type: "/tendermint.abci.ResponseDeliverTx";
   value: ResponseDeliverTxAmino;
 }
@@ -997,7 +997,7 @@ export interface ResponseEndBlock {
   consensusParamUpdates?: ConsensusParams;
   events: Event[];
 }
-export interface ResponseEndBlockProtoType {
+export interface ResponseEndBlockProtoMsg {
   typeUrl: "/tendermint.abci.ResponseEndBlock";
   value: Uint8Array;
 }
@@ -1006,7 +1006,7 @@ export interface ResponseEndBlockAmino {
   consensus_param_updates?: ConsensusParamsAmino;
   events: EventAmino[];
 }
-export interface ResponseEndBlockAminoType {
+export interface ResponseEndBlockAminoMsg {
   type: "/tendermint.abci.ResponseEndBlock";
   value: ResponseEndBlockAmino;
 }
@@ -1020,7 +1020,7 @@ export interface ResponseCommit {
   data: Uint8Array;
   retainHeight: Long;
 }
-export interface ResponseCommitProtoType {
+export interface ResponseCommitProtoMsg {
   typeUrl: "/tendermint.abci.ResponseCommit";
   value: Uint8Array;
 }
@@ -1029,7 +1029,7 @@ export interface ResponseCommitAmino {
   data: Uint8Array;
   retain_height: string;
 }
-export interface ResponseCommitAminoType {
+export interface ResponseCommitAminoMsg {
   type: "/tendermint.abci.ResponseCommit";
   value: ResponseCommitAmino;
 }
@@ -1040,14 +1040,14 @@ export interface ResponseCommitSDKType {
 export interface ResponseListSnapshots {
   snapshots: Snapshot[];
 }
-export interface ResponseListSnapshotsProtoType {
+export interface ResponseListSnapshotsProtoMsg {
   typeUrl: "/tendermint.abci.ResponseListSnapshots";
   value: Uint8Array;
 }
 export interface ResponseListSnapshotsAmino {
   snapshots: SnapshotAmino[];
 }
-export interface ResponseListSnapshotsAminoType {
+export interface ResponseListSnapshotsAminoMsg {
   type: "/tendermint.abci.ResponseListSnapshots";
   value: ResponseListSnapshotsAmino;
 }
@@ -1057,14 +1057,14 @@ export interface ResponseListSnapshotsSDKType {
 export interface ResponseOfferSnapshot {
   result: ResponseOfferSnapshot_Result;
 }
-export interface ResponseOfferSnapshotProtoType {
+export interface ResponseOfferSnapshotProtoMsg {
   typeUrl: "/tendermint.abci.ResponseOfferSnapshot";
   value: Uint8Array;
 }
 export interface ResponseOfferSnapshotAmino {
   result: ResponseOfferSnapshot_Result;
 }
-export interface ResponseOfferSnapshotAminoType {
+export interface ResponseOfferSnapshotAminoMsg {
   type: "/tendermint.abci.ResponseOfferSnapshot";
   value: ResponseOfferSnapshotAmino;
 }
@@ -1074,14 +1074,14 @@ export interface ResponseOfferSnapshotSDKType {
 export interface ResponseLoadSnapshotChunk {
   chunk: Uint8Array;
 }
-export interface ResponseLoadSnapshotChunkProtoType {
+export interface ResponseLoadSnapshotChunkProtoMsg {
   typeUrl: "/tendermint.abci.ResponseLoadSnapshotChunk";
   value: Uint8Array;
 }
 export interface ResponseLoadSnapshotChunkAmino {
   chunk: Uint8Array;
 }
-export interface ResponseLoadSnapshotChunkAminoType {
+export interface ResponseLoadSnapshotChunkAminoMsg {
   type: "/tendermint.abci.ResponseLoadSnapshotChunk";
   value: ResponseLoadSnapshotChunkAmino;
 }
@@ -1097,7 +1097,7 @@ export interface ResponseApplySnapshotChunk {
   /** Chunk senders to reject and ban */
   rejectSenders: string[];
 }
-export interface ResponseApplySnapshotChunkProtoType {
+export interface ResponseApplySnapshotChunkProtoMsg {
   typeUrl: "/tendermint.abci.ResponseApplySnapshotChunk";
   value: Uint8Array;
 }
@@ -1110,7 +1110,7 @@ export interface ResponseApplySnapshotChunkAmino {
   /** Chunk senders to reject and ban */
   reject_senders: string[];
 }
-export interface ResponseApplySnapshotChunkAminoType {
+export interface ResponseApplySnapshotChunkAminoMsg {
   type: "/tendermint.abci.ResponseApplySnapshotChunk";
   value: ResponseApplySnapshotChunkAmino;
 }
@@ -1130,7 +1130,7 @@ export interface ConsensusParams {
   validator?: ValidatorParams;
   version?: VersionParams;
 }
-export interface ConsensusParamsProtoType {
+export interface ConsensusParamsProtoMsg {
   typeUrl: "/tendermint.abci.ConsensusParams";
   value: Uint8Array;
 }
@@ -1145,7 +1145,7 @@ export interface ConsensusParamsAmino {
   validator?: ValidatorParamsAmino;
   version?: VersionParamsAmino;
 }
-export interface ConsensusParamsAminoType {
+export interface ConsensusParamsAminoMsg {
   type: "/tendermint.abci.ConsensusParams";
   value: ConsensusParamsAmino;
 }
@@ -1169,7 +1169,7 @@ export interface BlockParams {
   /** Note: must be greater or equal to -1 */
   maxGas: Long;
 }
-export interface BlockParamsProtoType {
+export interface BlockParamsProtoMsg {
   typeUrl: "/tendermint.abci.BlockParams";
   value: Uint8Array;
 }
@@ -1182,7 +1182,7 @@ export interface BlockParamsAmino {
   /** Note: must be greater or equal to -1 */
   max_gas: string;
 }
-export interface BlockParamsAminoType {
+export interface BlockParamsAminoMsg {
   type: "/tendermint.abci.BlockParams";
   value: BlockParamsAmino;
 }
@@ -1196,7 +1196,7 @@ export interface LastCommitInfo {
   round: number;
   votes: VoteInfo[];
 }
-export interface LastCommitInfoProtoType {
+export interface LastCommitInfoProtoMsg {
   typeUrl: "/tendermint.abci.LastCommitInfo";
   value: Uint8Array;
 }
@@ -1204,7 +1204,7 @@ export interface LastCommitInfoAmino {
   round: number;
   votes: VoteInfoAmino[];
 }
-export interface LastCommitInfoAminoType {
+export interface LastCommitInfoAminoMsg {
   type: "/tendermint.abci.LastCommitInfo";
   value: LastCommitInfoAmino;
 }
@@ -1222,7 +1222,7 @@ export interface Event {
   type: string;
   attributes: EventAttribute[];
 }
-export interface EventProtoType {
+export interface EventProtoMsg {
   typeUrl: "/tendermint.abci.Event";
   value: Uint8Array;
 }
@@ -1236,7 +1236,7 @@ export interface EventAmino {
   type: string;
   attributes: EventAttributeAmino[];
 }
-export interface EventAminoType {
+export interface EventAminoMsg {
   type: "/tendermint.abci.Event";
   value: EventAmino;
 }
@@ -1259,7 +1259,7 @@ export interface EventAttribute {
   /** nondeterministic */
   index: boolean;
 }
-export interface EventAttributeProtoType {
+export interface EventAttributeProtoMsg {
   typeUrl: "/tendermint.abci.EventAttribute";
   value: Uint8Array;
 }
@@ -1272,7 +1272,7 @@ export interface EventAttributeAmino {
   /** nondeterministic */
   index: boolean;
 }
-export interface EventAttributeAminoType {
+export interface EventAttributeAminoMsg {
   type: "/tendermint.abci.EventAttribute";
   value: EventAttributeAmino;
 }
@@ -1295,7 +1295,7 @@ export interface TxResult {
   tx: Uint8Array;
   result?: ResponseDeliverTx;
 }
-export interface TxResultProtoType {
+export interface TxResultProtoMsg {
   typeUrl: "/tendermint.abci.TxResult";
   value: Uint8Array;
 }
@@ -1311,7 +1311,7 @@ export interface TxResultAmino {
   tx: Uint8Array;
   result?: ResponseDeliverTxAmino;
 }
-export interface TxResultAminoType {
+export interface TxResultAminoMsg {
   type: "/tendermint.abci.TxResult";
   value: TxResultAmino;
 }
@@ -1339,7 +1339,7 @@ export interface Validator {
   /** The voting power */
   power: Long;
 }
-export interface ValidatorProtoType {
+export interface ValidatorProtoMsg {
   typeUrl: "/tendermint.abci.Validator";
   value: Uint8Array;
 }
@@ -1355,7 +1355,7 @@ export interface ValidatorAmino {
   /** The voting power */
   power: string;
 }
-export interface ValidatorAminoType {
+export interface ValidatorAminoMsg {
   type: "/tendermint.abci.Validator";
   value: ValidatorAmino;
 }
@@ -1371,7 +1371,7 @@ export interface ValidatorUpdate {
   pubKey?: PublicKey;
   power: Long;
 }
-export interface ValidatorUpdateProtoType {
+export interface ValidatorUpdateProtoMsg {
   typeUrl: "/tendermint.abci.ValidatorUpdate";
   value: Uint8Array;
 }
@@ -1381,7 +1381,7 @@ export interface ValidatorUpdateAmino {
   pub_key?: PublicKeyAmino;
   power: string;
 }
-export interface ValidatorUpdateAminoType {
+export interface ValidatorUpdateAminoMsg {
   type: "/tendermint.abci.ValidatorUpdate";
   value: ValidatorUpdateAmino;
 }
@@ -1397,7 +1397,7 @@ export interface VoteInfo {
   validator?: Validator;
   signedLastBlock: boolean;
 }
-export interface VoteInfoProtoType {
+export interface VoteInfoProtoMsg {
   typeUrl: "/tendermint.abci.VoteInfo";
   value: Uint8Array;
 }
@@ -1407,7 +1407,7 @@ export interface VoteInfoAmino {
   validator?: ValidatorAmino;
   signed_last_block: boolean;
 }
-export interface VoteInfoAminoType {
+export interface VoteInfoAminoMsg {
   type: "/tendermint.abci.VoteInfo";
   value: VoteInfoAmino;
 }
@@ -1436,7 +1436,7 @@ export interface Evidence {
    */
   totalVotingPower: Long;
 }
-export interface EvidenceProtoType {
+export interface EvidenceProtoMsg {
   typeUrl: "/tendermint.abci.Evidence";
   value: Uint8Array;
 }
@@ -1459,7 +1459,7 @@ export interface EvidenceAmino {
    */
   total_voting_power: string;
 }
-export interface EvidenceAminoType {
+export interface EvidenceAminoMsg {
   type: "/tendermint.abci.Evidence";
   value: EvidenceAmino;
 }
@@ -1486,7 +1486,7 @@ export interface Snapshot {
   /** Arbitrary application metadata */
   metadata: Uint8Array;
 }
-export interface SnapshotProtoType {
+export interface SnapshotProtoMsg {
   typeUrl: "/tendermint.abci.Snapshot";
   value: Uint8Array;
 }
@@ -1506,7 +1506,7 @@ export interface SnapshotAmino {
   /** Arbitrary application metadata */
   metadata: Uint8Array;
 }
-export interface SnapshotAminoType {
+export interface SnapshotAminoMsg {
   type: "/tendermint.abci.Snapshot";
   value: SnapshotAmino;
 }
@@ -1539,6 +1539,8 @@ function createBaseRequest(): Request {
 }
 
 export const Request = {
+  typeUrl: "/tendermint.abci.Request",
+
   encode(message: Request, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.echo !== undefined) {
       RequestEcho.encode(message.echo, writer.uint32(10).fork()).ldelim();
@@ -1819,6 +1821,25 @@ export const Request = {
     obj.load_snapshot_chunk = message.loadSnapshotChunk ? RequestLoadSnapshotChunk.toAmino(message.loadSnapshotChunk) : undefined;
     obj.apply_snapshot_chunk = message.applySnapshotChunk ? RequestApplySnapshotChunk.toAmino(message.applySnapshotChunk) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: RequestAminoMsg): Request {
+    return Request.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: RequestProtoMsg): Request {
+    return Request.decode(message.value);
+  },
+
+  toProto(message: Request): Uint8Array {
+    return Request.encode(message).finish();
+  },
+
+  toProtoMsg(message: Request): RequestProtoMsg {
+    return {
+      typeUrl: "/tendermint.abci.Request",
+      value: Request.encode(message).finish()
+    };
   }
 
 };
@@ -1830,6 +1851,8 @@ function createBaseRequestEcho(): RequestEcho {
 }
 
 export const RequestEcho = {
+  typeUrl: "/tendermint.abci.RequestEcho",
+
   encode(message: RequestEcho, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.message !== "") {
       writer.uint32(10).string(message.message);
@@ -1900,6 +1923,25 @@ export const RequestEcho = {
     const obj: any = {};
     obj.message = message.message;
     return obj;
+  },
+
+  fromAminoMsg(object: RequestEchoAminoMsg): RequestEcho {
+    return RequestEcho.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: RequestEchoProtoMsg): RequestEcho {
+    return RequestEcho.decode(message.value);
+  },
+
+  toProto(message: RequestEcho): Uint8Array {
+    return RequestEcho.encode(message).finish();
+  },
+
+  toProtoMsg(message: RequestEcho): RequestEchoProtoMsg {
+    return {
+      typeUrl: "/tendermint.abci.RequestEcho",
+      value: RequestEcho.encode(message).finish()
+    };
   }
 
 };
@@ -1909,6 +1951,8 @@ function createBaseRequestFlush(): RequestFlush {
 }
 
 export const RequestFlush = {
+  typeUrl: "/tendermint.abci.RequestFlush",
+
   encode(_: RequestFlush, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -1961,6 +2005,25 @@ export const RequestFlush = {
   toAmino(_: RequestFlush): RequestFlushAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: RequestFlushAminoMsg): RequestFlush {
+    return RequestFlush.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: RequestFlushProtoMsg): RequestFlush {
+    return RequestFlush.decode(message.value);
+  },
+
+  toProto(message: RequestFlush): Uint8Array {
+    return RequestFlush.encode(message).finish();
+  },
+
+  toProtoMsg(message: RequestFlush): RequestFlushProtoMsg {
+    return {
+      typeUrl: "/tendermint.abci.RequestFlush",
+      value: RequestFlush.encode(message).finish()
+    };
   }
 
 };
@@ -1974,6 +2037,8 @@ function createBaseRequestInfo(): RequestInfo {
 }
 
 export const RequestInfo = {
+  typeUrl: "/tendermint.abci.RequestInfo",
+
   encode(message: RequestInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.version !== "") {
       writer.uint32(10).string(message.version);
@@ -2074,6 +2139,25 @@ export const RequestInfo = {
     obj.block_version = message.blockVersion ? message.blockVersion.toString() : undefined;
     obj.p2p_version = message.p2pVersion ? message.p2pVersion.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: RequestInfoAminoMsg): RequestInfo {
+    return RequestInfo.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: RequestInfoProtoMsg): RequestInfo {
+    return RequestInfo.decode(message.value);
+  },
+
+  toProto(message: RequestInfo): Uint8Array {
+    return RequestInfo.encode(message).finish();
+  },
+
+  toProtoMsg(message: RequestInfo): RequestInfoProtoMsg {
+    return {
+      typeUrl: "/tendermint.abci.RequestInfo",
+      value: RequestInfo.encode(message).finish()
+    };
   }
 
 };
@@ -2086,6 +2170,8 @@ function createBaseRequestSetOption(): RequestSetOption {
 }
 
 export const RequestSetOption = {
+  typeUrl: "/tendermint.abci.RequestSetOption",
+
   encode(message: RequestSetOption, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.key !== "") {
       writer.uint32(10).string(message.key);
@@ -2171,6 +2257,25 @@ export const RequestSetOption = {
     obj.key = message.key;
     obj.value = message.value;
     return obj;
+  },
+
+  fromAminoMsg(object: RequestSetOptionAminoMsg): RequestSetOption {
+    return RequestSetOption.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: RequestSetOptionProtoMsg): RequestSetOption {
+    return RequestSetOption.decode(message.value);
+  },
+
+  toProto(message: RequestSetOption): Uint8Array {
+    return RequestSetOption.encode(message).finish();
+  },
+
+  toProtoMsg(message: RequestSetOption): RequestSetOptionProtoMsg {
+    return {
+      typeUrl: "/tendermint.abci.RequestSetOption",
+      value: RequestSetOption.encode(message).finish()
+    };
   }
 
 };
@@ -2187,6 +2292,8 @@ function createBaseRequestInitChain(): RequestInitChain {
 }
 
 export const RequestInitChain = {
+  typeUrl: "/tendermint.abci.RequestInitChain",
+
   encode(message: RequestInitChain, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.time !== undefined) {
       Timestamp.encode(toTimestamp(message.time), writer.uint32(10).fork()).ldelim();
@@ -2350,6 +2457,25 @@ export const RequestInitChain = {
     obj.app_state_bytes = message.appStateBytes;
     obj.initial_height = message.initialHeight ? message.initialHeight.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: RequestInitChainAminoMsg): RequestInitChain {
+    return RequestInitChain.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: RequestInitChainProtoMsg): RequestInitChain {
+    return RequestInitChain.decode(message.value);
+  },
+
+  toProto(message: RequestInitChain): Uint8Array {
+    return RequestInitChain.encode(message).finish();
+  },
+
+  toProtoMsg(message: RequestInitChain): RequestInitChainProtoMsg {
+    return {
+      typeUrl: "/tendermint.abci.RequestInitChain",
+      value: RequestInitChain.encode(message).finish()
+    };
   }
 
 };
@@ -2364,6 +2490,8 @@ function createBaseRequestQuery(): RequestQuery {
 }
 
 export const RequestQuery = {
+  typeUrl: "/tendermint.abci.RequestQuery",
+
   encode(message: RequestQuery, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.data.length !== 0) {
       writer.uint32(10).bytes(message.data);
@@ -2479,6 +2607,25 @@ export const RequestQuery = {
     obj.height = message.height ? message.height.toString() : undefined;
     obj.prove = message.prove;
     return obj;
+  },
+
+  fromAminoMsg(object: RequestQueryAminoMsg): RequestQuery {
+    return RequestQuery.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: RequestQueryProtoMsg): RequestQuery {
+    return RequestQuery.decode(message.value);
+  },
+
+  toProto(message: RequestQuery): Uint8Array {
+    return RequestQuery.encode(message).finish();
+  },
+
+  toProtoMsg(message: RequestQuery): RequestQueryProtoMsg {
+    return {
+      typeUrl: "/tendermint.abci.RequestQuery",
+      value: RequestQuery.encode(message).finish()
+    };
   }
 
 };
@@ -2493,6 +2640,8 @@ function createBaseRequestBeginBlock(): RequestBeginBlock {
 }
 
 export const RequestBeginBlock = {
+  typeUrl: "/tendermint.abci.RequestBeginBlock",
+
   encode(message: RequestBeginBlock, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.hash.length !== 0) {
       writer.uint32(10).bytes(message.hash);
@@ -2626,6 +2775,25 @@ export const RequestBeginBlock = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: RequestBeginBlockAminoMsg): RequestBeginBlock {
+    return RequestBeginBlock.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: RequestBeginBlockProtoMsg): RequestBeginBlock {
+    return RequestBeginBlock.decode(message.value);
+  },
+
+  toProto(message: RequestBeginBlock): Uint8Array {
+    return RequestBeginBlock.encode(message).finish();
+  },
+
+  toProtoMsg(message: RequestBeginBlock): RequestBeginBlockProtoMsg {
+    return {
+      typeUrl: "/tendermint.abci.RequestBeginBlock",
+      value: RequestBeginBlock.encode(message).finish()
+    };
   }
 
 };
@@ -2638,6 +2806,8 @@ function createBaseRequestCheckTx(): RequestCheckTx {
 }
 
 export const RequestCheckTx = {
+  typeUrl: "/tendermint.abci.RequestCheckTx",
+
   encode(message: RequestCheckTx, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.tx.length !== 0) {
       writer.uint32(10).bytes(message.tx);
@@ -2723,6 +2893,25 @@ export const RequestCheckTx = {
     obj.tx = message.tx;
     obj.type = message.type;
     return obj;
+  },
+
+  fromAminoMsg(object: RequestCheckTxAminoMsg): RequestCheckTx {
+    return RequestCheckTx.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: RequestCheckTxProtoMsg): RequestCheckTx {
+    return RequestCheckTx.decode(message.value);
+  },
+
+  toProto(message: RequestCheckTx): Uint8Array {
+    return RequestCheckTx.encode(message).finish();
+  },
+
+  toProtoMsg(message: RequestCheckTx): RequestCheckTxProtoMsg {
+    return {
+      typeUrl: "/tendermint.abci.RequestCheckTx",
+      value: RequestCheckTx.encode(message).finish()
+    };
   }
 
 };
@@ -2734,6 +2923,8 @@ function createBaseRequestDeliverTx(): RequestDeliverTx {
 }
 
 export const RequestDeliverTx = {
+  typeUrl: "/tendermint.abci.RequestDeliverTx",
+
   encode(message: RequestDeliverTx, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.tx.length !== 0) {
       writer.uint32(10).bytes(message.tx);
@@ -2804,6 +2995,25 @@ export const RequestDeliverTx = {
     const obj: any = {};
     obj.tx = message.tx;
     return obj;
+  },
+
+  fromAminoMsg(object: RequestDeliverTxAminoMsg): RequestDeliverTx {
+    return RequestDeliverTx.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: RequestDeliverTxProtoMsg): RequestDeliverTx {
+    return RequestDeliverTx.decode(message.value);
+  },
+
+  toProto(message: RequestDeliverTx): Uint8Array {
+    return RequestDeliverTx.encode(message).finish();
+  },
+
+  toProtoMsg(message: RequestDeliverTx): RequestDeliverTxProtoMsg {
+    return {
+      typeUrl: "/tendermint.abci.RequestDeliverTx",
+      value: RequestDeliverTx.encode(message).finish()
+    };
   }
 
 };
@@ -2815,6 +3025,8 @@ function createBaseRequestEndBlock(): RequestEndBlock {
 }
 
 export const RequestEndBlock = {
+  typeUrl: "/tendermint.abci.RequestEndBlock",
+
   encode(message: RequestEndBlock, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.height.isZero()) {
       writer.uint32(8).int64(message.height);
@@ -2885,6 +3097,25 @@ export const RequestEndBlock = {
     const obj: any = {};
     obj.height = message.height ? message.height.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: RequestEndBlockAminoMsg): RequestEndBlock {
+    return RequestEndBlock.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: RequestEndBlockProtoMsg): RequestEndBlock {
+    return RequestEndBlock.decode(message.value);
+  },
+
+  toProto(message: RequestEndBlock): Uint8Array {
+    return RequestEndBlock.encode(message).finish();
+  },
+
+  toProtoMsg(message: RequestEndBlock): RequestEndBlockProtoMsg {
+    return {
+      typeUrl: "/tendermint.abci.RequestEndBlock",
+      value: RequestEndBlock.encode(message).finish()
+    };
   }
 
 };
@@ -2894,6 +3125,8 @@ function createBaseRequestCommit(): RequestCommit {
 }
 
 export const RequestCommit = {
+  typeUrl: "/tendermint.abci.RequestCommit",
+
   encode(_: RequestCommit, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -2946,6 +3179,25 @@ export const RequestCommit = {
   toAmino(_: RequestCommit): RequestCommitAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: RequestCommitAminoMsg): RequestCommit {
+    return RequestCommit.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: RequestCommitProtoMsg): RequestCommit {
+    return RequestCommit.decode(message.value);
+  },
+
+  toProto(message: RequestCommit): Uint8Array {
+    return RequestCommit.encode(message).finish();
+  },
+
+  toProtoMsg(message: RequestCommit): RequestCommitProtoMsg {
+    return {
+      typeUrl: "/tendermint.abci.RequestCommit",
+      value: RequestCommit.encode(message).finish()
+    };
   }
 
 };
@@ -2955,6 +3207,8 @@ function createBaseRequestListSnapshots(): RequestListSnapshots {
 }
 
 export const RequestListSnapshots = {
+  typeUrl: "/tendermint.abci.RequestListSnapshots",
+
   encode(_: RequestListSnapshots, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -3007,6 +3261,25 @@ export const RequestListSnapshots = {
   toAmino(_: RequestListSnapshots): RequestListSnapshotsAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: RequestListSnapshotsAminoMsg): RequestListSnapshots {
+    return RequestListSnapshots.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: RequestListSnapshotsProtoMsg): RequestListSnapshots {
+    return RequestListSnapshots.decode(message.value);
+  },
+
+  toProto(message: RequestListSnapshots): Uint8Array {
+    return RequestListSnapshots.encode(message).finish();
+  },
+
+  toProtoMsg(message: RequestListSnapshots): RequestListSnapshotsProtoMsg {
+    return {
+      typeUrl: "/tendermint.abci.RequestListSnapshots",
+      value: RequestListSnapshots.encode(message).finish()
+    };
   }
 
 };
@@ -3019,6 +3292,8 @@ function createBaseRequestOfferSnapshot(): RequestOfferSnapshot {
 }
 
 export const RequestOfferSnapshot = {
+  typeUrl: "/tendermint.abci.RequestOfferSnapshot",
+
   encode(message: RequestOfferSnapshot, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.snapshot !== undefined) {
       Snapshot.encode(message.snapshot, writer.uint32(10).fork()).ldelim();
@@ -3104,6 +3379,25 @@ export const RequestOfferSnapshot = {
     obj.snapshot = message.snapshot ? Snapshot.toAmino(message.snapshot) : undefined;
     obj.app_hash = message.appHash;
     return obj;
+  },
+
+  fromAminoMsg(object: RequestOfferSnapshotAminoMsg): RequestOfferSnapshot {
+    return RequestOfferSnapshot.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: RequestOfferSnapshotProtoMsg): RequestOfferSnapshot {
+    return RequestOfferSnapshot.decode(message.value);
+  },
+
+  toProto(message: RequestOfferSnapshot): Uint8Array {
+    return RequestOfferSnapshot.encode(message).finish();
+  },
+
+  toProtoMsg(message: RequestOfferSnapshot): RequestOfferSnapshotProtoMsg {
+    return {
+      typeUrl: "/tendermint.abci.RequestOfferSnapshot",
+      value: RequestOfferSnapshot.encode(message).finish()
+    };
   }
 
 };
@@ -3117,6 +3411,8 @@ function createBaseRequestLoadSnapshotChunk(): RequestLoadSnapshotChunk {
 }
 
 export const RequestLoadSnapshotChunk = {
+  typeUrl: "/tendermint.abci.RequestLoadSnapshotChunk",
+
   encode(message: RequestLoadSnapshotChunk, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.height.isZero()) {
       writer.uint32(8).uint64(message.height);
@@ -3217,6 +3513,25 @@ export const RequestLoadSnapshotChunk = {
     obj.format = message.format;
     obj.chunk = message.chunk;
     return obj;
+  },
+
+  fromAminoMsg(object: RequestLoadSnapshotChunkAminoMsg): RequestLoadSnapshotChunk {
+    return RequestLoadSnapshotChunk.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: RequestLoadSnapshotChunkProtoMsg): RequestLoadSnapshotChunk {
+    return RequestLoadSnapshotChunk.decode(message.value);
+  },
+
+  toProto(message: RequestLoadSnapshotChunk): Uint8Array {
+    return RequestLoadSnapshotChunk.encode(message).finish();
+  },
+
+  toProtoMsg(message: RequestLoadSnapshotChunk): RequestLoadSnapshotChunkProtoMsg {
+    return {
+      typeUrl: "/tendermint.abci.RequestLoadSnapshotChunk",
+      value: RequestLoadSnapshotChunk.encode(message).finish()
+    };
   }
 
 };
@@ -3230,6 +3545,8 @@ function createBaseRequestApplySnapshotChunk(): RequestApplySnapshotChunk {
 }
 
 export const RequestApplySnapshotChunk = {
+  typeUrl: "/tendermint.abci.RequestApplySnapshotChunk",
+
   encode(message: RequestApplySnapshotChunk, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.index !== 0) {
       writer.uint32(8).uint32(message.index);
@@ -3330,6 +3647,25 @@ export const RequestApplySnapshotChunk = {
     obj.chunk = message.chunk;
     obj.sender = message.sender;
     return obj;
+  },
+
+  fromAminoMsg(object: RequestApplySnapshotChunkAminoMsg): RequestApplySnapshotChunk {
+    return RequestApplySnapshotChunk.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: RequestApplySnapshotChunkProtoMsg): RequestApplySnapshotChunk {
+    return RequestApplySnapshotChunk.decode(message.value);
+  },
+
+  toProto(message: RequestApplySnapshotChunk): Uint8Array {
+    return RequestApplySnapshotChunk.encode(message).finish();
+  },
+
+  toProtoMsg(message: RequestApplySnapshotChunk): RequestApplySnapshotChunkProtoMsg {
+    return {
+      typeUrl: "/tendermint.abci.RequestApplySnapshotChunk",
+      value: RequestApplySnapshotChunk.encode(message).finish()
+    };
   }
 
 };
@@ -3356,6 +3692,8 @@ function createBaseResponse(): Response {
 }
 
 export const Response = {
+  typeUrl: "/tendermint.abci.Response",
+
   encode(message: Response, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.exception !== undefined) {
       ResponseException.encode(message.exception, writer.uint32(10).fork()).ldelim();
@@ -3651,6 +3989,25 @@ export const Response = {
     obj.load_snapshot_chunk = message.loadSnapshotChunk ? ResponseLoadSnapshotChunk.toAmino(message.loadSnapshotChunk) : undefined;
     obj.apply_snapshot_chunk = message.applySnapshotChunk ? ResponseApplySnapshotChunk.toAmino(message.applySnapshotChunk) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ResponseAminoMsg): Response {
+    return Response.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ResponseProtoMsg): Response {
+    return Response.decode(message.value);
+  },
+
+  toProto(message: Response): Uint8Array {
+    return Response.encode(message).finish();
+  },
+
+  toProtoMsg(message: Response): ResponseProtoMsg {
+    return {
+      typeUrl: "/tendermint.abci.Response",
+      value: Response.encode(message).finish()
+    };
   }
 
 };
@@ -3662,6 +4019,8 @@ function createBaseResponseException(): ResponseException {
 }
 
 export const ResponseException = {
+  typeUrl: "/tendermint.abci.ResponseException",
+
   encode(message: ResponseException, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.error !== "") {
       writer.uint32(10).string(message.error);
@@ -3732,6 +4091,25 @@ export const ResponseException = {
     const obj: any = {};
     obj.error = message.error;
     return obj;
+  },
+
+  fromAminoMsg(object: ResponseExceptionAminoMsg): ResponseException {
+    return ResponseException.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ResponseExceptionProtoMsg): ResponseException {
+    return ResponseException.decode(message.value);
+  },
+
+  toProto(message: ResponseException): Uint8Array {
+    return ResponseException.encode(message).finish();
+  },
+
+  toProtoMsg(message: ResponseException): ResponseExceptionProtoMsg {
+    return {
+      typeUrl: "/tendermint.abci.ResponseException",
+      value: ResponseException.encode(message).finish()
+    };
   }
 
 };
@@ -3743,6 +4121,8 @@ function createBaseResponseEcho(): ResponseEcho {
 }
 
 export const ResponseEcho = {
+  typeUrl: "/tendermint.abci.ResponseEcho",
+
   encode(message: ResponseEcho, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.message !== "") {
       writer.uint32(10).string(message.message);
@@ -3813,6 +4193,25 @@ export const ResponseEcho = {
     const obj: any = {};
     obj.message = message.message;
     return obj;
+  },
+
+  fromAminoMsg(object: ResponseEchoAminoMsg): ResponseEcho {
+    return ResponseEcho.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ResponseEchoProtoMsg): ResponseEcho {
+    return ResponseEcho.decode(message.value);
+  },
+
+  toProto(message: ResponseEcho): Uint8Array {
+    return ResponseEcho.encode(message).finish();
+  },
+
+  toProtoMsg(message: ResponseEcho): ResponseEchoProtoMsg {
+    return {
+      typeUrl: "/tendermint.abci.ResponseEcho",
+      value: ResponseEcho.encode(message).finish()
+    };
   }
 
 };
@@ -3822,6 +4221,8 @@ function createBaseResponseFlush(): ResponseFlush {
 }
 
 export const ResponseFlush = {
+  typeUrl: "/tendermint.abci.ResponseFlush",
+
   encode(_: ResponseFlush, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
@@ -3874,6 +4275,25 @@ export const ResponseFlush = {
   toAmino(_: ResponseFlush): ResponseFlushAmino {
     const obj: any = {};
     return obj;
+  },
+
+  fromAminoMsg(object: ResponseFlushAminoMsg): ResponseFlush {
+    return ResponseFlush.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ResponseFlushProtoMsg): ResponseFlush {
+    return ResponseFlush.decode(message.value);
+  },
+
+  toProto(message: ResponseFlush): Uint8Array {
+    return ResponseFlush.encode(message).finish();
+  },
+
+  toProtoMsg(message: ResponseFlush): ResponseFlushProtoMsg {
+    return {
+      typeUrl: "/tendermint.abci.ResponseFlush",
+      value: ResponseFlush.encode(message).finish()
+    };
   }
 
 };
@@ -3889,6 +4309,8 @@ function createBaseResponseInfo(): ResponseInfo {
 }
 
 export const ResponseInfo = {
+  typeUrl: "/tendermint.abci.ResponseInfo",
+
   encode(message: ResponseInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.data !== "") {
       writer.uint32(10).string(message.data);
@@ -4019,6 +4441,25 @@ export const ResponseInfo = {
     obj.last_block_height = message.lastBlockHeight ? message.lastBlockHeight.toString() : undefined;
     obj.last_block_app_hash = message.lastBlockAppHash;
     return obj;
+  },
+
+  fromAminoMsg(object: ResponseInfoAminoMsg): ResponseInfo {
+    return ResponseInfo.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ResponseInfoProtoMsg): ResponseInfo {
+    return ResponseInfo.decode(message.value);
+  },
+
+  toProto(message: ResponseInfo): Uint8Array {
+    return ResponseInfo.encode(message).finish();
+  },
+
+  toProtoMsg(message: ResponseInfo): ResponseInfoProtoMsg {
+    return {
+      typeUrl: "/tendermint.abci.ResponseInfo",
+      value: ResponseInfo.encode(message).finish()
+    };
   }
 
 };
@@ -4032,6 +4473,8 @@ function createBaseResponseSetOption(): ResponseSetOption {
 }
 
 export const ResponseSetOption = {
+  typeUrl: "/tendermint.abci.ResponseSetOption",
+
   encode(message: ResponseSetOption, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.code !== 0) {
       writer.uint32(8).uint32(message.code);
@@ -4132,6 +4575,25 @@ export const ResponseSetOption = {
     obj.log = message.log;
     obj.info = message.info;
     return obj;
+  },
+
+  fromAminoMsg(object: ResponseSetOptionAminoMsg): ResponseSetOption {
+    return ResponseSetOption.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ResponseSetOptionProtoMsg): ResponseSetOption {
+    return ResponseSetOption.decode(message.value);
+  },
+
+  toProto(message: ResponseSetOption): Uint8Array {
+    return ResponseSetOption.encode(message).finish();
+  },
+
+  toProtoMsg(message: ResponseSetOption): ResponseSetOptionProtoMsg {
+    return {
+      typeUrl: "/tendermint.abci.ResponseSetOption",
+      value: ResponseSetOption.encode(message).finish()
+    };
   }
 
 };
@@ -4145,6 +4607,8 @@ function createBaseResponseInitChain(): ResponseInitChain {
 }
 
 export const ResponseInitChain = {
+  typeUrl: "/tendermint.abci.ResponseInitChain",
+
   encode(message: ResponseInitChain, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.consensusParams !== undefined) {
       ConsensusParams.encode(message.consensusParams, writer.uint32(10).fork()).ldelim();
@@ -4263,6 +4727,25 @@ export const ResponseInitChain = {
 
     obj.app_hash = message.appHash;
     return obj;
+  },
+
+  fromAminoMsg(object: ResponseInitChainAminoMsg): ResponseInitChain {
+    return ResponseInitChain.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ResponseInitChainProtoMsg): ResponseInitChain {
+    return ResponseInitChain.decode(message.value);
+  },
+
+  toProto(message: ResponseInitChain): Uint8Array {
+    return ResponseInitChain.encode(message).finish();
+  },
+
+  toProtoMsg(message: ResponseInitChain): ResponseInitChainProtoMsg {
+    return {
+      typeUrl: "/tendermint.abci.ResponseInitChain",
+      value: ResponseInitChain.encode(message).finish()
+    };
   }
 
 };
@@ -4282,6 +4765,8 @@ function createBaseResponseQuery(): ResponseQuery {
 }
 
 export const ResponseQuery = {
+  typeUrl: "/tendermint.abci.ResponseQuery",
+
   encode(message: ResponseQuery, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.code !== 0) {
       writer.uint32(8).uint32(message.code);
@@ -4472,6 +4957,25 @@ export const ResponseQuery = {
     obj.height = message.height ? message.height.toString() : undefined;
     obj.codespace = message.codespace;
     return obj;
+  },
+
+  fromAminoMsg(object: ResponseQueryAminoMsg): ResponseQuery {
+    return ResponseQuery.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ResponseQueryProtoMsg): ResponseQuery {
+    return ResponseQuery.decode(message.value);
+  },
+
+  toProto(message: ResponseQuery): Uint8Array {
+    return ResponseQuery.encode(message).finish();
+  },
+
+  toProtoMsg(message: ResponseQuery): ResponseQueryProtoMsg {
+    return {
+      typeUrl: "/tendermint.abci.ResponseQuery",
+      value: ResponseQuery.encode(message).finish()
+    };
   }
 
 };
@@ -4483,6 +4987,8 @@ function createBaseResponseBeginBlock(): ResponseBeginBlock {
 }
 
 export const ResponseBeginBlock = {
+  typeUrl: "/tendermint.abci.ResponseBeginBlock",
+
   encode(message: ResponseBeginBlock, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.events) {
       Event.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -4571,6 +5077,25 @@ export const ResponseBeginBlock = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ResponseBeginBlockAminoMsg): ResponseBeginBlock {
+    return ResponseBeginBlock.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ResponseBeginBlockProtoMsg): ResponseBeginBlock {
+    return ResponseBeginBlock.decode(message.value);
+  },
+
+  toProto(message: ResponseBeginBlock): Uint8Array {
+    return ResponseBeginBlock.encode(message).finish();
+  },
+
+  toProtoMsg(message: ResponseBeginBlock): ResponseBeginBlockProtoMsg {
+    return {
+      typeUrl: "/tendermint.abci.ResponseBeginBlock",
+      value: ResponseBeginBlock.encode(message).finish()
+    };
   }
 
 };
@@ -4589,6 +5114,8 @@ function createBaseResponseCheckTx(): ResponseCheckTx {
 }
 
 export const ResponseCheckTx = {
+  typeUrl: "/tendermint.abci.ResponseCheckTx",
+
   encode(message: ResponseCheckTx, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.code !== 0) {
       writer.uint32(8).uint32(message.code);
@@ -4782,6 +5309,25 @@ export const ResponseCheckTx = {
 
     obj.codespace = message.codespace;
     return obj;
+  },
+
+  fromAminoMsg(object: ResponseCheckTxAminoMsg): ResponseCheckTx {
+    return ResponseCheckTx.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ResponseCheckTxProtoMsg): ResponseCheckTx {
+    return ResponseCheckTx.decode(message.value);
+  },
+
+  toProto(message: ResponseCheckTx): Uint8Array {
+    return ResponseCheckTx.encode(message).finish();
+  },
+
+  toProtoMsg(message: ResponseCheckTx): ResponseCheckTxProtoMsg {
+    return {
+      typeUrl: "/tendermint.abci.ResponseCheckTx",
+      value: ResponseCheckTx.encode(message).finish()
+    };
   }
 
 };
@@ -4800,6 +5346,8 @@ function createBaseResponseDeliverTx(): ResponseDeliverTx {
 }
 
 export const ResponseDeliverTx = {
+  typeUrl: "/tendermint.abci.ResponseDeliverTx",
+
   encode(message: ResponseDeliverTx, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.code !== 0) {
       writer.uint32(8).uint32(message.code);
@@ -4993,6 +5541,25 @@ export const ResponseDeliverTx = {
 
     obj.codespace = message.codespace;
     return obj;
+  },
+
+  fromAminoMsg(object: ResponseDeliverTxAminoMsg): ResponseDeliverTx {
+    return ResponseDeliverTx.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ResponseDeliverTxProtoMsg): ResponseDeliverTx {
+    return ResponseDeliverTx.decode(message.value);
+  },
+
+  toProto(message: ResponseDeliverTx): Uint8Array {
+    return ResponseDeliverTx.encode(message).finish();
+  },
+
+  toProtoMsg(message: ResponseDeliverTx): ResponseDeliverTxProtoMsg {
+    return {
+      typeUrl: "/tendermint.abci.ResponseDeliverTx",
+      value: ResponseDeliverTx.encode(message).finish()
+    };
   }
 
 };
@@ -5006,6 +5573,8 @@ function createBaseResponseEndBlock(): ResponseEndBlock {
 }
 
 export const ResponseEndBlock = {
+  typeUrl: "/tendermint.abci.ResponseEndBlock",
+
   encode(message: ResponseEndBlock, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.validatorUpdates) {
       ValidatorUpdate.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -5142,6 +5711,25 @@ export const ResponseEndBlock = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ResponseEndBlockAminoMsg): ResponseEndBlock {
+    return ResponseEndBlock.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ResponseEndBlockProtoMsg): ResponseEndBlock {
+    return ResponseEndBlock.decode(message.value);
+  },
+
+  toProto(message: ResponseEndBlock): Uint8Array {
+    return ResponseEndBlock.encode(message).finish();
+  },
+
+  toProtoMsg(message: ResponseEndBlock): ResponseEndBlockProtoMsg {
+    return {
+      typeUrl: "/tendermint.abci.ResponseEndBlock",
+      value: ResponseEndBlock.encode(message).finish()
+    };
   }
 
 };
@@ -5154,6 +5742,8 @@ function createBaseResponseCommit(): ResponseCommit {
 }
 
 export const ResponseCommit = {
+  typeUrl: "/tendermint.abci.ResponseCommit",
+
   encode(message: ResponseCommit, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.data.length !== 0) {
       writer.uint32(18).bytes(message.data);
@@ -5239,6 +5829,25 @@ export const ResponseCommit = {
     obj.data = message.data;
     obj.retain_height = message.retainHeight ? message.retainHeight.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ResponseCommitAminoMsg): ResponseCommit {
+    return ResponseCommit.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ResponseCommitProtoMsg): ResponseCommit {
+    return ResponseCommit.decode(message.value);
+  },
+
+  toProto(message: ResponseCommit): Uint8Array {
+    return ResponseCommit.encode(message).finish();
+  },
+
+  toProtoMsg(message: ResponseCommit): ResponseCommitProtoMsg {
+    return {
+      typeUrl: "/tendermint.abci.ResponseCommit",
+      value: ResponseCommit.encode(message).finish()
+    };
   }
 
 };
@@ -5250,6 +5859,8 @@ function createBaseResponseListSnapshots(): ResponseListSnapshots {
 }
 
 export const ResponseListSnapshots = {
+  typeUrl: "/tendermint.abci.ResponseListSnapshots",
+
   encode(message: ResponseListSnapshots, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.snapshots) {
       Snapshot.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -5338,6 +5949,25 @@ export const ResponseListSnapshots = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ResponseListSnapshotsAminoMsg): ResponseListSnapshots {
+    return ResponseListSnapshots.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ResponseListSnapshotsProtoMsg): ResponseListSnapshots {
+    return ResponseListSnapshots.decode(message.value);
+  },
+
+  toProto(message: ResponseListSnapshots): Uint8Array {
+    return ResponseListSnapshots.encode(message).finish();
+  },
+
+  toProtoMsg(message: ResponseListSnapshots): ResponseListSnapshotsProtoMsg {
+    return {
+      typeUrl: "/tendermint.abci.ResponseListSnapshots",
+      value: ResponseListSnapshots.encode(message).finish()
+    };
   }
 
 };
@@ -5349,6 +5979,8 @@ function createBaseResponseOfferSnapshot(): ResponseOfferSnapshot {
 }
 
 export const ResponseOfferSnapshot = {
+  typeUrl: "/tendermint.abci.ResponseOfferSnapshot",
+
   encode(message: ResponseOfferSnapshot, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.result !== 0) {
       writer.uint32(8).int32(message.result);
@@ -5419,6 +6051,25 @@ export const ResponseOfferSnapshot = {
     const obj: any = {};
     obj.result = message.result;
     return obj;
+  },
+
+  fromAminoMsg(object: ResponseOfferSnapshotAminoMsg): ResponseOfferSnapshot {
+    return ResponseOfferSnapshot.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ResponseOfferSnapshotProtoMsg): ResponseOfferSnapshot {
+    return ResponseOfferSnapshot.decode(message.value);
+  },
+
+  toProto(message: ResponseOfferSnapshot): Uint8Array {
+    return ResponseOfferSnapshot.encode(message).finish();
+  },
+
+  toProtoMsg(message: ResponseOfferSnapshot): ResponseOfferSnapshotProtoMsg {
+    return {
+      typeUrl: "/tendermint.abci.ResponseOfferSnapshot",
+      value: ResponseOfferSnapshot.encode(message).finish()
+    };
   }
 
 };
@@ -5430,6 +6081,8 @@ function createBaseResponseLoadSnapshotChunk(): ResponseLoadSnapshotChunk {
 }
 
 export const ResponseLoadSnapshotChunk = {
+  typeUrl: "/tendermint.abci.ResponseLoadSnapshotChunk",
+
   encode(message: ResponseLoadSnapshotChunk, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.chunk.length !== 0) {
       writer.uint32(10).bytes(message.chunk);
@@ -5500,6 +6153,25 @@ export const ResponseLoadSnapshotChunk = {
     const obj: any = {};
     obj.chunk = message.chunk;
     return obj;
+  },
+
+  fromAminoMsg(object: ResponseLoadSnapshotChunkAminoMsg): ResponseLoadSnapshotChunk {
+    return ResponseLoadSnapshotChunk.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ResponseLoadSnapshotChunkProtoMsg): ResponseLoadSnapshotChunk {
+    return ResponseLoadSnapshotChunk.decode(message.value);
+  },
+
+  toProto(message: ResponseLoadSnapshotChunk): Uint8Array {
+    return ResponseLoadSnapshotChunk.encode(message).finish();
+  },
+
+  toProtoMsg(message: ResponseLoadSnapshotChunk): ResponseLoadSnapshotChunkProtoMsg {
+    return {
+      typeUrl: "/tendermint.abci.ResponseLoadSnapshotChunk",
+      value: ResponseLoadSnapshotChunk.encode(message).finish()
+    };
   }
 
 };
@@ -5513,6 +6185,8 @@ function createBaseResponseApplySnapshotChunk(): ResponseApplySnapshotChunk {
 }
 
 export const ResponseApplySnapshotChunk = {
+  typeUrl: "/tendermint.abci.ResponseApplySnapshotChunk",
+
   encode(message: ResponseApplySnapshotChunk, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.result !== 0) {
       writer.uint32(8).int32(message.result);
@@ -5659,6 +6333,25 @@ export const ResponseApplySnapshotChunk = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ResponseApplySnapshotChunkAminoMsg): ResponseApplySnapshotChunk {
+    return ResponseApplySnapshotChunk.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ResponseApplySnapshotChunkProtoMsg): ResponseApplySnapshotChunk {
+    return ResponseApplySnapshotChunk.decode(message.value);
+  },
+
+  toProto(message: ResponseApplySnapshotChunk): Uint8Array {
+    return ResponseApplySnapshotChunk.encode(message).finish();
+  },
+
+  toProtoMsg(message: ResponseApplySnapshotChunk): ResponseApplySnapshotChunkProtoMsg {
+    return {
+      typeUrl: "/tendermint.abci.ResponseApplySnapshotChunk",
+      value: ResponseApplySnapshotChunk.encode(message).finish()
+    };
   }
 
 };
@@ -5673,6 +6366,8 @@ function createBaseConsensusParams(): ConsensusParams {
 }
 
 export const ConsensusParams = {
+  typeUrl: "/tendermint.abci.ConsensusParams",
+
   encode(message: ConsensusParams, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.block !== undefined) {
       BlockParams.encode(message.block, writer.uint32(10).fork()).ldelim();
@@ -5788,6 +6483,25 @@ export const ConsensusParams = {
     obj.validator = message.validator ? ValidatorParams.toAmino(message.validator) : undefined;
     obj.version = message.version ? VersionParams.toAmino(message.version) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ConsensusParamsAminoMsg): ConsensusParams {
+    return ConsensusParams.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ConsensusParamsProtoMsg): ConsensusParams {
+    return ConsensusParams.decode(message.value);
+  },
+
+  toProto(message: ConsensusParams): Uint8Array {
+    return ConsensusParams.encode(message).finish();
+  },
+
+  toProtoMsg(message: ConsensusParams): ConsensusParamsProtoMsg {
+    return {
+      typeUrl: "/tendermint.abci.ConsensusParams",
+      value: ConsensusParams.encode(message).finish()
+    };
   }
 
 };
@@ -5800,6 +6514,8 @@ function createBaseBlockParams(): BlockParams {
 }
 
 export const BlockParams = {
+  typeUrl: "/tendermint.abci.BlockParams",
+
   encode(message: BlockParams, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.maxBytes.isZero()) {
       writer.uint32(8).int64(message.maxBytes);
@@ -5885,6 +6601,25 @@ export const BlockParams = {
     obj.max_bytes = message.maxBytes ? message.maxBytes.toString() : undefined;
     obj.max_gas = message.maxGas ? message.maxGas.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: BlockParamsAminoMsg): BlockParams {
+    return BlockParams.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: BlockParamsProtoMsg): BlockParams {
+    return BlockParams.decode(message.value);
+  },
+
+  toProto(message: BlockParams): Uint8Array {
+    return BlockParams.encode(message).finish();
+  },
+
+  toProtoMsg(message: BlockParams): BlockParamsProtoMsg {
+    return {
+      typeUrl: "/tendermint.abci.BlockParams",
+      value: BlockParams.encode(message).finish()
+    };
   }
 
 };
@@ -5897,6 +6632,8 @@ function createBaseLastCommitInfo(): LastCommitInfo {
 }
 
 export const LastCommitInfo = {
+  typeUrl: "/tendermint.abci.LastCommitInfo",
+
   encode(message: LastCommitInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.round !== 0) {
       writer.uint32(8).int32(message.round);
@@ -6000,6 +6737,25 @@ export const LastCommitInfo = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: LastCommitInfoAminoMsg): LastCommitInfo {
+    return LastCommitInfo.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: LastCommitInfoProtoMsg): LastCommitInfo {
+    return LastCommitInfo.decode(message.value);
+  },
+
+  toProto(message: LastCommitInfo): Uint8Array {
+    return LastCommitInfo.encode(message).finish();
+  },
+
+  toProtoMsg(message: LastCommitInfo): LastCommitInfoProtoMsg {
+    return {
+      typeUrl: "/tendermint.abci.LastCommitInfo",
+      value: LastCommitInfo.encode(message).finish()
+    };
   }
 
 };
@@ -6012,6 +6768,8 @@ function createBaseEvent(): Event {
 }
 
 export const Event = {
+  typeUrl: "/tendermint.abci.Event",
+
   encode(message: Event, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.type !== "") {
       writer.uint32(10).string(message.type);
@@ -6115,6 +6873,25 @@ export const Event = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: EventAminoMsg): Event {
+    return Event.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: EventProtoMsg): Event {
+    return Event.decode(message.value);
+  },
+
+  toProto(message: Event): Uint8Array {
+    return Event.encode(message).finish();
+  },
+
+  toProtoMsg(message: Event): EventProtoMsg {
+    return {
+      typeUrl: "/tendermint.abci.Event",
+      value: Event.encode(message).finish()
+    };
   }
 
 };
@@ -6128,6 +6905,8 @@ function createBaseEventAttribute(): EventAttribute {
 }
 
 export const EventAttribute = {
+  typeUrl: "/tendermint.abci.EventAttribute",
+
   encode(message: EventAttribute, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.key.length !== 0) {
       writer.uint32(10).bytes(message.key);
@@ -6228,6 +7007,25 @@ export const EventAttribute = {
     obj.value = message.value;
     obj.index = message.index;
     return obj;
+  },
+
+  fromAminoMsg(object: EventAttributeAminoMsg): EventAttribute {
+    return EventAttribute.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: EventAttributeProtoMsg): EventAttribute {
+    return EventAttribute.decode(message.value);
+  },
+
+  toProto(message: EventAttribute): Uint8Array {
+    return EventAttribute.encode(message).finish();
+  },
+
+  toProtoMsg(message: EventAttribute): EventAttributeProtoMsg {
+    return {
+      typeUrl: "/tendermint.abci.EventAttribute",
+      value: EventAttribute.encode(message).finish()
+    };
   }
 
 };
@@ -6242,6 +7040,8 @@ function createBaseTxResult(): TxResult {
 }
 
 export const TxResult = {
+  typeUrl: "/tendermint.abci.TxResult",
+
   encode(message: TxResult, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.height.isZero()) {
       writer.uint32(8).int64(message.height);
@@ -6357,6 +7157,25 @@ export const TxResult = {
     obj.tx = message.tx;
     obj.result = message.result ? ResponseDeliverTx.toAmino(message.result) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: TxResultAminoMsg): TxResult {
+    return TxResult.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: TxResultProtoMsg): TxResult {
+    return TxResult.decode(message.value);
+  },
+
+  toProto(message: TxResult): Uint8Array {
+    return TxResult.encode(message).finish();
+  },
+
+  toProtoMsg(message: TxResult): TxResultProtoMsg {
+    return {
+      typeUrl: "/tendermint.abci.TxResult",
+      value: TxResult.encode(message).finish()
+    };
   }
 
 };
@@ -6369,6 +7188,8 @@ function createBaseValidator(): Validator {
 }
 
 export const Validator = {
+  typeUrl: "/tendermint.abci.Validator",
+
   encode(message: Validator, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.address.length !== 0) {
       writer.uint32(10).bytes(message.address);
@@ -6454,6 +7275,25 @@ export const Validator = {
     obj.address = message.address;
     obj.power = message.power ? message.power.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ValidatorAminoMsg): Validator {
+    return Validator.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ValidatorProtoMsg): Validator {
+    return Validator.decode(message.value);
+  },
+
+  toProto(message: Validator): Uint8Array {
+    return Validator.encode(message).finish();
+  },
+
+  toProtoMsg(message: Validator): ValidatorProtoMsg {
+    return {
+      typeUrl: "/tendermint.abci.Validator",
+      value: Validator.encode(message).finish()
+    };
   }
 
 };
@@ -6466,6 +7306,8 @@ function createBaseValidatorUpdate(): ValidatorUpdate {
 }
 
 export const ValidatorUpdate = {
+  typeUrl: "/tendermint.abci.ValidatorUpdate",
+
   encode(message: ValidatorUpdate, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.pubKey !== undefined) {
       PublicKey.encode(message.pubKey, writer.uint32(10).fork()).ldelim();
@@ -6551,6 +7393,25 @@ export const ValidatorUpdate = {
     obj.pub_key = message.pubKey ? PublicKey.toAmino(message.pubKey) : undefined;
     obj.power = message.power ? message.power.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ValidatorUpdateAminoMsg): ValidatorUpdate {
+    return ValidatorUpdate.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ValidatorUpdateProtoMsg): ValidatorUpdate {
+    return ValidatorUpdate.decode(message.value);
+  },
+
+  toProto(message: ValidatorUpdate): Uint8Array {
+    return ValidatorUpdate.encode(message).finish();
+  },
+
+  toProtoMsg(message: ValidatorUpdate): ValidatorUpdateProtoMsg {
+    return {
+      typeUrl: "/tendermint.abci.ValidatorUpdate",
+      value: ValidatorUpdate.encode(message).finish()
+    };
   }
 
 };
@@ -6563,6 +7424,8 @@ function createBaseVoteInfo(): VoteInfo {
 }
 
 export const VoteInfo = {
+  typeUrl: "/tendermint.abci.VoteInfo",
+
   encode(message: VoteInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.validator !== undefined) {
       Validator.encode(message.validator, writer.uint32(10).fork()).ldelim();
@@ -6648,6 +7511,25 @@ export const VoteInfo = {
     obj.validator = message.validator ? Validator.toAmino(message.validator) : undefined;
     obj.signed_last_block = message.signedLastBlock;
     return obj;
+  },
+
+  fromAminoMsg(object: VoteInfoAminoMsg): VoteInfo {
+    return VoteInfo.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: VoteInfoProtoMsg): VoteInfo {
+    return VoteInfo.decode(message.value);
+  },
+
+  toProto(message: VoteInfo): Uint8Array {
+    return VoteInfo.encode(message).finish();
+  },
+
+  toProtoMsg(message: VoteInfo): VoteInfoProtoMsg {
+    return {
+      typeUrl: "/tendermint.abci.VoteInfo",
+      value: VoteInfo.encode(message).finish()
+    };
   }
 
 };
@@ -6663,6 +7545,8 @@ function createBaseEvidence(): Evidence {
 }
 
 export const Evidence = {
+  typeUrl: "/tendermint.abci.Evidence",
+
   encode(message: Evidence, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.type !== 0) {
       writer.uint32(8).int32(message.type);
@@ -6793,6 +7677,25 @@ export const Evidence = {
     obj.time = message.time ? Timestamp.toAmino(message.time) : undefined;
     obj.total_voting_power = message.totalVotingPower ? message.totalVotingPower.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: EvidenceAminoMsg): Evidence {
+    return Evidence.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: EvidenceProtoMsg): Evidence {
+    return Evidence.decode(message.value);
+  },
+
+  toProto(message: Evidence): Uint8Array {
+    return Evidence.encode(message).finish();
+  },
+
+  toProtoMsg(message: Evidence): EvidenceProtoMsg {
+    return {
+      typeUrl: "/tendermint.abci.Evidence",
+      value: Evidence.encode(message).finish()
+    };
   }
 
 };
@@ -6808,6 +7711,8 @@ function createBaseSnapshot(): Snapshot {
 }
 
 export const Snapshot = {
+  typeUrl: "/tendermint.abci.Snapshot",
+
   encode(message: Snapshot, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.height.isZero()) {
       writer.uint32(8).uint64(message.height);
@@ -6938,6 +7843,25 @@ export const Snapshot = {
     obj.hash = message.hash;
     obj.metadata = message.metadata;
     return obj;
+  },
+
+  fromAminoMsg(object: SnapshotAminoMsg): Snapshot {
+    return Snapshot.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: SnapshotProtoMsg): Snapshot {
+    return Snapshot.decode(message.value);
+  },
+
+  toProto(message: Snapshot): Uint8Array {
+    return Snapshot.encode(message).finish();
+  },
+
+  toProtoMsg(message: Snapshot): SnapshotProtoMsg {
+    return {
+      typeUrl: "/tendermint.abci.Snapshot",
+      value: Snapshot.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/tendermint/crypto/keys.ts b/__fixtures__/outputv2/tendermint/crypto/keys.ts
index 1c40f3e0e..57eb0bc64 100644
--- a/__fixtures__/outputv2/tendermint/crypto/keys.ts
+++ b/__fixtures__/outputv2/tendermint/crypto/keys.ts
@@ -7,7 +7,7 @@ export interface PublicKey {
   ed25519?: Uint8Array;
   secp256k1?: Uint8Array;
 }
-export interface PublicKeyProtoType {
+export interface PublicKeyProtoMsg {
   typeUrl: "/tendermint.crypto.PublicKey";
   value: Uint8Array;
 }
@@ -17,7 +17,7 @@ export interface PublicKeyAmino {
   ed25519?: Uint8Array;
   secp256k1?: Uint8Array;
 }
-export interface PublicKeyAminoType {
+export interface PublicKeyAminoMsg {
   type: "/tendermint.crypto.PublicKey";
   value: PublicKeyAmino;
 }
@@ -36,6 +36,8 @@ function createBasePublicKey(): PublicKey {
 }
 
 export const PublicKey = {
+  typeUrl: "/tendermint.crypto.PublicKey",
+
   encode(message: PublicKey, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.ed25519 !== undefined) {
       writer.uint32(10).bytes(message.ed25519);
@@ -121,6 +123,25 @@ export const PublicKey = {
     obj.ed25519 = message.ed25519;
     obj.secp256k1 = message.secp256k1;
     return obj;
+  },
+
+  fromAminoMsg(object: PublicKeyAminoMsg): PublicKey {
+    return PublicKey.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: PublicKeyProtoMsg): PublicKey {
+    return PublicKey.decode(message.value);
+  },
+
+  toProto(message: PublicKey): Uint8Array {
+    return PublicKey.encode(message).finish();
+  },
+
+  toProtoMsg(message: PublicKey): PublicKeyProtoMsg {
+    return {
+      typeUrl: "/tendermint.crypto.PublicKey",
+      value: PublicKey.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/tendermint/crypto/proof.ts b/__fixtures__/outputv2/tendermint/crypto/proof.ts
index 641174950..64fc75e57 100644
--- a/__fixtures__/outputv2/tendermint/crypto/proof.ts
+++ b/__fixtures__/outputv2/tendermint/crypto/proof.ts
@@ -7,7 +7,7 @@ export interface Proof {
   leafHash: Uint8Array;
   aunts: Uint8Array[];
 }
-export interface ProofProtoType {
+export interface ProofProtoMsg {
   typeUrl: "/tendermint.crypto.Proof";
   value: Uint8Array;
 }
@@ -17,7 +17,7 @@ export interface ProofAmino {
   leaf_hash: Uint8Array;
   aunts: Uint8Array[];
 }
-export interface ProofAminoType {
+export interface ProofAminoMsg {
   type: "/tendermint.crypto.Proof";
   value: ProofAmino;
 }
@@ -34,7 +34,7 @@ export interface ValueOp {
   /** To encode in ProofOp.Data */
   proof?: Proof;
 }
-export interface ValueOpProtoType {
+export interface ValueOpProtoMsg {
   typeUrl: "/tendermint.crypto.ValueOp";
   value: Uint8Array;
 }
@@ -45,7 +45,7 @@ export interface ValueOpAmino {
   /** To encode in ProofOp.Data */
   proof?: ProofAmino;
 }
-export interface ValueOpAminoType {
+export interface ValueOpAminoMsg {
   type: "/tendermint.crypto.ValueOp";
   value: ValueOpAmino;
 }
@@ -58,7 +58,7 @@ export interface DominoOp {
   input: string;
   output: string;
 }
-export interface DominoOpProtoType {
+export interface DominoOpProtoMsg {
   typeUrl: "/tendermint.crypto.DominoOp";
   value: Uint8Array;
 }
@@ -67,7 +67,7 @@ export interface DominoOpAmino {
   input: string;
   output: string;
 }
-export interface DominoOpAminoType {
+export interface DominoOpAminoMsg {
   type: "/tendermint.crypto.DominoOp";
   value: DominoOpAmino;
 }
@@ -87,7 +87,7 @@ export interface ProofOp {
   key: Uint8Array;
   data: Uint8Array;
 }
-export interface ProofOpProtoType {
+export interface ProofOpProtoMsg {
   typeUrl: "/tendermint.crypto.ProofOp";
   value: Uint8Array;
 }
@@ -102,7 +102,7 @@ export interface ProofOpAmino {
   key: Uint8Array;
   data: Uint8Array;
 }
-export interface ProofOpAminoType {
+export interface ProofOpAminoMsg {
   type: "/tendermint.crypto.ProofOp";
   value: ProofOpAmino;
 }
@@ -122,7 +122,7 @@ export interface ProofOpSDKType {
 export interface ProofOps {
   ops: ProofOp[];
 }
-export interface ProofOpsProtoType {
+export interface ProofOpsProtoMsg {
   typeUrl: "/tendermint.crypto.ProofOps";
   value: Uint8Array;
 }
@@ -131,7 +131,7 @@ export interface ProofOpsProtoType {
 export interface ProofOpsAmino {
   ops: ProofOpAmino[];
 }
-export interface ProofOpsAminoType {
+export interface ProofOpsAminoMsg {
   type: "/tendermint.crypto.ProofOps";
   value: ProofOpsAmino;
 }
@@ -151,6 +151,8 @@ function createBaseProof(): Proof {
 }
 
 export const Proof = {
+  typeUrl: "/tendermint.crypto.Proof",
+
   encode(message: Proof, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.total.isZero()) {
       writer.uint32(8).int64(message.total);
@@ -284,6 +286,25 @@ export const Proof = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ProofAminoMsg): Proof {
+    return Proof.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ProofProtoMsg): Proof {
+    return Proof.decode(message.value);
+  },
+
+  toProto(message: Proof): Uint8Array {
+    return Proof.encode(message).finish();
+  },
+
+  toProtoMsg(message: Proof): ProofProtoMsg {
+    return {
+      typeUrl: "/tendermint.crypto.Proof",
+      value: Proof.encode(message).finish()
+    };
   }
 
 };
@@ -296,6 +317,8 @@ function createBaseValueOp(): ValueOp {
 }
 
 export const ValueOp = {
+  typeUrl: "/tendermint.crypto.ValueOp",
+
   encode(message: ValueOp, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.key.length !== 0) {
       writer.uint32(10).bytes(message.key);
@@ -381,6 +404,25 @@ export const ValueOp = {
     obj.key = message.key;
     obj.proof = message.proof ? Proof.toAmino(message.proof) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ValueOpAminoMsg): ValueOp {
+    return ValueOp.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ValueOpProtoMsg): ValueOp {
+    return ValueOp.decode(message.value);
+  },
+
+  toProto(message: ValueOp): Uint8Array {
+    return ValueOp.encode(message).finish();
+  },
+
+  toProtoMsg(message: ValueOp): ValueOpProtoMsg {
+    return {
+      typeUrl: "/tendermint.crypto.ValueOp",
+      value: ValueOp.encode(message).finish()
+    };
   }
 
 };
@@ -394,6 +436,8 @@ function createBaseDominoOp(): DominoOp {
 }
 
 export const DominoOp = {
+  typeUrl: "/tendermint.crypto.DominoOp",
+
   encode(message: DominoOp, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.key !== "") {
       writer.uint32(10).string(message.key);
@@ -494,6 +538,25 @@ export const DominoOp = {
     obj.input = message.input;
     obj.output = message.output;
     return obj;
+  },
+
+  fromAminoMsg(object: DominoOpAminoMsg): DominoOp {
+    return DominoOp.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: DominoOpProtoMsg): DominoOp {
+    return DominoOp.decode(message.value);
+  },
+
+  toProto(message: DominoOp): Uint8Array {
+    return DominoOp.encode(message).finish();
+  },
+
+  toProtoMsg(message: DominoOp): DominoOpProtoMsg {
+    return {
+      typeUrl: "/tendermint.crypto.DominoOp",
+      value: DominoOp.encode(message).finish()
+    };
   }
 
 };
@@ -507,6 +570,8 @@ function createBaseProofOp(): ProofOp {
 }
 
 export const ProofOp = {
+  typeUrl: "/tendermint.crypto.ProofOp",
+
   encode(message: ProofOp, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.type !== "") {
       writer.uint32(10).string(message.type);
@@ -607,6 +672,25 @@ export const ProofOp = {
     obj.key = message.key;
     obj.data = message.data;
     return obj;
+  },
+
+  fromAminoMsg(object: ProofOpAminoMsg): ProofOp {
+    return ProofOp.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ProofOpProtoMsg): ProofOp {
+    return ProofOp.decode(message.value);
+  },
+
+  toProto(message: ProofOp): Uint8Array {
+    return ProofOp.encode(message).finish();
+  },
+
+  toProtoMsg(message: ProofOp): ProofOpProtoMsg {
+    return {
+      typeUrl: "/tendermint.crypto.ProofOp",
+      value: ProofOp.encode(message).finish()
+    };
   }
 
 };
@@ -618,6 +702,8 @@ function createBaseProofOps(): ProofOps {
 }
 
 export const ProofOps = {
+  typeUrl: "/tendermint.crypto.ProofOps",
+
   encode(message: ProofOps, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.ops) {
       ProofOp.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -706,6 +792,25 @@ export const ProofOps = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ProofOpsAminoMsg): ProofOps {
+    return ProofOps.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ProofOpsProtoMsg): ProofOps {
+    return ProofOps.decode(message.value);
+  },
+
+  toProto(message: ProofOps): Uint8Array {
+    return ProofOps.encode(message).finish();
+  },
+
+  toProtoMsg(message: ProofOps): ProofOpsProtoMsg {
+    return {
+      typeUrl: "/tendermint.crypto.ProofOps",
+      value: ProofOps.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/tendermint/libs/bits/types.ts b/__fixtures__/outputv2/tendermint/libs/bits/types.ts
index d2f460f71..d89e54826 100644
--- a/__fixtures__/outputv2/tendermint/libs/bits/types.ts
+++ b/__fixtures__/outputv2/tendermint/libs/bits/types.ts
@@ -5,7 +5,7 @@ export interface BitArray {
   bits: Long;
   elems: Long[];
 }
-export interface BitArrayProtoType {
+export interface BitArrayProtoMsg {
   typeUrl: "/tendermint.libs.bits.BitArray";
   value: Uint8Array;
 }
@@ -13,7 +13,7 @@ export interface BitArrayAmino {
   bits: string;
   elems: string[];
 }
-export interface BitArrayAminoType {
+export interface BitArrayAminoMsg {
   type: "/tendermint.libs.bits.BitArray";
   value: BitArrayAmino;
 }
@@ -30,6 +30,8 @@ function createBaseBitArray(): BitArray {
 }
 
 export const BitArray = {
+  typeUrl: "/tendermint.libs.bits.BitArray",
+
   encode(message: BitArray, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.bits.isZero()) {
       writer.uint32(8).int64(message.bits);
@@ -145,6 +147,25 @@ export const BitArray = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: BitArrayAminoMsg): BitArray {
+    return BitArray.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: BitArrayProtoMsg): BitArray {
+    return BitArray.decode(message.value);
+  },
+
+  toProto(message: BitArray): Uint8Array {
+    return BitArray.encode(message).finish();
+  },
+
+  toProtoMsg(message: BitArray): BitArrayProtoMsg {
+    return {
+      typeUrl: "/tendermint.libs.bits.BitArray",
+      value: BitArray.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/tendermint/p2p/types.ts b/__fixtures__/outputv2/tendermint/p2p/types.ts
index 1604b71b6..bfd66bff1 100644
--- a/__fixtures__/outputv2/tendermint/p2p/types.ts
+++ b/__fixtures__/outputv2/tendermint/p2p/types.ts
@@ -7,7 +7,7 @@ export interface ProtocolVersion {
   block: Long;
   app: Long;
 }
-export interface ProtocolVersionProtoType {
+export interface ProtocolVersionProtoMsg {
   typeUrl: "/tendermint.p2p.ProtocolVersion";
   value: Uint8Array;
 }
@@ -16,7 +16,7 @@ export interface ProtocolVersionAmino {
   block: string;
   app: string;
 }
-export interface ProtocolVersionAminoType {
+export interface ProtocolVersionAminoMsg {
   type: "/tendermint.p2p.ProtocolVersion";
   value: ProtocolVersionAmino;
 }
@@ -35,7 +35,7 @@ export interface NodeInfo {
   moniker: string;
   other?: NodeInfoOther;
 }
-export interface NodeInfoProtoType {
+export interface NodeInfoProtoMsg {
   typeUrl: "/tendermint.p2p.NodeInfo";
   value: Uint8Array;
 }
@@ -49,7 +49,7 @@ export interface NodeInfoAmino {
   moniker: string;
   other?: NodeInfoOtherAmino;
 }
-export interface NodeInfoAminoType {
+export interface NodeInfoAminoMsg {
   type: "/tendermint.p2p.NodeInfo";
   value: NodeInfoAmino;
 }
@@ -67,7 +67,7 @@ export interface NodeInfoOther {
   txIndex: string;
   rpcAddress: string;
 }
-export interface NodeInfoOtherProtoType {
+export interface NodeInfoOtherProtoMsg {
   typeUrl: "/tendermint.p2p.NodeInfoOther";
   value: Uint8Array;
 }
@@ -75,7 +75,7 @@ export interface NodeInfoOtherAmino {
   tx_index: string;
   rpc_address: string;
 }
-export interface NodeInfoOtherAminoType {
+export interface NodeInfoOtherAminoMsg {
   type: "/tendermint.p2p.NodeInfoOther";
   value: NodeInfoOtherAmino;
 }
@@ -88,7 +88,7 @@ export interface PeerInfo {
   addressInfo: PeerAddressInfo[];
   lastConnected?: Date;
 }
-export interface PeerInfoProtoType {
+export interface PeerInfoProtoMsg {
   typeUrl: "/tendermint.p2p.PeerInfo";
   value: Uint8Array;
 }
@@ -97,7 +97,7 @@ export interface PeerInfoAmino {
   address_info: PeerAddressInfoAmino[];
   last_connected?: Date;
 }
-export interface PeerInfoAminoType {
+export interface PeerInfoAminoMsg {
   type: "/tendermint.p2p.PeerInfo";
   value: PeerInfoAmino;
 }
@@ -112,7 +112,7 @@ export interface PeerAddressInfo {
   lastDialFailure?: Date;
   dialFailures: number;
 }
-export interface PeerAddressInfoProtoType {
+export interface PeerAddressInfoProtoMsg {
   typeUrl: "/tendermint.p2p.PeerAddressInfo";
   value: Uint8Array;
 }
@@ -122,7 +122,7 @@ export interface PeerAddressInfoAmino {
   last_dial_failure?: Date;
   dial_failures: number;
 }
-export interface PeerAddressInfoAminoType {
+export interface PeerAddressInfoAminoMsg {
   type: "/tendermint.p2p.PeerAddressInfo";
   value: PeerAddressInfoAmino;
 }
@@ -142,6 +142,8 @@ function createBaseProtocolVersion(): ProtocolVersion {
 }
 
 export const ProtocolVersion = {
+  typeUrl: "/tendermint.p2p.ProtocolVersion",
+
   encode(message: ProtocolVersion, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.p2p.isZero()) {
       writer.uint32(8).uint64(message.p2p);
@@ -242,6 +244,25 @@ export const ProtocolVersion = {
     obj.block = message.block ? message.block.toString() : undefined;
     obj.app = message.app ? message.app.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ProtocolVersionAminoMsg): ProtocolVersion {
+    return ProtocolVersion.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ProtocolVersionProtoMsg): ProtocolVersion {
+    return ProtocolVersion.decode(message.value);
+  },
+
+  toProto(message: ProtocolVersion): Uint8Array {
+    return ProtocolVersion.encode(message).finish();
+  },
+
+  toProtoMsg(message: ProtocolVersion): ProtocolVersionProtoMsg {
+    return {
+      typeUrl: "/tendermint.p2p.ProtocolVersion",
+      value: ProtocolVersion.encode(message).finish()
+    };
   }
 
 };
@@ -260,6 +281,8 @@ function createBaseNodeInfo(): NodeInfo {
 }
 
 export const NodeInfo = {
+  typeUrl: "/tendermint.p2p.NodeInfo",
+
   encode(message: NodeInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.protocolVersion !== undefined) {
       ProtocolVersion.encode(message.protocolVersion, writer.uint32(10).fork()).ldelim();
@@ -435,6 +458,25 @@ export const NodeInfo = {
     obj.moniker = message.moniker;
     obj.other = message.other ? NodeInfoOther.toAmino(message.other) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: NodeInfoAminoMsg): NodeInfo {
+    return NodeInfo.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: NodeInfoProtoMsg): NodeInfo {
+    return NodeInfo.decode(message.value);
+  },
+
+  toProto(message: NodeInfo): Uint8Array {
+    return NodeInfo.encode(message).finish();
+  },
+
+  toProtoMsg(message: NodeInfo): NodeInfoProtoMsg {
+    return {
+      typeUrl: "/tendermint.p2p.NodeInfo",
+      value: NodeInfo.encode(message).finish()
+    };
   }
 
 };
@@ -447,6 +489,8 @@ function createBaseNodeInfoOther(): NodeInfoOther {
 }
 
 export const NodeInfoOther = {
+  typeUrl: "/tendermint.p2p.NodeInfoOther",
+
   encode(message: NodeInfoOther, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.txIndex !== "") {
       writer.uint32(10).string(message.txIndex);
@@ -532,6 +576,25 @@ export const NodeInfoOther = {
     obj.tx_index = message.txIndex;
     obj.rpc_address = message.rpcAddress;
     return obj;
+  },
+
+  fromAminoMsg(object: NodeInfoOtherAminoMsg): NodeInfoOther {
+    return NodeInfoOther.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: NodeInfoOtherProtoMsg): NodeInfoOther {
+    return NodeInfoOther.decode(message.value);
+  },
+
+  toProto(message: NodeInfoOther): Uint8Array {
+    return NodeInfoOther.encode(message).finish();
+  },
+
+  toProtoMsg(message: NodeInfoOther): NodeInfoOtherProtoMsg {
+    return {
+      typeUrl: "/tendermint.p2p.NodeInfoOther",
+      value: NodeInfoOther.encode(message).finish()
+    };
   }
 
 };
@@ -545,6 +608,8 @@ function createBasePeerInfo(): PeerInfo {
 }
 
 export const PeerInfo = {
+  typeUrl: "/tendermint.p2p.PeerInfo",
+
   encode(message: PeerInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.id !== "") {
       writer.uint32(10).string(message.id);
@@ -663,6 +728,25 @@ export const PeerInfo = {
 
     obj.last_connected = message.lastConnected ? Timestamp.toAmino(message.lastConnected) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: PeerInfoAminoMsg): PeerInfo {
+    return PeerInfo.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: PeerInfoProtoMsg): PeerInfo {
+    return PeerInfo.decode(message.value);
+  },
+
+  toProto(message: PeerInfo): Uint8Array {
+    return PeerInfo.encode(message).finish();
+  },
+
+  toProtoMsg(message: PeerInfo): PeerInfoProtoMsg {
+    return {
+      typeUrl: "/tendermint.p2p.PeerInfo",
+      value: PeerInfo.encode(message).finish()
+    };
   }
 
 };
@@ -677,6 +761,8 @@ function createBasePeerAddressInfo(): PeerAddressInfo {
 }
 
 export const PeerAddressInfo = {
+  typeUrl: "/tendermint.p2p.PeerAddressInfo",
+
   encode(message: PeerAddressInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.address !== "") {
       writer.uint32(10).string(message.address);
@@ -792,6 +878,25 @@ export const PeerAddressInfo = {
     obj.last_dial_failure = message.lastDialFailure ? Timestamp.toAmino(message.lastDialFailure) : undefined;
     obj.dial_failures = message.dialFailures;
     return obj;
+  },
+
+  fromAminoMsg(object: PeerAddressInfoAminoMsg): PeerAddressInfo {
+    return PeerAddressInfo.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: PeerAddressInfoProtoMsg): PeerAddressInfo {
+    return PeerAddressInfo.decode(message.value);
+  },
+
+  toProto(message: PeerAddressInfo): Uint8Array {
+    return PeerAddressInfo.encode(message).finish();
+  },
+
+  toProtoMsg(message: PeerAddressInfo): PeerAddressInfoProtoMsg {
+    return {
+      typeUrl: "/tendermint.p2p.PeerAddressInfo",
+      value: PeerAddressInfo.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/tendermint/types/block.ts b/__fixtures__/outputv2/tendermint/types/block.ts
index 1ffe32cf4..826e8b2a6 100644
--- a/__fixtures__/outputv2/tendermint/types/block.ts
+++ b/__fixtures__/outputv2/tendermint/types/block.ts
@@ -9,7 +9,7 @@ export interface Block {
   evidence?: EvidenceList;
   lastCommit?: Commit;
 }
-export interface BlockProtoType {
+export interface BlockProtoMsg {
   typeUrl: "/tendermint.types.Block";
   value: Uint8Array;
 }
@@ -19,7 +19,7 @@ export interface BlockAmino {
   evidence?: EvidenceListAmino;
   last_commit?: CommitAmino;
 }
-export interface BlockAminoType {
+export interface BlockAminoMsg {
   type: "/tendermint.types.Block";
   value: BlockAmino;
 }
@@ -40,6 +40,8 @@ function createBaseBlock(): Block {
 }
 
 export const Block = {
+  typeUrl: "/tendermint.types.Block",
+
   encode(message: Block, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.header !== undefined) {
       Header.encode(message.header, writer.uint32(10).fork()).ldelim();
@@ -155,6 +157,25 @@ export const Block = {
     obj.evidence = message.evidence ? EvidenceList.toAmino(message.evidence) : undefined;
     obj.last_commit = message.lastCommit ? Commit.toAmino(message.lastCommit) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: BlockAminoMsg): Block {
+    return Block.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: BlockProtoMsg): Block {
+    return Block.decode(message.value);
+  },
+
+  toProto(message: Block): Uint8Array {
+    return Block.encode(message).finish();
+  },
+
+  toProtoMsg(message: Block): BlockProtoMsg {
+    return {
+      typeUrl: "/tendermint.types.Block",
+      value: Block.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/tendermint/types/evidence.ts b/__fixtures__/outputv2/tendermint/types/evidence.ts
index 1da557eea..b2c42370f 100644
--- a/__fixtures__/outputv2/tendermint/types/evidence.ts
+++ b/__fixtures__/outputv2/tendermint/types/evidence.ts
@@ -8,7 +8,7 @@ export interface Evidence {
   duplicateVoteEvidence?: DuplicateVoteEvidence;
   lightClientAttackEvidence?: LightClientAttackEvidence;
 }
-export interface EvidenceProtoType {
+export interface EvidenceProtoMsg {
   typeUrl: "/tendermint.types.Evidence";
   value: Uint8Array;
 }
@@ -16,7 +16,7 @@ export interface EvidenceAmino {
   duplicate_vote_evidence?: DuplicateVoteEvidenceAmino;
   light_client_attack_evidence?: LightClientAttackEvidenceAmino;
 }
-export interface EvidenceAminoType {
+export interface EvidenceAminoMsg {
   type: "/tendermint.types.Evidence";
   value: EvidenceAmino;
 }
@@ -33,7 +33,7 @@ export interface DuplicateVoteEvidence {
   validatorPower: Long;
   timestamp?: Date;
 }
-export interface DuplicateVoteEvidenceProtoType {
+export interface DuplicateVoteEvidenceProtoMsg {
   typeUrl: "/tendermint.types.DuplicateVoteEvidence";
   value: Uint8Array;
 }
@@ -46,7 +46,7 @@ export interface DuplicateVoteEvidenceAmino {
   validator_power: string;
   timestamp?: Date;
 }
-export interface DuplicateVoteEvidenceAminoType {
+export interface DuplicateVoteEvidenceAminoMsg {
   type: "/tendermint.types.DuplicateVoteEvidence";
   value: DuplicateVoteEvidenceAmino;
 }
@@ -68,7 +68,7 @@ export interface LightClientAttackEvidence {
   totalVotingPower: Long;
   timestamp?: Date;
 }
-export interface LightClientAttackEvidenceProtoType {
+export interface LightClientAttackEvidenceProtoMsg {
   typeUrl: "/tendermint.types.LightClientAttackEvidence";
   value: Uint8Array;
 }
@@ -81,7 +81,7 @@ export interface LightClientAttackEvidenceAmino {
   total_voting_power: string;
   timestamp?: Date;
 }
-export interface LightClientAttackEvidenceAminoType {
+export interface LightClientAttackEvidenceAminoMsg {
   type: "/tendermint.types.LightClientAttackEvidence";
   value: LightClientAttackEvidenceAmino;
 }
@@ -97,14 +97,14 @@ export interface LightClientAttackEvidenceSDKType {
 export interface EvidenceList {
   evidence: Evidence[];
 }
-export interface EvidenceListProtoType {
+export interface EvidenceListProtoMsg {
   typeUrl: "/tendermint.types.EvidenceList";
   value: Uint8Array;
 }
 export interface EvidenceListAmino {
   evidence: EvidenceAmino[];
 }
-export interface EvidenceListAminoType {
+export interface EvidenceListAminoMsg {
   type: "/tendermint.types.EvidenceList";
   value: EvidenceListAmino;
 }
@@ -120,6 +120,8 @@ function createBaseEvidence(): Evidence {
 }
 
 export const Evidence = {
+  typeUrl: "/tendermint.types.Evidence",
+
   encode(message: Evidence, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.duplicateVoteEvidence !== undefined) {
       DuplicateVoteEvidence.encode(message.duplicateVoteEvidence, writer.uint32(10).fork()).ldelim();
@@ -205,6 +207,25 @@ export const Evidence = {
     obj.duplicate_vote_evidence = message.duplicateVoteEvidence ? DuplicateVoteEvidence.toAmino(message.duplicateVoteEvidence) : undefined;
     obj.light_client_attack_evidence = message.lightClientAttackEvidence ? LightClientAttackEvidence.toAmino(message.lightClientAttackEvidence) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: EvidenceAminoMsg): Evidence {
+    return Evidence.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: EvidenceProtoMsg): Evidence {
+    return Evidence.decode(message.value);
+  },
+
+  toProto(message: Evidence): Uint8Array {
+    return Evidence.encode(message).finish();
+  },
+
+  toProtoMsg(message: Evidence): EvidenceProtoMsg {
+    return {
+      typeUrl: "/tendermint.types.Evidence",
+      value: Evidence.encode(message).finish()
+    };
   }
 
 };
@@ -220,6 +241,8 @@ function createBaseDuplicateVoteEvidence(): DuplicateVoteEvidence {
 }
 
 export const DuplicateVoteEvidence = {
+  typeUrl: "/tendermint.types.DuplicateVoteEvidence",
+
   encode(message: DuplicateVoteEvidence, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.voteA !== undefined) {
       Vote.encode(message.voteA, writer.uint32(10).fork()).ldelim();
@@ -350,6 +373,25 @@ export const DuplicateVoteEvidence = {
     obj.validator_power = message.validatorPower ? message.validatorPower.toString() : undefined;
     obj.timestamp = message.timestamp ? Timestamp.toAmino(message.timestamp) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: DuplicateVoteEvidenceAminoMsg): DuplicateVoteEvidence {
+    return DuplicateVoteEvidence.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: DuplicateVoteEvidenceProtoMsg): DuplicateVoteEvidence {
+    return DuplicateVoteEvidence.decode(message.value);
+  },
+
+  toProto(message: DuplicateVoteEvidence): Uint8Array {
+    return DuplicateVoteEvidence.encode(message).finish();
+  },
+
+  toProtoMsg(message: DuplicateVoteEvidence): DuplicateVoteEvidenceProtoMsg {
+    return {
+      typeUrl: "/tendermint.types.DuplicateVoteEvidence",
+      value: DuplicateVoteEvidence.encode(message).finish()
+    };
   }
 
 };
@@ -365,6 +407,8 @@ function createBaseLightClientAttackEvidence(): LightClientAttackEvidence {
 }
 
 export const LightClientAttackEvidence = {
+  typeUrl: "/tendermint.types.LightClientAttackEvidence",
+
   encode(message: LightClientAttackEvidence, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.conflictingBlock !== undefined) {
       LightBlock.encode(message.conflictingBlock, writer.uint32(10).fork()).ldelim();
@@ -513,6 +557,25 @@ export const LightClientAttackEvidence = {
     obj.total_voting_power = message.totalVotingPower ? message.totalVotingPower.toString() : undefined;
     obj.timestamp = message.timestamp ? Timestamp.toAmino(message.timestamp) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: LightClientAttackEvidenceAminoMsg): LightClientAttackEvidence {
+    return LightClientAttackEvidence.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: LightClientAttackEvidenceProtoMsg): LightClientAttackEvidence {
+    return LightClientAttackEvidence.decode(message.value);
+  },
+
+  toProto(message: LightClientAttackEvidence): Uint8Array {
+    return LightClientAttackEvidence.encode(message).finish();
+  },
+
+  toProtoMsg(message: LightClientAttackEvidence): LightClientAttackEvidenceProtoMsg {
+    return {
+      typeUrl: "/tendermint.types.LightClientAttackEvidence",
+      value: LightClientAttackEvidence.encode(message).finish()
+    };
   }
 
 };
@@ -524,6 +587,8 @@ function createBaseEvidenceList(): EvidenceList {
 }
 
 export const EvidenceList = {
+  typeUrl: "/tendermint.types.EvidenceList",
+
   encode(message: EvidenceList, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.evidence) {
       Evidence.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -612,6 +677,25 @@ export const EvidenceList = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: EvidenceListAminoMsg): EvidenceList {
+    return EvidenceList.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: EvidenceListProtoMsg): EvidenceList {
+    return EvidenceList.decode(message.value);
+  },
+
+  toProto(message: EvidenceList): Uint8Array {
+    return EvidenceList.encode(message).finish();
+  },
+
+  toProtoMsg(message: EvidenceList): EvidenceListProtoMsg {
+    return {
+      typeUrl: "/tendermint.types.EvidenceList",
+      value: EvidenceList.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/tendermint/types/params.ts b/__fixtures__/outputv2/tendermint/types/params.ts
index 95349c7b3..d71ca3a29 100644
--- a/__fixtures__/outputv2/tendermint/types/params.ts
+++ b/__fixtures__/outputv2/tendermint/types/params.ts
@@ -13,7 +13,7 @@ export interface ConsensusParams {
   validator?: ValidatorParams;
   version?: VersionParams;
 }
-export interface ConsensusParamsProtoType {
+export interface ConsensusParamsProtoMsg {
   typeUrl: "/tendermint.types.ConsensusParams";
   value: Uint8Array;
 }
@@ -28,7 +28,7 @@ export interface ConsensusParamsAmino {
   validator?: ValidatorParamsAmino;
   version?: VersionParamsAmino;
 }
-export interface ConsensusParamsAminoType {
+export interface ConsensusParamsAminoMsg {
   type: "/tendermint.types.ConsensusParams";
   value: ConsensusParamsAmino;
 }
@@ -66,7 +66,7 @@ export interface BlockParams {
    */
   timeIotaMs: Long;
 }
-export interface BlockParamsProtoType {
+export interface BlockParamsProtoMsg {
   typeUrl: "/tendermint.types.BlockParams";
   value: Uint8Array;
 }
@@ -93,7 +93,7 @@ export interface BlockParamsAmino {
    */
   time_iota_ms: string;
 }
-export interface BlockParamsAminoType {
+export interface BlockParamsAminoMsg {
   type: "/tendermint.types.BlockParams";
   value: BlockParamsAmino;
 }
@@ -131,7 +131,7 @@ export interface EvidenceParams {
    */
   maxBytes: Long;
 }
-export interface EvidenceParamsProtoType {
+export interface EvidenceParamsProtoMsg {
   typeUrl: "/tendermint.types.EvidenceParams";
   value: Uint8Array;
 }
@@ -162,7 +162,7 @@ export interface EvidenceParamsAmino {
    */
   max_bytes: string;
 }
-export interface EvidenceParamsAminoType {
+export interface EvidenceParamsAminoMsg {
   type: "/tendermint.types.EvidenceParams";
   value: EvidenceParamsAmino;
 }
@@ -181,7 +181,7 @@ export interface EvidenceParamsSDKType {
 export interface ValidatorParams {
   pubKeyTypes: string[];
 }
-export interface ValidatorParamsProtoType {
+export interface ValidatorParamsProtoMsg {
   typeUrl: "/tendermint.types.ValidatorParams";
   value: Uint8Array;
 }
@@ -193,7 +193,7 @@ export interface ValidatorParamsProtoType {
 export interface ValidatorParamsAmino {
   pub_key_types: string[];
 }
-export interface ValidatorParamsAminoType {
+export interface ValidatorParamsAminoMsg {
   type: "/tendermint.types.ValidatorParams";
   value: ValidatorParamsAmino;
 }
@@ -210,7 +210,7 @@ export interface ValidatorParamsSDKType {
 export interface VersionParams {
   appVersion: Long;
 }
-export interface VersionParamsProtoType {
+export interface VersionParamsProtoMsg {
   typeUrl: "/tendermint.types.VersionParams";
   value: Uint8Array;
 }
@@ -219,7 +219,7 @@ export interface VersionParamsProtoType {
 export interface VersionParamsAmino {
   app_version: string;
 }
-export interface VersionParamsAminoType {
+export interface VersionParamsAminoMsg {
   type: "/tendermint.types.VersionParams";
   value: VersionParamsAmino;
 }
@@ -238,7 +238,7 @@ export interface HashedParams {
   blockMaxBytes: Long;
   blockMaxGas: Long;
 }
-export interface HashedParamsProtoType {
+export interface HashedParamsProtoMsg {
   typeUrl: "/tendermint.types.HashedParams";
   value: Uint8Array;
 }
@@ -252,7 +252,7 @@ export interface HashedParamsAmino {
   block_max_bytes: string;
   block_max_gas: string;
 }
-export interface HashedParamsAminoType {
+export interface HashedParamsAminoMsg {
   type: "/tendermint.types.HashedParams";
   value: HashedParamsAmino;
 }
@@ -277,6 +277,8 @@ function createBaseConsensusParams(): ConsensusParams {
 }
 
 export const ConsensusParams = {
+  typeUrl: "/tendermint.types.ConsensusParams",
+
   encode(message: ConsensusParams, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.block !== undefined) {
       BlockParams.encode(message.block, writer.uint32(10).fork()).ldelim();
@@ -392,6 +394,25 @@ export const ConsensusParams = {
     obj.validator = message.validator ? ValidatorParams.toAmino(message.validator) : undefined;
     obj.version = message.version ? VersionParams.toAmino(message.version) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ConsensusParamsAminoMsg): ConsensusParams {
+    return ConsensusParams.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ConsensusParamsProtoMsg): ConsensusParams {
+    return ConsensusParams.decode(message.value);
+  },
+
+  toProto(message: ConsensusParams): Uint8Array {
+    return ConsensusParams.encode(message).finish();
+  },
+
+  toProtoMsg(message: ConsensusParams): ConsensusParamsProtoMsg {
+    return {
+      typeUrl: "/tendermint.types.ConsensusParams",
+      value: ConsensusParams.encode(message).finish()
+    };
   }
 
 };
@@ -405,6 +426,8 @@ function createBaseBlockParams(): BlockParams {
 }
 
 export const BlockParams = {
+  typeUrl: "/tendermint.types.BlockParams",
+
   encode(message: BlockParams, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.maxBytes.isZero()) {
       writer.uint32(8).int64(message.maxBytes);
@@ -505,6 +528,25 @@ export const BlockParams = {
     obj.max_gas = message.maxGas ? message.maxGas.toString() : undefined;
     obj.time_iota_ms = message.timeIotaMs ? message.timeIotaMs.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: BlockParamsAminoMsg): BlockParams {
+    return BlockParams.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: BlockParamsProtoMsg): BlockParams {
+    return BlockParams.decode(message.value);
+  },
+
+  toProto(message: BlockParams): Uint8Array {
+    return BlockParams.encode(message).finish();
+  },
+
+  toProtoMsg(message: BlockParams): BlockParamsProtoMsg {
+    return {
+      typeUrl: "/tendermint.types.BlockParams",
+      value: BlockParams.encode(message).finish()
+    };
   }
 
 };
@@ -518,6 +560,8 @@ function createBaseEvidenceParams(): EvidenceParams {
 }
 
 export const EvidenceParams = {
+  typeUrl: "/tendermint.types.EvidenceParams",
+
   encode(message: EvidenceParams, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.maxAgeNumBlocks.isZero()) {
       writer.uint32(8).int64(message.maxAgeNumBlocks);
@@ -618,6 +662,25 @@ export const EvidenceParams = {
     obj.max_age_duration = message.maxAgeDuration ? Duration.toAmino(message.maxAgeDuration) : undefined;
     obj.max_bytes = message.maxBytes ? message.maxBytes.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: EvidenceParamsAminoMsg): EvidenceParams {
+    return EvidenceParams.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: EvidenceParamsProtoMsg): EvidenceParams {
+    return EvidenceParams.decode(message.value);
+  },
+
+  toProto(message: EvidenceParams): Uint8Array {
+    return EvidenceParams.encode(message).finish();
+  },
+
+  toProtoMsg(message: EvidenceParams): EvidenceParamsProtoMsg {
+    return {
+      typeUrl: "/tendermint.types.EvidenceParams",
+      value: EvidenceParams.encode(message).finish()
+    };
   }
 
 };
@@ -629,6 +692,8 @@ function createBaseValidatorParams(): ValidatorParams {
 }
 
 export const ValidatorParams = {
+  typeUrl: "/tendermint.types.ValidatorParams",
+
   encode(message: ValidatorParams, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.pubKeyTypes) {
       writer.uint32(10).string(v!);
@@ -717,6 +782,25 @@ export const ValidatorParams = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: ValidatorParamsAminoMsg): ValidatorParams {
+    return ValidatorParams.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ValidatorParamsProtoMsg): ValidatorParams {
+    return ValidatorParams.decode(message.value);
+  },
+
+  toProto(message: ValidatorParams): Uint8Array {
+    return ValidatorParams.encode(message).finish();
+  },
+
+  toProtoMsg(message: ValidatorParams): ValidatorParamsProtoMsg {
+    return {
+      typeUrl: "/tendermint.types.ValidatorParams",
+      value: ValidatorParams.encode(message).finish()
+    };
   }
 
 };
@@ -728,6 +812,8 @@ function createBaseVersionParams(): VersionParams {
 }
 
 export const VersionParams = {
+  typeUrl: "/tendermint.types.VersionParams",
+
   encode(message: VersionParams, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.appVersion.isZero()) {
       writer.uint32(8).uint64(message.appVersion);
@@ -798,6 +884,25 @@ export const VersionParams = {
     const obj: any = {};
     obj.app_version = message.appVersion ? message.appVersion.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: VersionParamsAminoMsg): VersionParams {
+    return VersionParams.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: VersionParamsProtoMsg): VersionParams {
+    return VersionParams.decode(message.value);
+  },
+
+  toProto(message: VersionParams): Uint8Array {
+    return VersionParams.encode(message).finish();
+  },
+
+  toProtoMsg(message: VersionParams): VersionParamsProtoMsg {
+    return {
+      typeUrl: "/tendermint.types.VersionParams",
+      value: VersionParams.encode(message).finish()
+    };
   }
 
 };
@@ -810,6 +915,8 @@ function createBaseHashedParams(): HashedParams {
 }
 
 export const HashedParams = {
+  typeUrl: "/tendermint.types.HashedParams",
+
   encode(message: HashedParams, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.blockMaxBytes.isZero()) {
       writer.uint32(8).int64(message.blockMaxBytes);
@@ -895,6 +1002,25 @@ export const HashedParams = {
     obj.block_max_bytes = message.blockMaxBytes ? message.blockMaxBytes.toString() : undefined;
     obj.block_max_gas = message.blockMaxGas ? message.blockMaxGas.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: HashedParamsAminoMsg): HashedParams {
+    return HashedParams.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: HashedParamsProtoMsg): HashedParams {
+    return HashedParams.decode(message.value);
+  },
+
+  toProto(message: HashedParams): Uint8Array {
+    return HashedParams.encode(message).finish();
+  },
+
+  toProtoMsg(message: HashedParams): HashedParamsProtoMsg {
+    return {
+      typeUrl: "/tendermint.types.HashedParams",
+      value: HashedParams.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/tendermint/types/types.ts b/__fixtures__/outputv2/tendermint/types/types.ts
index 1e3c57e4c..34cd6c97a 100644
--- a/__fixtures__/outputv2/tendermint/types/types.ts
+++ b/__fixtures__/outputv2/tendermint/types/types.ts
@@ -123,7 +123,7 @@ export interface PartSetHeader {
   total: number;
   hash: Uint8Array;
 }
-export interface PartSetHeaderProtoType {
+export interface PartSetHeaderProtoMsg {
   typeUrl: "/tendermint.types.PartSetHeader";
   value: Uint8Array;
 }
@@ -133,7 +133,7 @@ export interface PartSetHeaderAmino {
   total: number;
   hash: Uint8Array;
 }
-export interface PartSetHeaderAminoType {
+export interface PartSetHeaderAminoMsg {
   type: "/tendermint.types.PartSetHeader";
   value: PartSetHeaderAmino;
 }
@@ -148,7 +148,7 @@ export interface Part {
   bytes: Uint8Array;
   proof?: Proof;
 }
-export interface PartProtoType {
+export interface PartProtoMsg {
   typeUrl: "/tendermint.types.Part";
   value: Uint8Array;
 }
@@ -157,7 +157,7 @@ export interface PartAmino {
   bytes: Uint8Array;
   proof?: ProofAmino;
 }
-export interface PartAminoType {
+export interface PartAminoMsg {
   type: "/tendermint.types.Part";
   value: PartAmino;
 }
@@ -172,7 +172,7 @@ export interface BlockID {
   hash: Uint8Array;
   partSetHeader?: PartSetHeader;
 }
-export interface BlockIDProtoType {
+export interface BlockIDProtoMsg {
   typeUrl: "/tendermint.types.BlockID";
   value: Uint8Array;
 }
@@ -182,7 +182,7 @@ export interface BlockIDAmino {
   hash: Uint8Array;
   part_set_header?: PartSetHeaderAmino;
 }
-export interface BlockIDAminoType {
+export interface BlockIDAminoMsg {
   type: "/tendermint.types.BlockID";
   value: BlockIDAmino;
 }
@@ -227,7 +227,7 @@ export interface Header {
   /** original proposer of the block */
   proposerAddress: Uint8Array;
 }
-export interface HeaderProtoType {
+export interface HeaderProtoMsg {
   typeUrl: "/tendermint.types.Header";
   value: Uint8Array;
 }
@@ -266,7 +266,7 @@ export interface HeaderAmino {
   /** original proposer of the block */
   proposer_address: Uint8Array;
 }
-export interface HeaderAminoType {
+export interface HeaderAminoMsg {
   type: "/tendermint.types.Header";
   value: HeaderAmino;
 }
@@ -298,7 +298,7 @@ export interface Data {
    */
   txs: Uint8Array[];
 }
-export interface DataProtoType {
+export interface DataProtoMsg {
   typeUrl: "/tendermint.types.Data";
   value: Uint8Array;
 }
@@ -312,7 +312,7 @@ export interface DataAmino {
    */
   txs: Uint8Array[];
 }
-export interface DataAminoType {
+export interface DataAminoMsg {
   type: "/tendermint.types.Data";
   value: DataAmino;
 }
@@ -338,7 +338,7 @@ export interface Vote {
   validatorIndex: number;
   signature: Uint8Array;
 }
-export interface VoteProtoType {
+export interface VoteProtoMsg {
   typeUrl: "/tendermint.types.Vote";
   value: Uint8Array;
 }
@@ -359,7 +359,7 @@ export interface VoteAmino {
   validator_index: number;
   signature: Uint8Array;
 }
-export interface VoteAminoType {
+export interface VoteAminoMsg {
   type: "/tendermint.types.Vote";
   value: VoteAmino;
 }
@@ -386,7 +386,7 @@ export interface Commit {
   blockId?: BlockID;
   signatures: CommitSig[];
 }
-export interface CommitProtoType {
+export interface CommitProtoMsg {
   typeUrl: "/tendermint.types.Commit";
   value: Uint8Array;
 }
@@ -398,7 +398,7 @@ export interface CommitAmino {
   block_id?: BlockIDAmino;
   signatures: CommitSigAmino[];
 }
-export interface CommitAminoType {
+export interface CommitAminoMsg {
   type: "/tendermint.types.Commit";
   value: CommitAmino;
 }
@@ -418,7 +418,7 @@ export interface CommitSig {
   timestamp?: Date;
   signature: Uint8Array;
 }
-export interface CommitSigProtoType {
+export interface CommitSigProtoMsg {
   typeUrl: "/tendermint.types.CommitSig";
   value: Uint8Array;
 }
@@ -430,7 +430,7 @@ export interface CommitSigAmino {
   timestamp?: Date;
   signature: Uint8Array;
 }
-export interface CommitSigAminoType {
+export interface CommitSigAminoMsg {
   type: "/tendermint.types.CommitSig";
   value: CommitSigAmino;
 }
@@ -451,7 +451,7 @@ export interface Proposal {
   timestamp?: Date;
   signature: Uint8Array;
 }
-export interface ProposalProtoType {
+export interface ProposalProtoMsg {
   typeUrl: "/tendermint.types.Proposal";
   value: Uint8Array;
 }
@@ -464,7 +464,7 @@ export interface ProposalAmino {
   timestamp?: Date;
   signature: Uint8Array;
 }
-export interface ProposalAminoType {
+export interface ProposalAminoMsg {
   type: "/tendermint.types.Proposal";
   value: ProposalAmino;
 }
@@ -481,7 +481,7 @@ export interface SignedHeader {
   header?: Header;
   commit?: Commit;
 }
-export interface SignedHeaderProtoType {
+export interface SignedHeaderProtoMsg {
   typeUrl: "/tendermint.types.SignedHeader";
   value: Uint8Array;
 }
@@ -489,7 +489,7 @@ export interface SignedHeaderAmino {
   header?: HeaderAmino;
   commit?: CommitAmino;
 }
-export interface SignedHeaderAminoType {
+export interface SignedHeaderAminoMsg {
   type: "/tendermint.types.SignedHeader";
   value: SignedHeaderAmino;
 }
@@ -501,7 +501,7 @@ export interface LightBlock {
   signedHeader?: SignedHeader;
   validatorSet?: ValidatorSet;
 }
-export interface LightBlockProtoType {
+export interface LightBlockProtoMsg {
   typeUrl: "/tendermint.types.LightBlock";
   value: Uint8Array;
 }
@@ -509,7 +509,7 @@ export interface LightBlockAmino {
   signed_header?: SignedHeaderAmino;
   validator_set?: ValidatorSetAmino;
 }
-export interface LightBlockAminoType {
+export interface LightBlockAminoMsg {
   type: "/tendermint.types.LightBlock";
   value: LightBlockAmino;
 }
@@ -523,7 +523,7 @@ export interface BlockMeta {
   header?: Header;
   numTxs: Long;
 }
-export interface BlockMetaProtoType {
+export interface BlockMetaProtoMsg {
   typeUrl: "/tendermint.types.BlockMeta";
   value: Uint8Array;
 }
@@ -533,7 +533,7 @@ export interface BlockMetaAmino {
   header?: HeaderAmino;
   num_txs: string;
 }
-export interface BlockMetaAminoType {
+export interface BlockMetaAminoMsg {
   type: "/tendermint.types.BlockMeta";
   value: BlockMetaAmino;
 }
@@ -550,7 +550,7 @@ export interface TxProof {
   data: Uint8Array;
   proof?: Proof;
 }
-export interface TxProofProtoType {
+export interface TxProofProtoMsg {
   typeUrl: "/tendermint.types.TxProof";
   value: Uint8Array;
 }
@@ -561,7 +561,7 @@ export interface TxProofAmino {
   data: Uint8Array;
   proof?: ProofAmino;
 }
-export interface TxProofAminoType {
+export interface TxProofAminoMsg {
   type: "/tendermint.types.TxProof";
   value: TxProofAmino;
 }
@@ -581,6 +581,8 @@ function createBasePartSetHeader(): PartSetHeader {
 }
 
 export const PartSetHeader = {
+  typeUrl: "/tendermint.types.PartSetHeader",
+
   encode(message: PartSetHeader, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.total !== 0) {
       writer.uint32(8).uint32(message.total);
@@ -666,6 +668,25 @@ export const PartSetHeader = {
     obj.total = message.total;
     obj.hash = message.hash;
     return obj;
+  },
+
+  fromAminoMsg(object: PartSetHeaderAminoMsg): PartSetHeader {
+    return PartSetHeader.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: PartSetHeaderProtoMsg): PartSetHeader {
+    return PartSetHeader.decode(message.value);
+  },
+
+  toProto(message: PartSetHeader): Uint8Array {
+    return PartSetHeader.encode(message).finish();
+  },
+
+  toProtoMsg(message: PartSetHeader): PartSetHeaderProtoMsg {
+    return {
+      typeUrl: "/tendermint.types.PartSetHeader",
+      value: PartSetHeader.encode(message).finish()
+    };
   }
 
 };
@@ -679,6 +700,8 @@ function createBasePart(): Part {
 }
 
 export const Part = {
+  typeUrl: "/tendermint.types.Part",
+
   encode(message: Part, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.index !== 0) {
       writer.uint32(8).uint32(message.index);
@@ -779,6 +802,25 @@ export const Part = {
     obj.bytes = message.bytes;
     obj.proof = message.proof ? Proof.toAmino(message.proof) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: PartAminoMsg): Part {
+    return Part.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: PartProtoMsg): Part {
+    return Part.decode(message.value);
+  },
+
+  toProto(message: Part): Uint8Array {
+    return Part.encode(message).finish();
+  },
+
+  toProtoMsg(message: Part): PartProtoMsg {
+    return {
+      typeUrl: "/tendermint.types.Part",
+      value: Part.encode(message).finish()
+    };
   }
 
 };
@@ -791,6 +833,8 @@ function createBaseBlockID(): BlockID {
 }
 
 export const BlockID = {
+  typeUrl: "/tendermint.types.BlockID",
+
   encode(message: BlockID, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.hash.length !== 0) {
       writer.uint32(10).bytes(message.hash);
@@ -876,6 +920,25 @@ export const BlockID = {
     obj.hash = message.hash;
     obj.part_set_header = message.partSetHeader ? PartSetHeader.toAmino(message.partSetHeader) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: BlockIDAminoMsg): BlockID {
+    return BlockID.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: BlockIDProtoMsg): BlockID {
+    return BlockID.decode(message.value);
+  },
+
+  toProto(message: BlockID): Uint8Array {
+    return BlockID.encode(message).finish();
+  },
+
+  toProtoMsg(message: BlockID): BlockIDProtoMsg {
+    return {
+      typeUrl: "/tendermint.types.BlockID",
+      value: BlockID.encode(message).finish()
+    };
   }
 
 };
@@ -900,6 +963,8 @@ function createBaseHeader(): Header {
 }
 
 export const Header = {
+  typeUrl: "/tendermint.types.Header",
+
   encode(message: Header, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.version !== undefined) {
       Consensus.encode(message.version, writer.uint32(10).fork()).ldelim();
@@ -1165,6 +1230,25 @@ export const Header = {
     obj.evidence_hash = message.evidenceHash;
     obj.proposer_address = message.proposerAddress;
     return obj;
+  },
+
+  fromAminoMsg(object: HeaderAminoMsg): Header {
+    return Header.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: HeaderProtoMsg): Header {
+    return Header.decode(message.value);
+  },
+
+  toProto(message: Header): Uint8Array {
+    return Header.encode(message).finish();
+  },
+
+  toProtoMsg(message: Header): HeaderProtoMsg {
+    return {
+      typeUrl: "/tendermint.types.Header",
+      value: Header.encode(message).finish()
+    };
   }
 
 };
@@ -1176,6 +1260,8 @@ function createBaseData(): Data {
 }
 
 export const Data = {
+  typeUrl: "/tendermint.types.Data",
+
   encode(message: Data, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.txs) {
       writer.uint32(10).bytes(v!);
@@ -1264,6 +1350,25 @@ export const Data = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: DataAminoMsg): Data {
+    return Data.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: DataProtoMsg): Data {
+    return Data.decode(message.value);
+  },
+
+  toProto(message: Data): Uint8Array {
+    return Data.encode(message).finish();
+  },
+
+  toProtoMsg(message: Data): DataProtoMsg {
+    return {
+      typeUrl: "/tendermint.types.Data",
+      value: Data.encode(message).finish()
+    };
   }
 
 };
@@ -1282,6 +1387,8 @@ function createBaseVote(): Vote {
 }
 
 export const Vote = {
+  typeUrl: "/tendermint.types.Vote",
+
   encode(message: Vote, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.type !== 0) {
       writer.uint32(8).int32(message.type);
@@ -1457,6 +1564,25 @@ export const Vote = {
     obj.validator_index = message.validatorIndex;
     obj.signature = message.signature;
     return obj;
+  },
+
+  fromAminoMsg(object: VoteAminoMsg): Vote {
+    return Vote.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: VoteProtoMsg): Vote {
+    return Vote.decode(message.value);
+  },
+
+  toProto(message: Vote): Uint8Array {
+    return Vote.encode(message).finish();
+  },
+
+  toProtoMsg(message: Vote): VoteProtoMsg {
+    return {
+      typeUrl: "/tendermint.types.Vote",
+      value: Vote.encode(message).finish()
+    };
   }
 
 };
@@ -1471,6 +1597,8 @@ function createBaseCommit(): Commit {
 }
 
 export const Commit = {
+  typeUrl: "/tendermint.types.Commit",
+
   encode(message: Commit, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.height.isZero()) {
       writer.uint32(8).int64(message.height);
@@ -1604,6 +1732,25 @@ export const Commit = {
     }
 
     return obj;
+  },
+
+  fromAminoMsg(object: CommitAminoMsg): Commit {
+    return Commit.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: CommitProtoMsg): Commit {
+    return Commit.decode(message.value);
+  },
+
+  toProto(message: Commit): Uint8Array {
+    return Commit.encode(message).finish();
+  },
+
+  toProtoMsg(message: Commit): CommitProtoMsg {
+    return {
+      typeUrl: "/tendermint.types.Commit",
+      value: Commit.encode(message).finish()
+    };
   }
 
 };
@@ -1618,6 +1765,8 @@ function createBaseCommitSig(): CommitSig {
 }
 
 export const CommitSig = {
+  typeUrl: "/tendermint.types.CommitSig",
+
   encode(message: CommitSig, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.blockIdFlag !== 0) {
       writer.uint32(8).int32(message.blockIdFlag);
@@ -1733,6 +1882,25 @@ export const CommitSig = {
     obj.timestamp = message.timestamp ? Timestamp.toAmino(message.timestamp) : undefined;
     obj.signature = message.signature;
     return obj;
+  },
+
+  fromAminoMsg(object: CommitSigAminoMsg): CommitSig {
+    return CommitSig.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: CommitSigProtoMsg): CommitSig {
+    return CommitSig.decode(message.value);
+  },
+
+  toProto(message: CommitSig): Uint8Array {
+    return CommitSig.encode(message).finish();
+  },
+
+  toProtoMsg(message: CommitSig): CommitSigProtoMsg {
+    return {
+      typeUrl: "/tendermint.types.CommitSig",
+      value: CommitSig.encode(message).finish()
+    };
   }
 
 };
@@ -1750,6 +1918,8 @@ function createBaseProposal(): Proposal {
 }
 
 export const Proposal = {
+  typeUrl: "/tendermint.types.Proposal",
+
   encode(message: Proposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.type !== 0) {
       writer.uint32(8).int32(message.type);
@@ -1910,6 +2080,25 @@ export const Proposal = {
     obj.timestamp = message.timestamp ? Timestamp.toAmino(message.timestamp) : undefined;
     obj.signature = message.signature;
     return obj;
+  },
+
+  fromAminoMsg(object: ProposalAminoMsg): Proposal {
+    return Proposal.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ProposalProtoMsg): Proposal {
+    return Proposal.decode(message.value);
+  },
+
+  toProto(message: Proposal): Uint8Array {
+    return Proposal.encode(message).finish();
+  },
+
+  toProtoMsg(message: Proposal): ProposalProtoMsg {
+    return {
+      typeUrl: "/tendermint.types.Proposal",
+      value: Proposal.encode(message).finish()
+    };
   }
 
 };
@@ -1922,6 +2111,8 @@ function createBaseSignedHeader(): SignedHeader {
 }
 
 export const SignedHeader = {
+  typeUrl: "/tendermint.types.SignedHeader",
+
   encode(message: SignedHeader, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.header !== undefined) {
       Header.encode(message.header, writer.uint32(10).fork()).ldelim();
@@ -2007,6 +2198,25 @@ export const SignedHeader = {
     obj.header = message.header ? Header.toAmino(message.header) : undefined;
     obj.commit = message.commit ? Commit.toAmino(message.commit) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: SignedHeaderAminoMsg): SignedHeader {
+    return SignedHeader.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: SignedHeaderProtoMsg): SignedHeader {
+    return SignedHeader.decode(message.value);
+  },
+
+  toProto(message: SignedHeader): Uint8Array {
+    return SignedHeader.encode(message).finish();
+  },
+
+  toProtoMsg(message: SignedHeader): SignedHeaderProtoMsg {
+    return {
+      typeUrl: "/tendermint.types.SignedHeader",
+      value: SignedHeader.encode(message).finish()
+    };
   }
 
 };
@@ -2019,6 +2229,8 @@ function createBaseLightBlock(): LightBlock {
 }
 
 export const LightBlock = {
+  typeUrl: "/tendermint.types.LightBlock",
+
   encode(message: LightBlock, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.signedHeader !== undefined) {
       SignedHeader.encode(message.signedHeader, writer.uint32(10).fork()).ldelim();
@@ -2104,6 +2316,25 @@ export const LightBlock = {
     obj.signed_header = message.signedHeader ? SignedHeader.toAmino(message.signedHeader) : undefined;
     obj.validator_set = message.validatorSet ? ValidatorSet.toAmino(message.validatorSet) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: LightBlockAminoMsg): LightBlock {
+    return LightBlock.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: LightBlockProtoMsg): LightBlock {
+    return LightBlock.decode(message.value);
+  },
+
+  toProto(message: LightBlock): Uint8Array {
+    return LightBlock.encode(message).finish();
+  },
+
+  toProtoMsg(message: LightBlock): LightBlockProtoMsg {
+    return {
+      typeUrl: "/tendermint.types.LightBlock",
+      value: LightBlock.encode(message).finish()
+    };
   }
 
 };
@@ -2118,6 +2349,8 @@ function createBaseBlockMeta(): BlockMeta {
 }
 
 export const BlockMeta = {
+  typeUrl: "/tendermint.types.BlockMeta",
+
   encode(message: BlockMeta, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.blockId !== undefined) {
       BlockID.encode(message.blockId, writer.uint32(10).fork()).ldelim();
@@ -2233,6 +2466,25 @@ export const BlockMeta = {
     obj.header = message.header ? Header.toAmino(message.header) : undefined;
     obj.num_txs = message.numTxs ? message.numTxs.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: BlockMetaAminoMsg): BlockMeta {
+    return BlockMeta.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: BlockMetaProtoMsg): BlockMeta {
+    return BlockMeta.decode(message.value);
+  },
+
+  toProto(message: BlockMeta): Uint8Array {
+    return BlockMeta.encode(message).finish();
+  },
+
+  toProtoMsg(message: BlockMeta): BlockMetaProtoMsg {
+    return {
+      typeUrl: "/tendermint.types.BlockMeta",
+      value: BlockMeta.encode(message).finish()
+    };
   }
 
 };
@@ -2246,6 +2498,8 @@ function createBaseTxProof(): TxProof {
 }
 
 export const TxProof = {
+  typeUrl: "/tendermint.types.TxProof",
+
   encode(message: TxProof, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.rootHash.length !== 0) {
       writer.uint32(10).bytes(message.rootHash);
@@ -2346,6 +2600,25 @@ export const TxProof = {
     obj.data = message.data;
     obj.proof = message.proof ? Proof.toAmino(message.proof) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: TxProofAminoMsg): TxProof {
+    return TxProof.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: TxProofProtoMsg): TxProof {
+    return TxProof.decode(message.value);
+  },
+
+  toProto(message: TxProof): Uint8Array {
+    return TxProof.encode(message).finish();
+  },
+
+  toProtoMsg(message: TxProof): TxProofProtoMsg {
+    return {
+      typeUrl: "/tendermint.types.TxProof",
+      value: TxProof.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/tendermint/types/validator.ts b/__fixtures__/outputv2/tendermint/types/validator.ts
index 8a03917bc..340246355 100644
--- a/__fixtures__/outputv2/tendermint/types/validator.ts
+++ b/__fixtures__/outputv2/tendermint/types/validator.ts
@@ -7,7 +7,7 @@ export interface ValidatorSet {
   proposer?: Validator;
   totalVotingPower: Long;
 }
-export interface ValidatorSetProtoType {
+export interface ValidatorSetProtoMsg {
   typeUrl: "/tendermint.types.ValidatorSet";
   value: Uint8Array;
 }
@@ -16,7 +16,7 @@ export interface ValidatorSetAmino {
   proposer?: ValidatorAmino;
   total_voting_power: string;
 }
-export interface ValidatorSetAminoType {
+export interface ValidatorSetAminoMsg {
   type: "/tendermint.types.ValidatorSet";
   value: ValidatorSetAmino;
 }
@@ -31,7 +31,7 @@ export interface Validator {
   votingPower: Long;
   proposerPriority: Long;
 }
-export interface ValidatorProtoType {
+export interface ValidatorProtoMsg {
   typeUrl: "/tendermint.types.Validator";
   value: Uint8Array;
 }
@@ -41,7 +41,7 @@ export interface ValidatorAmino {
   voting_power: string;
   proposer_priority: string;
 }
-export interface ValidatorAminoType {
+export interface ValidatorAminoMsg {
   type: "/tendermint.types.Validator";
   value: ValidatorAmino;
 }
@@ -55,7 +55,7 @@ export interface SimpleValidator {
   pubKey?: PublicKey;
   votingPower: Long;
 }
-export interface SimpleValidatorProtoType {
+export interface SimpleValidatorProtoMsg {
   typeUrl: "/tendermint.types.SimpleValidator";
   value: Uint8Array;
 }
@@ -63,7 +63,7 @@ export interface SimpleValidatorAmino {
   pub_key?: PublicKeyAmino;
   voting_power: string;
 }
-export interface SimpleValidatorAminoType {
+export interface SimpleValidatorAminoMsg {
   type: "/tendermint.types.SimpleValidator";
   value: SimpleValidatorAmino;
 }
@@ -81,6 +81,8 @@ function createBaseValidatorSet(): ValidatorSet {
 }
 
 export const ValidatorSet = {
+  typeUrl: "/tendermint.types.ValidatorSet",
+
   encode(message: ValidatorSet, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.validators) {
       Validator.encode(v!, writer.uint32(10).fork()).ldelim();
@@ -199,6 +201,25 @@ export const ValidatorSet = {
     obj.proposer = message.proposer ? Validator.toAmino(message.proposer) : undefined;
     obj.total_voting_power = message.totalVotingPower ? message.totalVotingPower.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ValidatorSetAminoMsg): ValidatorSet {
+    return ValidatorSet.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ValidatorSetProtoMsg): ValidatorSet {
+    return ValidatorSet.decode(message.value);
+  },
+
+  toProto(message: ValidatorSet): Uint8Array {
+    return ValidatorSet.encode(message).finish();
+  },
+
+  toProtoMsg(message: ValidatorSet): ValidatorSetProtoMsg {
+    return {
+      typeUrl: "/tendermint.types.ValidatorSet",
+      value: ValidatorSet.encode(message).finish()
+    };
   }
 
 };
@@ -213,6 +234,8 @@ function createBaseValidator(): Validator {
 }
 
 export const Validator = {
+  typeUrl: "/tendermint.types.Validator",
+
   encode(message: Validator, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.address.length !== 0) {
       writer.uint32(10).bytes(message.address);
@@ -328,6 +351,25 @@ export const Validator = {
     obj.voting_power = message.votingPower ? message.votingPower.toString() : undefined;
     obj.proposer_priority = message.proposerPriority ? message.proposerPriority.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ValidatorAminoMsg): Validator {
+    return Validator.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ValidatorProtoMsg): Validator {
+    return Validator.decode(message.value);
+  },
+
+  toProto(message: Validator): Uint8Array {
+    return Validator.encode(message).finish();
+  },
+
+  toProtoMsg(message: Validator): ValidatorProtoMsg {
+    return {
+      typeUrl: "/tendermint.types.Validator",
+      value: Validator.encode(message).finish()
+    };
   }
 
 };
@@ -340,6 +382,8 @@ function createBaseSimpleValidator(): SimpleValidator {
 }
 
 export const SimpleValidator = {
+  typeUrl: "/tendermint.types.SimpleValidator",
+
   encode(message: SimpleValidator, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.pubKey !== undefined) {
       PublicKey.encode(message.pubKey, writer.uint32(10).fork()).ldelim();
@@ -425,6 +469,25 @@ export const SimpleValidator = {
     obj.pub_key = message.pubKey ? PublicKey.toAmino(message.pubKey) : undefined;
     obj.voting_power = message.votingPower ? message.votingPower.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: SimpleValidatorAminoMsg): SimpleValidator {
+    return SimpleValidator.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: SimpleValidatorProtoMsg): SimpleValidator {
+    return SimpleValidator.decode(message.value);
+  },
+
+  toProto(message: SimpleValidator): Uint8Array {
+    return SimpleValidator.encode(message).finish();
+  },
+
+  toProtoMsg(message: SimpleValidator): SimpleValidatorProtoMsg {
+    return {
+      typeUrl: "/tendermint.types.SimpleValidator",
+      value: SimpleValidator.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/__fixtures__/outputv2/tendermint/version/types.ts b/__fixtures__/outputv2/tendermint/version/types.ts
index f4372f8ed..45360a9ce 100644
--- a/__fixtures__/outputv2/tendermint/version/types.ts
+++ b/__fixtures__/outputv2/tendermint/version/types.ts
@@ -11,7 +11,7 @@ export interface App {
   protocol: Long;
   software: string;
 }
-export interface AppProtoType {
+export interface AppProtoMsg {
   typeUrl: "/tendermint.version.App";
   value: Uint8Array;
 }
@@ -25,7 +25,7 @@ export interface AppAmino {
   protocol: string;
   software: string;
 }
-export interface AppAminoType {
+export interface AppAminoMsg {
   type: "/tendermint.version.App";
   value: AppAmino;
 }
@@ -49,7 +49,7 @@ export interface Consensus {
   block: Long;
   app: Long;
 }
-export interface ConsensusProtoType {
+export interface ConsensusProtoMsg {
   typeUrl: "/tendermint.version.Consensus";
   value: Uint8Array;
 }
@@ -63,7 +63,7 @@ export interface ConsensusAmino {
   block: string;
   app: string;
 }
-export interface ConsensusAminoType {
+export interface ConsensusAminoMsg {
   type: "/tendermint.version.Consensus";
   value: ConsensusAmino;
 }
@@ -86,6 +86,8 @@ function createBaseApp(): App {
 }
 
 export const App = {
+  typeUrl: "/tendermint.version.App",
+
   encode(message: App, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.protocol.isZero()) {
       writer.uint32(8).uint64(message.protocol);
@@ -171,6 +173,25 @@ export const App = {
     obj.protocol = message.protocol ? message.protocol.toString() : undefined;
     obj.software = message.software;
     return obj;
+  },
+
+  fromAminoMsg(object: AppAminoMsg): App {
+    return App.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: AppProtoMsg): App {
+    return App.decode(message.value);
+  },
+
+  toProto(message: App): Uint8Array {
+    return App.encode(message).finish();
+  },
+
+  toProtoMsg(message: App): AppProtoMsg {
+    return {
+      typeUrl: "/tendermint.version.App",
+      value: App.encode(message).finish()
+    };
   }
 
 };
@@ -183,6 +204,8 @@ function createBaseConsensus(): Consensus {
 }
 
 export const Consensus = {
+  typeUrl: "/tendermint.version.Consensus",
+
   encode(message: Consensus, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (!message.block.isZero()) {
       writer.uint32(8).uint64(message.block);
@@ -268,6 +291,25 @@ export const Consensus = {
     obj.block = message.block ? message.block.toString() : undefined;
     obj.app = message.app ? message.app.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: ConsensusAminoMsg): Consensus {
+    return Consensus.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: ConsensusProtoMsg): Consensus {
+    return Consensus.decode(message.value);
+  },
+
+  toProto(message: Consensus): Uint8Array {
+    return Consensus.encode(message).finish();
+  },
+
+  toProtoMsg(message: Consensus): ConsensusProtoMsg {
+    return {
+      typeUrl: "/tendermint.version.Consensus",
+      value: Consensus.encode(message).finish()
+    };
   }
 
 };
\ No newline at end of file
diff --git a/package.json b/package.json
index 8ee6b7d81..b392b6a03 100644
--- a/package.json
+++ b/package.json
@@ -8,6 +8,11 @@
   "scripts": {
     "build": "lerna run prepare --parallel",
     "buidl": "lerna run buidl --parallel",
+    "ast:fixture": "lerna run test:ast --parallel --scope \"@osmonauts/ast\"",
+    "buidl:ast": "lerna run buidl --parallel --scope \"@osmonauts/ast\"",
+    "buidl:parser": "lerna run buidl --parallel --scope \"@osmonauts/proto-parser\"",
+    "buidl:telescope": "lerna run buidl --parallel --scope \"@osmonauts/telescope\"",
+    "buidl:types": "lerna run buidl --parallel --scope \"@osmonauts/types\"",
     "bootstrap": "lerna bootstrap --use-workspaces",
     "lint": "lerna run lint",
     "format": "lerna run format",
@@ -37,4 +42,4 @@
   "dependencies": {
     "@jest/transform": "28.1.3"
   }
-}
+}
\ No newline at end of file
diff --git a/packages/ast/src/encoding/amino/utils.ts b/packages/ast/src/encoding/amino/utils.ts
index 97c26949d..767ffdd08 100644
--- a/packages/ast/src/encoding/amino/utils.ts
+++ b/packages/ast/src/encoding/amino/utils.ts
@@ -7,6 +7,7 @@ export const getTypeUrlWithPkgAndName = (pkg: string, name: string) => {
     return `/${pkg}.${name}`;
 }
 export const getTypeUrl = (root: ProtoRoot, proto: ProtoAny | ProtoType) => {
+    if (!proto.name) return;
     return getTypeUrlWithPkgAndName(root.package, proto.name);
 }
 
@@ -27,6 +28,12 @@ export const getAminoTypeName = (
         return proto.options['(amino.name)'];
     }
 
+    if (!proto.name) {
+        // seems to only happen for 
+        //  SourceInfo_PositionsEntry  (in hash map inside google.api.expr.v1beta1)
+        return;
+    }
+
     const typeUrl: string = getTypeUrl(root, proto);
 
     const exceptionsToCheck = {
diff --git a/packages/ast/src/encoding/object.ts b/packages/ast/src/encoding/object.ts
index 8bb5f7fdc..8a498b9b7 100644
--- a/packages/ast/src/encoding/object.ts
+++ b/packages/ast/src/encoding/object.ts
@@ -5,11 +5,12 @@ import { decodeMethod } from './proto/decode';
 import { encodeMethod } from './proto/encode';
 import { fromJSONMethod } from './proto/from-json';
 import { toJSONMethod } from './proto/to-json';
-import { fromAminoJSONMethod } from './proto/from-amino';
-import { toAminoJSONMethod } from './proto/to-amino';
+import { fromAminoJSONMethod, fromAminoMsgMethod } from './proto/from-amino';
+import { toAminoJSONMethod, toAminoMsgMethod } from './proto/to-amino';
 import { toSDKMethod } from './proto/to-sdk';
 import { fromSDKMethod } from './proto/from-sdk';
 import { ProtoParseContext } from './context';
+import { createAminoTypeProperty, createTypeUrlProperty, fromProtoMsgMethod, toProtoMethod, toProtoMsgMethod } from './proto';
 
 export const createObjectWithMethods = (
     context: ProtoParseContext,
@@ -17,7 +18,9 @@ export const createObjectWithMethods = (
     proto: ProtoType
 ) => {
 
-    const methods = [
+    const methodsAndProps = [
+        context.pluginValue('prototypes.addTypeUrlToObjects') && createTypeUrlProperty(context, proto),
+        context.pluginValue('prototypes.addAminoTypeToObjects') && createAminoTypeProperty(context, proto),
         context.pluginValue('prototypes.methods.encode') && encodeMethod(context, name, proto),
         context.pluginValue('prototypes.methods.decode') && decodeMethod(context, name, proto),
         context.pluginValue('prototypes.methods.fromJSON') && fromJSONMethod(context, name, proto),
@@ -25,8 +28,15 @@ export const createObjectWithMethods = (
         context.pluginValue('prototypes.methods.fromPartial') && fromPartialMethod(context, name, proto),
         context.pluginValue('prototypes.methods.fromSDK') && fromSDKMethod(context, name, proto),
         context.pluginValue('prototypes.methods.toSDK') && toSDKMethod(context, name, proto),
-        context.options.aminoEncoding.useRecursiveV2encoding && fromAminoJSONMethod(context, name, proto),
-        context.options.aminoEncoding.useRecursiveV2encoding && toAminoJSONMethod(context, name, proto),
+        (context.pluginValue('aminoEncoding.useRecursiveV2encoding') || context.pluginValue('prototypes.methods.fromAmino')) && fromAminoJSONMethod(context, name, proto),
+        (context.pluginValue('aminoEncoding.useRecursiveV2encoding') || context.pluginValue('prototypes.methods.toAmino')) && toAminoJSONMethod(context, name, proto),
+        (context.pluginValue('aminoEncoding.useRecursiveV2encoding') || context.pluginValue('prototypes.methods.fromAmino')) && fromAminoMsgMethod(context, name, proto),
+        (context.pluginValue('aminoEncoding.useRecursiveV2encoding') || context.pluginValue('prototypes.methods.toAmino')) && toAminoMsgMethod(context, name, proto),
+        (context.pluginValue('aminoEncoding.useRecursiveV2encoding') || context.pluginValue('prototypes.methods.fromProto')) && fromProtoMsgMethod(context, name, proto),
+        (context.pluginValue('aminoEncoding.useRecursiveV2encoding') || context.pluginValue('prototypes.methods.toProto')) && toProtoMethod(context, name, proto),
+        (context.pluginValue('aminoEncoding.useRecursiveV2encoding') || context.pluginValue('prototypes.methods.toProto')) && toProtoMsgMethod(context, name, proto),
+        // context.options.aminoEncoding.useRecursiveV2encoding && fromAminoJSONMethod(context, name, proto),
+        // context.options.aminoEncoding.useRecursiveV2encoding && toAminoJSONMethod(context, name, proto),
     ].filter(Boolean);
 
     return t.exportNamedDeclaration(
@@ -35,7 +45,7 @@ export const createObjectWithMethods = (
                 t.variableDeclarator(
                     t.identifier(name),
                     t.objectExpression(
-                        methods
+                        methodsAndProps
                     )
                 )
             ]
diff --git a/packages/ast/src/encoding/proto/__snapshots__/interfaces-amino.test.ts.snap b/packages/ast/src/encoding/proto/__snapshots__/interfaces-amino.test.ts.snap
index e877476f9..d23687bc3 100644
--- a/packages/ast/src/encoding/proto/__snapshots__/interfaces-amino.test.ts.snap
+++ b/packages/ast/src/encoding/proto/__snapshots__/interfaces-amino.test.ts.snap
@@ -85,6 +85,25 @@ exports[`Duration 1`] = `
 
   toAmino(message: Duration): DurationAmino {
     return (message.seconds.toInt() * 1_000_000_000 + message.nanos).toString();
+  },
+
+  fromAminoMsg(object: DurationAminoMsg): Duration {
+    return Duration.fromAmino(object.value);
+  },
+
+  fromProtoMsg(message: DurationProtoMsg): Duration {
+    return Duration.decode(message.value);
+  },
+
+  toProto(message: Duration): Uint8Array {
+    return Duration.encode(message).finish();
+  },
+
+  toProtoMsg(message: Duration): DurationProtoMsg {
+    return {
+      typeUrl: "/google.protobuf.Duration",
+      value: Duration.encode(message).finish()
+    };
   }
 
 };"
@@ -177,6 +196,32 @@ exports[`Height 1`] = `
     obj.revision_number = message.revisionNumber ? message.revisionNumber.toString() : undefined;
     obj.revision_height = message.revisionHeight ? message.revisionHeight.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: HeightAminoMsg): Height {
+    return Height.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: Height): HeightAminoMsg {
+    return {
+      type: "cosmos-sdk/Height",
+      value: Height.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: HeightProtoMsg): Height {
+    return Height.decode(message.value);
+  },
+
+  toProto(message: Height): Uint8Array {
+    return Height.encode(message).finish();
+  },
+
+  toProtoMsg(message: Height): HeightProtoMsg {
+    return {
+      typeUrl: "/ibc.core.client.v1.Height",
+      value: Height.encode(message).finish()
+    };
   }
 
 };"
@@ -350,6 +395,32 @@ exports[`MsgCreateValidator 1`] = `
     } : undefined;
     obj.value = message.value ? Coin.toAmino(message.value) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgCreateValidatorAminoMsg): MsgCreateValidator {
+    return MsgCreateValidator.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgCreateValidator): MsgCreateValidatorAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgCreateValidator",
+      value: MsgCreateValidator.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgCreateValidatorProtoMsg): MsgCreateValidator {
+    return MsgCreateValidator.decode(message.value);
+  },
+
+  toProto(message: MsgCreateValidator): Uint8Array {
+    return MsgCreateValidator.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgCreateValidator): MsgCreateValidatorProtoMsg {
+    return {
+      typeUrl: "/cosmos.staking.v1beta1.MsgCreateValidator",
+      value: MsgCreateValidator.encode(message).finish()
+    };
   }
 
 };"
@@ -457,6 +528,32 @@ exports[`MsgStoreCode 1`] = `
     obj.wasm_byte_code = message.wasmByteCode ? toBase64(message.wasmByteCode) : undefined;
     obj.instantiate_permission = message.instantiatePermission ? AccessConfig.toAmino(message.instantiatePermission) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgStoreCodeAminoMsg): MsgStoreCode {
+    return MsgStoreCode.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgStoreCode): MsgStoreCodeAminoMsg {
+    return {
+      type: "wasm/MsgStoreCode",
+      value: MsgStoreCode.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgStoreCodeProtoMsg): MsgStoreCode {
+    return MsgStoreCode.decode(message.value);
+  },
+
+  toProto(message: MsgStoreCode): Uint8Array {
+    return MsgStoreCode.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgStoreCode): MsgStoreCodeProtoMsg {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgStoreCode",
+      value: MsgStoreCode.encode(message).finish()
+    };
   }
 
 };"
@@ -582,6 +679,32 @@ exports[`MsgSubmitProposal 1`] = `
 
     obj.proposer = message.proposer;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgSubmitProposalAminoMsg): MsgSubmitProposal {
+    return MsgSubmitProposal.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgSubmitProposal): MsgSubmitProposalAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgSubmitProposal",
+      value: MsgSubmitProposal.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgSubmitProposalProtoMsg): MsgSubmitProposal {
+    return MsgSubmitProposal.decode(message.value);
+  },
+
+  toProto(message: MsgSubmitProposal): Uint8Array {
+    return MsgSubmitProposal.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgSubmitProposal): MsgSubmitProposalProtoMsg {
+    return {
+      typeUrl: "/cosmos.gov.v1beta1.MsgSubmitProposal",
+      value: MsgSubmitProposal.encode(message).finish()
+    };
   }
 
 };"
@@ -749,6 +872,32 @@ exports[`MsgTransfer 1`] = `
     obj.timeout_height = message.timeoutHeight ? Height.toAmino(message.timeoutHeight) : {};
     obj.timeout_timestamp = message.timeoutTimestamp ? message.timeoutTimestamp.toString() : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: MsgTransferAminoMsg): MsgTransfer {
+    return MsgTransfer.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: MsgTransfer): MsgTransferAminoMsg {
+    return {
+      type: "cosmos-sdk/MsgTransfer",
+      value: MsgTransfer.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: MsgTransferProtoMsg): MsgTransfer {
+    return MsgTransfer.decode(message.value);
+  },
+
+  toProto(message: MsgTransfer): Uint8Array {
+    return MsgTransfer.encode(message).finish();
+  },
+
+  toProtoMsg(message: MsgTransfer): MsgTransferProtoMsg {
+    return {
+      typeUrl: "/ibc.applications.transfer.v1.MsgTransfer",
+      value: MsgTransfer.encode(message).finish()
+    };
   }
 
 };"
diff --git a/packages/ast/src/encoding/proto/from-amino/index.ts b/packages/ast/src/encoding/proto/from-amino/index.ts
index d23b5ccea..e1f65ac60 100644
--- a/packages/ast/src/encoding/proto/from-amino/index.ts
+++ b/packages/ast/src/encoding/proto/from-amino/index.ts
@@ -5,6 +5,7 @@ import { getFieldOptionality, getFieldOptionalityForDefaults, getOneOfs } from '
 import { BILLION, identifier, objectMethod } from '../../../utils';
 import { ProtoParseContext } from '../../context';
 import { fromAminoJSON, arrayTypes, fromAminoMessages } from './utils';
+import { SymbolNames } from '../../types';
 
 const needsImplementation = (name: string, field: ProtoField) => {
     throw new Error(`need to implement fromAminoJSON (${field.type} rules[${field.rule}] name[${name}])`);
@@ -174,9 +175,7 @@ export const fromAminoJSONMethod = (context: ProtoParseContext, name: string, pr
         varName = '_';
     }
 
-    const AminoTypeName =
-        [name, 'Amino']
-            .filter(Boolean).join('');
+    const AminoTypeName = SymbolNames.Amino(name);
 
     const body: t.Statement[] = [];
 
@@ -239,3 +238,56 @@ export const fromAminoJSONMethod = (context: ProtoParseContext, name: string, pr
         )
     )
 };
+
+export const fromAminoMsgMethod = (context: ProtoParseContext, name: string, proto: ProtoType) => {
+    const varName = 'object';
+
+    const TypeName = SymbolNames.Msg(name);
+    const AminoMsgName = SymbolNames.AminoMsg(name);
+    const ReturnType = SymbolNames.Msg(name);
+
+    const body: t.Statement[] = [];
+
+    body.push(
+        t.returnStatement(
+            t.callExpression(
+                t.memberExpression(
+                    t.identifier(TypeName),
+                    t.identifier('fromAmino')
+                ),
+                [
+                    t.memberExpression(
+                        t.identifier(varName),
+                        t.identifier('value')
+                    )
+                ]
+            )
+        )
+    );
+
+    return objectMethod('method',
+        t.identifier('fromAminoMsg'),
+        [
+            identifier(varName,
+                t.tsTypeAnnotation(
+                    t.tsTypeReference(
+                        t.identifier(AminoMsgName)
+                    )
+                ),
+                false
+            )
+
+        ],
+        t.blockStatement(
+            body
+        ),
+        false,
+        false,
+        false,
+        t.tsTypeAnnotation(
+            t.tsTypeReference(
+                t.identifier(ReturnType)
+            )
+        )
+    )
+};
diff --git a/packages/ast/src/encoding/proto/from-proto/index.ts b/packages/ast/src/encoding/proto/from-proto/index.ts
new file mode 100644
index 000000000..b43d43ff8
--- /dev/null
+++ b/packages/ast/src/encoding/proto/from-proto/index.ts
@@ -0,0 +1,56 @@
+import * as t from '@babel/types';
+import { identifier, objectMethod } from '../../../utils';
+import { ProtoParseContext } from '../../context';
+import { ProtoType } from '@osmonauts/types';
+import { SymbolNames } from '../../types';
+
+export const fromProtoMsgMethod = (context: ProtoParseContext, name: string, proto: ProtoType) => {
+    const varName = 'message';
+    const ReturnType = SymbolNames.Msg(name);
+    const ProtoMsgName = SymbolNames.ProtoMsg(name);
+    const TypeName = SymbolNames.Msg(name);
+
+    const body: t.Statement[] = [];
+
+    // body
+
+    body.push(
+        t.returnStatement(
+            t.callExpression(
+                t.memberExpression(
+                    t.identifier(TypeName),
+                    t.identifier('decode')
+                ),
+                [
+                    t.memberExpression(
+                        t.identifier(varName),
+                        t.identifier('value')
+                    )
+                ]
+            )
+        )
+    );
+
+    return objectMethod('method',
+        t.identifier('fromProtoMsg'),
+        [
+            identifier(
+                varName,
+                t.tsTypeAnnotation(
+                    t.tsTypeReference(
+                        t.identifier(ProtoMsgName)
+                    )
+                )
+            )
+        ],
+        t.blockStatement(body),
+        false,
+        false,
+        false,
+        t.tsTypeAnnotation(
+            t.tsTypeReference(
+                t.identifier(ReturnType)
+            )
+        )
+    );
+};
diff --git a/packages/ast/src/encoding/proto/implements/__tests__/__snapshots__/interface-decoder.test.ts.snap b/packages/ast/src/encoding/proto/implements/__tests__/__snapshots__/interface-decoder.test.ts.snap
index 58a1478d3..ed04b0d60 100644
--- a/packages/ast/src/encoding/proto/implements/__tests__/__snapshots__/interface-decoder.test.ts.snap
+++ b/packages/ast/src/encoding/proto/implements/__tests__/__snapshots__/interface-decoder.test.ts.snap
@@ -141,6 +141,32 @@ exports[`PoolI objects 1`] = `
 
     obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined;
     return obj;
+  },
+
+  fromAminoMsg(object: QueryPoolsResponseAminoMsg): QueryPoolsResponse {
+    return QueryPoolsResponse.fromAmino(object.value);
+  },
+
+  toAminoMsg(message: QueryPoolsResponse): QueryPoolsResponseAminoMsg {
+    return {
+      type: "osmosis/gamm/query-pools-response",
+      value: QueryPoolsResponse.toAmino(message)
+    };
+  },
+
+  fromProtoMsg(message: QueryPoolsResponseProtoMsg): QueryPoolsResponse {
+    return QueryPoolsResponse.decode(message.value);
+  },
+
+  toProto(message: QueryPoolsResponse): Uint8Array {
+    return QueryPoolsResponse.encode(message).finish();
+  },
+
+  toProtoMsg(message: QueryPoolsResponse): QueryPoolsResponseProtoMsg {
+    return {
+      typeUrl: "/osmosis.gamm.v1beta1.QueryPoolsResponse",
+      value: QueryPoolsResponse.encode(message).finish()
+    };
   }
 
 };"
diff --git a/packages/ast/src/encoding/proto/index.ts b/packages/ast/src/encoding/proto/index.ts
index 91af1b39a..8d68f1b88 100644
--- a/packages/ast/src/encoding/proto/index.ts
+++ b/packages/ast/src/encoding/proto/index.ts
@@ -8,6 +8,9 @@ export * from './from-sdk';
 export * from './implements';
 export * from './interface';
 export * from './to-amino';
+export * from './to-proto';
+export * from './from-proto';
 export * from './to-json';
 export * from './to-sdk';
+export * from './props';
 export * from './types';
\ No newline at end of file
diff --git a/packages/ast/src/encoding/proto/interface/__tests__/__snapshots__/amino.interface.types.test.ts.snap b/packages/ast/src/encoding/proto/interface/__tests__/__snapshots__/amino.interface.types.test.ts.snap
index 77068e20f..9e40ca980 100644
--- a/packages/ast/src/encoding/proto/interface/__tests__/__snapshots__/amino.interface.types.test.ts.snap
+++ b/packages/ast/src/encoding/proto/interface/__tests__/__snapshots__/amino.interface.types.test.ts.snap
@@ -1,70 +1,70 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`GenesisState interface 1`] = `
-"export interface GenesisStateAminoType {
+"export interface GenesisStateAminoMsg {
   type: "cosmos-sdk/GenesisState";
   value: GenesisStateAmino;
 }"
 `;
 
 exports[`MsgSend amino interface 1`] = `
-"export interface MsgSendAminoType {
+"export interface MsgSendAminoMsg {
   type: "cosmos-sdk/MsgSend";
   value: MsgSendAmino;
 }"
 `;
 
 exports[`PageRequest interface 1`] = `
-"export interface PageRequestAminoType {
+"export interface PageRequestAminoMsg {
   type: "cosmos-sdk/PageRequest";
   value: PageRequestAmino;
 }"
 `;
 
 exports[`PageResponse interface 1`] = `
-"export interface PageResponseAminoType {
+"export interface PageResponseAminoMsg {
   type: "cosmos-sdk/PageResponse";
   value: PageResponseAmino;
 }"
 `;
 
 exports[`confio/proofs.proto ExistenceProof 1`] = `
-"export interface ExistenceProofAminoType {
+"export interface ExistenceProofAminoMsg {
   type: "/ics23.ExistenceProof";
   value: ExistenceProofAmino;
 }"
 `;
 
 exports[`cosmos/auth/v1beta1/auth.proto BaseAccount 1`] = `
-"export interface BaseAccountAminoType {
+"export interface BaseAccountAminoMsg {
   type: "cosmos-sdk/BaseAccount";
   value: BaseAccountAmino;
 }"
 `;
 
 exports[`cosmos/authz/v1beta1/authz.proto Grant 1`] = `
-"export interface GrantAminoType {
+"export interface GrantAminoMsg {
   type: "cosmos-sdk/Grant";
   value: GrantAmino;
 }"
 `;
 
 exports[`cosmos/authz/v1beta1/authz.proto GrantAuthorization 1`] = `
-"export interface GrantAuthorizationAminoType {
+"export interface GrantAuthorizationAminoMsg {
   type: "cosmos-sdk/GrantAuthorization";
   value: GrantAuthorizationAmino;
 }"
 `;
 
 exports[`cosmos/authz/v1beta1/query.proto QueryGrantsRequest 1`] = `
-"export interface QueryGrantsRequestAminoType {
+"export interface QueryGrantsRequestAminoMsg {
   type: "cosmos-sdk/QueryGrantsRequest";
   value: QueryGrantsRequestAmino;
 }"
 `;
 
 exports[`osmosis/gamm/v1beta1/tx.proto MsgJoinPool 1`] = `
-"export interface MsgJoinPoolAminoType {
+"export interface MsgJoinPoolAminoMsg {
   type: "osmosis/gamm/join-pool";
   value: MsgJoinPoolAmino;
 }"
diff --git a/packages/ast/src/encoding/proto/interface/__tests__/__snapshots__/interface.test.ts.snap b/packages/ast/src/encoding/proto/interface/__tests__/__snapshots__/interface.test.ts.snap
index 9541f8fe0..7a6b2196a 100644
--- a/packages/ast/src/encoding/proto/interface/__tests__/__snapshots__/interface.test.ts.snap
+++ b/packages/ast/src/encoding/proto/interface/__tests__/__snapshots__/interface.test.ts.snap
@@ -39,7 +39,7 @@ export interface MsgSend {
 `;
 
 exports[`MsgSend interface type 1`] = `
-"export interface MsgSendProtoType {
+"export interface MsgSendProtoMsg {
   typeUrl: "/cosmos.bank.v1beta1.MsgSend";
   value: Uint8Array;
 }"
@@ -225,7 +225,7 @@ export interface Grant {
 `;
 
 exports[`cosmos/authz/v1beta1/authz.proto Grant Type 1`] = `
-"export interface GrantProtoType {
+"export interface GrantProtoMsg {
   typeUrl: "/cosmos.authz.v1beta1.Grant";
   value: Uint8Array;
 }"
@@ -245,7 +245,7 @@ export interface GrantAuthorization {
 `;
 
 exports[`cosmos/authz/v1beta1/authz.proto GrantAuthorization Type 1`] = `
-"export interface GrantAuthorizationProtoType {
+"export interface GrantAuthorizationProtoMsg {
   typeUrl: "/cosmos.authz.v1beta1.GrantAuthorization";
   value: Uint8Array;
 }"
diff --git a/packages/ast/src/encoding/proto/interface/amino.ts b/packages/ast/src/encoding/proto/interface/amino.ts
index e3b55ecea..fa8248174 100644
--- a/packages/ast/src/encoding/proto/interface/amino.ts
+++ b/packages/ast/src/encoding/proto/interface/amino.ts
@@ -9,26 +9,19 @@ import {
 } from '../types';
 
 import {
-    CreateProtoTypeOptions,
+    SymbolNames,
     getFieldAminoTypeReference,
-    getMessageName,
     getTSAminoType
 } from '../../types';
 import { getAminoTypeName } from '../../amino';
 
-export const createAminoTypeOptionsDefaults: CreateProtoTypeOptions = {
-    useOriginalCase: true,
-    typeNameSuffix: 'Amino'
-};
-
 const getAminoField = (
     context: ProtoParseContext,
-    field: ProtoField,
-    options: CreateProtoTypeOptions = createAminoTypeOptionsDefaults
+    field: ProtoField
 ) => {
     let ast: any = null;
 
-    ast = getFieldAminoTypeReference(context, field, options);
+    ast = getFieldAminoTypeReference(context, field);
 
     if (field.rule === 'repeated') {
         ast = t.tsArrayType(ast);
@@ -56,11 +49,11 @@ const getAminoField = (
 export const createAminoType = (
     context: ProtoParseContext,
     name: string,
-    proto: ProtoType,
-    options: CreateProtoTypeOptions = createAminoTypeOptionsDefaults
+    proto: ProtoType
 ) => {
     const oneOfs = getOneOfs(proto);
-    const MsgName = getMessageName(name, options);
+
+    const AminoName = SymbolNames.Amino(name);
 
     // scalar amino types!
     let declaration: t.ExportNamedDeclaration | undefined;
@@ -72,7 +65,7 @@ export const createAminoType = (
             case 'google.protobuf.Timestamp':
                 declaration = t.exportNamedDeclaration(
                     t.tsTypeAliasDeclaration(
-                        t.identifier(MsgName),
+                        t.identifier(AminoName),
                         null,
                         t.tsStringKeyword()
                     )
@@ -85,7 +78,7 @@ export const createAminoType = (
     // declaration
     if (!declaration) {
         declaration = t.exportNamedDeclaration(t.tsInterfaceDeclaration(
-            t.identifier(MsgName),
+            t.identifier(AminoName),
             null,
             [],
             t.tsInterfaceBody(
@@ -94,7 +87,10 @@ export const createAminoType = (
                     const field = proto.fields[fieldName];
 
                     const orig = field.options?.['(telescope:orig)'] ?? fieldName;
-                    let fieldNameWithCase = options.useOriginalCase ? orig : fieldName;
+
+                    // this (useOriginalCase) is always true, right?
+                    // let fieldNameWithCase = options.useOriginalCase ? orig : fieldName;
+                    let fieldNameWithCase = orig;
 
                     // should we actually just edit/add comments 
                     // to make this more "native" for any google.protobuf.Any?
@@ -102,7 +98,7 @@ export const createAminoType = (
                     if (
                         name === 'Any' &&
                         context.ref.proto.package === 'google.protobuf' &&
-                        options.typeNameSuffix === 'Amino' &&
+                        // options.type === 'Amino' &&
                         orig === 'type_url'
                     ) {
                         // type_url => type
@@ -112,7 +108,7 @@ export const createAminoType = (
                     const propSig = tsPropertySignature(
                         t.identifier(fieldNameWithCase),
                         t.tsTypeAnnotation(
-                            getAminoField(context, field, options)
+                            getAminoField(context, field)
                         ),
                         getFieldOptionality(context, field, isOneOf)
                     );
@@ -160,11 +156,10 @@ export const createAminoType = (
 export const createAminoTypeType = (
     context: ProtoParseContext,
     name: string,
-    proto: ProtoType,
-    options: CreateProtoTypeOptions = createAminoTypeOptionsDefaults
+    proto: ProtoType
 ) => {
-    const MsgName = getMessageName(name, options)
-    const AminoMsgName = MsgName + 'Type';
+    const AminoName = SymbolNames.Amino(name);
+    const AminoTypeName = SymbolNames.AminoMsg(name);
 
     const aminoName = getAminoTypeName(context, context.ref.proto, proto);
     const typ = aminoName ? t.tsLiteralType(
@@ -174,7 +169,7 @@ export const createAminoTypeType = (
     );
     // scalar amino types!
     return t.exportNamedDeclaration(t.tsInterfaceDeclaration(
-        t.identifier(AminoMsgName),
+        t.identifier(AminoTypeName),
         null,
         [],
         t.tsInterfaceBody([
@@ -189,7 +184,7 @@ export const createAminoTypeType = (
                 t.identifier('value'),
                 t.tsTypeAnnotation(
                     t.tsTypeReference(
-                        t.identifier(MsgName)
+                        t.identifier(AminoName)
                     )
                 ),
                 false
diff --git a/packages/ast/src/encoding/proto/interface/proto.ts b/packages/ast/src/encoding/proto/interface/proto.ts
index c886fb815..3b26e809d 100644
--- a/packages/ast/src/encoding/proto/interface/proto.ts
+++ b/packages/ast/src/encoding/proto/interface/proto.ts
@@ -10,11 +10,10 @@ import {
 } from '../types';
 
 import {
-    CreateProtoTypeOptions,
-    createProtoTypeOptionsDefaults,
+    SymbolNames,
     getDefaultTSTypeFromProtoType,
     getFieldTypeReference,
-    getMessageName,
+    TelescopeBaseTypes,
     getTSType
 } from '../../types';
 import { getTypeUrlWithPkgAndName, getTypeUrl } from '../../amino';
@@ -22,11 +21,11 @@ import { getTypeUrlWithPkgAndName, getTypeUrl } from '../../amino';
 const getProtoField = (
     context: ProtoParseContext,
     field: ProtoField,
-    options: CreateProtoTypeOptions = createProtoTypeOptionsDefaults
+    type: TelescopeBaseTypes = 'Msg'
 ) => {
     let ast: any = null;
 
-    const fieldRef = getFieldTypeReference(context, field, options);
+    const fieldRef = getFieldTypeReference(context, field, type);
     ast = fieldRef.ast
     const isTypeCastableAnyType = fieldRef.isTypeCastableAnyType
 
@@ -67,7 +66,7 @@ export const createProtoType = (
     context: ProtoParseContext,
     name: string,
     proto: ProtoType,
-    options: CreateProtoTypeOptions = createProtoTypeOptionsDefaults
+    type: TelescopeBaseTypes = 'Msg'
 ) => {
     const oneOfs = getOneOfs(proto);
 
@@ -103,7 +102,7 @@ export const createProtoType = (
         }
     }
 
-    const MsgName = getMessageName(name, options);
+    const MsgName = SymbolNames[type](name);
 
     const fields = [];
 
@@ -148,12 +147,13 @@ export const createProtoType = (
             optional = true;
         }
 
-        let fieldNameWithCase = options.useOriginalCase ? orig : fieldName;
+        // let fieldNameWithCase = options.useOriginalCase ? orig : fieldName;
+        let fieldNameWithCase = type === 'SDKType' ? orig : fieldName;
 
         const propSig = tsPropertySignature(
             t.identifier(fieldNameWithCase),
             t.tsTypeAnnotation(
-                getProtoField(context, field, options)
+                getProtoField(context, field, type)
             ),
             optional || getFieldOptionality(context, field, isOneOf)
         );
@@ -162,7 +162,7 @@ export const createProtoType = (
         if (
             field.comment &&
             // no comment for derivative types
-            (!options.typeNamePrefix && !options.typeNameSuffix)
+            (type === 'Msg')
         ) {
             comments.push(
                 makeCommentBlock(field.comment)
@@ -212,11 +212,9 @@ export const createProtoType = (
 export const createProtoTypeType = (
     context: ProtoParseContext,
     name: string,
-    proto: ProtoType,
-    options: CreateProtoTypeOptions = createProtoTypeOptionsDefaults
+    proto: ProtoType
 ) => {
-    const MsgName = getMessageName(name, options);
-    const ProtoMsgName = MsgName + 'ProtoType';
+    const ProtoMsgName = SymbolNames.ProtoMsg(name);
 
     const typeUrl = getTypeUrl(context.ref.proto, proto);
     const typ = typeUrl ? t.tsLiteralType(
diff --git a/packages/ast/src/encoding/proto/interface/sdk.ts b/packages/ast/src/encoding/proto/interface/sdk.ts
index 186b70762..e10b19ea9 100644
--- a/packages/ast/src/encoding/proto/interface/sdk.ts
+++ b/packages/ast/src/encoding/proto/interface/sdk.ts
@@ -1,8 +1,8 @@
+import * as t from '@babel/types';
 import { ProtoEnum, ProtoType } from '@osmonauts/types';
 import { ProtoParseContext } from '../../context';
-import { createProtoEnum } from '../enums';
 import { createProtoType } from './proto';
-import * as t from '@babel/types';
+import { SymbolNames } from '../../types';
 
 export const createSDKType = (
     context: ProtoParseContext,
@@ -13,10 +13,7 @@ export const createSDKType = (
         context,
         name,
         proto,
-        {
-            useOriginalCase: true,
-            typeNameSuffix: 'SDKType',
-        }
+        'SDKType'
     );
 };
 
@@ -28,7 +25,7 @@ export const createEnumSDKType = (
     return t.exportNamedDeclaration(
         t.variableDeclaration('const', [
             t.variableDeclarator(
-                t.identifier(name + 'SDKType'),
+                t.identifier(SymbolNames.SDKType(name)),
                 t.identifier(name)
             )
         ])
diff --git a/packages/ast/src/encoding/proto/props/index.ts b/packages/ast/src/encoding/proto/props/index.ts
new file mode 100644
index 000000000..ee3573a91
--- /dev/null
+++ b/packages/ast/src/encoding/proto/props/index.ts
@@ -0,0 +1,28 @@
+import * as t from '@babel/types';
+import { ProtoParseContext } from '../../context';
+import { ProtoType } from '@osmonauts/types';
+import { getAminoTypeName, getTypeUrl } from '../../amino';
+
+export const createTypeUrlProperty = (
+    context: ProtoParseContext,
+    proto: ProtoType
+) => {
+    const typeUrl = getTypeUrl(context.ref.proto, proto);
+    if (!typeUrl) return;
+    return t.objectProperty(
+        t.identifier('typeUrl'),
+        t.stringLiteral(typeUrl)
+    )
+};
+
+export const createAminoTypeProperty = (
+    context: ProtoParseContext,
+    proto: ProtoType
+) => {
+    const str = getAminoTypeName(context, context.ref.proto, proto);
+    if (!str || str.startsWith('/')) return;
+    return t.objectProperty(
+        t.identifier('aminoType'),
+        t.stringLiteral(str)
+    )
+};
\ No newline at end of file
diff --git a/packages/ast/src/encoding/proto/to-amino/index.ts b/packages/ast/src/encoding/proto/to-amino/index.ts
index 8efc235e6..b6f1df220 100644
--- a/packages/ast/src/encoding/proto/to-amino/index.ts
+++ b/packages/ast/src/encoding/proto/to-amino/index.ts
@@ -5,6 +5,8 @@ import { ProtoParseContext } from '../../context';
 import { ProtoField, ProtoType } from '@osmonauts/types';
 import { arrayTypes, toAminoJSON, toAminoMessages } from './utils';
 import { pascal } from 'case';
+import { SymbolNames } from '../../types';
+import { getAminoTypeName } from '../../amino';
 
 const needsImplementation = (name: string, field: ProtoField) => {
     throw new Error(`need to implement toAminoJSON (${field.type} rules[${field.rule}] name[${name}])`);
@@ -176,9 +178,7 @@ export const toAminoJSONMethod = (context: ProtoParseContext, name: string, prot
         varName = '_';
     }
 
-    const AminoTypeName =
-        [name, 'Amino']
-            .filter(Boolean).join('')
+    const AminoTypeName = SymbolNames.Amino(name);
 
     const body: t.Statement[] = [];
 
@@ -246,3 +246,62 @@ export const toAminoJSONMethod = (context: ProtoParseContext, name: string, prot
         )
     );
 };
+
+export const toAminoMsgMethod = (context: ProtoParseContext, name: string, proto: ProtoType) => {
+    const varName = 'message';
+
+    const ReturnType = SymbolNames.AminoMsg(name);
+    const TypeName = SymbolNames.Msg(name);
+
+    const aminoType = getAminoTypeName(context, context.ref.proto, proto);
+    if (!aminoType || aminoType.startsWith('/')) return;
+
+    const body: t.Statement[] = [];
+
+    // body
+    body.push(
+        t.returnStatement(
+            t.objectExpression([
+                t.objectProperty(
+                    t.identifier('type'),
+                    t.stringLiteral(aminoType)
+                ),
+                t.objectProperty(
+                    t.identifier('value'),
+                    t.callExpression(
+                        t.memberExpression(
+                            t.identifier(TypeName),
+                            t.identifier('toAmino')
+                        ),
+                        [
+                            t.identifier(varName)
+                        ]
+                    )
+                )
+            ])
+        )
+    );
+
+    return objectMethod('method',
+        t.identifier('toAminoMsg'),
+        [
+            identifier(
+                varName,
+                t.tsTypeAnnotation(
+                    t.tsTypeReference(
+                        t.identifier(TypeName)
+                    )
+                )
+            )
+        ],
+        t.blockStatement(body),
+        false,
+        false,
+        false,
+        t.tsTypeAnnotation(
+            t.tsTypeReference(
+                t.identifier(ReturnType)
+            )
+        )
+    );
+};
diff --git a/packages/ast/src/encoding/proto/to-proto/index.ts b/packages/ast/src/encoding/proto/to-proto/index.ts
new file mode 100644
index 000000000..43faa9f45
--- /dev/null
+++ b/packages/ast/src/encoding/proto/to-proto/index.ts
@@ -0,0 +1,126 @@
+import * as t from '@babel/types';
+import { identifier, objectMethod } from '../../../utils';
+import { ProtoParseContext } from '../../context';
+import { ProtoType } from '@osmonauts/types';
+import { SymbolNames } from '../../types';
+import { getTypeUrl } from '../../amino';
+
+export const toProtoMsgMethod = (context: ProtoParseContext, name: string, proto: ProtoType) => {
+    let varName = 'message';
+
+    const ReturnType = SymbolNames.ProtoMsg(name);
+    const TypeName = SymbolNames.Msg(name);
+
+    const typeUrl = getTypeUrl(context.ref.proto, proto);
+    if (!typeUrl) return;
+
+    const body: t.Statement[] = [];
+
+    // body
+
+    body.push(
+        t.returnStatement(
+            t.objectExpression([
+                t.objectProperty(
+                    t.identifier('typeUrl'),
+                    t.stringLiteral(typeUrl)
+                ),
+                t.objectProperty(
+                    t.identifier('value'),
+                    t.callExpression(
+                        t.memberExpression(
+                            t.callExpression(
+                                t.memberExpression(
+                                    t.identifier(TypeName),
+                                    t.identifier('encode')
+                                ),
+                                [
+                                    t.identifier(varName)
+                                ]
+                            ),
+                            t.identifier('finish')
+                        ),
+                        []
+                    )
+                )
+            ])
+        )
+    );
+
+    return objectMethod('method',
+        t.identifier('toProtoMsg'),
+        [
+            identifier(
+                varName,
+                t.tsTypeAnnotation(
+                    t.tsTypeReference(
+                        t.identifier(TypeName)
+                    )
+                )
+            )
+        ],
+        t.blockStatement(body),
+        false,
+        false,
+        false,
+        t.tsTypeAnnotation(
+            t.tsTypeReference(
+                t.identifier(ReturnType)
+            )
+        )
+    );
+};
+
+export const toProtoMethod = (context: ProtoParseContext, name: string, proto: ProtoType) => {
+    let varName = 'message';
+
+    const ReturnType = 'Uint8Array';
+    const TypeName = SymbolNames.Msg(name);
+
+    const body: t.Statement[] = [];
+
+    // body
+
+    body.push(
+        t.returnStatement(
+            t.callExpression(
+                t.memberExpression(
+                    t.callExpression(
+                        t.memberExpression(
+                            t.identifier(TypeName),
+                            t.identifier('encode')
+                        ),
+                        [
+                            t.identifier('message')
+                        ]
+                    ),
+                    t.identifier('finish')
+                ),
+                []
+            )
+        )
+    )
+
+    return objectMethod('method',
+        t.identifier('toProto'),
+        [
+            identifier(
+                varName,
+                t.tsTypeAnnotation(
+                    t.tsTypeReference(
+                        t.identifier(TypeName)
+                    )
+                )
+            )
+        ],
+        t.blockStatement(body),
+        false,
+        false,
+        false,
+        t.tsTypeAnnotation(
+            t.tsTypeReference(
+                t.identifier(ReturnType)
+            )
+        )
+    );
+};
diff --git a/packages/ast/src/encoding/types.ts b/packages/ast/src/encoding/types.ts
index 7a34dce44..b786393a0 100644
--- a/packages/ast/src/encoding/types.ts
+++ b/packages/ast/src/encoding/types.ts
@@ -13,28 +13,64 @@ export const getFieldNames = (field: ProtoField) => {
     };
 }
 
-export interface CreateProtoTypeOptions {
-    useOriginalCase: boolean;
-    typeNamePrefix?: string;
-    typeNameSuffix?: string;
-};
+export type TelescopeBaseTypes = 'Msg' |
+    'SDKType' |
+    'Amino' |
+    'AminoMsg' |
+    'ProtoMsg';
 
-export const createProtoTypeOptionsDefaults: CreateProtoTypeOptions = {
-    useOriginalCase: false
-};
 
-export const getMessageName = (
+const getSymbolName = (
     name: string,
-    options: CreateProtoTypeOptions = createProtoTypeOptionsDefaults
+    type: TelescopeBaseTypes = 'Msg'
 ) => {
-    const MsgName = [options.typeNamePrefix, name, options.typeNameSuffix].filter(Boolean).join('');
-    return MsgName;
-}
+    let typeNameSuffix;
+    switch (type) {
+        case 'ProtoMsg':
+            typeNameSuffix = 'ProtoMsg';
+            break;
+        case 'AminoMsg':
+            typeNameSuffix = 'AminoMsg';
+            break;
+        case 'Amino':
+            typeNameSuffix = 'Amino';
+            break;
+        case 'SDKType':
+            typeNameSuffix = 'SDKType';
+            break;
+        case 'Msg':
+        default:
+    }
+    return [name, typeNameSuffix].filter(Boolean).join('')
+};
+
+export const SymbolNames = {
+    Msg: (
+        name: string,
+    ) => getSymbolName(name, 'Msg'),
+
+    SDKType: (
+        name: string
+    ) => getSymbolName(name, 'SDKType'),
+
+    ProtoMsg: (
+        name: string
+    ) => getSymbolName(name, 'ProtoMsg'),
+
+    AminoMsg: (
+        name: string
+    ) => getSymbolName(name, 'AminoMsg'),
+
+    Amino: (
+        name: string
+    ) => getSymbolName(name, 'Amino'),
+
+};
 
 export const getFieldTypeReference = (
     context: ProtoParseContext,
     field: ProtoField,
-    options: CreateProtoTypeOptions = createProtoTypeOptionsDefaults
+    type: TelescopeBaseTypes = 'Msg'
 ) => {
     let ast: any = null;
     let typ: any = null;
@@ -48,10 +84,10 @@ export const getFieldTypeReference = (
         };
 
     } else if (GOOGLE_TYPES.includes(field.type)) {
-        typ = getTSTypeFromGoogleType(context, field.type, options);
+        typ = getTSTypeFromGoogleType(context, field.type, type);
     } else {
         const propName = getProtoFieldTypeName(context, field);
-        const MsgName = field.parsedType?.type === 'Enum' ? propName : getMessageName(propName, options);
+        const MsgName = field.parsedType?.type === 'Enum' ? propName : SymbolNames[type](propName);
         typ = t.tsTypeReference(t.identifier(MsgName));
     }
 
@@ -59,7 +95,7 @@ export const getFieldTypeReference = (
     const lookupInterface = field.options?.['(cosmos_proto.accepts_interface)'];
     const isAnyType = field.parsedType?.type === 'Type' && field.parsedType?.name === 'Any';
     const isArray = field.rule === 'repeated';
-    const isBaseType = !options.typeNamePrefix && !options.typeNameSuffix;
+    const isBaseType = type === 'Msg';
     let symbols = null;
     if (implementsAcceptsAny && lookupInterface) {
         symbols = context.store._symbols.filter(s => s.implementsType === lookupInterface && s.ref === context.ref.filename);
@@ -113,8 +149,7 @@ export const getFieldTypeReference = (
 
 export const getFieldAminoTypeReference = (
     context: ProtoParseContext,
-    field: ProtoField,
-    options: CreateProtoTypeOptions = createProtoTypeOptionsDefaults
+    field: ProtoField
 ) => {
     let ast: any = null;
     let typ: any = null;
@@ -126,11 +161,11 @@ export const getFieldAminoTypeReference = (
         return typ;
 
     } else if (GOOGLE_TYPES.includes(field.type)) {
-        typ = getTSTypeFromGoogleType(context, field.type, options);
+        typ = getTSTypeFromGoogleType(context, field.type, 'Amino');
     } else {
         const propName = getProtoFieldTypeName(context, field);
         // enums don't need suffixes, etc.
-        const MsgName = field.parsedType?.type === 'Enum' ? propName : getMessageName(propName, options);
+        const MsgName = field.parsedType?.type === 'Enum' ? propName : SymbolNames.Amino(propName);
         typ = t.tsTypeReference(t.identifier(MsgName));
     }
 
@@ -210,11 +245,11 @@ export const getTSAminoType = (context: GenericParseContext, type: string) => {
 export const getTSTypeFromGoogleType = (
     context: GenericParseContext,
     type: string,
-    options: CreateProtoTypeOptions = createProtoTypeOptionsDefaults
+    options: TelescopeBaseTypes = 'Msg'
 ) => {
 
     const identifier = (str) => {
-        return t.identifier(getMessageName(str, options));
+        return t.identifier(SymbolNames[options](str));
     };
 
     switch (type) {
diff --git a/packages/ast/types/src/encoding/proto/from-amino/index.d.ts b/packages/ast/types/src/encoding/proto/from-amino/index.d.ts
index 23e3d3000..4802ac7cd 100644
--- a/packages/ast/types/src/encoding/proto/from-amino/index.d.ts
+++ b/packages/ast/types/src/encoding/proto/from-amino/index.d.ts
@@ -8,3 +8,4 @@ export interface FromAminoJSONMethod {
 }
 export declare const fromAminoJSONMethodFields: (context: ProtoParseContext, name: string, proto: ProtoType) => t.ObjectProperty[];
 export declare const fromAminoJSONMethod: (context: ProtoParseContext, name: string, proto: ProtoType) => t.ObjectMethod;
+export declare const fromAminoMsgMethod: (context: ProtoParseContext, name: string, proto: ProtoType) => t.ObjectMethod;
diff --git a/packages/ast/types/src/encoding/proto/from-proto/index.d.ts b/packages/ast/types/src/encoding/proto/from-proto/index.d.ts
new file mode 100644
index 000000000..a70cf1b88
--- /dev/null
+++ b/packages/ast/types/src/encoding/proto/from-proto/index.d.ts
@@ -0,0 +1,4 @@
+import * as t from '@babel/types';
+import { ProtoParseContext } from '../../context';
+import { ProtoType } from '@osmonauts/types';
+export declare const fromProtoMsgMethod: (context: ProtoParseContext, name: string, proto: ProtoType) => t.ObjectMethod;
diff --git a/packages/ast/types/src/encoding/proto/index.d.ts b/packages/ast/types/src/encoding/proto/index.d.ts
index a991358fe..61f061486 100644
--- a/packages/ast/types/src/encoding/proto/index.d.ts
+++ b/packages/ast/types/src/encoding/proto/index.d.ts
@@ -8,6 +8,9 @@ export * from './from-sdk';
 export * from './implements';
 export * from './interface';
 export * from './to-amino';
+export * from './to-proto';
+export * from './from-proto';
 export * from './to-json';
 export * from './to-sdk';
+export * from './props';
 export * from './types';
diff --git a/packages/ast/types/src/encoding/proto/interface/amino.d.ts b/packages/ast/types/src/encoding/proto/interface/amino.d.ts
index 828e28eea..c6926e9d2 100644
--- a/packages/ast/types/src/encoding/proto/interface/amino.d.ts
+++ b/packages/ast/types/src/encoding/proto/interface/amino.d.ts
@@ -1,8 +1,6 @@
 import * as t from '@babel/types';
 import { ProtoType, ProtoEnum } from '@osmonauts/types';
 import { ProtoParseContext } from '../../context';
-import { CreateProtoTypeOptions } from '../../types';
-export declare const createAminoTypeOptionsDefaults: CreateProtoTypeOptions;
-export declare const createAminoType: (context: ProtoParseContext, name: string, proto: ProtoType, options?: CreateProtoTypeOptions) => t.ExportNamedDeclaration;
-export declare const createAminoTypeType: (context: ProtoParseContext, name: string, proto: ProtoType, options?: CreateProtoTypeOptions) => t.ExportNamedDeclaration;
+export declare const createAminoType: (context: ProtoParseContext, name: string, proto: ProtoType) => t.ExportNamedDeclaration;
+export declare const createAminoTypeType: (context: ProtoParseContext, name: string, proto: ProtoType) => t.ExportNamedDeclaration;
 export declare const createEnumAminoType: (context: ProtoParseContext, name: string, proto: ProtoEnum) => t.ExportNamedDeclaration;
diff --git a/packages/ast/types/src/encoding/proto/interface/proto.d.ts b/packages/ast/types/src/encoding/proto/interface/proto.d.ts
index 5472aa1e1..656c04246 100644
--- a/packages/ast/types/src/encoding/proto/interface/proto.d.ts
+++ b/packages/ast/types/src/encoding/proto/interface/proto.d.ts
@@ -1,7 +1,7 @@
 import * as t from '@babel/types';
 import { ProtoType } from '@osmonauts/types';
 import { ProtoParseContext } from '../../context';
-import { CreateProtoTypeOptions } from '../../types';
-export declare const createProtoType: (context: ProtoParseContext, name: string, proto: ProtoType, options?: CreateProtoTypeOptions) => t.ExportNamedDeclaration;
-export declare const createProtoTypeType: (context: ProtoParseContext, name: string, proto: ProtoType, options?: CreateProtoTypeOptions) => t.ExportNamedDeclaration;
+import { TelescopeBaseTypes } from '../../types';
+export declare const createProtoType: (context: ProtoParseContext, name: string, proto: ProtoType, type?: TelescopeBaseTypes) => t.ExportNamedDeclaration;
+export declare const createProtoTypeType: (context: ProtoParseContext, name: string, proto: ProtoType) => t.ExportNamedDeclaration;
 export declare const createCreateProtoType: (context: ProtoParseContext, name: string, proto: ProtoType) => t.FunctionDeclaration;
diff --git a/packages/ast/types/src/encoding/proto/interface/sdk.d.ts b/packages/ast/types/src/encoding/proto/interface/sdk.d.ts
index d199e88b3..cc79be222 100644
--- a/packages/ast/types/src/encoding/proto/interface/sdk.d.ts
+++ b/packages/ast/types/src/encoding/proto/interface/sdk.d.ts
@@ -1,5 +1,5 @@
+import * as t from '@babel/types';
 import { ProtoEnum, ProtoType } from '@osmonauts/types';
 import { ProtoParseContext } from '../../context';
-import * as t from '@babel/types';
 export declare const createSDKType: (context: ProtoParseContext, name: string, proto: ProtoType) => t.ExportNamedDeclaration;
 export declare const createEnumSDKType: (context: ProtoParseContext, name: string, proto: ProtoEnum) => t.ExportNamedDeclaration;
diff --git a/packages/ast/types/src/encoding/proto/props/index.d.ts b/packages/ast/types/src/encoding/proto/props/index.d.ts
new file mode 100644
index 000000000..8679a101c
--- /dev/null
+++ b/packages/ast/types/src/encoding/proto/props/index.d.ts
@@ -0,0 +1,5 @@
+import * as t from '@babel/types';
+import { ProtoParseContext } from '../../context';
+import { ProtoType } from '@osmonauts/types';
+export declare const createTypeUrlProperty: (context: ProtoParseContext, proto: ProtoType) => t.ObjectProperty;
+export declare const createAminoTypeProperty: (context: ProtoParseContext, proto: ProtoType) => t.ObjectProperty;
diff --git a/packages/ast/types/src/encoding/proto/to-amino/index.d.ts b/packages/ast/types/src/encoding/proto/to-amino/index.d.ts
index e15b56b3f..e740d3ecd 100644
--- a/packages/ast/types/src/encoding/proto/to-amino/index.d.ts
+++ b/packages/ast/types/src/encoding/proto/to-amino/index.d.ts
@@ -8,3 +8,4 @@ export interface ToAminoJSONMethod {
 }
 export declare const toAminoJSONMethodFields: (context: ProtoParseContext, name: string, proto: ProtoType) => any[];
 export declare const toAminoJSONMethod: (context: ProtoParseContext, name: string, proto: ProtoType) => t.ObjectMethod;
+export declare const toAminoMsgMethod: (context: ProtoParseContext, name: string, proto: ProtoType) => t.ObjectMethod;
diff --git a/packages/ast/types/src/encoding/proto/to-proto/index.d.ts b/packages/ast/types/src/encoding/proto/to-proto/index.d.ts
new file mode 100644
index 000000000..a0a13ab67
--- /dev/null
+++ b/packages/ast/types/src/encoding/proto/to-proto/index.d.ts
@@ -0,0 +1,4 @@
+import * as t from '@babel/types';
+import { ProtoParseContext } from '../../context';
+import { ProtoType } from '@osmonauts/types';
+export declare const toProtoMsgMethod: (context: ProtoParseContext, name: string, proto: ProtoType) => t.ObjectMethod;
diff --git a/packages/ast/types/src/encoding/types.d.ts b/packages/ast/types/src/encoding/types.d.ts
index b855b3ddc..168dcfe42 100644
--- a/packages/ast/types/src/encoding/types.d.ts
+++ b/packages/ast/types/src/encoding/types.d.ts
@@ -5,24 +5,25 @@ export declare const getFieldNames: (field: ProtoField) => {
     propName: string;
     origName: string;
 };
-export interface CreateProtoTypeOptions {
-    useOriginalCase: boolean;
-    typeNamePrefix?: string;
-    typeNameSuffix?: string;
-}
-export declare const createProtoTypeOptionsDefaults: CreateProtoTypeOptions;
-export declare const getMessageName: (name: string, options?: CreateProtoTypeOptions) => string;
-export declare const getFieldTypeReference: (context: ProtoParseContext, field: ProtoField, options?: CreateProtoTypeOptions) => {
+export declare type TelescopeBaseTypes = 'Msg' | 'SDKType' | 'Amino' | 'AminoType' | 'ProtoType';
+export declare const SymbolNames: {
+    Msg: (name: string) => string;
+    SDKType: (name: string) => string;
+    ProtoType: (name: string) => string;
+    AminoType: (name: string) => string;
+    Amino: (name: string) => string;
+};
+export declare const getFieldTypeReference: (context: ProtoParseContext, field: ProtoField, type?: TelescopeBaseTypes) => {
     ast: any;
     isTypeCastableAnyType?: undefined;
 } | {
     ast: any;
     isTypeCastableAnyType: boolean;
 };
-export declare const getFieldAminoTypeReference: (context: ProtoParseContext, field: ProtoField, options?: CreateProtoTypeOptions) => any;
+export declare const getFieldAminoTypeReference: (context: ProtoParseContext, field: ProtoField) => any;
 export declare const getTSType: (context: GenericParseContext, type: string) => t.TSBooleanKeyword | t.TSNumberKeyword | t.TSStringKeyword | t.TSTypeReference;
 export declare const getTSAminoType: (context: GenericParseContext, type: string) => t.TSBooleanKeyword | t.TSNumberKeyword | t.TSStringKeyword | t.TSTypeReference;
-export declare const getTSTypeFromGoogleType: (context: GenericParseContext, type: string, options?: CreateProtoTypeOptions) => t.TSStringKeyword | t.TSTypeReference;
+export declare const getTSTypeFromGoogleType: (context: GenericParseContext, type: string, options?: TelescopeBaseTypes) => t.TSStringKeyword | t.TSTypeReference;
 export declare const getTSTypeForAmino: (context: GenericParseContext, field: ProtoField) => t.TSBooleanKeyword | t.TSNumberKeyword | t.TSStringKeyword | t.TSTypeReference;
 export declare const getTSTypeForProto: (context: GenericParseContext, field: ProtoField) => t.TSBooleanKeyword | t.TSNumberKeyword | t.TSStringKeyword | t.TSTypeReference;
 export declare const getDefaultTSTypeFromProtoType: (context: ProtoParseContext, field: ProtoField, isOneOf: boolean) => t.ArrayExpression | t.BooleanLiteral | t.Identifier | t.MemberExpression | t.NewExpression | t.NumericLiteral | t.ObjectExpression | t.StringLiteral;
diff --git a/packages/ast/types/test-utils/index.d.ts b/packages/ast/types/test-utils/index.d.ts
index 415dd5511..84c65e33a 100644
--- a/packages/ast/types/test-utils/index.d.ts
+++ b/packages/ast/types/test-utils/index.d.ts
@@ -30,6 +30,10 @@ export declare const defaultTelescopeOptions: {
             fromPartial?: boolean;
             toSDK?: boolean;
             fromSDK?: boolean;
+            toAmino?: boolean;
+            fromAmino?: boolean;
+            toProto?: boolean;
+            fromProto?: boolean;
         };
         includePackageVar?: boolean;
         fieldDefaultIsOptional?: boolean;
@@ -37,6 +41,8 @@ export declare const defaultTelescopeOptions: {
         allowUndefinedTypes?: boolean;
         optionalQueryParams?: boolean;
         optionalPageRequests?: boolean;
+        addTypeUrlToObjects?: boolean;
+        addAminoTypeToObjects?: boolean;
         addTypeUrlToDecoders?: boolean;
         excluded?: {
             packages?: string[];
diff --git a/packages/telescope/__tests__/telescope-v2.test.ts b/packages/telescope/__tests__/telescope-v2.test.ts
index bb1b08d65..4e65c4568 100644
--- a/packages/telescope/__tests__/telescope-v2.test.ts
+++ b/packages/telescope/__tests__/telescope-v2.test.ts
@@ -49,6 +49,9 @@ const options: TelescopeOptions = {
     parser: {
       keepCase: false
     },
+    addAminoTypeToObjects: true,
+    addTypeUrlToObjects: true,
+
     methods: {
       encode: true,
       decode: true,
@@ -56,7 +59,12 @@ const options: TelescopeOptions = {
       toJSON: true,
       fromPartial: true,
       toSDK: true,
-      fromSDK: true
+      fromSDK: true,
+      //
+      toAmino: true,
+      fromAmino: true,
+      fromProto: true,
+      toProto: true
     },
     includePackageVar: true,
     fieldDefaultIsOptional: false,
diff --git a/packages/telescope/src/build.ts b/packages/telescope/src/build.ts
index 1cb6aaf38..40c275c44 100644
--- a/packages/telescope/src/build.ts
+++ b/packages/telescope/src/build.ts
@@ -61,7 +61,9 @@ export const buildBaseTypeScriptInterface = (
     name: string,
     obj: any
 ) => {
+
     context.body.push(createProtoType(context.proto, name, obj));
+
     if (context.options.aminoEncoding.useRecursiveV2encoding) {
         context.body.push(createProtoTypeType(context.proto, name, obj));
         context.body.push(createAminoType(context.proto, name, obj));
diff --git a/packages/types/src/telescope.ts b/packages/types/src/telescope.ts
index deaa48f7a..56eac6d5f 100644
--- a/packages/types/src/telescope.ts
+++ b/packages/types/src/telescope.ts
@@ -40,6 +40,10 @@ interface TelescopeOpts {
             fromPartial?: boolean;
             toSDK?: boolean;
             fromSDK?: boolean;
+            toAmino?: boolean;
+            fromAmino?: boolean;
+            toProto?: boolean;
+            fromProto?: boolean;
         },
         includePackageVar?: boolean;
         fieldDefaultIsOptional?: boolean;
@@ -49,6 +53,8 @@ interface TelescopeOpts {
         optionalQueryParams?: boolean;
         optionalPageRequests?: boolean;
 
+        addTypeUrlToObjects?: boolean;
+        addAminoTypeToObjects?: boolean;
         addTypeUrlToDecoders?: boolean;
 
         excluded?: {
@@ -188,13 +194,19 @@ export const defaultTelescopeOptions: TelescopeOptions = {
             toJSON: false,
             fromPartial: true,
             toSDK: false,
-            fromSDK: false
+            fromSDK: false,
+            toAmino: false,
+            fromAmino: false,
+            toProto: false,
+            fromProto: false,
         },
         includePackageVar: false,
         fieldDefaultIsOptional: false,
         allowUndefinedTypes: false,
         useOptionalNullable: true,
 
+        addTypeUrlToObjects: false,
+        addAminoTypeToObjects: false,
         addTypeUrlToDecoders: false,
 
         optionalQueryParams: false,
diff --git a/packages/types/types/telescope.d.ts b/packages/types/types/telescope.d.ts
index 20c8998e2..16c2d0eef 100644
--- a/packages/types/types/telescope.d.ts
+++ b/packages/types/types/telescope.d.ts
@@ -33,6 +33,10 @@ interface TelescopeOpts {
             fromPartial?: boolean;
             toSDK?: boolean;
             fromSDK?: boolean;
+            toAmino?: boolean;
+            fromAmino?: boolean;
+            toProto?: boolean;
+            fromProto?: boolean;
         };
         includePackageVar?: boolean;
         fieldDefaultIsOptional?: boolean;
@@ -40,6 +44,8 @@ interface TelescopeOpts {
         allowUndefinedTypes?: boolean;
         optionalQueryParams?: boolean;
         optionalPageRequests?: boolean;
+        addTypeUrlToObjects?: boolean;
+        addAminoTypeToObjects?: boolean;
         addTypeUrlToDecoders?: boolean;
         excluded?: {
             packages?: string[];