updated some propery names for readability