diff --git a/proto/kpi_sample_types.proto b/proto/kpi_sample_types.proto
index 3494d984970a5d3c4eb312258403e8f1fedcf3c6..4419a8df4a22047d8708c5cf2e2c3657148b5eeb 100644
--- a/proto/kpi_sample_types.proto
+++ b/proto/kpi_sample_types.proto
@@ -23,8 +23,8 @@ enum KpiSampleType {
     KPISAMPLETYPE_BYTES_TRANSMITTED             = 201;
     KPISAMPLETYPE_BYTES_RECEIVED                = 202;
     KPISAMPLETYPE_BYTES_DROPPED                 = 203;
-    KPISAMPLETYPE_ML_CONFIDENCE                 = 401;   //. can be used by both optical and L3 without any issue
-    KPISAMPLETYPE_OPTICAL_SECURITY_STATUS       = 501;        //. can be used by both optical and L3 without any issue
+    KPISAMPLETYPE_ML_CONFIDENCE                 = 401;  //. can be used by both optical and L3 without any issue
+    KPISAMPLETYPE_OPTICAL_SECURITY_STATUS       = 501;  //. can be used by both optical and L3 without any issue
     KPISAMPLETYPE_L3_UNIQUE_ATTACK_CONNS        = 601;
     KPISAMPLETYPE_L3_TOTAL_DROPPED_PACKTS       = 602;
     KPISAMPLETYPE_L3_UNIQUE_ATTACKERS           = 603;
diff --git a/proto/monitoring.proto b/proto/monitoring.proto
index 027dcb0227c9b49cf091213bd42f101374eb3bc2..f9c408c96ced121f35cc1116bf64d013e7320e6a 100644
--- a/proto/monitoring.proto
+++ b/proto/monitoring.proto
@@ -36,7 +36,7 @@ service MonitoringService {
   rpc GetAlarmResponseStream(AlarmSubscription  ) returns (stream AlarmResponse) {} // Not Stable not final
   rpc DeleteAlarm           (AlarmID            ) returns (context.Empty       ) {} // Stable and final
   rpc GetStreamKpi          (KpiId              ) returns (stream Kpi          ) {} // Stable not final
-  rpc GetInstantKpi         (KpiId              ) returns (Kpi             ) {} // Stable not final
+  rpc GetInstantKpi         (KpiId              ) returns (Kpi                 ) {} // Stable not final
 }
 
 message KpiDescriptor {
@@ -59,7 +59,7 @@ message MonitorKpiRequest {
 }
 
 message KpiQuery {
-  repeated KpiId    kpi_ids              = 1;
+  repeated KpiId    kpi_ids             = 1;
   float             monitoring_window_s = 2;
   uint32            last_n_samples      = 3;  // used when you want something like "get the last N many samples
   context.Timestamp start_timestamp     = 4;  // used when you want something like "get the samples since X date/time"