diff --git a/gcloud/datastore/connection.py b/gcloud/datastore/connection.py
index 5267cb45b5b9..e7c9c4f4429f 100644
--- a/gcloud/datastore/connection.py
+++ b/gcloud/datastore/connection.py
@@ -193,7 +193,7 @@ def lookup(self, project, key_pbs,
         """
         lookup_request = _datastore_pb2.LookupRequest()
         _set_read_options(lookup_request, eventual, transaction_id)
-        _add_keys_to_request(lookup_request.key, key_pbs)
+        _add_keys_to_request(lookup_request.keys, key_pbs)
 
         lookup_response = self._rpc(project, 'lookup', lookup_request,
                                     _datastore_pb2.LookupResponse)
@@ -362,11 +362,11 @@ def allocate_ids(self, project, key_pbs):
         :returns: An equal number of keys,  with IDs filled in by the backend.
         """
         request = _datastore_pb2.AllocateIdsRequest()
-        _add_keys_to_request(request.key, key_pbs)
+        _add_keys_to_request(request.keys, key_pbs)
         # Nothing to do with this response, so just execute the method.
         response = self._rpc(project, 'allocateIds', request,
                              _datastore_pb2.AllocateIdsResponse)
-        return list(response.key)
+        return list(response.keys)
 
 
 def _set_read_options(request, eventual, transaction_id):
diff --git a/gcloud/datastore/test_connection.py b/gcloud/datastore/test_connection.py
index fba3644b875d..0f4a85ba2645 100644
--- a/gcloud/datastore/test_connection.py
+++ b/gcloud/datastore/test_connection.py
@@ -258,7 +258,7 @@ def test_lookup_single_key_empty_response(self):
         rq_class = datastore_pb2.LookupRequest
         request = rq_class()
         request.ParseFromString(cw['body'])
-        keys = list(request.key)
+        keys = list(request.keys)
         self.assertEqual(len(keys), 1)
         _compare_key_pb_after_request(self, key_pb, keys[0])
 
@@ -288,7 +288,7 @@ def test_lookup_single_key_empty_response_w_eventual(self):
         rq_class = datastore_pb2.LookupRequest
         request = rq_class()
         request.ParseFromString(cw['body'])
-        keys = list(request.key)
+        keys = list(request.keys)
         self.assertEqual(len(keys), 1)
         _compare_key_pb_after_request(self, key_pb, keys[0])
         self.assertEqual(request.read_options.read_consistency,
@@ -330,7 +330,7 @@ def test_lookup_single_key_empty_response_w_transaction(self):
         rq_class = datastore_pb2.LookupRequest
         request = rq_class()
         request.ParseFromString(cw['body'])
-        keys = list(request.key)
+        keys = list(request.keys)
         self.assertEqual(len(keys), 1)
         _compare_key_pb_after_request(self, key_pb, keys[0])
         self.assertEqual(request.read_options.transaction, TRANSACTION)
@@ -365,7 +365,7 @@ def test_lookup_single_key_nonempty_response(self):
         rq_class = datastore_pb2.LookupRequest
         request = rq_class()
         request.ParseFromString(cw['body'])
-        keys = list(request.key)
+        keys = list(request.keys)
         self.assertEqual(len(keys), 1)
         _compare_key_pb_after_request(self, key_pb, keys[0])
 
@@ -395,7 +395,7 @@ def test_lookup_multiple_keys_empty_response(self):
         rq_class = datastore_pb2.LookupRequest
         request = rq_class()
         request.ParseFromString(cw['body'])
-        keys = list(request.key)
+        keys = list(request.keys)
         self.assertEqual(len(keys), 2)
         _compare_key_pb_after_request(self, key_pb1, keys[0])
         _compare_key_pb_after_request(self, key_pb2, keys[1])
@@ -431,7 +431,7 @@ def test_lookup_multiple_keys_w_missing(self):
         rq_class = datastore_pb2.LookupRequest
         request = rq_class()
         request.ParseFromString(cw['body'])
-        keys = list(request.key)
+        keys = list(request.keys)
         self.assertEqual(len(keys), 2)
         _compare_key_pb_after_request(self, key_pb1, keys[0])
         _compare_key_pb_after_request(self, key_pb2, keys[1])
@@ -469,7 +469,7 @@ def test_lookup_multiple_keys_w_deferred(self):
         rq_class = datastore_pb2.LookupRequest
         request = rq_class()
         request.ParseFromString(cw['body'])
-        keys = list(request.key)
+        keys = list(request.keys)
         self.assertEqual(len(keys), 2)
         _compare_key_pb_after_request(self, key_pb1, keys[0])
         _compare_key_pb_after_request(self, key_pb2, keys[1])
@@ -807,7 +807,7 @@ def test_allocate_ids_empty(self):
         rq_class = datastore_pb2.AllocateIdsRequest
         request = rq_class()
         request.ParseFromString(cw['body'])
-        self.assertEqual(list(request.key), [])
+        self.assertEqual(list(request.keys), [])
 
     def test_allocate_ids_non_empty(self):
         from gcloud.datastore._generated import datastore_pb2
@@ -822,8 +822,8 @@ def test_allocate_ids_non_empty(self):
             self._make_key_pb(PROJECT, id=2345),
             ]
         rsp_pb = datastore_pb2.AllocateIdsResponse()
-        rsp_pb.key.add().CopyFrom(after_key_pbs[0])
-        rsp_pb.key.add().CopyFrom(after_key_pbs[1])
+        rsp_pb.keys.add().CopyFrom(after_key_pbs[0])
+        rsp_pb.keys.add().CopyFrom(after_key_pbs[1])
         conn = self._makeOne()
         URI = '/'.join([
             conn.api_base_url,
@@ -841,8 +841,8 @@ def test_allocate_ids_non_empty(self):
         rq_class = datastore_pb2.AllocateIdsRequest
         request = rq_class()
         request.ParseFromString(cw['body'])
-        self.assertEqual(len(request.key), len(before_key_pbs))
-        for key_before, key_after in zip(before_key_pbs, request.key):
+        self.assertEqual(len(request.keys), len(before_key_pbs))
+        for key_before, key_after in zip(before_key_pbs, request.keys):
             _compare_key_pb_after_request(self, key_before, key_after)