Rename some tools for clarity/accuracy