Update naming convention