diff --git a/src/proto_alpha/lib_client/client_baking_endorsement.mli b/src/proto_alpha/lib_client/client_baking_endorsement.mli
index cb7c0e20c..a672e8c60 100644
--- a/src/proto_alpha/lib_client/client_baking_endorsement.mli
+++ b/src/proto_alpha/lib_client/client_baking_endorsement.mli
@@ -12,7 +12,7 @@ open Tezos_context
 
 val forge_endorsement:
   #Client_commands.full_context ->
-  Client_proto_rpcs.block ->
+  Block_services.block ->
   src_sk:Client_keys.sk_locator ->
   ?slot:int ->
   ?max_priority:int ->
diff --git a/src/proto_alpha/lib_client/client_baking_forge.mli b/src/proto_alpha/lib_client/client_baking_forge.mli
index 84c22b94e..13b83563f 100644
--- a/src/proto_alpha/lib_client/client_baking_forge.mli
+++ b/src/proto_alpha/lib_client/client_baking_forge.mli
@@ -37,7 +37,7 @@ type error +=
 
 val forge_block:
   #RPC_context.simple ->
-  Client_proto_rpcs.block ->
+  Block_services.block ->
   ?force:bool ->
   ?operations:Operation.raw list ->
   ?best_effort:bool ->
@@ -86,5 +86,5 @@ val create:
 val get_unrevealed_nonces:
   #Client_commands.full_context ->
   ?force:bool ->
-  Client_proto_rpcs.block ->
+  Block_services.block ->
   (Block_hash.t * (Raw_level.t * Nonce.t)) list tzresult Lwt.t
diff --git a/src/proto_alpha/lib_client/client_baking_lib.mli b/src/proto_alpha/lib_client/client_baking_lib.mli
index 8b1518e06..13503b366 100644
--- a/src/proto_alpha/lib_client/client_baking_lib.mli
+++ b/src/proto_alpha/lib_client/client_baking_lib.mli
@@ -13,7 +13,7 @@ open Tezos_context
 (** Mine a block *)
 val bake_block:
   #Client_commands.full_context ->
-  Client_proto_rpcs.block ->
+  Block_services.block ->
   ?force:bool ->
   ?max_priority: int ->
   ?free_baking: bool ->
diff --git a/src/proto_alpha/lib_client/client_baking_revelation.mli b/src/proto_alpha/lib_client/client_baking_revelation.mli
index fbebde5ff..7663daa3e 100644
--- a/src/proto_alpha/lib_client/client_baking_revelation.mli
+++ b/src/proto_alpha/lib_client/client_baking_revelation.mli
@@ -12,13 +12,13 @@ open Tezos_context
 
 val inject_seed_nonce_revelation:
   #RPC_context.simple ->
-  Client_proto_rpcs.block ->
+  Block_services.block ->
   ?async:bool ->
   (Raw_level.t * Nonce.t) list ->
   Operation_hash.t tzresult Lwt.t
 
 val forge_seed_nonce_revelation:
   #Client_commands.full_context ->
-  Client_proto_rpcs.block ->
+  Block_services.block ->
   (Raw_level.t * Nonce.t) list ->
   unit tzresult Lwt.t
diff --git a/src/proto_alpha/lib_client/client_proto_context.mli b/src/proto_alpha/lib_client/client_proto_context.mli
index 20b9ade03..437fdcdbc 100644
--- a/src/proto_alpha/lib_client/client_proto_context.mli
+++ b/src/proto_alpha/lib_client/client_proto_context.mli
@@ -13,31 +13,31 @@ open Environment
 
 val list_contract_labels :
   #Client_commands.full_context ->
-  Client_proto_rpcs.block ->
+  Block_services.block ->
   (string * string * string) list tzresult Lwt.t
 
 val get_storage :
   #RPC_context.simple ->
-  Client_proto_rpcs.block ->
+  Block_services.block ->
   Contract.t ->
   Script.expr option tzresult Lwt.t
 
 val get_manager :
   #Client_commands.full_context ->
-  Client_proto_rpcs.block ->
+  Block_services.block ->
   Contract.t ->
   (string * public_key_hash *
    public_key * Client_keys.sk_locator) tzresult Lwt.t
 
 val get_balance:
   #RPC_context.simple ->
-  Client_proto_rpcs.block ->
+  Block_services.block ->
   Contract.t ->
   Tez.t tzresult Lwt.t
 
 val set_delegate :
   #RPC_context.simple ->
-  Client_proto_rpcs.block ->
+  Block_services.block ->
   fee:Tez.tez ->
   Contract.t ->
   src_pk:public_key ->
@@ -52,7 +52,7 @@ val operation_submitted_message :
 
 val source_to_keys:
   #Client_commands.full_context ->
-  Client_proto_rpcs.block ->
+  Block_services.block ->
   Contract.t ->
   (public_key * Client_keys.sk_locator) tzresult Lwt.t
 
@@ -107,7 +107,7 @@ val faucet :
 
 val transfer :
   #RPC_context.simple ->
-  Client_proto_rpcs.block ->
+  Block_services.block ->
   ?branch:int ->
   source:Contract.t ->
   src_pk:public_key ->
@@ -121,7 +121,7 @@ val transfer :
 
 val dictate :
   #RPC_context.simple ->
-  Client_proto_rpcs.block ->
+  Block_services.block ->
   dictator_operation ->
   secret_key ->
   Operation_hash.t tzresult Lwt.t
