Revert "Change property name to be more consistent"
Revert "Change property name to be more consistent"

This reverts commit 15d43eccf5f410480402c5d4be6154b53960fad3.

rsimmons/rindel3,rsimmons/rindel3,rsimmons/rindel3