diff --git a/proto/caosdb/entity/v1alpha1/main.proto b/proto/caosdb/entity/v1alpha1/main.proto
index e19ff71683d5add99638c04d5d981e22cbaa5fcf..71e8822553b0dd63788b81e0deca15d4021f241a 100644
--- a/proto/caosdb/entity/v1alpha1/main.proto
+++ b/proto/caosdb/entity/v1alpha1/main.proto
@@ -510,7 +510,7 @@ message RetrieveResponse {
   // Payload of the retrieval
   oneof wrapped_response {
     // Result of a request by id or any other unique identifier.
-    EntityResponse entity = 1;
+    EntityResponse entity_response = 1;
     // Result of a FIND query
     FindQueryResult find_result = 2;
     // Result of a SELECT query
@@ -533,7 +533,8 @@ message DeleteRequest {
 
 // Response to a single delete request.
 message DeleteResponse {
-  // Wrapped to make it easier to optionally return the full entity in the future.
+  // Wrapped to make it easier to optionally return the full entity in the
+  // future.
   oneof wrapped_response {
     // Id and messages of the deleted entity.
     IdResponse id_response = 1;
@@ -548,7 +549,8 @@ message UpdateRequest {
 
 // Response to a single update request.
 message UpdateResponse {
-  // Wraps an IdResponse. Might be extended in the future to optionally return the full entity.
+  // Wraps an IdResponse. Might be extended in the future to optionally return
+  // the full entity.
   oneof wrapped_response {
     // Id and messages of the updated entity.
     IdResponse id_response = 1;
@@ -563,7 +565,8 @@ message InsertRequest {
 
 // Response to a single insert request.
 message InsertResponse {
-  // Wraps an IdResponse. Might be extended in the future to optionally return also the full entity.
+  // Wraps an IdResponse. Might be extended in the future to optionally return
+  // also the full entity.
   oneof wrapped_response {
     // Id and messages of the inserted entity.
     IdResponse id_response = 1;
@@ -662,7 +665,6 @@ message FileTransmissionSettings {
   int64 max_file_size = 2;
 }
 
-
 // Indicates whether a registration (for upload or download) has been accepted
 // or rejected.
 enum RegistrationStatus {