Update section headings

Briefly discussed this at coffee this morning and these
headings may make more sense.