I agree that the naming could be better. I like @carolineleung's suggestions