Improve naming consistency