diff --git a/x/macaroon/keeper/query_server.go b/x/macaroon/keeper/querier.go
similarity index 100%
rename from x/macaroon/keeper/query_server.go
rename to x/macaroon/keeper/querier.go
diff --git a/x/macaroon/keeper/msg_server.go b/x/macaroon/keeper/rpc.go
similarity index 100%
rename from x/macaroon/keeper/msg_server.go
rename to x/macaroon/keeper/rpc.go
diff --git a/x/oracle/keeper/query_server.go b/x/oracle/keeper/querier.go
similarity index 100%
rename from x/oracle/keeper/query_server.go
rename to x/oracle/keeper/querier.go
diff --git a/x/oracle/keeper/msg_server.go b/x/oracle/keeper/rpc.go
similarity index 100%
rename from x/oracle/keeper/msg_server.go
rename to x/oracle/keeper/rpc.go
diff --git a/x/service/keeper/query_server.go b/x/service/keeper/querier.go
similarity index 100%
rename from x/service/keeper/query_server.go
rename to x/service/keeper/querier.go
diff --git a/x/service/keeper/msg_server.go b/x/service/keeper/rpc.go
similarity index 100%
rename from x/service/keeper/msg_server.go
rename to x/service/keeper/rpc.go