diff --git a/pkg/mcp/add_transaction.go b/pkg/mcp/add_transaction_tool_handler.go
similarity index 100%
rename from pkg/mcp/add_transaction.go
rename to pkg/mcp/add_transaction_tool_handler.go
diff --git a/pkg/mcp/query_all_accounts.go b/pkg/mcp/query_all_accounts_tool_handler.go
similarity index 100%
rename from pkg/mcp/query_all_accounts.go
rename to pkg/mcp/query_all_accounts_tool_handler.go
diff --git a/pkg/mcp/query_all_transaction_categories.go b/pkg/mcp/query_all_transaction_categories_tool_handler.go
similarity index 100%
rename from pkg/mcp/query_all_transaction_categories.go
rename to pkg/mcp/query_all_transaction_categories_tool_handler.go
diff --git a/pkg/mcp/query_all_transaction_tags.go b/pkg/mcp/query_all_transaction_tags_tool_handler.go
similarity index 100%
rename from pkg/mcp/query_all_transaction_tags.go
rename to pkg/mcp/query_all_transaction_tags_tool_handler.go
diff --git a/pkg/mcp/query_latest_exchange_rates.go b/pkg/mcp/query_latest_exchange_rates_tool_handler.go
similarity index 100%
rename from pkg/mcp/query_latest_exchange_rates.go
rename to pkg/mcp/query_latest_exchange_rates_tool_handler.go
diff --git a/pkg/mcp/query_transactions.go b/pkg/mcp/query_transactions_tool_handler.go
similarity index 100%
rename from pkg/mcp/query_transactions.go
rename to pkg/mcp/query_transactions_tool_handler.go