Fix underscore removal from tools