Update header files to use a more standard name to prevent rereading

This is from github report #16. There are likely a few more issues
that need to be addressed though this takes care of the major ones.