diff --git a/proto/compute.proto b/proto/compute.proto
index ac219471de73a9fc3574c8748983d56c17717947..0860965b2c399101e56e355a2f747be332c136c7 100644
--- a/proto/compute.proto
+++ b/proto/compute.proto
@@ -5,11 +5,11 @@ import "context.proto";
 import "service.proto";
 
 service ComputeService {
-  rpc check_credentials (context.TeraFlowController) returns (context.AuthenticationResult) {}
-  rpc get_connectivity_service_status ( service.ServiceId ) returns (service.ServiceState) {}
-  rpc create_connectivity_service ( service.Service ) returns (service.ServiceId) {}
-  rpc edit_connectivity_service ( service.Service ) returns (service.ServiceId) {}
-  rpc delete_connectivity_service ( service.Service ) returns ( context.Empty ) {}
-  rpc get_all_active_connectivity_services ( context.Empty ) returns ( service.ServiceIdList ) {}
-  rpc clear_all_connectivity_services ( context.Empty ) returns ( context.Empty ) {}
+  rpc checkCredentials (context.TeraFlowController) returns (context.AuthenticationResult) {}
+  rpc getConnectivityServiceStatus ( service.ServiceId ) returns (service.ServiceState) {}
+  rpc createConnectivityService ( service.Service ) returns (service.ServiceId) {}
+  rpc editConnectivityService ( service.Service ) returns (service.ServiceId) {}
+  rpc deleteConnectivityService ( service.Service ) returns ( context.Empty ) {}
+  rpc getAllActiveConnectivityServices ( context.Empty ) returns ( service.ServiceIdList ) {}
+  rpc clearAllConnectivityServices ( context.Empty ) returns ( context.Empty ) {}
 }
diff --git a/proto/grpc/health/v1/health.proto b/proto/grpc/health/v1/health.proto
deleted file mode 100644
index 709dcc5e5a718e6208899c37902123c2561df16a..0000000000000000000000000000000000000000
--- a/proto/grpc/health/v1/health.proto
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2015 The gRPC Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// The canonical version of this proto can be found at
-// https://github.com/grpc/grpc-proto/blob/master/grpc/health/v1/health.proto
-
-syntax = "proto3";
-
-package grpc.health.v1;
-
-option csharp_namespace = "Grpc.Health.V1";
-option go_package = "google.golang.org/grpc/health/grpc_health_v1";
-option java_multiple_files = true;
-option java_outer_classname = "HealthProto";
-option java_package = "io.grpc.health.v1";
-
-message HealthCheckRequest {
-  string service = 1;
-}
-
-message HealthCheckResponse {
-  enum ServingStatus {
-    UNKNOWN = 0;
-    SERVING = 1;
-    NOT_SERVING = 2;
-  }
-  ServingStatus status = 1;
-}
-
-service Health {
-  rpc Check(HealthCheckRequest) returns (HealthCheckResponse);
-}
-
-
diff --git a/proto/monitoring.proto b/proto/monitoring.proto
index 18f91b79703566bbbd2effb9c0de4cff21515544..1ef00c893f39ac28a86fc95ccb7c14564cc02fff 100644
--- a/proto/monitoring.proto
+++ b/proto/monitoring.proto
@@ -7,7 +7,7 @@ import "context.proto";
 service MonitoringService {
   rpc IncludeKpi (Kpi) returns (context.Empty) {}
   rpc MonitorKpi ( KpiDevice ) returns (context.Empty) {}
-  rpc GetStream_kpi ( KpiId ) returns (stream Kpi) {}
+  rpc GetStreamKpi ( KpiId ) returns (stream Kpi) {}
   rpc GetInstantKpi ( KpiId ) returns ( Kpi) {}
 }