fix tool naming across the tool