diff --git a/changelog.md b/changelog.md
index af4d8524cd..eb036f64ec 100644
--- a/changelog.md
+++ b/changelog.md
@@ -39,6 +39,7 @@
 - [#3084](https://github.com/ignite/cli/pull/3084) Add Ignite Chain documentation.
 - [#3109](https://github.com/ignite/cli/pull/3109) Refactor scaffolding for proto files to not rely on placeholders.
 - [#3106](https://github.com/ignite/cli/pull/3106) Add zoom image plugin.
+- [#3224](https://github.com/ignite/cli/pull/3224) Remove grpc_* prefix from query files in scaffolded chains
 
 ### Breaking Changes
 
diff --git a/ignite/pkg/cosmosanalysis/module/testdata/planet/x/mars/keeper/grpc_query_my_query.go b/ignite/pkg/cosmosanalysis/module/testdata/planet/x/mars/keeper/query_my_query.go
similarity index 100%
rename from ignite/pkg/cosmosanalysis/module/testdata/planet/x/mars/keeper/grpc_query_my_query.go
rename to ignite/pkg/cosmosanalysis/module/testdata/planet/x/mars/keeper/query_my_query.go
diff --git a/ignite/pkg/cosmosanalysis/module/testdata/planet_v2/x/mars/keeper/grpc_query_my_query.go b/ignite/pkg/cosmosanalysis/module/testdata/planet_v2/x/mars/keeper/query_my_query.go
similarity index 100%
rename from ignite/pkg/cosmosanalysis/module/testdata/planet_v2/x/mars/keeper/grpc_query_my_query.go
rename to ignite/pkg/cosmosanalysis/module/testdata/planet_v2/x/mars/keeper/query_my_query.go
diff --git a/ignite/templates/ibc/files/oracle/x/{{moduleName}}/keeper/grpc_query_{{queryName}}.go.plush b/ignite/templates/ibc/files/oracle/x/{{moduleName}}/keeper/query_{{queryName}}.go.plush
similarity index 100%
rename from ignite/templates/ibc/files/oracle/x/{{moduleName}}/keeper/grpc_query_{{queryName}}.go.plush
rename to ignite/templates/ibc/files/oracle/x/{{moduleName}}/keeper/query_{{queryName}}.go.plush
diff --git a/ignite/templates/module/create/files/base/x/{{moduleName}}/keeper/grpc_query.go.plush b/ignite/templates/module/create/files/base/x/{{moduleName}}/keeper/query.go.plush
similarity index 100%
rename from ignite/templates/module/create/files/base/x/{{moduleName}}/keeper/grpc_query.go.plush
rename to ignite/templates/module/create/files/base/x/{{moduleName}}/keeper/query.go.plush
diff --git a/ignite/templates/module/create/files/base/x/{{moduleName}}/keeper/grpc_query_params.go.plush b/ignite/templates/module/create/files/base/x/{{moduleName}}/keeper/query_params.go.plush
similarity index 100%
rename from ignite/templates/module/create/files/base/x/{{moduleName}}/keeper/grpc_query_params.go.plush
rename to ignite/templates/module/create/files/base/x/{{moduleName}}/keeper/query_params.go.plush
diff --git a/ignite/templates/module/create/files/base/x/{{moduleName}}/keeper/grpc_query_params_test.go.plush b/ignite/templates/module/create/files/base/x/{{moduleName}}/keeper/query_params_test.go.plush
similarity index 100%
rename from ignite/templates/module/create/files/base/x/{{moduleName}}/keeper/grpc_query_params_test.go.plush
rename to ignite/templates/module/create/files/base/x/{{moduleName}}/keeper/query_params_test.go.plush
diff --git a/ignite/templates/query/files/x/{{moduleName}}/keeper/grpc_query_{{queryName}}.go.plush b/ignite/templates/query/files/x/{{moduleName}}/keeper/query_{{queryName}}.go.plush
similarity index 100%
rename from ignite/templates/query/files/x/{{moduleName}}/keeper/grpc_query_{{queryName}}.go.plush
rename to ignite/templates/query/files/x/{{moduleName}}/keeper/query_{{queryName}}.go.plush
diff --git a/ignite/templates/typed/list/files/component/x/{{moduleName}}/keeper/grpc_query_{{typeName}}.go.plush b/ignite/templates/typed/list/files/component/x/{{moduleName}}/keeper/query_{{typeName}}.go.plush
similarity index 100%
rename from ignite/templates/typed/list/files/component/x/{{moduleName}}/keeper/grpc_query_{{typeName}}.go.plush
rename to ignite/templates/typed/list/files/component/x/{{moduleName}}/keeper/query_{{typeName}}.go.plush
diff --git a/ignite/templates/typed/list/files/component/x/{{moduleName}}/keeper/grpc_query_{{typeName}}_test.go.plush b/ignite/templates/typed/list/files/component/x/{{moduleName}}/keeper/query_{{typeName}}_test.go.plush
similarity index 100%
rename from ignite/templates/typed/list/files/component/x/{{moduleName}}/keeper/grpc_query_{{typeName}}_test.go.plush
rename to ignite/templates/typed/list/files/component/x/{{moduleName}}/keeper/query_{{typeName}}_test.go.plush
diff --git a/ignite/templates/typed/map/files/component/x/{{moduleName}}/keeper/grpc_query_{{typeName}}.go.plush b/ignite/templates/typed/map/files/component/x/{{moduleName}}/keeper/query_{{typeName}}.go.plush
similarity index 100%
rename from ignite/templates/typed/map/files/component/x/{{moduleName}}/keeper/grpc_query_{{typeName}}.go.plush
rename to ignite/templates/typed/map/files/component/x/{{moduleName}}/keeper/query_{{typeName}}.go.plush
diff --git a/ignite/templates/typed/map/files/tests/component/x/{{moduleName}}/keeper/grpc_query_{{typeName}}_test.go.plush b/ignite/templates/typed/map/files/tests/component/x/{{moduleName}}/keeper/query_{{typeName}}_test.go.plush
similarity index 100%
rename from ignite/templates/typed/map/files/tests/component/x/{{moduleName}}/keeper/grpc_query_{{typeName}}_test.go.plush
rename to ignite/templates/typed/map/files/tests/component/x/{{moduleName}}/keeper/query_{{typeName}}_test.go.plush
diff --git a/ignite/templates/typed/singleton/files/component/x/{{moduleName}}/keeper/grpc_query_{{typeName}}.go.plush b/ignite/templates/typed/singleton/files/component/x/{{moduleName}}/keeper/query_{{typeName}}.go.plush
similarity index 100%
rename from ignite/templates/typed/singleton/files/component/x/{{moduleName}}/keeper/grpc_query_{{typeName}}.go.plush
rename to ignite/templates/typed/singleton/files/component/x/{{moduleName}}/keeper/query_{{typeName}}.go.plush
diff --git a/ignite/templates/typed/singleton/files/component/x/{{moduleName}}/keeper/grpc_query_{{typeName}}_test.go.plush b/ignite/templates/typed/singleton/files/component/x/{{moduleName}}/keeper/query_{{typeName}}_test.go.plush
similarity index 100%
rename from ignite/templates/typed/singleton/files/component/x/{{moduleName}}/keeper/grpc_query_{{typeName}}_test.go.plush
rename to ignite/templates/typed/singleton/files/component/x/{{moduleName}}/keeper/query_{{typeName}}_test.go.plush