Update naming to match convention for later values.
As per this comment here: !1266 (comment 318412024)