Rename some h files to make more sense.