diff --git a/authorizer/src/asapo_authorizer/server/issue_token.go b/authorizer/src/asapo_authorizer/server/issue_token.go
index e8da6089faac9a0fdb83f6f2db1b46b14d0cebb7..2c0ecfcc8284f453ec9ac10ba0851004a40d4a08 100644
--- a/authorizer/src/asapo_authorizer/server/issue_token.go
+++ b/authorizer/src/asapo_authorizer/server/issue_token.go
@@ -73,7 +73,7 @@ func issueUserToken(w http.ResponseWriter, r *http.Request) {
 	}
 
 	log.WithFields(map[string]interface{}{
-		"id":      claims.Id,
+		"token_id":      claims.Id,
 		"subject": claims.Subject,
 		"validDays": request.DaysValid,
 		"accessTypes": request.AccessTypes,
diff --git a/receiver/src/receiver_data_server/net_server/rds_tcp_server.cpp b/receiver/src/receiver_data_server/net_server/rds_tcp_server.cpp
index 57b75e23ded55c582b1a81f3e5bf12b7fe753019..9ae6663f57a46c0121ac7fd8593847294de0a25d 100644
--- a/receiver/src/receiver_data_server/net_server/rds_tcp_server.cpp
+++ b/receiver/src/receiver_data_server/net_server/rds_tcp_server.cpp
@@ -80,7 +80,7 @@ GenericRequests RdsTcpServer::ReadRequests(const ListSocketDescriptors& sockets)
         }
         log__->Debug(LogMessageWithFields("received request").
             Append("operation", OpcodeToString(request->header.op_code)).
-            Append("id", request->header.data_id));
+            Append("buf_id", request->header.data_id));
         requests.emplace_back(std::move(request));
     }
     return requests;