Refactoring - renaming tools