Improved naming consistency