Increased naming consistency