variable name changed since we made this

wonder what else has changed, we should do a pass
Merge branch 'develop'