diff --git a/src/proto_alpha/lib_client/client_proto_contracts.mli b/src/proto_alpha/lib_client/client_proto_contracts.mli
index 3023e88dd..82cd6e4fe 100644
--- a/src/proto_alpha/lib_client/client_proto_contracts.mli
+++ b/src/proto_alpha/lib_client/client_proto_contracts.mli
@@ -43,19 +43,19 @@ val list_contracts:
 
 val get_manager:
   #RPC_context.simple ->
-  Client_proto_rpcs.block ->
+  Block_services.block ->
   Contract.t ->
   public_key_hash tzresult Lwt.t
 
 val get_delegate:
   #RPC_context.simple ->
-  Client_proto_rpcs.block ->
+  Block_services.block ->
   Contract.t ->
   public_key_hash tzresult Lwt.t
 
 val check_public_key :
   #RPC_context.simple ->
-  Client_proto_rpcs.block ->
+  Block_services.block ->
   ?src_pk:public_key ->
   public_key_hash ->
   public_key option tzresult Lwt.t
diff --git a/src/proto_alpha/lib_client/client_proto_programs.mli b/src/proto_alpha/lib_client/client_proto_programs.mli
index 8bff9d365..7beb4469f 100644
--- a/src/proto_alpha/lib_client/client_proto_programs.mli
+++ b/src/proto_alpha/lib_client/client_proto_programs.mli
@@ -52,20 +52,20 @@ val hash_and_sign :
   Michelson_v1_parser.parsed ->
   Michelson_v1_parser.parsed ->
   Client_keys.sk_locator ->
-  Client_proto_rpcs.block ->
+  Block_services.block ->
   #RPC_context.simple ->
   (string * string) tzresult Lwt.t
 
 val typecheck_data :
   data:Michelson_v1_parser.parsed ->
   ty:Michelson_v1_parser.parsed ->
-  Client_proto_rpcs.block ->
+  Block_services.block ->
   #RPC_context.simple ->
   unit tzresult Lwt.t
 
 val typecheck_program :
   Michelson_v1_parser.parsed ->
-  Client_proto_rpcs.block ->
+  Block_services.block ->
   #RPC_context.simple ->
   Script_tc_errors.type_map tzresult Lwt.t
 
diff --git a/src/proto_alpha/lib_client/test/proto_alpha_helpers.mli b/src/proto_alpha/lib_client/test/proto_alpha_helpers.mli
index d9e1638c3..75fef6700 100644
--- a/src/proto_alpha/lib_client/test/proto_alpha_helpers.mli
+++ b/src/proto_alpha/lib_client/test/proto_alpha_helpers.mli
@@ -19,7 +19,7 @@ val init :
     forked Tezos node and the block info of the block from where the
     tests will begin. *)
 
-val level : Client_proto_rpcs.block -> Tezos_context.Level.t tzresult Lwt.t
+val level : Block_services.block -> Tezos_context.Level.t tzresult Lwt.t
 
 module Account : sig
 
@@ -59,7 +59,7 @@ module Account : sig
   (** The hardcoded bootstrap accounts. *)
 
   val transfer :
-    ?block:Client_proto_rpcs.block ->
+    ?block:Block_services.block ->
     ?fee: Tez.t ->
     account:t ->
     destination:Contract.t ->
@@ -68,7 +68,7 @@ module Account : sig
     (Operation_hash.t * Contract.t list) tzresult Lwt.t
 
   val originate :
-    ?block:Client_proto_rpcs.block ->
+    ?block:Block_services.block ->
     ?delegate:public_key_hash ->
     ?fee: Tez.t ->
     src:t ->
@@ -77,7 +77,7 @@ module Account : sig
     unit -> (Operation_hash.t * Contract.t) tzresult Lwt.t
 
   val set_delegate :
-    ?block:Client_proto_rpcs.block ->
+    ?block:Block_services.block ->
     ?fee: Tez.t ->
     contract:Contract.t ->
     manager_sk:Client_keys.Secret_key_locator.t ->
@@ -85,10 +85,10 @@ module Account : sig
     public_key_hash option ->
     Operation_hash.t tzresult Lwt.t
 
-  val balance : ?block:Client_proto_rpcs.block -> t -> Tez.t tzresult Lwt.t
+  val balance : ?block:Block_services.block -> t -> Tez.t tzresult Lwt.t
 
   val delegate :
-    ?block:Client_proto_rpcs.block ->
+    ?block:Block_services.block ->
     Contract.t ->
     public_key_hash option tzresult Lwt.t
 
@@ -112,17 +112,17 @@ module Endorse : sig
   val endorse :
     ?slot:int ->
     Account.t ->
-    Client_proto_rpcs.block ->
+    Block_services.block ->
     Operation.raw tzresult Lwt.t
 
   val endorsers_list :
-    Client_proto_rpcs.block ->
+    Block_services.block ->
     Account.t array tzresult Lwt.t
 
   val endorsement_rights :
     ?max_priority:int ->
     Account.t ->
-    Client_proto_rpcs.block ->
+    Block_services.block ->
     Client_proto_rpcs.Helpers.Rights.endorsement_slot list tzresult Lwt.t
 
 end
@@ -208,4 +208,4 @@ module Assert : sig
 
 end
 
-val display_level: Client_proto_rpcs.block -> unit tzresult Lwt.t
+val display_level: Block_services.block -> unit tzresult Lwt.t