Starting on naming conventions section. Reordering content.