add helper methods and rename some internal Tool methods