Naming consistency improved