Updated property names after review with Ola.