What about the other ".invalid." files touched by this PR? Do they also need a name change?