renamed some tools