Sane variable naming (again).