Updated Namings and Styles