Naming convention updates.