Improved naming consistency.