Go back to 'oldFile' and 'newFile' with the proper Clang attribute

This reverts commit 6b215b927a63865a07ae5471c2f36397dc8db62e.