Refactoring: CLI tools and MR Tool renamed