ensure naming consistency