naming consistency fix