Rename for consistency
Add links to sections
Add link from header title