Rename and reorganize section headings