diff --git a/beacon_node/rpc/src/beacon_node.rs b/beacon_node/rpc/src/beacon_node.rs
index 7b00f04f48..54984c5c2a 100644
--- a/beacon_node/rpc/src/beacon_node.rs
+++ b/beacon_node/rpc/src/beacon_node.rs
@@ -1,7 +1,7 @@
 use crate::beacon_chain::BeaconChain;
 use futures::Future;
 use grpcio::{RpcContext, UnarySink};
-use protos::services::{Empty, Fork, NodeInfo};
+use protos::services::{Empty, Fork, NodeInfoResponse};
 use protos::services_grpc::BeaconNodeService;
 use slog::{trace, warn};
 use std::sync::Arc;
@@ -14,11 +14,11 @@ pub struct BeaconNodeServiceInstance {
 
 impl BeaconNodeService for BeaconNodeServiceInstance {
     /// Provides basic node information.
-    fn info(&mut self, ctx: RpcContext, _req: Empty, sink: UnarySink<NodeInfo>) {
+    fn info(&mut self, ctx: RpcContext, _req: Empty, sink: UnarySink<NodeInfoResponse>) {
         trace!(self.log, "Node info requested via RPC");
 
         // build the response
-        let mut node_info = NodeInfo::new();
+        let mut node_info = NodeInfoResponse::new();
         node_info.set_version(version::version());
 
         // get the chain state
diff --git a/protos/src/services.proto b/protos/src/services.proto
index 38c9d0b246..ee4f58d1b0 100644
--- a/protos/src/services.proto
+++ b/protos/src/services.proto
@@ -14,7 +14,7 @@ package ethereum.beacon.rpc.v1;
 
 // Service that currently identifies a beacon node
 service BeaconNodeService {
-    rpc Info(Empty) returns (NodeInfo);
+    rpc Info(Empty) returns (NodeInfoResponse);
 }
 
 /// Service that handles block production
@@ -40,7 +40,7 @@ service AttestationService {
 /*
  * Beacon Node Service Message
  */
-message NodeInfo {
+message NodeInfoResponse {
     string version = 1;
     Fork fork = 2;
     uint32 chain_id = 3;
@@ -53,8 +53,7 @@ message Fork {
     uint64 epoch = 3;
 }
 
-message Empty {
-}
+message Empty {}
 
 
 /*