Fix my overzealous renaming of header files