Improve variable naming.