Fixed tool names