Update naming conventions