diff --git a/connector/src/main/java/com/google/cloud/hive/bigquery/connector/utils/hive/KeyValueObjectInspector.java b/connector/src/main/java/com/google/cloud/hive/bigquery/connector/utils/hive/KeyValueObjectInspector.java
index c0a578d5..751cee72 100644
--- a/connector/src/main/java/com/google/cloud/hive/bigquery/connector/utils/hive/KeyValueObjectInspector.java
+++ b/connector/src/main/java/com/google/cloud/hive/bigquery/connector/utils/hive/KeyValueObjectInspector.java
@@ -26,7 +26,7 @@
 public class KeyValueObjectInspector extends StandardStructObjectInspector {
 
   // TODO: Maybe make these customizable via configuration:
-  public static final String KEY_FIELD_NAME = "name";
+  public static final String KEY_FIELD_NAME = "key";
   public static final String VALUE_FIELD_NAME = "value";
 
   KeyValueObjectInspector(ObjectInspector keyOI, ObjectInspector valueOI) {
diff --git a/connector/src/test/java/com/google/cloud/hive/bigquery/connector/TestUtils.java b/connector/src/test/java/com/google/cloud/hive/bigquery/connector/TestUtils.java
index 13834625..292cca5b 100644
--- a/connector/src/test/java/com/google/cloud/hive/bigquery/connector/TestUtils.java
+++ b/connector/src/test/java/com/google/cloud/hive/bigquery/connector/TestUtils.java
@@ -76,9 +76,9 @@ public class TestUtils {
       Stream.of(
               "CREATE OR REPLACE TABLE ${dataset}." + MAP_TABLE_NAME + " (",
               "id INT64,",
-              "map_of_ints ARRAY<STRUCT<name STRING, value INT64>>,",
-              "map_of_structs ARRAY<STRUCT<name STRING, value STRUCT<color STRING>>>,",
-              "map_of_arrays ARRAY<STRUCT<name STRING, value ARRAY<INT64>>>",
+              "map_of_ints ARRAY<STRUCT<key STRING, value INT64>>,",
+              "map_of_structs ARRAY<STRUCT<key STRING, value STRUCT<color STRING>>>,",
+              "map_of_arrays ARRAY<STRUCT<key STRING, value ARRAY<INT64>>>",
               ")")
           .collect(Collectors.joining("\n"));
 
@@ -102,7 +102,7 @@ public class TestUtils {
               "int_arr ARRAY<int64>,",
               "int_struct_arr ARRAY<STRUCT<i INT64>>,",
               "float_struct STRUCT<float_field FLOAT64>,",
-              "mp ARRAY<STRUCT<name STRING, value ARRAY<STRUCT<name STRING, value INT64>>>>",
+              "mp ARRAY<STRUCT<key STRING, value ARRAY<STRUCT<key STRING, value INT64>>>>",
               ")")
           .collect(Collectors.joining("\n"));
 
@@ -135,7 +135,7 @@ public class TestUtils {
               "nums STRUCT<min NUMERIC, max NUMERIC, pi NUMERIC, big_pi NUMERIC>,",
               "int_arr ARRAY<int64>,",
               "int_struct_arr ARRAY<STRUCT<i INT64>>,",
-              "mp ARRAY<STRUCT<name STRING, value ARRAY<STRUCT<name STRING, value INT64>>>>",
+              "mp ARRAY<STRUCT<key STRING, value ARRAY<STRUCT<key STRING, value INT64>>>>",
               ")")
           .collect(Collectors.joining("\n"));