Naming consistency update