Additional updates to naming conventions