updated ToolName to include all known tools