Fix some error from not changing the names of the headers, comment
places to be fixed.