renaming files to fit our naming scheme for tools suites
change macro file name to reflect recent changes