Aligned filenames with naming conventions. Verified all test suites.