Correct header comment format
Modify naming format