diff --git a/okap.proto b/okap.proto
index bfc6ca6..d28e931 100644
--- a/okap.proto
+++ b/okap.proto
@@ -115,14 +115,14 @@ message CallbackConfig {
 }
 
 message ConfigureCallbackRequest {
-  string service = 1;
+  string serviceId = 1;
   bool enabled = 2;
   CallbackConfig fetch = 3;
   CallbackConfig push = 4;
 }
 
 message ConfigureCallbackResponse {
-  string service = 1;
+  string serviceId = 1;
   bool enabled = 2;
   CallbackConfig fetch = 3;
   CallbackConfig push = 4;
@@ -132,7 +132,7 @@ message ListServicesRequest {
 }
 
 message ServiceConfiguration {
-  string service = 1;
+  string serviceId = 1;
   bool enabled = 2;
   CallbackConfig fetch = 3;
   CallbackConfig push = 4;