Updated names to prop_ in the beginning.