Updated to use the new tool names and to escape links