Moved 'Naming' into 'Formatting'. Added outlines for other types of formatting.