some more property renames to better reflect