Minor: Cleaning up header file names.