improved naming consistency