improve naming consistency