Naming consistency fix