better variable naming
Merge pull request #4668 from dimagi/naming

better variable naming