diff --git a/src/main/java/com/blueapron/connect/protobuf/ProtobufData.java b/src/main/java/com/blueapron/connect/protobuf/ProtobufData.java
index 016b61a..aa81734 100644
--- a/src/main/java/com/blueapron/connect/protobuf/ProtobufData.java
+++ b/src/main/java/com/blueapron/connect/protobuf/ProtobufData.java
@@ -210,8 +210,7 @@ private Schema toConnectSchema(Descriptors.FieldDescriptor descriptor) {
           break;
         }
 
-        String jsonName = descriptor.getJsonName();
-        builder = SchemaBuilder.struct().name(jsonName.substring(0, 1).toUpperCase() + jsonName.substring(1));
+        builder = SchemaBuilder.struct().name(descriptor.getMessageType().getName());
         for (Descriptors.FieldDescriptor fieldDescriptor : descriptor.getMessageType().getFields()) {
           builder.field(getConnectFieldName(fieldDescriptor), toConnectSchema(fieldDescriptor));
         }
diff --git a/src/test/java/com/blueapron/connect/protobuf/ProtobufDataTest.java b/src/test/java/com/blueapron/connect/protobuf/ProtobufDataTest.java
index f1a7ad9..d424e51 100644
--- a/src/test/java/com/blueapron/connect/protobuf/ProtobufDataTest.java
+++ b/src/test/java/com/blueapron/connect/protobuf/ProtobufDataTest.java
@@ -134,15 +134,15 @@ private Schema getExpectedComplexMapMessageProtoSchema(boolean useConnectMapType
     userIdBuilder.field("other_user_id", SchemaBuilder.int32().optional().build());
     final SchemaBuilder anotherIdBuilder = SchemaBuilder.struct();
     anotherIdBuilder.field("id", SchemaBuilder.string().optional().build());
-    userIdBuilder.field("another_id", anotherIdBuilder.optional().name("AnotherId").build());
+    userIdBuilder.field("another_id", anotherIdBuilder.optional().name("MessageId").build());
     builder.field("user_id", userIdBuilder.optional().name("UserId").build());
-    final SchemaBuilder messageIdBuilder = SchemaBuilder.struct().name("Value").optional();
+    final SchemaBuilder messageIdBuilder = SchemaBuilder.struct().name("MessageId").optional();
     messageIdBuilder.field("id", SchemaBuilder.string().optional().build());
     if (useConnectMapType) {
       builder.field("user_messages", SchemaBuilder.map(Schema.OPTIONAL_STRING_SCHEMA, messageIdBuilder.schema()).optional().build());
     } else {
       builder.field("user_messages", SchemaBuilder.array(SchemaBuilder.struct()
-        .name("UserMessages")
+        .name("UserMessagesEntry")
         .field("key", Schema.OPTIONAL_STRING_SCHEMA)
         .field("value", messageIdBuilder.schema()).optional().build())
         .optional().build());
@@ -161,7 +161,7 @@ private Schema getExpectedNestedTestProtoSchema(boolean useConnectMapType) {
     userIdBuilder.field("other_user_id", SchemaBuilder.int32().optional().build());
     final SchemaBuilder messageIdBuilder = SchemaBuilder.struct();
     messageIdBuilder.field("id", SchemaBuilder.string().optional().build());
-    userIdBuilder.field("another_id", messageIdBuilder.optional().name("AnotherId").build());
+    userIdBuilder.field("another_id", messageIdBuilder.optional().name("MessageId").build());
     builder.field("user_id", userIdBuilder.optional().name("UserId").build());
     builder.field("is_active", SchemaBuilder.bool().optional().build());
     builder.field("experiments_active", SchemaBuilder.array(SchemaBuilder.string().optional().build()).optional().build());
@@ -171,7 +171,7 @@ private Schema getExpectedNestedTestProtoSchema(boolean useConnectMapType) {
     if (useConnectMapType) {
       builder.field("map_type", SchemaBuilder.map(Schema.OPTIONAL_STRING_SCHEMA, Schema.OPTIONAL_STRING_SCHEMA).optional().build());
     } else {
-      builder.field("map_type", SchemaBuilder.array(SchemaBuilder.struct().field("key", Schema.OPTIONAL_STRING_SCHEMA).field("value", Schema.OPTIONAL_STRING_SCHEMA).optional().name("MapType").build()).optional().build());
+      builder.field("map_type", SchemaBuilder.array(SchemaBuilder.struct().field("key", Schema.OPTIONAL_STRING_SCHEMA).field("value", Schema.OPTIONAL_STRING_SCHEMA).optional().name("MapTypeEntry").build()).optional().build());
     }
     return builder.build();
   }