fix naming consistency