more consistent property/variable names