[DF-4714] Fixed property names after review.