diff --git a/x/macaroon/keeper/msg_server_test.go b/x/macaroon/keeper/rpc_test.go
similarity index 100%
rename from x/macaroon/keeper/msg_server_test.go
rename to x/macaroon/keeper/rpc_test.go
diff --git a/x/oracle/keeper/msg_server_test.go b/x/oracle/keeper/rpc_test.go
similarity index 100%
rename from x/oracle/keeper/msg_server_test.go
rename to x/oracle/keeper/rpc_test.go
diff --git a/x/service/keeper/msg_server_test.go b/x/service/keeper/rpc_test.go
similarity index 100%
rename from x/service/keeper/msg_server_test.go
rename to x/service/keeper/rpc_test.go
diff --git a/x/vault/keeper/server_test.go b/x/vault/keeper/rpc_test.go
similarity index 100%
rename from x/vault/keeper/server_test.go
rename to x/vault/keeper/rpc_test.go