Really catch up to file renaming.

Pointy hat: @bska