Revert "renaming tools"

This reverts commit ebcf04e61cc468801074adc0550846cd0f990fb6.