Revert unnecessary file renames