Renaming & test files