Changed names of propeties to avoid confusion