naming convention updates