Update format section
Update naming convention