Changing header convention for a few classes.