Update naming convention change on this branch