naming consistency improved