Renamed some tools