Refactored tools to tool naming scheme.