better variable naming

ref https://github.com/dimagi/commcare-hq/pull/4655