diff --git a/src/lib_rpc-base/RPC_arg.ml b/src/lib_rpc_base/RPC_arg.ml
similarity index 100%
rename from src/lib_rpc-base/RPC_arg.ml
rename to src/lib_rpc_base/RPC_arg.ml
diff --git a/src/lib_rpc-base/RPC_arg.mli b/src/lib_rpc_base/RPC_arg.mli
similarity index 100%
rename from src/lib_rpc-base/RPC_arg.mli
rename to src/lib_rpc_base/RPC_arg.mli
diff --git a/src/lib_rpc-base/RPC_description.ml b/src/lib_rpc_base/RPC_description.ml
similarity index 100%
rename from src/lib_rpc-base/RPC_description.ml
rename to src/lib_rpc_base/RPC_description.ml
diff --git a/src/lib_rpc-base/RPC_description.mli b/src/lib_rpc_base/RPC_description.mli
similarity index 100%
rename from src/lib_rpc-base/RPC_description.mli
rename to src/lib_rpc_base/RPC_description.mli
diff --git a/src/lib_rpc-base/RPC_encoding.ml b/src/lib_rpc_base/RPC_encoding.ml
similarity index 100%
rename from src/lib_rpc-base/RPC_encoding.ml
rename to src/lib_rpc_base/RPC_encoding.ml
diff --git a/src/lib_rpc-base/RPC_encoding.mli b/src/lib_rpc_base/RPC_encoding.mli
similarity index 100%
rename from src/lib_rpc-base/RPC_encoding.mli
rename to src/lib_rpc_base/RPC_encoding.mli
diff --git a/src/lib_rpc-base/RPC_path.ml b/src/lib_rpc_base/RPC_path.ml
similarity index 100%
rename from src/lib_rpc-base/RPC_path.ml
rename to src/lib_rpc_base/RPC_path.ml
diff --git a/src/lib_rpc-base/RPC_path.mli b/src/lib_rpc_base/RPC_path.mli
similarity index 100%
rename from src/lib_rpc-base/RPC_path.mli
rename to src/lib_rpc_base/RPC_path.mli
diff --git a/src/lib_rpc-base/RPC_query.ml b/src/lib_rpc_base/RPC_query.ml
similarity index 100%
rename from src/lib_rpc-base/RPC_query.ml
rename to src/lib_rpc_base/RPC_query.ml
diff --git a/src/lib_rpc-base/RPC_query.mli b/src/lib_rpc_base/RPC_query.mli
similarity index 100%
rename from src/lib_rpc-base/RPC_query.mli
rename to src/lib_rpc_base/RPC_query.mli
diff --git a/src/lib_rpc-base/RPC_service.ml b/src/lib_rpc_base/RPC_service.ml
similarity index 100%
rename from src/lib_rpc-base/RPC_service.ml
rename to src/lib_rpc_base/RPC_service.ml
diff --git a/src/lib_rpc-base/RPC_service.mli b/src/lib_rpc_base/RPC_service.mli
similarity index 100%
rename from src/lib_rpc-base/RPC_service.mli
rename to src/lib_rpc_base/RPC_service.mli
diff --git a/src/lib_rpc-base/jbuild b/src/lib_rpc_base/jbuild
similarity index 100%
rename from src/lib_rpc-base/jbuild
rename to src/lib_rpc_base/jbuild
diff --git a/src/lib_rpc-base/tezos-rpc-base.opam b/src/lib_rpc_base/tezos-rpc-base.opam
similarity index 100%
rename from src/lib_rpc-base/tezos-rpc-base.opam
rename to src/lib_rpc_base/tezos-rpc-base.opam
diff --git a/src/lib_rpc-http/RPC_answer.ml b/src/lib_rpc_http/RPC_answer.ml
similarity index 100%
rename from src/lib_rpc-http/RPC_answer.ml
rename to src/lib_rpc_http/RPC_answer.ml
diff --git a/src/lib_rpc-http/RPC_answer.mli b/src/lib_rpc_http/RPC_answer.mli
similarity index 100%
rename from src/lib_rpc-http/RPC_answer.mli
rename to src/lib_rpc_http/RPC_answer.mli
diff --git a/src/lib_rpc-http/RPC_client.ml b/src/lib_rpc_http/RPC_client.ml
similarity index 100%
rename from src/lib_rpc-http/RPC_client.ml
rename to src/lib_rpc_http/RPC_client.ml
diff --git a/src/lib_rpc-http/RPC_client.mli b/src/lib_rpc_http/RPC_client.mli
similarity index 100%
rename from src/lib_rpc-http/RPC_client.mli
rename to src/lib_rpc_http/RPC_client.mli
diff --git a/src/lib_rpc-http/RPC_directory.ml b/src/lib_rpc_http/RPC_directory.ml
similarity index 100%
rename from src/lib_rpc-http/RPC_directory.ml
rename to src/lib_rpc_http/RPC_directory.ml
diff --git a/src/lib_rpc-http/RPC_directory.mli b/src/lib_rpc_http/RPC_directory.mli
similarity index 100%
rename from src/lib_rpc-http/RPC_directory.mli
rename to src/lib_rpc_http/RPC_directory.mli
diff --git a/src/lib_rpc-http/RPC_server.ml b/src/lib_rpc_http/RPC_server.ml
similarity index 100%
rename from src/lib_rpc-http/RPC_server.ml
rename to src/lib_rpc_http/RPC_server.ml
diff --git a/src/lib_rpc-http/RPC_server.mli b/src/lib_rpc_http/RPC_server.mli
similarity index 100%
rename from src/lib_rpc-http/RPC_server.mli
rename to src/lib_rpc_http/RPC_server.mli
diff --git a/src/lib_rpc-http/jbuild b/src/lib_rpc_http/jbuild
similarity index 100%
rename from src/lib_rpc-http/jbuild
rename to src/lib_rpc_http/jbuild
diff --git a/src/lib_rpc-http/media_type.ml b/src/lib_rpc_http/media_type.ml
similarity index 100%
rename from src/lib_rpc-http/media_type.ml
rename to src/lib_rpc_http/media_type.ml
diff --git a/src/lib_rpc-http/media_type.mli b/src/lib_rpc_http/media_type.mli
similarity index 100%
rename from src/lib_rpc-http/media_type.mli
rename to src/lib_rpc_http/media_type.mli
diff --git a/src/lib_rpc-http/tezos-rpc-http.opam b/src/lib_rpc_http/tezos-rpc-http.opam
similarity index 100%
rename from src/lib_rpc-http/tezos-rpc-http.opam
rename to src/lib_rpc_http/tezos-rpc-http.opam