Refactor: mcp: Clean up some variable names