Add naming section and update comments section