Naming convention updates