renamed properties to match their intended function