Improve variable naming consistency