diff --git a/commonfile/fileproto/file.pb.go b/commonfile/fileproto/file.pb.go
index 5f295f0b..12cf373b 100644
--- a/commonfile/fileproto/file.pb.go
+++ b/commonfile/fileproto/file.pb.go
@@ -705,43 +705,43 @@ func init() {
 }
 
 var fileDescriptor_fd665a7e11c833d5 = []byte{
-	// 567 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x94, 0xcd, 0x6e, 0xda, 0x40,
-	0x10, 0xc7, 0x59, 0xa0, 0x14, 0x86, 0x8f, 0x38, 0x1b, 0x94, 0x52, 0x87, 0x5a, 0xc8, 0x87, 0x0a,
-	0xa5, 0x12, 0x91, 0x68, 0x0f, 0xb9, 0xe4, 0x10, 0x03, 0x41, 0xb4, 0x6a, 0x5a, 0x39, 0xea, 0xa5,
-	0x3d, 0x19, 0x7b, 0x51, 0xac, 0x38, 0x5e, 0xea, 0x5d, 0xaa, 0xe4, 0x2d, 0xfa, 0x24, 0x7d, 0x8e,
-	0x1c, 0x73, 0xec, 0xb1, 0x82, 0x17, 0xa9, 0xbc, 0x5e, 0xc0, 0x06, 0x47, 0x91, 0xb8, 0x98, 0xd9,
-	0xf9, 0xf8, 0xcd, 0xce, 0x7f, 0x77, 0x81, 0xb7, 0x36, 0xbd, 0xbd, 0xa5, 0xfe, 0xc4, 0xf5, 0xc8,
-	0x49, 0xf8, 0x99, 0x06, 0x94, 0xd3, 0x13, 0xf1, 0x65, 0xc2, 0xd1, 0x11, 0x36, 0x2e, 0x86, 0x36,
-	0xbb, 0xf7, 0x6d, 0xfd, 0x0c, 0xf6, 0x0c, 0x8f, 0xda, 0x37, 0x43, 0xc2, 0x4d, 0xf2, 0x73, 0x46,
-	0x18, 0xc7, 0x0d, 0x78, 0xc9, 0xa6, 0x96, 0x4d, 0x46, 0x4e, 0x03, 0xb5, 0x50, 0xbb, 0x64, 0x2e,
-	0x97, 0x58, 0x81, 0x9c, 0xed, 0x3a, 0x8d, 0x6c, 0x0b, 0xb5, 0x2b, 0x66, 0x68, 0xea, 0xa7, 0xa0,
-	0xac, 0xcb, 0xd9, 0x94, 0xfa, 0x8c, 0x2c, 0xb3, 0xd0, 0x2a, 0x0b, 0x63, 0xc8, 0x3b, 0x16, 0xb7,
-	0x64, 0xa1, 0xb0, 0x75, 0x53, 0x56, 0x7e, 0x9d, 0xb1, 0xeb, 0x1d, 0x3a, 0xaf, 0x98, 0xb9, 0x18,
-	0xf3, 0x00, 0xf6, 0x63, 0xcc, 0x68, 0x3b, 0x7a, 0x0f, 0x0e, 0x84, 0x93, 0xf5, 0x89, 0x47, 0x38,
-	0x79, 0xbe, 0x17, 0x86, 0xbc, 0xed, 0x3a, 0xac, 0x91, 0x6d, 0xe5, 0x42, 0x72, 0x68, 0xeb, 0x87,
-	0x50, 0x4f, 0x42, 0x24, 0xdc, 0x00, 0x1c, 0xf9, 0x7b, 0xd7, 0xc4, 0xbe, 0xd9, 0x8d, 0x3d, 0x5e,
-	0x6e, 0x50, 0x32, 0xa4, 0x8c, 0x9f, 0x00, 0x8f, 0x85, 0xfb, 0xfc, 0x97, 0xe5, 0x7a, 0xd6, 0xd8,
-	0xf5, 0x5c, 0x7e, 0xdf, 0x40, 0xad, 0x5c, 0xbb, 0xdc, 0x3d, 0xea, 0x2c, 0x0f, 0xb0, 0x23, 0x4a,
-	0xe3, 0x29, 0x66, 0x4a, 0x99, 0xfe, 0x43, 0x2a, 0x13, 0x77, 0xa6, 0x1c, 0xd4, 0x07, 0x28, 0x30,
-	0x6e, 0xf1, 0x19, 0x13, 0x4a, 0xd7, 0xba, 0xcd, 0x75, 0x9f, 0x78, 0xe5, 0x95, 0xc8, 0x31, 0x65,
-	0xae, 0x7e, 0x2e, 0xe1, 0xcc, 0x70, 0x7d, 0x67, 0x37, 0x0d, 0xea, 0x4b, 0x1d, 0x23, 0x84, 0x54,
-	0xb7, 0x06, 0x95, 0xb8, 0xae, 0xfa, 0x3b, 0xa8, 0x26, 0x35, 0x52, 0xa1, 0x28, 0xa9, 0x4c, 0x28,
-	0x53, 0x32, 0x57, 0xeb, 0xe3, 0x33, 0x28, 0x0e, 0x82, 0xa0, 0x47, 0x1d, 0xc2, 0x70, 0x0d, 0xe0,
-	0x9b, 0x4f, 0xee, 0xa6, 0xc4, 0xe6, 0xc4, 0x51, 0x32, 0x78, 0x0f, 0xca, 0xbd, 0x51, 0xff, 0x92,
-	0xf2, 0x0b, 0x3a, 0xf3, 0x1d, 0x05, 0x61, 0x05, 0xca, 0x83, 0x20, 0xa0, 0xc1, 0x97, 0xc9, 0x84,
-	0x11, 0xae, 0x3c, 0xa0, 0x63, 0x03, 0xf0, 0xf6, 0xc8, 0xb8, 0x0a, 0xa5, 0x4b, 0xca, 0x07, 0x77,
-	0x2e, 0xe3, 0x4c, 0xc9, 0x60, 0x80, 0x82, 0xb4, 0x11, 0xde, 0x87, 0x6a, 0x64, 0x8f, 0xfc, 0xab,
-	0x70, 0x0f, 0x4a, 0xb6, 0xfb, 0x27, 0x07, 0xf9, 0x0b, 0xd7, 0x23, 0xd8, 0x80, 0x52, 0x34, 0xde,
-	0x90, 0x70, 0xfc, 0x7a, 0xe3, 0xf0, 0xd6, 0x4f, 0x4f, 0x55, 0xd3, 0x42, 0x72, 0xd6, 0xbe, 0x64,
-	0x84, 0x97, 0x1b, 0x6f, 0x26, 0xc6, 0x5e, 0x91, 0x7a, 0x94, 0x1a, 0x93, 0x94, 0x8f, 0x50, 0x8e,
-	0x5d, 0x36, 0xdc, 0xdc, 0xc8, 0x4d, 0xdc, 0x63, 0xf5, 0xcd, 0x13, 0x51, 0xc9, 0x1a, 0x02, 0xac,
-	0x0f, 0x0d, 0x6f, 0xb6, 0x8d, 0xdf, 0x06, 0xb5, 0x99, 0x1e, 0x94, 0xa0, 0xcf, 0x50, 0x89, 0xbf,
-	0x2e, 0xbc, 0xd5, 0x37, 0xf1, 0x74, 0x55, 0xed, 0xa9, 0xb0, 0xc4, 0x9d, 0xc2, 0x8b, 0x68, 0xba,
-	0xc3, 0x75, 0x62, 0x62, 0xae, 0x57, 0x5b, 0xfe, 0xa8, 0xd2, 0xe8, 0x3c, 0xcc, 0x35, 0xf4, 0x38,
-	0xd7, 0xd0, 0xbf, 0xb9, 0x86, 0x7e, 0x2f, 0xb4, 0xcc, 0xe3, 0x42, 0xcb, 0xfc, 0x5d, 0x68, 0x99,
-	0xef, 0xf5, 0xb4, 0x7f, 0xd6, 0x71, 0x41, 0xfc, 0xbc, 0xff, 0x1f, 0x00, 0x00, 0xff, 0xff, 0xbc,
-	0x48, 0x8b, 0xe1, 0x78, 0x05, 0x00, 0x00,
+	// 565 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0xcd, 0x6e, 0xda, 0x40,
+	0x10, 0x66, 0x81, 0x52, 0x18, 0x7e, 0xe2, 0x6c, 0x50, 0x4a, 0x1d, 0x6a, 0x21, 0x1f, 0x2a, 0x94,
+	0x4a, 0x44, 0xa2, 0x3d, 0xe4, 0x92, 0x03, 0x7f, 0x89, 0x68, 0xd5, 0xb4, 0x72, 0xd4, 0x4b, 0x7b,
+	0x32, 0xf6, 0xa2, 0x58, 0x71, 0xbc, 0xd4, 0xbb, 0x54, 0xc9, 0x5b, 0xf4, 0x45, 0xfa, 0x1e, 0x39,
+	0xe6, 0xd8, 0x63, 0x05, 0x2f, 0x52, 0x79, 0xbd, 0x06, 0x1b, 0x1c, 0x45, 0xe2, 0x62, 0x66, 0x67,
+	0xbe, 0xf9, 0x66, 0xf7, 0x9b, 0x19, 0xe0, 0xad, 0x45, 0x6f, 0x6f, 0xa9, 0x37, 0x75, 0x5c, 0x72,
+	0x12, 0x7c, 0x66, 0x3e, 0xe5, 0xf4, 0x44, 0x7c, 0x99, 0x70, 0x74, 0x84, 0x8d, 0x8b, 0x81, 0xcd,
+	0xee, 0x3d, 0x4b, 0x3f, 0x83, 0xbd, 0xbe, 0x4b, 0xad, 0x9b, 0x0b, 0xc2, 0x0d, 0xf2, 0x73, 0x4e,
+	0x18, 0xc7, 0x0d, 0x78, 0xc9, 0x66, 0xa6, 0x45, 0xc6, 0x76, 0x03, 0xb5, 0x50, 0xbb, 0x64, 0x44,
+	0x47, 0xac, 0x40, 0xce, 0x72, 0xec, 0x46, 0xb6, 0x85, 0xda, 0x15, 0x23, 0x30, 0xf5, 0x53, 0x50,
+	0xd6, 0xe9, 0x6c, 0x46, 0x3d, 0x46, 0x22, 0x14, 0x5a, 0xa1, 0x30, 0x86, 0xbc, 0x6d, 0x72, 0x53,
+	0x26, 0x0a, 0x5b, 0x37, 0x64, 0xe6, 0xd7, 0x39, 0xbb, 0xde, 0xa1, 0xf2, 0x8a, 0x33, 0x17, 0xe3,
+	0x3c, 0x80, 0xfd, 0x18, 0x67, 0x78, 0x1d, 0x7d, 0x00, 0x07, 0xc2, 0xc9, 0x86, 0xc4, 0x25, 0x9c,
+	0x3c, 0x5f, 0x0b, 0x43, 0xde, 0x72, 0x6c, 0xd6, 0xc8, 0xb6, 0x72, 0x01, 0x73, 0x60, 0xeb, 0x87,
+	0x50, 0x4f, 0x92, 0x48, 0xf2, 0x3e, 0xe0, 0xd0, 0x3f, 0xb8, 0x26, 0xd6, 0xcd, 0x6e, 0xdc, 0x93,
+	0xe8, 0x82, 0x92, 0x43, 0xca, 0xf8, 0x09, 0xf0, 0x44, 0xb8, 0x7b, 0xbf, 0x4c, 0xc7, 0x35, 0x27,
+	0x8e, 0xeb, 0xf0, 0xfb, 0x06, 0x6a, 0xe5, 0xda, 0xe5, 0xee, 0x51, 0x27, 0x6a, 0x60, 0x47, 0xa4,
+	0xc6, 0x21, 0x46, 0x4a, 0x9a, 0xfe, 0x43, 0x2a, 0x13, 0x77, 0xa6, 0x34, 0xea, 0x03, 0x14, 0x18,
+	0x37, 0xf9, 0x9c, 0x09, 0xa5, 0x6b, 0xdd, 0xe6, 0xba, 0x4e, 0x3c, 0xf3, 0x4a, 0x60, 0x0c, 0x89,
+	0xd5, 0x7b, 0x92, 0x9c, 0xf5, 0x1d, 0xcf, 0xde, 0x4d, 0x83, 0x7a, 0xa4, 0x63, 0x48, 0x21, 0xd5,
+	0xad, 0x41, 0x25, 0xae, 0xab, 0xfe, 0x0e, 0xaa, 0x49, 0x8d, 0x54, 0x28, 0x4a, 0x56, 0x26, 0x94,
+	0x29, 0x19, 0xab, 0xf3, 0xf1, 0x19, 0x14, 0x47, 0xbe, 0x3f, 0xa0, 0x36, 0x61, 0xb8, 0x06, 0xf0,
+	0xcd, 0x23, 0x77, 0x33, 0x62, 0x71, 0x62, 0x2b, 0x19, 0xbc, 0x07, 0xe5, 0xc1, 0x78, 0x78, 0x49,
+	0xf9, 0x39, 0x9d, 0x7b, 0xb6, 0x82, 0xb0, 0x02, 0xe5, 0x91, 0xef, 0x53, 0xff, 0xcb, 0x74, 0xca,
+	0x08, 0x57, 0x1e, 0xd0, 0x71, 0x1f, 0xf0, 0xf6, 0x93, 0x71, 0x15, 0x4a, 0x97, 0x94, 0x8f, 0xee,
+	0x1c, 0xc6, 0x99, 0x92, 0xc1, 0x00, 0x05, 0x69, 0x23, 0xbc, 0x0f, 0xd5, 0xd0, 0x1e, 0x7b, 0x57,
+	0xc1, 0x1d, 0x94, 0x6c, 0xf7, 0x4f, 0x0e, 0xf2, 0xe7, 0x8e, 0x4b, 0x70, 0x0f, 0x8a, 0xd1, 0x9a,
+	0xe0, 0xd7, 0x1b, 0xbd, 0x5b, 0x6f, 0x9e, 0xaa, 0xa6, 0x85, 0xe4, 0x53, 0x87, 0x50, 0x5a, 0xcd,
+	0x36, 0xde, 0x04, 0xc6, 0x96, 0x48, 0x3d, 0x4a, 0x8d, 0x49, 0x96, 0x8f, 0x50, 0x8e, 0xcd, 0x1a,
+	0x6e, 0x6e, 0x60, 0x13, 0x63, 0xac, 0xbe, 0x79, 0x22, 0x2a, 0xb9, 0x2e, 0x00, 0xd6, 0x3d, 0xc3,
+	0x9b, 0x65, 0xe3, 0xc3, 0xa0, 0x36, 0xd3, 0x83, 0x92, 0xe8, 0x33, 0x54, 0xe2, 0xcb, 0x85, 0xb7,
+	0xea, 0x26, 0x36, 0x57, 0xd5, 0x9e, 0x0a, 0x4b, 0xba, 0x53, 0x78, 0x11, 0xbe, 0xee, 0x70, 0x0d,
+	0x4c, 0xbc, 0xeb, 0xd5, 0x96, 0x3f, 0xcc, 0xec, 0x77, 0x1e, 0x16, 0x1a, 0x7a, 0x5c, 0x68, 0xe8,
+	0xdf, 0x42, 0x43, 0xbf, 0x97, 0x5a, 0xe6, 0x71, 0xa9, 0x65, 0xfe, 0x2e, 0xb5, 0xcc, 0xf7, 0x7a,
+	0xda, 0x1f, 0xeb, 0xa4, 0x20, 0x7e, 0xde, 0xff, 0x0f, 0x00, 0x00, 0xff, 0xff, 0x3b, 0xb6, 0xed,
+	0xc6, 0x77, 0x05, 0x00, 0x00,
 }
 
 func (m *BlockGetRequest) Marshal() (dAtA []byte, err error) {
diff --git a/commonfile/fileproto/file_drpc.pb.go b/commonfile/fileproto/file_drpc.pb.go
index 87f98ce5..fcc7d66a 100644
--- a/commonfile/fileproto/file_drpc.pb.go
+++ b/commonfile/fileproto/file_drpc.pb.go
@@ -40,7 +40,7 @@ func (drpcEncoding_File_commonfile_fileproto_protos_file_proto) JSONUnmarshal(bu
 type DRPCFileClient interface {
 	DRPCConn() drpc.Conn
 
-	BlocksGet(ctx context.Context, in *BlockGetRequest) (*BlockGetResponse, error)
+	BlockGet(ctx context.Context, in *BlockGetRequest) (*BlockGetResponse, error)
 	BlockPush(ctx context.Context, in *BlockPushRequest) (*BlockPushResponse, error)
 	BlocksCheck(ctx context.Context, in *BlocksCheckRequest) (*BlocksCheckResponse, error)
 	BlocksBind(ctx context.Context, in *BlocksBindRequest) (*BlocksBindResponse, error)
@@ -58,9 +58,9 @@ func NewDRPCFileClient(cc drpc.Conn) DRPCFileClient {
 
 func (c *drpcFileClient) DRPCConn() drpc.Conn { return c.cc }
 
-func (c *drpcFileClient) BlocksGet(ctx context.Context, in *BlockGetRequest) (*BlockGetResponse, error) {
+func (c *drpcFileClient) BlockGet(ctx context.Context, in *BlockGetRequest) (*BlockGetResponse, error) {
 	out := new(BlockGetResponse)
-	err := c.cc.Invoke(ctx, "/filesync.File/BlocksGet", drpcEncoding_File_commonfile_fileproto_protos_file_proto{}, in, out)
+	err := c.cc.Invoke(ctx, "/filesync.File/BlockGet", drpcEncoding_File_commonfile_fileproto_protos_file_proto{}, in, out)
 	if err != nil {
 		return nil, err
 	}
@@ -113,7 +113,7 @@ func (c *drpcFileClient) Check(ctx context.Context, in *CheckRequest) (*CheckRes
 }
 
 type DRPCFileServer interface {
-	BlocksGet(context.Context, *BlockGetRequest) (*BlockGetResponse, error)
+	BlockGet(context.Context, *BlockGetRequest) (*BlockGetResponse, error)
 	BlockPush(context.Context, *BlockPushRequest) (*BlockPushResponse, error)
 	BlocksCheck(context.Context, *BlocksCheckRequest) (*BlocksCheckResponse, error)
 	BlocksBind(context.Context, *BlocksBindRequest) (*BlocksBindResponse, error)
@@ -123,7 +123,7 @@ type DRPCFileServer interface {
 
 type DRPCFileUnimplementedServer struct{}
 
-func (s *DRPCFileUnimplementedServer) BlocksGet(context.Context, *BlockGetRequest) (*BlockGetResponse, error) {
+func (s *DRPCFileUnimplementedServer) BlockGet(context.Context, *BlockGetRequest) (*BlockGetResponse, error) {
 	return nil, drpcerr.WithCode(errors.New("Unimplemented"), drpcerr.Unimplemented)
 }
 
@@ -154,14 +154,14 @@ func (DRPCFileDescription) NumMethods() int { return 6 }
 func (DRPCFileDescription) Method(n int) (string, drpc.Encoding, drpc.Receiver, interface{}, bool) {
 	switch n {
 	case 0:
-		return "/filesync.File/BlocksGet", drpcEncoding_File_commonfile_fileproto_protos_file_proto{},
+		return "/filesync.File/BlockGet", drpcEncoding_File_commonfile_fileproto_protos_file_proto{},
 			func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) {
 				return srv.(DRPCFileServer).
-					BlocksGet(
+					BlockGet(
 						ctx,
 						in1.(*BlockGetRequest),
 					)
-			}, DRPCFileServer.BlocksGet, true
+			}, DRPCFileServer.BlockGet, true
 	case 1:
 		return "/filesync.File/BlockPush", drpcEncoding_File_commonfile_fileproto_protos_file_proto{},
 			func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) {
@@ -216,16 +216,16 @@ func DRPCRegisterFile(mux drpc.Mux, impl DRPCFileServer) error {
 	return mux.Register(impl, DRPCFileDescription{})
 }
 
-type DRPCFile_BlocksGetStream interface {
+type DRPCFile_BlockGetStream interface {
 	drpc.Stream
 	SendAndClose(*BlockGetResponse) error
 }
 
-type drpcFile_BlocksGetStream struct {
+type drpcFile_BlockGetStream struct {
 	drpc.Stream
 }
 
-func (x *drpcFile_BlocksGetStream) SendAndClose(m *BlockGetResponse) error {
+func (x *drpcFile_BlockGetStream) SendAndClose(m *BlockGetResponse) error {
 	if err := x.MsgSend(m, drpcEncoding_File_commonfile_fileproto_protos_file_proto{}); err != nil {
 		return err
 	}
diff --git a/commonfile/fileproto/protos/file.proto b/commonfile/fileproto/protos/file.proto
index 07c778fe..ae943bbc 100644
--- a/commonfile/fileproto/protos/file.proto
+++ b/commonfile/fileproto/protos/file.proto
@@ -10,9 +10,9 @@ enum ErrCodes {
 }
 
 service File {
-    // GetBlocks streams ipfs blocks from server to client
-    rpc BlocksGet(BlockGetRequest) returns (BlockGetResponse);
-    // BlockPush pushes one block to server
+    // BlockGet gets one block from a server
+    rpc BlockGet(BlockGetRequest) returns (BlockGetResponse);
+    // BlockPush pushes one block to a server
     rpc BlockPush(BlockPushRequest) returns (BlockPushResponse);
     // BlocksCheck checks is CIDs exists
     rpc BlocksCheck(BlocksCheckRequest) returns (BlocksCheckResponse);