Merge "Fix minor header wordings"