Fix naming consistency